@goast/typescript 0.3.5 → 0.3.7-beta1

package/cjs/lib/generators/models/model-generator.js

@@ -18,14 +18,16 @@ class DefaultTypeScriptModelGenerator extends file_generator_1.TypeScriptFileGen
                 options: ctx.config,
                 generator: (b) => b.append(fileContent),
             });
+            const exports = fileContent.values.filter((x) => typeof x === 'object' && x !== null && 'export' in x && x.export === true && 'name' in x);
+            const isType = exports.find((x) => x.name === name) instanceof ast_1.ts.TypeAlias;
             return {
                 component: name,
                 filePath,
-                imports: [{ kind: 'file', name, modulePath: filePath, type: 'import' }],
-                additionalExports: fileContent.values
-                    .filter((x) => typeof x === 'object' && x !== null && 'export' in x && x.export === true && 'name' in x)
+                imports: [{ kind: 'file', name, modulePath: filePath, type: 'type-import' }],
+                additionalExports: exports
                     .filter((x) => x.name !== name)
-                    .map((x) => x.name),
+                    .map((x) => ({ name: x.name, type: x instanceof ast_1.ts.TypeAlias ? 'type-export' : 'export' })),
+                kind: isType ? 'type' : 'interface',
             };
         }
         else {
@@ -33,7 +35,7 @@ class DefaultTypeScriptModelGenerator extends file_generator_1.TypeScriptFileGen
             builder.append(this.getType(ctx, ctx.schema));
             const imports = builder.imports.imports;
             builder.imports.clear();
-            return { component: builder.toString(false), imports };
+            return { component: builder.toString(false), imports, kind: 'unknown' };
         }
     }
     getFileContent(ctx) {
@@ -158,13 +160,17 @@ class DefaultTypeScriptModelGenerator extends file_generator_1.TypeScriptFileGen
             return this.getAnyType(ctx);
         schema = (0, core_1.getSchemaReference)(schema, ['description']);
         if ((options === null || options === void 0 ? void 0 : options.useBaseType) && ctx.schema.inheritedSchemas.some((x) => x.id === schema.id)) {
-            return ast_1.ts.reference(this.getBaseTypeName(ctx, schema), this.getFilePath(ctx, schema));
+            return ast_1.ts.reference(this.getBaseTypeName(ctx, schema), this.getFilePath(ctx, schema), {
+                importType: 'type-import',
+            });
         }
         if (!(options === null || options === void 0 ? void 0 : options.skipSchemas) && this.shouldGenerateTypeDeclaration(ctx, schema)) {
             if (schema.id === ctx.schema.id) {
                 return null;
             }
-            return ast_1.ts.reference(this.getDeclarationTypeName(ctx, schema), this.getFilePath(ctx, schema));
+            return ast_1.ts.reference(this.getDeclarationTypeName(ctx, schema), this.getFilePath(ctx, schema), {
+                importType: 'type-import',
+            });
         }
         if (schema.enum) {
             return ast_1.ts.unionType(schema.enum.map((x) => ast_1.ts.toNode(x)));

package/cjs/lib/generators/models/models-generator.js

@@ -57,7 +57,10 @@ class TypeScriptModelsGenerator extends core_1.OpenApiSchemasGenerationProviderB
             const { filePath } = x;
             if (!filePath)
                 return [];
-            return [ast_1.ts.export(x.component, filePath), ...((_b = (_a = x.additionalExports) === null || _a === void 0 ? void 0 : _a.map((e) => ast_1.ts.export(e, filePath))) !== null && _b !== void 0 ? _b : [])];
+            return [
+                ast_1.ts.export(x.component, filePath, { kind: x.kind === 'type' ? 'type-export' : 'export' }),
+                ...((_b = (_a = x.additionalExports) === null || _a === void 0 ? void 0 : _a.map((e) => typeof e === 'string' ? ast_1.ts.export(e, filePath) : ast_1.ts.export(e.name, filePath, { kind: e.type }))) !== null && _b !== void 0 ? _b : []),
+            ];
         }));
     }
 }

package/cjs/lib/generators/services/angular-services/angular-service-generator.js

@@ -187,7 +187,7 @@ class DefaultTypeScriptAngularServiceGenerator extends file_generator_1.TypeScri
         var _a, _b, _c, _d;
         const hasParams = this.hasEndpointParams(ctx, endpoint);
         const paramsOptional = !endpoint.parameters.some((p) => p.required) && !((_a = endpoint.requestBody) === null || _a === void 0 ? void 0 : _a.required);
