ts-openapi-codegen 2.1.0-beta.1 → 2.1.0-beta.10

package/dist/core/utils/writeClientServices.js

@@ -1,25 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.writeClientServices = writeClientServices;
-const eslintFix_1 = require("../../common/utils/eslintFix");
-const fileSystemHelpers_1 = require("../../common/utils/fileSystemHelpers");
+const LoggerMessages_1 = require("../../common/LoggerMessages");
 const format_1 = require("../../common/utils/format");
 const pathHelpers_1 = require("../../common/utils/pathHelpers");
 /**
- * Generate Services using the Handlebar template and write to disk.
- * @param services Array of Services to write
- * @param templates The loaded handlebar templates
- * @param outputServicePath Folder options for generating the core, models, and service part
- * @param httpClient The selected httpClient (fetch, xhr or node)
- * @param useUnionTypes Use union types instead of enums
- * @param useOptions Use options or arguments functions
+ * Генерирует сервисы по Handlebars-шаблону и записывает их на диск.
+ * @param options параметры записи сервисов
  */
 async function writeClientServices(options) {
-    const { services, templates, outputPaths, httpClient, useUnionTypes, useOptions, useCancelableRequest, useProjectPrettier, useEslintFix } = options;
-    this.logger.info('Recording of service files begins');
+    const { services, templates, outputPaths, httpClient, useUnionTypes, useOptions, useCancelableRequest, modelsMode, prettierConfigPath } = options;
+    this.logger.info(LoggerMessages_1.LOGGER_MESSAGES.WRITE_CLIENT.SERVICES_START);
     for (const service of services) {
         const file = (0, pathHelpers_1.resolveHelper)(outputPaths.outputServices, `${service.name}.ts`);
-        this.logger.info(`The recording of the file data begins: ${file}`);
+        this.logger.info(LoggerMessages_1.LOGGER_MESSAGES.WRITE_CLIENT.DATA_WRITE_START(file));
         const templateResult = templates.exports.service({
             ...service,
             httpClient,
@@ -28,13 +22,12 @@ async function writeClientServices(options) {
             outputCore: outputPaths.outputCore,
             outputModels: outputPaths.outputModels,
             useCancelableRequest,
+            modelsMode,
         });
-        const formattedValue = await (0, format_1.format)(templateResult, undefined, useProjectPrettier);
-        await fileSystemHelpers_1.fileSystemHelpers.writeFile(file, formattedValue);
-        if (useEslintFix) {
-            await (0, eslintFix_1.eslintFix)(file);
-        }
-        this.logger.info(`File recording completed: ${file}`);
+        const formattedValue = await (0, format_1.format)(templateResult, undefined, prettierConfigPath);
+        await this.writeOutputFile(file, formattedValue);
+        this.registerLintTarget(file, outputPaths.outputServices);
+        this.logger.info(LoggerMessages_1.LOGGER_MESSAGES.WRITE_CLIENT.FILE_RECORDED(file));
     }
-    this.logger.info('Service file recording completed successfully');
+    this.logger.info(LoggerMessages_1.LOGGER_MESSAGES.WRITE_CLIENT.SERVICES_FINISH);
 }

package/dist/core/utils/writeClientServicesIndex.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"writeClientServicesIndex.d.ts","sourceRoot":"","sources":["../../../src/core/utils/writeClientServicesIndex.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC1D,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAG7C,UAAU,aAAa;IACnB,QAAQ,EAAE,OAAO,EAAE,CAAC;IACpB,SAAS,EAAE,SAAS,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,mBAAmB,CAAC,EAAE,OAAO,CAAC;CACjC;AAED,wBAAsB,wBAAwB,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,aAAa,iBAcvF"}
+{"version":3,"file":"writeClientServicesIndex.d.ts","sourceRoot":"","sources":["../../../src/core/utils/writeClientServicesIndex.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC1D,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,UAAU,aAAa;IACnB,QAAQ,EAAE,OAAO,EAAE,CAAC;IACpB,SAAS,EAAE,SAAS,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,mBAAmB,CAAC,EAAE,OAAO,CAAC;CACjC;AAED,wBAAsB,wBAAwB,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,aAAa,iBAuBvF"}

package/dist/core/utils/writeClientServicesIndex.js

@@ -1,16 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.writeClientServicesIndex = writeClientServicesIndex;
+const LoggerMessages_1 = require("../../common/LoggerMessages");
+const fileSystemHelpers_1 = require("../../common/utils/fileSystemHelpers");
 const pathHelpers_1 = require("../../common/utils/pathHelpers");
-const appendUniqueLinesToFile_1 = require("./appendUniqueLinesToFile");
 async function writeClientServicesIndex(options) {
     const { services, templates, outputServices, useSeparatedIndexes } = options;
     if (!useSeparatedIndexes) {
         return;
     }
     const filePath = (0, pathHelpers_1.resolveHelper)(outputServices, 'index.ts');
-    this.logger.info(`Data has been written to a file: ${filePath}`);
+    this.logger.info(LoggerMessages_1.LOGGER_MESSAGES.WRITE_CLIENT.INDEX_DATA_WRITTEN(filePath));
     const content = templates.indexes.services({ services });
-    await (0, appendUniqueLinesToFile_1.appendUniqueLinesToFile)(filePath, content);
-    this.logger.info(`Writing to the file is completed: ${filePath}`);
+    let existingContent = '';
+    const fileExists = await fileSystemHelpers_1.fileSystemHelpers.exists(filePath);
+    if (fileExists) {
+        existingContent = await fileSystemHelpers_1.fileSystemHelpers.readFile(filePath, 'utf8');
+    }
+    const existingLines = existingContent.split(/\r?\n/).filter(Boolean);
+    const dataLines = content.split(/\r?\n/).filter(Boolean);
+    const linesToAdd = dataLines.filter(line => !existingLines.includes(line.trim()));
+    const updatedContent = linesToAdd.length > 0 ? existingContent + linesToAdd.join('\n') + '\n' : existingContent;
+    await this.writeOutputFile(filePath, updatedContent);
+    this.logger.info(LoggerMessages_1.LOGGER_MESSAGES.WRITE_CLIENT.INDEX_WRITE_COMPLETED(filePath));
 }

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/core/utils/writeFileIfChanged.d.ts

@@ -0,0 +1,3 @@
+export type WriteFileIfChangedResult = 'written' | 'unchanged';
+export declare function writeFileIfChanged(filePath: string, nextContent: string): Promise<WriteFileIfChangedResult>;
+//# sourceMappingURL=writeFileIfChanged.d.ts.map

package/dist/core/utils/writeFileIfChanged.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"writeFileIfChanged.d.ts","sourceRoot":"","sources":["../../../src/core/utils/writeFileIfChanged.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,wBAAwB,GAAG,SAAS,GAAG,WAAW,CAAC;AAE/D,wBAAsB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAiBjH"}

package/dist/core/utils/writeFileIfChanged.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.writeFileIfChanged = writeFileIfChanged;
+const fileSystemHelpers_1 = require("../../common/utils/fileSystemHelpers");
+async function writeFileIfChanged(filePath, nextContent) {
+    try {
+        const fileExists = await fileSystemHelpers_1.fileSystemHelpers.exists(filePath);
+        if (fileExists) {
+            const currentContent = await fileSystemHelpers_1.fileSystemHelpers.readFile(filePath, 'utf8');
+            if (currentContent === nextContent) {
+                return 'unchanged';
+            }
+        }
+    }
+    catch (error) {
+        if (error?.code !== 'ENOENT') {
+            throw error;
+        }
+    }
+    await fileSystemHelpers_1.fileSystemHelpers.writeFile(filePath, nextContent);
+    return 'written';
+}

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

@@ -0,0 +1,8 @@
+declare const _default: {
+    compiler: (string | number)[];
+    main: (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
+    usePartial: boolean;
+    useData: boolean;
+};
+export default _default;
+//# sourceMappingURL=customCreateExecutorAdapter.d.ts.map

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

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

package/dist/templatesCompiled/cli/customCreateExecutorAdapter.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+// This is an automatically generated file for the hbs template.
+// You don't need to change it, run npm run build:hbs to update it.
+/* istanbul ignore file */
+/* tslint: disable */
+/* eslint: disable */
+// @ts-nocheck
+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 : "")
+            + "\nimport type { ApiResult } from './ApiResult';\nimport type { ApiRequestOptions } from './ApiRequestOptions';\nimport type { TOpenAPIConfig } from './OpenAPI';\nimport { OpenAPI } from './OpenAPI';\nimport type { RequestExecutor, RequestConfig } from './executor/requestExecutor';\nimport { request as transportRequest, requestRaw as transportRequestRaw } from './request';\n\n/**\n * Typed per-request options mapped into ApiRequestOptions via mapOptions.\n */\nexport interface MyCustomOptions {\n    timeout?: number;\n}\n\nfunction toApiRequestOptions(config: RequestConfig): ApiRequestOptions {\n    return {\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\n/**\n * Custom createExecutorAdapter for openapi.config.json \"customExecutorPath\".\n * Must export a function named createExecutorAdapter.\n */\nexport function createExecutorAdapter<TRequestOptions extends MyCustomOptions = MyCustomOptions>(\n    openApiConfig: TOpenAPIConfig = OpenAPI,\n    mapOptions?: (options: TRequestOptions | undefined) => Partial<ApiRequestOptions>,\n): RequestExecutor<TRequestOptions> {\n    const toMergedOptions = (config: RequestConfig, options?: TRequestOptions): ApiRequestOptions => ({\n        ...toApiRequestOptions(config),\n        ...(mapOptions ? mapOptions(options) : {}),\n    });\n\n    return {\n        request<TResponse>(config: RequestConfig, options?: TRequestOptions): Promise<TResponse> {\n            return transportRequest<TResponse>(toMergedOptions(config, options), openApiConfig);\n        },\n\n        requestRaw<TResponse>(config: RequestConfig, options?: TRequestOptions): Promise<ApiResult<TResponse>> {\n            return transportRequestRaw<TResponse>(toMergedOptions(config, options), openApiConfig);\n        },\n    };\n}\n";
+    }, "usePartial": true, "useData": true };

