Refactor coercion schemas to use new Valibot methods

fabian-hiller · fabian-hiller · commit 2471d527751e · 2025-12-06T17:32:54.000-05:00
diff --git a/codemod/zod-to-valibot/__testfixtures__/coerce-bigint-schema/output.ts b/codemod/zod-to-valibot/__testfixtures__/coerce-bigint-schema/output.ts
@@ -1,30 +1,6 @@
 import * as v from "valibot";
 
-const Schema1 = v.pipe(v.any(), v.transform(input => {
-  try {
-    return BigInt(input);
-  } catch {
-    return input;
-  }
-}), v.bigint());
-const Schema2 = v.pipe(v.any(), v.transform(input => {
-  try {
-    return BigInt(input);
-  } catch {
-    return input;
-  }
-}), v.bigint());
-const Schema3 = v.pipe(v.any(), v.transform(input => {
-  try {
-    return BigInt(input);
-  } catch {
-    return input;
-  }
-}), v.bigint(), v.gtValue(1n));
-const Schema4 = v.pipe(v.any(), v.transform(input => {
-  try {
-    return BigInt(input);
-  } catch {
-    return input;
-  }
-}), v.bigint(), v.ltValue(2n));
+const Schema1 = v.pipe(v.unknown(), v.toBigint());
+const Schema2 = v.pipe(v.unknown(), v.toBigint());
+const Schema3 = v.pipe(v.unknown(), v.toBigint(), v.gtValue(1n));
+const Schema4 = v.pipe(v.unknown(), v.toBigint(), v.ltValue(2n));
diff --git a/codemod/zod-to-valibot/__testfixtures__/coerce-boolean-schema/output.ts b/codemod/zod-to-valibot/__testfixtures__/coerce-boolean-schema/output.ts
@@ -1,4 +1,4 @@
 import * as v from "valibot";
 
-const Schema1 = v.pipe(v.unknown(), v.transform(Boolean), v.boolean());
-const Schema2 = v.pipe(v.unknown(), v.transform(Boolean), v.boolean());
+const Schema1 = v.pipe(v.unknown(), v.toBoolean());
+const Schema2 = v.pipe(v.unknown(), v.toBoolean());
diff --git a/codemod/zod-to-valibot/__testfixtures__/coerce-date-schema/output.ts b/codemod/zod-to-valibot/__testfixtures__/coerce-date-schema/output.ts
@@ -1,30 +1,6 @@
 import * as v from "valibot";
 
-const Schema1 = v.pipe(v.any(), v.transform(input => {
-  try {
-    return new Date(input);
-  } catch {
-    return input;
-  }
-}), v.date());
-const Schema2 = v.pipe(v.any(), v.transform(input => {
-  try {
-    return new Date(input);
-  } catch {
-    return input;
-  }
-}), v.date());
-const Schema3 = v.pipe(v.any(), v.transform(input => {
-  try {
-    return new Date(input);
-  } catch {
-    return input;
-  }
-}), v.date(), v.minValue(new Date("1/10/23")));
-const Schema4 = v.pipe(v.any(), v.transform(input => {
-  try {
-    return new Date(input);
-  } catch {
-    return input;
-  }
-}), v.date(), v.maxValue(new Date("2023-01-10")));
+const Schema1 = v.pipe(v.unknown(), v.toDate());
+const Schema2 = v.pipe(v.unknown(), v.toDate());
+const Schema3 = v.pipe(v.unknown(), v.toDate(), v.minValue(new Date("1/10/23")));
+const Schema4 = v.pipe(v.unknown(), v.toDate(), v.maxValue(new Date("2023-01-10")));
diff --git a/codemod/zod-to-valibot/__testfixtures__/coerce-number-schema/output.ts b/codemod/zod-to-valibot/__testfixtures__/coerce-number-schema/output.ts
@@ -1,6 +1,6 @@
 import * as v from "valibot";
 
