@kontur.candy/tools 2.254.0 → 2.256.0

package/distr/Common/async/pool/Registry.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Registry.js","names":["State","exports","Registry","constructor","states","Map","stateOf","item","ensureHas","get","add","has","Error","set","Idle","capture","expect","Busy","free","doom","Doomed","remove","delete","findBusy","_this$states$entries$","entries","find","_","state","doomAll","idles","push"],"sources":["../../../../../Common/async/pool/Registry.ts"],"sourcesContent":["export const enum State {\n    Idle = \"Idle\",\n    Busy = \"Busy\",\n    Doomed = \"Doomed\",\n}\n\nexport class Registry<Item> {\n    private readonly states = new Map<Item, State>();\n\n    public stateOf(item: Item): State {\n        this.ensureHas(item);\n        // @ts-expect-error item точно есть\n        return this.states.get(item);\n    }\n\n    public add(item: Item): void {\n        if (this.states.has(item)) {\n            throw new Error(\"Registry: duplicate\");\n        }\n        this.states.set(item, State.Idle);\n    }\n\n    public capture(item: Item): Item {\n        this.expect(item, State.Idle);\n        this.states.set(item, State.Busy);\n        return item;\n    }\n\n    public free(item: Item): void {\n        this.expect(item, State.Busy);\n        this.states.set(item, State.Idle);\n    }\n\n    public doom(item: Item): void {\n        this.ensureHas(item);\n        this.states.set(item, State.Doomed);\n    }\n\n    public remove(item: Item): void {\n        if (!this.states.delete(item)) {\n            throw new Error(\"Registry: remove unexpected\");\n        }\n    }\n\n    public findBusy(): Item | undefined {\n        return this.states.entries().find(([_, state]) => state === State.Busy)?.[0];\n    }\n\n    public doomAll(): Item[] {\n        const idles: Item[] = [];\n        for (const [item, state] of this.states.entries()) {\n            this.states.set(item, State.Doomed);\n            if (state === State.Idle) {\n                idles.push(item);\n            }\n        }\n        return idles;\n    }\n\n    private expect(item: Item, state: State): void {\n        this.ensureHas(item);\n        if (this.states.get(item) !== state) {\n            throw new Error(\"Registry: unexpected state\");\n        }\n    }\n\n    private ensureHas(item: Item): void {\n        if (!this.states.has(item)) {\n            throw new Error(\"Registry: unexpected item\");\n        }\n    }\n}\n"],"mappings":"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","ignoreList":[]}

package/distr/Common/async/pool/index.js

@@ -0,0 +1,13 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "FixedPool", {
+  enumerable: true,
+  get: function () {
+    return _FixedPool.FixedPool;
+  }
+});
+var _FixedPool = require("./FixedPool");
+//# sourceMappingURL=index.js.map

package/distr/Common/async/pool/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","names":["_FixedPool","require"],"sources":["../../../../../Common/async/pool/index.ts"],"sourcesContent":["export type { Disposable } from \"./AsyncPool\";\nexport { FixedPool } from \"./FixedPool\";\n"],"mappings":";;;;;;;;;;;AACA,IAAAA,UAAA,GAAAC,OAAA","ignoreList":[]}

package/distr/Common/ds/LinkedList.js

@@ -0,0 +1,64 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.LinkedList = void 0;
+class LinkedListClass {
+  constructor() {
+    this.length = 0;
+    this.first = null;
+    this.last = null;
+  }
+  empty() {
+    return this.length === 0;
+  }
+  notEmpty() {
+    return this.length > 0;
+  }
+  clear() {
+    this.length = 0;
+    this.first = null;
+    this.last = null;
+  }
+  forEach(fn) {
+    let current = this.first;
+    while (current !== null) {
+      fn(current.item);
+      current = current.next;
+    }
+  }
+  push(item) {
+    this.length++;
+    const last = this.last;
+    const element = {
+      prev: last,
+      next: null,
+      item: item
+    };
+    if (last) {
+      last.next = element;
+    } else {
+      this.first = element;
+    }
+    this.last = element;
+  }
+  shift() {
+    if (!this.first) {
+      return undefined;
+    }
+    this.length--;
+    const element = this.first;
+    if (this.last === element) {
+      this.first = null;
+      this.last = null;
+    } else {
+      this.first = element.next;
+      // @ts-expect-error last !== element => element.next !== null
+      this.first.prev = null;
+    }
+    return element.item;
+  }
+}
+const LinkedList = exports.LinkedList = LinkedListClass;
+//# sourceMappingURL=LinkedList.js.map

package/distr/Common/ds/LinkedList.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"LinkedList.js","names":["LinkedListClass","constructor","length","first","last","empty","notEmpty","clear","forEach","fn","current","item","next","push","element","prev","shift","undefined","LinkedList","exports"],"sources":["../../../../Common/ds/LinkedList.ts"],"sourcesContent":["interface Element<Item> {\n    item: Item;\n    prev: Element<Item> | null;\n    next: Element<Item> | null;\n}\n\nclass LinkedListClass<Item> {\n    private length = 0;\n    private first: Element<Item> | null = null;\n    private last: Element<Item> | null = null;\n\n    public empty(): this is EmptyLinkedList<Item> {\n        return this.length === 0;\n    }\n\n    public notEmpty(): this is NonEmptyLinkedList<Item> {\n        return this.length > 0;\n    }\n\n    public clear(): void {\n        this.length = 0;\n        this.first = null;\n        this.last = null;\n    }\n\n    public forEach(fn: (item: Item) => void): void {\n        let current = this.first;\n        while (current !== null) {\n            fn(current.item);\n            current = current.next;\n        }\n    }\n\n    public push(item: Item): void {\n        this.length++;\n        const last = this.last;\n        const element = { prev: last, next: null, item: item };\n        if (last) {\n            last.next = element;\n        } else {\n            this.first = element;\n        }\n        this.last = element;\n    }\n\n    public shift(this: NonEmptyLinkedList<Item>): Item;\n    public shift(this: EmptyLinkedList<Item>): undefined;\n    public shift(): Item | undefined;\n    public shift(): Item | undefined {\n        if (!this.first) {\n            return undefined;\n        }\n        this.length--;\n        const element = this.first;\n        if (this.last === element) {\n            this.first = null;\n            this.last = null;\n        } else {\n            this.first = element.next;\n            // @ts-expect-error last !== element => element.next !== null\n            this.first.prev = null;\n        }\n        return element.item;\n    }\n}\n\ndeclare const State: unique symbol;\ntype EmptyLinkedList<Item> = LinkedListClass<Item> & { readonly [State]: \"empty\" };\ntype NonEmptyLinkedList<Item> = LinkedListClass<Item> & { readonly [State]: \"nonempty\" };\n\nexport type LinkedList<Item> = EmptyLinkedList<Item> | NonEmptyLinkedList<Item>;\n\ninterface LinkedListCtor {\n    new <Item>(): LinkedList<Item>;\n}\n\nexport const LinkedList = LinkedListClass as LinkedListCtor;\n"],"mappings":";;;;;;AAMA,MAAMA,eAAe,CAAO;EAAAC,YAAA;IAAA,KAChBC,MAAM,GAAG,CAAC;IAAA,KACVC,KAAK,GAAyB,IAAI;IAAA,KAClCC,IAAI,GAAyB,IAAI;EAAA;EAElCC,KAAKA,CAAA,EAAkC;IAC1C,OAAO,IAAI,CAACH,MAAM,KAAK,CAAC;EAC5B;EAEOI,QAAQA,CAAA,EAAqC;IAChD,OAAO,IAAI,CAACJ,MAAM,GAAG,CAAC;EAC1B;EAEOK,KAAKA,CAAA,EAAS;IACjB,IAAI,CAACL,MAAM,GAAG,CAAC;IACf,IAAI,CAACC,KAAK,GAAG,IAAI;IACjB,IAAI,CAACC,IAAI,GAAG,IAAI;EACpB;EAEOI,OAAOA,CAACC,EAAwB,EAAQ;IAC3C,IAAIC,OAAO,GAAG,IAAI,CAACP,KAAK;IACxB,OAAOO,OAAO,KAAK,IAAI,EAAE;MACrBD,EAAE,CAACC,OAAO,CAACC,IAAI,CAAC;MAChBD,OAAO,GAAGA,OAAO,CAACE,IAAI;IAC1B;EACJ;EAEOC,IAAIA,CAACF,IAAU,EAAQ;IAC1B,IAAI,CAACT,MAAM,EAAE;IACb,MAAME,IAAI,GAAG,IAAI,CAACA,IAAI;IACtB,MAAMU,OAAO,GAAG;MAAEC,IAAI,EAAEX,IAAI;MAAEQ,IAAI,EAAE,IAAI;MAAED,IAAI,EAAEA;IAAK,CAAC;IACtD,IAAIP,IAAI,EAAE;MACNA,IAAI,CAACQ,IAAI,GAAGE,OAAO;IACvB,CAAC,MAAM;MACH,IAAI,CAACX,KAAK,GAAGW,OAAO;IACxB;IACA,IAAI,CAACV,IAAI,GAAGU,OAAO;EACvB;EAKOE,KAAKA,CAAA,EAAqB;IAC7B,IAAI,CAAC,IAAI,CAACb,KAAK,EAAE;MACb,OAAOc,SAAS;IACpB;IACA,IAAI,CAACf,MAAM,EAAE;IACb,MAAMY,OAAO,GAAG,IAAI,CAACX,KAAK;IAC1B,IAAI,IAAI,CAACC,IAAI,KAAKU,OAAO,EAAE;MACvB,IAAI,CAACX,KAAK,GAAG,IAAI;MACjB,IAAI,CAACC,IAAI,GAAG,IAAI;IACpB,CAAC,MAAM;MACH,IAAI,CAACD,KAAK,GAAGW,OAAO,CAACF,IAAI;MACzB;MACA,IAAI,CAACT,KAAK,CAACY,IAAI,GAAG,IAAI;IAC1B;IACA,OAAOD,OAAO,CAACH,IAAI;EACvB;AACJ;AAYO,MAAMO,UAAU,GAAAC,OAAA,CAAAD,UAAA,GAAGlB,eAAiC","ignoreList":[]}

