@kontur.candy/tools 2.250.0 → 2.251.1

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

@@ -21,53 +21,43 @@ class GeneratorAsyncProxy {
     this.useGeneratorRestarting = useGeneratorRestarting;
     this.pathToGeneratorRootDir = pathToGeneratorRootDir;
     this.purgeCache = purgeCache;
-    this.generatorSourcesImporter = new _GeneratorRequireUtils.GeneratorSourcesImporter(purgeCache);
+    this.generatorSourcesImporter = new _GeneratorRequireUtils.GeneratorSourcesImporter(this.pathToGeneratorRootDir, this.purgeCache);
   }
   async getLocalizedSugar(sugarFiles, resources) {
-    const localizationEntryPoint = await this.generatorSourcesImporter.importLocalization(this.pathToGeneratorRootDir);
+    const localizationEntryPoint = await this.generatorSourcesImporter.importLocalization();
     if (localizationEntryPoint == undefined) {
       throw new Error("Данная версия генератора не поддерживает локализацию.");
     }
     return localizationEntryPoint.getLocalizedSugar(sugarFiles, resources);
   }
   async getDictionary(sugarFiles, resources) {
-    const localizationEntryPoint = await this.generatorSourcesImporter.importLocalization(this.pathToGeneratorRootDir);
+    const localizationEntryPoint = await this.generatorSourcesImporter.importLocalization();
     if (localizationEntryPoint == undefined) {
       throw new Error("Данная версия генератора не поддерживает локализацию.");
     }
     return localizationEntryPoint.getDictionary(sugarFiles, resources);
   }
