Fixed a bug with URI-encoding of JSON Pointers

Author: JamesMessinger

dist/ref-parser.js

@@ -155,8 +155,8 @@ function crawl(obj, path, parents, $refs, options) {
 
         // Check for circular references
         var circular = pointer.circular || parents.indexOf(pointer.value) !== -1;
-        $refs.circular = $refs.circular || true;
-        if (!options.$refs.circular) {
+        $refs.circular = $refs.circular || circular;
+        if ($refs.circular && !options.$refs.circular) {
           throw ono.reference('Circular $ref pointer found at %s', keyPath);
         }
 
@@ -861,10 +861,10 @@ Pointer.join = function(base, tokens) {
   for (var i = 0; i < tokens.length; i++) {
     var token = tokens[i];
     // Encode the token, according to RFC 6901
-    base += '/' + token.replace(tildes, '~0').replace(slashes, '~1');
+    base += '/' + encodeURI(token.replace(tildes, '~0').replace(slashes, '~1'));
   }
 
-  return encodeURI(base);
+  return base;
 };
 
 /**
@@ -967,7 +967,7 @@ function read(path, $refs, options) {
     // Return from cache, if possible
     var $ref = $refs._get$Ref(path);
     if ($ref && !$ref.isExpired()) {
-      util.debug('    cached from %s', $ref.type);
+      util.debug('    cached from %s', $ref.pathType);
       return Promise.resolve({
         $ref: $ref,
         cached: true

dist/ref-parser.js.map

@@ -182,10 +182,10 @@ Pointer.join = function(base, tokens) {
   for (var i = 0; i < tokens.length; i++) {
     var token = tokens[i];
     // Encode the token, according to RFC 6901
-    base += '/' + token.replace(tildes, '~0').replace(slashes, '~1');
+    base += '/' + encodeURI(token.replace(tildes, '~0').replace(slashes, '~1'));
   }
 
-  return encodeURI(base);
+  return base;
 };
 
 /**

dist/ref-parser.min.js

@@ -30,10 +30,10 @@ describe('Schema with deeply-nested $refs', function() {
 
         // Reference equality
         expect(schema.properties.name.type)
-          .to.equal(schema.properties.level1.properties.name.type)
-          .to.equal(schema.properties.level1.properties.level2.properties.name.type)
-          .to.equal(schema.properties.level1.properties.level2.properties.level3.properties.name.type)
-          .to.equal(schema.properties.level1.properties.level2.properties.level3.properties.level4.properties.name.type);
+          .to.equal(schema.properties['level 1'].properties.name.type)
+          .to.equal(schema.properties['level 1'].properties['level 2'].properties.name.type)
+          .to.equal(schema.properties['level 1'].properties['level 2'].properties['level 3'].properties.name.type)
+          .to.equal(schema.properties['level 1'].properties['level 2'].properties['level 3'].properties['level 4'].properties.name.type);
 
         done();
       })