ts-openapi-codegen 2.0.0-beta.7 → 2.0.0-beta.9

package/README.md

@@ -526,6 +526,110 @@ export function request<T>(config: TOpenAPIConfig, options: ApiRequestOptions):
 }
 ```
 
+### RequestExecutor
+
+Starting from version **2.0.0** the generated services use the `RequestExecutor` interface
+instead of direct calls to the `request` core function.
+
+The `RequestExecutor` is a single HTTP logic integration point responsible for executing requests
+and extending client behavior. It allows you to:
+- use any transport (fetch/axios/xhr/custom);
+- Centrally handle requests, responses, and errors;
+- expand the client's behavior without changing the generated services.
+
+#### Interceptors
+
+`RequestExecutor` supports **interceptors**, which allow you to implement additional
+logic at different stages of the request lifecycle.:
+
+- `onRequest` — modification of the request before sending (headers, auth, logging);
+- `onResponse` — processing successful responses;
+- `onError` — centralized error handling.
+
+Interceptors are applied at the executor level and are automatically used by all
+generated services.
+
+```ts
+import { createClient } from './generated';
+
+const client = createClient({
+    interceptors: {
+        onRequest: [
+            (config) => ({
+                ...config,
+                headers: {
+                    ...config.headers,
+                    Authorization: 'Bearer token',
+                },
+            }),
+        ],
+        onError: [
+            (error) => {
+                console.error(error);
+                throw error;
+            },
+        ],
+    },
+});
+```
+
+#### Custom implementation of RequestExecutor with interceptors
+
+A custom `RequestExecutor` can be used together with interceptors.
+In this case, the executor is responsible only for the transport and execution of the request,
+while the interceptors are responsible for the extensible business logic (authorization, logging, error handling).
+
+```ts
+import type { RequestExecutor, RequestConfig } from './generated/core/executor/requestExecutor';
+import { withInterceptors } from './generated/core/interceptors/withInterceptors';
+import { SimpleService } from './generated/services/SimpleService';
+
+interface MyCustomOptions {
+    timeout?: number;
+}
+
+const baseExecutor: RequestExecutor<MyCustomOptions> = {
+    async request<T>(config: RequestConfig, options?: MyCustomOptions): Promise<T> {
+        const response = await fetch(config.url, {
+            method: config.method,
+            headers: config.headers,
+            body: config.body ? JSON.stringify(config.body) : undefined,
+            signal: options?.timeout
+                ? AbortSignal.timeout(options.timeout)
+                : undefined,
+        });
+
+        if (!response.ok) {
+            throw new Error(`Request failed: ${response.status}`);
+        }
+
+        return response.json();
+    },
+};
+
+// Wrapping the executor interceptors
+const executor = withInterceptors(baseExecutor, {
+    onRequest: [
+        (config) => ({
+            ...config,
+            headers: {
+                ...config.headers,
+                Authorization: 'Bearer token',
+            },
+        }),
+    ],
+    onError: [
+        (error) => {
+            console.error(error);
+            throw error;
+        },
+    ],
+});
+
+const service = new SimpleService(executor);
+await service.getCallWithoutParametersAndResponse({ timeout: 5000 });
+```
+
 ### Sorting strategy for function arguments `--sortByRequired`
 By default, the OpenAPI generator sorts the parameters of service functions according to a simplified scheme. If you need a more strict sorting option, then you need to use the `--sortByRequired` flag. The simplified sorting option is similar to the one used in version 0.2.3 of the OpenAPI generator. This flag allows you to upgrade to a new version of the generator if you are "stuck" on version 0.2.3.
 

package/README.rus.md

@@ -526,6 +526,110 @@ export function request<T>(config: TOpenAPIConfig, options: ApiRequestOptions):
 }
 ```
 
