Reject '+', '/', '*' in dot notation, don't accept arithmetic operati…

…ons in filter expressions. '-' is actually part of the path. #42
cburgmer · Jun 3, 2020 · 109c922 · 109c922
1 parent 5a9199d
commit 109c922
Show file tree

Hide file tree

Showing 6 changed files with 226 additions and 19 deletions.
diff --git a/docs/index.html b/docs/index.html
@@ -14440,7 +14440,7 @@ <h1>JSONPath Comparison</h1>
 <a href="results/filter_expression_with_addition.html#dotNET_Manatee.Json">➘</a>
 </td>
 <td class="proposal">
-<a href="results/filter_expression_with_addition.html#Proposal_A">➚</a>
+<a href="results/filter_expression_with_addition.html#Proposal_A">s</a>
 </td>
 </tr>
 <tr id="filter_expression_with_boolean_and_operator" class="no_consensus">
@@ -15650,7 +15650,7 @@ <h1>JSONPath Comparison</h1>
 <a href="results/filter_expression_with_division.html#dotNET_Manatee.Json">➚</a>
 </td>
 <td class="proposal">
-<a href="results/filter_expression_with_division.html#Proposal_A">➘</a>
+<a href="results/filter_expression_with_division.html#Proposal_A">s</a>
 </td>
 </tr>
 <tr id="filter_expression_with_empty_expression" class="no_consensus">

diff --git a/docs/results/filter_expression_with_addition.html b/docs/results/filter_expression_with_addition.html
@@ -191,13 +191,6 @@ <h4 id="dotNET_Manatee.Json">
 ]
 </code></pre>
 
-<h4 id="Proposal_A">
-Proposal (A)
-</h4>
-
-<pre><code>[]
-</code></pre>
-
 <h3>Errors</h3>
 
 <h4 id="Bash_JSONPath.sh">
@@ -332,6 +325,115 @@ <h4 id="Rust_jsonpath">
 
 <pre><code>parsing error
 </code></pre>
