@xano/xanoscript-language-server 11.8.4 → 11.8.5

package/parser/functions/db/dbDelFn.js

@@ -1,6 +1,8 @@
 import { DelToken } from "../../../lexer/db.js";
 import { StringLiteral } from "../../../lexer/literal.js";
 import { Identifier } from "../../../lexer/tokens.js";
+import { getVarName } from "../../generic/utils.js";
+import { captureFieldName } from "./captureFieldName.js";
 
 /**
  * @param {import('../base_parser.js').XanoBaseParser} $
@@ -9,14 +11,16 @@ export function dbDelFn($) {
   return () => {
     $.sectionStack.push("dbDelFn");
     const fnToken = $.CONSUME(DelToken); // "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);
 
+    const captured = {};
     $.SUBRULE($.schemaParseAttributeFn, {
       ARGS: [
         fnToken,
@@ -26,9 +30,12 @@ export function dbDelFn($) {
           "description?": "[string]",
           "disabled?": "[boolean]",
         },
+        captured,
       ],
     });
 
+    $.ACTION(() => captureFieldName($, captured));
+
     $.sectionStack.pop();
   };
 }

package/parser/functions/db/dbEditFn.js

@@ -1,6 +1,8 @@
 import { EditToken } 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 dbEditFn($) {
   return () => {
     $.sectionStack.push("dbEditFn");
     const fnToken = $.CONSUME(EditToken); // "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,
@@ -31,9 +35,15 @@ export function dbEditFn($) {
           "addon?": [addonSchema],
           "mock?": { "![string]": "[expression]" },
         },
+        captured,
       ],
     });
 
+    $.ACTION(() => {
+      captureFieldName($, captured);
+      captureDataKeys($, captured);
+    });
+
     $.SUBRULE($.asVariable, { ARGS: [fnToken] });
     $.sectionStack.pop();
   };

package/parser/functions/db/dbGetFn.js

@@ -1,6 +1,8 @@
 import { GetToken } from "../../../lexer/db.js";
 import { StringLiteral } from "../../../lexer/literal.js";
 import { Identifier } from "../../../lexer/tokens.js";
+import { getVarName } from "../../generic/utils.js";
+import { captureFieldName } from "./captureFieldName.js";
 import { addonSchema } from "./schema.js";
 
 /**
@@ -10,14 +12,16 @@ export function dbGetFn($) {
   return () => {
     $.sectionStack.push("dbGetFn");
     const fnToken = $.CONSUME(GetToken); // "get"
-    $.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,
@@ -31,9 +35,12 @@ export function dbGetFn($) {
           "addon?": [addonSchema],
           "mock?": { "![string]": "[expression]" },
         },
+        captured,
       ],
     });
 
+    $.ACTION(() => captureFieldName($, captured));
+
     $.SUBRULE($.asVariable, { ARGS: [fnToken] });
     $.sectionStack.pop();
   };

package/parser/functions/db/dbHasFn.js

@@ -1,6 +1,8 @@
 import { HasToken } from "../../../lexer/db.js";
 import { StringLiteral } from "../../../lexer/literal.js";
 import { Identifier } from "../../../lexer/tokens.js";
+import { getVarName } from "../../generic/utils.js";
+import { captureFieldName } from "./captureFieldName.js";
 
 /**
  * @param {import('../base_parser.js').XanoBaseParser} $
@@ -9,13 +11,15 @@ export function dbHasFn($) {
   return () => {
     $.sectionStack.push("dbHasFn");
     const fnToken = $.CONSUME(HasToken); // "has"
-    $.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,
@@ -26,8 +30,10 @@ export function dbHasFn($) {
           "disabled?": "[boolean]",
           "mock?": { "![string]": "[expression]" },
         },
+        captured,
       ],
     });
+    $.ACTION(() => captureFieldName($, captured));
     $.SUBRULE($.asVariable, { ARGS: [fnToken] });
     $.sectionStack.pop();
   };

package/parser/functions/db/dbPatchFn.js

@@ -1,6 +1,8 @@
 import { PatchToken } from "../../../lexer/db.js";
 import { StringLiteral } from "../../../lexer/literal.js";
 import { Identifier } from "../../../lexer/tokens.js";
+import { getVarName } from "../../generic/utils.js";
+import { captureFieldName } from "./captureFieldName.js";
 import { addonSchema } from "./schema.js";
 
 /**
@@ -10,14 +12,16 @@ export function dbPatchFn($) {
   return () => {
     $.sectionStack.push("dbPatchFn");
     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);
 
+    const captured = {};
     $.SUBRULE($.schemaParseAttributeFn, {
       ARGS: [
         fnToken,
@@ -30,9 +34,12 @@ export function dbPatchFn($) {
           "addon?": [addonSchema],
           "mock?": { "![string]": "[expression]" },
         },
+        captured,
       ],
     });
 
+    $.ACTION(() => captureFieldName($, captured));
+
     $.SUBRULE($.asVariable, { ARGS: [fnToken] });
     $.sectionStack.pop();
   };

package/parser/functions/db/dbQueryFn.js

@@ -1,6 +1,7 @@
 import { QueryToken } 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";
 
 /**
@@ -10,11 +11,13 @@ export function dbQueryFn($) {
   return () => {
     $.sectionStack.push("dbQueryFn");
     const fnToken = $.CONSUME(QueryToken); // "query"
-    $.OR([
-      { ALT: () => $.CONSUME(Identifier) }, // user
-      { ALT: () => $.CONSUME1(StringLiteral) }, // "user table"
+    const nameToken = $.OR([
+      { ALT: () => $.CONSUME(Identifier) },
+      { ALT: () => $.CONSUME1(StringLiteral) },
     ]);
+    $.addReference("table", getVarName(nameToken), nameToken);
 
+    const captured = {};
     $.SUBRULE($.schemaParseAttributeFn, {
       ARGS: [
         fnToken,
@@ -51,9 +54,32 @@ export function dbQueryFn($) {
           "where?": "[query]",
           "additional_where?": "[query]",
         },
+        captured,
       ],
     });
 
+    $.ACTION(() => {
+      // Extract join table references
+      if (captured.join) {
+        for (const [k, v] of Object.entries(captured.join)) {
+          if (k === "key" || k === "value") continue;
+          const tableEntry = v?.table;
+          if (tableEntry?.value) {
+            $.addReference("table", getVarName(tableEntry.value), tableEntry.value);
+          }
+        }
+      }
+      // Extract addon name references
+      if (captured.addon?.value && Array.isArray(captured.addon.value)) {
+        for (const item of captured.addon.value) {
+          const nameEntry = item.name;
+          if (nameEntry?.value) {
+            $.addReference("function", getVarName(nameEntry.value), nameEntry.value);
+          }
+        }
+      }
+    });
+
     // db.query rule is used within an addon declaration, but
     // in this context we don't allow "as" variable assignment
     const isAddonContext = $.sectionStack.includes("addonDeclaration");

package/parser/functions/db/dbSchemaFn.js

@@ -1,6 +1,7 @@
 import { SchemaToken } 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} $
@@ -12,10 +13,11 @@ export function dbSchemaFn($) {
 
     $.sectionStack.push("dbSchemaFn");
     const fnToken = $.CONSUME(SchemaToken); // "schema"
-    $.OR([
-      { ALT: () => $.CONSUME(Identifier) }, // user
-      { ALT: () => $.CONSUME1(StringLiteral) }, // "user table"
+    const nameToken = $.OR([
+      { ALT: () => $.CONSUME(Identifier) },
+      { ALT: () => $.CONSUME1(StringLiteral) },
     ]);
+    $.addReference("table", getVarName(nameToken), nameToken);
     $.SUBRULE($.functionAttrReq, {
       ARGS: [fnToken, requiredAttrs, optionalAttrs],
     });

package/parser/functions/db/dbTruncateFn.js

@@ -1,6 +1,7 @@
 import { TruncateToken } 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 dbTruncateFn($) {
   return () => {
     $.sectionStack.push("dbTruncateFn");
     const fnToken = $.CONSUME(TruncateToken); // "truncate"
-    $.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/middlewareCallFn.js

@@ -2,6 +2,7 @@ import { CallToken } from "../../lexer/action.js";
 import { StringLiteral } from "../../lexer/literal.js";
 import { MiddlewareToken } from "../../lexer/middleware.js";
 import { DotToken, Identifier } from "../../lexer/tokens.js";
+import { getVarName } from "../generic/utils.js";
 
 /**
  *
@@ -15,10 +16,11 @@ export function middlewareCallFn($) {
     $.CONSUME(DotToken); // "."
     const fnToken = $.CONSUME(CallToken); // "call"
 
-    $.OR([
+    const nameToken = $.OR([
       { ALT: () => $.CONSUME(Identifier) }, // user
       { ALT: () => $.CONSUME1(StringLiteral) }, // "user auth"
     ]);
+    $.addReference("middleware", getVarName(nameToken), nameToken);
 
     $.OPTION(() => {
       $.SUBRULE($.schemaParseAttributeFn, {

package/parser/functions/security/register.js

@@ -8,7 +8,9 @@ import { securityCreateUuidFn } from "./securityCreateUuidFn.js";
 import { securityDecryptFn } from "./securityDecryptFn.js";
 import { securityEncryptFn } from "./securityEncryptFn.js";
 import { securityJweDecodeFn } from "./securityJweDecodeFn.js";
+import { securityJweDecodeLegacyFn } from "./securityJweDecodeLegacyFn.js";
 import { securityJweEncodeFn } from "./securityJweEncodeFn.js";
+import { securityJweEncodeLegacyFn } from "./securityJweEncodeLegacyFn.js";
 import { securityJwsDecodeFn } from "./securityJwsDecodeFn.js";
 import { securityJwsEncodeFn } from "./securityJwsEncodeFn.js";
 import { securityRandomBytesFn } from "./securityRandomBytesFn.js";
@@ -21,44 +23,52 @@ import { securityRandomNumberFn } from "./securityRandomNumberFn.js";
 export const register = ($) => {
   $.securityCheckPasswordFn = $.RULE(
     "securityCheckPasswordFn",
-    securityCheckPasswordFn($)
+    securityCheckPasswordFn($),
   );
   $.securityCreateAuthTokenFn = $.RULE(
     "securityCreateAuthTokenFn",
-    securityCreateAuthTokenFn($)
+    securityCreateAuthTokenFn($),
   );
   $.securityCreateCurveKeyFn = $.RULE(
     "securityCreateCurveKeyFn",
-    securityCreateCurveKeyFn($)
+    securityCreateCurveKeyFn($),
   );
   $.securityCreatePasswordFn = $.RULE(
     "securityCreatePasswordFn",
-    securityCreatePasswordFn($)
+    securityCreatePasswordFn($),
   );
   $.securityCreateRsaKeyFn = $.RULE(
     "securityCreateRsaKeyFn",
-    securityCreateRsaKeyFn($)
+    securityCreateRsaKeyFn($),
   );
   $.securityCreateSecretKeyFn = $.RULE(
     "securityCreateSecretKeyFn",
-    securityCreateSecretKeyFn($)
+    securityCreateSecretKeyFn($),
   );
   $.securityCreateUuidFn = $.RULE(
     "securityCreateUuidFn",
-    securityCreateUuidFn($)
+    securityCreateUuidFn($),
   );
   $.securityDecryptFn = $.RULE("securityDecryptFn", securityDecryptFn($));
   $.securityEncryptFn = $.RULE("securityEncryptFn", securityEncryptFn($));
   $.securityJweDecodeFn = $.RULE("securityJweDecodeFn", securityJweDecodeFn($));
   $.securityJweEncodeFn = $.RULE("securityJweEncodeFn", securityJweEncodeFn($));
+  $.securityJweDecodeLegacyFn = $.RULE(
+    "securityJweDecodeLegacyFn",
+    securityJweDecodeLegacyFn($),
+  );
+  $.securityJweEncodeLegacyFn = $.RULE(
+    "securityJweEncodeLegacyFn",
+    securityJweEncodeLegacyFn($),
+  );
   $.securityJwsDecodeFn = $.RULE("securityJwsDecodeFn", securityJwsDecodeFn($));
   $.securityJwsEncodeFn = $.RULE("securityJwsEncodeFn", securityJwsEncodeFn($));
   $.securityRandomBytesFn = $.RULE(
     "securityRandomBytesFn",
-    securityRandomBytesFn($)
+    securityRandomBytesFn($),
   );
   $.securityRandomNumberFn = $.RULE(
     "securityRandomNumberFn",
-    securityRandomNumberFn($)
+    securityRandomNumberFn($),
   );
 };

package/parser/functions/security/securityCreateAuthTokenFn.js

@@ -1,4 +1,8 @@
+import { SingleQuotedStringLiteral,StringLiteral } from "../../../lexer/literal.js";
 import { CreateAuthTokenToken } from "../../../lexer/security.js";
+import { getVarName } from "../../generic/utils.js";
+
+const stringTokens = new Set([StringLiteral.name, SingleQuotedStringLiteral.name]);
 
 /**
  * @param {import('../../base_parser.js').XanoBaseParser} $
@@ -8,6 +12,7 @@ export function securityCreateAuthTokenFn($) {
     $.sectionStack.push("securityCreateAuthTokenFn");
     const fnToken = $.CONSUME(CreateAuthTokenToken); // "create_auth_token"
 
+    const captured = {};
     $.SUBRULE($.schemaParseAttributeFn, {
       ARGS: [
         fnToken,
@@ -19,9 +24,26 @@ export function securityCreateAuthTokenFn($) {
           "description?": "[string]",
           "disabled?": "[boolean]",
         },
+        captured,
       ],
     });
 
+    $.ACTION(() => {
+      if (!captured.table) return;
+      const keyOffset = captured.table.key?.startOffset;
+      if (keyOffset == null) return;
+      const tokens = $.input;
+      for (let i = 0; i < tokens.length - 2; i++) {
+        if (tokens[i].startOffset === keyOffset) {
+          const valueToken = tokens[i + 2];
+          if (valueToken && stringTokens.has(valueToken.tokenType.name)) {
+            $.addReference("table", getVarName(valueToken), valueToken);
+          }
+          break;
+        }
+      }
+    });
+
     $.SUBRULE($.asVariable, { ARGS: [fnToken] });
     $.sectionStack.pop();
   };

package/parser/functions/security/securityJweDecodeLegacyFn.js

@@ -0,0 +1,24 @@
+import { EqualToken, LCurly, RCurly } from "../../../lexer/control.js";
+import { JweDecodeLegacyToken } from "../../../lexer/security.js";
+import { Identifier, NewlineToken } from "../../../lexer/tokens.js";
+
+/**
+ * @param {import('../../base_parser.js').XanoBaseParser} $
+ */
+export function securityJweDecodeLegacyFn($) {
+  return () => {
+    $.sectionStack.push("securityJweDecodeLegacyFn");
+    const fnToken = $.CONSUME(JweDecodeLegacyToken); // "jwe_decode_legacy"
+    $.CONSUME(LCurly); // "{"
+    $.MANY(() => {
+      $.AT_LEAST_ONE(() => $.CONSUME(NewlineToken));
+      $.CONSUME1(Identifier); // "field_name"
+      $.CONSUME(EqualToken); // "="
+      $.SUBRULE($.expressionFn);
+    });
+    $.MANY1(() => $.CONSUME1(NewlineToken));
+    $.CONSUME(RCurly); // "}"
+    $.SUBRULE($.asVariable, { ARGS: [fnToken] });
+    $.sectionStack.pop();
+  };
+}

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

