Skip to content

fix: use containing object as filter parent #294

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

Closed
Narek-Khachikyan wants to merge 1 commit into from
Closed

fix: use containing object as filter parent #294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion badges/tests-badge.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion dist/index-browser-esm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2168,7 +2168,7 @@ class JSONPathClass {
} else {
const valObj3 = /** @type {Record<string, unknown>} */val;
this._walk(val, m => {
if (this._eval(safeLoc, valObj3[m], m, path, parent, parentPropName)) {
if (this._eval(safeLoc, valObj3[m], m, path, Array.isArray(val) ? parent : val, parentPropName)) {
addRet(this._trace(x, valObj3[m], push(path, m), val, m, callback, true));
}
});
Expand Down
2 changes: 1 addition & 1 deletion dist/index-browser-esm.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/index-browser-esm.min.js.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/index-browser-umd.cjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2174,7 +2174,7 @@
} else {
const valObj3 = /** @type {Record<string, unknown>} */val;
this._walk(val, m => {
if (this._eval(safeLoc, valObj3[m], m, path, parent, parentPropName)) {
if (this._eval(safeLoc, valObj3[m], m, path, Array.isArray(val) ? parent : val, parentPropName)) {
addRet(this._trace(x, valObj3[m], push(path, m), val, m, callback, true));
}
});
Expand Down
2 changes: 1 addition & 1 deletion dist/index-browser-umd.min.cjs
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/index-browser-umd.min.cjs.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/index-node-cjs.cjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2172,7 +2172,7 @@ class JSONPathClass {
} else {
const valObj3 = /** @type {Record<string, unknown>} */val;
this._walk(val, m => {
if (this._eval(safeLoc, valObj3[m], m, path, parent, parentPropName)) {
if (this._eval(safeLoc, valObj3[m], m, path, Array.isArray(val) ? parent : val, parentPropName)) {
addRet(this._trace(x, valObj3[m], push(path, m), val, m, callback, true));
}
});
Expand Down
2 changes: 1 addition & 1 deletion dist/index-node-esm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2170,7 +2170,7 @@ class JSONPathClass {
} else {
const valObj3 = /** @type {Record<string, unknown>} */val;
this._walk(val, m => {
if (this._eval(safeLoc, valObj3[m], m, path, parent, parentPropName)) {
if (this._eval(safeLoc, valObj3[m], m, path, Array.isArray(val) ? parent : val, parentPropName)) {
addRet(this._trace(x, valObj3[m], push(path, m), val, m, callback, true));
}
});
Expand Down
4 changes: 2 additions & 2 deletions src/jsonpath.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -756,8 +756,8 @@ class JSONPathClass {
} else {
const valObj3 = /** @type {Record<string, unknown>} */ (val);
this._walk(val, (m) => {
if (this._eval(safeLoc, valObj3[m], m, path, parent,
parentPropName)) {
if (this._eval(safeLoc, valObj3[m], m, path,
Array.isArray(val) ? parent : val, parentPropName)) {
addRet(this._trace(x, valObj3[m], push(path, m), val, m,
callback, true));
}
Expand Down
11 changes: 11 additions & 0 deletions test/test.examples.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,17 @@ checkBuiltInVMAndNodeVM(function (vmType, setBuiltInState) {
const result = jsonpath({json, path: '$..book[?(@parent.bicycle && @parent.bicycle.color === "red")].category'});
assert.deepEqual(result, expected);
});
it('uses the containing object as @parent in object filters', () => {
const data = {id: 1, foo: {id: 2, bar: {id: 3, foo: {id: 4}}}};
assert.deepEqual(jsonpath({
json: data,
path: '$.foo.bar[?(@property === "foo" && @parent.id === 3)]'
}), [data.foo.bar.foo]);
assert.deepEqual(jsonpath({
json: data,
path: '$.foo.bar[?(@property === "foo" && @parent.id === 2)]'
}), []);
});
it('Custom property: @property', () => {
const expected = json.store.book.reduce(function (arr, book) {
arr.push(book.author, book.title);
Expand Down