@kontur.candy/tools 2.254.0 → 2.255.0

package/distr/Tools/src/BuildTasks/Generator/GeneratorWorker/GeneratorPool.js

@@ -0,0 +1,62 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.GeneratorPool = void 0;
+var _nodePath = _interopRequireDefault(require("node:path"));
+var _ThreadPool = require("../../../../../Common/multithread/ThreadPool");
+var _IterableUtils = require("../../../../../Common/IterableUtils");
+const WORKER_MAX_OLD_GENERATION_MB = 512;
+
+// Candy always runs from compiled `distr/` where `.js` file exists.
+const WORKER_JS_FILENAME = "ReadSourcesAndProcessSugarWorker.js";
+const defaultWorkerScriptPath = _nodePath.default.join(__dirname, WORKER_JS_FILENAME);
+class GeneratorPool {
+  constructor(generatorPath, options = {}) {
+    this.pool = void 0;
+    const {
+      maxWorkers = 1,
+      workerPath = defaultWorkerScriptPath
+    } = options;
+    this.pool = new _ThreadPool.ThreadPool({
+      workerPath: workerPath,
+      size: Math.max(1, maxWorkers),
+      workerOptions: {
+        workerData: {
+          generatorPath: generatorPath
+        },
+        resourceLimits: {
+          maxOldGenerationSizeMb: WORKER_MAX_OLD_GENERATION_MB
+        }
+      }
+    });
+  }
+  async generate(message) {
+    if (!this.pool) {
+      throw new Error("GeneratorPool: exec on disposed pool");
+    }
+    const response = await this.pool.exec(message);
+    if (response.type === "Error") {
+      throw new Error(response.errorText);
+    }
+    return this.reconstructForm(response.generatedForm);
+  }
+  async dispose() {
+    var _this$pool;
+    await ((_this$pool = this.pool) === null || _this$pool === void 0 ? void 0 : _this$pool.dispose());
+    this.pool = undefined;
+  }
+  reconstructForm(formContent) {
+    const result = {};
+    for (const [key, item] of (0, _IterableUtils.iterateEntries)(formContent)) {
+      // Transferred ArrayBuffer -> reconstruct a Buffer (zero-copy view).
+      // String values pass through as-is.
+      result[key] = item instanceof ArrayBuffer ? Buffer.from(item) : item;
+    }
+    return result;
+  }
+}
+exports.GeneratorPool = GeneratorPool;
+//# sourceMappingURL=GeneratorPool.js.map

package/distr/Tools/src/BuildTasks/Generator/GeneratorWorker/GeneratorPool.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"GeneratorPool.js","names":["_nodePath","_interopRequireDefault","require","_ThreadPool","_IterableUtils","WORKER_MAX_OLD_GENERATION_MB","WORKER_JS_FILENAME","defaultWorkerScriptPath","path","join","__dirname","GeneratorPool","constructor","generatorPath","options","pool","maxWorkers","workerPath","ThreadPool","size","Math","max","workerOptions","workerData","resourceLimits","maxOldGenerationSizeMb","generate","message","Error","response","exec","type","errorText","reconstructForm","generatedForm","dispose","_this$pool","undefined","formContent","result","key","item","iterateEntries","ArrayBuffer","Buffer","from","exports"],"sources":["../../../../../../src/BuildTasks/Generator/GeneratorWorker/GeneratorPool.ts"],"sourcesContent":["import path from \"node:path\";\n\nimport { ThreadPool } from \"../../../../../Common/multithread/ThreadPool\";\nimport { GeneratedForm } from \"../../Form/GenerateForm\";\nimport { iterateEntries } from \"../../../../../Common/IterableUtils\";\n\nimport type { CallMessage, CallResponse, GeneratedFormWorkerMessage } from \"./ReadSourcesAndProcessSugarWorker\";\n\nconst WORKER_MAX_OLD_GENERATION_MB = 512;\n\n// Candy always runs from compiled `distr/` where `.js` file exists.\nconst WORKER_JS_FILENAME = \"ReadSourcesAndProcessSugarWorker.js\";\nconst defaultWorkerScriptPath = path.join(__dirname, WORKER_JS_FILENAME);\n\ninterface Options {\n    workerPath?: string;\n    maxWorkers?: number;\n}\n\nexport class GeneratorPool {\n    private pool?: ThreadPool;\n\n    public constructor(generatorPath: string, options: Options = {}) {\n        const { maxWorkers = 1, workerPath = defaultWorkerScriptPath } = options;\n        this.pool = new ThreadPool({\n            workerPath: workerPath,\n            size: Math.max(1, maxWorkers),\n            workerOptions: {\n                workerData: { generatorPath: generatorPath },\n                resourceLimits: { maxOldGenerationSizeMb: WORKER_MAX_OLD_GENERATION_MB },\n            },\n        });\n    }\n\n    public async generate(message: CallMessage): Promise<GeneratedForm> {\n        if (!this.pool) {\n            throw new Error(\"GeneratorPool: exec on disposed pool\");\n        }\n        const response = await this.pool.exec<CallMessage, CallResponse>(message);\n        if (response.type === \"Error\") {\n            throw new Error(response.errorText);\n        }\n        return this.reconstructForm(response.generatedForm);\n    }\n\n    public async dispose(): Promise<void> {\n        await this.pool?.dispose();\n        this.pool = undefined;\n    }\n\n    private reconstructForm(formContent: GeneratedFormWorkerMessage): GeneratedForm {\n        const result: GeneratedForm = {};\n        for (const [key, item] of iterateEntries(formContent)) {\n            // Transferred ArrayBuffer -> reconstruct a Buffer (zero-copy view).\n            // String values pass through as-is.\n            result[key] = item instanceof ArrayBuffer ? Buffer.from(item) : item;\n        }\n        return result;\n    }\n}\n"],"mappings":";;;;;;;AAAA,IAAAA,SAAA,GAAAC,sBAAA,CAAAC,OAAA;AAEA,IAAAC,WAAA,GAAAD,OAAA;AAEA,IAAAE,cAAA,GAAAF,OAAA;AAIA,MAAMG,4BAA4B,GAAG,GAAG;;AAExC;AACA,MAAMC,kBAAkB,GAAG,qCAAqC;AAChE,MAAMC,uBAAuB,GAAGC,iBAAI,CAACC,IAAI,CAACC,SAAS,EAAEJ,kBAAkB,CAAC;AAOjE,MAAMK,aAAa,CAAC;EAGhBC,WAAWA,CAACC,aAAqB,EAAEC,OAAgB,GAAG,CAAC,CAAC,EAAE;IAAA,KAFzDC,IAAI;IAGR,MAAM;MAAEC,UAAU,GAAG,CAAC;MAAEC,UAAU,GAAGV;IAAwB,CAAC,GAAGO,OAAO;IACxE,IAAI,CAACC,IAAI,GAAG,IAAIG,sBAAU,CAAC;MACvBD,UAAU,EAAEA,UAAU;MACtBE,IAAI,EAAEC,IAAI,CAACC,GAAG,CAAC,CAAC,EAAEL,UAAU,CAAC;MAC7BM,aAAa,EAAE;QACXC,UAAU,EAAE;UAAEV,aAAa,EAAEA;QAAc,CAAC;QAC5CW,cAAc,EAAE;UAAEC,sBAAsB,EAAEpB;QAA6B;MAC3E;IACJ,CAAC,CAAC;EACN;EAEA,MAAaqB,QAAQA,CAACC,OAAoB,EAA0B;IAChE,IAAI,CAAC,IAAI,CAACZ,IAAI,EAAE;MACZ,MAAM,IAAIa,KAAK,CAAC,sCAAsC,CAAC;IAC3D;IACA,MAAMC,QAAQ,GAAG,MAAM,IAAI,CAACd,IAAI,CAACe,IAAI,CAA4BH,OAAO,CAAC;IACzE,IAAIE,QAAQ,CAACE,IAAI,KAAK,OAAO,EAAE;MAC3B,MAAM,IAAIH,KAAK,CAACC,QAAQ,CAACG,SAAS,CAAC;IACvC;IACA,OAAO,IAAI,CAACC,eAAe,CAACJ,QAAQ,CAACK,aAAa,CAAC;EACvD;EAEA,MAAaC,OAAOA,CAAA,EAAkB;IAAA,IAAAC,UAAA;IAClC,QAAAA,UAAA,GAAM,IAAI,CAACrB,IAAI,cAAAqB,UAAA,uBAATA,UAAA,CAAWD,OAAO,CAAC,CAAC;IAC1B,IAAI,CAACpB,IAAI,GAAGsB,SAAS;EACzB;EAEQJ,eAAeA,CAACK,WAAuC,EAAiB;IAC5E,MAAMC,MAAqB,GAAG,CAAC,CAAC;IAChC,KAAK,MAAM,CAACC,GAAG,EAAEC,IAAI,CAAC,IAAI,IAAAC,6BAAc,EAACJ,WAAW,CAAC,EAAE;MACnD;MACA;MACAC,MAAM,CAACC,GAAG,CAAC,GAAGC,IAAI,YAAYE,WAAW,GAAGC,MAAM,CAACC,IAAI,CAACJ,IAAI,CAAC,GAAGA,IAAI;IACxE;IACA,OAAOF,MAAM;EACjB;AACJ;AAACO,OAAA,CAAAnC,aAAA,GAAAA,aAAA","ignoreList":[]}

package/distr/Tools/src/BuildTasks/Generator/GeneratorWorker/GeneratorRequireUtils.js

@@ -3,44 +3,37 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.GeneratorSourcesValidator = exports.GeneratorSourcesImporter = void 0;
+exports.importGenerator = exports.GeneratorSourcesValidator = void 0;
 var _ToolsApiClient = require("../../../Commons/ApiClient/ToolsApiClient");