package/distr/Common/multithread/ThreadPool.js

@@ -0,0 +1,74 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.ThreadPool = void 0;
+var _nodeWorker_threads = require("node:worker_threads");
+var _pool = require("../async/pool");
+var _TypingUtils = require("../TypingUtils");
+class ThreadPool {
+  constructor(ops) {
+    this.pool = void 0;
+    this.pool = new _pool.FixedPool({
+      size: ops.size,
+      fabric: this.fabric.bind(this, ops)
+    });
+  }
+
+  /**
+   * @throws при вызове после {@link ThreadPool.dispose}
+   */
+  exec(message) {
+    if (!this.pool) {
+      return Promise.reject(new Error("ThreadPool: exec on disposed pool"));
+    }
+    return this.pool.exec(({
+      worker
+    }) => this.call(worker, message));
+  }
+  async dispose() {
+    var _this$pool;
+    await ((_this$pool = this.pool) === null || _this$pool === void 0 ? void 0 : _this$pool.dispose());
+    // даем GC собрать
+    this.pool = undefined;
+  }
+  fabric(ops) {
+    const worker = new _nodeWorker_threads.Worker(ops.workerPath, ops.workerOptions);
+    return {
+      worker: worker,
+      dispose: () => worker.terminate().then(_TypingUtils.noop)
+    };
+  }
+  call(worker, message) {
+    const {
+      promise,
+      resolve,
+      reject
+    } = Promise.withResolvers();
+    const cleanup = () => {
+      worker.off("message", onMessage);
+      worker.off("error", onError);
+      worker.off("exit", onExit);
+    };
+    const onMessage = out => {
+      cleanup();
+      resolve(out);
+    };
+    const onError = err => {
+      cleanup();
+      reject(err);
+    };
+    const onExit = code => {
+      cleanup();
+      reject(new Error(`Worker exited with code ${code}`));
+    };
+    worker.once("message", onMessage);
+    worker.once("error", onError);
+    worker.once("exit", onExit);
+    worker.postMessage(message);
+    return promise;
+  }
+}
+exports.ThreadPool = ThreadPool;
+//# sourceMappingURL=ThreadPool.js.map

package/distr/Common/multithread/ThreadPool.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ThreadPool.js","names":["_nodeWorker_threads","require","_pool","_TypingUtils","ThreadPool","constructor","ops","pool","FixedPool","size","fabric","bind","exec","message","Promise","reject","Error","worker","call","dispose","_this$pool","undefined","Worker","workerPath","workerOptions","terminate","then","noop","promise","resolve","withResolvers","cleanup","off","onMessage","onError","onExit","out","err","code","once","postMessage","exports"],"sources":["../../../../Common/multithread/ThreadPool.ts"],"sourcesContent":["import { Worker, WorkerOptions } from \"node:worker_threads\";\n\nimport type { Disposable } from \"../async/pool\";\nimport { FixedPool } from \"../async/pool\";\nimport { noop } from \"../TypingUtils\";\n\ninterface Options {\n    workerPath: string;\n    workerOptions?: WorkerOptions;\n    size: number;\n}\n\ninterface Thread extends Disposable {\n    worker: Worker;\n}\n\nexport class ThreadPool {\n    private pool?: FixedPool<Thread>;\n\n    public constructor(ops: Options) {\n        this.pool = new FixedPool({ size: ops.size, fabric: this.fabric.bind(this, ops) });\n    }\n\n    /**\n     * @throws при вызове после {@link ThreadPool.dispose}\n     */\n    public exec<In, Out>(message: In): Promise<Out> {\n        if (!this.pool) {\n            return Promise.reject(new Error(\"ThreadPool: exec on disposed pool\"));\n        }\n        return this.pool.exec(({ worker }) => this.call<In, Out>(worker, message));\n    }\n\n    public async dispose(): Promise<void> {\n        await this.pool?.dispose();\n        // даем GC собрать\n        this.pool = undefined;\n    }\n\n    private fabric(ops: Options): Thread {\n        const worker = new Worker(ops.workerPath, ops.workerOptions);\n        return { worker: worker, dispose: () => worker.terminate().then(noop) };\n    }\n\n    private call<In, Out>(worker: Worker, message: In): Promise<Out> {\n        const { promise, resolve, reject } = Promise.withResolvers<Out>();\n        const cleanup = (): void => {\n            worker.off(\"message\", onMessage);\n            worker.off(\"error\", onError);\n            worker.off(\"exit\", onExit);\n        };\n        const onMessage = (out: Out): void => {\n            cleanup();\n            resolve(out);\n        };\n        const onError = (err: Error): void => {\n            cleanup();\n            reject(err);\n        };\n        const onExit = (code: number): void => {\n            cleanup();\n            reject(new Error(`Worker exited with code ${code}`));\n        };\n        worker.once(\"message\", onMessage);\n        worker.once(\"error\", onError);\n        worker.once(\"exit\", onExit);\n        worker.postMessage(message);\n        return promise;\n    }\n}\n"],"mappings":";;;;;;AAAA,IAAAA,mBAAA,GAAAC,OAAA;AAGA,IAAAC,KAAA,GAAAD,OAAA;AACA,IAAAE,YAAA,GAAAF,OAAA;AAYO,MAAMG,UAAU,CAAC;EAGbC,WAAWA,CAACC,GAAY,EAAE;IAAA,KAFzBC,IAAI;IAGR,IAAI,CAACA,IAAI,GAAG,IAAIC,eAAS,CAAC;MAAEC,IAAI,EAAEH,GAAG,CAACG,IAAI;MAAEC,MAAM,EAAE,IAAI,CAACA,MAAM,CAACC,IAAI,CAAC,IAAI,EAAEL,GAAG;IAAE,CAAC,CAAC;EACtF;;EAEA;AACJ;AACA;EACWM,IAAIA,CAAUC,OAAW,EAAgB;IAC5C,IAAI,CAAC,IAAI,CAACN,IAAI,EAAE;MACZ,OAAOO,OAAO,CAACC,MAAM,CAAC,IAAIC,KAAK,CAAC,mCAAmC,CAAC,CAAC;IACzE;IACA,OAAO,IAAI,CAACT,IAAI,CAACK,IAAI,CAAC,CAAC;MAAEK;IAAO,CAAC,KAAK,IAAI,CAACC,IAAI,CAAUD,MAAM,EAAEJ,OAAO,CAAC,CAAC;EAC9E;EAEA,MAAaM,OAAOA,CAAA,EAAkB;IAAA,IAAAC,UAAA;IAClC,QAAAA,UAAA,GAAM,IAAI,CAACb,IAAI,cAAAa,UAAA,uBAATA,UAAA,CAAWD,OAAO,CAAC,CAAC;IAC1B;IACA,IAAI,CAACZ,IAAI,GAAGc,SAAS;EACzB;EAEQX,MAAMA,CAACJ,GAAY,EAAU;IACjC,MAAMW,MAAM,GAAG,IAAIK,0BAAM,CAAChB,GAAG,CAACiB,UAAU,EAAEjB,GAAG,CAACkB,aAAa,CAAC;IAC5D,OAAO;MAAEP,MAAM,EAAEA,MAAM;MAAEE,OAAO,EAAEA,CAAA,KAAMF,MAAM,CAACQ,SAAS,CAAC,CAAC,CAACC,IAAI,CAACC,iBAAI;IAAE,CAAC;EAC3E;EAEQT,IAAIA,CAAUD,MAAc,EAAEJ,OAAW,EAAgB;IAC7D,MAAM;MAAEe,OAAO;MAAEC,OAAO;MAAEd;IAAO,CAAC,GAAGD,OAAO,CAACgB,aAAa,CAAM,CAAC;IACjE,MAAMC,OAAO,GAAGA,CAAA,KAAY;MACxBd,MAAM,CAACe,GAAG,CAAC,SAAS,EAAEC,SAAS,CAAC;MAChChB,MAAM,CAACe,GAAG,CAAC,OAAO,EAAEE,OAAO,CAAC;MAC5BjB,MAAM,CAACe,GAAG,CAAC,MAAM,EAAEG,MAAM,CAAC;IAC9B,CAAC;IACD,MAAMF,SAAS,GAAIG,GAAQ,IAAW;MAClCL,OAAO,CAAC,CAAC;MACTF,OAAO,CAACO,GAAG,CAAC;IAChB,CAAC;IACD,MAAMF,OAAO,GAAIG,GAAU,IAAW;MAClCN,OAAO,CAAC,CAAC;MACThB,MAAM,CAACsB,GAAG,CAAC;IACf,CAAC;IACD,MAAMF,MAAM,GAAIG,IAAY,IAAW;MACnCP,OAAO,CAAC,CAAC;MACThB,MAAM,CAAC,IAAIC,KAAK,CAAC,2BAA2BsB,IAAI,EAAE,CAAC,CAAC;IACxD,CAAC;IACDrB,MAAM,CAACsB,IAAI,CAAC,SAAS,EAAEN,SAAS,CAAC;IACjChB,MAAM,CAACsB,IAAI,CAAC,OAAO,EAAEL,OAAO,CAAC;IAC7BjB,MAAM,CAACsB,IAAI,CAAC,MAAM,EAAEJ,MAAM,CAAC;IAC3BlB,MAAM,CAACuB,WAAW,CAAC3B,OAAO,CAAC;IAC3B,OAAOe,OAAO;EAClB;AACJ;AAACa,OAAA,CAAArC,UAAA,GAAAA,UAAA","ignoreList":[]}