package/dist/templatesCompiled/cli/customRequest.js

@@ -7,11 +7,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 /* eslint: disable */
 // @ts-nocheck
 exports.default = { "1": function (container, depth0, helpers, partials, data) {
-        return "import type { CancelablePromise } from './CancelablePromise';\n";
+        return "import { CancelablePromise } from './CancelablePromise';\n";
     }, "3": 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 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";
+        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            onCancel(() => abortController.abort());\n\n            const url = buildUrl(options, config);\n            const response = await fetch(url, {\n                method: options.method,\n                headers: options.headers as HeadersInit,\n                body: options.body ? JSON.stringify(options.body) : undefined,\n                signal: abortController.signal,\n            });\n\n            const body = await response.json().catch(() => null);\n\n            if (!response.ok) {\n                throw new ApiError({\n                    status: response.status,\n                    message: response.statusText,\n                    body,\n                    request: toRequestConfig(options),\n                });\n            }\n\n            resolve(body as T);\n        } catch (error) {\n            reject(error);\n        }\n    });\n}\n\nexport function requestRaw<T>(options: ApiRequestOptions, config: TOpenAPIConfig): CancelablePromise<ApiResult<T>> {\n    return new CancelablePromise(async (resolve, reject, onCancel) => {\n        try {\n            const abortController = new AbortController();\n            onCancel(() => abortController.abort());\n\n            const url = buildUrl(options, config);\n            const response = await fetch(url, {\n                method: options.method,\n                headers: options.headers as HeadersInit,\n                body: options.body ? JSON.stringify(options.body) : undefined,\n                signal: abortController.signal,\n            });\n\n            const body = await response.json().catch(() => null);\n            const result: ApiResult<T> = {\n                url,\n                ok: response.ok,\n                status: response.status,\n                statusText: response.statusText,\n                body: body as T,\n            };\n\n            if (!response.ok) {\n                throw new ApiError({\n                    status: response.status,\n                    message: response.statusText,\n                    body,\n                    request: toRequestConfig(options),\n                });\n            }\n\n            resolve(result);\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";
+        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    const url = buildUrl(options, config);\n    const response = await fetch(url, {\n        method: options.method,\n        headers: options.headers as HeadersInit,\n        body: options.body ? JSON.stringify(options.body) : undefined,\n    });\n\n    const body = await response.json().catch(() => null);\n    const result: ApiResult<T> = {\n        url,\n        ok: response.ok,\n        status: response.status,\n        statusText: response.statusText,\n        body: body as T,\n    };\n\n    if (!response.ok) {\n        throw new ApiError({\n            status: response.status,\n            message: response.statusText,\n            body,\n            request: toRequestConfig(options),\n        });\n    }\n\n    return result;\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)) {
@@ -20,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 { 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 : "");
+            + "\nimport { ApiError } from './ApiError';\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": 7, "column": 0 }, "end": { "line": 9, "column": 7 } } })) != null ? stack1 : "")
+            + "\n/**\n * Custom HTTP transport (legacy signature).\n * This file is copied to core/request.ts during generation.\n *\n * After generation, wrap it with createLegacyRequestAdapter from core/executor/legacyRequestAdapter.ts\n * or set \"request\" in openapi.config.json — createExecutorAdapter maps RequestConfig automatically.\n */\nfunction buildUrl(options: ApiRequestOptions, config: TOpenAPIConfig): string {\n    const path = options.path.replace('{api-version}', config.VERSION);\n    return `${config.BASE}${path}`;\n}\n\nfunction toRequestConfig(options: ApiRequestOptions): { method: string; path: string } {\n    return { method: options.method, path: options.path };\n}\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": 27, "column": 0 }, "end": { "line": 132, "column": 7 } } })) != null ? stack1 : "");
     }, "usePartial": true, "useData": true };

