ts-openapi-codegen 2.1.0-beta.6 → 2.1.0-beta.7

package/dist/core/utils/writeClientSimpleIndex.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.writeClientSimpleIndex = writeClientSimpleIndex;
-const fileSystemHelpers_1 = require("../../common/utils/fileSystemHelpers");
+const LoggerMessages_1 = require("../../common/LoggerMessages");
 const pathHelpers_1 = require("../../common/utils/pathHelpers");
 /**
  * Generate the OpenAPI client index file using the Handlebar template and write it to disk.
@@ -11,12 +11,12 @@ const pathHelpers_1 = require("../../common/utils/pathHelpers");
 async function writeClientSimpleIndex(options) {
     const { templates, outputPath, core, models, schemas, services } = options;
     const resolvePathIndex = (0, pathHelpers_1.resolveHelper)(outputPath, 'index.ts');
-    this.logger.info(`The recording of the file data begins: ${resolvePathIndex}`);
-    await fileSystemHelpers_1.fileSystemHelpers.writeFile(resolvePathIndex, templates.indexes.simple({
+    this.logger.info(LoggerMessages_1.LOGGER_MESSAGES.WRITE_CLIENT.DATA_WRITE_START(resolvePathIndex));
+    await this.writeOutputFile(resolvePathIndex, templates.indexes.simple({
         core,
         models,
         schemas,
         services,
     }));
-    this.logger.info(`File recording completed: ${resolvePathIndex}`);
+    this.logger.info(LoggerMessages_1.LOGGER_MESSAGES.WRITE_CLIENT.FILE_RECORDED(resolvePathIndex));
 }

package/dist/templatesCompiled/cli/customRequest.d.ts

@@ -1,11 +1,7 @@
 declare const _default: {
     "1": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
-    "3": (container: any, depth0: any, helpers: any, partials: any, data: any) => any;
-    "4": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
-    "6": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
-    "8": (container: any, depth0: any, helpers: any, partials: any, data: any) => any;
-    "9": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
-    "11": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
+    "3": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
+    "5": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
     compiler: (string | number)[];
     main: (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
     usePartial: boolean;

package/dist/templatesCompiled/cli/customRequest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"customRequest.d.ts","sourceRoot":"","sources":["../../../src/templatesCompiled/cli/customRequest.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAMA,wBAyCmC"}
+{"version":3,"file":"customRequest.d.ts","sourceRoot":"","sources":["../../../src/templatesCompiled/cli/customRequest.ts"],"names":[],"mappings":";;;;;;;;;AAMA,wBAmBmC"}

package/dist/templatesCompiled/cli/customRequest.js

@@ -7,31 +7,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 /* eslint: disable */
 // @ts-nocheck
 exports.default = { "1": function (container, depth0, helpers, partials, data) {
-        return "import { CancelablePromise } from './CancelablePromise';\n";
+        return "import type { CancelablePromise } from './CancelablePromise';\n";
     }, "3": function (container, depth0, helpers, partials, data) {
-        var stack1, lookupProperty = container.lookupProperty || function (parent, propertyName) {
-            if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
-                return parent[propertyName];
-            }
-            return undefined;
-        };
-        return ((stack1 = lookupProperty(helpers, "if").call(depth0 != null ? depth0 : (container.nullContext || {}), lookupProperty(depth0, "useRequestRaw"), { "name": "if", "hash": {}, "fn": container.program(4, data, 0), "inverse": container.program(6, data, 0), "data": data, "loc": { "start": { "line": 15, "column": 0 }, "end": { "line": 77, "column": 7 } } })) != null ? stack1 : "");
-    }, "4": function (container, depth0, helpers, partials, data) {
-        return "export function requestRaw<T>(options: ApiRequestOptions, config: TOpenAPIConfig): CancelablePromise<ApiResult<T>> {\n    return new CancelablePromise(async (resolve, reject, onCancel) => {\n        try {\n            if (onCancel.isCancelled) {\n                return;\n            }\n\n            const url = `${config.BASE}${options.path}`.replace('{api-version}', config.VERSION);\n            const response = await fetch(url, {\n                method: options.method,\n                headers: options.headers as Record<string, string> | undefined,\n                body: options.body ? JSON.stringify(options.body) : undefined,\n            });\n\n            const body = (await response.json()) as T;\n            resolve({\n                url,\n                ok: response.ok,\n                status: response.status,\n                statusText: response.statusText,\n                body,\n            });\n        } catch (error) {\n            reject(error);\n        }\n    });\n}\n\nexport function request<T>(options: ApiRequestOptions, config: TOpenAPIConfig): CancelablePromise<T> {\n    return new CancelablePromise(async (resolve, reject, onCancel) => {\n        try {\n            const result = await requestRaw<T>(options, config);\n            if (!onCancel.isCancelled) {\n                resolve(result.body);\n            }\n        } catch (error) {\n            reject(error);\n        }\n    });\n}\n";
-    }, "6": function (container, depth0, helpers, partials, data) {
-        return "export function request<T>(options: ApiRequestOptions, config: TOpenAPIConfig): CancelablePromise<T> {\n    return new CancelablePromise(async (resolve, reject, onCancel) => {\n        try {\n            if (onCancel.isCancelled) {\n                return;\n            }\n\n            const url = `${config.BASE}${options.path}`.replace('{api-version}', config.VERSION);\n            const response = await fetch(url, {\n                method: options.method,\n                headers: options.headers as Record<string, string> | undefined,\n                body: options.body ? JSON.stringify(options.body) : undefined,\n            });\n\n            resolve((await response.json()) as T);\n        } catch (error) {\n            reject(error);\n        }\n    });\n}\n";
-    }, "8": function (container, depth0, helpers, partials, data) {
-        var stack1, lookupProperty = container.lookupProperty || function (parent, propertyName) {
-            if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
-                return parent[propertyName];
-            }
-            return undefined;
-        };
-        return ((stack1 = lookupProperty(helpers, "if").call(depth0 != null ? depth0 : (container.nullContext || {}), lookupProperty(depth0, "useRequestRaw"), { "name": "if", "hash": {}, "fn": container.program(9, data, 0), "inverse": container.program(11, data, 0), "data": data, "loc": { "start": { "line": 79, "column": 0 }, "end": { "line": 113, "column": 7 } } })) != null ? stack1 : "");
-    }, "9": function (container, depth0, helpers, partials, data) {
-        return "export async function requestRaw<T>(options: ApiRequestOptions, config: TOpenAPIConfig): Promise<ApiResult<T>> {\n    const url = `${config.BASE}${options.path}`.replace('{api-version}', config.VERSION);\n    const response = await fetch(url, {\n        method: options.method,\n        headers: options.headers as Record<string, string> | undefined,\n        body: options.body ? JSON.stringify(options.body) : undefined,\n    });\n\n    const body = (await response.json()) as T;\n    return {\n        url,\n        ok: response.ok,\n        status: response.status,\n        statusText: response.statusText,\n        body,\n    };\n}\n\nexport async function request<T>(options: ApiRequestOptions, config: TOpenAPIConfig): Promise<T> {\n    const result = await requestRaw<T>(options, config);\n    return result.body;\n}\n";
-    }, "11": function (container, depth0, helpers, partials, data) {
-        return "export async function request<T>(options: ApiRequestOptions, config: TOpenAPIConfig): Promise<T> {\n    const url = `${config.BASE}${options.path}`.replace('{api-version}', config.VERSION);\n    const response = await fetch(url, {\n        method: options.method,\n        headers: options.headers as Record<string, string> | undefined,\n        body: options.body ? JSON.stringify(options.body) : undefined,\n    });\n\n    return (await response.json()) as T;\n}\n";
+        return "export function request<T>(options: ApiRequestOptions, config: TOpenAPIConfig): CancelablePromise<T> {\n    return new CancelablePromise(async (resolve, reject, onCancel) => {\n        try {\n            const abortController = new AbortController();\n            \n            if (options?.timeout) {\n                const timeoutId = setTimeout(() => abortController.abort(), options.timeout);\n                onCancel(() => clearTimeout(timeoutId));\n            }\n            \n            onCancel(() => abortController.abort());\n            \n            if (onCancel.isCancelled) {\n                return;\n            }\n            \n            // Ваша пользовательская логика запросов здесь\n            const response = await fetch(config.url, {\n                method: config.method,\n                headers: config.headers,\n                body: config.body ? JSON.stringify(config.body) : undefined,\n                signal: abortController.signal,\n            });\n            \n            if (!response.ok) {\n                throw new Error(`Request failed: ${response.statusText}`);\n            }\n            \n            const data = await response.json();\n            resolve(data);\n        } catch (error) {\n            reject(error);\n        }\n    });\n};\n";
+    }, "5": function (container, depth0, helpers, partials, data) {
+        return "export async function request<T>(options: ApiRequestOptions, config: TOpenAPIConfig): Promise<T> {\n    return new Promise(async (resolve, reject) => {\n        try {\n            const url = getUrl(options, config);\n            const response = await sendRequest(options, url, config);\n            const responseBody = getResponseBody(response);\n            const responseHeader = getResponseHeader(response, options.responseHeader);\n\n            const result: ApiResult = {\n                url,\n                ok: isSuccess(response.status),\n                status: response.status,\n                statusText: response.statusText,\n                body: responseHeader || responseBody,\n            };\n\n            catchErrors(options, result);\n            resolve(result.body);\n        } catch (error) {\n            reject(error);\n        }\n    });\n}\n";
     }, "compiler": [8, ">= 4.3.0"], "main": function (container, depth0, helpers, partials, data) {
         var stack1, alias1 = depth0 != null ? depth0 : (container.nullContext || {}), lookupProperty = container.lookupProperty || function (parent, propertyName) {
             if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
@@ -40,8 +20,8 @@ exports.default = { "1": function (container, depth0, helpers, partials, data) {
             return undefined;
         };
         return ((stack1 = container.invokePartial(lookupProperty(partials, "header"), depth0, { "name": "header", "data": data, "helpers": helpers, "partials": partials, "decorators": container.decorators })) != null ? stack1 : "")
-            + "\nimport type { ApiRequestOptions } from './ApiRequestOptions';\nimport type { ApiResult } from './ApiResult';\nimport type { TOpenAPIConfig } from './OpenAPI';\n"
-            + ((stack1 = lookupProperty(helpers, "if").call(alias1, lookupProperty(depth0, "useCancelableRequest"), { "name": "if", "hash": {}, "fn": container.program(1, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 6, "column": 0 }, "end": { "line": 8, "column": 7 } } })) != null ? stack1 : "")
-            + "\n/**\n * Custom request implementation.\n * Wire this file via `request` in openapi.config.json.\n */\n"
-            + ((stack1 = lookupProperty(helpers, "if").call(alias1, lookupProperty(depth0, "useCancelableRequest"), { "name": "if", "hash": {}, "fn": container.program(3, data, 0), "inverse": container.program(8, data, 0), "data": data, "loc": { "start": { "line": 14, "column": 0 }, "end": { "line": 114, "column": 7 } } })) != null ? stack1 : "");
+            + "\nimport type { RequestExecutor, RequestConfig } from './request-executor';\n"
+            + ((stack1 = lookupProperty(helpers, "if").call(alias1, lookupProperty(depth0, "useCancelableRequest"), { "name": "if", "hash": {}, "fn": container.program(1, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 4, "column": 0 }, "end": { "line": 6, "column": 7 } } })) != null ? stack1 : "")
+            + "\n/**\n * Определите свой тип опций (опционально)\n * Измените этот интерфейс в соответствии с вашими потребностями\n */\ninterface MyCustomOptions {\n    timeout?: number;\n    retries?: number;\n}\n\n/**\n * Создайте пользовательский executor\n * Реализуйте свою логику запросов здесь\n *\n * @example Пример использования:\n * \n * import { createLegacyExecutor } from './generated/core/legacy-request-adapter';\n * import { SimpleService } from './generated/services/SimpleService';\n *\n * const executorWithOptions = createLegacyExecutor<MyCustomOptions>(OpenAPI, (options) => {\n *  // Мапьте ваши пользовательские опции в ApiRequestOptions при необходимости\n *  return {\n *      // Добавьте любые поля ApiRequestOptions на основе options\n *  };\n * });\n * \n * const simpleService = new SimpleService(executorWithOptions);\n * await simpleService.getCallWithoutParametersAndResponse();\n */\n"
+            + ((stack1 = lookupProperty(helpers, "if").call(alias1, lookupProperty(depth0, "useCancelableRequest"), { "name": "if", "hash": {}, "fn": container.program(3, data, 0), "inverse": container.program(5, data, 0), "data": data, "loc": { "start": { "line": 36, "column": 0 }, "end": { "line": 96, "column": 7 } } })) != null ? stack1 : "");
     }, "usePartial": true, "useData": true };

