ts-openapi-codegen 2.0.0-beta.9 → 2.1.0-beta.1

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

@@ -1,7 +1,11 @@
 import { OptionValues } from 'commander';
 /**
- * Запускает генерацию OpenAPI клиента
- * Поддерживает как конфиг-файл, так и параметры из CLI
+ * Runs OpenAPI client generation and returns a process exit code.
+ * Does not call `process.exit` — safe for in-process unit tests.
+ */
+export declare function runGenerateOpenApiClient(options: OptionValues): Promise<number>;
+/**
+ * CLI entry: runs generation and terminates the process with the resulting exit code.
  */
 export declare function generateOpenApiClient(options: OptionValues): Promise<void>;
 //# sourceMappingURL=generateOpenApiClient.d.ts.map

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,CA6DhF"}
+{"version":3,"file":"generateOpenApiClient.d.ts","sourceRoot":"","sources":["../../../src/cli/generateOpenApiClient/generateOpenApiClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AA0BzC;;;GAGG;AACH,wBAAsB,wBAAwB,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,CA+FrF;AAED;;GAEG;AACH,wBAAsB,qBAAqB,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAGhF"}

package/dist/cli/generateOpenApiClient/generateOpenApiClient.js

@@ -33,9 +33,9 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.runGenerateOpenApiClient = runGenerateOpenApiClient;
 exports.generateOpenApiClient = generateOpenApiClient;
 const Consts_1 = require("../../common/Consts");
-const defaultOptions_1 = require("../../common/defaultOptions");
 const Enums_1 = require("../../common/Enums");
 const LoggerMessages_1 = require("../../common/LoggerMessages");
 const convertArrayToObject_1 = require("../../common/utils/convertArrayToObject");
@@ -43,14 +43,24 @@ 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 UnifiedVersionedSchemas_1 = require("../../common/VersionedSchema/AllVersionedSchemas/UnifiedVersionedSchemas");
 const migrateDataToLatestSchemaVersion_1 = require("../../common/VersionedSchema/Utils/migrateDataToLatestSchemaVersion");
 const OpenAPI = __importStar(require("../../core"));
 const schemas_1 = require("../schemas");
+const generateCliFlatSchema = UnifiedVersionedSchemas_1.flatOptionsSchema.strict().superRefine((data, ctx) => {
+    if (data.excludeCoreServiceFiles === true && data.request) {
+        ctx.addIssue({
+            code: 'custom',
+            message: '"request" can only be used when "excludeCoreServiceFiles" is false',
+            path: ['request'],
+        });
+    }
+});
 /**
- * Запускает генерацию OpenAPI клиента
- * Поддерживает как конфиг-файл, так и параметры из CLI
+ * Runs OpenAPI client generation and returns a process exit code.
+ * Does not call `process.exit` — safe for in-process unit tests.
  */
-async function generateOpenApiClient(options) {
+async function runGenerateOpenApiClient(options) {
     const { openapiConfig, ...clientOptions } = options;
     try {
         const validationResult = (0, validateZodOptions_1.validateZodOptions)(schemas_1.generateOptionsSchema, {
@@ -58,32 +68,46 @@ async function generateOpenApiClient(options) {
             ...clientOptions,
         });
         if (!validationResult.success) {
-            Consts_1.APP_LOGGER.error(validationResult.errors.join('\n'));
-            process.exit(1);
+            Consts_1.APP_LOGGER.errorWithHint({
+                code: 'NO_OPTIONS_PROVIDED',
+                message: LoggerMessages_1.LOGGER_MESSAGES.ERROR.GENERIC(validationResult.errors.join('\n')),
+            });
+            await Consts_1.APP_LOGGER.shutdownLoggerAsync();
+            return 1;
         }
         const validatedOptions = validationResult.data;
-        // Если есть минимальные опции (input и output), используем их
         const hasMinimumRequiredOptions = !!validatedOptions.input && !!validatedOptions.output;
         if (hasMinimumRequiredOptions) {
-            // Используем старую Joi валидацию для обратной совместимости
-            // В будущем можно заменить на Zod
-            const { error: defaultValuesError, value } = defaultOptions_1.defaultOptions.validate({
+            const directOptionsValidationResult = (0, validateZodOptions_1.validateZodOptions)(generateCliFlatSchema, {
                 input: validatedOptions.input,
                 output: validatedOptions.output,
                 ...clientOptions,
             });
-            if (defaultValuesError) {
-                await OpenAPI.generate(value);
-                process.exit(0);
+            if (!directOptionsValidationResult.success) {
+                Consts_1.APP_LOGGER.errorWithHint({
+                    code: 'NO_OPTIONS_PROVIDED',
+                    message: LoggerMessages_1.LOGGER_MESSAGES.ERROR.GENERIC(directOptionsValidationResult.errors.join('\n')),
+                });
+                await Consts_1.APP_LOGGER.shutdownLoggerAsync();
+                return 1;
             }
+            await OpenAPI.generate(directOptionsValidationResult.data);
+            await Consts_1.APP_LOGGER.shutdownLoggerAsync();
+            return 0;
         }
         const configData = (0, loadConfigIfExists_1.loadConfigIfExists)(validatedOptions.openapiConfig);
         if (!configData) {
-            Consts_1.APP_LOGGER.error(LoggerMessages_1.LOGGER_MESSAGES.CONFIG.FILE_MISSING);
-            process.exit(1);
+            Consts_1.APP_LOGGER.errorWithHint({
+                code: validatedOptions.openapiConfig ? 'CONFIG_FILE_NOT_FOUND_AT' : 'CONFIG_FILE_MISSING',
+                message: `${LoggerMessages_1.LOGGER_MESSAGES.CONFIG.FILE_MISSING}\n${LoggerMessages_1.LOGGER_MESSAGES.CONFIG.FILE_MISSING_HINT}`,
+            });
+            await Consts_1.APP_LOGGER.shutdownLoggerAsync();
+            return 1;
+        }
+        if (Array.isArray(configData)) {
+            Consts_1.APP_LOGGER.warn(LoggerMessages_1.LOGGER_MESSAGES.CONFIG.ARRAY_DEPRECATED);
         }
         const preparedOptions = (0, convertArrayToObject_1.convertArrayToObject)(configData);
-        // Use unified migration system for all schema types
         const migratedOptions = (0, migrateDataToLatestSchemaVersion_1.migrateDataToLatestSchemaVersion)({
             rawInput: preparedOptions,
             migrationPlans: AllMigrationPlans_1.allMigrationPlans,
@@ -91,15 +115,39 @@ async function generateOpenApiClient(options) {
             migrationMode: Enums_1.EMigrationMode.GENERATE_OPENAPI,
         });
         if (!migratedOptions) {
-            Consts_1.APP_LOGGER.error(LoggerMessages_1.LOGGER_MESSAGES.CONFIG.CONVERSION_FAILED);
-            process.exit(1);
+            Consts_1.APP_LOGGER.errorWithHint({
+                code: 'NO_VALID_SPEC_FILES_FOUND',
+                message: LoggerMessages_1.LOGGER_MESSAGES.CONFIG.CONVERSION_FAILED,
+            });
+            await Consts_1.APP_LOGGER.shutdownLoggerAsync();
+            return 1;
         }
         const { value } = migratedOptions;
-        await OpenAPI.generate(value);
-        process.exit(0);
+        const mergedOptions = {
+            ...value,
+            strictOpenapi: validatedOptions.strictOpenapi ?? value.strictOpenapi,
+            reportFile: validatedOptions.reportFile ?? value.reportFile,
+            governanceConfig: validatedOptions.governanceConfig ?? value.governanceConfig,
+        };
+        await OpenAPI.generate(mergedOptions);
+        await Consts_1.APP_LOGGER.shutdownLoggerAsync();
+        return 0;
     }
     catch (error) {
-        Consts_1.APP_LOGGER.error(error.message);
-        process.exit(1);
+        const message = error instanceof Error ? error.message : String(error);
+        Consts_1.APP_LOGGER.errorWithHint({
+            code: 'SPEC_FILES_FIND_ERROR',
+            message: LoggerMessages_1.LOGGER_MESSAGES.ERROR.GENERIC(message),
+            error,
+        });
+        await Consts_1.APP_LOGGER.shutdownLoggerAsync();
+        return 1;
     }
 }
+/**
+ * CLI entry: runs generation and terminates the process with the resulting exit code.
+ */
+async function generateOpenApiClient(options) {
+    const exitCode = await runGenerateOpenApiClient(options);
+    process.exit(exitCode);
+}

package/dist/cli/index.js

@@ -8,10 +8,14 @@ const commander_1 = require("commander");
 const fs_1 = __importDefault(require("fs"));
 const Consts_1 = require("../common/Consts");
 const Enums_1 = require("../common/Enums");
+const LoggerMessages_1 = require("../common/LoggerMessages");
 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 ModelsMode_enum_1 = require("../core/types/enums/ModelsMode.enum");
 const ValidationLibrary_enum_1 = require("../core/types/enums/ValidationLibrary.enum");
+const analyzeDiff_1 = require("./analyzeDiff/analyzeDiff");
 const checkConfig_1 = require("./checkAndUpdateConfig/checkConfig");
 const updateConfig_1 = require("./checkAndUpdateConfig/updateConfig");
 const generateOpenApiClient_1 = require("./generateOpenApiClient/generateOpenApiClient");
@@ -46,8 +50,12 @@ program
     .addOption(new commander_1.Option('-c, --httpClient <value>', 'HTTP client to generate').choices([...Object.values(HttpClient_enum_1.HttpClient)]).default(HttpClient_enum_1.HttpClient.FETCH))
     .option('--useOptions', 'Use options instead of arguments (default: false)')
     .option('--useUnionTypes', 'Use union types instead of enums (default: false)')
+    .option('--useHistory', 'Apply diff report annotations during generation (default: false)')
+    .option('--diffReport <value>', 'Path to a diff report JSON file')
+    .addOption(new commander_1.Option('--modelsMode <value>', 'Models generation mode').choices([...Object.values(ModelsMode_enum_1.ModelsMode)]).default(ModelsMode_enum_1.ModelsMode.INTERFACES))
     .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')
@@ -56,7 +64,13 @@ program
     .addOption(new commander_1.Option('-t, --logTarget <target>', 'Target of logging').choices([...Object.values(Enums_1.ELogOutput)]).default(Enums_1.ELogOutput.CONSOLE))
     .option('-s, --sortByRequired', 'Property sorting strategy: simplified or extended')
     .option('--useSeparatedIndexes', 'Use separate index files for the core, models, schemas, and services.')
+    .option('--strict-openapi', 'Enable strict OpenAPI diagnostics report and fail generation when strict errors are found')
+    .option('--report-file <value>', 'Path to strict OpenAPI diagnostics report JSON file', './openapi-report.json')
+    .option('--governance-config <value>', 'Path to governance rules JSON config file')
     .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))
+    .option('--useProjectPrettier', 'Use project Prettier config for formatting generated code (default: false)')
+    .option('--useEslintFix', 'Run ESLint --fix on generated files after writing (default: false)')
     .hook('preAction', async () => {
     await updateNotifier.checkAndNotify();
 })
@@ -75,7 +89,7 @@ program
     await updateNotifier.checkAndNotify();
 })
     .action(async (options) => {
-    await (0, checkConfig_1.checkConfig)(options.openapiConfig);
+    await (0, checkConfig_1.checkConfig)(options);
 });
 /**
  * update - Команда для обновления конфигурационного файла
@@ -126,18 +140,61 @@ program
     .action(async (options) => {
     await (0, previewChanges_1.previewChanges)(options);
 });
+/**
+ * analyze-diff - Команда для анализа изменений между двумя версиями OpenAPI спецификации
+ *
+ * @example Как использовать сейчас
+ * Сравнение с явным старым файлом:
+ * openapi-codegen-cli analyze-diff \
+ * --input ./openapi/current.yaml \
+ * --compare-with ./openapi/previous.yaml \
+ * --output-report ./openapi-diff-report.json
+ *
+ * Сравнение с версией из Git:
+ * openapi-codegen-cli analyze-diff \
+ * --input openapi/spec.yaml \
+ * --git HEAD~1
+ */
+program
+    .command('analyze-diff')
+    .description('Analyzes differences between two OpenAPI specifications and produces a JSON report')
+    .addHelpText('before', (0, utils_1.getCLIName)(APP_NAME))
+    .addHelpText('after', [
+    '',
+    'Base source resolution:',
+    '  1) --compare-with has priority over --git when both are provided.',
+    '  2) --git is used only when --compare-with is not provided.',
+    '  3) when neither is provided, analyze-diff is skipped with exit code 0.',
+].join('\n'))
+    .option('-i, --input <value>', 'Path to current OpenAPI specification file (required)')
+    .option('--compare-with <value>', 'Path to previous OpenAPI specification file (overrides --git when both are provided)')
+    .option('--git <ref>', 'Git ref to read previous specification version from (used when --compare-with is not set)')
+    .option('--output-report <value>', 'Path to save JSON diff report')
+    .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('--governance-config <value>', 'Path to governance rules JSON config file')
+    .option('--strict-plugin-mode', 'Fail when plugin hook execution throws')
+    .option('--ci', 'Exit with code 1 when governance errors are found')
+    .option('--allow-breaking', 'Allow breaking changes in governance checks')
+    .hook('preAction', async () => {
+    await updateNotifier.checkAndNotify();
+})
+    .action(async (options) => {
+    const result = await (0, analyzeDiff_1.analyzeDiff)(options);
+    await Consts_1.APP_LOGGER.shutdownLoggerAsync();
+    process.exit((0, analyzeDiff_1.toAnalyzeDiffExitCode)(result));
+});
 program.exitOverride();
-// TODO: Включить позже!
-// program.showSuggestionAfterError(false);
+program.showSuggestionAfterError(false);
 // Парсирование аргументов с обработкой ошибок
 try {
     program.parse(process.argv);
 }
 catch (error) {
-    if (error.code === 'commander.unknownOption') {
+    if (error && typeof error === 'object' && 'code' in error && error.code === 'commander.unknownOption') {
         const errorMessage = error?.message ?? '';
         if (errorMessage) {
-            Consts_1.APP_LOGGER.error(errorMessage);
+            Consts_1.APP_LOGGER.error(LoggerMessages_1.LOGGER_MESSAGES.ERROR.GENERIC(errorMessage));
+            void Consts_1.APP_LOGGER.shutdownLoggerAsync().then(() => process.exit(1));
         }
     }
 }

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,iBA4C/C"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../src/cli/initOpenApiConfig/init.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAWzC;;GAEG;AACH,wBAAsB,IAAI,CAAC,OAAO,EAAE,YAAY,iBAwD/C"}

package/dist/cli/initOpenApiConfig/init.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.init = init;
 const Consts_1 = require("../../common/Consts");
+const LoggerMessages_1 = require("../../common/LoggerMessages");
 const validateZodOptions_1 = require("../../common/Validation/validateZodOptions");
 const confirmDialog_1 = require("../interactive/confirmDialog");
 const schemas_1 = require("../schemas");
@@ -14,31 +15,37 @@ const registerHandlebarTemplates_1 = require("./utils/registerHandlebarTemplates
 async function init(options) {
     const validationResult = (0, validateZodOptions_1.validateZodOptions)(schemas_1.initOptionsSchema, options);
     if (!validationResult.success) {
-        Consts_1.APP_LOGGER.error(validationResult.errors.join('\n'));
+        Consts_1.APP_LOGGER.error(LoggerMessages_1.LOGGER_MESSAGES.ERROR.GENERIC(validationResult.errors.join('\n')));
+        await Consts_1.APP_LOGGER.shutdownLoggerAsync();
         process.exit(1);
     }
     const validatedOptions = validationResult.data;
     const templates = (0, registerHandlebarTemplates_1.registerHandlebarTemplates)();
     if (validatedOptions.useInteractiveMode) {
         const shouldInitConfig = await (0, confirmDialog_1.confirmDialog)({
-            message: 'Желаете сформировать конфигурационный файл для быстрого запуска генератора?',
+            message: 'Would you like to create a configuration file for quick start of the generator?',
             initial: false,
         });
         if (shouldInitConfig) {
-            // TODO: генерация по шаблону!
             await (0, initConfig_1.initConfig)({
                 openapiConfig: validatedOptions.openapiConfig,
                 request: validatedOptions.request,
                 specsDir: validatedOptions.specsDir,
                 templates,
+                useInteractiveMode: validatedOptions.useInteractiveMode,
             });
         }
         const shouldInitCustomRequest = await (0, confirmDialog_1.confirmDialog)({
-            message: 'Желаете сформировать файл с пользовательским вариантом обработки запросов?',
+            message: 'Would you like to create a file with a custom request processing option?',
             initial: false,
         });
         if (shouldInitCustomRequest) {
-            await (0, initCustomRequest_1.initCustomRequest)(templates, validatedOptions?.useCancelableRequest);
+            await (0, initCustomRequest_1.initCustomRequest)({
+                templates,
+                useCancelableRequest: validatedOptions?.useCancelableRequest,
+                customRequestPath: validatedOptions.request,
+                useInteractiveMode: validatedOptions.useInteractiveMode,
+            });
         }
     }
     else {
@@ -47,7 +54,13 @@ async function init(options) {
             request: validatedOptions.request,
             specsDir: validatedOptions.specsDir,
             templates,
+            useInteractiveMode: validatedOptions.useInteractiveMode,
+        });
+        await (0, initCustomRequest_1.initCustomRequest)({
+            templates,
+            useCancelableRequest: validatedOptions?.useCancelableRequest,
+            customRequestPath: validatedOptions.request,
+            useInteractiveMode: validatedOptions.useInteractiveMode,
         });
-        await (0, initCustomRequest_1.initCustomRequest)(templates, validatedOptions?.useCancelableRequest);
     }
 }

package/dist/cli/initOpenApiConfig/initConfig.d.ts

@@ -2,6 +2,7 @@ import { InitOptions } from '../schemas';
 import { CLITemplates } from './Types';
 type InitConfigParams = Pick<InitOptions, 'openapiConfig' | 'specsDir' | 'request'> & {
     templates: CLITemplates;
+    useInteractiveMode?: boolean;
 };
 /**
  * Инициализирует файл конфигурации OpenAPI

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

@@ -1 +1 @@
-{"version":3,"file":"initConfig.d.ts","sourceRoot":"","sources":["../../../src/cli/initOpenApiConfig/initConfig.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAMvC,KAAK,gBAAgB,GAAG,IAAI,CAAC,WAAW,EAAE,eAAe,GAAG,UAAU,GAAG,SAAS,CAAC,GAAG;IAClF,SAAS,EAAE,YAAY,CAAC;CAC3B,CAAA;AAED;;GAEG;AACH,wBAAsB,UAAU,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAoGxE"}
+{"version":3,"file":"initConfig.d.ts","sourceRoot":"","sources":["../../../src/cli/initOpenApiConfig/initConfig.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAMvC,KAAK,gBAAgB,GAAG,IAAI,CAAC,WAAW,EAAE,eAAe,GAAG,UAAU,GAAG,SAAS,CAAC,GAAG;IAClF,SAAS,EAAE,YAAY,CAAC;IACxB,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAChC,CAAC;AAEF;;GAEG;AACH,wBAAsB,UAAU,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CA2HxE"}

package/dist/cli/initOpenApiConfig/initConfig.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initConfig = initConfig;
 const Consts_1 = require("../../common/Consts");
+const LoggerMessages_1 = require("../../common/LoggerMessages");
 const fileSystemHelpers_1 = require("../../common/utils/fileSystemHelpers");
 const pathHelpers_1 = require("../../common/utils/pathHelpers");
 const confirmDialog_1 = require("../interactive/confirmDialog");
@@ -16,16 +17,22 @@ const writeConfigFile_1 = require("./utils/writeConfigFile");
  * Инициализирует файл конфигурации OpenAPI
  */
 async function initConfig(params) {
+    const useInteractiveMode = params.useInteractiveMode === true;
     const configPath = (0, pathHelpers_1.resolveHelper)(process.cwd(), params.openapiConfig || '');
     const configExists = await fileSystemHelpers_1.fileSystemHelpers.exists(configPath);
     // Шаг 3: Проверка существования файла конфигурации
     if (configExists) {
+        if (!useInteractiveMode) {
+            Consts_1.APP_LOGGER.warn(LoggerMessages_1.LOGGER_MESSAGES.CONFIG.CONFIG_EXISTS_INTERACTIVE_DISABLED(configPath));
+            Consts_1.APP_LOGGER.info(LoggerMessages_1.LOGGER_MESSAGES.CONFIG.CONFIG_LEFT_UNCHANGED);
+            return;
+        }
         const shouldRegenerate = await (0, confirmDialog_1.confirmDialog)({
             message: 'Configuration file already exists. Do you want to regenerate it?',
             initial: false,
         });
         if (!shouldRegenerate) {
-            Consts_1.APP_LOGGER.info('Configuration file left unchanged.');
+            Consts_1.APP_LOGGER.info(LoggerMessages_1.LOGGER_MESSAGES.CONFIG.CONFIG_LEFT_UNCHANGED);
             return;
         }
     }
@@ -37,10 +44,10 @@ async function initConfig(params) {
         specFiles = await (0, findSpecFiles_1.findSpecFiles)(currentSpecsDir);
     }
     catch (error) {
-        Consts_1.APP_LOGGER.warn(`Error finding spec files: ${error instanceof Error ? error.message : String(error)}`);
+        Consts_1.APP_LOGGER.warn(LoggerMessages_1.LOGGER_MESSAGES.CONFIG.SPEC_FILES_FIND_ERROR(error instanceof Error ? error.message : String(error)));
     }
     if (specFiles.length === 0) {
-        Consts_1.APP_LOGGER.warn(`No spec files found in directory: ${currentSpecsDir}`);
+        Consts_1.APP_LOGGER.warn(LoggerMessages_1.LOGGER_MESSAGES.CONFIG.NO_SPEC_FILES_FOUND(currentSpecsDir));
     }
     // Валидация файлов
     const validatedSpecs = await (0, validateSpecFiles_1.validateSpecFiles)(specFiles);
@@ -48,51 +55,67 @@ async function initConfig(params) {
     let useMultiOption = false;
     let customRequest;
     let perSpecRequest = false;
+    const hasCustomRequestPath = Boolean(params.request);
     if (validatedSpecs.length > 0) {
         // Если найдены валидные спецификации, спрашиваем о типе конфигурации
         useMultiOption = validatedSpecs.length > 1;
-        // Спрашиваем про пользовательскую реализацию request
-        const hasCustomRequest = await (0, confirmDialog_1.confirmDialog)({
-            message: 'Do you want to use a custom request implementation?',
-            initial: false,
-        });
+        // В неинтерактивном режиме признак кастомного request определяется наличием --request
+        const hasCustomRequest = useInteractiveMode
+            ? await (0, confirmDialog_1.confirmDialog)({
+                message: 'Do you want to use a custom request implementation?',
+                initial: false,
+            })
+            : hasCustomRequestPath;
         if (hasCustomRequest) {
-            if (useMultiOption) {
+            if (useMultiOption && useInteractiveMode) {
                 perSpecRequest = await (0, confirmDialog_1.confirmDialog)({
                     message: 'Will each specification have its own request?',
                     initial: false,
                 });
             }
-            customRequest = params.request;
+            if (!hasCustomRequestPath) {
+                Consts_1.APP_LOGGER.warn(LoggerMessages_1.LOGGER_MESSAGES.CONFIG.CUSTOM_REQUEST_MISSING_PATH);
+            }
+            else {
+                customRequest = params.request;
+            }
         }
         config = await (0, buildConfig_1.buildConfig)(validatedSpecs, useMultiOption, customRequest, perSpecRequest);
     }
     else {
         // Если валидных спецификаций нет, предлагаем создать пример
-        Consts_1.APP_LOGGER.warn('No valid OpenAPI specification files found.');
-        const action = await (0, selectDialog_1.selectDialog)({
-            message: 'What would you like to do?',
-            choices: constants_1.OPEN_API_CONFIG_SELECT_OPTIONS,
-            initial: 0,
-        });
+        Consts_1.APP_LOGGER.warn(LoggerMessages_1.LOGGER_MESSAGES.CONFIG.NO_VALID_SPEC_FILES_FOUND);
+        const action = useInteractiveMode
+            ? await (0, selectDialog_1.selectDialog)({
+                message: 'What would you like to do?',
+                choices: constants_1.OPEN_API_CONFIG_SELECT_OPTIONS,
+                initial: 0,
+            })
+            : types_1.EConfigType.FLAT;
         if (action === types_1.EConfigType.NONE) {
-            Consts_1.APP_LOGGER.info('Configuration file generation cancelled.');
+            Consts_1.APP_LOGGER.info(LoggerMessages_1.LOGGER_MESSAGES.CONFIG.CONFIG_GENERATION_CANCELLED);
             return;
         }
         useMultiOption = action === types_1.EConfigType.MULTI;
-        // Спрашиваем про пользовательскую реализацию request
-        const hasCustomRequest = await (0, confirmDialog_1.confirmDialog)({
-            message: 'Do you want to use a custom request implementation?',
-            initial: false,
-        });
+        const hasCustomRequest = useInteractiveMode
+            ? await (0, confirmDialog_1.confirmDialog)({
+                message: 'Do you want to use a custom request implementation?',
+                initial: false,
+            })
+            : hasCustomRequestPath;
         if (hasCustomRequest) {
-            if (useMultiOption) {
+            if (useMultiOption && useInteractiveMode) {
                 perSpecRequest = await (0, confirmDialog_1.confirmDialog)({
                     message: 'Will each specification have its own request?',
                     initial: false,
                 });
             }
-            customRequest = './custom-request.ts';
+            if (!hasCustomRequestPath) {
+                Consts_1.APP_LOGGER.warn(LoggerMessages_1.LOGGER_MESSAGES.CONFIG.CUSTOM_REQUEST_MISSING_PATH);
+            }
+            else {
+                customRequest = params.request;
+            }
         }
         // Создаем пример конфигурации
         config = (0, buildConfig_1.buildExampleConfig)(useMultiOption, customRequest, perSpecRequest);

package/dist/cli/initOpenApiConfig/initCustomRequest.d.ts

@@ -1,3 +1,10 @@
 import { CLITemplates } from './Types';
-export declare function initCustomRequest(templates: CLITemplates, useCancelableRequest?: boolean): Promise<void>;
+type InitCustomRequestParams = {
+    templates: CLITemplates;
+    useCancelableRequest?: boolean;
+    customRequestPath?: string;
+    useInteractiveMode?: boolean;
+};
+export declare function initCustomRequest(params: InitCustomRequestParams): Promise<void>;
+export {};
 //# sourceMappingURL=initCustomRequest.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"initCustomRequest.d.ts","sourceRoot":"","sources":["../../../src/cli/initOpenApiConfig/initCustomRequest.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAEvC,wBAAsB,iBAAiB,CAAC,SAAS,EAAE,YAAY,EAAE,oBAAoB,CAAC,EAAE,OAAO,iBAkB9F"}
+{"version":3,"file":"initCustomRequest.d.ts","sourceRoot":"","sources":["../../../src/cli/initOpenApiConfig/initCustomRequest.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAEvC,KAAK,uBAAuB,GAAG;IAC3B,SAAS,EAAE,YAAY,CAAC;IACxB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAChC,CAAC;AAEF,wBAAsB,iBAAiB,CAAC,MAAM,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC,CAkDtF"}

package/dist/cli/initOpenApiConfig/initCustomRequest.js

@@ -1,23 +1,55 @@
 "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,
-    });
+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;
+    }
+    const shouldRequestExecutor = useInteractiveMode
+        ? await (0, confirmDialog_1.confirmDialog)({
+            message: 'Generate custom request file in executor format?',
+            initial: false,
+        })
+        : false;
     const artifacts = {
         useCancelableRequest,
     };
-    const customRequestPath = './src/custom/request.ts';
     const file = (0, pathHelpers_1.resolveHelper)(process.cwd(), customRequestPath);
+    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;
+        }
+        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;
+        }
+    }
     const templateResult = shouldRequestExecutor ? templates.requestExecutor(artifacts) : templates.request(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));
 }

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;;;;;;;;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,CA4ElK;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,cAAc,EAAE,OAAO,EAAE,aAAa,CAAC,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,OAAO,GAAG,WAAW,CAqEzH"}