Merge branch 'pmakhnev/rewrite-address-related-functions-to-tact' of …

…github.com:tact-lang/tact into pmakhnev/rewrite-address-related-functions-to-tact

.eslintrc.cjs

@@ -15,6 +15,14 @@ module.exports = {
     es2021: true,
   },
   rules: {
+    "@typescript-eslint/consistent-type-imports": [
+      "error",
+      {
+        prefer: "type-imports",
+        fixStyle: "separate-type-imports",
+        disallowTypeAnnotations: true,
+      },
+    ],
     "@typescript-eslint/no-unused-vars": [
       "error",
       {

dev-docs/CHANGELOG.md

@@ -24,6 +24,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `nullChecks` config option to disable run-time null checks for the `!!` operator in order to save gas: PR [#1660](https://github.com/tact-lang/tact/pull/1660)
 - `loadVarInt16`, `loadVarUint16`, `loadVarInt32`, `loadVarUint32` methods for the `Slice` type: PR [#1667](https://github.com/tact-lang/tact/pull/1667)
 - New functions in stdlib from `stdlib.fc` and `math.fc`: `Builder.depth`, `Slice.skipLastBits`, `Slice.firstBits`, `Slice.lastBits`, `Slice.depth`, `Cell.computeDataSize`, `Slice.computeDataSize`, `Cell.depth`, `curLt`, `blockLt`, `setGasLimit`, `getSeed`, `setSeed`, `myCode`, `sign`, `divc`, `muldivc`, `mulShiftRight`, `mulShiftRightRound`, `mulShiftRightCeil`, `sqrt`: PR [#986](https://github.com/tact-lang/tact/pull/986)
+- The `--output` CLI flag for specifying custom output directory in single-contract compilation: PR [#1793](https://github.com/tact-lang/tact/pull/1793)
 - New functions `Slice.asAddressUnsafe`, `contractHash`, `Builder.hash` in stdlib: PR [#1766](https://github.com/tact-lang/tact/pull/1766)
 
 ### Changed
@@ -48,6 +49,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Better error message for `extend function without parameters` error: PR [#1624](https://github.com/tact-lang/tact/pull/1624)
 - Don't generate `lazy_deployment_completed` by default: PR [#1717](https://github.com/tact-lang/tact/pull/1717)
 - Optimized `emptyCell()` and `emptySlice()` functions: PR [#1696](https://github.com/tact-lang/tact/pull/1696)
+- Internal `crc16` function is now verifiable and covered with tests: PR [#1739](https://github.com/tact-lang/tact/pull/1739)
 - Rearrange parameters of some asm methods in order described in `AsmShuffle`: PR [#1702](https://github.com/tact-lang/tact/pull/1702)
 - Error message for invalid type for function argument now shows expected type: PR [#1738](https://github.com/tact-lang/tact/pull/1738)
 

docs/src/content/docs/book/compile.mdx

@@ -95,7 +95,15 @@ If you want to pin down a specific version of the compiler, run the following co
 
 A number of build artifacts can be produced per compilation of each contract. Some of the artifacts can be omitted using [configuration settings](/book/config).
 
-The location of the artifacts depends on the [`output`](/book/config#projects-output) field of the [`tact.config.json`](/book/config). In [Blueprint][bp]-based projects, `output` is not used and all generated files are always placed in `build/ProjectName/`.
+The location of the artifacts depends on the compilation method:
+- For projects using `tact.config.json`, use the [`output`](/book/config#projects-output) field in the config file
+- For single contract compilation, you can specify the output directory using the `-o` or `--output` flag:
+  ```shell
+  tact contract.tact --output ./custom-output
+  ```
+  If not specified, the files will be generated in the same directory as the input file.
+
+In [Blueprint][bp]-based projects, `output` is not used and all generated files are always placed in `build/ProjectName/`.
 
 ### Compilation report, `.md` {#report}
 

examples/increment.spec.ts

@@ -1,5 +1,6 @@
 import { IncrementContract } from "./output/increment_IncrementContract";
-import { Blockchain, SandboxContract, TreasuryContract } from "@ton/sandbox";
+import type { SandboxContract, TreasuryContract } from "@ton/sandbox";
+import { Blockchain } from "@ton/sandbox";
 import { toNano } from "@ton/core";
 import "@ton/test-utils";
 

examples/multisig-3.spec.ts

@@ -1,5 +1,6 @@
 import { toNano } from "@ton/core";
-import { Blockchain, SandboxContract, TreasuryContract } from "@ton/sandbox";
+import type { SandboxContract, TreasuryContract } from "@ton/sandbox";
+import { Blockchain } from "@ton/sandbox";
 import { MultisigContract } from "./output/multisig-3_MultisigContract";
 import "@ton/test-utils";
 

examples/verify.ts

@@ -1,8 +1,10 @@
 import normalize from "path-normalize";
 import { Cell } from "@ton/core";
-import { Config, Options } from "../src/config/parseConfig";
-import { ILogger, Logger } from "../src/context/logger";
-import { PackageFileFormat, run } from "../src";
+import type { Config, Options } from "../src/config/parseConfig";
+import type { ILogger } from "../src/context/logger";
+import { Logger } from "../src/context/logger";
+import type { PackageFileFormat } from "../src";
+import { run } from "../src";
 import { fileFormat } from "../src/packaging/fileFormat";
 import { getCompilerVersion } from "../src/pipeline/version";
 

examples/wallet.spec.ts

@@ -1,5 +1,7 @@
-import { storeTransfer, Transfer, Wallet } from "./output/wallet_Wallet";
-import { Blockchain, SandboxContract, TreasuryContract } from "@ton/sandbox";
+import type { Transfer } from "./output/wallet_Wallet";
+import { storeTransfer, Wallet } from "./output/wallet_Wallet";
+import type { SandboxContract, TreasuryContract } from "@ton/sandbox";
+import { Blockchain } from "@ton/sandbox";
 import { beginCell, toNano } from "@ton/core";
 import { sign } from "@ton/crypto";
 import { randomKey } from "../src/test/utils/random-utils";

spell/cspell-list.txt

@@ -15,6 +15,7 @@ cheatsheet
 Cheatsheet
 cheatsheets
 Cheatsheets
+CCITT
 cleanall
 codegen
 compilables
@@ -167,5 +168,6 @@ vogons
 workchain
 workchains
 xffff
+XMODEM
 xtwitter
 привет

src/abi/AbiFunction.ts

@@ -1,8 +1,8 @@
-import { AstExpression } from "../ast/ast";
-import { CompilerContext } from "../context/context";
-import { WriterContext } from "../generator/Writer";
-import { TypeRef } from "../types/types";
-import { SrcInfo } from "../grammar";
+import type { AstExpression } from "../ast/ast";
+import type { CompilerContext } from "../context/context";
+import type { WriterContext } from "../generator/Writer";
+import type { TypeRef } from "../types/types";
+import type { SrcInfo } from "../grammar";
 
 export type AbiFunction = {
     name: string;

src/abi/global.ts

@@ -9,7 +9,7 @@ import {
 import { writeExpression } from "../generator/writers/writeExpression";
 import { throwCompilationError } from "../error/errors";
 import { getErrorId } from "../types/resolveErrors";
-import { AbiFunction } from "./AbiFunction";
+import type { AbiFunction } from "./AbiFunction";
 import path from "path";
 import { cwd } from "process";
 import { posixNormalize } from "../utils/filePath";

src/abi/map.ts

@@ -1,13 +1,14 @@
-import { CompilerContext } from "../context/context";
-import { SrcInfo } from "../grammar";
-import { printTypeRef, TypeRef } from "../types/types";
-import { WriterContext } from "../generator/Writer";
+import type { CompilerContext } from "../context/context";
+import type { SrcInfo } from "../grammar";
+import type { TypeRef } from "../types/types";
+import { printTypeRef } from "../types/types";
+import type { WriterContext } from "../generator/Writer";
 import { ops } from "../generator/writers/ops";
 import { writeExpression } from "../generator/writers/writeExpression";
 import { throwCompilationError } from "../error/errors";
 import { getType } from "../types/resolveDescriptors";
-import { AbiFunction } from "./AbiFunction";
-import { AstExpression } from "../ast/ast";
+import type { AbiFunction } from "./AbiFunction";
+import type { AstExpression } from "../ast/ast";
 import { isAssignable } from "../types/subtyping";
 
 // Helper functions to avoid redundancy

src/abi/struct.ts

@@ -2,7 +2,7 @@ import { ops } from "../generator/writers/ops";
 import { writeExpression } from "../generator/writers/writeExpression";
 import { throwCompilationError } from "../error/errors";
 import { getType } from "../types/resolveDescriptors";
-import { AbiFunction } from "./AbiFunction";
+import type { AbiFunction } from "./AbiFunction";
 
 export const StructFunctions: Map<string, AbiFunction> = new Map([
     [

src/ast/ast-constants.ts

@@ -1,5 +1,5 @@
 import { keys } from "../utils/tricks";
-import {
+import type {
     AstAugmentedAssignOperation,
     AstBinaryOperation,
     AstFunctionAttributeName,

src/ast/ast-helpers.ts

@@ -1,5 +1,5 @@
-import * as A from "./ast";
-import { AstId } from "./ast";
+import type * as A from "./ast";
+import type { AstId } from "./ast";
 import { throwInternalCompilerError } from "../error/errors";
 import { dummySrcInfo } from "../grammar";
 

src/ast/ast-printer.ts

@@ -1,4 +1,4 @@
-import * as A from "./ast";
+import type * as A from "./ast";
 import { groupBy, intercalate, isUndefined } from "../utils/array";
 import { makeVisitor } from "../utils/tricks";
 import { astNumToString, idText } from "./ast-helpers";

src/ast/ast.ts

@@ -1,7 +1,7 @@
-import { Address, Cell, Slice } from "@ton/core";
-import { SrcInfo } from "../grammar/src-info";
-import { RelativePath } from "../imports/path";
-import { Language } from "../imports/source";
+import type { Address, Cell, Slice } from "@ton/core";
+import type { SrcInfo } from "../grammar/src-info";
+import type { RelativePath } from "../imports/path";
+import type { Language } from "../imports/source";
 
 export type AstModule = {
     readonly kind: "module";

src/ast/clone.ts

@@ -1,5 +1,5 @@
-import { AstNode } from "./ast";
-import { FactoryAst } from "./ast-helpers";
+import type { AstNode } from "./ast";
+import type { FactoryAst } from "./ast-helpers";
 import { throwInternalCompilerError } from "../error/errors";
 
 export function cloneNode<T extends AstNode>(

src/ast/getAstSchema.ts

@@ -3,10 +3,10 @@
  * We have this file so that the "current id" state would not be stored globally
  */
 
-import { Loc } from "@tonstudio/parser-runtime";
-import * as A from "./ast";
-import { FactoryAst } from "../ast/ast-helpers";
-import { SrcInfo } from "../grammar/src-info";
+import type { Loc } from "@tonstudio/parser-runtime";
+import type * as A from "./ast";
+import type { FactoryAst } from "../ast/ast-helpers";
+import type { SrcInfo } from "../grammar/src-info";
 
 export const getAstSchema = (
     factory: FactoryAst,

src/ast/iterators.ts

@@ -1,4 +1,4 @@
-import { AstNode } from "./ast";
+import type { AstNode } from "./ast";
 
 /**
  * Recursively iterates over each node in an AstNode and applies a callback to each AST element.

src/ast/random.infra.ts

@@ -1,5 +1,5 @@
 import fc from "fast-check";
-import * as A from "./ast";
+import type * as A from "./ast";
 import { dummySrcInfo } from "../grammar/src-info";
 import { diffJson } from "diff";
 import { astBinaryOperations, astUnaryOperations } from "./ast-constants";

src/ast/util.ts

@@ -1,7 +1,9 @@
-import { Address, Cell, Slice } from "@ton/core";
-import * as A from "./ast";
-import { isLiteral, FactoryAst } from "./ast-helpers";
-import { dummySrcInfo, SrcInfo } from "../grammar";
+import type { Address, Cell, Slice } from "@ton/core";
+import type * as A from "./ast";
+import type { FactoryAst } from "./ast-helpers";
+import { isLiteral } from "./ast-helpers";
+import type { SrcInfo } from "../grammar";
+import { dummySrcInfo } from "../grammar";
 
 export const getAstUtil = ({ createNode }: FactoryAst) => {
     function makeUnaryExpression(

src/bindings/typescript/serializers.ts

@@ -1,5 +1,5 @@
-import { ABITypeRef } from "@ton/core";
-import { Writer } from "../../utils/Writer";
+import type { ABITypeRef } from "@ton/core";
+import type { Writer } from "../../utils/Writer";
 import { throwInternalCompilerError } from "../../error/errors";
 
 const primitiveTypes = [

src/bindings/typescript/writeStruct.ts

@@ -1,8 +1,11 @@
-import { ABIType, ABITypeRef } from "@ton/core";
+import type { ABIType, ABITypeRef } from "@ton/core";
 import { serializers } from "./serializers";
-import { AllocationCell, AllocationOperation } from "../../storage/operation";
+import type {
+    AllocationCell,
+    AllocationOperation,
+} from "../../storage/operation";
 import { throwInternalCompilerError } from "../../error/errors";
-import { Writer } from "../../utils/Writer";
+import type { Writer } from "../../utils/Writer";
 
 export const maxTupleSize = 15;
 

src/bindings/writeTypescript.ts

@@ -1,6 +1,6 @@
 import * as changeCase from "change-case";
 import { Writer } from "../utils/Writer";
-import { ABIArgument, ABIType, ContractABI } from "@ton/core";
+import type { ABIArgument, ABIType, ContractABI } from "@ton/core";
 import {
     writeArgumentToStack,
     writeDictParser,
@@ -13,7 +13,7 @@ import {
     writeTupleParser,
     writeTupleSerializer,
 } from "./typescript/writeStruct";
-import { AllocationCell } from "../storage/operation";
+import type { AllocationCell } from "../storage/operation";
 import { throwInternalCompilerError } from "../error/errors";
 import { topologicalSort } from "../utils/utils";
 import {

src/browser.ts

@@ -1,5 +1,6 @@
-import { Config, verifyConfig } from "./config/parseConfig";
-import { ILogger } from "./context/logger";
+import type { Config } from "./config/parseConfig";
+import { verifyConfig } from "./config/parseConfig";
+import type { ILogger } from "./context/logger";
 import { build } from "./pipeline/build";
 import { createVirtualFileSystem } from "./vfs/createVirtualFileSystem";
 

src/cli/arg-consumer.ts

@@ -1,4 +1,4 @@
-import { Intersect } from "../utils/tricks";
+import type { Intersect } from "../utils/tricks";
 
 type ArgConsumerErrors = {
     duplicateArgument: (name: string) => void;

src/cli/logger.spec.ts

@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-confusing-void-expression */
 import { throwInternal } from "../error/errors";
-import { Logger, SourceLogger } from "../error/logger-util";
-import { Range } from "../error/range";
+import type { Logger, SourceLogger } from "../error/logger-util";
+import type { Range } from "../error/range";
 import { getAnsiMarkup } from "./colors";
 import { TerminalLogger } from "./logger";
 import pathWindows from "path/win32";

src/cli/logger.ts

@@ -1,12 +1,14 @@
-import { Logger, LoggerHandlers, makeLogger } from "../error/logger-util";
+import type { Logger, LoggerHandlers } from "../error/logger-util";
+import { makeLogger } from "../error/logger-util";
 import {
     printError,
     showExpectedText,
     showTemplate,
 } from "../error/string-util";
 import { cwd } from "process";
 import { throwInternal } from "../error/errors";
-import { AnsiMarkup } from "./colors";
+import type { AnsiMarkup } from "./colors";
+import type * as path from "path";
 
 export const CliLogger = () => {
     let hadErrors = false;
@@ -24,7 +26,7 @@ export const CliLogger = () => {
 
 export type Verbosity = "error" | "warn" | "info";
 
-type PathApi = typeof import("path");
+type PathApi = typeof path;
 
 export const TerminalLogger = <T>(
     pathApi: PathApi,

src/cli/tact/e2e.spec.ts

@@ -1,6 +1,6 @@
 import { stat } from "fs/promises";
 import { makeCodegen, runCommand } from "../test-util.build";
-import { join, normalize } from "path";
+import { join, normalize, dirname } from "path";
 
 // disable tests on windows
 const testWin =
@@ -101,6 +101,20 @@ describe("tact foo.tact", () => {
         expect(result).toMatchObject({ kind: "exited", code: 0 });
     });
 
+    testWin(
+        "Check single-contract compilation with custom output directory",
+        async () => {
+            const path = await codegen.contract(`single-output`, goodContract);
+            const customOutput = "custom-output";
+            const result = await tact(`${path} --output ${customOutput}`);
+
+            expect(result).toMatchObject({ kind: "exited", code: 0 });
+
+            const statPromise = stat(join(dirname(path), customOutput));
+            await expect(statPromise).resolves.not.toThrow();
+        },
+    );
+
     testWin("Check single-contract compilation with --check", async () => {
         const path = await codegen.contract(`single-check`, goodContract);
         const result = await tact(`--check ${path}`);