package/dist/templatesCompiled/cli/customRequestExecutor.js

@@ -7,11 +7,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 /* eslint: disable */
 // @ts-nocheck
 exports.default = { "1": function (container, depth0, helpers, partials, data) {
-        return "import type { CancelablePromise } from './CancelablePromise';\n";
+        return "import { 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";
+        return "export const customExecutor: RequestExecutor<MyCustomOptions> = {\n    request<TResponse>(config: RequestConfig, options?: MyCustomOptions): CancelablePromise<TResponse> {\n        return new CancelablePromise(async (resolve, reject, onCancel) => {\n            try {\n                const abortController = new AbortController();\n                if (options?.timeout) {\n                    const timeoutId = setTimeout(() => abortController.abort(), options.timeout);\n                    onCancel(() => clearTimeout(timeoutId));\n                }\n                onCancel(() => abortController.abort());\n\n                const response = await fetch(buildUrl(config), {\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.status} ${response.statusText}`);\n                }\n\n                resolve((await response.json()) as TResponse);\n            } catch (error) {\n                reject(error);\n            }\n        });\n    },\n\n    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                if (options?.timeout) {\n                    const timeoutId = setTimeout(() => abortController.abort(), options.timeout);\n                    onCancel(() => clearTimeout(timeoutId));\n                }\n                onCancel(() => abortController.abort());\n\n                const url = buildUrl(config);\n                const response = await fetch(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                const body = (await response.json().catch(() => null)) as TResponse;\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};\n";
     }, "5": function (container, depth0, helpers, partials, data) {
-        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";
+        return "export const customExecutor: RequestExecutor<MyCustomOptions> = {\n    async request<TResponse>(config: RequestConfig, options?: MyCustomOptions): Promise<TResponse> {\n        const response = await fetch(buildUrl(config), {\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.status} ${response.statusText}`);\n        }\n\n        return response.json() as Promise<TResponse>;\n    },\n\n    async requestRaw<TResponse>(config: RequestConfig, options?: MyCustomOptions): Promise<ApiResult<TResponse>> {\n        const url = buildUrl(config);\n        const response = await fetch(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        const body = (await response.json().catch(() => null)) as TResponse;\n        return {\n            url,\n            ok: response.ok,\n            status: response.status,\n            statusText: response.statusText,\n            body,\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)) {
@@ -20,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 { 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 { 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(3, data, 0), "inverse": container.program(5, data, 0), "data": data, "loc": { "start": { "line": 28, "column": 0 }, "end": { "line": 84, "column": 7 } } })) != null ? stack1 : "");
+            + "\nimport type { ApiResult } from './ApiResult';\nimport type { TOpenAPIConfig } from './OpenAPI';\nimport { OpenAPI } from './OpenAPI';\nimport type { RequestExecutor, RequestConfig } from './executor/requestExecutor';\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": 7, "column": 0 }, "end": { "line": 9, "column": 7 } } })) != null ? stack1 : "")
+            + "\n/**\n * Typed per-request options (customize as needed).\n */\nexport interface MyCustomOptions {\n    timeout?: number;\n    retries?: number;\n}\n\nfunction buildUrl(config: RequestConfig, openApiConfig: TOpenAPIConfig = OpenAPI): string {\n    const path = config.path.replace('{api-version}', openApiConfig.VERSION);\n    return `${openApiConfig.BASE}${path}`;\n}\n\n/**\n * Custom RequestExecutor for direct service injection:\n *   const service = new SimpleService<MyCustomOptions>(customExecutor);\n *\n * For createClient integration use customExecutorPath with createExecutorAdapter scaffold instead.\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": 30, "column": 0 }, "end": { "line": 128, "column": 7 } } })) != null ? stack1 : "");
     }, "usePartial": true, "useData": true };