package/distr/Tools/src/BuildTasks/Form/GenerateForm.js

@@ -24,7 +24,8 @@ class DefaultFileWriter {
   }
 }
 async function generateForm(formSourcesPath, farmDirectory, generator, parentLogger = (0, _StaticLogger.getLogger)(), generationOptions, fileWriter = new DefaultFileWriter()) {
-  const logger = parentLogger.withPrefix(`GENERATE:${(0, _FormPathUtils.extractGfvFromFormPath)(formSourcesPath)}`);
+  const gfv = (0, _FormPathUtils.extractGfvFromFormPath)(formSourcesPath);
+  const logger = parentLogger.withPrefix(`GENERATE:${gfv}`);
   const action = (0, _ILogger.buildActionBegin)(logger, "Generation");
   const generatedContent = await generator.readSourcesAndProcessSugar(formSourcesPath, farmDirectory, generationOptions);
   logger.log("Writing files");

package/distr/Tools/src/BuildTasks/Form/GenerateForm.js.map

@@ -1 +1 @@
-{"version":3,"file":"GenerateForm.js","names":["path","_interopRequireWildcard","require","_fsExtra","_FsUtils","_ILogger","_StaticLogger","_FormPathUtils","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","DefaultFileWriter","writeBatch","fileBatch","filePath","keys","content","undefined","ensureDir","parse","dir","writeFileAsync","generateForm","formSourcesPath","farmDirectory","generator","parentLogger","getLogger","generationOptions","fileWriter","logger","withPrefix","extractGfvFromFormPath","action","buildActionBegin","generatedContent","readSourcesAndProcessSugar","log","writeGeneratedFiles","join","complete","candyFormContent","outputDirectory"],"sources":["../../../../../src/BuildTasks/Form/GenerateForm.ts"],"sourcesContent":["import * as path from \"path\";\n\nimport { ensureDir } from \"fs-extra\";\n\nimport { writeFileAsync } from \"../../Commons/FsUtils\";\nimport { buildActionBegin, ILogger } from \"../../Commons/Logging/ILogger\";\nimport { getLogger } from \"../../Commons/Logging/StaticLogger\";\nimport { FormResources, FormSource, SugarContent } from \"../FormSource\";\nimport { extractGfvFromFormPath } from \"../../../../Common/FormPathUtils\";\nimport { ExtractorResult } from \"../../../../Common/TextExtractor/TextExtractorTypes\";\n\nexport interface GeneratedForm {\n    [relativeFileName: string]: Buffer | string;\n}\n\nexport interface LocalizationDictionaryContent {\n    [relativeFileName: string]: string;\n}\n\nexport interface LocalizationEntryPoint {\n    getLocalizedSugar(sugarFiles: SugarContent, resources: FormResources): Promise<SugarContent>;\n    getDictionary(sugarFiles: SugarContent, resources: FormResources): Promise<LocalizationDictionaryContent>;\n}\n\nexport interface FormGenerator {\n    readSources(formSourcesPath: string, farmDirectory: string): Promise<FormSource>;\n    getAllDependencies(formSourcesPath: string, farmDirectory: string): Promise<string[]>;\n    getAllDependenciesHash(formSourcesPath: string, farmDirectory: string): Promise<string>;\n    supportsDependenciesExtraction(): Promise<boolean>;\n    readSourcesAndProcessSugar(\n        formSourcesPath: string,\n        farmDirectory: string,\n        generationOptions?: GenerationOptions\n    ): Promise<GeneratedForm>;\n    getLocalizedSugar(sugarFiles: SugarContent, resources: FormResources): Promise<SugarContent>;\n    getDictionary(sugarFiles: SugarContent, resources: FormResources): Promise<LocalizationDictionaryContent>;\n    getSugarTexts(formSourcesPath: string, farmDirectory: string): Promise<ExtractorResult>;\n}\n\nexport interface GenerationOptions {\n    skipCodeReformatting: boolean;\n    resourcesHash: string;\n}\n\nexport interface IFileWriter {\n    writeBatch(fileBatch: { [absoluteFileName: string]: string }): Promise<void>;\n}\n\nclass DefaultFileWriter implements IFileWriter {\n    public async writeBatch(fileBatch: { [absoluteFileName: string]: string }): Promise<void> {\n        for (const filePath of Object.keys(fileBatch)) {\n            const content = fileBatch[filePath];\n            if (content != undefined && content !== \"\") {\n                await ensureDir(path.parse(filePath).dir);\n                await writeFileAsync(filePath, content);\n            }\n        }\n    }\n}\n\nexport async function generateForm(\n    formSourcesPath: string,\n    farmDirectory: string,\n    generator: FormGenerator,\n    parentLogger: ILogger = getLogger(),\n    generationOptions?: GenerationOptions,\n    fileWriter: IFileWriter = new DefaultFileWriter()\n): Promise<void> {\n    const logger = parentLogger.withPrefix(`GENERATE:${extractGfvFromFormPath(formSourcesPath)}`);\n    const action = buildActionBegin(logger, \"Generation\");\n    const generatedContent = await generator.readSourcesAndProcessSugar(\n        formSourcesPath,\n        farmDirectory,\n        generationOptions\n    );\n    logger.log(\"Writing files\");\n    await writeGeneratedFiles(generatedContent, path.join(formSourcesPath, \"form\"), fileWriter);\n    action.complete();\n}\n\nasync function writeGeneratedFiles(\n    candyFormContent: GeneratedForm,\n    outputDirectory: string,\n    fileWriter: IFileWriter\n): Promise<void> {\n    const fileBatch = {};\n    for (const filePath of Object.keys(candyFormContent)) {\n        const content = candyFormContent[filePath];\n        if (content != undefined && content !== \"\") {\n            // @ts-ignore\n            fileBatch[path.join(outputDirectory, filePath)] = content;\n        }\n    }\n    await fileWriter.writeBatch(fileBatch);\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"GenerateForm.js","names":["path","_interopRequireWildcard","require","_fsExtra","_FsUtils","_ILogger","_StaticLogger","_FormPathUtils","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","DefaultFileWriter","writeBatch","fileBatch","filePath","keys","content","undefined","ensureDir","parse","dir","writeFileAsync","generateForm","formSourcesPath","farmDirectory","generator","parentLogger","getLogger","generationOptions","fileWriter","gfv","extractGfvFromFormPath","logger","withPrefix","action","buildActionBegin","generatedContent","readSourcesAndProcessSugar","log","writeGeneratedFiles","join","complete","candyFormContent","outputDirectory"],"sources":["../../../../../src/BuildTasks/Form/GenerateForm.ts"],"sourcesContent":["import * as path from \"path\";\n\nimport { ensureDir } from \"fs-extra\";\n\nimport { writeFileAsync } from \"../../Commons/FsUtils\";\nimport { buildActionBegin, ILogger } from \"../../Commons/Logging/ILogger\";\nimport { getLogger } from \"../../Commons/Logging/StaticLogger\";\nimport { FormResources, FormSource, SugarContent } from \"../FormSource\";\nimport { extractGfvFromFormPath } from \"../../../../Common/FormPathUtils\";\nimport { ExtractorResult } from \"../../../../Common/TextExtractor/TextExtractorTypes\";\n\nexport interface GeneratedForm {\n    [relativeFileName: string]: Buffer | string;\n}\n\nexport interface LocalizationDictionaryContent {\n    [relativeFileName: string]: string;\n}\n\nexport interface FormGenerator {\n    readSources(formSourcesPath: string, farmDirectory: string): Promise<FormSource>;\n    getAllDependencies(formSourcesPath: string, farmDirectory: string): Promise<string[]>;\n    getAllDependenciesHash(formSourcesPath: string, farmDirectory: string): Promise<string>;\n    readSourcesAndProcessSugar(\n        formSourcesPath: string,\n        farmDirectory: string,\n        generationOptions?: GenerationOptions\n    ): Promise<GeneratedForm>;\n    getLocalizedSugar(sugarFiles: SugarContent, resources: FormResources): Promise<SugarContent>;\n    getDictionary(sugarFiles: SugarContent, resources: FormResources): Promise<LocalizationDictionaryContent>;\n    getSugarTexts(formSourcesPath: string, farmDirectory: string): Promise<ExtractorResult>;\n    dispose?(): Promise<void>;\n}\n\nexport interface GenerationOptions {\n    resourcesHash: string;\n}\n\nexport interface IFileWriter {\n    writeBatch(fileBatch: { [absoluteFileName: string]: string }): Promise<void>;\n}\n\nclass DefaultFileWriter implements IFileWriter {\n    public async writeBatch(fileBatch: { [absoluteFileName: string]: string }): Promise<void> {\n        for (const filePath of Object.keys(fileBatch)) {\n            const content = fileBatch[filePath];\n            if (content != undefined && content !== \"\") {\n                await ensureDir(path.parse(filePath).dir);\n                await writeFileAsync(filePath, content);\n            }\n        }\n    }\n}\n\nexport async function generateForm(\n    formSourcesPath: string,\n    farmDirectory: string,\n    generator: FormGenerator,\n    parentLogger: ILogger = getLogger(),\n    generationOptions?: GenerationOptions,\n    fileWriter: IFileWriter = new DefaultFileWriter()\n): Promise<void> {\n    const gfv = extractGfvFromFormPath(formSourcesPath);\n    const logger = parentLogger.withPrefix(`GENERATE:${gfv}`);\n    const action = buildActionBegin(logger, \"Generation\");\n    const generatedContent = await generator.readSourcesAndProcessSugar(\n        formSourcesPath,\n        farmDirectory,\n        generationOptions\n    );\n    logger.log(\"Writing files\");\n    await writeGeneratedFiles(generatedContent, path.join(formSourcesPath, \"form\"), fileWriter);\n    action.complete();\n}\n\nasync function writeGeneratedFiles(\n    candyFormContent: GeneratedForm,\n    outputDirectory: string,\n    fileWriter: IFileWriter\n): Promise<void> {\n    const fileBatch = {};\n    for (const filePath of Object.keys(candyFormContent)) {\n        const content = candyFormContent[filePath];\n        if (content != undefined && content !== \"\") {\n            // @ts-ignore\n            fileBatch[path.join(outputDirectory, filePath)] = content;\n        }\n    }\n    await fileWriter.writeBatch(fileBatch);\n}\n"],"mappings":"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","ignoreList":[]}

package/distr/Tools/src/BuildTasks/Form/NullFormGenerator.js

@@ -23,9 +23,6 @@ class NullFormGenerator {
   readSourcesAndProcessSugar() {
     throw new Error("GenerationNotSupported");
   }
-  supportsDependenciesExtraction() {
-    throw new Error("GenerationNotSupported");
-  }
   getSugarTexts() {
     throw new Error("GenerationNotSupported");
   }

package/distr/Tools/src/BuildTasks/Form/NullFormGenerator.js.map

@@ -1 +1 @@
-{"version":3,"file":"NullFormGenerator.js","names":["NullFormGenerator","getAllDependencies","Error","getAllDependenciesHash","getDictionary","getLocalizedSugar","readSources","readSourcesAndProcessSugar","supportsDependenciesExtraction","getSugarTexts","exports"],"sources":["../../../../../src/BuildTasks/Form/NullFormGenerator.ts"],"sourcesContent":["import { FormSource, SugarContent } from \"../FormSource\";\nimport { ExtractorResult } from \"../../../../Common/TextExtractor/TextExtractorTypes\";\n\nimport { FormGenerator, GeneratedForm, LocalizationDictionaryContent } from \"./GenerateForm\";\n\nexport class NullFormGenerator implements FormGenerator {\n    public getAllDependencies(): Promise<string[]> {\n        throw new Error(\"GenerationNotSupported\");\n    }\n\n    public getAllDependenciesHash(): Promise<string> {\n        throw new Error(\"GenerationNotSupported\");\n    }\n\n    public getDictionary(): Promise<LocalizationDictionaryContent> {\n        throw new Error(\"GenerationNotSupported\");\n    }\n\n    public getLocalizedSugar(): Promise<SugarContent> {\n        throw new Error(\"GenerationNotSupported\");\n    }\n\n    public readSources(): Promise<FormSource> {\n        throw new Error(\"GenerationNotSupported\");\n    }\n\n    public readSourcesAndProcessSugar(): Promise<GeneratedForm> {\n        throw new Error(\"GenerationNotSupported\");\n    }\n\n    public supportsDependenciesExtraction(): Promise<boolean> {\n        throw new Error(\"GenerationNotSupported\");\n    }\n\n    public getSugarTexts(): Promise<ExtractorResult> {\n        throw new Error(\"GenerationNotSupported\");\n    }\n}\n"],"mappings":";;;;;;AAKO,MAAMA,iBAAiB,CAA0B;EAC7CC,kBAAkBA,CAAA,EAAsB;IAC3C,MAAM,IAAIC,KAAK,CAAC,wBAAwB,CAAC;EAC7C;EAEOC,sBAAsBA,CAAA,EAAoB;IAC7C,MAAM,IAAID,KAAK,CAAC,wBAAwB,CAAC;EAC7C;EAEOE,aAAaA,CAAA,EAA2C;IAC3D,MAAM,IAAIF,KAAK,CAAC,wBAAwB,CAAC;EAC7C;EAEOG,iBAAiBA,CAAA,EAA0B;IAC9C,MAAM,IAAIH,KAAK,CAAC,wBAAwB,CAAC;EAC7C;EAEOI,WAAWA,CAAA,EAAwB;IACtC,MAAM,IAAIJ,KAAK,CAAC,wBAAwB,CAAC;EAC7C;EAEOK,0BAA0BA,CAAA,EAA2B;IACxD,MAAM,IAAIL,KAAK,CAAC,wBAAwB,CAAC;EAC7C;EAEOM,8BAA8BA,CAAA,EAAqB;IACtD,MAAM,IAAIN,KAAK,CAAC,wBAAwB,CAAC;EAC7C;EAEOO,aAAaA,CAAA,EAA6B;IAC7C,MAAM,IAAIP,KAAK,CAAC,wBAAwB,CAAC;EAC7C;AACJ;AAACQ,OAAA,CAAAV,iBAAA,GAAAA,iBAAA","ignoreList":[]}
+{"version":3,"file":"NullFormGenerator.js","names":["NullFormGenerator","getAllDependencies","Error","getAllDependenciesHash","getDictionary","getLocalizedSugar","readSources","readSourcesAndProcessSugar","getSugarTexts","exports"],"sources":["../../../../../src/BuildTasks/Form/NullFormGenerator.ts"],"sourcesContent":["import { FormSource, SugarContent } from \"../FormSource\";\nimport { ExtractorResult } from \"../../../../Common/TextExtractor/TextExtractorTypes\";\n\nimport { FormGenerator, GeneratedForm, LocalizationDictionaryContent } from \"./GenerateForm\";\n\nexport class NullFormGenerator implements FormGenerator {\n    public getAllDependencies(): Promise<string[]> {\n        throw new Error(\"GenerationNotSupported\");\n    }\n\n    public getAllDependenciesHash(): Promise<string> {\n        throw new Error(\"GenerationNotSupported\");\n    }\n\n    public getDictionary(): Promise<LocalizationDictionaryContent> {\n        throw new Error(\"GenerationNotSupported\");\n    }\n\n    public getLocalizedSugar(): Promise<SugarContent> {\n        throw new Error(\"GenerationNotSupported\");\n    }\n\n    public readSources(): Promise<FormSource> {\n        throw new Error(\"GenerationNotSupported\");\n    }\n\n    public readSourcesAndProcessSugar(): Promise<GeneratedForm> {\n        throw new Error(\"GenerationNotSupported\");\n    }\n\n    public getSugarTexts(): Promise<ExtractorResult> {\n        throw new Error(\"GenerationNotSupported\");\n    }\n}\n"],"mappings":";;;;;;AAKO,MAAMA,iBAAiB,CAA0B;EAC7CC,kBAAkBA,CAAA,EAAsB;IAC3C,MAAM,IAAIC,KAAK,CAAC,wBAAwB,CAAC;EAC7C;EAEOC,sBAAsBA,CAAA,EAAoB;IAC7C,MAAM,IAAID,KAAK,CAAC,wBAAwB,CAAC;EAC7C;EAEOE,aAAaA,CAAA,EAA2C;IAC3D,MAAM,IAAIF,KAAK,CAAC,wBAAwB,CAAC;EAC7C;EAEOG,iBAAiBA,CAAA,EAA0B;IAC9C,MAAM,IAAIH,KAAK,CAAC,wBAAwB,CAAC;EAC7C;EAEOI,WAAWA,CAAA,EAAwB;IACtC,MAAM,IAAIJ,KAAK,CAAC,wBAAwB,CAAC;EAC7C;EAEOK,0BAA0BA,CAAA,EAA2B;IACxD,MAAM,IAAIL,KAAK,CAAC,wBAAwB,CAAC;EAC7C;EAEOM,aAAaA,CAAA,EAA6B;IAC7C,MAAM,IAAIN,KAAK,CAAC,wBAAwB,CAAC;EAC7C;AACJ;AAACO,OAAA,CAAAT,iBAAA,GAAAA,iBAAA","ignoreList":[]}

package/distr/Tools/src/BuildTasks/Generator/AcquirePublishedGeneratorTask.js

@@ -40,7 +40,7 @@ class AcquirePublishedGeneratorTask extends _ChainableValueProducer.ObservableVa
             this.logger.log(`Acquiring generator ${this.version}`);
             await this.execute(generatorDirectory, `npm install @kontur.candy/generator@${this.version}`);
           }
-          const result = (0, _CreateAsyncGenerator.createAsyncGenerator)(path.join(generatorDirectory, "node_modules", "@kontur.candy", "generator"), false, false);
+          const result = (0, _CreateAsyncGenerator.createAsyncGenerator)(path.join(generatorDirectory, "node_modules", "@kontur.candy", "generator"));
           this.acquiredGenerator = result;
         }
       });

