ts-openapi-codegen 2.0.0-beta.0 → 2.0.0-beta.1

package/README.md

@@ -510,6 +510,80 @@ export function request<T>(config: TOpenAPIConfig, options: ApiRequestOptions):
 }
 ```
 
+### Custom Request Executor
+
+Starting from version 2.0.0-beta.1, generated services use the `RequestExecutor` interface instead of calling the core `request` function directly. This allows you to provide your own request implementation or adapt existing ones.
+
+**Using a custom RequestExecutor:**
+
+You can create your own `RequestExecutor` implementation:
+
+```ts
+import type { RequestExecutor, RequestConfig } from './generated/core/request-executor';
+import { SimpleService } from './generated/services/SimpleService';
+
+// Define your custom options type (optional)
+interface MyCustomOptions {
+    timeout?: number;
+    retries?: number;
+}
+
+// Create a custom executor
+const customExecutor: RequestExecutor<MyCustomOptions> = {
+    async request<TResponse>(config: RequestConfig, options?: MyCustomOptions): Promise<TResponse> {
+        // Your custom request logic here
+        const response = await fetch(config.url, {
+            method: config.method,
+            headers: config.headers,
+            body: config.body ? JSON.stringify(config.body) : undefined,
+            signal: options?.timeout ? AbortSignal.timeout(options.timeout) : undefined,
+        });
+        
+        if (!response.ok) {
+            throw new Error(`Request failed: ${response.statusText}`);
+        }
+        
+        return response.json();
+    },
+};
+
+// Use it with generated services
+const simpleService = new SimpleService<MyCustomOptions>(customExecutor);
+await simpleService.getCallWithoutParametersAndResponse({ timeout: 5000, retries: 3 });
+```
+
+**Using legacy request adapter:**
+
+If you have an existing custom `request` file (specified via `--request` option), you can use the `createLegacyExecutor` helper to adapt it to the new `RequestExecutor` interface:
+
+```ts
+import { createLegacyExecutor } from './generated/core/legacy-request-adapter';
+import { OpenAPI } from './generated/core/OpenAPI';
+import { SimpleService } from './generated/services/SimpleService';
+
+// The legacy adapter wraps your existing request function
+const executor = createLegacyExecutor(OpenAPI);
+
+// Optionally, you can map custom options to ApiRequestOptions
+interface XHROptions {
+    timeout?: number;
+}
+
+const executorWithOptions = createLegacyExecutor<XHROptions>(OpenAPI, (options) => {
+    // Map your custom options to ApiRequestOptions if needed
+    return {
+        // Add any ApiRequestOptions fields based on options
+    };
+});
+
+// Use with services
+const simpleService = new SimpleService(executor);
+await simpleService.getCallWithoutParametersAndResponse();
+```
+
+**Note:** The `--request` option still works for customizing the core `request` function. The generated 
+`legacy-request-adapter` will automatically use your custom request implementation when creating the adapter.
+
 ### Sorting strategy for function arguments `--sortByRequired`
 By default, the OpenAPI generator sorts the parameters of service functions according to a simplified scheme. If you need a more strict sorting option, then you need to use the `--sortByRequired` flag. The simplified sorting option is similar to the one used in version 0.2.3 of the OpenAPI generator. This flag allows you to upgrade to a new version of the generator if you are "stuck" on version 0.2.3.
 

package/README.rus.md

@@ -509,6 +509,79 @@ export function request<T>(config: TOpenAPIConfig, options: ApiRequestOptions):
 }
 ```
 
+### Пользовательский Request Executor
+
+Начиная с версии 2.0.0, сгенерированные сервисы используют интерфейс `RequestExecutor` вместо прямых вызовов core-функции `request`. Это позволяет вам предоставить свою собственную реализацию запросов или адаптировать существующие.
+
+**Использование пользовательского RequestExecutor:**
+
+Вы можете создать свою собственную реализацию `RequestExecutor`:
+
+```ts
+import type { RequestExecutor, RequestConfig } from './generated/core/request-executor';
+import { SimpleService } from './generated/services/SimpleService';
+
+// Определите свой тип опций (опционально)
+interface MyCustomOptions {
+    timeout?: number;
+    retries?: number;
+}
+
+// Создайте пользовательский executor
+const customExecutor: RequestExecutor<MyCustomOptions> = {
+    async request<TResponse>(config: RequestConfig, options?: MyCustomOptions): Promise<TResponse> {
+        // Ваша пользовательская логика запросов здесь
+        const response = await fetch(config.url, {
+            method: config.method,
+            headers: config.headers,
+            body: config.body ? JSON.stringify(config.body) : undefined,
+            signal: options?.timeout ? AbortSignal.timeout(options.timeout) : undefined,
+        });
+        
+        if (!response.ok) {
+            throw new Error(`Request failed: ${response.statusText}`);
+        }
+        
+        return response.json();
+    },
+};
+
+// Используйте его со сгенерированными сервисами
+const simpleService = new SimpleService<MyCustomOptions>(customExecutor);
+await simpleService.getCallWithoutParametersAndResponse({ timeout: 5000, retries: 3 });
+```
+
+**Использование legacy request adapter:**
+
+Если у вас есть существующий пользовательский файл `request` (указанный через опцию `--request`), вы можете использовать хелпер `createLegacyExecutor` для адаптации его к новому интерфейсу `RequestExecutor`:
+
+```ts
+import { createLegacyExecutor } from './generated/core/legacy-request-adapter';
+import { OpenAPI } from './generated/core/OpenAPI';
+import { SimpleService } from './generated/services/SimpleService';
+
+// Legacy адаптер оборачивает вашу существующую функцию request
+const executor = createLegacyExecutor(OpenAPI);
+
+// Опционально, вы можете мапить пользовательские опции в ApiRequestOptions
+interface XHROptions {
+    timeout?: number;
+}
+
+const executorWithOptions = createLegacyExecutor<XHROptions>(OpenAPI, (options) => {
+    // Мапьте ваши пользовательские опции в ApiRequestOptions при необходимости
+    return {
+        // Добавьте любые поля ApiRequestOptions на основе options
+    };
+});
+
+// Используйте со сервисами
+const simpleService = new SimpleService(executor);
+await simpleService.getCallWithoutParametersAndResponse();
+```
+
+**Примечание:** Опция --request по-прежнему работает для кастомизации core-функции request. Сгенерированный legacy-request-adapter автоматически будет использовать вашу пользовательскую реализацию request при создании адаптера.
+
 ### Стратегия сортировки аргументов функций `--sortByRequired`
 По умолчанию генератор OpenAPI сортирует параметры сервисных функций согласно упрощенной схеме. Если вам нужна более строгая опция сортировки, используйте флаг `--sortByRequired`. Упрощенная опция сортировки похожа на ту, что использовалась в версии 0.2.3 генератора OpenAPI. Этот флаг позволяет обновиться до новой версии генератора, если вы "застряли" на версии 0.2.3.
 

