Merge d842000 into 1622b11

Author: olehmisar

src/index.test.ts

@@ -219,6 +219,20 @@ test('Optional values', async () => {
   expect(output.errors).toStrictEqual({});
 });
 
+test('Branded values', async () => {
+  const schema = z.object({
+    name: z.string().brand('name'),
+  });
+
+  const data = new FormData();
+  data.append('name', 'Name');
+  const output = await superValidate(data, schema);
+  expect(output.valid).equals(true);
+  expect(output.message).toBeUndefined();
+  expect(output.data.name).equals('Name');
+  expect(output.errors).toStrictEqual({});
+});
+
 describe('Default values', () => {
   test('With a partial entity', async () => {
     const now = new Date();
@@ -801,7 +815,7 @@ test('Passthrough validation', async () => {
   });
 });
 
-test.only('Preprocessed fields', async () => {
+test('Preprocessed fields', async () => {
   const schema = z.object({
     tristate: z.preprocess(
       (value) => (value === undefined ? undefined : Boolean(value)),

src/lib/superValidate.ts

@@ -24,6 +24,8 @@ import { traversePath } from './traversal.js';
 import type {
   z,
   AnyZodObject,
+  ZodBranded,
+  ZodTypeAny,
   ZodNumber,
   ZodLiteral,
   ZodNativeEnum,
@@ -194,7 +196,10 @@ function formDataToValidation<T extends AnyZodObject>(
     typeInfo: ZodTypeInfo
   ): unknown {
     const newValue = valueOrDefault(value, false, true, typeInfo);
-    const zodType = typeInfo.zodType;
+    const zodType: ZodTypeAny =
+      typeInfo.zodType._def.typeName === 'ZodBranded'
+        ? (typeInfo.zodType as ZodBranded<any, any>).unwrap()
+        : typeInfo.zodType;
 
     // If the value was empty, it now contains the default value,
     // so it can be returned immediately, unless it's boolean, which