@xano/xanoscript-language-server 11.8.4 → 11.8.5

package/onDidChangeContent/onDidChangeContent.js

@@ -1,4 +1,7 @@
 import { documentCache } from "../cache/documentCache.js";
+import { validateVariables } from "../parser/variableValidator.js";
+import { crossFileValidate } from "../workspace/crossFileValidator.js";
+import { workspaceIndex } from "../workspace/workspaceIndex.js";
 
 // Diagnostic severity constants
 const SEVERITY = {
@@ -71,16 +74,14 @@ export function onDidChangeContent(params, connection) {
 
   try {
     // Parse the XanoScript file using cache
-    const { parser, scheme } = documentCache.getOrParse(
+    const { lexResult, parser, scheme } = documentCache.getOrParse(
       document.uri,
       document.version,
       text,
     );
 
-    if (parser.errors.length === 0) {
-      // If parsing succeeds with no errors, send an empty diagnostics array
-      connection.sendDiagnostics({ uri: document.uri, diagnostics: [] });
-    }
+    // Update workspace index with already-parsed data (no re-parse needed)
+    workspaceIndex.addParsed(document.uri, text, parser.__symbolTable);
 
     for (const error of parser.errors) {
       console.error(
@@ -91,6 +92,52 @@ export function onDidChangeContent(params, connection) {
     // Create diagnostics in a single pass
     const diagnostics = createDiagnostics(parser, document);
 
+    // Run cross-file validation and append as warnings
+    if (parser.__symbolTable?.references) {
+      const crossFileWarnings = crossFileValidate(
+        parser.__symbolTable.references,
+        workspaceIndex,
+      );
+      for (const warning of crossFileWarnings) {
+        diagnostics.push({
+          severity: SEVERITY.WARNING,
+          range: {
+            start: document.positionAt(warning.startOffset),
+            end: document.positionAt(warning.endOffset + 1),
+          },
+          message: warning.message,
+        });
+      }
+    }
+
+    // Run variable validation and append warnings/hints
+    if (parser.__symbolTable?.varDeclarations) {
+      const varResult = validateVariables(
+        parser.__symbolTable,
+        lexResult.tokens,
+      );
+      for (const warning of varResult.warnings) {
+        diagnostics.push({
+          severity: SEVERITY.WARNING,
+          range: {
+            start: document.positionAt(warning.startOffset),
+            end: document.positionAt(warning.endOffset + 1),
+          },
+          message: warning.message,
+        });
+      }
+      for (const hint of varResult.hints) {
+        diagnostics.push({
+          severity: SEVERITY.HINT,
+          range: {
+            start: document.positionAt(hint.startOffset),
+            end: document.positionAt(hint.endOffset + 1),
+          },
+          message: hint.message,
+        });
+      }
+    }
+
     console.log(
       `onDidChangeContent(): sending diagnostic (${parser.errors.length} errors) for scheme:`,
       scheme,

package/onHover/functions.md

@@ -1538,6 +1538,34 @@ security.jwe_encode {
 
 Encodes a payload as a JSON Web Encryption (JWE) token with `headers`, `claims`, and a `key`. The `key_algorithm` (e.g., `A256KW`) and `content_algorithm` (e.g., `A256GCM`) secure the token, and `ttl` sets its validity (0 for no expiration). The token is stored in the variable defined by `as`, here `$encrypted_token`.
 
+# security.jwe_encode_legacy
+
+```xs
+security.jwe_encode_legacy {
+  payload = $jwt_payload
+  audience = "LegacyApp"
+  key = $env.magic_jwt_secret
+  key_algorithm = "A256KW"
+  content_algorithm = "A256CBC-HS512"
+} as $jwt
+```
+
+Encodes a payload as a JSON Web Encryption (JWE) token using legacy algorithms. The `payload` is the data to encrypt, `audience` specifies the intended recipient, and `key` is used for encryption. The `key_algorithm` (e.g., `A256KW`) and `content_algorithm` (e.g., `A256CBC-HS512`) secure the token. The resulting JWE token is stored in the variable defined by `as`, here `$jwt`.
+
+# security.jwe_decode_legacy
+
+```xs
+security.jwe_decode_legacy {
+  token = $input.magic_token
+  key = $env.magic_jwt_secret
+  audience = "LegacyApp"
+  key_algorithm = "A256KW"
+  content_algorithm = "A256CBC-HS512"
+} as $decoded_magic_token
+```
+
+Decodes a JSON Web Encryption (JWE) token that was encoded using legacy algorithms. The `token` is the JWE to decode, `key` is used for decryption, and `audience` specifies the expected recipient. The `key_algorithm` (e.g., `A256KW`) and `content_algorithm` (e.g., `A256CBC-HS512`) are used to properly decode the token. The decoded payload is stored in the variable defined by `as`, here `$decoded_magic_token`.
+
 # security.create_secret_key
 
 ```xs

package/package.json

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

package/parser/base_parser.js

@@ -42,10 +42,16 @@ export class XanoBaseParser extends CstParser {
    * Add a variable to the registry
    * @param {string} name the name of the variable
    * @param {string} type the type of the variable (int, decimal, text, bool, etc)
-   * @param {boolean} nullable whether the variable is nullable
+   * @param {import('chevrotain').IToken} [token] the token for position tracking
    */
-  addVariable(name, type, value = null) {
-    this.__symbolTable.var[name] = { type, value };
+  addVariable(name, type, token = null) {
+    this.__symbolTable.var[name] = { type, value: null };
+    this.__symbolTable.varDeclarations.push({
+      name,
+      type,
+      startOffset: token?.startOffset ?? null,
+      endOffset: token?.endOffset ?? null,
+    });
   }
 
   /**
@@ -58,6 +64,56 @@ export class XanoBaseParser extends CstParser {
     this.__symbolTable.input[name] = { type, iterable, nullable, optional };
   }
 
+  /**
+   * Record a cross-file reference for validation.
+   * @param {string} refType - The type of object referenced ("function", "table", "query", "task")
+   * @param {string} name - The referenced object name
+   * @param {import('chevrotain').IToken} token - The token containing the name (for diagnostics positioning)
+   */
+  addReference(refType, name, token) {
+    if (name == null || !token) return;
+    this.__symbolTable.references.push({
+      refType,
+      name,
+      startOffset: token.startOffset,
+      endOffset: token.endOffset,
+    });
+  }
+
+  /**
+   * Attach argument keys to the most recent reference (for input validation).
+   * @param {Object} args - Map of argument names to { value, startOffset, endOffset }
+   */
+  setReferenceArgs(args) {
+    const refs = this.__symbolTable.references;
+    if (refs.length === 0) return;
+    refs[refs.length - 1].args = args;
+  }
+
+  /**
+   * Attach field_name to the most recent reference (for column validation).
+   * @param {string} fieldName - The field name value
+   * @param {number} startOffset
+   * @param {number} endOffset
+   */
+  setReferenceFieldName(fieldName, startOffset, endOffset) {
+    const refs = this.__symbolTable.references;
+    if (refs.length === 0) return;
+    refs[refs.length - 1].fieldName = fieldName;
+    refs[refs.length - 1].fieldNameStartOffset = startOffset;
+    refs[refs.length - 1].fieldNameEndOffset = endOffset;
+  }
+
+  /**
+   * Attach data keys to the most recent reference (for column validation).
+   * @param {Array<{name: string, startOffset: number, endOffset: number}>} dataKeys
+   */
+  setReferenceDataKeys(dataKeys) {
+    const refs = this.__symbolTable.references;
+    if (refs.length === 0) return;
+    refs[refs.length - 1].dataKeys = dataKeys;
+  }
+
   /**
    * Add a warning message to the parser
    * @param {*} message
@@ -244,6 +300,8 @@ export class XanoBaseParser extends CstParser {
       var: {},
       auth: {},
       env: {},
+      references: [],
+      varDeclarations: [],
     };
   }
 }

package/parser/clauses/middlewareClause.js

@@ -1,5 +1,6 @@
 import { EqualToken } from "../../lexer/control.js";
 import { MiddlewareToken } from "../../lexer/tokens.js";
+import { getVarName } from "../generic/utils.js";
 
 /**
  * response = $entries
@@ -12,6 +13,7 @@ export function middlewareClause($) {
 
     const parent = $.CONSUME(MiddlewareToken); // "middleware"
     $.CONSUME(EqualToken); // "="
+    const captured = {};
     $.SUBRULE($.schemaParseObjectFn, {
       ARGS: [
         parent,
@@ -31,9 +33,23 @@ export function middlewareClause($) {
             },
           ],
         },
+        captured,
       ],
     });
 
+    $.ACTION(() => {
+      for (const phase of ["pre", "post"]) {
+        const items = captured[phase]?.value;
+        if (!Array.isArray(items)) continue;
+        for (const item of items) {
+          const nameEntry = item.name;
+          if (!nameEntry?.value) continue;
+          const token = nameEntry.value;
+          $.addReference("middleware", getVarName(token), token);
+        }
+      }
+    });
+
     $.sectionStack.pop();
   };
 }

package/parser/definitions/columnDefinition.js

@@ -113,6 +113,11 @@ export function columnDefinition($) {
       ],
     });
 
+    // Track table reference from FK column definition
+    if (captured.table?.value) {
+      $.addReference("table", getVarName(captured.table.value), captured.table.value);
+    }
+
     if (inputTypeToken.image == "vector" && !captured.size) {
       $.addWarning(
         'Column named "vector" should have a size attribute defining its length.',

package/parser/functions/api/apiCallFn.js

@@ -10,6 +10,7 @@ import {
   VerbToken,
 } from "../../../lexer/query.js";
 import { Identifier } from "../../../lexer/tokens.js";
+import { getVarName } from "../../generic/utils.js";
 
 /**
  * @param {import('../../base_parser.js').XanoBaseParser} $
@@ -36,10 +37,11 @@ export function apiCallFn($) {
       );
     }
 
-    $.OR([
-      { ALT: () => $.CONSUME(StringLiteral) }, // "foo/bar"
-      { ALT: () => $.CONSUME(Identifier) }, // foo
+    const nameToken = $.OR([
+      { ALT: () => $.CONSUME(StringLiteral) },
+      { ALT: () => $.CONSUME(Identifier) },
     ]);
+    $.addReference("query", getVarName(nameToken), nameToken);
     $.CONSUME(VerbToken);
     $.CONSUME(EqualToken);
     $.OR1([

package/parser/functions/controls/functionCallFn.js

@@ -1,6 +1,7 @@
 import { CallToken, FunctionToken } from "../../../lexer/function.js";
 import { StringLiteral } from "../../../lexer/literal.js";
 import { DotToken, Identifier } from "../../../lexer/tokens.js";
+import { getVarName } from "../../generic/utils.js";
 
 /**
  *
@@ -17,10 +18,11 @@ export function functionCallFn($) {
     $.CONSUME(DotToken); // "."
     const fnToken = $.CONSUME(CallToken); // "call"
 
-    $.OR([
-      { ALT: () => $.CONSUME(Identifier) }, // user
-      { ALT: () => $.CONSUME1(StringLiteral) }, // "user/ auth"
+    const nameToken = $.OR([
+      { ALT: () => $.CONSUME(Identifier) },
+      { ALT: () => $.CONSUME1(StringLiteral) },
     ]);
+    $.addReference("function", getVarName(nameToken), nameToken);
 
     $.SUBRULE($.functionAttrReq, {
       ARGS: [

package/parser/functions/controls/functionRunFn.js

@@ -1,6 +1,21 @@
 import { FunctionToken, RunToken } from "../../../lexer/function.js";
-import { StringLiteral } from "../../../lexer/literal.js";
-import { DotToken, Identifier } from "../../../lexer/tokens.js";
+import {
+  FloatLiteral,
+  IntegerLiteral,
+  SingleQuotedStringLiteral,
+  StringLiteral,
+} from "../../../lexer/literal.js";
+import { DotToken, FalseToken, Identifier, TrueToken } from "../../../lexer/tokens.js";
+import { getVarName } from "../../generic/utils.js";
+
+const literalTypeMap = new Map([
+  [IntegerLiteral.name, "int"],
+  [FloatLiteral.name, "decimal"],
+  [StringLiteral.name, "text"],
+  [SingleQuotedStringLiteral.name, "text"],
+  [TrueToken.name, "bool"],
+  [FalseToken.name, "bool"],
+]);
 
 /**
  *
@@ -14,11 +29,13 @@ export function functionRunFn($) {
     $.CONSUME(DotToken); // "."
     const fnToken = $.CONSUME(RunToken); // "run"
 
-    $.OR([
-      { ALT: () => $.CONSUME(Identifier) }, // user
-      { ALT: () => $.CONSUME1(StringLiteral) }, // "user/ auth"
+    const nameToken = $.OR([
+      { ALT: () => $.CONSUME(Identifier) },
+      { ALT: () => $.CONSUME1(StringLiteral) },
     ]);
+    $.addReference("function", getVarName(nameToken), nameToken);
 
+    const captured = {};
     $.OPTION(() => {
       $.SUBRULE($.schemaParseAttributeFn, {
         ARGS: [
@@ -30,10 +47,49 @@ export function functionRunFn($) {
             "runtime_mode?": ["async-shared", "async-dedicated"],
             "mock?": { "![string]": "[expression]" },
           },
+          captured,
         ],
       });
     });
 
+    $.ACTION(() => {
+      if (captured.input) {
+        const args = {};
+        const tokens = $.input;
+        for (const [k, v] of Object.entries(captured.input)) {
+          if (k === "key" || k === "value") continue;
+          const keyOffset = v?.key?.startOffset;
+
+          // Find value token: scan from key token, skip colon, grab next token
+          let type = null;
+          let value = v?.value?.image ?? null;
+          if (keyOffset != null) {
+            for (let i = 0; i < tokens.length - 2; i++) {
+              if (tokens[i].startOffset === keyOffset) {
+                // tokens[i] = key, tokens[i+1] = colon, tokens[i+2] = value
+                const valueToken = tokens[i + 2];
+                if (valueToken) {
+                  type = literalTypeMap.get(valueToken.tokenType.name) ?? null;
+                  if (type && !value) value = valueToken.image;
+                }
+                break;
+              }
+            }
+          }
+
+          args[k] = {
+            value,
+            type,
+            startOffset: v?.key?.startOffset ?? null,
+            endOffset: v?.key?.endOffset ?? null,
+          };
+        }
+        if (Object.keys(args).length > 0) {
+          $.setReferenceArgs(args);
+        }
+      }
+    });
+
     $.SUBRULE($.asVariable, { ARGS: [fnToken] });
     $.sectionStack.pop();
   };

package/parser/functions/controls/taskCallFn.js

@@ -1,6 +1,7 @@
 import { StringLiteral } from "../../../lexer/literal.js";
 import { CallToken, TaskToken } from "../../../lexer/task.js";
 import { DotToken, Identifier } from "../../../lexer/tokens.js";
+import { getVarName } from "../../generic/utils.js";
 
 /**
  *
@@ -17,10 +18,11 @@ export function taskCallFn($) {
     $.CONSUME(DotToken); // "."
     const fnToken = $.CONSUME(CallToken); // "call"
 
-    $.OR([
-      { ALT: () => $.CONSUME(Identifier) }, // user
-      { ALT: () => $.CONSUME1(StringLiteral) }, // "user/ auth"
+    const nameToken = $.OR([
+      { ALT: () => $.CONSUME(Identifier) },
+      { ALT: () => $.CONSUME1(StringLiteral) },
     ]);
+    $.addReference("task", getVarName(nameToken), nameToken);
 
     $.SUBRULE($.functionAttrReq, {
       ARGS: [fnToken, requiredAttrs, optionalAttrs],

package/parser/functions/db/captureFieldName.js

@@ -0,0 +1,63 @@
+import { SingleQuotedStringLiteral,StringLiteral } from "../../../lexer/literal.js";
+import { Identifier } from "../../../lexer/tokens.js";
+import { getVarName } from "../../generic/utils.js";
+
+const identifierLikeTokens = new Set([
+  Identifier.name,
+  StringLiteral.name,
+  SingleQuotedStringLiteral.name,
+]);
+
+/**
+ * Extract data object keys from captured schema and attach to last reference.
+ * @param {import('../../base_parser.js').XanoBaseParser} $
+ * @param {Object} captured
+ */
+export function captureDataKeys($, captured) {
+  if (!captured.data) return;
+
+  const dataKeys = [];
+  for (const [k, v] of Object.entries(captured.data)) {
+    if (k === "key" || k === "value") continue;
+    const keyToken = v?.key;
+    if (keyToken) {
+      dataKeys.push({
+        name: k,
+        startOffset: keyToken.startOffset,
+        endOffset: keyToken.endOffset,
+      });
+    }
+  }
+  if (dataKeys.length > 0) {
+    $.setReferenceDataKeys(dataKeys);
+  }
+}
+
+/**
+ * Extract field_name value from captured schema object and attach to last reference.
+ * Only captures when the value is an identifier or string literal (not a variable expression).
+ * @param {import('../../base_parser.js').XanoBaseParser} $
+ * @param {Object} captured
+ */
+export function captureFieldName($, captured) {
+  if (!captured.field_name) return;
+
+  const keyOffset = captured.field_name.key?.startOffset;
+  if (keyOffset == null) return;
+
+  const tokens = $.input;
+  for (let i = 0; i < tokens.length - 2; i++) {
+    if (tokens[i].startOffset === keyOffset) {
+      // tokens[i] = "field_name" key, tokens[i+1] = "=", tokens[i+2] = value
+      const valueToken = tokens[i + 2];
+      if (valueToken && identifierLikeTokens.has(valueToken.tokenType.name)) {
+        $.setReferenceFieldName(
+          getVarName(valueToken),
+          valueToken.startOffset,
+          valueToken.endOffset
+        );
+      }
+      break;
+    }
+  }
+}

package/parser/functions/db/dbAddFn.js

@@ -1,6 +1,7 @@
 import { AddToken } from "../../../lexer/db.js";
 import { StringLiteral } from "../../../lexer/literal.js";
 import { Identifier } from "../../../lexer/tokens.js";
+import { getVarName } from "../../generic/utils.js";
 import { addonSchema } from "./schema.js";
 /**
  * @param {import('../base_parser.js').XanoBaseParser} $
@@ -10,13 +11,14 @@ export function dbAddFn($) {
     $.sectionStack.push("dbAddFn");
     const fnToken = $.CONSUME(AddToken); // "add"
 
-    $.OR({
+    const nameToken = $.OR({
       DEF: [
-        { ALT: () => $.CONSUME(Identifier) }, // user
-        { ALT: () => $.CONSUME1(StringLiteral) }, // "user table"
+        { ALT: () => $.CONSUME(Identifier) },
+        { ALT: () => $.CONSUME1(StringLiteral) },
       ],
       ERR_MSG: "Expected a table name",
     });
+    $.addReference("table", getVarName(nameToken), nameToken);
 
     $.SUBRULE($.schemaParseAttributeFn, {
       ARGS: [

package/parser/functions/db/dbAddOrEditFn.js

@@ -1,6 +1,8 @@
 import { AddOrEditToken } from "../../../lexer/db.js";
 import { StringLiteral } from "../../../lexer/literal.js";
 import { Identifier } from "../../../lexer/tokens.js";
+import { getVarName } from "../../generic/utils.js";
+import { captureDataKeys,captureFieldName } from "./captureFieldName.js";
 import { addonSchema } from "./schema.js";
 
 /**
@@ -10,14 +12,16 @@ export function dbAddOrEditFn($) {
   return () => {
     $.sectionStack.push("dbAddOrEditFn");
     const fnToken = $.CONSUME(AddOrEditToken); // "edit"
-    $.OR({
+    const nameToken = $.OR({
       DEF: [
-        { ALT: () => $.CONSUME(Identifier) }, // user
-        { ALT: () => $.CONSUME1(StringLiteral) }, // "user table"
+        { ALT: () => $.CONSUME(Identifier) },
+        { ALT: () => $.CONSUME1(StringLiteral) },
       ],
       ERR_MSG: "Expected a table name",
     });
+    $.addReference("table", getVarName(nameToken), nameToken);
 
+    const captured = {};
     $.SUBRULE($.schemaParseAttributeFn, {
       ARGS: [
         fnToken,
@@ -30,9 +34,15 @@ export function dbAddOrEditFn($) {
           "addon?": [addonSchema],
           "mock?": { "![string]": "[expression]" },
         },
+        captured,
       ],
     });
 
+    $.ACTION(() => {
+      captureFieldName($, captured);
+      captureDataKeys($, captured);
+    });
+
     $.SUBRULE($.asVariable, { ARGS: [fnToken] });
     $.sectionStack.pop();
   };

package/parser/functions/db/dbBulkAddFn.js

@@ -1,6 +1,7 @@
 import { AddToken } from "../../../lexer/db.js";
 import { StringLiteral } from "../../../lexer/literal.js";
 import { Identifier } from "../../../lexer/tokens.js";
+import { getVarName } from "../../generic/utils.js";
 
 /**
  * @param {import('../base_parser.js').XanoBaseParser} $
@@ -9,13 +10,14 @@ export function dbBulkAddFn($) {
   return () => {
     $.sectionStack.push("dbBulkAddFn");
     const fnToken = $.CONSUME(AddToken); // "add"
-    $.OR({
+    const nameToken = $.OR({
       DEF: [
-        { ALT: () => $.CONSUME(Identifier) }, // user
-        { ALT: () => $.CONSUME1(StringLiteral) }, // "user table"
+        { ALT: () => $.CONSUME(Identifier) },
+        { ALT: () => $.CONSUME1(StringLiteral) },
       ],
       ERR_MSG: "Expected a table name",
     });
+    $.addReference("table", getVarName(nameToken), nameToken);
     const defined = {};
     $.SUBRULE($.schemaParseAttributeFn, {
       ARGS: [

package/parser/functions/db/dbBulkDeleteFn.js

@@ -1,6 +1,7 @@
 import { DeleteToken } from "../../../lexer/db.js";
 import { StringLiteral } from "../../../lexer/literal.js";
 import { Identifier } from "../../../lexer/tokens.js";
+import { getVarName } from "../../generic/utils.js";
 
 /**
  * @param {import('../base_parser.js').XanoBaseParser} $
@@ -9,13 +10,14 @@ export function dbBulkDeleteFn($) {
   return () => {
     $.sectionStack.push("dbBulkDeleteFn");
     const fnToken = $.CONSUME(DeleteToken); // "delete"
-    $.OR({
+    const nameToken = $.OR({
       DEF: [
-        { ALT: () => $.CONSUME(Identifier) }, // user
-        { ALT: () => $.CONSUME1(StringLiteral) }, // "user table"
+        { ALT: () => $.CONSUME(Identifier) },
+        { ALT: () => $.CONSUME1(StringLiteral) },
       ],
       ERR_MSG: "Expected a table name",
     });
+    $.addReference("table", getVarName(nameToken), nameToken);
 
     $.SUBRULE($.schemaParseAttributeFn, {
       ARGS: [

package/parser/functions/db/dbBulkPatchFn.js

@@ -1,6 +1,7 @@
 import { PatchToken } from "../../../lexer/db.js";
 import { StringLiteral } from "../../../lexer/literal.js";
 import { Identifier } from "../../../lexer/tokens.js";
+import { getVarName } from "../../generic/utils.js";
 
 /**
  * @param {import('../base_parser.js').XanoBaseParser} $
@@ -9,13 +10,14 @@ export function dbBulkPatchFn($) {
   return () => {
     $.sectionStack.push("dbBulkPatchFn");
     const fnToken = $.CONSUME(PatchToken); // "patch"
-    $.OR({
+    const nameToken = $.OR({
       DEF: [
-        { ALT: () => $.CONSUME(Identifier) }, // user
-        { ALT: () => $.CONSUME1(StringLiteral) }, // "user table"
+        { ALT: () => $.CONSUME(Identifier) },
+        { ALT: () => $.CONSUME1(StringLiteral) },
       ],
       ERR_MSG: "Expected a table name",
     });
+    $.addReference("table", getVarName(nameToken), nameToken);
 
     $.SUBRULE($.schemaParseAttributeFn, {
       ARGS: [

package/parser/functions/db/dbBulkUpdateFn.js

@@ -1,6 +1,7 @@
 import { UpdateToken } from "../../../lexer/db.js";
 import { StringLiteral } from "../../../lexer/literal.js";
 import { Identifier } from "../../../lexer/tokens.js";
+import { getVarName } from "../../generic/utils.js";
 
 /**
  * @param {import('../base_parser.js').XanoBaseParser} $
@@ -9,13 +10,14 @@ export function dbBulkUpdateFn($) {
   return () => {
     $.sectionStack.push("dbBulkUpdateFn");
     const fnToken = $.CONSUME(UpdateToken); // "update"
-    $.OR({
+    const nameToken = $.OR({
       DEF: [
-        { ALT: () => $.CONSUME(Identifier) }, // user
-        { ALT: () => $.CONSUME1(StringLiteral) }, // "user table"
+        { ALT: () => $.CONSUME(Identifier) },
+        { ALT: () => $.CONSUME1(StringLiteral) },
       ],
       ERR_MSG: "Expected a table name",
     });
+    $.addReference("table", getVarName(nameToken), nameToken);
 
     $.SUBRULE($.schemaParseAttributeFn, {
       ARGS: [