@goast/typescript 0.3.8-beta1 → 0.3.9

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

@@ -181,12 +181,12 @@ export class DefaultTypeScriptAngularServiceGenerator extends TypeScriptFileGene
         });
     }
     getEndpointMethod(ctx, endpoint) {
-        var _a, _b, _c, _d;
+        var _a;
         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: '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 accept = this.getEndpointSuccessResponseType(ctx, endpoint);
         const responseType = this.contentTypeToResponseType(accept);
         return ts.method(this.getEndpointMethodName(ctx, endpoint), {
             accessModifier: 'public',
@@ -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,12 +243,21 @@ export class DefaultTypeScriptAngularServiceGenerator extends TypeScriptFileGene
                             return ts.property(key, { value: ts.string(value.parser) });
                         }),
                     ],
-                })}`}
-              }`}
+                })}`}
+              }`}
             )`,
             ], '\n'),
         });
     }
+    getEndpointSuccessResponseType(ctx, endpoint) {
+        var _a, _b, _c, _d, _e, _f;
+        const response = this.getEndpointSuccessResponse(ctx, endpoint);
+        if (!response)
+            return '*/*';
+        if (!ctx.config.defaultSuccessResponseType)
+            return (_b = (_a = response.contentOptions[0]) === null || _a === void 0 ? void 0 : _a.type) !== null && _b !== void 0 ? _b : '*/*';
+        return ((_f = (_d = (_c = response.contentOptions.find((x) => x.type === ctx.config.defaultSuccessResponseType)) === null || _c === void 0 ? void 0 : _c.type) !== null && _d !== void 0 ? _d : (_e = response.contentOptions[0]) === null || _e === void 0 ? void 0 : _e.type) !== null && _f !== void 0 ? _f : '*/*');
+    }
     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));

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

@@ -9,6 +9,7 @@ export const defaultTypeScriptAngularServicesGeneratorConfig = {
         403: null,
         500: null,
     },
+    defaultSuccessResponseType: undefined,
     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,

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

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

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

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

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

@@ -186,7 +186,7 @@ export class DefaultTypeScriptK6ClientGenerator extends TypeScriptFileGenerator
                         ],
                     }),
                     parameters: [ts.constructorParameter('rootUrl'), ts.constructorParameter('defaultK6ParamsFactory')],
-                    body: s `this.rootUrl = rootUrl;
+                    body: s `this.rootUrl = rootUrl;
                   this._defaultK6ParamsFactory = defaultK6ParamsFactory;`,
                 }),
                 ...ctx.service.endpoints.map((e) => this.getEndpointMethod(ctx, e)),
@@ -245,11 +245,11 @@ 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),`}
-              })`}
+                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'),
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goast/typescript",
-  "version": "0.3.8-beta1",
+  "version": "0.3.9",
   "repository": "https://github.com/MaSch0212/goast.git",
   "description": "Provides gOAst generators for generating TypeScript code from OpenAPI specifications.",
   "keywords": [
@@ -30,6 +30,7 @@
     "@goast/core": "0.3.5",
     "tslib": "2.6.3"
   },
+  "packageManager": "pnpm@9.5.0",
   "module": "./esm/index.js",
   "main": "./cjs/index.js",
   "types": "./types/index.d.ts",
@@ -41,4 +42,4 @@
     },
     "./package.json": "./package.json"
   }
-}
+}

package/types/lib/generators/services/angular-services/angular-service-generator.d.ts

@@ -22,6 +22,7 @@ export declare class DefaultTypeScriptAngularServiceGenerator extends TypeScript
     protected getEndpointParamsType(ctx: Context, endpoint: ApiEndpoint): ts.TypeAlias<Builder>;
     protected getClass(ctx: Context): ts.Class<Builder>;
     protected getEndpointMethod(ctx: Context, endpoint: ApiEndpoint): ts.Method<Builder>;
+    protected getEndpointSuccessResponseType(ctx: Context, endpoint: ApiEndpoint): string;
     protected getEndpointSuccessResponse(ctx: Context, endpoint: ApiEndpoint): import("@goast/core").ApiResponse | undefined;
     protected getServiceClassName(ctx: Context): string;
     protected getResponseModelName(ctx: Context, endpoint: ApiEndpoint): string;

package/types/lib/generators/services/angular-services/models.d.ts

@@ -51,6 +51,11 @@ export type TypeScriptAngularServicesGeneratorConfig = TypeScriptGeneratorConfig
         parser: 'text' | 'json';
         type: Exclude<ts.Type<TypeScriptFileBuilder>, Function> | ((schemas: readonly ApiSchema[]) => ApiSchema);
     } | null>;
+    /**
+     * The default content type which is used for the success response. If not defined the first one defined in the OpenApi specification is used.
+     * @default undefined
+     */
+    defaultSuccessResponseType: Nullable<string>;
     /**
      * The possible status codes that any API endpoint can return.
      * This is only used when `strictResponseTypes` is set to `false`.