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

package/dist/cli/checkAndUpdateConfig/utils/__tests__/removeDefaultConfigValues.test.js

@@ -0,0 +1,35 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const node_assert_1 = __importDefault(require("node:assert"));
+const node_test_1 = require("node:test");
+const Consts_1 = require("../../../../common/Consts");
+const HttpClient_enum_1 = require("../../../../core/types/enums/HttpClient.enum");
+const removeDefaultConfigValues_1 = require("../removeDefaultConfigValues");
+(0, node_test_1.describe)('@unit: removeDefaultConfigValues', () => {
+    (0, node_test_1.test)('removes keys that match COMMON_DEFAULT_OPTIONS_VALUES', () => {
+        const cleaned = (0, removeDefaultConfigValues_1.removeDefaultConfigValues)({
+            input: './spec.json',
+            output: './generated',
+            httpClient: Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.httpClient,
+            sortByRequired: Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.sortByRequired,
+        });
+        node_assert_1.default.deepStrictEqual(cleaned, {
+            input: './spec.json',
+            output: './generated',
+        });
+    });
+    (0, node_test_1.test)('keeps custom values that differ from defaults', () => {
+        const cleaned = (0, removeDefaultConfigValues_1.removeDefaultConfigValues)({
+            input: './spec.json',
+            output: './generated',
+            httpClient: HttpClient_enum_1.HttpClient.AXIOS,
+            interfacePrefix: 'Api',
+        });
+        node_assert_1.default.strictEqual(cleaned.httpClient, HttpClient_enum_1.HttpClient.AXIOS);
+        node_assert_1.default.strictEqual(cleaned.interfacePrefix, 'Api');
+        node_assert_1.default.strictEqual(cleaned.input, './spec.json');
+    });
+});

package/dist/cli/checkAndUpdateConfig/utils/__tests__/validateAndMigrateConfigData.test.d.ts

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

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

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

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

@@ -0,0 +1,59 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const node_assert_1 = __importDefault(require("node:assert"));
+const node_test_1 = require("node:test");
+const Consts_1 = require("../../../../common/Consts");
+const HttpClient_enum_1 = require("../../../../core/types/enums/HttpClient.enum");
+const validateAndMigrateConfigData_1 = require("../validateAndMigrateConfigData");
+const flatConfig = {
+    input: './test/spec/v3.json',
+    output: './generated',
+    httpClient: HttpClient_enum_1.HttpClient.FETCH,
+};
+(0, node_test_1.describe)('@unit: validateAndMigrateConfigData', () => {
+    (0, node_test_1.test)('accepts current flat object config', () => {
+        const result = (0, validateAndMigrateConfigData_1.validateAndMigrateConfigData)({ ...flatConfig });
+        node_assert_1.default.strictEqual(result.isActualConfigVersion, true);
+        node_assert_1.default.strictEqual(result.migratedData.input, flatConfig.input);
+        node_assert_1.default.strictEqual(result.migratedData.output, flatConfig.output);
+    });
+    (0, node_test_1.test)('marks deprecated array format as outdated', () => {
+        const warnMock = node_test_1.mock.method(Consts_1.APP_LOGGER, 'warn', () => undefined);
+        const legacyArray = [
+            { input: './a.json', output: './generated/a', httpClient: HttpClient_enum_1.HttpClient.AXIOS, useOptions: true },
+            { input: './b.json', output: './generated/b', httpClient: HttpClient_enum_1.HttpClient.AXIOS, useOptions: true },
+        ];
+        const result = (0, validateAndMigrateConfigData_1.validateAndMigrateConfigData)(legacyArray);
+        node_assert_1.default.strictEqual(result.isActualConfigVersion, false);
+        node_assert_1.default.ok(Array.isArray(result.migratedData.items));
+        node_assert_1.default.strictEqual(result.migratedData.items.length, 2);
+        node_assert_1.default.strictEqual(warnMock.mock.callCount(), 1);
+        warnMock.mock.restore();
+    });
+    (0, node_test_1.test)('migrates multi-options config with items', () => {
+        const multiConfig = {
+            items: [
+                { input: './api/v1.json', output: './generated/v1' },
+                { input: './api/v2.json', output: './generated/v2' },
+            ],
+            httpClient: HttpClient_enum_1.HttpClient.AXIOS,
+        };
+        const result = (0, validateAndMigrateConfigData_1.validateAndMigrateConfigData)(multiConfig);
+        node_assert_1.default.ok(result.migratedData.items);
+        node_assert_1.default.strictEqual(result.migratedData.items.length, 2);
+        node_assert_1.default.strictEqual(result.migratedData.httpClient, HttpClient_enum_1.HttpClient.AXIOS);
+    });
+    (0, node_test_1.test)('detects default values when config matches defaults', () => {
+        const withDefaults = {
+            ...flatConfig,
+            httpClient: HttpClient_enum_1.HttpClient.FETCH,
+            sortByRequired: false,
+        };
+        const result = (0, validateAndMigrateConfigData_1.validateAndMigrateConfigData)(withDefaults);
+        node_assert_1.default.strictEqual(result.hasDefaultValues, true);
+        node_assert_1.default.strictEqual(result.migratedData.httpClient, undefined);
+    });
+});

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

