@xano/xanoscript-language-server 11.8.2 → 11.8.4

package/lexer/db.js

@@ -13,6 +13,12 @@ export const QueryToken = createTokenByName("query", {
   categories: [Identifier],
 });
 
+// where
+export const WhereToken = createTokenByName("where", {
+  longer_alt: Identifier,
+  categories: [Identifier],
+});
+
 // get
 export const GetToken = createTokenByName("get", {
   longer_alt: Identifier,
@@ -156,6 +162,7 @@ export const DbTokens = [
   MysqlToken,
   PostgresToken,
   OracleToken,
+  WhereToken,
 ];
 
 export function mapTokenToType(token) {
@@ -183,7 +190,9 @@ export function mapTokenToType(token) {
     case TruncateToken.name:
     case DirectQueryToken.name:
     case SetDatasourceToken.name:
-      return "function";
+      return "variable";
+    case WhereToken.name:
+      return;
     default:
       return null;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xano/xanoscript-language-server",
-  "version": "11.8.2",
+  "version": "11.8.4",
   "description": "Language Server Protocol implementation for XanoScript",
   "type": "module",
   "main": "server.js",

package/parser/functions/db/dbQueryFn.spec.js

@@ -34,6 +34,15 @@ describe("dbQueryFn", () => {
     expect(parser.errors).to.be.empty;
   });
 
+  it("dbQueryFn where can split line on binary operators", () => {
+    const parser = parse(`query user {
+      where = $db.user.visa_work_permit_end_date != null && 
+        $db.user.visa_work_permit_end_date <= $input.next_120_days && $db.bug_test_candidate.candidate_status == "mediated" && ($db.user.billing_end_date > now || $db.user.billing_end_date == null)
+      return = {type: "list"} 
+    } as $results`);
+    expect(parser.errors).to.be.empty;
+  });
+
   it("dbQueryFn accepts a description", () => {
     const parser = parse(`query user {
       where = $db.array_columns @> $db.array_columns.id

package/parser/generic/expressionFn.js

@@ -354,6 +354,7 @@ export function expressionTestFn($) {
       DEF: () => $.CONSUME1(Question), // "?"
     });
 
+    $.OPTION1(() => $.CONSUME(NewlineToken));
     $.SUBRULE($.expressionFn, { ARGS: [token, options] });
   };
 }

package/parser/generic/expressionFn.spec.js

@@ -107,6 +107,13 @@ describe("expressionFn", () => {
     expect(parser.errors).to.be.empty;
   });
 
+  it("expressionFn can split on multiple lines on binary operators", () => {
+    let parser = parse(`$var.value == "test" &&
+      $var.other_value != "example" ||
+      $var.another_value > 10`);
+    expect(parser.errors).to.be.empty;
+  });
+
   it("expressionFn accepts modulus symbol in expression", () => {
     const parser = parse("$this % 2 == 1");
     expect(parser.errors).to.be.empty;

package/parser/table_trigger_parser.js

@@ -1,4 +1,5 @@
 import { EqualToken, LCurly, RCurly } from "../lexer/control.js";
+import { WhereToken } from "../lexer/db.js";
 import { StringLiteral } from "../lexer/literal.js";
 import {
   ActionsToken,
@@ -20,6 +21,7 @@ export function tableTriggerDeclaration($) {
     let hasInput = false;
     let hasStack = false;
     let hasTags = false;
+    let hasWhere = false;
 
     // @TODO: search
 
@@ -127,6 +129,25 @@ export function tableTriggerDeclaration($) {
             $.SUBRULE($.tagsAttribute);
           },
         },
+        {
+          GATE: () => !hasWhere,
+          ALT: () => {
+            hasWhere = true;
+            const token = $.CONSUME(WhereToken, { LABEL: "where" });
+            $.CONSUME1(EqualToken);
+            $.SUBRULE($.expressionFn, {
+              ARGS: [
+                token,
+                {
+                  allowQueryExpression: true,
+                  allowVariable: true,
+                  allowExpression: false,
+                  allowComparison: true,
+                },
+              ],
+            });
+          },
+        },
       ]);
     });
 

package/parser/table_trigger_parser.spec.js

@@ -121,6 +121,35 @@ describe("table_trigger", () => {
       expect(parser.errors).to.be.empty;
     });
 
+    it("should accept a where clause in actions", () => {
+      const parser =
+        xanoscriptParser(`// Sends a Slack notification when a conversation's markdown is updated
+        table_trigger conversation_slack_notification {
+          table = "conversations"
+        
+          input {
+            json new
+            json old
+            enum action {
+              values = ["insert", "update", "delete", "truncate"]
+            }
+          
+            text datasource
+          }
+        
+          stack {
+            function.run "notifications/send_conversation_slack_notification" {
+              input = {id: $input.new.id}
+            } as $slack_result
+          }
+        
+          where = $db.NEW.markdown != null
+          actions = {insert: true, update: true}
+          history = 100
+        }`);
+      expect(parser.errors).to.be.empty;
+    });
+
     it("should parse actions with fields in any order", () => {
       const parser = xanoscriptParser(`table_trigger foo {
         table = "blah"