ts-openapi-codegen 1.0.0 → 2.0.0-beta.1

package/README.md

@@ -510,6 +510,80 @@ export function request<T>(config: TOpenAPIConfig, options: ApiRequestOptions):
 }
 ```
 
+### Custom Request Executor
+
+Starting from version 2.0.0-beta.1, generated services use the `RequestExecutor` interface instead of calling the core `request` function directly. This allows you to provide your own request implementation or adapt existing ones.
+
+**Using a custom RequestExecutor:**
+
+You can create your own `RequestExecutor` implementation:
+
+```ts
+import type { RequestExecutor, RequestConfig } from './generated/core/request-executor';
+import { SimpleService } from './generated/services/SimpleService';
+
+// Define your custom options type (optional)
+interface MyCustomOptions {
+    timeout?: number;
+    retries?: number;
+}
+
+// Create a custom executor
+const customExecutor: RequestExecutor<MyCustomOptions> = {
+    async request<TResponse>(config: RequestConfig, options?: MyCustomOptions): Promise<TResponse> {
+        // Your custom request logic here
+        const response = await fetch(config.url, {
+            method: config.method,
+            headers: config.headers,
+            body: config.body ? JSON.stringify(config.body) : undefined,
+            signal: options?.timeout ? AbortSignal.timeout(options.timeout) : undefined,
+        });
+        
+        if (!response.ok) {
+            throw new Error(`Request failed: ${response.statusText}`);
+        }
+        
+        return response.json();
+    },
+};
+
+// Use it with generated services
+const simpleService = new SimpleService<MyCustomOptions>(customExecutor);
+await simpleService.getCallWithoutParametersAndResponse({ timeout: 5000, retries: 3 });
+```
+
+**Using legacy request adapter:**
+
+If you have an existing custom `request` file (specified via `--request` option), you can use the `createLegacyExecutor` helper to adapt it to the new `RequestExecutor` interface:
+
+```ts
+import { createLegacyExecutor } from './generated/core/legacy-request-adapter';
+import { OpenAPI } from './generated/core/OpenAPI';
+import { SimpleService } from './generated/services/SimpleService';
+
+// The legacy adapter wraps your existing request function
+const executor = createLegacyExecutor(OpenAPI);
+
+// Optionally, you can map custom options to ApiRequestOptions
+interface XHROptions {
+    timeout?: number;
+}
+
+const executorWithOptions = createLegacyExecutor<XHROptions>(OpenAPI, (options) => {
+    // Map your custom options to ApiRequestOptions if needed
+    return {
+        // Add any ApiRequestOptions fields based on options
+    };
+});
+
+// Use with services
+const simpleService = new SimpleService(executor);
+await simpleService.getCallWithoutParametersAndResponse();
+```
+
+**Note:** The `--request` option still works for customizing the core `request` function. The generated 
+`legacy-request-adapter` will automatically use your custom request implementation when creating the adapter.
+
 ### Sorting strategy for function arguments `--sortByRequired`
 By default, the OpenAPI generator sorts the parameters of service functions according to a simplified scheme. If you need a more strict sorting option, then you need to use the `--sortByRequired` flag. The simplified sorting option is similar to the one used in version 0.2.3 of the OpenAPI generator. This flag allows you to upgrade to a new version of the generator if you are "stuck" on version 0.2.3.
 

package/README.rus.md

@@ -509,6 +509,79 @@ export function request<T>(config: TOpenAPIConfig, options: ApiRequestOptions):
 }
 ```
 
