@goast/typescript 0.2.6 → 0.2.8

package/assets/client/angular/angular-service.utils.ts

@@ -0,0 +1,26 @@
+import { HttpErrorResponse, HttpEvent, HttpResponse } from '@angular/common/http';
+import { Observable, filter, firstValueFrom } from 'rxjs';
+
+export async function waitForResponse<T extends HttpResponse<any> | HttpErrorResponse>(
+  httpEvents: Observable<HttpEvent<any>>,
+  options: { errorResponseTypes: Record<number, 'text' | 'json'> },
+): Promise<T> {
+  try {
+    const response = await firstValueFrom(httpEvents.pipe(filter((event) => event instanceof HttpResponse)));
+    return response as T;
+  } catch (error) {
+    if (error instanceof HttpErrorResponse) {
+      if (options.errorResponseTypes[error.status] === 'json' && typeof error.error === 'string') {
+        return new HttpErrorResponse({
+          error: JSON.parse(error.error),
+          headers: error.headers,
+          status: error.status,
+          statusText: error.statusText,
+          url: error.url ?? undefined,
+        }) as T;
+      }
+      return error as T;
+    }
+    throw error;
+  }
+}

package/cjs/lib/ast/references/angular.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.httpResponse = exports.httpContext = exports.httpClient = exports.provider = exports.injectable = exports.inject = void 0;
+exports.httpErrorResponse = exports.httpResponse = exports.httpContext = exports.httpClient = exports.provider = exports.injectable = exports.inject = void 0;
 const reference_1 = require("../nodes/reference");
 // @angular/core
 exports.inject = reference_1.tsReference.factory('inject', '@angular/core');
@@ -10,3 +10,4 @@ exports.provider = reference_1.tsReference.factory('Provider', '@angular/core');
 exports.httpClient = reference_1.tsReference.factory('HttpClient', '@angular/common/http');
 exports.httpContext = reference_1.tsReference.factory('HttpContext', '@angular/common/http');
 exports.httpResponse = reference_1.tsReference.genericFactory('HttpResponse', '@angular/common/http');
+exports.httpErrorResponse = reference_1.tsReference.factory('HttpErrorResponse', '@angular/common/http');

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

