Parse jsonPath expressions #1793
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Lauri Nevala <lauri.nevala@gmail.com>
Signed-off-by: Lauri Nevala <lauri.nevala@gmail.com>
Signed-off-by: Lauri Nevala <lauri.nevala@gmail.com>
Nokel81
requested changes
Dec 17, 2020
src/renderer/utils/jsonPath.ts
Outdated
Comment on lines
8
to
16
| const columnArr = jsonPath.split(/(?<=\w)\./); | ||
|
|
||
| columnArr.forEach((value, index) => { | ||
| if (index == 0) { | ||
| pathExpression = `${value}`; | ||
| } else { | ||
| pathExpression += `['${value}']`; | ||
| } | ||
| }); |
There was a problem hiding this comment.
Suggested change
| const columnArr = jsonPath.split(/(?<=\w)\./); | |
| columnArr.forEach((value, index) => { | |
| if (index == 0) { | |
| pathExpression = `${value}`; | |
| } else { | |
| pathExpression += `['${value}']`; | |
| } | |
| }); | |
| const [first, ...rest] = jsonPath.split(/(?<=\w)\./); | |
| if (rest.length === 0) { | |
| pathExpression = first; | |
| } | |
| pathExpression = `${first}${rest.map(value => `[${value}]`)}`; |
Comment on lines
8
to
16
|
|
||
| }); | ||
|
|
||
| test("strips '\' away from the result", () => { | ||
| const res = parseJsonPath(".metadata.labels['serving\\.knative\\.dev/configuration']"); | ||
|
|
||
| expect(res).toBe(".metadata.labels['serving.knative.dev/configuration']"); | ||
| }); | ||
|
|
There was a problem hiding this comment.
there should be a test for the following case: ".metadata.labels\.serving['some.other.item']"
There was a problem hiding this comment.
Added test case for this
Signed-off-by: Lauri Nevala <lauri.nevala@gmail.com>
Signed-off-by: Lauri Nevala <lauri.nevala@gmail.com>
Signed-off-by: Lauri Nevala <lauri.nevala@gmail.com>
Nokel81
reviewed
Dec 18, 2020
| @@ -0,0 +1,35 @@ | |||
| // Helper to convert strings used for jsonPath where \. or - is present to use indexed notation, | |||
| // for example: .metadata.labels.kubesphere\.io/alias-name -> .metadata.labels['kubesphere\.io/alias-name'] | |||
There was a problem hiding this comment.
Suggested change
| // for example: .metadata.labels.kubesphere\.io/alias-name -> .metadata.labels['kubesphere\.io/alias-name'] | |
| // for example: .metadata.labels.kubesphere\.io/alias-name -> .metadata.labels['kubesphere.io/alias-name'] |
| @@ -0,0 +1,35 @@ | |||
| import { parseJsonPath } from "../jsonPath"; | |||
|
|
|||
| describe("parseJsonPath", () => { | |||
There was a problem hiding this comment.
some more test cases that I have thought of:
- Include one with
\\\signifying an escaped '' or something similar. - perhaps escaping other characters too, like
\'(which might break your index conversion)
Signed-off-by: Lauri Nevala <lauri.nevala@gmail.com>
Nokel81
approved these changes
Dec 21, 2020
jakolehm
approved these changes
Dec 21, 2020
jakolehm
pushed a commit
that referenced
this pull request
Dec 22, 2020
* Fix jsonPath calls by removing \ characters and using $..[] notation Signed-off-by: Lauri Nevala <lauri.nevala@gmail.com> * Parse jsonPath properly Signed-off-by: Lauri Nevala <lauri.nevala@gmail.com> * Cleanup Signed-off-by: Lauri Nevala <lauri.nevala@gmail.com> * More cleanup Signed-off-by: Lauri Nevala <lauri.nevala@gmail.com> * Improve parsing Signed-off-by: Lauri Nevala <lauri.nevala@gmail.com> * Finetuning Signed-off-by: Lauri Nevala <lauri.nevala@gmail.com> * Stringify children only if value is object or array Signed-off-by: Lauri Nevala <lauri.nevala@gmail.com> * Test other escaped characters do not cause issues Signed-off-by: Lauri Nevala <lauri.nevala@gmail.com>
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
jsonPath.value()method does not work well with invalid-indentifier names, so changed these to use indexed notation as suggested here. Also required to get rid of\characters.Fixes #503, fixes #1773
Signed-off-by: Lauri Nevala lauri.nevala@gmail.com