-  async readSources(formSourcesPath, farmDirectory, hlFarmDirectoryPath) {
-    const readSources = await this.generatorSourcesImporter.importReadSources(this.pathToGeneratorRootDir);
-    const formSource = await readSources(formSourcesPath, farmDirectory, hlFarmDirectoryPath);
-    return formSource;
+  async readSources(formSourcesPath, farmDirectory) {
+    const readSources = await this.generatorSourcesImporter.importReadSources();
+    return await readSources(formSourcesPath, farmDirectory);
   }
-  async getSugarTexts(formSourcesPath, farmDirectory, hlFarmDirectoryPath) {
-    const getSugarTexts = await this.generatorSourcesImporter.importGetSugarTexts(this.pathToGeneratorRootDir);
-    const result = await getSugarTexts(formSourcesPath, farmDirectory, hlFarmDirectoryPath);
-    return result;
+  async getSugarTexts(formSourcesPath, farmDirectory) {
+    const getSugarTexts = await this.generatorSourcesImporter.importGetSugarTexts();
+    return await getSugarTexts(formSourcesPath, farmDirectory);
   }
-  async getAllDependencies(formSourcesPath, farmDirectory, hlFarmDirectoryPath) {
-    const getAllDependencies = await this.generatorSourcesImporter.importGetAllDependencies(this.pathToGeneratorRootDir);
-    if (getAllDependencies == undefined) {
-      throw new Error("This version of generator does not support dependencies extraction");
-    }
-    const formSource = await getAllDependencies(formSourcesPath, farmDirectory, hlFarmDirectoryPath);
-    return formSource;
+  async getAllDependencies(formSourcesPath, farmDirectory) {
+    const getAllDependencies = await this.generatorSourcesImporter.importGetAllDependencies();
+    return await getAllDependencies(formSourcesPath, farmDirectory);
   }
   async supportsDependenciesExtraction() {
-    const getAllDependenciesHash = await this.generatorSourcesImporter.importGetAllDependenciesHash(this.pathToGeneratorRootDir);
+    const getAllDependenciesHash = await this.generatorSourcesImporter.importGetAllDependenciesHash();
     return getAllDependenciesHash != undefined;
   }
-  async getAllDependenciesHash(formSourcesPath, farmDirectory, hlFarmDirectoryPath) {
-    const getAllDependenciesHash = await this.generatorSourcesImporter.importGetAllDependenciesHash(this.pathToGeneratorRootDir);
-    if (getAllDependenciesHash == undefined) {
-      throw new Error("This version of generator does not support dependencies extraction");
-    }
-    const formSource = await getAllDependenciesHash(formSourcesPath, farmDirectory, hlFarmDirectoryPath);
-    return formSource;
+  async getAllDependenciesHash(formSourcesPath, farmDirectory) {
+    const getAllDependenciesHash = await this.generatorSourcesImporter.importGetAllDependenciesHash();
+    return await getAllDependenciesHash(formSourcesPath, farmDirectory);
   }
-  async readSourcesAndProcessSugar(formSourcesPath, farmDirectory, hlFarmDirectoryPath, generationOptions) {
+  async readSourcesAndProcessSugar(formSourcesPath, farmDirectory, generationOptions) {
     this.maxRequestNumber++;
     const currentRequestNumber = this.maxRequestNumber;
     const promise = new Promise((resolve, reject) => {
@@ -88,53 +78,11 @@ class GeneratorAsyncProxy {
         console.log("Restarted generator");
       }
     }
-    this.generatorProcess.send([this.pathToGeneratorRootDir, formSourcesPath, farmDirectory, hlFarmDirectoryPath, generationOptions, this.purgeCache, currentRequestNumber]);
-    const result = await promise;
-    this.processSugarDeferredMap.delete(currentRequestNumber);
-    return result;
-  }
-  async processSugar(sugarFiles, resources, generationOptions) {
-    this.maxRequestNumber++;
-    const currentRequestNumber = this.maxRequestNumber;
-    const promise = new Promise((resolve, reject) => {
-      this.processSugarDeferredMap.set(currentRequestNumber, {
-        resolve: resolve,
-        reject: reject
-      });
-    });
-    if (!this.generatorProcess) {
-      this.generatorProcess = this.forkProcessSugarWorker();
-    }
-    this.generatorProcess.send([this.pathToGeneratorRootDir, sugarFiles, resources, generationOptions, this.purgeCache, currentRequestNumber]);
+    this.generatorProcess.send([this.pathToGeneratorRootDir, formSourcesPath, farmDirectory, generationOptions, this.purgeCache, currentRequestNumber]);
     const result = await promise;
     this.processSugarDeferredMap.delete(currentRequestNumber);
     return result;
   }
-  forkProcessSugarWorker() {
-    const processSugarWorker = (0, _child_process.fork)("./ProcessSugarWorker", [], {
-      cwd: __dirname
-    });
-    processSugarWorker.on("message", response => {
-      const currentDeferred = this.processSugarDeferredMap.get(response.requestNumber);
-      if (currentDeferred == undefined) {
-        return;
-      }
-      if (response.type === "Error") {
-        currentDeferred.reject(new Error(response.errorText));
-      } else {
-        const formContent = response.generatedForm;
-        const result = {};
-        for (const [key, formContentItem] of (0, _IterableUtils.iterateEntries)(formContent)) {
-          result[key] = typeof formContentItem === "string" ? formContentItem : Buffer.from(formContentItem.payload, formContentItem.encoding);
-        }
-        currentDeferred.resolve(result);
-      }
-    });
-    processSugarWorker.on("error", error => {
-      throw error;
-    });
-    return processSugarWorker;
-  }
   forkReadSourcesAndProcessSugarWorker() {
     const processSugarWorker = (0, _child_process.fork)("./ReadSourcesAndProcessSugarWorker", [], {
       cwd: __dirname

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

@@ -1 +1 @@
-{"version":3,"file":"CreateAsyncGenerator.js","names":["_child_process","require","_IterableUtils","_GeneratorRequireUtils","GeneratorAsyncProxy","constructor","pathToGeneratorRootDir","purgeCache","useGeneratorRestarting","generatorSourcesImporter","generatorProcess","maxRequestNumber","processSugarDeferredMap","Map","GeneratorSourcesImporter","getLocalizedSugar","sugarFiles","resources","localizationEntryPoint","importLocalization","undefined","Error","getDictionary","readSources","formSourcesPath","farmDirectory","hlFarmDirectoryPath","importReadSources","formSource","getSugarTexts","importGetSugarTexts","result","getAllDependencies","importGetAllDependencies","supportsDependenciesExtraction","getAllDependenciesHash","importGetAllDependenciesHash","readSourcesAndProcessSugar","generationOptions","currentRequestNumber","promise","Promise","resolve","reject","set","forkReadSourcesAndProcessSugarWorker","console","log","kill","send","delete","processSugar","forkProcessSugarWorker","processSugarWorker","fork","cwd","__dirname","on","response","currentDeferred","get","requestNumber","type","errorText","formContent","generatedForm","key","formContentItem","iterateEntries","Buffer","from","payload","encoding","error","generatorsCache","createAsyncGenerator"],"sources":["../../../../../../src/BuildTasks/Generator/GeneratorWorker/CreateAsyncGenerator.ts"],"sourcesContent":["/* eslint-disable no-console */\nimport { ChildProcess, fork } from \"child_process\";\n\nimport {\n    FormGenerator,\n    GeneratedForm,\n    GenerationOptions,\n    LocalizationDictionaryContent,\n} from \"../../Form/GenerateForm\";\nimport { FormResources, FormSource, SugarContent } from \"../../ReadFormSource\";\nimport { iterateEntries } from \"../../../../../Common/IterableUtils\";\nimport { ExtractorResult } from \"../../../../../Common/TextExtractor/TextExtractorTypes\";\n\nimport { GeneratorSourcesImporter } from \"./GeneratorRequireUtils\";\nimport { CallResponse } from \"./ProcessSugarWorker\";\n\ninterface ProcessSugarDeferred {\n    resolve: (result: GeneratedForm) => void;\n    reject: (error: unknown) => void;\n}\n\nclass GeneratorAsyncProxy implements FormGenerator {\n    private readonly pathToGeneratorRootDir: string;\n    private readonly generatorSourcesImporter: GeneratorSourcesImporter;\n    private readonly purgeCache: boolean;\n    private readonly useGeneratorRestarting: boolean;\n    private generatorProcess?: ChildProcess;\n    private maxRequestNumber = 0;\n    private readonly processSugarDeferredMap: Map<number, ProcessSugarDeferred> = new Map();\n\n    public constructor(pathToGeneratorRootDir: string, purgeCache: boolean, useGeneratorRestarting: boolean) {\n        this.useGeneratorRestarting = useGeneratorRestarting;\n        this.pathToGeneratorRootDir = pathToGeneratorRootDir;\n        this.purgeCache = purgeCache;\n        this.generatorSourcesImporter = new GeneratorSourcesImporter(purgeCache);\n    }\n\n    public async getLocalizedSugar(sugarFiles: SugarContent, resources: FormResources): Promise<SugarContent> {\n        const localizationEntryPoint = await this.generatorSourcesImporter.importLocalization(\n            this.pathToGeneratorRootDir\n        );\n        if (localizationEntryPoint == undefined) {\n            throw new Error(\"Данная версия генератора не поддерживает локализацию.\");\n        }\n        return localizationEntryPoint.getLocalizedSugar(sugarFiles, resources);\n    }\n\n    public async getDictionary(\n        sugarFiles: SugarContent,\n        resources: FormResources\n    ): Promise<LocalizationDictionaryContent> {\n        const localizationEntryPoint = await this.generatorSourcesImporter.importLocalization(\n            this.pathToGeneratorRootDir\n        );\n        if (localizationEntryPoint == undefined) {\n            throw new Error(\"Данная версия генератора не поддерживает локализацию.\");\n        }\n        return localizationEntryPoint.getDictionary(sugarFiles, resources);\n    }\n\n    public async readSources(\n        formSourcesPath: string,\n        farmDirectory: string,\n        hlFarmDirectoryPath: string\n    ): Promise<FormSource> {\n        const readSources: FormGenerator[\"readSources\"] = await this.generatorSourcesImporter.importReadSources(\n            this.pathToGeneratorRootDir\n        );\n        const formSource = await readSources(formSourcesPath, farmDirectory, hlFarmDirectoryPath);\n\n        return formSource;\n    }\n\n    public async getSugarTexts(\n        formSourcesPath: string,\n        farmDirectory: string,\n        hlFarmDirectoryPath: string\n    ): Promise<ExtractorResult> {\n        const getSugarTexts: FormGenerator[\"getSugarTexts\"] = await this.generatorSourcesImporter.importGetSugarTexts(\n            this.pathToGeneratorRootDir\n        );\n        const result = await getSugarTexts(formSourcesPath, farmDirectory, hlFarmDirectoryPath);\n\n        return result;\n    }\n\n    public async getAllDependencies(\n        formSourcesPath: string,\n        farmDirectory: string,\n        hlFarmDirectoryPath: string\n    ): Promise<string[]> {\n        const getAllDependencies = await this.generatorSourcesImporter.importGetAllDependencies(\n            this.pathToGeneratorRootDir\n        );\n        if (getAllDependencies == undefined) {\n            throw new Error(\"This version of generator does not support dependencies extraction\");\n        }\n        const formSource = await getAllDependencies(formSourcesPath, farmDirectory, hlFarmDirectoryPath);\n        return formSource;\n    }\n\n    public async supportsDependenciesExtraction(): Promise<boolean> {\n        const getAllDependenciesHash = await this.generatorSourcesImporter.importGetAllDependenciesHash(\n            this.pathToGeneratorRootDir\n        );\n        return getAllDependenciesHash != undefined;\n    }\n\n    public async getAllDependenciesHash(\n        formSourcesPath: string,\n        farmDirectory: string,\n        hlFarmDirectoryPath: string\n    ): Promise<string> {\n        const getAllDependenciesHash = await this.generatorSourcesImporter.importGetAllDependenciesHash(\n            this.pathToGeneratorRootDir\n        );\n        if (getAllDependenciesHash == undefined) {\n            throw new Error(\"This version of generator does not support dependencies extraction\");\n        }\n        const formSource = await getAllDependenciesHash(formSourcesPath, farmDirectory, hlFarmDirectoryPath);\n        return formSource;\n    }\n\n    public async readSourcesAndProcessSugar(\n        formSourcesPath: string,\n        farmDirectory: string,\n        hlFarmDirectoryPath: string,\n        generationOptions?: GenerationOptions\n    ): Promise<GeneratedForm> {\n        this.maxRequestNumber++;\n        const currentRequestNumber = this.maxRequestNumber;\n        const promise = new Promise<GeneratedForm>((resolve, reject) => {\n            this.processSugarDeferredMap.set(currentRequestNumber, {\n                resolve: resolve,\n                reject: reject,\n            });\n        });\n\n        if (!this.generatorProcess) {\n            this.generatorProcess = this.forkReadSourcesAndProcessSugarWorker();\n        }\n        if (this.useGeneratorRestarting) {\n            if (this.maxRequestNumber % 10 === 0) {\n                console.log(\"Restarting generator\");\n                this.generatorProcess.kill();\n                this.generatorProcess = undefined;\n                this.generatorProcess = this.forkReadSourcesAndProcessSugarWorker();\n                console.log(\"Restarted generator\");\n            }\n        }\n\n        this.generatorProcess.send([\n            this.pathToGeneratorRootDir,\n            formSourcesPath,\n            farmDirectory,\n            hlFarmDirectoryPath,\n            generationOptions,\n            this.purgeCache,\n            currentRequestNumber,\n        ]);\n\n        const result = await promise;\n        this.processSugarDeferredMap.delete(currentRequestNumber);\n        return result;\n    }\n\n    public async processSugar(\n        sugarFiles: SugarContent,\n        resources: FormResources,\n        generationOptions?: GenerationOptions\n    ): Promise<GeneratedForm> {\n        this.maxRequestNumber++;\n        const currentRequestNumber = this.maxRequestNumber;\n        const promise = new Promise<GeneratedForm>((resolve, reject) => {\n            this.processSugarDeferredMap.set(currentRequestNumber, {\n                resolve: resolve,\n                reject: reject,\n            });\n        });\n\n        if (!this.generatorProcess) {\n            this.generatorProcess = this.forkProcessSugarWorker();\n        }\n\n        this.generatorProcess.send([\n            this.pathToGeneratorRootDir,\n            sugarFiles,\n            resources,\n            generationOptions,\n            this.purgeCache,\n            currentRequestNumber,\n        ]);\n\n        const result = await promise;\n        this.processSugarDeferredMap.delete(currentRequestNumber);\n        return result;\n    }\n\n    private forkProcessSugarWorker(): ChildProcess {\n        const processSugarWorker = fork(\"./ProcessSugarWorker\", [], {\n            cwd: __dirname,\n        });\n\n        processSugarWorker.on(\"message\", (response: CallResponse) => {\n            const currentDeferred = this.processSugarDeferredMap.get(response.requestNumber);\n            if (currentDeferred == undefined) {\n                return;\n            }\n            if (response.type === \"Error\") {\n                currentDeferred.reject(new Error(response.errorText));\n            } else {\n                const formContent = response.generatedForm;\n                const result: GeneratedForm = {};\n\n                for (const [key, formContentItem] of iterateEntries(formContent)) {\n                    result[key] =\n                        typeof formContentItem === \"string\"\n                            ? formContentItem\n                            : Buffer.from(formContentItem.payload, formContentItem.encoding);\n                }\n\n                currentDeferred.resolve(result);\n            }\n        });\n\n        processSugarWorker.on(\"error\", error => {\n            throw error;\n        });\n\n        return processSugarWorker;\n    }\n\n    private forkReadSourcesAndProcessSugarWorker(): ChildProcess {\n        const processSugarWorker = fork(\"./ReadSourcesAndProcessSugarWorker\", [], {\n            cwd: __dirname,\n        });\n\n        processSugarWorker.on(\"message\", (response: CallResponse) => {\n            const currentDeferred = this.processSugarDeferredMap.get(response.requestNumber);\n            if (currentDeferred == undefined) {\n                return;\n            }\n            if (response.type === \"Error\") {\n                currentDeferred.reject(new Error(response.errorText));\n            } else {\n                const formContent = response.generatedForm;\n                const result: GeneratedForm = {};\n\n                for (const [key, formContentItem] of iterateEntries(formContent)) {\n                    result[key] =\n                        typeof formContentItem === \"string\"\n                            ? formContentItem\n                            : Buffer.from(formContentItem.payload, formContentItem.encoding);\n                }\n\n                currentDeferred.resolve(result);\n            }\n        });\n\n        processSugarWorker.on(\"error\", error => {\n            throw error;\n        });\n\n        return processSugarWorker;\n    }\n}\n\nconst generatorsCache: Map<string, GeneratorAsyncProxy> = new Map();\n\nexport function createAsyncGenerator(\n    pathToGeneratorRootDir: string,\n    purgeCache: boolean,\n    useGeneratorRestarting: boolean\n): FormGenerator {\n    let result = generatorsCache.get(pathToGeneratorRootDir);\n    if (result == undefined) {\n        result = new GeneratorAsyncProxy(pathToGeneratorRootDir, purgeCache, useGeneratorRestarting);\n        generatorsCache.set(pathToGeneratorRootDir, result);\n    }\n    return result;\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"CreateAsyncGenerator.js","names":["_child_process","require","_IterableUtils","_GeneratorRequireUtils","GeneratorAsyncProxy","constructor","pathToGeneratorRootDir","purgeCache","useGeneratorRestarting","generatorSourcesImporter","generatorProcess","maxRequestNumber","processSugarDeferredMap","Map","GeneratorSourcesImporter","getLocalizedSugar","sugarFiles","resources","localizationEntryPoint","importLocalization","undefined","Error","getDictionary","readSources","formSourcesPath","farmDirectory","importReadSources","getSugarTexts","importGetSugarTexts","getAllDependencies","importGetAllDependencies","supportsDependenciesExtraction","getAllDependenciesHash","importGetAllDependenciesHash","readSourcesAndProcessSugar","generationOptions","currentRequestNumber","promise","Promise","resolve","reject","set","forkReadSourcesAndProcessSugarWorker","console","log","kill","send","result","delete","processSugarWorker","fork","cwd","__dirname","on","response","currentDeferred","get","requestNumber","type","errorText","formContent","generatedForm","key","formContentItem","iterateEntries","Buffer","from","payload","encoding","error","generatorsCache","createAsyncGenerator"],"sources":["../../../../../../src/BuildTasks/Generator/GeneratorWorker/CreateAsyncGenerator.ts"],"sourcesContent":["/* eslint-disable no-console */\nimport { ChildProcess, fork } from \"child_process\";\n\nimport {\n    FormGenerator,\n    GeneratedForm,\n    GenerationOptions,\n    LocalizationDictionaryContent,\n} from \"../../Form/GenerateForm\";\nimport { FormResources, FormSource, SugarContent } from \"../../FormSource\";\nimport { iterateEntries } from \"../../../../../Common/IterableUtils\";\nimport { ExtractorResult } from \"../../../../../Common/TextExtractor/TextExtractorTypes\";\n\nimport { GeneratorSourcesImporter } from \"./GeneratorRequireUtils\";\nimport type { CallResponse } from \"./ReadSourcesAndProcessSugarWorker\";\n\ninterface ProcessSugarDeferred {\n    resolve: (result: GeneratedForm) => void;\n    reject: (error: unknown) => void;\n}\n\nclass GeneratorAsyncProxy implements FormGenerator {\n    private readonly pathToGeneratorRootDir: string;\n    private readonly generatorSourcesImporter: GeneratorSourcesImporter;\n    private readonly purgeCache: boolean;\n    private readonly useGeneratorRestarting: boolean;\n    private generatorProcess?: ChildProcess;\n    private maxRequestNumber = 0;\n    private readonly processSugarDeferredMap: Map<number, ProcessSugarDeferred> = new Map();\n\n    public constructor(pathToGeneratorRootDir: string, purgeCache: boolean, useGeneratorRestarting: boolean) {\n        this.useGeneratorRestarting = useGeneratorRestarting;\n        this.pathToGeneratorRootDir = pathToGeneratorRootDir;\n        this.purgeCache = purgeCache;\n        this.generatorSourcesImporter = new GeneratorSourcesImporter(this.pathToGeneratorRootDir, this.purgeCache);\n    }\n\n    public async getLocalizedSugar(sugarFiles: SugarContent, resources: FormResources): Promise<SugarContent> {\n        const localizationEntryPoint = await this.generatorSourcesImporter.importLocalization();\n        if (localizationEntryPoint == undefined) {\n            throw new Error(\"Данная версия генератора не поддерживает локализацию.\");\n        }\n        return localizationEntryPoint.getLocalizedSugar(sugarFiles, resources);\n    }\n\n    public async getDictionary(\n        sugarFiles: SugarContent,\n        resources: FormResources\n    ): Promise<LocalizationDictionaryContent> {\n        const localizationEntryPoint = await this.generatorSourcesImporter.importLocalization();\n        if (localizationEntryPoint == undefined) {\n            throw new Error(\"Данная версия генератора не поддерживает локализацию.\");\n        }\n        return localizationEntryPoint.getDictionary(sugarFiles, resources);\n    }\n\n    public async readSources(formSourcesPath: string, farmDirectory: string): Promise<FormSource> {\n        const readSources: FormGenerator[\"readSources\"] = await this.generatorSourcesImporter.importReadSources();\n        return await readSources(formSourcesPath, farmDirectory);\n    }\n\n    public async getSugarTexts(formSourcesPath: string, farmDirectory: string): Promise<ExtractorResult> {\n        const getSugarTexts: FormGenerator[\"getSugarTexts\"] = await this.generatorSourcesImporter.importGetSugarTexts();\n        return await getSugarTexts(formSourcesPath, farmDirectory);\n    }\n\n    public async getAllDependencies(formSourcesPath: string, farmDirectory: string): Promise<string[]> {\n        const getAllDependencies = await this.generatorSourcesImporter.importGetAllDependencies();\n        return await getAllDependencies(formSourcesPath, farmDirectory);\n    }\n\n    public async supportsDependenciesExtraction(): Promise<boolean> {\n        const getAllDependenciesHash = await this.generatorSourcesImporter.importGetAllDependenciesHash();\n        return getAllDependenciesHash != undefined;\n    }\n\n    public async getAllDependenciesHash(formSourcesPath: string, farmDirectory: string): Promise<string> {\n        const getAllDependenciesHash = await this.generatorSourcesImporter.importGetAllDependenciesHash();\n        return await getAllDependenciesHash(formSourcesPath, farmDirectory);\n    }\n\n    public async readSourcesAndProcessSugar(\n        formSourcesPath: string,\n        farmDirectory: string,\n        generationOptions?: GenerationOptions\n    ): Promise<GeneratedForm> {\n        this.maxRequestNumber++;\n        const currentRequestNumber = this.maxRequestNumber;\n        const promise = new Promise<GeneratedForm>((resolve, reject) => {\n            this.processSugarDeferredMap.set(currentRequestNumber, {\n                resolve: resolve,\n                reject: reject,\n            });\n        });\n\n        if (!this.generatorProcess) {\n            this.generatorProcess = this.forkReadSourcesAndProcessSugarWorker();\n        }\n        if (this.useGeneratorRestarting) {\n            if (this.maxRequestNumber % 10 === 0) {\n                console.log(\"Restarting generator\");\n                this.generatorProcess.kill();\n                this.generatorProcess = undefined;\n                this.generatorProcess = this.forkReadSourcesAndProcessSugarWorker();\n                console.log(\"Restarted generator\");\n            }\n        }\n\n        this.generatorProcess.send([\n            this.pathToGeneratorRootDir,\n            formSourcesPath,\n            farmDirectory,\n            generationOptions,\n            this.purgeCache,\n            currentRequestNumber,\n        ]);\n\n        const result = await promise;\n        this.processSugarDeferredMap.delete(currentRequestNumber);\n        return result;\n    }\n\n    private forkReadSourcesAndProcessSugarWorker(): ChildProcess {\n        const processSugarWorker = fork(\"./ReadSourcesAndProcessSugarWorker\", [], {\n            cwd: __dirname,\n        });\n\n        processSugarWorker.on(\"message\", (response: CallResponse) => {\n            const currentDeferred = this.processSugarDeferredMap.get(response.requestNumber);\n            if (currentDeferred == undefined) {\n                return;\n            }\n            if (response.type === \"Error\") {\n                currentDeferred.reject(new Error(response.errorText));\n            } else {\n                const formContent = response.generatedForm;\n                const result: GeneratedForm = {};\n\n                for (const [key, formContentItem] of iterateEntries(formContent)) {\n                    result[key] =\n                        typeof formContentItem === \"string\"\n                            ? formContentItem\n                            : Buffer.from(formContentItem.payload, formContentItem.encoding);\n                }\n\n                currentDeferred.resolve(result);\n            }\n        });\n\n        processSugarWorker.on(\"error\", error => {\n            throw error;\n        });\n\n        return processSugarWorker;\n    }\n}\n\nconst generatorsCache: Map<string, GeneratorAsyncProxy> = new Map();\n\nexport function createAsyncGenerator(\n    pathToGeneratorRootDir: string,\n    purgeCache: boolean,\n    useGeneratorRestarting: boolean\n): FormGenerator {\n    let result = generatorsCache.get(pathToGeneratorRootDir);\n    if (result == undefined) {\n        result = new GeneratorAsyncProxy(pathToGeneratorRootDir, purgeCache, useGeneratorRestarting);\n        generatorsCache.set(pathToGeneratorRootDir, result);\n    }\n    return result;\n}\n"],"mappings":"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","ignoreList":[]}

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

@@ -4,87 +4,37 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.GeneratorSourcesValidator = exports.GeneratorSourcesImporter = void 0;
-var path = _interopRequireWildcard(require("path"));
-var _fsExtra = require("fs-extra");
-var _FsUtils = require("../../../Commons/FsUtils");
-var _EngineStructureUtils = require("../../EngineStructureUtils");
-var _ReadFormSource = require("../../ReadFormSource");
 var _ToolsApiClient = require("../../../Commons/ApiClient/ToolsApiClient");
 var _RequireUncached = require("./RequireUncached");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 /* eslint-disable @typescript-eslint/no-unsafe-return */
 
 class GeneratorSourcesImporter {
-  constructor(purgeCache) {
+  constructor(generatorPath, purgeCache) {
+    this.generatorPath = void 0;
     this.purgeCache = void 0;
+    this.generatorPath = generatorPath;
     this.purgeCache = purgeCache;
   }
-  async importReadSources(pathToGenerator) {
-    if (await (0, _EngineStructureUtils.isOldGeneratorSourcesStructure)(pathToGenerator)) {
-      const readSourcesPath = path.join(pathToGenerator, "dist", "generators", "readSources.js");
-      if (await (0, _FsUtils.isFileExists)(readSourcesPath)) {
-        return this.requireUncachedDefault(readSourcesPath);
-      } else {
-        return _ReadFormSource.readFormSource;
-      }
-    } else {
-      const generatorMain = this.requireUncachedAllNamed(pathToGenerator);
-      return generatorMain["readSources"];
-    }
+  async importReadSources() {
+    return this.require("readSources");
   }
-  async importGetSugarTexts(pathToGenerator) {
-    if (await (0, _EngineStructureUtils.isOldGeneratorGetSugarTextsStructure)(pathToGenerator)) {
-      const getSugarTextsPath = path.join(pathToGenerator, "dist", "generators", "getSugarTexts.js");
-      if (await (0, _FsUtils.isFileExists)(getSugarTextsPath)) {
-        return this.requireUncachedDefault(getSugarTextsPath);
-      }
-      throw new Error("Для данной формы извлекание сахара не поддерживается. Подними движок до версии ^5.37.0");
-    } else {
-      const generatorMain = this.requireUncachedAllNamed(pathToGenerator);
-      return generatorMain["getSugarTexts"];
-    }
+  async importGetSugarTexts() {
+    return this.require("getSugarTexts");
   }
-  async importGetAllDependencies(pathToGenerator) {
-    if (await (0, _EngineStructureUtils.isOldGeneratorSourcesStructure)(pathToGenerator)) {
-      return undefined;
-    }
-    const generatorMain = this.requireUncachedAllNamed(pathToGenerator);
-    return generatorMain["getAllDependencies"];
+  async importGetAllDependencies() {
+    return this.require("getAllDependencies");
   }
-  async importGetAllDependenciesHash(pathToGenerator) {
-    if (await (0, _EngineStructureUtils.isOldGeneratorSourcesStructure)(pathToGenerator)) {
-      return undefined;
-    }
-    const generatorMain = this.requireUncachedAllNamed(pathToGenerator);
-    return generatorMain["getAllDependenciesHash"];
+  async importGetAllDependenciesHash() {
+    return this.require("getAllDependenciesHash");
   }
-  async importProcessSugar(pathToGenerator) {
-    if (await (0, _EngineStructureUtils.isOldGeneratorSourcesStructure)(pathToGenerator)) {
-      const processSugarPath = path.join(pathToGenerator, "dist", "generators", "processSugar.js");
-
-      // eslint-disable-next-line @typescript-eslint/no-require-imports
-      return require(processSugarPath).default;
-    } else {
-      const generatorMain = this.requireUncachedAllNamed(pathToGenerator);
-      return generatorMain["processSugar"];
-    }
+  async importProcessSugar() {
+    return this.require("processSugar");
   }
-  async importLocalization(pathToGenerator) {
-    if (await (0, _EngineStructureUtils.isOldGeneratorSourcesStructure)(pathToGenerator)) {
-      const localizationEntryPointPath = path.join(pathToGenerator, "dist", "generators", "localization.js");
-      if (!(await (0, _fsExtra.pathExists)(localizationEntryPointPath))) {
-        return undefined;
-      }
-      // eslint-disable-next-line @typescript-eslint/no-require-imports
-      return require(localizationEntryPointPath);
-    } else {
-      const generatorMain = this.requireUncachedAllNamed(pathToGenerator);
-      return generatorMain["localization"];
-    }
+  async importLocalization() {
+    return this.require("localization");
   }
-  requireUncachedDefault(module) {
-    return (0, _RequireUncached.requireUncachedDefault)(module, this.purgeCache);
+  async require(name) {
+    return this.requireUncachedAllNamed(this.generatorPath)[name];
   }
   requireUncachedAllNamed(module) {
     return (0, _RequireUncached.requireUncachedAllNamed)(module, this.purgeCache);

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

@@ -1 +1 @@
-{"version":3,"file":"GeneratorRequireUtils.js","names":["path","_interopRequireWildcard","require","_fsExtra","_FsUtils","_EngineStructureUtils","_ReadFormSource","_ToolsApiClient","_RequireUncached","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","GeneratorSourcesImporter","constructor","purgeCache","importReadSources","pathToGenerator","isOldGeneratorSourcesStructure","readSourcesPath","join","isFileExists","requireUncachedDefault","readFormSource","generatorMain","requireUncachedAllNamed","importGetSugarTexts","isOldGeneratorGetSugarTextsStructure","getSugarTextsPath","Error","importGetAllDependencies","undefined","importGetAllDependenciesHash","importProcessSugar","processSugarPath","importLocalization","localizationEntryPointPath","pathExists","module","exports","GeneratorSourcesValidator","generationOptions","isLocalDebug","apiClient","validate","formContent","compileNormalizationRulesOrDie","_compileResult$diagno","_compileResult$diagno2","normalizationRules","compileResult","compileNormalizationRules","diagnosticMessages","length","JSON","stringify","sourceText","resourcesHash","ToolsApiClient"],"sources":["../../../../../../src/BuildTasks/Generator/GeneratorWorker/GeneratorRequireUtils.ts"],"sourcesContent":["/* eslint-disable @typescript-eslint/no-unsafe-return */\nimport * as path from \"path\";\n\nimport { pathExists } from \"fs-extra\";\n\nimport { isFileExists } from \"../../../Commons/FsUtils\";\nimport { isOldGeneratorGetSugarTextsStructure, isOldGeneratorSourcesStructure } from \"../../EngineStructureUtils\";\nimport { FormGenerator, GeneratedForm, GenerationOptions, LocalizationEntryPoint } from \"../../Form/GenerateForm\";\nimport { FormResources, readFormSource, SugarContent } from \"../../ReadFormSource\";\nimport { ToolsApiClient } from \"../../../Commons/ApiClient/ToolsApiClient\";\n\nimport { RequireDefaultResult, requireUncachedAllNamed, requireUncachedDefault } 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 purgeCache: boolean;\n\n    public constructor(purgeCache: boolean) {\n        this.purgeCache = purgeCache;\n    }\n\n    public async importReadSources(pathToGenerator: string): Promise<FormGenerator[\"readSources\"]> {\n        if (await isOldGeneratorSourcesStructure(pathToGenerator)) {\n            const readSourcesPath = path.join(pathToGenerator, \"dist\", \"generators\", \"readSources.js\");\n\n            if (await isFileExists(readSourcesPath)) {\n                return this.requireUncachedDefault(readSourcesPath);\n            } else {\n                return readFormSource;\n            }\n        } else {\n            const generatorMain = this.requireUncachedAllNamed(pathToGenerator);\n            return generatorMain[\"readSources\"];\n        }\n    }\n\n    public async importGetSugarTexts(pathToGenerator: string): Promise<FormGenerator[\"getSugarTexts\"]> {\n        if (await isOldGeneratorGetSugarTextsStructure(pathToGenerator)) {\n            const getSugarTextsPath = path.join(pathToGenerator, \"dist\", \"generators\", \"getSugarTexts.js\");\n\n            if (await isFileExists(getSugarTextsPath)) {\n                return this.requireUncachedDefault(getSugarTextsPath);\n            }\n            throw new Error(\"Для данной формы извлекание сахара не поддерживается. Подними движок до версии ^5.37.0\");\n        } else {\n            const generatorMain = this.requireUncachedAllNamed(pathToGenerator);\n            return generatorMain[\"getSugarTexts\"];\n        }\n    }\n\n    public async importGetAllDependencies(\n        pathToGenerator: string\n    ): Promise<FormGenerator[\"getAllDependencies\"] | undefined> {\n        if (await isOldGeneratorSourcesStructure(pathToGenerator)) {\n            return undefined;\n        }\n        const generatorMain = this.requireUncachedAllNamed(pathToGenerator);\n        return generatorMain[\"getAllDependencies\"];\n    }\n\n    public async importGetAllDependenciesHash(\n        pathToGenerator: string\n    ): Promise<FormGenerator[\"getAllDependenciesHash\"] | undefined> {\n        if (await isOldGeneratorSourcesStructure(pathToGenerator)) {\n            return undefined;\n        }\n        const generatorMain = this.requireUncachedAllNamed(pathToGenerator);\n        return generatorMain[\"getAllDependenciesHash\"];\n    }\n\n    public async importProcessSugar(pathToGenerator: string): Promise<ProcessSugarFunc> {\n        if (await isOldGeneratorSourcesStructure(pathToGenerator)) {\n            const processSugarPath = path.join(pathToGenerator, \"dist\", \"generators\", \"processSugar.js\");\n\n            // eslint-disable-next-line @typescript-eslint/no-require-imports\n            return require(processSugarPath).default;\n        } else {\n            const generatorMain = this.requireUncachedAllNamed(pathToGenerator);\n            return generatorMain[\"processSugar\"];\n        }\n    }\n\n    public async importLocalization(pathToGenerator: string): Promise<undefined | LocalizationEntryPoint> {\n        if (await isOldGeneratorSourcesStructure(pathToGenerator)) {\n            const localizationEntryPointPath = path.join(pathToGenerator, \"dist\", \"generators\", \"localization.js\");\n            if (!(await pathExists(localizationEntryPointPath))) {\n                return undefined;\n            }\n            // eslint-disable-next-line @typescript-eslint/no-require-imports\n            return require(localizationEntryPointPath);\n        } else {\n            const generatorMain = this.requireUncachedAllNamed(pathToGenerator);\n            return generatorMain[\"localization\"];\n        }\n    }\n    private requireUncachedDefault(module: string): RequireDefaultResult {\n        return requireUncachedDefault(module, this.purgeCache);\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":"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","ignoreList":[]}
+{"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":[]}

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

@@ -3,13 +3,13 @@
 var _IterableUtils = require("../../../../../Common/IterableUtils");
 var _GeneratorRequireUtils = require("./GeneratorRequireUtils");
 var _TypedProcessWorker = require("./TypedProcessWorker");
-_TypedProcessWorker.TypedProcessWorker.start(async ([pathToGeneratorProcessSugar, formSourcesPath, farmDirectory, hlFarmDirectoryPath, generationOptions, purgeCache, requestNumber], send) => {
+_TypedProcessWorker.TypedProcessWorker.start(async ([pathToGeneratorProcessSugar, formSourcesPath, farmDirectory, generationOptions, purgeCache, requestNumber], send) => {
   let formSource;
   try {
-    const importer = new _GeneratorRequireUtils.GeneratorSourcesImporter(purgeCache);
-    const readSources = await importer.importReadSources(pathToGeneratorProcessSugar);
-    formSource = await readSources(formSourcesPath, farmDirectory, hlFarmDirectoryPath);
-    const processSugar = await importer.importProcessSugar(pathToGeneratorProcessSugar);
+    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);
 
     // eslint-disable-next-line no-warning-comments

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","hlFarmDirectoryPath","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 { GeneratedForm, GenerationOptions } from \"../../Form/GenerateForm\";\nimport { FormSource } from \"../../ReadFormSource\";\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: string };\n}\n\nexport type CallMessage = [string, string, string, string, undefined | GenerationOptions, boolean, number];\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        [\n            pathToGeneratorProcessSugar,\n            formSourcesPath,\n            farmDirectory,\n            hlFarmDirectoryPath,\n            generationOptions,\n            purgeCache,\n            requestNumber,\n        ],\n        send\n    ): Promise<void> => {\n        let formSource: FormSource | undefined;\n        try {\n            const importer = new GeneratorSourcesImporter(purgeCache);\n            const readSources = await importer.importReadSources(pathToGeneratorProcessSugar);\n            formSource = await readSources(formSourcesPath, farmDirectory, hlFarmDirectoryPath);\n\n            const processSugar = await importer.importProcessSugar(pathToGeneratorProcessSugar);\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;AAWAG,sCAAkB,CAACC,KAAK,CACpB,OACI,CACIC,2BAA2B,EAC3BC,eAAe,EACfC,aAAa,EACbC,mBAAmB,EACnBC,iBAAiB,EACjBC,UAAU,EACVC,aAAa,CAChB,EACDC,IAAI,KACY;EAChB,IAAIC,UAAkC;EACtC,IAAI;IACA,MAAMC,QAAQ,GAAG,IAAIC,+CAAwB,CAACL,UAAU,CAAC;IACzD,MAAMM,WAAW,GAAG,MAAMF,QAAQ,CAACG,iBAAiB,CAACZ,2BAA2B,CAAC;IACjFQ,UAAU,GAAG,MAAMG,WAAW,CAACV,eAAe,EAAEC,aAAa,EAAEC,mBAAmB,CAAC;IAEnF,MAAMU,YAAY,GAAG,MAAMJ,QAAQ,CAACK,kBAAkB,CAACd,2BAA2B,CAAC;IAEnF,MAAMe,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":["_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":[]}

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

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.requireUncachedAllNamed = requireUncachedAllNamed;
-exports.requireUncachedDefault = requireUncachedDefault;
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -30,14 +29,6 @@ function interopRequireDefault(obj) {
     default: obj
   };
 }
-function requireUncachedDefault(module, purgeCacheOnImport) {
-  if (purgeCacheOnImport) {
-    purgeCache(module);
-  }
-
-  // eslint-disable-next-line @typescript-eslint/no-require-imports
-  return interopRequireDefault(require(module)).default;
-}
 function requireUncachedAllNamed(module, purgeCacheOnImport) {
   if (purgeCacheOnImport) {
     purgeCache(module);

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

@@ -1 +1 @@
-{"version":3,"file":"RequireUncached.js","names":["purgeCache","moduleName","moduleKey","require","resolve","module","cache","Array","isArray","children","subModule","id","isEsModule","obj","__esModule","interopRequireDefault","default","requireUncachedDefault","purgeCacheOnImport","requireUncachedAllNamed"],"sources":["../../../../../../src/BuildTasks/Generator/GeneratorWorker/RequireUncached.ts"],"sourcesContent":["interface EsRequireResult {\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    default?: any;\n    __esModule?: boolean;\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    [module: string]: any;\n}\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\ntype CommonJsRequireResult = any;\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nexport type RequireDefaultResult = any;\n\nfunction purgeCache(moduleName: string): void {\n    const moduleKey = require.resolve(moduleName);\n    const module: undefined | NodeModule = require.cache[moduleKey];\n\n    if (module) {\n        delete require.cache[moduleKey];\n\n        if (Array.isArray(module.children)) {\n            for (const subModule of module.children) {\n                purgeCache(subModule.id);\n            }\n        }\n    }\n}\n\nfunction isEsModule(obj: EsRequireResult | CommonJsRequireResult): obj is EsRequireResult {\n    // eslint-disable-next-line @typescript-eslint/no-unsafe-return\n    return obj && obj.__esModule;\n}\n\nfunction interopRequireDefault(obj: EsRequireResult | CommonJsRequireResult): EsRequireResult {\n    return isEsModule(obj) ? obj : { default: obj };\n}\n\nexport function requireUncachedDefault(module: string, purgeCacheOnImport: boolean): RequireDefaultResult {\n    if (purgeCacheOnImport) {\n        purgeCache(module);\n    }\n\n    // eslint-disable-next-line @typescript-eslint/no-require-imports\n    return interopRequireDefault(require(module)).default;\n}\n\nexport function requireUncachedAllNamed(module: string, purgeCacheOnImport: boolean): RequireDefaultResult {\n    if (purgeCacheOnImport) {\n        purgeCache(module);\n    }\n\n    // eslint-disable-next-line @typescript-eslint/no-require-imports\n    return interopRequireDefault(require(module));\n}\n"],"mappings":";;;;;;;AAQA;;AAGA;;AAGA,SAASA,UAAUA,CAACC,UAAkB,EAAQ;EAC1C,MAAMC,SAAS,GAAGC,OAAO,CAACC,OAAO,CAACH,UAAU,CAAC;EAC7C,MAAMI,MAA8B,GAAGF,OAAO,CAACG,KAAK,CAACJ,SAAS,CAAC;EAE/D,IAAIG,MAAM,EAAE;IACR,OAAOF,OAAO,CAACG,KAAK,CAACJ,SAAS,CAAC;IAE/B,IAAIK,KAAK,CAACC,OAAO,CAACH,MAAM,CAACI,QAAQ,CAAC,EAAE;MAChC,KAAK,MAAMC,SAAS,IAAIL,MAAM,CAACI,QAAQ,EAAE;QACrCT,UAAU,CAACU,SAAS,CAACC,EAAE,CAAC;MAC5B;IACJ;EACJ;AACJ;AAEA,SAASC,UAAUA,CAACC,GAA4C,EAA0B;EACtF;EACA,OAAOA,GAAG,IAAIA,GAAG,CAACC,UAAU;AAChC;AAEA,SAASC,qBAAqBA,CAACF,GAA4C,EAAmB;EAC1F,OAAOD,UAAU,CAACC,GAAG,CAAC,GAAGA,GAAG,GAAG;IAAEG,OAAO,EAAEH;EAAI,CAAC;AACnD;AAEO,SAASI,sBAAsBA,CAACZ,MAAc,EAAEa,kBAA2B,EAAwB;EACtG,IAAIA,kBAAkB,EAAE;IACpBlB,UAAU,CAACK,MAAM,CAAC;EACtB;;EAEA;EACA,OAAOU,qBAAqB,CAACZ,OAAO,CAACE,MAAM,CAAC,CAAC,CAACW,OAAO;AACzD;AAEO,SAASG,uBAAuBA,CAACd,MAAc,EAAEa,kBAA2B,EAAwB;EACvG,IAAIA,kBAAkB,EAAE;IACpBlB,UAAU,CAACK,MAAM,CAAC;EACtB;;EAEA;EACA,OAAOU,qBAAqB,CAACZ,OAAO,CAACE,MAAM,CAAC,CAAC;AACjD","ignoreList":[]}
+{"version":3,"file":"RequireUncached.js","names":["purgeCache","moduleName","moduleKey","require","resolve","module","cache","Array","isArray","children","subModule","id","isEsModule","obj","__esModule","interopRequireDefault","default","requireUncachedAllNamed","purgeCacheOnImport"],"sources":["../../../../../../src/BuildTasks/Generator/GeneratorWorker/RequireUncached.ts"],"sourcesContent":["interface EsRequireResult {\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    default?: any;\n    __esModule?: boolean;\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    [module: string]: any;\n}\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\ntype CommonJsRequireResult = any;\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nexport type RequireDefaultResult = any;\n\nfunction purgeCache(moduleName: string): void {\n    const moduleKey = require.resolve(moduleName);\n    const module: undefined | NodeModule = require.cache[moduleKey];\n\n    if (module) {\n        delete require.cache[moduleKey];\n\n        if (Array.isArray(module.children)) {\n            for (const subModule of module.children) {\n                purgeCache(subModule.id);\n            }\n        }\n    }\n}\n\nfunction isEsModule(obj: EsRequireResult | CommonJsRequireResult): obj is EsRequireResult {\n    // eslint-disable-next-line @typescript-eslint/no-unsafe-return\n    return obj && obj.__esModule;\n}\n\nfunction interopRequireDefault(obj: EsRequireResult | CommonJsRequireResult): EsRequireResult {\n    return isEsModule(obj) ? obj : { default: obj };\n}\n\nexport function requireUncachedAllNamed(module: string, purgeCacheOnImport: boolean): RequireDefaultResult {\n    if (purgeCacheOnImport) {\n        purgeCache(module);\n    }\n\n    // eslint-disable-next-line @typescript-eslint/no-require-imports\n    return interopRequireDefault(require(module));\n}\n"],"mappings":";;;;;;AAQA;;AAGA;;AAGA,SAASA,UAAUA,CAACC,UAAkB,EAAQ;EAC1C,MAAMC,SAAS,GAAGC,OAAO,CAACC,OAAO,CAACH,UAAU,CAAC;EAC7C,MAAMI,MAA8B,GAAGF,OAAO,CAACG,KAAK,CAACJ,SAAS,CAAC;EAE/D,IAAIG,MAAM,EAAE;IACR,OAAOF,OAAO,CAACG,KAAK,CAACJ,SAAS,CAAC;IAE/B,IAAIK,KAAK,CAACC,OAAO,CAACH,MAAM,CAACI,QAAQ,CAAC,EAAE;MAChC,KAAK,MAAMC,SAAS,IAAIL,MAAM,CAACI,QAAQ,EAAE;QACrCT,UAAU,CAACU,SAAS,CAACC,EAAE,CAAC;MAC5B;IACJ;EACJ;AACJ;AAEA,SAASC,UAAUA,CAACC,GAA4C,EAA0B;EACtF;EACA,OAAOA,GAAG,IAAIA,GAAG,CAACC,UAAU;AAChC;AAEA,SAASC,qBAAqBA,CAACF,GAA4C,EAAmB;EAC1F,OAAOD,UAAU,CAACC,GAAG,CAAC,GAAGA,GAAG,GAAG;IAAEG,OAAO,EAAEH;EAAI,CAAC;AACnD;AAEO,SAASI,uBAAuBA,CAACZ,MAAc,EAAEa,kBAA2B,EAAwB;EACvG,IAAIA,kBAAkB,EAAE;IACpBlB,UAAU,CAACK,MAAM,CAAC;EACtB;;EAEA;EACA,OAAOU,qBAAqB,CAACZ,OAAO,CAACE,MAAM,CAAC,CAAC;AACjD","ignoreList":[]}

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

@@ -44,7 +44,7 @@ function getGeneratorVersion(generatorSource) {
     throw new Error("InvalidProgramState");
   }
 }
-async function runBuildForms(context, options, farmDirectory, resourcesDirectory, engineDirectory, candyModulesDirectory, hlFarmDirectoryPath) {
+async function runBuildForms(context, options, farmDirectory, resourcesDirectory, engineDirectory, candyModulesDirectory) {
   const buildOptions = options;
   const pickListsChain = _Observe.Observe.files(_path.default.join(farmDirectory, "picklists"), "*.json").do(x => _FSTask.FSTask.copyRecursively(context.logger.withPrefix("PICKLISTS"), x, _path.default.join(resourcesDirectory, "picklists")));
   const formInfos = await _FormGlobsUtils.FormGlobs.resolveGfvGlobs(options.formGlobs, farmDirectory);
@@ -124,7 +124,7 @@ async function runBuildForms(context, options, farmDirectory, resourcesDirectory
         };
       }
       if (await fi.generator.supportsDependenciesExtraction()) {
-        dependenciesHash = await fi.generator.getAllDependenciesHash(formDirPath, farmDirectory, hlFarmDirectoryPath);
+        dependenciesHash = await fi.generator.getAllDependenciesHash(formDirPath, farmDirectory);
       }
       return {
         ...fi,
@@ -148,7 +148,7 @@ async function runBuildForms(context, options, farmDirectory, resourcesDirectory
         context.logger.withPrefix(`GENERATE:${gfv}`).log("Skipped due build cache exits");
         return undefined;
       }
-      return (0, _GenerateForm.generateForm)(fi.formSourcesPath, farmDirectory, hlFarmDirectoryPath, fi.generator, 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"
       });