@goast/typescript 0.5.0 → 0.5.1-k6.1

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

@@ -136,40 +136,65 @@ export class DefaultTypeScriptK6ClientGenerator extends TypeScriptFileGenerator
         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 importOptions = ctx.config.language === 'javascript' ? { type: 'js-doc' } : {};
+        const description = `Parameters for operation ${this.getEndpointMethodName(ctx, endpoint)}`;
+        const typeName = this.getEndpointParamsTypeName(ctx, endpoint);
+        const properties = endpoint.parameters.map((parameter) => {
             const schema = parameter.schema;
-            const name = toCasing(parameter.name, ctx.config.propertyNameCasing);
-            type.tags.push(ts.docTag('property', parameter.required ? name : `[${name}]`, {
+            return {
+                name: toCasing(parameter.name, ctx.config.propertyNameCasing),
                 type: schema
-                    ? (b) => b.appendModelUsage(ctx.input.typescript.models[schema.id], { type: 'js-doc' })
+                    ? (b) => b.appendModelUsage(ctx.input.typescript.models[schema.id], importOptions)
                     : this.getAnyType(ctx),
-                text: (parameter.deprecated ? 'Deprecated: ' : '') + parameter.description,
-            }));
-        }
+                description: (parameter.deprecated ? 'Deprecated: ' : '') + parameter.description,
+                required: parameter.required,
+            };
+        });
         if (endpoint.requestBody !== undefined) {
             const body = endpoint.requestBody;
             const schema = body.content[0].schema;
-            type.tags.push(ts.docTag('property', body.required ? 'body' : '[body]', {
+            properties.push({
+                name: 'body',
                 type: schema
-                    ? (b) => b.appendModelUsage(ctx.input.typescript.models[schema.id], { type: 'js-doc' })
+                    ? (b) => b.appendModelUsage(ctx.input.typescript.models[schema.id], importOptions)
                     : this.getAnyType(ctx),
-                text: body.description,
+                description: body.description,
+                required: body.required,
+            });
+        }
+        if (ctx.config.language === 'javascript') {
+            return ts.doc({
+                description,
+                tags: [
+                    ts.docTag('typedef', typeName),
+                    ...properties.map((p) => ts.docTag('property', p.required ? p.name : `[${p.name}]`, {
+                        type: p.type,
+                        text: p.description,
+                    })),
+                ],
+            });
+        }
+        else {
+            return ts.typeAlias(typeName, ts.objectType({
+                members: properties.map((p) => ts.property(p.name, {
+                    type: p.type,
+                    optional: !p.required,
+                    doc: p.description ? ts.doc({ description: p.description }) : undefined,
+                })),
             }));
         }
-        return type;
     }
     getClass(ctx) {
+        const isJs = ctx.config.language === 'javascript';
+        const rootUrlType = ts.refs.string();
+        const paramType = ts.functionType({
+            returnType: ts.refs.k6.params({ importType: isJs ? 'js-doc' : 'type-import' }),
+        });
         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(),
-                    }),
+                    isJs ? ts.docTag('property', 'rootUrl', 'The root URL for this client.', { type: ts.refs.string() }) : null,
                     ctx.service.endpoints.length === 0 || ctx.service.endpoints.some((x) => !x.deprecated)
                         ? null
                         : ts.docTag('deprecated'),
@@ -177,18 +202,34 @@ export class DefaultTypeScriptK6ClientGenerator extends TypeScriptFileGenerator
             }),
             export: true,
             members: [
+                ...(isJs ? [] : [
+                    ts.property('rootUrl', {
+                        type: rootUrlType,
+                        readonly: true,
+                        accessModifier: 'public',
+                        doc: ts.doc({ description: 'The root URL for this client.' }),
+                    }),
+                    ts.property('_defaultK6ParamsFactory', {
+                        type: paramType,
+                        optional: true,
+                        readonly: true,
+                        accessModifier: 'private',
+                        doc: ts.doc({ description: 'A factory function that returns the default K6 parameters.' }),
+                    }),
+                ]),
                 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' }) }),
-                            }),
+                            ts.docTag('param', 'rootUrl', 'The root URL for this client.', { type: isJs ? rootUrlType : undefined }),
+                            ts.docTag('param', '[defaultK6ParamsFactory]', 'A factory function that returns the default K6 parameters.', { type: isJs ? paramType : undefined }),
                         ],
                     }),