+### RequestExecutor
+
+Начиная с версии **2.0.0**, сгенерированные сервисы используют интерфейс `RequestExecutor`
+вместо прямых вызовов core-функции `request`.
+
+`RequestExecutor` — это единая точка интеграции HTTP-логики, отвечающая за выполнение запросов
+и расширение поведения клиента. Он позволяет:
+- использовать любой транспорт (fetch / axios / xhr / custom);
+- централизованно обрабатывать запросы, ответы и ошибки;
+- расширять поведение клиента без изменения сгенерированных сервисов.
+
+#### Interceptors
+
+`RequestExecutor` поддерживает **interceptors**, которые позволяют внедрять дополнительную
+логику на разных этапах жизненного цикла запроса:
+
+- `onRequest` — модификация запроса перед отправкой (headers, auth, логирование);
+- `onResponse` — обработка успешных ответов;
+- `onError` — централизованная обработка ошибок.
+
+Interceptors применяются на уровне executor’а и автоматически используются всеми
+сгенерированными сервисами.
+
+```ts
+import { createClient } from './generated';
+
+const client = createClient({
+    interceptors: {
+        onRequest: [
+            (config) => ({
+                ...config,
+                headers: {
+                    ...config.headers,
+                    Authorization: 'Bearer token',
+                },
+            }),
+        ],
+        onError: [
+            (error) => {
+                console.error(error);
+                throw error;
+            },
+        ],
+    },
+});
+```
+
+#### Пользовательская реализация RequestExecutor с interceptors
+
+Пользовательский `RequestExecutor` может быть использован вместе с interceptors.
+В этом случае executor отвечает только за транспорт и выполнение запроса,
+а interceptors — за расширяемую бизнес-логику (авторизация, логирование, обработка ошибок).
+
+```ts
+import type { RequestExecutor, RequestConfig } from './generated/core/executor/requestExecutor';
+import { withInterceptors } from './generated/core/interceptors/withInterceptors';
+import { SimpleService } from './generated/services/SimpleService';
+
+interface MyCustomOptions {
+    timeout?: number;
+}
+
+const baseExecutor: RequestExecutor<MyCustomOptions> = {
+    async request<T>(config: RequestConfig, options?: MyCustomOptions): Promise<T> {
+        const response = await fetch(config.url, {
+            method: config.method,
+            headers: config.headers,
+            body: config.body ? JSON.stringify(config.body) : undefined,
+            signal: options?.timeout
+                ? AbortSignal.timeout(options.timeout)
+                : undefined,
+        });
+
+        if (!response.ok) {
+            throw new Error(`Request failed: ${response.status}`);
+        }
+
+        return response.json();
+    },
+};
+
+// Оборачиваем executor interceptors
+const executor = withInterceptors(baseExecutor, {
+    onRequest: [
+        (config) => ({
+            ...config,
+            headers: {
+                ...config.headers,
+                Authorization: 'Bearer token',
+            },
+        }),
+    ],
+    onError: [
+        (error) => {
+            console.error(error);
+            throw error;
+        },
+    ],
+});
+
+const service = new SimpleService(executor);
+await service.getCallWithoutParametersAndResponse({ timeout: 5000 });
+```
+
 ### Стратегия сортировки аргументов функций `--sortByRequired`
 По умолчанию генератор OpenAPI сортирует параметры сервисных функций согласно упрощенной схеме. Если вам нужна более строгая опция сортировки, используйте флаг `--sortByRequired`. Упрощенная опция сортировки похожа на ту, что использовалась в версии 0.2.3 генератора OpenAPI. Этот флаг позволяет обновиться до новой версии генератора, если вы "застряли" на версии 0.2.3.
 

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

@@ -1,3 +1,4 @@
+import { OptionValues } from 'commander';
 /**
  * Проверяет конфигурационный файл на корректность и актуальность.
  * Если обнаружены проблемы, предлагает действия для их исправления.
@@ -8,5 +9,5 @@
  * @example
  * await checkConfig('./openapi-config.json');
  */
-export declare function checkConfig(configPath: string): Promise<void>;
+export declare function checkConfig(options: OptionValues): Promise<void>;
 //# sourceMappingURL=checkConfig.d.ts.map

