Merge pull request #85 from hckrnews/fix-optional-keys

Fix the optional keys
trojs · Apr 16, 2021 · 007e4ca · 007e4ca
2 parents acb9a77 + 71c684c
commit 007e4ca
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 6 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@hckrnews/objects",
     "description": "Hack JavaScript objects",
-    "version": "2.2.2",
+    "version": "2.2.3",
     "author": {
         "name": "Pieter Wigboldus",
         "url": "https://hckr.news/"

diff --git a/src/objects.js b/src/objects.js
@@ -32,7 +32,21 @@ const ObjectGenerator = ({ schema } = {}) =>
         }
 
         get subSchema() {
-            return this.subPrefix ? schema[this.subPrefix] : schema;
+            const subSchema = this.subPrefix ? schema[this.subPrefix] : schema;
+
+            if (subSchema) {
+                return subSchema;
+            }
+
+            if (schema[`${this.subPrefix}?`]) {
+                return schema[`${this.subPrefix}?`];
+            }
+
+            if (schema[`?${this.subPrefix}`]) {
+                return schema[`?${this.subPrefix}`];
+            }
+
+            return null;
         }
 
         get validator() {
@@ -48,6 +62,10 @@ const ObjectGenerator = ({ schema } = {}) =>
         validate() {
             const { validator } = this;
 
+            if (!validator) {
+                return;
+            }
+
             this.originalData.forEach((data) => {
                 if (!validator.validate(data)) {
                     const [field, type] = validator.errors[0];

diff --git a/src/schemas/test1.js b/src/schemas/test1.js
@@ -3,6 +3,6 @@ import Test3Schema from './test3';
 
 export default {
     name: String,
-    test: Test2,
-    test3: Test3Schema
+    '?test': Test2,
+    'test3?': Test3Schema
 };