+
+<h4 id="Proposal_A">
+Proposal (A)
+</h4>
+
+<pre><code>x 1:10-1:10 ComparisonOperator
+| $[?(@.key+50==100)]
+|          ^
+| x 1:10-1:10 ScalarOperator
+| | $[?(@.key+50==100)]
+| |          ^
+| o 1:5-1:10 FilterValue
+| | $[?(@.key+50==100)]
+| |     ^^^^^
+| o 1:5-1:10 UnaryFilterExpression
+| | $[?(@.key+50==100)]
+| |     ^^^^^
+| | x 1:10-1:10 ScalarOperator
+| | | $[?(@.key+50==100)]
+| | |          ^
+| | o 1:5-1:10 FilterValue
+| | | $[?(@.key+50==100)]
+| | |     ^^^^^
+| | | 
+|/ /  
+| | 
+|/  
+o 1:5-1:10 HigherPrecedenceFilterExpression
+| $[?(@.key+50==100)]
+|     ^^^^^
+x 1:5-1:5 LogicalOr
+| $[?(@.key+50==100)]
+|     ^
+| x 1:10-1:10 ComparisonOperator
+| | $[?(@.key+50==100)]
+| |          ^
+| | x 1:10-1:10 ScalarOperator
+| | | $[?(@.key+50==100)]
+| | |          ^
+| | o 1:5-1:10 FilterValue
+| | | $[?(@.key+50==100)]
+| | |     ^^^^^
+| | o 1:5-1:10 UnaryFilterExpression
+| | | $[?(@.key+50==100)]
+| | |     ^^^^^
+| | | x 1:10-1:10 ScalarOperator
+| | | | $[?(@.key+50==100)]
+| | | |          ^
+| | | o 1:5-1:10 FilterValue
+| | | | $[?(@.key+50==100)]
+| | | |     ^^^^^
+| | | | 
+| |/ /  
+| | | 
+| |/  
+| o 1:5-1:10 HigherPrecedenceFilterExpression
+| | $[?(@.key+50==100)]
+| |     ^^^^^
+| x 1:5-1:5 LogicalAnd
+| | $[?(@.key+50==100)]
+| |     ^
+| | x 1:10-1:10 ComparisonOperator
+| | | $[?(@.key+50==100)]
+| | |          ^
+| | | x 1:10-1:10 ScalarOperator
+| | | | $[?(@.key+50==100)]
+| | | |          ^
+| | | o 1:5-1:10 FilterValue
+| | | | $[?(@.key+50==100)]
+| | | |     ^^^^^
+| | | o 1:5-1:10 UnaryFilterExpression
+| | | | $[?(@.key+50==100)]
+| | | |     ^^^^^
+| | | | x 1:10-1:10 ScalarOperator
+| | | | | $[?(@.key+50==100)]
+| | | | |          ^
+| | | | o 1:5-1:10 FilterValue
+| | | | | $[?(@.key+50==100)]
+| | | | |     ^^^^^
+| | | | | 
+| | |/ /  
+| | | | 
+| | |/  
+| | o 1:5-1:10 HigherPrecedenceFilterExpression
+| | | $[?(@.key+50==100)]
+| | |     ^^^^^
+| | | 
+|/ /  
+| | 
+|/  
+o 1:5-1:10 FilterExpression
+| $[?(@.key+50==100)]
+|     ^^^^^
+x 1:3-1:3 BracketElement
+| $[?(@.key+50==100)]
+|   ^
+x 1:3-1:3 BracketElements
+| $[?(@.key+50==100)]
+|   ^
+x 1:2-1:2 BracketChildren
+| $[?(@.key+50==100)]
+|  ^
+x 1:2-1:2 Operator
+| $[?(@.key+50==100)]
+|  ^
+o 1:1-1:2 Start
+  $[?(@.key+50==100)]
+  ^
+</code></pre>
 </article>
 <a href="https://github.com/cburgmer/json-path-comparison" class="github-corner" aria-label="View source on GitHub"><svg width="80" height="80" viewBox="0 0 250 250" style="fill:#151513; color:#fff; position: absolute; top: 0; border: 0; right: 0;" aria-hidden="true"><path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z"></path><path d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2" fill="currentColor" style="transform-origin: 130px 106px;" class="octo-arm"></path><path d="M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z" fill="currentColor" class="octo-body"></path></svg></a><style>.github-corner:hover .octo-arm{animation:octocat-wave 560ms ease-in-out}@keyframes octocat-wave{0%,100%{transform:rotate(0)}20%,60%{transform:rotate(-25deg)}40%,80%{transform:rotate(10deg)}}@media (max-width:500px){.github-corner:hover .octo-arm{animation:none}.github-corner .octo-arm{animation:octocat-wave 560ms ease-in-out}}</style>
 <style>

diff --git a/docs/results/filter_expression_with_division.html b/docs/results/filter_expression_with_division.html
@@ -201,13 +201,6 @@ <h4 id="dotNET_Manatee.Json">
 ]
 </code></pre>
 
-<h4 id="Proposal_A">
-Proposal (A)
-</h4>
-
-<pre><code>[]
-</code></pre>
-
 <h3>Errors</h3>
 
 <h4 id="Bash_JSONPath.sh">
@@ -352,6 +345,115 @@ <h4 id="Rust_jsonpath">
 
 <pre><code>parsing error
 </code></pre>
