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

package/dist/cli/initOpenApiConfig/initCustomRequest.js

@@ -1,23 +1,81 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initCustomRequest = initCustomRequest;
+const path_1 = __importDefault(require("path"));
+const Consts_1 = require("../../common/Consts");
+const LoggerMessages_1 = require("../../common/LoggerMessages");
 const fileSystemHelpers_1 = require("../../common/utils/fileSystemHelpers");
 const format_1 = require("../../common/utils/format");
 const pathHelpers_1 = require("../../common/utils/pathHelpers");
 const confirmDialog_1 = require("../interactive/confirmDialog");
-async function initCustomRequest(templates, useCancelableRequest) {
-    // TODO: Подумать над правильной постановкой вопроса!
-    const shouldRequestExecutor = await (0, confirmDialog_1.confirmDialog)({
-        message: 'Желаете сформировать пользовательский обработчик request в новом формате?',
-        initial: false,
-    });
+const selectDialog_1 = require("../interactive/selectDialog");
+async function resolveRequestFormat(params) {
+    if (!params.customRequestPath) {
+        return null;
+    }
+    if (params.requestFormat) {
+        return params.requestFormat;
+    }
+    if (params.useInteractiveMode) {
+        const choice = await (0, selectDialog_1.selectDialog)({
+            message: 'Which custom HTTP scaffold format do you want?',
+            choices: [
+                { name: 'Legacy transport (request + requestRaw) — for "request" config', value: 'transport' },
+                { name: 'createExecutorAdapter — for "customExecutorPath" config', value: 'adapter' },
+                { name: 'RequestExecutor object — for direct service injection', value: 'executor' },
+            ],
+            initial: 0,
+        });
+        return choice;
+    }
+    return 'transport';
+}
+async function initCustomRequest(params) {
+    const { templates, useCancelableRequest, customRequestPath, useInteractiveMode } = params;
+    if (!customRequestPath) {
+        Consts_1.APP_LOGGER.warn(LoggerMessages_1.LOGGER_MESSAGES.CUSTOM_REQUEST.PATH_NOT_PROVIDED);
+        return null;
+    }
+    const formatType = await resolveRequestFormat(params);
+    if (!formatType) {
+        return null;
+    }
     const artifacts = {
         useCancelableRequest,
     };
-    const customRequestPath = './src/custom/request.ts';
     const file = (0, pathHelpers_1.resolveHelper)(process.cwd(), customRequestPath);
-    const templateResult = shouldRequestExecutor ? templates.requestExecutor(artifacts) : templates.request(artifacts);
+    const fileDir = path_1.default.dirname(file);
+    const fileDirExists = await fileSystemHelpers_1.fileSystemHelpers.exists(fileDir);
+    if (!fileDirExists) {
+        await fileSystemHelpers_1.fileSystemHelpers.mkdir(fileDir);
+    }
+    const isFileExists = await fileSystemHelpers_1.fileSystemHelpers.exists(file);
+    if (isFileExists) {
+        if (!useInteractiveMode) {
+            Consts_1.APP_LOGGER.warn(LoggerMessages_1.LOGGER_MESSAGES.CUSTOM_REQUEST.FILE_EXISTS_INTERACTIVE_DISABLED(file));
+            Consts_1.APP_LOGGER.info(LoggerMessages_1.LOGGER_MESSAGES.CUSTOM_REQUEST.FILE_LEFT_UNCHANGED);
+            return formatType;
+        }
+        const shouldOverwrite = await (0, confirmDialog_1.confirmDialog)({
+            message: 'Custom request file already exists. Overwrite it?',
+            initial: false,
+        });
+        if (!shouldOverwrite) {
+            Consts_1.APP_LOGGER.info(LoggerMessages_1.LOGGER_MESSAGES.CUSTOM_REQUEST.FILE_LEFT_UNCHANGED);
+            return formatType;
+        }
+    }
+    const templateByFormat = {
+        transport: templates.request,
+        executor: templates.requestExecutor,
+        adapter: templates.createExecutorAdapter,
+    };
+    const templateResult = templateByFormat[formatType](artifacts);
     const formattedValue = await (0, format_1.format)(templateResult);
     await fileSystemHelpers_1.fileSystemHelpers.writeFile(file, formattedValue);
-    return;
+    Consts_1.APP_LOGGER.info(LoggerMessages_1.LOGGER_MESSAGES.CUSTOM_REQUEST.FILE_CREATED(file));
+    return formatType;
 }

package/dist/cli/initOpenApiConfig/utils/__tests__/buildConfig.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=buildConfig.test.d.ts.map

package/dist/cli/initOpenApiConfig/utils/__tests__/buildConfig.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"buildConfig.test.d.ts","sourceRoot":"","sources":["../../../../../src/cli/initOpenApiConfig/utils/__tests__/buildConfig.test.ts"],"names":[],"mappings":""}

