ts-openapi-codegen 2.0.0-beta.8 → 2.0.0-beta.9

package/dist/common/Consts.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DEFAULT_OUTPUT_API_DIR = exports.DEFAULT_CUSTOM_REQUEST_PATH = exports.DEFAULT_SPECS_DIR = exports.APP_LOGGER = exports.COMMON_DEFAULT_OPTIONS_VALUES = exports.DEFAULT_OPENAPI_CONFIG_FILENAME = void 0;
+exports.DEFAULT_DIFF_CHANGES_DIR = exports.DEFAULT_PREVIEW_CHANGES_DIR = exports.DEFAULT_OUTPUT_API_DIR = exports.DEFAULT_CUSTOM_REQUEST_PATH = exports.DEFAULT_SPECS_DIR = exports.APP_LOGGER = exports.COMMON_DEFAULT_OPTIONS_VALUES = exports.DEFAULT_OPENAPI_CONFIG_FILENAME = void 0;
 const HttpClient_enum_1 = require("../core/types/enums/HttpClient.enum");
 const ValidationLibrary_enum_1 = require("../core/types/enums/ValidationLibrary.enum");
 const Enums_1 = require("./Enums");
@@ -16,6 +16,7 @@ exports.COMMON_DEFAULT_OPTIONS_VALUES = {
     httpClient: HttpClient_enum_1.HttpClient.FETCH,
     useOptions: false,
     useUnionTypes: false,
+    includeSchemasFiles: false,
     excludeCoreServiceFiles: false,
     request: '',
     interfacePrefix: 'I',
@@ -36,3 +37,5 @@ exports.APP_LOGGER = new Logger_1.Logger({
 exports.DEFAULT_SPECS_DIR = 'openapi/';
 exports.DEFAULT_CUSTOM_REQUEST_PATH = './src/custom/request.ts';
 exports.DEFAULT_OUTPUT_API_DIR = './generated';
+exports.DEFAULT_PREVIEW_CHANGES_DIR = './.ts-openapi-codegen-preview-changes';
+exports.DEFAULT_DIFF_CHANGES_DIR = './.ts-openapi-codegen-diff-changes';

package/dist/common/LoggerMessages.js

@@ -10,7 +10,7 @@ exports.LOGGER_MESSAGES = {
     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`,
+        FINISHED_WITH_DURATION: (duration) => `Generation completed in ${duration} sec`,
         DURATION_FOR_FILE: (file, duration) => `Duration for "${file}": ${duration} sec`,
         NO_OPTIONS: 'No options provided for generation',
     },

package/dist/common/TRawOptions.d.ts

@@ -1,5 +1,5 @@
 import { z } from 'zod';
-import { flatOptionsSchema, rawOptionsSchema } from "./schemas/configSchemas";
+import { flatOptionsSchema, rawOptionsSchema } from './VersionedSchema/AllVersionedSchemas/UnifiedVersionedSchemas';
 export type TRawOptions = z.infer<typeof rawOptionsSchema>;
 export type TFlatOptions = z.infer<typeof flatOptionsSchema>;
 export type TStrictFlatOptions = {

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

@@ -1 +1 @@
-{"version":3,"file":"TRawOptions.d.ts","sourceRoot":"","sources":["../../src/common/TRawOptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAE9E,MAAM,MAAM,WAAW,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,gBAAgB,CAAC,CAAC;AAE3D,MAAM,MAAM,YAAY,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAE7D,MAAM,MAAM,kBAAkB,GAAG;KAC5B,CAAC,IAAI,MAAM,YAAY,CAAC,CAAC,GAAG,WAAW,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;CAC5D,CAAC"}
+{"version":3,"file":"TRawOptions.d.ts","sourceRoot":"","sources":["../../src/common/TRawOptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,iBAAiB,EAAC,gBAAgB,EAAE,MAAM,+DAA+D,CAAC;AAEnH,MAAM,MAAM,WAAW,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,gBAAgB,CAAC,CAAC;AAE3D,MAAM,MAAM,YAAY,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAE7D,MAAM,MAAM,kBAAkB,GAAG;KAC5B,CAAC,IAAI,MAAM,YAAY,CAAC,CAAC,GAAG,WAAW,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;CAC5D,CAAC"}

package/dist/common/Validation/formatZodError.d.ts

@@ -0,0 +1,10 @@
+import { ZodError } from 'zod';
+/**
+ * Форматирует Zod ошибку в читаемое сообщение для CLI
+ */
+export declare function formatZodError(error: ZodError): string[];
+/**
+ * Форматирует путь к полю в читаемый формат
+ */
+export declare function formatZodPath(path: (string | number | symbol)[]): string;
+//# sourceMappingURL=formatZodError.d.ts.map

package/dist/common/Validation/formatZodError.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"formatZodError.d.ts","sourceRoot":"","sources":["../../../src/common/Validation/formatZodError.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,KAAK,CAAC;AAE/B;;GAEG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,QAAQ,GAAG,MAAM,EAAE,CAYxD;AAkFD;;GAEG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC,EAAE,GAAG,MAAM,CA2BxE"}

package/dist/{cli/validation/errorFormatter.js → common/Validation/formatZodError.js}

@@ -1,24 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.formatZodErrorForCLI = formatZodErrorForCLI;
+exports.formatZodError = formatZodError;
+exports.formatZodPath = formatZodPath;
 /**
  * Форматирует Zod ошибку в читаемое сообщение для CLI
  */
-function formatZodErrorForCLI(error) {
+function formatZodError(error) {
     if (!error || error.issues.length === 0) {
-        return 'Validation error occurred';
+        return [];
     }
     const messages = [];
     for (const issue of error.issues) {
-        messages.push(formatIssue(issue));
+        messages.push(formatZodIssue(issue));
     }
-    return messages.join('\n');
+    return messages;
 }
 /**
  * Форматирует отдельную Zod issue в читаемое сообщение
  */
-function formatIssue(issue) {
-    const path = formatPath(issue.path);
+function formatZodIssue(issue) {
+    const path = formatZodPath(issue.path);
     const message = issue.message;
     // Если issue имеет кастомное сообщение, используем его
     if (issue.code === 'custom') {
@@ -27,7 +28,7 @@ function formatIssue(issue) {
     // Форматируем стандартные ошибки с использованием type guards
     if (issue.code === 'invalid_type') {
         if ('received' in issue && issue.received === 'undefined') {
-            const fieldName = formatPath(issue.path).replace(/^--/, '');
+            const fieldName = formatZodPath(issue.path).replace(/^--/, '');
             return `${path}: "${fieldName}" is required`;
         }
         if ('expected' in issue && 'received' in issue) {
@@ -35,7 +36,7 @@ function formatIssue(issue) {
         }
     }
     if (issue.code === 'invalid_format' && 'format' in issue) {
-        const fieldName = formatPath(issue.path).replace(/^--/, '');
+        const fieldName = formatZodPath(issue.path).replace(/^--/, '');
         const format = issue.format;
         if (format === 'email') {
             return `${path}: "${fieldName}" must be a valid email`;
@@ -46,7 +47,7 @@ function formatIssue(issue) {
         return `${path}: "${fieldName}" has invalid format: ${format}`;
     }
     if (issue.code === 'too_small' && 'minimum' in issue && 'type' in issue) {
-        const fieldName = formatPath(issue.path).replace(/^--/, '');
+        const fieldName = formatZodPath(issue.path).replace(/^--/, '');
         const type = issue.type;
         const minimum = issue.minimum;
         if (type === 'string') {
@@ -60,7 +61,7 @@ function formatIssue(issue) {
         }
     }
     if (issue.code === 'too_big' && 'maximum' in issue && 'type' in issue) {
-        const fieldName = formatPath(issue.path).replace(/^--/, '');
+        const fieldName = formatZodPath(issue.path).replace(/^--/, '');
         const type = issue.type;
         const maximum = issue.maximum;
         if (type === 'string') {
@@ -74,7 +75,7 @@ function formatIssue(issue) {
         }
     }
     if (issue.code === 'invalid_value') {
-        const fieldName = formatPath(issue.path).replace(/^--/, '');
+        const fieldName = formatZodPath(issue.path).replace(/^--/, '');
         return `${path}: "${fieldName}" has invalid value`;
     }
     if (issue.code === 'unrecognized_keys' && 'keys' in issue) {
@@ -86,7 +87,7 @@ function formatIssue(issue) {
 /**
  * Форматирует путь к полю в читаемый формат
  */
-function formatPath(path) {
+function formatZodPath(path) {
     if (path.length === 0) {
         return 'root';
     }

package/dist/common/Validation/index.d.ts

@@ -0,0 +1,3 @@
+export * from './formatZodError';
+export * from './validateZodOptions';
+//# sourceMappingURL=index.d.ts.map

package/dist/common/Validation/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/common/Validation/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC;AACjC,cAAc,sBAAsB,CAAC"}

package/dist/{cli/validation → common/Validation}/index.js

@@ -14,5 +14,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./errorFormatter"), exports);
-__exportStar(require("./validateCLIOptions"), exports);
+__exportStar(require("./formatZodError"), exports);
+__exportStar(require("./validateZodOptions"), exports);

package/dist/{cli/validation/validateCLIOptions.d.ts → common/Validation/validateZodOptions.d.ts}

@@ -7,21 +7,21 @@ export type ValidationResult<T> = {
     data: T;
 } | {
     success: false;
-    error: string;
+    errors: string[];
 };
 /**
  * Валидирует данные с помощью Zod схемы и возвращает отформатированный результат
  */
-export declare function validateCLIOptions<T>(schema: ZodSchema<T>, data: unknown): ValidationResult<T>;
+export declare function validateZodOptions<T>(schema: ZodSchema<T>, data: unknown): ValidationResult<T>;
 /**
  * Валидирует данные с помощью Zod схемы и возвращает raw результат
  * (полезно когда нужен доступ к ZodError для дополнительной обработки)
  */
-export declare function validateCLIOptionsRaw<T>(schema: ZodSchema<T>, data: unknown): {
+export declare function validateZodOptionsRaw<T>(schema: ZodSchema<T>, data: unknown): {
     success: true;
     data: T;
 } | {
     success: false;
     error: ZodError;
 };
-//# sourceMappingURL=validateCLIOptions.d.ts.map
+//# sourceMappingURL=validateZodOptions.d.ts.map

package/dist/common/Validation/validateZodOptions.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"validateZodOptions.d.ts","sourceRoot":"","sources":["../../../src/common/Validation/validateZodOptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,KAAK,CAAC;AAI1C;;GAEG;AACH,MAAM,MAAM,gBAAgB,CAAC,CAAC,IAAI;IAAE,OAAO,EAAE,IAAI,CAAC;IAAC,IAAI,EAAE,CAAC,CAAA;CAAE,GAAG;IAAE,OAAO,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC;AAEpG;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAc9F;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,GAAG;IAAE,OAAO,EAAE,IAAI,CAAC;IAAC,IAAI,EAAE,CAAC,CAAA;CAAE,GAAG;IAAE,OAAO,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,QAAQ,CAAA;CAAE,CAQ9I"}

package/dist/{cli/validation/validateCLIOptions.js → common/Validation/validateZodOptions.js}

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateCLIOptions = validateCLIOptions;
-exports.validateCLIOptionsRaw = validateCLIOptionsRaw;
+exports.validateZodOptions = validateZodOptions;
+exports.validateZodOptionsRaw = validateZodOptionsRaw;
 const zod_1 = require("zod");
-const errorFormatter_1 = require("./errorFormatter");
+const formatZodError_1 = require("./formatZodError");
 /**
  * Валидирует данные с помощью Zod схемы и возвращает отформатированный результат
  */
-function validateCLIOptions(schema, data) {
+function validateZodOptions(schema, data) {
     try {
         const result = schema.parse(data);
         return { success: true, data: result };
@@ -16,20 +16,17 @@ function validateCLIOptions(schema, data) {
         if (error instanceof zod_1.ZodError) {
             return {
                 success: false,
-                error: (0, errorFormatter_1.formatZodErrorForCLI)(error),
+                errors: (0, formatZodError_1.formatZodError)(error),
             };
         }
-        return {
-            success: false,
-            error: error instanceof Error ? error.message : 'Unknown validation error',
-        };
+        throw new Error(error instanceof Error ? error.message : 'Unknown validation error');
     }
 }
 /**
  * Валидирует данные с помощью Zod схемы и возвращает raw результат
  * (полезно когда нужен доступ к ZodError для дополнительной обработки)
  */
-function validateCLIOptionsRaw(schema, data) {
+function validateZodOptionsRaw(schema, data) {
     const result = schema.safeParse(data);
     if (result.success) {
         return { success: true, data: result.data };

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

@@ -1,8 +1,13 @@
+import { z } from 'zod';
 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.
+ *
+ * ВАЖНО!
+ * После обновления allVersionedSchemas необходимо обновить файл compatibilityCases
+ * src/common/VersionedSchema/Utils/__mocks__/compatibilityCases.ts
  */
-export declare const allVersionedSchemas: VersionedSchema<Record<string, any>>[];
+export declare const allVersionedSchemas: VersionedSchema<z.ZodTypeAny>[];
 //# sourceMappingURL=AllVersionedSchemas.d.ts.map

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

@@ -1 +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;AAiB3C;;;;GAIG;AACH,eAAO,MAAM,mBAAmB,EAAE,eAAe,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,EAkBrE,CAAC"}
+{"version":3,"file":"AllVersionedSchemas.d.ts","sourceRoot":"","sources":["../../../../src/common/VersionedSchema/AllVersionedSchemas/AllVersionedSchemas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAKxB,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAgB3C;;;;;;;;GAQG;AACH,eAAO,MAAM,mBAAmB,EAAE,eAAe,CAAC,CAAC,CAAC,UAAU,CAAC,EAS9D,CAAC"}

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

@@ -4,8 +4,7 @@ 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("./UnifiedOptionsSchemaV1");
-const UnifiedOptionsSchemaV2_1 = require("./UnifiedOptionsSchemaV2");
+const UnifiedVersionedSchemas_1 = require("./UnifiedVersionedSchemas");
 /**
  * Adds a prefix to all version strings in a versioned schema array.
  */
@@ -19,21 +18,16 @@ function addVersionPrefix(schemas, prefix) {
  * 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.
+ *
+ * ВАЖНО!
+ * После обновления allVersionedSchemas необходимо обновить файл compatibilityCases
+ * src/common/VersionedSchema/Utils/__mocks__/compatibilityCases.ts
  */
 exports.allVersionedSchemas = [
     // OPTIONS schemas with prefix
-    ...addVersionPrefix(OptionsVersionedSchemas_1.optionsVersionedSchemas, 'OPTIONS'),
+    ...addVersionPrefix(OptionsVersionedSchemas_1.optionsVersionedSchemas, Enums_1.EVersionedSchemaType.OPTIONS),
     // MULTI_OPTIONS schemas with prefix
-    ...addVersionPrefix(MultiOptionsVersionedSchemas_1.multiOptionsVersionedSchema, 'MULTI_OPTIONS'),
+    ...addVersionPrefix(MultiOptionsVersionedSchemas_1.multiOptionsVersionedSchema, Enums_1.EVersionedSchemaType.MULTI_OPTIONS),
     // UNIFIED_OPTIONS schemas (latest)
-    {
-        version: 'UNIFIED_v1',
-        schema: UnifiedOptionsSchemaV1_1.unifiedOptionsSchemaV1,
-        type: Enums_1.EVersionedSchemaType.UNIFIED_OPTIONS,
-    },
-    {
-        version: 'UNIFIED_v2',
-        schema: UnifiedOptionsSchemaV2_1.unifiedOptionsSchemaV2,
-        type: Enums_1.EVersionedSchemaType.UNIFIED_OPTIONS,
-    }
+    ...addVersionPrefix(UnifiedVersionedSchemas_1.unifiedVersionedSchemas, Enums_1.EVersionedSchemaType.UNIFIED_OPTIONS)
 ];

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

@@ -0,0 +1,28 @@
+import { z } from 'zod';
+import { HttpClient } from '../../../core/types/enums/HttpClient.enum';
+import { ELogLevel, ELogOutput } from '../../Enums';
+export declare const unifiedOptionsShape: z.ZodObject<{
+    items: z.ZodOptional<z.ZodArray<z.ZodObject<{
+        input: z.ZodString;
+        request: z.ZodOptional<z.ZodString>;
+        sortByRequired: z.ZodOptional<z.ZodBoolean>;
+        useSeparatedIndexes: z.ZodOptional<z.ZodBoolean>;
+        useCancelableRequest: z.ZodOptional<z.ZodBoolean>;
+        interfacePrefix: z.ZodOptional<z.ZodString>;
+        enumPrefix: z.ZodOptional<z.ZodString>;
+        typePrefix: z.ZodOptional<z.ZodString>;
+        output: z.ZodString;
+        outputCore: z.ZodOptional<z.ZodString>;
+        outputServices: z.ZodOptional<z.ZodString>;
+        outputModels: z.ZodOptional<z.ZodString>;
+        outputSchemas: z.ZodOptional<z.ZodString>;
+    }, z.core.$strip>>>;
+    input: z.ZodOptional<z.ZodString>;
+    output: z.ZodOptional<z.ZodString>;
+    httpClient: z.ZodEnum<typeof HttpClient>;
+}, z.core.$strip>;
+export declare const debugSettingsShape: z.ZodObject<{
+    logLevel: z.ZodOptional<z.ZodEnum<typeof ELogLevel>>;
+    logTarget: z.ZodOptional<z.ZodEnum<typeof ELogOutput>>;
+}, z.core.$strip>;
+//# sourceMappingURL=UnifiedBase.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"UnifiedBase.d.ts","sourceRoot":"","sources":["../../../../src/common/VersionedSchema/AllVersionedSchemas/UnifiedBase.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,CAAC,EAAC,MAAM,KAAK,CAAC;AAEtB,OAAO,EAAE,UAAU,EAAE,MAAM,2CAA2C,CAAC;AACvE,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAapD,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;iBAK9B,CAAC;AAEH,eAAO,MAAM,kBAAkB;;;iBAG7B,CAAC"}

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

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.debugSettingsShape = exports.unifiedOptionsShape = void 0;
+const zod_1 = require("zod");
+const HttpClient_enum_1 = require("../../../core/types/enums/HttpClient.enum");
+const Enums_1 = require("../../Enums");
+const CommonSchemas_1 = require("../CommonSchemas");
+const unifiedItemSchema = zod_1.z
+    .object({
+    ...CommonSchemas_1.outputPathsSchema.shape,
+    ...CommonSchemas_1.additionalParametersSchemaV2.shape,
+    ...CommonSchemas_1.experimentalParametersSchemaV2.shape,
+    input: zod_1.z.string().min(1),
+    request: zod_1.z.string().optional(),
+});
+exports.unifiedOptionsShape = zod_1.z.object({
+    items: zod_1.z.array(unifiedItemSchema).min(1).optional(),
+    input: zod_1.z.string().optional(),
+    output: zod_1.z.string().optional(),
+    httpClient: zod_1.z.enum(HttpClient_enum_1.HttpClient),
+});
+exports.debugSettingsShape = zod_1.z.object({
+    logLevel: zod_1.z.enum(Enums_1.ELogLevel).optional(),
+    logTarget: zod_1.z.enum(Enums_1.ELogOutput).optional(),
+});

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

@@ -1,7 +1,37 @@
-import Joi from 'joi';
-/**
- * Unified options schema that supports both single and multi-item configurations.
- * Use either 'items' array for multiple specs OR 'input'/'output' for single spec.
- */
-export declare const unifiedOptionsSchemaV1: Joi.ObjectSchema<any>;
+import { z } from 'zod';
+export declare const unifiedOptionsSchemaV1: z.ZodObject<{
+    sortByRequired: z.ZodOptional<z.ZodBoolean>;
+    useSeparatedIndexes: z.ZodOptional<z.ZodBoolean>;
+    useCancelableRequest: z.ZodOptional<z.ZodBoolean>;
+    request: z.ZodOptional<z.ZodString>;
+    interfacePrefix: z.ZodOptional<z.ZodString>;
+    enumPrefix: z.ZodOptional<z.ZodString>;
+    typePrefix: z.ZodOptional<z.ZodString>;
+    useOptions: z.ZodOptional<z.ZodBoolean>;
+    useUnionTypes: z.ZodOptional<z.ZodBoolean>;
+    excludeCoreServiceFiles: z.ZodOptional<z.ZodBoolean>;
+    includeSchemasFiles: z.ZodOptional<z.ZodBoolean>;
+    outputCore: z.ZodOptional<z.ZodString>;
+    outputServices: z.ZodOptional<z.ZodString>;
+    outputModels: z.ZodOptional<z.ZodString>;
+    outputSchemas: z.ZodOptional<z.ZodString>;
+    items: z.ZodOptional<z.ZodArray<z.ZodObject<{
+        input: z.ZodString;
+        request: z.ZodOptional<z.ZodString>;
+        sortByRequired: z.ZodOptional<z.ZodBoolean>;
+        useSeparatedIndexes: z.ZodOptional<z.ZodBoolean>;
+        useCancelableRequest: z.ZodOptional<z.ZodBoolean>;
+        interfacePrefix: z.ZodOptional<z.ZodString>;
+        enumPrefix: z.ZodOptional<z.ZodString>;
+        typePrefix: z.ZodOptional<z.ZodString>;
+        output: z.ZodString;
+        outputCore: z.ZodOptional<z.ZodString>;
+        outputServices: z.ZodOptional<z.ZodString>;
+        outputModels: z.ZodOptional<z.ZodString>;
+        outputSchemas: z.ZodOptional<z.ZodString>;
+    }, z.core.$strip>>>;
+    input: z.ZodOptional<z.ZodString>;
+    output: z.ZodOptional<z.ZodString>;
+    httpClient: z.ZodEnum<typeof import("../../..").HttpClient>;
+}, z.core.$strip>;
 //# sourceMappingURL=UnifiedOptionsSchemaV1.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"UnifiedOptionsSchemaV1.d.ts","sourceRoot":"","sources":["../../../../src/common/VersionedSchema/AllVersionedSchemas/UnifiedOptionsSchemaV1.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,KAAK,CAAC;AAgBtB;;;GAGG;AACH,eAAO,MAAM,sBAAsB,uBA4BZ,CAAC"}
+{"version":3,"file":"UnifiedOptionsSchemaV1.d.ts","sourceRoot":"","sources":["../../../../src/common/VersionedSchema/AllVersionedSchemas/UnifiedOptionsSchemaV1.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,CAAC,EAAC,MAAM,KAAK,CAAC;AAOtB,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAMjC,CAAC"}

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

@@ -1,41 +1,37 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.unifiedOptionsSchemaV1 = void 0;
-const joi_1 = __importDefault(require("joi"));
-const HttpClient_enum_1 = require("../../../core/types/enums/HttpClient.enum");
+const zod_1 = require("zod");
 const CommonSchemas_1 = require("../CommonSchemas");
-const mergeObjectSchemas_1 = require("../Utils/mergeObjectSchemas");
-const itemSchema = (0, mergeObjectSchemas_1.mergeObjectSchemas)(joi_1.default.object({
-    input: joi_1.default.string().required().description('Путь, URL или строка OpenAPI спецификации'),
-    request: joi_1.default.string().optional(),
-}), CommonSchemas_1.outputPathsSchema, CommonSchemas_1.additionalParametersSchemaV2, CommonSchemas_1.experimentalParametersSchemaV2);
-/**
- * Unified options schema that supports both single and multi-item configurations.
- * Use either 'items' array for multiple specs OR 'input'/'output' for single spec.
- */
-exports.unifiedOptionsSchemaV1 = (0, mergeObjectSchemas_1.mergeObjectSchemas)(joi_1.default.object({
-    // Multi-item configuration
-    items: joi_1.default.array().items(itemSchema).min(1).optional().description('Массив спецификаций для генерации'),
-    // Single-item configuration (mutually exclusive with items)
-    input: joi_1.default.string()
-        .when('items', {
-        is: joi_1.default.exist(),
-        then: joi_1.default.forbidden(),
-        otherwise: joi_1.default.required(),
-    })
-        .description('Путь, URL или строка OpenAPI спецификации'),
-    output: joi_1.default.string()
-        .when('items', {
-        is: joi_1.default.exist(),
-        then: joi_1.default.forbidden(),
-        otherwise: joi_1.default.required(),
-    })
-        .description('Выходная директория'),
-    httpClient: joi_1.default.string()
-        .valid(...Object.values(HttpClient_enum_1.HttpClient))
-        .optional(),
-}), CommonSchemas_1.outputPathsSchema, // outputCore, outputServices, etc. for single-item mode
-CommonSchemas_1.specialParametersSchemasV2, CommonSchemas_1.additionalParametersSchemaV2, CommonSchemas_1.experimentalParametersSchemaV2).xor('items', 'input');
+const UnifiedBase_1 = require("./UnifiedBase");
+const outputPathsSchemaWithoutOutput = CommonSchemas_1.outputPathsSchema.omit({ output: true });
+exports.unifiedOptionsSchemaV1 = zod_1.z.object({
+    ...UnifiedBase_1.unifiedOptionsShape.shape,
+    ...outputPathsSchemaWithoutOutput.shape,
+    ...CommonSchemas_1.specialParametersSchemasV2.shape,
+    ...CommonSchemas_1.additionalParametersSchemaV2.shape,
+    ...CommonSchemas_1.experimentalParametersSchemaV2.shape,
+});
+/*
+type TUnified = {
+    httpClient: HttpClient.FETCH | HttpClient.XHR | HttpClient.NODE | HttpClient.AXIOS;
+    useCancelableRequest: boolean | undefined;
+    sortByRequired: boolean | undefined;
+    useSeparatedIndexes: boolean | undefined;
+    request: string | undefined;
+    interfacePrefix: string | undefined;
+    enumPrefix: string | undefined;
+    typePrefix: string | undefined;
+    useOptions: boolean | undefined;
+    useUnionTypes: boolean | undefined;
+    excludeCoreServiceFiles: boolean | undefined;
+    includeSchemasFiles: boolean | undefined;
+    outputCore: string | undefined;
+    outputServices: string | undefined;
+    outputModels: string | undefined;
+    outputSchemas: string | undefined;
+    items: { ... 13 more }[] | undefined;
+    input: string | undefined;
+    output: string | undefined;
+}
+*/ 

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

@@ -1,7 +1,38 @@
-import Joi from 'joi';
-/**
- * Unified options schema that supports both single and multi-item configurations.
- * Use either 'items' array for multiple specs OR 'input'/'output' for single spec.
- */
-export declare const unifiedOptionsSchemaV2: Joi.ObjectSchema<any>;
+import { z } from 'zod';
+export declare const unifiedOptionsSchemaV2: z.ZodObject<{
+    useOptions: z.ZodOptional<z.ZodBoolean>;
+    useUnionTypes: z.ZodOptional<z.ZodBoolean>;
+    excludeCoreServiceFiles: z.ZodOptional<z.ZodBoolean>;
+    validationLibrary: z.ZodOptional<z.ZodEnum<typeof import("../../../core/types/enums/ValidationLibrary.enum").ValidationLibrary>>;
+    sortByRequired: z.ZodOptional<z.ZodBoolean>;
+    useSeparatedIndexes: z.ZodOptional<z.ZodBoolean>;
+    useCancelableRequest: z.ZodOptional<z.ZodBoolean>;
+    request: z.ZodOptional<z.ZodString>;
+    interfacePrefix: z.ZodOptional<z.ZodString>;
+    enumPrefix: z.ZodOptional<z.ZodString>;
+    typePrefix: z.ZodOptional<z.ZodString>;
+    includeSchemasFiles: z.ZodOptional<z.ZodBoolean>;
+    outputCore: z.ZodOptional<z.ZodString>;
+    outputServices: z.ZodOptional<z.ZodString>;
+    outputModels: z.ZodOptional<z.ZodString>;
+    outputSchemas: z.ZodOptional<z.ZodString>;
+    items: z.ZodOptional<z.ZodArray<z.ZodObject<{
+        input: z.ZodString;
+        request: z.ZodOptional<z.ZodString>;
+        sortByRequired: z.ZodOptional<z.ZodBoolean>;
+        useSeparatedIndexes: z.ZodOptional<z.ZodBoolean>;
+        useCancelableRequest: z.ZodOptional<z.ZodBoolean>;
+        interfacePrefix: z.ZodOptional<z.ZodString>;
+        enumPrefix: z.ZodOptional<z.ZodString>;
+        typePrefix: z.ZodOptional<z.ZodString>;
+        output: z.ZodString;
+        outputCore: z.ZodOptional<z.ZodString>;
+        outputServices: z.ZodOptional<z.ZodString>;
+        outputModels: z.ZodOptional<z.ZodString>;
+        outputSchemas: z.ZodOptional<z.ZodString>;
+    }, z.core.$strip>>>;
+    input: z.ZodOptional<z.ZodString>;
+    output: z.ZodOptional<z.ZodString>;
+    httpClient: z.ZodEnum<typeof import("../../..").HttpClient>;
+}, z.core.$strip>;
 //# sourceMappingURL=UnifiedOptionsSchemaV2.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"UnifiedOptionsSchemaV2.d.ts","sourceRoot":"","sources":["../../../../src/common/VersionedSchema/AllVersionedSchemas/UnifiedOptionsSchemaV2.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,KAAK,CAAC;AAgBtB;;;GAGG;AACH,eAAO,MAAM,sBAAsB,uBA4BZ,CAAC"}
+{"version":3,"file":"UnifiedOptionsSchemaV2.d.ts","sourceRoot":"","sources":["../../../../src/common/VersionedSchema/AllVersionedSchemas/UnifiedOptionsSchemaV2.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,CAAC,EAAC,MAAM,KAAK,CAAC;AAKtB,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAGjC,CAAC"}

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

@@ -1,41 +1,34 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.unifiedOptionsSchemaV2 = void 0;
-const joi_1 = __importDefault(require("joi"));
-const HttpClient_enum_1 = require("../../../core/types/enums/HttpClient.enum");
+const zod_1 = require("zod");
 const CommonSchemas_1 = require("../CommonSchemas");
-const mergeObjectSchemas_1 = require("../Utils/mergeObjectSchemas");
-const itemSchema = (0, mergeObjectSchemas_1.mergeObjectSchemas)(joi_1.default.object({
-    input: joi_1.default.string().required().description('Путь, URL или строка OpenAPI спецификации'),
-    request: joi_1.default.string().optional(),
-}), CommonSchemas_1.outputPathsSchema, CommonSchemas_1.additionalParametersSchemaV2, CommonSchemas_1.experimentalParametersSchemaV2);
-/**
- * Unified options schema that supports both single and multi-item configurations.
- * Use either 'items' array for multiple specs OR 'input'/'output' for single spec.
- */
-exports.unifiedOptionsSchemaV2 = (0, mergeObjectSchemas_1.mergeObjectSchemas)(joi_1.default.object({
-    // Multi-item configuration
-    items: joi_1.default.array().items(itemSchema).min(1).optional().description('Массив спецификаций для генерации'),
-    // Single-item configuration (mutually exclusive with items)
-    input: joi_1.default.string()
-        .when('items', {
-        is: joi_1.default.exist(),
-        then: joi_1.default.forbidden(),
-        otherwise: joi_1.default.required(),
-    })
-        .description('Путь, URL или строка OpenAPI спецификации'),
-    output: joi_1.default.string()
-        .when('items', {
-        is: joi_1.default.exist(),
-        then: joi_1.default.forbidden(),
-        otherwise: joi_1.default.required(),
-    })
-        .description('Выходная директория'),
-    httpClient: joi_1.default.string()
-        .valid(...Object.values(HttpClient_enum_1.HttpClient))
-        .optional(),
-}), CommonSchemas_1.outputPathsSchema, // outputCore, outputServices, etc. for single-item mode
-CommonSchemas_1.specialParametersSchemasV3, CommonSchemas_1.additionalParametersSchemaV2, CommonSchemas_1.experimentalParametersSchemaV2).xor('items', 'input');
+const UnifiedOptionsSchemaV1_1 = require("./UnifiedOptionsSchemaV1");
+exports.unifiedOptionsSchemaV2 = zod_1.z.object({
+    ...UnifiedOptionsSchemaV1_1.unifiedOptionsSchemaV1.shape,
+    ...CommonSchemas_1.specialParametersSchemasV3.shape,
+});
+/*
+type TUnified = {
+    output: string;
+    useOptions: boolean | undefined;
+    useUnionTypes: boolean | undefined;
+    excludeCoreServiceFiles: boolean | undefined;
+    validationLibrary: ValidationLibrary.NONE | ValidationLibrary.ZOD | ValidationLibrary.JOI | ValidationLibrary.YUP | ValidationLibrary.JSONSCHEMA | undefined;
+    useCancelableRequest: boolean | undefined;
+    sortByRequired: boolean | undefined;
+    useSeparatedIndexes: boolean | undefined;
+    request: string | undefined;
+    interfacePrefix: string | undefined;
+    enumPrefix: string | undefined;
+    typePrefix: string | undefined;
+    includeSchemasFiles: boolean | undefined;
+    outputCore: string | undefined;
+    outputServices: string | undefined;
+    outputModels: string | undefined;
+    outputSchemas: string | undefined;
+    items: { ... 13 more }[] | undefined;
+    input: string | undefined;
+    httpClient: HttpClient.FETCH | HttpClient.XHR | HttpClient.NODE | HttpClient.AXIOS | undefined;
+}
+*/