+
+<h4 id="Proposal_A">
+Proposal (A)
+</h4>
+
+<pre><code>x 1:10-1:10 ComparisonOperator
+| $[?(@.key/10==5)]
+|          ^
+| x 1:10-1:10 ScalarOperator
+| | $[?(@.key/10==5)]
+| |          ^
+| o 1:5-1:10 FilterValue
+| | $[?(@.key/10==5)]
+| |     ^^^^^
+| o 1:5-1:10 UnaryFilterExpression
+| | $[?(@.key/10==5)]
+| |     ^^^^^
+| | x 1:10-1:10 ScalarOperator
+| | | $[?(@.key/10==5)]
+| | |          ^
+| | o 1:5-1:10 FilterValue
+| | | $[?(@.key/10==5)]
+| | |     ^^^^^
+| | | 
+|/ /  
+| | 
+|/  
+o 1:5-1:10 HigherPrecedenceFilterExpression
+| $[?(@.key/10==5)]
+|     ^^^^^
+x 1:5-1:5 LogicalOr
+| $[?(@.key/10==5)]
+|     ^
+| x 1:10-1:10 ComparisonOperator
+| | $[?(@.key/10==5)]
+| |          ^
+| | x 1:10-1:10 ScalarOperator
+| | | $[?(@.key/10==5)]
+| | |          ^
+| | o 1:5-1:10 FilterValue
+| | | $[?(@.key/10==5)]
+| | |     ^^^^^
+| | o 1:5-1:10 UnaryFilterExpression
+| | | $[?(@.key/10==5)]
+| | |     ^^^^^
+| | | x 1:10-1:10 ScalarOperator
+| | | | $[?(@.key/10==5)]
+| | | |          ^
+| | | o 1:5-1:10 FilterValue
+| | | | $[?(@.key/10==5)]
+| | | |     ^^^^^
+| | | | 
+| |/ /  
+| | | 
+| |/  
+| o 1:5-1:10 HigherPrecedenceFilterExpression
+| | $[?(@.key/10==5)]
+| |     ^^^^^
+| x 1:5-1:5 LogicalAnd
+| | $[?(@.key/10==5)]
+| |     ^
+| | x 1:10-1:10 ComparisonOperator
+| | | $[?(@.key/10==5)]
+| | |          ^
+| | | x 1:10-1:10 ScalarOperator
+| | | | $[?(@.key/10==5)]
+| | | |          ^
+| | | o 1:5-1:10 FilterValue
+| | | | $[?(@.key/10==5)]
+| | | |     ^^^^^
+| | | o 1:5-1:10 UnaryFilterExpression
+| | | | $[?(@.key/10==5)]
+| | | |     ^^^^^
+| | | | x 1:10-1:10 ScalarOperator
+| | | | | $[?(@.key/10==5)]
+| | | | |          ^
+| | | | o 1:5-1:10 FilterValue
+| | | | | $[?(@.key/10==5)]
+| | | | |     ^^^^^
+| | | | | 
+| | |/ /  
+| | | | 
+| | |/  
+| | o 1:5-1:10 HigherPrecedenceFilterExpression
+| | | $[?(@.key/10==5)]
+| | |     ^^^^^
+| | | 
+|/ /  
+| | 
+|/  
+o 1:5-1:10 FilterExpression
+| $[?(@.key/10==5)]
+|     ^^^^^
+x 1:3-1:3 BracketElement
+| $[?(@.key/10==5)]
+|   ^
+x 1:3-1:3 BracketElements
+| $[?(@.key/10==5)]
+|   ^
+x 1:2-1:2 BracketChildren
+| $[?(@.key/10==5)]
+|  ^
+x 1:2-1:2 Operator
+| $[?(@.key/10==5)]
+|  ^
+o 1:1-1:2 Start
+  $[?(@.key/10==5)]
+  ^
+</code></pre>
 </article>
 <a href="https://github.com/cburgmer/json-path-comparison" class="github-corner" aria-label="View source on GitHub"><svg width="80" height="80" viewBox="0 0 250 250" style="fill:#151513; color:#fff; position: absolute; top: 0; border: 0; right: 0;" aria-hidden="true"><path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z"></path><path d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2" fill="currentColor" style="transform-origin: 130px 106px;" class="octo-arm"></path><path d="M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z" fill="currentColor" class="octo-body"></path></svg></a><style>.github-corner:hover .octo-arm{animation:octocat-wave 560ms ease-in-out}@keyframes octocat-wave{0%,100%{transform:rotate(0)}20%,60%{transform:rotate(-25deg)}40%,80%{transform:rotate(10deg)}}@media (max-width:500px){.github-corner:hover .octo-arm{animation:none}.github-corner .octo-arm{animation:octocat-wave 560ms ease-in-out}}</style>
 <style>

