@baseplate-dev/core-generators 0.1.1

package/dist/renderers/typescript/extractor/organize-ts-template-imports.js

@@ -0,0 +1,175 @@
+import { isBuiltin } from 'node:module';
+import path from 'node:path';
+import { Node, Project, SyntaxKind } from 'ts-morph';
+import { mergeTsImportDeclarations } from '../imports/merge-ts-import-declarations.js';
+import { sortImportDeclarations } from '../imports/sort-imports/sort-import-declarations.js';
+import { getTsMorphImportDeclarationsFromSourceFile, replaceImportDeclarationsInSourceFile, } from '../imports/ts-morph-operations.js';
+/**
+ * Collects all Identifier names from a SourceFile,
+ * skipping nodes within ImportDeclaration structures.
+ */
+function collectUsedIdentifierNames(sourceFile) {
+    const usedIdentifiers = new Set();
+    sourceFile.forEachDescendant((node, traversal) => {
+        if (node.isKind(SyntaxKind.ImportDeclaration)) {
+            traversal.skip();
+            return;
+        }
+        if (Node.isIdentifier(node)) {
+            usedIdentifiers.add(node.getText());
+        }
+    });
+    return usedIdentifiers;
+}
+/**
+ * Organizes the imports in a Typescript template file.
+ * - Removes unused imports
+ * - Replaces import declarations with new import declarations in the projectExportMap
+ * - Sorts the imports
+ * - Writes the imports to the file
+ *
+ * @param filePath - The path to the file to organize
+ * @param contents - The contents of the file to organize
+ * @param context - The context for the template import lookup
+ * @returns The organized contents of the file
+ */
+export async function organizeTsTemplateImports(filePath, contents, { projectExportMap, generatorFiles, resolver, projectRoot, }) {
+    const project = new Project({ useInMemoryFileSystem: true });
+    const sourceFile = project.createSourceFile(filePath, contents);
+    // Replace import declarations with new import declarations
+    const importDeclarations = getTsMorphImportDeclarationsFromSourceFile(sourceFile);
+    // Filter out import declarations that are not used
+    // Note: This is a rudimentary implementation that has a known issue
+    // where it will incorrectly identify a used import if the identifier
+    // has been declared in a different scope, e.g.
+    // import { foo } from './foo';
+    // const foo = 'foo';
+    //
+    // In this case, the import { foo } is incorrectly identified as used.
+    // The proper way is to check if the identifier has been used. However,
+    // this comes with a significant performance penalty so we should only use
+    // this if we can't use collectUsedIdentifierNames.
+    const usedIdentifierNames = collectUsedIdentifierNames(sourceFile);
+    const isNodeUsed = (node) => {
+        if (!node) {
+            return false;
+        }
+        const name = (Node.isImportSpecifier(node)
+            ? node.getAliasNode()?.getText()
+            : undefined) ?? node.getText();
+        return usedIdentifierNames.has(name);
+    };
+    const tsImportDeclarations = importDeclarations
+        .map((declaration) => {
+        const namespaceImport = declaration.getNamespaceImport();
+        const defaultImport = declaration.getDefaultImport();
+        return {
+            moduleSpecifier: declaration.getModuleSpecifier().getLiteralValue(),
+            isTypeOnly: declaration.isTypeOnly(),
+            namespaceImport: isNodeUsed(namespaceImport)
+                ? namespaceImport.getText()
+                : undefined,
+            defaultImport: isNodeUsed(defaultImport)
+                ? defaultImport.getText()
+                : undefined,
+            namedImports: declaration
+                .getNamedImports()
+                .filter((namedImport) => isNodeUsed(namedImport))
+                .map((namedImport) => ({
+                name: namedImport.getName(),
+                alias: namedImport.getAliasNode()?.getText(),
+                isTypeOnly: namedImport.isTypeOnly(),
+            })),
+        };
+    })
+        .filter((importDeclaration) => importDeclaration.defaultImport ??
+        importDeclaration.namespaceImport ??
+        importDeclaration.namedImports.length > 0);
+    const usedProjectExports = [];
+    const updatedImportDeclarations = await Promise.all(tsImportDeclarations.map(async (importDeclaration) => {
+        const { moduleSpecifier } = importDeclaration;
+        if (isBuiltin(moduleSpecifier)) {
+            return [importDeclaration];
+        }
+        // TODO: A bit of a hack but no easy fix in the short term
+        // Don't modify imports for ws since we install only the types
+        // but not the implementation
+        if (moduleSpecifier === 'ws') {
+            return [importDeclaration];
+        }
+        const resolutionResult = await resolver.async(path.dirname(filePath), moduleSpecifier);
+        if (!resolutionResult.path) {
+            throw new Error(`Could not resolve import ${moduleSpecifier} in ${filePath}: ${String(resolutionResult.error)}`);
+        }
+        const resolvedPath = resolutionResult.path;
+        // Don't modify external imports outside the project root
+        if (!resolvedPath.startsWith(projectRoot)) {
+            return [importDeclaration];
+        }
+        // Don't modify imports for files in the generator
+        if (generatorFiles.includes(resolvedPath)) {
+            const relativeImportPath = path
+                .relative(path.dirname(filePath), resolvedPath)
+                .replace(/\.(t|j)sx?$/, '.js');
+            const fixedImportDeclaration = {
+                ...importDeclaration,
+                // convert to relative path
+                moduleSpecifier: relativeImportPath.startsWith('.')
+                    ? relativeImportPath
+                    : `./${relativeImportPath}`,
+            };
+            return [fixedImportDeclaration];
+        }
+        if (importDeclaration.namespaceImport) {
+            throw new Error(`Import ${moduleSpecifier} in ${filePath} cannot be a namespace import since it are not supported currently
+          for template extraction.`);
+        }
+        // look up the corresponding import in the project exports
+        const pathExports = projectExportMap.get(resolvedPath);
+        if (!pathExports) {
+            throw new Error(`Import ${resolvedPath} in ${filePath} is not found in the project exports.`);
+        }
+        const importDeclarations = [];
+        const { defaultImport } = importDeclaration;
+        if (defaultImport) {
+            const projectExport = pathExports.get('default') ?? pathExports.get('*');
+            if (!projectExport) {
+                throw new Error(`Default import from ${moduleSpecifier} in ${filePath} is not found in the project exports.`);
+            }
+            if (projectExport.isTypeOnly && !importDeclaration.isTypeOnly) {
+                throw new Error(`Default import from ${moduleSpecifier} in ${filePath} is not a type only import but the project export is a type only import.`);
+            }
+            usedProjectExports.push(projectExport);
+            importDeclarations.push({
+                namedImports: [{ name: projectExport.name }],
+                moduleSpecifier: projectExport.importSource,
+                isTypeOnly: projectExport.isTypeOnly,
+            });
+        }
+        importDeclarations.push(...importDeclaration.namedImports.map((namedImport) => {
+            const projectExport = pathExports.get(namedImport.name) ?? pathExports.get('*');
+            if (!projectExport) {
+                throw new Error(`Import ${namedImport.name} from ${moduleSpecifier} in ${filePath} is not found in the project exports.`);
+            }
+            const isTypeOnly = !!importDeclaration.isTypeOnly || !!namedImport.isTypeOnly;
+            if (!isTypeOnly && projectExport.isTypeOnly) {
+                throw new Error(`Import ${namedImport.name} from ${moduleSpecifier} in ${filePath} is not a type only import but the project export is a type only import.`);
+            }
+            usedProjectExports.push(projectExport);
+            return {
+                namedImports: [namedImport],
+                moduleSpecifier: projectExport.importSource,
+                isTypeOnly,
+            };
+        }));
+        return importDeclarations;
+    }));
+    const mergedImportDeclarations = mergeTsImportDeclarations(updatedImportDeclarations.flat());
+    const sortedImportDeclarations = sortImportDeclarations(mergedImportDeclarations, {});
+    replaceImportDeclarationsInSourceFile(sourceFile, importDeclarations, sortedImportDeclarations);
+    return {
+        contents: sourceFile.getFullText(),
+        usedProjectExports,
+    };
+}
+//# sourceMappingURL=organize-ts-template-imports.js.map