package/dist/templatesCompiled/client/core/ApiError.js

@@ -14,5 +14,5 @@ exports.default = { "compiler": [8, ">= 4.3.0"], "main": function (container, de
             return undefined;
         };
         return ((stack1 = container.invokePartial(lookupProperty(partials, "header"), depth0, { "name": "header", "data": data, "helpers": helpers, "partials": partials, "decorators": container.decorators })) != null ? stack1 : "")
-            + "\nimport { RequestConfig } from './executor/requestExecutor';\n\nexport class ApiError<TBody = unknown> extends Error {\n    readonly status: number;\n    readonly body?: TBody;\n    readonly headers?: Record<string, string>;\n    readonly request: RequestConfig;\n\n    constructor(params: { status: number; message: string; body?: TBody; headers?: Record<string, string>; request: RequestConfig }) {\n        super(params.message);\n        this.name = 'ApiError';\n        this.status = params.status;\n        this.body = params.body;\n        this.headers = params.headers;\n        this.request = params.request;\n    }\n}\n";
+            + "\nimport type { RequestConfig } from './executor/requestExecutor';\n\nexport class ApiError<TBody = unknown> extends Error {\n    readonly status: number;\n    readonly body?: TBody;\n    readonly headers?: Record<string, string>;\n    readonly request: RequestConfig;\n\n    constructor(params: { status: number; message: string; body?: TBody; headers?: Record<string, string>; request: RequestConfig }) {\n        super(params.message);\n        this.name = 'ApiError';\n        this.status = params.status;\n        this.body = params.body;\n        this.headers = params.headers;\n        this.request = params.request;\n    }\n}\n";
     }, "usePartial": true, "useData": true };

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

