Prevent infinite recursions when using refsoption as false

lib/cycle.js

@@ -28,7 +28,8 @@ exports.decycle = function decycle(object, options, replacer) {
 
   var map = new WMap()
 
-  var hasCircular = Object.prototype.hasOwnProperty.call(options, 'circular');
+  var noCircularOption = !Object.prototype.hasOwnProperty.call(options, 'circular');
+  var withRefs = options.refs !== false;
 
   return (function derez(_value, path, key) {
 
@@ -104,15 +105,21 @@ exports.decycle = function decycle(object, options, replacer) {
         // If the value is an object or array, look to see if we have already
         // encountered it. If so, return a $ref/path object.
 
-      if (typeof value === 'object' && options['refs']) {
+      if (typeof value === 'object') {
         var foundPath = map.get(value);
         if (foundPath) {
-          if (hasCircular && path.indexOf(foundPath) === 0) {
-            return typeof options.circular === 'function'?
+          if (noCircularOption && withRefs) {
+            return {$jsan: foundPath};
+          }
+          if (path.indexOf(foundPath) === 0) {
+            if (!noCircularOption) {
+              return typeof options.circular === 'function'?
               options.circular(value, path, foundPath):
               options.circular;
+            }
+            return {$jsan: foundPath};
           }
-          return {$jsan: foundPath};
+          if (withRefs) return {$jsan: foundPath};
         }
         map.set(value, path);
       }

lib/index.js

@@ -27,7 +27,6 @@ exports.stringify = function stringify(value, replacer, space, _options) {
       'infinity': options
     }
   }
-  if (typeof options.refs === 'undefined') options.refs = true;
 
   var decycled = cycle.decycle(value, options, replacer);
   if (arguments.length === 1) {

test/unit.js

@@ -199,6 +199,16 @@ describe('jsan', function() {
       assert.equal(jsan.stringify(obj, null, null, {refs: false}), '{"prop1":{"a":1},"prop2":{"prop3":{"a":1}}}');
     });
 
+    it('works with refs option with circular references', function() {
+      var obj = {};
+      obj.self = obj;
+      obj.a = 1;
+      obj.b = {t: 1};
+      obj.c = obj.b;
+      assert.equal(jsan.stringify(obj, null, null, {refs: false}), '{"self":{"$jsan":"$"},"a":1,"b":{"t":1},"c":{"t":1}}');
+      assert.equal(jsan.stringify(obj, null, null, {refs: false, circular: 'Circular'}), '{"self":"Circular","a":1,"b":{"t":1},"c":{"t":1}}');
+    });
+
     it('works on objects with "[", "\'", and "]" in the keys', function() {
       var obj = {};
       obj['["key"]'] = {};