package/distr/Tools/src/BuildTasks/Generator/AcquirePublishedGeneratorTask.js.map

@@ -1 +1 @@
-{"version":3,"file":"AcquirePublishedGeneratorTask.js","names":["_child_process","require","path","_interopRequireWildcard","_fsExtra","_pLimit","_interopRequireDefault","_StaticLogger","_ChainableValueProducer","_TypingUtils","_CreateAsyncGenerator","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","AcquirePublishedGeneratorTask","ObservableValueProducerBase","constructor","version","candyModulesDirectory","useVersionFromCache","logger","getLogger","cacheDirectory","acquiredGenerator","acquireLimit","pLimit","withPrefix","getCurrentValue","undefined","generatorDirectory","join","useGeneratorFromCache","pathExists","prepareGeneratorDirectory","log","execute","result","createAsyncGenerator","Error","beginListening","stopListening","ensureDir","outputFile","resolve","command","workingDirectory","executable","executableArguments","split","Promise","rejectPromise","npm_config_registry","_","env","process","watchProcess","spawn","reject","cwd","shell","windowsHide","stdio","stdout","on","data","verbose","toString","stderr","code","exports"],"sources":["../../../../../src/BuildTasks/Generator/AcquirePublishedGeneratorTask.ts"],"sourcesContent":["import { spawn } from \"child_process\";\nimport * as path from \"path\";\n\nimport { ensureDir, outputFile, pathExists } from \"fs-extra\";\nimport pLimit from \"p-limit\";\n\nimport { ILogger } from \"../../Commons/Logging/ILogger\";\nimport { getLogger } from \"../../Commons/Logging/StaticLogger\";\nimport { ObservableValueProducerBase } from \"../../Commons/TasksCore/ChainableValueProducer\";\nimport { FormGenerator } from \"../Form/GenerateForm\";\nimport { reject } from \"../../../../Common/TypingUtils\";\n\nimport { createAsyncGenerator } from \"./GeneratorWorker/CreateAsyncGenerator\";\n\nexport class AcquirePublishedGeneratorTask extends ObservableValueProducerBase<FormGenerator> {\n    private readonly logger: ILogger;\n    private readonly version: string;\n    private readonly cacheDirectory: string;\n    private acquiredGenerator?: FormGenerator;\n    private readonly useVersionFromCache: boolean;\n    private readonly acquireLimit = pLimit(1);\n\n    public constructor(\n        version: string,\n        candyModulesDirectory: string,\n        useVersionFromCache: boolean,\n        logger: ILogger = getLogger()\n    ) {\n        super();\n        this.logger = logger.withPrefix(\"GENERATOR\");\n        this.version = version;\n        this.cacheDirectory = candyModulesDirectory;\n        this.useVersionFromCache = useVersionFromCache;\n    }\n\n    public async getCurrentValue(): Promise<FormGenerator> {\n        if (this.acquiredGenerator == undefined) {\n            await this.acquireLimit(async () => {\n                if (this.acquiredGenerator == undefined) {\n                    const generatorDirectory = path.join(this.cacheDirectory, \"generators\", this.version);\n                    const useGeneratorFromCache = this.useVersionFromCache && (await pathExists(generatorDirectory));\n\n                    if (!useGeneratorFromCache) {\n                        await this.prepareGeneratorDirectory(generatorDirectory);\n                        this.logger.log(`Acquiring generator ${this.version}`);\n                        await this.execute(generatorDirectory, `npm install @kontur.candy/generator@${this.version}`);\n                    }\n\n                    const result = createAsyncGenerator(\n                        path.join(generatorDirectory, \"node_modules\", \"@kontur.candy\", \"generator\"),\n                        false,\n                        false\n                    );\n                    this.acquiredGenerator = result;\n                }\n            });\n        }\n        if (this.acquiredGenerator == undefined) {\n            throw new Error(\"InvalidProgramState\");\n        }\n        return this.acquiredGenerator;\n    }\n\n    protected async beginListening(): Promise<void> {\n        // Нет предков и тут нечего наблюдать\n    }\n\n    protected async stopListening(): Promise<void> {\n        // Нет предков и тут нечего наблюдать\n    }\n\n    private async prepareGeneratorDirectory(generatorDirectory: string): Promise<void> {\n        await ensureDir(generatorDirectory);\n        await outputFile(\n            path.resolve(generatorDirectory, \"package.json\"),\n            `{ \"name\": \"generator\", \"version\": \"1.0.0\", \"description\": \"Generator\", \"author\": \"\" }`\n        );\n    }\n\n    private execute(generatorDirectory: string, command: string): Promise<void> {\n        const workingDirectory = generatorDirectory;\n        const [executable, ...executableArguments] = command.split(\" \");\n        return new Promise<void>((resolve, rejectPromise) => {\n            const { npm_config_registry: _, ...env } = process.env;\n            const watchProcess = spawn(executable ?? reject(), executableArguments, {\n                cwd: workingDirectory,\n                shell: true,\n                windowsHide: true,\n                stdio: \"pipe\",\n                env: env,\n            });\n            watchProcess.stdout.on(\"data\", (data: Buffer | string) => {\n                this.logger.verbose(data.toString());\n            });\n            watchProcess.stderr.on(\"data\", (data: Buffer | string) => {\n                this.logger.verbose(data.toString());\n            });\n            watchProcess.on(\"exit\", code => {\n                if (code !== 0) {\n                    rejectPromise(new Error(`Command ${command} exited with code ${code}`));\n                } else {\n                    resolve();\n                }\n            });\n        });\n    }\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"AcquirePublishedGeneratorTask.js","names":["_child_process","require","path","_interopRequireWildcard","_fsExtra","_pLimit","_interopRequireDefault","_StaticLogger","_ChainableValueProducer","_TypingUtils","_CreateAsyncGenerator","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","AcquirePublishedGeneratorTask","ObservableValueProducerBase","constructor","version","candyModulesDirectory","useVersionFromCache","logger","getLogger","cacheDirectory","acquiredGenerator","acquireLimit","pLimit","withPrefix","getCurrentValue","undefined","generatorDirectory","join","useGeneratorFromCache","pathExists","prepareGeneratorDirectory","log","execute","result","createAsyncGenerator","Error","beginListening","stopListening","ensureDir","outputFile","resolve","command","workingDirectory","executable","executableArguments","split","Promise","rejectPromise","npm_config_registry","_","env","process","watchProcess","spawn","reject","cwd","shell","windowsHide","stdio","stdout","on","data","verbose","toString","stderr","code","exports"],"sources":["../../../../../src/BuildTasks/Generator/AcquirePublishedGeneratorTask.ts"],"sourcesContent":["import { spawn } from \"child_process\";\nimport * as path from \"path\";\n\nimport { ensureDir, outputFile, pathExists } from \"fs-extra\";\nimport pLimit from \"p-limit\";\n\nimport { ILogger } from \"../../Commons/Logging/ILogger\";\nimport { getLogger } from \"../../Commons/Logging/StaticLogger\";\nimport { ObservableValueProducerBase } from \"../../Commons/TasksCore/ChainableValueProducer\";\nimport { FormGenerator } from \"../Form/GenerateForm\";\nimport { reject } from \"../../../../Common/TypingUtils\";\n\nimport { createAsyncGenerator } from \"./GeneratorWorker/CreateAsyncGenerator\";\n\nexport class AcquirePublishedGeneratorTask extends ObservableValueProducerBase<FormGenerator> {\n    private readonly logger: ILogger;\n    private readonly version: string;\n    private readonly cacheDirectory: string;\n    private acquiredGenerator?: FormGenerator;\n    private readonly useVersionFromCache: boolean;\n    private readonly acquireLimit = pLimit(1);\n\n    public constructor(\n        version: string,\n        candyModulesDirectory: string,\n        useVersionFromCache: boolean,\n        logger: ILogger = getLogger()\n    ) {\n        super();\n        this.logger = logger.withPrefix(\"GENERATOR\");\n        this.version = version;\n        this.cacheDirectory = candyModulesDirectory;\n        this.useVersionFromCache = useVersionFromCache;\n    }\n\n    public async getCurrentValue(): Promise<FormGenerator> {\n        if (this.acquiredGenerator == undefined) {\n            await this.acquireLimit(async () => {\n                if (this.acquiredGenerator == undefined) {\n                    const generatorDirectory = path.join(this.cacheDirectory, \"generators\", this.version);\n                    const useGeneratorFromCache = this.useVersionFromCache && (await pathExists(generatorDirectory));\n\n                    if (!useGeneratorFromCache) {\n                        await this.prepareGeneratorDirectory(generatorDirectory);\n                        this.logger.log(`Acquiring generator ${this.version}`);\n                        await this.execute(generatorDirectory, `npm install @kontur.candy/generator@${this.version}`);\n                    }\n\n                    const result = createAsyncGenerator(\n                        path.join(generatorDirectory, \"node_modules\", \"@kontur.candy\", \"generator\")\n                    );\n                    this.acquiredGenerator = result;\n                }\n            });\n        }\n        if (this.acquiredGenerator == undefined) {\n            throw new Error(\"InvalidProgramState\");\n        }\n        return this.acquiredGenerator;\n    }\n\n    protected async beginListening(): Promise<void> {\n        // Нет предков и тут нечего наблюдать\n    }\n\n    protected async stopListening(): Promise<void> {\n        // Нет предков и тут нечего наблюдать\n    }\n\n    private async prepareGeneratorDirectory(generatorDirectory: string): Promise<void> {\n        await ensureDir(generatorDirectory);\n        await outputFile(\n            path.resolve(generatorDirectory, \"package.json\"),\n            `{ \"name\": \"generator\", \"version\": \"1.0.0\", \"description\": \"Generator\", \"author\": \"\" }`\n        );\n    }\n\n    private execute(generatorDirectory: string, command: string): Promise<void> {\n        const workingDirectory = generatorDirectory;\n        const [executable, ...executableArguments] = command.split(\" \");\n        return new Promise<void>((resolve, rejectPromise) => {\n            const { npm_config_registry: _, ...env } = process.env;\n            const watchProcess = spawn(executable ?? reject(), executableArguments, {\n                cwd: workingDirectory,\n                shell: true,\n                windowsHide: true,\n                stdio: \"pipe\",\n                env: env,\n            });\n            watchProcess.stdout.on(\"data\", (data: Buffer | string) => {\n                this.logger.verbose(data.toString());\n            });\n            watchProcess.stderr.on(\"data\", (data: Buffer | string) => {\n                this.logger.verbose(data.toString());\n            });\n            watchProcess.on(\"exit\", code => {\n                if (code !== 0) {\n                    rejectPromise(new Error(`Command ${command} exited with code ${code}`));\n                } else {\n                    resolve();\n                }\n            });\n        });\n    }\n}\n"],"mappings":"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","ignoreList":[]}