-        const responseModelType = ast_1.ts.reference(this.getResponseModelName(ctx, endpoint), this.getResponseModelFilePath(ctx));
+        const responseModelType = ast_1.ts.reference(this.getResponseModelName(ctx, endpoint), this.getResponseModelFilePath(ctx), { importType: 'type-import' });
         const returnType = ctx.refs.abortablePromise([responseModelType]);
         const accept = (_d = (_c = (_b = this.getEndpointSuccessResponse(ctx, endpoint)) === null || _b === void 0 ? void 0 : _b.contentOptions[0]) === null || _c === void 0 ? void 0 : _c.type) !== null && _d !== void 0 ? _d : '*/*';
         const responseType = this.contentTypeToResponseType(accept);
@@ -231,13 +231,13 @@ class DefaultTypeScriptAngularServiceGenerator extends file_generator_1.TypeScri
                     }
                     : null,
                 '',
-                (0, core_1.builderTemplate) `return ${ctx.refs.waitForResponse([responseModelType])}(${core_1.builderTemplate.indent `
-              this.http.request(rb.build({${core_1.builderTemplate.indent `
-                responseType: ${ast_1.ts.string(responseType)},
-                accept: ${ast_1.ts.string(accept)},
-                context,`}
-              })),
-              {${core_1.builderTemplate.indent `
+                (0, core_1.builderTemplate) `return ${ctx.refs.waitForResponse([responseModelType])}(${core_1.builderTemplate.indent `
+              this.http.request(rb.build({${core_1.builderTemplate.indent `
+                responseType: ${ast_1.ts.string(responseType)},
+                accept: ${ast_1.ts.string(accept)},
+                context,`}
+              })),
+              {${core_1.builderTemplate.indent `
                 errorResponseTypes: ${ast_1.ts.object({
                     members: [
                         ...Object.entries(this.getEndpointStatusCodes(ctx, endpoint))
@@ -246,8 +246,8 @@ class DefaultTypeScriptAngularServiceGenerator extends file_generator_1.TypeScri
                             return ast_1.ts.property(key, { value: ast_1.ts.string(value.parser) });
                         }),
                     ],
-                })}`}
-              }`}
+                })}`}
+              }`}
             )`,
             ], '\n'),
         });

package/cjs/lib/generators/services/angular-services/angular-services-generator.js

@@ -199,7 +199,7 @@ class TypeScriptAngularServicesGenerator extends core_1.OpenApiServicesGeneratio
     getResponseModelsIndexFileContent(ctx) {
         return (0, core_1.appendValueGroup)(Object.values(ctx.output.typescript.services)
             .flatMap((x) => Object.values(x.responseModels))
-            .map((x) => ast_1.ts.export(x.component, x.filePath)));
+            .map((x) => ast_1.ts.export(x.component, x.filePath, { kind: 'type-export' })));
     }
     getServicesIndexFilePath(ctx) {
         return ctx.config.servicesIndexFile ? (0, path_1.resolve)(ctx.config.outputDir, ctx.config.servicesIndexFile) : null;

package/cjs/lib/generators/services/angular-services/refs.js

@@ -10,7 +10,7 @@ function getReferenceFactories(options) {
     const utilsDirPath = (0, path_1.resolve)(options.outputDir, options.utilsDir);
     return {
         // angular-service.utils.ts
-        abortablePromise: ast_1.ts.reference.genericFactory('AbortablePromise', (0, path_1.join)(utilsDirPath, 'angular-service.utils.ts')),
+        abortablePromise: ast_1.ts.reference.genericFactory('AbortablePromise', (0, path_1.join)(utilsDirPath, 'angular-service.utils.ts'), { importType: 'type-import' }),
         waitForResponse: ast_1.ts.reference.genericFactory('waitForResponse', (0, path_1.join)(utilsDirPath, 'angular-service.utils.ts')),
         // request-builder.ts
         requestBuilder: ast_1.ts.reference.factory('RequestBuilder', (0, path_1.join)(utilsDirPath, 'request-builder.ts')),
@@ -19,7 +19,9 @@ function getReferenceFactories(options) {
         // api-base-service.ts - generated in angular-service-generator.ts
         apiBaseService: ast_1.ts.reference.factory('ApiBaseService', (0, path_1.join)(utilsDirPath, 'api-base-service.ts')),
         // http-status-code.ts - generated in angular-services-generator.ts
-        httpStatusCode: ast_1.ts.reference.factory('HttpStatusCode', (0, path_1.join)(utilsDirPath, 'http-status-code.ts')),
+        httpStatusCode: ast_1.ts.reference.factory('HttpStatusCode', (0, path_1.join)(utilsDirPath, 'http-status-code.ts'), {
+            importType: 'type-import',
+        }),
         // provide.ts - generated in angular-services-generator.ts
         provide: ast_1.ts.reference.factory((0, core_1.toCasing)(`provide_${(_b = options.domainName) !== null && _b !== void 0 ? _b : ''}_Api`, options.functionNameCasing), (0, path_1.join)(utilsDirPath, 'provide.ts')),
     };

package/cjs/lib/generators/services/easy-network-stub/easy-network-stub-generator.js

@@ -97,15 +97,15 @@ class DefaultTypeScriptEasyNetworkStubGenerator extends file_generator_1.TypeScr
             ],
             returnType: 'this',
             body: (0, core_1.appendValueGroup)([
-                (0, core_1.builderTemplate) `this.stubWrapper.stub2<${requestType}>()(${core_1.builderTemplate.indent `
-              ${ast_1.ts.string(endpoint.method.toUpperCase())},
-              ${this.getStubClassName(ctx)}.${this.getEndpointPathPropertyName(ctx, endpoint)},
-              async (request) => {${core_1.builderTemplate.indent `
-                if (this.stubWrapper.options.rememberRequests) {${core_1.builderTemplate.indent `
-                  this.${this.getEndpointRequestsFieldName(ctx, endpoint)}.push(request);`}
-                }
-                throw await response(${this.getResponderVariableName(ctx, endpoint)}, request);`}
-              }`}
+                (0, core_1.builderTemplate) `this.stubWrapper.stub2<${requestType}>()(${core_1.builderTemplate.indent `
+              ${ast_1.ts.string(endpoint.method.toUpperCase())},
+              ${this.getStubClassName(ctx)}.${this.getEndpointPathPropertyName(ctx, endpoint)},
+              async (request) => {${core_1.builderTemplate.indent `
+                if (this.stubWrapper.options.rememberRequests) {${core_1.builderTemplate.indent `
+                  this.${this.getEndpointRequestsFieldName(ctx, endpoint)}.push(request);`}
+                }
+                throw await response(${this.getResponderVariableName(ctx, endpoint)}, request);`}
+              }`}
             );`,
                 'return this;',
             ], '\n'),

