Update CTS and test normalized paths

jg-rp · Feb 4, 2025 · ca6331a · ca6331a
1 parent 2108507
commit ca6331a
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 6 deletions.
diff --git a/tests/path/compliance.test.ts b/tests/path/compliance.test.ts
@@ -9,7 +9,9 @@ type Case = {
   selector: string;
   document?: JSONValue;
   result?: JSONValue[];
+  result_paths?: string[];
   results?: JSONValue[][];
+  results_paths?: string[][];
   invalid_selector?: boolean;
 };
 
@@ -30,16 +32,30 @@ const testSuiteName = env.nondeterministic
 describe(testSuiteName, () => {
   test.each<Case>(cts.tests)(
     "$name",
-    ({ selector, document, result, results, invalid_selector }: Case) => {
+    ({
+      selector,
+      document,
+      result,
+      result_paths,
+      results,
+      results_paths,
+      invalid_selector,
+    }: Case) => {
       if (invalid_selector) {
         expect(() => env.compile(selector)).toThrow(JSONPathError);
       } else if (document) {
         if (result) {
-          const rv = env.query(selector, document).values();
-          expect(rv).toStrictEqual(result);
+          const nodes = env.query(selector, document);
+          expect(nodes.values()).toStrictEqual(result);
+          expect(nodes.paths({ form: "canonical" })).toStrictEqual(
+            result_paths,
+          );
         } else if (results) {
-          const rv = env.query(selector, document).values();
-          expect(results).toContainEqual(rv);
+          const nodes = env.query(selector, document);
+          expect(results).toContainEqual(nodes.values());
+          expect(results_paths).toContainEqual(
+            nodes.paths({ form: "canonical" }),
+          );
         }
       }
     },

diff --git a/tests/path/cts b/tests/path/cts
+1,631 −16		cts.json
+30 −6		cts.schema.json
+490 −62		tests/basic.json
+2,556 −440		tests/filter.json
+54 −12		tests/functions/count.json
+189 −46		tests/functions/length.json
+357 −80		tests/functions/match.json
+374 −82		tests/functions/search.json
+64 −14		tests/functions/value.json
+83 −20		tests/index_selector.json
+476 −147		tests/name_selector.json
+400 −70		tests/slice_selector.json
+337 −65		tests/whitespace/filter.json
+561 −105		tests/whitespace/functions.json
+1,869 −285		tests/whitespace/operators.json
+429 −129		tests/whitespace/selectors.json
+337 −65		tests/whitespace/slice.json