package/dist/templatesCompiled/cli/customRequestExecutor.d.ts

@@ -2,9 +2,6 @@ declare const _default: {
     "1": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
     "3": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
     "5": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
-    "6": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
-    "8": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
-    "9": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
     compiler: (string | number)[];
     main: (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
     usePartial: boolean;

package/dist/templatesCompiled/cli/customRequestExecutor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"customRequestExecutor.d.ts","sourceRoot":"","sources":["../../../src/templatesCompiled/cli/customRequestExecutor.ts"],"names":[],"mappings":";;;;;;;;;;;;AAMA,wBA4CmC"}
+{"version":3,"file":"customRequestExecutor.d.ts","sourceRoot":"","sources":["../../../src/templatesCompiled/cli/customRequestExecutor.ts"],"names":[],"mappings":";;;;;;;;;AAMA,wBAmBmC"}

package/dist/templatesCompiled/cli/customRequestExecutor.js

@@ -7,33 +7,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 /* eslint: disable */
 // @ts-nocheck
 exports.default = { "1": function (container, depth0, helpers, partials, data) {
-        return "import type { ApiResult } from './ApiResult';\n";
-    }, "3": function (container, depth0, helpers, partials, data) {
         return "import type { CancelablePromise } from './CancelablePromise';\n";
+    }, "3": function (container, depth0, helpers, partials, data) {
+        return "export const customExecutor: RequestExecutor<MyCustomOptions> = {\n    async request<TResponse>(config: RequestConfig, options?: MyCustomOptions): CancelablePromise<TResponse> {\n        return new CancelablePromise(async (resolve, reject, onCancel) => {\n            try {\n                const abortController = new AbortController();\n                \n                if (options?.timeout) {\n                    const timeoutId = setTimeout(() => abortController.abort(), options.timeout);\n                    onCancel(() => clearTimeout(timeoutId));\n                }\n                \n                onCancel(() => abortController.abort());\n                \n                if (onCancel.isCancelled) {\n                    return;\n                }\n                \n                // Ваша пользовательская логика запросов здесь\n                const response = await fetch(config.url, {\n                    method: config.method,\n                    headers: config.headers,\n                    body: config.body ? JSON.stringify(config.body) : undefined,\n                    signal: abortController.signal,\n                });\n                \n                if (!response.ok) {\n                    throw new Error(`Request failed: ${response.statusText}`);\n                }\n                \n                const data = await response.json();\n                resolve(data);\n            } catch (error) {\n                reject(error);\n            }\n        });\n    },\n};\n";
     }, "5": function (container, depth0, helpers, partials, data) {
-        var stack1, lookupProperty = container.lookupProperty || function (parent, propertyName) {
-            if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
-                return parent[propertyName];
-            }
-            return undefined;
-        };
-        return "export const customExecutor: RequestExecutor<MyCustomOptions> = {\n"
-            + ((stack1 = lookupProperty(helpers, "if").call(depth0 != null ? depth0 : (container.nullContext || {}), lookupProperty(depth0, "useRequestRaw"), { "name": "if", "hash": {}, "fn": container.program(6, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 33, "column": 4 }, "end": { "line": 70, "column": 11 } } })) != null ? stack1 : "")
-            + "    request<TResponse>(config: RequestConfig, options?: MyCustomOptions): CancelablePromise<TResponse> {\n        return new CancelablePromise(async (resolve, reject, onCancel) => {\n            try {\n                const abortController = new AbortController();\n\n                if (options?.timeout) {\n                    const timeoutId = setTimeout(() => abortController.abort(), options.timeout);\n                    onCancel(() => clearTimeout(timeoutId));\n                }\n\n                onCancel(() => abortController.abort());\n\n                if (onCancel.isCancelled) {\n                    return;\n                }\n\n                const response = await fetch(`${config.path}`, {\n                    method: config.method,\n                    headers: config.headers,\n                    body: config.body ? JSON.stringify(config.body) : undefined,\n                    signal: abortController.signal,\n                });\n\n                if (!response.ok) {\n                    throw new Error(`Request failed: ${response.statusText}`);\n                }\n\n                resolve((await response.json()) as TResponse);\n            } catch (error) {\n                reject(error);\n            }\n        });\n    },\n};\n";
-    }, "6": function (container, depth0, helpers, partials, data) {
-        return "    requestRaw<TResponse>(config: RequestConfig, options?: MyCustomOptions): CancelablePromise<ApiResult<TResponse>> {\n        return new CancelablePromise(async (resolve, reject, onCancel) => {\n            try {\n                const abortController = new AbortController();\n\n                if (options?.timeout) {\n                    const timeoutId = setTimeout(() => abortController.abort(), options.timeout);\n                    onCancel(() => clearTimeout(timeoutId));\n                }\n\n                onCancel(() => abortController.abort());\n\n                if (onCancel.isCancelled) {\n                    return;\n                }\n\n                const response = await fetch(`${config.path}`, {\n                    method: config.method,\n                    headers: config.headers,\n                    body: config.body ? JSON.stringify(config.body) : undefined,\n                    signal: abortController.signal,\n                });\n\n                const body = (await response.json()) as TResponse;\n                resolve({\n                    url: response.url,\n                    ok: response.ok,\n                    status: response.status,\n                    statusText: response.statusText,\n                    body,\n                });\n            } catch (error) {\n                reject(error);\n            }\n        });\n    },\n";
-    }, "8": function (container, depth0, helpers, partials, data) {
-        var stack1, lookupProperty = container.lookupProperty || function (parent, propertyName) {
-            if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
-                return parent[propertyName];
-            }
-            return undefined;
-        };
-        return "export const customExecutor: RequestExecutor<MyCustomOptions> = {\n"
-            + ((stack1 = lookupProperty(helpers, "if").call(depth0 != null ? depth0 : (container.nullContext || {}), lookupProperty(depth0, "useRequestRaw"), { "name": "if", "hash": {}, "fn": container.program(9, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 107, "column": 4 }, "end": { "line": 125, "column": 11 } } })) != null ? stack1 : "")
-            + "    async request<TResponse>(config: RequestConfig, options?: MyCustomOptions): Promise<TResponse> {\n        const response = await fetch(`${config.path}`, {\n            method: config.method,\n            headers: config.headers,\n            body: config.body ? JSON.stringify(config.body) : undefined,\n            signal: options?.timeout ? AbortSignal.timeout(options.timeout) : undefined,\n        });\n\n        if (!response.ok) {\n            throw new Error(`Request failed: ${response.statusText}`);\n        }\n\n        return response.json();\n    },\n};\n";
-    }, "9": function (container, depth0, helpers, partials, data) {
-        return "    async requestRaw<TResponse>(config: RequestConfig, options?: MyCustomOptions): Promise<ApiResult<TResponse>> {\n        const response = await fetch(`${config.path}`, {\n            method: config.method,\n            headers: config.headers,\n            body: config.body ? JSON.stringify(config.body) : undefined,\n            signal: options?.timeout ? AbortSignal.timeout(options.timeout) : undefined,\n        });\n\n        const body = (await response.json()) as TResponse;\n        return {\n            url: response.url,\n            ok: response.ok,\n            status: response.status,\n            statusText: response.statusText,\n            body,\n        };\n    },\n";
+        return "export const customExecutor: RequestExecutor<MyCustomOptions> = {\n    async request<TResponse>(config: RequestConfig, options?: MyCustomOptions): Promise<TResponse> {\n        // Ваша пользовательская логика запросов здесь\n        const response = await fetch(config.url, {\n            method: config.method,\n            headers: config.headers,\n            body: config.body ? JSON.stringify(config.body) : undefined,\n            signal: options?.timeout ? AbortSignal.timeout(options.timeout) : undefined,\n        });\n        \n        if (!response.ok) {\n            throw new Error(`Request failed: ${response.statusText}`);\n        }\n        \n        return response.json();\n    },\n};\n";
     }, "compiler": [8, ">= 4.3.0"], "main": function (container, depth0, helpers, partials, data) {
         var stack1, alias1 = depth0 != null ? depth0 : (container.nullContext || {}), lookupProperty = container.lookupProperty || function (parent, propertyName) {
             if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
@@ -43,8 +21,7 @@ exports.default = { "1": function (container, depth0, helpers, partials, data) {
         };
         return ((stack1 = container.invokePartial(lookupProperty(partials, "header"), depth0, { "name": "header", "data": data, "helpers": helpers, "partials": partials, "decorators": container.decorators })) != null ? stack1 : "")
             + "\nimport type { RequestExecutor, RequestConfig } from './request-executor';\n"
-            + ((stack1 = lookupProperty(helpers, "if").call(alias1, lookupProperty(depth0, "useRequestRaw"), { "name": "if", "hash": {}, "fn": container.program(1, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 4, "column": 0 }, "end": { "line": 6, "column": 7 } } })) != null ? stack1 : "")
-            + ((stack1 = lookupProperty(helpers, "if").call(alias1, lookupProperty(depth0, "useCancelableRequest"), { "name": "if", "hash": {}, "fn": container.program(3, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 7, "column": 0 }, "end": { "line": 9, "column": 7 } } })) != null ? stack1 : "")
+            + ((stack1 = lookupProperty(helpers, "if").call(alias1, lookupProperty(depth0, "useCancelableRequest"), { "name": "if", "hash": {}, "fn": container.program(1, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 4, "column": 0 }, "end": { "line": 6, "column": 7 } } })) != null ? stack1 : "")
             + "\n/**\n * Определите свой тип опций (опционально)\n * Измените этот интерфейс в соответствии с вашими потребностями\n */\ninterface MyCustomOptions {\n    timeout?: number;\n    retries?: number;\n}\n\n/**\n * Создайте пользовательский executor\n * Реализуйте свою логику запросов здесь\n *\n * @example Пример использования:\n * \n * import { SimpleService } from './generated/services/SimpleService';\n * \n * const simpleService = new SimpleService<MyCustomOptions>(customExecutor);\n * await simpleService.getCallWithoutParametersAndResponse({ timeout: 5000, retries: 3 });\n */\n"
