@xano/xanoscript-language-server 11.7.0 → 11.7.2

package/.claude/settings.local.json

@@ -10,7 +10,16 @@
       "Bash(grep:*)",
       "Bash(node --input-type=module:*)",
       "Bash(find:*)",
-      "Read(//tmp/**)"
+      "Read(//tmp/**)",
+      "Bash(git stash:*)",
+      "Bash(node:*)",
+      "Bash(for:*)",
+      "Bash(do)",
+      "Bash(if ! grep -q \"guidFieldAttribute\" \"$f\")",
+      "Bash(then)",
+      "Bash(echo:*)",
+      "Bash(fi)",
+      "Bash(done)"
     ]
   }
 }

package/onCompletion/contentAssist.js

@@ -127,6 +127,11 @@ const filterSuggestions = Object.freeze(
   })
 );
 
+// Maximum number of tokens to pass to computeContentAssist.
+// Chevrotain's content assist has exponential complexity with complex grammars;
+// beyond this threshold it can consume gigabytes of memory and OOM the process.
+const MAX_CONTENT_ASSIST_TOKENS = 40;
+
 export function getContentAssistSuggestions(text, scheme) {
   try {
     const lexResult = lexDocument(text);
@@ -138,32 +143,31 @@ export function getContentAssistSuggestions(text, scheme) {
       return filterSuggestions;
     }
 
-    let syntacticSuggestions;
-    parser.reset();
-    if (scheme === "db") {
-      syntacticSuggestions = parser.computeContentAssist(
-        "tableDeclaration",
-        partialTokenVector
-      );
-    } else if (scheme === "api") {
-      syntacticSuggestions = parser.computeContentAssist(
-        "queryDeclaration",
-        partialTokenVector
-      );
-    } else if (scheme === "function") {
-      syntacticSuggestions = parser.computeContentAssist(
-        "functionDeclaration",
-        partialTokenVector
-      );
-    } else if (scheme === "task") {
-      syntacticSuggestions = parser.computeContentAssist(
-        "taskDeclaration",
-        partialTokenVector
-      );
-    } else {
+    // Skip computeContentAssist for large token vectors to prevent OOM.
+    // Chevrotain explores all possible parse paths which grows exponentially
+    // with deeply nested grammars (e.g., arrays inside function blocks).
+    if (partialTokenVector.length > MAX_CONTENT_ASSIST_TOKENS) {
+      return [];
+    }
+
+    const ruleNameByScheme = {
+      db: "tableDeclaration",
+      api: "queryDeclaration",
+      function: "functionDeclaration",
+      task: "taskDeclaration",
+    };
+
+    const ruleName = ruleNameByScheme[scheme];
+    if (!ruleName) {
       return [];
     }
 
+    parser.reset();
+    const syntacticSuggestions = parser.computeContentAssist(
+      ruleName,
+      partialTokenVector
+    );
+
     // The suggestions also include the context, we are only interested
     // in the TokenTypes in this example.
     const tokenTypesSuggestions = syntacticSuggestions

package/package.json

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

package/parser/addon_parser.js

@@ -17,6 +17,7 @@ import {
 export function addonDeclaration($) {
   return () => {
     let hasDescription = false;
+    let hasGuid = false;
     let hasInput = false;
     let hasStack = false;
     let hasTags = false;
@@ -41,6 +42,13 @@ export function addonDeclaration($) {
             $.SUBRULE($.descriptionFieldAttribute);
           },
         },
+        {
+          GATE: () => !hasGuid,
+          ALT: () => {
+            hasGuid = true;
+            $.SUBRULE($.guidFieldAttribute);
+          },
+        },
         {
           GATE: () => !hasInput,
           ALT: () => {

package/parser/agent_parser.js

@@ -9,6 +9,7 @@ export function agentDeclaration($) {
   return () => {
     let hasCanonical = false;
     let hasDescription = false;
+    let hasGuid = false;
     let hasDocs = false;
     let hasHistory = false;
     let hasLLM = false;
@@ -48,6 +49,13 @@ export function agentDeclaration($) {
             $.SUBRULE($.descriptionFieldAttribute);
           },
         },
+        {
+          GATE: () => !hasGuid,
+          ALT: () => {
+            hasGuid = true;
+            $.SUBRULE($.guidFieldAttribute);
+          },
+        },
         {
           GATE: () => !hasDocs,
           ALT: () => {

package/parser/agent_trigger_parser.js

@@ -14,6 +14,7 @@ export function agentTriggerDeclaration($) {
     let hasActive = false;
     let hasAgent = false;
     let hasDescription = false;
+    let hasGuid = false;
     let hasDocs = false;
     let hasHistory = false;
     let hasInput = false;
@@ -69,6 +70,13 @@ export function agentTriggerDeclaration($) {
             $.SUBRULE($.descriptionFieldAttribute);
           },
         },
+        {
+          GATE: () => !hasGuid,
+          ALT: () => {
+            hasGuid = true;
+            $.SUBRULE($.guidFieldAttribute);
+          },
+        },
         {
           GATE: () => !hasDocs,
           ALT: () => {

package/parser/api_group_parser.js

@@ -16,6 +16,7 @@ export function apiGroupDeclaration($) {
     let hasCanonical = false;
     let hasCors = false;
     let hasDescription = false;
+    let hasGuid = false;
     let hasDocs = false;
     let hasHistory = false;
     let hasSwagger = false;
@@ -81,6 +82,13 @@ export function apiGroupDeclaration($) {
             $.SUBRULE($.descriptionFieldAttribute);
           },
         },
+        {
+          GATE: () => !hasGuid,
+          ALT: () => {
+            hasGuid = true;
+            $.SUBRULE($.guidFieldAttribute);
+          },
+        },
         {
           GATE: () => !hasDocs,
           ALT: () => {

package/parser/attributes/guidFieldAttribute.js

@@ -0,0 +1,16 @@
+import { EqualToken } from "../../lexer/control.js";
+import { StringLiteral } from "../../lexer/literal.js";
+import { GuidToken } from "../../lexer/tokens.js";
+
+/**
+ * @param {import('../base_parser.js').XanoBaseParser} $
+ */
+export function guidFieldAttribute($) {
+  return () => {
+    $.sectionStack.push("guidFieldAttribute");
+    $.CONSUME(GuidToken); // "guid"
+    $.CONSUME(EqualToken); // "="
+    $.CONSUME(StringLiteral); // e.g., "tgGYuUFKbBz4_6DIkDR5hUUCRno"
+    $.sectionStack.pop();
+  };
+}

package/parser/attributes/guidFieldAttribute.spec.js

@@ -0,0 +1,93 @@
+import { expect } from "chai";
+import { describe, it } from "mocha";
+import { xanoscriptParser } from "../parser.js";
+
+describe("guidFieldAttribute", () => {
+  it("should parse guid in a table", () => {
+    const parser = xanoscriptParser(`table "foo" {
+      guid = "tgGYuUFKbBz4_6DIkDR5hUUCRno"
+      auth = false
+      schema {
+        int id
+      }
+    }`);
+    expect(parser.errors).to.be.empty;
+  });
+
+  it("should parse guid in a function", () => {
+    const parser = xanoscriptParser(`function "my/function" {
+      guid = "dg4egGY_sadclkj231af32"
+      input {
+      }
+      stack {
+      }
+      response = null
+    }`);
+    expect(parser.errors).to.be.empty;
+  });
+
+  it("should parse guid in a query", () => {
+    const parser = xanoscriptParser(`query "test" verb = GET {
+      guid = "abc123def456"
+      api_group = "default"
+      input {
+      }
+      stack {
+      }
+      response = null
+    }`);
+    expect(parser.errors).to.be.empty;
+  });
+
+  it("should parse guid in a task", () => {
+    const parser = xanoscriptParser(`task "my_task" {
+      guid = "task_guid_123"
+      stack {
+      }
+    }`);
+    expect(parser.errors).to.be.empty;
+  });
+
+  it("should parse guid in an api_group", () => {
+    const parser = xanoscriptParser(`api_group "my_group" {
+      guid = "api_group_guid_123"
+    }`);
+    expect(parser.errors).to.be.empty;
+  });
+
+  it("should parse guid in a middleware", () => {
+    const parser = xanoscriptParser(`middleware "my_mw" {
+      guid = "mw_guid_123"
+      input {
+      }
+      stack {
+      }
+      response = null
+    }`);
+    expect(parser.errors).to.be.empty;
+  });
+
+  it("should not allow duplicate guid", () => {
+    const parser = xanoscriptParser(`function "test" {
+      guid = "first"
+      guid = "second"
+      input {
+      }
+      stack {
+      }
+      response = null
+    }`);
+    expect(parser.errors).to.not.be.empty;
+  });
+
+  it("should work without guid (optional)", () => {
+    const parser = xanoscriptParser(`function "test" {
+      input {
+      }
+      stack {
+      }
+      response = null
+    }`);
+    expect(parser.errors).to.be.empty;
+  });
+});

package/parser/attributes/register.js

@@ -2,6 +2,7 @@ import { columnDefaultValueAttribute } from "./columnDefaultValueAttribute.js";
 import { descriptionFieldAttribute } from "./descriptionFieldAttribute.js";
 import { disabledFieldAttribute } from "./disabledFieldAttribute.js";
 import { docsFieldAttribute } from "./docsFieldAttribute.js"
+import { guidFieldAttribute } from "./guidFieldAttribute.js";
 import { inputFilterFn } from "./inputFilterFn.js";
 import { sensitiveFieldAttribute } from "./sensitiveFieldAttribute.js";
 import { valueFieldAttribute } from "./valueFieldAttribute.js";
@@ -28,6 +29,10 @@ export const register = ($) => {
     "docsFieldAttribute",
     docsFieldAttribute($)
   );
+  $.guidFieldAttribute = $.RULE(
+    "guidFieldAttribute",
+    guidFieldAttribute($)
+  );
   $.inputFilterFn = $.RULE("inputFilterFn", inputFilterFn($));
   $.sensitiveFieldAttribute = $.RULE(
     "sensitiveFieldAttribute",

package/parser/function_parser.js

@@ -9,6 +9,7 @@ export function functionDeclaration($) {
   return () => {
     let hasCache = false;
     let hasDescription = false;
+    let hasGuid = false;
     let hasDocs = false;
     let hasHistory = false;
     let hasInput = false;
@@ -54,6 +55,13 @@ export function functionDeclaration($) {
             $.SUBRULE($.descriptionFieldAttribute);
           },
         },
+        {
+          GATE: () => !hasGuid,
+          ALT: () => {
+            hasGuid = true;
+            $.SUBRULE($.guidFieldAttribute);
+          },
+        },
         {
           GATE: () => !hasDocs,
           ALT: () => {

package/parser/function_parser.spec.js

@@ -100,10 +100,14 @@ describe("function_parser", () => {
       }
 
       stack {
-        api.call "users/{user_id}" verb=GET {
-          api_group = "account"
-          input = { user_id: 123 }
-        } as $user
+        group {
+          stack {
+            api.call "users/{user_id}" verb=GET {
+              api_group = "account"
+              input = { user_id: 123 }
+            } as $user
+          }
+        }
       }
 
       response = null
@@ -111,4 +115,3 @@ describe("function_parser", () => {
     expect(parser.errors).to.not.be.empty;
   });
 });
-

package/parser/functions/api/apiCallFn.js

@@ -20,15 +20,19 @@ export function apiCallFn($) {
     const fnToken = $.CONSUME(CallToken); // "call"
 
     // Validate that api.call is only used in allowed contexts
-    const validContexts = ["workflowTestDeclaration", "toolDeclaration", "testClause"];
+    const validContexts = [
+      "workflowTestDeclaration",
+      "toolDeclaration",
+      "testClause",
+    ];
     const isInValidContext = validContexts.some((context) =>
-      $.sectionStack.includes(context)
+      $.sectionStack.includes(context),
     );
 
     if (!isInValidContext) {
       $.addInvalidValueError(
         fnToken,
-        "api.call can only be used within workflow_test, tool, or test contexts"
+        "api.call can only be used within workflow_test, tool, or test contexts",
       );
     }
 

package/parser/functions/expect/unitExpectToBeWithinFn.spec.js

@@ -29,8 +29,10 @@ describe("unitExpectToBeWithinFn", () => {
   });
 
   it("unitExpectToBeWithinFn does not accepts filters on value argument", () => {
-    const parser =
-      parse(`to_be_within (($response|get:foo:"bar")|first|concat:bar) {
+    const parser = parse(`to_be_within (($response|get:foo:"bar")
+        |first
+        |concat:bar
+      ) {
       min = 11
       max = 13
     }`);

package/parser/functions/expect/unitExpectWithArgumentsFn.js

@@ -10,7 +10,10 @@ import {
   ToStartWithToken,
 } from "../../../lexer/expect.js";
 import { DotToken, Identifier } from "../../../lexer/tokens.js";
-import { ResponseVariable } from "../../../lexer/variables.js";
+import {
+  ResponseVariable,
+  ShortFormVariable,
+} from "../../../lexer/variables.js";
 
 /**
  * @param {import('../../base_parser.js').XanoBaseParser} $
@@ -32,7 +35,10 @@ export function unitExpectWithArgumentsFn($) {
     $.CONSUME(ResponseVariable); // "$response"
     $.MANY(() => {
       $.CONSUME(DotToken); // "."
-      $.CONSUME(Identifier); // "x", "users", etc.
+      $.OR1([
+        { ALT: () => $.CONSUME(Identifier) }, // "x", "users", etc.
+        { ALT: () => $.CONSUME(ShortFormVariable) }, // "$xyz"
+      ]);
     });
     $.CONSUME(RParent); // ")"
 

package/parser/functions/expect/unitExpectWithArgumentsFn.spec.js

@@ -20,6 +20,13 @@ describe("unitExpectWithArgumentsFn", () => {
     expect(parser.errors).to.be.empty;
   });
 
+  it("unitExpectWithArgumentsFn to_equal accepts a $response subpath with $ prefix", () => {
+    const parser = parse(`to_equal ($response.$xyz) {
+      value = "foo"
+    }`);
+    expect(parser.errors).to.be.empty;
+  });
+
   it("unitExpectWithArgumentsFn does not accept a non response variable", () => {
     const parser = parse(`to_equal ($foo) {
       value = 12  

package/parser/functions/expect/workflowExpectToBeWithinFn.js

@@ -1,5 +1,6 @@
 import { LParent, RParent } from "../../../lexer/control.js";
 import { ToBeWithinToken } from "../../../lexer/expect.js";
+import { NewlineToken } from "../../../lexer/tokens.js";
 
 /**
  * @param {import('../../base_parser.js').XanoBaseParser} $
@@ -13,6 +14,7 @@ export function workflowExpectToBeWithinFn($) {
     const fnToken = $.CONSUME(ToBeWithinToken); // "to_be_within"
     $.CONSUME(LParent); // "("
     $.SUBRULE($.expressionFn); // "$foo|get:bar:null"
+    $.MANY(() => $.CONSUME(NewlineToken)); // allow newlines between the expression and the attributes
     $.CONSUME(RParent); // ")"
     $.SUBRULE($.functionAttrReq, {
       ARGS: [fnToken, requiredAttrs, optionalAttrs],

package/parser/functions/expect/workflowExpectWithArgumentsFn.js

@@ -9,6 +9,7 @@ import {
   ToNotEqualToken,
   ToStartWithToken,
 } from "../../../lexer/expect.js";
+import { NewlineToken } from "../../../lexer/tokens.js";
 
 /**
  * @param {import('../../base_parser.js').XanoBaseParser} $
@@ -31,6 +32,7 @@ export function workflowExpectWithArgumentsFn($) {
     ]);
     $.CONSUME(LParent); // "("
     $.SUBRULE($.expressionFn); // "$foo|get:bar:null"
+    $.MANY(() => $.CONSUME(NewlineToken)); // allow newlines between the expression and the attributes
     $.CONSUME(RParent); // ")"
     $.SUBRULE($.functionAttrReq, {
       ARGS: [fnToken, requiredAttrs, optionalAttrs],

package/parser/functions/expect/workflowExpectWithArgumentsFn.spec.js

@@ -27,6 +27,13 @@ describe("workflowExpectWithArgumentsFn", () => {
     expect(parser.errors).to.be.empty;
   });
 
+  it("accept string a named attribute", () => {
+    const parser = parse(`to_equal ($attr.sub."some value") {
+      value = "enabled"
+    }`);
+    expect(parser.errors).to.be.empty;
+  });
+
   it("workflowExpectWithArgumentsFn accepts a filtered variable", () => {
     // foo is not in quotes
     let parser = parse(`to_equal ($x|get:foo:"bar") {

package/parser/functions/expect/workflowExpectWithoutArgumentsFn.js

@@ -10,6 +10,7 @@ import {
   ToNotBeDefinedToken,
   ToNotBeNullToken,
 } from "../../../lexer/expect.js";
+import { NewlineToken } from "../../../lexer/tokens.js";
 
 /**
  * @param {import('../../base_parser.js').XanoBaseParser} $
@@ -30,6 +31,7 @@ export function workflowExpectWithoutArgumentsFn($) {
     ]);
     $.CONSUME(LParent); // "("
     $.SUBRULE($.expressionFn); // "$foo|get:bar:null"
+    $.MANY(() => $.CONSUME(NewlineToken)); // allow newlines between the expression and the attributes
     $.CONSUME(RParent); // ")"
     $.SUBRULE($.functionAttrReq, {
       ARGS: [fnToken, [], ["description", "disabled"]],

package/parser/functions/schema/schemaFn.js

@@ -64,7 +64,7 @@ export function schemaFn($) {
             schemaExpectOneOf(
               schema,
               ["string", "number", "boolean", "timestamp"],
-              captured
+              captured,
             ),
           ALT: () => {
             $.SUBRULE($.schemaParseImmutableFn, {

package/parser/functions/schema/schemaParseAttributeFn.spec.js

@@ -14,7 +14,7 @@ export function parserExtension() {
       const name = this.CONSUME(Identifier);
       this.CONSUME(EqualToken); // "="
       this.SUBRULE(this.schemaParseAttributeFn, { ARGS: [name, schema] });
-    }
+    },
   );
 
   this.schemaParseAttributeFn_expression = this.RULE(
@@ -26,7 +26,7 @@ export function parserExtension() {
       };
       const name = this.CONSUME(Identifier);
       this.SUBRULE(this.schemaParseAttributeFn, { ARGS: [name, schema] });
-    }
+    },
   );
 
   // this rule requires a foo field to be defined
@@ -36,7 +36,7 @@ export function parserExtension() {
       const schema = { "disabled?": "[boolean]", "description?": "[string]" };
       const name = this.CONSUME(Identifier);
       this.SUBRULE(this.schemaParseAttributeFn, { ARGS: [name, schema] });
-    }
+    },
   );
 
   this.schemaParseAttributeFn_deep = this.RULE(
@@ -52,7 +52,7 @@ export function parserExtension() {
       const name = this.CONSUME(Identifier);
       this.CONSUME(EqualToken); // "="
       this.SUBRULE(this.schemaParseAttributeFn, { ARGS: [name, schema] });
-    }
+    },
   );
 
   this.schemaParseAttributeFn_stack = this.RULE(
@@ -65,7 +65,7 @@ export function parserExtension() {
       };
       const name = this.CONSUME(Identifier);
       this.SUBRULE(this.schemaParseAttributeFn, { ARGS: [name, schema] });
-    }
+    },
   );
 
   this.schemaParseAttributeFn_optional = this.RULE(
@@ -80,7 +80,7 @@ export function parserExtension() {
       const name = this.CONSUME(Identifier);
       this.CONSUME(EqualToken); // "="
       this.SUBRULE(this.schemaParseAttributeFn, { ARGS: [name, schema] });
-    }
+    },
   );
 
   this.schemaParseAttributeFn_multiple = this.RULE(
@@ -93,7 +93,7 @@ export function parserExtension() {
       const name = this.CONSUME(Identifier);
       this.CONSUME(EqualToken); // "="
       this.SUBRULE(this.schemaParseAttributeFn, { ARGS: [name, schema] });
-    }
+    },
   );
 
   this.schemaParseAttributeFn_disabled = this.RULE(
@@ -108,7 +108,7 @@ export function parserExtension() {
       const name = this.CONSUME(Identifier);
       this.CONSUME(EqualToken); // "="
       this.SUBRULE(this.schemaParseAttributeFn, { ARGS: [name, schema] });
-    }
+    },
   );
 }
 
@@ -133,7 +133,7 @@ describe("schemaParseAttributeFn", () => {
     expect(parser.errors).to.be.empty;
 
     parse(
-      `value = { something = 123.2, other_thing = 44 }`
+      `value = { something = 123.2, other_thing = 44 }`,
     ).schemaParseAttributeFn_flat();
     expect(parser.errors).to.be.empty;
   });

package/parser/functions/workflowExpectFn.js

@@ -12,13 +12,13 @@ export function workflowExpectFn($) {
     // Validate that expect statements are only used in allowed contexts
     const validContexts = ["workflowTestDeclaration", "testClause"];
     const isInValidContext = validContexts.some((context) =>
-      $.sectionStack.includes(context)
+      $.sectionStack.includes(context),
     );
 
     if (!isInValidContext) {
       $.addInvalidValueError(
         expectToken,
-        "expect statements can only be used within workflow_test or test contexts"
+        "expect statements can only be used within workflow_test or test contexts",
       );
     }
 

package/parser/functions/workflowExpectFn.spec.js

@@ -0,0 +1,33 @@
+import { expect } from "chai";
+import { describe, it } from "mocha";
+import { lexDocument } from "../../lexer/lexer.js";
+import { parser } from "../test_parser.js";
+
+function parse(inputText) {
+  parser.reset();
+  const lexResult = lexDocument(inputText);
+  parser.input = lexResult.tokens;
+  parser.sectionStack.push("workflowTestDeclaration");
+  parser.workflowExpectFn();
+  return parser;
+}
+
+describe("workflowExpectFn", () => {
+  it("workflowExpectFn accepts a string literal as value", () => {
+    const parser = parse(`expect.to_equal ($response.email) {
+      value = "email@example.com"
+    }`);
+    expect(parser.errors).to.be.empty;
+  });
+
+  it("workflowExpectFn accepts filtered values", () => {
+    const parser = parse(`expect.to_equal ($total
+      |subtract:$tax
+      |subtract:$cost
+    ) {
+      value = $som_value
+    }`);
+    console.log(parser.errors);
+    expect(parser.errors).to.be.empty;
+  });
+});

package/parser/generic/chainedIdentifier.js

@@ -1,4 +1,4 @@
-import { IntegerLiteral } from "../../lexer/literal.js";
+import { IntegerLiteral, StringLiteral } from "../../lexer/literal.js";
 import { DotToken, Identifier } from "../../lexer/tokens.js";
 import { ShortFormVariable } from "../../lexer/variables.js";
 
@@ -38,6 +38,7 @@ export function singleChainedIdentifier($) {
             }, // e.g., .bar
             { ALT: () => $.CONSUME(Identifier) }, // e.g., .bar
             { ALT: () => $.CONSUME2(IntegerLiteral) }, // e.g., .3
+            { ALT: () => $.CONSUME(StringLiteral) }, // e.g., ."some value"
             { ALT: () => $.SUBRULE($.bracketAccessor) }, // e.g., .["key"]
           ]);
         },

package/parser/mcp_server_parser.js

@@ -13,6 +13,7 @@ export function mcpServerDeclaration($) {
     let hasActive = false;
     let hasCanonical = false;
     let hasDescription = false;
+    let hasGuid = false;
     let hasDocs = false;
     let hasHistory = false;
     let hasInstructions = false;
@@ -58,6 +59,13 @@ export function mcpServerDeclaration($) {
             $.SUBRULE($.descriptionFieldAttribute);
           },
         },
+        {
+          GATE: () => !hasGuid,
+          ALT: () => {
+            hasGuid = true;
+            $.SUBRULE($.guidFieldAttribute);
+          },
+        },
         {
           GATE: () => !hasDocs,
           ALT: () => {

package/parser/mcp_server_trigger_parser.js

@@ -12,6 +12,7 @@ export function mcpServerTriggerDeclaration($) {
     let hasActions = false;
     let hasActive = false;
     let hasDescription = false;
+    let hasGuid = false;
     let hasHistory = false;
     let hasInput = false;
     let hasMcpServer = false;
@@ -69,6 +70,13 @@ export function mcpServerTriggerDeclaration($) {
             $.SUBRULE($.descriptionFieldAttribute);
           },
         },
+        {
+          GATE: () => !hasGuid,
+          ALT: () => {
+            hasGuid = true;
+            $.SUBRULE($.guidFieldAttribute);
+          },
+        },
         {
           GATE: () => !hasHistory,
           ALT: () => {

package/parser/middleware_parser.js

@@ -11,6 +11,7 @@ import { Identifier, NewlineToken } from "../lexer/tokens.js";
 export function middlewareDeclaration($) {
   return () => {
     let hasDescription = false;
+    let hasGuid = false;
     let hasDocs = false;
     let hasExceptionPolicy = false;
     let hasHistory = false;
@@ -43,6 +44,13 @@ export function middlewareDeclaration($) {
             $.SUBRULE($.descriptionFieldAttribute);
           },
         },
+        {
+          GATE: () => !hasGuid,
+          ALT: () => {
+            hasGuid = true;
+            $.SUBRULE($.guidFieldAttribute);
+          },
+        },
         {
           GATE: () => !hasDocs,
           ALT: () => {

package/parser/parser.js

@@ -15,6 +15,7 @@ export function xanoscriptParser(text, scheme, preTokenized = null) {
     scheme = getSchemeFromContent(text);
   }
   const lexResult = preTokenized || lexDocument(text);
+  parser.reset();
   parser.input = lexResult.tokens;
   switch (scheme.toLowerCase()) {
     case "addon":

package/parser/query_parser.js

@@ -20,6 +20,7 @@ export function queryDeclaration($) {
     let hasAuth = false;
     let hasCache = false;
     let hasDescription = false;
+    let hasGuid = false;
     let hasDocs = false;
     let hasHistory = false;
     let hasInput = false;
@@ -101,6 +102,13 @@ export function queryDeclaration($) {
             $.SUBRULE($.descriptionFieldAttribute);
           },
         },
+        {
+          GATE: () => !hasGuid,
+          ALT: () => {
+            hasGuid = true;
+            $.SUBRULE($.guidFieldAttribute);
+          },
+        },
         {
           GATE: () => !hasApiGroup,
           ALT: () => {

package/parser/realtime_trigger_parser.js

@@ -13,6 +13,7 @@ export function realtimeTriggerDeclaration($) {
     let hasActive = false;
     let hasChannel = false;
     let hasDescription = false;
+    let hasGuid = false;
     let hasHistory = false;
     let hasInput = false;
     let hasResponse = false;
@@ -75,6 +76,13 @@ export function realtimeTriggerDeclaration($) {
             $.SUBRULE($.descriptionFieldAttribute);
           },
         },
+        {
+          GATE: () => !hasGuid,
+          ALT: () => {
+            hasGuid = true;
+            $.SUBRULE($.guidFieldAttribute);
+          },
+        },
         {
           GATE: () => !hasHistory,
           ALT: () => {

package/parser/table_parser.js

@@ -44,6 +44,7 @@ export function tableDeclaration($) {
     let hasView = false;
     let hasAuth = false;
     let hasDescription = false;
+    let hasGuid = false;
     let hasTags = false;
     let hasAutoComplete = false;
     let hasIndex = false;
@@ -62,6 +63,10 @@ export function tableDeclaration($) {
           GATE: () => !hasDescription,
           ALT: () => $.SUBRULE($.descriptionFieldAttribute),
         },
+        {
+          GATE: () => !hasGuid,
+          ALT: () => $.SUBRULE($.guidFieldAttribute),
+        },
         {
           GATE: () => !hasTags,
           ALT: () => $.SUBRULE($.tagsAttribute),

package/parser/table_trigger_parser.js

@@ -15,6 +15,7 @@ export function tableTriggerDeclaration($) {
     let hasDatasources = false;
     let hasDbTable = false;
     let hasDescription = false;
+    let hasGuid = false;
     let hasHistory = false;
     let hasInput = false;
     let hasStack = false;
@@ -91,6 +92,13 @@ export function tableTriggerDeclaration($) {
             $.SUBRULE($.descriptionFieldAttribute);
           },
         },
+        {
+          GATE: () => !hasGuid,
+          ALT: () => {
+            hasGuid = true;
+            $.SUBRULE($.guidFieldAttribute);
+          },
+        },
         {
           GATE: () => !hasHistory,
           ALT: () => {

package/parser/task_parser.js

@@ -9,6 +9,7 @@ export function taskDeclaration($) {
     let hasActive = false;
     let hasDataSource = false;
     let hasDescription = false;
+    let hasGuid = false;
     let hasDocs = false;
     let hasHistory = false;
     let hasMiddleware = false;
@@ -57,6 +58,13 @@ export function taskDeclaration($) {
             $.SUBRULE($.descriptionFieldAttribute);
           },
         },
+        {
+          GATE: () => !hasGuid,
+          ALT: () => {
+            hasGuid = true;
+            $.SUBRULE($.guidFieldAttribute);
+          },
+        },
         {
           GATE: () => !hasDocs,
           ALT: () => {

package/parser/tool_parser.js

@@ -6,6 +6,7 @@ import { InstructionsToken, ToolToken } from "../lexer/tool.js";
 export function toolDeclaration($) {
   return () => {
     let hasDescription = false;
+    let hasGuid = false;
     let hasDocs = false;
     let hasHistory = false;
     let hasInput = false;
@@ -36,6 +37,13 @@ export function toolDeclaration($) {
             $.SUBRULE($.descriptionFieldAttribute);
           },
         },
+        {
+          GATE: () => !hasGuid,
+          ALT: () => {
+            hasGuid = true;
+            $.SUBRULE($.guidFieldAttribute);
+          },
+        },
         {
           GATE: () => !hasDocs,
           ALT: () => {

package/parser/workflow_test_parser.js

@@ -7,6 +7,7 @@ export function workflowTestDeclaration($) {
   return () => {
     let hasDatasource = false;
     let hasDescription = false;
+    let hasGuid = false;
     let hasStack = false;
     let hasTags = false;
 
@@ -40,14 +41,19 @@ export function workflowTestDeclaration($) {
             $.SUBRULE($.descriptionFieldAttribute);
           },
         },
+        {
+          GATE: () => !hasGuid,
+          ALT: () => {
+            hasGuid = true;
+            $.SUBRULE($.guidFieldAttribute);
+          },
+        },
         {
           GATE: () => !hasStack,
           ALT: () => {
             hasStack = true;
             $.SUBRULE($.stackClause, {
-              ARGS: [
-                { allowCallStatements: true },
-              ],
+              ARGS: [{ allowCallStatements: true }],
             });
           },
         },

package/parser/workflow_test_parser.spec.js

@@ -39,8 +39,10 @@ describe("workflow_test_parser", () => {
           input = {a: 5, b: 10}
         } as $sums
       
-        expect.to_equal ($sum) {
-          value = 15
+        expect.to_equal ($sum
+          |subtract:5
+        ) {
+          value = 10
         }
       }
     }`);
@@ -95,6 +97,10 @@ describe("workflow_test_parser", () => {
           value = 42
         }
 
+        function.run woot {
+          input = {scope: 12}
+        } as $my_val
+
         group {
           stack {
             function.call "add" {
@@ -113,6 +119,11 @@ describe("workflow_test_parser", () => {
               input = {a: 20, b: 22}
             } as $sum
              
+            api.call "users/{user_id}" verb=GET {
+              api_group = "account"
+              input = { user_id: 123 }
+            } as $user
+
             expect.to_equal ($a) {
               value = 42
             }

package/parser/workspace_trigger_parser.js

@@ -12,6 +12,7 @@ export function workspaceTriggerDeclaration($) {
     let hasActions = false;
     let hasActive = false;
     let hasDescription = false;
+    let hasGuid = false;
     let hasHistory = false;
     let hasInput = false;
     let hasStack = false;
@@ -67,6 +68,13 @@ export function workspaceTriggerDeclaration($) {
             $.SUBRULE($.descriptionFieldAttribute);
           },
         },
+        {
+          GATE: () => !hasGuid,
+          ALT: () => {
+            hasGuid = true;
+            $.SUBRULE($.guidFieldAttribute);
+          },
+        },
         {
           GATE: () => !hasHistory,
           ALT: () => {