package/dist/cli/initOpenApiConfig/utils/__tests__/buildConfig.test.js

@@ -0,0 +1,93 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const node_assert_1 = __importDefault(require("node:assert"));
+const node_test_1 = require("node:test");
+const Consts_1 = require("../../../../common/Consts");
+const buildConfig_1 = require("../buildConfig");
+const createMockSpec = (relativePath = './test/spec.yml') => ({
+    relativePath,
+    path: '',
+});
+(0, node_test_1.describe)('@unit: buildConfig', () => {
+    (0, node_test_1.test)('creates items array for multiple specs in multi-option mode', async () => {
+        const validatedSpecs = [createMockSpec('./api/v1.yml'), createMockSpec('./api/v2.yml')];
+        const result = await (0, buildConfig_1.buildConfig)(validatedSpecs, true);
+        node_assert_1.default.strictEqual(result.items?.length, 2);
+        node_assert_1.default.strictEqual(result.items?.[0].input, './api/v1.yml');
+        node_assert_1.default.strictEqual(result.items?.[1].input, './api/v2.yml');
+        node_assert_1.default.strictEqual(result.items?.[0].output, Consts_1.DEFAULT_OUTPUT_API_DIR);
+        node_assert_1.default.strictEqual(result.items?.[1].output, Consts_1.DEFAULT_OUTPUT_API_DIR);
+    });
+    (0, node_test_1.test)('includes per-item request when perSpecRequest is enabled', async () => {
+        const validatedSpecs = [createMockSpec()];
+        const customRequest = './custom/request.ts';
+        const result = await (0, buildConfig_1.buildConfig)(validatedSpecs, true, { request: customRequest }, true);
+        node_assert_1.default.strictEqual(result.items?.[0].request, customRequest);
+        node_assert_1.default.strictEqual(result.request, undefined);
+    });
+    (0, node_test_1.test)('includes root request when perSpecRequest is disabled', async () => {
+        const validatedSpecs = [createMockSpec()];
+        const customRequest = './custom/request.ts';
+        const result = await (0, buildConfig_1.buildConfig)(validatedSpecs, true, { request: customRequest }, false);
+        node_assert_1.default.strictEqual(result.items?.[0].request, undefined);
+        node_assert_1.default.strictEqual(result.request, customRequest);
+    });
+    (0, node_test_1.test)('sets default values from COMMON_DEFAULT_OPTIONS_VALUES in multi mode', async () => {
+        const result = await (0, buildConfig_1.buildConfig)([createMockSpec()], true);
+        node_assert_1.default.strictEqual(result.httpClient, Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.httpClient);
+        node_assert_1.default.strictEqual(result.sortByRequired, Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.sortByRequired);
+        node_assert_1.default.strictEqual(result.enumPrefix, Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.enumPrefix);
+        node_assert_1.default.strictEqual(result.excludeCoreServiceFiles, Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.excludeCoreServiceFiles);
+        node_assert_1.default.strictEqual(result.interfacePrefix, Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.interfacePrefix);
+        node_assert_1.default.strictEqual(result.typePrefix, Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.typePrefix);
+        node_assert_1.default.strictEqual(result.useCancelableRequest, Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.useCancelableRequest);
+        node_assert_1.default.strictEqual(result.useOptions, Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.useOptions);
+        node_assert_1.default.strictEqual(result.useSeparatedIndexes, Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.useSeparatedIndexes);
+        node_assert_1.default.strictEqual(result.useUnionTypes, Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.useUnionTypes);
+        node_assert_1.default.strictEqual(result.modelsMode, Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.modelsMode);
+        node_assert_1.default.strictEqual(result.useHistory, Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.useHistory);
+        node_assert_1.default.strictEqual(result.diffReport, Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.diffReport);
+    });
+    (0, node_test_1.test)('uses first spec for flat config', async () => {
+        const validatedSpecs = [createMockSpec('./api/v1.yml'), createMockSpec('./api/v2.yml')];
+        const result = await (0, buildConfig_1.buildConfig)(validatedSpecs, false);
+        node_assert_1.default.strictEqual(result.input, './api/v1.yml');
+        node_assert_1.default.strictEqual(result.output, Consts_1.DEFAULT_OUTPUT_API_DIR);
+    });
+    (0, node_test_1.test)('throws when no validated specs in flat mode', async () => {
+        await node_assert_1.default.rejects(() => (0, buildConfig_1.buildConfig)([], false), /No validated spec files found/);
+    });
+    (0, node_test_1.test)('includes request in flat mode', async () => {
+        const customRequest = './custom/request.ts';
+        const result = await (0, buildConfig_1.buildConfig)([createMockSpec()], false, { request: customRequest });
+        node_assert_1.default.strictEqual(result.request, customRequest);
+    });
+});
+(0, node_test_1.describe)('@unit: buildExampleConfig', () => {
+    (0, node_test_1.test)('creates multi-option example with placeholder spec path', () => {
+        const result = (0, buildConfig_1.buildExampleConfig)(true);
+        node_assert_1.default.strictEqual(result.items?.length, 1);
+        node_assert_1.default.strictEqual(result.items?.[0].input, './openapi/spec.yml');
+        node_assert_1.default.strictEqual(result.items?.[0].output, Consts_1.DEFAULT_OUTPUT_API_DIR);
+    });
+    (0, node_test_1.test)('creates flat example with placeholder spec path', () => {
+        const result = (0, buildConfig_1.buildExampleConfig)(false);
+        node_assert_1.default.strictEqual(result.input, './openapi/spec.yml');
+        node_assert_1.default.strictEqual(result.output, Consts_1.DEFAULT_OUTPUT_API_DIR);
+    });
+    (0, node_test_1.test)('includes root request for multi-option when not perSpecRequest', () => {
+        const customRequest = './custom/request.ts';
+        const result = (0, buildConfig_1.buildExampleConfig)(true, { request: customRequest }, false);
+        node_assert_1.default.strictEqual(result.request, customRequest);
+        node_assert_1.default.strictEqual(result.items?.[0].request, undefined);
+    });
+    (0, node_test_1.test)('includes per-item request when perSpecRequest is true', () => {
+        const customRequest = './custom/request.ts';
+        const result = (0, buildConfig_1.buildExampleConfig)(true, { request: customRequest }, true);
+        node_assert_1.default.strictEqual(result.request, undefined);
+        node_assert_1.default.strictEqual(result.items?.[0].request, customRequest);
+    });
+});

