zod-v3-to-v4 1.4.0 → 1.5.0

package/dist/ast.js

@@ -1,30 +1,39 @@
 import { SyntaxKind, ts, } from "ts-morph";
-export function findRootQualifiedName(node) {
-    const identifier = findRootIdentifier(node);
+export function findRootNode(node) {
+    const identifier = findFirstIdentifier(node);
     const [mainDeclaration] = identifier?.getSymbol()?.getDeclarations() ?? [];
     if (mainDeclaration?.isKind(SyntaxKind.VariableDeclaration)) {
         const initializer = mainDeclaration.getInitializer();
         if (initializer?.isKind(SyntaxKind.CallExpression) ||
             initializer?.isKind(SyntaxKind.PropertyAccessExpression)) {
-            return findRootQualifiedName(initializer);
+            return findRootNode(initializer);
         }
-        return undefined;
+        return { type: "not found" };
     }
     if (mainDeclaration?.isKind(SyntaxKind.Parameter)) {
-        return mainDeclaration
+        const qualifiedName = mainDeclaration
             ?.getFirstChildByKind(ts.SyntaxKind.TypeReference)
             ?.getFirstChildByKind(ts.SyntaxKind.QualifiedName);
+        return qualifiedName
+            ? { type: "qualified name", value: qualifiedName }
+            : { type: "not found" };
     }
-    return undefined;
+    if (mainDeclaration?.isKind(SyntaxKind.ImportSpecifier)) {
+        const importDeclaration = mainDeclaration.getFirstAncestorByKind(SyntaxKind.ImportDeclaration);
+        return importDeclaration
+            ? { type: "import declaration", value: importDeclaration }
+            : { type: "not found" };
+    }
+    return { type: "not found" };
 }
-export function findRootNode(node) {
-    const identifier = findRootIdentifier(node);
+export function findRootExpression(node) {
+    const identifier = findFirstIdentifier(node);
     const [mainDeclaration] = identifier?.getSymbol()?.getDeclarations() ?? [];
     if (mainDeclaration?.isKind(SyntaxKind.VariableDeclaration)) {
         const initializer = mainDeclaration.getInitializer();
         if (initializer?.isKind(SyntaxKind.CallExpression) ||
             initializer?.isKind(SyntaxKind.PropertyAccessExpression)) {
-            return findRootNode(initializer);
+            return findRootExpression(initializer);
         }
         return undefined;
     }
@@ -33,10 +42,10 @@ export function findRootNode(node) {
     }
     return undefined;
 }
-function findRootIdentifier(node) {
+function findFirstIdentifier(node) {
     const nestedExpression = node?.getExpression();
     if (nestedExpression?.isKind(SyntaxKind.PropertyAccessExpression)) {
-        return findRootIdentifier(nestedExpression);
+        return findFirstIdentifier(nestedExpression);
     }
     if (nestedExpression?.isKind(SyntaxKind.Identifier)) {
         return nestedExpression;

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

@@ -40,6 +40,50 @@ export function convertZStringPatternsToTopLevelApi(node, zodName) {
         renames: [{ name: "cidrv4" }, { name: "cidrv6" }],
     });
 }
+export function convertZCoercePatternsToTopLevelApi(node, zodName) {
+    const names = ["bigint", "boolean", "date", "number", "string"];
+    node
+        .getDescendantsOfKind(SyntaxKind.CallExpression)
+        // Start from the deepest, otherwise we can't get info from removed nodes
+        .reverse()
+        .filter((e) => {
+        const expression = e.getExpression();
+        if (!expression.isKind(SyntaxKind.PropertyAccessExpression)) {
+            return false;
+        }
+        const [firstArgument, ...otherArgs] = e.getArguments();
+        if (otherArgs.length > 0 ||
+            !firstArgument?.isKind(SyntaxKind.ObjectLiteralExpression)) {
+            return false;
+        }
+        const propertiesNames = firstArgument
+            .getProperties()
+            .map((p) => ("getName" in p ? p.getName() : ""));
+        return (names.includes(expression.getName()) &&
+            propertiesNames.includes("coerce"));
+    })
+        .forEach((e) => {
+        const expression = e.getExpression();
+        if (!expression.isKind(SyntaxKind.PropertyAccessExpression)) {
+            return;
+        }
+        const [firstArgument, ...otherArgs] = e.getArguments();
+        if (otherArgs.length > 0 ||
+            !firstArgument?.isKind(SyntaxKind.ObjectLiteralExpression)) {
+            return;
+        }
+        // Delete `coerce` property
+        firstArgument
+            .getProperties()
+            .filter((p) => "getName" in p && p.getName() === "coerce")
+            .forEach((p) => p.remove());
+        // If only `{}` is left, remove it
+        if (firstArgument.getProperties().length === 0) {
+            e.removeArgument(firstArgument);
+        }
+        expression.replaceWithText(`${zodName}.coerce.${expression.getName()}`);
+    });
+}
 export function convertZObjectPatternsToTopLevelApi(node, zodName) {
     convertNameToTopLevelApi(node, {
         zodName,

package/dist/convert-zod-errors.js

@@ -141,13 +141,20 @@ export function convertZodErrorToTreeifyError(sourceFile, zodName) {
         .forEach((expression) => {
         const caller = expression.getFirstChild()?.getFirstChild()?.getText() ?? "";
         expression.replaceWithText(`${zodName}.treeifyError(${caller})`);
+        // Get rid of `.formErrors` or `.fieldErrors` on `z.treeifyError()`
+        const parentObject = expression.getParentIfKind(SyntaxKind.PropertyAccessExpression);
+        if (parentObject &&
+            ["formErrors", "fieldErrors"].includes(parentObject.getName())) {
+            parentObject.replaceWithText(expression.getText());
+        }
     });
     sourceFile
         .getDescendantsOfKind(SyntaxKind.PropertyAccessExpression)
         .filter((expression) => isZodReference(zodName, ["ZodJSONSchema", "ZodError"], expression))
         .filter((expression) => {
         const looksLikeZodErrorFormErrors = expression.getName() === "formErrors";
-        return looksLikeZodErrorFormErrors;
+        const looksLikeZodErrorFieldErrors = expression.getName() === "fieldErrors";
+        return looksLikeZodErrorFormErrors || looksLikeZodErrorFieldErrors;
     })
         .forEach((expression) => {
         const caller = expression.getFirstChild()?.getText() ?? "";

package/dist/migrate.js

@@ -1,7 +1,7 @@
 import { SyntaxKind } from "ts-morph";
-import { findRootNode } from "./ast.js";
+import { findRootExpression } from "./ast.js";
 import { collectZodImportDeclarations, collectZodReferences, getZodName, } from "./collect-imports.js";
-import { convertZArrayPatternsToTopLevelApi, convertZFunctionPatternsToTopLevelApi, convertZNumberPatternsToZInt, convertZObjectPatternsToTopLevelApi, convertZRecordPatternsToTopLevelApi, convertZStringPatternsToTopLevelApi, } from "./convert-name-to-top-level-api.js";
+import { convertZArrayPatternsToTopLevelApi, convertZCoercePatternsToTopLevelApi, convertZFunctionPatternsToTopLevelApi, convertZNumberPatternsToZInt, convertZObjectPatternsToTopLevelApi, convertZRecordPatternsToTopLevelApi, convertZStringPatternsToTopLevelApi, } from "./convert-name-to-top-level-api.js";
 import { convertDeprecatedErrorKeysToErrorFunction, convertErrorMapToErrorFunction, convertMessageKeyToError, convertZodErrorAddIssueToDirectPushes, convertZodErrorToTreeifyError, } from "./convert-zod-errors.js";
 import { isZodNode } from "./zod-node.js";
 export function migrateZodV3ToV4(sourceFile, options = {}) {
@@ -31,6 +31,7 @@ export function migrateZodV3ToV4(sourceFile, options = {}) {
         convertDeprecatedErrorKeysToErrorFunction(parentStatement);
         convertZNumberPatternsToZInt(parentStatement, zodName);
         convertZStringPatternsToTopLevelApi(parentStatement, zodName);
+        convertZCoercePatternsToTopLevelApi(parentStatement, zodName);
         convertZObjectPatternsToTopLevelApi(parentStatement, zodName);
         convertZArrayPatternsToTopLevelApi(parentStatement, zodName);
         convertZFunctionPatternsToTopLevelApi(parentStatement);
@@ -67,7 +68,7 @@ function renameZSchemaEnumToLowercase(sourceFile, zodName) {
         .getDescendantsOfKind(SyntaxKind.PropertyAccessExpression)
         .filter((node) => node.getName() === "Enum")
         .filter((node) => {
-        const rootNode = findRootNode(node);
+        const rootNode = findRootExpression(node);
         const expression = rootNode?.getExpression();
         const isFromZodEnum = expression?.isKind(SyntaxKind.PropertyAccessExpression) &&
             expression.getName() === "enum" &&

package/dist/zod-node.js

@@ -1,5 +1,5 @@
 import { SyntaxKind, } from "ts-morph";
-import { findRootQualifiedName } from "./ast.js";
+import { findRootNode } from "./ast.js";
 export function isZodNode(node) {
     return (node.isKind(SyntaxKind.CallExpression) ||
         node.isKind(SyntaxKind.PropertyAccessExpression) ||
@@ -31,11 +31,22 @@ export function getDirectDescendantsOfKind(node, kind) {
  * // => true if expression is `z.ZodJSONSchema` or `z.ZodError`
  */
 export function isZodReference(zodName, expectedTypes, expression) {
-    const qualifiedName = findRootQualifiedName(expression);
-    const left = qualifiedName?.getLeft();
-    const belongsToZod = left?.isKind(SyntaxKind.Identifier) && left.getText() === zodName;
-    const right = qualifiedName?.getRight();
-    const isExpectedType = right?.isKind(SyntaxKind.Identifier) &&
-        expectedTypes.includes(right.getText());
-    return belongsToZod && isExpectedType;
+    const result = findRootNode(expression);
+    if (result.type === "qualified name") {
+        const left = result.value.getLeft();
+        const belongsToZod = left?.isKind(SyntaxKind.Identifier) && left.getText() === zodName;
+        const right = result.value.getRight();
+        const isExpectedType = right?.isKind(SyntaxKind.Identifier) &&
+            expectedTypes.includes(right.getText());
+        return belongsToZod && isExpectedType;
+    }
+    if (result.type === "import declaration") {
+        const hasZodImport = result.value
+            .getImportClause()
+            ?.getNamedImports()
+            ?.some((i) => i.getName() === zodName);
+        const isFromZod = ["zod", "zod/v4"].includes(result.value.getModuleSpecifierValue());
+        return hasZodImport && isFromZod;
+    }
+    return false;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zod-v3-to-v4",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "description": "Migrate Zod from v3 to v4",
   "keywords": [
     "zod",
@@ -25,20 +25,6 @@
     "README.md",
     "dist/*.js"
   ],
-  "scripts": {
-    "prebuild": "rimraf dist",
-    "build": "tsc --project tsconfig.build.json",
-    "postbuild": "chmod +x dist/index.js",
-    "format": "prettier . --write",
-    "format-check": "prettier . --list-different",
-    "playground": "pnpm playground:interactive playground/tsconfig.json",
-    "playground:interactive": "node --experimental-strip-types --disable-warning=ExperimentalWarning src/index.ts",
-    "prepare": "husky",
-    "prepublishOnly": "pnpm typecheck && pnpm test && pnpm build",
-    "test": "vitest run",
-    "test:watch": "vitest watch",
-    "typecheck": "tsc --noEmit"
-  },
   "lint-staged": {
     "*": "prettier --ignore-unknown --write"
   },
@@ -59,5 +45,16 @@
     "vitest": "3.1.4",
     "zod": "3.25.12"
   },
-  "packageManager": "pnpm@9.15.4+sha512.b2dc20e2fc72b3e18848459b37359a32064663e5627a51e4c74b2c29dd8e8e0491483c3abb40789cfd578bf362fb6ba8261b05f0387d76792ed6e23ea3b1b6a0"
-}
+  "scripts": {
+    "prebuild": "rimraf dist",
+    "build": "tsc --project tsconfig.build.json",
+    "postbuild": "chmod +x dist/index.js",
+    "format": "prettier . --write",
+    "format-check": "prettier . --list-different",
+    "playground": "pnpm playground:interactive playground/tsconfig.json",
+    "playground:interactive": "node --experimental-strip-types --disable-warning=ExperimentalWarning src/index.ts",
+    "test": "vitest run",
+    "test:watch": "vitest watch",
+    "typecheck": "tsc --noEmit"
+  }
+}