@@ -1,10 +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;
-    "5": (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;
     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,wBA6BmC"}
+{"version":3,"file":"createExecutorAdapter.d.ts","sourceRoot":"","sources":["../../../../../src/templatesCompiled/client/core/executor/createExecutorAdapter.ts"],"names":[],"mappings":";;;;;;AAMA,wBAUmC"}

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

@@ -6,32 +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 { 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) {
-        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";
-    }, "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            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) {
+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 : "")
-            + "\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(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(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";
+            + "\nimport type { ApiResult } from '../ApiResult';\nimport type { RequestExecutor, RequestConfig } from './requestExecutor';\nimport type { ApiRequestOptions } from '../ApiRequestOptions';\nimport type { TOpenAPIConfig } from '../OpenAPI';\nimport { OpenAPI } from '../OpenAPI';\nimport { request as __request, requestRaw as __requestRaw } from '../request';\n\nfunction toApiRequestOptions(config: RequestConfig): ApiRequestOptions {\n    return {\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\n/**\n * Creates the default RequestExecutor bridging RequestConfig to the HTTP transport.\n *\n * @param openApiConfig - Runtime OpenAPI settings (BASE, TOKEN, HEADERS, etc.)\n * @param mapOptions - Maps typed per-request options (TRequestOptions) into transport-specific ApiRequestOptions\n */\nexport function createExecutorAdapter<TRequestOptions extends Record<string, any>>(\n    openApiConfig: TOpenAPIConfig = OpenAPI,\n    mapOptions?: (options: TRequestOptions | undefined) => Partial<ApiRequestOptions>,\n): RequestExecutor<TRequestOptions> {\n    const toMergedOptions = (config: RequestConfig, options?: TRequestOptions): ApiRequestOptions => ({\n        ...toApiRequestOptions(config),\n        ...(mapOptions ? mapOptions(options) : {}),\n    });\n\n    return {\n        requestRaw<TResponse>(config: RequestConfig, options?: TRequestOptions): Promise<ApiResult<TResponse>> {\n            return __requestRaw<TResponse>(toMergedOptions(config, options), openApiConfig);\n        },\n        request<TResponse>(config: RequestConfig, options?: TRequestOptions): Promise<TResponse> {\n            return __request<TResponse>(toMergedOptions(config, options), openApiConfig);\n        },\n    };\n}\n";
     }, "usePartial": true, "useData": true };

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