@@ -1 +1 @@
-{"version":3,"file":"removeDefaultConfigValues.d.ts","sourceRoot":"","sources":["../../../../src/cli/checkAndUpdateConfig/utils/removeDefaultConfigValues.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,yBAAyB,CACrC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAChC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAWrB"}
+{"version":3,"file":"removeDefaultConfigValues.d.ts","sourceRoot":"","sources":["../../../../src/cli/checkAndUpdateConfig/utils/removeDefaultConfigValues.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,yBAAyB,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAW9F"}

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;AA2BnD;;;;;;;;;;;;;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/checkAndUpdateConfig/utils/validateExecutorSetup.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Validates request/customExecutorPath semantics after schema migration.
+ * Returns human-readable warnings (non-fatal).
+ */
+export declare function validateExecutorSetup(configData: Record<string, unknown>, cwd?: string): string[];
+//# sourceMappingURL=validateExecutorSetup.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"validateExecutorSetup.d.ts","sourceRoot":"","sources":["../../../../src/cli/checkAndUpdateConfig/utils/validateExecutorSetup.ts"],"names":[],"mappings":"AAaA;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG,GAAE,MAAsB,GAAG,MAAM,EAAE,CA6ChH"}

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

@@ -0,0 +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.validateExecutorSetup = validateExecutorSetup;
+const fs_1 = require("fs");
+const path_1 = __importDefault(require("path"));
+const collectConfigItems = (configData) => {
+    if (Array.isArray(configData.items)) {
+        return configData.items;
+    }
+    return [configData];
+};
+/**
+ * Validates request/customExecutorPath semantics after schema migration.
+ * Returns human-readable warnings (non-fatal).
+ */
+function validateExecutorSetup(configData, cwd = process.cwd()) {
+    const warnings = [];
+    const rootRequest = typeof configData.request === 'string' ? configData.request : undefined;
+    const rootCustomExecutorPath = typeof configData.customExecutorPath === 'string' ? configData.customExecutorPath : undefined;
+    const validatePath = (field, value, itemLabel) => {
+        const prefix = itemLabel ? `${itemLabel}: ` : '';
+        const resolved = path_1.default.resolve(cwd, value);
+        if (!(0, fs_1.existsSync)(resolved)) {
+            warnings.push(`${prefix}${field} file not found: ${value}`);
+            return;
+        }
+        if (field === 'customExecutorPath') {
+            const content = (0, fs_1.readFileSync)(resolved, 'utf8');
+            if (!/\bexport\s+function\s+createExecutorAdapter\b/.test(content)) {
+                warnings.push(`${prefix}customExecutorPath should export function createExecutorAdapter`);
+            }
+        }
+    };
+    if (rootRequest) {
+        validatePath('request', rootRequest);
+    }
+    if (rootCustomExecutorPath) {
+        validatePath('customExecutorPath', rootCustomExecutorPath);
+    }
+    collectConfigItems(configData).forEach((item, index) => {
+        const itemRequest = typeof item.request === 'string' ? item.request : undefined;
+        const itemCustomExecutorPath = typeof item.customExecutorPath === 'string' ? item.customExecutorPath : undefined;
+        const label = `items[${index}]`;
+        if (itemRequest && itemRequest !== rootRequest) {
+            validatePath('request', itemRequest, label);
+        }
+        if (itemCustomExecutorPath && itemCustomExecutorPath !== rootCustomExecutorPath) {
+            validatePath('customExecutorPath', itemCustomExecutorPath, label);
+        }
+    });
+    return warnings;
+}

package/dist/cli/checkAndUpdateConfig/utils/writeConfigFile.d.ts

@@ -29,6 +29,6 @@ interface IWriteConfigFileOptions {
  *   isUpdating: false,
  * });
  */
-export declare function writeConfigFile({ data, configPath, isUpdating, }: IWriteConfigFileOptions): Promise<void>;
+export declare function writeConfigFile({ data, configPath, isUpdating }: IWriteConfigFileOptions): Promise<void>;
 export {};
 //# sourceMappingURL=writeConfigFile.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"writeConfigFile.d.ts","sourceRoot":"","sources":["../../../../src/cli/checkAndUpdateConfig/utils/writeConfigFile.ts"],"names":[],"mappings":"AAIA,UAAU,uBAAuB;IAC7B,wBAAwB;IACxB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,gCAAgC;IAChC,UAAU,EAAE,MAAM,CAAC;IACnB,mEAAmE;IACnE,UAAU,EAAE,OAAO,CAAC;CACvB;AAED;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAsB,eAAe,CAAC,EAClC,IAAI,EACJ,UAAU,EACV,UAAU,GACb,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC,CAYzC"}
+{"version":3,"file":"writeConfigFile.d.ts","sourceRoot":"","sources":["../../../../src/cli/checkAndUpdateConfig/utils/writeConfigFile.ts"],"names":[],"mappings":"AAIA,UAAU,uBAAuB;IAC7B,wBAAwB;IACxB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,gCAAgC;IAChC,UAAU,EAAE,MAAM,CAAC;IACnB,mEAAmE;IACnE,UAAU,EAAE,OAAO,CAAC;CACvB;AAED;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAsB,eAAe,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC,CAY9G"}

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

@@ -27,7 +27,7 @@ const writeExampleConfigFile_1 = require("./writeExampleConfigFile");
  *   isUpdating: false,
  * });
  */