@@ -0,0 +1,26 @@
+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.securityJweDecodeLegacyFn();
+  return parser;
+}
+
+describe("securityJweDecodeLegacyFn", () => {
+  it("securityJweDecodeLegacyFn accepts attributes and store value in a variable", () => {
+    const parser = parse(`jwe_decode_legacy {
+      token = $input.magic_token
+      key = $env.magic_jwt_secret
+      audience = "Xano"
+      key_algorithm = "A256KW"
+      content_algorithm = "A256CBC-HS512"
+    } as $decoded_magic_token`);
+    console.log(parser.errors);
+    expect(parser.errors).to.be.empty;
+  });
+});

package/parser/functions/security/securityJweEncodeLegacyFn.js

@@ -0,0 +1,24 @@
+import { EqualToken, LCurly, RCurly } from "../../../lexer/control.js";
+import { JweEncodeLegacyToken } from "../../../lexer/security.js";
+import { Identifier, NewlineToken } from "../../../lexer/tokens.js";
+
+/**
+ * @param {import('../../base_parser.js').XanoBaseParser} $
+ */
+export function securityJweEncodeLegacyFn($) {
+  return () => {
+    $.sectionStack.push("securityJweEncodeLegacyFn");
+    const fnToken = $.CONSUME(JweEncodeLegacyToken); // "jwe_encode_legacy"
+    $.CONSUME(LCurly); // "{"
+    $.MANY(() => {
+      $.AT_LEAST_ONE(() => $.CONSUME(NewlineToken));
+      $.CONSUME1(Identifier); // "field_name"
+      $.CONSUME(EqualToken); // "="
+      $.SUBRULE($.expressionFn);
+    });
+    $.MANY1(() => $.CONSUME1(NewlineToken));
+    $.CONSUME(RCurly); // "}"
+    $.SUBRULE($.asVariable, { ARGS: [fnToken] });
+    $.sectionStack.pop();
+  };
+}

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

