Lazy filter queries.

jg-rp · Oct 15, 2023 · eea0f80 · eea0f80
1 parent 0b89902
commit eea0f80
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/src/path/expression.ts b/src/path/expression.ts
@@ -190,7 +190,11 @@ export abstract class JSONPathQuery extends FilterExpression {
 
 export class RelativeQuery extends JSONPathQuery {
   public evaluate(context: FilterContext): JSONPathNodeList {
-    return this.path.query(context.currentValue); // TODO: lazy query?
+    return context.lazy
+      ? new JSONPathNodeList(
+          Array.from(this.path.lazyQuery(context.currentValue)),
+        )
+      : this.path.query(context.currentValue);
   }
 
   public toString(): string {
@@ -200,7 +204,9 @@ export class RelativeQuery extends JSONPathQuery {
 
 export class RootQuery extends JSONPathQuery {
   public evaluate(context: FilterContext): JSONPathNodeList {
-    return this.path.query(context.rootValue); // TODO: lazy query?
+    return context.lazy
+      ? new JSONPathNodeList(Array.from(this.path.lazyQuery(context.rootValue)))
+      : this.path.query(context.rootValue);
   }
 
   public toString(): string {

diff --git a/src/path/selectors.ts b/src/path/selectors.ts
@@ -495,6 +495,7 @@ export class FilterSelector extends JSONPathSelector {
             environment: this.environment,
             currentValue: value,
             rootValue: node.root,
+            lazy: true,
           };
           if (this.expression.evaluate(filterContext)) {
             yield new JSONPathNode(value, node.location.concat(i), node.root);
@@ -506,6 +507,7 @@ export class FilterSelector extends JSONPathSelector {
             environment: this.environment,
             currentValue: value,
             rootValue: node.root,
+            lazy: true,
           };
           if (this.expression.evaluate(filterContext)) {
             yield new JSONPathNode(value, node.location.concat(key), node.root);

diff --git a/src/path/types.ts b/src/path/types.ts
@@ -15,6 +15,7 @@ export type FilterContext = {
   environment: JSONPathEnvironment;
   currentValue: JSONValue;
   rootValue: JSONValue;
+  lazy?: boolean;
 };
 
 /**