@goast/typescript 0.2.14 → 0.2.16

package/README.md

@@ -1,11 +1,11 @@
-# typescript
-
-This library was generated with [Nx](https://nx.dev).
-
-## Building
-
-Run `nx build typescript` to build the library.
-
-## Running unit tests
-
-Run `nx test typescript` to execute the unit tests via [Jest](https://jestjs.io).
+# typescript
+
+This library was generated with [Nx](https://nx.dev).
+
+## Building
+
+Run `nx build typescript` to build the library.
+
+## Running unit tests
+
+Run `nx test typescript` to execute the unit tests via [Jest](https://jestjs.io).

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/assets/client/angular/request-builder.ts

@@ -1,372 +1,372 @@
-import { HttpRequest, HttpParameterCodec, HttpParams, HttpHeaders, HttpContext } from '@angular/common/http';
-
-/**
- * Custom parameter codec to correctly handle the plus sign in parameter
- * values. See https://github.com/angular/angular/issues/18261
- */
-class ParameterCodec implements HttpParameterCodec {
-  encodeKey(key: string): string {
-    return encodeURIComponent(key);
-  }
-
-  encodeValue(value: string): string {
-    return encodeURIComponent(value);
-  }
-
-  decodeKey(key: string): string {
-    return decodeURIComponent(key);
-  }
-
-  decodeValue(value: string): string {
-    return decodeURIComponent(value);
-  }
-}
-const ParameterCodecInstance = new ParameterCodec();
-
-/**
- * Defines the options for appending a parameter
- */
-interface ParameterOptions {
-  style?: string;
-  explode?: boolean;
-}
-
-/**
- * Base class for a parameter
- */
-abstract class Parameter {
-  constructor(
-    public name: string,
-    public value: any,
-    public options: ParameterOptions,
-    defaultStyle: string,
-    defaultExplode: boolean,
-  ) {
-    this.options = options || {};
-    if (this.options.style === null || this.options.style === undefined) {
-      this.options.style = defaultStyle;
-    }
-    if (this.options.explode === null || this.options.explode === undefined) {
-      this.options.explode = defaultExplode;
-    }
-  }
-
-  serializeValue(value: any, separator = ','): string {
-    if (value === null || value === undefined) {
-      return '';
-    } else if (value instanceof Array) {
-      return value
-        .map((v) => this.serializeValue(v).split(separator).join(encodeURIComponent(separator)))
-        .join(separator);
-    } else if (typeof value === 'object') {
-      const array: string[] = [];
-      for (const key of Object.keys(value)) {
-        let propVal = value[key];
-        if (propVal !== null && propVal !== undefined) {
-          propVal = this.serializeValue(propVal).split(separator).join(encodeURIComponent(separator));
-          if (this.options.explode) {
-            array.push(`${key}=${propVal}`);
-          } else {
-            array.push(key);
-            array.push(propVal);
-          }
-        }
-      }
-      return array.join(separator);
-    } else {
-      return String(value);
-    }
-  }
-}
-
-/**
- * A parameter in the operation path
- */
-class PathParameter extends Parameter {
-  constructor(name: string, value: any, options: ParameterOptions) {
-    super(name, value, options, 'simple', false);
-  }
-
-  append(path: string): string {
-    let value = this.value;
-    if (value === null || value === undefined) {
-      value = '';
-    }
-    let prefix = this.options.style === 'label' ? '.' : '';
-    const separator = this.options.explode ? (prefix === '' ? ',' : prefix) : ',';
-    let alreadySerialized = false;
-    if (this.options.style === 'matrix') {
-      // The parameter name is just used as prefix, except in some cases...
-      prefix = `;${this.name}=`;
-      if (this.options.explode && typeof value === 'object') {
-        prefix = ';';
-        if (value instanceof Array) {
-          // For arrays we have to repeat the name for each element
-          value = value.map((v) => `${this.name}=${this.serializeValue(v, ';')}`);
-          value = value.join(';');
-          alreadySerialized = true;
-        } else {
-          // For objects we have to put each the key / value pairs
-          value = this.serializeValue(value, ';');
-          alreadySerialized = true;
-        }
-      }
-    }
-    value = prefix + (alreadySerialized ? value : this.serializeValue(value, separator));
-    // Replace both the plain variable and the corresponding variant taking in the prefix and explode into account
-    path = path.replace(`{${this.name}}`, value);
-    path = path.replace(`{${prefix}${this.name}${this.options.explode ? '*' : ''}}`, value);
-    return path;
-  }
-
-  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-  // @ts-ignore
-  serializeValue(value: any, separator = ','): string {
-    let result = typeof value === 'string' ? encodeURIComponent(value) : super.serializeValue(value, separator);
-    result = result.replace(/%3D/g, '=');
-    result = result.replace(/%3B/g, ';');
-    result = result.replace(/%2C/g, ',');
-    return result;
-  }
-}
-
-/**
- * A parameter in the query
- */
-class QueryParameter extends Parameter {
-  constructor(name: string, value: any, options: ParameterOptions) {
-    super(name, value, options, 'form', true);
-  }
-
-  append(params: HttpParams): HttpParams {
-    if (this.value instanceof Array) {
-      // Array serialization
-      if (this.options.explode) {
-        for (const v of this.value) {
-          params = params.append(this.name, this.serializeValue(v));
-        }
-      } else {
-        const separator =
-          this.options.style === 'spaceDelimited' ? ' ' : this.options.style === 'pipeDelimited' ? '|' : ',';
-        return params.append(this.name, this.serializeValue(this.value, separator));
-      }
-    } else if (this.value !== null && typeof this.value === 'object') {
-      // Object serialization
-      if (this.options.style === 'deepObject') {
-        // Append a parameter for each key, in the form `name[key]`
-        for (const key of Object.keys(this.value)) {
-          const propVal = this.value[key];
-          if (propVal !== null && propVal !== undefined) {
-            params = params.append(`${this.name}[${key}]`, this.serializeValue(propVal));
-          }
-        }
-      } else if (this.options.explode) {
-        // Append a parameter for each key without using the parameter name
-        for (const key of Object.keys(this.value)) {
-          const propVal = this.value[key];
-          if (propVal !== null && propVal !== undefined) {
-            params = params.append(key, this.serializeValue(propVal));
-          }
-        }
-      } else {
-        // Append a single parameter whose values are a comma-separated list of key,value,key,value...
-        const array: any[] = [];
-        for (const key of Object.keys(this.value)) {
-          const propVal = this.value[key];
-          if (propVal !== null && propVal !== undefined) {
-            array.push(key);
-            array.push(propVal);
-          }
-        }
-        params = params.append(this.name, this.serializeValue(array));
-      }
-    } else if (this.value !== null && this.value !== undefined) {
-      // Plain value
-      params = params.append(this.name, this.serializeValue(this.value));
-    }
-    return params;
-  }
-}
-
-/**
- * A parameter in the HTTP request header
- */
-class HeaderParameter extends Parameter {
-  constructor(name: string, value: any, options: ParameterOptions) {
-    super(name, value, options, 'simple', false);
-  }
-
-  append(headers: HttpHeaders): HttpHeaders {
-    if (this.value !== null && this.value !== undefined) {
-      if (this.value instanceof Array) {
-        for (const v of this.value) {
-          headers = headers.append(this.name, this.serializeValue(v));
-        }
-      } else {
-        headers = headers.append(this.name, this.serializeValue(this.value));
-      }
-    }
-    return headers;
-  }
-}
-
-/**
- * Helper to build http requests from parameters
- */
-export class RequestBuilder {
-  private _path = new Map<string, PathParameter>();
-  private _query = new Map<string, QueryParameter>();
-  private _header = new Map<string, HeaderParameter>();
-  _bodyContent: any | null;
-  _bodyContentType?: string;
-
-  constructor(
-    public rootUrl: string,
-    public operationPath: string,
-    public method: string,
-  ) {}
-
-  /**
-   * Sets a path parameter
-   */
-  path(name: string, value: any, options?: ParameterOptions): void {
-    this._path.set(name, new PathParameter(name, value, options || {}));
-  }
-
-  /**
-   * Sets a query parameter
-   */
-  query(name: string, value: any, options?: ParameterOptions): void {
-    this._query.set(name, new QueryParameter(name, value, options || {}));
-  }
-
-  /**
-   * Sets a header parameter
-   */
-  header(name: string, value: any, options?: ParameterOptions): void {
-    this._header.set(name, new HeaderParameter(name, value, options || {}));
-  }
-
-  /**
-   * Sets the body content, along with the content type
-   */
-  body(value: any, contentType = 'application/json'): void {
-    if (value instanceof Blob) {
-      this._bodyContentType = value.type;
-    } else {
-      this._bodyContentType = contentType;
-    }
-    if (this._bodyContentType === 'application/x-www-form-urlencoded' && value !== null && typeof value === 'object') {
-      // Handle URL-encoded data
-      const pairs: Array<[string, string]> = [];
-      for (const key of Object.keys(value)) {
-        let val = value[key];
-        if (!(val instanceof Array)) {
-          val = [val];
-        }
-        for (const v of val) {
-          const formValue = this.formDataValue(v);
-          if (formValue !== null) {
-            pairs.push([key, formValue]);
-          }
-        }
-      }
-      this._bodyContent = pairs.map((p) => `${encodeURIComponent(p[0])}=${encodeURIComponent(p[1])}`).join('&');
-    } else if (this._bodyContentType === 'multipart/form-data') {
-      // Handle multipart form data
-      const formData = new FormData();
-      if (value !== null && value !== undefined) {
-        for (const key of Object.keys(value)) {
-          const val = value[key];
-          if (val instanceof Array) {
-            for (const v of val) {
-              const toAppend = this.formDataValue(v);
-              if (toAppend !== null) {
-                formData.append(key, toAppend);
-              }
-            }
-          } else {
-            const toAppend = this.formDataValue(val);
-            if (toAppend !== null) {
-              formData.set(key, toAppend);
-            }
-          }
-        }
-      }
-      this._bodyContent = formData;
-    } else {
-      // The body is the plain content
-      this._bodyContent = value;
-    }
-  }
-
-  private formDataValue(value: any): any {
-    if (value === null || value === undefined) {
-      return null;
-    }
-    if (value instanceof Blob) {
-      return value;
-    }
-    if (typeof value === 'object') {
-      return JSON.stringify(value);
-    }
-    return String(value);
-  }
-
-  /**
-   * Builds the request with the current set parameters
-   */
-  build<T = any>(options?: {
-    /** Which content types to accept */
-    accept?: string;
-
-    /** The expected response type */
-    responseType?: 'json' | 'text' | 'blob' | 'arraybuffer';
-
-    /** Whether to report progress on uploads / downloads */
-    reportProgress?: boolean;
-
-    /** Allow passing HttpContext for HttpClient */
-    context?: HttpContext;
-  }): HttpRequest<T> {
-    options = options || {};
-
-    // Path parameters
-    let path = this.operationPath;
-    for (const pathParam of this._path.values()) {
-      path = pathParam.append(path);
-    }
-    const url = this.rootUrl + path;
-
-    // Query parameters
-    let httpParams = new HttpParams({
-      encoder: ParameterCodecInstance,
-    });
-    for (const queryParam of this._query.values()) {
-      httpParams = queryParam.append(httpParams);
-    }
-
-    // Header parameters
-    let httpHeaders = new HttpHeaders();
-    if (options.accept) {
-      httpHeaders = httpHeaders.append('Accept', options.accept);
-    }
-    for (const headerParam of this._header.values()) {
-      httpHeaders = headerParam.append(httpHeaders);
-    }
-
-    // Request content headers
-    if (this._bodyContentType && !(this._bodyContent instanceof FormData)) {
-      httpHeaders = httpHeaders.set('Content-Type', this._bodyContentType);
-    }
-
-    // Perform the request
-    return new HttpRequest<T>(this.method.toUpperCase(), url, this._bodyContent, {
-      params: httpParams,
-      headers: httpHeaders,
-      responseType: options.responseType,
-      reportProgress: options.reportProgress,
-      context: options.context,
-    });
-  }
-}
+import { HttpRequest, HttpParameterCodec, HttpParams, HttpHeaders, HttpContext } from '@angular/common/http';
+
+/**
+ * Custom parameter codec to correctly handle the plus sign in parameter
+ * values. See https://github.com/angular/angular/issues/18261
+ */
+class ParameterCodec implements HttpParameterCodec {
+  encodeKey(key: string): string {
+    return encodeURIComponent(key);
+  }
+
+  encodeValue(value: string): string {
+    return encodeURIComponent(value);
+  }
+
+  decodeKey(key: string): string {
+    return decodeURIComponent(key);
+  }
+
+  decodeValue(value: string): string {
+    return decodeURIComponent(value);
+  }
+}
+const ParameterCodecInstance = new ParameterCodec();
+
+/**
+ * Defines the options for appending a parameter
+ */
+interface ParameterOptions {
+  style?: string;
+  explode?: boolean;
+}
+
+/**
+ * Base class for a parameter
+ */
+abstract class Parameter {
+  constructor(
+    public name: string,
+    public value: any,
+    public options: ParameterOptions,
+    defaultStyle: string,
+    defaultExplode: boolean,
+  ) {
+    this.options = options || {};
+    if (this.options.style === null || this.options.style === undefined) {
+      this.options.style = defaultStyle;
+    }
+    if (this.options.explode === null || this.options.explode === undefined) {
+      this.options.explode = defaultExplode;
+    }
+  }
+
+  serializeValue(value: any, separator = ','): string {
+    if (value === null || value === undefined) {
+      return '';
+    } else if (value instanceof Array) {
+      return value
+        .map((v) => this.serializeValue(v).split(separator).join(encodeURIComponent(separator)))
+        .join(separator);
+    } else if (typeof value === 'object') {
+      const array: string[] = [];
+      for (const key of Object.keys(value)) {
+        let propVal = value[key];
+        if (propVal !== null && propVal !== undefined) {
+          propVal = this.serializeValue(propVal).split(separator).join(encodeURIComponent(separator));
+          if (this.options.explode) {
+            array.push(`${key}=${propVal}`);
+          } else {
+            array.push(key);
+            array.push(propVal);
+          }
+        }
+      }
+      return array.join(separator);
+    } else {
+      return String(value);
+    }
+  }
+}
+
+/**
+ * A parameter in the operation path
+ */
+class PathParameter extends Parameter {
+  constructor(name: string, value: any, options: ParameterOptions) {
+    super(name, value, options, 'simple', false);
+  }
+
+  append(path: string): string {
+    let value = this.value;
+    if (value === null || value === undefined) {
+      value = '';
+    }
+    let prefix = this.options.style === 'label' ? '.' : '';
+    const separator = this.options.explode ? (prefix === '' ? ',' : prefix) : ',';
+    let alreadySerialized = false;
+    if (this.options.style === 'matrix') {
+      // The parameter name is just used as prefix, except in some cases...
+      prefix = `;${this.name}=`;
+      if (this.options.explode && typeof value === 'object') {
+        prefix = ';';
+        if (value instanceof Array) {
+          // For arrays we have to repeat the name for each element
+          value = value.map((v) => `${this.name}=${this.serializeValue(v, ';')}`);
+          value = value.join(';');
+          alreadySerialized = true;
+        } else {
+          // For objects we have to put each the key / value pairs
+          value = this.serializeValue(value, ';');
+          alreadySerialized = true;
+        }
+      }
+    }
+    value = prefix + (alreadySerialized ? value : this.serializeValue(value, separator));
+    // Replace both the plain variable and the corresponding variant taking in the prefix and explode into account
+    path = path.replace(`{${this.name}}`, value);
+    path = path.replace(`{${prefix}${this.name}${this.options.explode ? '*' : ''}}`, value);
+    return path;
+  }
+
+  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+  // @ts-ignore
+  serializeValue(value: any, separator = ','): string {
+    let result = typeof value === 'string' ? encodeURIComponent(value) : super.serializeValue(value, separator);
+    result = result.replace(/%3D/g, '=');
+    result = result.replace(/%3B/g, ';');
+    result = result.replace(/%2C/g, ',');
+    return result;
+  }
+}
+
+/**
+ * A parameter in the query
+ */
+class QueryParameter extends Parameter {
+  constructor(name: string, value: any, options: ParameterOptions) {
+    super(name, value, options, 'form', true);
+  }
+
+  append(params: HttpParams): HttpParams {
+    if (this.value instanceof Array) {
+      // Array serialization
+      if (this.options.explode) {
+        for (const v of this.value) {
+          params = params.append(this.name, this.serializeValue(v));
+        }
+      } else {
+        const separator =
+          this.options.style === 'spaceDelimited' ? ' ' : this.options.style === 'pipeDelimited' ? '|' : ',';
+        return params.append(this.name, this.serializeValue(this.value, separator));
+      }
+    } else if (this.value !== null && typeof this.value === 'object') {
+      // Object serialization
+      if (this.options.style === 'deepObject') {
+        // Append a parameter for each key, in the form `name[key]`
+        for (const key of Object.keys(this.value)) {
+          const propVal = this.value[key];
+          if (propVal !== null && propVal !== undefined) {
+            params = params.append(`${this.name}[${key}]`, this.serializeValue(propVal));
+          }
+        }
+      } else if (this.options.explode) {
+        // Append a parameter for each key without using the parameter name
+        for (const key of Object.keys(this.value)) {
+          const propVal = this.value[key];
+          if (propVal !== null && propVal !== undefined) {
+            params = params.append(key, this.serializeValue(propVal));
+          }
+        }
+      } else {
+        // Append a single parameter whose values are a comma-separated list of key,value,key,value...
+        const array: any[] = [];
+        for (const key of Object.keys(this.value)) {
+          const propVal = this.value[key];
+          if (propVal !== null && propVal !== undefined) {
+            array.push(key);
+            array.push(propVal);
+          }
+        }
+        params = params.append(this.name, this.serializeValue(array));
+      }
+    } else if (this.value !== null && this.value !== undefined) {
+      // Plain value
+      params = params.append(this.name, this.serializeValue(this.value));
+    }
+    return params;
+  }
+}
+
+/**
+ * A parameter in the HTTP request header
+ */
+class HeaderParameter extends Parameter {
+  constructor(name: string, value: any, options: ParameterOptions) {
+    super(name, value, options, 'simple', false);
+  }
+
+  append(headers: HttpHeaders): HttpHeaders {
+    if (this.value !== null && this.value !== undefined) {
+      if (this.value instanceof Array) {
+        for (const v of this.value) {
+          headers = headers.append(this.name, this.serializeValue(v));
+        }
+      } else {
+        headers = headers.append(this.name, this.serializeValue(this.value));
+      }
+    }
+    return headers;
+  }
+}
+
+/**
+ * Helper to build http requests from parameters
+ */
+export class RequestBuilder {
+  private _path = new Map<string, PathParameter>();
+  private _query = new Map<string, QueryParameter>();
+  private _header = new Map<string, HeaderParameter>();
+  _bodyContent: any | null;
+  _bodyContentType?: string;
+
+  constructor(
+    public rootUrl: string,
+    public operationPath: string,
+    public method: string,
+  ) {}
+
+  /**
+   * Sets a path parameter
+   */
+  path(name: string, value: any, options?: ParameterOptions): void {
+    this._path.set(name, new PathParameter(name, value, options || {}));
+  }
+
+  /**
+   * Sets a query parameter
+   */
+  query(name: string, value: any, options?: ParameterOptions): void {
+    this._query.set(name, new QueryParameter(name, value, options || {}));
+  }
+
+  /**
+   * Sets a header parameter
+   */
+  header(name: string, value: any, options?: ParameterOptions): void {
+    this._header.set(name, new HeaderParameter(name, value, options || {}));
+  }
+
+  /**
+   * Sets the body content, along with the content type
+   */
+  body(value: any, contentType = 'application/json'): void {
+    if (value instanceof Blob) {
+      this._bodyContentType = value.type;
+    } else {
+      this._bodyContentType = contentType;
+    }
+    if (this._bodyContentType === 'application/x-www-form-urlencoded' && value !== null && typeof value === 'object') {
+      // Handle URL-encoded data
+      const pairs: Array<[string, string]> = [];
+      for (const key of Object.keys(value)) {
+        let val = value[key];
+        if (!(val instanceof Array)) {
+          val = [val];
+        }
+        for (const v of val) {
+          const formValue = this.formDataValue(v);
+          if (formValue !== null) {
+            pairs.push([key, formValue]);
+          }
+        }
+      }
+      this._bodyContent = pairs.map((p) => `${encodeURIComponent(p[0])}=${encodeURIComponent(p[1])}`).join('&');
+    } else if (this._bodyContentType === 'multipart/form-data') {
+      // Handle multipart form data
+      const formData = new FormData();
+      if (value !== null && value !== undefined) {
+        for (const key of Object.keys(value)) {
+          const val = value[key];
+          if (val instanceof Array) {
+            for (const v of val) {
+              const toAppend = this.formDataValue(v);
+              if (toAppend !== null) {
+                formData.append(key, toAppend);
+              }
+            }
+          } else {
+            const toAppend = this.formDataValue(val);
+            if (toAppend !== null) {
+              formData.set(key, toAppend);
+            }
+          }
+        }
+      }
+      this._bodyContent = formData;
+    } else {
+      // The body is the plain content
+      this._bodyContent = value;
+    }
+  }
+
+  private formDataValue(value: any): any {
+    if (value === null || value === undefined) {
+      return null;
+    }
+    if (value instanceof Blob) {
+      return value;
+    }
+    if (typeof value === 'object') {
+      return JSON.stringify(value);
+    }
+    return String(value);
+  }
+
+  /**
+   * Builds the request with the current set parameters
+   */
+  build<T = any>(options?: {
+    /** Which content types to accept */
+    accept?: string;
+
+    /** The expected response type */
+    responseType?: 'json' | 'text' | 'blob' | 'arraybuffer';
+
+    /** Whether to report progress on uploads / downloads */
+    reportProgress?: boolean;
+
+    /** Allow passing HttpContext for HttpClient */
+    context?: HttpContext;
+  }): HttpRequest<T> {
+    options = options || {};
+
+    // Path parameters
+    let path = this.operationPath;
+    for (const pathParam of this._path.values()) {
+      path = pathParam.append(path);
+    }
+    const url = this.rootUrl + path;
+
+    // Query parameters
+    let httpParams = new HttpParams({
+      encoder: ParameterCodecInstance,
+    });
+    for (const queryParam of this._query.values()) {
+      httpParams = queryParam.append(httpParams);
+    }
+
+    // Header parameters
+    let httpHeaders = new HttpHeaders();
+    if (options.accept) {
+      httpHeaders = httpHeaders.append('Accept', options.accept);
+    }
+    for (const headerParam of this._header.values()) {
+      httpHeaders = headerParam.append(httpHeaders);
+    }
+
+    // Request content headers
+    if (this._bodyContentType && !(this._bodyContent instanceof FormData)) {
+      httpHeaders = httpHeaders.set('Content-Type', this._bodyContentType);
+    }
+
+    // Perform the request
+    return new HttpRequest<T>(this.method.toUpperCase(), url, this._bodyContent, {
+      params: httpParams,
+      headers: httpHeaders,
+      responseType: options.responseType,
+      reportProgress: options.reportProgress,
+      context: options.context,
+    });
+  }
+}

package/cjs/lib/ast/nodes/type-alias.js

@@ -16,6 +16,8 @@ class TsTypeAlias extends node_1.TsNode {
         this.export = (_d = options.export) !== null && _d !== void 0 ? _d : false;
     }
     onWrite(builder) {
+        if (this.doc)
+            (0, write_ts_nodes_1.writeTsNode)(builder, this.doc);
         if (this.export)
             builder.append('export ');
         builder.append('type ');

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

@@ -51,6 +51,10 @@ class DefaultTypeScriptModelGenerator extends file_generator_1.TypeScriptFileGen
     getEnum(ctx) {
         var _a, _b;
         return ast_1.ts.enum(this.getDeclarationTypeName(ctx, ctx.schema), {
+            doc: ast_1.ts.doc({
+                description: ctx.schema.description,
+                tags: [ctx.schema.deprecated ? ast_1.ts.docTag('deprecated') : null],
+            }),
             export: true,
             members: ((_b = (_a = ctx.schema.enum) === null || _a === void 0 ? void 0 : _a.map((x) => String(x))) !== null && _b !== void 0 ? _b : []).map((x) => ast_1.ts.enumValue((0, core_1.toCasing)(x, ctx.config.enumValueNameCasing), { value: ast_1.ts.string(x) })),
         });
@@ -58,7 +62,10 @@ class DefaultTypeScriptModelGenerator extends file_generator_1.TypeScriptFileGen
     getInterface(ctx, schema) {
         return ast_1.ts.interface(this.getDeclarationTypeName(ctx, ctx.schema), {
             export: true,
-            doc: ast_1.ts.doc({ description: schema.description }),
+            doc: ast_1.ts.doc({
+                description: schema.description,
+                tags: [ctx.schema.deprecated ? ast_1.ts.docTag('deprecated') : null],
+            }),
             members: [...this.getProperties(ctx, schema), this.getIndexer(ctx, schema)],
         });
     }
@@ -67,7 +74,10 @@ class DefaultTypeScriptModelGenerator extends file_generator_1.TypeScriptFileGen
         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 }),
+            doc: ast_1.ts.doc({
+                description: schema.description,
+                tags: [ctx.schema.deprecated ? ast_1.ts.docTag('deprecated') : null],
+            }),
         });
         if (hasDiscriminator) {
             const propertyValue = this.getDiscriminatorTypeName(ctx, ctx.schema);
@@ -108,7 +118,10 @@ class DefaultTypeScriptModelGenerator extends file_generator_1.TypeScriptFileGen
     getProperties(ctx, schema) {
         return Array.from(schema.properties.values()).map((property) => {
             return ast_1.ts.property(property.name, {
-                doc: ast_1.ts.doc({ description: property.schema.description }),
+                doc: ast_1.ts.doc({
+                    description: property.schema.description,
+                    tags: [property.schema.deprecated ? ast_1.ts.docTag('deprecated') : null],
+                }),
                 readonly: ctx.config.immutableTypes,
                 optional: !schema.required.has(property.name),
                 type: ast_1.ts.unionType([this.getType(ctx, property.schema), property.schema.nullable ? 'null' : null]),

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

@@ -78,6 +78,10 @@ class DefaultTypeScriptAngularServiceGenerator extends file_generator_1.TypeScri
             ]),
             ast_1.ts.objectType({ members: [ast_1.ts.property('status', { type: 'TStatus' })] }),
         ]), {
+            doc: ast_1.ts.doc({
+                description: `Response model for operation ${this.getEndpointMethodName(ctx, endpoint)}`,
+                tags: [endpoint.deprecated ? ast_1.ts.docTag('deprecated') : null],
+            }),
             export: true,
             generics: [
                 ast_1.ts.genericParameter('TStatus', {
@@ -132,7 +136,10 @@ class DefaultTypeScriptAngularServiceGenerator extends file_generator_1.TypeScri
         for (const parameter of endpoint.parameters) {
             const schema = parameter.schema;
             type.members.push(ast_1.ts.property((0, core_1.toCasing)(parameter.name, ctx.config.propertyNameCasing), {
-                doc: ast_1.ts.doc({ description: parameter.description }),
+                doc: ast_1.ts.doc({
+                    description: parameter.description,
+                    tags: [parameter.deprecated ? ast_1.ts.docTag('deprecated') : null],
+                }),
                 type: schema ? (b) => b.appendModelUsage(ctx.input.models[schema.id]) : this.getAnyType(ctx),
                 optional: !parameter.required,
             }));
@@ -152,7 +159,14 @@ 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 }),
+            doc: ast_1.ts.doc({
+                description: ctx.service.description,
+                tags: [
+                    ctx.service.endpoints.length === 0 || ctx.service.endpoints.some((x) => !x.deprecated)
+                        ? null
+                        : ast_1.ts.docTag('deprecated'),
+                ],
+            }),
             decorators: [
                 ast_1.ts.decorator(ast_1.ts.refs.angular.injectable(), ctx.config.provideKind === 'root' ? [ast_1.ts.toNode({ providedIn: 'root' })] : []),
             ],
@@ -174,7 +188,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), {
@@ -188,6 +202,10 @@ class DefaultTypeScriptAngularServiceGenerator extends file_generator_1.TypeScri
                     : null,
                 ast_1.ts.parameter('context', { optional: true, type: ast_1.ts.refs.angular.httpContext() }),
             ],
+            doc: ast_1.ts.doc({
+                description: endpoint.description,
+                tags: [endpoint.deprecated ? ast_1.ts.docTag('deprecated') : null],
+            }),
             returnType,
             body: (0, core_1.appendValueGroup)([
                 (0, core_1.builderTemplate) `const rb = new ${ctx.refs.requestBuilder()}(this.rootUrl, ${this.getServiceClassName(ctx)}.${this.getEndpointPathPropertyName(ctx, endpoint)}, '${endpoint.method}');`,

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/cjs/lib/generators/services/fetch-clients/fetch-client-generator.js

@@ -39,7 +39,14 @@ class DefaultTypeScriptFetchClientGenerator extends file_generator_1.TypeScriptF
     }
     getInterface(ctx) {
         return ast_1.ts.interface(this.getInterfaceName(ctx), {
-            doc: ast_1.ts.doc({ description: ctx.service.description }),
+            doc: ast_1.ts.doc({
+                description: ctx.service.description,
+                tags: [
+                    ctx.service.endpoints.length === 0 || ctx.service.endpoints.some((x) => !x.deprecated)
+                        ? null
+                        : ast_1.ts.docTag('deprecated'),
+                ],
+            }),
             export: true,
             members: ctx.service.endpoints.map((endpoint) => this.getInterfaceEndpointMethod(ctx, endpoint)),
         });
@@ -50,13 +57,14 @@ class DefaultTypeScriptFetchClientGenerator extends file_generator_1.TypeScriptF
         const bodySchema = (_b = (_a = endpoint.requestBody) === null || _a === void 0 ? void 0 : _a.content[0]) === null || _b === void 0 ? void 0 : _b.schema;
         const responseSchema = this.getResponseSchema(ctx, endpoint);
         return ast_1.ts.method((0, core_1.toCasing)(endpoint.name, ctx.config.methodCasing), {
-            doc: ast_1.ts.doc({ description: endpoint.description }),
+            doc: ast_1.ts.doc({ description: endpoint.description, tags: [endpoint.deprecated ? ast_1.ts.docTag('deprecated') : null] }),
             parameters: [
                 params.length > 0
                     ? ast_1.ts.parameter('params', {
                         description: 'Parameters for the endpoint.',
                         type: ast_1.ts.objectType({
                             members: params.map((x) => ast_1.ts.property((0, core_1.toCasing)(x.name, ctx.config.propertyNameCasing), {
+                                doc: ast_1.ts.doc({ tags: [x.deprecated ? ast_1.ts.docTag('deprecated') : null] }),
                                 type: this.getSchemaType(ctx, x.schema),
                                 optional: !x.required,
                             })),
@@ -92,7 +100,14 @@ class DefaultTypeScriptFetchClientGenerator extends file_generator_1.TypeScriptF
     }
     getClass(ctx) {
         return ast_1.ts.class(this.getClassName(ctx), {
-            doc: ast_1.ts.doc({ description: ctx.service.description }),
+            doc: ast_1.ts.doc({
+                description: ctx.service.description,
+                tags: [
+                    ctx.service.endpoints.length === 0 || ctx.service.endpoints.some((x) => !x.deprecated)
+                        ? null
+                        : ast_1.ts.docTag('deprecated'),
+                ],
+            }),
             export: true,
             implements: this.shouldGenerateInterface(ctx)
                 ? [ast_1.ts.reference(this.getInterfaceName(ctx), this.getInterfaceFilePath(ctx))]

package/esm/lib/ast/nodes/type-alias.js

@@ -13,6 +13,8 @@ export class TsTypeAlias extends TsNode {
         this.export = (_d = options.export) !== null && _d !== void 0 ? _d : false;
     }
     onWrite(builder) {
+        if (this.doc)
+            writeTsNode(builder, this.doc);
         if (this.export)
             builder.append('export ');
         builder.append('type ');

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

@@ -48,6 +48,10 @@ export class DefaultTypeScriptModelGenerator extends TypeScriptFileGenerator {
     getEnum(ctx) {
         var _a, _b;
         return ts.enum(this.getDeclarationTypeName(ctx, ctx.schema), {
+            doc: ts.doc({
+                description: ctx.schema.description,
+                tags: [ctx.schema.deprecated ? ts.docTag('deprecated') : null],
+            }),
             export: true,
             members: ((_b = (_a = ctx.schema.enum) === null || _a === void 0 ? void 0 : _a.map((x) => String(x))) !== null && _b !== void 0 ? _b : []).map((x) => ts.enumValue(toCasing(x, ctx.config.enumValueNameCasing), { value: ts.string(x) })),
         });
@@ -55,7 +59,10 @@ export class DefaultTypeScriptModelGenerator extends TypeScriptFileGenerator {
     getInterface(ctx, schema) {
         return ts.interface(this.getDeclarationTypeName(ctx, ctx.schema), {
             export: true,
-            doc: ts.doc({ description: schema.description }),
+            doc: ts.doc({
+                description: schema.description,
+                tags: [ctx.schema.deprecated ? ts.docTag('deprecated') : null],
+            }),
             members: [...this.getProperties(ctx, schema), this.getIndexer(ctx, schema)],
         });
     }
@@ -64,7 +71,10 @@ export class DefaultTypeScriptModelGenerator extends TypeScriptFileGenerator {
         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 }),
+            doc: ts.doc({
+                description: schema.description,
+                tags: [ctx.schema.deprecated ? ts.docTag('deprecated') : null],
+            }),
         });
         if (hasDiscriminator) {
             const propertyValue = this.getDiscriminatorTypeName(ctx, ctx.schema);
@@ -105,7 +115,10 @@ export class DefaultTypeScriptModelGenerator extends TypeScriptFileGenerator {
     getProperties(ctx, schema) {
         return Array.from(schema.properties.values()).map((property) => {
             return ts.property(property.name, {
-                doc: ts.doc({ description: property.schema.description }),
+                doc: ts.doc({
+                    description: property.schema.description,
+                    tags: [property.schema.deprecated ? ts.docTag('deprecated') : null],
+                }),
                 readonly: ctx.config.immutableTypes,
                 optional: !schema.required.has(property.name),
                 type: ts.unionType([this.getType(ctx, property.schema), property.schema.nullable ? 'null' : null]),

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

@@ -75,6 +75,10 @@ export class DefaultTypeScriptAngularServiceGenerator extends TypeScriptFileGene
             ]),
             ts.objectType({ members: [ts.property('status', { type: 'TStatus' })] }),
         ]), {
+            doc: ts.doc({
+                description: `Response model for operation ${this.getEndpointMethodName(ctx, endpoint)}`,
+                tags: [endpoint.deprecated ? ts.docTag('deprecated') : null],
+            }),
             export: true,
             generics: [
                 ts.genericParameter('TStatus', {
@@ -129,7 +133,10 @@ export class DefaultTypeScriptAngularServiceGenerator extends TypeScriptFileGene
         for (const parameter of endpoint.parameters) {
             const schema = parameter.schema;
             type.members.push(ts.property(toCasing(parameter.name, ctx.config.propertyNameCasing), {
-                doc: ts.doc({ description: parameter.description }),
+                doc: ts.doc({
+                    description: parameter.description,
+                    tags: [parameter.deprecated ? ts.docTag('deprecated') : null],
+                }),
                 type: schema ? (b) => b.appendModelUsage(ctx.input.models[schema.id]) : this.getAnyType(ctx),
                 optional: !parameter.required,
             }));
@@ -149,7 +156,14 @@ export class DefaultTypeScriptAngularServiceGenerator extends TypeScriptFileGene
     }
     getClass(ctx) {
         return ts.class(this.getServiceClassName(ctx), {
-            doc: ts.doc({ description: ctx.service.description }),
+            doc: ts.doc({
+                description: ctx.service.description,
+                tags: [
+                    ctx.service.endpoints.length === 0 || ctx.service.endpoints.some((x) => !x.deprecated)
+                        ? null
+                        : ts.docTag('deprecated'),
+                ],
+            }),
             decorators: [
                 ts.decorator(ts.refs.angular.injectable(), ctx.config.provideKind === 'root' ? [ts.toNode({ providedIn: 'root' })] : []),
             ],
@@ -171,7 +185,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), {
@@ -185,6 +199,10 @@ export class DefaultTypeScriptAngularServiceGenerator extends TypeScriptFileGene
                     : null,
                 ts.parameter('context', { optional: true, type: ts.refs.angular.httpContext() }),
             ],
+            doc: ts.doc({
+                description: endpoint.description,
+                tags: [endpoint.deprecated ? ts.docTag('deprecated') : null],
+            }),
             returnType,
             body: appendValueGroup([
                 s `const rb = new ${ctx.refs.requestBuilder()}(this.rootUrl, ${this.getServiceClassName(ctx)}.${this.getEndpointPathPropertyName(ctx, endpoint)}, '${endpoint.method}');`,

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/esm/lib/generators/services/fetch-clients/fetch-client-generator.js

@@ -36,7 +36,14 @@ export class DefaultTypeScriptFetchClientGenerator extends TypeScriptFileGenerat
     }
     getInterface(ctx) {
         return ts.interface(this.getInterfaceName(ctx), {
-            doc: ts.doc({ description: ctx.service.description }),
+            doc: ts.doc({
+                description: ctx.service.description,
+                tags: [
+                    ctx.service.endpoints.length === 0 || ctx.service.endpoints.some((x) => !x.deprecated)
+                        ? null
+                        : ts.docTag('deprecated'),
+                ],
+            }),
             export: true,
             members: ctx.service.endpoints.map((endpoint) => this.getInterfaceEndpointMethod(ctx, endpoint)),
         });
@@ -47,13 +54,14 @@ export class DefaultTypeScriptFetchClientGenerator extends TypeScriptFileGenerat
         const bodySchema = (_b = (_a = endpoint.requestBody) === null || _a === void 0 ? void 0 : _a.content[0]) === null || _b === void 0 ? void 0 : _b.schema;
         const responseSchema = this.getResponseSchema(ctx, endpoint);
         return ts.method(toCasing(endpoint.name, ctx.config.methodCasing), {
-            doc: ts.doc({ description: endpoint.description }),
+            doc: ts.doc({ description: endpoint.description, tags: [endpoint.deprecated ? ts.docTag('deprecated') : null] }),
             parameters: [
                 params.length > 0
                     ? ts.parameter('params', {
                         description: 'Parameters for the endpoint.',
                         type: ts.objectType({
                             members: params.map((x) => ts.property(toCasing(x.name, ctx.config.propertyNameCasing), {
+                                doc: ts.doc({ tags: [x.deprecated ? ts.docTag('deprecated') : null] }),
                                 type: this.getSchemaType(ctx, x.schema),
                                 optional: !x.required,
                             })),
@@ -89,7 +97,14 @@ export class DefaultTypeScriptFetchClientGenerator extends TypeScriptFileGenerat
     }
     getClass(ctx) {
         return ts.class(this.getClassName(ctx), {
-            doc: ts.doc({ description: ctx.service.description }),
+            doc: ts.doc({
+                description: ctx.service.description,
+                tags: [
+                    ctx.service.endpoints.length === 0 || ctx.service.endpoints.some((x) => !x.deprecated)
+                        ? null
+                        : ts.docTag('deprecated'),
+                ],
+            }),
             export: true,
             implements: this.shouldGenerateInterface(ctx)
                 ? [ts.reference(this.getInterfaceName(ctx), this.getInterfaceFilePath(ctx))]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goast/typescript",
-  "version": "0.2.14",
+  "version": "0.2.16",
   "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>;