@@ -0,0 +1,11 @@
+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;
+    compiler: (string | number)[];
+    main: (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
+    usePartial: boolean;
+    useData: boolean;
+};
+export default _default;
+//# sourceMappingURL=legacyRequestAdapter.d.ts.map

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

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

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

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+// This is an automatically generated file for the hbs template.
+// You don't need to change it, run npm run build:hbs to update it.
+/* istanbul ignore file */
+/* tslint: disable */
+/* eslint: disable */
+// @ts-nocheck
+exports.default = { "1": function (container, depth0, helpers, partials, data) {
+        return "import { requestRaw as legacyRequestRaw } from '../request';\n";
+    }, "3": function (container, depth0, helpers, partials, data) {
+        return "            return legacyRequestRaw<TResponse>(toMergedOptions(config, options), openApiConfig);\n";
+    }, "5": function (container, depth0, helpers, partials, data) {
+        return "            return legacyRequest<TResponse>(toMergedOptions(config, options), openApiConfig).then((body) => ({\n                url: `${openApiConfig.BASE}${config.path}`,\n                ok: true,\n                status: 200,\n                statusText: 'OK',\n                body: body as TResponse,\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)) {
+                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 : "")
+            + "\nimport type { ApiResult } from '../ApiResult';\nimport type { ApiRequestOptions } from '../ApiRequestOptions';\nimport type { TOpenAPIConfig } from '../OpenAPI';\nimport { OpenAPI } from '../OpenAPI';\nimport { request as legacyRequest } from '../request';\n"
+            + ((stack1 = lookupProperty(helpers, "if").call(alias1, lookupProperty(lookupProperty(data, "root"), "useCustomRequestRaw"), { "name": "if", "hash": {}, "fn": container.program(1, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 8, "column": 0 }, "end": { "line": 10, "column": 7 } } })) != null ? stack1 : "")
+            + "import type { RequestExecutor, RequestConfig } from './requestExecutor';\n\nfunction toApiRequestOptions(config: RequestConfig): ApiRequestOptions {\n    return {\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\n/**\n * Adapts legacy request(options, config) transport to the RequestExecutor contract.\n * Use via createClient({ executorFactory: ({ openApiConfig }) => createLegacyRequestAdapter(openApiConfig) }).\n */\nexport function createLegacyRequestAdapter<TRequestOptions extends Record<string, any>>(\n    openApiConfig: TOpenAPIConfig = OpenAPI,\n    mapOptions?: (options: TRequestOptions | undefined) => Partial<ApiRequestOptions>,\n): RequestExecutor<TRequestOptions> {\n    const toMergedOptions = (config: RequestConfig, options?: TRequestOptions): ApiRequestOptions => ({\n        ...toApiRequestOptions(config),\n        ...(mapOptions ? mapOptions(options) : {}),\n    });\n\n    return {\n        request<TResponse>(config: RequestConfig, options?: TRequestOptions): Promise<TResponse> {\n            return legacyRequest<TResponse>(toMergedOptions(config, options), openApiConfig);\n        },\n\n        requestRaw<TResponse>(config: RequestConfig, options?: TRequestOptions): Promise<ApiResult<TResponse>> {\n"
+            + ((stack1 = lookupProperty(helpers, "if").call(alias1, lookupProperty(lookupProperty(data, "root"), "useCustomRequestRaw"), { "name": "if", "hash": {}, "fn": container.program(3, data, 0), "inverse": container.program(5, data, 0), "data": data, "loc": { "start": { "line": 45, "column": 12 }, "end": { "line": 55, "column": 19 } } })) != null ? stack1 : "")
+            + "        },\n    };\n}\n";
+    }, "usePartial": true, "useData": true };

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

@@ -1,4 +1,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;
     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,wBAUmC"}
+{"version":3,"file":"requestExecutor.d.ts","sourceRoot":"","sources":["../../../../../src/templatesCompiled/client/core/executor/requestExecutor.ts"],"names":[],"mappings":";;;;;;;;AAMA,wBAgBmC"}

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

@@ -6,7 +6,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 /* tslint: disable */
 /* eslint: disable */
 // @ts-nocheck
