ts-openapi-codegen 2.1.0-beta.6 → 2.1.0-beta.7

package/dist/cli/checkAndUpdateConfig/checkConfig.js

@@ -24,14 +24,14 @@ async function checkConfig(options) {
     if (!validationResult.success) {
         Consts_1.APP_LOGGER.error(LoggerMessages_1.LOGGER_MESSAGES.ERROR.GENERIC(validationResult.errors.join('\n')));
         await Consts_1.APP_LOGGER.shutdownLoggerAsync();
-        process.exit(1);
+        return { success: false, error: validationResult.errors.join('\n') };
     }
     const validatedOptions = validationResult.data;
     const configData = (0, loadConfigIfExists_1.loadConfigIfExists)(validatedOptions.openapiConfig);
     if (!configData) {
         Consts_1.APP_LOGGER.error(LoggerMessages_1.LOGGER_MESSAGES.CONFIG.FILE_NOT_FOUND(validatedOptions.openapiConfig || ''));
         await Consts_1.APP_LOGGER.shutdownLoggerAsync();
-        process.exit(1);
+        return { success: false, error: LoggerMessages_1.LOGGER_MESSAGES.CONFIG.FILE_NOT_FOUND(validatedOptions.openapiConfig || '') };
     }
     try {
         const { isActualConfigVersion, hasDefaultValues, migratedData } = (0, validateAndMigrateConfigData_1.validateAndMigrateConfigData)(configData);
@@ -44,7 +44,8 @@ async function checkConfig(options) {
                 warningMessage: LoggerMessages_1.LOGGER_MESSAGES.CONFIG.WARNING_OUTDATED_CONFIG,
                 actionChoices: constants_1.ACTION_FOR_CONFIG_DATA_OPTIONS,
             });
-            return;
+            await Consts_1.APP_LOGGER.shutdownLoggerAsync();
+            return { success: true };
         }
         // Если есть значения по умолчанию, предложить их удаление
         if (hasDefaultValues) {
@@ -55,11 +56,14 @@ async function checkConfig(options) {
                 actionChoices: constants_1.ACTION_FOR_CONFIG_DATA_OPTIONS,
             });
         }
+        await Consts_1.APP_LOGGER.shutdownLoggerAsync();
+        return { success: true };
     }
     catch (error) {
         handleConfigError(LoggerMessages_1.LOGGER_MESSAGES.CONFIG.CHECKING_FAILED, error);
         await Consts_1.APP_LOGGER.shutdownLoggerAsync();
-        process.exit(1);
+        const message = error instanceof Error ? error.message : String(error);
+        return { success: false, error: message };
     }
 }
 /**

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

@@ -1,4 +1,5 @@
 import { OptionValues } from 'commander';
+import { CLICommandResult } from '../types';
 /**
  * Обновляет конфигурационный файл до актуальной версии.
  * Выполняет миграцию данных при необходимости.
@@ -9,5 +10,5 @@ import { OptionValues } from 'commander';
  * @example
  * await updateConfig('./openapi-config.json');
  */
-export declare function updateConfig(options: OptionValues): Promise<void>;
+export declare function updateConfig(options: OptionValues): Promise<CLICommandResult>;
 //# 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":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAUzC;;;;;;;;;GASG;AACH,wBAAsB,YAAY,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAoCvE"}
