feat: Add JP version and regex operations in jsonlogic #73
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
Datron
requested changes
May 24, 2024
Cargo.toml
Outdated
| @@ -41,7 +41,7 @@ chrono = { version = "0.4.26", features = ["serde"] } | |||
| uuid = {version = "1.3.4", features = ["v4", "serde"]} | |||
| reqwest = { version = "0.11.18", features = ["json"]} | |||
| jsonschema = "~0.17" | |||
| jsonlogic = "0.5.1" | |||
| jsonlogic = { git = "https://github.com/juspay/jsonlogic_rs.git", rev = "4f1a8bcbb423c599eacf6c95ae17f5c0974bc071" } | |||
There was a problem hiding this comment.
Why did we make this change? All other changes are in JS
There was a problem hiding this comment.
to add the same operators in the rust client
There was a problem hiding this comment.
Are those added in this PR? If not, can we make this change when we add the operations
There was a problem hiding this comment.
clients/js/src/index.ts
Outdated
| jsonLogic.add_operation("match", matchRegex); | ||
| jsonLogic.add_operation("semver_eq", compareSemanticIsEqual); | ||
| jsonLogic.add_operation("semver_gt", compareSemanticIsGreater); | ||
| jsonLogic.add_operation("semver_gteq", compareSemanticIsGreaterEqual); |
There was a problem hiding this comment.
Suggested change
| jsonLogic.add_operation("semver_gteq", compareSemanticIsGreaterEqual); | |
| jsonLogic.add_operation("semver_ge", compareSemanticIsGreaterEqual); |
clients/js/src/index.ts
Outdated
| jsonLogic.add_operation("semver_gt", compareSemanticIsGreater); | ||
| jsonLogic.add_operation("semver_gteq", compareSemanticIsGreaterEqual); | ||
| jsonLogic.add_operation("semver_lt", compareSemanticIsLesser); | ||
| jsonLogic.add_operation("semver_lteq", compareSemanticIsLesserEqual); |
There was a problem hiding this comment.
Suggested change
| jsonLogic.add_operation("semver_lteq", compareSemanticIsLesserEqual); | |
| jsonLogic.add_operation("semver_le", compareSemanticIsLesserEqual); |
| const compareSemanticIsGreaterImp = function (version_a: string, version_b: string) { | ||
| return version_a.localeCompare(version_b, undefined, {numeric:true, sensitivity:'base'}) > 0; | ||
| const compareSemantic = function (version_a: string, version_b: string): number { | ||
| return version_a.localeCompare(version_b, undefined, { numeric: true, sensitivity: 'base' }); |
There was a problem hiding this comment.
the locales parameter and options parameter are not supported on android webview
clients/js/src/index.ts
Outdated
| jsonLogic.add_operation("match", matchRegex); | ||
| jsonLogic.add_operation("semver_eq", compareSemanticIsEqual); | ||
| jsonLogic.add_operation("semver_gt", compareSemanticIsGreater); | ||
| jsonLogic.add_operation("semver_gteq", compareSemanticIsGreaterEqual); |
There was a problem hiding this comment.
@ayushjain17 should we add one for between also ?
There was a problem hiding this comment.
@pratikmishra356 less than supports between operation as well, the behaviour of these version comparison operators are same as that of the normal comparison operators - wrt the number of operators
ayushjain17
force-pushed
the
jsExpClient
branch
4 times, most recently
from
627c264 to
83d34bf
Compare
ayushjain17
changed the title
ayushjain17
force-pushed
the
jsExpClient
branch
3 times, most recently
from
416da02 to
9bca3e5
Compare
ayushjain17
changed the title
ayushjain17
force-pushed
the
jsExpClient
branch
5 times, most recently
from
a390d37 to
f9f0e5a
Compare
ShubhranshuSanjeev
approved these changes
May 28, 2024
Datron
reviewed
May 29, 2024
| @@ -41,7 +41,7 @@ chrono = { version = "0.4.26", features = ["serde"] } | |||
| uuid = {version = "1.3.4", features = ["v4", "serde"]} | |||
| reqwest = { version = "0.11.18", features = ["json"]} | |||
| jsonschema = "~0.17" | |||
| jsonlogic = "0.5.1" | |||
| jsonlogic = { git = "https://github.com/juspay/jsonlogic_rs.git", version = "0.5.2" } | |||
There was a problem hiding this comment.
Why add this without rust changes?
Datron
approved these changes
May 29, 2024
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.
Problem
Semantic versioning and regex related operations not present in jsonlogic
Solution
Add semver and regex operations in jsonlogic