@@ -162,7 +162,12 @@ class DefaultTypeScriptModelGenerator extends file_generator_1.TypeScriptFileGen
                     members: Object.entries(discriminator.mapping).map(([key, value]) => ast_1.ts.property(key, {
                         type: ast_1.ts.intersectionType([
                             ast_1.ts.objectType({
-                                members: [ast_1.ts.property(discriminator.propertyName, { type: ast_1.ts.string(key) })],
+                                members: [
+                                    ast_1.ts.property(discriminator.propertyName, {
+                                        type: ast_1.ts.string(key),
+                                        readonly: ctx.config.immutableTypes,
+                                    }),
+                                ],
                             }),
                             this.getType(ctx, value),
                         ]),

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

@@ -50,15 +50,19 @@ class DefaultTypeScriptAngularServiceGenerator extends file_generator_1.TypeScri
         }
         result.values.push(ast_1.ts.typeAlias(this.getResponseModelName(ctx, endpoint), ast_1.ts.intersectionType([
             ast_1.ts.unionType([
-                ...Object.entries(statusCodes).map(([key, value]) => ast_1.ts.intersectionType([
-                    ast_1.ts.refs.angular.httpResponse([value]),
-                    ast_1.ts.objectType({
-                        members: [
-                            ast_1.ts.property('status', { type: key }),
-                            ast_1.ts.property('ok', { type: key.startsWith('2') ? 'true' : 'false' }),
-                        ],
-                    }),
-                ])),
+                ...Object.entries(statusCodes).map(([key, value]) => {
+                    const isSuccess = key.startsWith('2');
+                    return ast_1.ts.intersectionType([
+                        isSuccess ? ast_1.ts.refs.angular.httpResponse([value.type]) : ast_1.ts.refs.angular.httpErrorResponse(),
+                        ast_1.ts.objectType({
+                            members: [
+                                isSuccess ? null : ast_1.ts.property('error', { type: ast_1.ts.unionType([value.type, ast_1.ts.refs.null_()]) }),
+                                ast_1.ts.property('status', { type: key }),
+                                ast_1.ts.property('ok', { type: isSuccess ? 'true' : 'false' }),
+                            ],
+                        }),
+                    ]);
+                }),
                 !ctx.config.strictResponseTypes
                     ? ast_1.ts.intersectionType([
                         ast_1.ts.refs.angular.httpResponse([this.getAnyType(ctx)]),
@@ -86,13 +90,30 @@ class DefaultTypeScriptAngularServiceGenerator extends file_generator_1.TypeScri
     }
     getEndpointStatusCodes(ctx, endpoint) {
         return Object.fromEntries([
-            ...Object.entries(ctx.config.defaultStatusCodeResponseTypes).map(([key, value]) => [
-                key,
-                typeof value === 'function' ? this.getSchemaType(ctx, value(ctx.data.schemas)) : value,
-            ]),
+            ...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 : ast_1.ts.refs.never(),
+                    },
+                ];
+            }),
             ...endpoint.responses
                 .filter((x) => x.statusCode)
-                .map((x) => { var _a; return [x.statusCode, this.getSchemaType(ctx, (_a = x.contentOptions[0]) === null || _a === void 0 ? void 0 : _a.schema, ast_1.ts.refs.never())]; }),
+                .map((x) => {
+                var _a, _b;
+                return [
+                    x.statusCode,
+                    {
+                        parser: this.contentTypeToResponseType((_a = x.contentOptions[0]) === null || _a === void 0 ? void 0 : _a.type),
+                        type: this.getSchemaType(ctx, (_b = x.contentOptions[0]) === null || _b === void 0 ? void 0 : _b.schema, ast_1.ts.refs.never()),
+                    },
+                ];
+            }),
         ]);
     }
     // #endregion
@@ -150,11 +171,10 @@ class DefaultTypeScriptAngularServiceGenerator extends file_generator_1.TypeScri
         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 returnType = ast_1.ts.refs.promise([
-            ast_1.ts.reference(this.getResponseModelName(ctx, endpoint), this.getResponseModelFilePath(ctx)),
-        ]);
+        const responseModelType = ast_1.ts.reference(this.getResponseModelName(ctx, endpoint), this.getResponseModelFilePath(ctx));
+        const returnType = ast_1.ts.refs.promise([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 responseType = accept.includes('json') ? 'json' : 'text';
+        const responseType = this.contentTypeToResponseType(accept);
         return ast_1.ts.method(this.getEndpointMethodName(ctx, endpoint), {
             accessModifier: 'public',
             parameters: [
@@ -191,16 +211,24 @@ class DefaultTypeScriptAngularServiceGenerator extends file_generator_1.TypeScri
                     }
                     : null,
                 '',
-                (0, core_1.builderTemplate) `return ${ast_1.ts.refs.rxjs.firstValueFrom()}(${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: ${ast_1.ts.string(responseType)},
                 accept: ${ast_1.ts.string(accept)},
                 context,`}
-              })).pipe(${core_1.builderTemplate.indent `
-                ${ast_1.ts.refs.rxjs.filter()}((r: unknown) => r instanceof ${ast_1.ts.refs.angular.httpResponse.infer()}),
-                ${ast_1.ts.refs.rxjs.take()}(1),`}
-              )`}
-            ) as unknown as ${returnType};`,
+              })),
+              {${core_1.builderTemplate.indent `
+                errorResponseTypes: ${ast_1.ts.object({
+                    members: [
+                        ...Object.entries(this.getEndpointStatusCodes(ctx, endpoint))
+                            .filter(([key]) => !key.startsWith('2'))
+                            .map(([key, value]) => {
+                            return ast_1.ts.property(key, { value: ast_1.ts.string(value.parser) });
+                        }),
+                    ],
+                })}`}
+              }`}
+            )`,
             ], '\n'),
         });
     }
@@ -238,5 +266,8 @@ class DefaultTypeScriptAngularServiceGenerator extends file_generator_1.TypeScri
             return fallback !== null && fallback !== void 0 ? fallback : this.getAnyType(ctx);
         return (b) => b.appendModelUsage(output);
     }
+    contentTypeToResponseType(contentType) {
+        return (contentType === null || contentType === void 0 ? void 0 : contentType.includes('json')) ? 'json' : 'text';
+    }
 }
 exports.DefaultTypeScriptAngularServiceGenerator = DefaultTypeScriptAngularServiceGenerator;

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