package/dist/renderers/typescript/extractor/organize-ts-template-imports.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"organize-ts-template-imports.js","sourceRoot":"","sources":["../../../../src/renderers/typescript/extractor/organize-ts-template-imports.ts"],"names":[],"mappings":"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"}

package/dist/renderers/typescript/extractor/preprocess-code-for-extraction-hack.d.ts

@@ -0,0 +1,17 @@
+/**
+ * PREPROCESSING HACK: Adjusts code string before template extraction
+ * to handle specific Prettier formatting quirks where comment markers
+ * are moved outside parentheses.
+ *
+ * Pattern 1: identifier /* TPL_VAR:START *\/ ( => identifier(/* TPL_VAR:START *\/
+ * Pattern 2: ) /* TPL_VAR:END *\/ => /* TPL_VAR:END *\/)
+ * Pattern 3: ,[whitespace]/* TPL_VAR:END *\/ => /* TPL_VAR:END *\/,[whitespace]
+ *
+ * WARNING: This is a temporary workaround and might be fragile.
+ * It assumes specific formatting outputs from Prettier.
+ *
+ * @param code The code string to preprocess.
+ * @returns The transformed code string.
+ */
+export declare function preprocessCodeForExtractionHack(code: string): string;
+//# sourceMappingURL=preprocess-code-for-extraction-hack.d.ts.map

