@mxpicture/gcp-functions-generator 1.1.91 → 1.2.2

package/dist/generator/Generator.d.ts

@@ -1,57 +1,8 @@
-import { DecoFile, DecoImport, DecoSingleImport } from "@mxpicture/gcp-functions-common/types";
-import { DecoFileType, DecoFileExtension, DecoTargetType, DecoNames, Decorator } from "@mxpicture/gcp-functions-common/decorator";
-import { Collector } from "../common/Collector.js";
-import { GeneratorEnv } from "../common/types.common.js";
-import { CodeCollector } from "../common/CodeCollector.js";
-/**
- * Base structure shared by all generator outputs, containing imports and code lines.
- */
-export interface GeneratorBase {
-    imports: DecoImport[];
-    code: string[];
-}
-/**
- * Generator output for a single decorator header, including a name identifier.
- */
-export interface GeneratorHeader extends GeneratorBase {
-    name: string;
-}
-/**
- * Full result file produced by a generator, ready to be written to disk.
- */
-export interface GeneratorResultFile extends GeneratorBase {
-    type: DecoFileType;
-    ext: DecoFileExtension;
-    inputFilePath: string;
-    targetFilePath: string;
-    targetType: DecoTargetType;
-    importsCode: string[];
-}
-/**
- * Pairs a decorator with its resolved names for processing by a generator.
- */
-export interface GeneratorRunItem {
-    decorator: Decorator;
-    names: DecoNames;
-}
-/**
- * A record of run items keyed by decorator name, providing lookup for cross-references.
- */
-export type GeneratorRunItems = Record<string, GeneratorRunItem>;
-/**
- * Converts an array of {@link DecoImport} entries into TypeScript import statement strings.
- *
- * @param imports - The imports to convert.
- * @returns An array of import statement strings (empty imports are filtered out).
- */
-export declare const importsToCode: (imports: DecoImport[]) => string[];
-/**
- * Async variant of {@link importsToCode}.
- *
- * @param imports - The imports to convert.
- * @returns A promise resolving to an array of import statement strings.
- */
-export declare const importsToCodeAsync: (imports: DecoImport[]) => Promise<string[]>;
+import type { DecoFile } from "@mxpicture/gcp-functions-common/types";
+import { type DecoFileType, type DecoFileExtension, DecoPackageType, type Decorator } from "@mxpicture/gcp-functions-common/decorator";
+import type { GeneratorEnv, GeneratorHeader, GeneratorRunItem, GeneratorRunItems, GeneratorRunResult } from "../common/types.common.js";
+import type { GeneratorFs } from "../run/GeneratorFs.js";
+import type { GeneratorFile } from "../run/GeneratorFile.js";
 /**
  * Abstract base class for all code generators.
  *
@@ -61,24 +12,22 @@ export declare const importsToCodeAsync: (imports: DecoImport[]) => Promise<stri
  * formatting, and writing to disk.
  */
 export declare abstract class Generator {
-    readonly order: number;
-    readonly type: DecoFileType;
+    readonly fileType: DecoFileType;
     readonly ext: DecoFileExtension;
-    readonly targetType: DecoTargetType;
-    readonly collector: Collector;
-    readonly useAdditionalImports: boolean;
-    protected usedImports: DecoSingleImport[];
+    readonly packageType: DecoPackageType;
     /**
      * Creates a new generator.
      *
-     * @param order - Execution order generators.
-     * @param type - The decorator file type this generator produces.
+     * @param fileType - The decorator file type this generator produces.
      * @param ext - The output file extension.
-     * @param targetType - The target package (common, backend, frontend).
-     * @param collector - The shared collector for cross-generator lookups.
+     * @param packageType - The target package (common, backend, frontend).
      * @param useAdditionalImports - Whether to include additional imports from the decorator.
      */
-    constructor(order: number, type: DecoFileType, ext: DecoFileExtension, targetType: DecoTargetType, collector: Collector, useAdditionalImports?: boolean);
+    constructor(p: {
+        fileType: DecoFileType;
+        ext: DecoFileExtension;
+        packageType: DecoPackageType;
+    });
     /**
      * Processes a decorator file by running all its headers through the generator.
      *
@@ -87,46 +36,11 @@ export declare abstract class Generator {
      * @returns A promise resolving to the assembled result file.
      * @throws Error if no headers are produced for the file.
      */
-    run(file: DecoFile, env: GeneratorEnv): Promise<GeneratorResultFile>;
-    /**
-     * Formats and writes one or more generator result files to disk.
-     *
-     * @param files - The result files to write.
-     */
-    static write(...files: GeneratorResultFile[]): Promise<void>;
-    /**
-     * Resolves an import path from the current generator's context to a target type and file type.
-     *
-     * @param targetType - The target type of the import destination.
-     * @param fileType - The file type of the import destination.
-     * @returns The resolved import path string.
-     */
-    resolveImport(targetType: DecoTargetType, fileType: DecoFileType): string;
-    /**
-     * Resolves an import path to the common target for the given file type.
-     *
-     * @param fileType - The file type to import from common.
-     * @returns The resolved import path.
-     */
-    importCommon(fileType: DecoFileType): string;
-    /**
-     * Resolves an import path to the frontend target for the given file type.
-     *
-     * @param fileType - The file type to import from frontend.
-     * @returns The resolved import path.
-     */
-    importFrontend(fileType: DecoFileType): string;
-    /**
-     * Resolves an import path to the backend target for the given file type.
-     *
-     * @param fileType - The file type to import from backend.
-     * @returns The resolved import path.
-     */
-    importBackend(fileType: DecoFileType): string;
-    protected processHeader(curretItem: GeneratorRunItem, all: GeneratorRunItems, env: GeneratorEnv): Promise<(GeneratorHeader & {
-        inputFilePath: string;
-    }) | null>;
-    protected i(_prop: string, isType?: boolean): string;
-    protected abstract runHeader(current: GeneratorRunItem, all: GeneratorRunItems, env: GeneratorEnv, result: CodeCollector): Promise<string | null>;
+    run4codes(decoFiles: DecoFile[], env: GeneratorEnv, fs: GeneratorFs): Promise<void>;
+    protected run4code(decoFile: DecoFile, env: GeneratorEnv, fs: GeneratorFs, runItems: GeneratorRunItems): Promise<GeneratorFile>;
+    run4imports(): Promise<void>;
+    protected buildRunItems(packageType: DecoPackageType, decorators: Decorator[]): GeneratorRunItems;
+    protected processHeader(curretItem: GeneratorRunItem, env: GeneratorEnv): Promise<GeneratorHeader | null>;
+    protected abstract runHeader(item: GeneratorRunItem, env: GeneratorEnv): Promise<GeneratorRunResult | null>;
 }
 //# sourceMappingURL=Generator.d.ts.map