-                    parameters: [ts.constructorParameter('rootUrl'), ts.constructorParameter('defaultK6ParamsFactory')],
-                    body: s `this.rootUrl = rootUrl;
+                    parameters: [
+                        ts.constructorParameter('rootUrl', { type: isJs ? undefined : rootUrlType }),
+                        ts.constructorParameter('defaultK6ParamsFactory', { type: isJs ? undefined : paramType, optional: true }),
+                    ],
+                    body: s `this.rootUrl = rootUrl;
                   this._defaultK6ParamsFactory = defaultK6ParamsFactory;`,
                 }),
                 ...ctx.service.endpoints.map((e) => this.getEndpointMethod(ctx, e)),
@@ -198,33 +239,33 @@ export class DefaultTypeScriptK6ClientGenerator extends TypeScriptFileGenerator
     }
     getEndpointMethod(ctx, endpoint) {
         var _a, _b, _c, _d;
+        const isJs = ctx.config.language === 'javascript';
         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 responseModelType = ts.reference(this.getResponseModelName(ctx, endpoint), this.getResponseModelFilePath(ctx), { importType: ctx.config.language === 'javascript' ? 'js-doc' : 'type-import' });
         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 : '*/*';
+        const paramsType = hasParams ? ts.reference(this.getEndpointParamsTypeName(ctx, endpoint)) : null;
+        const returnTypeWithPromise = ctx.config.async ? ts.refs.promise([returnType]) : returnType;
         return ts.method(this.getEndpointMethodName(ctx, endpoint), {
             async: ctx.config.async,
-            parameters: [hasParams ? ts.parameter('params') : null, ts.parameter('k6Params')],
+            parameters: [
+                hasParams ? ts.parameter('params', { type: isJs ? null : paramsType }) : null,
+                ts.parameter('k6Params', { type: isJs ? null : ts.refs.k6.params({ importType: 'type-import' }) }),
+            ],
+            returnType: isJs ? null : returnTypeWithPromise,
             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,
-                ],
+                tags: isJs
+                    ? [
+                        hasParams ? ts.docTag('param', paramsOptional ? '[params]' : 'params', { type: paramsType }) : null,
+                        ts.docTag('param', '[k6Params]', { type: ts.refs.k6.params({ importType: 'js-doc' }) }),
+                        ts.docTag('returns', { type: returnTypeWithPromise }),
+                        endpoint.deprecated ? ts.docTag('deprecated') : null,
+                    ]
+                    : [],
             }),
+            accessModifier: isJs ? null : 'public',
             body: appendValueGroup([
                 s `const rb = new ${ctx.refs.requestBuilder()}(this.rootUrl, ${this.getEndpointPathPropertyName(ctx, endpoint)}, '${endpoint.method}');`,
                 hasParams
@@ -249,24 +290,35 @@ export class DefaultTypeScriptK6ClientGenerator extends TypeScriptFileGenerator
                     }
                     : 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),`}
-              })`}
-            );`,
+                ctx.config.language === 'javascript'
+                    ? s `return /** @type {${returnType}} */ (${s.indent `
+                ${ctx.config.async ? 'await rb.buildAsync' : 'rb.build'}({${s.indent `
+                  accept: ${ts.string(accept)},
+                  params: this.getK6Params(k6Params),`}
+                })`}
+              );`
+                    : s `return (${s.indent `
+                ${ctx.config.async ? 'await rb.buildAsync' : 'rb.build'}({${s.indent `
+                  accept: ${ts.string(accept)},
+                  params: this.getK6Params(k6Params),`}
+                })`}
+              ) as unknown as ${returnType};`,
             ], '\n'),
         });
     }
