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

package/dist/cli/index.js

@@ -8,11 +8,15 @@ 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 analyzeUsage_1 = require("./analyzeUsage/analyzeUsage");
 const checkConfig_1 = require("./checkAndUpdateConfig/checkConfig");
 const updateConfig_1 = require("./checkAndUpdateConfig/updateConfig");
 const generateOpenApiClient_1 = require("./generateOpenApiClient/generateOpenApiClient");
@@ -28,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 спецификации
@@ -47,6 +57,9 @@ 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')
@@ -58,13 +71,24 @@ 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('--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 - Команда для проверки конфигурационного файла
@@ -78,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 - Команда для обновления конфигурационного файла
@@ -92,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 - Команда для инициализации конфигурационного файла
@@ -104,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 - Команда для предпросмотра изменений перед генерацией
@@ -127,7 +155,69 @@ 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 спецификации
+ *
+ * @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);
+    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);
@@ -136,10 +226,11 @@ 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/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":""}

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

@@ -0,0 +1,49 @@
+"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 promises_1 = require("node:fs/promises");
+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', () => {
+    (0, node_test_1.test)('leaves existing config unchanged in non-interactive mode', async () => {
+        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, 'openapi.config.json');
+        await (0, promises_1.writeFile)(configPath, '{"input":"./x.json","output":"./out"}', 'utf8');
+        const warnMock = node_test_1.mock.method(Consts_1.APP_LOGGER, 'warn', () => undefined);
+        const infoMock = node_test_1.mock.method(Consts_1.APP_LOGGER, 'info', () => undefined);
+        const templates = (0, registerHandlebarTemplates_1.registerHandlebarTemplates)();
+        await (0, initConfig_1.initConfig)({
+            openapiConfig: configPath,
+            specsDir: dir,
+            templates,
+            useInteractiveMode: false,
+        });
+        node_assert_1.default.strictEqual(warnMock.mock.callCount(), 1);
+        node_assert_1.default.strictEqual(infoMock.mock.callCount(), 1);
+        warnMock.mock.restore();
+        infoMock.mock.restore();
+    });
+    (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)();
+        await (0, initConfig_1.initConfig)({
+            openapiConfig: configPath,
+            specsDir: (0, node_path_1.join)(dir, 'empty-specs'),
+            templates,
+            useInteractiveMode: false,
+        });
+        const written = await (0, promises_1.readFile)(configPath, 'utf8');
+        node_assert_1.default.match(written, /"input"/);
+        node_assert_1.default.match(written, /"output"/);
+    });
+});

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;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;AAOzC,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AA0B5C;;GAEG;AACH,wBAAsB,IAAI,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,gBAAgB,CAAC,CA6E3E"}

package/dist/cli/initOpenApiConfig/init.js

@@ -2,52 +2,97 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.init = init;
 const Consts_1 = require("../../common/Consts");
-const validateZodOptions_1 = require("../../common/Validation/validateZodOptions");
+const LoggerMessages_1 = require("../../common/LoggerMessages");
+const Validation_1 = require("../../common/Validation");
 const confirmDialog_1 = require("../interactive/confirmDialog");
 const schemas_1 = require("../schemas");
 const initConfig_1 = require("./initConfig");
 const initCustomRequest_1 = require("./initCustomRequest");
 const registerHandlebarTemplates_1 = require("./utils/registerHandlebarTemplates");
+function resolveHttpConfigPaths(requestPath, format) {
+    if (!requestPath || !format) {
+        return {};
+    }
+    switch (format) {
+        case 'transport':
+            return { request: requestPath };
+        case 'adapter':
+            return { customExecutorPath: requestPath };
+        case 'executor':
+            return {};
+    }
+}
 /**
  * Фнукция изначальной настройки файлов конфигурации для последующего запуска генератора
  */
 async function init(options) {
-    const validationResult = (0, validateZodOptions_1.validateZodOptions)(schemas_1.initOptionsSchema, options);
+    const validationResult = (0, Validation_1.validateZodOptions)(schemas_1.initOptionsSchema, options);
     if (!validationResult.success) {
-        Consts_1.APP_LOGGER.error(validationResult.errors.join('\n'));
-        process.exit(1);
+        Consts_1.APP_LOGGER.error(LoggerMessages_1.LOGGER_MESSAGES.ERROR.GENERIC(validationResult.errors.join('\n')));
+        await Consts_1.APP_LOGGER.shutdownLoggerAsync();
+        return { success: false, error: validationResult.errors.join('\n') };
     }
     const validatedOptions = validationResult.data;
     const templates = (0, registerHandlebarTemplates_1.registerHandlebarTemplates)();
+    let scaffoldFormat = null;
     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: генерация по шаблону!
+            scaffoldFormat = validatedOptions.request
+                ? await (0, initCustomRequest_1.initCustomRequest)({
+                    templates,
+                    useCancelableRequest: validatedOptions?.useCancelableRequest,
+                    customRequestPath: validatedOptions.request,
+                    useInteractiveMode: validatedOptions.useInteractiveMode,
+                    requestFormat: validatedOptions.requestFormat,
+                })
+                : null;
             await (0, initConfig_1.initConfig)({
                 openapiConfig: validatedOptions.openapiConfig,
-                request: validatedOptions.request,
                 specsDir: validatedOptions.specsDir,
                 templates,
+                useInteractiveMode: validatedOptions.useInteractiveMode,
+                httpConfig: resolveHttpConfigPaths(validatedOptions.request, scaffoldFormat),
             });
         }