package/distr/Tools/src/BuildTasks/Generator/BuildGeneratorFromSourcesTask.js

@@ -26,8 +26,11 @@ class BuildGeneratorFromSourcesTask extends _ChainableValueProducer.ObservableVa
     this.buildProcess = void 0;
     this.buildResultWatcher = void 0;
     this.handleUpdate = async () => {
+      var _this$currentGenerato, _this$currentGenerato2;
       this.logger.log("Generator sources updated");
-      await this.emitUpdate((0, _CreateAsyncGenerator.createAsyncGenerator)(_path.default.join(this.pathToEngineSources, "Generator"), this.useWatch, this.useWatch));
+      await ((_this$currentGenerato = this.currentGenerator) === null || _this$currentGenerato === void 0 || (_this$currentGenerato2 = _this$currentGenerato.dispose) === null || _this$currentGenerato2 === void 0 ? void 0 : _this$currentGenerato2.call(_this$currentGenerato));
+      this.currentGenerator = (0, _CreateAsyncGenerator.createAsyncGenerator)(_path.default.join(this.pathToEngineSources, "Generator"));
+      await this.emitUpdate(this.currentGenerator);
     };
     this.logger = logger.withPrefix("GENERATOR");
     this.pathToEngineSources = pathToEngineSources;
@@ -41,7 +44,7 @@ class BuildGeneratorFromSourcesTask extends _ChainableValueProducer.ObservableVa
         if (this.buildProcess == undefined) {
           this.buildProcess = await this.runWatchProcessStarted();
           this.buildResultWatcher = await this.createBuildResultWatcher(_path.default.join(this.pathToEngineSources, "Generator", "dist"));
-          this.currentGenerator = (0, _CreateAsyncGenerator.createAsyncGenerator)(_path.default.join(this.pathToEngineSources, "Generator"), this.useWatch, this.useWatch);
+          this.currentGenerator = (0, _CreateAsyncGenerator.createAsyncGenerator)(_path.default.join(this.pathToEngineSources, "Generator"));
         }
       } else {
         this.currentGenerator = await this.acquireGeneratorFromSources();
@@ -56,6 +59,7 @@ class BuildGeneratorFromSourcesTask extends _ChainableValueProducer.ObservableVa
     this.useWatch = true;
   }
   async stopListening() {
+    var _this$currentGenerato3, _this$currentGenerato4;
     if (this.buildProcess != undefined) {
       try {
         const buildProcess = this.buildProcess;
@@ -68,6 +72,7 @@ class BuildGeneratorFromSourcesTask extends _ChainableValueProducer.ObservableVa
     if (this.buildResultWatcher != undefined) {
       this.buildResultWatcher.close();
     }
+    await ((_this$currentGenerato3 = this.currentGenerator) === null || _this$currentGenerato3 === void 0 || (_this$currentGenerato4 = _this$currentGenerato3.dispose) === null || _this$currentGenerato4 === void 0 ? void 0 : _this$currentGenerato4.call(_this$currentGenerato3));
     this.useWatch = false;
   }
   async acquireGeneratorFromSources() {
@@ -76,7 +81,7 @@ class BuildGeneratorFromSourcesTask extends _ChainableValueProducer.ObservableVa
     await (0, _ExecUtils.execCommandAsync)(this.logger, `npm run generator:build`, {
       cwd: buildDirectory
     });
-    const result = (0, _CreateAsyncGenerator.createAsyncGenerator)(_path.default.join(this.pathToEngineSources, "Generator"), this.useWatch, this.useWatch);
+    const result = (0, _CreateAsyncGenerator.createAsyncGenerator)(_path.default.join(this.pathToEngineSources, "Generator"));
     action.complete();
     return result;
   }
@@ -107,7 +112,11 @@ class BuildGeneratorFromSourcesTask extends _ChainableValueProducer.ObservableVa
       ignoreInitial: true,
       cwd: pathToGeneratorOutputDir,
       ignorePermissionErrors: false,
-      usePolling: true
+      usePolling: true,
+      awaitWriteFinish: {
+        stabilityThreshold: 200,
+        pollInterval: 50
+      }
     });
     const handleAnyFsEventDebounced = _lodash.default.debounce(() => this.handleUpdate(), 500);
     watcher.on("all", handleAnyFsEventDebounced);

