@goast/typescript 0.2.13 → 0.2.15

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

@@ -1,14 +1,28 @@
 import { HttpErrorResponse, HttpEvent, HttpResponse } from '@angular/common/http';
-import { Observable, filter, firstValueFrom } from 'rxjs';
+import { Observable, Subscription, filter, take, map, catchError, EMPTY } from 'rxjs';
 
-export async function waitForResponse<T extends HttpResponse<any> | HttpErrorResponse>(
+export type AbortablePromise<T> = {
+  abort(): void;
+  then<TResult1 = T, TResult2 = never>(
+    onfulfilled?: ((value: T) => TResult1 | PromiseLike<TResult1>) | undefined | null,
+    onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | undefined | null,
+  ): AbortablePromise<TResult1 | TResult2>;
+  catch<TResult = never>(
+    onrejected?: ((reason: any) => TResult | PromiseLike<TResult>) | undefined | null,
+  ): AbortablePromise<T | TResult>;
+  finally(onfinally?: (() => void) | undefined | null): AbortablePromise<T>;
+};
+
+export 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) {
+): AbortablePromise<T> {
+  return firstValueFromAbortable<T>(
+    httpEvents.pipe(
+      filter((event) => event instanceof HttpResponse),
+      map((response) => response as T),
+    ),
+  ).catch((error) => {
     if (error instanceof HttpErrorResponse) {
       if (options.errorResponseTypes[error.status] === 'json' && typeof error.error === 'string') {
         return new HttpErrorResponse({
@@ -22,5 +36,45 @@ export async function waitForResponse<T extends HttpResponse<any> | HttpErrorRes
       return error as T;
     }
     throw error;
-  }
+  });
+}
+
+function firstValueFromAbortable<T>(observable: Observable<T>): AbortablePromise<T> {
+  let subscription: Subscription | undefined = undefined;
+  let _reject: ((reason?: any) => void) | undefined = undefined;
+  const abortFn = () => {
+    if (!subscription) {
+      throw new Error('Not subscribed yet.');
+    }
+    subscription.unsubscribe();
+    _reject?.(new DOMException('The request has been aborted.', 'AbortError'));
+  };
+
+  return createAbortablePromise(
+    new Promise<T>((resolve, reject) => {
+      _reject = reject;
+      subscription = observable
+        .pipe(
+          take(1),
+          catchError((e: unknown) => {
+            reject(e);
+            return EMPTY;
+          }),
+        )
+        .subscribe((x: T) => resolve(x));
+    }),
+    abortFn,
+  );
+}
+
+function createAbortablePromise<T>(promise: Promise<T>, abortFn: () => void) {
+  const thenFn = promise.then.bind(promise);
+  const catchFn = promise.catch.bind(promise);
+  const finallyFn = promise.finally?.bind(promise);
+  return Object.assign(promise, {
+    then: (...args: any[]) => createAbortablePromise(thenFn(...args), abortFn),
+    catch: (...args: any[]) => createAbortablePromise(catchFn(...args), abortFn),
+    finally: finallyFn ? (...args: any[]) => createAbortablePromise(finallyFn(...args), abortFn) : undefined,
+    abort: abortFn,
+  });
 }

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

@@ -153,7 +153,9 @@ class DefaultTypeScriptAngularServiceGenerator extends file_generator_1.TypeScri
     getClass(ctx) {
         return ast_1.ts.class(this.getServiceClassName(ctx), {
             doc: ast_1.ts.doc({ description: ctx.service.description }),
-            decorators: [ast_1.ts.decorator(ast_1.ts.refs.angular.injectable(), [ast_1.ts.toNode({ providedIn: 'root' })])],
+            decorators: [
+                ast_1.ts.decorator(ast_1.ts.refs.angular.injectable(), ctx.config.provideKind === 'root' ? [ast_1.ts.toNode({ providedIn: 'root' })] : []),
+            ],
             export: true,
             extends: ctx.refs.apiBaseService(),
             members: [
@@ -172,7 +174,7 @@ class DefaultTypeScriptAngularServiceGenerator extends file_generator_1.TypeScri
         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));
-        const returnType = ast_1.ts.refs.promise([responseModelType]);
+        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 responseType = this.contentTypeToResponseType(accept);
         return ast_1.ts.method(this.getEndpointMethodName(ctx, endpoint), {

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

@@ -10,6 +10,7 @@ function getReferenceFactories(options) {
     const utilsDirPath = (0, path_1.resolve)(options.outputDir, options.utilsDirPath);
     return {
         // angular-service.utils.ts
+        abortablePromise: ast_1.ts.reference.genericFactory('AbortablePromise', (0, path_1.join)(utilsDirPath, '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')),

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

@@ -150,7 +150,9 @@ export class DefaultTypeScriptAngularServiceGenerator extends TypeScriptFileGene
     getClass(ctx) {
         return ts.class(this.getServiceClassName(ctx), {
             doc: ts.doc({ description: ctx.service.description }),
-            decorators: [ts.decorator(ts.refs.angular.injectable(), [ts.toNode({ providedIn: 'root' })])],
+            decorators: [
+                ts.decorator(ts.refs.angular.injectable(), ctx.config.provideKind === 'root' ? [ts.toNode({ providedIn: 'root' })] : []),
+            ],
             export: true,
             extends: ctx.refs.apiBaseService(),
             members: [
@@ -169,7 +171,7 @@ export class DefaultTypeScriptAngularServiceGenerator extends TypeScriptFileGene
         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));
-        const returnType = ts.refs.promise([responseModelType]);
+        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 responseType = this.contentTypeToResponseType(accept);
         return ts.method(this.getEndpointMethodName(ctx, endpoint), {

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

@@ -7,6 +7,7 @@ export function getReferenceFactories(options) {
     const utilsDirPath = resolve(options.outputDir, options.utilsDirPath);
     return {
         // angular-service.utils.ts
+        abortablePromise: ts.reference.genericFactory('AbortablePromise', join(utilsDirPath, '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')),

package/package.json

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

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

@@ -1,6 +1,13 @@
 import { ts } from '../../../ast';
 import type { TypeScriptAngularServicesGeneratorConfig } from './models';
 export declare function getReferenceFactories(options: TypeScriptAngularServicesGeneratorConfig): {
+    abortablePromise: (<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;
+    };
     waitForResponse: (<TBuilder extends import("@goast/core").SourceBuilder<never>>(generics: [ts.Type<TBuilder>]) => ts.Reference<TBuilder, never>) & {
         refName: string;
         moduleNameOrfilePath: import("@goast/core").Nullable<string>;