package/dist/generator/Generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Generator.d.ts","sourceRoot":"","sources":["../../src/generator/Generator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Generator.d.ts","sourceRoot":"","sources":["../../src/generator/Generator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,uCAAuC,CAAC;AACtE,OAAO,EACL,KAAK,YAAY,EACjB,KAAK,iBAAiB,EACtB,eAAe,EACf,KAAK,SAAS,EAEf,MAAM,2CAA2C,CAAC;AACnD,OAAO,KAAK,EACV,YAAY,EACZ,eAAe,EACf,gBAAgB,EAChB,iBAAiB,EACjB,kBAAkB,EACnB,MAAM,2BAA2B,CAAC;AACnC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAGzD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAO7D;;;;;;;GAOG;AACH,8BAAsB,SAAS;IAC7B,SAAgB,QAAQ,EAAE,YAAY,CAAC;IACvC,SAAgB,GAAG,EAAE,iBAAiB,CAAC;IACvC,SAAgB,WAAW,EAAE,eAAe,CAAC;IAE7C;;;;;;;OAOG;gBACgB,CAAC,EAAE;QACpB,QAAQ,EAAE,YAAY,CAAC;QACvB,GAAG,EAAE,iBAAiB,CAAC;QACvB,WAAW,EAAE,eAAe,CAAC;KAC9B;IAMD;;;;;;;OAOG;IACU,SAAS,CACpB,SAAS,EAAE,QAAQ,EAAE,EACrB,GAAG,EAAE,YAAY,EACjB,EAAE,EAAE,WAAW;cAeD,QAAQ,CACtB,QAAQ,EAAE,QAAQ,EAClB,GAAG,EAAE,YAAY,EACjB,EAAE,EAAE,WAAW,EACf,QAAQ,EAAE,iBAAiB,GAC1B,OAAO,CAAC,aAAa,CAAC;IAwBZ,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAuCzC,SAAS,CAAC,aAAa,CACrB,WAAW,EAAE,eAAe,EAC5B,UAAU,EAAE,SAAS,EAAE,GACtB,iBAAiB;cA0BJ,aAAa,CAC3B,UAAU,EAAE,gBAAgB,EAC5B,GAAG,EAAE,YAAY,GAChB,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC;IAgBlC,SAAS,CAAC,QAAQ,CAAC,SAAS,CAC1B,IAAI,EAAE,gBAAgB,EACtB,GAAG,EAAE,YAAY,GAChB,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC;CACtC"}