+{"version":3,"file":"updateConfig.d.ts","sourceRoot":"","sources":["../../../src/cli/checkAndUpdateConfig/updateConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAOzC,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAI5C;;;;;;;;;GASG;AACH,wBAAsB,YAAY,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAuCnF"}

package/dist/cli/checkAndUpdateConfig/updateConfig.js

@@ -23,14 +23,14 @@ async function updateConfig(options) {
     if (!validationResult.success) {
         Consts_1.APP_LOGGER.error(LoggerMessages_1.LOGGER_MESSAGES.ERROR.GENERIC(validationResult.errors.join('\n')));
         await Consts_1.APP_LOGGER.shutdownLoggerAsync();
-        process.exit(1);
+        return { success: false, error: validationResult.errors.join('\n') };
     }
     const validatedOptions = validationResult.data;
     const configData = (0, loadConfigIfExists_1.loadConfigIfExists)(validatedOptions.openapiConfig);
     if (!configData) {
         Consts_1.APP_LOGGER.error(LoggerMessages_1.LOGGER_MESSAGES.CONFIG.FILE_NOT_FOUND(validatedOptions.openapiConfig || ''));
         await Consts_1.APP_LOGGER.shutdownLoggerAsync();
-        process.exit(1);
+        return { success: false, error: LoggerMessages_1.LOGGER_MESSAGES.CONFIG.FILE_NOT_FOUND(validatedOptions.openapiConfig || '') };
     }
     try {
         const { isActualConfigVersion, migratedData } = (0, validateAndMigrateConfigData_1.validateAndMigrateConfigData)(configData);
@@ -44,11 +44,14 @@ async function updateConfig(options) {
                 isUpdating: true,
             });
         }
+        await Consts_1.APP_LOGGER.shutdownLoggerAsync();
+        return { success: true };
     }
     catch (error) {
         handleUpdateError(LoggerMessages_1.LOGGER_MESSAGES.CONFIG.UPDATING_FAILED, error);
         await Consts_1.APP_LOGGER.shutdownLoggerAsync();
-        process.exit(1);
+        const message = error instanceof Error ? error.message : String(error);
+        return { success: false, error: message };
     }
 }
 /**

package/dist/cli/checkAndUpdateConfig/utils/validateAndMigrateConfigData.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validateAndMigrateConfigData.d.ts","sourceRoot":"","sources":["../../../../src/cli/checkAndUpdateConfig/utils/validateAndMigrateConfigData.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,uBAAuB,EAAE,MAAM,UAAU,CAAC;AAGnD;;;;;;;;;;;;;GAaG;AACH,wBAAgB,4BAA4B,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,GAAG,uBAAuB,CAmC7H"}
+{"version":3,"file":"validateAndMigrateConfigData.d.ts","sourceRoot":"","sources":["../../../../src/cli/checkAndUpdateConfig/utils/validateAndMigrateConfigData.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,uBAAuB,EAAE,MAAM,UAAU,CAAC;AA6BnD;;;;;;;;;;;;;GAaG;AACH,wBAAgB,4BAA4B,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,GAAG,uBAAuB,CAmC7H"}

package/dist/cli/checkAndUpdateConfig/utils/validateAndMigrateConfigData.js

@@ -12,6 +12,24 @@ const OptionsVersionedSchemas_1 = require("../../../common/VersionedSchema/Optio
 const migrateDataToLatestSchemaVersion_1 = require("../../../common/VersionedSchema/Utils/migrateDataToLatestSchemaVersion");
 const isInstanceOfMultiOptions_1 = require("../../../core/utils/isInstanceOfMultiOptions");
 const removeDefaultConfigValues_1 = require("./removeDefaultConfigValues");
+const omitUndefinedValues = (data) => {
+    const result = {};
+    for (const [key, value] of Object.entries(data)) {
+        if (value === undefined) {
+            continue;
+        }
+        if (Array.isArray(value)) {
+            result[key] = value.map(item => item && typeof item === 'object' && !Array.isArray(item) ? omitUndefinedValues(item) : item);
+            continue;
+        }
+        if (value && typeof value === 'object') {
+            result[key] = omitUndefinedValues(value);
+            continue;
+        }
+        result[key] = value;
+    }
+    return result;
+};
 /**
  * Валидирует и мигрирует данные конфигурации до последней версии схемы.
  * Определяет тип конфигурации (одиночная или множественная опция) и применяет соответствующий план миграции.
@@ -31,7 +49,7 @@ function validateAndMigrateConfigData(configData) {
     if (isArrayFormat) {
         Consts_1.APP_LOGGER.warn(LoggerMessages_1.LOGGER_MESSAGES.CONFIG.ARRAY_DEPRECATED);
     }
-    const normalizedData = (0, convertArrayToObject_1.convertArrayToObject)(configData);
+    const normalizedData = omitUndefinedValues((0, convertArrayToObject_1.convertArrayToObject)(configData));
     const isMultiOptions = (0, isInstanceOfMultiOptions_1.isInstanceOfMultioptions)(normalizedData);
     // Выбрать соответствующие схемы и планы миграции
     const migrationPlans = isMultiOptions ? MultiOptionsMigrationPlan_1.multiOptionsMigrationPlan : OptionsMigrationPlans_1.optionsMigrationPlans;

package/dist/cli/generateOpenApiClient/__tests__/generateOpenApiClient.strict.test.js

@@ -7,6 +7,7 @@ const node_assert_1 = __importDefault(require("node:assert"));
 const node_fs_1 = require("node:fs");
 const node_path_1 = __importDefault(require("node:path"));
 const node_test_1 = require("node:test");
+const silenceLoggers_1 = require("../../../test/helpers/silenceLoggers");
 const generateOpenApiClient_1 = require("../generateOpenApiClient");
 const repoRoot = node_path_1.default.join(__dirname, '..', '..', '..', '..');
 const cliDefaults = {
@@ -35,23 +36,31 @@ function createTempDir(t, prefix) {
     return tempDir;
 }
 function runStrictGenerate(options) {
-    return (0, generateOpenApiClient_1.runGenerateOpenApiClient)({
+    return (0, generateOpenApiClient_1.generateOpenApiClient)({
         ...cliDefaults,
         ...options,
     });
 }
 (0, node_test_1.describe)('@unit: generateOpenApiClient strict-openapi', () => {
-    (0, node_test_1.test)('returns exit code 0 and writes report file when strict has no errors', async (t) => {
+    let restoreLoggers;
+    (0, node_test_1.beforeEach)(() => {
+        restoreLoggers = (0, silenceLoggers_1.installSilenceLoggers)();
+    });
+    (0, node_test_1.afterEach)(() => {
+        restoreLoggers?.();
+        restoreLoggers = undefined;
+    });
+    (0, node_test_1.test)('returns success and writes report file when strict has no errors', async (t) => {
         const tempDir = createTempDir(t, 'openapi-cli-strict-ok-');
         const reportFile = node_path_1.default.join(tempDir, 'strict-report.json');
         const outputDir = node_path_1.default.join(tempDir, 'generated');
-        const exitCode = await runStrictGenerate({
+        const result = await runStrictGenerate({
             input: node_path_1.default.join(repoRoot, 'test/spec/lom/lom_api.yaml'),
             output: outputDir,
             strictOpenapi: true,
             reportFile,
         });
-        node_assert_1.default.strictEqual(exitCode, 0);
+        node_assert_1.default.strictEqual(result.success, true);
         const report = JSON.parse((0, node_fs_1.readFileSync)(reportFile, 'utf8'));
         node_assert_1.default.ok(Array.isArray(report.issues));
         node_assert_1.default.ok(Array.isArray(report.governance.violations));
@@ -59,7 +68,7 @@ function runStrictGenerate(options) {
         node_assert_1.default.strictEqual(typeof report.summary.warnings, 'number');
         node_assert_1.default.strictEqual(typeof report.summary.info, 'number');
     });
-    (0, node_test_1.test)('returns exit code 1 and writes report file when strict finds errors', async (t) => {
+    (0, node_test_1.test)('returns failure and writes report file when strict finds errors', async (t) => {
         const tempDir = createTempDir(t, 'openapi-cli-strict-error-');
         const inputSpec = node_path_1.default.join(tempDir, 'broken-openapi.json');
         const reportFile = node_path_1.default.join(tempDir, 'strict-report.json');
@@ -92,13 +101,13 @@ function runStrictGenerate(options) {
                 schemas: {},
             },
         }));
-        const exitCode = await runStrictGenerate({
+        const result = await runStrictGenerate({
             input: inputSpec,
             output: outputDir,
             strictOpenapi: true,
             reportFile,
         });
-        node_assert_1.default.strictEqual(exitCode, 1);
+        node_assert_1.default.strictEqual(result.success, false);
         const report = JSON.parse((0, node_fs_1.readFileSync)(reportFile, 'utf8'));
         node_assert_1.default.ok(report.summary.errors > 0);
         node_assert_1.default.ok(report.issues.some(issue => issue.severity === 'error'));
@@ -137,14 +146,14 @@ function runStrictGenerate(options) {
                 },
             },
         }));
-        const exitCode = await runStrictGenerate({
+        const result = await runStrictGenerate({
             input: inputSpec,
             output: outputDir,
             strictOpenapi: true,
             reportFile,
             governanceConfig,
         });
-        node_assert_1.default.strictEqual(exitCode, 0);
+        node_assert_1.default.strictEqual(result.success, true);
         const report = JSON.parse((0, node_fs_1.readFileSync)(reportFile, 'utf8'));
         node_assert_1.default.ok(!report.governance.violations.some(violation => violation.ruleId === 'REQUIRE_OPERATION_ID'));
         node_assert_1.default.ok(report.governance.violations.some(violation => violation.ruleId === 'NO_DEFAULT_WITHOUT_2XX' && violation.severity === 'error'));

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

@@ -1,11 +1,8 @@
 import { OptionValues } from 'commander';
+import { CLICommandResult } from '../types';
 /**
  * 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>;
+export declare function generateOpenApiClient(options: OptionValues): Promise<CLICommandResult>;
 //# 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;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"}
+{"version":3,"file":"generateOpenApiClient.d.ts","sourceRoot":"","sources":["../../../src/cli/generateOpenApiClient/generateOpenApiClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAezC,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAY5C;;;GAGG;AACH,wBAAsB,qBAAqB,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAmG5F"}

package/dist/cli/generateOpenApiClient/generateOpenApiClient.js

@@ -33,7 +33,6 @@ 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 Enums_1 = require("../../common/Enums");
@@ -60,7 +59,7 @@ const generateCliFlatSchema = UnifiedVersionedSchemas_1.flatOptionsSchema.strict
  * Runs OpenAPI client generation and returns a process exit code.
  * Does not call `process.exit` — safe for in-process unit tests.
  */
