Added support for ZodPipeline.

Author: ciscoheat

CHANGELOG.md

@@ -33,6 +33,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added `superValidateSync`, useful on the client for SPA:s.
 - Added `defaultValues`, which takes a schema and returns the default values for it.
 - `options.resetForm` now works without `use:enhance`!
+- Support for `ZodPipeline`.
 
 ## [0.8.7] - 2023-05-22
 

src/index.test.ts

@@ -909,3 +909,29 @@ test('setMessage and setError with refined schema', async () => {
     id: ['Id error']
   });
 });
+
+test.only('Schema with pipe()', async () => {
+  const schema = z.object({
+    len: z
+      .string()
+      .transform((val) => val.length)
+      .pipe(z.number().min(5)),
+    date: z.union([z.number(), z.string(), z.date()]).pipe(z.coerce.date()),
+    num: z.number().or(z.string()).pipe(z.coerce.number())
+  });
+
+  const form = await superValidate(schema);
+  assert(form.valid === false);
+  expect(form.data.len).toEqual(0);
+  expect(form.data.num).toEqual(0);
+
+  const formData4 = new FormData();
+  formData4.set('len', 'four');
+  formData4.set('date', '2023-05-28');
+  formData4.set('num', '123');
+  const form4 = await superValidate(formData4, schema);
+  assert(form4.valid === false);
+  expect(form4.data.len).toBeNaN();
+  expect(form4.data.date.getDate()).toEqual(28);
+  expect(form4.data.num).toEqual(123);
+});

src/lib/schemaEntity.ts

@@ -24,7 +24,8 @@ import {
   ZodBigInt,
   ZodObject,
   ZodSymbol,
-  ZodRecord
+  ZodRecord,
+  ZodPipeline
 } from 'zod';
 
 import type { SuperValidateOptions } from './superValidate.js';
@@ -75,6 +76,8 @@ export function hasEffects(zodType: ZodTypeAny): boolean {
 }
 
 export function unwrapZodType(zodType: ZodTypeAny): ZodTypeInfo {
+  const originalType = zodType;
+
   let _wrapped = true;
   let isNullable = false;
   let isOptional = false;
@@ -98,13 +101,16 @@ export function unwrapZodType(zodType: ZodTypeAny): ZodTypeInfo {
     } else if (zodType._def.typeName == 'ZodEffects') {
       if (!effects) effects = zodType as ZodEffects<ZodTypeAny>;
       zodType = zodType._def.schema;
+    } else if (zodType._def.typeName == 'ZodPipeline') {
+      zodType = (zodType as ZodPipeline<ZodTypeAny, ZodTypeAny>)._def.out;
     } else {
       _wrapped = false;
     }
   }
 
   return {
     zodType,
+    originalType,
     isNullable,
     isOptional,
     hasDefault,

src/lib/superValidate.ts

@@ -121,16 +121,9 @@ function formDataToValidation<T extends AnyZodObject>(
   ) {
     if (entry && typeof entry !== 'string') {
       // File object, not supported
-      /*
-      throw new SuperFormError(
-        `Field "${key}" contains a file, which is not supported by Superforms. Remove it from the schema and use FormData directly instead.`
-      );
-      return (entry.valueOf() as File).name;
-      return entry as File;
-      */
       return undefined;
     } else {
-      return parseEntry(key, entry, typeInfo);
+      return parseFormDataEntry(key, entry, typeInfo);
     }
   }
 
@@ -146,7 +139,7 @@ function formDataToValidation<T extends AnyZodObject>(
     }
   }
 
-  function parseEntry(
+  function parseFormDataEntry(
     field: string,
     value: string | null,
     typeInfo: ZodTypeInfo
@@ -171,7 +164,7 @@ function formDataToValidation<T extends AnyZodObject>(
       return new Date(value ?? '');
     } else if (zodType instanceof ZodArray) {
       const arrayType = unwrapZodType(zodType._def.type);
-      return parseEntry(field, value, arrayType);
+      return parseFormDataEntry(field, value, arrayType);
     } else if (zodType instanceof ZodBigInt) {
       try {
         return BigInt(value ?? '.');
@@ -521,6 +514,7 @@ export function superValidateSync<
     output = emptyResultToValidation(result, entityInfo, addErrors);
   } else {
     const result = originalSchema.safeParse(data);
+
     output = resultToValidation(
       result,
       entityInfo,

src/lib/traversal.ts

@@ -9,6 +9,7 @@ import type { MaybePromise } from '$app/forms';
 
 export type ZodTypeInfo = {
   zodType: ZodTypeAny;
+  originalType: ZodTypeAny;
   isNullable: boolean;
   isOptional: boolean;
   hasDefault: boolean;