package/dist/cli/initOpenApiConfig/utils/__tests__/findSpecFiles.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=findSpecFiles.test.d.ts.map

package/dist/cli/initOpenApiConfig/utils/__tests__/findSpecFiles.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"findSpecFiles.test.d.ts","sourceRoot":"","sources":["../../../../../src/cli/initOpenApiConfig/utils/__tests__/findSpecFiles.test.ts"],"names":[],"mappings":""}

package/dist/cli/initOpenApiConfig/utils/__tests__/findSpecFiles.test.js

@@ -0,0 +1,45 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const node_assert_1 = __importDefault(require("node:assert"));
+const node_fs_1 = __importDefault(require("node:fs"));
+const node_path_1 = __importDefault(require("node:path"));
+const node_test_1 = require("node:test");
+const findSpecFiles_1 = require("../findSpecFiles");
+const createTempDir = (t, prefix) => {
+    const root = node_path_1.default.join(__dirname, 'generated');
+    node_fs_1.default.mkdirSync(root, { recursive: true });
+    const tempDir = node_fs_1.default.mkdtempSync(node_path_1.default.join(root, prefix));
+    t.after(() => {
+        node_fs_1.default.rmSync(tempDir, { recursive: true, force: true });
+    });
+    return tempDir;
+};
+(0, node_test_1.describe)('@unit: findSpecFiles', () => {
+    (0, node_test_1.test)('returns spec files with supported extensions', async (t) => {
+        const dir = createTempDir(t, 'find-specs-');
+        node_fs_1.default.writeFileSync(node_path_1.default.join(dir, 'api.json'), '{}');
+        node_fs_1.default.writeFileSync(node_path_1.default.join(dir, 'api.yml'), 'openapi: 3.0.0');
+        node_fs_1.default.writeFileSync(node_path_1.default.join(dir, 'api.yaml'), 'openapi: 3.0.0');
+        node_fs_1.default.writeFileSync(node_path_1.default.join(dir, 'readme.txt'), 'skip');
+        const files = await (0, findSpecFiles_1.findSpecFiles)(dir);
+        node_assert_1.default.strictEqual(files.length, 3);
+        node_assert_1.default.ok(files.every(file => /\.(json|ya?ml)$/i.test(file)));
+    });
+    (0, node_test_1.test)('throws when directory does not exist', async () => {
+        await node_assert_1.default.rejects(() => (0, findSpecFiles_1.findSpecFiles)(node_path_1.default.join(__dirname, 'missing-dir-never-exists')), /Directory does not exist/);
+    });
+    (0, node_test_1.test)('throws when path is not a directory', async (t) => {
+        const dir = createTempDir(t, 'find-specs-file-');
+        const filePath = node_path_1.default.join(dir, 'not-a-dir.json');
+        node_fs_1.default.writeFileSync(filePath, '{}');
+        await node_assert_1.default.rejects(() => (0, findSpecFiles_1.findSpecFiles)(filePath), /Path is not a directory/);
+    });
+    (0, node_test_1.test)('returns empty array for directory without specs', async (t) => {
+        const dir = createTempDir(t, 'find-specs-empty-');
+        const files = await (0, findSpecFiles_1.findSpecFiles)(dir);
+        node_assert_1.default.deepStrictEqual(files, []);
+    });
+});

