ts-openapi-codegen 2.0.0-beta.8 → 2.0.0

package/dist/cli/index.js

@@ -10,6 +10,7 @@ const Consts_1 = require("../common/Consts");
 const Enums_1 = require("../common/Enums");
 const UpdateNotifier_1 = require("../common/UpdateNotifier");
 const pathHelpers_1 = require("../common/utils/pathHelpers");
+const EmptySchemaStrategy_enum_1 = require("../core/types/enums/EmptySchemaStrategy.enum");
 const HttpClient_enum_1 = require("../core/types/enums/HttpClient.enum");
 const ValidationLibrary_enum_1 = require("../core/types/enums/ValidationLibrary.enum");
 const checkConfig_1 = require("./checkAndUpdateConfig/checkConfig");
@@ -48,6 +49,7 @@ program
     .option('--useUnionTypes', 'Use union types instead of enums (default: false)')
     .option('--excludeCoreServiceFiles', 'The generation of the core and services is excluded (default: false)')
     .option('--request <value>', 'Path to custom request file')
+    .option('--customExecutorPath <value>', 'Path to custom createExecutorAdapter module')
     .option('--interfacePrefix <value>', 'Prefix for interface model(default: "I")', 'I')
     .option('--enumPrefix <value>', 'Prefix for enum model(default: "E")', 'E')
     .option('--typePrefix <value>', 'Prefix for type model(default: "T")', 'T')
@@ -57,6 +59,7 @@ program
     .option('-s, --sortByRequired', 'Property sorting strategy: simplified or extended')
     .option('--useSeparatedIndexes', 'Use separate index files for the core, models, schemas, and services.')
     .addOption(new commander_1.Option('--validationLibrary <value>', 'Validation library to use for schema validation').choices([...Object.values(ValidationLibrary_enum_1.ValidationLibrary)]).default(ValidationLibrary_enum_1.ValidationLibrary.NONE))
+    .addOption(new commander_1.Option('--emptySchemaStrategy <value>', 'How to handle empty generated schemas').choices([...Object.values(EmptySchemaStrategy_enum_1.EmptySchemaStrategy)]).default(EmptySchemaStrategy_enum_1.EmptySchemaStrategy.KEEP))
     .hook('preAction', async () => {
     await updateNotifier.checkAndNotify();
 })
