Skip to content

Commit 5e1d1a4

Browse files
f3athf3ath
authored
Cleanup (#115)
1 parent 4251b70 commit 5e1d1a4

10 files changed

+124
-102
lines changed

‎CHANGELOG.md

+5
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
55
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

7+
## [Unreleased]
8+
### Changed
9+
- Minor performance improvements
10+
711
## [0.7.4] - 2024-08-03
812
### Changed
913
- CTS updated
@@ -205,6 +209,7 @@ Previously, no modification would be made and no errors/exceptions thrown.
205209
### Added
206210
- Basic design draft
207211

212+
[Unreleased]: https://github.com/f3ath/jessie/compare/0.7.4...HEAD
208213
[0.7.4]: https://github.com/f3ath/jessie/compare/0.7.3...0.7.4
209214
[0.7.3]: https://github.com/f3ath/jessie/compare/0.7.2...0.7.3
210215
[0.7.2]: https://github.com/f3ath/jessie/compare/0.7.1...0.7.2

‎benchmark/parsing.dart

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
import 'package:json_path/json_path.dart';
2+
3+
void main() {
4+
const e1 =
5+
r"$..store[?(@.type == 'electronics')].items[?(@.price > 100 && @.availability == 'in stock')].details[?(@.specs.screen.size >= 40 && search(@.specs.processor, 'Intel|AMD'))].reviews[*].comments[?(@.rating >= 4 && @.verified == true)].content[?(length(@) > 100)]";
6+
const e2 =
7+
r"$..book[0:10][?(match(@.author, '(J.K.|George R.R.) Martin') && @.price < 30 && @.published >= '2010-01-01')].summary[?(length(@) > 200)]";
8+
const e3 =
9+
r"$..store.bicycle[?(@.price > 50)].model[?match(@, '(Mountain|Road)')]";
10+
const e4 =
11+
r"$..orders[*][?(@.status == 'delivered' && value(@.items[0:5][?(@.price > 50 && match(@.category, '(Electronics|Books)'))].quantity) > 1)].tracking[*].history[?(@.location == 'Warehouse' && @.status == 'out for delivery')]";
12+
13+
final start = DateTime.now();
14+
for (var i = 0; i < 50000; i++) {
15+
JsonPath(e1);
16+
JsonPath(e2);
17+
JsonPath(e3);
18+
JsonPath(e4);
19+
}
20+
final end = DateTime.now();
21+
print(
22+
'Duration: ${end.difference(start).inMilliseconds} ms');
23+
}

‎lib/src/fun/fun_factory.dart

+7-13
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,11 @@ class FunFactory {
3232
Expression<NodeList> nodes(FunCall call) => _any<NodeList>(call);
3333

3434
/// Returns a function to use as an argument for another function.
35-
Expression<T> _any<T extends Object>(FunCall call) {
36-
final name = call.name;
37-
final args = call.args;
38-
try {
39-
if (args.length == 1) return _any1<T>(name, args[0]);
40-
if (args.length == 2) return _any2<T>(name, args[0], args[1]);
41-
} on StateError catch (e) {
42-
throw FormatException(e.message);
43-
}
44-
throw Exception('Type mismatch');
45-
}
35+
Expression<T> _any<T extends Object>(FunCall call) => switch (call.args) {
36+
[var a] => _any1<T>(call.name, a),
37+
[var a, var b] => _any2<T>(call.name, a, b),
38+
_ => throw Exception('Invalid number of args for ${call.name}()'),
39+
};
4640

4741
Expression<T> _any1<T extends Object>(String name, Expression a0) {
4842
final f = _getFun1<T>(name);
@@ -79,13 +73,13 @@ class FunFactory {
7973
Fun1<T, Object> _getFun1<T extends Object>(String name) {
8074
final f = _fun1[name];
8175
if (f is Fun1<T, Object>) return f;
82-
throw StateError('Function "$name" of 1 argument is not found');
76+
throw FormatException('Function "$name" of 1 argument is not found');
8377
}
8478

8579
Fun2<T, Object, Object> _getFun2<T extends Object>(String name) {
8680
final f = _fun2[name];
8781
if (f is Fun2<T, Object, Object>) return f;
88-
throw StateError('Function "$name" of 2 arguments is not found');
82+
throw FormatException('Function "$name" of 2 arguments is not found');
8983
}
9084

9185
static Expression cast(Expression arg,

‎lib/src/grammar/json_path.dart

+58-79
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import 'package:json_path/src/grammar/negatable.dart';
1414
import 'package:json_path/src/grammar/parser_ext.dart';
1515
import 'package:json_path/src/grammar/select_all_recursively.dart';
1616
import 'package:json_path/src/grammar/sequence_selector.dart';
17+
import 'package:json_path/src/grammar/singular_segment_sequence.dart';
1718
import 'package:json_path/src/grammar/strings.dart';
1819
import 'package:json_path/src/grammar/union_selector.dart';
1920
import 'package:json_path/src/grammar/wildcard.dart';
@@ -28,27 +29,25 @@ class JsonPathGrammarDefinition
2829
final FunFactory _fun;
2930

3031
@override
31-
Parser<Expression<NodeList>> start() => ref0(_absPath).end();
32+
Parser<Expression<NodeList>> start() => _absPath().end();
3233

33-
Parser<Selector> _unionElement() => [
34-
arraySlice,
35-
arrayIndex,
36-
wildcard,
37-
quotedString.map(childSelector),
38-
_expressionFilter()
39-
].toChoiceParser().trim();
34+
Parser<Expression<NodeList>> _absPath() => _segmentSequence()
35+
.skip(before: char(r'$'))
36+
.map((expr) => Expression((node) => expr.call(node.root)));
4037

41-
Parser<SingularSelector> _singularUnionElement() => [
42-
arrayIndex,
43-
quotedString.map(childSelector),
38+
Parser<Expression<NodeList>> _segmentSequence() =>
39+
_segment().star().map(sequenceSelector).map(Expression.new);
40+
41+
Parser<Selector> _segment() => [
42+
dotName,
43+
wildcard.skip(before: char('.')),
44+
ref0(_union),
45+
ref0(_recursion),
4446
].toChoiceParser().trim();
4547

4648
Parser<Selector> _union() =>
4749
_unionElement().toList().inBrackets().map(unionSelector);
4850

49-
Parser<SingularSelector> _singularUnion() =>
50-
_singularUnionElement().inBrackets();
51-
5251
Parser<Selector> _recursion() => [
5352
wildcard,
5453
_union(),
@@ -58,38 +57,18 @@ class JsonPathGrammarDefinition
5857
.skip(before: string('..'))
5958
.map((value) => sequenceSelector([selectAllRecursively, value]));
6059

61-
Parser<Expression<bool>> _parenExpr() => negatable(_logicalExpr().inParens());
62-
63-
Parser<Expression> _funArgument() => [
64-
literal,
65-
ref0(_singularFilterPath),
66-
ref0(_filterPath),
67-
ref0(_valueFunExpr),
68-
ref0(_logicalFunExpr),
69-
ref0(_nodesFunExpr),
70-
ref0(_logicalExpr),
60+
Parser<Selector> _unionElement() => [
61+
arraySlice,
62+
arrayIndex,
63+
wildcard,
64+
quotedString.map(childSelector),
65+
_expressionFilter()
7166
].toChoiceParser().trim();
7267

73-
Parser<T> _funCall<T>(T Function(FunCall) toFun) =>
74-
(funName & _funArgument().toList().inParens())
75-
.map((v) => FunCall(v[0], v[1]))
76-
.tryMap(toFun);
77-
78-
Parser<Expression<Maybe>> _valueFunExpr() => _funCall(_fun.value);
79-
80-
Parser<Expression<NodeList>> _nodesFunExpr() => _funCall(_fun.nodes);
81-
82-
Parser<Expression<bool>> _logicalFunExpr() => _funCall(_fun.logical);
83-
84-
Parser<Expression<Maybe>> _comparable() => [
85-
literal,
86-
_singularFilterPath().map((expr) => expr.map((v) => v.asValue)),
87-
_valueFunExpr(),
88-
].toChoiceParser();
89-
90-
Parser<Expression<bool>> _logicalExpr() => _logicalOrExpr();
68+
Parser<Selector> _expressionFilter() =>
69+
_logicalExpr().skip(before: string('?').trim()).map(filterSelector);
9170

92-
Parser<Expression<bool>> _logicalOrExpr() => _logicalOrSequence()
71+
Parser<Expression<bool>> _logicalExpr() => _logicalOrSequence()
9372
.map((list) => list.reduce((a, b) => a.merge(b, (a, b) => a || b)));
9473

9574
Parser<List<Expression<bool>>> _logicalOrSequence() =>
@@ -109,61 +88,61 @@ class JsonPathGrammarDefinition
10988
failureJoiner: (a, b) =>
11089
Failure(a.buffer, a.position, 'Expression expected'));
11190

112-
Parser<Expression<NodeList>> _filterPath() => [
113-
ref0(_relPath),
114-
ref0(_absPath),
115-
].toChoiceParser();
116-
117-
Parser<Expression<SingularNodeList>> _singularFilterPath() => [
118-
ref0(_singularRelPath),
119-
ref0(_singularAbsPath),
120-
].toChoiceParser();
121-
122-
Parser<Expression<bool>> _existenceTest() =>
123-
ref0(_filterPath).map((value) => value.map((v) => v.asLogical));
91+
Parser<Expression<bool>> _parenExpr() => negatable(_logicalExpr().inParens());
12492

12593
Parser<Expression<bool>> _testExpr() => negatable([
12694
_existenceTest(),
12795
_logicalFunExpr(),
12896
].toChoiceParser());
12997

130-
Parser<Selector> _expressionFilter() =>
131-
_logicalExpr().skip(before: string('?').trim()).map(filterSelector);
98+
Parser<Expression<bool>> _existenceTest() =>
99+
_filterPath().map((value) => value.map((v) => v.asLogical));
132100

133-
Parser<Selector> _segment() => [
134-
dotName,
135-
wildcard.skip(before: char('.')),
136-
ref0(_union),
137-
ref0(_recursion),
138-
].toChoiceParser().trim();
101+
Parser<Expression<bool>> _logicalFunExpr() => _funCall(_fun.logical);
139102

140-
Parser<SingularSelector> _singularSegment() => [
141-
dotName,
142-
ref0(_singularUnion),
103+
Parser<T> _funCall<T>(T Function(FunCall) toFun) =>
104+
(funName & _funArgument().toList().inParens())
105+
.map((v) => FunCall(v[0], v[1]))
106+
.tryMap(toFun);
107+
108+
Parser<Expression> _funArgument() => [
109+
literal,
110+
_singularFilterPath(),
111+
_filterPath(),
112+
ref0(_valueFunExpr),
113+
ref0(_logicalFunExpr),
114+
ref0(_nodesFunExpr),
115+
ref0(_logicalExpr),
143116
].toChoiceParser().trim();
144117

145-
Parser<Expression<NodeList>> _segmentSequence() =>
146-
_segment().star().map(sequenceSelector).map(Expression.new);
118+
Parser<Expression<SingularNodeList>> _singularFilterPath() => [
119+
ref0(_singularRelPath),
120+
ref0(_singularAbsPath),
121+
].toChoiceParser();
147122

148-
Parser<Expression<SingularNodeList>> _singularSegmentSequence() =>
149-
_singularSegment()
150-
.star()
151-
.map(singularSequenceSelector)
152-
.map(Expression.new);
123+
Parser<Expression<Maybe>> _valueFunExpr() => _funCall(_fun.value);
153124

154-
Parser<Expression<NodeList>> _absPath() => _segmentSequence()
155-
.skip(before: char(r'$'))
156-
.map((expr) => Expression((node) => expr.call(node.root)));
125+
Parser<Expression<NodeList>> _nodesFunExpr() => _funCall(_fun.nodes);
126+
127+
Parser<Expression<Maybe>> _comparable() => [
128+
literal,
129+
_singularFilterPath().map((expr) => expr.map((v) => v.asValue)),
130+
_valueFunExpr(),
131+
].toChoiceParser();
132+
133+
Parser<Expression<NodeList>> _filterPath() => [
134+
ref0(_relPath),
135+
ref0(_absPath),
136+
].toChoiceParser();
157137

158138
Parser<Expression<SingularNodeList>> _singularAbsPath() =>
159-
_singularSegmentSequence()
139+
singularSegmentSequence
160140
.skip(before: char(r'$'), after: _segment().not())
161141
.map((expr) => Expression((node) => expr.call(node.root)));
162142

163143
Parser<Expression<NodeList>> _relPath() =>
164144
_segmentSequence().skip(before: char('@'));
165145

166146
Parser<Expression<SingularNodeList>> _singularRelPath() =>
167-
_singularSegmentSequence()
168-
.skip(before: char('@'), after: _segment().not());
147+
singularSegmentSequence.skip(before: char('@'), after: _segment().not());
169148
}

‎lib/src/grammar/singular_segment_sequence.dart

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
import 'package:json_path/src/expression/expression.dart';
2+
import 'package:json_path/src/grammar/array_index.dart';
3+
import 'package:json_path/src/grammar/child_selector.dart';
4+
import 'package:json_path/src/grammar/dot_name.dart';
5+
import 'package:json_path/src/grammar/parser_ext.dart';
6+
import 'package:json_path/src/grammar/sequence_selector.dart';
7+
import 'package:json_path/src/grammar/strings.dart';
8+
import 'package:petitparser/petitparser.dart';
9+
10+
final _singularUnionElement = [
11+
arrayIndex,
12+
quotedString.map(childSelector),
13+
].toChoiceParser().trim();
14+
15+
final _singularUnion = _singularUnionElement.inBrackets();
16+
17+
final _singularSegment = [
18+
dotName,
19+
_singularUnion,
20+
].toChoiceParser().trim();
21+
22+
final singularSegmentSequence =
23+
_singularSegment.star().map(singularSequenceSelector).map(Expression.new);

‎lib/src/grammar/strings.dart

+1-3
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,7 @@ final _escapedControl = [
2626
_escapedTab
2727
].toChoiceParser();
2828

29-
// The parser does not seem to support Unicode 6.0 boundary (0x10FFFF).
30-
// We're limiting ourselves to Unicode 1.0 boundary (0xFFFF).
31-
// TODO: work around by using surrogate pairs
29+
// The highest unicode character
3230
final _unicodeBoundary = String.fromCharCode(0xFFFF);
3331

3432
// Exclude double quote '"' and back slash '\'

‎lib/src/json_path_parser.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class JsonPathParser {
2020

2121
JsonPathParser._(Iterable<Fun> functions)
2222
: _parser =
23-
JsonPathGrammarDefinition(FunFactory([..._stdFun, ...functions]))
23+
JsonPathGrammarDefinition(FunFactory(_stdFun.followedBy(functions)))
2424
.build<Expression<NodeList>>();
2525

2626
/// The standard instance is pre-cached to speed up parsing when only

‎lib/src/node_match.dart

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class NodeMatch implements JsonPathMatch {
2020
final Object? value;
2121
}
2222

23-
extension _NodeExt<T> on Node<T> {
23+
extension<T> on Node<T> {
2424
Iterable<Object> trace() sync* {
2525
if (key != null) {
2626
yield* parent!.trace();
@@ -35,7 +35,7 @@ extension _NodeExt<T> on Node<T> {
3535
JsonPointer pointer() => JsonPointer.build(trace().map((e) => e.toString()));
3636

3737
String path() => r'$' + trace().map(_segment).join();
38-
}
3938

40-
Object _segment(Object? v) =>
41-
v is int ? IndexSelector(v) : NameSelector(v.toString());
39+
Object _segment(Object? v) =>
40+
v is int ? IndexSelector(v) : NameSelector(v.toString());
41+
}

‎lib/src/normalized/name_selector.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ class NameSelector {
88
String toString() => "['${name.escaped}']";
99
}
1010

11-
extension _StringExt on String {
11+
extension on String {
1212
/// Returns a string with all characters escaped as unicode entities.
1313
String get unicodeEscaped =>
1414
codeUnits.map((c) => '\\u${c.toRadixString(16).padLeft(4, '0')}').join();

‎pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ dependencies:
1414

1515
dev_dependencies:
1616
check_coverage: ^0.0.4
17-
lints: ">=3.0.0 <5.0.0"
17+
lints: ^4.0.0
1818
path: ^1.8.2
1919
test: ^1.21.1
2020

0 commit comments

Comments
 (0)