@@ -0,0 +1,25 @@
+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.securityJweEncodeLegacyFn();
+  return parser;
+}
+
+describe("securityJweEncodeLegacyFn", () => {
+  it("securityJweEncodeLegacyFn accepts attributes and store value in a variable", () => {
+    const parser = parse(`jwe_encode_legacy {
+      payload = $jwt_payload
+      audience = "Xano"
+      key = $env.magic_jwt_secret
+      key_algorithm = "A256KW"
+      content_algorithm = "A256CBC-HS512"
+    } as $jwt`);
+    expect(parser.errors).to.be.empty;
+  });
+});

package/parser/functions/securityFn.js

@@ -20,6 +20,8 @@ export function securityFn($) {
       { ALT: () => $.SUBRULE($.securityEncryptFn) }, // security.encrypt
       { ALT: () => $.SUBRULE($.securityJweDecodeFn) }, // security.jwe_decode
       { ALT: () => $.SUBRULE($.securityJweEncodeFn) }, // security.jwe_encode
+      { ALT: () => $.SUBRULE($.securityJweDecodeLegacyFn) }, // security.jwe_decode_legacy
+      { ALT: () => $.SUBRULE($.securityJweEncodeLegacyFn) }, // security.jwe_encode_legacy
       { ALT: () => $.SUBRULE($.securityJwsDecodeFn) }, // security.jws_decode
       { ALT: () => $.SUBRULE($.securityJwsEncodeFn) }, // security.jws_encode
       { ALT: () => $.SUBRULE($.securityRandomBytesFn) }, // security.random_bytes

package/parser/functions/varFn.js

@@ -68,7 +68,7 @@ export function varFn($) {
             // we can directly add the variable here but
             // not necessary for the `assignableVariableProperty` below
             // which will add it on its own
-            $.addVariable(variable.image, "unknown");
+            $.addVariable(variable.image, "unknown", variable);
           }
         },
       },

package/parser/generic/asVariable.js

@@ -13,7 +13,9 @@ export function asVariable($) {
     $.OPTION(() => {
       hasAs = true;
       $.CONSUME(AsToken); // "as"
+      $.__assignableIsDeclaration = true;
       $.SUBRULE($.assignableVariableProperty);
+      $.__assignableIsDeclaration = false;
     });
 
     if (!hasAs && parent) {

package/parser/generic/assignableVariableAs.js

@@ -45,6 +45,7 @@ export function assignableVariableAs($) {
           )
         );
       }
+      $.addVariable(variableName, "unknown", variableToken);
     }
   };
 }

package/parser/generic/assignableVariableProperty.js

@@ -128,8 +128,11 @@ export function assignableVariableProperty($) {
       },
     });
 
-    if (variableName) {
-      $.addVariable(variableName, "unknown");
+    // Only register as a declaration when used in an "as $var" context.
+    // Other callers (var.update, math.*, text.*) are usages, not declarations,
+    // and the token scanner will pick them up automatically.
+    if (variableName && $.__assignableIsDeclaration) {
+      $.addVariable(variableName, "unknown", variableToken);
     }
   };
 }