-var _RequireUncached = require("./RequireUncached");
-/* eslint-disable @typescript-eslint/no-unsafe-return */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 
-class GeneratorSourcesImporter {
-  constructor(generatorPath, purgeCache) {
-    this.generatorPath = void 0;
-    this.purgeCache = void 0;
-    this.generatorPath = generatorPath;
-    this.purgeCache = purgeCache;
-  }
-  async importReadSources() {
-    return this.require("readSources");
-  }
-  async importGetSugarTexts() {
-    return this.require("getSugarTexts");
-  }
-  async importGetAllDependencies() {
-    return this.require("getAllDependencies");
-  }
-  async importGetAllDependenciesHash() {
-    return this.require("getAllDependenciesHash");
-  }
-  async importProcessSugar() {
-    return this.require("processSugar");
-  }
-  async importLocalization() {
-    return this.require("localization");
-  }
-  async require(name) {
-    return this.requireUncachedAllNamed(this.generatorPath)[name];
-  }
-  requireUncachedAllNamed(module) {
-    return (0, _RequireUncached.requireUncachedAllNamed)(module, this.purgeCache);
-  }
-}
-exports.GeneratorSourcesImporter = GeneratorSourcesImporter;
+const isEsModule = obj => Boolean(obj && obj.__esModule);
+const interopRequireDefault = obj => isEsModule(obj) ? obj : {
+  default: obj
+};
+// eslint-disable-next-line no-warning-comments
+// TODO(04-06-2027) -- избавиться от этой обертки, импортировать движок напрямую
+/**
+ * Эта обертка существует для сохранения обратной совместимости
+ * между Tools и движками, экспортирующими `getDictionary` и `getLocalizedSugar`
+ * единым объектом `localization`
+ */
+const importGenerator = path => {
+  var _generator$getDiction, _generator$getLocaliz;
+  // eslint-disable-next-line @typescript-eslint/no-require-imports
+  const generator = interopRequireDefault(require(path));
+  const legacyLocalization = generator.localization;
+  return {
+    processSugar: generator.processSugar,
+    readSources: generator.readSources,
+    getSugarTexts: generator.getSugarTexts,
+    getAllDependencies: generator.getAllDependencies,
+    getAllDependenciesHash: generator.getAllDependenciesHash,
+    getDictionary: (_generator$getDiction = generator.getDictionary) !== null && _generator$getDiction !== void 0 ? _generator$getDiction : legacyLocalization.getDictionary,
+    getLocalizedSugar: (_generator$getLocaliz = generator.getLocalizedSugar) !== null && _generator$getLocaliz !== void 0 ? _generator$getLocaliz : legacyLocalization.getLocalizedSugar
+  };
+};
+exports.importGenerator = importGenerator;
 class GeneratorSourcesValidator {
   constructor(generationOptions) {
     this.isLocalDebug = void 0;

package/distr/Tools/src/BuildTasks/Generator/GeneratorWorker/GeneratorRequireUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"GeneratorRequireUtils.js","names":["_ToolsApiClient","require","_RequireUncached","GeneratorSourcesImporter","constructor","generatorPath","purgeCache","importReadSources","importGetSugarTexts","importGetAllDependencies","importGetAllDependenciesHash","importProcessSugar","importLocalization","name","requireUncachedAllNamed","module","exports","GeneratorSourcesValidator","generationOptions","isLocalDebug","apiClient","validate","formContent","compileNormalizationRulesOrDie","_compileResult$diagno","_compileResult$diagno2","normalizationRules","compileResult","compileNormalizationRules","diagnosticMessages","length","Error","JSON","stringify","sourceText","resourcesHash","ToolsApiClient"],"sources":["../../../../../../src/BuildTasks/Generator/GeneratorWorker/GeneratorRequireUtils.ts"],"sourcesContent":["/* eslint-disable @typescript-eslint/no-unsafe-return */\nimport { FormGenerator, GeneratedForm, GenerationOptions, LocalizationEntryPoint } from \"../../Form/GenerateForm\";\nimport { FormResources, SugarContent } from \"../../FormSource\";\nimport { ToolsApiClient } from \"../../../Commons/ApiClient/ToolsApiClient\";\n\nimport { RequireDefaultResult, requireUncachedAllNamed } from \"./RequireUncached\";\n\ntype ProcessSugarFunc = (\n    sugarFiles: SugarContent,\n    resources: FormResources,\n    generationOptions?: GenerationOptions\n) => GeneratedForm | Promise<GeneratedForm>;\n\nexport class GeneratorSourcesImporter {\n    private readonly generatorPath: string;\n    private readonly purgeCache: boolean;\n\n    public constructor(generatorPath: string, purgeCache: boolean) {\n        this.generatorPath = generatorPath;\n        this.purgeCache = purgeCache;\n    }\n\n    public async importReadSources(): Promise<FormGenerator[\"readSources\"]> {\n        return this.require(\"readSources\");\n    }\n\n    public async importGetSugarTexts(): Promise<FormGenerator[\"getSugarTexts\"]> {\n        return this.require(\"getSugarTexts\");\n    }\n\n    public async importGetAllDependencies(): Promise<FormGenerator[\"getAllDependencies\"]> {\n        return this.require(\"getAllDependencies\");\n    }\n\n    public async importGetAllDependenciesHash(): Promise<FormGenerator[\"getAllDependenciesHash\"]> {\n        return this.require(\"getAllDependenciesHash\");\n    }\n\n    public async importProcessSugar(): Promise<ProcessSugarFunc> {\n        return this.require(\"processSugar\");\n    }\n\n    public async importLocalization(): Promise<LocalizationEntryPoint> {\n        return this.require(\"localization\");\n    }\n\n    private async require(name: string) {\n        return this.requireUncachedAllNamed(this.generatorPath)[name];\n    }\n\n    private requireUncachedAllNamed(module: string): RequireDefaultResult {\n        return requireUncachedAllNamed(module, this.purgeCache);\n    }\n}\n\nexport class GeneratorSourcesValidator {\n    private readonly isLocalDebug: boolean;\n    private readonly apiClient: ToolsApiClient;\n\n    public constructor(generationOptions: GenerationOptions | undefined) {\n        this.isLocalDebug = generationOptions?.resourcesHash == \"local-hash\";\n        this.apiClient = new ToolsApiClient();\n    }\n\n    public validate = async (formContent: GeneratedForm): Promise<void> => {\n        if (!this.isLocalDebug) {\n            return;\n        }\n        await this.compileNormalizationRulesOrDie(formContent);\n    };\n\n    private readonly compileNormalizationRulesOrDie = async (formContent: GeneratedForm): Promise<void> => {\n        const normalizationRules = formContent[\"ServerSide.normalize\"];\n        if (!normalizationRules || typeof normalizationRules !== \"string\") {\n            return;\n        }\n        const compileResult = await this.apiClient.compileNormalizationRules(normalizationRules, \"formulas\");\n        if (!compileResult || (compileResult?.diagnosticMessages?.length ?? 0) == 0) {\n            return;\n        }\n\n        throw Error(\n            `Invalid ServerSide.normalize:\\r\\n\n             ${JSON.stringify(compileResult.diagnosticMessages)}\\r\\n\n             ${compileResult.sourceText}`\n        );\n    };\n}\n"],"mappings":";;;;;;AAGA,IAAAA,eAAA,GAAAC,OAAA;AAEA,IAAAC,gBAAA,GAAAD,OAAA;AALA;;AAaO,MAAME,wBAAwB,CAAC;EAI3BC,WAAWA,CAACC,aAAqB,EAAEC,UAAmB,EAAE;IAAA,KAH9CD,aAAa;IAAA,KACbC,UAAU;IAGvB,IAAI,CAACD,aAAa,GAAGA,aAAa;IAClC,IAAI,CAACC,UAAU,GAAGA,UAAU;EAChC;EAEA,MAAaC,iBAAiBA,CAAA,EAA0C;IACpE,OAAO,IAAI,CAACN,OAAO,CAAC,aAAa,CAAC;EACtC;EAEA,MAAaO,mBAAmBA,CAAA,EAA4C;IACxE,OAAO,IAAI,CAACP,OAAO,CAAC,eAAe,CAAC;EACxC;EAEA,MAAaQ,wBAAwBA,CAAA,EAAiD;IAClF,OAAO,IAAI,CAACR,OAAO,CAAC,oBAAoB,CAAC;EAC7C;EAEA,MAAaS,4BAA4BA,CAAA,EAAqD;IAC1F,OAAO,IAAI,CAACT,OAAO,CAAC,wBAAwB,CAAC;EACjD;EAEA,MAAaU,kBAAkBA,CAAA,EAA8B;IACzD,OAAO,IAAI,CAACV,OAAO,CAAC,cAAc,CAAC;EACvC;EAEA,MAAaW,kBAAkBA,CAAA,EAAoC;IAC/D,OAAO,IAAI,CAACX,OAAO,CAAC,cAAc,CAAC;EACvC;EAEA,MAAcA,OAAOA,CAACY,IAAY,EAAE;IAChC,OAAO,IAAI,CAACC,uBAAuB,CAAC,IAAI,CAACT,aAAa,CAAC,CAACQ,IAAI,CAAC;EACjE;EAEQC,uBAAuBA,CAACC,MAAc,EAAwB;IAClE,OAAO,IAAAD,wCAAuB,EAACC,MAAM,EAAE,IAAI,CAACT,UAAU,CAAC;EAC3D;AACJ;AAACU,OAAA,CAAAb,wBAAA,GAAAA,wBAAA;AAEM,MAAMc,yBAAyB,CAAC;EAI5Bb,WAAWA,CAACc,iBAAgD,EAAE;IAAA,KAHpDC,YAAY;IAAA,KACZC,SAAS;IAAA,KAOnBC,QAAQ,GAAG,MAAOC,WAA0B,IAAoB;MACnE,IAAI,CAAC,IAAI,CAACH,YAAY,EAAE;QACpB;MACJ;MACA,MAAM,IAAI,CAACI,8BAA8B,CAACD,WAAW,CAAC;IAC1D,CAAC;IAAA,KAEgBC,8BAA8B,GAAG,MAAOD,WAA0B,IAAoB;MAAA,IAAAE,qBAAA,EAAAC,sBAAA;MACnG,MAAMC,kBAAkB,GAAGJ,WAAW,CAAC,sBAAsB,CAAC;MAC9D,IAAI,CAACI,kBAAkB,IAAI,OAAOA,kBAAkB,KAAK,QAAQ,EAAE;QAC/D;MACJ;MACA,MAAMC,aAAa,GAAG,MAAM,IAAI,CAACP,SAAS,CAACQ,yBAAyB,CAACF,kBAAkB,EAAE,UAAU,CAAC;MACpG,IAAI,CAACC,aAAa,IAAI,EAAAH,qBAAA,GAACG,aAAa,aAAbA,aAAa,gBAAAF,sBAAA,GAAbE,aAAa,CAAEE,kBAAkB,cAAAJ,sBAAA,uBAAjCA,sBAAA,CAAmCK,MAAM,cAAAN,qBAAA,cAAAA,qBAAA,GAAI,CAAC,KAAK,CAAC,EAAE;QACzE;MACJ;MAEA,MAAMO,KAAK,CACP;AACZ,eAAeC,IAAI,CAACC,SAAS,CAACN,aAAa,CAACE,kBAAkB,CAAC;AAC/D,eAAeF,aAAa,CAACO,UAAU,EAC/B,CAAC;IACL,CAAC;IA1BG,IAAI,CAACf,YAAY,GAAG,CAAAD,iBAAiB,aAAjBA,iBAAiB,uBAAjBA,iBAAiB,CAAEiB,aAAa,KAAI,YAAY;IACpE,IAAI,CAACf,SAAS,GAAG,IAAIgB,8BAAc,CAAC,CAAC;EACzC;AAyBJ;AAACpB,OAAA,CAAAC,yBAAA,GAAAA,yBAAA","ignoreList":[]}
+{"version":3,"file":"GeneratorRequireUtils.js","names":["_ToolsApiClient","require","isEsModule","obj","Boolean","__esModule","interopRequireDefault","default","importGenerator","path","_generator$getDiction","_generator$getLocaliz","generator","legacyLocalization","localization","processSugar","readSources","getSugarTexts","getAllDependencies","getAllDependenciesHash","getDictionary","getLocalizedSugar","exports","GeneratorSourcesValidator","constructor","generationOptions","isLocalDebug","apiClient","validate","formContent","compileNormalizationRulesOrDie","_compileResult$diagno","_compileResult$diagno2","normalizationRules","compileResult","compileNormalizationRules","diagnosticMessages","length","Error","JSON","stringify","sourceText","resourcesHash","ToolsApiClient"],"sources":["../../../../../../src/BuildTasks/Generator/GeneratorWorker/GeneratorRequireUtils.ts"],"sourcesContent":["import { FormGenerator, GeneratedForm, GenerationOptions } from \"../../Form/GenerateForm\";\nimport { FormResources, SugarContent } from \"../../FormSource\";\nimport { ToolsApiClient } from \"../../../Commons/ApiClient/ToolsApiClient\";\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\ntype RequireResult = any;\nconst isEsModule = (obj: RequireResult): boolean => Boolean(obj && obj.__esModule);\nconst interopRequireDefault = (obj: RequireResult): RequireResult => (isEsModule(obj) ? obj : { default: obj });\n\ntype ProcessSugarFunc = (\n    sugarFiles: SugarContent,\n    resources: FormResources,\n    generationOptions?: GenerationOptions\n) => GeneratedForm | Promise<GeneratedForm>;\n\ntype LocalizationEntryPoint = Pick<FormGenerator, \"getLocalizedSugar\" | \"getDictionary\">;\n\nexport interface Generator {\n    readSources: FormGenerator[\"readSources\"];\n    processSugar: ProcessSugarFunc;\n    getSugarTexts: FormGenerator[\"getSugarTexts\"];\n    getAllDependencies: FormGenerator[\"getAllDependencies\"];\n    getAllDependenciesHash: FormGenerator[\"getAllDependenciesHash\"];\n    getDictionary: FormGenerator[\"getDictionary\"];\n    getLocalizedSugar: FormGenerator[\"getLocalizedSugar\"];\n}\n\n// eslint-disable-next-line no-warning-comments\n// TODO(04-06-2027) -- избавиться от этой обертки, импортировать движок напрямую\n/**\n * Эта обертка существует для сохранения обратной совместимости\n * между Tools и движками, экспортирующими `getDictionary` и `getLocalizedSugar`\n * единым объектом `localization`\n */\nexport const importGenerator = (path: string): Generator => {\n    // eslint-disable-next-line @typescript-eslint/no-require-imports\n    const generator = interopRequireDefault(require(path));\n    const legacyLocalization = generator.localization as LocalizationEntryPoint;\n    return {\n        processSugar: generator.processSugar,\n        readSources: generator.readSources,\n        getSugarTexts: generator.getSugarTexts,\n        getAllDependencies: generator.getAllDependencies,\n        getAllDependenciesHash: generator.getAllDependenciesHash,\n        getDictionary: generator.getDictionary ?? legacyLocalization.getDictionary,\n        getLocalizedSugar: generator.getLocalizedSugar ?? legacyLocalization.getLocalizedSugar,\n    };\n};\n\nexport class GeneratorSourcesValidator {\n    private readonly isLocalDebug: boolean;\n    private readonly apiClient: ToolsApiClient;\n\n    public constructor(generationOptions: GenerationOptions | undefined) {\n        this.isLocalDebug = generationOptions?.resourcesHash == \"local-hash\";\n        this.apiClient = new ToolsApiClient();\n    }\n\n    public validate = async (formContent: GeneratedForm): Promise<void> => {\n        if (!this.isLocalDebug) {\n            return;\n        }\n        await this.compileNormalizationRulesOrDie(formContent);\n    };\n\n    private readonly compileNormalizationRulesOrDie = async (formContent: GeneratedForm): Promise<void> => {\n        const normalizationRules = formContent[\"ServerSide.normalize\"];\n        if (!normalizationRules || typeof normalizationRules !== \"string\") {\n            return;\n        }\n        const compileResult = await this.apiClient.compileNormalizationRules(normalizationRules, \"formulas\");\n        if (!compileResult || (compileResult?.diagnosticMessages?.length ?? 0) == 0) {\n            return;\n        }\n\n        throw Error(\n            `Invalid ServerSide.normalize:\\r\\n\n             ${JSON.stringify(compileResult.diagnosticMessages)}\\r\\n\n             ${compileResult.sourceText}`\n        );\n    };\n}\n"],"mappings":";;;;;;AAEA,IAAAA,eAAA,GAAAC,OAAA;AAEA;;AAEA,MAAMC,UAAU,GAAIC,GAAkB,IAAcC,OAAO,CAACD,GAAG,IAAIA,GAAG,CAACE,UAAU,CAAC;AAClF,MAAMC,qBAAqB,GAAIH,GAAkB,IAAqBD,UAAU,CAACC,GAAG,CAAC,GAAGA,GAAG,GAAG;EAAEI,OAAO,EAAEJ;AAAI,CAAE;AAoB/G;AACA;AACA;AACA;AACA;AACA;AACA;AACO,MAAMK,eAAe,GAAIC,IAAY,IAAgB;EAAA,IAAAC,qBAAA,EAAAC,qBAAA;EACxD;EACA,MAAMC,SAAS,GAAGN,qBAAqB,CAACL,OAAO,CAACQ,IAAI,CAAC,CAAC;EACtD,MAAMI,kBAAkB,GAAGD,SAAS,CAACE,YAAsC;EAC3E,OAAO;IACHC,YAAY,EAAEH,SAAS,CAACG,YAAY;IACpCC,WAAW,EAAEJ,SAAS,CAACI,WAAW;IAClCC,aAAa,EAAEL,SAAS,CAACK,aAAa;IACtCC,kBAAkB,EAAEN,SAAS,CAACM,kBAAkB;IAChDC,sBAAsB,EAAEP,SAAS,CAACO,sBAAsB;IACxDC,aAAa,GAAAV,qBAAA,GAAEE,SAAS,CAACQ,aAAa,cAAAV,qBAAA,cAAAA,qBAAA,GAAIG,kBAAkB,CAACO,aAAa;IAC1EC,iBAAiB,GAAAV,qBAAA,GAAEC,SAAS,CAACS,iBAAiB,cAAAV,qBAAA,cAAAA,qBAAA,GAAIE,kBAAkB,CAACQ;EACzE,CAAC;AACL,CAAC;AAACC,OAAA,CAAAd,eAAA,GAAAA,eAAA;AAEK,MAAMe,yBAAyB,CAAC;EAI5BC,WAAWA,CAACC,iBAAgD,EAAE;IAAA,KAHpDC,YAAY;IAAA,KACZC,SAAS;IAAA,KAOnBC,QAAQ,GAAG,MAAOC,WAA0B,IAAoB;MACnE,IAAI,CAAC,IAAI,CAACH,YAAY,EAAE;QACpB;MACJ;MACA,MAAM,IAAI,CAACI,8BAA8B,CAACD,WAAW,CAAC;IAC1D,CAAC;IAAA,KAEgBC,8BAA8B,GAAG,MAAOD,WAA0B,IAAoB;MAAA,IAAAE,qBAAA,EAAAC,sBAAA;MACnG,MAAMC,kBAAkB,GAAGJ,WAAW,CAAC,sBAAsB,CAAC;MAC9D,IAAI,CAACI,kBAAkB,IAAI,OAAOA,kBAAkB,KAAK,QAAQ,EAAE;QAC/D;MACJ;MACA,MAAMC,aAAa,GAAG,MAAM,IAAI,CAACP,SAAS,CAACQ,yBAAyB,CAACF,kBAAkB,EAAE,UAAU,CAAC;MACpG,IAAI,CAACC,aAAa,IAAI,EAAAH,qBAAA,GAACG,aAAa,aAAbA,aAAa,gBAAAF,sBAAA,GAAbE,aAAa,CAAEE,kBAAkB,cAAAJ,sBAAA,uBAAjCA,sBAAA,CAAmCK,MAAM,cAAAN,qBAAA,cAAAA,qBAAA,GAAI,CAAC,KAAK,CAAC,EAAE;QACzE;MACJ;MAEA,MAAMO,KAAK,CACP;AACZ,eAAeC,IAAI,CAACC,SAAS,CAACN,aAAa,CAACE,kBAAkB,CAAC;AAC/D,eAAeF,aAAa,CAACO,UAAU,EAC/B,CAAC;IACL,CAAC;IA1BG,IAAI,CAACf,YAAY,GAAG,CAAAD,iBAAiB,aAAjBA,iBAAiB,uBAAjBA,iBAAiB,CAAEiB,aAAa,KAAI,YAAY;IACpE,IAAI,CAACf,SAAS,GAAG,IAAIgB,8BAAc,CAAC,CAAC;EACzC;AAyBJ;AAACrB,OAAA,CAAAC,yBAAA,GAAAA,yBAAA","ignoreList":[]}

package/distr/Tools/src/BuildTasks/Generator/GeneratorWorker/ReadSourcesAndProcessSugarWorker.js

@@ -1,16 +1,18 @@
 "use strict";
 
+var _nodeWorker_threads = require("node:worker_threads");
 var _IterableUtils = require("../../../../../Common/IterableUtils");
 var _GeneratorRequireUtils = require("./GeneratorRequireUtils");
-var _TypedProcessWorker = require("./TypedProcessWorker");
-_TypedProcessWorker.TypedProcessWorker.start(async ([pathToGeneratorProcessSugar, formSourcesPath, farmDirectory, generationOptions, purgeCache, requestNumber], send) => {
+var _TypedThreadWorker = require("./TypedThreadWorker");
+const {
+  generatorPath
+} = _nodeWorker_threads.workerData;
+const generator = (0, _GeneratorRequireUtils.importGenerator)(generatorPath);
+(0, _TypedThreadWorker.startWorker)(async ([formPath, farmPath, options], send) => {
   let formSource;
   try {
-    const importer = new _GeneratorRequireUtils.GeneratorSourcesImporter(pathToGeneratorProcessSugar, purgeCache);
-    const readSources = await importer.importReadSources();
-    formSource = await readSources(formSourcesPath, farmDirectory);
-    const processSugar = await importer.importProcessSugar();
-    const formContent = await processSugar(formSource.sugarContent, formSource.resources, generationOptions);
+    formSource = await generator.readSources(formPath, farmPath);
+    const formContent = await generator.processSugar(formSource.sugarContent, formSource.resources, options);
 
     // eslint-disable-next-line no-warning-comments
     // TODO(2026-06-30): временно отключаем валидацию компиляции Flang на бэкенде (исправить в задаче https://yt.skbkontur.ru/issue/FS-9242)
@@ -18,40 +20,31 @@ _TypedProcessWorker.TypedProcessWorker.start(async ([pathToGeneratorProcessSugar
     // await validator.validate(formContent);
 
     const result = {};
-
-    // NOTE Because only JSON are allowed for IPC we need to convert Buffer -> Base64
-    // Another solution is use a stream, but formContent still need to convert or send by chunks
+    const transferList = [];
     for (const [key, formContentItem] of (0, _IterableUtils.iterateEntries)(formContent)) {
-      // @ts-ignore
-      result[key] = formContentItem instanceof Buffer ? {
-        payload: formContentItem.toString("base64"),
-        encoding: "base64"
-      } : formContentItem;
+      if (formContentItem instanceof Buffer) {
+        // Buffer.buffer is typed as ArrayBuffer | SharedArrayBuffer,
+        // but Node.js Buffers never use SharedArrayBuffer in practice.
+        const content = formContentItem.buffer.slice(formContentItem.byteOffset, formContentItem.byteOffset + formContentItem.byteLength);
+        result[key] = content;
+        transferList.push(content);
+      } else {
+        result[key] = formContentItem;
+      }
     }
     send({
       type: "Result",
       gfv: formSource.resources.gfv,
-      generatedForm: result,
-      requestNumber: requestNumber
-    });
+      generatedForm: result
+    }, transferList);
   } catch (error) {
-    if (error instanceof Error) {
-      var _formSource;
-      send({
-        type: "Error",
-        gfv: (_formSource = formSource) === null || _formSource === void 0 ? void 0 : _formSource.resources.gfv,
-        errorText: `${error.toString()}\n${error.stack}`,
-        requestNumber: requestNumber
-      });
-    } else {
-      var _formSource2;
-      send({
-        type: "Error",
-        gfv: (_formSource2 = formSource) === null || _formSource2 === void 0 ? void 0 : _formSource2.resources.gfv,
-        errorText: `${error}`,
-        requestNumber: requestNumber
-      });
-    }
+    var _formSource;
+    const errorText = error instanceof Error ? `${error.toString()}\n${error.stack}` : `${error}`;
+    send({
+      type: "Error",
+      gfv: (_formSource = formSource) === null || _formSource === void 0 ? void 0 : _formSource.resources.gfv,
+      errorText: errorText
+    });
   }
 });
 //# sourceMappingURL=ReadSourcesAndProcessSugarWorker.js.map

package/distr/Tools/src/BuildTasks/Generator/GeneratorWorker/ReadSourcesAndProcessSugarWorker.js.map

@@ -1 +1 @@
-{"version":3,"file":"ReadSourcesAndProcessSugarWorker.js","names":["_IterableUtils","require","_GeneratorRequireUtils","_TypedProcessWorker","TypedProcessWorker","start","pathToGeneratorProcessSugar","formSourcesPath","farmDirectory","generationOptions","purgeCache","requestNumber","send","formSource","importer","GeneratorSourcesImporter","readSources","importReadSources","processSugar","importProcessSugar","formContent","sugarContent","resources","result","key","formContentItem","iterateEntries","Buffer","payload","toString","encoding","type","gfv","generatedForm","error","Error","_formSource","errorText","stack","_formSource2"],"sources":["../../../../../../src/BuildTasks/Generator/GeneratorWorker/ReadSourcesAndProcessSugarWorker.ts"],"sourcesContent":["import type { GeneratedForm, GenerationOptions } from \"../../Form/GenerateForm\";\nimport type { FormSource } from \"../../FormSource\";\nimport { iterateEntries } from \"../../../../../Common/IterableUtils\";\n\nimport { GeneratorSourcesImporter } from \"./GeneratorRequireUtils\";\nimport { TypedProcessWorker } from \"./TypedProcessWorker\";\n\nexport interface GeneratedFormInterProcessMessage {\n    [relativeFileName: string]: string | { payload: string; encoding: BufferEncoding };\n}\n\nexport type CallMessage = [\n    generatorPath: string,\n    formPath: string,\n    farmPath: string,\n    undefined | GenerationOptions,\n    purgeCache: boolean,\n    requestNumber: number,\n];\n\nexport type CallResponse =\n    | { type: \"Result\"; gfv: string; generatedForm: GeneratedFormInterProcessMessage; requestNumber: number }\n    | { type: \"Error\"; gfv?: string; errorText: string; requestNumber: number };\n\nTypedProcessWorker.start<CallMessage, CallResponse>(\n    async (\n        [pathToGeneratorProcessSugar, formSourcesPath, farmDirectory, generationOptions, purgeCache, requestNumber],\n        send\n    ): Promise<void> => {\n        let formSource: FormSource | undefined;\n        try {\n            const importer = new GeneratorSourcesImporter(pathToGeneratorProcessSugar, purgeCache);\n            const readSources = await importer.importReadSources();\n            formSource = await readSources(formSourcesPath, farmDirectory);\n\n            const processSugar = await importer.importProcessSugar();\n\n            const formContent: GeneratedForm = await processSugar(\n                formSource.sugarContent,\n                formSource.resources,\n                generationOptions\n            );\n\n            // eslint-disable-next-line no-warning-comments\n            // TODO(2026-06-30): временно отключаем валидацию компиляции Flang на бэкенде (исправить в задаче https://yt.skbkontur.ru/issue/FS-9242)\n            // const validator = new GeneratorSourcesValidator(generationOptions);\n            // await validator.validate(formContent);\n\n            const result: GeneratedFormInterProcessMessage = {};\n\n            // NOTE Because only JSON are allowed for IPC we need to convert Buffer -> Base64\n            // Another solution is use a stream, but formContent still need to convert or send by chunks\n            for (const [key, formContentItem] of iterateEntries(formContent)) {\n                // @ts-ignore\n                result[key] =\n                    formContentItem instanceof Buffer\n                        ? { payload: formContentItem.toString(\"base64\"), encoding: \"base64\" }\n                        : formContentItem;\n            }\n\n            send({\n                type: \"Result\",\n                gfv: formSource.resources.gfv,\n                generatedForm: result,\n                requestNumber: requestNumber,\n            });\n        } catch (error) {\n            if (error instanceof Error) {\n                send({\n                    type: \"Error\",\n                    gfv: formSource?.resources.gfv,\n                    errorText: `${error.toString()}\\n${error.stack}`,\n                    requestNumber: requestNumber,\n                });\n            } else {\n                send({\n                    type: \"Error\",\n                    gfv: formSource?.resources.gfv,\n                    errorText: `${error}`,\n                    requestNumber: requestNumber,\n                });\n            }\n        }\n    }\n);\n"],"mappings":";;AAEA,IAAAA,cAAA,GAAAC,OAAA;AAEA,IAAAC,sBAAA,GAAAD,OAAA;AACA,IAAAE,mBAAA,GAAAF,OAAA;AAmBAG,sCAAkB,CAACC,KAAK,CACpB,OACI,CAACC,2BAA2B,EAAEC,eAAe,EAAEC,aAAa,EAAEC,iBAAiB,EAAEC,UAAU,EAAEC,aAAa,CAAC,EAC3GC,IAAI,KACY;EAChB,IAAIC,UAAkC;EACtC,IAAI;IACA,MAAMC,QAAQ,GAAG,IAAIC,+CAAwB,CAACT,2BAA2B,EAAEI,UAAU,CAAC;IACtF,MAAMM,WAAW,GAAG,MAAMF,QAAQ,CAACG,iBAAiB,CAAC,CAAC;IACtDJ,UAAU,GAAG,MAAMG,WAAW,CAACT,eAAe,EAAEC,aAAa,CAAC;IAE9D,MAAMU,YAAY,GAAG,MAAMJ,QAAQ,CAACK,kBAAkB,CAAC,CAAC;IAExD,MAAMC,WAA0B,GAAG,MAAMF,YAAY,CACjDL,UAAU,CAACQ,YAAY,EACvBR,UAAU,CAACS,SAAS,EACpBb,iBACJ,CAAC;;IAED;IACA;IACA;IACA;;IAEA,MAAMc,MAAwC,GAAG,CAAC,CAAC;;IAEnD;IACA;IACA,KAAK,MAAM,CAACC,GAAG,EAAEC,eAAe,CAAC,IAAI,IAAAC,6BAAc,EAACN,WAAW,CAAC,EAAE;MAC9D;MACAG,MAAM,CAACC,GAAG,CAAC,GACPC,eAAe,YAAYE,MAAM,GAC3B;QAAEC,OAAO,EAAEH,eAAe,CAACI,QAAQ,CAAC,QAAQ,CAAC;QAAEC,QAAQ,EAAE;MAAS,CAAC,GACnEL,eAAe;IAC7B;IAEAb,IAAI,CAAC;MACDmB,IAAI,EAAE,QAAQ;MACdC,GAAG,EAAEnB,UAAU,CAACS,SAAS,CAACU,GAAG;MAC7BC,aAAa,EAAEV,MAAM;MACrBZ,aAAa,EAAEA;IACnB,CAAC,CAAC;EACN,CAAC,CAAC,OAAOuB,KAAK,EAAE;IACZ,IAAIA,KAAK,YAAYC,KAAK,EAAE;MAAA,IAAAC,WAAA;MACxBxB,IAAI,CAAC;QACDmB,IAAI,EAAE,OAAO;QACbC,GAAG,GAAAI,WAAA,GAAEvB,UAAU,cAAAuB,WAAA,uBAAVA,WAAA,CAAYd,SAAS,CAACU,GAAG;QAC9BK,SAAS,EAAE,GAAGH,KAAK,CAACL,QAAQ,CAAC,CAAC,KAAKK,KAAK,CAACI,KAAK,EAAE;QAChD3B,aAAa,EAAEA;MACnB,CAAC,CAAC;IACN,CAAC,MAAM;MAAA,IAAA4B,YAAA;MACH3B,IAAI,CAAC;QACDmB,IAAI,EAAE,OAAO;QACbC,GAAG,GAAAO,YAAA,GAAE1B,UAAU,cAAA0B,YAAA,uBAAVA,YAAA,CAAYjB,SAAS,CAACU,GAAG;QAC9BK,SAAS,EAAE,GAAGH,KAAK,EAAE;QACrBvB,aAAa,EAAEA;MACnB,CAAC,CAAC;IACN;EACJ;AACJ,CACJ,CAAC","ignoreList":[]}
+{"version":3,"file":"ReadSourcesAndProcessSugarWorker.js","names":["_nodeWorker_threads","require","_IterableUtils","_GeneratorRequireUtils","_TypedThreadWorker","generatorPath","workerData","generator","importGenerator","startWorker","formPath","farmPath","options","send","formSource","readSources","formContent","processSugar","sugarContent","resources","result","transferList","key","formContentItem","iterateEntries","Buffer","content","buffer","slice","byteOffset","byteLength","push","type","gfv","generatedForm","error","_formSource","errorText","Error","toString","stack"],"sources":["../../../../../../src/BuildTasks/Generator/GeneratorWorker/ReadSourcesAndProcessSugarWorker.ts"],"sourcesContent":["import { workerData } from \"node:worker_threads\";\n\nimport type { GeneratedForm, GenerationOptions } from \"../../Form/GenerateForm\";\nimport type { FormSource } from \"../../FormSource\";\nimport { iterateEntries } from \"../../../../../Common/IterableUtils\";\n\nimport { importGenerator } from \"./GeneratorRequireUtils\";\nimport { startWorker } from \"./TypedThreadWorker\";\n\nexport interface GeneratedFormWorkerMessage {\n    [relativeFileName: string]: string | ArrayBuffer;\n}\n\nexport type CallMessage = [formPath: string, farmPath: string, options: GenerationOptions | undefined];\n\nexport type CallResponse =\n    | { type: \"Result\"; gfv: string; generatedForm: GeneratedFormWorkerMessage }\n    | { type: \"Error\"; gfv?: string; errorText: string };\n\nconst { generatorPath } = workerData as { generatorPath: string };\nconst generator = importGenerator(generatorPath);\n\nstartWorker<CallMessage, CallResponse>(async ([formPath, farmPath, options], send): Promise<void> => {\n    let formSource: FormSource | undefined;\n    try {\n        formSource = await generator.readSources(formPath, farmPath);\n        const formContent: GeneratedForm = await generator.processSugar(\n            formSource.sugarContent,\n            formSource.resources,\n            options\n        );\n\n        // eslint-disable-next-line no-warning-comments\n        // TODO(2026-06-30): временно отключаем валидацию компиляции Flang на бэкенде (исправить в задаче https://yt.skbkontur.ru/issue/FS-9242)\n        // const validator = new GeneratorSourcesValidator(generationOptions);\n        // await validator.validate(formContent);\n\n        const result: GeneratedFormWorkerMessage = {};\n        const transferList: ArrayBuffer[] = [];\n\n        for (const [key, formContentItem] of iterateEntries(formContent)) {\n            if (formContentItem instanceof Buffer) {\n                // Buffer.buffer is typed as ArrayBuffer | SharedArrayBuffer,\n                // but Node.js Buffers never use SharedArrayBuffer in practice.\n                const content = formContentItem.buffer.slice(\n                    formContentItem.byteOffset,\n                    formContentItem.byteOffset + formContentItem.byteLength\n                ) as ArrayBuffer;\n                result[key] = content;\n                transferList.push(content);\n            } else {\n                result[key] = formContentItem as string;\n            }\n        }\n\n        send(\n            {\n                type: \"Result\",\n                gfv: formSource.resources.gfv,\n                generatedForm: result,\n            },\n            transferList\n        );\n    } catch (error) {\n        const errorText = error instanceof Error ? `${error.toString()}\\n${error.stack}` : `${error}`;\n        send({\n            type: \"Error\",\n            gfv: formSource?.resources.gfv,\n            errorText: errorText,\n        });\n    }\n});\n"],"mappings":";;AAAA,IAAAA,mBAAA,GAAAC,OAAA;AAIA,IAAAC,cAAA,GAAAD,OAAA;AAEA,IAAAE,sBAAA,GAAAF,OAAA;AACA,IAAAG,kBAAA,GAAAH,OAAA;AAYA,MAAM;EAAEI;AAAc,CAAC,GAAGC,8BAAuC;AACjE,MAAMC,SAAS,GAAG,IAAAC,sCAAe,EAACH,aAAa,CAAC;AAEhD,IAAAI,8BAAW,EAA4B,OAAO,CAACC,QAAQ,EAAEC,QAAQ,EAAEC,OAAO,CAAC,EAAEC,IAAI,KAAoB;EACjG,IAAIC,UAAkC;EACtC,IAAI;IACAA,UAAU,GAAG,MAAMP,SAAS,CAACQ,WAAW,CAACL,QAAQ,EAAEC,QAAQ,CAAC;IAC5D,MAAMK,WAA0B,GAAG,MAAMT,SAAS,CAACU,YAAY,CAC3DH,UAAU,CAACI,YAAY,EACvBJ,UAAU,CAACK,SAAS,EACpBP,OACJ,CAAC;;IAED;IACA;IACA;IACA;;IAEA,MAAMQ,MAAkC,GAAG,CAAC,CAAC;IAC7C,MAAMC,YAA2B,GAAG,EAAE;IAEtC,KAAK,MAAM,CAACC,GAAG,EAAEC,eAAe,CAAC,IAAI,IAAAC,6BAAc,EAACR,WAAW,CAAC,EAAE;MAC9D,IAAIO,eAAe,YAAYE,MAAM,EAAE;QACnC;QACA;QACA,MAAMC,OAAO,GAAGH,eAAe,CAACI,MAAM,CAACC,KAAK,CACxCL,eAAe,CAACM,UAAU,EAC1BN,eAAe,CAACM,UAAU,GAAGN,eAAe,CAACO,UACjD,CAAgB;QAChBV,MAAM,CAACE,GAAG,CAAC,GAAGI,OAAO;QACrBL,YAAY,CAACU,IAAI,CAACL,OAAO,CAAC;MAC9B,CAAC,MAAM;QACHN,MAAM,CAACE,GAAG,CAAC,GAAGC,eAAyB;MAC3C;IACJ;IAEAV,IAAI,CACA;MACImB,IAAI,EAAE,QAAQ;MACdC,GAAG,EAAEnB,UAAU,CAACK,SAAS,CAACc,GAAG;MAC7BC,aAAa,EAAEd;IACnB,CAAC,EACDC,YACJ,CAAC;EACL,CAAC,CAAC,OAAOc,KAAK,EAAE;IAAA,IAAAC,WAAA;IACZ,MAAMC,SAAS,GAAGF,KAAK,YAAYG,KAAK,GAAG,GAAGH,KAAK,CAACI,QAAQ,CAAC,CAAC,KAAKJ,KAAK,CAACK,KAAK,EAAE,GAAG,GAAGL,KAAK,EAAE;IAC7FtB,IAAI,CAAC;MACDmB,IAAI,EAAE,OAAO;MACbC,GAAG,GAAAG,WAAA,GAAEtB,UAAU,cAAAsB,WAAA,uBAAVA,WAAA,CAAYjB,SAAS,CAACc,GAAG;MAC9BI,SAAS,EAAEA;IACf,CAAC,CAAC;EACN;AACJ,CAAC,CAAC","ignoreList":[]}

package/distr/Tools/src/BuildTasks/Generator/GeneratorWorker/TypedThreadWorker.js

@@ -0,0 +1,14 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.startWorker = void 0;
+var _nodeWorker_threads = require("node:worker_threads");
+const startWorker = handle => {
+  _nodeWorker_threads.parentPort === null || _nodeWorker_threads.parentPort === void 0 || _nodeWorker_threads.parentPort.on("message", async msg => {
+    await handle(msg, (out, transfer) => _nodeWorker_threads.parentPort === null || _nodeWorker_threads.parentPort === void 0 ? void 0 : _nodeWorker_threads.parentPort.postMessage(out, transfer));
+  });
+};
+exports.startWorker = startWorker;
+//# sourceMappingURL=TypedThreadWorker.js.map

package/distr/Tools/src/BuildTasks/Generator/GeneratorWorker/TypedThreadWorker.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"TypedThreadWorker.js","names":["_nodeWorker_threads","require","startWorker","handle","parentPort","on","msg","out","transfer","postMessage","exports"],"sources":["../../../../../../src/BuildTasks/Generator/GeneratorWorker/TypedThreadWorker.ts"],"sourcesContent":["import { parentPort, TransferListItem } from \"node:worker_threads\";\n\ntype Send<Out> = (out: Out, transfer?: TransferListItem[]) => void;\ntype Handle<In, Out> = (msg: In, send: Send<Out>) => Promise<void>;\n\nexport const startWorker = <In, Out>(handle: Handle<In, Out>): void => {\n    parentPort?.on(\"message\", async (msg: In) => {\n        await handle(msg, (out, transfer) => parentPort?.postMessage(out, transfer));\n    });\n};\n"],"mappings":";;;;;;AAAA,IAAAA,mBAAA,GAAAC,OAAA;AAKO,MAAMC,WAAW,GAAaC,MAAuB,IAAW;EACnEC,8BAAU,aAAVA,8BAAU,eAAVA,8BAAU,CAAEC,EAAE,CAAC,SAAS,EAAE,MAAOC,GAAO,IAAK;IACzC,MAAMH,MAAM,CAACG,GAAG,EAAE,CAACC,GAAG,EAAEC,QAAQ,KAAKJ,8BAAU,aAAVA,8BAAU,uBAAVA,8BAAU,CAAEK,WAAW,CAACF,GAAG,EAAEC,QAAQ,CAAC,CAAC;EAChF,CAAC,CAAC;AACN,CAAC;AAACE,OAAA,CAAAR,WAAA,GAAAA,WAAA","ignoreList":[]}

package/distr/Tools/src/BuildTasks/ResolveFormInfo.js

@@ -20,7 +20,7 @@ let FormBuildMode = exports.FormBuildMode = /*#__PURE__*/function (FormBuildMode
   FormBuildMode[FormBuildMode["NoEditor"] = 1] = "NoEditor";
   return FormBuildMode;
 }({});
-async function resolveFormInfo(formJsonFile, pathToForm, _engineDirectory, logger = (0, _StaticLogger.getLogger)(), upgradeFormJson = false, useLastStableVersion = false, usePrereleaseVersion, nightly = false) {
+async function resolveFormInfo(formJsonFile, pathToForm, logger = (0, _StaticLogger.getLogger)(), upgradeFormJson = false, useLastStableVersion = false, usePrereleaseVersion, nightly = false) {
   var _formConfig$dependenc, _formConfig$dependenc2, _formConfig$settings$;
   const formConfig = await readFormConfig(formJsonFile);
   if (useLastStableVersion && usePrereleaseVersion != undefined) {

package/distr/Tools/src/BuildTasks/ResolveFormInfo.js.map

@@ -1 +1 @@
-{"version":3,"file":"ResolveFormInfo.js","names":["_fsExtra","require","_lodash","_FsUtils","_StaticLogger","_FormPathUtils","_PublishedVersionUtils","_Version","FormBuildMode","exports","resolveFormInfo","formJsonFile","pathToForm","_engineDirectory","logger","getLogger","upgradeFormJson","useLastStableVersion","usePrereleaseVersion","nightly","_formConfig$dependenc","_formConfig$dependenc2","_formConfig$settings$","formConfig","readFormConfig","undefined","Error","dependencies","engine","getLastStableEngineVersion","generator","getLastStableGeneratorVersion","log","writeFileAsync","JSON","stringify","prereleaseVersionFormJson","getPrereleaseVersionFormJson","generatorVersion","parseCandyVersionSpec","engineVersion","type","preId","themes","mode","NoEditor","NormalBuild","formName","extractGfvFromFormPath","formSourcesPath","useServerSideNormalization","settings","useServerSideFLangNormalization","isNewFormJsonFormat","readJson","getFormConfigFromSource","_formConfig$dependenc3","_formConfig$dependenc4","_formConfig$settings","_formConfig$mode","isValidSemVerVersionRange","pickBy","x","build"],"sources":["../../../../src/BuildTasks/ResolveFormInfo.ts"],"sourcesContent":["import { readJson } from \"fs-extra\";\nimport { pickBy } from \"lodash\";\n\nimport { writeFileAsync } from \"../Commons/FsUtils\";\nimport { ILogger } from \"../Commons/Logging/ILogger\";\nimport { getLogger } from \"../Commons/Logging/StaticLogger\";\nimport { extractGfvFromFormPath } from \"../../../Common/FormPathUtils\";\n\nimport {\n    getLastStableEngineVersion,\n    getLastStableGeneratorVersion,\n    getPrereleaseVersionFormJson,\n} from \"./PublishedVersionUtils\";\nimport { CandyVersionSpec, isValidSemVerVersionRange, parseCandyVersionSpec } from \"./Version\";\n\nexport enum FormBuildMode {\n    NormalBuild,\n    NoEditor,\n}\n\nexport interface FormInfo {\n    themes?: string[];\n    mode: FormBuildMode;\n    formName: string;\n    formSourcesPath: string;\n    generatorVersion: undefined | CandyVersionSpec;\n    engineVersion: undefined | CandyVersionSpec;\n    useServerSideNormalization: boolean;\n}\n\nexport interface FormConfigContent {\n    themes?: string[];\n    build?: \"ci\" | \"manual\";\n    mode?: \"no-editor\";\n    dependencies?: {\n        generator?: string;\n        engine?: string;\n    };\n    settings?: {\n        useServerSideFLangNormalization?: boolean;\n        autoCalculationCalculatorImpl?: \"calculator2\";\n        disableFlangRulesForEnableAutoFieldFeature?: boolean;\n        disableFlangRulesForFormulaAndInitNormalizer?: boolean;\n    };\n}\n\ninterface FormConfig {\n    themes?: string[];\n    build?: \"ci\" | \"manual\";\n    mode?: \"no-editor\" | \"normal-build\";\n    dependencies?: {\n        generator: undefined | string;\n        engine: undefined | string;\n    };\n    settings: {\n        useServerSideFLangNormalization: boolean;\n        autoCalculationCalculatorImpl?: \"calculator2\" | \"default\";\n        disableFlangRulesForEnableAutoFieldFeature?: boolean;\n        disableFlangRulesForFormulaAndInitNormalizer?: boolean;\n    };\n}\n\nexport async function resolveFormInfo(\n    formJsonFile: string,\n    pathToForm: string,\n    _engineDirectory: undefined | string,\n    logger: ILogger = getLogger(),\n    upgradeFormJson: boolean = false,\n    useLastStableVersion: boolean = false,\n    usePrereleaseVersion?: string,\n    nightly: boolean = false\n): Promise<FormInfo> {\n    const formConfig = await readFormConfig(formJsonFile);\n    if (useLastStableVersion && usePrereleaseVersion != undefined) {\n        throw new Error(\"Необходимо использовать либо флаг useLastStableVersion либо usePrereleaseVersion\");\n    }\n    if (useLastStableVersion) {\n        formConfig.dependencies = {\n            engine: await getLastStableEngineVersion(),\n            generator: await getLastStableGeneratorVersion(),\n        };\n        logger.log(`Updated to last stable version ${formConfig.dependencies.engine}`);\n        await writeFileAsync(formJsonFile, JSON.stringify(formConfig, undefined, \"  \"), \"utf8\");\n    }\n    if (usePrereleaseVersion != undefined) {\n        const prereleaseVersionFormJson = await getPrereleaseVersionFormJson(usePrereleaseVersion);\n        if (prereleaseVersionFormJson != undefined) {\n            formConfig.dependencies = {\n                engine: prereleaseVersionFormJson,\n                generator: prereleaseVersionFormJson,\n            };\n            logger.log(`Updated to last prerelease version ${formConfig.dependencies.engine}`);\n        }\n        await writeFileAsync(formJsonFile, JSON.stringify(formConfig, undefined, \"  \"), \"utf8\");\n    }\n    let generatorVersion =\n        formConfig.dependencies?.generator != undefined\n            ? parseCandyVersionSpec(formConfig.dependencies.generator)\n            : undefined;\n    let engineVersion =\n        formConfig.dependencies?.engine != undefined\n            ? parseCandyVersionSpec(formConfig.dependencies.engine)\n            : undefined;\n    if (nightly) {\n        generatorVersion = { type: \"pre\", preId: \"nightly\" };\n        engineVersion = { type: \"pre\", preId: \"nightly\" };\n    }\n    if (upgradeFormJson) {\n        await writeFileAsync(formJsonFile, JSON.stringify(formConfig, undefined, \"  \"), \"utf8\");\n    }\n    return {\n        themes: formConfig.themes,\n        mode: formConfig.mode === \"no-editor\" ? FormBuildMode.NoEditor : FormBuildMode.NormalBuild,\n        formName: extractGfvFromFormPath(pathToForm),\n        formSourcesPath: pathToForm,\n        generatorVersion: generatorVersion,\n        engineVersion: engineVersion,\n        useServerSideNormalization: formConfig.settings.useServerSideFLangNormalization ?? false,\n    };\n}\n\nexport async function isNewFormJsonFormat(formJsonFile: string): Promise<boolean> {\n    const formConfig: FormConfigContent = await readJson(formJsonFile);\n    return formConfig.dependencies != undefined;\n}\n\nexport async function readFormConfig(formJsonFile: string): Promise<FormConfig> {\n    const formConfig: FormConfigContent = await readJson(formJsonFile);\n    return getFormConfigFromSource(formConfig);\n}\n\nexport function getFormConfigFromSource(formConfig: FormConfigContent): FormConfig {\n    if (\n        formConfig.dependencies?.generator != undefined &&\n        !isValidSemVerVersionRange(formConfig.dependencies.generator)\n    ) {\n        throw new Error(`${formConfig.dependencies.generator} is not valid version format`);\n    }\n\n    if (formConfig.dependencies?.engine != undefined && !isValidSemVerVersionRange(formConfig.dependencies.engine)) {\n        throw new Error(`${formConfig.dependencies.engine} is not valid version format`);\n    }\n\n    const settings = {\n        useServerSideFLangNormalization: false,\n        ...pickBy(formConfig.settings ?? {}, x => x !== undefined),\n    };\n\n    return {\n        themes: formConfig.themes,\n        build: formConfig.build || \"manual\",\n        mode: formConfig.mode ?? \"normal-build\",\n        settings: settings,\n        dependencies:\n            formConfig.dependencies != undefined\n                ? {\n                      generator: formConfig.dependencies.generator,\n                      engine: formConfig.dependencies.engine,\n                  }\n                : undefined,\n    };\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"ResolveFormInfo.js","names":["_fsExtra","require","_lodash","_FsUtils","_StaticLogger","_FormPathUtils","_PublishedVersionUtils","_Version","FormBuildMode","exports","resolveFormInfo","formJsonFile","pathToForm","logger","getLogger","upgradeFormJson","useLastStableVersion","usePrereleaseVersion","nightly","_formConfig$dependenc","_formConfig$dependenc2","_formConfig$settings$","formConfig","readFormConfig","undefined","Error","dependencies","engine","getLastStableEngineVersion","generator","getLastStableGeneratorVersion","log","writeFileAsync","JSON","stringify","prereleaseVersionFormJson","getPrereleaseVersionFormJson","generatorVersion","parseCandyVersionSpec","engineVersion","type","preId","themes","mode","NoEditor","NormalBuild","formName","extractGfvFromFormPath","formSourcesPath","useServerSideNormalization","settings","useServerSideFLangNormalization","isNewFormJsonFormat","readJson","getFormConfigFromSource","_formConfig$dependenc3","_formConfig$dependenc4","_formConfig$settings","_formConfig$mode","isValidSemVerVersionRange","pickBy","x","build"],"sources":["../../../../src/BuildTasks/ResolveFormInfo.ts"],"sourcesContent":["import { readJson } from \"fs-extra\";\nimport { pickBy } from \"lodash\";\n\nimport { writeFileAsync } from \"../Commons/FsUtils\";\nimport { ILogger } from \"../Commons/Logging/ILogger\";\nimport { getLogger } from \"../Commons/Logging/StaticLogger\";\nimport { extractGfvFromFormPath } from \"../../../Common/FormPathUtils\";\n\nimport {\n    getLastStableEngineVersion,\n    getLastStableGeneratorVersion,\n    getPrereleaseVersionFormJson,\n} from \"./PublishedVersionUtils\";\nimport { CandyVersionSpec, isValidSemVerVersionRange, parseCandyVersionSpec } from \"./Version\";\n\nexport enum FormBuildMode {\n    NormalBuild,\n    NoEditor,\n}\n\nexport interface FormInfo {\n    themes?: string[];\n    mode: FormBuildMode;\n    formName: string;\n    formSourcesPath: string;\n    generatorVersion: undefined | CandyVersionSpec;\n    engineVersion: undefined | CandyVersionSpec;\n    useServerSideNormalization: boolean;\n}\n\nexport interface FormConfigContent {\n    themes?: string[];\n    build?: \"ci\" | \"manual\";\n    mode?: \"no-editor\";\n    dependencies?: {\n        generator?: string;\n        engine?: string;\n    };\n    settings?: {\n        useServerSideFLangNormalization?: boolean;\n        autoCalculationCalculatorImpl?: \"calculator2\";\n        disableFlangRulesForEnableAutoFieldFeature?: boolean;\n        disableFlangRulesForFormulaAndInitNormalizer?: boolean;\n    };\n}\n\ninterface FormConfig {\n    themes?: string[];\n    build?: \"ci\" | \"manual\";\n    mode?: \"no-editor\" | \"normal-build\";\n    dependencies?: {\n        generator: undefined | string;\n        engine: undefined | string;\n    };\n    settings: {\n        useServerSideFLangNormalization: boolean;\n        autoCalculationCalculatorImpl?: \"calculator2\" | \"default\";\n        disableFlangRulesForEnableAutoFieldFeature?: boolean;\n        disableFlangRulesForFormulaAndInitNormalizer?: boolean;\n    };\n}\n\nexport async function resolveFormInfo(\n    formJsonFile: string,\n    pathToForm: string,\n    logger: ILogger = getLogger(),\n    upgradeFormJson: boolean = false,\n    useLastStableVersion: boolean = false,\n    usePrereleaseVersion?: string,\n    nightly: boolean = false\n): Promise<FormInfo> {\n    const formConfig = await readFormConfig(formJsonFile);\n    if (useLastStableVersion && usePrereleaseVersion != undefined) {\n        throw new Error(\"Необходимо использовать либо флаг useLastStableVersion либо usePrereleaseVersion\");\n    }\n    if (useLastStableVersion) {\n        formConfig.dependencies = {\n            engine: await getLastStableEngineVersion(),\n            generator: await getLastStableGeneratorVersion(),\n        };\n        logger.log(`Updated to last stable version ${formConfig.dependencies.engine}`);\n        await writeFileAsync(formJsonFile, JSON.stringify(formConfig, undefined, \"  \"), \"utf8\");\n    }\n    if (usePrereleaseVersion != undefined) {\n        const prereleaseVersionFormJson = await getPrereleaseVersionFormJson(usePrereleaseVersion);\n        if (prereleaseVersionFormJson != undefined) {\n            formConfig.dependencies = {\n                engine: prereleaseVersionFormJson,\n                generator: prereleaseVersionFormJson,\n            };\n            logger.log(`Updated to last prerelease version ${formConfig.dependencies.engine}`);\n        }\n        await writeFileAsync(formJsonFile, JSON.stringify(formConfig, undefined, \"  \"), \"utf8\");\n    }\n    let generatorVersion =\n        formConfig.dependencies?.generator != undefined\n            ? parseCandyVersionSpec(formConfig.dependencies.generator)\n            : undefined;\n    let engineVersion =\n        formConfig.dependencies?.engine != undefined\n            ? parseCandyVersionSpec(formConfig.dependencies.engine)\n            : undefined;\n    if (nightly) {\n        generatorVersion = { type: \"pre\", preId: \"nightly\" };\n        engineVersion = { type: \"pre\", preId: \"nightly\" };\n    }\n    if (upgradeFormJson) {\n        await writeFileAsync(formJsonFile, JSON.stringify(formConfig, undefined, \"  \"), \"utf8\");\n    }\n    return {\n        themes: formConfig.themes,\n        mode: formConfig.mode === \"no-editor\" ? FormBuildMode.NoEditor : FormBuildMode.NormalBuild,\n        formName: extractGfvFromFormPath(pathToForm),\n        formSourcesPath: pathToForm,\n        generatorVersion: generatorVersion,\n        engineVersion: engineVersion,\n        useServerSideNormalization: formConfig.settings.useServerSideFLangNormalization ?? false,\n    };\n}\n\nexport async function isNewFormJsonFormat(formJsonFile: string): Promise<boolean> {\n    const formConfig: FormConfigContent = await readJson(formJsonFile);\n    return formConfig.dependencies != undefined;\n}\n\nexport async function readFormConfig(formJsonFile: string): Promise<FormConfig> {\n    const formConfig: FormConfigContent = await readJson(formJsonFile);\n    return getFormConfigFromSource(formConfig);\n}\n\nexport function getFormConfigFromSource(formConfig: FormConfigContent): FormConfig {\n    if (\n        formConfig.dependencies?.generator != undefined &&\n        !isValidSemVerVersionRange(formConfig.dependencies.generator)\n    ) {\n        throw new Error(`${formConfig.dependencies.generator} is not valid version format`);\n    }\n\n    if (formConfig.dependencies?.engine != undefined && !isValidSemVerVersionRange(formConfig.dependencies.engine)) {\n        throw new Error(`${formConfig.dependencies.engine} is not valid version format`);\n    }\n\n    const settings = {\n        useServerSideFLangNormalization: false,\n        ...pickBy(formConfig.settings ?? {}, x => x !== undefined),\n    };\n\n    return {\n        themes: formConfig.themes,\n        build: formConfig.build || \"manual\",\n        mode: formConfig.mode ?? \"normal-build\",\n        settings: settings,\n        dependencies:\n            formConfig.dependencies != undefined\n                ? {\n                      generator: formConfig.dependencies.generator,\n                      engine: formConfig.dependencies.engine,\n                  }\n                : undefined,\n    };\n}\n"],"mappings":"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","ignoreList":[]}

package/distr/Tools/src/CLICommands/BuildForms/BuildFormsOptions.js

@@ -75,16 +75,6 @@ const buildFormsOptionsDefinition = exports.buildFormsOptionsDefinition = (0, _C
     usePrereleaseVersion: input
   }),
   description: "Устанавливает версию движка в файла form.json в последнюю пререлизную версию в заданным preid. В файле версии генератора и движка будут установлены в pre:some-preid."
-}, {
-  name: "no-reformat",
-  doesNotRequireValue: true,
-  defaultValue: {
-    skipGeneratedCodeReformatting: true
-  },
-  parse: input => ({
-    skipGeneratedCodeReformatting: input
-  }),
-  description: "Отлючает форматирование генерируемого кода. Работает, только если версия генератора поддерживает эту опцию. Используется для ускорения сборки форм. (default: true)"
 }, {
   alias: "g",
   name: "gfvs",

package/distr/Tools/src/CLICommands/BuildForms/BuildFormsOptions.js.map

@@ -1 +1 @@
-{"version":3,"file":"BuildFormsOptions.js","names":["_CommandBasedOptionsParser","require","_CommonOptionDefintions","_BuildCacheMode","buildFormsOptionsDefinition","exports","commandDefinition","optionsDefinition","alias","name","defaultValue","watch","parse","input","doesNotRequireValue","description","clean","mode","upgradeFormJson","buildCacheMode","BuildCacheMode","ReadOnly","parseBuildCacheMode","useLastStableVersion","usePrereleaseVersion","undefined","skipGeneratedCodeReformatting","formGlobs","defaultOption","multiple","useVersionFromCache","buildCandyWidget","devModeOption","logVerbosityOption","detailedDescription","trim","examples","extendedDetails"],"sources":["../../../../../src/CLICommands/BuildForms/BuildFormsOptions.ts"],"sourcesContent":["import { commandDefinition, optionsDefinition } from \"../../Commons/Options/CommandBasedOptionsParser\";\nimport { CommonOptions } from \"../CommonOptions/CommonOptions\";\nimport { devModeOption, logVerbosityOption } from \"../CommonOptions/CommonOptionDefintions\";\n\nimport { BuildCacheMode, parseBuildCacheMode } from \"./BuildCacheMode\";\n\nexport interface BuildFormsOptions extends CommonOptions {\n    watch: boolean;\n    clean: boolean;\n    formGlobs: string[];\n    upgradeFormJson: boolean;\n    useLastStableVersion: boolean;\n    usePrereleaseVersion?: string;\n    skipGeneratedCodeReformatting: boolean;\n    useVersionFromCache: boolean;\n    mode: \"development\" | \"production\";\n    buildCacheMode: BuildCacheMode;\n    buildCandyWidget: boolean;\n}\n\nexport const buildFormsOptionsDefinition = commandDefinition<\"build\", BuildFormsOptions>(\n    \"build\",\n    \"build\",\n    optionsDefinition(\n        {\n            alias: \"w\",\n            name: \"watch\",\n            defaultValue: { watch: false },\n            parse: input => ({ watch: input }),\n            doesNotRequireValue: true,\n            description:\n                \"Watch-режим. Выполняет сборку форм, а затем пересобирает при изменениях. В том числе движка, генератора и статических ресурсов.\",\n        },\n        {\n            name: \"clean\",\n            defaultValue: { clean: false },\n            parse: input => ({ clean: input }),\n            doesNotRequireValue: true,\n            description:\n                \"Полностью очищает целевой каталог ресурсов. Используется при полной сборке форм для продакшена\",\n        },\n        {\n            name: \"mode\",\n            defaultValue: { mode: \"development\" },\n            parse: (input: string) => ({ mode: input }),\n            description:\n                \"Разделение сборок на продовую (mode=production) и не продовую (mode=development). По умолчанию development\",\n        },\n        {\n            name: \"upgrade-form-json\",\n            defaultValue: { upgradeFormJson: false },\n            parse: input => ({ upgradeFormJson: input }),\n            doesNotRequireValue: true,\n            description: \"Форсирует изменение формата файла form.json на новый\",\n        },\n        {\n            name: \"build-cache\",\n            defaultValue: { buildCacheMode: BuildCacheMode.ReadOnly },\n            parse: (input: string) => ({ buildCacheMode: parseBuildCacheMode(input) }),\n            description:\n                \"Задаёт режим использования кэша сборки. Возможные значения:\\n\" +\n                \"  disabled - не использовать кэш\\n\" +\n                \"  readonly - использовать кэш для сборки, но не обновляет его (значение по умолчанию)\\n\" +\n                \"  update - использовать кэш для сборки и презаписывать, если не совпадает\\n\" +\n                \"  force-update - всегда выполнять сборку и обновить значения в кэше\\n\" +\n                \"Отключается при использовании watch-режима\",\n        },\n        {\n            name: \"use-last-stable-version\",\n            defaultValue: { useLastStableVersion: false },\n            parse: input => ({ useLastStableVersion: input }),\n            doesNotRequireValue: true,\n            description:\n                \"Устанавливает версию движка в файла `form.json` в последнюю стабильную версию. Аналогичен запуску candy-build с параметром -ge master\",\n        },\n        {\n            name: \"use-prerelease-version\",\n            defaultValue: { usePrereleaseVersion: undefined as undefined | string },\n            parse: (input: string) => ({ usePrereleaseVersion: input }),\n            description:\n                \"Устанавливает версию движка в файла form.json в последнюю пререлизную версию в заданным preid. В файле версии генератора и движка будут установлены в pre:some-preid.\",\n        },\n        {\n            name: \"no-reformat\",\n            doesNotRequireValue: true,\n            defaultValue: { skipGeneratedCodeReformatting: true },\n            parse: (input: boolean) => ({ skipGeneratedCodeReformatting: input }),\n            description:\n                \"Отлючает форматирование генерируемого кода. Работает, только если версия генератора поддерживает эту опцию. Используется для ускорения сборки форм. (default: true)\",\n        },\n        {\n            alias: \"g\",\n            name: \"gfvs\",\n            defaultValue: { formGlobs: [] },\n            parse: (input: string[]) => ({ formGlobs: input }),\n            defaultOption: true,\n            multiple: true,\n            description: \"Одна или несколько GFV или GFV-масок для пересборки. Может содержать значки `?` и `*`.\",\n        },\n        {\n            name: \"use-version-from-cache\",\n            defaultValue: { useVersionFromCache: false },\n            parse: (input: boolean) => ({ useVersionFromCache: input }),\n            description: \"Использовать версию движка и генератора из файловой системы\",\n            doesNotRequireValue: true,\n        },\n        {\n            name: \"build-candy-widget\",\n            doesNotRequireValue: true,\n            defaultValue: { buildCandyWidget: false },\n            parse: (input: boolean) => ({ buildCandyWidget: input }),\n            description: \"Собирать candy-виджет\",\n        },\n        devModeOption,\n        logVerbosityOption\n    ),\n    {\n        description:\n            \"Выполняет сборку одной или нескольких форм.\\n\" +\n            \"Подробнее: https://git.skbkontur.ru/forms/candy/-/blob/master/Tools/README.md#candy-build\",\n\n        detailedDescription: `\nОсновной сценарий: выполняет сборку форм в каталог с ресурсами. Действия, которые выполняет команда:\n\n* Получение движка форм версии указанной в \\`form.json\\`,\n* получение генератора форм версии указанной в \\`form.json\\`,\n* генерация и компиляция формы в каталог ресурсов,\n* создание файлов \\`{gfv}.metas.json\\` в каталоге ресурсов\n* копирование конвертеров в каталог ресурсов,\n* копирование схемы в каталог ресурсов.\n`.trim(),\n\n        examples: `\n\\`\\`\\`\n# Сборка формы 104816\ncandy build 104816\n\\`\\`\\`\n\n\\`\\`\\`\n# Сборка все формы группы 1\ncandy build 1?????\n\\`\\`\\`\n\n\\`\\`\\`\n# Собрать форму 104816 и следить за изменениями\ncandy build 104816 -w\n\\`\\`\\`\n\n\\`\\`\\`\n# Использовать последнюю пререлизную версию движка с preid=bso\ncandy build 104816 --use-prerelease-version bso\n\\`\\`\\`\n`.trim(),\n\n        extendedDetails: `\n### Версионирование\n\nПри сборке форм, учитывается версия движка и генератора указанные файле form.json. Версии могут указывать не на конкретную версию, а адресовать диапазон в соответствии с [semver](https://semver.org/lang/ru/).\nВ этом случае будет выбрана последняя подходящая версия.\n\nФайл form.json должен выглядеть следующим образом:\n\\`\\`\\`\n{\n    // Опционально\n    \"themes\": [\"имя-темы\", ...],\n    \"dependencies\": {\n        \"engine\": \"[версия-движка]\",\n        \"generator\": \"[версия-генератора]\"\n    }\n}\n\\`\\`\\`\n\n\\`версия-движка\\`, \\`версия-генератора\\` - Соответственно, диапазоны версий. На данный момент всегда совпадают.\n\nДопустимые варианты версий:\n* Версия в формате [semver](https://semver.org/lang/ru/).\n* Версия с префиксом pre. Например, \\`pre:my-stange-branch-name\\`, где \\`my-stange-branch-name\\` - название предрелизной версии, выпускаемой разработчиками Candy, для предварительного выпуска форм.\nВерсия с префиксом pre используются для движков, которые не являются стабильными и используются для предварительных сборок форм.\n`.trim(),\n    }\n);\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"BuildFormsOptions.js","names":["_CommandBasedOptionsParser","require","_CommonOptionDefintions","_BuildCacheMode","buildFormsOptionsDefinition","exports","commandDefinition","optionsDefinition","alias","name","defaultValue","watch","parse","input","doesNotRequireValue","description","clean","mode","upgradeFormJson","buildCacheMode","BuildCacheMode","ReadOnly","parseBuildCacheMode","useLastStableVersion","usePrereleaseVersion","undefined","formGlobs","defaultOption","multiple","useVersionFromCache","buildCandyWidget","devModeOption","logVerbosityOption","detailedDescription","trim","examples","extendedDetails"],"sources":["../../../../../src/CLICommands/BuildForms/BuildFormsOptions.ts"],"sourcesContent":["import { commandDefinition, optionsDefinition } from \"../../Commons/Options/CommandBasedOptionsParser\";\nimport { CommonOptions } from \"../CommonOptions/CommonOptions\";\nimport { devModeOption, logVerbosityOption } from \"../CommonOptions/CommonOptionDefintions\";\n\nimport { BuildCacheMode, parseBuildCacheMode } from \"./BuildCacheMode\";\n\nexport interface BuildFormsOptions extends CommonOptions {\n    watch: boolean;\n    clean: boolean;\n    formGlobs: string[];\n    upgradeFormJson: boolean;\n    useLastStableVersion: boolean;\n    usePrereleaseVersion?: string;\n    useVersionFromCache: boolean;\n    mode: \"development\" | \"production\";\n    buildCacheMode: BuildCacheMode;\n    buildCandyWidget: boolean;\n}\n\nexport const buildFormsOptionsDefinition = commandDefinition<\"build\", BuildFormsOptions>(\n    \"build\",\n    \"build\",\n    optionsDefinition(\n        {\n            alias: \"w\",\n            name: \"watch\",\n            defaultValue: { watch: false },\n            parse: input => ({ watch: input }),\n            doesNotRequireValue: true,\n            description:\n                \"Watch-режим. Выполняет сборку форм, а затем пересобирает при изменениях. В том числе движка, генератора и статических ресурсов.\",\n        },\n        {\n            name: \"clean\",\n            defaultValue: { clean: false },\n            parse: input => ({ clean: input }),\n            doesNotRequireValue: true,\n            description:\n                \"Полностью очищает целевой каталог ресурсов. Используется при полной сборке форм для продакшена\",\n        },\n        {\n            name: \"mode\",\n            defaultValue: { mode: \"development\" },\n            parse: (input: string) => ({ mode: input }),\n            description:\n                \"Разделение сборок на продовую (mode=production) и не продовую (mode=development). По умолчанию development\",\n        },\n        {\n            name: \"upgrade-form-json\",\n            defaultValue: { upgradeFormJson: false },\n            parse: input => ({ upgradeFormJson: input }),\n            doesNotRequireValue: true,\n            description: \"Форсирует изменение формата файла form.json на новый\",\n        },\n        {\n            name: \"build-cache\",\n            defaultValue: { buildCacheMode: BuildCacheMode.ReadOnly },\n            parse: (input: string) => ({ buildCacheMode: parseBuildCacheMode(input) }),\n            description:\n                \"Задаёт режим использования кэша сборки. Возможные значения:\\n\" +\n                \"  disabled - не использовать кэш\\n\" +\n                \"  readonly - использовать кэш для сборки, но не обновляет его (значение по умолчанию)\\n\" +\n                \"  update - использовать кэш для сборки и презаписывать, если не совпадает\\n\" +\n                \"  force-update - всегда выполнять сборку и обновить значения в кэше\\n\" +\n                \"Отключается при использовании watch-режима\",\n        },\n        {\n            name: \"use-last-stable-version\",\n            defaultValue: { useLastStableVersion: false },\n            parse: input => ({ useLastStableVersion: input }),\n            doesNotRequireValue: true,\n            description:\n                \"Устанавливает версию движка в файла `form.json` в последнюю стабильную версию. Аналогичен запуску candy-build с параметром -ge master\",\n        },\n        {\n            name: \"use-prerelease-version\",\n            defaultValue: { usePrereleaseVersion: undefined as undefined | string },\n            parse: (input: string) => ({ usePrereleaseVersion: input }),\n            description:\n                \"Устанавливает версию движка в файла form.json в последнюю пререлизную версию в заданным preid. В файле версии генератора и движка будут установлены в pre:some-preid.\",\n        },\n        {\n            alias: \"g\",\n            name: \"gfvs\",\n            defaultValue: { formGlobs: [] },\n            parse: (input: string[]) => ({ formGlobs: input }),\n            defaultOption: true,\n            multiple: true,\n            description: \"Одна или несколько GFV или GFV-масок для пересборки. Может содержать значки `?` и `*`.\",\n        },\n        {\n            name: \"use-version-from-cache\",\n            defaultValue: { useVersionFromCache: false },\n            parse: (input: boolean) => ({ useVersionFromCache: input }),\n            description: \"Использовать версию движка и генератора из файловой системы\",\n            doesNotRequireValue: true,\n        },\n        {\n            name: \"build-candy-widget\",\n            doesNotRequireValue: true,\n            defaultValue: { buildCandyWidget: false },\n            parse: (input: boolean) => ({ buildCandyWidget: input }),\n            description: \"Собирать candy-виджет\",\n        },\n        devModeOption,\n        logVerbosityOption\n    ),\n    {\n        description:\n            \"Выполняет сборку одной или нескольких форм.\\n\" +\n            \"Подробнее: https://git.skbkontur.ru/forms/candy/-/blob/master/Tools/README.md#candy-build\",\n\n        detailedDescription: `\nОсновной сценарий: выполняет сборку форм в каталог с ресурсами. Действия, которые выполняет команда:\n\n* Получение движка форм версии указанной в \\`form.json\\`,\n* получение генератора форм версии указанной в \\`form.json\\`,\n* генерация и компиляция формы в каталог ресурсов,\n* создание файлов \\`{gfv}.metas.json\\` в каталоге ресурсов\n* копирование конвертеров в каталог ресурсов,\n* копирование схемы в каталог ресурсов.\n`.trim(),\n\n        examples: `\n\\`\\`\\`\n# Сборка формы 104816\ncandy build 104816\n\\`\\`\\`\n\n\\`\\`\\`\n# Сборка все формы группы 1\ncandy build 1?????\n\\`\\`\\`\n\n\\`\\`\\`\n# Собрать форму 104816 и следить за изменениями\ncandy build 104816 -w\n\\`\\`\\`\n\n\\`\\`\\`\n# Использовать последнюю пререлизную версию движка с preid=bso\ncandy build 104816 --use-prerelease-version bso\n\\`\\`\\`\n`.trim(),\n\n        extendedDetails: `\n### Версионирование\n\nПри сборке форм, учитывается версия движка и генератора указанные файле form.json. Версии могут указывать не на конкретную версию, а адресовать диапазон в соответствии с [semver](https://semver.org/lang/ru/).\nВ этом случае будет выбрана последняя подходящая версия.\n\nФайл form.json должен выглядеть следующим образом:\n\\`\\`\\`\n{\n    // Опционально\n    \"themes\": [\"имя-темы\", ...],\n    \"dependencies\": {\n        \"engine\": \"[версия-движка]\",\n        \"generator\": \"[версия-генератора]\"\n    }\n}\n\\`\\`\\`\n\n\\`версия-движка\\`, \\`версия-генератора\\` - Соответственно, диапазоны версий. На данный момент всегда совпадают.\n\nДопустимые варианты версий:\n* Версия в формате [semver](https://semver.org/lang/ru/).\n* Версия с префиксом pre. Например, \\`pre:my-stange-branch-name\\`, где \\`my-stange-branch-name\\` - название предрелизной версии, выпускаемой разработчиками Candy, для предварительного выпуска форм.\nВерсия с префиксом pre используются для движков, которые не являются стабильными и используются для предварительных сборок форм.\n`.trim(),\n    }\n);\n"],"mappings":"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","ignoreList":[]}

package/distr/Tools/src/CLICommands/BuildForms/RunBuildForms.js

@@ -76,7 +76,7 @@ async function runBuildForms(context, options, farmDirectory, resourcesDirectory
     if (await (0, _fsExtra.pathExists)(_path.default.join(formDirPath, "presentations.json"))) {
       throw new Error(`presentations.json больше не используется, удали его из ${formDirPath} или используй команду candy rename ${gfv} в каталоге candy.farm`);
     }
-    return _Observe.Observe.file(_path.default.join(formDirPath, _WellKnownDirectories.WellKnownDirectories.FormJsonFileName)).transform(formJsonFile => (0, _ResolveFormInfo.resolveFormInfo)(formJsonFile, formDirPath, engineDirectory, context.logger.withPrefix(`FORM:${gfv}`), options.upgradeFormJson, options.useLastStableVersion, options.usePrereleaseVersion)).transform(async fi => {
+    return _Observe.Observe.file(_path.default.join(formDirPath, _WellKnownDirectories.WellKnownDirectories.FormJsonFileName)).transform(formJsonFile => (0, _ResolveFormInfo.resolveFormInfo)(formJsonFile, formDirPath, context.logger.withPrefix(`FORM:${gfv}`), options.upgradeFormJson, options.useLastStableVersion, options.usePrereleaseVersion)).transform(async fi => {
       if (fi.mode === _ResolveFormInfo.FormBuildMode.NormalBuild) {
         if (fi.generatorVersion == undefined) {
           throw new Error("generatorVersion is not defined");
@@ -116,16 +116,13 @@ async function runBuildForms(context, options, farmDirectory, resourcesDirectory
         }
       });
     }, async fi => fi, async fi => fi.engineSource != undefined ? (0, _EngineSource.getEngineSourceKey)(fi.engineSource) : "NullEngine").attach(async fi => buildOptions.watch ? _Observe.Observe.files(fi.formSourcesPath, "../../controls/**/*", "../../xsltTemplates/**/*", "../../jsHelpers/**/*", `./${_WellKnownDirectories.WellKnownDirectories.FormJsonFileName}`, "schemas/**/*", "sugar/**/*", "controls/**/*", "autocalc/**/*", "helpers/**/*", "normalizers/**/*", "validations/**/*", "localization/**/*") : _Observe.Observe.value(fi.formSourcesPath)).transform(async fi => {
-      let dependenciesHash;
       if (fi.mode !== _ResolveFormInfo.FormBuildMode.NormalBuild) {
         return {
           ...fi,
           dependenciesHash: undefined
         };
       }
-      if (await fi.generator.supportsDependenciesExtraction()) {
-        dependenciesHash = await fi.generator.getAllDependenciesHash(formDirPath, farmDirectory);
-      }
+      const dependenciesHash = await fi.generator.getAllDependenciesHash(formDirPath, farmDirectory);
       return {
         ...fi,
         dependenciesHash: dependenciesHash
@@ -149,7 +146,6 @@ async function runBuildForms(context, options, farmDirectory, resourcesDirectory
         return undefined;
       }
       return (0, _GenerateForm.generateForm)(fi.formSourcesPath, farmDirectory, fi.generator, undefined, {
-        skipCodeReformatting: options.skipGeneratedCodeReformatting,
         resourcesHash: (_fi$dependenciesHash = fi.dependenciesHash) !== null && _fi$dependenciesHash !== void 0 ? _fi$dependenciesHash : "UndefinedResourcesHash"
       });
     }).attach(async () => buildOptions.watch ? _Observe.Observe.files(_path.default.join(formDirPath, "form"), "**/*") : _Observe.Observe.value(_path.default.join(formDirPath, "form"))).do(async fi => {