@goast/typescript 0.2.6 → 0.2.7

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

@@ -0,0 +1,16 @@
+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>>,
+): Promise<T> {
+  try {
+    const response = await firstValueFrom(httpEvents.pipe(filter((event) => event instanceof HttpResponse)));
+    return response as T;
+  } catch (error) {
+    if (error instanceof HttpErrorResponse) {
+      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]) : 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_()]) }),
+                                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)]),
@@ -150,9 +154,8 @@ 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';
         return ast_1.ts.method(this.getEndpointMethodName(ctx, endpoint), {
@@ -191,16 +194,13 @@ 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};`,
+              }))`}
+            )`,
             ], '\n'),
         });
     }

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/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]) : ts.refs.angular.httpErrorResponse(),
+                        ts.objectType({
+                            members: [
+                                isSuccess ? null : ts.property('error', { type: ts.unionType([value, 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)]),
@@ -147,9 +151,8 @@ 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';
         return ts.method(this.getEndpointMethodName(ctx, endpoint), {
@@ -188,16 +191,13 @@ 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};`,
+              }))`}
+            )`,
             ], '\n'),
         });
     }

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/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.7",
   "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/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>;
     } & {