@goast/typescript 0.3.8 → 0.3.9

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

@@ -184,12 +184,12 @@ class DefaultTypeScriptAngularServiceGenerator extends file_generator_1.TypeScri
         });
     }
     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 = 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 accept = this.getEndpointSuccessResponseType(ctx, endpoint);
         const responseType = this.contentTypeToResponseType(accept);
         return ast_1.ts.method(this.getEndpointMethodName(ctx, endpoint), {
             accessModifier: 'public',
@@ -252,6 +252,15 @@ class DefaultTypeScriptAngularServiceGenerator extends file_generator_1.TypeScri
             ], '\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/cjs/lib/generators/services/angular-services/models.js

@@ -12,6 +12,7 @@ exports.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/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',
@@ -249,6 +249,15 @@ export class DefaultTypeScriptAngularServiceGenerator extends TypeScriptFileGene
             ], '\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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goast/typescript",
-  "version": "0.3.8",
+  "version": "0.3.9",
   "repository": "https://github.com/MaSch0212/goast.git",
   "description": "Provides gOAst generators for generating TypeScript code from OpenAPI specifications.",
   "keywords": [

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