-async function writeConfigFile({ data, configPath, isUpdating, }) {
+async function writeConfigFile({ data, configPath, isUpdating }) {
     const preparedData = await (0, prepareConfigData_1.prepareConfigData)(data);
     if (!preparedData) {
         throw new Error('Failed to prepare configuration data for writing');

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

package/dist/cli/generateOpenApiClient/generateOpenApiClient.js

@@ -33,14 +33,13 @@ 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");
 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 Validation_1 = require("../../common/Validation");
 const AllMigrationPlans_1 = require("../../common/VersionedSchema/AllVersionedSchemas/AllMigrationPlans");
 const AllVersionedSchemas_1 = require("../../common/VersionedSchema/AllVersionedSchemas/AllVersionedSchemas");
 const UnifiedVersionedSchemas_1 = require("../../common/VersionedSchema/AllVersionedSchemas/UnifiedVersionedSchemas");
@@ -60,10 +59,10 @@ 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, {
+        const validationResult = (0, Validation_1.validateZodOptions)(schemas_1.generateOptionsSchema, {
             openapiConfig,
             ...clientOptions,
         });
@@ -73,12 +72,12 @@ 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;
         if (hasMinimumRequiredOptions) {
-            const directOptionsValidationResult = (0, validateZodOptions_1.validateZodOptions)(generateCliFlatSchema, {
+            const directOptionsValidationResult = (0, Validation_1.validateZodOptions)(generateCliFlatSchema, {
                 input: validatedOptions.input,
                 output: validatedOptions.output,
                 ...clientOptions,
@@ -89,11 +88,16 @@ 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 OpenAPI.generate({
+                ...directOptionsValidationResult.data,
+                prettierConfigPath: validatedOptions.prettierConfigPath,
+                tsconfigPath: validatedOptions.tsconfigPath,
+                eslintConfigPath: validatedOptions.eslintConfigPath,
+            });
             await Consts_1.APP_LOGGER.shutdownLoggerAsync();
-            return 0;
+            return { success: true };
         }
         const configData = (0, loadConfigIfExists_1.loadConfigIfExists)(validatedOptions.openapiConfig);
         if (!configData) {
@@ -102,7 +106,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 +124,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 +132,17 @@ 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,
+            prettierConfigPath: validatedOptions.prettierConfigPath ?? value.prettierConfigPath,
+            tsconfigPath: validatedOptions.tsconfigPath ?? value.tsconfigPath,
+            eslintConfigPath: validatedOptions.eslintConfigPath ?? value.eslintConfigPath,
         };
         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 +152,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 спецификации
@@ -69,13 +76,19 @@ program
     .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)')
+    .option('--prettierConfigPath <value>', 'Path to Prettier config file for formatting generated code')
+    .option('--tsconfigPath <value>', 'Path to project tsconfig.json for batch ESLint fix (requires --eslintConfigPath)')
+    .option('--eslintConfigPath <value>', 'Path to project ESLint config for batch ESLint fix (requires --tsconfigPath)')
+    .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 - Команда для проверки конфигурационного файла
@@ -89,7 +102,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 - Команда для обновления конфигурационного файла
@@ -103,7 +117,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 - Команда для инициализации конфигурационного файла
@@ -115,13 +130,15 @@ program
     .option('-ocn, --openapi-config <value>', 'The path to the configuration file, listing the options', Consts_1.DEFAULT_OPENAPI_CONFIG_FILENAME)
     .option('-sd, --specs-dir <value>', 'Путь до директории с файлами спецификации', './openapi')
     .option('--request <value>', 'Path to custom request file')
+    .option('--requestFormat <value>', 'Scaffold format for --request: transport | adapter | executor (default: transport)')
     .option('--useCancelableRequest', 'Use cancelled promise as returned data type in request (default: false)')
     .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 - Команда для предпросмотра изменений перед генерацией
@@ -138,7 +155,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 спецификации
@@ -180,8 +198,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/Types.d.ts

@@ -1,6 +1,8 @@
+export type RequestScaffoldFormat = 'transport' | 'executor' | 'adapter';
 export type CLITemplates = {
     config: Handlebars.TemplateDelegate;
     request: Handlebars.TemplateDelegate;
     requestExecutor: Handlebars.TemplateDelegate;
+    createExecutorAdapter: Handlebars.TemplateDelegate;
 };
 //# sourceMappingURL=Types.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Types.d.ts","sourceRoot":"","sources":["../../../src/cli/initOpenApiConfig/Types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,YAAY,GAAG;IACvB,MAAM,EAAE,UAAU,CAAC,gBAAgB,CAAC;IACpC,OAAO,EAAE,UAAU,CAAC,gBAAgB,CAAC;IACrC,eAAe,EAAE,UAAU,CAAC,gBAAgB,CAAC;CAChD,CAAC"}
+{"version":3,"file":"Types.d.ts","sourceRoot":"","sources":["../../../src/cli/initOpenApiConfig/Types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,qBAAqB,GAAG,WAAW,GAAG,UAAU,GAAG,SAAS,CAAC;AAEzE,MAAM,MAAM,YAAY,GAAG;IACvB,MAAM,EAAE,UAAU,CAAC,gBAAgB,CAAC;IACpC,OAAO,EAAE,UAAU,CAAC,gBAAgB,CAAC;IACrC,eAAe,EAAE,UAAU,CAAC,gBAAgB,CAAC;IAC7C,qBAAqB,EAAE,UAAU,CAAC,gBAAgB,CAAC;CACtD,CAAC"}

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

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

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

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

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

@@ -0,0 +1,20 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const node_assert_1 = __importDefault(require("node:assert"));
+const node_test_1 = require("node:test");
+const Consts_1 = require("../../../common/Consts");
+const init_1 = require("../init");
+(0, node_test_1.describe)('@unit: init', () => {
+    (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);
+        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.d.ts

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

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

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