flowquery 1.0.23 → 1.0.24

package/package.json

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

package/src/parsing/parser.ts

@@ -857,7 +857,7 @@ class Parser extends BaseParser {
         while (true) {
             if (this.token.isDot()) {
                 this.setNextToken();
-                if (!this.token.isIdentifierOrKeyword()) {
+                if (!this.token.isIdentifier() && !this.token.isKeyword()) {
                     throw new Error("Expected identifier");
                 }
                 lookup = new Lookup();

package/tests/parsing/parser.test.ts

@@ -264,6 +264,42 @@ test("Test lookup with JSON array", () => {
     expect(_return.firstChild().value()).toBe(2);
 });
 
+test("Test lookup with reserved keyword property names", () => {
+    const parser = new Parser();
+    const ast = parser.parse("with {end: 1, null: 2, case: 3} as x return x.end, x.null, x.case");
+    expect(ast.print()).toBe(
+        "ASTNode\n" +
+            "- With\n" +
+            "-- Expression (x)\n" +
+            "--- AssociativeArray\n" +
+            "---- KeyValuePair\n" +
+            "----- String (end)\n" +
+            "----- Expression\n" +
+            "------ Number (1)\n" +
+            "---- KeyValuePair\n" +
+            "----- String (null)\n" +
+            "----- Expression\n" +
+            "------ Number (2)\n" +
+            "---- KeyValuePair\n" +
+            "----- String (case)\n" +
+            "----- Expression\n" +
+            "------ Number (3)\n" +
+            "- Return\n" +
+            "-- Expression\n" +
+            "--- Lookup\n" +
+            "---- Identifier (end)\n" +
+            "---- Reference (x)\n" +
+            "-- Expression\n" +
+            "--- Lookup\n" +
+            "---- Identifier (null)\n" +
+            "---- Reference (x)\n" +
+            "-- Expression\n" +
+            "--- Lookup\n" +
+            "---- Identifier (case)\n" +
+            "---- Reference (x)"
+    );
+});
+
 test("Test load with post", () => {
     const parser = new Parser();
     const ast = parser.parse(