@@ -75,7 +78,7 @@ program
     await updateNotifier.checkAndNotify();
 })
     .action(async (options) => {
-    await (0, checkConfig_1.checkConfig)(options.openapiConfig);
+    await (0, checkConfig_1.checkConfig)(options);
 });
 /**
  * update - Команда для обновления конфигурационного файла
@@ -89,7 +92,7 @@ program
     await updateNotifier.checkAndNotify();
 })
     .action(async (options) => {
-    await (0, updateConfig_1.updateConfig)(options.openapiConfig);
+    await (0, updateConfig_1.updateConfig)(options);
 });
 /**
  * init - Команда для инициализации конфигурационного файла
@@ -116,10 +119,10 @@ program
     .command('preview-changes')
     .description('Preview changes that will be made to generated code before applying them')
     .addHelpText('before', (0, utils_1.getCLIName)(APP_NAME))
-    .option('-ocn, --openapi-config <value>', 'The path to the configuration file, listing the options', Consts_1.DEFAULT_OPENAPI_CONFIG_FILENAME)
-    .option('-gd, --generated-dir <value>', 'Directory with previously generated code (default: "generated")', './generated')
-    .option('-pd, --preview-dir <value>', 'Temporary directory for preview generation (default: "generated-preview")', './generated-preview')
-    .option('-dd, --diff-dir <value>', 'Directory to save diff files (default: "generated-diff")', './generated-diff')
+    .option('-ocn, --openapi-config <value>', 'The path to the configuration file, listing the options (default: "openapi.config.json")', Consts_1.DEFAULT_OPENAPI_CONFIG_FILENAME)
+    .option('-gd, --generated-dir <value>', 'Directory with previously generated code (default: "generated")', Consts_1.DEFAULT_OUTPUT_API_DIR)
+    .option('-pd, --preview-dir <value>', 'Temporary directory for preview generation (default: ".ts-openapi-codegen-preview-changes)', Consts_1.DEFAULT_PREVIEW_CHANGES_DIR)
+    .option('-dd, --diff-dir <value>', 'Directory to save diff files (default: ".ts-openapi-codegen-diff-changes")', Consts_1.DEFAULT_DIFF_CHANGES_DIR)
     .hook('preAction', async () => {
     await updateNotifier.checkAndNotify();
 })
@@ -127,8 +130,7 @@ program
     await (0, previewChanges_1.previewChanges)(options);
 });
 program.exitOverride();
-// TODO: Включить позже!
-// program.showSuggestionAfterError(false);
+program.showSuggestionAfterError(false);
 // Парсирование аргументов с обработкой ошибок
 try {
     program.parse(process.argv);

package/dist/cli/initOpenApiConfig/init.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../src/cli/initOpenApiConfig/init.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAUzC;;GAEG;AACH,wBAAsB,IAAI,CAAC,OAAO,EAAE,YAAY,iBAmD/C"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../src/cli/initOpenApiConfig/init.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAUzC;;GAEG;AACH,wBAAsB,IAAI,CAAC,OAAO,EAAE,YAAY,iBA4C/C"}

package/dist/cli/initOpenApiConfig/init.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.init = init;
 const Consts_1 = require("../../common/Consts");
+const validateZodOptions_1 = require("../../common/Validation/validateZodOptions");
 const confirmDialog_1 = require("../interactive/confirmDialog");
 const schemas_1 = require("../schemas");
-const validation_1 = require("../validation");
 const initConfig_1 = require("./initConfig");
 const initCustomRequest_1 = require("./initCustomRequest");
 const registerHandlebarTemplates_1 = require("./utils/registerHandlebarTemplates");
@@ -12,20 +12,12 @@ const registerHandlebarTemplates_1 = require("./utils/registerHandlebarTemplates
  * Фнукция изначальной настройки файлов конфигурации для последующего запуска генератора
  */
 async function init(options) {
-    let validatedOptions;
-    try {
-        // Валидация опций через Zod
-        const validationResult = (0, validation_1.validateCLIOptions)(schemas_1.initOptionsSchema, options);
-        if (!validationResult.success) {
-            Consts_1.APP_LOGGER.error(validationResult.error);
-            process.exit(1);
-        }
-        validatedOptions = validationResult.data;
-    }
-    catch (error) {
-        Consts_1.APP_LOGGER.error(error.message);
+    const validationResult = (0, validateZodOptions_1.validateZodOptions)(schemas_1.initOptionsSchema, options);
+    if (!validationResult.success) {
+        Consts_1.APP_LOGGER.error(validationResult.errors.join('\n'));
         process.exit(1);
     }
+    const validatedOptions = validationResult.data;
     const templates = (0, registerHandlebarTemplates_1.registerHandlebarTemplates)();
     if (validatedOptions.useInteractiveMode) {
         const shouldInitConfig = await (0, confirmDialog_1.confirmDialog)({

package/dist/cli/initOpenApiConfig/initConfig.js

@@ -16,7 +16,7 @@ const writeConfigFile_1 = require("./utils/writeConfigFile");
  * Инициализирует файл конфигурации OpenAPI
  */
 async function initConfig(params) {
-    const configPath = (0, pathHelpers_1.resolveHelper)(process.cwd(), params.openapiConfig);
+    const configPath = (0, pathHelpers_1.resolveHelper)(process.cwd(), params.openapiConfig || '');
     const configExists = await fileSystemHelpers_1.fileSystemHelpers.exists(configPath);
     // Шаг 3: Проверка существования файла конфигурации
     if (configExists) {
@@ -29,7 +29,7 @@ async function initConfig(params) {
             return;
         }
     }
-    const currentSpecsDir = params.specsDir;
+    const currentSpecsDir = params.specsDir || '';
     // Шаг 4: Формирование файла конфигурации
     // Поиск файлов спецификаций
     let specFiles = [];
@@ -98,5 +98,5 @@ async function initConfig(params) {
         config = (0, buildConfig_1.buildExampleConfig)(useMultiOption, customRequest, perSpecRequest);
     }
     // Записываем конфигурацию на диск
-    await (0, writeConfigFile_1.writeConfigFile)(params.openapiConfig, config, params.templates);
+    await (0, writeConfigFile_1.writeConfigFile)(params.openapiConfig || '', config, params.templates);
 }

package/dist/cli/previewChanges/previewChanges.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"previewChanges.d.ts","sourceRoot":"","sources":["../../../src/cli/previewChanges/previewChanges.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AA0BzC;;;;GAIG;AACH,wBAAsB,cAAc,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CA0IzE"}
+{"version":3,"file":"previewChanges.d.ts","sourceRoot":"","sources":["../../../src/cli/previewChanges/previewChanges.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAoHzC;;;;GAIG;AACH,wBAAsB,cAAc,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAwLzE"}

package/dist/cli/previewChanges/previewChanges.js

@@ -36,44 +36,119 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.previewChanges = previewChanges;
 const Consts_1 = require("../../common/Consts");
 const Enums_1 = require("../../common/Enums");
+const LoggerMessages_1 = require("../../common/LoggerMessages");
 const convertArrayToObject_1 = require("../../common/utils/convertArrayToObject");
 const fileSystemHelpers_1 = require("../../common/utils/fileSystemHelpers");
 const loadConfigIfExists_1 = require("../../common/utils/loadConfigIfExists");
 const pathHelpers_1 = require("../../common/utils/pathHelpers");
+const validateZodOptions_1 = require("../../common/Validation/validateZodOptions");
 const AllMigrationPlans_1 = require("../../common/VersionedSchema/AllVersionedSchemas/AllMigrationPlans");
 const AllVersionedSchemas_1 = require("../../common/VersionedSchema/AllVersionedSchemas/AllVersionedSchemas");
 const migrateDataToLatestSchemaVersion_1 = require("../../common/VersionedSchema/Utils/migrateDataToLatestSchemaVersion");
 const OpenAPI = __importStar(require("../../core"));
+const schemas_1 = require("../schemas");
 const compareFiles_1 = require("./utils/compareFiles");
 const formatDiff_1 = require("./utils/formatDiff");
 const isDirectoryEmpty_1 = require("./utils/isDirectoryEmpty");
 const readDirectoryRecursive_1 = require("./utils/readDirectoryRecursive");
 const updateOutputPaths_1 = require("./utils/updateOutputPaths");
+function buildSummary(changes) {
+    const added = [];
+    const removed = [];
+    const modified = [];
+    for (const change of changes) {
+        if (change.status === 'added') {
+            added.push(change.file);
+            continue;
+        }
+        if (change.status === 'removed') {
+            removed.push(change.file);
+            continue;
+        }
+        modified.push(change.file);
+    }
+    added.sort();
+    removed.sort();
+    modified.sort();
+    return {
+        added,
+        removed,
+        modified,
+        total: changes.length,
+    };
+}
+function toFileLink(filePath) {
+    return `./${filePath}.md`;
+}
+function toCategoryMarkdown(title, files) {
+    const lines = [`# ${title}`, ''];
+    if (files.length === 0) {
+        lines.push('_No files_', '');
+        return lines.join('\n');
+    }
+    for (const file of files) {
+        lines.push(`- [${file}](${toFileLink(file)})`);
+    }
+    lines.push('');
+    return lines.join('\n');
+}
+function toSummaryMarkdown(summary) {
+    return [
+        '# Preview Changes Summary',
+        '',
+        `Total changes: ${summary.total}`,
+        `Added files: ${summary.added.length}`,
+        `Removed files: ${summary.removed.length}`,
+        `Modified files: ${summary.modified.length}`,
+        '',
+        '## Reports',
+        '- [Added files](./added-files.md)',
+        '- [Removed files](./removed-files.md)',
+        '- [Modified files](./modified-files.md)',
+        '',
+        '## Added',
+        ...summary.added.map(file => `- [${file}](${toFileLink(file)})`),
+        '',
+        '## Removed',
+        ...summary.removed.map(file => `- [${file}](${toFileLink(file)})`),
+        '',
+        '## Modified',
+        ...summary.modified.map(file => `- [${file}](${toFileLink(file)})`),
+        '',
+    ].join('\n');
+}
 /**
  * Основная функция для предпросмотра изменений
  *
  * TODO: Добавить проверку опций команды перед выполнением
  */
 async function previewChanges(options) {
-    const { openapiConfig, generatedDir = 'generated', previewDir = 'generated-preview', diffDir = 'generated-diff' } = options;
-    const resolvedGeneratedDir = (0, pathHelpers_1.resolveHelper)(process.cwd(), generatedDir);
-    const resolvedPreviewDir = (0, pathHelpers_1.resolveHelper)(process.cwd(), previewDir);
-    const resolvedDiffDir = (0, pathHelpers_1.resolveHelper)(process.cwd(), diffDir);
+    let exitCode = 0;
+    let resolvedPreviewDir = '';
     let previewDirCreated = false;
     try {
+        const validationResult = (0, validateZodOptions_1.validateZodOptions)(schemas_1.previewChangesSchema, options);
+        if (!validationResult.success) {
+            Consts_1.APP_LOGGER.error(validationResult.errors.join('\n'));
+            exitCode = 1;
+            return;
+        }
+        const { openapiConfig, generatedDir, previewDir, diffDir } = validationResult.data;
+        const resolvedGeneratedDir = (0, pathHelpers_1.resolveHelper)(process.cwd(), generatedDir || '');
+        resolvedPreviewDir = (0, pathHelpers_1.resolveHelper)(process.cwd(), previewDir || '');
+        const resolvedDiffDir = (0, pathHelpers_1.resolveHelper)(process.cwd(), diffDir || '');
         // 1. Проверка директории со сгенерированным кодом
         if (await (0, isDirectoryEmpty_1.isDirectoryEmpty)(resolvedGeneratedDir)) {
             Consts_1.APP_LOGGER.info(`Directory "${generatedDir}" is empty or does not exist. Nothing to compare.`);
-            process.exit(0);
+            return;
         }
-        // 2. Создание временной директории для preview
-        await fileSystemHelpers_1.fileSystemHelpers.mkdir(resolvedPreviewDir);
-        previewDirCreated = true;
-        // 3. Загрузка конфигурации
+        // 2. Загрузка конфигурации
         const configData = (0, loadConfigIfExists_1.loadConfigIfExists)(openapiConfig);
         if (!configData) {
-            Consts_1.APP_LOGGER.error('The configuration file is missing');
-            process.exit(1);
+            throw new Error('The configuration file is missing');
+        }
+        if (Array.isArray(configData)) {
+            Consts_1.APP_LOGGER.warn(LoggerMessages_1.LOGGER_MESSAGES.CONFIG.ARRAY_DEPRECATED);
         }
         const preparedOptions = (0, convertArrayToObject_1.convertArrayToObject)(configData);
         // Миграция опций
@@ -84,12 +159,15 @@ async function previewChanges(options) {
             migrationMode: Enums_1.EMigrationMode.GENERATE_OPENAPI,
         });
         if (!migratedOptions) {
-            Consts_1.APP_LOGGER.error("Couldn't convert the set of options to the current version");
-            process.exit(1);
+            throw new Error("Couldn't convert the set of options to the current version");
         }
+        // 3. Подготовка и создание временной директории preview
+        await fileSystemHelpers_1.fileSystemHelpers.rmdir(resolvedPreviewDir);
+        await fileSystemHelpers_1.fileSystemHelpers.mkdir(resolvedPreviewDir);
+        previewDirCreated = true;
         // 4. Обновление путей output для генерации в preview директорию
         const migratedValue = migratedOptions.value;
-        const previewOptions = (0, updateOutputPaths_1.updateOutputPaths)(migratedValue, previewDir, generatedDir);
+        const previewOptions = (0, updateOutputPaths_1.updateOutputPaths)(migratedValue, previewDir || '', generatedDir || '');
         // 5. Генерация кода в preview директорию
         Consts_1.APP_LOGGER.info(`Generating code to preview directory: ${previewDir}`);
         await OpenAPI.generate(previewOptions);
@@ -97,13 +175,15 @@ async function previewChanges(options) {
         Consts_1.APP_LOGGER.info('Comparing files...');
         const oldFiles = await (0, readDirectoryRecursive_1.readDirectoryRecursive)(resolvedGeneratedDir);
         const newFiles = await (0, readDirectoryRecursive_1.readDirectoryRecursive)(resolvedPreviewDir);
-        const allFiles = new Set([...oldFiles, ...newFiles]);
+        const oldFileSet = new Set(oldFiles);
+        const newFileSet = new Set(newFiles);
+        const allFiles = new Set([...oldFileSet, ...newFileSet]);
         const changes = [];
-        for (const file of allFiles) {
+        for (const file of [...allFiles].sort()) {
             const oldPath = (0, pathHelpers_1.joinHelper)(resolvedGeneratedDir, file);
             const newPath = (0, pathHelpers_1.joinHelper)(resolvedPreviewDir, file);
-            const oldExists = await fileSystemHelpers_1.fileSystemHelpers.exists(oldPath);
-            const newExists = await fileSystemHelpers_1.fileSystemHelpers.exists(newPath);
+            const oldExists = oldFileSet.has(file);
+            const newExists = newFileSet.has(file);
             if (oldExists && newExists) {
                 // Файл существует в обеих директориях - сравниваем
                 const fileDiff = await (0, compareFiles_1.compareFiles)(oldPath, newPath);
@@ -135,6 +215,7 @@ async function previewChanges(options) {
         }
         // 7. Сохранение результатов в diff директорию
         if (changes.length > 0) {
+            await fileSystemHelpers_1.fileSystemHelpers.rmdir(resolvedDiffDir);
             await fileSystemHelpers_1.fileSystemHelpers.mkdir(resolvedDiffDir);
             for (const change of changes) {
                 const diffFilePath = (0, pathHelpers_1.joinHelper)(resolvedDiffDir, `${change.file}.md`);
@@ -153,30 +234,40 @@ async function previewChanges(options) {
                 await fileSystemHelpers_1.fileSystemHelpers.writeFile(diffFilePath, diffContent, 'utf-8');
                 Consts_1.APP_LOGGER.info(`Diff saved: ${diffFilePath}`);
             }
+            const summary = buildSummary(changes);
+            await fileSystemHelpers_1.fileSystemHelpers.writeFile((0, pathHelpers_1.joinHelper)(resolvedDiffDir, 'added-files.md'), toCategoryMarkdown('Added Files', summary.added), 'utf-8');
+            await fileSystemHelpers_1.fileSystemHelpers.writeFile((0, pathHelpers_1.joinHelper)(resolvedDiffDir, 'removed-files.md'), toCategoryMarkdown('Removed Files', summary.removed), 'utf-8');
+            await fileSystemHelpers_1.fileSystemHelpers.writeFile((0, pathHelpers_1.joinHelper)(resolvedDiffDir, 'modified-files.md'), toCategoryMarkdown('Modified Files', summary.modified), 'utf-8');
+            await fileSystemHelpers_1.fileSystemHelpers.writeFile((0, pathHelpers_1.joinHelper)(resolvedDiffDir, 'summary.json'), JSON.stringify(summary, null, 2), 'utf-8');
+            await fileSystemHelpers_1.fileSystemHelpers.writeFile((0, pathHelpers_1.joinHelper)(resolvedDiffDir, 'summary.md'), toSummaryMarkdown(summary), 'utf-8');
             Consts_1.APP_LOGGER.info(`\nTotal changes: ${changes.length}`);
             Consts_1.APP_LOGGER.info(`Diff files saved to: ${diffDir}`);
         }
         else {
+            await fileSystemHelpers_1.fileSystemHelpers.rmdir(resolvedDiffDir);
             Consts_1.APP_LOGGER.info('No changes detected. All files are identical.');
         }
-        // 8. Удаление временной директории preview
-        Consts_1.APP_LOGGER.info(`Cleaning up preview directory: ${previewDir}`);
-        await fileSystemHelpers_1.fileSystemHelpers.rmdir(resolvedPreviewDir);
-        previewDirCreated = false;
-        process.exit(0);
     }
     catch (error) {
-        // Очистка preview директории в случае ошибки
-        if (previewDirCreated) {
+        exitCode = 1;
+        Consts_1.APP_LOGGER.error(error.message);
+    }
+    finally {
+        if (previewDirCreated || resolvedPreviewDir) {
             try {
-                Consts_1.APP_LOGGER.info(`Cleaning up preview directory after error: ${previewDir}`);
-                await fileSystemHelpers_1.fileSystemHelpers.rmdir(resolvedPreviewDir);
+                if (resolvedPreviewDir) {
+                    Consts_1.APP_LOGGER.info(`Cleaning up preview directory: ${resolvedPreviewDir}`);
+                    await fileSystemHelpers_1.fileSystemHelpers.rmdir(resolvedPreviewDir);
+                }
             }
             catch (cleanupError) {
                 Consts_1.APP_LOGGER.error(`Failed to cleanup preview directory: ${cleanupError.message}`);
+                exitCode = 1;
             }
         }
-        Consts_1.APP_LOGGER.error(error.message);
+    }
+    if (exitCode !== 0) {
         process.exit(1);
     }
+    process.exit(0);
 }

package/dist/cli/previewChanges/utils/updateOutputPaths.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"updateOutputPaths.d.ts","sourceRoot":"","sources":["../../../../src/cli/previewChanges/utils/updateOutputPaths.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAG1D;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAC7B,OAAO,EAAE,WAAW,EACpB,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,GACrB,WAAW,CAuIb"}
+{"version":3,"file":"updateOutputPaths.d.ts","sourceRoot":"","sources":["../../../../src/cli/previewChanges/utils/updateOutputPaths.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAG1D;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAC7B,OAAO,EAAE,WAAW,EACpB,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,GACrB,WAAW,CA6Ib"}

package/dist/cli/previewChanges/utils/updateOutputPaths.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateOutputPaths = updateOutputPaths;
+const path_1 = require("path");
 const pathHelpers_1 = require("../../../common/utils/pathHelpers");
 /**
  * Обновляет пути output в опциях для генерации в preview директорию
@@ -23,6 +24,11 @@ function updateOutputPaths(options, previewDir, generatedDir) {
         if (relativePath.startsWith('./')) {
             relativePath = relativePath.substring(2);
         }
+        // Если путь выходит за пределы generatedDir, используем basename для безопасного переноса
+        if (relativePath.startsWith('../')) {
+            const outputBaseName = (0, path_1.basename)(resolvedOldPath);
+            return (0, pathHelpers_1.joinHelper)(previewDir, outputBaseName);
+        }
         // Если путь пустой или равен текущей директории, возвращаем previewDir
         if (!relativePath || relativePath === '' || relativePath === './') {
             return previewDir;

package/dist/cli/schemas/base.d.ts

@@ -1,11 +1,16 @@
 import { z } from 'zod';
 import { ELogLevel, ELogOutput } from '../../common/Enums';
 import { HttpClient } from '../../core/types/enums/HttpClient.enum';
+/**
+ * Преобразует пустые строки в undefined для опциональных полей
+ * Это нужно, потому что Commander.js передает пустые строки для опций без значений
+ */
+export declare const emptyStringToUndefined: z.ZodPipe<z.ZodTransform<unknown, unknown>, z.ZodOptional<z.ZodString>>;
 /**
  * Базовая схема с общими опциями для всех команд
  */
 export declare const baseCLIOptionsSchema: z.ZodObject<{
-    openapiConfig: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    openapiConfig: z.ZodPipe<z.ZodTransform<unknown, unknown>, z.ZodOptional<z.ZodString>>;
 }, z.core.$strip>;
 export type BaseCLIOptions = z.infer<typeof baseCLIOptionsSchema>;
 /**

package/dist/cli/schemas/base.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../../src/cli/schemas/base.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,wCAAwC,CAAC;AAEpE;;GAEG;AACH,eAAO,MAAM,oBAAoB;;iBAE/B,CAAC;AAEH,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,oBAAoB,CAAC,CAAC;AAElE;;GAEG;AACH,eAAO,MAAM,gBAAgB,8BAA2B,CAAC;AACzD,eAAO,MAAM,cAAc,6BAA0B,CAAC;AACtD,eAAO,MAAM,eAAe,8BAA2B,CAAC"}
+{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../../src/cli/schemas/base.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,wCAAwC,CAAC;AAEpE;;;GAGG;AACH,eAAO,MAAM,sBAAsB,yEAAoF,CAAC;AAExH;;GAEG;AACH,eAAO,MAAM,oBAAoB;;iBAE/B,CAAC;AAEH,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,oBAAoB,CAAC,CAAC;AAElE;;GAEG;AACH,eAAO,MAAM,gBAAgB,8BAAqB,CAAC;AACnD,eAAO,MAAM,cAAc,6BAAoB,CAAC;AAChD,eAAO,MAAM,eAAe,8BAAqB,CAAC"}

package/dist/cli/schemas/base.js

@@ -1,19 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.logTargetSchema = exports.logLevelSchema = exports.httpClientSchema = exports.baseCLIOptionsSchema = void 0;
+exports.logTargetSchema = exports.logLevelSchema = exports.httpClientSchema = exports.baseCLIOptionsSchema = exports.emptyStringToUndefined = void 0;
 const zod_1 = require("zod");
-const Consts_1 = require("../../common/Consts");
 const Enums_1 = require("../../common/Enums");
 const HttpClient_enum_1 = require("../../core/types/enums/HttpClient.enum");
+/**
+ * Преобразует пустые строки в undefined для опциональных полей
+ * Это нужно, потому что Commander.js передает пустые строки для опций без значений
+ */
+exports.emptyStringToUndefined = zod_1.z.preprocess(val => (val === '' ? undefined : val), zod_1.z.string().min(1).optional());
 /**
  * Базовая схема с общими опциями для всех команд
  */
 exports.baseCLIOptionsSchema = zod_1.z.object({
-    openapiConfig: zod_1.z.string().optional().default(Consts_1.DEFAULT_OPENAPI_CONFIG_FILENAME),
+    openapiConfig: exports.emptyStringToUndefined,
 });
 /**
  * Enum схемы для типизированных значений
  */
-exports.httpClientSchema = zod_1.z.nativeEnum(HttpClient_enum_1.HttpClient);
-exports.logLevelSchema = zod_1.z.nativeEnum(Enums_1.ELogLevel);
-exports.logTargetSchema = zod_1.z.nativeEnum(Enums_1.ELogOutput);
+exports.httpClientSchema = zod_1.z.enum(HttpClient_enum_1.HttpClient);
+exports.logLevelSchema = zod_1.z.enum(Enums_1.ELogLevel);
+exports.logTargetSchema = zod_1.z.enum(Enums_1.ELogOutput);

package/dist/cli/schemas/checkConfig.d.ts

@@ -1,6 +1,6 @@
 import { z } from 'zod';
 export declare const checkConfigOptionsSchema: z.ZodObject<{
-    openapiConfig: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    openapiConfig: z.ZodPipe<z.ZodTransform<unknown, unknown>, z.ZodOptional<z.ZodString>>;
 }, z.core.$strip>;
 export type CheckConfigOptions = z.infer<typeof checkConfigOptionsSchema>;
 //# sourceMappingURL=checkConfig.d.ts.map

package/dist/cli/schemas/generate.d.ts

@@ -1,32 +1,8 @@
 import { z } from 'zod';
-/**
- * Схема для команды generate
- * Основана на baseFlatOptionsSchema, но с добавлением:
- * - openapiConfig (из baseCLIOptionsSchema)
- * - опциональными input/output (валидируются условно)
- */
 export declare const generateOptionsSchema: z.ZodObject<{
-    openapiConfig: z.ZodDefault<z.ZodOptional<z.ZodString>>;
-    outputCore: z.ZodOptional<z.ZodString>;
-    outputServices: z.ZodOptional<z.ZodString>;
-    outputModels: z.ZodOptional<z.ZodString>;
-    outputSchemas: z.ZodOptional<z.ZodString>;
-    interfacePrefix: z.ZodDefault<z.ZodOptional<z.ZodString>>;
-    enumPrefix: z.ZodDefault<z.ZodOptional<z.ZodString>>;
-    typePrefix: z.ZodDefault<z.ZodOptional<z.ZodString>>;
-    httpClient: z.ZodOptional<z.ZodEnum<typeof import("../..").HttpClient>>;
-    useOptions: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
-    useUnionTypes: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
-    excludeCoreServiceFiles: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
-    request: z.ZodOptional<z.ZodString>;
-    useCancelableRequest: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
-    logLevel: z.ZodOptional<z.ZodEnum<typeof import("../../common/Enums").ELogLevel>>;
-    logTarget: z.ZodOptional<z.ZodEnum<typeof import("../../common/Enums").ELogOutput>>;
-    sortByRequired: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
-    useSeparatedIndexes: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
-    validationLibrary: z.ZodOptional<z.ZodEnum<typeof import("../../core/types/enums/ValidationLibrary.enum").ValidationLibrary>>;
     input: z.ZodPipe<z.ZodTransform<unknown, unknown>, z.ZodOptional<z.ZodString>>;
     output: z.ZodPipe<z.ZodTransform<unknown, unknown>, z.ZodOptional<z.ZodString>>;
+    openapiConfig: z.ZodPipe<z.ZodTransform<unknown, unknown>, z.ZodOptional<z.ZodString>>;
 }, z.core.$strip>;
 export type GenerateOptions = z.infer<typeof generateOptionsSchema>;
 //# sourceMappingURL=generate.d.ts.map

package/dist/cli/schemas/generate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../../src/cli/schemas/generate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAgBxB;;;;;GAKG;AACH,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;;;;iBAwC5B,CAAC;AAEP,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,qBAAqB,CAAC,CAAC"}
+{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../../src/cli/schemas/generate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAIxB,eAAO,MAAM,qBAAqB;;;;iBA2C5B,CAAC;AAEP,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,qBAAqB,CAAC,CAAC"}

package/dist/cli/schemas/generate.js

@@ -2,52 +2,41 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateOptionsSchema = void 0;
 const zod_1 = require("zod");
-const Consts_1 = require("../../common/Consts");
-const configSchemas_1 = require("../../common/schemas/configSchemas");
-const loadConfigIfExists_1 = require("../../common/utils/loadConfigIfExists");
 const base_1 = require("./base");
-/**
- * Преобразует пустые строки в undefined для опциональных полей
- * Это нужно, потому что Commander.js передает пустые строки для опций без значений
- */
-const emptyStringToUndefined = zod_1.z.preprocess((val) => (val === '' ? undefined : val), zod_1.z.string().min(1).optional());
-/**
- * Схема для команды generate
- * Основана на baseFlatOptionsSchema, но с добавлением:
- * - openapiConfig (из baseCLIOptionsSchema)
- * - опциональными input/output (валидируются условно)
- */
-exports.generateOptionsSchema = base_1.baseCLIOptionsSchema
-    .merge(configSchemas_1.baseFlatOptionsSchema)
-    .extend({
-    input: emptyStringToUndefined,
-    output: emptyStringToUndefined,
+exports.generateOptionsSchema = zod_1.z
+    .object({
+    ...base_1.baseCLIOptionsSchema.shape,
+    input: base_1.emptyStringToUndefined,
+    output: base_1.emptyStringToUndefined,
 })
     .superRefine((data, ctx) => {
-    // Проверка: если excludeCoreServiceFiles === true, request не должен быть указан
-    if (data.excludeCoreServiceFiles === true && data.request) {
+    const hasInput = !!data.input;
+    const hasCongigPath = !!data.openapiConfig;
+    if (hasInput && hasCongigPath) {
         ctx.addIssue({
-            code: zod_1.z.ZodIssueCode.custom,
-            message: '"--request" can only be used when "excludeCoreServiceFiles" is false',
-            path: ['request'],
+            code: 'custom',
+            message: 'Use either openapiConfig or input/output, but not both options.',
+            path: ['openapiConfig'],
         });
     }
-    // Проверка: input и output обязательны, если конфиг-файл не существует или пуст
-    const configPath = data.openapiConfig || Consts_1.DEFAULT_OPENAPI_CONFIG_FILENAME;
-    const configData = (0, loadConfigIfExists_1.loadConfigIfExists)(configPath);
-    // Если конфиг не существует или пуст, требуем input и output
-    const needsInputOutput = !configData || (Array.isArray(configData) && configData.length === 0) || (typeof configData === 'object' && Object.keys(configData).length === 0);
-    if (needsInputOutput) {
+    if (!hasInput && !hasCongigPath) {
+        ctx.addIssue({
+            code: 'custom',
+            message: 'You must specify either openapiConfig or input/output',
+            path: ['input'],
+        });
+    }
+    if (hasInput && !hasCongigPath) {
         if (!data.input || data.input.trim() === '') {
             ctx.addIssue({
-                code: zod_1.z.ZodIssueCode.custom,
+                code: 'custom',
                 message: '"--input" is required when no valid config file is provided',
                 path: ['input'],
             });
         }
         if (!data.output || data.output.trim() === '') {
             ctx.addIssue({
-                code: zod_1.z.ZodIssueCode.custom,
+                code: 'custom',
                 message: '"--output" is required when no valid config file is provided',
                 path: ['output'],
             });

package/dist/cli/schemas/index.d.ts

@@ -2,6 +2,7 @@ export * from './base';
 export * from './checkConfig';
 export * from './generate';
 export * from './init';
+export * from './previewChanges';
 export * from './updateConfig';
-export type CLIOptions = import('./generate').GenerateOptions | import('./checkConfig').CheckConfigOptions | import('./updateConfig').UpdateConfigOptions | import('./init').InitOptions;
+export type CLIOptions = import('./generate').GenerateOptions | import('./checkConfig').CheckConfigOptions | import('./updateConfig').UpdateConfigOptions | import('./init').InitOptions | import('./previewChanges').TPreviewChangesOptions;
 //# sourceMappingURL=index.d.ts.map

package/dist/cli/schemas/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cli/schemas/index.ts"],"names":[],"mappings":"AAAA,cAAc,QAAQ,CAAC;AACvB,cAAc,eAAe,CAAC;AAC9B,cAAc,YAAY,CAAC;AAC3B,cAAc,QAAQ,CAAC;AACvB,cAAc,gBAAgB,CAAC;AAG/B,MAAM,MAAM,UAAU,GAAG,OAAO,YAAY,EAAE,eAAe,GAAG,OAAO,eAAe,EAAE,kBAAkB,GAAG,OAAO,gBAAgB,EAAE,mBAAmB,GAAG,OAAO,QAAQ,EAAE,WAAW,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cli/schemas/index.ts"],"names":[],"mappings":"AAAA,cAAc,QAAQ,CAAC;AACvB,cAAc,eAAe,CAAC;AAC9B,cAAc,YAAY,CAAC;AAC3B,cAAc,QAAQ,CAAC;AACvB,cAAc,kBAAkB,CAAC;AACjC,cAAc,gBAAgB,CAAC;AAG/B,MAAM,MAAM,UAAU,GAChB,OAAO,YAAY,EAAE,eAAe,GACpC,OAAO,eAAe,EAAE,kBAAkB,GAC1C,OAAO,gBAAgB,EAAE,mBAAmB,GAC5C,OAAO,QAAQ,EAAE,WAAW,GAC5B,OAAO,kBAAkB,EAAE,sBAAsB,CAAC"}

package/dist/cli/schemas/index.js

@@ -18,4 +18,5 @@ __exportStar(require("./base"), exports);
 __exportStar(require("./checkConfig"), exports);
 __exportStar(require("./generate"), exports);
 __exportStar(require("./init"), exports);
+__exportStar(require("./previewChanges"), exports);
 __exportStar(require("./updateConfig"), exports);

package/dist/cli/schemas/init.d.ts

@@ -1,10 +1,10 @@
 import { z } from 'zod';
 export declare const initOptionsSchema: z.ZodObject<{
-    openapiConfig: z.ZodDefault<z.ZodOptional<z.ZodString>>;
-    specsDir: z.ZodDefault<z.ZodOptional<z.ZodString>>;
-    request: z.ZodDefault<z.ZodOptional<z.ZodString>>;
-    useCancelableRequest: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
-    useInteractiveMode: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
+    openapiConfig: z.ZodPipe<z.ZodTransform<unknown, unknown>, z.ZodOptional<z.ZodString>>;
+    specsDir: z.ZodPipe<z.ZodTransform<unknown, unknown>, z.ZodOptional<z.ZodString>>;
+    request: z.ZodPipe<z.ZodTransform<unknown, unknown>, z.ZodOptional<z.ZodString>>;
+    useCancelableRequest: z.ZodOptional<z.ZodBoolean>;
+    useInteractiveMode: z.ZodOptional<z.ZodBoolean>;
 }, z.core.$strip>;
 export type InitOptions = z.infer<typeof initOptionsSchema>;
 //# sourceMappingURL=init.d.ts.map

package/dist/cli/schemas/init.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../src/cli/schemas/init.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAKxB,eAAO,MAAM,iBAAiB;;;;;;iBAK5B,CAAC;AAEH,MAAM,MAAM,WAAW,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../src/cli/schemas/init.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAIxB,eAAO,MAAM,iBAAiB;;;;;;iBAK5B,CAAC;AAEH,MAAM,MAAM,WAAW,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC"}