-async function runGenerateOpenApiClient(options) {
+async function generateOpenApiClient(options) {
     const { openapiConfig, ...clientOptions } = options;
     try {
         const validationResult = (0, validateZodOptions_1.validateZodOptions)(schemas_1.generateOptionsSchema, {
@@ -73,7 +72,7 @@ async function runGenerateOpenApiClient(options) {
                 message: LoggerMessages_1.LOGGER_MESSAGES.ERROR.GENERIC(validationResult.errors.join('\n')),
             });
             await Consts_1.APP_LOGGER.shutdownLoggerAsync();
-            return 1;
+            return { success: false, error: validationResult.errors.join('\n') };
         }
         const validatedOptions = validationResult.data;
         const hasMinimumRequiredOptions = !!validatedOptions.input && !!validatedOptions.output;
@@ -89,11 +88,11 @@ async function runGenerateOpenApiClient(options) {
                     message: LoggerMessages_1.LOGGER_MESSAGES.ERROR.GENERIC(directOptionsValidationResult.errors.join('\n')),
                 });
                 await Consts_1.APP_LOGGER.shutdownLoggerAsync();
-                return 1;
+                return { success: false, error: directOptionsValidationResult.errors.join('\n') };
             }
             await OpenAPI.generate(directOptionsValidationResult.data);
             await Consts_1.APP_LOGGER.shutdownLoggerAsync();
-            return 0;
+            return { success: true };
         }
         const configData = (0, loadConfigIfExists_1.loadConfigIfExists)(validatedOptions.openapiConfig);
         if (!configData) {
@@ -102,7 +101,7 @@ async function runGenerateOpenApiClient(options) {
                 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;
+            return { success: false, error: LoggerMessages_1.LOGGER_MESSAGES.CONFIG.FILE_MISSING };
         }
         if (Array.isArray(configData)) {
             Consts_1.APP_LOGGER.warn(LoggerMessages_1.LOGGER_MESSAGES.CONFIG.ARRAY_DEPRECATED);
@@ -120,7 +119,7 @@ async function runGenerateOpenApiClient(options) {
                 message: LoggerMessages_1.LOGGER_MESSAGES.CONFIG.CONVERSION_FAILED,
             });
             await Consts_1.APP_LOGGER.shutdownLoggerAsync();
-            return 1;
+            return { success: false, error: LoggerMessages_1.LOGGER_MESSAGES.CONFIG.CONVERSION_FAILED };
         }
         const { value } = migratedOptions;
         const mergedOptions = {
@@ -128,10 +127,14 @@ async function runGenerateOpenApiClient(options) {
             strictOpenapi: validatedOptions.strictOpenapi ?? value.strictOpenapi,
             reportFile: validatedOptions.reportFile ?? value.reportFile,
             governanceConfig: validatedOptions.governanceConfig ?? value.governanceConfig,
+            cache: validatedOptions.cache ?? value.cache,
+            cachePath: validatedOptions.cachePath ?? value.cachePath,
+            cacheStrategy: validatedOptions.cacheStrategy ?? value.cacheStrategy,
+            cacheDebug: validatedOptions.cacheDebug ?? value.cacheDebug,
         };
         await OpenAPI.generate(mergedOptions);
         await Consts_1.APP_LOGGER.shutdownLoggerAsync();
-        return 0;
+        return { success: true };
     }
     catch (error) {
         const message = error instanceof Error ? error.message : String(error);
@@ -141,13 +144,6 @@ async function runGenerateOpenApiClient(options) {
             error,
         });
         await Consts_1.APP_LOGGER.shutdownLoggerAsync();
