solve-engine 1.0.2 → 1.1.0

package/dist/{chunk-R7YVBHCV.cjs → chunk-YTIYVHL7.cjs}

@@ -1,12 +1,12 @@
 'use strict';
 
-var chunk5LI5EPGJ_cjs = require('./chunk-5LI5EPGJ.cjs');
+var chunkQFTDTX6K_cjs = require('./chunk-QFTDTX6K.cjs');
 var chunkOUHT5Z36_cjs = require('./chunk-OUHT5Z36.cjs');
 var chunkAQNHHJMJ_cjs = require('./chunk-AQNHHJMJ.cjs');
-var chunk5KMIY374_cjs = require('./chunk-5KMIY374.cjs');
+var chunkB4HBEFTB_cjs = require('./chunk-B4HBEFTB.cjs');
 
 // src/lexer/ExpressionLexer.ts
-chunk5LI5EPGJ_cjs.registerAllTokenTypes();
+chunkQFTDTX6K_cjs.registerAllTokenTypes();
 function buildCharClassTable() {
   const table = new Uint8Array(128);
   for (let i = 48; i <= 57; i++) table[i] = 2 /* DIGIT */;
@@ -184,6 +184,16 @@ var _ExpressionLexer = class _ExpressionLexer {
     // Line / column tracking (1-indexed)
     this.line = 1;
     this.lineStartPos = 0;
+    // Open-bracket context stack for the current line, one entry per unclosed
+    // `(`/`[`, `true` when a comma inside it is a separator rather than a
+    // thousands group. A `[` (vector/matrix) and a CALL `(` (`rgb(255,255,255)`,
+    // preceded by an identifier) are separator contexts; a bare GROUPING `(`
+    // (`(1,000)`, preceded by an operator or the line start) is not, so a
+    // parenthesised thousands number still reads as one scalar. The number scanner
+    // consults the innermost entry. Tracked here because the flat token stream
+    // carries no nesting otherwise; reset per line, so an unbalanced bracket
+    // cannot bleed the decision into the next.
+    this.groupingStack = [];
     // Plugin-extensible keyword map (merged with locale keywordMap)
     this.pluginKeywordMap = /* @__PURE__ */ new Map();
     // Plugin-extensible two-char operators: firstChar → (secondChar → tokenType)
@@ -233,7 +243,7 @@ var _ExpressionLexer = class _ExpressionLexer {
       if (m && typeof m[1] === "string") {
         const value = m[1].trim();
         if (value.length > 0) {
-          return new LexerToken(rule.tokenType, chunk5LI5EPGJ_cjs.tokenTypeId(rule.tokenType), value, value, 0, 0, this.line, 1);
+          return new LexerToken(rule.tokenType, chunkQFTDTX6K_cjs.tokenTypeId(rule.tokenType), value, value, 0, 0, this.line, 1);
         }
       }
     }
@@ -263,7 +273,7 @@ var _ExpressionLexer = class _ExpressionLexer {
       for (const [keyword, tokenType] of Object.entries(plugin.keywords)) {
         const lower = keyword.toLowerCase();
         if (this.keywordMap.has(lower)) {
-          throw chunk5KMIY374_cjs.ErrorFactory.config(
+          throw chunkB4HBEFTB_cjs.ErrorFactory.config(
             "PLUGIN_KEYWORD_COLLISION",
             `Plugin keyword "${keyword}" conflicts with built-in keyword (type: ${this.keywordMap.get(lower)}). Built-in keywords cannot be overridden.`,
             { keyword, builtinType: this.keywordMap.get(lower) }
@@ -281,28 +291,28 @@ var _ExpressionLexer = class _ExpressionLexer {
           const second = chars.charCodeAt(1);
           const builtInSecondMap = TWO_CHAR_OPS[first];
           if (builtInSecondMap && builtInSecondMap[second] !== void 0) {
-            throw chunk5KMIY374_cjs.ErrorFactory.config(
+            throw chunkB4HBEFTB_cjs.ErrorFactory.config(
               "PLUGIN_OPERATOR_COLLISION",
               `Plugin operator "${chars}" conflicts with built-in operator (type: ${builtInSecondMap[second]}). Built-in operators cannot be overridden.`,
               { operator: chars, builtinType: builtInSecondMap[second] }
             );
           }
           if (first === 60 && second === 60) {
-            throw chunk5KMIY374_cjs.ErrorFactory.config(
+            throw chunkB4HBEFTB_cjs.ErrorFactory.config(
               "PLUGIN_OPERATOR_COLLISION",
               `Plugin operator "${chars}" conflicts with built-in operator (type: LSHIFT). Built-in operators cannot be overridden.`,
               { operator: chars, builtinType: "LSHIFT" }
             );
           }
           if (first === 62 && second === 62) {
-            throw chunk5KMIY374_cjs.ErrorFactory.config(
+            throw chunkB4HBEFTB_cjs.ErrorFactory.config(
               "PLUGIN_OPERATOR_COLLISION",
               `Plugin operator "${chars}" conflicts with built-in operator (type: RSHIFT). Built-in operators cannot be overridden.`,
               { operator: chars, builtinType: "RSHIFT" }
             );
           }
           if (first === 47 && second === 47) {
-            throw chunk5KMIY374_cjs.ErrorFactory.config(
+            throw chunkB4HBEFTB_cjs.ErrorFactory.config(
               "PLUGIN_OPERATOR_COLLISION",
               `Plugin operator "${chars}" conflicts with built-in comment sequence. Comment sequences cannot be overridden.`,
               { operator: chars, builtinType: "COMMENT" }
@@ -320,7 +330,7 @@ var _ExpressionLexer = class _ExpressionLexer {
     if (plugin.units) {
       for (const unit of plugin.units) {
         if (chunkAQNHHJMJ_cjs.knownUnits.has(unit)) {
-          throw chunk5KMIY374_cjs.ErrorFactory.config(
+          throw chunkB4HBEFTB_cjs.ErrorFactory.config(
             "PLUGIN_UNIT_COLLISION",
             `Plugin unit "${unit}" conflicts with a built-in unit. Built-in units cannot be overridden.`,
             { unit }
@@ -541,20 +551,20 @@ var _ExpressionLexer = class _ExpressionLexer {
       switch (cc) {
         case 2 /* DIGIT */:
         case 4 /* DOT */:
-          yield new LexerToken("NUMBER", chunk5LI5EPGJ_cjs.tokenTypeId("NUMBER"), this.input, this.input, 0, 0, 1, 1);
+          yield new LexerToken("NUMBER", chunkQFTDTX6K_cjs.tokenTypeId("NUMBER"), this.input, this.input, 0, 0, 1, 1);
           tokenIndex++;
           break;
         case 3 /* ALPHA */: {
           const input2 = this.input;
           const identLower = input2.toLowerCase();
           if (this.mergedUnits.has(input2)) {
-            yield new LexerToken("UNIT", chunk5LI5EPGJ_cjs.tokenTypeId("UNIT"), input2, input2, 0, 0, 1, 1);
+            yield new LexerToken("UNIT", chunkQFTDTX6K_cjs.tokenTypeId("UNIT"), input2, input2, 0, 0, 1, 1);
           } else {
             const kwType = this.mergedKeywords.get(identLower);
             if (kwType) {
-              yield new LexerToken(kwType, chunk5LI5EPGJ_cjs.tokenTypeId(kwType), input2, input2, 0, 0, 1, 1);
+              yield new LexerToken(kwType, chunkQFTDTX6K_cjs.tokenTypeId(kwType), input2, input2, 0, 0, 1, 1);
             } else {
-              yield new LexerToken("IDENT", chunk5LI5EPGJ_cjs.tokenTypeId("IDENT"), input2, input2, 0, 0, 1, 1);
+              yield new LexerToken("IDENT", chunkQFTDTX6K_cjs.tokenTypeId("IDENT"), input2, input2, 0, 0, 1, 1);
             }
           }
           tokenIndex++;
@@ -563,7 +573,7 @@ var _ExpressionLexer = class _ExpressionLexer {
         case 5 /* OPERATOR */: {
           const opType = OP_MAP[c0];
           if (opType) {
-            yield new LexerToken(opType, chunk5LI5EPGJ_cjs.tokenTypeId(opType), this.input, this.input, 0, 0, 1, 1);
+            yield new LexerToken(opType, chunkQFTDTX6K_cjs.tokenTypeId(opType), this.input, this.input, 0, 0, 1, 1);
             tokenIndex++;
           }
           break;
@@ -579,61 +589,64 @@ var _ExpressionLexer = class _ExpressionLexer {
           tokenIndex++;
           break;
         case 8 /* DOLLAR */:
-          yield new LexerToken("DOLLAR", chunk5LI5EPGJ_cjs.tokenTypeId("DOLLAR"), "$", "$", 0, 0, 1, 1);
+          yield new LexerToken("DOLLAR", chunkQFTDTX6K_cjs.tokenTypeId("DOLLAR"), "$", "$", 0, 0, 1, 1);
           tokenIndex++;
           break;
         case 11 /* BACKTICK */:
-          yield new LexerToken("BACKTICK_OPEN", chunk5LI5EPGJ_cjs.tokenTypeId("BACKTICK_OPEN"), "`", "`", 0, 0, 1, 1);
+          yield new LexerToken("BACKTICK_OPEN", chunkQFTDTX6K_cjs.tokenTypeId("BACKTICK_OPEN"), "`", "`", 0, 0, 1, 1);
           tokenIndex++;
           break;
         default: {
           if (isUnicodeSpace(c0)) ; else if (c0 === 215) {
-            yield new LexerToken("STAR", chunk5LI5EPGJ_cjs.tokenTypeId("STAR"), "\xD7", "\xD7", 0, 0, 1, 1);
+            yield new LexerToken("STAR", chunkQFTDTX6K_cjs.tokenTypeId("STAR"), "\xD7", "\xD7", 0, 0, 1, 1);
             tokenIndex++;
           } else if (c0 === 247) {
-            yield new LexerToken("SLASH", chunk5LI5EPGJ_cjs.tokenTypeId("SLASH"), "\xF7", "\xF7", 0, 0, 1, 1);
+            yield new LexerToken("SLASH", chunkQFTDTX6K_cjs.tokenTypeId("SLASH"), "\xF7", "\xF7", 0, 0, 1, 1);
+            tokenIndex++;
+          } else if (c0 === 177) {
+            yield new LexerToken("PLUS_MINUS", chunkQFTDTX6K_cjs.tokenTypeId("PLUS_MINUS"), "\xB1", "\xB1", 0, 0, 1, 1);
             tokenIndex++;
           } else if (c0 === 8800) {
-            yield new LexerToken("NEQ", chunk5LI5EPGJ_cjs.tokenTypeId("NEQ"), "\u2260", "\u2260", 0, 0, 1, 1);
+            yield new LexerToken("NEQ", chunkQFTDTX6K_cjs.tokenTypeId("NEQ"), "\u2260", "\u2260", 0, 0, 1, 1);
             tokenIndex++;
           } else if (c0 === 163) {
-            yield new LexerToken("POUND", chunk5LI5EPGJ_cjs.tokenTypeId("POUND"), "\xA3", "\xA3", 0, 0, 1, 1);
+            yield new LexerToken("POUND", chunkQFTDTX6K_cjs.tokenTypeId("POUND"), "\xA3", "\xA3", 0, 0, 1, 1);
             tokenIndex++;
           } else if (c0 === 8364) {
-            yield new LexerToken("EURO", chunk5LI5EPGJ_cjs.tokenTypeId("EURO"), "\u20AC", "\u20AC", 0, 0, 1, 1);
+            yield new LexerToken("EURO", chunkQFTDTX6K_cjs.tokenTypeId("EURO"), "\u20AC", "\u20AC", 0, 0, 1, 1);
             tokenIndex++;
           } else if (c0 === 165) {
-            yield new LexerToken("YEN", chunk5LI5EPGJ_cjs.tokenTypeId("YEN"), "\xA5", "\xA5", 0, 0, 1, 1);
+            yield new LexerToken("YEN", chunkQFTDTX6K_cjs.tokenTypeId("YEN"), "\xA5", "\xA5", 0, 0, 1, 1);
             tokenIndex++;
           } else if (c0 === 8381) {
-            yield new LexerToken("RUBLE", chunk5LI5EPGJ_cjs.tokenTypeId("RUBLE"), "\u20BD", "\u20BD", 0, 0, 1, 1);
+            yield new LexerToken("RUBLE", chunkQFTDTX6K_cjs.tokenTypeId("RUBLE"), "\u20BD", "\u20BD", 0, 0, 1, 1);
             tokenIndex++;
           } else if (c0 === 8361) {
-            yield new LexerToken("WON", chunk5LI5EPGJ_cjs.tokenTypeId("WON"), "\u20A9", "\u20A9", 0, 0, 1, 1);
+            yield new LexerToken("WON", chunkQFTDTX6K_cjs.tokenTypeId("WON"), "\u20A9", "\u20A9", 0, 0, 1, 1);
             tokenIndex++;
           } else if (c0 === 8377) {
-            yield new LexerToken("CURRENCY_SYMBOL", chunk5LI5EPGJ_cjs.tokenTypeId("CURRENCY_SYMBOL"), "\u20B9", "\u20B9", 0, 0, 1, 1);
+            yield new LexerToken("CURRENCY_SYMBOL", chunkQFTDTX6K_cjs.tokenTypeId("CURRENCY_SYMBOL"), "\u20B9", "\u20B9", 0, 0, 1, 1);
             tokenIndex++;
           } else if (c0 === 8378) {
-            yield new LexerToken("CURRENCY_SYMBOL", chunk5LI5EPGJ_cjs.tokenTypeId("CURRENCY_SYMBOL"), "\u20BA", "\u20BA", 0, 0, 1, 1);
+            yield new LexerToken("CURRENCY_SYMBOL", chunkQFTDTX6K_cjs.tokenTypeId("CURRENCY_SYMBOL"), "\u20BA", "\u20BA", 0, 0, 1, 1);
             tokenIndex++;
           } else if (c0 === 8372) {
-            yield new LexerToken("CURRENCY_SYMBOL", chunk5LI5EPGJ_cjs.tokenTypeId("CURRENCY_SYMBOL"), "\u20B4", "\u20B4", 0, 0, 1, 1);
+            yield new LexerToken("CURRENCY_SYMBOL", chunkQFTDTX6K_cjs.tokenTypeId("CURRENCY_SYMBOL"), "\u20B4", "\u20B4", 0, 0, 1, 1);
             tokenIndex++;
           } else if (c0 === 8362) {
-            yield new LexerToken("CURRENCY_SYMBOL", chunk5LI5EPGJ_cjs.tokenTypeId("CURRENCY_SYMBOL"), "\u20AA", "\u20AA", 0, 0, 1, 1);
+            yield new LexerToken("CURRENCY_SYMBOL", chunkQFTDTX6K_cjs.tokenTypeId("CURRENCY_SYMBOL"), "\u20AA", "\u20AA", 0, 0, 1, 1);
             tokenIndex++;
           } else if (c0 === 8363) {
-            yield new LexerToken("CURRENCY_SYMBOL", chunk5LI5EPGJ_cjs.tokenTypeId("CURRENCY_SYMBOL"), "\u20AB", "\u20AB", 0, 0, 1, 1);
+            yield new LexerToken("CURRENCY_SYMBOL", chunkQFTDTX6K_cjs.tokenTypeId("CURRENCY_SYMBOL"), "\u20AB", "\u20AB", 0, 0, 1, 1);
             tokenIndex++;
           } else if (c0 === 8358) {
-            yield new LexerToken("CURRENCY_SYMBOL", chunk5LI5EPGJ_cjs.tokenTypeId("CURRENCY_SYMBOL"), "\u20A6", "\u20A6", 0, 0, 1, 1);
+            yield new LexerToken("CURRENCY_SYMBOL", chunkQFTDTX6K_cjs.tokenTypeId("CURRENCY_SYMBOL"), "\u20A6", "\u20A6", 0, 0, 1, 1);
             tokenIndex++;
           } else if (c0 === 8369) {
-            yield new LexerToken("CURRENCY_SYMBOL", chunk5LI5EPGJ_cjs.tokenTypeId("CURRENCY_SYMBOL"), "\u20B1", "\u20B1", 0, 0, 1, 1);
+            yield new LexerToken("CURRENCY_SYMBOL", chunkQFTDTX6K_cjs.tokenTypeId("CURRENCY_SYMBOL"), "\u20B1", "\u20B1", 0, 0, 1, 1);
             tokenIndex++;
           } else if (c0 >= 128) {
-            yield new LexerToken("IDENT", chunk5LI5EPGJ_cjs.tokenTypeId("IDENT"), this.input, this.input, 0, 0, 1, 1);
+            yield new LexerToken("IDENT", chunkQFTDTX6K_cjs.tokenTypeId("IDENT"), this.input, this.input, 0, 0, 1, 1);
             tokenIndex++;
           }
           break;
@@ -643,6 +656,7 @@ var _ExpressionLexer = class _ExpressionLexer {
       return;
     }
     const input = this.input;
+    this.groupingStack.length = 0;
     while (this.pos < len) {
       const c0 = input.charCodeAt(this.pos);
       const cc = _ExpressionLexer.CHAR_CLASS[c0] ?? 0 /* SKIP */;
@@ -657,12 +671,14 @@ var _ExpressionLexer = class _ExpressionLexer {
           if (c0 === 10) {
             this.line++;
             this.lineStartPos = this.pos;
+            this.groupingStack.length = 0;
           } else if (c0 === 13) {
             this.line++;
             if (this.pos < len && input.charCodeAt(this.pos) === 10) {
               this.pos++;
             }
             this.lineStartPos = this.pos;
+            this.groupingStack.length = 0;
           }
           break;
         // ── Digit, inline number tokenizer ───────────────────────────
@@ -688,12 +704,12 @@ var _ExpressionLexer = class _ExpressionLexer {
               yield this.tokenizeNumber();
             } else {
               const col = this.pos - this.lineStartPos + 1;
-              yield new LexerToken("DOT", chunk5LI5EPGJ_cjs.tokenTypeId("DOT"), ".", ".", this.pos, 0, this.line, col);
+              yield new LexerToken("DOT", chunkQFTDTX6K_cjs.tokenTypeId("DOT"), ".", ".", this.pos, 0, this.line, col);
               this.pos++;
             }
           } else {
             const col = this.pos - this.lineStartPos + 1;
-            yield new LexerToken("DOT", chunk5LI5EPGJ_cjs.tokenTypeId("DOT"), ".", ".", this.pos, 0, this.line, col);
+            yield new LexerToken("DOT", chunkQFTDTX6K_cjs.tokenTypeId("DOT"), ".", ".", this.pos, 0, this.line, col);
             this.pos++;
           }
           tokenIndex++;
@@ -716,7 +732,7 @@ var _ExpressionLexer = class _ExpressionLexer {
         // ── Dollar sign $ ─────────────────────────────────────────────
         case 8 /* DOLLAR */: {
           const col = this.pos - this.lineStartPos + 1;
-          yield new LexerToken("DOLLAR", chunk5LI5EPGJ_cjs.tokenTypeId("DOLLAR"), "$", "$", this.pos, 0, this.line, col);
+          yield new LexerToken("DOLLAR", chunkQFTDTX6K_cjs.tokenTypeId("DOLLAR"), "$", "$", this.pos, 0, this.line, col);
           this.pos++;
           tokenIndex++;
           break;
@@ -724,7 +740,7 @@ var _ExpressionLexer = class _ExpressionLexer {
         // ── Backtick ` ───────────────────────────────────────────────
         case 11 /* BACKTICK */: {
           const col = this.pos - this.lineStartPos + 1;
-          yield new LexerToken("BACKTICK_OPEN", chunk5LI5EPGJ_cjs.tokenTypeId("BACKTICK_OPEN"), "`", "`", this.pos, 0, this.line, col);
+          yield new LexerToken("BACKTICK_OPEN", chunkQFTDTX6K_cjs.tokenTypeId("BACKTICK_OPEN"), "`", "`", this.pos, 0, this.line, col);
           this.pos++;
           if (openSpan) {
             const span = openSpan;
@@ -751,63 +767,67 @@ var _ExpressionLexer = class _ExpressionLexer {
               this.lineStartPos = this.pos;
             }
           } else if (c0 === 215) {
-            yield new LexerToken("STAR", chunk5LI5EPGJ_cjs.tokenTypeId("STAR"), "\xD7", "\xD7", this.pos, 0, this.line, col);
+            yield new LexerToken("STAR", chunkQFTDTX6K_cjs.tokenTypeId("STAR"), "\xD7", "\xD7", this.pos, 0, this.line, col);
             this.pos++;
             tokenIndex++;
           } else if (c0 === 247) {
-            yield new LexerToken("SLASH", chunk5LI5EPGJ_cjs.tokenTypeId("SLASH"), "\xF7", "\xF7", this.pos, 0, this.line, col);
+            yield new LexerToken("SLASH", chunkQFTDTX6K_cjs.tokenTypeId("SLASH"), "\xF7", "\xF7", this.pos, 0, this.line, col);
+            this.pos++;
+            tokenIndex++;
+          } else if (c0 === 177) {
+            yield new LexerToken("PLUS_MINUS", chunkQFTDTX6K_cjs.tokenTypeId("PLUS_MINUS"), "\xB1", "\xB1", this.pos, 0, this.line, col);
             this.pos++;
             tokenIndex++;
           } else if (c0 === 8800) {
-            yield new LexerToken("NEQ", chunk5LI5EPGJ_cjs.tokenTypeId("NEQ"), "\u2260", "\u2260", this.pos, 0, this.line, col);
+            yield new LexerToken("NEQ", chunkQFTDTX6K_cjs.tokenTypeId("NEQ"), "\u2260", "\u2260", this.pos, 0, this.line, col);
             this.pos++;
             tokenIndex++;
           } else if (c0 === 163) {
-            yield new LexerToken("POUND", chunk5LI5EPGJ_cjs.tokenTypeId("POUND"), "\xA3", "\xA3", this.pos, 0, this.line, col);
+            yield new LexerToken("POUND", chunkQFTDTX6K_cjs.tokenTypeId("POUND"), "\xA3", "\xA3", this.pos, 0, this.line, col);
             this.pos++;
             tokenIndex++;
           } else if (c0 === 8364) {
-            yield new LexerToken("EURO", chunk5LI5EPGJ_cjs.tokenTypeId("EURO"), "\u20AC", "\u20AC", this.pos, 0, this.line, col);
+            yield new LexerToken("EURO", chunkQFTDTX6K_cjs.tokenTypeId("EURO"), "\u20AC", "\u20AC", this.pos, 0, this.line, col);
             this.pos++;
             tokenIndex++;
           } else if (c0 === 165) {
-            yield new LexerToken("YEN", chunk5LI5EPGJ_cjs.tokenTypeId("YEN"), "\xA5", "\xA5", this.pos, 0, this.line, col);
+            yield new LexerToken("YEN", chunkQFTDTX6K_cjs.tokenTypeId("YEN"), "\xA5", "\xA5", this.pos, 0, this.line, col);
             this.pos++;
             tokenIndex++;
           } else if (c0 === 8381) {
-            yield new LexerToken("RUBLE", chunk5LI5EPGJ_cjs.tokenTypeId("RUBLE"), "\u20BD", "\u20BD", this.pos, 0, this.line, col);
+            yield new LexerToken("RUBLE", chunkQFTDTX6K_cjs.tokenTypeId("RUBLE"), "\u20BD", "\u20BD", this.pos, 0, this.line, col);
             this.pos++;
             tokenIndex++;
           } else if (c0 === 8361) {
-            yield new LexerToken("WON", chunk5LI5EPGJ_cjs.tokenTypeId("WON"), "\u20A9", "\u20A9", this.pos, 0, this.line, col);
+            yield new LexerToken("WON", chunkQFTDTX6K_cjs.tokenTypeId("WON"), "\u20A9", "\u20A9", this.pos, 0, this.line, col);
             this.pos++;
             tokenIndex++;
           } else if (c0 === 8377) {
-            yield new LexerToken("CURRENCY_SYMBOL", chunk5LI5EPGJ_cjs.tokenTypeId("CURRENCY_SYMBOL"), "\u20B9", "\u20B9", this.pos, 0, this.line, col);
+            yield new LexerToken("CURRENCY_SYMBOL", chunkQFTDTX6K_cjs.tokenTypeId("CURRENCY_SYMBOL"), "\u20B9", "\u20B9", this.pos, 0, this.line, col);
             this.pos++;
             tokenIndex++;
           } else if (c0 === 8378) {
-            yield new LexerToken("CURRENCY_SYMBOL", chunk5LI5EPGJ_cjs.tokenTypeId("CURRENCY_SYMBOL"), "\u20BA", "\u20BA", this.pos, 0, this.line, col);
+            yield new LexerToken("CURRENCY_SYMBOL", chunkQFTDTX6K_cjs.tokenTypeId("CURRENCY_SYMBOL"), "\u20BA", "\u20BA", this.pos, 0, this.line, col);
             this.pos++;
             tokenIndex++;
           } else if (c0 === 8372) {
-            yield new LexerToken("CURRENCY_SYMBOL", chunk5LI5EPGJ_cjs.tokenTypeId("CURRENCY_SYMBOL"), "\u20B4", "\u20B4", this.pos, 0, this.line, col);
+            yield new LexerToken("CURRENCY_SYMBOL", chunkQFTDTX6K_cjs.tokenTypeId("CURRENCY_SYMBOL"), "\u20B4", "\u20B4", this.pos, 0, this.line, col);
             this.pos++;
             tokenIndex++;
           } else if (c0 === 8362) {
-            yield new LexerToken("CURRENCY_SYMBOL", chunk5LI5EPGJ_cjs.tokenTypeId("CURRENCY_SYMBOL"), "\u20AA", "\u20AA", this.pos, 0, this.line, col);
+            yield new LexerToken("CURRENCY_SYMBOL", chunkQFTDTX6K_cjs.tokenTypeId("CURRENCY_SYMBOL"), "\u20AA", "\u20AA", this.pos, 0, this.line, col);
             this.pos++;
             tokenIndex++;
           } else if (c0 === 8363) {
-            yield new LexerToken("CURRENCY_SYMBOL", chunk5LI5EPGJ_cjs.tokenTypeId("CURRENCY_SYMBOL"), "\u20AB", "\u20AB", this.pos, 0, this.line, col);
+            yield new LexerToken("CURRENCY_SYMBOL", chunkQFTDTX6K_cjs.tokenTypeId("CURRENCY_SYMBOL"), "\u20AB", "\u20AB", this.pos, 0, this.line, col);
             this.pos++;
             tokenIndex++;
           } else if (c0 === 8358) {
-            yield new LexerToken("CURRENCY_SYMBOL", chunk5LI5EPGJ_cjs.tokenTypeId("CURRENCY_SYMBOL"), "\u20A6", "\u20A6", this.pos, 0, this.line, col);
+            yield new LexerToken("CURRENCY_SYMBOL", chunkQFTDTX6K_cjs.tokenTypeId("CURRENCY_SYMBOL"), "\u20A6", "\u20A6", this.pos, 0, this.line, col);
             this.pos++;
             tokenIndex++;
           } else if (c0 === 8369) {
-            yield new LexerToken("CURRENCY_SYMBOL", chunk5LI5EPGJ_cjs.tokenTypeId("CURRENCY_SYMBOL"), "\u20B1", "\u20B1", this.pos, 0, this.line, col);
+            yield new LexerToken("CURRENCY_SYMBOL", chunkQFTDTX6K_cjs.tokenTypeId("CURRENCY_SYMBOL"), "\u20B1", "\u20B1", this.pos, 0, this.line, col);
             this.pos++;
             tokenIndex++;
           } else if (c0 >= 128) {
@@ -848,7 +868,7 @@ var _ExpressionLexer = class _ExpressionLexer {
         }
         const text2 = input.slice(start, pos);
         this.pos = pos;
-        return new LexerToken("NUMBER", chunk5LI5EPGJ_cjs.tokenTypeId("NUMBER"), text2, text2, start, 0, this.line, startCol);
+        return new LexerToken("NUMBER", chunkQFTDTX6K_cjs.tokenTypeId("NUMBER"), text2, text2, start, 0, this.line, startCol);
       }
       if (next === 98 || next === 66) {
         pos += 2;
@@ -857,7 +877,7 @@ var _ExpressionLexer = class _ExpressionLexer {
         }
         const text2 = input.slice(start, pos);
         this.pos = pos;
-        return new LexerToken("NUMBER", chunk5LI5EPGJ_cjs.tokenTypeId("NUMBER"), text2, text2, start, 0, this.line, startCol);
+        return new LexerToken("NUMBER", chunkQFTDTX6K_cjs.tokenTypeId("NUMBER"), text2, text2, start, 0, this.line, startCol);
       }
       if (next === 111 || next === 79) {
         pos += 2;
@@ -866,7 +886,7 @@ var _ExpressionLexer = class _ExpressionLexer {
         }
         const text2 = input.slice(start, pos);
         this.pos = pos;
-        return new LexerToken("NUMBER", chunk5LI5EPGJ_cjs.tokenTypeId("NUMBER"), text2, text2, start, 0, this.line, startCol);
+        return new LexerToken("NUMBER", chunkQFTDTX6K_cjs.tokenTypeId("NUMBER"), text2, text2, start, 0, this.line, startCol);
       }
     }
     let hasIntPart = false;
@@ -875,6 +895,9 @@ var _ExpressionLexer = class _ExpressionLexer {
       pos++;
     }
     while (hasIntPart && pos < len && (input.charCodeAt(pos) === 44 || input.charCodeAt(pos) === 46)) {
+      if (input.charCodeAt(pos) === 44 && this.groupingStack.length > 0 && this.groupingStack[this.groupingStack.length - 1]) {
+        break;
+      }
       if (pos + 4 <= len) {
         const d1 = input.charCodeAt(pos + 1);
         const d2 = input.charCodeAt(pos + 2);
@@ -924,12 +947,12 @@ var _ExpressionLexer = class _ExpressionLexer {
         pos++;
         const text2 = input.slice(start, pos);
         this.pos = pos;
-        return new LexerToken("BIGINT", chunk5LI5EPGJ_cjs.tokenTypeId("BIGINT"), text2, text2, start, 0, this.line, startCol);
+        return new LexerToken("BIGINT", chunkQFTDTX6K_cjs.tokenTypeId("BIGINT"), text2, text2, start, 0, this.line, startCol);
       }
     }
     const text = input.slice(start, pos);
     this.pos = pos;
-    return new LexerToken("NUMBER", chunk5LI5EPGJ_cjs.tokenTypeId("NUMBER"), text, text, start, 0, this.line, startCol);
+    return new LexerToken("NUMBER", chunkQFTDTX6K_cjs.tokenTypeId("NUMBER"), text, text, start, 0, this.line, startCol);
   }
   // ── Inline identifier / keyword tokenizer ──────────────────────────────
   /**
@@ -961,22 +984,22 @@ var _ExpressionLexer = class _ExpressionLexer {
       pos++;
       this.pos = pos;
       const fullText = input.slice(start, pos);
-      return new LexerToken("INLINE_SOLVE_START", chunk5LI5EPGJ_cjs.tokenTypeId("INLINE_SOLVE_START"), fullText, fullText, start, 0, this.line, startCol);
+      return new LexerToken("INLINE_SOLVE_START", chunkQFTDTX6K_cjs.tokenTypeId("INLINE_SOLVE_START"), fullText, fullText, start, 0, this.line, startCol);
     }
     const isKnownUnit = this.mergedUnits.has(identText);
     if (isKnownUnit) {
       if (!this.isFollowedByLParen(pos)) {
         this.pos = pos;
-        return new LexerToken("UNIT", chunk5LI5EPGJ_cjs.tokenTypeId("UNIT"), identText, identText, start, 0, this.line, startCol);
+        return new LexerToken("UNIT", chunkQFTDTX6K_cjs.tokenTypeId("UNIT"), identText, identText, start, 0, this.line, startCol);
       }
     }
     const localeKwType = this.mergedKeywords.get(identLower);
     if (localeKwType) {
       this.pos = pos;
-      return new LexerToken(localeKwType, chunk5LI5EPGJ_cjs.tokenTypeId(localeKwType), identText, identText, start, 0, this.line, startCol);
+      return new LexerToken(localeKwType, chunkQFTDTX6K_cjs.tokenTypeId(localeKwType), identText, identText, start, 0, this.line, startCol);
     }
     this.pos = pos;
-    return new LexerToken("IDENT", chunk5LI5EPGJ_cjs.tokenTypeId("IDENT"), identText, identText, start, 0, this.line, startCol);
+    return new LexerToken("IDENT", chunkQFTDTX6K_cjs.tokenTypeId("IDENT"), identText, identText, start, 0, this.line, startCol);
   }
   /**
    * Peek past in-expression whitespace (space, tab) from `pos` to check
@@ -994,6 +1017,42 @@ var _ExpressionLexer = class _ExpressionLexer {
     return false;
   }
   // ── Inline operator tokenizer ─────────────────────────────────────────
+  /**
+   * Whether the `(` at `parenPos` opens a function call rather than a bare
+   * grouping, deciding whether a comma inside it is a separator or a thousands
+   * group (see {@link groupingStack}).
+   *
+   * It is a call when the nearest non-whitespace character before it belongs to
+   * the value the call applies to: a closing `)`/`]` (a call on a result), or an
+   * IDENTIFIER (`rgb(`, `vec2(`). A run of digits alone is a number, not an
+   * identifier, so `2(1,000)` is implicit multiplication over the grouping
+   * `(1,000)`, not a call, while `vec2(` and `atan2(` (identifiers that end in a
+   * digit) are calls. A `(` after an operator, a comma, or the line start is a
+   * grouping.
+   */
+  precededByCallTarget(parenPos) {
+    const input = this.input;
+    const start = this.lineStartPos;
+    let i = parenPos - 1;
+    while (i >= start && (input.charCodeAt(i) === 32 || input.charCodeAt(i) === 9)) i--;
+    if (i < start) return false;
+    const c = input.charCodeAt(i);
+    const isWord = (ch) => ch >= 48 && ch <= 57 || ch >= 65 && ch <= 90 || ch >= 97 && ch <= 122 || ch === 95;
+    const isAlpha = (ch) => ch >= 65 && ch <= 90 || ch >= 97 && ch <= 122 || ch === 95;
+    if (!isWord(c)) return false;
+    const wordEnd = i + 1;
+    let hasAlpha = false;
+    while (i >= start) {
+      const ch = input.charCodeAt(i);
+      if (!isWord(ch)) break;
+      if (isAlpha(ch)) hasAlpha = true;
+      i--;
+    }
+    if (!hasAlpha) return false;
+    const word = input.slice(i + 1, wordEnd).toLowerCase();
+    const keywordType = this.mergedKeywords.get(word);
+    return keywordType === void 0 || keywordType === "FUNC";
+  }
   /**
    * Reads an operator/punctuation token.
    * Handles two-char operators (==, !=, >=, <=, **) and the special
@@ -1013,7 +1072,7 @@ var _ExpressionLexer = class _ExpressionLexer {
         if (twoCharType) {
           const text2 = input.slice(pos, pos + 2);
           this.pos = pos + 2;
-          return new LexerToken(twoCharType, chunk5LI5EPGJ_cjs.tokenTypeId(twoCharType), text2, text2, pos, 0, this.line, col);
+          return new LexerToken(twoCharType, chunkQFTDTX6K_cjs.tokenTypeId(twoCharType), text2, text2, pos, 0, this.line, col);
         }
       }
       if (c0 === 47 && c1 === 47) {
@@ -1025,19 +1084,19 @@ var _ExpressionLexer = class _ExpressionLexer {
         }
         const text2 = input.slice(pos, commentPos);
         this.pos = commentPos;
-        return new LexerToken("COMMENT", chunk5LI5EPGJ_cjs.tokenTypeId("COMMENT"), text2, text2, pos, 0, this.line, col);
+        return new LexerToken("COMMENT", chunkQFTDTX6K_cjs.tokenTypeId("COMMENT"), text2, text2, pos, 0, this.line, col);
       }
       if (c0 === 60 && c1 === 60) {
         this.pos = pos + 2;
-        return new LexerToken("LSHIFT", chunk5LI5EPGJ_cjs.tokenTypeId("LSHIFT"), "<<", "<<", pos, 0, this.line, col);
+        return new LexerToken("LSHIFT", chunkQFTDTX6K_cjs.tokenTypeId("LSHIFT"), "<<", "<<", pos, 0, this.line, col);
       }
       if (c0 === 62 && c1 === 62) {
         if (input.charCodeAt(pos + 2) === 62) {
           this.pos = pos + 3;
-          return new LexerToken("URSHIFT", chunk5LI5EPGJ_cjs.tokenTypeId("URSHIFT"), ">>>", ">>>", pos, 0, this.line, col);
+          return new LexerToken("URSHIFT", chunkQFTDTX6K_cjs.tokenTypeId("URSHIFT"), ">>>", ">>>", pos, 0, this.line, col);
         }
         this.pos = pos + 2;
-        return new LexerToken("RSHIFT", chunk5LI5EPGJ_cjs.tokenTypeId("RSHIFT"), ">>", ">>", pos, 0, this.line, col);
+        return new LexerToken("RSHIFT", chunkQFTDTX6K_cjs.tokenTypeId("RSHIFT"), ">>", ">>", pos, 0, this.line, col);
       }
       if (this.hasPluginOps) {
         const pluginInner = this.pluginOperators.get(c0);
@@ -1046,15 +1105,22 @@ var _ExpressionLexer = class _ExpressionLexer {
           if (pluginType) {
             const text2 = input.slice(pos, pos + 2);
             this.pos = pos + 2;
-            return new LexerToken(pluginType, chunk5LI5EPGJ_cjs.tokenTypeId(pluginType), text2, text2, pos, 0, this.line, col);
+            return new LexerToken(pluginType, chunkQFTDTX6K_cjs.tokenTypeId(pluginType), text2, text2, pos, 0, this.line, col);
           }
         }
       }
     }
     this.pos = pos + 1;
+    if (c0 === 91) {
+      this.groupingStack.push(true);
+    } else if (c0 === 40) {
+      this.groupingStack.push(this.precededByCallTarget(pos));
+    } else if (c0 === 41 || c0 === 93) {
+      if (this.groupingStack.length > 0) this.groupingStack.pop();
+    }
     const opType = OP_MAP[c0];
     const text = input.charAt(pos);
-    return new LexerToken(opType || "ERROR", chunk5LI5EPGJ_cjs.tokenTypeId(opType || "ERROR"), text, text, pos, 0, this.line, col);
+    return new LexerToken(opType || "ERROR", chunkQFTDTX6K_cjs.tokenTypeId(opType || "ERROR"), text, text, pos, 0, this.line, col);
   }
   // ── String literal tokenizer ──────────────────────────────────────────
   /**
@@ -1090,7 +1156,7 @@ var _ExpressionLexer = class _ExpressionLexer {
         const text = input.slice(start, pos);
         const value = input.slice(start + 1, pos - 1);
         this.pos = pos;
-        return new LexerToken("STRING", chunk5LI5EPGJ_cjs.tokenTypeId("STRING"), value, text, start, lineBreaks, this.line, startCol);
+        return new LexerToken("STRING", chunkQFTDTX6K_cjs.tokenTypeId("STRING"), value, text, start, lineBreaks, this.line, startCol);
       }
       if (c0 === 92 && pos + 1 < len) {
         pos += 2;
@@ -1104,7 +1170,7 @@ var _ExpressionLexer = class _ExpressionLexer {
       pos++;
     }
     this.pos = pos;
-    throw chunk5KMIY374_cjs.ErrorFactory.parsing(
+    throw chunkB4HBEFTB_cjs.ErrorFactory.parsing(
       "UNTERMINATED_STRING",
       `Unterminated string literal: ${input.slice(start, pos)}`,
       { literal: input.slice(start, pos), offset: start }
@@ -1164,6 +1230,36 @@ var _ExpressionLexer = class _ExpressionLexer {
     }
     return pos;
   }
+  /**
+   * The end offset (exclusive) of a `#hex` colour literal starting at `hashPos`,
+   * or -1 if the run there is not one. A colour is `#` followed by EXACTLY 3, 4,
+   * 6 or 8 hex digits (the CSS forms `#rgb`/`#rgba`/`#rrggbb`/`#rrggbbaa`) and
+   * then a boundary, not a longer word or number. This is the one predicate that
+   * carves colours out of the two things `#` otherwise means, a markdown heading
+   * at line start and a comment mid-line, and it is pure character logic so line
+   * classification stays vocabulary-independent. Examples: `#f00`, `#ff0000`,
+   * `#deadbeef` match; `# Heading` (space), `#tag`/`#todo` (non-hex letter),
+   * `#12345` (length 5), `#ff0000zz` (trailing word) do not.
+   */
+  matchHexColourEnd(hashPos, end) {
+    const input = this.input;
+    let p = hashPos + 1;
+    let n = 0;
+    while (p < end) {
+      const c = input.charCodeAt(p);
+      const isHex = c >= 48 && c <= 57 || c >= 65 && c <= 70 || c >= 97 && c <= 102;
+      if (!isHex) break;
+      n++;
+      p++;
+    }
+    if (n !== 3 && n !== 4 && n !== 6 && n !== 8) return -1;
+    if (p < end) {
+      const c = input.charCodeAt(p);
+      const isWord = c >= 48 && c <= 57 || c >= 65 && c <= 90 || c >= 97 && c <= 122 || c === 95;
+      if (isWord) return -1;
+    }
+    return p;
+  }
   classifyFromPositions(start, end) {
     const len = end;
     if (start >= len) {
@@ -1182,6 +1278,13 @@ var _ExpressionLexer = class _ExpressionLexer {
     const c0 = input.charCodeAt(pos);
     let hasInline;
     if (c0 === 35) {
+      if (this.matchHexColourEnd(pos, len) !== -1) {
+        if (hasInline === void 0) {
+          const idx = input.indexOf("s`", pos);
+          hasInline = idx !== -1 && idx < len;
+        }
+        return { type: "expression", skip: false, hasInlineSolve: hasInline };
+      }
       let hashCount = 1;
       while (pos + hashCount < len && input.charCodeAt(pos + hashCount) === 35) {
         hashCount++;
@@ -1367,6 +1470,14 @@ var _ExpressionLexer = class _ExpressionLexer {
     const len = this.len;
     const start = this.pos;
     const startCol = start - this.lineStartPos + 1;
+    if (input.charCodeAt(start) === 35) {
+      const hexEnd = this.matchHexColourEnd(start, len);
+      if (hexEnd !== -1) {
+        const text2 = input.slice(start, hexEnd);
+        this.pos = hexEnd;
+        return new LexerToken("HEX_COLOUR", chunkQFTDTX6K_cjs.tokenTypeId("HEX_COLOUR"), text2, text2, start, 0, this.line, startCol);
+      }
+    }
     let pos = this.pos;
     if (pos + 1 < len && input.charCodeAt(pos + 1) === 47) {
       pos += 2;
@@ -1380,7 +1491,7 @@ var _ExpressionLexer = class _ExpressionLexer {
     }
     const text = input.slice(start, pos);
     this.pos = pos;
-    return new LexerToken("COMMENT", chunk5LI5EPGJ_cjs.tokenTypeId("COMMENT"), text, text, start, 0, this.line, startCol);
+    return new LexerToken("COMMENT", chunkQFTDTX6K_cjs.tokenTypeId("COMMENT"), text, text, start, 0, this.line, startCol);
   }
 };
 _ExpressionLexer.CHAR_CLASS = buildCharClassTable();
@@ -1388,5 +1499,5 @@ var ExpressionLexer = _ExpressionLexer;
 
 exports.ExpressionLexer = ExpressionLexer;
 exports.LexerToken = LexerToken;
-//# sourceMappingURL=chunk-R7YVBHCV.cjs.map
-//# sourceMappingURL=chunk-R7YVBHCV.cjs.map
+//# sourceMappingURL=chunk-YTIYVHL7.cjs.map
+//# sourceMappingURL=chunk-YTIYVHL7.cjs.map