-const Schema1 = v.pipe(v.unknown(), v.transform(Number), v.number());
-const Schema2 = v.pipe(v.unknown(), v.transform(Number), v.number());
-const Schema3 = v.pipe(v.unknown(), v.transform(Number), v.number(), v.finite());
-const Schema4 = v.pipe(v.unknown(), v.transform(Number), v.number(), v.multipleOf(12));
+const Schema1 = v.pipe(v.unknown(), v.toNumber());
+const Schema2 = v.pipe(v.unknown(), v.toNumber());
+const Schema3 = v.pipe(v.unknown(), v.toNumber(), v.finite());
+const Schema4 = v.pipe(v.unknown(), v.toNumber(), v.multipleOf(12));
diff --git a/codemod/zod-to-valibot/__testfixtures__/coerce-string-schema/output.ts b/codemod/zod-to-valibot/__testfixtures__/coerce-string-schema/output.ts
@@ -1,6 +1,6 @@
 import * as v from "valibot";
 
-const Schema1 = v.pipe(v.unknown(), v.transform(String), v.string());
-const Schema2 = v.pipe(v.unknown(), v.transform(String), v.string());
-const Schema3 = v.pipe(v.unknown(), v.transform(String), v.string(), v.email());
-const Schema4 = v.pipe(v.unknown(), v.transform(String), v.string(), v.url());
+const Schema1 = v.pipe(v.unknown(), v.toString());
+const Schema2 = v.pipe(v.unknown(), v.toString());
+const Schema3 = v.pipe(v.unknown(), v.toString(), v.email());
+const Schema4 = v.pipe(v.unknown(), v.toString(), v.url());
diff --git a/codemod/zod-to-valibot/__testfixtures__/schema-options/output.ts b/codemod/zod-to-valibot/__testfixtures__/schema-options/output.ts
@@ -19,7 +19,7 @@ const schema7Description = v.getDescription(Schema7);
 const Schema8 = v.pipe(v.literal("hello"), v.description('some description (literal "hello")'));
 const schema8Description = v.getDescription(Schema8);
 // coerce
-const Schema9 = v.pipe(v.unknown(), v.transform(String), v.string());
+const Schema9 = v.pipe(v.unknown(), v.toString());
 const Schema10 = v.string();
 // errorMap - supported by Valibot but incompatible
 const Schema11 = v.string();
@@ -42,23 +42,17 @@ const Schema18 = v.literal("bot", 'must be "bot" (msg)');
 const Schema19 = v.string("must be a string (msg)");
 const Schema20 = v.literal("bot", 'must be "bot" (msg)');
 // coerce + invalid_type_error
-const Schema21 = v.pipe(v.unknown(), v.transform(String), v.string("must be a string"));
+const Schema21 = v.pipe(v.unknown(), v.toString("must be a string"));
 const Schema22 = v.string("must be a string");
 // coerce + description
-const Schema23 = v.pipe(
-  v.unknown(),
-  v.transform(String),
-  v.string(),
-  v.description("some description")
-);
+const Schema23 = v.pipe(v.unknown(), v.toString(), v.description("some description"));
 const schema23Description = v.getDescription(Schema23);
 const Schema24 = v.pipe(v.string(), v.description("some description"));
 const schema24Description = v.getDescription(Schema24);
 // coerce + invalid_type_error + description
 const Schema25 = v.pipe(
   v.unknown(),
-  v.transform(String),
-  v.string("must be a string"),
+  v.toString("must be a string"),
   v.description("some description")
 );
 const schema25Description = v.getDescription(Schema25);
diff --git a/codemod/zod-to-valibot/package.json b/codemod/zod-to-valibot/package.json
@@ -34,7 +34,9 @@
     "@types/node": "^24.10.1",
     "tsdown": "^0.16.6",
     "typescript": "^5.9.3",
+    "valibot": "workspace:*",
     "vite-plugin-node-polyfills": "^0.24.0",
-    "vitest": "^4.0.13"
+    "vitest": "^4.0.13",
+    "zod": "^3.25.76"
   }
 }
