Full types manifest support. For #1867

hapijs · Jul 23, 2019 · 45861ac · 45861ac
1 parent 4ebeffd
commit 45861ac
Show file tree

Hide file tree

Showing 6 changed files with 99 additions and 32 deletions.
diff --git a/lib/manifest.js b/lib/manifest.js
@@ -11,7 +11,6 @@ let Schemas;
 
 
 const internals = {
-    nonInners: ['allow', 'flags', 'invalid', 'keys', 'preferences', 'rules', 'type'],
     flagDefaults: {
         cast: false,
         func: false,
@@ -337,7 +336,22 @@ internals.Builder = class {
 
         const inners = {};
         for (const key in desc) {
-            if (internals.nonInners.includes(key)) {
+            if (['allow', 'flags', 'invalid', 'keys', 'preferences', 'rules', 'type'].includes(key)) {
+                continue;
+            }
+
+            if (['items', 'ordered'].includes(key)) {
+                inners[key] = desc[key].map((item) => this.parse(item));
+                continue;
+            }
+
+            if (['falsy', 'truthy'].includes(key)) {
+                inners[key] = desc[key].map((item) => this.build(item));
+                continue;
+            }
+
+            if (key === 'link') {
+                inners.link = this.build(desc.link);
                 continue;
             }
 
@@ -373,36 +387,6 @@ internals.Builder = class {
             schema = schema._build(inners);
         }
 
-        /*
-        // Inners
-
-        for (const inner in schema._inners) {
-
-            if (items instanceof Map) {
-                if (items.size) {
-                    description[inner] = [...items.entries()];
-                }
-
-                continue;
-            }
-
-            if (Common.isValues(items)) {
-                if (items.length) {
-                    description[inner] = items.describe();
-                }
-
-                continue;
-            }
-
-            let normalized = [];
-            for (const item of items) {
-                normalized.push(internals.describe(item));
-            }
-
-            description[inner] = inner === 'link' ? normalized[0] : normalized;
-        }
-        */
-
         return schema;
     }
 

diff --git a/lib/types/array.js b/lib/types/array.js
@@ -103,6 +103,21 @@ internals.Array = class extends Any {
         }
     }
 
+    _build(desc) {
+
+        let obj = this;                                     // eslint-disable-line consistent-this
+
+        if (desc.items) {
+            obj = obj.items(...desc.items);
+        }
+
+        if (desc.ordered) {
+            obj = obj.ordered(...desc.ordered);
+        }
+
+        return obj;
+    }
+
     // Rules
 
     has(schema) {

diff --git a/lib/types/boolean.js b/lib/types/boolean.js
@@ -47,6 +47,21 @@ internals.Boolean = class extends Any {
         }
     }
 
+    _build(desc) {
+
+        let obj = this;                                     // eslint-disable-line consistent-this
+
+        if (desc.truthy) {
+            obj = obj.truthy(...desc.truthy);
+        }
+
+        if (desc.falsy) {
+            obj = obj.falsy(...desc.falsy);
+        }
+
+        return obj;
+    }
+
     // Rules
 
     truthy(...values) {

diff --git a/lib/types/link.js b/lib/types/link.js
@@ -54,6 +54,11 @@ internals.Link = class extends Any {
         return schema._validate(value, state, prefs);
     }
 
+    _build(desc) {
+
+        return this.ref(desc.link);
+    }
+
     // Rules
 
     ref(ref) {

diff --git a/lib/types/symbol.js b/lib/types/symbol.js
@@ -41,6 +41,13 @@ internals.Symbol = class extends Any {
         }
     }
 
+    _build(desc) {
+
+        let obj = this;                                     // eslint-disable-line consistent-this
+        obj = obj.map(desc.map);
+        return obj;
+    }
+
     // Rules
 
     map(iterable) {

diff --git a/test/manifest.js b/test/manifest.js
@@ -353,6 +353,32 @@ describe('Manifest', () => {
             ]);
         });
 
+        it('builds arrays', () => {
+
+            internals.test([
+                Joi.array().min(1).items(Joi.number()),
+                Joi.array().has(Joi.string()),
+                Joi.array().ordered(Joi.number(), Joi.boolean(), Joi.binary())
+            ]);
+        });
+
+        it('builds booleans', () => {
+
+            internals.test([
+                Joi.boolean().truthy('x'),
+                Joi.boolean().falsy(Joi.ref('$x')),
+                Joi.boolean().truthy(3).falsy(4)
+            ]);
+        });
+
+        it('builds links', () => {
+
+            internals.test([
+                Joi.link('....'),
+                Joi.link(Joi.ref('xxx....', { separator: 'x' }))
+            ]);
+        });
+
         it('builds objects', () => {
 
             internals.test([
@@ -374,6 +400,21 @@ describe('Manifest', () => {
                 Joi.string().replace(/x/, 'X')
             ]);
         });
+
+        it('builds strings', () => {
+
+            internals.test([
+                Joi.string().min(1).max(10).pattern(/\d*/),
+                Joi.string().replace(/x/, 'X')
+            ]);
+        });
+
+        it('builds symbols', () => {
+
+            internals.test([
+                Joi.symbol().map([['a', Symbol('a')]])
+            ]);
+        });
     });
 });