@xano/xanoscript-language-server 11.4.0 → 11.6.0

package/.claude/settings.local.json

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xano/xanoscript-language-server",
-  "version": "11.4.0",
+  "version": "11.6.0",
   "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/security/securityCreateAuthTokenFn.js

@@ -1,6 +1,4 @@
-import { EqualToken, LCurly, RCurly } from "../../../lexer/control.js";
 import { CreateAuthTokenToken } from "../../../lexer/security.js";
-import { Identifier, NewlineToken } from "../../../lexer/tokens.js";
 
 /**
  * @param {import('../../base_parser.js').XanoBaseParser} $
@@ -9,15 +7,21 @@ export function securityCreateAuthTokenFn($) {
   return () => {
     $.sectionStack.push("securityCreateAuthTokenFn");
     const fnToken = $.CONSUME(CreateAuthTokenToken); // "create_auth_token"
-    $.CONSUME(LCurly); // "{"
-    $.MANY(() => {
-      $.AT_LEAST_ONE(() => $.CONSUME(NewlineToken));
-      $.CONSUME1(Identifier); // "field_name"
-      $.CONSUME(EqualToken); // "="
-      $.SUBRULE($.expressionFn);
+
+    $.SUBRULE($.schemaParseAttributeFn, {
+      ARGS: [
+        fnToken,
+        {
+          extras: "[expression]",
+          table: "[expression]",
+          expiration: "[expression]",
+          id: "[expression]",
+          "description?": "[string]",
+          "disabled?": "[boolean]",
+        },
+      ],
     });
-    $.MANY1(() => $.CONSUME1(NewlineToken));
-    $.CONSUME(RCurly); // "}"
+
     $.SUBRULE($.asVariable, { ARGS: [fnToken] });
     $.sectionStack.pop();
   };

package/parser/functions/security/securityCreateAuthTokenFn.spec.js

@@ -17,8 +17,35 @@ describe("securityCreateAuthTokenFn", () => {
       table = "empty"
       extras = {}
       expiration = 86400
-      id = ""
+      id = $user.id
     } as $authToken`);
     expect(parser.errors).to.be.empty;
   });
+
+  it("securityCreateAuthTokenFn requires an expiration attribute", () => {
+    const parser = parse(`create_auth_token {
+      table = "empty"
+      extras = {}
+      id = $user.id
+    } as $authToken`);
+    expect(parser.errors).to.not.be.empty;
+  });
+
+  it("securityCreateAuthTokenFn requires an extra attribute", () => {
+    const parser = parse(`create_auth_token {
+      table = "empty"
+      expiration = 86400
+      id = $user.id
+    } as $authToken`);
+    expect(parser.errors).to.not.be.empty;
+  });
+
+  it("securityCreateAuthTokenFn requires a table attribute", () => {
+    const parser = parse(`create_auth_token {
+      expiration = 86400
+      id = $user.id
+      extras = {"role": "admin"}
+    } as $authToken`);
+    expect(parser.errors).to.not.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]",
                 },
               ],
             });

package/parser/table_trigger_parser.js

@@ -44,18 +44,14 @@ export function tableTriggerDeclaration($) {
             const subParent = $.CONSUME(ActionsToken); // "actions"
             $.CONSUME(EqualToken); // "="
 
-            $.SUBRULE($.objectAttrReq, {
+            $.SUBRULE($.schemaParseObjectFn, {
               ARGS: [
                 subParent,
-                [], // required
-                ["delete", "insert", "truncate", "update"], // optional
                 {
-                  types: {
-                    delete: "boolean",
-                    insert: "boolean",
-                    truncate: "boolean",
-                    update: "boolean",
-                  },
+                  "delete?": "[boolean]",
+                  "insert?": "[boolean]",
+                  "truncate?": "[boolean]",
+                  "update?": "[boolean]",
                 },
               ],
             });
@@ -74,9 +70,11 @@ export function tableTriggerDeclaration($) {
           GATE: () => !hasDatasources,
           ALT: () => {
             hasDatasources = true;
-            $.CONSUME(DatasourcesToken);
+            const parent = $.CONSUME(DatasourcesToken);
             $.CONSUME3(EqualToken);
-            $.SUBRULE($.arrayOfStringLiterals);
+            $.SUBRULE($.schemaFn, {
+              ARGS: [parent, ["[string]"]],
+            });
           },
         },
         {

package/parser/test_parser.js

@@ -7,9 +7,7 @@ import { parserExtension as schemaParseConstantFnExtension } from "./functions/s
 import { parserExtension as schemaParseEnumFnExtension } from "./functions/schema/schemaParseEnum.spec.js";
 import { parserExtension as schemaParseImmutableFnExtension } from "./functions/schema/schemaParseImmutableFn.spec.js";
 import { parserExtension as schemaParseObjectFnExtension } from "./functions/schema/schemaParseObjectFn.spec.js";
-import { parserExtension as arrayOfObjectAttrReqExtension } from "./generic/arrayOfObjectAttrReq.spec.js";
 import { parserExtension as functionAttrReqExtension } from "./generic/functionAttrReq.spec.js";
-import { parserExtension as objectAttrReqExtension } from "./generic/objectAttrReq.spec.js";
 import { parserExtension as objectWithAttributesExtension } from "./generic/objectWithAttributes.spec.js";
 
 /**
@@ -26,9 +24,7 @@ class TestParser extends XanoBaseParser {
     schemaParseObjectFnExtension.bind(this)();
     schemaParseEnumFnExtension.bind(this)();
     schemaParseImmutableFnExtension.bind(this)();
-    arrayOfObjectAttrReqExtension.bind(this)();
     functionAttrReqExtension.bind(this)();
-    objectAttrReqExtension.bind(this)();
     objectWithAttributesExtension.bind(this)();
     schemaParseAttributeFnExtension.bind(this)();
 

package/parser/workspace_trigger_parser.js

@@ -39,17 +39,13 @@ export function workspaceTriggerDeclaration($) {
             const subParent = $.CONSUME(ActionsToken); // "actions"
             $.CONSUME(EqualToken); // "="
 
-            $.SUBRULE($.objectAttrReq, {
+            $.SUBRULE($.schemaParseObjectFn, {
               ARGS: [
                 subParent,
-                [], // required
-                ["branch_live", "branch_merge", "branch_new"], // optional
                 {
-                  types: {
-                    branch_live: "boolean",
-                    branch_merge: "boolean",
-                    branch_new: "boolean",
-                  },
+                  "branch_live?": "[boolean]",
+                  "branch_merge?": "[boolean]",
+                  "branch_new?": "[boolean]",
                 },
               ],
             });

package/parser/generic/arrayOfObjectAttrReq.js

@@ -1,47 +0,0 @@
-import { CommaToken, LSquare, RSquare } from "../../lexer/control.js";
-import { NewlineToken } from "../../lexer/tokens.js";
-
-/**
- * see objectAttrReq signature for arrayOfObjectAttrReq arguments details
- * @param {import('../base_parser.js').XanoBaseParser} $
- */
-export function arrayOfObjectAttrReq($) {
-  /**
-   * @param {import('chevrotain').Rule} rule
-   **/
-  return (parent, required, optional, options = {}) => {
-    $.CONSUME(LSquare); // "["
-    $.OPTION(() => {
-      $.OR([
-        // multi line, each value on a new line
-        {
-          ALT: () => {
-            $.CONSUME(NewlineToken);
-            $.AT_LEAST_ONE(() => {
-              $.SUBRULE($.objectAttrReq, {
-                ARGS: [parent, required, optional, options],
-              });
-              $.OPTION1(() => $.CONSUME(CommaToken)); // optional comma
-              $.AT_LEAST_ONE1(() => $.CONSUME3(NewlineToken));
-            });
-          },
-        },
-        // one line, comma separated [ ..., ... ]
-        {
-          ALT: () => {
-            $.AT_LEAST_ONE_SEP({
-              SEP: CommaToken,
-              DEF: () => {
-                $.SUBRULE1($.objectAttrReq, {
-                  ARGS: [parent, required, optional, options],
-                });
-              },
-            });
-            $.MANY(() => $.CONSUME2(NewlineToken));
-          },
-        },
-      ]);
-    });
-    $.CONSUME(RSquare); // "]"
-  };
-}