Move object dependencies to manifest. For #1867

hapijs · Jul 9, 2019 · 337952f · 337952f
1 parent b8dab8a
commit 337952f
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 13 deletions.
diff --git a/lib/manifest.js b/lib/manifest.js
@@ -153,7 +153,7 @@ exports.describe = function (schema) {
 
     // Inners
 
-    const inners = ['renames', 'patterns', 'notes', 'tags', 'meta', 'examples', 'alterations', 'externals', 'items', 'ordered', 'matches', 'map', 'truthy', 'falsy'];
+    const inners = ['dependencies', 'renames', 'patterns', 'notes', 'tags', 'meta', 'examples', 'alterations', 'externals', 'items', 'ordered', 'matches', 'map', 'truthy', 'falsy'];
     for (const inner of inners) {
         //    for (const inner in schema._inners) {
         const items = schema._inners[inner];
@@ -195,9 +195,7 @@ exports.describe = function (schema) {
 
 internals.inner = function (item) {
 
-    if (Common.isSchema(item) ||
-        Common.isResolvable(item)) {
-
+    if (typeof item.describe === 'function') {
         return item.describe();
     }
 

diff --git a/lib/types/object.js b/lib/types/object.js
@@ -325,14 +325,6 @@ internals.Object = class extends Any {
             }
         }
 
-        if (this._inners.dependencies) {
-            description.dependencies = [];
-            for (const dep of this._inners.dependencies) {
-                const { type, key, paths } = dep;
-                description.dependencies.push({ type, key: key.key, peers: paths });
-            }
-        }
-
         return description;
     }
 
@@ -605,7 +597,7 @@ internals.Object = class extends Any {
 
         const obj = this.clone();
         obj._inners.dependencies = obj._inners.dependencies || [];
-        obj._inners.dependencies.push({ type, key, peers: paths, paths: peers });
+        obj._inners.dependencies.push(new internals.Dependency(type, key, paths, peers));
         return obj;
     }
 
@@ -1017,4 +1009,25 @@ internals.clone = function (value, prefs) {
 };
 
 
+internals.Dependency = class {
+
+    constructor(type, key, peers, paths) {
+
+        this.type = type;
+        this.key = key;
+        this.peers = peers;
+        this.paths = paths;
+    }
+
+    describe() {
+
+        return {
+            type: this.type,
+            key: this.key.key,
+            peers: this.paths
+        };
+    }
+};
+
+
 module.exports = new internals.Object();