-        return 1;
+        return { success: false, error: message };
     }
 }
-/**
- * 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

@@ -16,6 +16,7 @@ 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 analyzeUsage_1 = require("./analyzeUsage/analyzeUsage");
 const checkConfig_1 = require("./checkAndUpdateConfig/checkConfig");
 const updateConfig_1 = require("./checkAndUpdateConfig/updateConfig");
 const generateOpenApiClient_1 = require("./generateOpenApiClient/generateOpenApiClient");
@@ -31,6 +32,12 @@ const updateNotifier = new UpdateNotifier_1.UpdateNotifier({
     packageVersion: APP_VERSION,
 });
 const program = new commander_1.Command();
+const finishCommand = (result) => {
+    if (!result || !result.success) {
+        process.exit(1);
+    }
+    process.exit(0);
+};
 program.version(APP_VERSION).name(APP_NAME).description(APP_DESCRIPTION).addHelpText('before', (0, utils_1.getCLIName)(APP_NAME));
 /**
  * generate - Команда для генерации кода на основе OpenAPI спецификации
@@ -60,7 +67,6 @@ program
     .option('--enumPrefix <value>', 'Prefix for enum model(default: "E")', 'E')
     .option('--typePrefix <value>', 'Prefix for type model(default: "T")', 'T')
     .option('--useCancelableRequest', 'Use cancelled promise as returned data type in request (default: false)')
-    .option('--useRequestRaw [value]', 'Generate requestRaw methods and raw HTTP stack (default: true)', (value) => value === undefined || value === 'true' || value === true)
     .addOption(new commander_1.Option('-l, --logLevel <level>', 'Logging level').choices([...Object.values(Enums_1.ELogLevel)]).default(Enums_1.ELogLevel.ERROR))
     .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')
@@ -72,11 +78,16 @@ program
     .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)')
+    .option('--cache', 'Enable generation cache (default: disabled)')
+    .option('--cachePath <value>', 'Path to generation cache file relative to output directory (default: .openapi-codegen-cache.json)')
+    .addOption(new commander_1.Option('--cacheStrategy <value>', 'Cache strategy').choices(['content', 'entity']).default('entity'))
+    .option('--cacheDebug', 'Show cache hit/miss debug logs (default: false)')
     .hook('preAction', async () => {
     await updateNotifier.checkAndNotify();
 })
     .action(async (options) => {
-    await (0, generateOpenApiClient_1.generateOpenApiClient)(options);
+    const result = await (0, generateOpenApiClient_1.generateOpenApiClient)(options);
+    finishCommand(result);
 });
 /**
  * check - Команда для проверки конфигурационного файла
@@ -90,7 +101,8 @@ program
     await updateNotifier.checkAndNotify();
 })
     .action(async (options) => {
-    await (0, checkConfig_1.checkConfig)(options);
+    const result = await (0, checkConfig_1.checkConfig)(options);
+    finishCommand(result);
 });
 /**
  * update - Команда для обновления конфигурационного файла
@@ -104,7 +116,8 @@ program
     await updateNotifier.checkAndNotify();
 })
     .action(async (options) => {
-    await (0, updateConfig_1.updateConfig)(options);
+    const result = await (0, updateConfig_1.updateConfig)(options);
+    finishCommand(result);
 });
 /**
  * init - Команда для инициализации конфигурационного файла
@@ -117,13 +130,13 @@ program
     .option('-sd, --specs-dir <value>', 'Путь до директории с файлами спецификации', './openapi')
     .option('--request <value>', 'Path to custom request file')
     .option('--useCancelableRequest', 'Use cancelled promise as returned data type in request (default: false)')
-    .option('--useRequestRaw [value]', 'Generate requestRaw methods and raw HTTP stack (default: true)', (value) => value === undefined || value === true || value === 'true')
     .option('--useInteractiveMode', 'Использовать интерактивный режим команды. В терминале будут задаваться вопросы  (default: false)')
     .hook('preAction', async () => {
     await updateNotifier.checkAndNotify();
 })
     .action(async (options) => {
-    await (0, init_1.init)(options);
+    const result = await (0, init_1.init)(options);
+    finishCommand(result);
 });
 /**
  * preview-changes - Команда для предпросмотра изменений перед генерацией
@@ -140,7 +153,8 @@ program
     await updateNotifier.checkAndNotify();
 })
     .action(async (options) => {
-    await (0, previewChanges_1.previewChanges)(options);
+    const result = await (0, previewChanges_1.previewChanges)(options);
+    finishCommand(result);
 });
 /**
  * analyze-diff - Команда для анализа изменений между двумя версиями OpenAPI спецификации
@@ -182,8 +196,26 @@ program
 })
     .action(async (options) => {
     const result = await (0, analyzeDiff_1.analyzeDiff)(options);
-    await Consts_1.APP_LOGGER.shutdownLoggerAsync();
-    process.exit((0, analyzeDiff_1.toAnalyzeDiffExitCode)(result));
+    finishCommand(result);
+});
+/**
+ * analyze-usage - Команда для анализа использования generated API в consumer-проекте
+ */
+program
+    .command('analyze-usage')
+    .description('Analyzes generated API usage in a TypeScript consumer project and produces usage reports')
+    .addHelpText('before', (0, utils_1.getCLIName)(APP_NAME))
+    .option('-s, --sourcePath <value>', 'Path to generated API file')
+    .option('-p, --projectPath <value>', 'Root of your React/TS project')
+    .option('-t, --tsconfigPath <value>', 'Optional path to tsconfig.json')
+    .option('-o, --output <value>', 'Output report filename', 'api-report.json')
+    .option('-c, --check', 'CI mode (exit code 1 when errors are found)')
+    .hook('preAction', async () => {
+    await updateNotifier.checkAndNotify();
+})
+    .action(async (options) => {
+    const result = await (0, analyzeUsage_1.analyzeUsage)(options);
+    finishCommand(result);
 });
 program.exitOverride();
 program.showSuggestionAfterError(false);

