From 2a163083544a19e242e7680eff18f0ad08201e6d Mon Sep 17 00:00:00 2001 From: verytactical <186486509+verytactical@users.noreply.github.com> Date: Tue, 14 Jan 2025 17:15:07 +0400 Subject: [PATCH] refactor: move contexts out of root (#1320) - compiler context - logger --- scripts/prepare.ts | 2 +- src/abi/AbiFunction.ts | 2 +- src/abi/map.ts | 2 +- src/browser.ts | 2 +- src/config/features.ts | 2 +- src/{ => context}/context.ts | 0 src/{ => context}/logger.ts | 0 src/func/funcCompile.spec.ts | 2 +- src/func/funcCompile.ts | 2 +- src/generator/Writer.ts | 2 +- src/generator/createABI.ts | 2 +- src/generator/writeProgram.ts | 2 +- src/generator/writeReport.ts | 2 +- src/generator/writers/resolveFuncType.spec.ts | 2 +- src/generator/writers/writeExpression.spec.ts | 2 +- src/generator/writers/writeSerialization.spec.ts | 2 +- src/grammar/store.ts | 2 +- src/main.ts | 2 +- src/node.ts | 2 +- src/optimizer/constEval.ts | 2 +- src/optimizer/interpreter.ts | 2 +- src/optimizer/test/partial-eval.spec.ts | 2 +- src/pipeline/build.ts | 4 ++-- src/pipeline/compile.ts | 2 +- src/pipeline/precompile.ts | 2 +- src/storage/resolveAllocation.spec.ts | 2 +- src/storage/resolveAllocation.ts | 2 +- src/types/getSupportedInterfaces.ts | 2 +- src/types/resolveABITypeRef.ts | 2 +- src/types/resolveDescriptors.spec.ts | 2 +- src/types/resolveDescriptors.ts | 2 +- src/types/resolveErrors.ts | 2 +- src/types/resolveExpression.ts | 2 +- src/types/resolveSignatures.ts | 2 +- src/types/resolveStatements.spec.ts | 2 +- src/types/resolveStatements.ts | 2 +- src/verify.ts | 2 +- 37 files changed, 36 insertions(+), 36 deletions(-) rename src/{ => context}/context.ts (100%) rename src/{ => context}/logger.ts (100%) diff --git a/scripts/prepare.ts b/scripts/prepare.ts index f9009db52..e351d8845 100644 --- a/scripts/prepare.ts +++ b/scripts/prepare.ts @@ -5,7 +5,7 @@ import { FuncCompilationResult, funcCompile } from "../src/func/funcCompile"; import path from "path"; import { glob } from "glob"; import { verify } from "../src/verify"; -import { Logger } from "../src/logger"; +import { Logger } from "../src/context/logger"; import { __DANGER__disableVersionNumber } from "../src/pipeline/version"; // Read cases diff --git a/src/abi/AbiFunction.ts b/src/abi/AbiFunction.ts index 00faa5f73..cedb81ae7 100644 --- a/src/abi/AbiFunction.ts +++ b/src/abi/AbiFunction.ts @@ -1,5 +1,5 @@ import { AstExpression } from "../grammar/ast"; -import { CompilerContext } from "../context"; +import { CompilerContext } from "../context/context"; import { WriterContext } from "../generator/Writer"; import { TypeRef } from "../types/types"; import { SrcInfo } from "../grammar"; diff --git a/src/abi/map.ts b/src/abi/map.ts index f17d5cb90..b952c6ea1 100644 --- a/src/abi/map.ts +++ b/src/abi/map.ts @@ -1,4 +1,4 @@ -import { CompilerContext } from "../context"; +import { CompilerContext } from "../context/context"; import { SrcInfo } from "../grammar"; import { TypeRef } from "../types/types"; import { WriterContext } from "../generator/Writer"; diff --git a/src/browser.ts b/src/browser.ts index 84cd88e10..bd5d45fcc 100644 --- a/src/browser.ts +++ b/src/browser.ts @@ -1,5 +1,5 @@ import { Config, verifyConfig } from "./config/parseConfig"; -import { ILogger } from "./logger"; +import { ILogger } from "./context/logger"; import { build } from "./pipeline/build"; import { createVirtualFileSystem } from "./vfs/createVirtualFileSystem"; diff --git a/src/config/features.ts b/src/config/features.ts index 1b9cc5a14..4119e3804 100644 --- a/src/config/features.ts +++ b/src/config/features.ts @@ -1,4 +1,4 @@ -import { CompilerContext, createContextStore } from "../context"; +import { CompilerContext, createContextStore } from "../context/context"; const featureStore = createContextStore(); diff --git a/src/context.ts b/src/context/context.ts similarity index 100% rename from src/context.ts rename to src/context/context.ts diff --git a/src/logger.ts b/src/context/logger.ts similarity index 100% rename from src/logger.ts rename to src/context/logger.ts diff --git a/src/func/funcCompile.spec.ts b/src/func/funcCompile.spec.ts index 60e937b10..9ed451e8c 100644 --- a/src/func/funcCompile.spec.ts +++ b/src/func/funcCompile.spec.ts @@ -1,6 +1,6 @@ import fs from "fs"; import path from "path"; -import { Logger } from "../logger"; +import { Logger } from "../context/logger"; import { funcCompile } from "./funcCompile"; import files from "../imports/stdlib"; diff --git a/src/func/funcCompile.ts b/src/func/funcCompile.ts index d6fb400db..0cf37f274 100644 --- a/src/func/funcCompile.ts +++ b/src/func/funcCompile.ts @@ -1,4 +1,4 @@ -import { ILogger } from "../logger"; +import { ILogger } from "../context/logger"; // Wasm Imports // eslint-disable-next-line @typescript-eslint/no-var-requires diff --git a/src/generator/Writer.ts b/src/generator/Writer.ts index 7c13eca6d..701d6ee62 100644 --- a/src/generator/Writer.ts +++ b/src/generator/Writer.ts @@ -1,4 +1,4 @@ -import { CompilerContext } from "../context"; +import { CompilerContext } from "../context/context"; import { escapeUnicodeControlCodes, trimIndent } from "../utils/text"; import { topologicalSort } from "../utils/utils"; import { Writer } from "../utils/Writer"; diff --git a/src/generator/createABI.ts b/src/generator/createABI.ts index 4aa7b4ff8..5bb5f7974 100644 --- a/src/generator/createABI.ts +++ b/src/generator/createABI.ts @@ -1,6 +1,6 @@ import { ABIGetter, ABIReceiver, ABIType, ContractABI } from "@ton/core"; import { contractErrors } from "../abi/errors"; -import { CompilerContext } from "../context"; +import { CompilerContext } from "../context/context"; import { idText } from "../grammar/ast"; import { getSupportedInterfaces } from "../types/getSupportedInterfaces"; import { createABITypeRefFromTypeRef } from "../types/resolveABITypeRef"; diff --git a/src/generator/writeProgram.ts b/src/generator/writeProgram.ts index 7523c8385..e15a0f822 100644 --- a/src/generator/writeProgram.ts +++ b/src/generator/writeProgram.ts @@ -1,4 +1,4 @@ -import { CompilerContext } from "../context"; +import { CompilerContext } from "../context/context"; import { getAllocation, getSortedTypes } from "../storage/resolveAllocation"; import { getAllStaticFunctions, diff --git a/src/generator/writeReport.ts b/src/generator/writeReport.ts index 62250f53d..c3bde1b03 100644 --- a/src/generator/writeReport.ts +++ b/src/generator/writeReport.ts @@ -1,5 +1,5 @@ import { ContractABI } from "@ton/core"; -import { CompilerContext } from "../context"; +import { CompilerContext } from "../context/context"; import { PackageFileFormat } from "../packaging/fileFormat"; import { getType } from "../types/resolveDescriptors"; import { Writer } from "../utils/Writer"; diff --git a/src/generator/writers/resolveFuncType.spec.ts b/src/generator/writers/resolveFuncType.spec.ts index d41fca3c6..534155355 100644 --- a/src/generator/writers/resolveFuncType.spec.ts +++ b/src/generator/writers/resolveFuncType.spec.ts @@ -3,7 +3,7 @@ import { resolveDescriptors } from "../../types/resolveDescriptors"; import { WriterContext } from "../Writer"; import { resolveFuncType } from "./resolveFuncType"; import { openContext } from "../../grammar/store"; -import { CompilerContext } from "../../context"; +import { CompilerContext } from "../../context/context"; import { getParser } from "../../grammar"; import { defaultParser } from "../../grammar/grammar"; diff --git a/src/generator/writers/writeExpression.spec.ts b/src/generator/writers/writeExpression.spec.ts index b7b2c0caa..045244e6b 100644 --- a/src/generator/writers/writeExpression.spec.ts +++ b/src/generator/writers/writeExpression.spec.ts @@ -6,7 +6,7 @@ import { WriterContext } from "../Writer"; import { writeExpression } from "./writeExpression"; import { openContext } from "../../grammar/store"; import { resolveStatements } from "../../types/resolveStatements"; -import { CompilerContext } from "../../context"; +import { CompilerContext } from "../../context/context"; import { getParser } from "../../grammar"; import { getAstFactory } from "../../grammar/ast"; import { defaultParser } from "../../grammar/grammar"; diff --git a/src/generator/writers/writeSerialization.spec.ts b/src/generator/writers/writeSerialization.spec.ts index 11279ee7d..41d2d4efe 100644 --- a/src/generator/writers/writeSerialization.spec.ts +++ b/src/generator/writers/writeSerialization.spec.ts @@ -1,4 +1,4 @@ -import { CompilerContext } from "../../context"; +import { CompilerContext } from "../../context/context"; import { getAllocation, resolveAllocations, diff --git a/src/grammar/store.ts b/src/grammar/store.ts index 21092e297..d0c1b3a70 100644 --- a/src/grammar/store.ts +++ b/src/grammar/store.ts @@ -7,7 +7,7 @@ import { AstAsmFunctionDef, } from "./ast"; import { throwInternalCompilerError } from "../error/errors"; -import { CompilerContext, createContextStore } from "../context"; +import { CompilerContext, createContextStore } from "../context/context"; import { ItemOrigin } from "./src-info"; import { Parser } from "./grammar"; diff --git a/src/main.ts b/src/main.ts index abfb5a5af..fc936c948 100644 --- a/src/main.ts +++ b/src/main.ts @@ -15,5 +15,5 @@ export { createVirtualFileSystem } from "./vfs/createVirtualFileSystem"; export * from "./browser"; export * from "./verify"; -export * from "./logger"; +export * from "./context/logger"; export * from "./error/errors"; diff --git a/src/node.ts b/src/node.ts index 68850d62c..3c6df434e 100644 --- a/src/node.ts +++ b/src/node.ts @@ -3,7 +3,7 @@ import fs from "fs"; import { ConfigProject, Config, parseConfig } from "./config/parseConfig"; import { createNodeFileSystem } from "./vfs/createNodeFileSystem"; import { build } from "./pipeline/build"; -import { LogLevel, Logger } from "./logger"; +import { LogLevel, Logger } from "./context/logger"; import { TactErrorCollection } from "./error/errors"; type AdditionalCliOptions = { diff --git a/src/optimizer/constEval.ts b/src/optimizer/constEval.ts index 3c305b42d..ab4bf6092 100644 --- a/src/optimizer/constEval.ts +++ b/src/optimizer/constEval.ts @@ -1,4 +1,4 @@ -import { CompilerContext } from "../context"; +import { CompilerContext } from "../context/context"; import { AstBinaryOperation, AstExpression, diff --git a/src/optimizer/interpreter.ts b/src/optimizer/interpreter.ts index 88b57981b..b316750d4 100644 --- a/src/optimizer/interpreter.ts +++ b/src/optimizer/interpreter.ts @@ -2,7 +2,7 @@ import { Address, beginCell, BitString, Cell, toNano } from "@ton/core"; import { paddedBufferToBits } from "@ton/core/dist/boc/utils/paddedBits"; import * as crc32 from "crc-32"; import { evalConstantExpression } from "./constEval"; -import { CompilerContext } from "../context"; +import { CompilerContext } from "../context/context"; import { TactCompilationError, TactConstEvalError, diff --git a/src/optimizer/test/partial-eval.spec.ts b/src/optimizer/test/partial-eval.spec.ts index c888e508a..0529b9794 100644 --- a/src/optimizer/test/partial-eval.spec.ts +++ b/src/optimizer/test/partial-eval.spec.ts @@ -7,7 +7,7 @@ import { } from "../../grammar/ast"; import { AstUtil, getAstUtil } from "../util"; import { getOptimizer } from "../constEval"; -import { CompilerContext } from "../../context"; +import { CompilerContext } from "../../context/context"; import { ExpressionTransformer, Rule } from "../types"; import { AssociativeRule3 } from "../associative"; import { evalBinaryOp, evalUnaryOp } from "../interpreter"; diff --git a/src/pipeline/build.ts b/src/pipeline/build.ts index ea5b70a78..b39eec009 100644 --- a/src/pipeline/build.ts +++ b/src/pipeline/build.ts @@ -3,12 +3,12 @@ import { decompileAll } from "@tact-lang/opcode"; import { writeTypescript } from "../bindings/writeTypescript"; import { featureEnable } from "../config/features"; import { ConfigProject } from "../config/parseConfig"; -import { CompilerContext } from "../context"; +import { CompilerContext } from "../context/context"; import { funcCompile } from "../func/funcCompile"; import { writeReport } from "../generator/writeReport"; import { getRawAST } from "../grammar/store"; import files from "../imports/stdlib"; -import { ILogger, Logger } from "../logger"; +import { ILogger, Logger } from "../context/logger"; import { PackageFileFormat } from "../packaging/fileFormat"; import { packageCode } from "../packaging/packageCode"; import { createABITypeRefFromTypeRef } from "../types/resolveABITypeRef"; diff --git a/src/pipeline/compile.ts b/src/pipeline/compile.ts index 84fde8302..0f42e3e16 100644 --- a/src/pipeline/compile.ts +++ b/src/pipeline/compile.ts @@ -1,4 +1,4 @@ -import { CompilerContext } from "../context"; +import { CompilerContext } from "../context/context"; import { createABI } from "../generator/createABI"; import { writeProgram } from "../generator/writeProgram"; diff --git a/src/pipeline/precompile.ts b/src/pipeline/precompile.ts index 7c233f9c6..49af55122 100644 --- a/src/pipeline/precompile.ts +++ b/src/pipeline/precompile.ts @@ -1,4 +1,4 @@ -import { CompilerContext } from "../context"; +import { CompilerContext } from "../context/context"; import { resolveDescriptors } from "../types/resolveDescriptors"; import { resolveAllocations } from "../storage/resolveAllocation"; import { openContext } from "../grammar/store"; diff --git a/src/storage/resolveAllocation.spec.ts b/src/storage/resolveAllocation.spec.ts index 1f01614e6..6be6a8ce6 100644 --- a/src/storage/resolveAllocation.spec.ts +++ b/src/storage/resolveAllocation.spec.ts @@ -3,7 +3,7 @@ import { resolveDescriptors } from "../types/resolveDescriptors"; import { getAllocations, resolveAllocations } from "./resolveAllocation"; import { openContext } from "../grammar/store"; import { resolveStatements } from "../types/resolveStatements"; -import { CompilerContext } from "../context"; +import { CompilerContext } from "../context/context"; import { resolveSignatures } from "../types/resolveSignatures"; import path from "path"; import { getParser } from "../grammar"; diff --git a/src/storage/resolveAllocation.ts b/src/storage/resolveAllocation.ts index cacea64d9..20dc8e360 100644 --- a/src/storage/resolveAllocation.ts +++ b/src/storage/resolveAllocation.ts @@ -1,4 +1,4 @@ -import { CompilerContext, createContextStore } from "../context"; +import { CompilerContext, createContextStore } from "../context/context"; import { getType, toBounced, getAllTypes } from "../types/resolveDescriptors"; import { TypeDescription } from "../types/types"; import { topologicalSort } from "../utils/utils"; diff --git a/src/types/getSupportedInterfaces.ts b/src/types/getSupportedInterfaces.ts index 2ac15702f..28a3265e5 100644 --- a/src/types/getSupportedInterfaces.ts +++ b/src/types/getSupportedInterfaces.ts @@ -1,5 +1,5 @@ import { enabledDebug } from "../config/features"; -import { CompilerContext } from "../context"; +import { CompilerContext } from "../context/context"; import { TypeDescription } from "./types"; export function getSupportedInterfaces( diff --git a/src/types/resolveABITypeRef.ts b/src/types/resolveABITypeRef.ts index 3f5390a3b..b9ec9975c 100644 --- a/src/types/resolveABITypeRef.ts +++ b/src/types/resolveABITypeRef.ts @@ -19,7 +19,7 @@ import { throwInternalCompilerError, } from "../error/errors"; import { TypeRef } from "./types"; -import { CompilerContext } from "../context"; +import { CompilerContext } from "../context/context"; import { getType } from "./resolveDescriptors"; import { SrcInfo } from "../grammar"; diff --git a/src/types/resolveDescriptors.spec.ts b/src/types/resolveDescriptors.spec.ts index 2c5dc177e..f7df468db 100644 --- a/src/types/resolveDescriptors.spec.ts +++ b/src/types/resolveDescriptors.spec.ts @@ -1,4 +1,4 @@ -import { CompilerContext } from "../context"; +import { CompilerContext } from "../context/context"; import { getAllStaticFunctions, getAllTypes, diff --git a/src/types/resolveDescriptors.ts b/src/types/resolveDescriptors.ts index 54fc1ff5d..37cd75c5f 100644 --- a/src/types/resolveDescriptors.ts +++ b/src/types/resolveDescriptors.ts @@ -25,7 +25,7 @@ import { throwCompilationError, throwInternalCompilerError, } from "../error/errors"; -import { CompilerContext, createContextStore, Store } from "../context"; +import { CompilerContext, createContextStore, Store } from "../context/context"; import { ConstantDescription, FieldDescription, diff --git a/src/types/resolveErrors.ts b/src/types/resolveErrors.ts index b7621141c..02f6394b9 100644 --- a/src/types/resolveErrors.ts +++ b/src/types/resolveErrors.ts @@ -1,5 +1,5 @@ import { sha256_sync } from "@ton/crypto"; -import { CompilerContext, createContextStore } from "../context"; +import { CompilerContext, createContextStore } from "../context/context"; import { AstNode, FactoryAst, isRequire } from "../grammar/ast"; import { traverse } from "../grammar/iterators"; import { evalConstantExpression } from "../optimizer/constEval"; diff --git a/src/types/resolveExpression.ts b/src/types/resolveExpression.ts index 197fb7d38..cb0046b19 100644 --- a/src/types/resolveExpression.ts +++ b/src/types/resolveExpression.ts @@ -23,7 +23,7 @@ import { AstStructValue, } from "../grammar/ast"; import { idTextErr, throwCompilationError } from "../error/errors"; -import { CompilerContext, createContextStore } from "../context"; +import { CompilerContext, createContextStore } from "../context/context"; import { getAllTypes, getStaticConstant, diff --git a/src/types/resolveSignatures.ts b/src/types/resolveSignatures.ts index f02a134b4..a36b2d01e 100644 --- a/src/types/resolveSignatures.ts +++ b/src/types/resolveSignatures.ts @@ -1,6 +1,6 @@ import * as changeCase from "change-case"; import { ABIField, beginCell } from "@ton/core"; -import { CompilerContext } from "../context"; +import { CompilerContext } from "../context/context"; import { idToHex } from "../utils/idToHex"; import { idTextErr, diff --git a/src/types/resolveStatements.spec.ts b/src/types/resolveStatements.spec.ts index 1cb1e39a8..8213f9335 100644 --- a/src/types/resolveStatements.spec.ts +++ b/src/types/resolveStatements.spec.ts @@ -3,7 +3,7 @@ import { resolveDescriptors } from "./resolveDescriptors"; import { loadCases } from "../utils/loadCases"; import { openContext } from "../grammar/store"; import { resolveStatements } from "./resolveStatements"; -import { CompilerContext } from "../context"; +import { CompilerContext } from "../context/context"; import { featureEnable } from "../config/features"; import { getParser } from "../grammar"; import { getAstFactory } from "../grammar/ast"; diff --git a/src/types/resolveStatements.ts b/src/types/resolveStatements.ts index a23e5db8d..daaf44c53 100644 --- a/src/types/resolveStatements.ts +++ b/src/types/resolveStatements.ts @@ -1,4 +1,4 @@ -import { CompilerContext } from "../context"; +import { CompilerContext } from "../context/context"; import { AstCondition, AstStatement, diff --git a/src/verify.ts b/src/verify.ts index 7ea3d8054..61bd86e6c 100644 --- a/src/verify.ts +++ b/src/verify.ts @@ -1,7 +1,7 @@ import normalize from "path-normalize"; import { Cell } from "@ton/core"; import { Config, Options } from "./config/parseConfig"; -import { ILogger, Logger } from "./logger"; +import { ILogger, Logger } from "./context/logger"; import { PackageFileFormat, run } from "./main"; import { fileFormat } from "./packaging/fileFormat"; import { getCompilerVersion } from "./pipeline/version";