V0.5.1 (#54)

Author: f3ath

.gitmodules

@@ -1,3 +1,4 @@
-[submodule "cts"]
-	path = cts
+
+[submodule "test/cases/cts"]
+	path = test/cases/cts
 	url = https://github.com/jsonpath-standard/jsonpath-compliance-test-suite.git

.pubignore

@@ -1,3 +1,3 @@
-cts
+test/cases/cts
 .coverage
 

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.5.1] - 2023-03-28
+### Added
+- Better support for Normalized Paths
+
 ## [0.5.0] - 2023-03-23
 ### Added
 - Full support of some built-in functions: `length()`, `size()`, `search()`, `match()`, `value()`.
@@ -133,6 +137,7 @@ Previously, no modification would be made and no errors/exceptions thrown.
 ### Added
 - Basic design draft
 
+[0.5.1]: https://github.com/f3ath/jessie/compare/0.5.0...0.5.1
 [0.5.0]: https://github.com/f3ath/jessie/compare/0.4.4...0.5.0
 [0.4.4]: https://github.com/f3ath/jessie/compare/0.4.3...0.4.4
 [0.4.3]: https://github.com/f3ath/jessie/compare/0.4.2...0.4.3

cts

@@ -1,5 +1,7 @@
 import 'package:json_path/json_path.dart';
 import 'package:json_path/src/node.dart';
+import 'package:json_path/src/normalized/index_selector.dart';
+import 'package:json_path/src/normalized/name_selector.dart';
 import 'package:rfc_6901/rfc_6901.dart';
 
 class NodeMatch implements JsonPathMatch {
@@ -35,16 +37,5 @@ extension _NodeExt<T> on Node<T> {
   String path() => r'$' + trace().map(_segment).join();
 }
 
-String _segment(Object? e) =>
-    e is int ? '[$e]' : "['${_escape(e.toString())}']";
-
-String _escape(String string) => {
-      r'/': r'\/',
-      r'\': r'\\',
-      '\b': r'\b',
-      '\f': r'\f',
-      '\n': r'\n',
-      '\r': r'\r',
-      '\t': r'\t',
-      "'": r"\'",
-    }.entries.fold(string, (s, e) => s.replaceAll(e.key, e.value));
+Object _segment(Object? e) =>
+    e is int ? IndexSelector(e) : NameSelector(e.toString());

lib/src/node_match.dart

@@ -0,0 +1,8 @@
+class IndexSelector {
+  IndexSelector(this.index);
+
+  final int index;
+
+  @override
+  String toString() => '[$index]';
+}

lib/src/normalized/index_selector.dart

@@ -0,0 +1,25 @@
+class NameSelector {
+  NameSelector(this.name);
+
+  final String name;
+
+  @override
+  String toString() => "['${_escape(name)}']";
+
+  String _escape(String string) => {
+        r'/': r'\/',
+        r'\': r'\\',
+        '\b': r'\b',
+        '\f': r'\f',
+        '\n': r'\n',
+        '\r': r'\r',
+        '\t': r'\t',
+        "'": r"\'",
+      }
+          .entries
+          .fold(string, (s, e) => s.replaceAll(e.key, e.value))
+          .replaceAllMapped(
+              RegExp(r'[\u0000-\u001f]'),
+              (s) =>
+                  '\\u${s[0]!.codeUnitAt(0).toRadixString(16).padLeft(4, '0')}');
+}

lib/src/normalized/name_selector.dart

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

pubspec.yaml

@@ -0,0 +1,66 @@
+{
+  "tests": [
+    {
+      "name": "escaped characters",
+      "selector": "$[*]",
+      "document": {
+        "\u0000": "NUL",
+        "\u0001": "SOH",
+        "\u0002": "STX",
+        "\u0003": "ETX",
+        "\u0004": "EOT",
+        "\u0005": "ENQ",
+        "\u0006": "ACK",
+        "\u0007": "nul",
+        "\u0008": "BS, backspace",
+        "\u0009": "HT, tab",
+        "\u000A": "LF, new line",
+        "\u000B": "VT",
+        "\u000C": "FF, form feed",
+        "\u000D": "CR, carriage return",
+        "\u000E": "SO",
+        "\u000F": "SI",
+        "\u001F": "US",
+        "'": "single quote/apostrophe",
+        "\\": "backslash"
+      },
+      "paths": [
+        "$['\\u0000']",
+        "$['\\u0001']",
+        "$['\\u0002']",
+        "$['\\u0003']",
+        "$['\\u0004']",
+        "$['\\u0005']",
+        "$['\\u0006']",
+        "$['\\u0007']",
+        "$['\\b']",
+        "$['\\t']",
+        "$['\\n']",
+        "$['\\u000b']",
+        "$['\\f']",
+        "$['\\r']",
+        "$['\\u000e']",
+        "$['\\u000f']",
+        "$['\\u001f']",
+        "$['\\'']",
+        "$['\\\\']"
+      ]
+    },
+    {
+      "name": "unescaped characters",
+      "selector": "$[*]",
+      "document": {
+        "\"": "double quote",
+        "[]": "[]",
+        "\ud83d\ude00": "smiley face",
+        "\u10FFFF": "0x10FFFF"
+      },
+      "paths": [
+        "$['\"']",
+        "$['[]']",
+        "$['\uD83D\uDE00']",
+        "$['\u10FFFF']"
+      ]
+    }
+  ]
+}

test/cases/cts

@@ -4,7 +4,7 @@ import 'package:json_path/json_path.dart';
 import 'helper.dart';
 
 void main() {
-  runTestsInDirectory('cts');
+  runTestsInDirectory('test/cases/cts');
   runTestsInDirectory('test/cases/standard');
   runTestsInDirectory('test/cases/extra',
       parser: JsonPathParser(functions: [

test/cases/standard/normalized_path.json

@@ -14,7 +14,8 @@ void runTestsInDirectory(String dirName, {JsonPathParser? parser}) {
   Directory(dirName)
       .listSync()
       .whereType<File>()
-      .where((file) => file.path.endsWith('.json'))
+      .where((file) =>
+          file.path.endsWith('.json') && !file.path.endsWith('.schema.json'))
       .forEach((file) {
     group(path.basename(file.path), () {
       final cases = jsonDecode(file.readAsStringSync());