package/dist/cli/initOpenApiConfig/__tests__/init.test.js

@@ -7,23 +7,13 @@ const node_assert_1 = __importDefault(require("node:assert"));
 const node_test_1 = require("node:test");
 const Consts_1 = require("../../../common/Consts");
 const init_1 = require("../init");
-class ProcessExitError extends Error {
-    exitCode;
-    constructor(exitCode) {
-        super(`process.exit(${exitCode})`);
-        this.exitCode = exitCode;
-        this.name = 'ProcessExitError';
-    }
-}
 (0, node_test_1.describe)('@unit: init', () => {
-    (0, node_test_1.test)('exits when options fail schema validation', async () => {
-        const exitMock = node_test_1.mock.method(process, 'exit', (code) => {
-            throw new ProcessExitError(Number(code ?? 0));
-        });
+    (0, node_test_1.test)('returns failure when options fail schema validation', async () => {
         const shutdownMock = node_test_1.mock.method(Consts_1.APP_LOGGER, 'shutdownLoggerAsync', async () => undefined);
         const errorMock = node_test_1.mock.method(Consts_1.APP_LOGGER, 'error', () => undefined);
-        await node_assert_1.default.rejects(() => (0, init_1.init)({ specsDir: 123 }), ProcessExitError);
-        exitMock.mock.restore();
+        const result = await (0, init_1.init)({ specsDir: 123 });
+        node_assert_1.default.strictEqual(result.success, false);
+        node_assert_1.default.ok(result.error);
         shutdownMock.mock.restore();
         errorMock.mock.restore();
     });

package/dist/cli/initOpenApiConfig/__tests__/initConfig.test.js

@@ -9,6 +9,7 @@ const node_os_1 = require("node:os");
 const node_path_1 = require("node:path");
 const node_test_1 = require("node:test");
 const Consts_1 = require("../../../common/Consts");
+const silenceLoggers_1 = require("../../../test/helpers/silenceLoggers");
 const initConfig_1 = require("../initConfig");
 const registerHandlebarTemplates_1 = require("../utils/registerHandlebarTemplates");
 (0, node_test_1.describe)('@unit: initConfig', () => {
@@ -30,7 +31,8 @@ const registerHandlebarTemplates_1 = require("../utils/registerHandlebarTemplate
         warnMock.mock.restore();
         infoMock.mock.restore();
     });
-    (0, node_test_1.test)('writes example config when no specs are found', async () => {
+    (0, node_test_1.test)('writes example config when no specs are found', async (t) => {
+        (0, silenceLoggers_1.silenceAppLogger)(t);
         const dir = await (0, promises_1.mkdtemp)((0, node_path_1.join)((0, node_os_1.tmpdir)(), 'init-config-'));
         const configPath = (0, node_path_1.join)(dir, 'new-openapi.config.json');
         const templates = (0, registerHandlebarTemplates_1.registerHandlebarTemplates)();

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

@@ -1,6 +1,7 @@
 import { OptionValues } from 'commander';
+import { CLICommandResult } from '../types';
 /**
  * Фнукция изначальной настройки файлов конфигурации для последующего запуска генератора
  */
-export declare function init(options: OptionValues): Promise<void>;
+export declare function init(options: OptionValues): Promise<CLICommandResult>;
 //# sourceMappingURL=init.d.ts.map

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

package/dist/cli/initOpenApiConfig/init.js

@@ -17,7 +17,7 @@ async function init(options) {
     if (!validationResult.success) {
         Consts_1.APP_LOGGER.error(LoggerMessages_1.LOGGER_MESSAGES.ERROR.GENERIC(validationResult.errors.join('\n')));
         await Consts_1.APP_LOGGER.shutdownLoggerAsync();
-        process.exit(1);
+        return { success: false, error: validationResult.errors.join('\n') };
     }
     const validatedOptions = validationResult.data;
     const templates = (0, registerHandlebarTemplates_1.registerHandlebarTemplates)();
@@ -43,7 +43,6 @@ async function init(options) {
             await (0, initCustomRequest_1.initCustomRequest)({
                 templates,
                 useCancelableRequest: validatedOptions?.useCancelableRequest,
-                useRequestRaw: validatedOptions?.useRequestRaw,
                 customRequestPath: validatedOptions.request,
                 useInteractiveMode: validatedOptions.useInteractiveMode,
             });
@@ -60,9 +59,10 @@ async function init(options) {
         await (0, initCustomRequest_1.initCustomRequest)({
             templates,
             useCancelableRequest: validatedOptions?.useCancelableRequest,
-            useRequestRaw: validatedOptions?.useRequestRaw,
             customRequestPath: validatedOptions.request,
             useInteractiveMode: validatedOptions.useInteractiveMode,
         });
     }
+    await Consts_1.APP_LOGGER.shutdownLoggerAsync();
+    return { success: true };
 }

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

@@ -2,7 +2,6 @@ import { CLITemplates } from './Types';
 type InitCustomRequestParams = {
     templates: CLITemplates;
     useCancelableRequest?: boolean;
-    useRequestRaw?: boolean;
     customRequestPath?: string;
     useInteractiveMode?: boolean;
 };

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":"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,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,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,CAmDtF"}
+{"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

@@ -12,7 +12,7 @@ const format_1 = require("../../common/utils/format");
 const pathHelpers_1 = require("../../common/utils/pathHelpers");
 const confirmDialog_1 = require("../interactive/confirmDialog");
 async function initCustomRequest(params) {
-    const { templates, useCancelableRequest, useRequestRaw, customRequestPath, useInteractiveMode } = params;
+    const { templates, useCancelableRequest, customRequestPath, useInteractiveMode } = params;
     if (!customRequestPath) {
         Consts_1.APP_LOGGER.warn(LoggerMessages_1.LOGGER_MESSAGES.CUSTOM_REQUEST.PATH_NOT_PROVIDED);
         return;
@@ -25,7 +25,6 @@ async function initCustomRequest(params) {
         : false;
     const artifacts = {
         useCancelableRequest,
-        useRequestRaw,
     };
     const file = (0, pathHelpers_1.resolveHelper)(process.cwd(), customRequestPath);
     const fileDir = path_1.default.dirname(file);

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

@@ -7,6 +7,7 @@ const node_assert_1 = __importDefault(require("node:assert"));
 const node_fs_1 = __importDefault(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
 const node_test_1 = require("node:test");
+const silenceLoggers_1 = require("../../../../test/helpers/silenceLoggers");
 const validateSpecFile_1 = require("../validateSpecFile");
 const validateSpecFiles_1 = require("../validateSpecFiles");
 const minimalOpenApi = {
@@ -26,6 +27,14 @@ const createSpecFile = (t, content) => {
     return filePath;
 };
 (0, node_test_1.describe)('@unit: validateSpecFiles', () => {
+    let restoreAppLogger;
+    (0, node_test_1.beforeEach)(() => {
+        restoreAppLogger = (0, silenceLoggers_1.installSilenceAppLogger)();
+    });
+    (0, node_test_1.afterEach)(() => {
+        restoreAppLogger?.();
+        restoreAppLogger = undefined;
+    });
     (0, node_test_1.test)('validateSpecFile returns true for valid OpenAPI spec', async (t) => {
         const specPath = createSpecFile(t, minimalOpenApi);
         const isValid = await (0, validateSpecFile_1.validateSpecFile)(specPath);

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

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

@@ -28,7 +28,6 @@ async function buildConfig(validatedSpecs, useMultiOption, customRequest, perSpe
             interfacePrefix: Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.interfacePrefix,
             typePrefix: Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.typePrefix,
             useCancelableRequest: Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.useCancelableRequest,
-            useRequestRaw: Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.useRequestRaw,
             useOptions: Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.useOptions,
             useSeparatedIndexes: Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.useSeparatedIndexes,
             useUnionTypes: Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.useUnionTypes,
@@ -66,7 +65,6 @@ async function buildConfig(validatedSpecs, useMultiOption, customRequest, perSpe
             interfacePrefix: Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.interfacePrefix,
             typePrefix: Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.typePrefix,
             useCancelableRequest: Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.useCancelableRequest,
-            useRequestRaw: Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.useRequestRaw,
             useOptions: Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.useOptions,
             useSeparatedIndexes: Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.useSeparatedIndexes,
             useUnionTypes: Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.useUnionTypes,
@@ -113,7 +111,6 @@ function buildExampleConfig(useMultiOption, customRequest, perSpecRequest) {
             interfacePrefix: Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.interfacePrefix,
             typePrefix: Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.typePrefix,
             useCancelableRequest: Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.useCancelableRequest,
-            useRequestRaw: Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.useRequestRaw,
             useOptions: Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.useOptions,
             useSeparatedIndexes: Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.useSeparatedIndexes,
             useUnionTypes: Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.useUnionTypes,
@@ -146,7 +143,6 @@ function buildExampleConfig(useMultiOption, customRequest, perSpecRequest) {
             interfacePrefix: Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.interfacePrefix,
             typePrefix: Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.typePrefix,
             useCancelableRequest: Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.useCancelableRequest,
-            useRequestRaw: Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.useRequestRaw,
             useOptions: Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.useOptions,
             useSeparatedIndexes: Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.useSeparatedIndexes,
             useUnionTypes: Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.useUnionTypes,