package/cjs/lib/generators/services/easy-network-stub/easy-network-stubs-generator.js

@@ -82,13 +82,15 @@ class TypeScriptEasyNetworkStubsGenerator extends core_1.OpenApiServicesGenerati
                 ...Object.entries(ctx.output.typescript.stubs).map(([id, x]) => ast_1.ts.property((0, core_1.toCasing)(serviceNames[id], fieldCasing), {
                     accessModifier: 'private',
                     optional: true,
-                    type: ctx.refs.easyNetworkStubGroup([ast_1.ts.reference(x.component, x.filePath), 'this']),
+                    type: ctx.refs.easyNetworkStubGroup([ast_1.ts.reference(x.component, x.filePath), 'this'], {
+                        importType: 'type-import',
+                    }),
                 })),
                 ast_1.ts.constructor({
                     parameters: [
                         ast_1.ts.constructorParameter('stub', { type: ast_1.ts.refs.easyNetworkStub.easyNetworkStub() }),
                         ast_1.ts.constructorParameter('options', {
-                            type: ast_1.ts.refs.partial([ctx.refs.easyNetworkStubWrapperOptions()]),
+                            type: ast_1.ts.refs.partial([ctx.refs.easyNetworkStubWrapperOptions()], { importType: 'type-import' }),
                             optional: true,
                         }),
                     ],
@@ -96,14 +98,16 @@ class TypeScriptEasyNetworkStubsGenerator extends core_1.OpenApiServicesGenerati
                 }),
                 ast_1.ts.property('requests', {
                     accessModifier: 'public',
-                    type: ast_1.ts.arrayType(ctx.refs.stubRequestItem(), { readonly: true }),
+                    type: ast_1.ts.arrayType(ctx.refs.stubRequestItem({ importType: 'type-import' }), { readonly: true }),
                     get: ast_1.ts.property.getter({
                         body: (0, core_1.appendValueGroup)(['return this._stubWrapper.requests;'], '\n'),
                     }),
                 }),
                 ...Object.entries(ctx.output.typescript.stubs).map(([id, x]) => ast_1.ts.property((0, core_1.toCasing)(serviceNames[id], ctx.config.propertyNameCasing), {
                     accessModifier: 'public',
-                    type: ctx.refs.easyNetworkStubGroup([ast_1.ts.reference(x.component, x.filePath), 'this']),
+                    type: ctx.refs.easyNetworkStubGroup([ast_1.ts.reference(x.component, x.filePath), 'this'], {
+                        importType: 'type-import',
+                    }),
                     get: ast_1.ts.property.getter({
                         body: (0, core_1.appendValueGroup)([
                             (0, core_1.builderTemplate) `return this.${(0, core_1.toCasing)(serviceNames[id], fieldCasing)} ??= ${ctx.refs.createEasyNetworkStubGroup.infer()}(this, this._stubWrapper, ${ast_1.ts.reference(x.component, x.filePath)});`,

package/cjs/lib/generators/services/easy-network-stub/refs.js

@@ -9,14 +9,20 @@ function getReferenceFactories(options) {
     const easyNetworkStubUtilsPath = (0, path_1.join)(utilsDirPath, 'easy-network-stub.utils.ts');
     return {
         // easy-network-stub.utils.ts
-        easyNetworkStubWrapperOptions: ast_1.ts.reference.factory('EasyNetworkStubWrapperOptions', easyNetworkStubUtilsPath),
-        stubRequestItem: ast_1.ts.reference.factory('StubRequestItem', easyNetworkStubUtilsPath),
-        stubRequestInfo: ast_1.ts.reference.genericFactory('StubRequestInfo', easyNetworkStubUtilsPath),
-        strictRouteResponseCallback: ast_1.ts.reference.genericFactory('StrictRouteResponseCallback', easyNetworkStubUtilsPath),
+        easyNetworkStubWrapperOptions: ast_1.ts.reference.factory('EasyNetworkStubWrapperOptions', easyNetworkStubUtilsPath, {
+            importType: 'type-import',
+        }),
+        stubRequestItem: ast_1.ts.reference.factory('StubRequestItem', easyNetworkStubUtilsPath, { importType: 'type-import' }),
+        stubRequestInfo: ast_1.ts.reference.genericFactory('StubRequestInfo', easyNetworkStubUtilsPath, {
+            importType: 'type-import',
+        }),
+        strictRouteResponseCallback: ast_1.ts.reference.genericFactory('StrictRouteResponseCallback', easyNetworkStubUtilsPath, { importType: 'type-import' }),
         getStubResponder: ast_1.ts.reference.genericFactory('getStubResponder', easyNetworkStubUtilsPath),
         easyNetworkStubWrapper: ast_1.ts.reference.factory('EasyNetworkStubWrapper', easyNetworkStubUtilsPath),
         easyNetworkStubBase: ast_1.ts.reference.factory('EasyNetworkStubBase', easyNetworkStubUtilsPath),
-        easyNetworkStubGroup: ast_1.ts.reference.genericFactory('EasyNetworkStubGroup', easyNetworkStubUtilsPath),
+        easyNetworkStubGroup: ast_1.ts.reference.genericFactory('EasyNetworkStubGroup', easyNetworkStubUtilsPath, {
+            importType: 'type-import',
+        }),
         createEasyNetworkStubGroup: ast_1.ts.reference.genericFactory('createEasyNetworkStubGroup', easyNetworkStubUtilsPath),
     };
 }

package/cjs/lib/generators/services/fetch-clients/fetch-client-generator.js

@@ -136,7 +136,7 @@ class DefaultTypeScriptFetchClientGenerator extends file_generator_1.TypeScriptF
         const method = this.getInterfaceEndpointMethod(ctx, endpoint);
         method.accessModifier = 'public';
         method.body = (0, core_1.appendValueGroup)([
-            (0, core_1.builderTemplate) `const url = new ${ctx.refs.urlBuilder()}(this.options.baseUrl)${core_1.builderTemplate.indent `
+            (0, core_1.builderTemplate) `const url = new ${ctx.refs.urlBuilder()}(this.options.baseUrl)${core_1.builderTemplate.indent `
           .withPath(${ast_1.ts.string(endpoint.path)})${(b) => b.forEach(endpoint.parameters, (b, p) => {
                 switch (p.target) {
                     case 'path':
@@ -146,7 +146,7 @@ class DefaultTypeScriptFetchClientGenerator extends file_generator_1.TypeScriptF
                         b.append((0, core_1.builderTemplate) `\n.withQueryParam(${ast_1.ts.string(p.name)}, params.${(0, core_1.toCasing)(p.name, ctx.config.paramNameCasing)})`);
                         break;
                 }
-            })}
+            })}
           .build();`}`,
             (0, core_1.builderTemplate) `const response = (this.options.fetch ?? fetch)(url, ${ast_1.ts.object({
                 members: [

package/cjs/lib/generators/services/fetch-clients/refs.js

@@ -9,8 +9,8 @@ function getReferenceFactories(options) {
     const fetchClientUtilsPath = (0, path_1.resolve)(utilsDirPath, 'fetch-client.utils.ts');
     return {
         // fetch-client.utils.ts
-        typedResponse: ast_1.ts.reference.genericFactory('TypedResponse', fetchClientUtilsPath),
-        fetchClientOptions: ast_1.ts.reference.factory('FetchClientOptions', fetchClientUtilsPath),
+        typedResponse: ast_1.ts.reference.genericFactory('TypedResponse', fetchClientUtilsPath, { importType: 'type-import' }),
+        fetchClientOptions: ast_1.ts.reference.factory('FetchClientOptions', fetchClientUtilsPath, { importType: 'type-import' }),
         urlBuilder: ast_1.ts.reference.factory('UrlBuilder', fetchClientUtilsPath),
     };
 }

package/cjs/lib/generators/services/k6-clients/k6-client-generator.js

@@ -189,7 +189,7 @@ class DefaultTypeScriptK6ClientGenerator extends file_generator_1.TypeScriptFile
                         ],
                     }),
                     parameters: [ast_1.ts.constructorParameter('rootUrl'), ast_1.ts.constructorParameter('defaultK6ParamsFactory')],
-                    body: (0, core_1.builderTemplate) `this.rootUrl = rootUrl;
+                    body: (0, core_1.builderTemplate) `this.rootUrl = rootUrl;
                   this._defaultK6ParamsFactory = defaultK6ParamsFactory;`,
                 }),
                 ...ctx.service.endpoints.map((e) => this.getEndpointMethod(ctx, e)),
@@ -248,11 +248,11 @@ class DefaultTypeScriptK6ClientGenerator extends file_generator_1.TypeScriptFile
                     }
                     : null,
                 '',
-                (0, core_1.builderTemplate) `return /** @type {${returnType}} */ (${core_1.builderTemplate.indent `
-              ${ctx.config.async ? 'await rb.buildAsync' : 'rb.build'}({${core_1.builderTemplate.indent `
-                accept: ${ast_1.ts.string(accept)},
-                params: this.getK6Params(k6Params),`}
-              })`}
+                (0, core_1.builderTemplate) `return /** @type {${returnType}} */ (${core_1.builderTemplate.indent `
+              ${ctx.config.async ? 'await rb.buildAsync' : 'rb.build'}({${core_1.builderTemplate.indent `
+                accept: ${ast_1.ts.string(accept)},
+                params: this.getK6Params(k6Params),`}
+              })`}
             );`,
             ], '\n'),
         });

package/cjs/lib/import-collection.js

@@ -15,13 +15,14 @@ class ImportExportCollection {
         this._typeImports = new Map();
         this._jsDocImports = new Map();
         this._exports = new Map();
+        this._typeExports = new Map();
         this._options = { ...exports.defaultImportExportCollectionOptions, ...options };
     }
     get hasImports() {
         return this._imports.size > 0 || this._typeImports.size > 0 || this._jsDocImports.size > 0;
     }
     get hasExports() {
-        return this._exports.size > 0;
+        return this._exports.size > 0 || this._typeExports.size > 0;
     }
     get imports() {
         return [
@@ -51,28 +52,23 @@ class ImportExportCollection {
             map.set(fromModule, new Set([importName]));
         }
     }
-    getImportMap(type) {
-        switch (type) {
-            case 'import':
-                return this._imports;
-            case 'type-import':
-                return this._typeImports;
-            case 'js-doc':
-                return this._jsDocImports;
-        }
-    }
-    addExport(exportName, fromModule) {
-        const existingExport = this._exports.get(fromModule);
+    addExport(exportName, fromModule, options) {
+        var _a;
+        const map = this.getExportMap((_a = options === null || options === void 0 ? void 0 : options.type) !== null && _a !== void 0 ? _a : 'export');
+        const existingExport = map.get(fromModule);
         if (existingExport) {
             existingExport.add(exportName);
         }
         else {
-            this._exports.set(fromModule, new Set([exportName]));
+            map.set(fromModule, new Set([exportName]));
         }
     }
     clear() {
         this._imports.clear();
+        this._typeImports.clear();
+        this._jsDocImports.clear();
         this._exports.clear();
+        this._typeExports.clear();
     }
     toString(options) {
         const builder = new core_1.StringBuilder(options);
@@ -111,6 +107,15 @@ class ImportExportCollection {
             }
             const sortedExports = this.sortAndResolve(this._exports, filePath, importModuleTransformer);
             this.writeImportsExports(builder, 'export', sortedExports, { useSingleQuotes });
+            hasPrevious = true;
+        }
+        if (this._typeExports.size > 0) {
+            if (hasPrevious) {
+                builder.appendLine();
+            }
+            const sortedExports = this.sortAndResolve(this._typeExports, filePath, importModuleTransformer);
+            this.writeImportsExports(builder, 'export type', sortedExports, { useSingleQuotes });
+            hasPrevious = true;
         }
     }
     writeImportsExports(builder, keyword, data, options) {
@@ -153,5 +158,23 @@ class ImportExportCollection {
             kind,
         ];
     }
+    getImportMap(type) {
+        switch (type) {
+            case 'import':
+                return this._imports;
+            case 'type-import':
+                return this._typeImports;
+            case 'js-doc':
+                return this._jsDocImports;
+        }
+    }
+    getExportMap(type) {
+        switch (type) {
+            case 'export':
+                return this._exports;
+            case 'type-export':
+                return this._typeExports;
+        }
+    }
 }
 exports.ImportExportCollection = ImportExportCollection;

package/esm/lib/ast/nodes/export.js

@@ -3,16 +3,18 @@ import { TsNode } from '../node';
 import { writeTsNodes } from '../utils/write-ts-nodes';
 export class TsExport extends TsNode {
     constructor(options) {
+        var _a;
         super(options);
         this.name = options.name;
         this.filePath = options.filePath;
+        this.kind = (_a = options.kind) !== null && _a !== void 0 ? _a : 'export';
     }
     onWrite(builder) {
         if (builder instanceof TypeScriptFileBuilder) {
-            builder.addExport(this.name, this.filePath);
+            builder.addExport(this.name, this.filePath, { type: this.kind });
         }
         else {
-            builder.appendLine(`export { ${this.name} } from '${this.filePath}';`);
+            builder.appendLine(this.kind === 'type-export' ? 'export type' : 'export', ` { ${this.name} } from '${this.filePath}';`);
         }
     }
 }

package/esm/lib/ast/nodes/reference.js

@@ -38,24 +38,24 @@ TsReference.addImportHandlers = [
     },
 ];
 const createReference = (name, moduleNameOrfilePath, options) => new TsReference({ ...options, name, moduleNameOrfilePath });
-function _createFactory(name, moduleNameOrfilePath) {
-    return Object.assign((options) => createReference(name, moduleNameOrfilePath, options), {
+function _createFactory(name, moduleNameOrfilePath, defaultOptions) {
+    return Object.assign((options) => createReference(name, moduleNameOrfilePath, { ...defaultOptions, ...options }), {
         refName: name,
         moduleNameOrfilePath,
     });
 }
-function createFactory(name, moduleNameOrfilePath) {
-    return _createFactory(name, moduleNameOrfilePath);
+function createFactory(name, moduleNameOrfilePath, defaultOptions) {
+    return _createFactory(name, moduleNameOrfilePath, defaultOptions);
 }
-function _createGenericFactory(name, moduleNameOrfilePath) {
-    return Object.assign((generics, options) => createReference(name, moduleNameOrfilePath, { ...options, generics }), {
+function _createGenericFactory(name, moduleNameOrfilePath, defaultOptions) {
+    return Object.assign((generics, options) => createReference(name, moduleNameOrfilePath, { ...defaultOptions, ...options, generics }), {
         refName: name,
         moduleNameOrfilePath,
         infer: () => createReference(name, moduleNameOrfilePath),
     });
 }
-function createGenericFactory(name, moduleNameOrfilePath) {
-    return _createGenericFactory(name, moduleNameOrfilePath);
+function createGenericFactory(name, moduleNameOrfilePath, defaultOptions) {
+    return _createGenericFactory(name, moduleNameOrfilePath, defaultOptions);
 }
 export const tsReference = Object.assign(createReference, {
     factory: createFactory,

package/esm/lib/ast/references/angular.js

@@ -2,7 +2,7 @@ import { tsReference } from '../nodes/reference';
 // @angular/core
 export const inject = tsReference.factory('inject', '@angular/core');
 export const injectable = tsReference.factory('Injectable', '@angular/core');
-export const provider = tsReference.factory('Provider', '@angular/core');
+export const provider = tsReference.factory('Provider', '@angular/core', { importType: 'type-import' });
 // @angular/common/http
 export const httpClient = tsReference.factory('HttpClient', '@angular/common/http');
 export const httpContext = tsReference.factory('HttpContext', '@angular/common/http');

package/esm/lib/ast/references/easy-network-stub.js

@@ -1,5 +1,7 @@
 import { tsReference } from '../nodes/reference';
 export const easyNetworkStub = tsReference.factory('EasyNetworkStub', 'easy-network-stub');
-export const httpMethod = tsReference.factory('HttpMethod', 'easy-network-stub');
-export const routeResponseCallback = tsReference.genericFactory('RouteResponseCallback', 'easy-network-stub');
+export const httpMethod = tsReference.factory('HttpMethod', 'easy-network-stub', { importType: 'type-import' });
+export const routeResponseCallback = tsReference.genericFactory('RouteResponseCallback', 'easy-network-stub', {
+    importType: 'type-import',
+});
 export const errorResponse = tsReference.genericFactory('ErrorResponse', 'easy-network-stub');

package/esm/lib/file-builder.js

@@ -24,8 +24,8 @@ export class TypeScriptFileBuilder extends SourceBuilder {
         this.imports.addImport(name, moduleNameOrfilePath, options);
         return this;
     }
-    addExport(name, filePath) {
-        this.imports.addExport(name, filePath);
+    addExport(name, filePath, options) {
+        this.imports.addExport(name, filePath, options);
         return this;
     }
     clear() {
@@ -59,7 +59,7 @@ export class TypeScriptFileBuilder extends SourceBuilder {
     appendModelUsage(type, options) {
         this.append(type.component);
         for (const i of type.imports) {
-            this.addImport(i.name, i.modulePath, options);
+            this.addImport(i.name, i.modulePath, { ...i, ...options });
         }
         return this;
     }

package/esm/lib/generators/models/model-generator.js

@@ -15,14 +15,16 @@ export class DefaultTypeScriptModelGenerator extends TypeScriptFileGenerator {
                 options: ctx.config,
                 generator: (b) => b.append(fileContent),
             });
+            const exports = fileContent.values.filter((x) => typeof x === 'object' && x !== null && 'export' in x && x.export === true && 'name' in x);
+            const isType = exports.find((x) => x.name === name) instanceof ts.TypeAlias;
             return {
                 component: name,
                 filePath,
-                imports: [{ kind: 'file', name, modulePath: filePath, type: 'import' }],
-                additionalExports: fileContent.values
-                    .filter((x) => typeof x === 'object' && x !== null && 'export' in x && x.export === true && 'name' in x)
+                imports: [{ kind: 'file', name, modulePath: filePath, type: 'type-import' }],
+                additionalExports: exports
                     .filter((x) => x.name !== name)
-                    .map((x) => x.name),
+                    .map((x) => ({ name: x.name, type: x instanceof ts.TypeAlias ? 'type-export' : 'export' })),
+                kind: isType ? 'type' : 'interface',
             };
         }
         else {
@@ -30,7 +32,7 @@ export class DefaultTypeScriptModelGenerator extends TypeScriptFileGenerator {
             builder.append(this.getType(ctx, ctx.schema));
             const imports = builder.imports.imports;
             builder.imports.clear();
-            return { component: builder.toString(false), imports };
+            return { component: builder.toString(false), imports, kind: 'unknown' };
         }
     }
     getFileContent(ctx) {
@@ -155,13 +157,17 @@ export class DefaultTypeScriptModelGenerator extends TypeScriptFileGenerator {
             return this.getAnyType(ctx);
         schema = getSchemaReference(schema, ['description']);
         if ((options === null || options === void 0 ? void 0 : options.useBaseType) && ctx.schema.inheritedSchemas.some((x) => x.id === schema.id)) {
-            return ts.reference(this.getBaseTypeName(ctx, schema), this.getFilePath(ctx, schema));
+            return ts.reference(this.getBaseTypeName(ctx, schema), this.getFilePath(ctx, schema), {
+                importType: 'type-import',
+            });
         }
         if (!(options === null || options === void 0 ? void 0 : options.skipSchemas) && this.shouldGenerateTypeDeclaration(ctx, schema)) {
             if (schema.id === ctx.schema.id) {
                 return null;
             }
-            return ts.reference(this.getDeclarationTypeName(ctx, schema), this.getFilePath(ctx, schema));
+            return ts.reference(this.getDeclarationTypeName(ctx, schema), this.getFilePath(ctx, schema), {
+                importType: 'type-import',
+            });
         }
         if (schema.enum) {
             return ts.unionType(schema.enum.map((x) => ts.toNode(x)));

package/esm/lib/generators/models/models-generator.js

@@ -54,7 +54,10 @@ export class TypeScriptModelsGenerator extends OpenApiSchemasGenerationProviderB
             const { filePath } = x;
             if (!filePath)
                 return [];
-            return [ts.export(x.component, filePath), ...((_b = (_a = x.additionalExports) === null || _a === void 0 ? void 0 : _a.map((e) => ts.export(e, filePath))) !== null && _b !== void 0 ? _b : [])];
+            return [
+                ts.export(x.component, filePath, { kind: x.kind === 'type' ? 'type-export' : 'export' }),
+                ...((_b = (_a = x.additionalExports) === null || _a === void 0 ? void 0 : _a.map((e) => typeof e === 'string' ? ts.export(e, filePath) : ts.export(e.name, filePath, { kind: e.type }))) !== null && _b !== void 0 ? _b : []),
+            ];
         }));
     }
 }

package/esm/lib/generators/services/angular-services/angular-service-generator.js

@@ -184,7 +184,7 @@ export class DefaultTypeScriptAngularServiceGenerator extends TypeScriptFileGene
         var _a, _b, _c, _d;
         const hasParams = this.hasEndpointParams(ctx, endpoint);
         const paramsOptional = !endpoint.parameters.some((p) => p.required) && !((_a = endpoint.requestBody) === null || _a === void 0 ? void 0 : _a.required);
-        const responseModelType = ts.reference(this.getResponseModelName(ctx, endpoint), this.getResponseModelFilePath(ctx));
+        const responseModelType = ts.reference(this.getResponseModelName(ctx, endpoint), this.getResponseModelFilePath(ctx), { importType: 'type-import' });
         const returnType = ctx.refs.abortablePromise([responseModelType]);
         const accept = (_d = (_c = (_b = this.getEndpointSuccessResponse(ctx, endpoint)) === null || _b === void 0 ? void 0 : _b.contentOptions[0]) === null || _c === void 0 ? void 0 : _c.type) !== null && _d !== void 0 ? _d : '*/*';
         const responseType = this.contentTypeToResponseType(accept);
@@ -228,13 +228,13 @@ export class DefaultTypeScriptAngularServiceGenerator extends TypeScriptFileGene
                     }
                     : null,
                 '',
-                s `return ${ctx.refs.waitForResponse([responseModelType])}(${s.indent `
-              this.http.request(rb.build({${s.indent `
-                responseType: ${ts.string(responseType)},
-                accept: ${ts.string(accept)},
-                context,`}
-              })),
-              {${s.indent `
+                s `return ${ctx.refs.waitForResponse([responseModelType])}(${s.indent `
+              this.http.request(rb.build({${s.indent `
+                responseType: ${ts.string(responseType)},
+                accept: ${ts.string(accept)},
+                context,`}
+              })),
+              {${s.indent `
                 errorResponseTypes: ${ts.object({
                     members: [
                         ...Object.entries(this.getEndpointStatusCodes(ctx, endpoint))
@@ -243,8 +243,8 @@ export class DefaultTypeScriptAngularServiceGenerator extends TypeScriptFileGene
                             return ts.property(key, { value: ts.string(value.parser) });
                         }),
                     ],
-                })}`}
-              }`}
+                })}`}
+              }`}
             )`,
             ], '\n'),
         });

