@goast/typescript 0.5.1-k6.3 → 0.5.2-k6.1

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

@@ -229,7 +229,7 @@ export class DefaultTypeScriptK6ClientGenerator extends TypeScriptFileGenerator
                         ts.constructorParameter('rootUrl', { type: isJs ? undefined : rootUrlType }),
                         ts.constructorParameter('defaultK6ParamsFactory', { type: isJs ? undefined : paramType, optional: true }),
                     ],
-                    body: s `this.rootUrl = rootUrl;
+                    body: s `this.rootUrl = rootUrl;
                   this._defaultK6ParamsFactory = defaultK6ParamsFactory;`,
                 }),
                 ...ctx.service.endpoints.map((e) => this.getEndpointMethod(ctx, e)),
@@ -291,17 +291,17 @@ export class DefaultTypeScriptK6ClientGenerator extends TypeScriptFileGenerator
                     : null,
                 '',
                 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 /** @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),`}
-                })`}
+                    : 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'),
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goast/typescript",
-  "version": "0.5.1-k6.3",
+  "version": "0.5.2-k6.1",
   "description": "Provides gOAst generators for generating TypeScript code from OpenAPI specifications.",
   "author": {
     "name": "Marc Schmidt (MaSch0212)",

package/script/src/generators/models/models.d.ts

@@ -2,7 +2,7 @@ import type { ApiSchema, DefaultGenerationProviderConfig, ExtendedStringCasing,
 import { ts } from '../../ast/index.js';
 import type { TypeScriptComponentOutput } from '../../common-results.js';
 import { type TypeScriptGeneratorConfig } from '../../config.js';
-import { TypeScriptFileBuilder } from '../../file-builder.js';
+import type { TypeScriptFileBuilder } from '../../file-builder.js';
 export type TypeScriptModelGeneratorConfig = TypeScriptGeneratorConfig & {
     /**
      * Determines how to generate enums.

package/script/src/generators/models/models.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../../../../src/src/generators/models/models.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,SAAS,EACT,+BAA+B,EAC/B,oBAAoB,EACpB,QAAQ,EACR,uCAAuC,EACxC,MAAM,aAAa,CAAC;AAErB,OAAO,EAAE,EAAE,EAAE,MAAM,oBAAoB,CAAC;AACxC,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,yBAAyB,CAAC;AACzE,OAAO,EAAoC,KAAK,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AACnG,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAE9D,MAAM,MAAM,8BAA8B,GAAG,yBAAyB,GAAG;IACvE;;;;;OAKG;IACH,cAAc,EAAE,OAAO,GAAG,aAAa,CAAC;IAExC;;;OAGG;IACH,cAAc,EAAE,OAAO,CAAC;IAExB;;;OAGG;IACH,oBAAoB,EAAE,OAAO,CAAC;IAE9B;;;OAGG;IACH,SAAS,EAAE,MAAM,CAAC;IAElB;;;OAGG;IACH,mBAAmB,EAAE,QAAQ,CAAC,oBAAoB,CAAC,CAAC;IAEpD;;;;;OAKG;IACH,eAAe,EAAE,MAAM,GAAG,kBAAkB,CAAC;IAE7C;;;OAGG;IACH,2BAA2B,EAAE,oBAAoB,CAAC;IAElD;;;OAGG;IACH,gBAAgB,EAAE,MAAM,EAAE,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;CACxD,CAAC;AAEF,MAAM,MAAM,+BAA+B,GAAG,8BAA8B,GAAG;IAC7E;;;OAGG;IACH,eAAe,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;CACnC,CAAC;AAEF,eAAO,MAAM,qCAAqC,EAAE,+BAA+B,CAAC,8BAA8B,CAWjH,CAAC;AAEF,eAAO,MAAM,sCAAsC,EAAE,+BAA+B,CAAC,+BAA+B,CAKjH,CAAC;AAGJ,MAAM,MAAM,8BAA8B,GAAG,EAAE,CAAC;AAEhD,MAAM,MAAM,+BAA+B,GAAG;IAC5C,UAAU,EAAE;QACV,MAAM,EAAE;YACN,CAAC,QAAQ,EAAE,MAAM,GAAG,8BAA8B,CAAC;SACpD,CAAC;QACF,UAAU,EAAE;YACV,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;SAC1B,CAAC;KACH,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,8BAA8B,GAAG,yBAAyB,CAAC;AAEvE,MAAM,MAAM,gCAAgC,GAAG,uCAAuC,CACpF,8BAA8B,EAC9B,+BAA+B,EAC/B,+BAA+B,EAC/B,8BAA8B,CAC/B,CAAC;AAEF,MAAM,MAAM,+BAA+B,GAAG,gCAAgC,GAAG;IAC/E,MAAM,EAAE,SAAS,CAAC;CACnB,CAAC"}
+{"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../../../../src/src/generators/models/models.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,SAAS,EACT,+BAA+B,EAC/B,oBAAoB,EACpB,QAAQ,EACR,uCAAuC,EACxC,MAAM,aAAa,CAAC;AAErB,OAAO,EAAE,EAAE,EAAE,MAAM,oBAAoB,CAAC;AACxC,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,yBAAyB,CAAC;AACzE,OAAO,EAAoC,KAAK,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AACnG,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAEnE,MAAM,MAAM,8BAA8B,GAAG,yBAAyB,GAAG;IACvE;;;;;OAKG;IACH,cAAc,EAAE,OAAO,GAAG,aAAa,CAAC;IAExC;;;OAGG;IACH,cAAc,EAAE,OAAO,CAAC;IAExB;;;OAGG;IACH,oBAAoB,EAAE,OAAO,CAAC;IAE9B;;;OAGG;IACH,SAAS,EAAE,MAAM,CAAC;IAElB;;;OAGG;IACH,mBAAmB,EAAE,QAAQ,CAAC,oBAAoB,CAAC,CAAC;IAEpD;;;;;OAKG;IACH,eAAe,EAAE,MAAM,GAAG,kBAAkB,CAAC;IAE7C;;;OAGG;IACH,2BAA2B,EAAE,oBAAoB,CAAC;IAElD;;;OAGG;IACH,gBAAgB,EAAE,MAAM,EAAE,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;CACxD,CAAC;AAEF,MAAM,MAAM,+BAA+B,GAAG,8BAA8B,GAAG;IAC7E;;;OAGG;IACH,eAAe,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;CACnC,CAAC;AAEF,eAAO,MAAM,qCAAqC,EAAE,+BAA+B,CAAC,8BAA8B,CAWjH,CAAC;AAEF,eAAO,MAAM,sCAAsC,EAAE,+BAA+B,CAAC,+BAA+B,CAKjH,CAAC;AAGJ,MAAM,MAAM,8BAA8B,GAAG,EAAE,CAAC;AAEhD,MAAM,MAAM,+BAA+B,GAAG;IAC5C,UAAU,EAAE;QACV,MAAM,EAAE;YACN,CAAC,QAAQ,EAAE,MAAM,GAAG,8BAA8B,CAAC;SACpD,CAAC;QACF,UAAU,EAAE;YACV,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;SAC1B,CAAC;KACH,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,8BAA8B,GAAG,yBAAyB,CAAC;AAEvE,MAAM,MAAM,gCAAgC,GAAG,uCAAuC,CACpF,8BAA8B,EAC9B,+BAA+B,EAC/B,+BAA+B,EAC/B,8BAA8B,CAC/B,CAAC;AAEF,MAAM,MAAM,+BAA+B,GAAG,gCAAgC,GAAG;IAC/E,MAAM,EAAE,SAAS,CAAC;CACnB,CAAC"}

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.js

@@ -232,7 +232,7 @@ class DefaultTypeScriptK6ClientGenerator extends file_generator_js_1.TypeScriptF
                         index_js_1.ts.constructorParameter('rootUrl', { type: isJs ? undefined : rootUrlType }),
                         index_js_1.ts.constructorParameter('defaultK6ParamsFactory', { type: isJs ? undefined : paramType, optional: true }),
                     ],
-                    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)),
@@ -294,17 +294,17 @@ class DefaultTypeScriptK6ClientGenerator extends file_generator_js_1.TypeScriptF
                     : null,
                 '',
                 ctx.config.language === 'javascript'
-                    ? (0, core_1.builderTemplate) `return /** @type {${returnType}} */ (${core_1.builderTemplate.indent `
-                ${ctx.config.async ? 'await rb.buildAsync' : 'rb.build'}({${core_1.builderTemplate.indent `
-                  accept: ${index_js_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: ${index_js_1.ts.string(accept)},
+                  params: this.getK6Params(k6Params),`}
+                })`}
               );`
-                    : (0, core_1.builderTemplate) `return (${core_1.builderTemplate.indent `
-                ${ctx.config.async ? 'await rb.buildAsync' : 'rb.build'}({${core_1.builderTemplate.indent `
-                  accept: ${index_js_1.ts.string(accept)},
-                  params: this.getK6Params(k6Params),`}
-                })`}
+                    : (0, core_1.builderTemplate) `return (${core_1.builderTemplate.indent `
+                ${ctx.config.async ? 'await rb.buildAsync' : 'rb.build'}({${core_1.builderTemplate.indent `
+                  accept: ${index_js_1.ts.string(accept)},
+                  params: this.getK6Params(k6Params),`}
+                })`}
               ) as unknown as ${returnType};`,
             ], '\n'),
         });