feat: merge schema defaults during cast for yup and valibot

logaretm · Sep 10, 2023 · c372718 · c372718
1 parent 51b6865
commit c372718
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 3 deletions.
diff --git a/packages/valibot/src/index.ts b/packages/valibot/src/index.ts
@@ -1,7 +1,17 @@
 import { PartialDeep } from 'type-fest';
 import type { TypedSchema, TypedSchemaError } from 'vee-validate';
-import { Output, Input, BaseSchema, BaseSchemaAsync, safeParseAsync, safeParse, Issue } from 'valibot';
-import { normalizeFormPath } from '../../shared';
+import {
+  Output,
+  Input,
+  BaseSchema,
+  BaseSchemaAsync,
+  safeParseAsync,
+  safeParse,
+  Issue,
+  getDefault,
+  optional,
+} from 'valibot';
+import { isObject, merge, normalizeFormPath } from '../../shared';
 
 export function toTypedSchema<
   TSchema extends BaseSchema | BaseSchemaAsync,
@@ -32,8 +42,16 @@ export function toTypedSchema<
       }
 
       const result = safeParse(valibotSchema, values);
+      if (result.success) {
+        return result.data;
+      }
+
+      const defaults = getDefault(optional(valibotSchema));
+      if (isObject(defaults) && isObject(values)) {
+        return merge(defaults, values);
+      }
 
-      return result.success ? result.data : values;
+      return values;
     },
   };
 

diff --git a/packages/yup/src/index.ts b/packages/yup/src/index.ts
@@ -1,6 +1,7 @@
 import { InferType, Schema, ValidateOptions, ValidationError } from 'yup';
 import { TypedSchema, TypedSchemaError } from 'vee-validate';
 import { PartialDeep } from 'type-fest';
+import { isObject, merge } from '../../shared';
 
 export function toTypedSchema<TSchema extends Schema, TOutput = InferType<TSchema>, TInput = PartialDeep<TOutput>>(
   yupSchema: TSchema,
@@ -51,6 +52,11 @@ export function toTypedSchema<TSchema extends Schema, TOutput = InferType<TSchem
       try {
         return yupSchema.cast(values);
       } catch {
+        const defaults = yupSchema.getDefault();
+        if (isObject(defaults) && isObject(values)) {
+          return merge(defaults, values);
+        }
+
         return values;
       }
     },