+### Пользовательский Request Executor
+
+Начиная с версии 2.0.0, сгенерированные сервисы используют интерфейс `RequestExecutor` вместо прямых вызовов core-функции `request`. Это позволяет вам предоставить свою собственную реализацию запросов или адаптировать существующие.
+
+**Использование пользовательского RequestExecutor:**
+
+Вы можете создать свою собственную реализацию `RequestExecutor`:
+
+```ts
+import type { RequestExecutor, RequestConfig } from './generated/core/request-executor';
+import { SimpleService } from './generated/services/SimpleService';
+
+// Определите свой тип опций (опционально)
+interface MyCustomOptions {
+    timeout?: number;
+    retries?: number;
+}
+
+// Создайте пользовательский executor
+const customExecutor: RequestExecutor<MyCustomOptions> = {
+    async request<TResponse>(config: RequestConfig, options?: MyCustomOptions): Promise<TResponse> {
+        // Ваша пользовательская логика запросов здесь
+        const response = await fetch(config.url, {
+            method: config.method,
+            headers: config.headers,
+            body: config.body ? JSON.stringify(config.body) : undefined,
+            signal: options?.timeout ? AbortSignal.timeout(options.timeout) : undefined,
+        });
+        
+        if (!response.ok) {
+            throw new Error(`Request failed: ${response.statusText}`);
+        }
+        
+        return response.json();
+    },
+};
+
+// Используйте его со сгенерированными сервисами
+const simpleService = new SimpleService<MyCustomOptions>(customExecutor);
+await simpleService.getCallWithoutParametersAndResponse({ timeout: 5000, retries: 3 });
+```
+
+**Использование legacy request adapter:**
+
+Если у вас есть существующий пользовательский файл `request` (указанный через опцию `--request`), вы можете использовать хелпер `createLegacyExecutor` для адаптации его к новому интерфейсу `RequestExecutor`:
+
+```ts
+import { createLegacyExecutor } from './generated/core/legacy-request-adapter';
+import { OpenAPI } from './generated/core/OpenAPI';
+import { SimpleService } from './generated/services/SimpleService';
+
+// Legacy адаптер оборачивает вашу существующую функцию request
+const executor = createLegacyExecutor(OpenAPI);
+
+// Опционально, вы можете мапить пользовательские опции в ApiRequestOptions
+interface XHROptions {
+    timeout?: number;
+}
+
+const executorWithOptions = createLegacyExecutor<XHROptions>(OpenAPI, (options) => {
+    // Мапьте ваши пользовательские опции в ApiRequestOptions при необходимости
+    return {
+        // Добавьте любые поля ApiRequestOptions на основе options
+    };
+});
+
+// Используйте со сервисами
+const simpleService = new SimpleService(executor);
+await simpleService.getCallWithoutParametersAndResponse();
+```
+
+**Примечание:** Опция --request по-прежнему работает для кастомизации core-функции request. Сгенерированный legacy-request-adapter автоматически будет использовать вашу пользовательскую реализацию request при создании адаптера.
+
 ### Стратегия сортировки аргументов функций `--sortByRequired`
 По умолчанию генератор OpenAPI сортирует параметры сервисных функций согласно упрощенной схеме. Если вам нужна более строгая опция сортировки, используйте флаг `--sortByRequired`. Упрощенная опция сортировки похожа на ту, что использовалась в версии 0.2.3 генератора OpenAPI. Этот флаг позволяет обновиться до новой версии генератора, если вы "застряли" на версии 0.2.3.
 

