@goast/typescript 0.2.7 → 0.2.9

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

@@ -3,12 +3,22 @@ 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/generators/models/model-generator.js

@@ -64,18 +64,39 @@ class DefaultTypeScriptModelGenerator extends file_generator_1.TypeScriptFileGen
     }
     getTypeAlias(ctx, schema) {
         var _a;
-        const isDiscriminated = schema.discriminator && Object.keys(schema.discriminator.mapping).length > 0;
-        const result = ast_1.ts.typeAlias(this.getDeclarationTypeName(ctx, schema), (_a = (isDiscriminated ? this.getDiscriminatorType(ctx, schema) : this.getType(ctx, schema, { skipSchemas: true }))) !== null && _a !== void 0 ? _a : this.getAnyType(ctx), {
+        const hasDiscriminator = schema.discriminator && Object.keys(schema.discriminator.mapping).length > 0;
+        const result = ast_1.ts.typeAlias(this.getDeclarationTypeName(ctx, schema), (_a = (hasDiscriminator ? this.getDiscriminatorType(ctx, schema) : this.getType(ctx, schema, { skipSchemas: true }))) !== null && _a !== void 0 ? _a : this.getAnyType(ctx), {
             export: true,
             doc: ast_1.ts.doc({ description: schema.description }),
         });
-        if (isDiscriminated) {
+        if (hasDiscriminator) {
             const propertyValue = this.getDiscriminatorTypeName(ctx, ctx.schema);
             result.generics.push(ast_1.ts.genericParameter(this.getDiscriminatorGenericParamName(ctx, schema), {
                 constraint: propertyValue,
                 default: propertyValue,
             }));
         }
+        const inheritedSchemas = this.getInheritedSchemas(ctx, schema);
+        if (inheritedSchemas.length > 0) {
+            const fixedProperties = inheritedSchemas.reduce((p, c) => {
+                const mappingValues = Object.entries(c.discriminator.mapping)
+                    .filter(([_, value]) => value.id === schema.id)
+                    .map(([key]) => ast_1.ts.string(key));
+                if (c.discriminator.propertyName in p) {
+                    p[c.discriminator.propertyName].types.push(...mappingValues);
+                }
+                else {
+                    p[c.discriminator.propertyName] = ast_1.ts.unionType(mappingValues);
+                }
+                return p;
+            }, {});
+            result.type = ast_1.ts.intersectionType([
+                result.type,
+                ast_1.ts.objectType({
+                    members: Object.entries(fixedProperties).map(([key, value]) => ast_1.ts.property(key, { type: value, readonly: ctx.config.immutableTypes })),
+                }),
+            ]);
+        }
         return result;
     }
     getIndexer(ctx, schema) {

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

@@ -53,10 +53,10 @@ class DefaultTypeScriptAngularServiceGenerator extends file_generator_1.TypeScri
                 ...Object.entries(statusCodes).map(([key, value]) => {
                     const isSuccess = key.startsWith('2');
                     return ast_1.ts.intersectionType([
-                        isSuccess ? ast_1.ts.refs.angular.httpResponse([value]) : ast_1.ts.refs.angular.httpErrorResponse(),
+                        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, ast_1.ts.refs.null_()]) }),
+                                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' }),
                             ],
@@ -90,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
@@ -157,7 +174,7 @@ class DefaultTypeScriptAngularServiceGenerator extends file_generator_1.TypeScri
         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: [
@@ -199,7 +216,18 @@ class DefaultTypeScriptAngularServiceGenerator extends file_generator_1.TypeScri
                 responseType: ${ast_1.ts.string(responseType)},
                 accept: ${ast_1.ts.string(accept)},
                 context,`}
-              }))`}
+              })),
+              {${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/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/esm/lib/generators/models/model-generator.js

@@ -61,18 +61,39 @@ export class DefaultTypeScriptModelGenerator extends TypeScriptFileGenerator {
     }
     getTypeAlias(ctx, schema) {
         var _a;
-        const isDiscriminated = schema.discriminator && Object.keys(schema.discriminator.mapping).length > 0;
-        const result = ts.typeAlias(this.getDeclarationTypeName(ctx, schema), (_a = (isDiscriminated ? this.getDiscriminatorType(ctx, schema) : this.getType(ctx, schema, { skipSchemas: true }))) !== null && _a !== void 0 ? _a : this.getAnyType(ctx), {
+        const hasDiscriminator = schema.discriminator && Object.keys(schema.discriminator.mapping).length > 0;
+        const result = ts.typeAlias(this.getDeclarationTypeName(ctx, schema), (_a = (hasDiscriminator ? this.getDiscriminatorType(ctx, schema) : this.getType(ctx, schema, { skipSchemas: true }))) !== null && _a !== void 0 ? _a : this.getAnyType(ctx), {
             export: true,
             doc: ts.doc({ description: schema.description }),
         });
-        if (isDiscriminated) {
+        if (hasDiscriminator) {
             const propertyValue = this.getDiscriminatorTypeName(ctx, ctx.schema);
             result.generics.push(ts.genericParameter(this.getDiscriminatorGenericParamName(ctx, schema), {
                 constraint: propertyValue,
                 default: propertyValue,
             }));
         }
+        const inheritedSchemas = this.getInheritedSchemas(ctx, schema);
+        if (inheritedSchemas.length > 0) {
+            const fixedProperties = inheritedSchemas.reduce((p, c) => {
+                const mappingValues = Object.entries(c.discriminator.mapping)
+                    .filter(([_, value]) => value.id === schema.id)
+                    .map(([key]) => ts.string(key));
+                if (c.discriminator.propertyName in p) {
+                    p[c.discriminator.propertyName].types.push(...mappingValues);
+                }
+                else {
+                    p[c.discriminator.propertyName] = ts.unionType(mappingValues);
+                }
+                return p;
+            }, {});
+            result.type = ts.intersectionType([
+                result.type,
+                ts.objectType({
+                    members: Object.entries(fixedProperties).map(([key, value]) => ts.property(key, { type: value, readonly: ctx.config.immutableTypes })),
+                }),
+            ]);
+        }
         return result;
     }
     getIndexer(ctx, schema) {

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

@@ -50,10 +50,10 @@ export class DefaultTypeScriptAngularServiceGenerator extends TypeScriptFileGene
                 ...Object.entries(statusCodes).map(([key, value]) => {
                     const isSuccess = key.startsWith('2');
                     return ts.intersectionType([
-                        isSuccess ? ts.refs.angular.httpResponse([value]) : ts.refs.angular.httpErrorResponse(),
+                        isSuccess ? ts.refs.angular.httpResponse([value.type]) : ts.refs.angular.httpErrorResponse(),
                         ts.objectType({
                             members: [
-                                isSuccess ? null : ts.property('error', { type: ts.unionType([value, ts.refs.null_()]) }),
+                                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' }),
                             ],
@@ -87,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
@@ -154,7 +171,7 @@ export class DefaultTypeScriptAngularServiceGenerator extends TypeScriptFileGene
         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: [
@@ -196,7 +213,18 @@ export class DefaultTypeScriptAngularServiceGenerator extends TypeScriptFileGene
                 responseType: ${ts.string(responseType)},
                 accept: ${ts.string(accept)},
                 context,`}
-              }))`}
+              })),
+              {${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/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/package.json

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

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