package/dist/common/TRawOptions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TRawOptions.d.ts","sourceRoot":"","sources":["../../src/common/TRawOptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAEhD,KAAK,WAAW,GAAG;IACf,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;CACpB,CAAA;AAED,MAAM,MAAM,WAAW,GAAG;IACtB,KAAK,CAAC,EAAE,WAAW,EAAE,CAAC;IACtB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,QAAQ,CAAC,EAAE,SAAS,CAAC;IACrB,SAAS,CAAC,EAAE,UAAU,CAAC;IACvB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,mBAAmB,CAAC,EAAE,OAAO,CAAC;CACjC,CAAA;AAED,MAAM,MAAM,YAAY,GAAG,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;AAEtD,MAAM,MAAM,kBAAkB,GAAG;KAC9B,CAAC,IAAI,MAAM,YAAY,CAAC,CAAC,GAAG,WAAW,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;CAC1D,CAAC"}
+{"version":3,"file":"TRawOptions.d.ts","sourceRoot":"","sources":["../../src/common/TRawOptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAEhD,KAAK,WAAW,GAAG;IACf,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACtB,KAAK,CAAC,EAAE,WAAW,EAAE,CAAC;IACtB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,QAAQ,CAAC,EAAE,SAAS,CAAC;IACrB,SAAS,CAAC,EAAE,UAAU,CAAC;IACvB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,mBAAmB,CAAC,EAAE,OAAO,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;AAEtD,MAAM,MAAM,kBAAkB,GAAG;KAC5B,CAAC,IAAI,MAAM,YAAY,CAAC,CAAC,GAAG,WAAW,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;CAC5D,CAAC"}

package/dist/core/__tests__/WriteClient.test.js

@@ -51,6 +51,8 @@ const WriteClient_1 = require("../WriteClient");
                 request: () => 'request',
                 cancelablePromise: () => 'cancelablePromise',
                 httpStatusCode: () => 'httpStatusCode',
+                legacyRequestAdapter: () => 'legacyRequestAdapter',
+                requestExecutor: () => 'requestExecutor',
             },
         };
         const outputPaths = (0, getOutputPaths_1.getOutputPaths)({ output: './dist' });

package/dist/core/utils/__mocks__/templates.d.ts

@@ -0,0 +1,3 @@
+import { Templates } from '../registerHandlebarTemplates';
+export declare const templates: Templates;
+//# sourceMappingURL=templates.d.ts.map

package/dist/core/utils/__mocks__/templates.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"templates.d.ts","sourceRoot":"","sources":["../../../../src/core/utils/__mocks__/templates.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAE1D,eAAO,MAAM,SAAS,EAAE,SAyBvB,CAAC"}

package/dist/core/utils/__mocks__/templates.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.templates = void 0;
+exports.templates = {
+    indexes: {
+        full: () => 'fullIndex',
+        simple: () => 'simpleIndex',
+        core: () => 'coreIndex',
+        models: () => 'modelsIndex',
+        schemas: () => 'schemasIndex',
+        services: () => 'servicesIndex',
+    },
+    exports: {
+        model: () => 'model',
+        schema: () => 'schema',
+        service: () => 'service',
+    },
+    core: {
+        settings: () => 'settings',
+        apiError: () => 'apiError',
+        apiRequestOptions: () => 'apiRequestOptions',
+        apiResult: () => 'apiResult',
+        request: () => 'request',
+        cancelablePromise: () => 'cancelablePromise',
+        httpStatusCode: () => 'httpStatusCode',
+        legacyRequestAdapter: () => 'legacyRequestAdapter',
+        requestExecutor: () => 'requestExecutor',
+    },
+};

package/dist/core/utils/__tests__/writeClientCore.test.js

@@ -8,6 +8,7 @@ const node_test_1 = require("node:test");
 const fileSystemHelpers_1 = require("../../../common/utils/fileSystemHelpers");
 const HttpClient_enum_1 = require("../../types/enums/HttpClient.enum");
 const WriteClient_1 = require("../../WriteClient");