package/distr/Tools/src/BuildTasks/Generator/BuildGeneratorFromSourcesTask.js.map

@@ -1 +1 @@
-{"version":3,"file":"BuildGeneratorFromSourcesTask.js","names":["_path","_interopRequireDefault","require","_chokidar","_lodash","_pLimit","_ExecUtils","_ILogger","_StaticLogger","_ChainableValueProducer","_ProcessUtils","_CreateAsyncGenerator","generatorBuildLimit","pLimit","BuildGeneratorFromSourcesTask","ObservableValueProducerBase","constructor","pathToEngineSources","logger","getLogger","useWatch","currentGenerator","buildProcess","buildResultWatcher","handleUpdate","log","emitUpdate","createAsyncGenerator","path","join","withPrefix","getCurrentValue","undefined","runWatchProcessStarted","createBuildResultWatcher","acquireGeneratorFromSources","Error","beginListening","stopListening","kill","error","close","action","buildActionBegin","buildDirectory","getBuildDirectory","execCommandAsync","cwd","result","complete","ProcessUtils","createShellProcess","onStdOut","subscribe","data","verbose","toString","onStdErr","start","waitFirstCompilationCompleted","waitOutputIncludesString","pathToGeneratorOutputDir","maskToObserveGeneratorChanges","watcher","watch","ignoreInitial","ignorePermissionErrors","usePolling","handleAnyFsEventDebounced","_","debounce","on","exports"],"sources":["../../../../../src/BuildTasks/Generator/BuildGeneratorFromSourcesTask.ts"],"sourcesContent":["import { FSWatcher } from \"fs\";\nimport path from \"path\";\n\nimport { watch } from \"chokidar\";\nimport _ from \"lodash\";\nimport pLimit from \"p-limit\";\n\nimport { execCommandAsync } from \"../../Commons/ExecUtils\";\nimport { buildActionBegin, ILogger } from \"../../Commons/Logging/ILogger\";\nimport { getLogger } from \"../../Commons/Logging/StaticLogger\";\nimport { ObservableValueProducerBase } from \"../../Commons/TasksCore/ChainableValueProducer\";\nimport { FormGenerator } from \"../Form/GenerateForm\";\nimport { ProcessUtils } from \"../ProcessUtils/ProcessUtils\";\nimport { ShellProcessHandle } from \"../ProcessUtils/ShellProcessHandle\";\n\nimport { createAsyncGenerator } from \"./GeneratorWorker/CreateAsyncGenerator\";\n\nconst generatorBuildLimit = pLimit(1);\n\nexport class BuildGeneratorFromSourcesTask extends ObservableValueProducerBase<FormGenerator> {\n    private readonly pathToEngineSources: string;\n    private readonly logger: ILogger;\n    private useWatch = false;\n    private currentGenerator?: FormGenerator;\n    private buildProcess?: ShellProcessHandle;\n    private buildResultWatcher?: FSWatcher;\n\n    public constructor(pathToEngineSources: string, logger: ILogger = getLogger()) {\n        super();\n        this.logger = logger.withPrefix(\"GENERATOR\");\n        this.pathToEngineSources = pathToEngineSources;\n    }\n\n    public async getCurrentValue(): Promise<FormGenerator> {\n        return generatorBuildLimit(async () => {\n            if (this.currentGenerator != undefined) {\n                return this.currentGenerator;\n            }\n            if (this.useWatch) {\n                if (this.buildProcess == undefined) {\n                    this.buildProcess = await this.runWatchProcessStarted();\n                    this.buildResultWatcher = await this.createBuildResultWatcher(\n                        path.join(this.pathToEngineSources, \"Generator\", \"dist\")\n                    );\n                    this.currentGenerator = createAsyncGenerator(\n                        path.join(this.pathToEngineSources, \"Generator\"),\n                        this.useWatch,\n                        this.useWatch\n                    );\n                }\n            } else {\n                this.currentGenerator = await this.acquireGeneratorFromSources();\n            }\n            if (this.currentGenerator == undefined) {\n                throw new Error(\"InvalidProgramState\");\n            }\n            return this.currentGenerator;\n        });\n    }\n\n    protected async beginListening(): Promise<void> {\n        this.useWatch = true;\n    }\n\n    protected async stopListening(): Promise<void> {\n        if (this.buildProcess != undefined) {\n            try {\n                const buildProcess = this.buildProcess;\n                this.buildProcess = undefined;\n                await buildProcess.kill();\n            } catch (error) {\n                this.logger.error(`Failed to stop process: ${error}`);\n            }\n        }\n        if (this.buildResultWatcher != undefined) {\n            this.buildResultWatcher.close();\n        }\n        this.useWatch = false;\n    }\n\n    private readonly handleUpdate = async (): Promise<void> => {\n        this.logger.log(\"Generator sources updated\");\n        await this.emitUpdate(\n            createAsyncGenerator(path.join(this.pathToEngineSources, \"Generator\"), this.useWatch, this.useWatch)\n        );\n    };\n\n    private async acquireGeneratorFromSources(): Promise<FormGenerator> {\n        const action = buildActionBegin(this.logger, \"Build generator\");\n        const buildDirectory = await this.getBuildDirectory();\n        await execCommandAsync(this.logger, `npm run generator:build`, {\n            cwd: buildDirectory,\n        });\n        const result = createAsyncGenerator(\n            path.join(this.pathToEngineSources, \"Generator\"),\n            this.useWatch,\n            this.useWatch\n        );\n        action.complete();\n        return result;\n    }\n\n    private async getBuildDirectory(): Promise<string> {\n        return this.pathToEngineSources;\n    }\n\n    private async runWatchProcessStarted(): Promise<ShellProcessHandle> {\n        this.logger.log(\"Start watch\");\n        const buildDirectory = await this.getBuildDirectory();\n        const result = ProcessUtils.createShellProcess(\n            \"npm\",\n            [\"run\", \"generator:build\", \"--\", \"--watch\"],\n            buildDirectory\n        );\n        result.onStdOut.subscribe(data => {\n            this.logger.verbose(data.toString());\n        });\n        result.onStdErr.subscribe(data => {\n            this.logger.verbose(data.toString());\n        });\n        result.start();\n        await this.waitFirstCompilationCompleted(result);\n        this.logger.log(\"Successfully complied\");\n        return result;\n    }\n\n    private async waitFirstCompilationCompleted(result: ShellProcessHandle): Promise<void> {\n        await result.waitOutputIncludesString(\"Successfully compiled\");\n    }\n\n    private async createBuildResultWatcher(pathToGeneratorOutputDir: string): Promise<FSWatcher> {\n        const maskToObserveGeneratorChanges = [\"Generator/src/**/*.js\", \"index.js\"];\n        const watcher = watch(maskToObserveGeneratorChanges, {\n            ignoreInitial: true,\n            cwd: pathToGeneratorOutputDir,\n            ignorePermissionErrors: false,\n            usePolling: true,\n        });\n        const handleAnyFsEventDebounced = _.debounce(() => this.handleUpdate(), 500);\n        watcher.on(\"all\", handleAnyFsEventDebounced);\n        watcher.on(\"error\", handleAnyFsEventDebounced);\n        // @ts-ignore\n        return watcher;\n    }\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"BuildGeneratorFromSourcesTask.js","names":["_path","_interopRequireDefault","require","_chokidar","_lodash","_pLimit","_ExecUtils","_ILogger","_StaticLogger","_ChainableValueProducer","_ProcessUtils","_CreateAsyncGenerator","generatorBuildLimit","pLimit","BuildGeneratorFromSourcesTask","ObservableValueProducerBase","constructor","pathToEngineSources","logger","getLogger","useWatch","currentGenerator","buildProcess","buildResultWatcher","handleUpdate","_this$currentGenerato","_this$currentGenerato2","log","dispose","call","createAsyncGenerator","path","join","emitUpdate","withPrefix","getCurrentValue","undefined","runWatchProcessStarted","createBuildResultWatcher","acquireGeneratorFromSources","Error","beginListening","stopListening","_this$currentGenerato3","_this$currentGenerato4","kill","error","close","action","buildActionBegin","buildDirectory","getBuildDirectory","execCommandAsync","cwd","result","complete","ProcessUtils","createShellProcess","onStdOut","subscribe","data","verbose","toString","onStdErr","start","waitFirstCompilationCompleted","waitOutputIncludesString","pathToGeneratorOutputDir","maskToObserveGeneratorChanges","watcher","watch","ignoreInitial","ignorePermissionErrors","usePolling","awaitWriteFinish","stabilityThreshold","pollInterval","handleAnyFsEventDebounced","_","debounce","on","exports"],"sources":["../../../../../src/BuildTasks/Generator/BuildGeneratorFromSourcesTask.ts"],"sourcesContent":["import { FSWatcher } from \"fs\";\nimport path from \"path\";\n\nimport { watch } from \"chokidar\";\nimport _ from \"lodash\";\nimport pLimit from \"p-limit\";\n\nimport { execCommandAsync } from \"../../Commons/ExecUtils\";\nimport { buildActionBegin, ILogger } from \"../../Commons/Logging/ILogger\";\nimport { getLogger } from \"../../Commons/Logging/StaticLogger\";\nimport { ObservableValueProducerBase } from \"../../Commons/TasksCore/ChainableValueProducer\";\nimport { FormGenerator } from \"../Form/GenerateForm\";\nimport { ProcessUtils } from \"../ProcessUtils/ProcessUtils\";\nimport { ShellProcessHandle } from \"../ProcessUtils/ShellProcessHandle\";\n\nimport { createAsyncGenerator } from \"./GeneratorWorker/CreateAsyncGenerator\";\n\nconst generatorBuildLimit = pLimit(1);\n\nexport class BuildGeneratorFromSourcesTask extends ObservableValueProducerBase<FormGenerator> {\n    private readonly pathToEngineSources: string;\n    private readonly logger: ILogger;\n    private useWatch = false;\n    private currentGenerator?: FormGenerator;\n    private buildProcess?: ShellProcessHandle;\n    private buildResultWatcher?: FSWatcher;\n\n    public constructor(pathToEngineSources: string, logger: ILogger = getLogger()) {\n        super();\n        this.logger = logger.withPrefix(\"GENERATOR\");\n        this.pathToEngineSources = pathToEngineSources;\n    }\n\n    public async getCurrentValue(): Promise<FormGenerator> {\n        return generatorBuildLimit(async () => {\n            if (this.currentGenerator != undefined) {\n                return this.currentGenerator;\n            }\n            if (this.useWatch) {\n                if (this.buildProcess == undefined) {\n                    this.buildProcess = await this.runWatchProcessStarted();\n                    this.buildResultWatcher = await this.createBuildResultWatcher(\n                        path.join(this.pathToEngineSources, \"Generator\", \"dist\")\n                    );\n                    this.currentGenerator = createAsyncGenerator(path.join(this.pathToEngineSources, \"Generator\"));\n                }\n            } else {\n                this.currentGenerator = await this.acquireGeneratorFromSources();\n            }\n            if (this.currentGenerator == undefined) {\n                throw new Error(\"InvalidProgramState\");\n            }\n            return this.currentGenerator;\n        });\n    }\n\n    protected async beginListening(): Promise<void> {\n        this.useWatch = true;\n    }\n\n    protected async stopListening(): Promise<void> {\n        if (this.buildProcess != undefined) {\n            try {\n                const buildProcess = this.buildProcess;\n                this.buildProcess = undefined;\n                await buildProcess.kill();\n            } catch (error) {\n                this.logger.error(`Failed to stop process: ${error}`);\n            }\n        }\n        if (this.buildResultWatcher != undefined) {\n            this.buildResultWatcher.close();\n        }\n        await this.currentGenerator?.dispose?.();\n        this.useWatch = false;\n    }\n\n    private readonly handleUpdate = async (): Promise<void> => {\n        this.logger.log(\"Generator sources updated\");\n        await this.currentGenerator?.dispose?.();\n        this.currentGenerator = createAsyncGenerator(path.join(this.pathToEngineSources, \"Generator\"));\n        await this.emitUpdate(this.currentGenerator);\n    };\n\n    private async acquireGeneratorFromSources(): Promise<FormGenerator> {\n        const action = buildActionBegin(this.logger, \"Build generator\");\n        const buildDirectory = await this.getBuildDirectory();\n        await execCommandAsync(this.logger, `npm run generator:build`, {\n            cwd: buildDirectory,\n        });\n        const result = createAsyncGenerator(path.join(this.pathToEngineSources, \"Generator\"));\n        action.complete();\n        return result;\n    }\n\n    private async getBuildDirectory(): Promise<string> {\n        return this.pathToEngineSources;\n    }\n\n    private async runWatchProcessStarted(): Promise<ShellProcessHandle> {\n        this.logger.log(\"Start watch\");\n        const buildDirectory = await this.getBuildDirectory();\n        const result = ProcessUtils.createShellProcess(\n            \"npm\",\n            [\"run\", \"generator:build\", \"--\", \"--watch\"],\n            buildDirectory\n        );\n        result.onStdOut.subscribe(data => {\n            this.logger.verbose(data.toString());\n        });\n        result.onStdErr.subscribe(data => {\n            this.logger.verbose(data.toString());\n        });\n        result.start();\n        await this.waitFirstCompilationCompleted(result);\n        this.logger.log(\"Successfully complied\");\n        return result;\n    }\n\n    private async waitFirstCompilationCompleted(result: ShellProcessHandle): Promise<void> {\n        await result.waitOutputIncludesString(\"Successfully compiled\");\n    }\n\n    private async createBuildResultWatcher(pathToGeneratorOutputDir: string): Promise<FSWatcher> {\n        const maskToObserveGeneratorChanges = [\"Generator/src/**/*.js\", \"index.js\"];\n        const watcher = watch(maskToObserveGeneratorChanges, {\n            ignoreInitial: true,\n            cwd: pathToGeneratorOutputDir,\n            ignorePermissionErrors: false,\n            usePolling: true,\n            awaitWriteFinish: { stabilityThreshold: 200, pollInterval: 50 },\n        });\n        const handleAnyFsEventDebounced = _.debounce(() => this.handleUpdate(), 500);\n        watcher.on(\"all\", handleAnyFsEventDebounced);\n        watcher.on(\"error\", handleAnyFsEventDebounced);\n        // @ts-ignore\n        return watcher;\n    }\n}\n"],"mappings":"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","ignoreList":[]}

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