diff --git a/proposals/Proposal_A/README.md b/proposals/Proposal_A/README.md
@@ -188,4 +188,3 @@ To call out some decisions deviating from other implementations:
 - JSON in filter?
 - Arbitrary brackets in filter
 - $[::-2]
-- division/multiplication
diff --git a/proposals/Proposal_A/selector.peg b/proposals/Proposal_A/selector.peg
@@ -11,7 +11,7 @@ DotChild
   / ".*" { return [['children', [['all']]]]; }
 
 DotChildName
-  = [^\.\*\[\]\(\)@\?\|& ,:=<>!"'\\]+ { return text(); }
+  = [^ -#%-,\.\/\:-\@\[-\`\{-\~]+ { return text(); }
 
 BracketChildren
   = "[" ws children:BracketElements ws "]" { return [['children', children]]; }

diff --git a/proposals/Proposal_A/test_suite.yaml b/proposals/Proposal_A/test_suite.yaml
@@ -461,6 +461,7 @@ queries:
   - id: filter_expression_with_addition
     selector: "$[?(@.key+50==100)]"
     document: [{"key": 60}, {"key": 50}, {"key": 10}, {"key": -50}]
+    expectedError: SyntaxError
   - id: filter_expression_with_boolean_and_operator
     selector: "$[?(@.key>42 && @.key<44)]"
     document: [{"key": 42}, {"key": 43}, {"key": 44}]
@@ -500,6 +501,7 @@ queries:
   - id: filter_expression_with_division
     selector: "$[?(@.key/10==5)]"
     document: [{"key": 60}, {"key": 50}, {"key": 10}, {"key": -50}]
+    expectedError: SyntaxError
   - id: filter_expression_with_empty_expression
     selector: "$[?()]"
     document: [1, {"key": 42}, "value", null]
@@ -601,6 +603,7 @@ queries:
   - id: filter_expression_with_multiplication
     selector: "$[?(@.key*2==100)]"
     document: [{"key": 60}, {"key": 50}, {"key": 10}, {"key": -50}]
+    expectedError: SyntaxError
   - id: filter_expression_with_negation_and_equals
     selector: "$[?(!(@.key==42))]"
     document: [{"key": 0}, {"key": 42}, {"key": -1}, {"key": 41}, {"key": 43}, {"key": 42.0001}, {"key": 41.9999}, {"key": 100}, {"some": "value"}]
@@ -621,7 +624,8 @@ queries:
     document: [{"a": [{"price": 1}, {"price": 3}]}, {"a": [{"price": 11}]}, {"a": [{"price": 8}, {"price": 12}, {"price": 3}]}, {"a": []}]
   - id: filter_expression_with_substraction
     selector: "$[?(@.key-50==-100)]"
-    document: [{"key": 60}, {"key": 50}, {"key": 10}, {"key": -50}]
+    document: [{"key": 60}, {"key": 50}, {"key": 10}, {"key": -50}, {"key-50": -100}]
+    consensus: [{"key-50": -100}]
   - id: filter_expression_with_triple_equal
     selector: "$[?(@.key===42)]"
     document: [{"key": 0}, {"key": 42}, {"key": -1}, {"key": 1}, {"key": 41}, {"key": 43}, {"key": 42.0001}, {"key": 41.9999}, {"key": 100}, {"key": "some"}, {"key": "42"}, {"key": null}, {"key": 420}, {"key": ""}, {"key": {}}, {"key": []}, {"key": [42]}, {"key": {"key": 42}}, {"key": {"some": 42}}, {"some": "value"}]