package/dist/generator/Generator.js

@@ -1,29 +1,7 @@
-import { basename, dirname } from "node:path";
-import { mkdir, writeFile } from "node:fs/promises";
-import { DecoFileExtension, DecoTargetType, } from "@mxpicture/gcp-functions-common/decorator";
-import { directories } from "../common/Directories.js";
-import { decoBackendNamesAsync, decoFrontendNamesAsync, decoNamesAsync, } from "../decorator/deco.names.js";
-import { formatCode, formatJson } from "@mxpicture/build-api/code";
+import { DecoPackageType, } from "@mxpicture/gcp-functions-common/decorator";
 import { toFilename } from "../common/file.common.js";
-import { CodeCollector } from "../common/CodeCollector.js";
-const importToCode = (imp) => imp.props.length > 0
-    ? `import ${imp.isType ? "type " : ""}{ ${[...imp.props].join(", ")} } from "${imp.path}"`
-    : null;
-const importToCodeAsync = async (imp) => Promise.resolve().then(() => importToCode(imp));
-/**
- * Converts an array of {@link DecoImport} entries into TypeScript import statement strings.
- *
- * @param imports - The imports to convert.
- * @returns An array of import statement strings (empty imports are filtered out).
- */
-export const importsToCode = (imports) => imports.map(importToCode).filter((imp) => imp !== null);
-/**
- * Async variant of {@link importsToCode}.
- *
- * @param imports - The imports to convert.
- * @returns A promise resolving to an array of import statement strings.
- */
-export const importsToCodeAsync = async (imports) => (await Promise.all(imports.map(importToCodeAsync))).filter((imp) => imp !== null);
+import { basename } from "node:path";
+import { decoBackendNames, decoFrontendNames, decoNames, } from "../decorator/deco.names.js";
 /**
  * Abstract base class for all code generators.
  *
@@ -33,30 +11,21 @@ export const importsToCodeAsync = async (imports) => (await Promise.all(imports.
  * formatting, and writing to disk.
  */
 export class Generator {
-    order;
-    type;
+    fileType;
     ext;
-    targetType;
-    collector;
-    useAdditionalImports;
-    usedImports = [];
+    packageType;
     /**
      * Creates a new generator.
      *
-     * @param order - Execution order generators.
-     * @param type - The decorator file type this generator produces.
+     * @param fileType - The decorator file type this generator produces.
      * @param ext - The output file extension.
-     * @param targetType - The target package (common, backend, frontend).
-     * @param collector - The shared collector for cross-generator lookups.
+     * @param packageType - The target package (common, backend, frontend).
      * @param useAdditionalImports - Whether to include additional imports from the decorator.
      */
-    constructor(order, type, ext, targetType, collector, useAdditionalImports = false) {
-        this.order = order;
-        this.type = type;
-        this.ext = ext;
-        this.targetType = targetType;
-        this.collector = collector;
-        this.useAdditionalImports = useAdditionalImports;
+    constructor(p) {
+        this.fileType = p.fileType;
+        this.ext = p.ext;
+        this.packageType = p.packageType;
     }
     /**
      * Processes a decorator file by running all its headers through the generator.
@@ -66,147 +35,93 @@ export class Generator {
      * @returns A promise resolving to the assembled result file.
      * @throws Error if no headers are produced for the file.
      */
-    async run(file, env) {
-        let result = null;
-        const runHeaders = {};
-        const resultsCollector = new CodeCollector();
-        for (const decorator of file.decorators) {
+    async run4codes(decoFiles, env, fs) {
+        const collects = decoFiles.map((decoFile) => ({
+            decoFile,
+            runItems: this.buildRunItems(this.packageType, decoFile.decorators),
+        }));
+        await Promise.all(collects.map(async (collect) => this.run4code(collect.decoFile, env, fs, collect.runItems)));
+    }
+    async run4code(decoFile, env, fs, runItems) {
+        const headerResults = (await Promise.all(Object.values(runItems).map((p) => this.processHeader(p, env)))).filter((h) => !!h);
+        if (headerResults.length === 0)
+            throw new Error(`Generator ${this.fileType}, file ${decoFile.templateRepoFilePath}: no headers provided`);
+        const filename = toFilename({
+            filename: basename(headerResults[0].inputFilePath),
+            fileType: this.fileType,
+            ext: this.ext,
+            generated: true,
+        });
+        const file = fs.file(this.packageType, this.fileType, filename);
+        file.code = headerResults.flatMap((res) => res.code);
+        return file;
+    }
+    async run4imports() {
+        // file.code = headerResults.flatMap((result) => result.code);
+        // const imports = nodesToImports(this.expFinder.requestedNodes);
+        // for (const imp of imports) {
+        //   const parts = splitPackagePath(imp.path);
+        //   if (!parts) continue;
+        //   imp.path = this.resolveImp(parts.packageType, parts.type);
+        // }
+        // resultFile.importsCode = importsToCode(imports);
+        // return resultFile;
+    }
+    // /**
+    //  * Resolves an import path from the current generator's context to a target type and file type.
+    //  *
+    //  * @param packageType - The target type of the import destination.
+    //  * @param fileType - The file type of the import destination.
+    //  * @returns The resolved import path string.
+    //  */
+    // public resolveImp(
+    //   packageType: DecoPackageType,
+    //   fileType: DecoFileType,
+    // ): string {
+    //   return directories.resolveImport(
+    //     { packageType, fileType },
+    //     { packageType: this.packageType, fileType: this.type },
+    //   );
+    // }
+    // public resolveImpString(path: string): string {
+    //   const parts = splitPackagePath(path);
+    //   return parts ? this.resolveImp(parts.packageType, parts.type) : path;
+    // }
+    // public resolveImpDeco(deco: DecoImport): DecoImport {
+    //   deco.path = this.resolveImpString(deco.path);
+    //   return deco;
+    // }
+    buildRunItems(packageType, decorators) {
+        const runItems = {};
+        const allNames = [];
+        for (const decorator of decorators) {
             const extr = decorator.extractRaw();
-            const names = this.targetType === DecoTargetType.backend
-                ? await decoBackendNamesAsync(extr.name, extr.namespace)
-                : this.targetType === DecoTargetType.frontend
-                    ? await decoFrontendNamesAsync(extr.name, extr.namespace)
-                    : await decoNamesAsync(extr.name, extr.namespace);
-            runHeaders[extr.name] = {
+            const names = packageType === DecoPackageType.backend
+                ? decoBackendNames(extr.name, extr.namespace)
+                : packageType === DecoPackageType.frontend
+                    ? decoFrontendNames(extr.name, extr.namespace)
+                    : decoNames(extr.name, extr.namespace);
+            allNames.push(names);
+            runItems[extr.name] = {
                 decorator,
                 names,
+                allNames,
             };
         }
-        const interfaceResults = await Promise.all(Object.values(runHeaders).map((p) => this.processHeader(p, runHeaders, env)));
-        for (const interfaceResult of interfaceResults) {
-            if (!interfaceResult)
-                continue;
-            if (!result) {
-                const targetFilename = toFilename({
-                    filename: basename(interfaceResult.inputFilePath),
-                    type: this.type,
-                    ext: this.ext,
-                    generated: true,
-                });
-                result = {
-                    inputFilePath: interfaceResult.inputFilePath,
-                    targetFilePath: directories.toTargetPath(this.type, targetFilename, this.targetType),
-                    targetType: this.targetType,
-                    imports: [],
-                    importsCode: [],
-                    code: [],
-                    ext: this.ext,
-                    type: this.type,
-                };
-            }
-            resultsCollector.addCode(...interfaceResult.code);
-            resultsCollector.addImport(...interfaceResult.imports);
-        }
-        if (!result)
-            throw new Error(`Generator ${this.type}, file ${file.templateRepoFilePath}: no headers provided`);
-        result.code = resultsCollector.code;
-        result.imports = resultsCollector.imports;
-        result.importsCode = await importsToCodeAsync(result.imports);
-        return result;
+        return runItems;
     }
-    /**
-     * Formats and writes one or more generator result files to disk.
-     *
-     * @param files - The result files to write.
-     */
-    static async write(...files) {
-        const promises = [];
-        for (const file of files) {
-            const preCode = [...file.importsCode, "", ...file.code].join("\n");
-            promises.push((async () => {
-                let code;
-                if (file.ext === DecoFileExtension.ts)
-                    code = await formatCode(preCode);
-                else if (file.ext === DecoFileExtension.json)
-                    code = await formatJson(preCode);
-                else
-                    code = preCode;
-                await mkdir(dirname(file.targetFilePath), { recursive: true });
-                return writeFile(file.targetFilePath, code);
-            })());
-        }
-        await Promise.all(promises);
-    }
-    /**
-     * Resolves an import path from the current generator's context to a target type and file type.
-     *
-     * @param targetType - The target type of the import destination.
-     * @param fileType - The file type of the import destination.
-     * @returns The resolved import path string.
-     */
-    resolveImport(targetType, fileType) {
-        return directories.resolveImport({ targetType, fileType }, { targetType: this.targetType, fileType: this.type });
-    }
-    /**
-     * Resolves an import path to the common target for the given file type.
-     *
-     * @param fileType - The file type to import from common.
-     * @returns The resolved import path.
-     */
-    importCommon(fileType) {
-        return this.resolveImport(DecoTargetType.common, fileType);
-    }
-    /**
-     * Resolves an import path to the frontend target for the given file type.
-     *
-     * @param fileType - The file type to import from frontend.
-     * @returns The resolved import path.
-     */
-    importFrontend(fileType) {
-        return this.resolveImport(DecoTargetType.frontend, fileType);
-    }
-    /**
-     * Resolves an import path to the backend target for the given file type.
-     *
-     * @param fileType - The file type to import from backend.
-     * @returns The resolved import path.
-     */
-    importBackend(fileType) {
-        return this.resolveImport(DecoTargetType.backend, fileType);
-    }
-    async processHeader(curretItem, all, env) {
-        const { decorator, names } = curretItem;
+    async processHeader(curretItem, env) {
+        const { decorator } = curretItem;
         const raw = decorator.extractRaw();
-        this.collector.add(names.basename, this.targetType, {
-            names: names,
-        });
-        const result = new CodeCollector();
-        const name = await this.runHeader(curretItem, all, env, result);
-        if (!name)
+        const headerResult = await this.runHeader(curretItem, env);
+        if (!headerResult)
             return null;
+        // this.processPredictions(headerResult.code);
         return {
-            name,
+            name: headerResult.name,
             inputFilePath: raw.inputFilePath,
-            code: [...result.code],
-            imports: this.useAdditionalImports &&
-                raw.additionalImports &&
-                raw.additionalImports.length > 0
-                ? [...result.imports, ...raw.additionalImports]
-                : [...result.imports],
+            code: [...headerResult.code],
         };
     }
-    // i for import
-    i(_prop, isType) {
-        // todo use it
-        const prop = _prop.substring(0);
-        let found = this.usedImports.find((i) => i.prop === prop);
-        if (!found) {
-            found = { prop, isType };
-            this.usedImports.push(found);
-        }
-        if (found.isType && !isType)
-            found.isType = false;
-        return prop;
-    }
 }
 //# sourceMappingURL=Generator.js.map

package/dist/generator/Generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"Generator.js","sourceRoot":"","sources":["../../src/generator/Generator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Generator.js","sourceRoot":"","sources":["../../src/generator/Generator.ts"],"names":[],"mappings":"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"}

package/dist/generator/GeneratorAnnotations.d.ts

@@ -1,6 +1,5 @@
-import { Generator, GeneratorRunItem, GeneratorRunItems } from "./Generator.js";
-import { CodeCollector } from "../common/CodeCollector.js";
-import { GeneratorEnv } from "../common/types.common.js";
+import { Generator } from "./Generator.js";
+import type { GeneratorEnv, GeneratorRunItem, GeneratorRunResult } from "../common/types.common.js";
 /**
  * Generator that produces annotation metadata and initial-value factory functions.
  *
@@ -10,7 +9,7 @@ import { GeneratorEnv } from "../common/types.common.js";
  */
 export declare class GeneratorAnnotations extends Generator {
     constructor();
-    protected runHeader(current: GeneratorRunItem, all: GeneratorRunItems, env: GeneratorEnv, result: CodeCollector): Promise<string | null>;
+    protected runHeader(item: GeneratorRunItem, env: GeneratorEnv): Promise<GeneratorRunResult | null>;
 }
 declare const _default: GeneratorAnnotations;
 export default _default;

package/dist/generator/GeneratorAnnotations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GeneratorAnnotations.d.ts","sourceRoot":"","sources":["../../src/generator/GeneratorAnnotations.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAQhF,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AASzD;;;;;;GAMG;AACH,qBAAa,oBAAqB,SAAQ,SAAS;;cAWxB,SAAS,CAChC,OAAO,EAAE,gBAAgB,EACzB,GAAG,EAAE,iBAAiB,EACtB,GAAG,EAAE,YAAY,EACjB,MAAM,EAAE,aAAa,GACpB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;CAiH1B;;AAED,wBAA0C"}
+{"version":3,"file":"GeneratorAnnotations.d.ts","sourceRoot":"","sources":["../../src/generator/GeneratorAnnotations.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAO3C,OAAO,KAAK,EACV,YAAY,EACZ,gBAAgB,EAChB,kBAAkB,EACnB,MAAM,2BAA2B,CAAC;AASnC;;;;;;GAMG;AACH,qBAAa,oBAAqB,SAAQ,SAAS;;cASxB,SAAS,CAChC,IAAI,EAAE,gBAAgB,EACtB,GAAG,EAAE,YAAY,GAChB,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC;CAuEtC;;AAED,wBAA0C"}

package/dist/generator/GeneratorAnnotations.js

@@ -1,7 +1,6 @@
 import { Generator } from "./Generator.js";
-import { Collector } from "../common/Collector.js";
 import { formatJsonStringify } from "@mxpicture/build-api/code";
-import { DecoFileExtension, DecoFileType, DecoTargetType, } from "@mxpicture/gcp-functions-common/decorator";
+import { DecoFileExtension, DecoFileType, DecoPackageType, } from "@mxpicture/gcp-functions-common/decorator";
 const typeRegex = /\"type\": \"([a-zA-Z][a-zA-Z0-9]*)\"/;
 const itemTypeRegex = /\"itemType\": \"(DecoPropertyType\.|)([a-zA-Z][a-zA-Z0-9]*)\"/;
 const propertyRefRegex = /\"propertyRef\": \"([a-zA-Z][a-zA-Z0-9]*)\"/;
@@ -16,59 +15,46 @@ const dateFormatRegex = /\"dateFormat\": \"([a-zA-Z][a-zA-Z0-9]*)\"/;
  */
 export class GeneratorAnnotations extends Generator {
     constructor() {
-        super(20, DecoFileType.annotations, DecoFileExtension.ts, DecoTargetType.common, Collector.instance());
-    }
-    async runHeader(current, all, env, result) {
-        const names = current.names;
-        result.addImport({
-            path: "@mxpicture/gcp-functions-common/types",
-            props: ["AnnotationsHeader"],
-            isType: true,
-        }, {
-            path: "@mxpicture/gcp-functions-common/helper",
-            props: ["annoDocInitial"],
-            isType: false,
-        }, {
-            path: this.importCommon(DecoFileType.doc),
-            props: [names.doc],
-            isType: true,
+        super({
+            fileType: DecoFileType.annotations,
+            ext: DecoFileExtension.ts,
+            packageType: DecoPackageType.common,
         });
-        const importDecoProps = new Set();
-        const importDecoTypeProps = new Set();
-        const header = current.decorator.extractAnnotations();
+    }
+    async runHeader(item, env) {
+        void env;
+        const names = item.names;
+        const code = [];
+        const header = item.decorator.extractAnnotations();
         const json = await formatJsonStringify(JSON.stringify(header));
         const lines = json.split("\n");
-        result.addCode("", `export const ${names.initialFunc} = (): Partial<${this.i(names.doc, true)}> => ${this.i("annoDocInitial")}(${names.annotations}.properties);`, "");
-        result.addCode(`export const ${names.annotations}: ${this.i("AnnotationsHeader", true)} = `);
+        code.push("", `export const ${names.initialFunc} = (): Partial<${names.doc}> => annoDocInitial(${names.annotations}.properties);`, "");
+        code.push(`export const ${names.annotations}: AnnotationsHeader = `);
         // replace enums and types
         for (let line of lines) {
             // type
             let match = null;
             match = line.match(typeRegex);
             while (match && match.length > 1) {
-                importDecoProps.add("DecoPropertyType"); // todo remove after implementation of this.i()
-                line = line.replace(typeRegex, `type: ${this.i("DecoPropertyType")}.${match[1]}`);
+                line = line.replace(typeRegex, `type: DecoPropertyType.${match[1]}`);
                 match = line.match(typeRegex);
             }
             // itemType
             match = line.match(itemTypeRegex);
             while (match && match.length > 2) {
-                importDecoProps.add("DecoPropertyType"); // todo remove after implementation of this.i()
-                line = line.replace(itemTypeRegex, `itemType: ${this.i("DecoPropertyType")}.${match[2]}`);
+                line = line.replace(itemTypeRegex, `itemType: DecoPropertyType.${match[2]}`);
                 match = line.match(itemTypeRegex);
             }
             // propertyRef
             match = line.match(propertyRefRegex);
             while (match && match.length > 1) {
-                importDecoTypeProps.add("DecoPropertyDataWoType"); // todo remove after implementation of this.i()
-                line = line.replace(propertyRefRegex, `propertyRef: "${match[1]}" as keyof ${this.i("DecoPropertyDataWoType")}`);
+                line = line.replace(propertyRefRegex, `propertyRef: "${match[1]}" as keyof DecoPropertyDataWoType`);
                 match = line.match(propertyRefRegex);
             }
             // dateFormat
             match = line.match(dateFormatRegex);
             while (match && match.length > 1) {
-                importDecoProps.add("DecoDateFormat"); // todo remove after implementation of this.i()
-                line = line.replace(dateFormatRegex, `dateFormat: ${this.i("DecoDateFormat")}.${match[1]}`);
+                line = line.replace(dateFormatRegex, `dateFormat: DecoDateFormat.${match[1]}`);
                 match = line.match(dateFormatRegex);
             }
             // subHeader(Name)
@@ -77,22 +63,10 @@ export class GeneratorAnnotations extends Generator {
                 line = line.replace(subHeaderNameRegex, `subHeader: ${match[1]}`);
                 match = line.match(subHeaderNameRegex);
             }
-            result.addCode(line);
+            code.push(line);
         }
-        result.addCode(";");
-        if (importDecoTypeProps.size > 0)
-            result.addImport({
-                path: "@mxpicture/gcp-functions-common/decorator",
-                props: [...importDecoTypeProps],
-                isType: true,
-            });
-        if (importDecoProps.size > 0)
-            result.addImport({
-                path: "@mxpicture/gcp-functions-common/decorator",
-                props: [...importDecoProps],
-                isType: false,
-            });
-        return current.decorator.name;
+        code.push(";");
+        return { name: item.decorator.name, code };
     }
 }
 export default new GeneratorAnnotations();