zod-v3-to-v4 1.6.1 → 1.7.1

package/dist/convert-name-to-top-level-api.js

@@ -272,11 +272,52 @@ function convertNameToTopLevelApiAndWrapInUnion(node, options) {
             .filter((expression) => names.includes(expression.getName()))
             .forEach((expression) => {
             const parent = expression.getFirstAncestorByKind(SyntaxKind.CallExpression);
+            if (!parent) {
+                return;
+            }
             const text = expression.getExpression().getText();
+            // Check if the method call has arguments (e.g., .ip({ version: "v4" }))
+            const args = parent.getArguments();
+            if (args.length > 0) {
+                // Try to extract version from the arguments
+                const firstArg = args[0];
+                if (firstArg?.isKind(SyntaxKind.ObjectLiteralExpression)) {
+                    const versionProperty = firstArg.getProperties().find((prop) => {
+                        if (prop.isKind(SyntaxKind.PropertyAssignment)) {
+                            const name = prop.getName();
+                            return name === "version" || name === '"version"';
+                        }
+                        return false;
+                    });
+                    if (versionProperty?.isKind(SyntaxKind.PropertyAssignment)) {
+                        const initializer = versionProperty.getInitializer();
+                        if (initializer?.isKind(SyntaxKind.StringLiteral)) {
+                            const version = initializer.getLiteralValue();
+                            if (version === "v4" && nameToWrap === "ip") {
+                                parent.replaceWithText(`${text}.ipv4()`);
+                                return;
+                            }
+                            else if (version === "v6" && nameToWrap === "ip") {
+                                parent.replaceWithText(`${text}.ipv6()`);
+                                return;
+                            }
+                            else if (version === "v4" && nameToWrap === "cidr") {
+                                parent.replaceWithText(`${text}.cidrv4()`);
+                                return;
+                            }
+                            else if (version === "v6" && nameToWrap === "cidr") {
+                                parent.replaceWithText(`${text}.cidrv6()`);
+                                return;
+                            }
+                        }
+                    }
+                }
+            }
+            // Default behavior: create union
             const unionText = renames
                 .map(({ name }) => `${text}.${name}()`)
                 .join(", ");
-            parent?.replaceWithText(`${zodName}.union([${unionText}])`);
+            parent.replaceWithText(`${zodName}.union([${unionText}])`);
         });
         convertNameToTopLevelApi(callExpression, {
             zodName,

package/dist/convert-zod-errors.js

@@ -130,7 +130,7 @@ export function convertDeprecatedErrorKeysToErrorFunction(node) {
 export function convertZodErrorToTreeifyError(sourceFile, zodName) {
     sourceFile
         .getDescendantsOfKind(SyntaxKind.CallExpression)
-        .filter((expression) => isZodReference(zodName, ["ZodJSONSchema", "ZodError"], expression))
+        .filter((expression) => isZodReference(zodName, ["ZodType", "ZodError"], expression))
         .filter((expression) => {
         const argsCount = expression.getArguments().length;
         const methodCalled = expression.getExpression().getLastChild();
@@ -150,7 +150,7 @@ export function convertZodErrorToTreeifyError(sourceFile, zodName) {
     });
     sourceFile
         .getDescendantsOfKind(SyntaxKind.PropertyAccessExpression)
-        .filter((expression) => isZodReference(zodName, ["ZodJSONSchema", "ZodError"], expression))
+        .filter((expression) => isZodReference(zodName, ["ZodType", "ZodError"], expression))
         .filter((expression) => {
         const looksLikeZodErrorFormErrors = expression.getName() === "formErrors";
         const looksLikeZodErrorFieldErrors = expression.getName() === "fieldErrors";
@@ -164,7 +164,7 @@ export function convertZodErrorToTreeifyError(sourceFile, zodName) {
 export function convertZodErrorAddIssueToDirectPushes(sourceFile, zodName) {
     sourceFile
         .getDescendantsOfKind(SyntaxKind.CallExpression)
-        .filter((expression) => isZodReference(zodName, ["ZodJSONSchema", "ZodError"], expression))
+        .filter((expression) => isZodReference(zodName, ["ZodType", "ZodError"], expression))
         .filter((expression) => {
         const argsCount = expression.getArguments().length;
         const methodCalled = expression.getExpression().getLastChild();

package/dist/migrate.js

@@ -23,7 +23,7 @@ export function migrateZodV3ToV4(sourceFile, options = {}) {
         }
         const parentType = node.getFirstAncestorByKind(SyntaxKind.QualifiedName);
         if (parentType?.getText().endsWith("ZodSchema")) {
-            parentType?.getRight().replaceWithText("ZodJSONSchema");
+            parentType?.getRight().replaceWithText("ZodType");
         }
         const parentStatement = node.getParentWhile(isZodNode) || node;
         if (!isZodNode(parentStatement)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zod-v3-to-v4",
-  "version": "1.6.1",
+  "version": "1.7.1",
   "description": "Migrate Zod from v3 to v4",
   "keywords": [
     "zod",