package/dist/cli/generate/runGenerateOpenApi.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runGenerateOpenApi.d.ts","sourceRoot":"","sources":["../../../src/cli/generate/runGenerateOpenApi.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAgBzC;;;GAGG;AACH,wBAAsB,kBAAkB,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAoD7E"}
+{"version":3,"file":"runGenerateOpenApi.d.ts","sourceRoot":"","sources":["../../../src/cli/generate/runGenerateOpenApi.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAYzC;;;GAGG;AACH,wBAAsB,kBAAkB,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAwC7E"}

package/dist/cli/generate/runGenerateOpenApi.js

@@ -39,13 +39,10 @@ const defaultOptions_1 = require("../../common/defaultOptions");
 const Enums_1 = require("../../common/Enums");
 const convertArrayToObject_1 = require("../../common/utils/convertArrayToObject");
 const loadConfigIfExists_1 = require("../../common/utils/loadConfigIfExists");
-const MultiOptionsMigrationPlan_1 = require("../../common/VersionedSchema/MultiOptionsVersioned/MultiOptionsMigrationPlan");
-const MultiOptionsVersionedSchemas_1 = require("../../common/VersionedSchema/MultiOptionsVersioned/MultiOptionsVersionedSchemas");
-const OptionsMigrationPlans_1 = require("../../common/VersionedSchema/OptionsVersioned/OptionsMigrationPlans");
-const OptionsVersionedSchemas_1 = require("../../common/VersionedSchema/OptionsVersioned/OptionsVersionedSchemas");
+const AllMigrationPlans_1 = require("../../common/VersionedSchema/AllVersionedSchemas/AllMigrationPlans");
+const AllVersionedSchemas_1 = require("../../common/VersionedSchema/AllVersionedSchemas/AllVersionedSchemas");
 const migrateDataToLatestSchemaVersion_1 = require("../../common/VersionedSchema/Utils/migrateDataToLatestSchemaVersion");
 const OpenAPI = __importStar(require("../../core"));
-const isInstanceOfMultiOptions_1 = require("../../core/utils/isInstanceOfMultiOptions");
 /**
  * Запускает генерацию OpenAPI клиента
  * Поддерживает как конфиг-файл, так и параметры из CLI
@@ -66,31 +63,19 @@ async function runGenerateOpenApi(options) {
             Consts_1.APP_LOGGER.error('The configuration file is missing');
         }
         const preparedOptions = (0, convertArrayToObject_1.convertArrayToObject)(configData);
-        const isMultiOptions = (0, isInstanceOfMultiOptions_1.isInstanceOfMultioptions)(preparedOptions);
-        const migratedOptions = isMultiOptions
-            ? (0, migrateDataToLatestSchemaVersion_1.migrateDataToLatestSchemaVersion)({
-                rawInput: preparedOptions,
-                migrationPlans: MultiOptionsMigrationPlan_1.multiOptionsMigrationPlan,
-                versionedSchemas: MultiOptionsVersionedSchemas_1.multiOptionsVersionedSchema,
-                migrationMode: Enums_1.EMigrationMode.GENERATE_OPENAPI,
-            })
-            : (0, migrateDataToLatestSchemaVersion_1.migrateDataToLatestSchemaVersion)({
-                rawInput: preparedOptions,
-                migrationPlans: OptionsMigrationPlans_1.optionsMigrationPlans,
-                versionedSchemas: OptionsVersionedSchemas_1.optionsVersionedSchemas,
-                migrationMode: Enums_1.EMigrationMode.GENERATE_OPENAPI,
-            });
+        // Use unified migration system for all schema types
+        const migratedOptions = (0, migrateDataToLatestSchemaVersion_1.migrateDataToLatestSchemaVersion)({
+            rawInput: preparedOptions,
+            migrationPlans: AllMigrationPlans_1.allMigrationPlans,
+            versionedSchemas: AllVersionedSchemas_1.allVersionedSchemas,
+            migrationMode: Enums_1.EMigrationMode.GENERATE_OPENAPI,
+        });
         if (!migratedOptions) {
             Consts_1.APP_LOGGER.error("Couldn't convert the set of options to the current version");
         }
         else {
             const { value } = migratedOptions;
-            if (isMultiOptions) {
-                await OpenAPI.generate(value);
-            }
-            else {
-                await OpenAPI.generate(value);
-            }
+            await OpenAPI.generate(value);
         }
         process.exit(0);
     }

package/dist/common/Consts.d.ts

@@ -1,25 +1,6 @@
-import { HttpClient } from '../core';
-import { ELogLevel, ELogOutput } from './Enums';
 import { Logger } from './Logger';
+import { TStrictFlatOptions } from './TRawOptions';
 export declare const DEFAULT_OPENAPI_CONFIG_FILENAME = "openapi.config.json";
-export declare const COMMON_DEFAULT_OPTIONS_VALUES: {
-    outputCore: string;
-    outputServices: string;
-    outputModels: string;
-    outputSchemas: string;
-    httpClient: HttpClient;
-    useOptions: boolean;
-    useUnionTypes: boolean;
-    excludeCoreServiceFiles: boolean;
-    includeSchemasFiles: boolean;
-    interfacePrefix: string;
-    enumPrefix: string;
-    typePrefix: string;
-    useCancelableRequest: boolean;
-    logLevel: ELogLevel;
-    logTarget: ELogOutput;
-    sortByRequired: boolean;
-    useSeparatedIndexes: boolean;
-};
+export declare const COMMON_DEFAULT_OPTIONS_VALUES: TStrictFlatOptions;
 export declare const APP_LOGGER: Logger;
 //# sourceMappingURL=Consts.d.ts.map

package/dist/common/Consts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Consts.d.ts","sourceRoot":"","sources":["../../src/common/Consts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,eAAO,MAAM,+BAA+B,wBAAwB,CAAC;AAErE,eAAO,MAAM,6BAA6B;;;;;;;;;;;;;;;;;;CAkBzC,CAAC;AAEF,eAAO,MAAM,UAAU,QAIrB,CAAC"}
+{"version":3,"file":"Consts.d.ts","sourceRoot":"","sources":["../../src/common/Consts.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAEnD,eAAO,MAAM,+BAA+B,wBAAwB,CAAC;AAErE,eAAO,MAAM,6BAA6B,EAAE,kBAqB3C,CAAC;AAEF,eAAO,MAAM,UAAU,QAIrB,CAAC"}

package/dist/common/Consts.js

@@ -1,20 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.APP_LOGGER = exports.COMMON_DEFAULT_OPTIONS_VALUES = exports.DEFAULT_OPENAPI_CONFIG_FILENAME = void 0;
-const core_1 = require("../core");
+const HttpClient_enum_1 = require("../core/types/enums/HttpClient.enum");
 const Enums_1 = require("./Enums");
 const Logger_1 = require("./Logger");
 exports.DEFAULT_OPENAPI_CONFIG_FILENAME = 'openapi.config.json';
 exports.COMMON_DEFAULT_OPTIONS_VALUES = {
+    input: '',
+    output: '',
     outputCore: '',
     outputServices: '',
     outputModels: '',
     outputSchemas: '',
-    httpClient: core_1.HttpClient.FETCH,
+    httpClient: HttpClient_enum_1.HttpClient.FETCH,
     useOptions: false,
     useUnionTypes: false,
     excludeCoreServiceFiles: false,
     includeSchemasFiles: false,
+    request: '',
     interfacePrefix: 'I',
     enumPrefix: 'E',
     typePrefix: 'T',

package/dist/common/Logger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Logger.d.ts","sourceRoot":"","sources":["../../src/common/Logger.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAGhD,UAAU,aAAa;IACnB,6DAA6D;IAC7D,UAAU,EAAE,MAAM,CAAC;IACnB,gCAAgC;IAChC,KAAK,EAAE,SAAS,CAAC;IACjB,0CAA0C;IAC1C,SAAS,EAAE,UAAU,CAAC;IACtB,mDAAmD;IACnD,sDAAsD;IACtD,MAAM,CAAC,EAAE;QACL,6CAA6C;QAC7C,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,+CAA+C;QAC/C,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,uDAAuD;QACvD,QAAQ,CAAC,EAAE,MAAM,CAAC;KACrB,CAAC;CACL;AAED,qBAAa,MAAM;IACf,OAAO,CAAC,OAAO,CAAgB;IAC/B,OAAO,CAAC,aAAa,CAAY;IACjC,OAAO,CAAC,WAAW,CAAS;gBAEhB,OAAO,EAAE,aAAa;IA6C3B,QAAQ,CAAC,KAAK,EAAE,SAAS;IAKzB,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,GAAG;IAKlC,IAAI,CAAC,OAAO,EAAE,MAAM;IAIpB,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,OAAO;IAO5C,SAAS,CAAC,OAAO,EAAE,MAAM;IAOzB,cAAc,IAAI,IAAI;CAahC"}
+{"version":3,"file":"Logger.d.ts","sourceRoot":"","sources":["../../src/common/Logger.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAIhD,UAAU,aAAa;IACnB,6DAA6D;IAC7D,UAAU,EAAE,MAAM,CAAC;IACnB,gCAAgC;IAChC,KAAK,EAAE,SAAS,CAAC;IACjB,0CAA0C;IAC1C,SAAS,EAAE,UAAU,CAAC;IACtB,mDAAmD;IACnD,sDAAsD;IACtD,MAAM,CAAC,EAAE;QACL,6CAA6C;QAC7C,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,+CAA+C;QAC/C,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,uDAAuD;QACvD,QAAQ,CAAC,EAAE,MAAM,CAAC;KACrB,CAAC;CACL;AAED,qBAAa,MAAM;IACf,OAAO,CAAC,OAAO,CAAgB;IAC/B,OAAO,CAAC,aAAa,CAAY;IACjC,OAAO,CAAC,WAAW,CAAS;gBAEhB,OAAO,EAAE,aAAa;IA6C3B,QAAQ,CAAC,KAAK,EAAE,SAAS;IAKzB,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,GAAG;IAKlC,IAAI,CAAC,OAAO,EAAE,MAAM;IAIpB,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,OAAO;IAO5C,SAAS,CAAC,OAAO,EAAE,MAAM;IAOzB,cAAc,IAAI,IAAI;CAahC"}

package/dist/common/Logger.js

@@ -7,6 +7,7 @@ exports.Logger = void 0;
 const winston_1 = require("winston");
 const winston_daily_rotate_file_1 = __importDefault(require("winston-daily-rotate-file"));
 const Enums_1 = require("./Enums");
+const LoggerMessages_1 = require("./LoggerMessages");
 const pathHelpers_1 = require("./utils/pathHelpers");
 class Logger {
     _logger;
@@ -49,7 +50,7 @@ class Logger {
         this._logger.level = level;
     }
     error(message, error) {
-        this._logger.error(`Error: ${message}`, error);
+        this._logger.error(`${LoggerMessages_1.LOGGER_MESSAGES.ERROR.PREFIX} ${message}`, error);
         process.exit(1);
     }
     warn(message) {
@@ -58,7 +59,7 @@ class Logger {
     info(message, hasSeparator) {
         this._logger.info(message);
         if (hasSeparator) {
-            this._logger.info('==========================================');
+            this._logger.info(LoggerMessages_1.LOGGER_MESSAGES.SEPARATOR);
         }
     }
     forceInfo(message) {

package/dist/common/LoggerMessages.d.ts

@@ -0,0 +1,64 @@
+/**
+ * Константы с текстовыми сообщениями для Logger
+ * Все тексты для логирования должны быть вынесены сюда для централизованного управления
+ */
+export declare const LOGGER_MESSAGES: {
+    readonly GENERATION: {
+        readonly STARTED: (count: number) => string;
+        readonly FINISHED: "Generation has been finished";
+        readonly FINISHED_WITH_DURATION: (duration: string) => string;
+        readonly DURATION_FOR_FILE: (file: string, duration: string) => string;
+        readonly NO_OPTIONS: "No options provided for generation";
+    };
+    readonly OPENAPI: {
+        readonly DEFINING_VERSION: "Defining the version of the openapi specification (2 or 3)";
+        readonly WRITING_V2: "Write our OpenAPI client version 2 to disk.";
+        readonly WRITING_V3: "Write our OpenAPI client version 3 to disk.";
+    };
+    readonly FILES: {
+        readonly CORE_RECORDING_STARTED: "The recording of the kernel files begins";
+        readonly CORE_RECORDING_COMPLETED: "The writing of the kernel files has been completed successfully";
+        readonly SERVICES_RECORDING_STARTED: "Recording of service files begins";
+        readonly SERVICES_RECORDING_COMPLETED: "Service file recording completed successfully";
+        readonly SERVICE_FILE_STARTED: (file: string) => string;
+        readonly SERVICE_FILE_COMPLETED: (file: string) => string;
+        readonly MODELS_RECORDING_STARTED: "Recording of model files begins";
+        readonly MODELS_RECORDING_COMPLETED: "Model file recording completed successfully";
+        readonly MODEL_FILE_STARTED: (file: string) => string;
+        readonly MODEL_FILE_COMPLETED: (file: string) => string;
+        readonly MODEL_DIRECTORY_CREATING: (directory: string) => string;
+        readonly SCHEMAS_RECORDING_STARTED: "The recording of model validation schema files begins.";
+        readonly SCHEMAS_RECORDING_COMPLETED: "The recording of model validation schema files has been completed successfully";
+        readonly SCHEMA_FILE_STARTED: (file: string) => string;
+        readonly SCHEMA_FILE_COMPLETED: (file: string) => string;
+        readonly SCHEMA_DIRECTORY_CREATING: (directory: string) => string;
+        readonly INDEX_DATA_WRITTEN: (filePath: string) => string;
+        readonly INDEX_WRITING_COMPLETED: (filePath: string) => string;
+        readonly SIMPLE_INDEX_STARTED: (filePath: string) => string;
+        readonly SIMPLE_INDEX_COMPLETED: (filePath: string) => string;
+    };
+    readonly UPDATE_NOTIFIER: {
+        readonly MISSING_PARAMS: (packageName: string, packageVersion: string) => string;
+        readonly STORE_NOT_CREATED: "The settings store has not been created. The package update will be checked more often than once every 1 week!";
+        readonly CANT_GET_VERSION: "Couldn't get information about the latest current version";
+    };
+    readonly TEMPLATES: {
+        readonly PRECOMPILATION_SUCCESS: "The templates have been successfully precompiled and saved!";
+        readonly PRECOMPILATION_ERROR: (error: string) => string;
+    };
+    readonly CONFIG: {
+        readonly FILE_RECORDING_COMPLETED: (file: string) => string;
+        readonly FILE_ALREADY_EXISTS: (fileName: string) => string;
+        readonly FILE_MISSING: "The configuration file is missing";
+        readonly CONVERSION_FAILED: "Couldn't convert the set of options to the current version";
+        readonly FILE_UPDATED: (configPath: string) => string;
+        readonly ACTION_SKIPPED: "Action skipped.";
+        readonly UNKNOWN_ACTION: (action: string) => string;
+    };
+    readonly ERROR: {
+        readonly PREFIX: "Error:";
+        readonly GENERIC: (message: string) => string;
+    };
+    readonly SEPARATOR: "==========================================";
+};
+//# sourceMappingURL=LoggerMessages.d.ts.map

package/dist/common/LoggerMessages.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"LoggerMessages.d.ts","sourceRoot":"","sources":["../../src/common/LoggerMessages.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,eAAO,MAAM,eAAe;;kCAGH,MAAM;;oDAEY,MAAM;2CACf,MAAM,YAAY,MAAM;;;;;;;;;;;;;8CAoBrB,MAAM;gDACJ,MAAM;;;4CAKV,MAAM;8CACJ,MAAM;uDACG,MAAM;;;6CAKhB,MAAM;+CACJ,MAAM;wDACG,MAAM;gDAGd,MAAM;qDACD,MAAM;kDACT,MAAM;oDACJ,MAAM;;;+CAKX,MAAM,kBAAkB,MAAM;;;;;;+CAW9B,MAAM;;;kDAKH,MAAM;iDACP,MAAM;;;4CAGX,MAAM;;0CAER,MAAM;;;;oCAMZ,MAAM;;;CAKvB,CAAC"}

package/dist/common/LoggerMessages.js

@@ -0,0 +1,82 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LOGGER_MESSAGES = void 0;
+/**
+ * Константы с текстовыми сообщениями для Logger
+ * Все тексты для логирования должны быть вынесены сюда для централизованного управления
+ */
+exports.LOGGER_MESSAGES = {
+    // ========== Generation Messages (OpenApiClient) ==========
+    GENERATION: {
+        STARTED: (count) => `Generation has begun. Total number of specification files: ${count}`,
+        FINISHED: 'Generation has been finished',
+        FINISHED_WITH_DURATION: (duration) => `Generation completed in ${duration} ms`,
+        DURATION_FOR_FILE: (file, duration) => `Duration for "${file}": ${duration} sec`,
+        NO_OPTIONS: 'No options provided for generation',
+    },
+    // ========== OpenAPI Specification Messages ==========
+    OPENAPI: {
+        DEFINING_VERSION: 'Defining the version of the openapi specification (2 or 3)',
+        WRITING_V2: 'Write our OpenAPI client version 2 to disk.',
+        WRITING_V3: 'Write our OpenAPI client version 3 to disk.',
+    },
+    // ========== File Writing Messages (WriteClient) ==========
+    FILES: {
+        // Core files
+        CORE_RECORDING_STARTED: 'The recording of the kernel files begins',
+        CORE_RECORDING_COMPLETED: 'The writing of the kernel files has been completed successfully',
+        // Service files
+        SERVICES_RECORDING_STARTED: 'Recording of service files begins',
+        SERVICES_RECORDING_COMPLETED: 'Service file recording completed successfully',
+        SERVICE_FILE_STARTED: (file) => `The recording of the file data begins: ${file}`,
+        SERVICE_FILE_COMPLETED: (file) => `File recording completed: ${file}`,
+        // Model files
+        MODELS_RECORDING_STARTED: 'Recording of model files begins',
+        MODELS_RECORDING_COMPLETED: 'Model file recording completed successfully',
+        MODEL_FILE_STARTED: (file) => `The recording of the file data begins: ${file}`,
+        MODEL_FILE_COMPLETED: (file) => `File recording completed: ${file}`,
+        MODEL_DIRECTORY_CREATING: (directory) => `A directory is being created: ${directory}`,
+        // Schema files
+        SCHEMAS_RECORDING_STARTED: 'The recording of model validation schema files begins.',
+        SCHEMAS_RECORDING_COMPLETED: 'The recording of model validation schema files has been completed successfully',
+        SCHEMA_FILE_STARTED: (file) => `The recording of the file data begins: ${file}`,
+        SCHEMA_FILE_COMPLETED: (file) => `File recording completed: ${file}`,
+        SCHEMA_DIRECTORY_CREATING: (directory) => `A directory is being created: ${directory}`,
+        // Index files
+        INDEX_DATA_WRITTEN: (filePath) => `Data has been written to a file: ${filePath}`,
+        INDEX_WRITING_COMPLETED: (filePath) => `Writing to the file is completed: ${filePath}`,
+        SIMPLE_INDEX_STARTED: (filePath) => `The recording of the file data begins: ${filePath}`,
+        SIMPLE_INDEX_COMPLETED: (filePath) => `File recording completed: ${filePath}`,
+    },
+    // ========== Update Notifier Messages ==========
+    UPDATE_NOTIFIER: {
+        MISSING_PARAMS: (packageName, packageVersion) => `
+            The necessary parameters for checking the version are not specified.
+            Current values packageName: ${packageName}, packageVersion: ${packageVersion}
+        `,
+        STORE_NOT_CREATED: 'The settings store has not been created. The package update will be checked more often than once every 1 week!',
+        CANT_GET_VERSION: "Couldn't get information about the latest current version",
+    },
+    // ========== Template Precompilation Messages ==========
+    TEMPLATES: {
+        PRECOMPILATION_SUCCESS: 'The templates have been successfully precompiled and saved!',
+        PRECOMPILATION_ERROR: (error) => `Error during pre-compilation of templates: ${error}`,
+    },
+    // ========== Config Messages (CLI) ==========
+    CONFIG: {
+        FILE_RECORDING_COMPLETED: (file) => `File recording completed: ${file}`,
+        FILE_ALREADY_EXISTS: (fileName) => `The configuration file already exists: ${fileName}`,
+        FILE_MISSING: 'The configuration file is missing',
+        CONVERSION_FAILED: "Couldn't convert the set of options to the current version",
+        FILE_UPDATED: (configPath) => `Configuration file "${configPath}" has been updated`,
+        ACTION_SKIPPED: 'Action skipped.',
+        UNKNOWN_ACTION: (action) => `Unknown action: ${action}`,
+    },
+    // ========== Error Messages ==========
+    ERROR: {
+        PREFIX: 'Error:',
+        GENERIC: (message) => message,
+    },
+    // ========== Separator ==========
+    SEPARATOR: '==========================================',
+};

package/dist/common/TRawOptions.d.ts

@@ -0,0 +1,40 @@
+import { HttpClient } from '../core/types/enums/HttpClient.enum';
+import { ELogLevel, ELogOutput } from './Enums';
+type TItemConfig = {
+    input: string;
+    output: string;
+    outputCore?: string;
+    outputServices?: string;
+    outputModels?: string;
+    outputSchemas?: string;
+    request?: string;
+};
+export type TRawOptions = {
+    items?: TItemConfig[];
+    input?: string;
+    output?: string;
+    outputCore?: string;
+    outputServices?: string;
+    outputModels?: string;
+    outputSchemas?: string;
+    httpClient?: HttpClient;
+    useOptions?: boolean;
+    useUnionTypes?: boolean;
+    excludeCoreServiceFiles?: boolean;
+    includeSchemasFiles?: boolean;
+    request?: string;
+    interfacePrefix?: string;
+    enumPrefix?: string;
+    typePrefix?: string;
+    useCancelableRequest?: boolean;
+    logLevel?: ELogLevel;
+    logTarget?: ELogOutput;
+    sortByRequired?: boolean;
+    useSeparatedIndexes?: boolean;
+};
+export type TFlatOptions = Omit<TRawOptions, 'items'>;
+export type TStrictFlatOptions = {
+    [P in keyof TFlatOptions]-?: NonNullable<TFlatOptions[P]>;
+};
+export {};
+//# sourceMappingURL=TRawOptions.d.ts.map

package/dist/common/TRawOptions.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"TRawOptions.d.ts","sourceRoot":"","sources":["../../src/common/TRawOptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAEhD,KAAK,WAAW,GAAG;IACf,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACtB,KAAK,CAAC,EAAE,WAAW,EAAE,CAAC;IACtB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,QAAQ,CAAC,EAAE,SAAS,CAAC;IACrB,SAAS,CAAC,EAAE,UAAU,CAAC;IACvB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,mBAAmB,CAAC,EAAE,OAAO,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;AAEtD,MAAM,MAAM,kBAAkB,GAAG;KAC5B,CAAC,IAAI,MAAM,YAAY,CAAC,CAAC,GAAG,WAAW,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;CAC5D,CAAC"}

package/dist/common/VersionedSchema/AllVersionedSchemas/AllMigrationPlans.d.ts

@@ -0,0 +1,8 @@
+import { SchemaMigrationPlan } from '../Types';
+/**
+ * Unified migration plan that includes all migrations from all schema types.
+ * Migrates from any old version to the latest UNIFIED_v1 schema.
+ * Reuses existing migration plans to avoid code duplication.
+ */
+export declare const allMigrationPlans: SchemaMigrationPlan<Record<string, any>, Record<string, any>>[];
+//# sourceMappingURL=AllMigrationPlans.d.ts.map

package/dist/common/VersionedSchema/AllVersionedSchemas/AllMigrationPlans.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"AllMigrationPlans.d.ts","sourceRoot":"","sources":["../../../../src/common/VersionedSchema/AllVersionedSchemas/AllMigrationPlans.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAc/C;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,EAAE,mBAAmB,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,EAY5F,CAAC"}

package/dist/common/VersionedSchema/AllVersionedSchemas/AllMigrationPlans.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.allMigrationPlans = void 0;
+const MultiOptionsMigrationPlan_1 = require("../MultiOptionsVersioned/MultiOptionsMigrationPlan");
+const OptionsMigrationPlans_1 = require("../OptionsVersioned/OptionsMigrationPlans");
+const createTrivialMigration_1 = require("../Utils/createTrivialMigration");
+/**
+ * Adds a prefix to all version strings in a migration plan array.
+ */
+function addVersionPrefixToMigrationPlans(plans, prefix) {
+    return plans.map(plan => ({
+        ...plan,
+        fromVersion: `${prefix}_${plan.fromVersion}`,
+        toVersion: `${prefix}_${plan.toVersion}`,
+    }));
+}
+/**
+ * Unified migration plan that includes all migrations from all schema types.
+ * Migrates from any old version to the latest UNIFIED_v1 schema.
+ * Reuses existing migration plans to avoid code duplication.
+ */
+exports.allMigrationPlans = [
+    // ===== OPTIONS migrations (with prefix) =====
+    ...addVersionPrefixToMigrationPlans(OptionsMigrationPlans_1.optionsMigrationPlans, 'OPTIONS'),
+    // Migration from OPTIONS v4 to UNIFIED v1
+    (0, createTrivialMigration_1.createTrivialMigration)('OPTIONS_v4', 'UNIFIED_v1', 'Migrate from OPTIONS to UNIFIED schema'),
+    // ===== MULTI_OPTIONS migrations (with prefix) =====
+    ...addVersionPrefixToMigrationPlans(MultiOptionsMigrationPlan_1.multiOptionsMigrationPlan, 'MULTI_OPTIONS'),
+    // Migration from MULTI_OPTIONS v5 to UNIFIED v1
+    (0, createTrivialMigration_1.createTrivialMigration)('MULTI_OPTIONS_v5', 'UNIFIED_v1', 'Migrate from MULTI_OPTIONS to UNIFIED schema'),
+];

package/dist/common/VersionedSchema/AllVersionedSchemas/AllVersionedSchemas.d.ts

@@ -0,0 +1,8 @@
+import { VersionedSchema } from '../Types';
+/**
+ * Unified array of all versioned schemas with prefixed versions.
+ * This allows migration from any old schema version to the latest unified schema.
+ * Reuses existing schema arrays to avoid code duplication.
+ */
+export declare const allVersionedSchemas: VersionedSchema<Record<string, any>>[];
+//# sourceMappingURL=AllVersionedSchemas.d.ts.map

package/dist/common/VersionedSchema/AllVersionedSchemas/AllVersionedSchemas.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"AllVersionedSchemas.d.ts","sourceRoot":"","sources":["../../../../src/common/VersionedSchema/AllVersionedSchemas/AllVersionedSchemas.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAgB3C;;;;GAIG;AACH,eAAO,MAAM,mBAAmB,EAAE,eAAe,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,EAarE,CAAC"}

package/dist/common/VersionedSchema/AllVersionedSchemas/AllVersionedSchemas.js

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.allVersionedSchemas = void 0;
+const Enums_1 = require("../Enums");
+const MultiOptionsVersionedSchemas_1 = require("../MultiOptionsVersioned/MultiOptionsVersionedSchemas");
+const OptionsVersionedSchemas_1 = require("../OptionsVersioned/OptionsVersionedSchemas");
+const UnifiedOptionsSchemaV1_1 = require("../UnifiedOptionsVersioned/UnifiedOptionsSchemaV1");
+/**
+ * Adds a prefix to all version strings in a versioned schema array.
+ */
+function addVersionPrefix(schemas, prefix) {
+    return schemas.map(schema => ({
+        ...schema,
+        version: `${prefix}_${schema.version}`,
+    }));
+}
+/**
+ * Unified array of all versioned schemas with prefixed versions.
+ * This allows migration from any old schema version to the latest unified schema.
+ * Reuses existing schema arrays to avoid code duplication.
+ */
+exports.allVersionedSchemas = [
+    // OPTIONS schemas with prefix
+    ...addVersionPrefix(OptionsVersionedSchemas_1.optionsVersionedSchemas, 'OPTIONS'),
+    // MULTI_OPTIONS schemas with prefix
+    ...addVersionPrefix(MultiOptionsVersionedSchemas_1.multiOptionsVersionedSchema, 'MULTI_OPTIONS'),
+    // UNIFIED_OPTIONS schemas (latest)
+    {
+        version: 'UNIFIED_v1',
+        schema: UnifiedOptionsSchemaV1_1.unifiedOptionsSchemaV1,
+        type: Enums_1.EVersionedSchemaType.UNIFIED_OPTIONS,
+    },
+];

package/dist/common/VersionedSchema/Enums.d.ts

@@ -1,5 +1,6 @@
 export declare enum EVersionedSchemaType {
     OPTIONS = "OPTIONS",
-    MULTI_OPTIONS = "MULTI_OPTIONS"
+    MULTI_OPTIONS = "MULTI_OPTIONS",
+    UNIFIED_OPTIONS = "UNIFIED_OPTIONS"
 }
 //# sourceMappingURL=Enums.d.ts.map

package/dist/common/VersionedSchema/Enums.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Enums.d.ts","sourceRoot":"","sources":["../../../src/common/VersionedSchema/Enums.ts"],"names":[],"mappings":"AAAA,oBAAY,oBAAoB;IAC5B,OAAO,YAAY;IACnB,aAAa,kBAAkB;CAClC"}
+{"version":3,"file":"Enums.d.ts","sourceRoot":"","sources":["../../../src/common/VersionedSchema/Enums.ts"],"names":[],"mappings":"AAAA,oBAAY,oBAAoB;IAC5B,OAAO,YAAY;IACnB,aAAa,kBAAkB;IAC/B,eAAe,oBAAoB;CACtC"}

package/dist/common/VersionedSchema/Enums.js

@@ -5,4 +5,5 @@ var EVersionedSchemaType;
 (function (EVersionedSchemaType) {
     EVersionedSchemaType["OPTIONS"] = "OPTIONS";
     EVersionedSchemaType["MULTI_OPTIONS"] = "MULTI_OPTIONS";
+    EVersionedSchemaType["UNIFIED_OPTIONS"] = "UNIFIED_OPTIONS";
 })(EVersionedSchemaType || (exports.EVersionedSchemaType = EVersionedSchemaType = {}));

package/dist/common/VersionedSchema/MultiOptionsVersioned/MultiOptionsMigrationPlan.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MultiOptionsMigrationPlan.d.ts","sourceRoot":"","sources":["../../../../src/common/VersionedSchema/MultiOptionsVersioned/MultiOptionsMigrationPlan.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAE/C;;GAEG;AACH,eAAO,MAAM,yBAAyB,EAAE,mBAAmB,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,EAoCpG,CAAC"}
+{"version":3,"file":"MultiOptionsMigrationPlan.d.ts","sourceRoot":"","sources":["../../../../src/common/VersionedSchema/MultiOptionsVersioned/MultiOptionsMigrationPlan.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAG/C;;GAEG;AACH,eAAO,MAAM,yBAAyB,EAAE,mBAAmB,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,EA0BpG,CAAC"}