Fixed a bug that failed to detect certain circular references

Author: JamesMessinger

dist/ref-parser.js

@@ -149,6 +149,7 @@ function crawl(obj, path, parents, $refs, options) {
     Object.keys(obj).forEach(function(key) {
       var keyPath = Pointer.join(path, key);
       var value = obj[key];
+      var circular = false;
 
       if ($Ref.isAllowed$Ref(value, options)) {
         // We found a $ref, so resolve it
@@ -157,8 +158,8 @@ function crawl(obj, path, parents, $refs, options) {
         var pointer = $refs._resolve($refPath, options);
 
         // Check for circular references
-        var circular = pointer.circular || parents.indexOf(pointer.value) !== -1;
-        circular && (isCircular = foundCircularReference(keyPath, $refs, options));
+        circular = pointer.circular || parents.indexOf(pointer.value) !== -1;
+        circular && foundCircularReference(keyPath, $refs, options);
 
         // Dereference the JSON reference
         var dereferencedValue = getDereferencedValue(value, pointer.value);
@@ -167,7 +168,6 @@ function crawl(obj, path, parents, $refs, options) {
         if (!circular) {
           // If the `crawl` method returns true, then dereferenced value is circular
           circular = crawl(dereferencedValue, pointer.path, parents, $refs, options);
-          isCircular = isCircular || circular;
         }
 
         // Replace the JSON reference with the dereferenced value
@@ -177,12 +177,15 @@ function crawl(obj, path, parents, $refs, options) {
       }
       else {
         if (parents.indexOf(value) === -1) {
-          isCircular = crawl(value, keyPath, parents, $refs, options);
+          circular = crawl(value, keyPath, parents, $refs, options);
         }
         else {
-          isCircular = foundCircularReference(keyPath, $refs, options);
+          circular = foundCircularReference(keyPath, $refs, options);
         }
       }
+
+      // Set the "isCircular" flag if this or any other property is circular
+      isCircular = isCircular || circular;
     });
 
     parents.pop();

dist/ref-parser.js.map

@@ -40,6 +40,7 @@ function crawl(obj, path, parents, $refs, options) {
     Object.keys(obj).forEach(function(key) {
       var keyPath = Pointer.join(path, key);
       var value = obj[key];
+      var circular = false;
 
       if ($Ref.isAllowed$Ref(value, options)) {
         // We found a $ref, so resolve it
@@ -48,8 +49,8 @@ function crawl(obj, path, parents, $refs, options) {
         var pointer = $refs._resolve($refPath, options);
 
         // Check for circular references
-        var circular = pointer.circular || parents.indexOf(pointer.value) !== -1;
-        circular && (isCircular = foundCircularReference(keyPath, $refs, options));
+        circular = pointer.circular || parents.indexOf(pointer.value) !== -1;
+        circular && foundCircularReference(keyPath, $refs, options);
 
         // Dereference the JSON reference
         var dereferencedValue = getDereferencedValue(value, pointer.value);
@@ -58,7 +59,6 @@ function crawl(obj, path, parents, $refs, options) {
         if (!circular) {
           // If the `crawl` method returns true, then dereferenced value is circular
           circular = crawl(dereferencedValue, pointer.path, parents, $refs, options);
-          isCircular = isCircular || circular;
         }
 
         // Replace the JSON reference with the dereferenced value
@@ -68,12 +68,15 @@ function crawl(obj, path, parents, $refs, options) {
       }
       else {
         if (parents.indexOf(value) === -1) {
-          isCircular = crawl(value, keyPath, parents, $refs, options);
+          circular = crawl(value, keyPath, parents, $refs, options);
         }
         else {
-          isCircular = foundCircularReference(keyPath, $refs, options);
+          circular = foundCircularReference(keyPath, $refs, options);
         }
       }
+
+      // Set the "isCircular" flag if this or any other property is circular
+      isCircular = isCircular || circular;
     });
 
     parents.pop();

dist/ref-parser.min.js

@@ -8,6 +8,8 @@ definitions:
         $ref: '#/definitions/pet'
       spouse:
         $ref: "#/definitions/person"       # <--- circular reference to ancestor
+      age:
+        type: number
 
   pet:
     title: pet

dist/ref-parser.min.js.map

@@ -69,6 +69,9 @@ helper.dereferenced.circular =
             "pet": null,
             "name": {
               "type": "string"
+            },
+            "age": {
+              "type": "number"
             }
           }
         },
@@ -107,6 +110,9 @@ helper.dereferenced.circular =
             "pet": null,
             "name": {
               "type": "string"
+            },
+            "age": {
+              "type": "number"
             }
           }
         },

lib/dereference.js

@@ -54,6 +54,9 @@ helper.parsed.circular =
           },
           "name": {
             "type": "string"
+          },
+          "age": {
+            "type": "number"
           }
         }
       },