package/dist/cli/checkAndUpdateConfig/checkConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"checkConfig.d.ts","sourceRoot":"","sources":["../../../src/cli/checkAndUpdateConfig/checkConfig.ts"],"names":[],"mappings":"AAMA;;;;;;;;;GASG;AACH,wBAAsB,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAoCnE"}
+{"version":3,"file":"checkConfig.d.ts","sourceRoot":"","sources":["../../../src/cli/checkAndUpdateConfig/checkConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAUzC;;;;;;;;;GASG;AACH,wBAAsB,WAAW,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CA4CtE"}

package/dist/cli/checkAndUpdateConfig/checkConfig.js

@@ -3,6 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkConfig = checkConfig;
 const Consts_1 = require("../../common/Consts");
 const loadConfigIfExists_1 = require("../../common/utils/loadConfigIfExists");
+const validateZodOptions_1 = require("../../common/Validation/validateZodOptions");
+const schemas_1 = require("../schemas");
 const constants_1 = require("./constants");
 const selectConfigAction_1 = require("./utils/selectConfigAction");
 const validateAndMigrateConfigData_1 = require("./utils/validateAndMigrateConfigData");
@@ -16,20 +18,26 @@ const validateAndMigrateConfigData_1 = require("./utils/validateAndMigrateConfig
  * @example
  * await checkConfig('./openapi-config.json');
  */
-async function checkConfig(configPath) {
-    const configData = (0, loadConfigIfExists_1.loadConfigIfExists)(configPath);
+async function checkConfig(options) {
+    const validationResult = (0, validateZodOptions_1.validateZodOptions)(schemas_1.checkConfigOptionsSchema, options);
+    if (!validationResult.success) {
+        Consts_1.APP_LOGGER.error(validationResult.errors.join('\n'));
+        process.exit(1);
+    }
+    const validatedOptions = validationResult.data;
+    const configData = (0, loadConfigIfExists_1.loadConfigIfExists)(validatedOptions.openapiConfig);
     if (!configData) {
-        Consts_1.APP_LOGGER.error(`${constants_1.ERROR_MESSAGES.FILE_NOT_FOUND} ${configPath}`);
+        Consts_1.APP_LOGGER.error(`${constants_1.ERROR_MESSAGES.FILE_NOT_FOUND} ${validatedOptions.openapiConfig || ''}`);
         return;
     }
     try {
         const { isActualConfigVersion, hasDefaultValues, migratedData } = (0, validateAndMigrateConfigData_1.validateAndMigrateConfigData)(configData);
-        Consts_1.APP_LOGGER.info(constants_1.SUCCESS_MESSAGES.CONFIG_VALID(configPath));
+        Consts_1.APP_LOGGER.info(constants_1.SUCCESS_MESSAGES.CONFIG_VALID(validatedOptions.openapiConfig || ''));
         // Если версия не актуальна, предложить обновление
         if (!isActualConfigVersion) {
             await (0, selectConfigAction_1.selectConfigAction)({
                 migratedData,
-                configPath,
+                configPath: validatedOptions.openapiConfig || '',
                 warningMessage: 'Ваша версия конфигурации устарела и нуждается в обновлении.',
                 actionChoices: constants_1.ACTION_FOR_CONFIG_DATA_OPTIONS,
             });
@@ -39,7 +47,7 @@ async function checkConfig(configPath) {
         if (hasDefaultValues) {
             await (0, selectConfigAction_1.selectConfigAction)({
                 migratedData,
-                configPath,
+                configPath: validatedOptions.openapiConfig || '',
                 warningMessage: 'В вашей конфигурации есть значения по умолчанию, которые можно удалить.',
                 actionChoices: constants_1.ACTION_FOR_CONFIG_DATA_OPTIONS,
             });

package/dist/cli/checkAndUpdateConfig/updateConfig.d.ts

@@ -1,3 +1,4 @@
+import { OptionValues } from 'commander';
 /**
  * Обновляет конфигурационный файл до актуальной версии.
  * Выполняет миграцию данных при необходимости.
@@ -8,5 +9,5 @@
  * @example
  * await updateConfig('./openapi-config.json');
  */
-export declare function updateConfig(configPath: string): Promise<void>;
+export declare function updateConfig(options: OptionValues): Promise<void>;
 //# sourceMappingURL=updateConfig.d.ts.map

package/dist/cli/checkAndUpdateConfig/updateConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"updateConfig.d.ts","sourceRoot":"","sources":["../../../src/cli/checkAndUpdateConfig/updateConfig.ts"],"names":[],"mappings":"AAMA;;;;;;;;;GASG;AACH,wBAAsB,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAuBpE"}
+{"version":3,"file":"updateConfig.d.ts","sourceRoot":"","sources":["../../../src/cli/checkAndUpdateConfig/updateConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAUzC;;;;;;;;;GASG;AACH,wBAAsB,YAAY,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAgCvE"}

package/dist/cli/checkAndUpdateConfig/updateConfig.js

@@ -3,6 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateConfig = updateConfig;
 const Consts_1 = require("../../common/Consts");
 const loadConfigIfExists_1 = require("../../common/utils/loadConfigIfExists");
+const validateZodOptions_1 = require("../../common/Validation/validateZodOptions");
+const schemas_1 = require("../schemas");
 const constants_1 = require("./constants");
 const validateAndMigrateConfigData_1 = require("./utils/validateAndMigrateConfigData");
 const writeConfigFile_1 = require("./utils/writeConfigFile");
@@ -16,21 +18,27 @@ const writeConfigFile_1 = require("./utils/writeConfigFile");
  * @example
  * await updateConfig('./openapi-config.json');
  */
-async function updateConfig(configPath) {
-    const configData = (0, loadConfigIfExists_1.loadConfigIfExists)(configPath);
+async function updateConfig(options) {
+    const validationResult = (0, validateZodOptions_1.validateZodOptions)(schemas_1.updateConfigOptionsSchema, options);
+    if (!validationResult.success) {
+        Consts_1.APP_LOGGER.error(validationResult.errors.join('\n'));
+        process.exit(1);
+    }
+    const validatedOptions = validationResult.data;
+    const configData = (0, loadConfigIfExists_1.loadConfigIfExists)(validatedOptions.openapiConfig);
     if (!configData) {
-        Consts_1.APP_LOGGER.error(`${constants_1.ERROR_MESSAGES.FILE_NOT_FOUND} ${configPath}`);
+        Consts_1.APP_LOGGER.error(`${constants_1.ERROR_MESSAGES.FILE_NOT_FOUND} ${validatedOptions.openapiConfig}`);
         return;
     }
     try {
         const { isActualConfigVersion, migratedData } = (0, validateAndMigrateConfigData_1.validateAndMigrateConfigData)(configData);
         if (isActualConfigVersion) {
-            Consts_1.APP_LOGGER.info(constants_1.SUCCESS_MESSAGES.CONFIG_UP_TO_DATE(configPath));
+            Consts_1.APP_LOGGER.info(constants_1.SUCCESS_MESSAGES.CONFIG_UP_TO_DATE(validatedOptions.openapiConfig || ''));
         }
         else {
             await (0, writeConfigFile_1.writeConfigFile)({
                 data: migratedData,
-                configPath,
+                configPath: validatedOptions.openapiConfig || '',
                 isUpdating: true,
             });
         }

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

@@ -1 +1 @@
-{"version":3,"file":"generateOpenApiClient.d.ts","sourceRoot":"","sources":["../../../src/cli/generateOpenApiClient/generateOpenApiClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAgBzC;;;GAGG;AACH,wBAAsB,qBAAqB,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CA8DhF"}
+{"version":3,"file":"generateOpenApiClient.d.ts","sourceRoot":"","sources":["../../../src/cli/generateOpenApiClient/generateOpenApiClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAgBzC;;;GAGG;AACH,wBAAsB,qBAAqB,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CA6DhF"}

package/dist/cli/generateOpenApiClient/generateOpenApiClient.js

@@ -40,12 +40,12 @@ const Enums_1 = require("../../common/Enums");
 const LoggerMessages_1 = require("../../common/LoggerMessages");
 const convertArrayToObject_1 = require("../../common/utils/convertArrayToObject");
 const loadConfigIfExists_1 = require("../../common/utils/loadConfigIfExists");
+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 generate_1 = require("../schemas/generate");
-const validation_1 = require("../validation");
+const schemas_1 = require("../schemas");
 /**
  * Запускает генерацию OpenAPI клиента
  * Поддерживает как конфиг-файл, так и параметры из CLI
@@ -53,13 +53,12 @@ const validation_1 = require("../validation");
 async function generateOpenApiClient(options) {
     const { openapiConfig, ...clientOptions } = options;
     try {
-        // Валидация опций через Zod
-        const validationResult = (0, validation_1.validateCLIOptions)(generate_1.generateOptionsSchema, {
+        const validationResult = (0, validateZodOptions_1.validateZodOptions)(schemas_1.generateOptionsSchema, {
             openapiConfig,
             ...clientOptions,
         });
         if (!validationResult.success) {
-            Consts_1.APP_LOGGER.error(validationResult.error);
+            Consts_1.APP_LOGGER.error(validationResult.errors.join('\n'));
             process.exit(1);
         }
         const validatedOptions = validationResult.data;

package/dist/cli/index.js

@@ -89,7 +89,7 @@ program
     await updateNotifier.checkAndNotify();
 })
     .action(async (options) => {
-    await (0, updateConfig_1.updateConfig)(options.openapiConfig);
+    await (0, updateConfig_1.updateConfig)(options);
 });
 /**
  * init - Команда для инициализации конфигурационного файла
@@ -116,10 +116,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();
 })

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;AA4BzC;;;;GAIG;AACH,wBAAsB,cAAc,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAiJzE"}

package/dist/cli/previewChanges/previewChanges.js

@@ -40,10 +40,12 @@ 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");
@@ -55,10 +57,15 @@ const updateOutputPaths_1 = require("./utils/updateOutputPaths");
  * 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);
+    const validationResult = (0, validateZodOptions_1.validateZodOptions)(schemas_1.previewChangesSchema, options);
+    if (!validationResult.success) {
+        Consts_1.APP_LOGGER.error(validationResult.errors.join('\n'));
+        process.exit(1);
+    }
+    const { openapiConfig, generatedDir, previewDir, diffDir } = validationResult.data;
+    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 previewDirCreated = false;
     try {
         // 1. Проверка директории со сгенерированным кодом
@@ -89,7 +96,7 @@ async function previewChanges(options) {
         }
         // 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);

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