-        const shouldInitCustomRequest = await (0, confirmDialog_1.confirmDialog)({
-            message: 'Желаете сформировать файл с пользовательским вариантом обработки запросов?',
-            initial: false,
-        });
-        if (shouldInitCustomRequest) {
-            await (0, initCustomRequest_1.initCustomRequest)(templates, validatedOptions?.useCancelableRequest);
+        else {
+            const shouldInitCustomRequest = await (0, confirmDialog_1.confirmDialog)({
+                message: 'Would you like to create a file with a custom request processing option?',
+                initial: false,
+            });
+            if (shouldInitCustomRequest) {
+                await (0, initCustomRequest_1.initCustomRequest)({
+                    templates,
+                    useCancelableRequest: validatedOptions?.useCancelableRequest,
+                    customRequestPath: validatedOptions.request,
+                    useInteractiveMode: validatedOptions.useInteractiveMode,
+                    requestFormat: validatedOptions.requestFormat,
+                });
+            }
         }
     }
     else {
+        scaffoldFormat = validatedOptions.request
+            ? await (0, initCustomRequest_1.initCustomRequest)({
+                templates,
+                useCancelableRequest: validatedOptions?.useCancelableRequest,
+                customRequestPath: validatedOptions.request,
+                useInteractiveMode: validatedOptions.useInteractiveMode,
+                requestFormat: validatedOptions.requestFormat,
+            })
+            : null;
         await (0, initConfig_1.initConfig)({
             openapiConfig: validatedOptions.openapiConfig,
             request: validatedOptions.request,
             specsDir: validatedOptions.specsDir,
             templates,
+            useInteractiveMode: validatedOptions.useInteractiveMode,
+            httpConfig: resolveHttpConfigPaths(validatedOptions.request, scaffoldFormat),
         });
-        await (0, initCustomRequest_1.initCustomRequest)(templates, validatedOptions?.useCancelableRequest);
     }
+    await Consts_1.APP_LOGGER.shutdownLoggerAsync();
+    return { success: true };
 }

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

@@ -1,7 +1,13 @@
 import { InitOptions } from '../schemas';
 import { CLITemplates } from './Types';
+type HttpConfigPaths = {
+    request?: string;
+    customExecutorPath?: string;
+};
 type InitConfigParams = Pick<InitOptions, 'openapiConfig' | 'specsDir' | 'request'> & {
     templates: CLITemplates;
+    useInteractiveMode?: boolean;
+    httpConfig?: HttpConfigPaths;
 };
 /**
  * Инициализирует файл конфигурации 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,eAAe,GAAG;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC/B,CAAC;AAEF,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;IAC7B,UAAU,CAAC,EAAE,eAAe,CAAC;CAChC,CAAC;AAEF;;GAEG;AACH,wBAAsB,UAAU,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CA+HxE"}

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,65 +44,85 @@ 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);
     let config;
     let useMultiOption = false;
     let customRequest;
+    let customExecutorPath;
     let perSpecRequest = false;
+    const hasCustomRequestPath = Boolean(params.request);
+    const httpConfig = params.httpConfig ?? {};
     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 = httpConfig.request ?? params.request;
+                customExecutorPath = httpConfig.customExecutorPath;
+            }
         }
-        config = await (0, buildConfig_1.buildConfig)(validatedSpecs, useMultiOption, customRequest, perSpecRequest);
+        config = await (0, buildConfig_1.buildConfig)(validatedSpecs, useMultiOption, { request: customRequest, customExecutorPath }, 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 = httpConfig.request ?? params.request;
+                customExecutorPath = httpConfig.customExecutorPath;
+            }
         }
         // Создаем пример конфигурации
-        config = (0, buildConfig_1.buildExampleConfig)(useMultiOption, customRequest, perSpecRequest);
+        config = (0, buildConfig_1.buildExampleConfig)(useMultiOption, { request: customRequest, customExecutorPath }, perSpecRequest);
     }
     // Записываем конфигурацию на диск
     await (0, writeConfigFile_1.writeConfigFile)(params.openapiConfig || '', config, params.templates);

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

@@ -1,3 +1,11 @@
-import { CLITemplates } from './Types';
-export declare function initCustomRequest(templates: CLITemplates, useCancelableRequest?: boolean): Promise<void>;
+import { CLITemplates, RequestScaffoldFormat } from './Types';
+type InitCustomRequestParams = {
+    templates: CLITemplates;
+    useCancelableRequest?: boolean;
+    customRequestPath?: string;
+    useInteractiveMode?: boolean;
+    requestFormat?: RequestScaffoldFormat;
+};
+export declare function initCustomRequest(params: InitCustomRequestParams): Promise<RequestScaffoldFormat | null>;
+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":"AASA,OAAO,EAAE,YAAY,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAC;AAE9D,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;IAC7B,aAAa,CAAC,EAAE,qBAAqB,CAAC;CACzC,CAAC;AA4BF,wBAAsB,iBAAiB,CAAC,MAAM,EAAE,uBAAuB,GAAG,OAAO,CAAC,qBAAqB,GAAG,IAAI,CAAC,CAwD9G"}