Do not roll up references in the root document

Fixes #112
whitlockjc · Apr 25, 2017 · 74f24a1 · 74f24a1
1 parent e863a9c
commit 74f24a1
Show file tree

Hide file tree

Showing 6 changed files with 329 additions and 292 deletions.
diff --git a/browser/json-refs-min.js b/browser/json-refs-min.js
diff --git a/browser/json-refs-standalone-min.js b/browser/json-refs-standalone-min.js
diff --git a/browser/json-refs-standalone.js b/browser/json-refs-standalone.js
diff --git a/browser/json-refs.js b/browser/json-refs.js
diff --git a/index.js b/index.js
@@ -1274,11 +1274,14 @@ function resolveRefs (obj, options) {
       });
 
       function walkRefs (root, refPtr, refPath) {
+        var refPtrParts = refPtr.split('#');
         var refDetails = results.refs[refPtr];
         var refDeps;
 
-        // Record the reference (relative to the root document)
-        allRefs[pathToPtr(options.subDocPath.concat(refPath))] = refDetails;
+        // Record the reference (relative to the root document unless the reference is in the root document)
+        allRefs[refPtrParts[0] === options.location ?
+                  '#' + refPtrParts[1] :
+                  pathToPtr(options.subDocPath.concat(refPath))] = refDetails;
 
         // Do not walk invalid references
         if (refDetails.circular || !isValid(refDetails)) {