package/dist/cli/initOpenApiConfig/utils/__tests__/validateSpecFiles.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=validateSpecFiles.test.d.ts.map

package/dist/cli/initOpenApiConfig/utils/__tests__/validateSpecFiles.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"validateSpecFiles.test.d.ts","sourceRoot":"","sources":["../../../../../src/cli/initOpenApiConfig/utils/__tests__/validateSpecFiles.test.ts"],"names":[],"mappings":""}

package/dist/cli/initOpenApiConfig/utils/__tests__/validateSpecFiles.test.js

@@ -0,0 +1,61 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const node_assert_1 = __importDefault(require("node:assert"));
+const node_fs_1 = __importDefault(require("node:fs"));
+const node_path_1 = __importDefault(require("node:path"));
+const node_test_1 = require("node:test");
+const silenceLoggers_1 = require("../../../../test/helpers/silenceLoggers");
+const validateSpecFile_1 = require("../validateSpecFile");
+const validateSpecFiles_1 = require("../validateSpecFiles");
+const minimalOpenApi = {
+    openapi: '3.0.3',
+    info: { title: 'Test API', version: '1.0.0' },
+    paths: {},
+};
+const createSpecFile = (t, content) => {
+    const root = node_path_1.default.join(__dirname, 'generated');
+    node_fs_1.default.mkdirSync(root, { recursive: true });
+    const dir = node_fs_1.default.mkdtempSync(node_path_1.default.join(root, 'spec-'));
+    const filePath = node_path_1.default.join(dir, 'spec.json');
+    node_fs_1.default.writeFileSync(filePath, JSON.stringify(content), 'utf-8');
+    t.after(() => {
+        node_fs_1.default.rmSync(dir, { recursive: true, force: true });
+    });
+    return filePath;
+};
+(0, node_test_1.describe)('@unit: validateSpecFiles', () => {
+    let restoreAppLogger;
+    (0, node_test_1.beforeEach)(() => {
+        restoreAppLogger = (0, silenceLoggers_1.installSilenceAppLogger)();
+    });
+    (0, node_test_1.afterEach)(() => {
+        restoreAppLogger?.();
+        restoreAppLogger = undefined;
+    });
+    (0, node_test_1.test)('validateSpecFile returns true for valid OpenAPI spec', async (t) => {
+        const specPath = createSpecFile(t, minimalOpenApi);
+        const isValid = await (0, validateSpecFile_1.validateSpecFile)(specPath);
+        node_assert_1.default.strictEqual(isValid, true);
+    });
+    (0, node_test_1.test)('validateSpecFile returns false for invalid file', async (t) => {
+        const specPath = createSpecFile(t, { not: 'openapi' });
+        const isValid = await (0, validateSpecFile_1.validateSpecFile)(specPath);
+        node_assert_1.default.strictEqual(isValid, false);
+    });
+    (0, node_test_1.test)('validateSpecFiles returns only valid specs with relative paths', async (t) => {
+        const validPath = createSpecFile(t, minimalOpenApi);
+        const invalidPath = createSpecFile(t, { invalid: true });
+        const validated = await (0, validateSpecFiles_1.validateSpecFiles)([validPath, invalidPath]);
+        node_assert_1.default.strictEqual(validated.length, 1);
+        node_assert_1.default.strictEqual(validated[0].path, validPath);
+        node_assert_1.default.ok(validated[0].relativePath.endsWith('spec.json'));
+    });
+    (0, node_test_1.test)('validateSpecFiles returns empty array when all files invalid', async (t) => {
+        const invalidPath = createSpecFile(t, { invalid: true });
+        const validated = await (0, validateSpecFiles_1.validateSpecFiles)([invalidPath]);
+        node_assert_1.default.deepStrictEqual(validated, []);
+    });
+});

