fix: recursively resolve and dereference extended refs

lib/bundle/index.js

@@ -78,14 +78,7 @@ function crawl (parent, key, path, pathFromRoot, indirections, inventory, $refs,
       for (let key of keys) {
         let keyPath = Pointer.join(path, key);
         let keyPathFromRoot = Pointer.join(pathFromRoot, key);
-        let value = obj[key];
-
-        if ($Ref.isAllowed$Ref(value)) {
-          inventory$Ref(obj, key, path, keyPathFromRoot, indirections, inventory, $refs, options, customRoots);
-        }
-        else {
-          crawl(obj, key, keyPath, keyPathFromRoot, indirections, inventory, $refs, options, customRoots);
-        }
+        crawl(obj, key, keyPath, keyPathFromRoot, indirections, inventory, $refs, options, customRoots);
       }
     }
   }

lib/resolve-external.js

@@ -82,15 +82,15 @@ function crawl (obj, path, $refs, options, external, seen) {
         }
         obj.$ref = withoutHash + obj.$ref;
       }
+    }
 
-      for (let key of Object.keys(obj)) {
-        let keyPath = Pointer.join(path, key);
-        let value = obj[key];
+    for (let key of Object.keys(obj)) {
+      let keyPath = Pointer.join(path, key);
+      let value = obj[key];
 
-        promises = promises.concat(
-          crawl(value, keyPath, $refs, options, external, seen)
-        );
-      }
+      promises = promises.concat(
+        crawl(value, keyPath, $refs, options, external, seen)
+      );
     }
   }
 

test/specs/nested-extended/dereferenced.js

@@ -0,0 +1,16 @@
+"use strict";
+
+module.exports = {
+  const: "root",
+  objectchild: {
+    const: "object-child",
+  },
+  arraychild: [
+    {
+      const: "array-child",
+    },
+  ],
+  local: {
+    const: "local",
+  }
+};

test/specs/nested-extended/nested-extended.spec.js

@@ -0,0 +1,51 @@
+"use strict";
+
+const chai = require("chai");
+const chaiSubset = require("chai-subset");
+chai.use(chaiSubset);
+const { expect } = chai;
+const $RefParser = require("../../../lib");
+const helper = require("../../utils/helper");
+const path = require("../../utils/path");
+const parsedSchema = require("./parsed");
+const dereferencedSchema = require("./dereferenced");
+
+describe("Schema with a $ref nested inside an extended $ref", () => {
+  it("should parse successfully", async () => {
+    let parser = new $RefParser();
+    const schema = await parser.parse(
+      path.rel("specs/nested-extended/nested-extended.yaml")
+    );
+    expect(schema).to.equal(parser.schema);
+    expect(schema).to.deep.equal(parsedSchema.schema);
+    expect(parser.$refs.paths()).to.deep.equal([
+      path.abs("specs/nested-extended/nested-extended.yaml"),
+    ]);
+  });
+
+  it("should resolve successfully", helper.testResolve(
+    path.rel("specs/nested-extended/nested-extended.yaml"),
+    path.abs("specs/nested-extended/nested-extended.yaml"), parsedSchema.schema,
+    path.abs("specs/nested-extended/referenced-root.yaml"), parsedSchema.root,
+    path.abs("specs/nested-extended/referenced-object-child.yaml"), parsedSchema.objectchild,
+    path.abs("specs/nested-extended/referenced-array-child.yaml"), parsedSchema.arraychild
+  ));
+
+  it("should dereference successfully", async () => {
+    let parser = new $RefParser();
+    const schema = await parser.dereference(
+      path.rel("specs/nested-extended/nested-extended.yaml")
+    );
+    expect(schema).to.equal(parser.schema);
+    expect(schema).to.deep.equal(dereferencedSchema);
+  });
+
+  it("should bundle successfully", async () => {
+    let parser = new $RefParser();
+    const schema = await parser.bundle(
+      path.rel("specs/nested-extended/nested-extended.yaml")
+    );
+    expect(schema).to.equal(parser.schema);
+    expect(schema).to.deep.equal(dereferencedSchema);
+  });
+});

test/specs/nested-extended/nested-extended.yaml

@@ -0,0 +1,10 @@
+$ref: "referenced-root.yaml"
+objectchild:
+  $ref: "referenced-object-child.yaml"
+arraychild:
+  - $ref: "referenced-array-child.yaml"
+local:
+  $ref: "#/$defs/local"
+$defs:
+  local:
+    const: "local"

test/specs/nested-extended/parsed.js

@@ -0,0 +1,35 @@
+"use strict";
+
+module.exports = {
+  schema: {
+    $ref: "referenced-root.yaml",
+    objectchild: {
+      $ref: "referenced-object-child.yaml",
+    },
+    arraychild: [
+      {
+        $ref: "referenced-array-child.yaml",
+      },
+    ],
+    local: {
+      $ref: "#/$defs/local",
+    },
+    $defs: {
+      local: {
+        const: "local",
+      },
+    },
+  },
+
+  root: {
+    const: "root",
+  },
+
+  objectchild: {
+    const: "object-child",
+  },
+
+  arraychild: {
+    const: "array-child",
+  },
+};

test/specs/nested-extended/referenced-array-child.yaml

@@ -0,0 +1 @@
+const: "array-child"

test/specs/nested-extended/referenced-object-child.yaml

@@ -0,0 +1 @@
+const: "object-child"

test/specs/nested-extended/referenced-root.yaml

@@ -0,0 +1 @@
+const: "root"