Skip to content

Detect circular references and return early #69

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
iamvery wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Detect circular references and return early #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d253cc3
Detect circular references and return early
iamvery Aug 16, 2017
4ce22ac
Fix bug in circular detection
iamvery Aug 17, 2017
e3b6bb4
SEMICOLONS щ（ﾟДﾟщ）
iamvery Aug 17, 2017
12fdd6c
Use array as Set isn't available in CI version
iamvery Aug 17, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions lib/handlers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,8 @@ function traverser(recurse) {

var results = [];

var descend = function(value, path) {
var descend = function(value, path, seen) {
seen = (seen || []).slice()

if (is_array(value)) {
value.forEach(function(element, index) {
Expand All @@ -204,10 +205,15 @@ function traverser(recurse) {
value.forEach(function(element, index) {
if (results.length >= count) { return }
if (recurse) {
descend(element, path.concat(index));
descend(element, path.concat(index), seen);
}
});
} else if (is_object(value)) {
if (seen.indexOf(value) === -1) {
seen.push(value);
} else {
return;
}
this.keys(value).forEach(function(k) {
if (results.length >= count) { return }
if (passable(k, value[k], ref)) {
Expand All @@ -217,7 +223,7 @@ function traverser(recurse) {
this.keys(value).forEach(function(k) {
if (results.length >= count) { return }
if (recurse) {
descend(value[k], path.concat(k));
descend(value[k], path.concat(k), seen);
}
});
}
Expand Down
14 changes: 14 additions & 0 deletions test/query.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,5 +355,19 @@ suite('query', function() {
assert.deepEqual(jp.query({a: 1, b: 2, c: null}, '$..["a","b","c","d"]'), [1, 2, null]);
});

test('circular reference', function() {
var obj = { foo: 'bar' };
obj.circularReference = obj;
var results = jp.query(obj, '$..*');
assert.deepEqual(results, ['bar', obj]);

var obj = {};
var o = { foo: 'bar' }
obj.foo = o;
obj.bar = o;
var results = jp.query(obj, '$..*');
assert.deepEqual(results, [o, o, 'bar', 'bar']);
});

});