-    getGetK6ParamsMethod(_ctx) {
+    getGetK6ParamsMethod(ctx) {
+        const isJs = ctx.config.language === 'javascript';
         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')],
+            accessModifier: isJs ? null : 'private',
+            doc: isJs
+                ? ts.doc({
+                    tags: [
+                        ts.docTag('private'),
+                        ts.docTag('param', '[k6Params]', { type: ts.refs.k6.params({ importType: 'js-doc' }) }),
+                    ],
+                })
+                : null,
+            parameters: [ts.parameter('k6Params', { type: isJs ? null : ts.refs.k6.params({ importType: 'type-import' }) })],
             body: s `return Object.assign({}, this._defaultK6ParamsFactory ? this._defaultK6ParamsFactory() : {}, k6Params);`,
         });
     }
@@ -299,7 +351,7 @@ export class DefaultTypeScriptK6ClientGenerator extends TypeScriptFileGenerator
     }
     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`);
+        return resolve(ctx.config.outputDir, ctx.config.clientDir, `${toCasing(ctx.service.name, (_a = ctx.config.clientFileNameCasing) !== null && _a !== void 0 ? _a : ctx.config.fileNameCasing)}.${ctx.config.language === 'typescript' ? 'ts' : 'js'}`);
     }
     getResponseModelFilePath(ctx) {
         var _a;

package/esm/src/generators/services/k6-clients/k6-clients-generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"k6-clients-generator.d.ts","sourceRoot":"","sources":["../../../../../src/src/generators/services/k6-clients/k6-clients-generator.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,KAAK,UAAU,EACf,KAAK,gBAAgB,EAErB,OAAO,EACP,KAAK,YAAY,EACjB,KAAK,uBAAuB,EAC5B,qCAAqC,EACtC,MAAM,aAAa,CAAC;AAIrB,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,EAAsC,KAAK,2BAA2B,EAAE,MAAM,0BAA0B,CAAC;AAChH,OAAO,EAEL,KAAK,iCAAiC,EACtC,KAAK,kCAAkC,EACvC,KAAK,mCAAmC,EACxC,KAAK,iCAAiC,EACtC,KAAK,kCAAkC,EACxC,MAAM,aAAa,CAAC;AAGrB,KAAK,KAAK,GAAG,iCAAiC,CAAC;AAC/C,KAAK,MAAM,GAAG,kCAAkC,CAAC;AACjD,KAAK,MAAM,GAAG,kCAAkC,CAAC;AACjD,KAAK,aAAa,GAAG,iCAAiC,CAAC;AACvD,KAAK,OAAO,GAAG,mCAAmC,CAAC;AAEnD,qBAAa,4BAA6B,SAAQ,qCAAqC,CACrF,KAAK,EACL,MAAM,EACN,MAAM,EACN,aAAa,EACb,OAAO,CACR;IACC,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAA2C;gBAEvE,sBAAsB,CAAC,EAAE,OAAO,CAAC,2BAA2B,EAAE,EAAE,CAAC;cAM1D,UAAU,IAAI,MAAM;cAYpB,YAAY,CAC7B,OAAO,EAAE,uBAAuB,CAAC,KAAK,CAAC,EACvC,MAAM,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,GAAG,SAAS,GACnC,OAAO;cAOe,uBAAuB,CAAC,GAAG,EAAE,mCAAmC,GAAG,OAAO,CAAC,IAAI,CAAC;cAKtF,eAAe,CAAC,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,GAAG,YAAY,CAAC,aAAa,CAAC;cAQ/E,gBAAgB,CAAC,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,aAAa,GAAG,IAAI;cAInF,kBAAkB,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAgB/D,SAAS,CAAC,4BAA4B,CAAC,GAAG,EAAE,OAAO,GAAG,gBAAgB,CAAC,qBAAqB,CAAC;IAY7F,SAAS,CAAC,kBAAkB,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC,YAAY,CAAC;IAwB9E,SAAS,CAAC,gBAAgB,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI;IAIvD,SAAS,CAAC,8BAA8B,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI;IAMrE,SAAS,CAAC,mBAAmB,CAAC,GAAG,EAAE,OAAO,GAAG,gBAAgB,CAAC,qBAAqB,CAAC;IAMpF,SAAS,CAAC,iCAAiC,CAAC,GAAG,EAAE,OAAO,GAAG,gBAAgB,CAAC,qBAAqB,CAAC;CAOnG"}
+{"version":3,"file":"k6-clients-generator.d.ts","sourceRoot":"","sources":["../../../../../src/src/generators/services/k6-clients/k6-clients-generator.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,KAAK,UAAU,EACf,KAAK,gBAAgB,EAErB,OAAO,EACP,KAAK,YAAY,EACjB,KAAK,uBAAuB,EAC5B,qCAAqC,EACtC,MAAM,aAAa,CAAC;AAIrB,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,EAAsC,KAAK,2BAA2B,EAAE,MAAM,0BAA0B,CAAC;AAChH,OAAO,EAEL,KAAK,iCAAiC,EACtC,KAAK,kCAAkC,EACvC,KAAK,mCAAmC,EACxC,KAAK,iCAAiC,EACtC,KAAK,kCAAkC,EACxC,MAAM,aAAa,CAAC;AAGrB,KAAK,KAAK,GAAG,iCAAiC,CAAC;AAC/C,KAAK,MAAM,GAAG,kCAAkC,CAAC;AACjD,KAAK,MAAM,GAAG,kCAAkC,CAAC;AACjD,KAAK,aAAa,GAAG,iCAAiC,CAAC;AACvD,KAAK,OAAO,GAAG,mCAAmC,CAAC;AAEnD,qBAAa,4BAA6B,SAAQ,qCAAqC,CACrF,KAAK,EACL,MAAM,EACN,MAAM,EACN,aAAa,EACb,OAAO,CACR;IACC,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAA2C;gBAEvE,sBAAsB,CAAC,EAAE,OAAO,CAAC,2BAA2B,EAAE,EAAE,CAAC;cAM1D,UAAU,IAAI,MAAM;cAYpB,YAAY,CAC7B,OAAO,EAAE,uBAAuB,CAAC,KAAK,CAAC,EACvC,MAAM,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,GAAG,SAAS,GACnC,OAAO;cAOe,uBAAuB,CAAC,GAAG,EAAE,mCAAmC,GAAG,OAAO,CAAC,IAAI,CAAC;cAKtF,eAAe,CAAC,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,GAAG,YAAY,CAAC,aAAa,CAAC;cAQ/E,gBAAgB,CAAC,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,aAAa,GAAG,IAAI;cAInF,kBAAkB,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAiB/D,SAAS,CAAC,4BAA4B,CAAC,GAAG,EAAE,OAAO,GAAG,gBAAgB,CAAC,qBAAqB,CAAC;IAY7F,SAAS,CAAC,kBAAkB,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC,YAAY,CAAC;IAwB9E,SAAS,CAAC,gBAAgB,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI;IASvD,SAAS,CAAC,8BAA8B,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI;IAMrE,SAAS,CAAC,mBAAmB,CAAC,GAAG,EAAE,OAAO,GAAG,gBAAgB,CAAC,qBAAqB,CAAC;IAMpF,SAAS,CAAC,iCAAiC,CAAC,GAAG,EAAE,OAAO,GAAG,gBAAgB,CAAC,qBAAqB,CAAC;CAOnG"}

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

@@ -52,7 +52,8 @@ export class TypeScriptK6ClientsGenerator extends OpenApiServicesGenerationProvi
     async generateUtilsFiles(ctx) {
         const targetDir = resolve(ctx.config.outputDir, ctx.config.utilsDir);
         await fs.ensureDir(targetDir);
-        await copyAssetFile('client/k6/request-builder.js', targetDir, 'Request Builder');
+        const ext = ctx.config.language === 'javascript' ? '.js' : '.ts';
+        await copyAssetFile(`client/k6/request-builder${ext}`, targetDir, 'Request Builder');
         if (!ctx.config.strictResponseTypes) {
             TypeScriptFileBuilder.generate({
                 logName: 'http status codes',
@@ -91,7 +92,9 @@ export class TypeScriptK6ClientsGenerator extends OpenApiServicesGenerationProvi
         };
     }
     getIndexFilePath(ctx) {
-        return ctx.config.clientsIndexFile ? resolve(ctx.config.outputDir, ctx.config.clientsIndexFile) : null;
+        return ctx.config.clientsIndexFile
+            ? resolve(ctx.config.outputDir, ctx.config.clientsIndexFile.replace(/\.[jt]s$/, ctx.config.language === 'javascript' ? '.js' : '.ts'))
+            : null;
     }
     getResponseModelsIndexFilePath(ctx) {
         return ctx.config.responseModelsIndexFile

package/esm/src/generators/services/k6-clients/models.d.ts

@@ -6,6 +6,11 @@ import type { TypeScriptFileBuilder } from '../../../file-builder.js';
 import type { TypeScriptModelsGeneratorOutput } from '../../models/index.js';
 import type { getReferenceFactories } from './refs.js';
 export type TypeScriptK6ClientsGeneratorConfig = TypeScriptGeneratorConfig & {
+    /**
+     * The language of the generated clients.
+     * @default 'javascript'
+     */
+    language: 'javascript' | 'typescript';
     /**
      * Whether to use strict response types for the services.
      * If enabled only the status codes are included that are defined in the OpenAPI specification or the `defaultStatusCodeResponseTypes` option.

package/esm/src/generators/services/k6-clients/models.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../../../../../src/src/generators/services/k6-clients/models.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,SAAS,EACT,UAAU,EACV,+BAA+B,EAC/B,oBAAoB,EACpB,QAAQ,EACR,wCAAwC,EACzC,MAAM,aAAa,CAAC;AAErB,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,uBAAuB,CAAC;AAChD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AACzE,OAAO,EAAoC,KAAK,yBAAyB,EAAE,MAAM,oBAAoB,CAAC;AACtG,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AACtE,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,uBAAuB,CAAC;AAC7E,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAC;AAEvD,MAAM,MAAM,kCAAkC,GAAG,yBAAyB,GAAG;IAC3E;;;;OAIG;IACH,mBAAmB,EAAE,OAAO,CAAC;IAE7B;;;;;;;;;;;;;;;;;;;;;;OAsBG;IACH,8BAA8B,EAAE,MAAM,CACpC,MAAM,EACN;QACE,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC;QAExB,IAAI,EAAE,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,qBAAqB,CAAC,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,SAAS,SAAS,EAAE,KAAK,SAAS,CAAC,CAAC;KAC1G,GAAG,IAAI,CACT,CAAC;IAEF;;;;;OAKG;IACH,mBAAmB,EAAE,MAAM,EAAE,CAAC;IAE9B;;;OAGG;IACH,oBAAoB,EAAE,QAAQ,CAAC,oBAAoB,CAAC,CAAC;IAErD;;;OAGG;IACH,2BAA2B,EAAE,QAAQ,CAAC,oBAAoB,CAAC,CAAC;IAE5D;;;OAGG;IACH,gBAAgB,EAAE,QAAQ,CAAC,oBAAoB,CAAC,CAAC;IAEjD;;;OAGG;IACH,SAAS,EAAE,MAAM,CAAC;IAElB;;;OAGG;IACH,iBAAiB,EAAE,MAAM,CAAC;IAE1B;;;OAGG;IACH,gBAAgB,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;IAEnC;;;OAGG;IACH,uBAAuB,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;IAE1C;;;OAGG;IACH,QAAQ,EAAE,MAAM,CAAC;IAEjB;;;OAGG;IACH,KAAK,EAAE,OAAO,CAAC;CAChB,CAAC;AAEF,eAAO,MAAM,yCAAyC,EAAE,+BAA+B,CACrF,kCAAkC,CAqFnC,CAAC;AAEF,MAAM,MAAM,iCAAiC,GAAG,+BAA+B,CAAC;AAEhF,MAAM,MAAM,kCAAkC,GAAG;IAC/C,UAAU,EAAE;QACV,SAAS,EAAE;YACT,CAAC,SAAS,EAAE,MAAM,GAAG,iCAAiC,CAAC;SACxD,CAAC;QACF,UAAU,EAAE;YACV,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;YAC5B,gBAAgB,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;SACpC,CAAC;KACH,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,iCAAiC,GAAG,sBAAsB,GAAG;IACvE,cAAc,EAAE;QACd,CAAC,WAAW,EAAE,MAAM,GAAG,sBAAsB,CAAC;KAC/C,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,mCAAmC,GAC3C,wCAAwC,CACxC,iCAAiC,EACjC,kCAAkC,EAClC,kCAAkC,EAClC,iCAAiC,CAClC,GACC;IACA,IAAI,EAAE,UAAU,CAAC,OAAO,qBAAqB,CAAC,CAAC;CAChD,CAAC;AAEJ,MAAM,MAAM,kCAAkC,GAAG,mCAAmC,GAAG;IACrF,QAAQ,CAAC,OAAO,EAAE,UAAU,CAAC;CAC9B,CAAC"}
+{"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../../../../../src/src/generators/services/k6-clients/models.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,SAAS,EACT,UAAU,EACV,+BAA+B,EAC/B,oBAAoB,EACpB,QAAQ,EACR,wCAAwC,EACzC,MAAM,aAAa,CAAC;AAErB,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,uBAAuB,CAAC;AAChD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AACzE,OAAO,EAAoC,KAAK,yBAAyB,EAAE,MAAM,oBAAoB,CAAC;AACtG,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AACtE,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,uBAAuB,CAAC;AAC7E,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAC;AAEvD,MAAM,MAAM,kCAAkC,GAAG,yBAAyB,GAAG;IAC3E;;;OAGG;IACH,QAAQ,EAAE,YAAY,GAAG,YAAY,CAAC;IAEtC;;;;OAIG;IACH,mBAAmB,EAAE,OAAO,CAAC;IAE7B;;;;;;;;;;;;;;;;;;;;;;OAsBG;IACH,8BAA8B,EAAE,MAAM,CACpC,MAAM,EACN;QACE,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC;QAExB,IAAI,EAAE,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,qBAAqB,CAAC,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,SAAS,SAAS,EAAE,KAAK,SAAS,CAAC,CAAC;KAC1G,GAAG,IAAI,CACT,CAAC;IAEF;;;;;OAKG;IACH,mBAAmB,EAAE,MAAM,EAAE,CAAC;IAE9B;;;OAGG;IACH,oBAAoB,EAAE,QAAQ,CAAC,oBAAoB,CAAC,CAAC;IAErD;;;OAGG;IACH,2BAA2B,EAAE,QAAQ,CAAC,oBAAoB,CAAC,CAAC;IAE5D;;;OAGG;IACH,gBAAgB,EAAE,QAAQ,CAAC,oBAAoB,CAAC,CAAC;IAEjD;;;OAGG;IACH,SAAS,EAAE,MAAM,CAAC;IAElB;;;OAGG;IACH,iBAAiB,EAAE,MAAM,CAAC;IAE1B;;;OAGG;IACH,gBAAgB,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;IAEnC;;;OAGG;IACH,uBAAuB,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;IAE1C;;;OAGG;IACH,QAAQ,EAAE,MAAM,CAAC;IAEjB;;;OAGG;IACH,KAAK,EAAE,OAAO,CAAC;CAChB,CAAC;AAEF,eAAO,MAAM,yCAAyC,EAAE,+BAA+B,CACrF,kCAAkC,CAqFnC,CAAC;AAEF,MAAM,MAAM,iCAAiC,GAAG,+BAA+B,CAAC;AAEhF,MAAM,MAAM,kCAAkC,GAAG;IAC/C,UAAU,EAAE;QACV,SAAS,EAAE;YACT,CAAC,SAAS,EAAE,MAAM,GAAG,iCAAiC,CAAC;SACxD,CAAC;QACF,UAAU,EAAE;YACV,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;YAC5B,gBAAgB,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;SACpC,CAAC;KACH,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,iCAAiC,GAAG,sBAAsB,GAAG;IACvE,cAAc,EAAE;QACd,CAAC,WAAW,EAAE,MAAM,GAAG,sBAAsB,CAAC;KAC/C,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,mCAAmC,GAC3C,wCAAwC,CACxC,iCAAiC,EACjC,kCAAkC,EAClC,kCAAkC,EAClC,iCAAiC,CAClC,GACC;IACA,IAAI,EAAE,UAAU,CAAC,OAAO,qBAAqB,CAAC,CAAC;CAChD,CAAC;AAEJ,MAAM,MAAM,kCAAkC,GAAG,mCAAmC,GAAG;IACrF,QAAQ,CAAC,OAAO,EAAE,UAAU,CAAC;CAC9B,CAAC"}

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

@@ -1,7 +1,7 @@
 import { defaultTypeScriptGeneratorConfig } from '../../../config.js';
 export const defaultTypeScriptK6ClientsGeneratorConfig = {
     ...defaultTypeScriptGeneratorConfig,
-    importModuleTransformer: 'js-extension',
+    language: 'javascript',
     strictResponseTypes: true,
     defaultStatusCodeResponseTypes: {
         401: null,

package/esm/src/generators/services/k6-clients/refs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"refs.d.ts","sourceRoot":"","sources":["../../../../../src/src/generators/services/k6-clients/refs.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,EAAE,EAAE,MAAM,uBAAuB,CAAC;AAC3C,OAAO,KAAK,EAAE,kCAAkC,EAAE,MAAM,aAAa,CAAC;AAEtE,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,kCAAkC,GAAG;IAClF,cAAc,EAAE,EAAE,CAAC,sBAAsB,CAAC;IAC1C,cAAc,EAAE,EAAE,CAAC,sBAAsB,CAAC;CAC3C,CAMA"}
+{"version":3,"file":"refs.d.ts","sourceRoot":"","sources":["../../../../../src/src/generators/services/k6-clients/refs.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,EAAE,EAAE,MAAM,uBAAuB,CAAC;AAC3C,OAAO,KAAK,EAAE,kCAAkC,EAAE,MAAM,aAAa,CAAC;AAEtE,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,kCAAkC,GAAG;IAClF,cAAc,EAAE,EAAE,CAAC,sBAAsB,CAAC;IAC1C,cAAc,EAAE,EAAE,CAAC,sBAAsB,CAAC;CAC3C,CAOA"}

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

@@ -2,8 +2,9 @@ import { join, resolve } from 'node:path';
 import { ts } from '../../../ast/index.js';
 export function getReferenceFactories(options) {
     const utilsDirPath = resolve(options.outputDir, options.utilsDir);
+    const ext = options.language === 'javascript' ? '.js' : '.ts';
     return {
-        requestBuilder: ts.reference.factory('RequestBuilder', join(utilsDirPath, 'request-builder.js')),
+        requestBuilder: ts.reference.factory('RequestBuilder', join(utilsDirPath, `request-builder${ext}`)),
         httpStatusCode: ts.reference.factory('HttpStatusCode', join(utilsDirPath, 'http-status-code.ts')),
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goast/typescript",
-  "version": "0.5.0",
+  "version": "0.5.1-k6.1",
   "description": "Provides gOAst generators for generating TypeScript code from OpenAPI specifications.",
   "author": {
     "name": "Marc Schmidt (MaSch0212)",
@@ -22,13 +22,10 @@
       "require": "./script/mod.js"
     }
   },
-  "scripts": {
-    "test": "node test_runner.js"
-  },
   "dependencies": {
     "tslib": "^2.6.2",
     "fs-extra": "^11.2.0",
-    "@goast/core": "0.4.1"
+    "@goast/core": "0.4.2"
   },
   "devDependencies": {
     "@types/node": "^20.9.0",

package/script/src/file-builder.js

@@ -74,7 +74,7 @@ class TypeScriptFileBuilder extends core_1.SourceBuilder {
         }
     }
     appendModelUsage(type, options) {
-        this.append(type.component);
+        this.append((options === null || options === void 0 ? void 0 : options.type) === 'js-doc' ? type.component.replace(/\/\*\*.*\*\/\s*/gs, '') : type.component);
         for (const i of type.imports) {
             this.addImport(i.name, i.modulePath, { ...i, ...options });
         }

package/script/src/generators/services/angular-services/angular-service-generator.js

@@ -232,13 +232,13 @@ class DefaultTypeScriptAngularServiceGenerator extends file_generator_js_1.TypeS
                     ], '\n'), { multiline: true })
                     : null,
                 '',
-                (0, core_1.builderTemplate) `return ${ctx.refs.waitForResponse([responseModelType])}(${core_1.builderTemplate.indent `
-              this.http.request(rb.build({${core_1.builderTemplate.indent `
-                responseType: ${index_js_1.ts.string(responseType)},
-                accept: ${index_js_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: ${index_js_1.ts.string(responseType)},
+                accept: ${index_js_1.ts.string(accept)},
+                context,`}
+              })),
+              {${core_1.builderTemplate.indent `
                 errorResponseTypes: ${index_js_1.ts.object({
                     members: [
                         ...Object.entries(this.getEndpointStatusCodes(ctx, endpoint))
@@ -247,8 +247,8 @@ class DefaultTypeScriptAngularServiceGenerator extends file_generator_js_1.TypeS
                             return index_js_1.ts.property(key, { value: index_js_1.ts.string(value.parser) });
                         }),
                     ],
-                })}`}
-              }`}
+                })}`}
+              }`}
             )`,
             ], '\n'),
         });

package/script/src/generators/services/easy-network-stub/easy-network-stub-generator.js

@@ -97,15 +97,15 @@ class DefaultTypeScriptEasyNetworkStubGenerator extends file_generator_js_1.Type
             ],
             returnType: 'this',
             body: (0, core_1.appendValueGroup)([
-                (0, core_1.builderTemplate) `this.stubWrapper.stub2<${requestType}>()(${core_1.builderTemplate.indent `
-              ${index_js_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 `
+              ${index_js_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/script/src/generators/services/fetch-clients/fetch-client-generator.js

@@ -134,7 +134,7 @@ class DefaultTypeScriptFetchClientGenerator extends file_generator_js_1.TypeScri
         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(${index_js_1.ts.string(endpoint.path)})${(b) => b.forEach(endpoint.parameters, (b, p) => {
                 switch (p.target) {
                     case 'path':
@@ -144,7 +144,7 @@ class DefaultTypeScriptFetchClientGenerator extends file_generator_js_1.TypeScri
                         b.append((0, core_1.builderTemplate) `\n.withQueryParam(${index_js_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, ${index_js_1.ts.object({
                 members: [

package/script/src/generators/services/k6-clients/k6-client-generator.d.ts

@@ -19,10 +19,10 @@ export declare class DefaultTypeScriptK6ClientGenerator extends TypeScriptFileGe
         type: ts.Type<Builder>;
     }>;
     protected getClientFileContent(ctx: Context): AppendValueGroup<Builder>;
-    protected getEndpointParamsType(ctx: Context, endpoint: ApiEndpoint): ts.Doc<Builder>;
+    protected getEndpointParamsType(ctx: Context, endpoint: ApiEndpoint): ts.Doc<Builder> | ts.TypeAlias<Builder>;
     protected getClass(ctx: Context): ts.Class<Builder>;
     protected getEndpointMethod(ctx: Context, endpoint: ApiEndpoint): ts.Method<Builder>;
-    protected getGetK6ParamsMethod(_ctx: Context): ts.Method<Builder>;
+    protected getGetK6ParamsMethod(ctx: Context): ts.Method<Builder>;
     protected getEndpointSuccessResponse(_ctx: Context, endpoint: ApiEndpoint): ApiResponse | undefined;
     protected getSchemaType(ctx: Context, schema: ApiSchema | undefined, options?: TypeScriptImportOptions & {
         fallback?: ts.Type<Builder>;

package/script/src/generators/services/k6-clients/k6-client-generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"k6-client-generator.d.ts","sourceRoot":"","sources":["../../../../../src/src/generators/services/k6-clients/k6-client-generator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"k6-client-generator.d.ts","sourceRoot":"","sources":["../../../../../src/src/generators/services/k6-clients/k6-client-generator.ts"],"names":[],"mappings":"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"}