+const templates_1 = require("../__mocks__/templates");
 (0, node_test_1.describe)('@unit: writeClientCore', () => {
     (0, node_test_1.test)('writes to filesystem', async () => {
         const writeFileCalls = [];
@@ -22,33 +23,9 @@ const WriteClient_1 = require("../../WriteClient");
             models: [],
             services: [],
         };
-        const templates = {
-            indexes: {
-                full: () => 'fullIndex',
-                simple: () => 'simpleIndex',
-                core: () => 'coreIndex',
-                models: () => 'modelsIndex',
-                schemas: () => 'schemasIndex',
-                services: () => 'servicesIndex',
-            },
-            exports: {
-                model: () => 'model',
-                schema: () => 'schema',
-                service: () => 'service',
-            },
-            core: {
-                settings: () => 'settings',
-                apiError: () => 'apiError',
-                apiRequestOptions: () => 'apiRequestOptions',
-                apiResult: () => 'apiResult',
-                request: () => 'request',
-                cancelablePromise: () => 'cancelablePromise',
-                httpStatusCode: () => 'httpStatusCode',
-            },
-        };
         const useCancelableRequest = true;
         const writeClient = new WriteClient_1.WriteClient();
-        await writeClient.writeClientCore({ client, templates, outputCorePath: '/', httpClient: HttpClient_enum_1.HttpClient.FETCH, useCancelableRequest });
+        await writeClient.writeClientCore({ client, templates: templates_1.templates, outputCorePath: '/', httpClient: HttpClient_enum_1.HttpClient.FETCH, useCancelableRequest });
         node_assert_1.default.ok(writeFileCalls.some(([filePath, content]) => filePath.toString().includes('OpenAPI.ts') && content.toString().includes('settings')), 'Expected writeFile to be called with settings content for OpenAPI.ts');
         node_assert_1.default.ok(writeFileCalls.some(([filePath, content]) => filePath.toString().includes('ApiError.ts') && content.toString().includes('apiError')), 'Expected writeFile to be called with apiError content for ApiError.ts');
         node_assert_1.default.ok(writeFileCalls.some(([filePath, content]) => filePath.toString().includes('ApiRequestOptions.ts') && content.toString().includes('apiRequestOptions')), 'Expected writeFile to be called with apiRequestOptions content for ApiRequestOptions.ts');

package/dist/core/utils/__tests__/writeClientFullIndex.test.js

@@ -7,6 +7,7 @@ const node_assert_1 = __importDefault(require("node:assert"));
 const node_test_1 = require("node:test");
 const fileSystemHelpers_1 = require("../../../common/utils/fileSystemHelpers");
 const WriteClient_1 = require("../../WriteClient");
+const templates_1 = require("../__mocks__/templates");
 (0, node_test_1.describe)('@unit: writeClientFullIndex', () => {
     (0, node_test_1.test)('writes to filesystem', async () => {
         const writeFileCalls = [];
@@ -15,32 +16,8 @@ const WriteClient_1 = require("../../WriteClient");
         fileSystemHelpers_1.fileSystemHelpers.writeFile = async (path, content) => {
             writeFileCalls.push([path, content]);
         };
-        const templates = {
-            indexes: {
-                full: () => 'fullIndex',
-                simple: () => 'simpleIndex',
-                core: () => 'coreIndex',
-                models: () => 'modelsIndex',
-                schemas: () => 'schemasIndex',
-                services: () => 'servicesIndex',
-            },
-            exports: {
-                model: () => 'model',
-                schema: () => 'schema',
-                service: () => 'service',
-            },
-            core: {
-                settings: () => 'settings',
-                apiError: () => 'apiError',
-                apiRequestOptions: () => 'apiRequestOptions',
-                apiResult: () => 'apiResult',
-                request: () => 'request',
-                cancelablePromise: () => 'cancelablePromise',
-                httpStatusCode: () => 'httpStatusCode',
-            },
-        };
         const writeClient = new WriteClient_1.WriteClient();
-        await writeClient.writeClientFullIndex({ templates, outputPath: '/', core: [], models: [], schemas: [], services: [] });
+        await writeClient.writeClientFullIndex({ templates: templates_1.templates, outputPath: '/', core: [], models: [], schemas: [], services: [] });
         node_assert_1.default.ok(writeFileCalls.some(([filePath, content]) => filePath.toString().includes('index.ts') && content.toString().includes('fullIndex')), 'Expected writeFile to be called with index content for index.ts');
         // Restoring the original function
         fileSystemHelpers_1.fileSystemHelpers.writeFile = originalWriteFile;

package/dist/core/utils/__tests__/writeClientModels.test.js

@@ -8,6 +8,7 @@ const node_test_1 = require("node:test");
 const fileSystemHelpers_1 = require("../../../common/utils/fileSystemHelpers");
 const HttpClient_enum_1 = require("../../types/enums/HttpClient.enum");
 const WriteClient_1 = require("../../WriteClient");
+const templates_1 = require("../__mocks__/templates");
 (0, node_test_1.describe)('@unit: writeClientModels', () => {
     (0, node_test_1.test)('writes to filesystem', async () => {
         const writeFileCalls = [];
@@ -37,34 +38,10 @@ const WriteClient_1 = require("../../WriteClient");
                 alias: '',
             },
         ];
-        const templates = {
-            indexes: {
-                full: () => 'fullIndex',
-                simple: () => 'simpleIndex',
-                core: () => 'coreIndex',
-                models: () => 'modelsIndex',
-                schemas: () => 'schemasIndex',
-                services: () => 'servicesIndex',
-            },
-            exports: {
-                model: () => 'model',
-                schema: () => 'schema',
-                service: () => 'service',
-            },
-            core: {
-                settings: () => 'settings',
-                apiError: () => 'apiError',
-                apiRequestOptions: () => 'apiRequestOptions',
-                apiResult: () => 'apiResult',
-                request: () => 'request',
-                cancelablePromise: () => 'cancelablePromise',
-                httpStatusCode: () => 'httpStatusCode',
-            },
-        };
         const writeClient = new WriteClient_1.WriteClient();
         await writeClient.writeClientModels({
             models,
-            templates,
+            templates: templates_1.templates,
             outputModelsPath: '/',
             httpClient: HttpClient_enum_1.HttpClient.FETCH,
             useUnionTypes: false,

package/dist/core/utils/__tests__/writeClientSchemas.test.js

@@ -8,6 +8,7 @@ const node_test_1 = require("node:test");
 const fileSystemHelpers_1 = require("../../../common/utils/fileSystemHelpers");
 const HttpClient_enum_1 = require("../../types/enums/HttpClient.enum");
 const WriteClient_1 = require("../../WriteClient");
+const templates_1 = require("../__mocks__/templates");
 (0, node_test_1.describe)('@unit: writeClientSchemas', () => {
     (0, node_test_1.test)('writes to filesystem', async () => {
         const writeFileCalls = [];
@@ -37,34 +38,10 @@ const WriteClient_1 = require("../../WriteClient");
                 properties: [],
             },
         ];
-        const templates = {
-            indexes: {
-                full: () => 'fullIndex',
-                simple: () => 'simpleIndex',
-                core: () => 'coreIndex',
-                models: () => 'modelsIndex',
-                schemas: () => 'schemasIndex',
-                services: () => 'servicesIndex',
-            },
-            exports: {
-                model: () => 'model',
-                schema: () => 'schema',
-                service: () => 'service',
-            },
-            core: {
-                settings: () => 'settings',
-                apiError: () => 'apiError',
-                apiRequestOptions: () => 'apiRequestOptions',
-                apiResult: () => 'apiResult',
-                request: () => 'request',
-                cancelablePromise: () => 'cancelablePromise',
-                httpStatusCode: () => 'httpStatusCode',
-            },
-        };
         const writeClient = new WriteClient_1.WriteClient();
         await writeClient.writeClientSchemas({
             models,
-            templates,
+            templates: templates_1.templates,
             outputSchemasPath: '/',
             httpClient: HttpClient_enum_1.HttpClient.FETCH,
             useUnionTypes: false,

package/dist/core/utils/__tests__/writeClientServices.test.js

@@ -8,6 +8,7 @@ const node_test_1 = require("node:test");
 const fileSystemHelpers_1 = require("../../../common/utils/fileSystemHelpers");
 const HttpClient_enum_1 = require("../../types/enums/HttpClient.enum");
 const WriteClient_1 = require("../../WriteClient");
+const templates_1 = require("../__mocks__/templates");
 (0, node_test_1.describe)('@unit: writeClientServices', () => {
     (0, node_test_1.test)('writes to filesystem', async () => {
         const writeFileCalls = [];
@@ -24,34 +25,10 @@ const WriteClient_1 = require("../../WriteClient");
                 imports: [],
             },
         ];
-        const templates = {
-            indexes: {
-                full: () => 'fullIndex',
-                simple: () => 'simpleIndex',
-                core: () => 'coreIndex',
-                models: () => 'modelsIndex',
-                schemas: () => 'schemasIndex',
-                services: () => 'servicesIndex',
-            },
-            exports: {
-                model: () => 'model',
-                schema: () => 'schema',
-                service: () => 'service',
-            },
-            core: {
-                settings: () => 'settings',
-                apiError: () => 'apiError',
-                apiRequestOptions: () => 'apiRequestOptions',
-                apiResult: () => 'apiResult',
-                request: () => 'request',
-                cancelablePromise: () => 'cancelablePromise',
-                httpStatusCode: () => 'httpStatusCode',
-            },
-        };
         const writeClient = new WriteClient_1.WriteClient();
         await writeClient.writeClientServices({
             services,
-            templates,
+            templates: templates_1.templates,
             outputPaths: {
                 outputCore: '/',
                 outputModels: '/',

package/dist/core/utils/registerHandlebarTemplates.d.ts

@@ -22,6 +22,8 @@ export interface Templates {
         request: Handlebars.TemplateDelegate;
         cancelablePromise: Handlebars.TemplateDelegate;
         httpStatusCode: Handlebars.TemplateDelegate;
+        requestExecutor: Handlebars.TemplateDelegate;
+        legacyRequestAdapter: Handlebars.TemplateDelegate;
     };
 }
 /**

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

@@ -1 +1 @@
-{"version":3,"file":"registerHandlebarTemplates.d.ts","sourceRoot":"","sources":["../../../src/core/utils/registerHandlebarTemplates.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,UAAU,MAAM,oBAAoB,CAAC;AAuFjD,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAE5D,MAAM,WAAW,SAAS;IACtB,OAAO,EAAE;QACL,IAAI,EAAE,UAAU,CAAC,gBAAgB,CAAC;QAClC,MAAM,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACpC,IAAI,EAAE,UAAU,CAAC,gBAAgB,CAAC;QAClC,MAAM,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACpC,OAAO,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACrC,QAAQ,EAAE,UAAU,CAAC,gBAAgB,CAAC;KACzC,CAAA;IACD,OAAO,EAAE;QACL,KAAK,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACnC,MAAM,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACpC,OAAO,EAAE,UAAU,CAAC,gBAAgB,CAAC;KACxC,CAAC;IACF,IAAI,EAAE;QACF,QAAQ,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACtC,QAAQ,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACtC,iBAAiB,EAAE,UAAU,CAAC,gBAAgB,CAAC;QAC/C,SAAS,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACvC,OAAO,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACrC,iBAAiB,EAAE,UAAU,CAAC,gBAAgB,CAAC;QAC/C,cAAc,EAAE,UAAU,CAAC,gBAAgB,CAAC;KAC/C,CAAC;CACL;AAED;;;GAGG;AACH,wBAAgB,0BAA0B,CAAC,IAAI,EAAE;IAAE,UAAU,EAAE,UAAU,CAAC;IAAC,UAAU,EAAE,OAAO,CAAC;IAAC,aAAa,EAAE,OAAO,CAAA;CAAE,GAAG,SAAS,CA4GnI"}
+{"version":3,"file":"registerHandlebarTemplates.d.ts","sourceRoot":"","sources":["../../../src/core/utils/registerHandlebarTemplates.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,UAAU,MAAM,oBAAoB,CAAC;AAyFjD,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAE5D,MAAM,WAAW,SAAS;IACtB,OAAO,EAAE;QACL,IAAI,EAAE,UAAU,CAAC,gBAAgB,CAAC;QAClC,MAAM,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACpC,IAAI,EAAE,UAAU,CAAC,gBAAgB,CAAC;QAClC,MAAM,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACpC,OAAO,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACrC,QAAQ,EAAE,UAAU,CAAC,gBAAgB,CAAC;KACzC,CAAA;IACD,OAAO,EAAE;QACL,KAAK,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACnC,MAAM,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACpC,OAAO,EAAE,UAAU,CAAC,gBAAgB,CAAC;KACxC,CAAC;IACF,IAAI,EAAE;QACF,QAAQ,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACtC,QAAQ,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACtC,iBAAiB,EAAE,UAAU,CAAC,gBAAgB,CAAC;QAC/C,SAAS,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACvC,OAAO,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACrC,iBAAiB,EAAE,UAAU,CAAC,gBAAgB,CAAC;QAC/C,cAAc,EAAE,UAAU,CAAC,gBAAgB,CAAC;QAC5C,eAAe,EAAE,UAAU,CAAC,gBAAgB,CAAC;QAC7C,oBAAoB,EAAE,UAAU,CAAC,gBAAgB,CAAC;KACrD,CAAC;CACL;AAED;;;GAGG;AACH,wBAAgB,0BAA0B,CAAC,IAAI,EAAE;IAAE,UAAU,EAAE,UAAU,CAAC;IAAC,UAAU,EAAE,OAAO,CAAC;IAAC,aAAa,EAAE,OAAO,CAAA;CAAE,GAAG,SAAS,CA8GnI"}

package/dist/core/utils/registerHandlebarTemplates.js

@@ -77,6 +77,8 @@ const sendRequest_3 = __importDefault(require("../../templatesCompiled/client/co
 const OpenAPI_1 = __importDefault(require("../../templatesCompiled/client/core/OpenAPI"));
 const CancelablePromise_1 = __importDefault(require("../../templatesCompiled/client/core/CancelablePromise"));
 const request_4 = __importDefault(require("../../templatesCompiled/client/core/request"));
+const request_executor_1 = __importDefault(require("../../templatesCompiled/client/core/request-executor"));
+const legacy_request_adapter_1 = __importDefault(require("../../templatesCompiled/client/core/legacy-request-adapter"));
 const getHeaders_4 = __importDefault(require("../../templatesCompiled/client/core/xhr/getHeaders"));
 const getRequestBody_4 = __importDefault(require("../../templatesCompiled/client/core/xhr/getRequestBody"));
 const getResponseBody_4 = __importDefault(require("../../templatesCompiled/client/core/xhr/getResponseBody"));
@@ -153,6 +155,8 @@ function registerHandlebarTemplates(root) {
             request: Handlebars.template(request_4.default),
             cancelablePromise: Handlebars.template(CancelablePromise_1.default),
             httpStatusCode: Handlebars.template(HttpStatusCode_1.default),
+            requestExecutor: Handlebars.template(request_executor_1.default),
+            legacyRequestAdapter: Handlebars.template(legacy_request_adapter_1.default),
         },
     };
     // Partials for the generations of the models, services, etc.

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

@@ -1 +1 @@
-{"version":3,"file":"writeClientCore.d.ts","sourceRoot":"","sources":["../../../src/core/utils/writeClientCore.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAEzD;;;;;;;GAOG;AACH,UAAU,gBAAgB;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,SAAS,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,EAAE,UAAU,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,mBAAmB,CAAC,EAAE,OAAO,CAAC;CACjC;AAED;;;;;;;;GAQG;AACH,wBAAsB,eAAe,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAgCjG"}
+{"version":3,"file":"writeClientCore.d.ts","sourceRoot":"","sources":["../../../src/core/utils/writeClientCore.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAEzD;;;;;;;GAOG;AACH,UAAU,gBAAgB;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,SAAS,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,EAAE,UAAU,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,mBAAmB,CAAC,EAAE,OAAO,CAAC;CACjC;AAED;;;;;;;;GAQG;AACH,wBAAsB,eAAe,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAmCjG"}

package/dist/core/utils/writeClientCore.js

@@ -31,6 +31,9 @@ async function writeClientCore(options) {
     }
     await fileSystemHelpers_1.fileSystemHelpers.writeFile((0, pathHelpers_1.resolveHelper)(outputCorePath, 'HttpStatusCode.ts'), templates.core.httpStatusCode({}));
     await fileSystemHelpers_1.fileSystemHelpers.writeFile((0, pathHelpers_1.resolveHelper)(outputCorePath, 'request.ts'), templates.core.request(context));
+    await fileSystemHelpers_1.fileSystemHelpers.writeFile((0, pathHelpers_1.resolveHelper)(outputCorePath, 'request-executor.ts'), templates.core.requestExecutor({}));
+    // TODO: Добавлять только, если не выбран custom-ный request
+    await fileSystemHelpers_1.fileSystemHelpers.writeFile((0, pathHelpers_1.resolveHelper)(outputCorePath, 'legacy-request-adapter.ts'), templates.core.legacyRequestAdapter({}));
     if (request) {
         const requestFile = (0, pathHelpers_1.resolveHelper)(process.cwd(), request);
         const requestFileExists = await fileSystemHelpers_1.fileSystemHelpers.exists(requestFile);

package/dist/templatesCompiled/client/core/legacy-request-adapter.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=legacy-request-adapter.d.ts.map

package/dist/templatesCompiled/client/core/legacy-request-adapter.d.ts.map

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

package/dist/templatesCompiled/client/core/legacy-request-adapter.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 { RequestExecutor, RequestConfig } from './request-executor';\nimport type { ApiRequestOptions } from './ApiRequestOptions';\nimport type { TOpenAPIConfig } from './OpenAPI';\nimport { OpenAPI } from './OpenAPI';\nimport { request as __request } from './request';\n\n/**\n * Legacy RequestExecutor-адаптер поверх существующего request(ApiRequestOptions, OpenAPI).\n *\n * TOptions — тип рантайм-опций транспорта (IXHROptions, IFetchOptions и т.п.).\n * mapOptions — опциональная функция, которая мапит TOptions → часть ApiRequestOptions.\n */\nexport function createLegacyExecutor<TOptions = unknown>(\n    openApiConfig: TOpenAPIConfig = OpenAPI,\n    mapOptions?: (options: TOptions | undefined) => Partial<ApiRequestOptions>,\n): RequestExecutor<TOptions> {\n    return {\n        request<TResponse>(config: RequestConfig, options?: TOptions): Promise<TResponse> {\n            const baseOptions: ApiRequestOptions = {\n                method: config.method as ApiRequestOptions['method'],\n                path: config.url,         // RequestConfig.url → ApiRequestOptions.path\n                headers: config.headers,\n                query: config.query,\n                body: config.body,\n            };\n\n            const mergedOptions: ApiRequestOptions = {\n                ...baseOptions,\n                ...(mapOptions ? mapOptions(options) : {}),\n            };\n\n            return __request<TResponse>(mergedOptions, openApiConfig);\n        },\n    };\n}";
+    }, "usePartial": true, "useData": true };

package/dist/templatesCompiled/client/core/request-executor.d.ts

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

package/dist/templatesCompiled/client/core/request-executor.d.ts.map

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

package/dist/templatesCompiled/client/core/request-executor.js

@@ -0,0 +1,11 @@
+"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) {
+        return "export interface RequestConfig {\n  method: string;\n  url: string;\n  headers?: Record<string, string>;\n  query?: Record<string, any>;\n  body?: unknown;\n}\n\nexport interface RequestExecutor<TOptions = unknown> {\n  request<TResponse>(\n    config: RequestConfig,\n    options?: TOptions\n  ): Promise<TResponse>;\n}";
+    }, "useData": true };

package/dist/templatesCompiled/client/exportService.d.ts.map

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

package/dist/templatesCompiled/client/exportService.js

@@ -49,10 +49,10 @@ exports.default = { "1": function (container, depth0, helpers, partials, data) {
             return undefined;
         };
         return "const "
-            + ((stack1 = container.lambda(container.strict(depth0, "name", { "start": { "line": 16, "column": 9 }, "end": { "line": 16, "column": 13 } }), depth0)) != null ? stack1 : "")
+            + ((stack1 = container.lambda(container.strict(depth0, "name", { "start": { "line": 14, "column": 9 }, "end": { "line": 14, "column": 13 } }), depth0)) != null ? stack1 : "")
             + " = ("
             + ((stack1 = container.invokePartial(lookupProperty(partials, "parameters"), depth0, { "name": "parameters", "data": data, "helpers": helpers, "partials": partials, "decorators": container.decorators })) != null ? stack1 : "")
-            + "): ApiRequestOptions => ({\n    "
+            + "): RequestConfig => ({\n    "
             + ((stack1 = container.invokePartial(lookupProperty(partials, "serviceOption"), depth0, { "name": "serviceOption", "data": data, "helpers": helpers, "partials": partials, "decorators": container.decorators })) != null ? stack1 : "")
             + "});\n\n";
     }, "9": function (container, depth0, helpers, partials, data) {
@@ -63,16 +63,16 @@ exports.default = { "1": function (container, depth0, helpers, partials, data) {
             return undefined;
         };
         return "    "
-            + ((stack1 = container.lambda(container.strict(depth0, "name", { "start": { "line": 24, "column": 7 }, "end": { "line": 24, "column": 11 } }), depth0)) != null ? stack1 : "")
+            + ((stack1 = container.lambda(container.strict(depth0, "name", { "start": { "line": 22, "column": 7 }, "end": { "line": 22, "column": 11 } }), depth0)) != null ? stack1 : "")
             + ": ("
             + ((stack1 = container.invokePartial(lookupProperty(partials, "parametersDefinition"), depth0, { "name": "parametersDefinition", "data": data, "helpers": helpers, "partials": partials, "decorators": container.decorators })) != null ? stack1 : "")
-            + ") => ApiRequestOptions;\n";
+            + ") => RequestConfig;\n";
     }, "11": function (container, depth0, helpers, partials, data) {
         var stack1, alias1 = container.strict, alias2 = container.lambda;
         return "    "
-            + ((stack1 = alias2(alias1(depth0, "name", { "start": { "line": 30, "column": 7 }, "end": { "line": 30, "column": 11 } }), depth0)) != null ? stack1 : "")
+            + ((stack1 = alias2(alias1(depth0, "name", { "start": { "line": 28, "column": 7 }, "end": { "line": 28, "column": 11 } }), depth0)) != null ? stack1 : "")
             + ": "
-            + ((stack1 = alias2(alias1(depth0, "name", { "start": { "line": 30, "column": 19 }, "end": { "line": 30, "column": 23 } }), depth0)) != null ? stack1 : "")
+            + ((stack1 = alias2(alias1(depth0, "name", { "start": { "line": 28, "column": 19 }, "end": { "line": 28, "column": 23 } }), depth0)) != null ? stack1 : "")
             + ",\n";
     }, "13": function (container, depth0, helpers, partials, data, blockParams, depths) {
         var stack1, alias1 = depth0 != null ? depth0 : (container.nullContext || {}), alias2 = container.strict, alias3 = container.lambda, lookupProperty = container.lookupProperty || function (parent, propertyName) {
@@ -82,33 +82,33 @@ exports.default = { "1": function (container, depth0, helpers, partials, data) {
             return undefined;
         };
         return "    /**\n"
-            + ((stack1 = lookupProperty(helpers, "if").call(alias1, lookupProperty(depth0, "deprecated"), { "name": "if", "hash": {}, "fn": container.program(14, data, 0, blockParams, depths), "inverse": container.noop, "data": data, "loc": { "start": { "line": 38, "column": 4 }, "end": { "line": 40, "column": 11 } } })) != null ? stack1 : "")
-            + ((stack1 = lookupProperty(helpers, "if").call(alias1, lookupProperty(depth0, "summary"), { "name": "if", "hash": {}, "fn": container.program(16, data, 0, blockParams, depths), "inverse": container.noop, "data": data, "loc": { "start": { "line": 41, "column": 4 }, "end": { "line": 43, "column": 11 } } })) != null ? stack1 : "")
-            + ((stack1 = lookupProperty(helpers, "if").call(alias1, lookupProperty(depth0, "description"), { "name": "if", "hash": {}, "fn": container.program(18, data, 0, blockParams, depths), "inverse": container.noop, "data": data, "loc": { "start": { "line": 44, "column": 4 }, "end": { "line": 46, "column": 11 } } })) != null ? stack1 : "")
-            + ((stack1 = lookupProperty(helpers, "unless").call(alias1, lookupProperty(lookupProperty(data, "root"), "useOptions"), { "name": "unless", "hash": {}, "fn": container.program(20, data, 0, blockParams, depths), "inverse": container.noop, "data": data, "loc": { "start": { "line": 47, "column": 4 }, "end": { "line": 53, "column": 15 } } })) != null ? stack1 : "")
-            + ((stack1 = lookupProperty(helpers, "each").call(alias1, lookupProperty(depth0, "results"), { "name": "each", "hash": {}, "fn": container.program(24, data, 0, blockParams, depths), "inverse": container.noop, "data": data, "loc": { "start": { "line": 54, "column": 4 }, "end": { "line": 56, "column": 13 } } })) != null ? stack1 : "")
+            + ((stack1 = lookupProperty(helpers, "if").call(alias1, lookupProperty(depth0, "deprecated"), { "name": "if", "hash": {}, "fn": container.program(14, data, 0, blockParams, depths), "inverse": container.noop, "data": data, "loc": { "start": { "line": 37, "column": 4 }, "end": { "line": 39, "column": 11 } } })) != null ? stack1 : "")
+            + ((stack1 = lookupProperty(helpers, "if").call(alias1, lookupProperty(depth0, "summary"), { "name": "if", "hash": {}, "fn": container.program(16, data, 0, blockParams, depths), "inverse": container.noop, "data": data, "loc": { "start": { "line": 40, "column": 4 }, "end": { "line": 42, "column": 11 } } })) != null ? stack1 : "")
+            + ((stack1 = lookupProperty(helpers, "if").call(alias1, lookupProperty(depth0, "description"), { "name": "if", "hash": {}, "fn": container.program(18, data, 0, blockParams, depths), "inverse": container.noop, "data": data, "loc": { "start": { "line": 43, "column": 4 }, "end": { "line": 45, "column": 11 } } })) != null ? stack1 : "")
+            + ((stack1 = lookupProperty(helpers, "unless").call(alias1, lookupProperty(lookupProperty(data, "root"), "useOptions"), { "name": "unless", "hash": {}, "fn": container.program(20, data, 0, blockParams, depths), "inverse": container.noop, "data": data, "loc": { "start": { "line": 46, "column": 4 }, "end": { "line": 52, "column": 15 } } })) != null ? stack1 : "")
+            + ((stack1 = lookupProperty(helpers, "each").call(alias1, lookupProperty(depth0, "results"), { "name": "each", "hash": {}, "fn": container.program(24, data, 0, blockParams, depths), "inverse": container.noop, "data": data, "loc": { "start": { "line": 53, "column": 4 }, "end": { "line": 55, "column": 13 } } })) != null ? stack1 : "")
             + "     * @throws ApiError\n     */\n"
-            + ((stack1 = lookupProperty(helpers, "if").call(alias1, lookupProperty(lookupProperty(data, "root"), "useCancelableRequest"), { "name": "if", "hash": {}, "fn": container.program(26, data, 0, blockParams, depths), "inverse": container.program(28, data, 0, blockParams, depths), "data": data, "loc": { "start": { "line": 59, "column": 4 }, "end": { "line": 63, "column": 11 } } })) != null ? stack1 : "")
-            + "        return __request<"
+            + ((stack1 = lookupProperty(helpers, "if").call(alias1, lookupProperty(lookupProperty(data, "root"), "useCancelableRequest"), { "name": "if", "hash": {}, "fn": container.program(26, data, 0, blockParams, depths), "inverse": container.program(28, data, 0, blockParams, depths), "data": data, "loc": { "start": { "line": 58, "column": 4 }, "end": { "line": 68, "column": 11 } } })) != null ? stack1 : "")
+            + "        return this.executor.request<"
             + ((stack1 = container.invokePartial(lookupProperty(partials, "result"), depth0, { "name": "result", "hash": { "default": "void" }, "data": data, "helpers": helpers, "partials": partials, "decorators": container.decorators })) != null ? stack1 : "")
-            + ">("
-            + ((stack1 = alias3(alias2(depths[1], "originName", { "start": { "line": 64, "column": 55 }, "end": { "line": 64, "column": 68 } }), depth0)) != null ? stack1 : "")
+            + ">(\n            "
+            + ((stack1 = alias3(alias2(depths[1], "originName", { "start": { "line": 70, "column": 15 }, "end": { "line": 70, "column": 28 } }), depth0)) != null ? stack1 : "")
             + "Options."
-            + ((stack1 = alias3(alias2(depth0, "name", { "start": { "line": 64, "column": 81 }, "end": { "line": 64, "column": 85 } }), depth0)) != null ? stack1 : "")
+            + ((stack1 = alias3(alias2(depth0, "name", { "start": { "line": 70, "column": 42 }, "end": { "line": 70, "column": 46 } }), depth0)) != null ? stack1 : "")
             + "("
             + ((stack1 = container.invokePartial(lookupProperty(partials, "parameterValues"), depth0, { "name": "parameterValues", "data": data, "helpers": helpers, "partials": partials, "decorators": container.decorators })) != null ? stack1 : "")
-            + "), OpenAPI);\n    }\n";
+            + "),\n            options\n        );\n    }\n";
     }, "14": function (container, depth0, helpers, partials, data) {
         return "     * @deprecated\n";
     }, "16": function (container, depth0, helpers, partials, data) {
         var stack1;
         return "     * "
-            + ((stack1 = container.lambda(container.strict(depth0, "summary", { "start": { "line": 42, "column": 10 }, "end": { "line": 42, "column": 17 } }), depth0)) != null ? stack1 : "")
+            + ((stack1 = container.lambda(container.strict(depth0, "summary", { "start": { "line": 41, "column": 10 }, "end": { "line": 41, "column": 17 } }), depth0)) != null ? stack1 : "")
             + "\n";
     }, "18": function (container, depth0, helpers, partials, data) {
         var stack1;
         return "     * "
-            + ((stack1 = container.lambda(container.strict(depth0, "description", { "start": { "line": 45, "column": 10 }, "end": { "line": 45, "column": 21 } }), depth0)) != null ? stack1 : "")
+            + ((stack1 = container.lambda(container.strict(depth0, "description", { "start": { "line": 44, "column": 10 }, "end": { "line": 44, "column": 21 } }), depth0)) != null ? stack1 : "")
             + "\n";
     }, "20": function (container, depth0, helpers, partials, data) {
         var stack1, lookupProperty = container.lookupProperty || function (parent, propertyName) {
@@ -117,7 +117,7 @@ exports.default = { "1": function (container, depth0, helpers, partials, data) {
             }
             return undefined;
         };
-        return ((stack1 = lookupProperty(helpers, "if").call(depth0 != null ? depth0 : (container.nullContext || {}), lookupProperty(depth0, "parameters"), { "name": "if", "hash": {}, "fn": container.program(21, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 48, "column": 4 }, "end": { "line": 52, "column": 11 } } })) != null ? stack1 : "");
+        return ((stack1 = lookupProperty(helpers, "if").call(depth0 != null ? depth0 : (container.nullContext || {}), lookupProperty(depth0, "parameters"), { "name": "if", "hash": {}, "fn": container.program(21, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 47, "column": 4 }, "end": { "line": 51, "column": 11 } } })) != null ? stack1 : "");
     }, "21": function (container, depth0, helpers, partials, data) {
         var stack1, lookupProperty = container.lookupProperty || function (parent, propertyName) {
             if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
@@ -125,20 +125,20 @@ exports.default = { "1": function (container, depth0, helpers, partials, data) {
             }
             return undefined;
         };
-        return ((stack1 = lookupProperty(helpers, "each").call(depth0 != null ? depth0 : (container.nullContext || {}), lookupProperty(depth0, "parameters"), { "name": "each", "hash": {}, "fn": container.program(22, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 49, "column": 4 }, "end": { "line": 51, "column": 13 } } })) != null ? stack1 : "");
+        return ((stack1 = lookupProperty(helpers, "each").call(depth0 != null ? depth0 : (container.nullContext || {}), lookupProperty(depth0, "parameters"), { "name": "each", "hash": {}, "fn": container.program(22, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 48, "column": 4 }, "end": { "line": 50, "column": 13 } } })) != null ? stack1 : "");
     }, "22": function (container, depth0, helpers, partials, data) {
         var stack1, alias1 = container.strict, alias2 = container.lambda;
         return "     * @param "
-            + ((stack1 = alias2(alias1(depth0, "name", { "start": { "line": 50, "column": 17 }, "end": { "line": 50, "column": 21 } }), depth0)) != null ? stack1 : "")
+            + ((stack1 = alias2(alias1(depth0, "name", { "start": { "line": 49, "column": 17 }, "end": { "line": 49, "column": 21 } }), depth0)) != null ? stack1 : "")
             + " "
-            + ((stack1 = alias2(alias1(depth0, "description", { "start": { "line": 50, "column": 28 }, "end": { "line": 50, "column": 39 } }), depth0)) != null ? stack1 : "")
+            + ((stack1 = alias2(alias1(depth0, "description", { "start": { "line": 49, "column": 28 }, "end": { "line": 49, "column": 39 } }), depth0)) != null ? stack1 : "")
             + "\n";
     }, "24": function (container, depth0, helpers, partials, data) {
         var stack1, alias1 = container.strict, alias2 = container.lambda;
         return "     * @returns "
-            + ((stack1 = alias2(alias1(depth0, "type", { "start": { "line": 55, "column": 19 }, "end": { "line": 55, "column": 23 } }), depth0)) != null ? stack1 : "")
+            + ((stack1 = alias2(alias1(depth0, "type", { "start": { "line": 54, "column": 19 }, "end": { "line": 54, "column": 23 } }), depth0)) != null ? stack1 : "")
             + " "
-            + ((stack1 = alias2(alias1(depth0, "description", { "start": { "line": 55, "column": 30 }, "end": { "line": 55, "column": 41 } }), depth0)) != null ? stack1 : "")
+            + ((stack1 = alias2(alias1(depth0, "description", { "start": { "line": 54, "column": 30 }, "end": { "line": 54, "column": 41 } }), depth0)) != null ? stack1 : "")
             + "\n";
     }, "26": function (container, depth0, helpers, partials, data) {
         var stack1, lookupProperty = container.lookupProperty || function (parent, propertyName) {
@@ -147,11 +147,11 @@ exports.default = { "1": function (container, depth0, helpers, partials, data) {
             }
             return undefined;
         };
-        return "    public static "
-            + ((stack1 = container.lambda(container.strict(depth0, "name", { "start": { "line": 60, "column": 21 }, "end": { "line": 60, "column": 25 } }), depth0)) != null ? stack1 : "")
-            + "("
+        return "    public "
+            + ((stack1 = container.lambda(container.strict(depth0, "name", { "start": { "line": 59, "column": 14 }, "end": { "line": 59, "column": 18 } }), depth0)) != null ? stack1 : "")
+            + "(\n        "
             + ((stack1 = container.invokePartial(lookupProperty(partials, "parameters"), depth0, { "name": "parameters", "data": data, "helpers": helpers, "partials": partials, "decorators": container.decorators })) != null ? stack1 : "")
-            + "): CancelablePromise<"
+            + "        options?: TOptions,\n    ): CancelablePromise<"
             + ((stack1 = container.invokePartial(lookupProperty(partials, "result"), depth0, { "name": "result", "hash": { "default": "void" }, "data": data, "helpers": helpers, "partials": partials, "decorators": container.decorators })) != null ? stack1 : "")
             + "> {\n";
     }, "28": function (container, depth0, helpers, partials, data) {
@@ -161,11 +161,11 @@ exports.default = { "1": function (container, depth0, helpers, partials, data) {
             }
             return undefined;
         };
-        return "    public static "
-            + ((stack1 = container.lambda(container.strict(depth0, "name", { "start": { "line": 62, "column": 21 }, "end": { "line": 62, "column": 25 } }), depth0)) != null ? stack1 : "")
-            + "("
+        return "    public "
+            + ((stack1 = container.lambda(container.strict(depth0, "name", { "start": { "line": 64, "column": 14 }, "end": { "line": 64, "column": 18 } }), depth0)) != null ? stack1 : "")
+            + "(\n        "
             + ((stack1 = container.invokePartial(lookupProperty(partials, "parameters"), depth0, { "name": "parameters", "data": data, "helpers": helpers, "partials": partials, "decorators": container.decorators })) != null ? stack1 : "")
-            + "): Promise<"
+            + "        options?: TOptions,\n    ): Promise<"
             + ((stack1 = container.invokePartial(lookupProperty(partials, "result"), depth0, { "name": "result", "hash": { "default": "void" }, "data": data, "helpers": helpers, "partials": partials, "decorators": container.decorators })) != null ? stack1 : "")
             + "> {\n";
     }, "compiler": [8, ">= 4.3.0"], "main": function (container, depth0, helpers, partials, data, blockParams, depths) {
@@ -179,27 +179,23 @@ exports.default = { "1": function (container, depth0, helpers, partials, data) {
             + "\n"
             + ((stack1 = lookupProperty(helpers, "if").call(alias1, lookupProperty(depth0, "imports"), { "name": "if", "hash": {}, "fn": container.program(1, data, 0, blockParams, depths), "inverse": container.noop, "data": data, "loc": { "start": { "line": 3, "column": 0 }, "end": { "line": 7, "column": 7 } } })) != null ? stack1 : "")
             + ((stack1 = lookupProperty(helpers, "if").call(alias1, lookupProperty(lookupProperty(data, "root"), "useCancelableRequest"), { "name": "if", "hash": {}, "fn": container.program(5, data, 0, blockParams, depths), "inverse": container.noop, "data": data, "loc": { "start": { "line": 8, "column": 0 }, "end": { "line": 10, "column": 7 } } })) != null ? stack1 : "")
-            + "import { request as __request } from '"
-            + ((stack1 = lookupProperty(helpers, "joinPath").call(alias1, lookupProperty(lookupProperty(data, "root"), "outputCore"), "request", { "name": "joinPath", "hash": {}, "data": data, "loc": { "start": { "line": 11, "column": 38 }, "end": { "line": 11, "column": 79 } } })) != null ? stack1 : "")
-            + "';\nimport type { ApiRequestOptions } from '"
-            + ((stack1 = lookupProperty(helpers, "joinPath").call(alias1, lookupProperty(lookupProperty(data, "root"), "outputCore"), "ApiRequestOptions", { "name": "joinPath", "hash": {}, "data": data, "loc": { "start": { "line": 12, "column": 40 }, "end": { "line": 12, "column": 91 } } })) != null ? stack1 : "")
-            + "';\nimport { OpenAPI } from '"
-            + ((stack1 = lookupProperty(helpers, "joinPath").call(alias1, lookupProperty(lookupProperty(data, "root"), "outputCore"), "OpenAPI", { "name": "joinPath", "hash": {}, "data": data, "loc": { "start": { "line": 13, "column": 25 }, "end": { "line": 13, "column": 66 } } })) != null ? stack1 : "")
+            + "import type { RequestExecutor, RequestConfig } from '"
+            + ((stack1 = lookupProperty(helpers, "joinPath").call(alias1, lookupProperty(lookupProperty(data, "root"), "outputCore"), "request-executor", { "name": "joinPath", "hash": {}, "data": data, "loc": { "start": { "line": 11, "column": 53 }, "end": { "line": 11, "column": 103 } } })) != null ? stack1 : "")
             + "';\n\n"
-            + ((stack1 = lookupProperty(helpers, "each").call(alias1, lookupProperty(depth0, "operations"), { "name": "each", "hash": {}, "fn": container.program(7, data, 0, blockParams, depths), "inverse": container.noop, "data": data, "loc": { "start": { "line": 15, "column": 0 }, "end": { "line": 20, "column": 9 } } })) != null ? stack1 : "")
+            + ((stack1 = lookupProperty(helpers, "each").call(alias1, lookupProperty(depth0, "operations"), { "name": "each", "hash": {}, "fn": container.program(7, data, 0, blockParams, depths), "inverse": container.noop, "data": data, "loc": { "start": { "line": 13, "column": 0 }, "end": { "line": 18, "column": 9 } } })) != null ? stack1 : "")
             + "\nexport type T"
-            + ((stack1 = alias3(alias2(depth0, "originName", { "start": { "line": 22, "column": 16 }, "end": { "line": 22, "column": 26 } }), depth0)) != null ? stack1 : "")
+            + ((stack1 = alias3(alias2(depth0, "originName", { "start": { "line": 20, "column": 16 }, "end": { "line": 20, "column": 26 } }), depth0)) != null ? stack1 : "")
             + "Options = {\n"
-            + ((stack1 = lookupProperty(helpers, "each").call(alias1, lookupProperty(depth0, "operations"), { "name": "each", "hash": {}, "fn": container.program(9, data, 0, blockParams, depths), "inverse": container.noop, "data": data, "loc": { "start": { "line": 23, "column": 0 }, "end": { "line": 25, "column": 9 } } })) != null ? stack1 : "")
-            + "}\n\nexport const "
-            + ((stack1 = alias3(alias2(depth0, "originName", { "start": { "line": 28, "column": 16 }, "end": { "line": 28, "column": 26 } }), depth0)) != null ? stack1 : "")
+            + ((stack1 = lookupProperty(helpers, "each").call(alias1, lookupProperty(depth0, "operations"), { "name": "each", "hash": {}, "fn": container.program(9, data, 0, blockParams, depths), "inverse": container.noop, "data": data, "loc": { "start": { "line": 21, "column": 0 }, "end": { "line": 23, "column": 9 } } })) != null ? stack1 : "")
+            + "};\n\nexport const "
+            + ((stack1 = alias3(alias2(depth0, "originName", { "start": { "line": 26, "column": 16 }, "end": { "line": 26, "column": 26 } }), depth0)) != null ? stack1 : "")
             + "Options: T"
-            + ((stack1 = alias3(alias2(depth0, "originName", { "start": { "line": 28, "column": 42 }, "end": { "line": 28, "column": 52 } }), depth0)) != null ? stack1 : "")
+            + ((stack1 = alias3(alias2(depth0, "originName", { "start": { "line": 26, "column": 42 }, "end": { "line": 26, "column": 52 } }), depth0)) != null ? stack1 : "")
             + "Options = {\n"
-            + ((stack1 = lookupProperty(helpers, "each").call(alias1, lookupProperty(depth0, "operations"), { "name": "each", "hash": {}, "fn": container.program(11, data, 0, blockParams, depths), "inverse": container.noop, "data": data, "loc": { "start": { "line": 29, "column": 0 }, "end": { "line": 31, "column": 9 } } })) != null ? stack1 : "")
-            + "}\n\nexport class "
-            + ((stack1 = alias3(alias2(depth0, "name", { "start": { "line": 34, "column": 16 }, "end": { "line": 34, "column": 20 } }), depth0)) != null ? stack1 : "")
-            + " {\n\n"
-            + ((stack1 = lookupProperty(helpers, "each").call(alias1, lookupProperty(depth0, "operations"), { "name": "each", "hash": {}, "fn": container.program(13, data, 0, blockParams, depths), "inverse": container.noop, "data": data, "loc": { "start": { "line": 36, "column": 4 }, "end": { "line": 66, "column": 13 } } })) != null ? stack1 : "")
+            + ((stack1 = lookupProperty(helpers, "each").call(alias1, lookupProperty(depth0, "operations"), { "name": "each", "hash": {}, "fn": container.program(11, data, 0, blockParams, depths), "inverse": container.noop, "data": data, "loc": { "start": { "line": 27, "column": 0 }, "end": { "line": 29, "column": 9 } } })) != null ? stack1 : "")
+            + "};\n\nexport class "
+            + ((stack1 = alias3(alias2(depth0, "name", { "start": { "line": 32, "column": 16 }, "end": { "line": 32, "column": 20 } }), depth0)) != null ? stack1 : "")
+            + "<TOptions = unknown> {\n    constructor(private readonly executor: RequestExecutor<TOptions>) {}\n\n"
+            + ((stack1 = lookupProperty(helpers, "each").call(alias1, lookupProperty(depth0, "operations"), { "name": "each", "hash": {}, "fn": container.program(13, data, 0, blockParams, depths), "inverse": container.noop, "data": data, "loc": { "start": { "line": 35, "column": 4 }, "end": { "line": 74, "column": 13 } } })) != null ? stack1 : "")
             + "}\n";
     }, "usePartial": true, "useData": true, "useDepths": true };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "ts-openapi-codegen",
-    "version": "2.0.0-beta.0",
+    "version": "2.0.0-beta.1",
     "description": "Library that generates Typescript clients based on the OpenAPI specification. It bases on openapi-typescript-codegen",
     "author": "Alexey Zverev",
     "homepage": "https://github.com/ozonophore/openapi-codegen.git",