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

package/dist/core/index.js

@@ -2,172 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HttpClient = void 0;
 exports.generate = generate;
-const fileSystemHelpers_1 = require("../common/utils/fileSystemHelpers");
-const pathHelpers_1 = require("../common/utils/pathHelpers");
-const Parser_1 = require("./api/v2/Parser");
-const Parser_2 = require("./api/v3/Parser");
-const Context_1 = require("./Context");
-const HttpClient_enum_1 = require("./types/enums/HttpClient.enum");
-const getOpenApiSpec_1 = require("./utils/getOpenApiSpec");
-const getOpenApiVersion_1 = require("./utils/getOpenApiVersion");
-const getOutputPaths_1 = require("./utils/getOutputPaths");
-const isInstanceOfMultiOptions_1 = require("./utils/isInstanceOfMultiOptions");
-const isString_1 = require("./utils/isString");
-const postProcessClient_1 = require("./utils/postProcessClient");
-const prepareOptions_1 = require("./utils/prepareOptions");
-const registerHandlebarTemplates_1 = require("./utils/registerHandlebarTemplates");
-const WriteClient_1 = require("./WriteClient");
-var HttpClient_enum_2 = require("./types/enums/HttpClient.enum");
-Object.defineProperty(exports, "HttpClient", { enumerable: true, get: function () { return HttpClient_enum_2.HttpClient; } });
-/**
- * Generate the OpenAPI client. This method will read the OpenAPI specification and based on the
- * given language it will generate the client, including the typed models, validation schemas,
- * service layer, etc.
- * @param input: The relative location of the OpenAPI spec
- * @param output: The relative location of the output directory
- * @param outputCore: The relative location of the output directory for core
- * @param outputServices: The relative location of the output directory for services
- * @param outputModels: The relative location of the output directory for models
- * @param outputSchemas: The relative location of the output directory for schemas
- * @param httpClient: The selected httpClient (fetch or XHR)
- * @param useOptions: Use options or arguments functions
- * @param useUnionTypes: Use union types instead of enums
- * @param excludeCoreServiceFiles The generation of the core and services is excluded
- * @param includeSchemasFiles The generation of model validation schemes is enabled
- * @param request: Path to custom request file
- * @param write: Write the files to disk (true or false)
- * @param interfacePrefix: Prefix for interface model(I)
- * @param enumPrefix: Prefix for enum model(E)
- * @param typePrefix: Prefix for type model(T)
- * @param useCancelableRequest Use cancelable request type.
- * @param sortByRequired Property sorting strategy: simplified or extended
- * @param useSeparatedIndexes Use separate index files for the core, models, schemas, and services
- */
-async function generateFrom({ input, output, outputCore, outputServices, outputModels, outputSchemas, httpClient = HttpClient_enum_1.HttpClient.FETCH, useOptions = false, useUnionTypes = false, excludeCoreServiceFiles = false, includeSchemasFiles = false, request, write = true, interfacePrefix = 'I', enumPrefix = 'E', typePrefix = 'T', useCancelableRequest = false, sortByRequired = false, useSeparatedIndexes = false, }, writeClient) {
-    const outputPaths = (0, getOutputPaths_1.getOutputPaths)({
-        output,
-        outputCore,
-        outputServices,
-        outputModels,
-        outputSchemas,
-    });
-    const absoluteInput = (0, isString_1.isString)(input) ? (0, pathHelpers_1.resolveHelper)(process.cwd(), input) : input;
-    const context = new Context_1.Context({ input: absoluteInput, output: outputPaths, prefix: { interface: interfacePrefix, enum: enumPrefix, type: typePrefix }, sortByRequired });
-    const openApi = (0, isString_1.isString)(input) ? await (0, getOpenApiSpec_1.getOpenApiSpec)(context, input) : input;
-    const openApiVersion = (0, getOpenApiVersion_1.getOpenApiVersion)(openApi);
-    const templates = (0, registerHandlebarTemplates_1.registerHandlebarTemplates)({
-        httpClient,
-        useUnionTypes,
-        useOptions,
-    });
-    writeClient.logger.info('Defining the version of the openapi specification (2 or 3)');
-    switch (openApiVersion) {
-        case getOpenApiVersion_1.OpenApiVersion.V2: {
-            const client = new Parser_1.Parser(context).parse(openApi);
-            const clientFinal = (0, postProcessClient_1.postProcessClient)(client);
-            if (!write)
-                break;
-            writeClient.logger.info('Write our OpenAPI client version 2 to disk.');
-            await writeClient.writeClient({
-                client: clientFinal,
-                templates,
-                outputPaths,
-                httpClient,
-                useOptions,
-                useUnionTypes,
-                excludeCoreServiceFiles,
-                includeSchemasFiles,
-                request,
-                useCancelableRequest,
-                useSeparatedIndexes,
-            });
-            break;
-        }
-        case getOpenApiVersion_1.OpenApiVersion.V3: {
-            const client = new Parser_2.Parser(context).parse(openApi);
-            const clientFinal = (0, postProcessClient_1.postProcessClient)(client);
-            if (!write)
-                break;
-            writeClient.logger.info('Write our OpenAPI client version 3 to disk.');
-            await writeClient.writeClient({
-                client: clientFinal,
-                templates,
-                outputPaths,
-                httpClient,
-                useOptions,
-                useUnionTypes,
-                excludeCoreServiceFiles,
-                includeSchemasFiles,
-                request,
-                useCancelableRequest,
-                useSeparatedIndexes,
-            });
-            break;
-        }
-    }
+const OpenApiClient_1 = require("./OpenApiClient");
+var HttpClient_enum_1 = require("./types/enums/HttpClient.enum");
+Object.defineProperty(exports, "HttpClient", { enumerable: true, get: function () { return HttpClient_enum_1.HttpClient; } });
+async function generate(rawOptions) {
+    const openApiClient = new OpenApiClient_1.OpenApiClient();
+    await openApiClient.generate(rawOptions);
 }
-/**
- * @throws {Error} If options validation fails or generation encounters an error
- * @returns {Promise<void>}
- */
-async function generate(options) {
-    let preparedOptions = [];
-    if (Array.isArray(options)) {
-        preparedOptions = options;
-    }
-    else if ((0, isInstanceOfMultiOptions_1.isInstanceOfMultioptions)(options)) {
-        const { items, ...otherProps } = options;
-        preparedOptions = items.map(item => ({ ...item, ...otherProps }));
-    }
-    else {
-        preparedOptions = Array.of(options);
-    }
-    const optionsFinal = preparedOptions.map(op => (0, prepareOptions_1.prepareOptions)(op));
-    const writeClient = new WriteClient_1.WriteClient();
-    writeClient.logger.forceInfo(`${GENERATION_MESSAGES.STARTED}. Total number of specification files: ${optionsFinal.length}`);
-    if (optionsFinal.length === 0) {
-        throw new Error('No options provided for generation');
-    }
-    try {
-        const start = process.hrtime();
-        for (const option of optionsFinal) {
-            await cleanOutputDirectories(option);
-        }
-        for (const option of optionsFinal) {
-            const fileStart = process.hrtime();
-            await generateFrom(option, writeClient);
-            const [fileSeconds, fileNanoseconds] = process.hrtime(fileStart);
-            const fileDuration = fileSeconds + fileNanoseconds / 1e6;
-            writeClient.logger.info(`Duration for "${option.input}": ${fileDuration.toFixed(2)} sec`);
-        }
-        if (optionsFinal[0]?.useSeparatedIndexes) {
-            await writeClient.combineAndWrightSimple();
-        }
-        else {
-            await writeClient.combineAndWrite();
-        }
-        writeClient.logger.forceInfo(GENERATION_MESSAGES.FINISHED);
-        const [seconds, nanoseconds] = process.hrtime(start);
-        const durationInMs = seconds + nanoseconds / 1e6;
-        writeClient.logger.forceInfo(GENERATION_MESSAGES.DURATION(durationInMs));
-        writeClient.logger.forceInfo(GENERATION_MESSAGES.FINISHED);
-    }
-    catch (error) {
-        writeClient.logger.error(error.message);
-    }
-    writeClient.logger.shutdownLogger();
-}
-const cleanOutputDirectories = async (option) => {
-    const outputDirs = [option.output, option.outputCore, option.outputSchemas, option.outputModels, option.outputServices];
-    for (const dir of outputDirs) {
-        if (dir) {
-            await fileSystemHelpers_1.fileSystemHelpers.rmdir(dir);
-        }
-    }
-};
-const GENERATION_MESSAGES = {
-    STARTED: 'Generation has begun',
-    FINISHED: 'Generation from has been finished',
-    FILE_FINISHED: (input) => `Generation from "${input}" was finished`,
-    DURATION: (ms) => `Lead time: ${ms.toFixed(2)} sec`,
-};

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"}