diff --git a/codemod/zod-to-valibot/src/transform/schemas-and-links/schemas/bigint/bigint.ts b/codemod/zod-to-valibot/src/transform/schemas-and-links/schemas/bigint/bigint.ts
@@ -1,8 +1,10 @@
 import j from 'jscodeshift';
 import {
   getDescription,
+  getOptions,
   getSchemaComps,
   getSchemaWithOptionalDescription,
+  getTransformedMsgs,
 } from '../helpers';
 
 export function transformBigint(
@@ -18,45 +20,28 @@ export function transformBigint(
     coerceSchema
   );
   if (coerce) {
+    const optionsArg =
+      args.length > 0 && args[args.length - 1]?.type === 'ObjectExpression'
+        ? args[args.length - 1]
+        : null;
+    const msgs = getTransformedMsgs(getOptions(optionsArg));
     return j.callExpression(
       j.memberExpression(j.identifier(valibotIdentifier), j.identifier('pipe')),
       [
         j.callExpression(
           j.memberExpression(
             j.identifier(valibotIdentifier),
-            j.identifier('any')
+            j.identifier('unknown')
           ),
           []
         ),
         j.callExpression(
           j.memberExpression(
             j.identifier(valibotIdentifier),
-            j.identifier('transform')
+            j.identifier('toBigint')
           ),
-          [
-            j.arrowFunctionExpression(
-              [j.identifier('input')],
-              j.blockStatement([
-                j.tryStatement(
-                  j.blockStatement([
-                    j.returnStatement(
-                      j.callExpression(j.identifier('BigInt'), [
-                        j.identifier('input'),
-                      ])
-                    ),
-                  ]),
-                  j.catchClause(
-                    null,
-                    null,
-                    j.blockStatement([j.returnStatement(j.identifier('input'))])
-                  )
-                ),
-              ]),
-              false
-            ),
-          ]
+          msgs.filter((m) => m !== null)
         ),
-        baseSchema,
         ...(description
           ? [getDescription(valibotIdentifier, description)]
           : []),
diff --git a/codemod/zod-to-valibot/src/transform/schemas-and-links/schemas/boolean/boolean.ts b/codemod/zod-to-valibot/src/transform/schemas-and-links/schemas/boolean/boolean.ts
@@ -1,8 +1,10 @@
 import j from 'jscodeshift';
 import {
   getDescription,
+  getOptions,
   getSchemaComps,
   getSchemaWithOptionalDescription,
+  getTransformedMsgs,
 } from '../helpers';
 
 export function transformBoolean(
@@ -18,6 +20,11 @@ export function transformBoolean(
     coerceSchema
   );
   if (coerce) {
+    const optionsArg =
+      args.length > 0 && args[args.length - 1]?.type === 'ObjectExpression'
+        ? args[args.length - 1]
+        : null;
+    const msgs = getTransformedMsgs(getOptions(optionsArg));
     return j.callExpression(
       j.memberExpression(j.identifier(valibotIdentifier), j.identifier('pipe')),
       [
@@ -31,11 +38,10 @@ export function transformBoolean(
         j.callExpression(
           j.memberExpression(
             j.identifier(valibotIdentifier),
-            j.identifier('transform')
+            j.identifier('toBoolean')
           ),
-          [j.identifier('Boolean')]
+          msgs.filter((m) => m !== null)
         ),
-        baseSchema,
         ...(description
           ? [getDescription(valibotIdentifier, description)]
           : []),
diff --git a/codemod/zod-to-valibot/src/transform/schemas-and-links/schemas/date/date.ts b/codemod/zod-to-valibot/src/transform/schemas-and-links/schemas/date/date.ts
@@ -1,8 +1,10 @@
 import j from 'jscodeshift';
 import {
   getDescription,
+  getOptions,
   getSchemaComps,
   getSchemaWithOptionalDescription,
+  getTransformedMsgs,
 } from '../helpers';
 
 export function transformDate(
@@ -18,45 +20,28 @@ export function transformDate(
     coerceSchema
   );
   if (coerce) {
+    const optionsArg =
+      args.length > 0 && args[args.length - 1]?.type === 'ObjectExpression'
+        ? args[args.length - 1]
+        : null;
+    const msgs = getTransformedMsgs(getOptions(optionsArg));
     return j.callExpression(
       j.memberExpression(j.identifier(valibotIdentifier), j.identifier('pipe')),
       [
         j.callExpression(
           j.memberExpression(
             j.identifier(valibotIdentifier),
-            j.identifier('any')
+            j.identifier('unknown')
           ),
           []
         ),
         j.callExpression(
           j.memberExpression(
             j.identifier(valibotIdentifier),
-            j.identifier('transform')
+            j.identifier('toDate')
           ),
-          [
-            j.arrowFunctionExpression(
-              [j.identifier('input')],
-              j.blockStatement([
-                j.tryStatement(
-                  j.blockStatement([
-                    j.returnStatement(
-                      j.newExpression(j.identifier('Date'), [
-                        j.identifier('input'),
-                      ])
-                    ),
-                  ]),
-                  j.catchClause(
-                    null,
-                    null,
-                    j.blockStatement([j.returnStatement(j.identifier('input'))])
-                  )
-                ),
-              ]),
-              false
-            ),
-          ]
+          msgs.filter((m) => m !== null)
         ),
-        baseSchema,
         ...(description
           ? [getDescription(valibotIdentifier, description)]
           : []),
diff --git a/codemod/zod-to-valibot/src/transform/schemas-and-links/schemas/helpers.ts b/codemod/zod-to-valibot/src/transform/schemas-and-links/schemas/helpers.ts
@@ -34,10 +34,10 @@ export function getTransformedMsgs(schemaOptions: SchemaOptionsToASTVal) {
 }
 
 export function getOption(
-  optionsArgs: j.CallExpression['arguments'][number],
+  optionsArgs: j.CallExpression['arguments'][number] | null,
   optionName: string
 ) {
-  if (optionsArgs.type !== 'ObjectExpression') {
+  if (!optionsArgs || optionsArgs.type !== 'ObjectExpression') {
     return null;
   }
   const optionVals = optionsArgs.properties
@@ -49,7 +49,7 @@ export function getOption(
         : null
     )
     .filter((v) => v !== null);
-  const optionVal = optionVals.at(0);
+  const optionVal = optionVals[0];
   return optionVal === undefined ||
     optionVal.type === 'RestElement' ||
     optionVal.type === 'SpreadElementPattern' ||
@@ -64,7 +64,7 @@ export function getOption(
 }
 
 export function getOptions(
-  optionsArgs: j.CallExpression['arguments'][number]
+  optionsArgs: j.CallExpression['arguments'][number] | null
 ): Partial<
   Record<
     'description' | 'invalid_type_error' | 'required_error' | 'message',
diff --git a/codemod/zod-to-valibot/src/transform/schemas-and-links/schemas/number/number.ts b/codemod/zod-to-valibot/src/transform/schemas-and-links/schemas/number/number.ts
@@ -1,8 +1,10 @@
 import j from 'jscodeshift';
 import {
   getDescription,
+  getOptions,
   getSchemaComps,
   getSchemaWithOptionalDescription,
+  getTransformedMsgs,
 } from '../helpers';
 
 export function transformNumber(
@@ -18,6 +20,11 @@ export function transformNumber(
     coerceSchema
   );
   if (coerce) {
+    const optionsArg =
+      args.length > 0 && args[args.length - 1]?.type === 'ObjectExpression'
+        ? args[args.length - 1]
+        : null;
+    const msgs = getTransformedMsgs(getOptions(optionsArg));
     return j.callExpression(
       j.memberExpression(j.identifier(valibotIdentifier), j.identifier('pipe')),
       [
@@ -31,11 +38,10 @@ export function transformNumber(
         j.callExpression(
           j.memberExpression(
             j.identifier(valibotIdentifier),
-            j.identifier('transform')
+            j.identifier('toNumber')
           ),
-          [j.identifier('Number')]
+          msgs.filter((m) => m !== null)
         ),
-        baseSchema,
         ...(description
           ? [getDescription(valibotIdentifier, description)]
           : []),
diff --git a/codemod/zod-to-valibot/src/transform/schemas-and-links/schemas/string/string.ts b/codemod/zod-to-valibot/src/transform/schemas-and-links/schemas/string/string.ts
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,9 @@`
`34`	`34`	`"@types/node": "^24.10.1",`
`35`	`35`	`"tsdown": "^0.16.6",`
`36`	`36`	`"typescript": "^5.9.3",`
	`37`	`+ "valibot": "workspace:*",`
`37`	`38`	`"vite-plugin-node-polyfills": "^0.24.0",`
`38`		`- "vitest": "^4.0.13"`
	`39`	`+ "vitest": "^4.0.13",`
	`40`	`+ "zod": "^3.25.76"`
`39`	`41`	`}`
`40`	`42`	`}`