package/esm/lib/generators/services/angular-services/angular-services-generator.js

@@ -196,7 +196,7 @@ export class TypeScriptAngularServicesGenerator extends OpenApiServicesGeneratio
     getResponseModelsIndexFileContent(ctx) {
         return appendValueGroup(Object.values(ctx.output.typescript.services)
             .flatMap((x) => Object.values(x.responseModels))
-            .map((x) => ts.export(x.component, x.filePath)));
+            .map((x) => ts.export(x.component, x.filePath, { kind: 'type-export' })));
     }
     getServicesIndexFilePath(ctx) {
         return ctx.config.servicesIndexFile ? resolve(ctx.config.outputDir, ctx.config.servicesIndexFile) : null;

package/esm/lib/generators/services/angular-services/refs.js

@@ -7,7 +7,7 @@ export function getReferenceFactories(options) {
     const utilsDirPath = resolve(options.outputDir, options.utilsDir);
     return {
         // angular-service.utils.ts
-        abortablePromise: ts.reference.genericFactory('AbortablePromise', join(utilsDirPath, 'angular-service.utils.ts')),
+        abortablePromise: ts.reference.genericFactory('AbortablePromise', join(utilsDirPath, 'angular-service.utils.ts'), { importType: 'type-import' }),
         waitForResponse: ts.reference.genericFactory('waitForResponse', join(utilsDirPath, 'angular-service.utils.ts')),
         // request-builder.ts
         requestBuilder: ts.reference.factory('RequestBuilder', join(utilsDirPath, 'request-builder.ts')),
@@ -16,7 +16,9 @@ export function getReferenceFactories(options) {
         // api-base-service.ts - generated in angular-service-generator.ts
         apiBaseService: ts.reference.factory('ApiBaseService', join(utilsDirPath, 'api-base-service.ts')),
         // http-status-code.ts - generated in angular-services-generator.ts
-        httpStatusCode: ts.reference.factory('HttpStatusCode', join(utilsDirPath, 'http-status-code.ts')),
+        httpStatusCode: ts.reference.factory('HttpStatusCode', join(utilsDirPath, 'http-status-code.ts'), {
+            importType: 'type-import',
+        }),
         // provide.ts - generated in angular-services-generator.ts
         provide: ts.reference.factory(toCasing(`provide_${(_b = options.domainName) !== null && _b !== void 0 ? _b : ''}_Api`, options.functionNameCasing), join(utilsDirPath, 'provide.ts')),
     };