Handle scoped only imports (#12)

Author: P0lip

lib/bundle/index.js

@@ -143,9 +143,7 @@ function inventory$Ref ($refParent, $refKey, path, pathFromRoot, indirections, i
 
  if (options.bundle.generateKey && file !== $refs._root$Ref.path) {
  if (!customRoots[file]) {
- customRoots[file] = {
- "#": options.bundle.generateKey($refs._root$Ref.value, file, null, pathFromRoot)
- };
+ customRoots[file] = {};
  }
 
  if (!(hash in customRoots[file])) {
@@ -252,7 +250,7 @@ function remap (schema, inventory, options, customRoots) {
  // console.log('Re-mapping $ref pointer "%s" at %s', entry.$ref.$ref, entry.pathFromRoot);
 
  // if entry is not inlineable and has a custom root linked, we need to remap the properties of the object
- if (customRoots[entry.file] && entry.hash in customRoots[entry.file] && customRoots[entry.file]["#"] !== null) {
+ if (customRoots[entry.file] && entry.hash in customRoots[entry.file] && typeof customRoots[entry.file]["#"] === "string") {
  if (entry.hash === "#") {
  // the whole file is referenced for the first time
  // we need to inject its entire content here

test/specs/custom-bundling-roots/custom-bundling-roots.spec.js

@@ -54,6 +54,105 @@ describe("Custom bundling roots", () => {
  });
  });
 
+ it("scoped references only", async () => {
+ let parser = new $RefParser();
+
+ const schema = await parser.bundle(path.rel("specs/custom-bundling-roots/n"), {
+ properties: {
+ test: {
+ type: {
+ $ref: "#/definitions/Number"
+ }
+ }
+ },
+ definitions: {
+ Number: {
+ type: {
+ $ref: "./id.json#/type"
+ }
+ },
+ Name: {
+ type: "string",
+ example: {
+ $ref: "./id.json#/name"
+ }
+ }
+ }
+ }, {
+ bundle: getDefaultsForOAS2(),
+ });
+
+ expect(schema).to.equal(parser.schema);
+ expect(schema).to.deep.equal({
+ properties: {
+ test: {
+ type: {
+ $ref: "#/definitions/Number"
+ }
+ }
+ },
+ definitions: {
+ Number: {
+ type: "number",
+ },
+ Name: {
+ example: "id",
+ type: "string"
+ }
+ }
+ });
+ });
+
+ it("scoped and full references", async () => {
+ let parser = new $RefParser();
+
+ const schema = await parser.bundle(path.rel("specs/custom-bundling-roots/n"), {
+ properties: {
+ test: {
+ type: {
+ $ref: "#/definitions/Number"
+ }
+ }
+ },
+ definitions: {
+ Number: {
+ type: {
+ $ref: "./id.json#/type"
+ }
+ },
+ Id: {
+ $ref: "./id.json"
+ }
+ }
+ }, {
+ bundle: getDefaultsForOAS2(),
+ });
+
+ expect(schema).to.equal(parser.schema);
+ expect(schema).to.deep.equal({
+ properties: {
+ test: {
+ type: {
+ $ref: "#/definitions/Number"
+ }
+ }
+ },
+ definitions: {
+ Number: {
+ type: {
+ $ref: "#/definitions/Id/type"
+ }
+ },
+ Id: {
+ type: "number",
+ name: "id",
+ in: "path",
+ required: true
+ }
+ }
+ });
+ });
+
  it("should handle $refs whose parents were remapped", async () => {
  setupHttpMocks({
  "http://localhost:8080/api/nodes.raw?srn=gh/stoplightio/test/Book.v1.yaml": {