@@ -46,7 +46,8 @@ class TypeScriptAngularServicesGenerator extends core_1.OpenApiServicesGeneratio
         const sourceDir = (0, path_1.resolve)((0, path_1.dirname)(require.resolve('@goast/typescript')), '../assets/client/angular');
         const targetDir = (0, path_1.resolve)(ctx.config.outputDir, ctx.config.utilsDirPath);
         (0, fs_extra_1.ensureDirSync)(targetDir);
-        this.copyFile('request builder', sourceDir, targetDir, 'request-builder.ts');
+        this.copyFile('Request Builder', sourceDir, targetDir, 'request-builder.ts');
+        this.copyFile('Angular Service Utils', sourceDir, targetDir, 'angular-service.utils.ts');
         file_builder_1.TypeScriptFileBuilder.generate({
             logName: 'api configuration',
             filePath: (0, path_1.resolve)(targetDir, 'api-configuration.ts'),

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

@@ -1,12 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.defaultTypeScriptAngularServicesGeneratorConfig = void 0;
-const ast_1 = require("../../../ast");
 const config_1 = require("../../../config");
 exports.defaultTypeScriptAngularServicesGeneratorConfig = Object.assign(Object.assign({}, config_1.defaultTypeScriptGeneratorConfig), { fileNameCasing: { casing: 'kebab', suffix: '.service' }, responseModelFileNameCasing: { casing: 'kebab', suffix: '-responses.model' }, provideKind: 'provide-fn', strictResponseTypes: true, defaultStatusCodeResponseTypes: {
-        401: ast_1.ts.refs.never(),
-        403: ast_1.ts.refs.never(),
-        500: ast_1.ts.refs.never(),
+        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,

package/cjs/lib/generators/services/angular-services/refs.js

@@ -9,6 +9,8 @@ function getReferenceFactories(options) {
     var _a, _b;
     const utilsDirPath = (0, path_1.resolve)(options.outputDir, options.utilsDirPath);
     return {
+        // angular-service.utils.ts
+        waitForResponse: ast_1.ts.reference.genericFactory('waitForResponse', (0, path_1.join)(utilsDirPath, 'angular-service.utils.ts')),
         // request-builder.ts
         requestBuilder: ast_1.ts.reference.factory('RequestBuilder', (0, path_1.join)(utilsDirPath, 'request-builder.ts')),
         // api-configuration.ts - generated in angular-services-generator.ts

package/esm/lib/ast/references/angular.js

@@ -7,3 +7,4 @@ export const provider = tsReference.factory('Provider', '@angular/core');
 export const httpClient = tsReference.factory('HttpClient', '@angular/common/http');
 export const httpContext = tsReference.factory('HttpContext', '@angular/common/http');
 export const httpResponse = tsReference.genericFactory('HttpResponse', '@angular/common/http');
+export const httpErrorResponse = tsReference.factory('HttpErrorResponse', '@angular/common/http');

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

@@ -159,7 +159,12 @@ export class DefaultTypeScriptModelGenerator extends TypeScriptFileGenerator {
                     members: Object.entries(discriminator.mapping).map(([key, value]) => ts.property(key, {
                         type: ts.intersectionType([
                             ts.objectType({
-                                members: [ts.property(discriminator.propertyName, { type: ts.string(key) })],
+                                members: [
+                                    ts.property(discriminator.propertyName, {
+                                        type: ts.string(key),
+                                        readonly: ctx.config.immutableTypes,
+                                    }),
+                                ],
                             }),
                             this.getType(ctx, value),
                         ]),

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

@@ -47,15 +47,19 @@ export class DefaultTypeScriptAngularServiceGenerator extends TypeScriptFileGene
         }
         result.values.push(ts.typeAlias(this.getResponseModelName(ctx, endpoint), ts.intersectionType([
             ts.unionType([
-                ...Object.entries(statusCodes).map(([key, value]) => ts.intersectionType([
-                    ts.refs.angular.httpResponse([value]),
-                    ts.objectType({
-                        members: [
-                            ts.property('status', { type: key }),
-                            ts.property('ok', { type: key.startsWith('2') ? 'true' : 'false' }),
-                        ],
-                    }),
-                ])),
+                ...Object.entries(statusCodes).map(([key, value]) => {
+                    const isSuccess = key.startsWith('2');
+                    return ts.intersectionType([
+                        isSuccess ? ts.refs.angular.httpResponse([value.type]) : ts.refs.angular.httpErrorResponse(),
+                        ts.objectType({
+                            members: [
+                                isSuccess ? null : ts.property('error', { type: ts.unionType([value.type, ts.refs.null_()]) }),
+                                ts.property('status', { type: key }),
+                                ts.property('ok', { type: isSuccess ? 'true' : 'false' }),
+                            ],
+                        }),
+                    ]);
+                }),
                 !ctx.config.strictResponseTypes
                     ? ts.intersectionType([
                         ts.refs.angular.httpResponse([this.getAnyType(ctx)]),
@@ -83,13 +87,30 @@ export class DefaultTypeScriptAngularServiceGenerator extends TypeScriptFileGene
     }
     getEndpointStatusCodes(ctx, endpoint) {
         return Object.fromEntries([
-            ...Object.entries(ctx.config.defaultStatusCodeResponseTypes).map(([key, value]) => [
-                key,
-                typeof value === 'function' ? this.getSchemaType(ctx, value(ctx.data.schemas)) : value,
-            ]),
+            ...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, this.getSchemaType(ctx, (_a = x.contentOptions[0]) === null || _a === void 0 ? void 0 : _a.schema, ts.refs.never())]; }),
+                .map((x) => {
+                var _a, _b;
+                return [
+                    x.statusCode,
+                    {
+                        parser: this.contentTypeToResponseType((_a = x.contentOptions[0]) === null || _a === void 0 ? void 0 : _a.type),
+                        type: this.getSchemaType(ctx, (_b = x.contentOptions[0]) === null || _b === void 0 ? void 0 : _b.schema, ts.refs.never()),
+                    },
+                ];
+            }),
         ]);
     }
     // #endregion
@@ -147,11 +168,10 @@ export class DefaultTypeScriptAngularServiceGenerator extends TypeScriptFileGene
         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 returnType = ts.refs.promise([
-            ts.reference(this.getResponseModelName(ctx, endpoint), this.getResponseModelFilePath(ctx)),
-        ]);
+        const responseModelType = ts.reference(this.getResponseModelName(ctx, endpoint), this.getResponseModelFilePath(ctx));
+        const returnType = ts.refs.promise([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 responseType = accept.includes('json') ? 'json' : 'text';
+        const responseType = this.contentTypeToResponseType(accept);
         return ts.method(this.getEndpointMethodName(ctx, endpoint), {
             accessModifier: 'public',
             parameters: [
@@ -188,16 +208,24 @@ export class DefaultTypeScriptAngularServiceGenerator extends TypeScriptFileGene
                     }
                     : null,
                 '',
-                s `return ${ts.refs.rxjs.firstValueFrom()}(${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,`}
-              })).pipe(${s.indent `
-                ${ts.refs.rxjs.filter()}((r: unknown) => r instanceof ${ts.refs.angular.httpResponse.infer()}),
-                ${ts.refs.rxjs.take()}(1),`}
-              )`}
-            ) as unknown as ${returnType};`,
+              })),
+              {${s.indent `
+                errorResponseTypes: ${ts.object({
+                    members: [
+                        ...Object.entries(this.getEndpointStatusCodes(ctx, endpoint))
+                            .filter(([key]) => !key.startsWith('2'))
+                            .map(([key, value]) => {
+                            return ts.property(key, { value: ts.string(value.parser) });
+                        }),
+                    ],
+                })}`}
+              }`}
+            )`,
             ], '\n'),
         });
     }
@@ -235,4 +263,7 @@ export class DefaultTypeScriptAngularServiceGenerator extends TypeScriptFileGene
             return fallback !== null && fallback !== void 0 ? fallback : this.getAnyType(ctx);
         return (b) => b.appendModelUsage(output);
     }
+    contentTypeToResponseType(contentType) {
+        return (contentType === null || contentType === void 0 ? void 0 : contentType.includes('json')) ? 'json' : 'text';
+    }
 }

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

@@ -43,7 +43,8 @@ export class TypeScriptAngularServicesGenerator extends OpenApiServicesGeneratio
         const sourceDir = resolve(dirname(require.resolve('@goast/typescript')), '../assets/client/angular');
         const targetDir = resolve(ctx.config.outputDir, ctx.config.utilsDirPath);
         ensureDirSync(targetDir);
-        this.copyFile('request builder', sourceDir, targetDir, 'request-builder.ts');
+        this.copyFile('Request Builder', sourceDir, targetDir, 'request-builder.ts');
+        this.copyFile('Angular Service Utils', sourceDir, targetDir, 'angular-service.utils.ts');
         TypeScriptFileBuilder.generate({
             logName: 'api configuration',
             filePath: resolve(targetDir, 'api-configuration.ts'),

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

@@ -1,9 +1,8 @@
-import { ts } from '../../../ast';
 import { defaultTypeScriptGeneratorConfig } from '../../../config';
 export const defaultTypeScriptAngularServicesGeneratorConfig = Object.assign(Object.assign({}, defaultTypeScriptGeneratorConfig), { fileNameCasing: { casing: 'kebab', suffix: '.service' }, responseModelFileNameCasing: { casing: 'kebab', suffix: '-responses.model' }, provideKind: 'provide-fn', strictResponseTypes: true, defaultStatusCodeResponseTypes: {
-        401: ts.refs.never(),
-        403: ts.refs.never(),
-        500: ts.refs.never(),
+        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,

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

@@ -6,6 +6,8 @@ export function getReferenceFactories(options) {
     var _a, _b;
     const utilsDirPath = resolve(options.outputDir, options.utilsDirPath);
     return {
+        // angular-service.utils.ts
+        waitForResponse: ts.reference.genericFactory('waitForResponse', join(utilsDirPath, 'angular-service.utils.ts')),
         // request-builder.ts
         requestBuilder: ts.reference.factory('RequestBuilder', join(utilsDirPath, 'request-builder.ts')),
         // api-configuration.ts - generated in angular-services-generator.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goast/typescript",
-  "version": "0.2.6",
+  "version": "0.2.8",
   "repository": "https://github.com/MaSch0212/goast.git",
   "author": {
     "name": "Marc Schmidt (MaSch0212)",

package/types/lib/ast/references/angular.d.ts

@@ -35,3 +35,9 @@ export declare const httpResponse: (<TBuilder extends import("@goast/core").Sour
 } & {
     moduleNameOrfilePath: string;
 };
+export declare const httpErrorResponse: (<TBuilder extends import("@goast/core").SourceBuilder<never>>() => import("../nodes/reference").TsReference<TBuilder, never>) & {
+    refName: string;
+    moduleNameOrfilePath: import("@goast/core").Nullable<string>;
+} & {
+    moduleNameOrfilePath: string;
+};

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

@@ -14,7 +14,10 @@ export declare class DefaultTypeScriptAngularServiceGenerator extends TypeScript
     generate(ctx: Context): Output;
     protected generateResponseModels(ctx: Context): Record<string, TypeScriptExportOutput>;
     protected getResponseModelFileContent(ctx: Context, endpoint: ApiEndpoint): AppendValueGroup<Builder>;
-    protected getEndpointStatusCodes(ctx: Context, endpoint: ApiEndpoint): Record<number, ts.Type<Builder>>;
+    protected getEndpointStatusCodes(ctx: Context, endpoint: ApiEndpoint): Record<number, {
+        parser: 'text' | 'json';
+        type: ts.Type<Builder>;
+    }>;
     protected getServiceFileContent(ctx: Context): AppendValueGroup<Builder>;
     protected getEndpointParamsType(ctx: Context, endpoint: ApiEndpoint): ts.TypeAlias<Builder>;
     protected getClass(ctx: Context): ts.Class<Builder>;
@@ -29,5 +32,6 @@ export declare class DefaultTypeScriptAngularServiceGenerator extends TypeScript
     protected getResponseModelFilePath(ctx: Context): string;
     protected hasEndpointParams(ctx: Context, endpoint: ApiEndpoint): boolean;
     protected getSchemaType(ctx: Context, schema: ApiSchema | undefined, fallback?: ts.Type<Builder>): ts.Type<Builder>;
+    private contentTypeToResponseType;
 }
 export {};

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

@@ -29,20 +29,29 @@ export type TypeScriptAngularServicesGeneratorConfig = TypeScriptGeneratorConfig
      * The default response types for status codes that are not defined in the OpenAPI specification.
      * @example
      * {
-     *   400: schemas =>
-     *     schemas.find(s => s.name === 'BadRequestResponse')
-     *       ?? throwExp('BadRequestResponse not found'),
-     *   404: 'never',
-     *   500: ts.refs.any(),
+     *   400: {
+     *     parser: 'json',
+     *     type: schemas =>
+     *       schemas.find(s => s.name === 'BadRequestResponse')
+     *         ?? throwExp('BadRequestResponse not found'),
+     *   },
+     *   404: null,
+     *   500: {
+     *     parser: 'json',
+     *     type: ts.refs.any(),
+     *   },
      * }
      * @default
      * {
-     *   401: ts.refs.never(),
-     *   403: ts.refs.never(),
-     *   500: ts.refs.never(),
+     *   401: null,
+     *   403: null,
+     *   500: null,
      * }
      */
-    defaultStatusCodeResponseTypes: Record<number, Exclude<ts.Type<TypeScriptFileBuilder>, Function> | ((schemas: readonly ApiSchema[]) => ApiSchema)>;
+    defaultStatusCodeResponseTypes: Record<number, {
+        parser: 'text' | 'json';
+        type: Exclude<ts.Type<TypeScriptFileBuilder>, Function> | ((schemas: readonly ApiSchema[]) => ApiSchema);
+    } | null>;
     /**
      * The possible status codes that any API endpoint can return.
      * This is only used when `strictResponseTypes` is set to `false`;

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

@@ -1,31 +1,38 @@
 import { ts } from '../../../ast';
 import type { TypeScriptAngularServicesGeneratorConfig } from './models';
 export declare function getReferenceFactories(options: TypeScriptAngularServicesGeneratorConfig): {
-    requestBuilder: (<TBuilder extends import("@goast/core").SourceBuilder<never>>() => ts.Reference<TBuilder, never>) & {
+    waitForResponse: (<TBuilder extends import("@goast/core").SourceBuilder<never>>(generics: [ts.Type<TBuilder>]) => ts.Reference<TBuilder, never>) & {
         refName: string;
         moduleNameOrfilePath: import("@goast/core").Nullable<string>;
+        infer: <TBuilder_1 extends import("@goast/core").SourceBuilder<never>>() => ts.Reference<TBuilder_1, never>;
     } & {
         moduleNameOrfilePath: string;
     };
-    apiConfiguration: (<TBuilder extends import("@goast/core").SourceBuilder<never>>() => ts.Reference<TBuilder, never>) & {
+    requestBuilder: (<TBuilder_2 extends import("@goast/core").SourceBuilder<never>>() => ts.Reference<TBuilder_2, never>) & {
         refName: string;
         moduleNameOrfilePath: import("@goast/core").Nullable<string>;
     } & {
         moduleNameOrfilePath: string;
     };
-    apiBaseService: (<TBuilder extends import("@goast/core").SourceBuilder<never>>() => ts.Reference<TBuilder, never>) & {
+    apiConfiguration: (<TBuilder_2 extends import("@goast/core").SourceBuilder<never>>() => ts.Reference<TBuilder_2, never>) & {
         refName: string;
         moduleNameOrfilePath: import("@goast/core").Nullable<string>;
     } & {
         moduleNameOrfilePath: string;
     };
-    httpStatusCode: (<TBuilder extends import("@goast/core").SourceBuilder<never>>() => ts.Reference<TBuilder, never>) & {
+    apiBaseService: (<TBuilder_2 extends import("@goast/core").SourceBuilder<never>>() => ts.Reference<TBuilder_2, never>) & {
         refName: string;
         moduleNameOrfilePath: import("@goast/core").Nullable<string>;
     } & {
         moduleNameOrfilePath: string;
     };
-    provide: (<TBuilder extends import("@goast/core").SourceBuilder<never>>() => ts.Reference<TBuilder, never>) & {
+    httpStatusCode: (<TBuilder_2 extends import("@goast/core").SourceBuilder<never>>() => ts.Reference<TBuilder_2, never>) & {
+        refName: string;
+        moduleNameOrfilePath: import("@goast/core").Nullable<string>;
+    } & {
+        moduleNameOrfilePath: string;
+    };
+    provide: (<TBuilder_2 extends import("@goast/core").SourceBuilder<never>>() => ts.Reference<TBuilder_2, never>) & {
         refName: string;
         moduleNameOrfilePath: import("@goast/core").Nullable<string>;
     } & {