@xano/xanoscript-language-server 11.5.0 → 11.6.1

package/.claude/settings.local.json

@@ -0,0 +1,12 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(npm test:*)",
+      "Bash(node -e:*)",
+      "Bash(node --input-type=module -e:*)",
+      "Bash(git checkout:*)",
+      "Bash(ls:*)",
+      "Bash(npm run lint:*)"
+    ]
+  }
+}

package/lexer/literal.js

@@ -24,7 +24,7 @@ export const SingleQuotedStringLiteral = createUniqToken({
 export const FloatLiteral = createUniqToken({
   name: "FloatLiteral",
   label: "floating point number",
-  pattern: /-?\d+\.\d+/,
+  pattern: /-?\d+\.\d+([eE][+-]?\d+)?/,
 });
 
 export const IntegerLiteral = createUniqToken({

package/onDidChangeContent/onDidChangeContent.js

@@ -62,7 +62,7 @@ export function onDidChangeContent(params, connection) {
   if (!document) {
     console.error(
       "onDidChangeContent(): Document not found for URI:",
-      params.textDocument.uri
+      params.textDocument.uri,
     );
     return null;
   }
@@ -74,7 +74,7 @@ export function onDidChangeContent(params, connection) {
     const { parser, scheme } = documentCache.getOrParse(
       document.uri,
       document.version,
-      text
+      text,
     );
 
     if (parser.errors.length === 0) {
@@ -84,7 +84,7 @@ export function onDidChangeContent(params, connection) {
 
     for (const error of parser.errors) {
       console.error(
-        `onDidChangeContent(): Error parsing document: ${error.name}`
+        `onDidChangeContent(): Error parsing document: ${error.name}`,
       );
     }
 
@@ -93,7 +93,7 @@ export function onDidChangeContent(params, connection) {
 
     console.log(
       `onDidChangeContent(): sending diagnostic (${parser.errors.length} errors) for scheme:`,
-      scheme
+      scheme,
     );
 
     connection.sendDiagnostics({

package/onHover/onHoverDocument.js

@@ -39,7 +39,7 @@ export function onHoverDocument(params, documents, hoverProviders = []) {
   if (!document) {
     console.error(
       "onHover(): Document not found for URI:",
-      params.textDocument.uri
+      params.textDocument.uri,
     );
     return null;
   }
@@ -51,7 +51,7 @@ export function onHoverDocument(params, documents, hoverProviders = []) {
   const { lexResult, parser } = documentCache.getOrParse(
     params.textDocument.uri,
     document.version,
-    text
+    text,
   );
 
   if (lexResult.errors.length > 0) return null;
@@ -67,7 +67,7 @@ export function onHoverDocument(params, documents, hoverProviders = []) {
 
   // Find the hover provider that matches the token
   const messageProvider = hoverProviders.find((provider) =>
-    provider.isMatch(tokenIdx, tokens, parser)
+    provider.isMatch(tokenIdx, tokens, parser),
   );
 
   if (messageProvider) {

package/onSemanticCheck/highlight.js

@@ -30,13 +30,13 @@ function higlightDefault(text, SemanticTokensBuilder) {
         character,
         token.image.length, // Length of the token
         encodeTokenType(tokenType), // Numeric ID for the token type
-        0 // No modifiers for now
+        0, // No modifiers for now
       );
     } else if (tokenType === undefined) {
       console.log(
         `token type not mapped to a type: ${JSON.stringify(
-          token.tokenType.name
-        )}`
+          token.tokenType.name,
+        )}`,
       );
     }
   });

package/onSemanticCheck/onSemanticCheck.js

@@ -13,7 +13,7 @@ export function onSemanticCheck(params, documents, SemanticTokensBuilder) {
   if (!document) {
     console.error(
       "onSemanticCheck(): Document not found for URI:",
-      params.textDocument.uri
+      params.textDocument.uri,
     );
     return null;
   }

package/package.json

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

package/parser/agent_parser.js

@@ -250,18 +250,16 @@ export function agentDeclaration($) {
             $.CONSUME2(EqualToken); // "="
 
             // [{"name":"tool_name"}]
-            $.SUBRULE($.arrayOfObjectAttrReq, {
+            $.SUBRULE($.schemaParseArrayFn, {
               ARGS: [
                 subParent,
-                ["name"], // required
-                ["active", "auth"], // optional
-                {
-                  types: {
-                    active: "boolean",
-                    auth: "string",
-                    name: "string",
+                [
+                  {
+                    name: "[string]",
+                    "active?": "[boolean]",
+                    "auth?": "[string]",
                   },
-                },
+                ],
               ],
             });
           },

package/parser/api_group_parser.js

@@ -59,27 +59,16 @@ export function apiGroupDeclaration($) {
 
             const subParent = $.CONSUME(CorsToken);
             $.CONSUME3(EqualToken); // "="
-            $.SUBRULE($.objectAttrReq, {
+            $.SUBRULE($.schemaParseObjectFn, {
               ARGS: [
                 subParent,
-                [], // required
-                [
-                  "mode",
-                  "origins",
-                  "methods",
-                  "headers",
-                  "credentials",
-                  "max_age",
-                ], // optional
                 {
-                  types: {
-                    mode: "string",
-                    origins: ($) => $.SUBRULE($.arrayOfStringLiterals),
-                    methods: ($) => $.SUBRULE1($.arrayOfStringLiterals),
-                    headers: ($) => $.SUBRULE2($.arrayOfStringLiterals),
-                    credentials: "boolean",
-                    max_age: "number",
-                  },
+                  "mode?": "[string]",
+                  "origins?": ["[string]"],
+                  "methods?": ["[string]"],
+                  "headers?": ["[string]"],
+                  "credentials?": "[boolean]",
+                  "max_age?": "[number]",
                 },
               ],
             });
@@ -112,14 +101,12 @@ export function apiGroupDeclaration($) {
             hasSwagger = true;
             const subRule = $.CONSUME(SwaggerToken);
             $.CONSUME4(EqualToken); // "="
-            $.SUBRULE2($.objectAttrReq, {
+            $.SUBRULE2($.schemaParseObjectFn, {
               ARGS: [
                 subRule,
-                [], // required
-                ["active", "token"], // optional
                 {
-                  active: "boolean",
-                  token: "string",
+                  "active?": "[boolean]",
+                  "token?": "[string]",
                 },
               ],
             });

package/parser/clauses/cacheClause.js

@@ -10,19 +10,18 @@ export function cacheClause($) {
     $.sectionStack.push("cacheClause");
     const parent = $.CONSUME(Cachetoken); // "cache"
     $.CONSUME(EqualToken); // "="
-    $.SUBRULE($.objectAttrReq, {
+
+    $.SUBRULE($.schemaParseObjectFn, {
       ARGS: [
         parent,
-        ["ttl", "input", "auth", "datasource", "ip"],
-        ["headers", "env"],
         {
-          types: {
-            ttl: "number",
-            input: "boolean",
-            auth: "boolean",
-            datasource: "boolean",
-            ip: "boolean",
-          },
+          ttl: "[number]",
+          input: "[boolean]",
+          auth: "[boolean]",
+          datasource: "[boolean]",
+          ip: "[boolean]",
+          "headers?": ["[string]"],
+          "env?": ["[string]"],
         },
       ],
     });

package/parser/functions/util/utilGetRawInputFn.js

@@ -12,7 +12,7 @@ export function utilGetRawInputFn($) {
       ARGS: [
         fnToken,
         {
-          "encoding?": ["json", "yaml", "x-www-form-urlencoded", ""],
+          "encoding?": ["json", "none", "yaml", "x-www-form-urlencoded", ""],
           "description?": "[string]",
           "disabled?": "[boolean]",
           "exclude_middleware?": "[boolean]",

package/parser/functions/util/utilGetRawInputFn.spec.js

@@ -19,6 +19,13 @@ describe("utilGetRawInputFn", () => {
     expect(parser.errors).to.be.empty;
   });
 
+  it("utilGetRawInputFn accepts none as an encoding attribute", () => {
+    const parser = parse(`get_raw_input {
+      encoding = "none"
+    } as $x4`);
+    expect(parser.errors).to.be.empty;
+  });
+
   it("utilGetRawInputFn encoding attribute is optional", () => {
     const parser = parse(`get_raw_input as $x4`);
     expect(parser.errors).to.be.empty;

package/parser/functions/varFn.js

@@ -1,6 +1,23 @@
 import { DotToken } from "../../lexer/tokens.js";
 import { UpdateToken, VarToken } from "../../lexer/var.js";
-import { ShortFormVariable } from "../../lexer/variables.js";
+import {
+  ApiBaseUrlVariable,
+  BranchVariable,
+  DatasourceVariable,
+  HttpHeadersVariable,
+  RemoteHostVariable,
+  RemoteIpVariable,
+  RemotePasswordVariable,
+  RemotePortVariable,
+  RemoteUserVariable,
+  RequestAuthTokenVariable,
+  RequestMethod,
+  RequestQuerystringVariable,
+  RequestUriVariable,
+  ShortFormVariable,
+  TenantVariable,
+  WebflowVariable,
+} from "../../lexer/variables.js";
 
 /**
  * represent $var.x or $x, the only format accepting an assigment
@@ -15,7 +32,27 @@ export function varFn($) {
       {
         // "var $users"
         ALT: () => {
-          const variable = $.CONSUME(ShortFormVariable);
+          // "$users" or env property tokens like "$http_headers"
+          // TODO: probably a good idea to add a warning when an reserved env property
+          // token is used as a variable name
+          const variable = $.OR1([
+            { ALT: () => $.CONSUME(ShortFormVariable) },
+            { ALT: () => $.CONSUME(ApiBaseUrlVariable) },
+            { ALT: () => $.CONSUME(BranchVariable) },
+            { ALT: () => $.CONSUME(DatasourceVariable) },
+            { ALT: () => $.CONSUME(HttpHeadersVariable) },
+            { ALT: () => $.CONSUME(RemoteHostVariable) },
+            { ALT: () => $.CONSUME(RemoteIpVariable) },
+            { ALT: () => $.CONSUME(RemotePasswordVariable) },
+            { ALT: () => $.CONSUME(RemotePortVariable) },
+            { ALT: () => $.CONSUME(RemoteUserVariable) },
+            { ALT: () => $.CONSUME(RequestAuthTokenVariable) },
+            { ALT: () => $.CONSUME(RequestMethod) },
+            { ALT: () => $.CONSUME(RequestQuerystringVariable) },
+            { ALT: () => $.CONSUME(RequestUriVariable) },
+            { ALT: () => $.CONSUME(TenantVariable) },
+            { ALT: () => $.CONSUME(WebflowVariable) },
+          ]);
           if (variable.image) {
             // we can directly add the variable here but
             // not necessary for the `assignableVariableProperty` below

package/parser/functions/varFn.spec.js

@@ -84,6 +84,13 @@ describe("varFn", () => {
     expect(parser.errors).to.be.empty;
   });
 
+  it("varFn accept scientific notation", () => {
+    const parser = parse(`  var $x1 {
+      value = 4.21E-6
+    }`);
+    expect(parser.errors).to.be.empty;
+  });
+
   it("varFn expect a variable name", () => {
     const parser = parse(`var {
       value = "email"
@@ -92,6 +99,13 @@ describe("varFn", () => {
     expect(parser.errors).to.not.be.empty;
   });
 
+  it("varFn accepts an $env.$http_headers object as the value", () => {
+    const parser = parse(`var $http_headers {
+      value = $env.$http_headers
+    }`);
+    expect(parser.errors).to.be.empty;
+  });
+
   it("varFn expect an as variable to be an identifier", () => {
     const parser = parse(`var "user" {
       value = "email"
@@ -107,6 +121,13 @@ describe("varFn", () => {
     expect(parser.errors).to.be.empty;
   });
 
+  it("varFn can update a value", () => {
+    const parser = parse(`var.update $http_headers.Referer {
+      value = "example.com"
+    }`);
+    expect(parser.errors).to.be.empty;
+  });
+
   it("should allow accessing a property from an object defined in place", () => {
     let parser = parse(`var $config {
       value = {

package/parser/generic/assignableVariableProperty.js

@@ -1,6 +1,24 @@
 import { PipeToken } from "../../lexer/control.js";
 import { DotToken, Identifier, NewlineToken } from "../../lexer/tokens.js";
-import { LongFormVariable, ShortFormVariable } from "../../lexer/variables.js";
+import {
+  ApiBaseUrlVariable,
+  BranchVariable,
+  DatasourceVariable,
+  HttpHeadersVariable,
+  LongFormVariable,
+  RemoteHostVariable,
+  RemoteIpVariable,
+  RemotePasswordVariable,
+  RemotePortVariable,
+  RemoteUserVariable,
+  RequestAuthTokenVariable,
+  RequestMethod,
+  RequestQuerystringVariable,
+  RequestUriVariable,
+  ShortFormVariable,
+  TenantVariable,
+  WebflowVariable,
+} from "../../lexer/variables.js";
 
 /**
  * represent $var.x or $x, the only format accepting an assigment
@@ -11,10 +29,29 @@ export function assignableVariableProperty($) {
     let variableName = "";
     $.OR({
       DEF: [
-        // "$users"
+        // "$users" or env property tokens like "$http_headers"
+        // TODO: probably a good idea to add a warning when an reserved env property
+        // token is used as a variable name
         {
           ALT: () => {
-            const variable = $.CONSUME(ShortFormVariable);
+            const variable = $.OR1([
+              { ALT: () => $.CONSUME(ShortFormVariable) },
+              { ALT: () => $.CONSUME(ApiBaseUrlVariable) },
+              { ALT: () => $.CONSUME(BranchVariable) },
+              { ALT: () => $.CONSUME(DatasourceVariable) },
+              { ALT: () => $.CONSUME(HttpHeadersVariable) },
+              { ALT: () => $.CONSUME(RemoteHostVariable) },
+              { ALT: () => $.CONSUME(RemoteIpVariable) },
+              { ALT: () => $.CONSUME(RemotePasswordVariable) },
+              { ALT: () => $.CONSUME(RemotePortVariable) },
+              { ALT: () => $.CONSUME(RemoteUserVariable) },
+              { ALT: () => $.CONSUME(RequestAuthTokenVariable) },
+              { ALT: () => $.CONSUME(RequestMethod) },
+              { ALT: () => $.CONSUME(RequestQuerystringVariable) },
+              { ALT: () => $.CONSUME(RequestUriVariable) },
+              { ALT: () => $.CONSUME(TenantVariable) },
+              { ALT: () => $.CONSUME(WebflowVariable) },
+            ]);
             variableName = variable.image;
           },
         },

package/parser/generic/completeEnvVariable.js

@@ -38,7 +38,7 @@ export function completeEnvVariable($) {
             {
               ALT: () => {
                 $.CONSUME(HttpHeadersVariable);
-                $.SUBRULE($.singleChainedIdentifier);
+                $.OPTION(() => $.SUBRULE($.singleChainedIdentifier));
               },
             },
             { ALT: () => $.CONSUME(RemoteHostVariable) },

package/parser/generic/completeEnvVariable.spec.js

@@ -62,6 +62,11 @@ describe("completeEnvVariable", () => {
     expect(parser.errors).to.be.empty;
   });
 
+  it("completeEnvVariable accepts $http_headers without property access", () => {
+    const parser = parse("$env.$http_headers");
+    expect(parser.errors).to.be.empty;
+  });
+
   it("completeEnvVariable warn when using env variable starting with $", () => {
     const parser = parse("$env.$my_custom_variable");
     expect(parser.errors).to.be.empty;

package/parser/generic/expressionFn.spec.js

@@ -187,6 +187,11 @@ describe("expressionFn", () => {
     expect(parser.errors).to.be.empty;
   });
 
+  it("expressionFn can be a scientific notation", () => {
+    const parser = parse("4.21E-6");
+    expect(parser.errors).to.be.empty;
+  });
+
   it("expressionFn accepts a JSON", () => {
     const parser = parse(`[
       {
@@ -270,7 +275,7 @@ describe("expressionFn", () => {
 
   it("expressionFn accepts a rich boolean test expression", () => {
     const parser = parse(
-      `($event_type == "app_mention") || (($event_type == "message") && ($channel_type == "im")) || $thread_replies.ai_bot_thread`
+      `($event_type == "app_mention") || (($event_type == "message") && ($channel_type == "im")) || $thread_replies.ai_bot_thread`,
     );
     expect(parser.errors).to.be.empty;
   });
@@ -323,7 +328,7 @@ describe("expressionFn", () => {
 
   it("expressionFn allow concat operator", () => {
     const parser = parse(
-      `"Given the conversation history and the latest message:\\n\\"" ~ $latestMessage ~ "\\"\\n\\nWho should act next? Or should we FINISH? Select one of: " ~ ($memberOptions|join:", ") ~ "."`
+      `"Given the conversation history and the latest message:\\n\\"" ~ $latestMessage ~ "\\"\\n\\nWho should act next? Or should we FINISH? Select one of: " ~ ($memberOptions|join:", ") ~ "."`,
     );
     expect(parser.errors).to.be.empty;
   });
@@ -374,14 +379,14 @@ describe("expressionFn", () => {
 
   it("expressionFn should accept chained filters in parenthesis", () => {
     const parser = parse(
-      `(now|to_timestamp|add:2:2|add:2|transform_timestamp:"24 hours ago":"UTC")`
+      `(now|to_timestamp|add:2:2|add:2|transform_timestamp:"24 hours ago":"UTC")`,
     );
     expect(parser.errors).to.be.empty;
   });
 
   it("expressionFn should accept chained filters with comparison", () => {
     const parser = parse(
-      `(now|to_timestamp|transform_timestamp:"24 hours ago":"UTC") > (335|add:2)`
+      `(now|to_timestamp|transform_timestamp:"24 hours ago":"UTC") > (335|add:2)`,
     );
     expect(parser.errors).to.be.empty;
   });

package/parser/generic/register.js

@@ -1,5 +1,3 @@
-import { arrayOfObjectAttrReq } from "./arrayOfObjectAttrReq.js";
-import { arrayOfStringLiterals } from "./arrayOfStringLiterals.js";
 import { arrayWithValues } from "./arrayWithValues.js";
 import { assignableVariableAs } from "./assignableVariableAs.js";
 import { assignableVariableProperty } from "./assignableVariableProperty.js";
@@ -28,7 +26,6 @@ import { minimalFnBody } from "./minimalFnBody.js";
 import { mockAttribute } from "./mockAttribute.js";
 import { multilineFilterFn } from "./multilineFilterFn.js";
 import { numberValue } from "./numberValue.js";
-import { objectAttrReq } from "./objectAttrReq.js";
 import { objectWithAttributes } from "./objectWithAttributes.js";
 import {
   commentBlockFn,
@@ -48,29 +45,21 @@ import { variableOnly } from "./variableOnly.js";
  */
 export const register = ($) => {
   $.mockAttribute = $.RULE("mockAttribute", mockAttribute($));
-  $.arrayOfObjectAttrReq = $.RULE(
-    "arrayOfObjectAttrReq",
-    arrayOfObjectAttrReq($)
-  );
-  $.arrayOfStringLiterals = $.RULE(
-    "arrayOfStringLiterals",
-    arrayOfStringLiterals($)
-  );
   $.arrayWithValues = $.RULE("arrayWithValues", arrayWithValues($));
   $.assignableVariableAs = $.RULE(
     "assignableVariableAs",
-    assignableVariableAs($)
+    assignableVariableAs($),
   );
   $.assignableVariableProperty = $.RULE(
     "assignableVariableProperty",
-    assignableVariableProperty($)
+    assignableVariableProperty($),
   );
   $.booleanValue = $.RULE("booleanValue", booleanValue($));
   $.castedValue = $.RULE("castedValue", castedValue($));
   $.chainedIdentifier = $.RULE("chainedIdentifier", chainedIdentifier($));
   $.singleChainedIdentifier = $.RULE(
     "singleChainedIdentifier",
-    singleChainedIdentifier($)
+    singleChainedIdentifier($),
   );
   $.enumValue = $.RULE("enumValue", enumValue($));
   $.expressionFn = $.RULE("expressionFn", expressionFn($));
@@ -82,10 +71,9 @@ export const register = ($) => {
   $.longFormVariable = $.RULE("longFormVariable", longFormVariable($));
   $.minimalFnBody = $.RULE("minimalFnBody", minimalFnBody($));
   $.numberValue = $.RULE("numberValue", numberValue($));
-  $.objectAttrReq = $.RULE("objectAttrReq", objectAttrReq($));
   $.objectWithAttributes = $.RULE(
     "objectWithAttributes",
-    objectWithAttributes($)
+    objectWithAttributes($),
   );
   $.pipedFilter = $.RULE("pipedFilter", pipedFilter($));
   $.requiredValueFnBody = $.RULE("requiredValueFnBody", requiredValueFnBody($));
@@ -94,31 +82,31 @@ export const register = ($) => {
   $.tagsAttribute = $.RULE("tagsAttribute", tagsAttribute($));
   $.expressionFnForResponse = $.RULE(
     "valueExpressionForResponse",
-    valueExpressionForResponse($)
+    valueExpressionForResponse($),
   );
   $.variableOnly = $.RULE("variableOnly", variableOnly($));
   $.completeAuthVariable = $.RULE(
     "completeAuthVariable",
-    completeAuthVariable($)
+    completeAuthVariable($),
   );
   $.bracketAccessor = $.RULE("bracketAccessor", bracketAccessor($));
   $.bracketArrayAccessor = $.RULE(
     "bracketArrayAccessor",
-    bracketArrayAccessor($)
+    bracketArrayAccessor($),
   );
   $.completeInputVariable = $.RULE(
     "completeInputVariable",
-    completeInputVariable($)
+    completeInputVariable($),
   );
   $.completeErrorVariable = $.RULE(
     "completeErrorVariable",
-    completeErrorVariable($)
+    completeErrorVariable($),
   );
   $.completeEnvVariable = $.RULE("completeEnvVariable", completeEnvVariable($));
   $.asVariable = $.RULE("asVariable", asVariable($));
   $.optionalCommentBlockFn = $.RULE(
     "optionalCommentBlockFn",
-    optionalCommentBlockFn($)
+    optionalCommentBlockFn($),
   );
   $.commentBlockFn = $.RULE("commentBlockFn", commentBlockFn($));
 };

package/parser/mcp_server_parser.js

@@ -99,18 +99,16 @@ export function mcpServerDeclaration($) {
             $.CONSUME2(EqualToken); // "="
 
             // [{"name":"tool_name"}]
-            $.SUBRULE($.arrayOfObjectAttrReq, {
+            $.SUBRULE($.schemaParseArrayFn, {
               ARGS: [
                 subParent,
-                ["name"], // required
-                ["active", "auth"], // optional
-                {
-                  types: {
-                    active: "boolean",
-                    auth: "string",
-                    name: "string",
+                [
+                  {
+                    name: "[string]",
+                    "active?": "[boolean]",
+                    "auth?": "[string]",
                   },
-                },
+                ],
               ],
             });
           },

package/parser/mcp_server_trigger_parser.js

@@ -43,15 +43,11 @@ export function mcpServerTriggerDeclaration($) {
             const subParent = $.CONSUME(ActionsToken); // "actions"
             $.CONSUME(EqualToken); // "="
 
-            $.SUBRULE($.objectAttrReq, {
+            $.SUBRULE($.schemaParseObjectFn, {
               ARGS: [
                 subParent,
-                ["connection"],
-                [],
                 {
-                  types: {
-                    connection: "boolean",
-                  },
+                  connection: "[boolean]",
                 },
               ],
             });

package/parser/realtime_trigger_parser.js

@@ -41,16 +41,12 @@ export function realtimeTriggerDeclaration($) {
             const subParent = $.CONSUME(ActionsToken); // "actions"
             $.CONSUME(EqualToken); // "="
 
-            $.SUBRULE($.objectAttrReq, {
+            $.SUBRULE($.schemaParseObjectFn, {
               ARGS: [
                 subParent,
-                [], // required
-                ["join", "message"], // optional
                 {
-                  types: {
-                    join: "boolean",
-                    message: "boolean",
-                  },
+                  "join?": "[boolean]",
+                  "message?": "[boolean]",
                 },
               ],
             });