package/dist/cli/initOpenApiConfig/utils/buildConfig.d.ts

@@ -1,21 +1,15 @@
 import { TRawOptions } from '../../../common/TRawOptions';
 import { ValidatedSpec } from './validateSpecFiles';
+export type HttpConfigPaths = {
+    request?: string;
+    customExecutorPath?: string;
+};
 /**
  * Формирует конфигурацию на основе валидированных спецификаций
- * @param validatedSpecs - Массив валидированных спецификаций
- * @param useMultiOption - Использовать множественный формат (items)
- * @param customRequest - Путь к кастомной реализации request (опционально)
- * @param perSpecRequest - Использовать отдельный request для каждой спецификации (только для MULTI)
- * @returns Объект конфигурации
- * @throws {Error} Если нет валидированных спецификаций для плоского формата
  */
-export declare function buildConfig(validatedSpecs: ValidatedSpec[], useMultiOption: boolean, customRequest?: string, perSpecRequest?: boolean): Promise<TRawOptions>;
+export declare function buildConfig(validatedSpecs: ValidatedSpec[], useMultiOption: boolean, httpConfig?: HttpConfigPaths, perSpecRequest?: boolean): Promise<TRawOptions>;
 /**
  * Создает пример конфигурации, когда нет валидированных спецификаций
- * @param useMultiOption - Использовать множественный формат (items)
- * @param customRequest - Путь к кастомной реализации request (опционально)
- * @param perSpecRequest - Использовать отдельный request для каждой спецификации (только для MULTI)
- * @returns Объект конфигурации-примера
  */
-export declare function buildExampleConfig(useMultiOption: boolean, customRequest?: string, perSpecRequest?: boolean): TRawOptions;
+export declare function buildExampleConfig(useMultiOption: boolean, httpConfig?: HttpConfigPaths, perSpecRequest?: boolean): TRawOptions;
 //# sourceMappingURL=buildConfig.d.ts.map