-            + ((stack1 = lookupProperty(helpers, "if").call(alias1, lookupProperty(depth0, "useCancelableRequest"), { "name": "if", "hash": {}, "fn": container.program(5, data, 0), "inverse": container.program(8, data, 0), "data": data, "loc": { "start": { "line": 31, "column": 0 }, "end": { "line": 141, "column": 7 } } })) != null ? stack1 : "");
+            + ((stack1 = lookupProperty(helpers, "if").call(alias1, lookupProperty(depth0, "useCancelableRequest"), { "name": "if", "hash": {}, "fn": container.program(3, data, 0), "inverse": container.program(5, data, 0), "data": data, "loc": { "start": { "line": 28, "column": 0 }, "end": { "line": 84, "column": 7 } } })) != null ? stack1 : "");
     }, "usePartial": true, "useData": true };

package/dist/templatesCompiled/client/core/axios/request.d.ts

@@ -1,11 +1,7 @@
 declare const _default: {
     "1": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
-    "3": (container: any, depth0: any, helpers: any, partials: any, data: any) => any;
-    "4": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
-    "6": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
-    "8": (container: any, depth0: any, helpers: any, partials: any, data: any) => any;
-    "9": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
-    "11": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
+    "3": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
+    "5": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
     compiler: (string | number)[];
     main: (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
     usePartial: boolean;

package/dist/templatesCompiled/client/core/axios/request.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../../../../../src/templatesCompiled/client/core/axios/request.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAMA,wBAuEmC"}
+{"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../../../../../src/templatesCompiled/client/core/axios/request.ts"],"names":[],"mappings":";;;;;;;;;AAMA,wBAiDmC"}

package/dist/templatesCompiled/client/core/axios/request.js

@@ -9,29 +9,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = { "1": function (container, depth0, helpers, partials, data) {
         return "import { CancelablePromise } from './CancelablePromise';\n";
     }, "3": function (container, depth0, helpers, partials, data) {
-        var stack1, lookupProperty = container.lookupProperty || function (parent, propertyName) {
-            if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
-                return parent[propertyName];
-            }
-            return undefined;
-        };
-        return ((stack1 = lookupProperty(helpers, "if").call(depth0 != null ? depth0 : (container.nullContext || {}), lookupProperty(lookupProperty(data, "root"), "useRequestRaw"), { "name": "if", "hash": {}, "fn": container.program(4, data, 0), "inverse": container.program(6, data, 0), "data": data, "loc": { "start": { "line": 70, "column": 0 }, "end": { "line": 148, "column": 7 } } })) != null ? stack1 : "");
-    }, "4": function (container, depth0, helpers, partials, data) {
         return " export function requestRaw<T>(options: ApiRequestOptions, config: TOpenAPIConfig): CancelablePromise<ApiResult<T>> {\n    return new CancelablePromise(async(resolve, reject, onCancel) => {\n        try {\n            const url = getUrl(options, config);\n            \n            if (!onCancel.isCancelled) {\n                const response = await sendRequest<T>(options, url, config, onCancel);\n                const responseBody = getResponseBody(response, options);\n                const responseHeader = getResponseHeader(response, options.responseHeader);\n                const result: ApiResult<T> = {\n                    url,\n                    ok: isSuccess(response.status),\n                    status: response.status,\n                    statusText: response.statusText,\n                    body: (responseHeader || responseBody) as T,\n                };\n\n                catchErrors(options, result);\n                resolve(result);\n            }\n        } catch (error) {\n            reject(error);\n        }\n    });\n}\n\nexport function request<T>(options: ApiRequestOptions, config: TOpenAPIConfig): CancelablePromise<T> {\n   return new CancelablePromise(async(resolve, reject, onCancel) => {\n       try {\n           const url = getUrl(options, config);\n           \n           if (!onCancel.isCancelled) {\n               const response = await sendRequest<T>(options, url, config, onCancel);\n               const responseBody = getResponseBody(response, options);\n               const responseHeader = getResponseHeader(response, options.responseHeader);\n               const result: ApiResult<T> = {\n                   url,\n                   ok: isSuccess(response.status),\n                   status: response.status,\n                   statusText: response.statusText,\n                   body: (responseHeader || responseBody) as T,\n               };\n\n               catchErrors(options, result);\n               resolve(result.body);\n            }\n        } catch (error) {\n            reject(error);\n        }\n    });\n}\n";
-    }, "6": function (container, depth0, helpers, partials, data) {
-        return "export function request<T>(options: ApiRequestOptions, config: TOpenAPIConfig): CancelablePromise<T> {\n   return new CancelablePromise(async(resolve, reject, onCancel) => {\n       try {\n           const url = getUrl(options, config);\n           \n           if (!onCancel.isCancelled) {\n               const response = await sendRequest<T>(options, url, config, onCancel);\n               const responseBody = getResponseBody(response, options);\n               const responseHeader = getResponseHeader(response, options.responseHeader);\n               const result: ApiResult<T> = {\n                   url,\n                   ok: isSuccess(response.status),\n                   status: response.status,\n                   statusText: response.statusText,\n                   body: (responseHeader || responseBody) as T,\n               };\n\n               catchErrors(options, result);\n               resolve(result.body);\n            }\n        } catch (error) {\n            reject(error);\n        }\n    });\n}\n";
-    }, "8": function (container, depth0, helpers, partials, data) {
-        var stack1, lookupProperty = container.lookupProperty || function (parent, propertyName) {
-            if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
-                return parent[propertyName];
-            }
-            return undefined;
-        };
-        return ((stack1 = lookupProperty(helpers, "if").call(depth0 != null ? depth0 : (container.nullContext || {}), lookupProperty(lookupProperty(data, "root"), "useRequestRaw"), { "name": "if", "hash": {}, "fn": container.program(9, data, 0), "inverse": container.program(11, data, 0), "data": data, "loc": { "start": { "line": 150, "column": 0 }, "end": { "line": 203, "column": 7 } } })) != null ? stack1 : "");
-    }, "9": function (container, depth0, helpers, partials, data) {
+    }, "5": function (container, depth0, helpers, partials, data) {
         return "export async function request<T>(options: ApiRequestOptions, config: TOpenAPIConfig): Promise<T> {\n    const result = await requestRaw<T>(options, config);\n    return result.body;\n}\n\nexport async function requestRaw<T>(options: ApiRequestOptions, config: TOpenAPIConfig): Promise<ApiResult<T>> {\n    return new Promise(async (resolve, reject) => {\n        try {\n            const url = getUrl(options, config);\n            const response = await sendRequest(options, url, config);\n            const responseBody = getResponseBody(response, options);\n            const responseHeader = getResponseHeader(response, options.responseHeader);\n\n            const result: ApiResult<T> = {\n                url,\n                ok: isSuccess(response.status),\n                status: response.status,\n                statusText: response.statusText,\n                body: (responseHeader || responseBody) as T,\n            };\n\n            catchErrors(options, result);\n            resolve(result);\n        } catch (error) {\n            reject(error);\n        }\n    });\n}\n";
-    }, "11": function (container, depth0, helpers, partials, data) {
-        return "export async function request<T>(options: ApiRequestOptions, config: TOpenAPIConfig): Promise<T> {\n    return new Promise(async (resolve, reject) => {\n        try {\n            const url = getUrl(options, config);\n            const response = await sendRequest(options, url, config);\n            const responseBody = getResponseBody(response, options);\n            const responseHeader = getResponseHeader(response, options.responseHeader);\n\n            const result: ApiResult<T> = {\n                url,\n                ok: isSuccess(response.status),\n                status: response.status,\n                statusText: response.statusText,\n                body: (responseHeader || responseBody) as T,\n            };\n\n            catchErrors(options, result);\n            resolve(result.body);\n        } catch (error) {\n            reject(error);\n        }\n    });\n}\n";
     }, "compiler": [8, ">= 4.3.0"], "main": function (container, depth0, helpers, partials, data) {
         var stack1, alias1 = depth0 != null ? depth0 : (container.nullContext || {}), lookupProperty = container.lookupProperty || function (parent, propertyName) {
             if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
@@ -73,5 +53,5 @@ exports.default = { "1": function (container, depth0, helpers, partials, data) {
             + "\n\n"
             + ((stack1 = container.invokePartial(lookupProperty(partials, "functions/catchErrors"), depth0, { "name": "functions/catchErrors", "data": data, "helpers": helpers, "partials": partials, "decorators": container.decorators })) != null ? stack1 : "")
             + "\n\n/**\n * Request using axios client\n * @param config The OpenAPI configuration object\n * @param options The request options from the the service\n * @returns ApiResult\n * @throws ApiError\n */\n"
-            + ((stack1 = lookupProperty(helpers, "if").call(alias1, lookupProperty(lookupProperty(data, "root"), "useCancelableRequest"), { "name": "if", "hash": {}, "fn": container.program(3, data, 0), "inverse": container.program(8, data, 0), "data": data, "loc": { "start": { "line": 69, "column": 0 }, "end": { "line": 204, "column": 7 } } })) != null ? stack1 : "");
+            + ((stack1 = lookupProperty(helpers, "if").call(alias1, lookupProperty(lookupProperty(data, "root"), "useCancelableRequest"), { "name": "if", "hash": {}, "fn": container.program(3, data, 0), "inverse": container.program(5, data, 0), "data": data, "loc": { "start": { "line": 69, "column": 0 }, "end": { "line": 150, "column": 7 } } })) != null ? stack1 : "");
     }, "usePartial": true, "useData": true };

package/dist/templatesCompiled/client/core/executor/createExecutorAdapter.d.ts

@@ -2,12 +2,9 @@ declare const _default: {
     "1": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
     "3": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
     "5": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
-    "6": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
-    "8": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
-    "10": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
+    "7": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
+    "9": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
     "11": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
-    "13": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
-    "14": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
     compiler: (string | number)[];
     main: (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
     usePartial: boolean;

package/dist/templatesCompiled/client/core/executor/createExecutorAdapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createExecutorAdapter.d.ts","sourceRoot":"","sources":["../../../../../src/templatesCompiled/client/core/executor/createExecutorAdapter.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAMA,wBA8DmC"}
+{"version":3,"file":"createExecutorAdapter.d.ts","sourceRoot":"","sources":["../../../../../src/templatesCompiled/client/core/executor/createExecutorAdapter.ts"],"names":[],"mappings":";;;;;;;;;;;;AAMA,wBA6BmC"}

package/dist/templatesCompiled/client/core/executor/createExecutorAdapter.js

@@ -7,45 +7,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 /* eslint: disable */
 // @ts-nocheck
 exports.default = { "1": function (container, depth0, helpers, partials, data) {
-        return "import type { ApiResult } from '../ApiResult';\n";
-    }, "3": function (container, depth0, helpers, partials, data) {
         return "import type { ApiRequestOptions } from '../ApiRequestOptions';\nimport type { TOpenAPIConfig } from '../OpenAPI';\nimport { OpenAPI } from '../OpenAPI';\n";
+    }, "3": function (container, depth0, helpers, partials, data) {
+        return "import { request as __request } from '../request';\n";
     }, "5": function (container, depth0, helpers, partials, data) {
-        var stack1, lookupProperty = container.lookupProperty || function (parent, propertyName) {
-            if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
-                return parent[propertyName];
-            }
-            return undefined;
-        };
-        return "import { request as __request"
-            + ((stack1 = lookupProperty(helpers, "if").call(depth0 != null ? depth0 : (container.nullContext || {}), lookupProperty(lookupProperty(data, "root"), "useRequestRaw"), { "name": "if", "hash": {}, "fn": container.program(6, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 13, "column": 29 }, "end": { "line": 13, "column": 91 } } })) != null ? stack1 : "")
-            + " } from '../request';\n";
-    }, "6": function (container, depth0, helpers, partials, data) {
-        return ", requestRaw as __requestRaw";
-    }, "8": function (container, depth0, helpers, partials, data) {
+        return "import { request as __request, requestRaw as __requestRaw } from '../request';\n";
+    }, "7": function (container, depth0, helpers, partials, data) {
         return "    openApiConfig: TOpenAPIConfig = OpenAPI,\n    mapOptions?: (options: TRequestOptions | undefined) => Partial<ApiRequestOptions>,\n";
-    }, "10": function (container, depth0, helpers, partials, data) {
-        var stack1, lookupProperty = container.lookupProperty || function (parent, propertyName) {
-            if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
-                return parent[propertyName];
-            }
-            return undefined;
-        };
-        return ((stack1 = lookupProperty(helpers, "if").call(depth0 != null ? depth0 : (container.nullContext || {}), lookupProperty(lookupProperty(data, "root"), "useRequestRaw"), { "name": "if", "hash": {}, "fn": container.program(11, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 26, "column": 8 }, "end": { "line": 30, "column": 15 } } })) != null ? stack1 : "")
-            + "        request<TResponse>(config: RequestConfig, options?: TRequestOptions): Promise<TResponse> {\n            return __request(config, options) as Promise<TResponse>;\n        },\n";
+    }, "9": function (container, depth0, helpers, partials, data) {
+        return "        requestRaw<TResponse>(config: RequestConfig, options?: TRequestOptions): Promise<ApiResult<TResponse>> {\n            return __request(config, options) as Promise<ApiResult<TResponse>>;\n        },\n        request<TResponse>(config: RequestConfig, options?: TRequestOptions): Promise<TResponse> {\n            return __request(config, options) as Promise<TResponse>;\n        },\n";
     }, "11": function (container, depth0, helpers, partials, data) {
-        return "        requestRaw<TResponse>(config: RequestConfig, options?: TRequestOptions): Promise<ApiResult<TResponse>> {\n            return __requestRaw(config, options) as Promise<ApiResult<TResponse>>;\n        },\n";
-    }, "13": function (container, depth0, helpers, partials, data) {
-        var stack1, lookupProperty = container.lookupProperty || function (parent, propertyName) {
-            if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
-                return parent[propertyName];
-            }
-            return undefined;
-        };
-        return ((stack1 = lookupProperty(helpers, "if").call(depth0 != null ? depth0 : (container.nullContext || {}), lookupProperty(lookupProperty(data, "root"), "useRequestRaw"), { "name": "if", "hash": {}, "fn": container.program(14, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 35, "column": 8 }, "end": { "line": 55, "column": 15 } } })) != null ? stack1 : "")
-            + "        request<TResponse>(config: RequestConfig, options?: TRequestOptions): Promise<TResponse> {\n            const baseOptions: ApiRequestOptions = {\n                method: config.method as ApiRequestOptions['method'],\n                path: config.path,\n                headers: config.headers,\n                query: config.query,\n                body: config.body,\n                cookies: config.cookies,\n                mediaType: config.requestMediaType,\n                responseType: config.responseType,\n            };\n\n            const mergedOptions: ApiRequestOptions = {\n                ...baseOptions,\n                ...(mapOptions ? mapOptions(options) : {}),\n            };\n\n            return __request<TResponse>(mergedOptions, openApiConfig);\n        },\n";
-    }, "14": function (container, depth0, helpers, partials, data) {
-        return "        requestRaw<TResponse>(config: RequestConfig, options?: TRequestOptions): Promise<ApiResult<TResponse>> {\n            const baseOptions: ApiRequestOptions = {\n                method: config.method as ApiRequestOptions['method'],\n                path: config.path,\n                headers: config.headers,\n                query: config.query,\n                body: config.body,\n                cookies: config.cookies,\n                mediaType: config.requestMediaType,\n                responseType: config.responseType,\n            };\n\n            const mergedOptions: ApiRequestOptions = {\n                ...baseOptions,\n                ...(mapOptions ? mapOptions(options) : {}),\n            };\n\n            return __requestRaw<TResponse>(mergedOptions, openApiConfig);\n        },\n";
+        return "        requestRaw<TResponse>(config: RequestConfig, options?: TRequestOptions): Promise<ApiResult<TResponse>> {\n            const baseOptions: ApiRequestOptions = {\n                method: config.method as ApiRequestOptions['method'],\n                path: config.path,\n                headers: config.headers,\n                query: config.query,\n                body: config.body,\n                cookies: config.cookies,\n                mediaType: config.requestMediaType,\n                responseType: config.responseType,\n            };\n\n            const mergedOptions: ApiRequestOptions = {\n                ...baseOptions,\n                ...(mapOptions ? mapOptions(options) : {}),\n            };\n\n            return __requestRaw<TResponse>(mergedOptions, openApiConfig);\n        },\n        request<TResponse>(config: RequestConfig, options?: TRequestOptions): Promise<TResponse> {\n            const baseOptions: ApiRequestOptions = {\n                method: config.method as ApiRequestOptions['method'],\n                path: config.path,\n                headers: config.headers,\n                query: config.query,\n                body: config.body,\n                cookies: config.cookies,\n                mediaType: config.requestMediaType,\n                responseType: config.responseType,\n            };\n\n            const mergedOptions: ApiRequestOptions = {\n                ...baseOptions,\n                ...(mapOptions ? mapOptions(options) : {}),\n            };\n\n            return __request<TResponse>(mergedOptions, openApiConfig);\n        },\n";
     }, "compiler": [8, ">= 4.3.0"], "main": function (container, depth0, helpers, partials, data) {
         var stack1, alias1 = depth0 != null ? depth0 : (container.nullContext || {}), lookupProperty = container.lookupProperty || function (parent, propertyName) {
             if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
@@ -54,14 +26,12 @@ exports.default = { "1": function (container, depth0, helpers, partials, data) {
             return undefined;
         };
         return ((stack1 = container.invokePartial(lookupProperty(partials, "header"), depth0, { "name": "header", "data": data, "helpers": helpers, "partials": partials, "decorators": container.decorators })) != null ? stack1 : "")
-            + "\n"
-            + ((stack1 = lookupProperty(helpers, "if").call(alias1, lookupProperty(lookupProperty(data, "root"), "useRequestRaw"), { "name": "if", "hash": {}, "fn": container.program(1, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 3, "column": 0 }, "end": { "line": 5, "column": 7 } } })) != null ? stack1 : "")
-            + "import type { RequestExecutor, RequestConfig } from './requestExecutor';\n"
-            + ((stack1 = lookupProperty(helpers, "unless").call(alias1, lookupProperty(lookupProperty(data, "root"), "useCustomRequest"), { "name": "unless", "hash": {}, "fn": container.program(3, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 7, "column": 0 }, "end": { "line": 11, "column": 11 } } })) != null ? stack1 : "")
-            + ((stack1 = lookupProperty(helpers, "if").call(alias1, lookupProperty(lookupProperty(data, "root"), "useCustomRequest"), { "name": "if", "hash": {}, "fn": container.program(5, data, 0), "inverse": container.program(5, data, 0), "data": data, "loc": { "start": { "line": 12, "column": 0 }, "end": { "line": 16, "column": 7 } } })) != null ? stack1 : "")
+            + "\nimport type { ApiResult } from '../ApiResult';\nimport type { RequestExecutor, RequestConfig } from './requestExecutor';\n"
+            + ((stack1 = lookupProperty(helpers, "unless").call(alias1, lookupProperty(lookupProperty(data, "root"), "useCustomRequest"), { "name": "unless", "hash": {}, "fn": container.program(1, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 5, "column": 0 }, "end": { "line": 9, "column": 11 } } })) != null ? stack1 : "")
+            + ((stack1 = lookupProperty(helpers, "if").call(alias1, lookupProperty(lookupProperty(data, "root"), "useCustomRequest"), { "name": "if", "hash": {}, "fn": container.program(3, data, 0), "inverse": container.program(5, data, 0), "data": data, "loc": { "start": { "line": 10, "column": 0 }, "end": { "line": 14, "column": 7 } } })) != null ? stack1 : "")
             + "\nexport function createExecutorAdapter<TRequestOptions extends Record<string, any>>(\n"
