v0.6.3 (#76)

Author: f3ath

Diff for: CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.6.3] - 2023-08-26
+### Fixed
+- Allow whitespaces after `?` in expressions
+
 ## [0.6.2] - 2023-07-21
 ### Fixed
 - Disallow comparison of non-singular queries
@@ -160,6 +164,7 @@ Previously, no modification would be made and no errors/exceptions thrown.
 ### Added
 - Basic design draft
 
+[0.6.3]: https://github.com/f3ath/jessie/compare/0.6.2...0.6.3
 [0.6.2]: https://github.com/f3ath/jessie/compare/0.6.1...0.6.2
 [0.6.1]: https://github.com/f3ath/jessie/compare/0.6.0...0.6.1
 [0.6.0]: https://github.com/f3ath/jessie/compare/0.5.3...0.6.0

Diff for: lib/src/expression/static_expression.dart

@@ -12,10 +12,8 @@ class StaticExpression<T extends Object> extends Expression<T> {
 
   @override
   Expression<R> merge<R extends Object, M extends Object>(
-      Expression<M> other, R Function(T v, M m) merger) {
-    if (other is StaticExpression<M>) {
-      return StaticExpression(merger(value, other.value));
-    }
-    return super.merge(other, merger);
-  }
+          Expression<M> other, R Function(T v, M m) merger) =>
+      other is StaticExpression<M>
+          ? StaticExpression(merger(value, other.value))
+          : super.merge(other, merger);
 }

Diff for: lib/src/fun/fun_factory.dart