-exports.default = { "compiler": [8, ">= 4.3.0"], "main": function (container, depth0, helpers, partials, data) {
+exports.default = { "1": function (container, depth0, helpers, partials, data) {
+        return "import type { CancelablePromise } from '../CancelablePromise';\n\ntype ExecutorReturn<T> = CancelablePromise<T>;\n";
+    }, "3": function (container, depth0, helpers, partials, data) {
+        return "type ExecutorReturn<T> = Promise<T>;\n";
+    }, "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];
@@ -14,5 +18,7 @@ exports.default = { "compiler": [8, ">= 4.3.0"], "main": function (container, de
             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 { 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";
+            + "\nimport type { ApiResult } from '../ApiResult';\n"
+            + ((stack1 = lookupProperty(helpers, "if").call(depth0 != null ? depth0 : (container.nullContext || {}), lookupProperty(lookupProperty(data, "root"), "useCancelableRequest"), { "name": "if", "hash": {}, "fn": container.program(1, data, 0), "inverse": container.program(3, data, 0), "data": data, "loc": { "start": { "line": 4, "column": 0 }, "end": { "line": 10, "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  ): ExecutorReturn<TResponse>;\n\n  requestRaw<TResponse>(\n    config: RequestConfig,\n    options?: TOptions\n  ): ExecutorReturn<ApiResult<TResponse>>;\n}\n";
     }, "usePartial": true, "useData": true };

package/dist/templatesCompiled/client/core/functions/catchErrors.js

@@ -7,5 +7,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
 /* eslint: disable */
 // @ts-nocheck
 exports.default = { "compiler": [8, ">= 4.3.0"], "main": function (container, depth0, helpers, partials, data) {
-        return "function catchErrors(options: ApiRequestOptions, result: ApiResult<unknown>): void {\n    const errors: Record<string, string> = {\n        [EHTTP_STATUS_CODES.BAD_GATEWAY]: EHTTP_STATUS_NAME.BAD_GATEWAY,\n        [EHTTP_STATUS_CODES.BAD_REQUEST]: EHTTP_STATUS_NAME.BAD_REQUEST,\n        [EHTTP_STATUS_CODES.FORBIDDEN]: EHTTP_STATUS_NAME.FORBIDDEN,\n        [EHTTP_STATUS_CODES.INTERNAL_SERVER_ERROR]: EHTTP_STATUS_NAME.INTERNAL_SERVER_ERROR,\n        [EHTTP_STATUS_CODES.NOT_FOUND]: EHTTP_STATUS_NAME.NOT_FOUND,\n        [EHTTP_STATUS_CODES.SERVICE_UNAVAILABLE]: EHTTP_STATUS_NAME.SERVICE_UNAVAILABLE,\n        [EHTTP_STATUS_CODES.UNAUTHORIZED]: EHTTP_STATUS_NAME.UNAUTHORIZED,\n        ...options.errors,\n    }\n\n    const error = errors[result.status];\n    if (error) {\n        throw new ApiError({\n            message: result.statusText,\n            status: result.status,\n            request: options,\n        });\n    }\n\n    if (!result.ok) {\n        throw new ApiError({\n            message: 'Generic Error',\n            status: result.status,\n            request: options,\n        });\n    }\n}\n";
+        return "function toRequestConfig(options: ApiRequestOptions): { method: string; path: string; headers?: Record<string, string>; query?: Record<string, any>; body?: unknown } {\n    return {\n        method: options.method,\n        path: options.path,\n        headers: options.headers,\n        query: options.query,\n        body: options.body,\n    };\n}\n\nfunction catchErrors(options: ApiRequestOptions, result: ApiResult<unknown>): void {\n    const errors: Record<string, string> = {\n        [EHTTP_STATUS_CODES.BAD_GATEWAY]: EHTTP_STATUS_NAME.BAD_GATEWAY,\n        [EHTTP_STATUS_CODES.BAD_REQUEST]: EHTTP_STATUS_NAME.BAD_REQUEST,\n        [EHTTP_STATUS_CODES.FORBIDDEN]: EHTTP_STATUS_NAME.FORBIDDEN,\n        [EHTTP_STATUS_CODES.INTERNAL_SERVER_ERROR]: EHTTP_STATUS_NAME.INTERNAL_SERVER_ERROR,\n        [EHTTP_STATUS_CODES.NOT_FOUND]: EHTTP_STATUS_NAME.NOT_FOUND,\n        [EHTTP_STATUS_CODES.SERVICE_UNAVAILABLE]: EHTTP_STATUS_NAME.SERVICE_UNAVAILABLE,\n        [EHTTP_STATUS_CODES.UNAUTHORIZED]: EHTTP_STATUS_NAME.UNAUTHORIZED,\n        ...options.errors,\n    }\n\n    const error = errors[result.status];\n    if (error) {\n        throw new ApiError({\n            message: result.statusText,\n            status: result.status,\n            body: result.body,\n            request: toRequestConfig(options),\n        });\n    }\n\n    if (!result.ok) {\n        throw new ApiError({\n            message: 'Generic Error',\n            status: result.status,\n            body: result.body,\n            request: toRequestConfig(options),\n        });\n    }\n}\n";
     }, "useData": true };

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

@@ -14,5 +14,5 @@ exports.default = { "compiler": [8, ">= 4.3.0"], "main": function (container, de
             return undefined;
         };
         return ((stack1 = container.invokePartial(lookupProperty(partials, "header"), depth0, { "name": "header", "data": data, "helpers": helpers, "partials": partials, "decorators": container.decorators })) != null ? stack1 : "")
-            + "\nimport { ErrorInterceptor } from './interceptors';\nimport { ApiError } from '../ApiError';\n\ninterface ExecutorError {\n    status: number;\n    body?: unknown;\n    headers?: Record<string, string>;\n}\n\nexport const apiErrorInterceptor: ErrorInterceptor = (error, request) => {\n    if (typeof error === 'object' && error && 'status' in error) {\n        const e = error as ExecutorError;\n\n        throw new ApiError({\n            status: e.status,\n            message: `Request failed with status ${e.status}`,\n            body: e.body,\n            headers: e.headers,\n            request,\n        });\n    }\n\n    throw error;\n};";
+            + "\nimport type { ErrorInterceptor } from './interceptors';\nimport { ApiError } from '../ApiError';\n\ninterface ExecutorError {\n    status: number;\n    body?: unknown;\n    headers?: Record<string, string>;\n}\n\nexport const apiErrorInterceptor: ErrorInterceptor = (error, request) => {\n    if (error instanceof ApiError) {\n        throw error;\n    }\n\n    if (typeof error === 'object' && error && 'status' in error) {\n        const e = error as ExecutorError;\n\n        throw new ApiError({\n            status: e.status,\n            message: `Request failed with status ${e.status}`,\n            body: e.body,\n            headers: e.headers,\n            request,\n        });\n    }\n\n    throw error;\n};\n";
     }, "usePartial": true, "useData": true };

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

@@ -14,5 +14,5 @@ exports.default = { "compiler": [8, ">= 4.3.0"], "main": function (container, de
             return undefined;
         };
         return ((stack1 = container.invokePartial(lookupProperty(partials, "header"), depth0, { "name": "header", "data": data, "helpers": helpers, "partials": partials, "decorators": container.decorators })) != null ? stack1 : "")
-            + "\nimport { RequestConfig } from '../executor/requestExecutor';\n\nexport type RequestInterceptor =\n  (config: RequestConfig) => RequestConfig | Promise<RequestConfig>;\n\nexport type ResponseInterceptor<T = unknown> =\n  (response: T, context: RequestConfig) => T | Promise<T>;\n\nexport type ErrorInterceptor =\n  (error: unknown, context: RequestConfig) => unknown | Promise<unknown>;";
+            + "\nimport type { RequestConfig } from '../executor/requestExecutor';\n\nexport type RequestInterceptor =\n  (config: RequestConfig) => RequestConfig | Promise<RequestConfig>;\n\nexport type ResponseInterceptor<T = unknown> =\n  (response: T, context: RequestConfig) => T | Promise<T>;\n\nexport type ErrorInterceptor =\n  (error: unknown, context: RequestConfig) => unknown | Promise<unknown>;\n\nconst REQUEST_RECOVERY_BRAND = Symbol.for('@openapi-codegen/RequestRecovery');\n\n/**\n * Return from an ErrorInterceptor to recover from a failed request instead of re-throwing.\n * The recovered value is passed through onResponse interceptors.\n */\nexport class RequestRecovery<T = unknown> {\n  constructor(public readonly value: T) {\n    Object.defineProperty(this, REQUEST_RECOVERY_BRAND, { value: true, enumerable: false });\n  }\n}\n\nexport function isRequestRecovery(value: unknown): value is RequestRecovery {\n  return typeof value === 'object' && value !== null && REQUEST_RECOVERY_BRAND in value;\n}\n";
     }, "usePartial": true, "useData": true };

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

@@ -14,5 +14,5 @@ exports.default = { "compiler": [8, ">= 4.3.0"], "main": function (container, de
             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 { 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";
+            + "\nimport type { ApiResult } from '../ApiResult';\nimport type { RequestInterceptor, ResponseInterceptor, ErrorInterceptor } from './interceptors';\nimport { isRequestRecovery } from './interceptors';\nimport type { 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            let currentConfig = config;\n\n            try {\n                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\n                for (const interceptor of interceptors.onError ?? []) {\n                    const result = await interceptor(error, currentConfig);\n\n                    if (isRequestRecovery(result)) {\n                        return runResponseInterceptors(result.value as TResponse, currentConfig);\n                    }\n\n                    error = result;\n                }\n\n                throw error;\n            }\n        },\n        async requestRaw<TResponse>(config: RequestConfig, options?: TOptions): Promise<ApiResult<TResponse>> {\n            let currentConfig = config;\n\n            try {\n                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\n                for (const interceptor of interceptors.onError ?? []) {\n                    const result = await interceptor(error, currentConfig);\n\n                    if (isRequestRecovery(result)) {\n                        return runResponseInterceptors(result.value as ApiResult<TResponse>, currentConfig);\n                    }\n\n                    error = result;\n                }\n\n                throw error;\n            }\n        },\n    };\n}\n";
     }, "usePartial": true, "useData": true };

package/dist/templatesCompiled/client/exportClient.d.ts

@@ -1,10 +1,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;
-    "10": (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/exportClient.d.ts.map

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