Use external JSON Pointer (#19)

Author: f3ath

CHANGELOG.md

@@ -3,7 +3,6 @@
 - `JsonPathMatch.context` contains the matching context. It is intended to be used in named filters.
 - `JsonPathMatch.parent` contains the parent match.
 - `JsonPathMatch.pointer` contains the RFC 6901 JSON Pointer to the match.
-- JsonPointer implementation
 
 ### Changed
 - Named filters argument renamed from `filter` to `filters`

example/example.dart

@@ -57,9 +57,4 @@ void main() {
       .read(document)
       .map((match) => '${match.pointer}:\t${match.value}')
       .forEach(print);
-
-  /// Modifying all prices in-place:
-  prices.read(document).map((match) => match.pointer).forEach((pointer) {
-    pointer.transform(document, (value) => value - 1);
-  });
 }

lib/json_path.dart

@@ -1,7 +1,7 @@
 /// JSONPath for Dart
 library json_path;
 
-export 'package:json_path/src/path/filter_not_found.dart';
-export 'package:json_path/src/path/json_path.dart';
-export 'package:json_path/src/path/json_path_match.dart';
-export 'package:json_path/src/path/matching_context.dart';
+export 'package:json_path/src/filter_not_found.dart';
+export 'package:json_path/src/json_path.dart';
+export 'package:json_path/src/json_path_match.dart';
+export 'package:json_path/src/matching_context.dart';

lib/json_pointer.dart

@@ -0,0 +1,37 @@
+import 'package:json_path/src/json_path_match.dart';
+import 'package:json_path/src/matching_context.dart';
+import 'package:json_path/src/quote.dart';
+import 'package:rfc_6901/rfc_6901.dart';
+
+/// Creates a match for a child element
+class ChildMatch implements JsonPathMatch {
+  /// Child match for an array element
+  ChildMatch.index(int index, this.parent)
+      : value = parent.value[index],
+        path = parent.path + '[' + index.toString() + ']',
+        pointer = JsonPointerSegment(index.toString(), parent.pointer);
+
+  /// Child match for an object child
+  ChildMatch.child(String key, this.parent)
+      : value = parent.value[key],
+        path = parent.path + '[' + quote(key) + ']',
+        pointer = JsonPointerSegment(key, parent.pointer);
+
+  /// The value
+  @override
+  final value;
+
+  /// JSONPath to this match
+  @override
+  final String path;
+
+  /// JSON Pointer (RFC 6901) to this match
+  @override
+  final JsonPointer pointer;
+
+  @override
+  MatchingContext get context => parent.context;
+
+  @override
+  final JsonPathMatch parent;
+}

lib/src/child_match.dart

@@ -1,12 +1,12 @@
-import 'package:json_path/src/path/selector/array_index.dart';
-import 'package:json_path/src/path/selector/array_slice.dart';
-import 'package:json_path/src/path/selector/field.dart';
-import 'package:json_path/src/path/selector/named_filter.dart';
-import 'package:json_path/src/path/selector/recursion.dart';
-import 'package:json_path/src/path/selector/selector.dart';
-import 'package:json_path/src/path/selector/sequence.dart';
-import 'package:json_path/src/path/selector/union.dart';
-import 'package:json_path/src/path/selector/wildcard.dart';
+import 'package:json_path/src/selector.dart';
+import 'package:json_path/src/selector/array_index.dart';
+import 'package:json_path/src/selector/array_slice.dart';
+import 'package:json_path/src/selector/field.dart';
+import 'package:json_path/src/selector/named_filter.dart';
+import 'package:json_path/src/selector/recursion.dart';
+import 'package:json_path/src/selector/sequence.dart';
+import 'package:json_path/src/selector/union.dart';
+import 'package:json_path/src/selector/wildcard.dart';
 import 'package:petitparser/petitparser.dart';
 
 final minus = char('-');

lib/src/path/filter_not_found.dart lib/src/filter_not_found.dart

@@ -1,7 +1,7 @@
-import 'package:json_path/src/path/grammar.dart' as grammar;
-import 'package:json_path/src/path/json_path_match.dart';
-import 'package:json_path/src/path/match_factory.dart';
-import 'package:json_path/src/path/selector/selector.dart';
+import 'package:json_path/src/grammar.dart' as grammar;
+import 'package:json_path/src/json_path_match.dart';
+import 'package:json_path/src/root_match.dart';
+import 'package:json_path/src/selector.dart';
 
 /// A JSONPath expression
 class JsonPath {
@@ -22,8 +22,7 @@ class JsonPath {
   /// Reads the given [document] object returning an Iterable of all matches found.
   Iterable<JsonPathMatch> read(document,
           {Map<String, CallbackFilter> filters = const {}}) =>
-      _selector
-          .read(rootMatch(document, expression, {...this.filters, ...filters}));
+      _selector.apply(RootMatch(document, {...this.filters, ...filters}));
 
   /// Reads the given [json] object returning an Iterable of all values found.
   Iterable readValues(json) => read(json).map((_) => _.value);

lib/src/path/grammar.dart lib/src/grammar.dart

@@ -1,12 +1,12 @@
-import 'package:json_path/json_pointer.dart';
-import 'package:json_path/src/path/matching_context.dart';
+import 'package:json_path/src/matching_context.dart';
+import 'package:rfc_6901/rfc_6901.dart';
 
 /// A named filter function
 typedef CallbackFilter = bool Function(JsonPathMatch match);
 
-abstract class JsonPathMatch<T> {
+abstract class JsonPathMatch {
   /// The value
-  T get value;
+  dynamic get value;
 
   /// JSONPath to this match
   String get path;

lib/src/path/json_path.dart lib/src/json_path.dart

@@ -0,0 +1,8 @@
+import 'package:json_path/src/json_path_match.dart';
+
+class MatchingContext {
+  const MatchingContext(this.filters);
+
+  /// Named callback filters
+  final Map<String, CallbackFilter> filters;
+}