get rid of cancelable promise

Author: mwareingWLL

dist/index.js

@@ -8,7 +8,6 @@ import type { ApiRequestOptions } from './ApiRequestOptions';
 import type { OpenAPIConfig } from './OpenAPI';
 {{else}}
 import type { ApiRequestOptions } from './ApiRequestOptions';
-import type { CancelablePromise } from './CancelablePromise';
 import type { OpenAPIConfig } from './OpenAPI';
 {{/equals}}
 
@@ -26,6 +25,6 @@ export abstract class BaseHttpRequest {
 	{{#equals @root.httpClient 'angular'}}
 	public abstract request<T>(options: ApiRequestOptions): Observable<T>;
 	{{else}}
-	public abstract request<T>(options: ApiRequestOptions): CancelablePromise<T>;
+	public abstract request<T>(options: ApiRequestOptions): Promise<T>;
 	{{/equals}}
 }

src/templates/core/BaseHttpRequest.hbs

@@ -13,7 +13,6 @@ import { request as __request } from './request';
 {{else}}
 import type { ApiRequestOptions } from './ApiRequestOptions';
 import { BaseHttpRequest } from './BaseHttpRequest';
-import type { CancelablePromise } from './CancelablePromise';
 import type { OpenAPIConfig } from './OpenAPI';
 import { request as __request } from './request';
 {{/equals}}
@@ -51,10 +50,10 @@ export class {{httpRequest}} extends BaseHttpRequest {
 	/**
 	 * Request method
 	 * @param options The request options from the service
-	 * @returns CancelablePromise<T>
+	 * @returns Promise<T>
 	 * @throws ApiError
 	 */
-	public override request<T>(options: ApiRequestOptions): CancelablePromise<T> {
+	public override request<T>(options: ApiRequestOptions): Promise<T> {
 		return __request(this.config, options);
 	}
 	{{/equals}}

src/templates/core/HttpRequest.hbs

@@ -3,8 +3,6 @@
 import { ApiError } from './ApiError';
 import type { ApiRequestOptions } from './ApiRequestOptions';
 import type { ApiResult } from './ApiResult';
-import { CancelablePromise } from './CancelablePromise';
-import type { OnCancel } from './CancelablePromise';
 import type { OpenAPIConfig } from './OpenAPI';
 
 {{>functions/isDefined}}
@@ -59,34 +57,32 @@ import type { OpenAPIConfig } from './OpenAPI';
  * Request method
  * @param config The OpenAPI configuration object
  * @param options The request options from the service
- * @returns CancelablePromise<T>
+ * @returns Promise<T>
  * @throws ApiError
  */
-export const request = <T>(config: OpenAPIConfig, options: ApiRequestOptions): CancelablePromise<T> => {
-	return new CancelablePromise(async (resolve, reject, onCancel) => {
+export const request = <T>(config: OpenAPIConfig, options: ApiRequestOptions): Promise<T> => {
+	return new Promise(async (resolve, reject) => {
 		try {
 			const url = getUrl(config, options);
 			const formData = getFormData(options);
 			const body = getRequestBody(options);
 			const headers = await getHeaders(config, options);
 
-			if (!onCancel.isCancelled) {
-				const response = await sendRequest(config, options, url, body, formData, headers, onCancel);
-				const responseBody = await getResponseBody(response);
-				const responseHeader = getResponseHeader(response, options.responseHeader);
+			const response = await sendRequest(config, options, url, body, formData, headers);
+			const responseBody = await getResponseBody(response);
+			const responseHeader = getResponseHeader(response, options.responseHeader);
 
-				const result: ApiResult = {
-					url,
-					ok: response.ok,
-					status: response.status,
-					statusText: response.statusText,
-					body: responseHeader ?? responseBody,
-				};
+			const result: ApiResult = {
+				url,
+				ok: response.ok,
+				status: response.status,
+				statusText: response.statusText,
+				body: responseHeader ?? responseBody,
+			};
 
-				catchErrorCodes(options, result);
+			catchErrorCodes(options, result);
 
-				resolve(result.body);
-			}
+			resolve(result.body);
 		} catch (error) {
 			reject(error);
 		}

src/templates/core/fetch/request.hbs

@@ -5,22 +5,16 @@ export const sendRequest = async (
 	body: any,
 	formData: FormData | undefined,
 	headers: Headers,
-	onCancel: OnCancel
 ): Promise<Response> => {
-	const controller = new AbortController();
-
 	const request: RequestInit = {
 		headers,
 		body: body ?? formData,
 		method: options.method,
-		signal: controller.signal,
 	};
 
 	if (config.WITH_CREDENTIALS) {
 		request.credentials = config.CREDENTIALS;
 	}
 
-	onCancel(() => controller.abort());
-
 	return await fetch(url, request);
 };

src/templates/core/fetch/sendRequest.hbs

@@ -18,7 +18,6 @@ import type { {{{this}}} } from '../models/{{{this}}}';
 
 {{/if}}
 {{#notEquals @root.httpClient 'angular'}}
-import type { CancelablePromise } from '../core/CancelablePromise';
 {{/notEquals}}
 {{#if @root.exportClient}}
 {{#equals @root.httpClient 'angular'}}
@@ -75,15 +74,15 @@ export class {{{name}}}{{{@root.postfix}}} {
 	public {{{name}}}({{>parameters}}): Observable<{{>result}}> {
 		return this.httpRequest.request({
 	{{else}}
-	public {{{name}}}({{>parameters}}): CancelablePromise<{{>result}}> {
+	public {{{name}}}({{>parameters}}): Promise<{{>result}}> {
 		return this.httpRequest.request({
 	{{/equals}}
 	{{else}}
 	{{#equals @root.httpClient 'angular'}}
 	public {{{name}}}({{>parameters}}): Observable<{{>result}}> {
 		return __request(OpenAPI, this.http, {
 	{{else}}
-	public static {{{name}}}({{>parameters}}): CancelablePromise<{{>result}}> {
+	public static {{{name}}}({{>parameters}}): Promise<{{>result}}> {
 		return __request(OpenAPI, {
 	{{/equals}}
 	{{/if}}

src/templates/exportService.hbs

@@ -9,7 +9,6 @@ export { ApiError } from './core/ApiError';
 {{#if @root.exportClient}}
 export { BaseHttpRequest } from './core/BaseHttpRequest';
 {{/if}}
-export { CancelablePromise, CancelError } from './core/CancelablePromise';
 export { OpenAPI } from './core/OpenAPI';
 export type { OpenAPIConfig } from './core/OpenAPI';
 {{/if}}

src/templates/index.hbs

@@ -0,0 +1,40 @@
+/* generated using openapi-typescript-codegen -- do not edit */
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+import type { BaseHttpRequest } from './core/BaseHttpRequest';
+import type { OpenAPIConfig } from './core/OpenAPI';
+import { FetchHttpRequest } from './core/FetchHttpRequest';
+import { AssetsService } from './services/AssetsService';
+import { MembersService } from './services/MembersService';
+import { StampCardsService } from './services/StampCardsService';
+import { StampCardTypesService } from './services/StampCardTypesService';
+import { TenantsService } from './services/TenantsService';
+type HttpRequestConstructor = new (config: OpenAPIConfig) => BaseHttpRequest;
+export class PlutoCoreSDK {
+    public readonly assets: AssetsService;
+    public readonly members: MembersService;
+    public readonly stampCards: StampCardsService;
+    public readonly stampCardTypes: StampCardTypesService;
+    public readonly tenants: TenantsService;
+    public readonly request: BaseHttpRequest;
+    constructor(config?: Partial<OpenAPIConfig>, HttpRequest: HttpRequestConstructor = FetchHttpRequest) {
+        this.request = new HttpRequest({
+            BASE: config?.BASE ?? '',
+            VERSION: config?.VERSION ?? '0.0.1',
+            WITH_CREDENTIALS: config?.WITH_CREDENTIALS ?? false,
+            CREDENTIALS: config?.CREDENTIALS ?? 'include',
+            TOKEN: config?.TOKEN,
+            USERNAME: config?.USERNAME,
+            PASSWORD: config?.PASSWORD,
+            HEADERS: config?.HEADERS,
+            ENCODE_PATH: config?.ENCODE_PATH,
+        });
+        this.assets = new AssetsService(this.request);
+        this.members = new MembersService(this.request);
+        this.stampCards = new StampCardsService(this.request);
+        this.stampCardTypes = new StampCardTypesService(this.request);
+        this.tenants = new TenantsService(this.request);
+    }
+}
+

tester/PlutoCoreSDK.ts

@@ -0,0 +1,25 @@
+/* generated using openapi-typescript-codegen -- do not edit */
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+import type { ApiRequestOptions } from './ApiRequestOptions';
+import type { ApiResult } from './ApiResult';
+
+export class ApiError extends Error {
+    public readonly url: string;
+    public readonly status: number;
+    public readonly statusText: string;
+    public readonly body: any;
+    public readonly request: ApiRequestOptions;
+
+    constructor(request: ApiRequestOptions, response: ApiResult, message: string) {
+        super(message);
+
+        this.name = 'ApiError';
+        this.url = response.url;
+        this.status = response.status;
+        this.statusText = response.statusText;
+        this.body = response.body;
+        this.request = request;
+    }
+}

tester/core/ApiError.ts

@@ -0,0 +1,17 @@
+/* generated using openapi-typescript-codegen -- do not edit */
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+export type ApiRequestOptions = {
+    readonly method: 'GET' | 'PUT' | 'POST' | 'DELETE' | 'OPTIONS' | 'HEAD' | 'PATCH';
+    readonly url: string;
+    readonly path?: Record<string, any>;
+    readonly cookies?: Record<string, any>;
+    readonly headers?: Record<string, any>;
+    readonly query?: Record<string, any>;
+    readonly formData?: Record<string, any>;
+    readonly body?: any;
+    readonly mediaType?: string;
+    readonly responseHeader?: string;
+    readonly errors?: Record<number, string>;
+};