@@ -3,119 +3,41 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.createAsyncGenerator = createAsyncGenerator;
-var _child_process = require("child_process");
-var _IterableUtils = require("../../../../../Common/IterableUtils");
+exports.createAsyncGenerator = void 0;
 var _GeneratorRequireUtils = require("./GeneratorRequireUtils");
-/* eslint-disable no-console */
-
+var _GeneratorPool = require("./GeneratorPool");
 class GeneratorAsyncProxy {
-  constructor(pathToGeneratorRootDir, purgeCache, useGeneratorRestarting) {
-    this.pathToGeneratorRootDir = void 0;
-    this.generatorSourcesImporter = void 0;
-    this.purgeCache = void 0;
-    this.useGeneratorRestarting = void 0;
-    this.generatorProcess = void 0;
-    this.maxRequestNumber = 0;
-    this.processSugarDeferredMap = new Map();
-    this.useGeneratorRestarting = useGeneratorRestarting;
-    this.pathToGeneratorRootDir = pathToGeneratorRootDir;
-    this.purgeCache = purgeCache;
-    this.generatorSourcesImporter = new _GeneratorRequireUtils.GeneratorSourcesImporter(this.pathToGeneratorRootDir, this.purgeCache);
-  }
-  async getLocalizedSugar(sugarFiles, resources) {
-    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();
-    if (localizationEntryPoint == undefined) {
-      throw new Error("Данная версия генератора не поддерживает локализацию.");
-    }
-    return localizationEntryPoint.getDictionary(sugarFiles, resources);
-  }
-  async readSources(formSourcesPath, farmDirectory) {
-    const readSources = await this.generatorSourcesImporter.importReadSources();
-    return await readSources(formSourcesPath, farmDirectory);
-  }
-  async getSugarTexts(formSourcesPath, farmDirectory) {
-    const getSugarTexts = await this.generatorSourcesImporter.importGetSugarTexts();
-    return await getSugarTexts(formSourcesPath, farmDirectory);
-  }
-  async getAllDependencies(formSourcesPath, farmDirectory) {
-    const getAllDependencies = await this.generatorSourcesImporter.importGetAllDependencies();
-    return await getAllDependencies(formSourcesPath, farmDirectory);
-  }
-  async supportsDependenciesExtraction() {
-    const getAllDependenciesHash = await this.generatorSourcesImporter.importGetAllDependenciesHash();
-    return getAllDependenciesHash != undefined;
-  }
-  async getAllDependenciesHash(formSourcesPath, farmDirectory) {
-    const getAllDependenciesHash = await this.generatorSourcesImporter.importGetAllDependenciesHash();
-    return await getAllDependenciesHash(formSourcesPath, farmDirectory);
+  constructor(generatorPath) {
+    this.generatorPath = void 0;
+    this.pool = void 0;
+    this.readSources = void 0;
+    this.getSugarTexts = void 0;
+    this.getAllDependencies = void 0;
+    this.getAllDependenciesHash = void 0;
+    this.getDictionary = void 0;
+    this.getLocalizedSugar = void 0;
+    this.generatorPath = generatorPath;
+    const generator = (0, _GeneratorRequireUtils.importGenerator)(generatorPath);
+    this.readSources = generator.readSources;
+    this.getSugarTexts = generator.getSugarTexts;
+    this.getAllDependencies = generator.getAllDependencies;
+    this.getAllDependenciesHash = generator.getAllDependenciesHash;
+    this.getDictionary = generator.getDictionary;
+    this.getLocalizedSugar = generator.getLocalizedSugar;
   }
   async readSourcesAndProcessSugar(formSourcesPath, farmDirectory, 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.forkReadSourcesAndProcessSugarWorker();
-    }
-    if (this.useGeneratorRestarting) {
-      if (this.maxRequestNumber % 10 === 0) {
-        console.log("Restarting generator");
-        this.generatorProcess.kill();
-        this.generatorProcess = undefined;
-        this.generatorProcess = this.forkReadSourcesAndProcessSugarWorker();
-        console.log("Restarted generator");
-      }
+    if (!this.pool) {
+      this.pool = new _GeneratorPool.GeneratorPool(this.generatorPath);
     }
-    this.generatorProcess.send([this.pathToGeneratorRootDir, formSourcesPath, farmDirectory, generationOptions, this.purgeCache, currentRequestNumber]);
-    const result = await promise;
-    this.processSugarDeferredMap.delete(currentRequestNumber);
-    return result;
+    const message = [formSourcesPath, farmDirectory, generationOptions];
+    return this.pool.generate(message);
   }
-  forkReadSourcesAndProcessSugarWorker() {
-    const processSugarWorker = (0, _child_process.fork)("./ReadSourcesAndProcessSugarWorker", [], {
-      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;
+  async dispose() {
+    var _this$pool;
+    await ((_this$pool = this.pool) === null || _this$pool === void 0 ? void 0 : _this$pool.dispose());
+    this.pool = undefined;
   }
 }
-const generatorsCache = new Map();
-function createAsyncGenerator(pathToGeneratorRootDir, purgeCache, useGeneratorRestarting) {
-  let result = generatorsCache.get(pathToGeneratorRootDir);
-  if (result == undefined) {
-    result = new GeneratorAsyncProxy(pathToGeneratorRootDir, purgeCache, useGeneratorRestarting);
-    generatorsCache.set(pathToGeneratorRootDir, result);
-  }
-  return result;
-}
+const createAsyncGenerator = generatorPath => new GeneratorAsyncProxy(generatorPath);
+exports.createAsyncGenerator = createAsyncGenerator;
 //# sourceMappingURL=CreateAsyncGenerator.js.map