package/dist/cli/initOpenApiConfig/utils/buildConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buildConfig.d.ts","sourceRoot":"","sources":["../../../../src/cli/initOpenApiConfig/utils/buildConfig.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEpD;;;;;;;;GAQG;AACH,wBAAsB,WAAW,CAAC,cAAc,EAAE,aAAa,EAAE,EAAE,cAAc,EAAE,OAAO,EAAE,aAAa,CAAC,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC,CA8ClK;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,cAAc,EAAE,OAAO,EAAE,aAAa,CAAC,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,OAAO,GAAG,WAAW,CAuCzH"}
+{"version":3,"file":"buildConfig.d.ts","sourceRoot":"","sources":["../../../../src/cli/initOpenApiConfig/utils/buildConfig.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEpD,MAAM,MAAM,eAAe,GAAG;IAC1B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC/B,CAAC;AAqBF;;GAEG;AACH,wBAAsB,WAAW,CAAC,cAAc,EAAE,aAAa,EAAE,EAAE,cAAc,EAAE,OAAO,EAAE,UAAU,CAAC,EAAE,eAAe,EAAE,cAAc,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC,CA2ExK;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,cAAc,EAAE,OAAO,EAAE,UAAU,CAAC,EAAE,eAAe,EAAE,cAAc,CAAC,EAAE,OAAO,GAAG,WAAW,CAqE/H"}

package/dist/cli/initOpenApiConfig/utils/buildConfig.js

@@ -3,21 +3,31 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildConfig = buildConfig;
 exports.buildExampleConfig = buildExampleConfig;
 const Consts_1 = require("../../../common/Consts");
+const spreadHttpConfig = (paths, perItem = false) => {
+    if (!paths) {
+        return {};
+    }
+    if (perItem && paths.request) {
+        return { request: paths.request };
+    }
+    const result = {};
+    if (!perItem && paths.request) {
+        result.request = paths.request;
+    }
+    if (paths.customExecutorPath) {
+        result.customExecutorPath = paths.customExecutorPath;
+    }
+    return result;
+};
 /**
  * Формирует конфигурацию на основе валидированных спецификаций
- * @param validatedSpecs - Массив валидированных спецификаций
- * @param useMultiOption - Использовать множественный формат (items)
- * @param customRequest - Путь к кастомной реализации request (опционально)
- * @param perSpecRequest - Использовать отдельный request для каждой спецификации (только для MULTI)
- * @returns Объект конфигурации
- * @throws {Error} Если нет валидированных спецификаций для плоского формата
  */
-async function buildConfig(validatedSpecs, useMultiOption, customRequest, perSpecRequest) {
+async function buildConfig(validatedSpecs, useMultiOption, httpConfig, perSpecRequest) {
     if (useMultiOption) {
         const items = validatedSpecs.map(spec => ({
             input: spec.relativePath,
             output: Consts_1.DEFAULT_OUTPUT_API_DIR,
-            ...(perSpecRequest && customRequest ? { request: customRequest } : {}),
+            ...(perSpecRequest ? spreadHttpConfig(httpConfig, true) : {}),
         }));
         return {
             items,
@@ -31,14 +41,28 @@ async function buildConfig(validatedSpecs, useMultiOption, customRequest, perSpe
             useOptions: Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.useOptions,
             useSeparatedIndexes: Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.useSeparatedIndexes,
             useUnionTypes: Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.useUnionTypes,
-            ...(!perSpecRequest && customRequest ? { request: customRequest } : {}),
+            modelsMode: Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.modelsMode,
+            useHistory: Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.useHistory,
+            diffReport: Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.diffReport,
+            ...(!perSpecRequest ? spreadHttpConfig(httpConfig) : {}),
+            models: {
+                mode: Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.modelsMode,
+            },
+            analyze: {
+                useHistory: Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.useHistory,
+                reportPath: Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.diffReport,
+            },
+            miracles: {
+                enabled: true,
+                confidence: 1,
+                types: ['RENAME', 'TYPE_COERCION'],
+            },
         };
     }
     else {
         if (validatedSpecs.length === 0) {
             throw new Error('No validated spec files found');
         }
-        // Для плоского варианта используем первую спецификацию
         const firstSpec = validatedSpecs[0];
         return {
             input: firstSpec.relativePath,
@@ -53,25 +77,36 @@ async function buildConfig(validatedSpecs, useMultiOption, customRequest, perSpe
             useOptions: Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.useOptions,
             useSeparatedIndexes: Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.useSeparatedIndexes,
             useUnionTypes: Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.useUnionTypes,
-            ...(customRequest ? { request: customRequest } : {}),
+            modelsMode: Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.modelsMode,
+            useHistory: Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.useHistory,
+            diffReport: Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.diffReport,
+            ...spreadHttpConfig(httpConfig),
+            models: {
+                mode: Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.modelsMode,
+            },
+            analyze: {
+                useHistory: Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.useHistory,
+                reportPath: Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.diffReport,
+            },
+            miracles: {
+                enabled: true,
+                confidence: 1,
+                types: ['RENAME', 'TYPE_COERCION'],
+            },
         };
     }
 }
 /**
  * Создает пример конфигурации, когда нет валидированных спецификаций
- * @param useMultiOption - Использовать множественный формат (items)
- * @param customRequest - Путь к кастомной реализации request (опционально)
- * @param perSpecRequest - Использовать отдельный request для каждой спецификации (только для MULTI)
- * @returns Объект конфигурации-примера
  */
-function buildExampleConfig(useMultiOption, customRequest, perSpecRequest) {
+function buildExampleConfig(useMultiOption, httpConfig, perSpecRequest) {
     if (useMultiOption) {
         return {
             items: [
                 {
                     input: './openapi/spec.yml',
                     output: Consts_1.DEFAULT_OUTPUT_API_DIR,
-                    ...(perSpecRequest && customRequest ? { request: customRequest } : {}),
+                    ...(perSpecRequest ? spreadHttpConfig(httpConfig, true) : {}),
                 },
             ],
             httpClient: Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.httpClient,
@@ -84,7 +119,22 @@ function buildExampleConfig(useMultiOption, customRequest, perSpecRequest) {
             useOptions: Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.useOptions,
             useSeparatedIndexes: Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.useSeparatedIndexes,
             useUnionTypes: Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.useUnionTypes,
-            ...(!perSpecRequest && customRequest ? { request: customRequest } : {}),
+            modelsMode: Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.modelsMode,
+            useHistory: Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.useHistory,
+            diffReport: Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.diffReport,
+            ...(!perSpecRequest ? spreadHttpConfig(httpConfig) : {}),
+            models: {
+                mode: Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.modelsMode,
+            },
+            analyze: {
+                useHistory: Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.useHistory,
+                reportPath: Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.diffReport,
+            },
+            miracles: {
+                enabled: true,
+                confidence: 1,
+                types: ['RENAME', 'TYPE_COERCION'],
+            },
         };
     }
     else {
@@ -101,7 +151,22 @@ function buildExampleConfig(useMultiOption, customRequest, perSpecRequest) {
             useOptions: Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.useOptions,
             useSeparatedIndexes: Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.useSeparatedIndexes,
             useUnionTypes: Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.useUnionTypes,
-            ...(customRequest ? { request: customRequest } : {}),
+            modelsMode: Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.modelsMode,
+            useHistory: Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.useHistory,
+            diffReport: Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.diffReport,
+            ...spreadHttpConfig(httpConfig),
+            models: {
+                mode: Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.modelsMode,
+            },
+            analyze: {
+                useHistory: Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.useHistory,
+                reportPath: Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.diffReport,
+            },
+            miracles: {
+                enabled: true,
+                confidence: 1,
+                types: ['RENAME', 'TYPE_COERCION'],
+            },
         };
     }
 }

package/dist/cli/initOpenApiConfig/utils/registerHandlebarTemplates.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"registerHandlebarTemplates.d.ts","sourceRoot":"","sources":["../../../../src/cli/initOpenApiConfig/utils/registerHandlebarTemplates.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAGxC,wBAAgB,0BAA0B,IAAI,YAAY,CAUzD"}
+{"version":3,"file":"registerHandlebarTemplates.d.ts","sourceRoot":"","sources":["../../../../src/cli/initOpenApiConfig/utils/registerHandlebarTemplates.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAExC,wBAAgB,0BAA0B,IAAI,YAAY,CAWzD"}

package/dist/cli/initOpenApiConfig/utils/registerHandlebarTemplates.js

@@ -38,6 +38,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.registerHandlebarTemplates = registerHandlebarTemplates;
 const Handlebars = __importStar(require("handlebars/runtime"));
+const customCreateExecutorAdapter_1 = __importDefault(require("../../../templatesCompiled/cli/customCreateExecutorAdapter"));
 const customRequest_1 = __importDefault(require("../../../templatesCompiled/cli/customRequest"));
 const customRequestExecutor_1 = __importDefault(require("../../../templatesCompiled/cli/customRequestExecutor"));
 const openApiConfig_1 = __importDefault(require("../../../templatesCompiled/cli/openApiConfig"));
@@ -47,6 +48,7 @@ function registerHandlebarTemplates() {
         config: Handlebars.template(openApiConfig_1.default),
         request: Handlebars.template(customRequest_1.default),
         requestExecutor: Handlebars.template(customRequestExecutor_1.default),
+        createExecutorAdapter: Handlebars.template(customCreateExecutorAdapter_1.default),
     };
     Handlebars.registerPartial('header', Handlebars.template(header_1.default));
     return templates;

package/dist/cli/initOpenApiConfig/utils/validateSpecFile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validateSpecFile.d.ts","sourceRoot":"","sources":["../../../../src/cli/initOpenApiConfig/utils/validateSpecFile.ts"],"names":[],"mappings":"AAIA;;;;GAIG;AACH,wBAAsB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAQzE"}
+{"version":3,"file":"validateSpecFile.d.ts","sourceRoot":"","sources":["../../../../src/cli/initOpenApiConfig/utils/validateSpecFile.ts"],"names":[],"mappings":"AAKA;;;;GAIG;AACH,wBAAsB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAQzE"}

package/dist/cli/initOpenApiConfig/utils/validateSpecFile.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateSpecFile = validateSpecFile;
 const swagger_parser_1 = __importDefault(require("@apidevtools/swagger-parser"));
 const Consts_1 = require("../../../common/Consts");
+const LoggerMessages_1 = require("../../../common/LoggerMessages");
 /**
  * Валидирует файл спецификации через SwaggerParser
  * @param filePath - Путь к файлу спецификации
@@ -17,7 +18,7 @@ async function validateSpecFile(filePath) {
         return true;
     }
     catch {
-        Consts_1.APP_LOGGER.warn(`Skipping invalid spec file: ${filePath}`);
+        Consts_1.APP_LOGGER.warn(LoggerMessages_1.LOGGER_MESSAGES.SPEC_VALIDATION.SKIP_INVALID_FILE(filePath));
         return false;
     }
 }

package/dist/cli/initOpenApiConfig/utils/writeConfigFile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"writeConfigFile.d.ts","sourceRoot":"","sources":["../../../../src/cli/initOpenApiConfig/utils/writeConfigFile.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAI1D,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAExC;;;;;;GAMG;AACH,wBAAsB,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,SAAS,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAerH"}
+{"version":3,"file":"writeConfigFile.d.ts","sourceRoot":"","sources":["../../../../src/cli/initOpenApiConfig/utils/writeConfigFile.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAI1D,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAExC;;;;;;GAMG;AACH,wBAAsB,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,SAAS,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAerH"}

package/dist/cli/initOpenApiConfig/utils/writeConfigFile.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.writeConfigFile = writeConfigFile;
 const path_1 = __importDefault(require("path"));
 const Consts_1 = require("../../../common/Consts");
+const LoggerMessages_1 = require("../../../common/LoggerMessages");
 const fileSystemHelpers_1 = require("../../../common/utils/fileSystemHelpers");
 const format_1 = require("../../../common/utils/format");
 const pathHelpers_1 = require("../../../common/utils/pathHelpers");
@@ -27,5 +28,5 @@ async function writeConfigFile(configPath, config, templates) {
     const templateResult = templates.config(config);
     const formattedValue = await (0, format_1.format)(templateResult, 'json');
     await fileSystemHelpers_1.fileSystemHelpers.writeFile(resolvedPath, formattedValue);
-    Consts_1.APP_LOGGER.info(`Configuration file created: ${resolvedPath}`);
+    Consts_1.APP_LOGGER.info(LoggerMessages_1.LOGGER_MESSAGES.CONFIG.CONFIG_CREATED(resolvedPath));
 }

package/dist/cli/interactive/confirmDialog.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"confirmDialog.d.ts","sourceRoot":"","sources":["../../../src/cli/interactive/confirmDialog.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,sBAAsB,EAAE,MAAM,SAAS,CAAC;AAEjD;;;;;;;;;;;;;GAaG;AACH,wBAAsB,aAAa,CAAC,OAAO,EAAE,sBAAsB,GAAG,OAAO,CAAC,OAAO,CAAC,CAerF"}
+{"version":3,"file":"confirmDialog.d.ts","sourceRoot":"","sources":["../../../src/cli/interactive/confirmDialog.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,sBAAsB,EAAE,MAAM,SAAS,CAAC;AAEjD;;;;;;;;;;;;;GAaG;AACH,wBAAsB,aAAa,CAAC,OAAO,EAAE,sBAAsB,GAAG,OAAO,CAAC,OAAO,CAAC,CAgBrF"}

package/dist/cli/interactive/confirmDialog.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.confirmDialog = confirmDialog;
 const enquirer_1 = require("enquirer");
 const Consts_1 = require("../../common/Consts");
-const constants_1 = require("./constants");
+const LoggerMessages_1 = require("../../common/LoggerMessages");
 /**
  * Отображает диалог подтверждения для пользователя.
  * Используется для критичных действий (удаление, публикация и т.д.)
@@ -30,7 +30,8 @@ async function confirmDialog(options) {
     }
     catch {
         // Пользователь прервал процесс (Ctrl+C)
-        Consts_1.APP_LOGGER.error(`\n${constants_1.DIALOG_MESSAGES.OPERATION_CANCELLED}`);
+        Consts_1.APP_LOGGER.error(LoggerMessages_1.LOGGER_MESSAGES.DIALOG.OPERATION_CANCELLED);
+        await Consts_1.APP_LOGGER.shutdownLoggerAsync();
         process.exit(0);
     }
 }

package/dist/cli/interactive/constants.d.ts

@@ -1,7 +1,3 @@
 import { EConfigType, EnquirerSelectChoice } from './types';
 export declare const OPEN_API_CONFIG_SELECT_OPTIONS: EnquirerSelectChoice<EConfigType>[];
-export declare const DIALOG_MESSAGES: {
-    readonly OPERATION_CANCELLED: "Операция отменена пользователем.";
-    readonly SELECTION_CANCELLED: "Выбор отменён.";
-};
 //# sourceMappingURL=constants.d.ts.map

package/dist/cli/interactive/constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../src/cli/interactive/constants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAC,oBAAoB,EAAE,MAAM,SAAS,CAAC;AAE3D,eAAO,MAAM,8BAA8B,EAAE,oBAAoB,CAAC,WAAW,CAAC,EAgB7E,CAAC;AAEF,eAAO,MAAM,eAAe;;;CAGlB,CAAC"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../src/cli/interactive/constants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAC;AAE5D,eAAO,MAAM,8BAA8B,EAAE,oBAAoB,CAAC,WAAW,CAAC,EAgB7E,CAAC"}