fix: ajv resolver to work with unlimited layers of nesting (#412)

react-hook-form · Jun 10, 2022 · 692fe65 · 692fe65
1 parent 0cad904
commit 692fe65
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 3 deletions.
diff --git a/ajv/src/__tests__/__fixtures__/data.ts b/ajv/src/__tests__/__fixtures__/data.ts
@@ -4,7 +4,7 @@ import { Field, InternalFieldName } from 'react-hook-form';
 interface Data {
   username: string;
   password: string;
-  deepObject: { data: string };
+  deepObject: { data: string; twoLayersDeep: { name: string } };
 }
 
 export const schema: JSONSchemaType<Data> = {
@@ -26,8 +26,14 @@ export const schema: JSONSchemaType<Data> = {
       nullable: true,
       properties: {
         data: { type: 'string' },
+        twoLayersDeep: {
+          type: 'object',
+          properties: { name: { type: 'string' } },
+          additionalProperties: false,
+          required: ['name'],
+        },
       },
-      required: ['data'],
+      required: ['data', 'twoLayersDeep'],
     },
   },
   required: ['username', 'password', 'deepObject'],
@@ -38,6 +44,9 @@ export const validData: Data = {
   username: 'jsun969',
   password: 'validPassword',
   deepObject: {
+    twoLayersDeep: {
+      name: 'deeper',
+    },
     data: 'data',
   },
 };
@@ -47,6 +56,7 @@ export const invalidData = {
   password: 'invalid-password',
   deepObject: {
     data: 233,
+    twoLayersDeep: { name: 123 }
   },
 };
 

diff --git a/ajv/src/__tests__/__snapshots__/ajv.ts.snap b/ajv/src/__tests__/__snapshots__/ajv.ts.snap
@@ -66,6 +66,16 @@ Object {
           "type": "must be string",
         },
       },
+      "twoLayersDeep": Object {
+        "name": Object {
+          "message": "must be string",
+          "ref": undefined,
+          "type": "type",
+          "types": Object {
+            "type": "must be string",
+          },
+        },
+      },
     },
     "password": Object {
       "message": "One uppercase character",
@@ -104,6 +114,16 @@ Object {
           "type": "must be string",
         },
       },
+      "twoLayersDeep": Object {
+        "name": Object {
+          "message": "must be string",
+          "ref": undefined,
+          "type": "type",
+          "types": Object {
+            "type": "must be string",
+          },
+        },
+      },
     },
     "password": Object {
       "message": "One uppercase character",
@@ -139,6 +159,13 @@ Object {
         "ref": undefined,
         "type": "type",
       },
+      "twoLayersDeep": Object {
+        "name": Object {
+          "message": "must be string",
+          "ref": undefined,
+          "type": "type",
+        },
+      },
     },
     "password": Object {
       "message": "One uppercase character",
@@ -168,6 +195,13 @@ Object {
         "ref": undefined,
         "type": "type",
       },
+      "twoLayersDeep": Object {
+        "name": Object {
+          "message": "must be string",
+          "ref": undefined,
+          "type": "type",
+        },
+      },
     },
     "password": Object {
       "message": "One uppercase character",

diff --git a/ajv/src/ajv.ts b/ajv/src/ajv.ts
@@ -17,7 +17,7 @@ const parseErrorSchema = (
 
   return ajvErrors.reduce<Record<string, FieldError>>((previous, error) => {
     // `/deepObject/data` -> `deepObject.data`
-    const path = error.instancePath.substring(1).replace('/', '.');
+    const path = error.instancePath.substring(1).replace(/\//g, '.');
 
     if (!previous[path]) {
       previous[path] = {