flowquery 1.0.37 → 1.0.38

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flowquery",
-  "version": "1.0.37",
+  "version": "1.0.38",
   "description": "A declarative query language for data processing pipelines.",
   "main": "dist/index.node.js",
   "types": "dist/index.node.d.ts",

package/src/parsing/operations/group_by.ts

@@ -52,10 +52,12 @@ class GroupBy extends Projection {
         let node: Node = this.current;
         for (const mapper of this.mappers) {
             const value: any = mapper.value();
-            let child: Node | undefined = node.children.get(value);
+            const key: string =
+                typeof value === "object" && value !== null ? JSON.stringify(value) : String(value);
+            let child: Node | undefined = node.children.get(key);
             if (child === undefined) {
                 child = new Node(value);
-                node.children.set(value, child);
+                node.children.set(key, child);
             }
             node = child;
         }

package/src/parsing/operations/limit.ts

@@ -7,6 +7,12 @@ class Limit extends Operation {
         super();
         this.limit = limit;
     }
+    public get isLimitReached(): boolean {
+        return this.count >= this.limit;
+    }
+    public increment(): void {
+        this.count++;
+    }
     public async run(): Promise<void> {
         if (this.count >= this.limit) {
             return;
@@ -19,4 +25,4 @@ class Limit extends Operation {
     }
 }
 
-export default Limit;
+export default Limit;

package/src/parsing/operations/return.ts

@@ -1,3 +1,4 @@
+import Limit from "./limit";
 import Projection from "./projection";
 import Where from "./where";
 
@@ -15,6 +16,7 @@ import Where from "./where";
 class Return extends Projection {
     protected _where: Where | null = null;
     protected _results: Record<string, any>[] = [];
+    private _limit: Limit | null = null;
     public set where(where: Where) {
         this._where = where;
     }
@@ -24,10 +26,16 @@ class Return extends Projection {
         }
         return this._where.value();
     }
+    public set limit(limit: Limit) {
+        this._limit = limit;
+    }
     public async run(): Promise<void> {
         if (!this.where) {
             return;
         }
+        if (this._limit !== null && this._limit.isLimitReached) {
+            return;
+        }
         const record: Map<string, any> = new Map();
         for (const [expression, alias] of this.expressions()) {
             const raw = expression.value();
@@ -35,6 +43,9 @@ class Return extends Projection {
             record.set(alias, value);
         }
         this._results.push(Object.fromEntries(record));
+        if (this._limit !== null) {
+            this._limit.increment();
+        }
     }
     public async initialize(): Promise<void> {
         this._results = [];

package/src/parsing/parser.ts

@@ -112,6 +112,9 @@ class Parser extends BaseParser {
             if (this.token.isUnion()) {
                 break;
             }
+            if (this.token.isEOF()) {
+                break;
+            }
             operation = this.parseOperation();
             if (operation === null && !isSubQuery) {
                 throw new Error("Expected one of WITH, UNWIND, RETURN, LOAD, OR CALL");
@@ -142,8 +145,12 @@ class Parser extends BaseParser {
             }
             const limit = this.parseLimit();
             if (limit !== null) {
-                operation!.addSibling(limit);
-                operation = limit;
+                if (operation instanceof Return) {
+                    (operation as Return).limit = limit;
+                } else {
+                    operation!.addSibling(limit);
+                    operation = limit;
+                }
             }
             previous = operation;
         }
@@ -494,16 +501,11 @@ class Parser extends BaseParser {
         node.label = label!;
         if (identifier !== null && this._state.variables.has(identifier)) {
             let reference = this._state.variables.get(identifier);
-            // Resolve through Expression -> Reference -> Node (e.g., after WITH)
-            if (reference instanceof Expression && reference.firstChild() instanceof Reference) {
-                const inner = (reference.firstChild() as Reference).referred;
-                if (inner instanceof Node) {
-                    reference = inner;
-                }
-            }
             if (
                 reference === undefined ||
-                (!(reference instanceof Node) && !(reference instanceof Unwind))
+                (!(reference instanceof Node) &&
+                    !(reference instanceof Unwind) &&
+                    !(reference instanceof Expression))
             ) {
                 throw new Error(`Undefined node reference: ${identifier}`);
             }

package/tests/compute/runner.test.ts

@@ -842,6 +842,19 @@ test("Test limit", async () => {
     expect(results.length).toBe(50);
 });
 
+test("Test limit as last operation", async () => {
+    const runner = new Runner(
+        `
+        unwind range(1, 10) as i
+        return i
+        limit 5
+        `
+    );
+    await runner.run();
+    const results = runner.results;
+    expect(results.length).toBe(5);
+});
+
 test("Test range lookup", async () => {
     const runner = new Runner(
         `
@@ -1327,6 +1340,60 @@ test("Test match with referenced to previous variable", async () => {
     expect(results[1]).toEqual({ name1: "Person 2", name2: "Person 3", name3: "Person 4" });
 });
 
+test("Test match with aggregated with and subsequent match", async () => {
+    await new Runner(`
+        CREATE VIRTUAL (:User) AS {
+            unwind [
+                {id: 1, name: 'Alice'},
+                {id: 2, name: 'Bob'},
+                {id: 3, name: 'Carol'}
+            ] as record
+            RETURN record.id as id, record.name as name
+        }
+    `).run();
+    await new Runner(`
+        CREATE VIRTUAL (:User)-[:KNOWS]-(:User) AS {
+            unwind [
+                {left_id: 1, right_id: 2},
+                {left_id: 1, right_id: 3}
+            ] as record
+            RETURN record.left_id as left_id, record.right_id as right_id
+        }
+    `).run();
+    await new Runner(`
+        CREATE VIRTUAL (:Project) AS {
+            unwind [
+                {id: 1, name: 'Project A'},
+                {id: 2, name: 'Project B'}
+            ] as record
+            RETURN record.id as id, record.name as name
+        }
+    `).run();
+    await new Runner(`
+        CREATE VIRTUAL (:User)-[:WORKS_ON]-(:Project) AS {
+            unwind [
+                {left_id: 1, right_id: 1},
+                {left_id: 1, right_id: 2}
+            ] as record
+            RETURN record.left_id as left_id, record.right_id as right_id
+        }
+    `).run();
+    const match = new Runner(`
+        MATCH (u:User)-[:KNOWS]->(s:User)
+        WITH u, count(s) as acquaintances
+        MATCH (u)-[:WORKS_ON]->(p:Project)
+        RETURN u.name as name, acquaintances, collect(p.name) as projects
+    `);
+    await match.run();
+    const results = match.results;
+    expect(results.length).toBe(1);
+    expect(results[0]).toEqual({
+        name: "Alice",
+        acquaintances: 2,
+        projects: ["Project A", "Project B"],
+    });
+});
+
 test("Test match and return full node", async () => {
     await new Runner(`
         CREATE VIRTUAL (:Person) AS {