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

package/dist/common/VersionedSchema/Utils/determineBestMatchingSchemaVersion.js

@@ -1,41 +1,86 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.determineBestMatchingSchemaVersion = determineBestMatchingSchemaVersion;
-const getErrorFieldsFromValidation_1 = require("./getErrorFieldsFromValidation");
+const validateZodOptions_1 = require("../../Validation/validateZodOptions");
 const getUniqueKeysFromSchemas_1 = require("./getUniqueKeysFromSchemas");
 const getUniqueObjectKeys_1 = require("./getUniqueObjectKeys");
-// Determining the most appropriate schema version
+/**
+ * Counts unknown keys using a strict schema variant.
+ * The strict check is used only for ranking candidates, not for final validation.
+ */
+function getStrictUnrecognizedKeyCount(schema, inputData) {
+    const strictResult = (0, validateZodOptions_1.validateZodOptionsRaw)(schema.strict(), inputData);
+    if (strictResult.success) {
+        return 0;
+    }
+    return strictResult.error.issues.reduce((count, issue) => {
+        if (issue.code !== 'unrecognized_keys' || !('keys' in issue)) {
+            return count;
+        }
+        return count + issue.keys.length;
+    }, 0);
+}
+/**
+ * Compares two schema candidates and returns the better one.
+ * Priority:
+ * 1) fewer structural errors;
+ * 2) fewer strict-mode unknown keys;
+ * 3) more matching keys;
+ * 4) newer version inside the same schema family;
+ * 5) lower index when schema families differ.
+ */
+function compareCandidates(best, current) {
+    if (current.structuralErrorCount !== best.structuralErrorCount) {
+        return current.structuralErrorCount < best.structuralErrorCount ? current : best;
+    }
+    if (current.strictUnrecognizedKeyCount !== best.strictUnrecognizedKeyCount) {
+        return current.strictUnrecognizedKeyCount < best.strictUnrecognizedKeyCount ? current : best;
+    }
+    if (current.matchingKeysCount !== best.matchingKeysCount) {
+        return current.matchingKeysCount > best.matchingKeysCount ? current : best;
+    }
+    if (current.type === best.type) {
+        return current.index > best.index ? current : best;
+    }
+    return current.index < best.index ? current : best;
+}
+/**
+ * Determines the best matching schema version for input data.
+ * `invalid_value` issues are intentionally ignored to allow migration from older enum/value variants.
+ */
 function determineBestMatchingSchemaVersion(inputData, versionedSchemas) {
     if (!versionedSchemas.length) {
         throw new Error('The list of schemes cannot be empty');
     }
     const inputKeys = (0, getUniqueObjectKeys_1.getUniqueObjectKeys)(inputData);
-    const matchingSchemas = versionedSchemas
-        .map(({ schema, version }, idx) => {
-        const { error } = schema.validate(inputData, { allowUnknown: true });
-        const errorFields = (0, getErrorFieldsFromValidation_1.getErrorFieldsFromValidation)(error).filter(err => err.type !== 'any.only');
-        return errorFields.length === 0 ? { version, index: idx } : null;
-    })
-        .filter((match) => match !== null);
-    if (matchingSchemas.length > 0) {
-        const latestMatch = matchingSchemas.reduce((prev, curr) => (curr.index > prev.index ? curr : prev));
+    const schemaMatches = versionedSchemas.map(({ schema, baseSchema, version, type }, idx) => {
+        const schemaKeys = (0, getUniqueKeysFromSchemas_1.getUniqueKeysFromSchemas)([schema]);
+        const matchingKeysCount = inputKeys.filter(key => schemaKeys.has(key)).length;
+        const strictUnrecognizedKeyCount = getStrictUnrecognizedKeyCount(baseSchema, inputData);
+        const validationResult = (0, validateZodOptions_1.validateZodOptionsRaw)(schema, inputData);
+        const structuralErrorCount = !validationResult.success
+            ? validationResult.error.issues.filter(issue => issue.code !== 'invalid_value').length
+            : 0;
         return {
-            lastVersionIndex: latestMatch.index,
-            latestVersion: latestMatch.version,
-            firstVersion: matchingSchemas[0].version,
+            index: idx,
+            version,
+            type,
+            structuralErrorCount,
+            strictUnrecognizedKeyCount,
+            matchingKeysCount,
         };
-    }
-    const schemaMatches = versionedSchemas.map(({ schema, version }, idx) => {
-        const schemaKeys = (0, getUniqueKeysFromSchemas_1.getUniqueKeysFromSchemas)([schema]);
-        const { error } = schema.validate(inputData, { allowUnknown: true });
-        const errorFields = (0, getErrorFieldsFromValidation_1.getErrorFieldsFromValidation)(error).filter(err => err.type !== 'any.only');
-        const matchingKeys = inputKeys.filter(key => schemaKeys.has(key));
-        return { index: idx, version, errorFields, matchingKeys };
     });
-    const bestMatch = schemaMatches.reduce((best, current) => {
-        const isBetterMatch = current.matchingKeys.length >= best.matchingKeys.length && current.errorFields.length <= best.errorFields.length;
-        return isBetterMatch ? current : best;
-    }, schemaMatches[0]);
+    const structurallyValidMatches = schemaMatches.filter(match => match.structuralErrorCount === 0);
+    if (structurallyValidMatches.length > 0) {
+        const bestStructurallyValidMatch = structurallyValidMatches.reduce(compareCandidates);
+        const firstVersion = structurallyValidMatches.reduce((earliest, current) => (current.index < earliest.index ? current : earliest)).version;
+        return {
+            lastVersionIndex: bestStructurallyValidMatch.index,
+            latestVersion: bestStructurallyValidMatch.version,
+            firstVersion,
+        };
+    }
+    const bestMatch = schemaMatches.reduce(compareCandidates);
     return {
         lastVersionIndex: bestMatch.index,
         latestVersion: bestMatch.version,

package/dist/common/VersionedSchema/Utils/getCurrentErrorMessage.d.ts

@@ -1,3 +1,3 @@
-import Joi from "joi";
-export declare function getCurrentErrorMessage(error: Joi.ValidationError, replaicingKeysMap: Map<string, string>): void;
+import { z } from 'zod';
+export declare function getCurrentErrorMessage(error: z.ZodError, replaicingKeysMap: Map<string, string>): void;
 //# sourceMappingURL=getCurrentErrorMessage.d.ts.map

package/dist/common/VersionedSchema/Utils/getCurrentErrorMessage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getCurrentErrorMessage.d.ts","sourceRoot":"","sources":["../../../../src/common/VersionedSchema/Utils/getCurrentErrorMessage.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,KAAK,CAAC;AAKtB,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,GAAG,CAAC,eAAe,EAAE,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,QAQxG"}
+{"version":3,"file":"getCurrentErrorMessage.d.ts","sourceRoot":"","sources":["../../../../src/common/VersionedSchema/Utils/getCurrentErrorMessage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAKxB,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,CAAC,CAAC,QAAQ,EAAE,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,QAqB/F"}

package/dist/common/VersionedSchema/Utils/getCurrentErrorMessage.js

@@ -1,14 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCurrentErrorMessage = getCurrentErrorMessage;
-const getErrorFieldsFromValidation_1 = require("./getErrorFieldsFromValidation");
+const formatZodError_1 = require("../../Validation/formatZodError");
 const getKeyByMapValue_1 = require("./getKeyByMapValue");
 function getCurrentErrorMessage(error, replaicingKeysMap) {
-    const { path } = (0, getErrorFieldsFromValidation_1.getErrorFieldsFromValidation)(error)[0];
-    const reverseKey = (0, getKeyByMapValue_1.getKeyByMapValue)(replaicingKeysMap, path);
-    let currentMessage = error.message;
-    if (reverseKey) {
-        currentMessage = error.message.replace(path, reverseKey);
+    if (!error || error.issues.length === 0) {
+        return;
     }
-    throw new Error(currentMessage);
+    const messages = new Set();
+    error.issues.forEach(issue => {
+        const path = (0, formatZodError_1.formatZodPath)(issue.path);
+        const reverseKey = (0, getKeyByMapValue_1.getKeyByMapValue)(replaicingKeysMap, path);
+        let currentMessage = issue.message;
+        if (reverseKey) {
+            currentMessage = error.message.replace(path, reverseKey);
+        }
+        messages.add(currentMessage);
+    });
+    const result = Array.from(messages.values());
+    throw new Error(result.join('\n'));
 }

package/dist/common/VersionedSchema/Utils/getUniqueKeysFromSchemas.d.ts

@@ -1,8 +1,8 @@
-import Joi from 'joi';
+import { z } from 'zod';
 /**
  * Get all the unique parameter keys of all Joi schemes in the array
- * @param schemas array of joi schemes
+ * @param schemas array of zod schemes
  * @returns All the unique parameter keys of all Joi schemes in the array
  */
-export declare function getUniqueKeysFromSchemas(schemas: Joi.Schema[]): Set<string>;
+export declare function getUniqueKeysFromSchemas(schemas: z.ZodTypeAny[]): Set<string>;
 //# sourceMappingURL=getUniqueKeysFromSchemas.d.ts.map

package/dist/common/VersionedSchema/Utils/getUniqueKeysFromSchemas.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getUniqueKeysFromSchemas.d.ts","sourceRoot":"","sources":["../../../../src/common/VersionedSchema/Utils/getUniqueKeysFromSchemas.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,KAAK,CAAC;AAKtB;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,eAQ7D"}
+{"version":3,"file":"getUniqueKeysFromSchemas.d.ts","sourceRoot":"","sources":["../../../../src/common/VersionedSchema/Utils/getUniqueKeysFromSchemas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAqBxB;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,CAAC,CAAC,UAAU,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC,CAQ7E"}

package/dist/common/VersionedSchema/Utils/getUniqueKeysFromSchemas.js

@@ -1,17 +1,30 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getUniqueKeysFromSchemas = getUniqueKeysFromSchemas;
-const joiHandlers_1 = require("./joiHandlers");
-const traverseObjectStructure_1 = require("./traverseObjectStructure");
+const zod_1 = require("zod");
+function collectKeys(schema, result) {
+    if (!(schema instanceof zod_1.z.ZodObject)) {
+        return;
+    }
+    const shape = schema.shape;
+    for (const key of Object.keys(shape)) {
+        result.add(key);
+        const fieldSchema = shape[key];
+        // если поле — вложенный объект, идём глубже
+        if (fieldSchema instanceof zod_1.z.ZodObject) {
+            collectKeys(fieldSchema, result);
+        }
+    }
+}
 /**
  * Get all the unique parameter keys of all Joi schemes in the array
- * @param schemas array of joi schemes
+ * @param schemas array of zod schemes
  * @returns All the unique parameter keys of all Joi schemes in the array
  */
 function getUniqueKeysFromSchemas(schemas) {
     const result = new Set();
     for (const schema of schemas) {
-        (0, traverseObjectStructure_1.traverseObjectStructure)(schema, [joiHandlers_1.handleJoiSchema, joiHandlers_1.handleJoiDescription], result);
+        collectKeys(schema, result);
     }
     return result;
 }

package/dist/common/VersionedSchema/Utils/getUniqueObjectKeys.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getUniqueObjectKeys.d.ts","sourceRoot":"","sources":["../../../../src/common/VersionedSchema/Utils/getUniqueObjectKeys.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,YAKhE"}
+{"version":3,"file":"getUniqueObjectKeys.d.ts","sourceRoot":"","sources":["../../../../src/common/VersionedSchema/Utils/getUniqueObjectKeys.ts"],"names":[],"mappings":"AAmBA;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,YAKhE"}

package/dist/common/VersionedSchema/Utils/getUniqueObjectKeys.js

@@ -1,7 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getUniqueObjectKeys = getUniqueObjectKeys;
-const traverseObjectStructure_1 = require("./traverseObjectStructure");
+function collectUniqueObjectKeys(root, result) {
+    const recurse = (v) => collectUniqueObjectKeys(v, result);
+    if (root && typeof root === 'object') {
+        if (Array.isArray(root)) {
+            for (const item of root) {
+                recurse(item);
+            }
+        }
+        else {
+            for (const key of Object.keys(root)) {
+                if (result instanceof Set) {
+                    result.add(key);
+                }
+                recurse(root[key]);
+            }
+        }
+    }
+}
 /**
  * Get unique keys from object properties (set of options)
  * @param rawInput object properties (set of options)
@@ -9,6 +26,6 @@ const traverseObjectStructure_1 = require("./traverseObjectStructure");
  */
 function getUniqueObjectKeys(rawInput) {
     const result = new Set();
-    (0, traverseObjectStructure_1.traverseObjectStructure)(rawInput, [], result);
+    collectUniqueObjectKeys(rawInput, result);
     return Array.from(result);
 }

package/dist/common/VersionedSchema/Utils/migrateDataToLatestSchemaVersion.d.ts

@@ -1,18 +1,29 @@
+import { z } from 'zod';
 import { EMigrationMode } from '../../Enums';
 import { EVersionedSchemaType } from '../Enums';
 import { SchemaMigrationPlan, VersionedSchema, VersionMatchResult } from '../Types';
+/**
+ * Input arguments for migrating arbitrary config data to the latest schema version.
+ */
 type MigrateToLatestProps = {
     rawInput: Record<string, any>;
     migrationPlans: SchemaMigrationPlan<Record<string, any>, Record<string, any>>[];
-    versionedSchemas: VersionedSchema<Record<string, any>>[];
+    versionedSchemas: VersionedSchema<z.ZodTypeAny>[];
     migrationMode: EMigrationMode;
 };
+/**
+ * Result of successful migration to the latest schema.
+ */
 type MigrateToLatestResult = {
     value: Record<string, any>;
     guessedVersion: VersionMatchResult;
     schemaVersion: string;
     schemaType: EVersionedSchemaType;
 };
+/**
+ * Migrates raw input through the migration graph to the latest schema version.
+ * Migration path is resolved by `fromVersion -> toVersion` links from `migrationPlans`.
+ */
 export declare function migrateDataToLatestSchemaVersion({ rawInput, migrationPlans, versionedSchemas, migrationMode }: MigrateToLatestProps): MigrateToLatestResult | null;
 export {};
 //# sourceMappingURL=migrateDataToLatestSchemaVersion.d.ts.map

package/dist/common/VersionedSchema/Utils/migrateDataToLatestSchemaVersion.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"migrateDataToLatestSchemaVersion.d.ts","sourceRoot":"","sources":["../../../../src/common/VersionedSchema/Utils/migrateDataToLatestSchemaVersion.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAChD,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AASpF,KAAK,oBAAoB,GAAG;IACxB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC9B,cAAc,EAAE,mBAAmB,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC;IAChF,gBAAgB,EAAE,eAAe,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC;IACzD,aAAa,EAAE,cAAc,CAAC;CACjC,CAAC;AAEF,KAAK,qBAAqB,GAAG;IACzB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC3B,cAAc,EAAE,kBAAkB,CAAC;IACnC,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,oBAAoB,CAAC;CACpC,CAAC;AAEF,wBAAgB,gCAAgC,CAAC,EAAE,QAAQ,EAAE,cAAc,EAAE,gBAAgB,EAAE,aAAa,EAAE,EAAE,oBAAoB,GAAG,qBAAqB,GAAG,IAAI,CAiElK"}
+{"version":3,"file":"migrateDataToLatestSchemaVersion.d.ts","sourceRoot":"","sources":["../../../../src/common/VersionedSchema/Utils/migrateDataToLatestSchemaVersion.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAE7C,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAChD,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AASpF;;GAEG;AACH,KAAK,oBAAoB,GAAG;IACxB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC9B,cAAc,EAAE,mBAAmB,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC;IAChF,gBAAgB,EAAE,eAAe,CAAC,CAAC,CAAC,UAAU,CAAC,EAAE,CAAC;IAClD,aAAa,EAAE,cAAc,CAAC;CACjC,CAAC;AAEF;;GAEG;AACH,KAAK,qBAAqB,GAAG;IACzB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC3B,cAAc,EAAE,kBAAkB,CAAC;IACnC,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,oBAAoB,CAAC;CACpC,CAAC;AAEF;;;GAGG;AACH,wBAAgB,gCAAgC,CAAC,EAAE,QAAQ,EAAE,cAAc,EAAE,gBAAgB,EAAE,aAAa,EAAE,EAAE,oBAAoB,GAAG,qBAAqB,GAAG,IAAI,CAoFlK"}

package/dist/common/VersionedSchema/Utils/migrateDataToLatestSchemaVersion.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.migrateDataToLatestSchemaVersion = migrateDataToLatestSchemaVersion;
+const Consts_1 = require("../../Consts");
 const Enums_1 = require("../../Enums");
+const validateZodOptions_1 = require("../../Validation/validateZodOptions");
 const determineBestMatchingSchemaVersion_1 = require("./determineBestMatchingSchemaVersion");
 const generateKeyMappingForInvalidKeys_1 = require("./generateKeyMappingForInvalidKeys");
 const getCurrentErrorMessage_1 = require("./getCurrentErrorMessage");
@@ -9,6 +11,10 @@ const getUniqueKeysFromSchemas_1 = require("./getUniqueKeysFromSchemas");
 const getUniqueObjectKeys_1 = require("./getUniqueObjectKeys");
 const replaceInvalidKeysWithMappedNames_1 = require("./replaceInvalidKeysWithMappedNames");
 const validateAndSuggestKeyCorrections_1 = require("./validateAndSuggestKeyCorrections");
+/**
+ * Migrates raw input through the migration graph to the latest schema version.
+ * Migration path is resolved by `fromVersion -> toVersion` links from `migrationPlans`.
+ */
 function migrateDataToLatestSchemaVersion({ rawInput, migrationPlans, versionedSchemas, migrationMode }) {
     const schemas = versionedSchemas.map(el => el.schema);
     const allUniqueKeysFromSchemas = (0, getUniqueKeysFromSchemas_1.getUniqueKeysFromSchemas)(schemas);
@@ -19,39 +25,52 @@ function migrateDataToLatestSchemaVersion({ rawInput, migrationPlans, versionedS
     const schemaPossibleKeys = (0, getUniqueKeysFromSchemas_1.getUniqueKeysFromSchemas)([guessedValidationSchema]);
     const replacingKeysMap = (0, generateKeyMappingForInvalidKeys_1.generateKeyMappingForInvalidKeys)(allUniqueKeysFromRawInput, schemaPossibleKeys);
     let currentData = replacingKeysMap.size ? (0, replaceInvalidKeysWithMappedNames_1.replaceInvalidKeysWithMappedNames)(rawInput, replacingKeysMap) : rawInput;
-    const actualVersionIndex = versionedSchemas.length - 1;
-    const actualSchema = versionedSchemas[actualVersionIndex];
-    for (let idx = guessedVersion.lastVersionIndex; idx < versionedSchemas.length - 1; idx++) {
-        const currentVersionSchema = versionedSchemas[idx];
-        const { error: firstError } = currentVersionSchema.schema.validate(currentData);
-        if (firstError) {
-            (0, getCurrentErrorMessage_1.getCurrentErrorMessage)(firstError, replacingKeysMap);
+    const actualSchema = versionedSchemas[versionedSchemas.length - 1];
+    const schemasByVersion = new Map(versionedSchemas.map(schemaInfo => [schemaInfo.version, schemaInfo.schema]));
+    const migrationPlanByFromVersion = new Map(migrationPlans.map(plan => [plan.fromVersion, plan]));
+    let currentVersion = guessedVersion.latestVersion;
+    const visitedVersions = new Set([currentVersion]);
+    while (currentVersion !== actualSchema.version) {
+        const currentVersionSchema = schemasByVersion.get(currentVersion);
+        if (!currentVersionSchema) {
+            throw new Error(`No schema found for version ${currentVersion}.`);
         }
-        const fromVersion = currentVersionSchema.version;
-        const migrationPlan = migrationPlans.find(p => p.fromVersion === fromVersion);
+        const firstValidationResult = (0, validateZodOptions_1.validateZodOptionsRaw)(currentVersionSchema, currentData);
+        if (!firstValidationResult.success) {
+            (0, getCurrentErrorMessage_1.getCurrentErrorMessage)(firstValidationResult.error, replacingKeysMap);
+        }
+        const migrationPlan = migrationPlanByFromVersion.get(currentVersion);
         if (!migrationPlan) {
-            const availableVersions = migrationPlans.map(p => p.fromVersion).join(', ');
-            throw new Error(`No migration plan from ${fromVersion}. ` +
+            const availableVersions = Array.from(migrationPlanByFromVersion.keys()).join(', ');
+            throw new Error(`No migration plan from ${currentVersion}. ` +
                 `Available migration plans: ${availableVersions}. ` +
                 `This usually means the migration chain is incomplete.`);
         }
-        const toVersion = versionedSchemas[idx + 1].version;
+        const nextVersion = migrationPlan.toVersion;
+        const nextSchema = schemasByVersion.get(nextVersion);
+        if (!nextSchema) {
+            throw new Error(`Migration plan from ${migrationPlan.fromVersion} points to unknown schema version ${nextVersion}.`);
+        }
         const migratedRaw = migrationPlan.migrate(currentData);
-        const { error } = versionedSchemas[idx + 1].schema.validate(migratedRaw, { allowUnknown: false });
-        if (error) {
-            throw new Error(`Migration from ${fromVersion} to ${toVersion} failed validation. ` +
-                `Error: ${error.message}. ` +
+        const validationResult = (0, validateZodOptions_1.validateZodOptions)(nextSchema, migratedRaw);
+        if (!validationResult.success) {
+            throw new Error(`Migration from ${currentVersion} to ${nextVersion} failed validation. ` +
+                `Error: ${validationResult.errors.join('\n')}. ` +
                 `Migration description: ${migrationPlan.description || 'No description provided'}.`);
         }
         currentData = { ...migratedRaw };
-        const isLastIteration = idx + 1 === actualVersionIndex;
-        if (isLastIteration && migrationMode === Enums_1.EMigrationMode.GENERATE_OPENAPI) {
-            console.warn('Для выполнения генерации OpenApi потребовалось мигрировать схему Ваших данных на актуальную. Для обновленмя конфигурации в файле используйте команду `npm name_cli_tool update-config`');
+        currentVersion = nextVersion;
+        if (visitedVersions.has(currentVersion)) {
+            throw new Error(`Migration loop detected at version ${currentVersion}.`);
+        }
+        visitedVersions.add(currentVersion);
+        if (currentVersion === actualSchema.version && migrationMode === Enums_1.EMigrationMode.GENERATE_OPENAPI) {
+            Consts_1.APP_LOGGER.warn('To perform OpenAPI generation, it was necessary to migrate the schema of your data to the current one. To update the configuration in the file, use the command `npm openapi-codegen-cli update-config`');
         }
     }
-    const { error } = actualSchema.schema.validate(currentData, { allowUnknown: false });
-    if (error) {
-        (0, getCurrentErrorMessage_1.getCurrentErrorMessage)(error, replacingKeysMap);
+    const validationResult = (0, validateZodOptions_1.validateZodOptionsRaw)(actualSchema.schema, currentData);
+    if (!validationResult.success) {
+        (0, getCurrentErrorMessage_1.getCurrentErrorMessage)(validationResult.error, replacingKeysMap);
     }
     return { value: currentData, guessedVersion, schemaVersion: actualSchema.version, schemaType: actualSchema.type };
 }

package/dist/common/VersionedSchema/refinements/dependentOptionsRefinement.d.ts

@@ -0,0 +1,4 @@
+import { z } from 'zod';
+import { TRawOptions } from "../../TRawOptions";
+export declare function dependentOptionsRefinement(data: TRawOptions, ctx: z.RefinementCtx): void;
+//# sourceMappingURL=dependentOptionsRefinement.d.ts.map

package/dist/common/VersionedSchema/refinements/dependentOptionsRefinement.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"dependentOptionsRefinement.d.ts","sourceRoot":"","sources":["../../../../src/common/VersionedSchema/refinements/dependentOptionsRefinement.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,CAAC,EAAC,MAAM,KAAK,CAAC;AAEtB,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,CAAC,CAAC,aAAa,QA2C7E"}

package/dist/common/VersionedSchema/refinements/dependentOptionsRefinement.js

@@ -0,0 +1,43 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.dependentOptionsRefinement = dependentOptionsRefinement;
+function dependentOptionsRefinement(data, ctx) {
+    // Проверка: либо items, либо input+output должны быть указаны
+    const hasItems = data.items && data.items.length > 0;
+    const hasInputOutput = !!(data.input && data.output);
+    if (!hasItems && !hasInputOutput) {
+        ctx.addIssue({
+            code: 'custom',
+            message: 'Either "items" array or "input" + "output" must be provided',
+            path: [],
+        });
+    }
+    // Если есть items, то input и output в корне не должны быть указаны
+    if (hasItems && hasInputOutput) {
+        ctx.addIssue({
+            code: 'custom',
+            message: 'Cannot use both "items" array and "input"/"output" at the root level',
+            path: ['items'],
+        });
+    }
+    // Валидация: если excludeCoreServiceFiles === true, request не должен быть указан
+    if (data.excludeCoreServiceFiles === true && data.request) {
+        ctx.addIssue({
+            code: 'custom',
+            message: '"request" can only be used when "excludeCoreServiceFiles" is false',
+            path: ['request'],
+        });
+    }
+    // Валидация для каждого элемента в items
+    if (hasItems && data.items) {
+        data.items.forEach((item, index) => {
+            if (item.request && data.excludeCoreServiceFiles === true) {
+                ctx.addIssue({
+                    code: 'custom',
+                    message: '"request" in items can only be used when "excludeCoreServiceFiles" is false',
+                    path: ['items', index, 'request'],
+                });
+            }
+        });
+    }
+}

package/dist/common/VersionedSchema/refinements/singleOrMultiRefinement.d.ts

@@ -0,0 +1,4 @@
+import { z } from 'zod';
+import { unifiedOptionsShape } from '../AllVersionedSchemas/UnifiedBase';
+export declare function singleOrMultiRefinement(data: z.infer<typeof unifiedOptionsShape>, ctx: z.RefinementCtx): void;
+//# sourceMappingURL=singleOrMultiRefinement.d.ts.map

package/dist/common/VersionedSchema/refinements/singleOrMultiRefinement.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"singleOrMultiRefinement.d.ts","sourceRoot":"","sources":["../../../../src/common/VersionedSchema/refinements/singleOrMultiRefinement.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AAEzE,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,mBAAmB,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,aAAa,QAmBtG"}

package/dist/common/VersionedSchema/refinements/singleOrMultiRefinement.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.singleOrMultiRefinement = singleOrMultiRefinement;
+function singleOrMultiRefinement(data, ctx) {
+    const hasItems = !!data.items?.length;
+    const hasSingle = !!data.input;
+    if (hasItems && hasSingle) {
+        ctx.addIssue({
+            code: 'custom',
+            message: 'Use either items or input/output, but not both options.',
+            path: ['items'],
+        });
+    }
+    if (!hasItems && !hasSingle) {
+        ctx.addIssue({
+            code: 'custom',
+            message: 'You must specify either items or input/output',
+            path: ['input'],
+        });
+    }
+}