@@ -36,7 +36,6 @@ class FunFactory {
       if (args.length == 1) return any1<T>(name, args[0]);
       if (args.length == 2) return any2<T>(name, args[0], args[1]);
     } on TypeError catch (e) {
-      /// Thrown by
       throw FormatException('Invalid argument: $e');
     } on StateError catch (e) {
       throw FormatException(e.message);

Diff for: lib/src/grammar/cmp_operator.dart

@@ -1,4 +1,5 @@
 import 'package:maybe_just_nothing/maybe_just_nothing.dart';
+import 'package:petitparser/petitparser.dart';
 
 /// True if [a] equals [b].
 bool _eq(Maybe a, Maybe b) =>
@@ -48,3 +49,5 @@ const _operations = <String, bool Function(Maybe, Maybe)>{
 
 bool compare(String op, Maybe a, Maybe b) =>
     (_operations[op] ?? (throw StateError('Invalid operation "$op"')))(a, b);
+
+final cmpOperator = _operations.keys.map(string).toChoiceParser().trim();

Diff for: lib/src/grammar/compare.dart

@@ -1,5 +1,4 @@
 import 'package:json_path/src/expression/expression.dart';
-import 'package:json_path/src/grammar/cmp_operator.dart';
 import 'package:json_path/src/grammar/compare.dart';
 import 'package:maybe_just_nothing/maybe_just_nothing.dart';
 import 'package:petitparser/parser.dart';

Diff for: lib/src/grammar/comparison_expression.dart

@@ -57,20 +57,18 @@ class JsonPathGrammarDefinition extends GrammarDefinition<Expression<Nodes>> {
           .skip(before: string('..'))
           .map((value) => sequenceSelector([selectAllRecursively, value]));
 
-  Parser<Expression<bool>> _parenExpr() => negatable(
-        _logicalExpr().inParens(),
-      );
+  Parser<Expression<bool>> _parenExpr() => negatable(_logicalExpr().inParens());
 
   Parser<Expression> _funArgument() => [
         literal,
         _filterPath(),
         ref0(_funExpr),
       ].toChoiceParser().trim();
 
-  Parser<T> _funCall<T>(T Function(FunCall) funMaker) =>
+  Parser<T> _funCall<T>(T Function(FunCall) toFun) =>
       (funName & _funArgument().toList().inParens())
           .map((v) => FunCall(v[0], v[1]))
-          .tryMap(funMaker);
+          .tryMap(toFun);
 
   Parser<Expression> _funExpr() => _funCall(_fun.any);
 
@@ -125,7 +123,7 @@ class JsonPathGrammarDefinition extends GrammarDefinition<Expression<Nodes>> {
       ].toChoiceParser());
 
   Parser<Selector> _expressionFilter() =>
-      _logicalExpr().skip(before: string('?')).map(filterSelector);
+      _logicalExpr().skip(before: string('?').trim()).map(filterSelector);
 
   Parser<Selector> _segment() => [
         dotName,

Diff for: lib/src/grammar/json_path.dart

@@ -22,15 +22,15 @@ Iterable<int> _backward(int length, int? start, int? stop, int step) sync* {
 }
 
 /// exclusive
-int _low(int? stop, int length) {
-  if (stop == null) return -1;
-  if (stop < 0) return max(length + stop, -1);
-  return stop;
-}
+int _low(int? stop, int length) => switch (stop) {
+      null => -1,
+      < 0 => max(length + stop, -1),
+      _ => stop,
+    };
 
 /// inclusive
-int _high(int? start, int length) {
-  if (start == null) return length - 1;
-  if (start < 0) return length + start;
-  return min(start, length - 1);
-}
+int _high(int? start, int length) => switch (start) {
+      null => length - 1,
+      < 0 => length + start,
+      _ => min(start, length - 1),
+    };

Diff for: lib/src/grammar/slice_indices.dart

@@ -1,5 +1,5 @@
 name: json_path
-version: 0.6.2
+version: 0.6.3
 description: Implementation of JSONPath expressions like "$.store.book[2].price". Reads and writes values in parsed JSON objects.
 homepage: "https://github.com/f3ath/jessie"
 

Diff for: pubspec.yaml

@@ -43,6 +43,11 @@
       "result": ["A", "B"],
       "paths": ["$['a']", "$['b']"],
       "pointers": ["/a", "/b"]
+    }, {
+      "name": "union wildcard on object, twice",
+      "selector": "$[*, *]",
+      "document": {"a": "A", "b": "B"},
+      "result": ["A", "B", "A", "B"]
     }, {
       "name": "dot wildcard on array",
       "selector": "$.*",

Diff for: test/cases/standard/basic.json

@@ -43,10 +43,34 @@
       "result": [ "foo" ]
     },
     {
-      "name": "returns in an absolute singular selector ",
+      "name": "returns in an absolute singular selector",
       "selector" : "$..[?length(@)==length($\r[0]\r.a)]",
       "document" : [ {"a": "foo"}, {} ],
       "result": [ "foo" ]
+    },
+    {
+      "name": "space between ? and function",
+      "selector" : "$..[? length(@)==1]",
+      "document" : [ {"a": "foo"}, {} ],
+      "result": [ {"a": "foo"} ]
+    },
+    {
+      "name": "tab between ? and function",
+      "selector" : "$..[?\tlength(@)==1]",
+      "document" : [ {"a": "foo"}, {} ],
+      "result": [ {"a": "foo"} ]
+    },
+    {
+      "name": "\\n between ? and function",
+      "selector" : "$..[ ?\nlength(@) == 1 ]",
+      "document" : [ {"a": "foo"}, {} ],
+      "result": [ {"a": "foo"} ]
+    },
+    {
+      "name": "\\r between ? and function",
+      "selector" : "$..[ ?\rlength(@) == 1 ]",
+      "document" : [ {"a": "foo"}, {} ],
+      "result": [ {"a": "foo"} ]
     }
   ]
 }

Diff for: test/cases/standard/whitespace.json

@@ -6,10 +6,8 @@ import 'package:path/path.dart' as path;
 import 'package:test/test.dart';
 
 void runTestsInDirectory(String dirName, {JsonPathParser? parser}) {
-  JsonPath jsonPath(String expression) {
-    if (parser != null) return parser.parse(expression);
-    return JsonPath(expression);
-  }
+  JsonPath jsonPath(String expression) =>
+      parser?.parse(expression) ?? JsonPath(expression);
 
   Directory(dirName)
       .listSync()
@@ -26,11 +24,12 @@ void runTestsInDirectory(String dirName, {JsonPathParser? parser}) {
           }
         }
 
+        final String selector = t['selector'];
+
         final document = t['document'];
         final String? name = t['name'];
         final List? paths = t['paths'];
         final List? pointers = t['pointers'];
-        final String selector = t['selector'];
         final String? skip = t['skip'];
         final List? values = t['result'];
         final bool? invalid = t['invalid_selector'];
@@ -66,7 +65,7 @@ void runTestsInDirectory(String dirName, {JsonPathParser? parser}) {
               );
             });
           }
-          if ([values, paths, pointers, invalid].every((_) => _ == null)) {
+          if ([values, paths, pointers, invalid].every((v) => v == null)) {
             throw ArgumentError('No expectations found');
           }
         }, skip: skip);