Skip to content

feat(json-path): add support for JSONPath #1496

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

Merged
merged 2 commits into from
May 22, 2022
Merged

feat(json-path): add support for JSONPath #1496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
35a5fe8
feat(json-path): add support for JSONPath
char0n May 22, 2022
110748e
Merge branch 'main' into char0n/json-path-full-support
char0n May 22, 2022
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: 2 additions & 0 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion packages/apidom-json-path/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@
"dependencies": {
"@babel/runtime-corejs3": "=7.18.0",
"jsonpath-plus": "=6.0.1",
"@swagger-api/apidom-core": "^0.27.0"
"@swagger-api/apidom-core": "^0.27.0",
"@swagger-api/apidom-json-pointer": "^0.27.0"
},
"files": [
"cjs/",
Expand Down
8 changes: 5 additions & 3 deletions packages/apidom-json-path/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { JSONPath } from 'jsonpath-plus';
import { Element, toValue, ObjectElement } from '@swagger-api/apidom-core';
import { Element, toValue } from '@swagger-api/apidom-core';
import { evaluate as jsonPointerEvaluate } from '@swagger-api/apidom-json-pointer';

type Evaluate = {
<T extends Element>(path: string, element: T): Element[];
Expand All @@ -24,7 +25,7 @@ export const evaluate: Evaluate = (path, element) => {
resultType: 'pointer',
}) as string[];

return pointers.map(() => new ObjectElement());
return pointers.map((pointer) => jsonPointerEvaluate(pointer, element));
};

/**
Expand All @@ -43,7 +44,8 @@ export const evaluateMulti: EvaluateMulti = (paths, element) => {

const endPointValues: Element[] = [];
for (const pointer of pointers) {
endPointValues.push(new ObjectElement({ pointer }));
const endPointValue = jsonPointerEvaluate(pointer, element);
endPointValues.push(endPointValue);
}

if (Array.isArray(path)) {
Expand Down
16 changes: 11 additions & 5 deletions packages/apidom-json-path/test/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { assert } from 'chai';
import { ObjectElement } from '@swagger-api/apidom-core';
import { ObjectElement, NumberElement } from '@swagger-api/apidom-core';

import { evaluate, evaluateMulti } from '../src';

Expand All @@ -14,7 +14,7 @@ describe('apidom-json-path', function () {
});
const result = evaluate('$.a.b[?(@ < 10)]', objectElement);

assert.lengthOf(result, 2);
assert.deepEqual(result, [new NumberElement(1), new NumberElement(2)]);
});
});

Expand All @@ -27,7 +27,7 @@ describe('apidom-json-path', function () {
});
const result = evaluate(['$', 'a', 'b', '?(@ < 10)'], objectElement);

assert.lengthOf(result, 2);
assert.deepEqual(result, [new NumberElement(1), new NumberElement(2)]);
});
});

Expand Down Expand Up @@ -55,7 +55,10 @@ describe('apidom-json-path', function () {
});
const result = evaluateMulti(['$.a.b[?(@ < 10)]', '$.a.b[?(@ > 10)]'], objectElement);

assert.lengthOf(result, 2);
assert.deepEqual(result, [
['$.a.b[?(@ < 10)]', [new NumberElement(1), new NumberElement(2)]],
['$.a.b[?(@ > 10)]', [new NumberElement(100)]],
]);
});
});

Expand All @@ -74,7 +77,10 @@ describe('apidom-json-path', function () {
objectElement,
);

assert.lengthOf(result, 2);
assert.deepEqual(result, [
["$['a']['b']['?(@ < 10)']", [new NumberElement(1), new NumberElement(2)]],
["$['a']['b']['?(@ > 10)']", [new NumberElement(100)]],
]);
});
});

Expand Down