@xano/xanoscript-language-server 12.0.0 → 12.1.0

package/package.json

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

package/parser/attributes/columnDefaultValueAttribute.js

@@ -8,6 +8,7 @@ import {
   FalseToken,
   Identifier,
   NowToken,
+  NullToken,
   TrueToken,
 } from "../../lexer/tokens.js";
 
@@ -33,6 +34,7 @@ export function columnDefaultValueAttribute($) {
       { ALT: () => $.CONSUME(TrueToken) }, // true
       { ALT: () => $.CONSUME(FalseToken) }, // false
       { ALT: () => $.CONSUME(NowToken) }, // now
+      { ALT: () => $.CONSUME(NullToken) }, // null
       { ALT: () => $.CONSUME(Identifier) }, // when everything else fails, it's an identifier
     ]);
     $.sectionStack.pop();

package/parser/definitions/objectColumnDefinition.js

@@ -19,13 +19,19 @@ export function objectColumnDefinition($) {
     const parent = $.CONSUME(ObjectToken); // "object"
 
     let iterable = false;
-    const nullable = false; // objects cannot be nullable
+    let nullable = false;
     let optional = false;
 
     $.OPTION2(() => {
       // object[]
       iterable = true;
       $.SUBRULE($.arraySlice);
+
+      // object[]? (nullable array)
+      $.OPTION3(() => {
+        nullable = true;
+        $.CONSUME(Question);
+      });
     });
 
     // Column name (e.g., "user_id", "optional_column", "required_column")
@@ -40,7 +46,7 @@ export function objectColumnDefinition($) {
     // ? (is it an optional field)
     $.OPTION(() => {
       optional = true;
-      $.CONSUME(Question);
+      $.CONSUME1(Question);
     });
 
     $.SUBRULE($.objectColumnMetadataDefinition); // Object metadata

package/parser/functions/api/apiLambdaFn.js

@@ -4,8 +4,8 @@ import { LambdaToken } from "../../../lexer/api.js";
  * @param {import('../../base_parser.js').XanoBaseParser} $
  */
 export function apiLambdaFn($) {
-  const requiredAttrs = ["code", "timeout"];
-  const optionalAttrs = ["description", "disabled"];
+  const requiredAttrs = ["code"];
+  const optionalAttrs = ["description", "disabled", "timeout"];
 
   return () => {
     $.sectionStack.push("apiLambdaFn");

package/parser/functions/api/apiMicroserviceFn.js

@@ -0,0 +1,39 @@
+import { MicroserviceToken } from "../../../lexer/api.js";
+
+// api.microservice {
+//   host = $host
+//   path = "/reload"
+//   method = "POST"
+//   params = {}
+//   headers = []
+//   timeout = 60
+//   follow_location = true
+// } as $api_1
+
+/**
+ * @param {import('../../base_parser.js').XanoBaseParser} $
+ */
+export function apiMicroserviceFn($) {
+  return () => {
+    $.sectionStack.push("apiMicroserviceFn");
+    const fnToken = $.CONSUME(MicroserviceToken); // "microservice"
+    $.SUBRULE($.schemaParseAttributeFn, {
+      ARGS: [
+        fnToken,
+        {
+          host: "[expression]",
+          path: "[expression]",
+          method: "[expression]",
+          "description?": "[string]",
+          "disabled?": "[boolean]",
+          "params?": "[expression]",
+          "headers?": "[expression]",
+          "timeout?": "[expression]",
+          "follow_location?": "[expression]",
+        },
+      ],
+    });
+    $.SUBRULE($.asVariable, { ARGS: [fnToken] });
+    $.sectionStack.pop();
+  };
+}

package/parser/functions/api/register.js

@@ -1,5 +1,6 @@
 import { apiCallFn } from "./apiCallFn.js";
 import { apiLambdaFn } from "./apiLambdaFn.js";
+import { apiMicroserviceFn } from "./apiMicroserviceFn.js";
 import { apiRealtimeEventFn } from "./apiRealtimeEventFn.js";
 import { apiRequestFn } from "./apiRequestFn.js";
 import { apiStreamFn } from "./apiStreamFn.js";
@@ -11,6 +12,7 @@ import { webflowRequestFn } from "./webflowRequestFn.js";
  */
 export const register = ($) => {
   $.apiLambdaFn = $.RULE("apiLambdaFn", apiLambdaFn($));
+  $.apiMicroserviceFn = $.RULE("apiMicroserviceFn", apiMicroserviceFn($));
   $.apiRealtimeEventFn = $.RULE("apiRealtimeEventFn", apiRealtimeEventFn($));
   $.apiRequestFn = $.RULE("apiRequestFn", apiRequestFn($));
   $.apiStreamFn = $.RULE("apiStreamFn", apiStreamFn($));

package/parser/functions/apiFn.js

@@ -15,6 +15,7 @@ export function apiFn($) {
       { ALT: () => $.SUBRULE($.apiRequestFn) }, // "api.request"
       { ALT: () => $.SUBRULE($.apiRealtimeEventFn) }, // "api.realtime_event"
       { ALT: () => $.SUBRULE($.apiStreamFn) }, // "api.stream"
+      { ALT: () => $.SUBRULE($.apiMicroserviceFn) }, // "api.microservice"
     ]);
     $.sectionStack.pop();
   };

package/parser/functions/array/arrayShiftFn.js

@@ -1,4 +1,6 @@
-import { ShiftToken } from "../../../lexer/arrays.js";
+import { ArrayToken, ShiftToken } from "../../../lexer/arrays.js";
+import { AsToken } from "../../../lexer/control.js";
+import { DotToken } from "../../../lexer/tokens.js";
 
 /**
  * array.shift $my_array as $test
@@ -7,9 +9,16 @@ import { ShiftToken } from "../../../lexer/arrays.js";
 export function arrayShiftFn($) {
   return () => {
     $.sectionStack.push("arrayShiftFn");
+    $.OPTION(() => {
+      $.CONSUME(ArrayToken); // "array"
+      $.CONSUME(DotToken); // "."
+    });
     $.CONSUME(ShiftToken); // "shift"
     $.SUBRULE($.variableOnly);
-    $.SUBRULE($.arrayNoValueAs);
+    $.OPTION1(() => {
+      $.CONSUME(AsToken);
+      $.SUBRULE($.assignableVariableAs);
+    });
     $.sectionStack.pop();
   };
 }

package/parser/functions/controls/conditionalElifFn.js

@@ -1,3 +1,4 @@
+import { ExclamationToken } from "../../../lexer/cast.js";
 import { ElseifToken, LParent, RParent } from "../../../lexer/control.js";
 import { NewlineToken } from "../../../lexer/tokens.js";
 
@@ -7,6 +8,7 @@ import { NewlineToken } from "../../../lexer/tokens.js";
 export function conditionalElifFn($) {
   return () => {
     $.sectionStack.push("conditionalElifFn");
+    $.OPTION1(() => $.CONSUME(ExclamationToken)); // "!" (disabled)
     $.CONSUME(ElseifToken); // "elseif"
     $.CONSUME(LParent); // "("
     $.MANY(() => $.CONSUME(NewlineToken));

package/parser/functions/controls/forFn.js

@@ -19,6 +19,7 @@ export function forFn($) {
     $.CONSUME(ForToken); // "for"
     $.CONSUME(LParent); // "("
     $.SUBRULE($.expressionFn);
+    $.OPTION3(() => $.CONSUME2(NewlineToken));
     $.CONSUME(RParent); // ")"
     $.OPTION(() => {
       $.CONSUME(LCurly); // "{"

package/parser/functions/db/dbBulkAddFn.js

@@ -24,7 +24,7 @@ export function dbBulkAddFn($) {
         fnToken,
         {
           "items?": "[expression]",
-          "allow_id_field?": "[boolean]",
+          "allow_id_field?": "[expression]",
           "description?": "[string]",
           "disabled?": "[boolean]",
         },

package/parser/functions/schema/schemaParseObjectFn.js

@@ -7,7 +7,12 @@ import {
   RCurly,
 } from "../../../lexer/control.js";
 import { StringLiteral } from "../../../lexer/literal.js";
-import { DotToken, Identifier, NewlineToken } from "../../../lexer/tokens.js";
+import {
+  DotToken,
+  Identifier,
+  NewlineToken,
+  NowToken,
+} from "../../../lexer/tokens.js";
 import { InputVariable, ShortFormVariable } from "../../../lexer/variables.js";
 import {
   canBeDisabledAttribute,
@@ -67,7 +72,10 @@ export function schemaParseObjectFn($) {
       const keyValue = $.OR([
         {
           ALT: () => {
-            objectKeyToken = $.CONSUME(Identifier);
+            objectKeyToken = $.OR6([
+              { ALT: () => $.CONSUME(Identifier) },
+              { ALT: () => $.CONSUME(NowToken) },
+            ]);
             const tokens = [objectKeyToken];
             $.MANY3(() => {
               tokens.push($.CONSUME(DotToken));

package/parser/functions/storage/storageCreateAttachmentFn.js

@@ -13,7 +13,7 @@ export function storageCreateAttachmentFn($) {
         {
           value: "[expression]",
           access: ["public", "private"],
-          filename: "[expression]",
+          "filename?": "[expression]",
           "description?": "[string]",
           "disabled?": "[boolean]",
         },

package/parser/generic/expressionFn.js

@@ -115,6 +115,13 @@ export function expressionFn($) {
     let hasTests = false;
     let has_ternary = false;
 
+    // Inside any delimited sub-expression — `(...)`, `[...]`, `{...}` — a
+    // filter chain is unambiguous and should always be allowed, even when
+    // the outer expression has filters disabled (e.g. it is itself a filter
+    // argument). See filterFn.js for the rationale on why filter args
+    // disable filter parsing.
+    const delimitedOptions = { ...options, allowFilter: true };
+
     $.OR([
       {
         ALT: () => {
@@ -127,13 +134,17 @@ export function expressionFn($) {
                 $.OR3([
                   {
                     ALT: () =>
-                      $.SUBRULE($.expressionFn, { ARGS: [token, options] }),
+                      $.SUBRULE($.expressionFn, {
+                        ARGS: [token, delimitedOptions],
+                      }),
                   },
                   {
                     // some filters can be used as standalone value (e.g., `(|uuid)`)
                     // bug have to be inside parentheses
                     ALT: () =>
-                      $.SUBRULE($.multilineFilterFn, { ARGS: [options] }),
+                      $.SUBRULE($.multilineFilterFn, {
+                        ARGS: [delimitedOptions],
+                      }),
                   },
                 ]);
                 $.OPTION(() => $.CONSUME1(NewlineToken));
@@ -160,7 +171,7 @@ export function expressionFn($) {
               token,
               options.allowQueryExpression ? ["[query]"] : ["[expression]"],
               {},
-              options,
+              delimitedOptions,
             ],
           });
         },
@@ -181,7 +192,7 @@ export function expressionFn($) {
                   : "[expression]",
               },
               {},
-              options,
+              delimitedOptions,
             ],
           });
           $.SUBRULE($.chainedIdentifier);
@@ -199,8 +210,10 @@ export function expressionFn($) {
       // We use LookAhead to peek at the next tokens without consuming them
       // to decide if we should close or keep the gate open
       GATE: () =>
-        (options.allowFilter && $.LA(1).tokenType === PipeToken) ||
-        ($.LA(1).tokenType === NewlineToken && $.LA(2).tokenType === PipeToken),
+        options.allowFilter &&
+        ($.LA(1).tokenType === PipeToken ||
+          ($.LA(1).tokenType === NewlineToken &&
+            $.LA(2).tokenType === PipeToken)),
       DEF: () => {
         hasFilters = true;
         $.SUBRULE($.filterFn, { ARGS: [options] });

package/parser/generic/filterFn.js

@@ -40,9 +40,22 @@ export function filterFn($) {
       );
     }
 
+    // Filter arguments do not absorb subsequent `|filter` tokens — those
+    // belong to the outer expression's filter chain. Without this, a long
+    // sibling chain like `[]|push:1|push:2|push:3` parses as deep right-
+    // nested SUBRULEs and overflows the stack. Explicit nesting still works
+    // via parentheses (`|f:(x|g:y)`), since the parens branch in
+    // expressionFn restores `allowFilter: true`.
+    // allowBareIdentifier lets property-name args like `|get:items:null`
+    // parse as Identifier without requiring quotes or backticks.
+    const argOptions = {
+      ...options,
+      allowFilter: false,
+      allowBareIdentifier: true,
+    };
     $.MANY1(() => {
       $.CONSUME(ColonToken);
-      $.SUBRULE($.expressionFn, { ARGS: [filterToken, options, state] });
+      $.SUBRULE($.expressionFn, { ARGS: [filterToken, argOptions, state] });
     });
   };
 }