fix(yup): lazy schema (#619)

react-hook-form · Aug 18, 2023 · c1d5433 · c1d5433
1 parent 4882173
commit c1d5433
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 2 deletions.
diff --git a/yup/src/__tests__/yup.ts b/yup/src/__tests__/yup.ts
@@ -189,4 +189,29 @@ describe('yupResolver', () => {
     expect(schemaSyncSpy).not.toHaveBeenCalled();
     expect(result).toEqual({ errors: {}, values: validData });
   });
+
+  it('shoud validate a lazy schema with success', async () => {
+    const lazySchema = yup.lazy(() => yup.object().shape({ firstName: yup.string().optional() }));
+
+    const schemaSpy = vi.spyOn(lazySchema, 'validate');
+    const schemaSyncSpy = vi.spyOn(lazySchema, 'validateSync');
+
+    const result = await yupResolver(lazySchema, undefined,)(
+      { firstName: "resolver" },
+      undefined,
+      {
+        fields: {
+          firstName: {
+            ref: { name: 'firstName' },
+            name: 'firstName',
+          }
+        },
+        shouldUseNativeValidation,
+      },
+    );
+
+    expect(schemaSpy).toHaveBeenCalledTimes(1);
+    expect(schemaSyncSpy).not.toHaveBeenCalled();
+    expect(result).toEqual({ errors: {}, values: { firstName: "resolver" } });
+  });
 });
diff --git a/yup/src/yup.ts b/yup/src/yup.ts
@@ -43,7 +43,7 @@ const parseErrorSchema = (
 };
 
 export function yupResolver<TFieldValues extends FieldValues>(
-  schema: Yup.ObjectSchema<TFieldValues>,
+  schema: Yup.ObjectSchema<TFieldValues> | ReturnType<typeof Yup.lazy>,
   schemaOptions: Parameters<(typeof schema)['validate']>[1] = {},
   resolverOptions: {
     /**
@@ -90,7 +90,7 @@ export function yupResolver<TFieldValues extends FieldValues>(
           parseErrorSchema(
             e,
             !options.shouldUseNativeValidation &&
-              options.criteriaMode === 'all',
+            options.criteriaMode === 'all',
           ),
           options,
         ),