package/dist/renderers/typescript/extractor/preprocess-code-for-extraction-hack.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"preprocess-code-for-extraction-hack.d.ts","sourceRoot":"","sources":["../../../../src/renderers/typescript/extractor/preprocess-code-for-extraction-hack.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,+BAA+B,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CA0CpE"}

package/dist/renderers/typescript/extractor/preprocess-code-for-extraction-hack.js

@@ -0,0 +1,46 @@
+/**
+ * PREPROCESSING HACK: Adjusts code string before template extraction
+ * to handle specific Prettier formatting quirks where comment markers
+ * are moved outside parentheses.
+ *
+ * Pattern 1: identifier /* TPL_VAR:START *\/ ( => identifier(/* TPL_VAR:START *\/
+ * Pattern 2: ) /* TPL_VAR:END *\/ => /* TPL_VAR:END *\/)
+ * Pattern 3: ,[whitespace]/* TPL_VAR:END *\/ => /* TPL_VAR:END *\/,[whitespace]
+ *
+ * WARNING: This is a temporary workaround and might be fragile.
+ * It assumes specific formatting outputs from Prettier.
+ *
+ * @param code The code string to preprocess.
+ * @returns The transformed code string.
+ */
+export function preprocessCodeForExtractionHack(code) {
+    let transformedCode = code;
+    // --- Pattern 1: Move START marker inside the opening parenthesis ---
+    // Addresses Prettier moving the START marker *before* the opening parenthesis.
+    // Example `Before`: myFunction /* TPL_ARGS:START */ (arg1, arg2)
+    // Example `After`:  myFunction(/* TPL_ARGS:START */ arg1, arg2)
+    const startMarkerRegex = /(\w+)\s*(\/\* (TPL_[A-Z0-9_]+):START \*\/)\s*\(/g;
+    transformedCode = transformedCode.replaceAll(startMarkerRegex, (match, identifier, startMarkerComment) => 
+    // Replace with: identifier, opening parenthesis, the START comment
+    `${identifier}(${startMarkerComment}`);
+    // --- Pattern 2: Move END marker before the opening parenthesis ---
+    // Addresses cases where the END marker might appear *after* the opening parenthesis,
+    // potentially separated by whitespace.
+    // Example `Before`: ( /* TPL_ARGS:END */ arg1, arg2)
+    // Example `After`:  /* TPL_ARGS:END */ (arg1, arg2)
+    const endMarkerRegex = /\(\s*(\/\* (TPL_[A-Z0-9_]+):END \*\/)/g;
+    transformedCode = transformedCode.replaceAll(endMarkerRegex, (match, endMarkerComment) => 
+    // Replace with: the END comment, opening parenthesis
+    `${endMarkerComment}(`);
+    // --- Pattern 3: Move END marker before comma ---
+    // Addresses cases where the END marker appears after a comma, potentially
+    // separated by whitespace (including a single newline).
+    // Example `Before`: arg1, /* TPL_ARGS:END */ arg2
+    // Example `After`:  arg1 /* TPL_ARGS:END */, arg2
+    const commaEndMarkerRegex = /,(\s*)(\/\* (TPL_[A-Z0-9_]+):END \*\/)/g;
+    transformedCode = transformedCode.replaceAll(commaEndMarkerRegex, (match, whitespace, endMarkerComment) => 
+    // Replace with: the END comment, comma
+    `${endMarkerComment},${whitespace}`);
+    return transformedCode;
+}
+//# sourceMappingURL=preprocess-code-for-extraction-hack.js.map

package/dist/renderers/typescript/extractor/preprocess-code-for-extraction-hack.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"preprocess-code-for-extraction-hack.js","sourceRoot":"","sources":["../../../../src/renderers/typescript/extractor/preprocess-code-for-extraction-hack.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AACH,MAAM,UAAU,+BAA+B,CAAC,IAAY;IAC1D,IAAI,eAAe,GAAG,IAAI,CAAC;IAE3B,sEAAsE;IACtE,+EAA+E;IAC/E,iEAAiE;IACjE,gEAAgE;IAChE,MAAM,gBAAgB,GAAG,kDAAkD,CAAC;IAC5E,eAAe,GAAG,eAAe,CAAC,UAAU,CAC1C,gBAAgB,EAChB,CAAC,KAAK,EAAE,UAAU,EAAE,kBAAkB,EAAE,EAAE;IACxC,mEAAmE;IACnE,GAAG,UAAU,IAAI,kBAAkB,EAAE,CACxC,CAAC;IAEF,oEAAoE;IACpE,qFAAqF;IACrF,uCAAuC;IACvC,qDAAqD;IACrD,oDAAoD;IACpD,MAAM,cAAc,GAAG,wCAAwC,CAAC;IAChE,eAAe,GAAG,eAAe,CAAC,UAAU,CAC1C,cAAc,EACd,CAAC,KAAK,EAAE,gBAAgB,EAAE,EAAE;IAC1B,qDAAqD;IACrD,GAAG,gBAAgB,GAAG,CACzB,CAAC;IAEF,kDAAkD;IAClD,0EAA0E;IAC1E,wDAAwD;IACxD,kDAAkD;IAClD,kDAAkD;IAClD,MAAM,mBAAmB,GAAG,yCAAyC,CAAC;IACtE,eAAe,GAAG,eAAe,CAAC,UAAU,CAC1C,mBAAmB,EACnB,CAAC,KAAK,EAAE,UAAU,EAAE,gBAAgB,EAAE,EAAE;IACtC,uCAAuC;IACvC,GAAG,gBAAgB,IAAI,UAAU,EAAE,CACtC,CAAC;IAEF,OAAO,eAAe,CAAC;AACzB,CAAC"}

package/dist/renderers/typescript/extractor/templates/imports-file.d.ts

@@ -0,0 +1,2 @@
+export declare const IMPORTS_FILE_TEMPLATE = "\nimport { createReadOnlyProviderType } from '@baseplate-dev/sync';\n\nimport type { TsImportMapProviderFromSchema } from 'TPL_TS_IMPORTS';\n\nimport {\n  createTsImportMap,\n  createTsImportMapSchema,\n} from 'TPL_TS_IMPORTS';\n\nconst TPL_IMPORTS_SCHEMA_VAR =\n  createTsImportMapSchema(TPL_IMPORTS_SCHEMA);\n\ntype TPL_IMPORTS_PROVIDER_TYPE_VAR = TsImportMapProviderFromSchema<\n  typeof TPL_IMPORTS_SCHEMA_VAR\n>;\n\nexport const TPL_IMPORTS_PROVIDER_VAR =\n  createReadOnlyProviderType<TPL_IMPORTS_PROVIDER_TYPE_VAR>(\n    'TPL_PROVIDER_NAME',\n  );\n\nexport function TPL_CREATE_IMPORT_MAP_FUNCTION(\n  importBase: string,\n): TPL_IMPORTS_PROVIDER_TYPE_VAR {\n  if (!importBase.startsWith('@/')) {\n    throw new Error('importBase must start with @/');\n  }\n\n  return createTsImportMap(\n    TPL_IMPORTS_SCHEMA_VAR,\n    TPL_IMPORT_MAP_CREATOR,\n  );\n}";
+//# sourceMappingURL=imports-file.d.ts.map

package/dist/renderers/typescript/extractor/templates/imports-file.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"imports-file.d.ts","sourceRoot":"","sources":["../../../../../src/renderers/typescript/extractor/templates/imports-file.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,qBAAqB,k2BAiChC,CAAC"}

package/dist/renderers/typescript/extractor/templates/imports-file.js

@@ -0,0 +1,35 @@
+export const IMPORTS_FILE_TEMPLATE = `
+import { createReadOnlyProviderType } from '@baseplate-dev/sync';
+
+import type { TsImportMapProviderFromSchema } from 'TPL_TS_IMPORTS';
+
+import {
+  createTsImportMap,
+  createTsImportMapSchema,
+} from 'TPL_TS_IMPORTS';
+
+const TPL_IMPORTS_SCHEMA_VAR =
+  createTsImportMapSchema(TPL_IMPORTS_SCHEMA);
+
+type TPL_IMPORTS_PROVIDER_TYPE_VAR = TsImportMapProviderFromSchema<
+  typeof TPL_IMPORTS_SCHEMA_VAR
+>;
+
+export const TPL_IMPORTS_PROVIDER_VAR =
+  createReadOnlyProviderType<TPL_IMPORTS_PROVIDER_TYPE_VAR>(
+    'TPL_PROVIDER_NAME',
+  );
+
+export function TPL_CREATE_IMPORT_MAP_FUNCTION(
+  importBase: string,
+): TPL_IMPORTS_PROVIDER_TYPE_VAR {
+  if (!importBase.startsWith('@/')) {
+    throw new Error('importBase must start with @/');
+  }
+
+  return createTsImportMap(
+    TPL_IMPORTS_SCHEMA_VAR,
+    TPL_IMPORT_MAP_CREATOR,
+  );
+}`;
+//# sourceMappingURL=imports-file.js.map

package/dist/renderers/typescript/extractor/templates/imports-file.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"imports-file.js","sourceRoot":"","sources":["../../../../../src/renderers/typescript/extractor/templates/imports-file.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,qBAAqB,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAiCnC,CAAC"}

package/dist/renderers/typescript/extractor/ts-template-file-extractor.d.ts

@@ -0,0 +1,167 @@
+import type { TemplateFileExtractorContext, TemplateFileExtractorFile } from '@baseplate-dev/sync';
+import { TemplateFileExtractor } from '@baseplate-dev/sync';
+import { ResolverFactory } from 'oxc-resolver';
+import { z } from 'zod';
+import type { TsCodeFragment } from '../fragments/types.js';
+import type { TsTemplateFileMetadata } from '../templates/types.js';
+import type { ProjectExportLookupMap, TsTemplateImportLookupContext } from './organize-ts-template-imports.js';
+import type { TsProjectExport } from './write-ts-project-exports.js';
+import { tsTemplateFileMetadataSchema } from '../templates/types.js';
+interface TypescriptCodeEntry {
+    codeBlock: TsCodeFragment;
+    exportName: string;
+}
+declare const generatorOptionsSchema: z.ZodObject<{
+    /**
+     * A map of export group names to export group configuration.
+     *
+     * To refer to the default export group name, use an empty string.
+     */
+    exportGroups: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodObject<{
+        /**
+         * Whether to export the provider type.
+         */
+        exportProviderType: z.ZodOptional<z.ZodBoolean>;
+        /**
+         * The existing imports provider to use.
+         */
+        existingImportsProvider: z.ZodOptional<z.ZodObject<{
+            /**
+             * The module specifier of the existing imports provider.
+             *
+             * Can be a relative path with @/ or a package name.
+             */
+            moduleSpecifier: z.ZodString;
+            /**
+             * The name of the import schema export.
+             */
+            importSchemaName: z.ZodString;
+            /**
+             * The name of the provider type export.
+             */
+            providerTypeName: z.ZodString;
+            /**
+             * The name of the provider export.
+             */
+            providerName: z.ZodString;
+        }, "strip", z.ZodTypeAny, {
+            moduleSpecifier: string;
+            importSchemaName: string;
+            providerTypeName: string;
+            providerName: string;
+        }, {
+            moduleSpecifier: string;
+            importSchemaName: string;
+            providerTypeName: string;
+            providerName: string;
+        }>>;
+    }, "strip", z.ZodTypeAny, {
+        existingImportsProvider?: {
+            moduleSpecifier: string;
+            importSchemaName: string;
+            providerTypeName: string;
+            providerName: string;
+        } | undefined;
+        exportProviderType?: boolean | undefined;
+    }, {
+        existingImportsProvider?: {
+            moduleSpecifier: string;
+            importSchemaName: string;
+            providerTypeName: string;
+            providerName: string;
+        } | undefined;
+        exportProviderType?: boolean | undefined;
+    }>>>;
+}, "strip", z.ZodTypeAny, {
+    exportGroups?: Record<string, {
+        existingImportsProvider?: {
+            moduleSpecifier: string;
+            importSchemaName: string;
+            providerTypeName: string;
+            providerName: string;
+        } | undefined;
+        exportProviderType?: boolean | undefined;
+    }> | undefined;
+}, {
+    exportGroups?: Record<string, {
+        existingImportsProvider?: {
+            moduleSpecifier: string;
+            importSchemaName: string;
+            providerTypeName: string;
+            providerName: string;
+        } | undefined;
+        exportProviderType?: boolean | undefined;
+    }> | undefined;
+}>;
+type GeneratorOptions = z.infer<typeof generatorOptionsSchema>;
+export declare class TsTemplateFileExtractor extends TemplateFileExtractor<typeof tsTemplateFileMetadataSchema> {
+    name: string;
+    metadataSchema: z.ZodObject<z.objectUtil.extendShape<{
+        type: z.ZodString;
+        name: z.ZodString;
+        generator: z.ZodString;
+        template: z.ZodString;
+    }, {
+        type: z.ZodLiteral<"ts">;
+        group: z.ZodOptional<z.ZodString>;
+        exportGroup: z.ZodOptional<z.ZodString>;
+        projectExports: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodObject<{
+            isTypeOnly: z.ZodOptional<z.ZodBoolean>;
+            exportName: z.ZodOptional<z.ZodString>;
+        }, "strip", z.ZodTypeAny, {
+            isTypeOnly?: boolean | undefined;
+            exportName?: string | undefined;
+        }, {
+            isTypeOnly?: boolean | undefined;
+            exportName?: string | undefined;
+        }>>>;
+        projectExportsOnly: z.ZodOptional<z.ZodBoolean>;
+    }>, "strip", z.ZodTypeAny, {
+        type: "ts";
+        name: string;
+        generator: string;
+        template: string;
+        group?: string | undefined;
+        exportGroup?: string | undefined;
+        projectExports?: Record<string, {
+            isTypeOnly?: boolean | undefined;
+            exportName?: string | undefined;
+        }> | undefined;
+        projectExportsOnly?: boolean | undefined;
+    }, {
+        type: "ts";
+        name: string;
+        generator: string;
+        template: string;
+        group?: string | undefined;
+        exportGroup?: string | undefined;
+        projectExports?: Record<string, {
+            isTypeOnly?: boolean | undefined;
+            exportName?: string | undefined;
+        }> | undefined;
+        projectExportsOnly?: boolean | undefined;
+    }>;
+    protected pathResolver: ResolverFactory;
+    constructor(context: TemplateFileExtractorContext, { pathResolver, }?: {
+        pathResolver?: ResolverFactory;
+    });
+    private generatorConfigCacheMap;
+    protected getGeneratorOptions(generatorName: string): Promise<GeneratorOptions>;
+    protected getTypescriptRendererImport(generatorName: string): string;
+    protected extractTemplateFile(file: TemplateFileExtractorFile<TsTemplateFileMetadata>, importLookupContext: TsTemplateImportLookupContext): Promise<TypescriptCodeEntry & {
+        originalPath: string;
+    }>;
+    protected extractTemplateFilesForGroup(generatorName: string, groupName: string, files: TemplateFileExtractorFile<TsTemplateFileMetadata>[], lookupContext: TsTemplateImportLookupContext): Promise<TypescriptCodeEntry>;
+    protected extractTemplateFilesForGenerator(generatorName: string, files: TemplateFileExtractorFile<TsTemplateFileMetadata>[], projectExportMap: ProjectExportLookupMap): Promise<void>;
+    /**
+     * Generates an import file for a generator.
+     *
+     * @param generatorName - The name of the generator.
+     * @param files - The files to generate the import file for.
+     * @returns A list of project exports.
+     */
+    protected generateImportFileForGenerator(generatorName: string, files: TemplateFileExtractorFile<TsTemplateFileMetadata>[]): Promise<TsProjectExport[]>;
+    extractTemplateFiles(files: TemplateFileExtractorFile<TsTemplateFileMetadata>[]): Promise<void>;
+}
+export {};
+//# sourceMappingURL=ts-template-file-extractor.d.ts.map

package/dist/renderers/typescript/extractor/ts-template-file-extractor.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ts-template-file-extractor.d.ts","sourceRoot":"","sources":["../../../../src/renderers/typescript/extractor/ts-template-file-extractor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,4BAA4B,EAC5B,yBAAyB,EAC1B,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAGL,qBAAqB,EACtB,MAAM,qBAAqB,CAAC;AAS7B,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/C,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AACpE,OAAO,KAAK,EACV,sBAAsB,EACtB,6BAA6B,EAC9B,MAAM,mCAAmC,CAAC;AAC3C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAKrE,OAAO,EAEL,4BAA4B,EAC7B,MAAM,uBAAuB,CAAC;AAM/B,UAAU,mBAAmB;IAC3B,SAAS,EAAE,cAAc,CAAC;IAC1B,UAAU,EAAE,MAAM,CAAC;CACpB;AAYD,QAAA,MAAM,sBAAsB;IAC1B;;;;OAIG;;QAKG;;WAEG;;QAEH;;WAEG;;YAGC;;;;eAIG;;YAEH;;eAEG;;YAEH;;eAEG;;YAEH;;eAEG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAOb,CAAC;AAEH,KAAK,gBAAgB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,sBAAsB,CAAC,CAAC;AAE/D,qBAAa,uBAAwB,SAAQ,qBAAqB,CAChE,OAAO,4BAA4B,CACpC;IACQ,IAAI,SAAoB;IACxB,cAAc;cArGQ,EAC7B,SAAQ;cAGmB,EAAG,SAAS;mBAItC,EAAG,SAAS;kBAIZ,EAAI,SAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAyFwC;IAErD,SAAS,CAAC,YAAY,EAAE,eAAe,CAAC;gBAGtC,OAAO,EAAE,4BAA4B,EACrC,EACE,YAAY,GACb,GAAE;QACD,YAAY,CAAC,EAAE,eAAe,CAAC;KAC3B;IAuBR,OAAO,CAAC,uBAAuB,CAAuC;cAEtD,mBAAmB,CACjC,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,gBAAgB,CAAC;IAkB5B,SAAS,CAAC,2BAA2B,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM;cAMpD,mBAAmB,CACjC,IAAI,EAAE,yBAAyB,CAAC,sBAAsB,CAAC,EACvD,mBAAmB,EAAE,6BAA6B,GACjD,OAAO,CACR,mBAAmB,GAAG;QACpB,YAAY,EAAE,MAAM,CAAC;KACtB,CACF;cAoFe,4BAA4B,CAC1C,aAAa,EAAE,MAAM,EACrB,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,yBAAyB,CAAC,sBAAsB,CAAC,EAAE,EAC1D,aAAa,EAAE,6BAA6B,GAC3C,OAAO,CAAC,mBAAmB,CAAC;cA6Cf,gCAAgC,CAC9C,aAAa,EAAE,MAAM,EACrB,KAAK,EAAE,yBAAyB,CAAC,sBAAsB,CAAC,EAAE,EAC1D,gBAAgB,EAAE,sBAAsB,GACvC,OAAO,CAAC,IAAI,CAAC;IAwEhB;;;;;;OAMG;cACa,8BAA8B,CAC5C,aAAa,EAAE,MAAM,EACrB,KAAK,EAAE,yBAAyB,CAAC,sBAAsB,CAAC,EAAE,GACzD,OAAO,CAAC,eAAe,EAAE,CAAC;IA6DvB,oBAAoB,CACxB,KAAK,EAAE,yBAAyB,CAAC,sBAAsB,CAAC,EAAE,GACzD,OAAO,CAAC,IAAI,CAAC;CAsDjB"}