-            + ((stack1 = lookupProperty(helpers, "unless").call(alias1, lookupProperty(lookupProperty(data, "root"), "useCustomRequest"), { "name": "unless", "hash": {}, "fn": container.program(8, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 19, "column": 0 }, "end": { "line": 22, "column": 11 } } })) != null ? stack1 : "")
+            + ((stack1 = lookupProperty(helpers, "unless").call(alias1, lookupProperty(lookupProperty(data, "root"), "useCustomRequest"), { "name": "unless", "hash": {}, "fn": container.program(7, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 17, "column": 0 }, "end": { "line": 20, "column": 11 } } })) != null ? stack1 : "")
             + "): RequestExecutor<TRequestOptions> {\n    return {\n"
-            + ((stack1 = lookupProperty(helpers, "if").call(alias1, lookupProperty(lookupProperty(data, "root"), "useCustomRequest"), { "name": "if", "hash": {}, "fn": container.program(10, data, 0), "inverse": container.program(13, data, 0), "data": data, "loc": { "start": { "line": 25, "column": 8 }, "end": { "line": 75, "column": 15 } } })) != null ? stack1 : "")
+            + ((stack1 = lookupProperty(helpers, "if").call(alias1, lookupProperty(lookupProperty(data, "root"), "useCustomRequest"), { "name": "if", "hash": {}, "fn": container.program(9, data, 0), "inverse": container.program(11, data, 0), "data": data, "loc": { "start": { "line": 23, "column": 8 }, "end": { "line": 69, "column": 15 } } })) != null ? stack1 : "")
             + "    };\n}\n";
     }, "usePartial": true, "useData": true };

