@goast/typescript 0.3.1 → 0.3.3

package/esm/lib/file-builder.js

@@ -20,8 +20,8 @@ export class TypeScriptFileBuilder extends SourceBuilder {
             useSingleQuotes: this.options.useSingleQuotes,
         });
     }
-    addImport(name, moduleNameOrfilePath) {
-        this.imports.addImport(name, moduleNameOrfilePath);
+    addImport(name, moduleNameOrfilePath, options) {
+        this.imports.addImport(name, moduleNameOrfilePath, options);
         return this;
     }
     addExport(name, filePath) {
@@ -33,7 +33,12 @@ export class TypeScriptFileBuilder extends SourceBuilder {
         this.imports.clear();
     }
     toString(addPadding = true) {
+        var _a;
         const builder = new SourceBuilder(this.options);
+        if ((_a = this.filePath) === null || _a === void 0 ? void 0 : _a.match(/\.[cm]?js$/)) {
+            builder.appendLine('// @ts-check');
+        }
+        builder.ensurePreviousLineEmpty();
         this.imports.writeTo(builder);
         const baseString = super.toString();
         if (baseString && addPadding) {
@@ -51,10 +56,10 @@ export class TypeScriptFileBuilder extends SourceBuilder {
             value.write(this);
         }
     }
-    appendModelUsage(type) {
+    appendModelUsage(type, options) {
         this.append(type.component);
         for (const i of type.imports) {
-            this.addImport(i.name, i.modulePath);
+            this.addImport(i.name, i.modulePath, options);
         }
         return this;
     }

package/esm/lib/generators/index.js

@@ -1,5 +1,6 @@
 export * from './file-generator';
 export * from './models';
 export * from './services/angular-services';
-export * from './services/fetch-clients';
 export * from './services/easy-network-stub';
+export * from './services/fetch-clients';
+export * from './services/k6-clients';

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

@@ -18,7 +18,7 @@ export class DefaultTypeScriptModelGenerator extends TypeScriptFileGenerator {
             return {
                 component: name,
                 filePath,
-                imports: [{ kind: 'file', name, modulePath: 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)
                     .filter((x) => x.name !== name)

package/esm/lib/generators/services/k6-clients/index.js

@@ -0,0 +1,3 @@
+export * from './k6-client-generator';
+export * from './k6-clients-generator';
+export * from './models';

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

@@ -0,0 +1,307 @@
+import { resolve } from 'path';
+import { appendValueGroup, toCasing, builderTemplate as s, } from '@goast/core';
+import { ts } from '../../../ast';
+import { TypeScriptFileBuilder } from '../../../file-builder';
+import { TypeScriptFileGenerator } from '../../file-generator';
+export class DefaultTypeScriptK6ClientGenerator extends TypeScriptFileGenerator {
+    generate(ctx) {
+        const responseModels = this.generateResponseModels(ctx);
+        const filePath = this.getFilePath(ctx);
+        const name = this.getClassName(ctx);
+        TypeScriptFileBuilder.generate({
+            logName: `k6 client ${name}`,
+            filePath,
+            options: ctx.config,
+            generator: (b) => b.append(this.getClientFileContent(ctx)),
+        });
+        return {
+            filePath,
+            component: name,
+            responseModels,
+        };
+    }
+    // #region Response Model
+    generateResponseModels(ctx) {
+        const result = {};
+        const filePath = this.getResponseModelFilePath(ctx);
+        const builder = new TypeScriptFileBuilder(filePath, ctx.config);
+        for (const endpoint of ctx.service.endpoints) {
+            const name = this.getResponseModelName(ctx, endpoint);
+            builder.appendLine(this.getResponseModelFileContent(ctx, endpoint));
+            result[endpoint.id] = { component: name, filePath };
+        }
+        builder.writeToFile();
+        return result;
+    }
+    getResponseModelFileContent(ctx, endpoint) {
+        const result = appendValueGroup([]);
+        const statusCodes = this.getEndpointStatusCodes(ctx, endpoint);
+        let statusCodeType;
+        const statusCodesTypeName = toCasing(`${endpoint.name}_StatusCodes`, ctx.config.typeNameCasing);
+        result.values.push(ts.typeAlias(statusCodesTypeName, ts.unionType(Object.keys(statusCodes))));
+        if (ctx.config.strictResponseTypes) {
+            statusCodeType = ts.reference(statusCodesTypeName);
+        }
+        else {
+            statusCodeType = ctx.refs.httpStatusCode();
+        }
+        result.values.push(ts.typeAlias(this.getResponseModelName(ctx, endpoint), ts.intersectionType([
+            ts.unionType([
+                ...Object.entries(statusCodes).map(([key, value]) => {
+                    return ts.intersectionType([
+                        ts.refs.omit([ts.refs.k6.response(), ts.string('json')]),
+                        ts.objectType({
+                            members: [
+                                ts.property('status', { type: key }),
+                                ts.method('json', {
+                                    returnType: value.type,
+                                }),
+                                ts.method('json', {
+                                    parameters: [ts.parameter('selector', { type: ts.refs.string() })],
+                                    returnType: ts.refs.k6.jsonValue(),
+                                }),
+                            ],
+                        }),
+                    ]);
+                }),
+                !ctx.config.strictResponseTypes
+                    ? ts.intersectionType([
+                        ts.refs.k6.response(),
+                        ts.objectType({
+                            members: [
+                                ts.property('status', {
+                                    type: ts.refs.exclude([ctx.refs.httpStatusCode(), ts.reference(statusCodesTypeName)]),
+                                }),
+                            ],
+                        }),
+                    ])
+                    : null,
+            ]),
+            ts.objectType({ members: [ts.property('status', { type: 'TStatus' })] }),
+        ]), {
+            doc: ts.doc({
+                description: `Response model for operation ${this.getEndpointMethodName(ctx, endpoint)}`,
+                tags: [endpoint.deprecated ? ts.docTag('deprecated') : null],
+            }),
+            export: true,
+            generics: [
+                ts.genericParameter('TStatus', {
+                    constraint: statusCodeType,
+                    default: statusCodeType,
+                }),
+            ],
+        }));
+        return result;
+    }
+    getEndpointStatusCodes(ctx, endpoint) {
+        return Object.fromEntries([
+            ...Object.entries(ctx.config.defaultStatusCodeResponseTypes).map(([key, value]) => {
+                var _a;
+                return [
+                    key,
+                    {
+                        parser: (_a = value === null || value === void 0 ? void 0 : value.parser) !== null && _a !== void 0 ? _a : 'text',
+                        type: typeof (value === null || value === void 0 ? void 0 : value.type) === 'function'
+                            ? this.getSchemaType(ctx, value.type(ctx.data.schemas))
+                            : (value !== null && value !== void 0 ? value : ts.refs.never()),
+                    },
+                ];
+            }),
+            ...endpoint.responses
+                .filter((x) => x.statusCode)
+                .map((x) => {
+                var _a;
+                return [
+                    x.statusCode,
+                    {
+                        type: this.getSchemaType(ctx, (_a = x.contentOptions[0]) === null || _a === void 0 ? void 0 : _a.schema, { fallback: ts.refs.never() }),
+                    },
+                ];
+            }),
+        ]);
+    }
+    // #endregion
+    getClientFileContent(ctx) {
+        const code = appendValueGroup([], '\n');
+        for (const endpoint of ctx.service.endpoints) {
+            if (endpoint.parameters.length > 0 || endpoint.requestBody !== undefined) {
+                code.values.push(this.getEndpointParamsType(ctx, endpoint));
+            }
+        }
+        code.values.push(appendValueGroup(ctx.service.endpoints.map((e) => ts.variable(this.getEndpointPathPropertyName(ctx, e), {
+            readonly: true,
+            value: ts.string(e.path),
+        }))));
+        code.values.push(this.getClass(ctx));
+        return code;
+    }
+    getEndpointParamsType(ctx, endpoint) {
+        const type = ts.doc({
+            description: `Parameters for operation ${this.getEndpointMethodName(ctx, endpoint)}`,
+            tags: [ts.docTag('typedef', this.getEndpointParamsTypeName(ctx, endpoint))],
+        });
+        for (const parameter of endpoint.parameters) {
+            const schema = parameter.schema;
+            const name = toCasing(parameter.name, ctx.config.propertyNameCasing);
+            type.tags.push(ts.docTag('property', parameter.required ? name : `[${name}]`, {
+                type: schema
+                    ? (b) => b.appendModelUsage(ctx.input.typescript.models[schema.id], { type: 'js-doc' })
+                    : this.getAnyType(ctx),
+                text: (parameter.deprecated ? 'Deprecated: ' : '') + parameter.description,
+            }));
+        }
+        if (endpoint.requestBody !== undefined) {
+            const body = endpoint.requestBody;
+            const schema = body.content[0].schema;
+            type.tags.push(ts.docTag('property', body.required ? 'body' : '[body]', {
+                type: schema
+                    ? (b) => b.appendModelUsage(ctx.input.typescript.models[schema.id], { type: 'js-doc' })
+                    : this.getAnyType(ctx),
+                text: body.description,
+            }));
+        }
+        return type;
+    }
+    getClass(ctx) {
+        return ts.class(this.getClassName(ctx), {
+            doc: ts.doc({
+                description: ctx.service.description,
+                tags: [
+                    ts.docTag('property', 'rootUrl', 'The root URL for this client.', {
+                        type: ts.refs.string(),
+                    }),
+                    ctx.service.endpoints.length === 0 || ctx.service.endpoints.some((x) => !x.deprecated)
+                        ? null
+                        : ts.docTag('deprecated'),
+                ],
+            }),
+            export: true,
+            members: [
+                ts.constructor({
+                    doc: ts.doc({
+                        description: 'Creates a new instance of the client.',
+                        tags: [
+                            ts.docTag('param', 'rootUrl', 'The root URL for this client.', { type: ts.refs.string() }),
+                            ts.docTag('param', '[defaultK6ParamsFactory]', 'A factory function that returns the default K6 parameters.', { type: ts.functionType({ returnType: ts.refs.k6.params({ importType: 'js-doc' }) }) }),
+                        ],
+                    }),
+                    parameters: [ts.constructorParameter('rootUrl'), ts.constructorParameter('defaultK6ParamsFactory')],
+                    body: s `this.rootUrl = rootUrl;
+                  this._defaultK6ParamsFactory = defaultK6ParamsFactory;`,
+                }),
+                ...ctx.service.endpoints.map((e) => this.getEndpointMethod(ctx, e)),
+                this.getGetK6ParamsMethod(ctx),
+            ],
+        });
+    }
+    getEndpointMethod(ctx, endpoint) {
+        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), { importType: 'js-doc' });
+        const returnType = 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 : '*/*';
+        return ts.method(this.getEndpointMethodName(ctx, endpoint), {
+            async: ctx.config.async,
+            parameters: [hasParams ? ts.parameter('params') : null, ts.parameter('k6Params')],
+            doc: ts.doc({
+                description: endpoint.description,
+                tags: [
+                    hasParams
+                        ? ts.docTag('param', paramsOptional ? '[params]' : 'params', {
+                            type: ts.reference(this.getEndpointParamsTypeName(ctx, endpoint)),
+                        })
+                        : null,
+                    ts.docTag('param', '[k6Params]', {
+                        type: ts.refs.k6.params({ importType: 'js-doc' }),
+                    }),
+                    ts.docTag('returns', {
+                        type: ctx.config.async ? ts.refs.promise([returnType]) : returnType,
+                    }),
+                    endpoint.deprecated ? ts.docTag('deprecated') : null,
+                ],
+            }),
+            body: appendValueGroup([
+                s `const rb = new ${ctx.refs.requestBuilder()}(this.rootUrl, ${this.getEndpointPathPropertyName(ctx, endpoint)}, '${endpoint.method}');`,
+                hasParams
+                    ? (b) => {
+                        var _a;
+                        return b.appendIf(paramsOptional, 'if (params) ').parenthesizeIf(paramsOptional, '{}', appendValueGroup([
+                            ...endpoint.parameters
+                                .filter((p) => p.target === 'path' || p.target === 'query' || p.target === 'header')
+                                .map((p) => {
+                                const options = ts.object({
+                                    members: [
+                                        p.style !== undefined ? ts.property('style', { value: ts.string(p.style) }) : null,
+                                        p.explode !== undefined ? ts.property('explode', { value: ts.toNode(p.explode) }) : null,
+                                    ],
+                                });
+                                return s `rb.${p.target}(${ts.string(p.name)}, params.${toCasing(p.name, ctx.config.propertyNameCasing)}, ${options});`;
+                            }),
+                            endpoint.requestBody
+                                ? s `rb.body(params.body, ${ts.string((_a = endpoint.requestBody.content[0].type) !== null && _a !== void 0 ? _a : 'application/json')});`
+                                : null,
+                        ], '\n'), { multiline: true });
+                    }
+                    : null,
+                '',
+                s `return /** @type {${returnType}} */ (${s.indent `
+              ${ctx.config.async ? 'await rb.buildAsync' : 'rb.build'}({${s.indent `
+                accept: ${ts.string(accept)},
+                params: this.getK6Params(k6Params),`}
+              })`}
+            );`,
+            ], '\n'),
+        });
+    }
+    getGetK6ParamsMethod(ctx) {
+        return ts.method('getK6Params', {
+            doc: ts.doc({
+                tags: [
+                    ts.docTag('private'),
+                    ts.docTag('param', '[k6Params]', { type: ts.refs.k6.params({ importType: 'js-doc' }) }),
+                ],
+            }),
+            parameters: [ts.parameter('k6Params')],
+            body: s `return Object.assign({}, this._defaultK6ParamsFactory ? this._defaultK6ParamsFactory() : {}, k6Params);`,
+        });
+    }
+    getEndpointSuccessResponse(ctx, endpoint) {
+        var _a;
+        return ((_a = endpoint.responses.find((x) => x.statusCode && x.statusCode >= 200 && x.statusCode < 300)) !== null && _a !== void 0 ? _a : endpoint.responses.find((x) => x.statusCode === undefined));
+    }
+    getSchemaType(ctx, schema, options) {
+        var _a;
+        const output = schema && ctx.input.typescript.models[schema.id];
+        if (!output)
+            return (_a = options === null || options === void 0 ? void 0 : options.fallback) !== null && _a !== void 0 ? _a : this.getAnyType(ctx);
+        return (b) => b.appendModelUsage(output, options);
+    }
+    getClassName(ctx) {
+        var _a;
+        return toCasing(ctx.service.name, (_a = ctx.config.clientNameCasing) !== null && _a !== void 0 ? _a : ctx.config.typeNameCasing);
+    }
+    getResponseModelName(ctx, endpoint) {
+        return toCasing(`${this.getEndpointMethodName(ctx, endpoint)}ApiResponse`, ctx.config.typeNameCasing);
+    }
+    getEndpointParamsTypeName(ctx, endpoint) {
+        return toCasing(this.getEndpointMethodName(ctx, endpoint) + '_Params', ctx.config.typeNameCasing);
+    }
+    getEndpointPathPropertyName(ctx, endpoint) {
+        return toCasing(this.getEndpointMethodName(ctx, endpoint) + '_Path', ctx.config.constantNameCasing);
+    }
+    getEndpointMethodName(ctx, endpoint) {
+        return toCasing(endpoint.name, ctx.config.functionNameCasing);
+    }
+    getFilePath(ctx) {
+        var _a;
+        return resolve(ctx.config.outputDir, ctx.config.clientDir, `${toCasing(ctx.service.name, (_a = ctx.config.clientFileNameCasing) !== null && _a !== void 0 ? _a : ctx.config.fileNameCasing)}.js`);
+    }
+    getResponseModelFilePath(ctx) {
+        var _a;
+        return resolve(ctx.config.outputDir, ctx.config.responseModelsDir, `${toCasing(ctx.service.name, (_a = ctx.config.responseModelFileNameCasing) !== null && _a !== void 0 ? _a : ctx.config.fileNameCasing)}.ts`);
+    }
+    hasEndpointParams(ctx, endpoint) {
+        return endpoint.parameters.length > 0 || endpoint.requestBody !== undefined;
+    }
+}

package/esm/lib/generators/services/k6-clients/k6-clients-generator.js

@@ -0,0 +1,112 @@
+import { dirname, resolve } from 'path';
+import { ensureDirSync, copyFileSync } from 'fs-extra';
+import { OpenApiServicesGenerationProviderBase, Factory, appendValueGroup, } from '@goast/core';
+import { DefaultTypeScriptK6ClientGenerator } from './k6-client-generator';
+import { defaultTypeScriptK6ClientsGeneratorConfig, } from './models';
+import { getReferenceFactories } from './refs';
+import { ts } from '../../../ast';
+import { TypeScriptFileBuilder } from '../../../file-builder';
+export class TypeScriptK6ClientsGenerator extends OpenApiServicesGenerationProviderBase {
+    constructor(clientGeneratorFactory) {
+        super();
+        this._clientGeneratorFactory =
+            clientGeneratorFactory !== null && clientGeneratorFactory !== void 0 ? clientGeneratorFactory : Factory.fromValue(new DefaultTypeScriptK6ClientGenerator());
+    }
+    initResult() {
+        return {
+            typescript: {
+                k6Clients: {},
+                indexFiles: {
+                    k6Clients: undefined,
+                    k6ResponseModels: undefined,
+                },
+            },
+        };
+    }
+    buildContext(context, config) {
+        const providerContext = this.getProviderContext(context, config, defaultTypeScriptK6ClientsGeneratorConfig);
+        return Object.assign(providerContext, {
+            refs: getReferenceFactories(providerContext.config),
+        });
+    }
+    onGenerate(ctx) {
+        const output = super.onGenerate(ctx);
+        this.generateUtilsFiles(ctx);
+        output.typescript.indexFiles = this.generateIndexFiles(ctx);
+        return output;
+    }
+    generateService(ctx, service) {
+        const clientGenerator = this._clientGeneratorFactory.create();
+        return clientGenerator.generate({
+            ...ctx,
+            service,
+        });
+    }
+    addServiceResult(ctx, service, result) {
+        ctx.output.typescript.k6Clients[service.id] = result;
+    }
+    generateUtilsFiles(ctx) {
+        const sourceDir = resolve(dirname(require.resolve('@goast/typescript')), '../assets/client/k6');
+        const targetDir = resolve(ctx.config.outputDir, ctx.config.utilsDir);
+        ensureDirSync(targetDir);
+        this.copyFile('Request Builder', sourceDir, targetDir, 'request-builder.js');
+        if (!ctx.config.strictResponseTypes) {
+            TypeScriptFileBuilder.generate({
+                logName: 'http status codes',
+                filePath: resolve(targetDir, 'http-status-code.ts'),
+                options: ctx.config,
+                generator: (b) => b.append(this.getHttpStatusCodeFileContent(ctx)),
+            });
+        }
+    }
+    getHttpStatusCodeFileContent(ctx) {
+        return appendValueGroup([
+            ts.typeAlias('HttpStatusCode', ts.unionType(ctx.config.possibleStatusCodes), {
+                doc: ts.doc({ description: 'The possible status codes that any API endpoint can return.' }),
+                export: true,
+            }),
+        ], '\n');
+    }
+    generateIndexFiles(ctx) {
+        const clientsIndexFilePath = this.getIndexFilePath(ctx);
+        const responseModelsIndexFilePath = this.getResponseModelsIndexFilePath(ctx);
+        TypeScriptFileBuilder.tryGenerate({
+            logName: 'clients index file',
+            filePath: clientsIndexFilePath,
+            options: ctx.config,
+            generator: (b) => b.append(this.getIndexFileContent(ctx)),
+        });
+        TypeScriptFileBuilder.tryGenerate({
+            logName: 'response models index file',
+            filePath: responseModelsIndexFilePath,
+            options: ctx.config,
+            generator: (b) => b.append(this.getResponseModelsIndexFileContent(ctx)),
+        });
+        return {
+            k6Clients: clientsIndexFilePath,
+            k6ResponseModels: responseModelsIndexFilePath,
+        };
+    }
+    getIndexFilePath(ctx) {
+        return ctx.config.clientsIndexFile ? resolve(ctx.config.outputDir, ctx.config.clientsIndexFile) : null;
+    }
+    getResponseModelsIndexFilePath(ctx) {
+        return ctx.config.responseModelsIndexFile
+            ? resolve(ctx.config.outputDir, ctx.config.responseModelsIndexFile)
+            : null;
+    }
+    getIndexFileContent(ctx) {
+        return appendValueGroup(Object.values(ctx.output.typescript.k6Clients).map((x) => ts.export(x.component, x.filePath)));
+    }
+    getResponseModelsIndexFileContent(ctx) {
+        return appendValueGroup(Object.values(ctx.output.typescript.k6Clients)
+            .flatMap((x) => Object.values(x.responseModels))
+            .map((x) => ts.export(x.component, x.filePath)));
+    }
+    copyFile(logName, sourceDir, targetDir, fileName) {
+        const source = resolve(sourceDir, fileName);
+        const target = resolve(targetDir, fileName);
+        console.log(`Generating ${logName} to ${target}...`);
+        copyFileSync(source, target);
+    }
+}

package/esm/lib/generators/services/k6-clients/models.js

@@ -0,0 +1,25 @@
+import { defaultTypeScriptGeneratorConfig } from '../../../config';
+export const defaultTypeScriptK6ClientsGeneratorConfig = {
+    ...defaultTypeScriptGeneratorConfig,
+    importModuleTransformer: 'js-extension',
+    strictResponseTypes: true,
+    defaultStatusCodeResponseTypes: {
+        401: null,
+        403: null,
+        500: null,
+    },
+    possibleStatusCodes: [
+        100, 101, 102, 103, 200, 201, 202, 203, 204, 205, 206, 207, 208, 226, 300, 301, 302, 303, 304, 305, 306, 307, 308,
+        400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 421, 422, 423, 424, 425,
+        426, 428, 429, 431, 451, 500, 501, 502, 503, 504, 505, 506, 507, 508, 510, 511,
+    ],
+    clientFileNameCasing: { casing: 'kebab', suffix: '-client' },
+    responseModelFileNameCasing: { casing: 'kebab', suffix: '-responses' },
+    clientNameCasing: { casing: 'pascal', suffix: 'Client' },
+    clientDir: 'clients',
+    responseModelsDir: 'models/responses',
+    clientsIndexFile: 'clients.js',
+    responseModelsIndexFile: 'responses.ts',
+    utilsDir: 'utils',
+    async: true,
+};

package/esm/lib/generators/services/k6-clients/refs.js

@@ -0,0 +1,9 @@
+import { join, resolve } from 'path';
+import { ts } from '../../../ast';
+export function getReferenceFactories(options) {
+    const utilsDirPath = resolve(options.outputDir, options.utilsDir);
+    return {
+        requestBuilder: ts.reference.factory('RequestBuilder', join(utilsDirPath, 'request-builder.js')),
+        httpStatusCode: ts.reference.factory('HttpStatusCode', join(utilsDirPath, 'http-status-code.ts')),
+    };
+}

package/esm/lib/import-collection.js

@@ -9,31 +9,53 @@ export const defaultImportExportCollectionOptions = {
 export class ImportExportCollection {
     constructor(options) {
         this._imports = new Map();
+        this._typeImports = new Map();
+        this._jsDocImports = new Map();
         this._exports = new Map();
         this._options = { ...defaultImportExportCollectionOptions, ...options };
     }
     get hasImports() {
-        return this._imports.size > 0;
+        return this._imports.size > 0 || this._typeImports.size > 0 || this._jsDocImports.size > 0;
     }
     get hasExports() {
         return this._exports.size > 0;
     }
     get imports() {
-        return Array.from(this._imports.entries())
+        return [
+            ...this.toImport('import', this._imports),
+            ...this.toImport('type-import', this._typeImports),
+            ...this.toImport('js-doc', this._jsDocImports),
+        ];
+    }
+    toImport(type, map) {
+        return Array.from(map.entries())
             .map(([fromModule, importNames]) => Array.from(importNames).map((importName) => ({
             kind: this.getImportKind(fromModule),
+            type,
             modulePath: fromModule,
             name: importName,
         })))
             .flat();
     }
-    addImport(importName, fromModule) {
-        const existingImport = this._imports.get(fromModule);
+    addImport(importName, fromModule, options) {
+        var _a;
+        const map = this.getImportMap((_a = options === null || options === void 0 ? void 0 : options.type) !== null && _a !== void 0 ? _a : 'import');
+        const existingImport = map.get(fromModule);
         if (existingImport) {
             existingImport.add(importName);
         }
         else {
-            this._imports.set(fromModule, new Set([importName]));
+            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) {
@@ -56,14 +78,34 @@ export class ImportExportCollection {
     }
     writeTo(builder) {
         const { filePath, importModuleTransformer, useSingleQuotes } = this._options;
+        let hasPrevious = false;
         if (this._imports.size > 0) {
             const sortedImports = this.sortAndResolve(this._imports, filePath, importModuleTransformer);
             this.writeImportsExports(builder, 'import', sortedImports, { useSingleQuotes });
+            hasPrevious = true;
         }
-        if (this._imports.size > 0 && this._exports.size > 0) {
-            builder.appendLine();
+        if (this._typeImports.size > 0) {
+            if (hasPrevious) {
+                builder.appendLine();
+            }
+            const sortedImports = this.sortAndResolve(this._typeImports, filePath, importModuleTransformer);
+            this.writeImportsExports(builder, 'import type', sortedImports, { useSingleQuotes });
+            hasPrevious = true;
+        }
+        if (this._jsDocImports.size > 0) {
+            if (hasPrevious) {
+                builder.appendLine();
+            }
+            const sortedImports = this.sortAndResolve(this._jsDocImports, filePath, importModuleTransformer);
+            builder.appendLine('/**');
+            this.writeImportsExports(builder, ' * @import', sortedImports, { useSingleQuotes });
+            builder.appendLine(' */');
+            hasPrevious = true;
         }
         if (this._exports.size > 0) {
+            if (hasPrevious) {
+                builder.appendLine();
+            }
             const sortedExports = this.sortAndResolve(this._exports, filePath, importModuleTransformer);
             this.writeImportsExports(builder, 'export', sortedExports, { useSingleQuotes });
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goast/typescript",
-  "version": "0.3.1",
+  "version": "0.3.3",
   "repository": "https://github.com/MaSch0212/goast.git",
   "description": "Provides gOAst generators for generating TypeScript code from OpenAPI specifications.",
   "keywords": [
@@ -25,9 +25,9 @@
   "type": "module",
   "dependencies": {
     "fs-extra": "^11.2.0",
-    "node-fetch": "^3.3.2",
+    "node-fetch": "^2.7.0",
     "yaml": "^2.4.5",
-    "@goast/core": "0.3.1",
+    "@goast/core": "0.3.2",
     "tslib": "2.6.3"
   },
   "packageManager": "pnpm@9.5.0",

package/types/lib/ast/nodes/method.d.ts

@@ -12,6 +12,7 @@ type Options<TBuilder extends SourceBuilder, TInjects extends string = never> =
     doc?: Nullable<TsDoc<TBuilder>>;
     decorators?: Nullable<Nullable<TsDecorator<TBuilder>>[]>;
     accessModifier?: Nullable<TsAccessModifier>;
+    async?: Nullable<boolean>;
     static?: Nullable<boolean>;
     abstract?: Nullable<boolean>;
     override?: Nullable<boolean>;
@@ -29,6 +30,7 @@ export declare class TsMethod<TBuilder extends SourceBuilder, TInjects extends s
     static: boolean;
     abstract: boolean;
     override: boolean;
+    async: boolean;
     name: string;
     optional: boolean;
     generics: (TsGenericParameter<TBuilder> | BasicAppendValue<TBuilder>)[];