Fix deep nested dynamis types validation

talyssonoc · Jun 15, 2020 · d2059dd · d2059dd
1 parent 1da1204
commit d2059dd
Show file tree

Hide file tree

Showing 7 changed files with 76 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 2.0.1 - 2020-06-15
+
+Fix:
+
+- Fix deep nested dynamic types validation
+
 ## 2.0.0 - 2020-03-31
 
 Refactors:

diff --git a/lerna.json b/lerna.json
@@ -1,6 +1,6 @@
 {
   "packages": ["packages/*"],
-  "version": "2.0.0",
+  "version": "2.0.1",
   "npmClient": "yarn",
   "useWorkspaces": true
 }
diff --git a/packages/jest-structure/package.json b/packages/jest-structure/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jest-structure",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "Jest assertions to use with Structure",
   "main": "index.js",
   "author": "Talysson <talyssonoc@gmail.com>",
@@ -15,7 +15,7 @@
     "node": ">=10.13.0"
   },
   "devDependencies": {
-    "structure": "2.0.0"
+    "structure": "2.0.1"
   },
   "peerDependencies": {
     "jest": "^25.1.0"

diff --git a/packages/structure/dist/structure.js b/packages/structure/dist/structure.js
diff --git a/packages/structure/package.json b/packages/structure/package.json
@@ -1,6 +1,6 @@
 {
   "name": "structure",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "A simple schema/attributes library built on top of modern JavaScript",
   "main": "src/index.js",
   "browser": "dist/structure.js",
@@ -52,7 +52,7 @@
     "babel-loader": "^8.1.0",
     "coveralls": "^3.1.0",
     "electron": "^9.0.0",
-    "jest-structure": "2.0.0",
+    "jest-structure": "2.0.1",
     "webpack": "^4.41.2",
     "webpack-cli": "^3.3.9"
   }

diff --git a/packages/structure/src/validation/validations/nested.js b/packages/structure/src/validation/validations/nested.js
@@ -45,20 +45,32 @@ function getNestedValidations(typeSchema) {
   return joiSchema;
 }
 
-exports.resolveDynamicLinks = function resolveDynamicLinks({ schema, joiValidation }) {
+const resolveDynamicLinks = function resolveDynamicLinks({ schema, joiValidation }) {
   return schema.attributeDefinitions.reduce((joiValidation, attributeDefinition) => {
     if (!attributeDefinition.hasDynamicType) {
       return joiValidation;
     }
 
     const type = attributeDefinition.resolveType();
+    const nestedSchema = type[SCHEMA];
 
-    if (!type[SCHEMA]) {
+    // warning: uses Joi internals
+    // https://github.com/hapijs/joi/blob/v16.1.8/lib/types/any.js#L72 ⤵
+    // https://github.com/hapijs/joi/blob/v16.1.8/lib/base.js#L699 ⤵
+    // https://github.com/hapijs/joi/blob/v16.1.8/lib/modify.js#L149
+    if (!nestedSchema || joiValidation._ids._get(nestedSchema.identifier)) {
       return joiValidation;
     }
 
-    const attributeValidation = type[SCHEMA].validation;
+    const attributeValidation = nestedSchema.validation;
 
-    return joiValidation.shared(attributeValidation.joiValidation);
+    const sharedValidation = joiValidation.shared(attributeValidation.joiValidation);
+
+    return resolveDynamicLinks({
+      schema: nestedSchema,
+      joiValidation: sharedValidation,
+    });
   }, joiValidation);
 };
+
+exports.resolveDynamicLinks = resolveDynamicLinks;
diff --git a/packages/structure/test/unit/validation/nestedStructure.spec.js b/packages/structure/test/unit/validation/nestedStructure.spec.js
@@ -421,5 +421,53 @@ describe('validation', () => {
         });
       });
     });
+
+    describe('when nesting is deep', () => {
+      it('validates properly', () => {
+        const Vehicle = attributes({
+          year: {
+            type: Number,
+            required: true,
+          },
+        })(class Vehicle {});
+
+        const UserPersonalInformation = attributes(
+          {
+            name: String,
+            vehicle: 'Vehicle',
+          },
+          {
+            dynamics: {
+              Vehicle: () => Vehicle,
+            },
+          }
+        )(class UserPersonalInformation {});
+
+        const AutoRiskProfile = attributes(
+          {
+            userPersonalInformation: {
+              type: 'UserPersonalInformation',
+              required: true,
+            },
+          },
+          {
+            dynamics: {
+              UserPersonalInformation: () => UserPersonalInformation,
+            },
+          }
+        )(class AutoRiskProfile {});
+
+        expect(() => {
+          AutoRiskProfile.buildStrict({
+            userPersonalInformation: new UserPersonalInformation({
+              name: 'a',
+              vehicle: new Vehicle({
+                year: 2018,
+              }),
+            }),
+          });
+        }).not.toThrow();
+      });
+    });
   });
 });