package/dist/templatesCompiled/client/core/executor/requestExecutor.d.ts

@@ -1,6 +1,4 @@
 declare const _default: {
-    "1": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
-    "3": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
     compiler: (string | number)[];
     main: (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
     usePartial: boolean;

package/dist/templatesCompiled/client/core/executor/requestExecutor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"requestExecutor.d.ts","sourceRoot":"","sources":["../../../../../src/templatesCompiled/client/core/executor/requestExecutor.ts"],"names":[],"mappings":";;;;;;;;AAMA,wBAkBmC"}
+{"version":3,"file":"requestExecutor.d.ts","sourceRoot":"","sources":["../../../../../src/templatesCompiled/client/core/executor/requestExecutor.ts"],"names":[],"mappings":";;;;;;AAMA,wBAUmC"}

package/dist/templatesCompiled/client/core/executor/requestExecutor.js

@@ -6,21 +6,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 /* tslint: disable */
 /* eslint: disable */
 // @ts-nocheck
-exports.default = { "1": function (container, depth0, helpers, partials, data) {
-        return "import type { ApiResult } from '../ApiResult';\n";
-    }, "3": function (container, depth0, helpers, partials, data) {
-        return "  requestRaw<TResponse>(\n    config: RequestConfig,\n    options?: TOptions\n  ): Promise<ApiResult<TResponse>>;\n";
-    }, "compiler": [8, ">= 4.3.0"], "main": function (container, depth0, helpers, partials, data) {
-        var stack1, alias1 = depth0 != null ? depth0 : (container.nullContext || {}), lookupProperty = container.lookupProperty || function (parent, propertyName) {
+exports.default = { "compiler": [8, ">= 4.3.0"], "main": function (container, depth0, helpers, partials, data) {
+        var stack1, lookupProperty = container.lookupProperty || function (parent, propertyName) {
             if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
                 return parent[propertyName];
             }
             return undefined;
         };
         return ((stack1 = container.invokePartial(lookupProperty(partials, "header"), depth0, { "name": "header", "data": data, "helpers": helpers, "partials": partials, "decorators": container.decorators })) != null ? stack1 : "")
-            + "\n"
-            + ((stack1 = lookupProperty(helpers, "if").call(alias1, lookupProperty(lookupProperty(data, "root"), "useRequestRaw"), { "name": "if", "hash": {}, "fn": container.program(1, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 3, "column": 0 }, "end": { "line": 5, "column": 7 } } })) != null ? stack1 : "")
-            + "\nexport interface RequestConfig {\n  method: string;\n  path: string;\n\n  headers?: Record<string, string>;\n  query?: Record<string, any>;\n  body?: unknown;\n\n  requestMediaType?: string;\n  responseType?: 'blob';\n  cookies?: Record<string, string>;\n}\n\nexport interface RequestExecutor<TOptions = unknown> {\n  request<TResponse>(\n    config: RequestConfig,\n    options?: TOptions\n  ): Promise<TResponse>;\n\n"
-            + ((stack1 = lookupProperty(helpers, "if").call(alias1, lookupProperty(lookupProperty(data, "root"), "useRequestRaw"), { "name": "if", "hash": {}, "fn": container.program(3, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 26, "column": 0 }, "end": { "line": 31, "column": 7 } } })) != null ? stack1 : "")
-            + "}\n";
+            + "\nimport type { ApiResult } from '../ApiResult';\n\nexport interface RequestConfig {\n  method: string;\n  path: string;\n\n  headers?: Record<string, string>;\n  query?: Record<string, any>;\n  body?: unknown;\n\n  requestMediaType?: string;\n  responseType?: 'blob';\n  cookies?: Record<string, string>;\n}\n\nexport interface RequestExecutor<TOptions = unknown> {\n  request<TResponse>(\n    config: RequestConfig,\n    options?: TOptions\n  ): Promise<TResponse>;\n\n  requestRaw<TResponse>(\n    config: RequestConfig,\n    options?: TOptions\n  ): Promise<ApiResult<TResponse>>;\n}\n";
     }, "usePartial": true, "useData": true };

package/dist/templatesCompiled/client/core/fetch/request.d.ts

@@ -1,11 +1,7 @@
 declare const _default: {
     "1": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
-    "3": (container: any, depth0: any, helpers: any, partials: any, data: any) => any;
-    "4": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
-    "6": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
-    "8": (container: any, depth0: any, helpers: any, partials: any, data: any) => any;
-    "9": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
-    "11": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
+    "3": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
+    "5": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
     compiler: (string | number)[];
     main: (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
     usePartial: boolean;

package/dist/templatesCompiled/client/core/fetch/request.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../../../../../src/templatesCompiled/client/core/fetch/request.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAMA,wBAqEmC"}
+{"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../../../../../src/templatesCompiled/client/core/fetch/request.ts"],"names":[],"mappings":";;;;;;;;;AAMA,wBA+CmC"}

package/dist/templatesCompiled/client/core/fetch/request.js

@@ -9,29 +9,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = { "1": function (container, depth0, helpers, partials, data) {
         return "import { CancelablePromise } from './CancelablePromise';\n";
     }, "3": function (container, depth0, helpers, partials, data) {
-        var stack1, lookupProperty = container.lookupProperty || function (parent, propertyName) {
-            if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
-                return parent[propertyName];
-            }
-            return undefined;
-        };
-        return ((stack1 = lookupProperty(helpers, "if").call(depth0 != null ? depth0 : (container.nullContext || {}), lookupProperty(lookupProperty(data, "root"), "useRequestRaw"), { "name": "if", "hash": {}, "fn": container.program(4, data, 0), "inverse": container.program(6, data, 0), "data": data, "loc": { "start": { "line": 62, "column": 0 }, "end": { "line": 137, "column": 7 } } })) != null ? stack1 : "");
-    }, "4": function (container, depth0, helpers, partials, data) {
         return "export function requestRaw<T>(options: ApiRequestOptions, config: TOpenAPIConfig): CancelablePromise<ApiResult<T>> {\n    return new CancelablePromise(async(resolve, reject, onCancel) => {\n        try {\n            const url = getUrl(options, config);\n\n            if (!onCancel.isCancelled) {\n                const response = await sendRequest(options, url, config, onCancel);\n                const responseBody = await getResponseBody(response, options);\n                const responseHeader = getResponseHeader(response, options.responseHeader);\n                const result: ApiResult<T> = {\n                    url,\n                    ok: response.ok,\n                    status: response.status,\n                    statusText: response.statusText,\n                    body: (responseHeader || responseBody) as T,\n                };\n                catchErrors(options, result);\n                resolve(result);\n            }\n        } catch (error) {\n            reject(error);\n        }\n    });\n}\n\nexport function request<T>(options: ApiRequestOptions, config: TOpenAPIConfig): CancelablePromise<T> {\n    return new CancelablePromise(async(resolve, reject, onCancel) => {\n        try {\n            const url = getUrl(options, config);\n\n            if (!onCancel.isCancelled) {\n                const response = await sendRequest(options, url, config, onCancel);\n                const responseBody = await getResponseBody(response, options);\n                const responseHeader = getResponseHeader(response, options.responseHeader);\n                const result: ApiResult<T> = {\n                    url,\n                    ok: response.ok,\n                    status: response.status,\n                    statusText: response.statusText,\n                    body: (responseHeader || responseBody) as T,\n                };\n                catchErrors(options, result);\n                resolve(result.body);\n            }\n        } catch (error) {\n            reject(error);\n        }\n    });\n}\n";
-    }, "6": function (container, depth0, helpers, partials, data) {
-        return "export function request<T>(options: ApiRequestOptions, config: TOpenAPIConfig): CancelablePromise<T> {\n    return new CancelablePromise(async(resolve, reject, onCancel) => {\n        try {\n            const url = getUrl(options, config);\n\n            if (!onCancel.isCancelled) {\n                const response = await sendRequest(options, url, config, onCancel);\n                const responseBody = await getResponseBody(response, options);\n                const responseHeader = getResponseHeader(response, options.responseHeader);\n                const result: ApiResult<T> = {\n                    url,\n                    ok: response.ok,\n                    status: response.status,\n                    statusText: response.statusText,\n                    body: (responseHeader || responseBody) as T,\n                };\n                catchErrors(options, result);\n                resolve(result.body);\n            }\n        } catch (error) {\n            reject(error);\n        }\n    });\n}\n";
-    }, "8": function (container, depth0, helpers, partials, data) {
-        var stack1, lookupProperty = container.lookupProperty || function (parent, propertyName) {
-            if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
-                return parent[propertyName];
-            }
-            return undefined;
-        };
-        return ((stack1 = lookupProperty(helpers, "if").call(depth0 != null ? depth0 : (container.nullContext || {}), lookupProperty(lookupProperty(data, "root"), "useRequestRaw"), { "name": "if", "hash": {}, "fn": container.program(9, data, 0), "inverse": container.program(11, data, 0), "data": data, "loc": { "start": { "line": 139, "column": 0 }, "end": { "line": 192, "column": 7 } } })) != null ? stack1 : "");
-    }, "9": function (container, depth0, helpers, partials, data) {
+    }, "5": function (container, depth0, helpers, partials, data) {
         return "export async function request<T>(options: ApiRequestOptions, config: TOpenAPIConfig): Promise<T> {\n    const result = await requestRaw<T>(options, config);\n    return result.body;\n}\n\nexport async function requestRaw<T>(options: ApiRequestOptions, config: TOpenAPIConfig): Promise<ApiResult<T>> {\n    return new Promise(async (resolve, reject) => {\n        try {\n            const url = getUrl(options, config);\n            const response = await sendRequest(options, url, config);\n            const responseBody = await getResponseBody(response, options);\n            const responseHeader = getResponseHeader(response, options.responseHeader);\n\n            const result: ApiResult<T> = {\n                url,\n                ok: response.ok,\n                status: response.status,\n                statusText: response.statusText,\n                body: (responseHeader || responseBody) as T,\n            };\n\n            catchErrors(options, result);\n            resolve(result);\n        } catch (error) {\n            reject(error);\n        }\n    });\n}\n";
-    }, "11": function (container, depth0, helpers, partials, data) {
-        return "export async function request<T>(options: ApiRequestOptions, config: TOpenAPIConfig): Promise<T> {\n    return new Promise(async (resolve, reject) => {\n        try {\n            const url = getUrl(options, config);\n            const response = await sendRequest(options, url, config);\n            const responseBody = await getResponseBody(response, options);\n            const responseHeader = getResponseHeader(response, options.responseHeader);\n\n            const result: ApiResult<T> = {\n                url,\n                ok: response.ok,\n                status: response.status,\n                statusText: response.statusText,\n                body: (responseHeader || responseBody) as T,\n            };\n\n            catchErrors(options, result);\n            resolve(result.body);\n        } catch (error) {\n            reject(error);\n        }\n    });\n}\n";
     }, "compiler": [8, ">= 4.3.0"], "main": function (container, depth0, helpers, partials, data) {
         var stack1, alias1 = depth0 != null ? depth0 : (container.nullContext || {}), lookupProperty = container.lookupProperty || function (parent, propertyName) {
             if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
@@ -71,5 +51,5 @@ exports.default = { "1": function (container, depth0, helpers, partials, data) {
             + "\n\n"
             + ((stack1 = container.invokePartial(lookupProperty(partials, "functions/catchErrors"), depth0, { "name": "functions/catchErrors", "data": data, "helpers": helpers, "partials": partials, "decorators": container.decorators })) != null ? stack1 : "")
             + "\n\n/**\n * Request using fetch client\n * @param config The OpenAPI configuration object\n * @param options The request options from the the service\n * @returns ApiResult\n * @throws ApiError\n */\n"
-            + ((stack1 = lookupProperty(helpers, "if").call(alias1, lookupProperty(lookupProperty(data, "root"), "useCancelableRequest"), { "name": "if", "hash": {}, "fn": container.program(3, data, 0), "inverse": container.program(8, data, 0), "data": data, "loc": { "start": { "line": 61, "column": 0 }, "end": { "line": 193, "column": 7 } } })) != null ? stack1 : "");
+            + ((stack1 = lookupProperty(helpers, "if").call(alias1, lookupProperty(lookupProperty(data, "root"), "useCancelableRequest"), { "name": "if", "hash": {}, "fn": container.program(3, data, 0), "inverse": container.program(5, data, 0), "data": data, "loc": { "start": { "line": 61, "column": 0 }, "end": { "line": 140, "column": 7 } } })) != null ? stack1 : "");
     }, "usePartial": true, "useData": true };

package/dist/templatesCompiled/client/core/interceptors/withInterceptors.d.ts

@@ -1,6 +1,4 @@
 declare const _default: {
-    "1": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
-    "3": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
     compiler: (string | number)[];
     main: (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
     usePartial: boolean;

package/dist/templatesCompiled/client/core/interceptors/withInterceptors.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"withInterceptors.d.ts","sourceRoot":"","sources":["../../../../../src/templatesCompiled/client/core/interceptors/withInterceptors.ts"],"names":[],"mappings":";;;;;;;;AAMA,wBAkBmC"}
+{"version":3,"file":"withInterceptors.d.ts","sourceRoot":"","sources":["../../../../../src/templatesCompiled/client/core/interceptors/withInterceptors.ts"],"names":[],"mappings":";;;;;;AAMA,wBAUmC"}

package/dist/templatesCompiled/client/core/interceptors/withInterceptors.js

@@ -6,21 +6,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 /* tslint: disable */
 /* eslint: disable */
 // @ts-nocheck
-exports.default = { "1": function (container, depth0, helpers, partials, data) {
-        return "import type { ApiResult } from '../ApiResult';\n";
-    }, "3": function (container, depth0, helpers, partials, data) {
-        return "        async requestRaw<TResponse>(config: RequestConfig, options?: TOptions): Promise<ApiResult<TResponse>> {\n            try {\n                const currentConfig = await runRequestInterceptors(config);\n                const response = await executor.requestRaw<TResponse>(currentConfig, options);\n                const transformedBody = await runResponseInterceptors(response.body, currentConfig);\n\n                if (transformedBody !== response.body) {\n                    return { ...response, body: transformedBody };\n                }\n\n                return response;\n            } catch (caught) {\n                let error = caught;\n                const currentConfig = config;\n\n                for (const interceptor of interceptors.onError ?? []) {\n                    error = await interceptor(error, currentConfig);\n                }\n\n                throw error;\n            }\n        },\n";
-    }, "compiler": [8, ">= 4.3.0"], "main": function (container, depth0, helpers, partials, data) {
-        var stack1, alias1 = depth0 != null ? depth0 : (container.nullContext || {}), lookupProperty = container.lookupProperty || function (parent, propertyName) {
+exports.default = { "compiler": [8, ">= 4.3.0"], "main": function (container, depth0, helpers, partials, data) {
+        var stack1, lookupProperty = container.lookupProperty || function (parent, propertyName) {
             if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
                 return parent[propertyName];
             }
             return undefined;
         };
         return ((stack1 = container.invokePartial(lookupProperty(partials, "header"), depth0, { "name": "header", "data": data, "helpers": helpers, "partials": partials, "decorators": container.decorators })) != null ? stack1 : "")
-            + "\n"
-            + ((stack1 = lookupProperty(helpers, "if").call(alias1, lookupProperty(lookupProperty(data, "root"), "useRequestRaw"), { "name": "if", "hash": {}, "fn": container.program(1, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 3, "column": 0 }, "end": { "line": 5, "column": 7 } } })) != null ? stack1 : "")
-            + "import { RequestInterceptor, ResponseInterceptor, ErrorInterceptor } from './interceptors';\nimport { RequestConfig, RequestExecutor } from '../executor/requestExecutor';\n\nexport function withInterceptors<TOptions extends Record<string, any> = Record<string, never>>(\n    executor: RequestExecutor<TOptions>,\n    interceptors: {\n        onRequest?: RequestInterceptor[];\n        onResponse?: ResponseInterceptor[];\n        onError?: ErrorInterceptor[];\n    }\n): RequestExecutor<TOptions> {\n    const runRequestInterceptors = async (config: RequestConfig): Promise<RequestConfig> => {\n        let currentConfig = config;\n\n        for (const interceptor of interceptors.onRequest ?? []) {\n            currentConfig = await interceptor(currentConfig);\n        }\n\n        return currentConfig;\n    };\n\n    const runResponseInterceptors = async <TResponse>(\n        response: TResponse,\n        config: RequestConfig\n    ): Promise<TResponse> => {\n        let currentResponse = response;\n\n        for (const interceptor of interceptors.onResponse ?? []) {\n            currentResponse = (await interceptor(currentResponse, config)) as TResponse;\n        }\n\n        return currentResponse;\n    };\n\n    return {\n        async request<TResponse>(config: RequestConfig, options?: TOptions): Promise<TResponse> {\n            try {\n                const currentConfig = await runRequestInterceptors(config);\n                const response = await executor.request<TResponse>(currentConfig, options);\n\n                return runResponseInterceptors(response, currentConfig);\n            } catch (caught) {\n                let error = caught;\n                const currentConfig = config;\n\n                for (const interceptor of interceptors.onError ?? []) {\n                    error = await interceptor(error, currentConfig);\n                }\n\n                throw error;\n            }\n        },\n"
-            + ((stack1 = lookupProperty(helpers, "if").call(alias1, lookupProperty(lookupProperty(data, "root"), "useRequestRaw"), { "name": "if", "hash": {}, "fn": container.program(3, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 58, "column": 0 }, "end": { "line": 81, "column": 7 } } })) != null ? stack1 : "")
-            + "    };\n}\n";
+            + "\nimport type { ApiResult } from '../ApiResult';\nimport { RequestInterceptor, ResponseInterceptor, ErrorInterceptor } from './interceptors';\nimport { RequestConfig, RequestExecutor } from '../executor/requestExecutor';\n\nexport function withInterceptors<TOptions extends Record<string, any> = Record<string, never>>(\n    executor: RequestExecutor<TOptions>,\n    interceptors: {\n        onRequest?: RequestInterceptor[];\n        onResponse?: ResponseInterceptor[];\n        onError?: ErrorInterceptor[];\n    }\n): RequestExecutor<TOptions> {\n    const runRequestInterceptors = async (config: RequestConfig): Promise<RequestConfig> => {\n        let currentConfig = config;\n\n        for (const interceptor of interceptors.onRequest ?? []) {\n            currentConfig = await interceptor(currentConfig);\n        }\n\n        return currentConfig;\n    };\n\n    const runResponseInterceptors = async <TResponse>(\n        response: TResponse,\n        config: RequestConfig\n    ): Promise<TResponse> => {\n        let currentResponse = response;\n\n        for (const interceptor of interceptors.onResponse ?? []) {\n            currentResponse = (await interceptor(currentResponse, config)) as TResponse;\n        }\n\n        return currentResponse;\n    };\n\n    return {\n        async request<TResponse>(config: RequestConfig, options?: TOptions): Promise<TResponse> {\n            try {\n                const currentConfig = await runRequestInterceptors(config);\n                const response = await executor.request<TResponse>(currentConfig, options);\n\n                return runResponseInterceptors(response, currentConfig);\n            } catch (caught) {\n                let error = caught;\n                const currentConfig = config;\n\n                for (const interceptor of interceptors.onError ?? []) {\n                    error = await interceptor(error, currentConfig);\n                }\n\n                throw error;\n            }\n        },\n        async requestRaw<TResponse>(config: RequestConfig, options?: TOptions): Promise<ApiResult<TResponse>> {\n            try {\n                const currentConfig = await runRequestInterceptors(config);\n                const response = await executor.requestRaw<TResponse>(currentConfig, options);\n\n                return runResponseInterceptors(response, currentConfig);\n            } catch (caught) {\n                let error = caught;\n                const currentConfig = config;\n\n                for (const interceptor of interceptors.onError ?? []) {\n                    error = await interceptor(error, currentConfig);\n                }\n\n                throw error;\n            }\n        },\n    };\n}\n";
     }, "usePartial": true, "useData": true };

package/dist/templatesCompiled/client/core/node/request.d.ts

@@ -1,11 +1,7 @@
 declare const _default: {
     "1": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
-    "3": (container: any, depth0: any, helpers: any, partials: any, data: any) => any;
-    "4": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
-    "6": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
-    "8": (container: any, depth0: any, helpers: any, partials: any, data: any) => any;
-    "9": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
-    "11": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
+    "3": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
+    "5": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
     compiler: (string | number)[];
     main: (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
     usePartial: boolean;

package/dist/templatesCompiled/client/core/node/request.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../../../../../src/templatesCompiled/client/core/node/request.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAMA,wBAqEmC"}
+{"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../../../../../src/templatesCompiled/client/core/node/request.ts"],"names":[],"mappings":";;;;;;;;;AAMA,wBA+CmC"}