solve-engine 1.1.0 → 1.2.0

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

@@ -1,12 +1,12 @@
 'use strict';
 
-var chunkQFTDTX6K_cjs = require('./chunk-QFTDTX6K.cjs');
+var chunkG2YPPLGX_cjs = require('./chunk-G2YPPLGX.cjs');
 var chunkOUHT5Z36_cjs = require('./chunk-OUHT5Z36.cjs');
 var chunkAQNHHJMJ_cjs = require('./chunk-AQNHHJMJ.cjs');
-var chunkB4HBEFTB_cjs = require('./chunk-B4HBEFTB.cjs');
+var chunkMIGXCBXT_cjs = require('./chunk-MIGXCBXT.cjs');
 
 // src/lexer/ExpressionLexer.ts
-chunkQFTDTX6K_cjs.registerAllTokenTypes();
+chunkG2YPPLGX_cjs.registerAllTokenTypes();
 function buildCharClassTable() {
   const table = new Uint8Array(128);
   for (let i = 48; i <= 57; i++) table[i] = 2 /* DIGIT */;
@@ -85,8 +85,12 @@ var TWO_CHAR_OPS = {
   // <=
   38: { 38: "LOGICAL_AND" },
   // &&
-  124: { 124: "LOGICAL_OR" }
+  124: { 124: "LOGICAL_OR" },
   // ||
+  43: { 61: "PLUS_EQUALS" },
+  // +=  (compound assignment, running totals)
+  45: { 61: "MINUS_EQUALS" }
+  // -=  (neither + nor - had a two-char op before)
   // Note: ** is NOT a single token, the existing moo lexer emits two
   // separate STAR tokens, and the parser consumes them that way.
   // 42: { 42: 'EXPONENT' },  // **, disabled for moo compatibility
@@ -243,7 +247,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, chunkQFTDTX6K_cjs.tokenTypeId(rule.tokenType), value, value, 0, 0, this.line, 1);
+          return new LexerToken(rule.tokenType, chunkG2YPPLGX_cjs.tokenTypeId(rule.tokenType), value, value, 0, 0, this.line, 1);
         }
       }
     }
@@ -273,7 +277,7 @@ var _ExpressionLexer = class _ExpressionLexer {
       for (const [keyword, tokenType] of Object.entries(plugin.keywords)) {
         const lower = keyword.toLowerCase();
         if (this.keywordMap.has(lower)) {
-          throw chunkB4HBEFTB_cjs.ErrorFactory.config(
+          throw chunkMIGXCBXT_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) }
@@ -291,28 +295,28 @@ var _ExpressionLexer = class _ExpressionLexer {
           const second = chars.charCodeAt(1);
           const builtInSecondMap = TWO_CHAR_OPS[first];
           if (builtInSecondMap && builtInSecondMap[second] !== void 0) {
-            throw chunkB4HBEFTB_cjs.ErrorFactory.config(
+            throw chunkMIGXCBXT_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 chunkB4HBEFTB_cjs.ErrorFactory.config(
+            throw chunkMIGXCBXT_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 chunkB4HBEFTB_cjs.ErrorFactory.config(
+            throw chunkMIGXCBXT_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 chunkB4HBEFTB_cjs.ErrorFactory.config(
+            throw chunkMIGXCBXT_cjs.ErrorFactory.config(
               "PLUGIN_OPERATOR_COLLISION",
               `Plugin operator "${chars}" conflicts with built-in comment sequence. Comment sequences cannot be overridden.`,
               { operator: chars, builtinType: "COMMENT" }
@@ -330,7 +334,7 @@ var _ExpressionLexer = class _ExpressionLexer {
     if (plugin.units) {
       for (const unit of plugin.units) {
         if (chunkAQNHHJMJ_cjs.knownUnits.has(unit)) {
-          throw chunkB4HBEFTB_cjs.ErrorFactory.config(
+          throw chunkMIGXCBXT_cjs.ErrorFactory.config(
             "PLUGIN_UNIT_COLLISION",
             `Plugin unit "${unit}" conflicts with a built-in unit. Built-in units cannot be overridden.`,
             { unit }
@@ -551,20 +555,20 @@ var _ExpressionLexer = class _ExpressionLexer {
       switch (cc) {
         case 2 /* DIGIT */:
         case 4 /* DOT */:
-          yield new LexerToken("NUMBER", chunkQFTDTX6K_cjs.tokenTypeId("NUMBER"), this.input, this.input, 0, 0, 1, 1);
+          yield new LexerToken("NUMBER", chunkG2YPPLGX_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", chunkQFTDTX6K_cjs.tokenTypeId("UNIT"), input2, input2, 0, 0, 1, 1);
+            yield new LexerToken("UNIT", chunkG2YPPLGX_cjs.tokenTypeId("UNIT"), input2, input2, 0, 0, 1, 1);
           } else {
             const kwType = this.mergedKeywords.get(identLower);
             if (kwType) {
-              yield new LexerToken(kwType, chunkQFTDTX6K_cjs.tokenTypeId(kwType), input2, input2, 0, 0, 1, 1);
+              yield new LexerToken(kwType, chunkG2YPPLGX_cjs.tokenTypeId(kwType), input2, input2, 0, 0, 1, 1);
             } else {
-              yield new LexerToken("IDENT", chunkQFTDTX6K_cjs.tokenTypeId("IDENT"), input2, input2, 0, 0, 1, 1);
+              yield new LexerToken("IDENT", chunkG2YPPLGX_cjs.tokenTypeId("IDENT"), input2, input2, 0, 0, 1, 1);
             }
           }
           tokenIndex++;
@@ -573,7 +577,7 @@ var _ExpressionLexer = class _ExpressionLexer {
         case 5 /* OPERATOR */: {
           const opType = OP_MAP[c0];
           if (opType) {
-            yield new LexerToken(opType, chunkQFTDTX6K_cjs.tokenTypeId(opType), this.input, this.input, 0, 0, 1, 1);
+            yield new LexerToken(opType, chunkG2YPPLGX_cjs.tokenTypeId(opType), this.input, this.input, 0, 0, 1, 1);
             tokenIndex++;
           }
           break;
@@ -589,64 +593,64 @@ var _ExpressionLexer = class _ExpressionLexer {
           tokenIndex++;
           break;
         case 8 /* DOLLAR */:
-          yield new LexerToken("DOLLAR", chunkQFTDTX6K_cjs.tokenTypeId("DOLLAR"), "$", "$", 0, 0, 1, 1);
+          yield new LexerToken("DOLLAR", chunkG2YPPLGX_cjs.tokenTypeId("DOLLAR"), "$", "$", 0, 0, 1, 1);
           tokenIndex++;
           break;
         case 11 /* BACKTICK */:
-          yield new LexerToken("BACKTICK_OPEN", chunkQFTDTX6K_cjs.tokenTypeId("BACKTICK_OPEN"), "`", "`", 0, 0, 1, 1);
+          yield new LexerToken("BACKTICK_OPEN", chunkG2YPPLGX_cjs.tokenTypeId("BACKTICK_OPEN"), "`", "`", 0, 0, 1, 1);
           tokenIndex++;
           break;
         default: {
           if (isUnicodeSpace(c0)) ; else if (c0 === 215) {
-            yield new LexerToken("STAR", chunkQFTDTX6K_cjs.tokenTypeId("STAR"), "\xD7", "\xD7", 0, 0, 1, 1);
+            yield new LexerToken("STAR", chunkG2YPPLGX_cjs.tokenTypeId("STAR"), "\xD7", "\xD7", 0, 0, 1, 1);
             tokenIndex++;
           } else if (c0 === 247) {
-            yield new LexerToken("SLASH", chunkQFTDTX6K_cjs.tokenTypeId("SLASH"), "\xF7", "\xF7", 0, 0, 1, 1);
+            yield new LexerToken("SLASH", chunkG2YPPLGX_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);
+            yield new LexerToken("PLUS_MINUS", chunkG2YPPLGX_cjs.tokenTypeId("PLUS_MINUS"), "\xB1", "\xB1", 0, 0, 1, 1);
             tokenIndex++;
           } else if (c0 === 8800) {
-            yield new LexerToken("NEQ", chunkQFTDTX6K_cjs.tokenTypeId("NEQ"), "\u2260", "\u2260", 0, 0, 1, 1);
+            yield new LexerToken("NEQ", chunkG2YPPLGX_cjs.tokenTypeId("NEQ"), "\u2260", "\u2260", 0, 0, 1, 1);
             tokenIndex++;
           } else if (c0 === 163) {
-            yield new LexerToken("POUND", chunkQFTDTX6K_cjs.tokenTypeId("POUND"), "\xA3", "\xA3", 0, 0, 1, 1);
+            yield new LexerToken("POUND", chunkG2YPPLGX_cjs.tokenTypeId("POUND"), "\xA3", "\xA3", 0, 0, 1, 1);
             tokenIndex++;
           } else if (c0 === 8364) {
-            yield new LexerToken("EURO", chunkQFTDTX6K_cjs.tokenTypeId("EURO"), "\u20AC", "\u20AC", 0, 0, 1, 1);
+            yield new LexerToken("EURO", chunkG2YPPLGX_cjs.tokenTypeId("EURO"), "\u20AC", "\u20AC", 0, 0, 1, 1);
             tokenIndex++;
           } else if (c0 === 165) {
-            yield new LexerToken("YEN", chunkQFTDTX6K_cjs.tokenTypeId("YEN"), "\xA5", "\xA5", 0, 0, 1, 1);
+            yield new LexerToken("YEN", chunkG2YPPLGX_cjs.tokenTypeId("YEN"), "\xA5", "\xA5", 0, 0, 1, 1);
             tokenIndex++;
           } else if (c0 === 8381) {
-            yield new LexerToken("RUBLE", chunkQFTDTX6K_cjs.tokenTypeId("RUBLE"), "\u20BD", "\u20BD", 0, 0, 1, 1);
+            yield new LexerToken("RUBLE", chunkG2YPPLGX_cjs.tokenTypeId("RUBLE"), "\u20BD", "\u20BD", 0, 0, 1, 1);
             tokenIndex++;
           } else if (c0 === 8361) {
-            yield new LexerToken("WON", chunkQFTDTX6K_cjs.tokenTypeId("WON"), "\u20A9", "\u20A9", 0, 0, 1, 1);
+            yield new LexerToken("WON", chunkG2YPPLGX_cjs.tokenTypeId("WON"), "\u20A9", "\u20A9", 0, 0, 1, 1);
             tokenIndex++;
           } else if (c0 === 8377) {
-            yield new LexerToken("CURRENCY_SYMBOL", chunkQFTDTX6K_cjs.tokenTypeId("CURRENCY_SYMBOL"), "\u20B9", "\u20B9", 0, 0, 1, 1);
+            yield new LexerToken("CURRENCY_SYMBOL", chunkG2YPPLGX_cjs.tokenTypeId("CURRENCY_SYMBOL"), "\u20B9", "\u20B9", 0, 0, 1, 1);
             tokenIndex++;
           } else if (c0 === 8378) {
-            yield new LexerToken("CURRENCY_SYMBOL", chunkQFTDTX6K_cjs.tokenTypeId("CURRENCY_SYMBOL"), "\u20BA", "\u20BA", 0, 0, 1, 1);
+            yield new LexerToken("CURRENCY_SYMBOL", chunkG2YPPLGX_cjs.tokenTypeId("CURRENCY_SYMBOL"), "\u20BA", "\u20BA", 0, 0, 1, 1);
             tokenIndex++;
           } else if (c0 === 8372) {
-            yield new LexerToken("CURRENCY_SYMBOL", chunkQFTDTX6K_cjs.tokenTypeId("CURRENCY_SYMBOL"), "\u20B4", "\u20B4", 0, 0, 1, 1);
+            yield new LexerToken("CURRENCY_SYMBOL", chunkG2YPPLGX_cjs.tokenTypeId("CURRENCY_SYMBOL"), "\u20B4", "\u20B4", 0, 0, 1, 1);
             tokenIndex++;
           } else if (c0 === 8362) {
-            yield new LexerToken("CURRENCY_SYMBOL", chunkQFTDTX6K_cjs.tokenTypeId("CURRENCY_SYMBOL"), "\u20AA", "\u20AA", 0, 0, 1, 1);
+            yield new LexerToken("CURRENCY_SYMBOL", chunkG2YPPLGX_cjs.tokenTypeId("CURRENCY_SYMBOL"), "\u20AA", "\u20AA", 0, 0, 1, 1);
             tokenIndex++;
           } else if (c0 === 8363) {
-            yield new LexerToken("CURRENCY_SYMBOL", chunkQFTDTX6K_cjs.tokenTypeId("CURRENCY_SYMBOL"), "\u20AB", "\u20AB", 0, 0, 1, 1);
+            yield new LexerToken("CURRENCY_SYMBOL", chunkG2YPPLGX_cjs.tokenTypeId("CURRENCY_SYMBOL"), "\u20AB", "\u20AB", 0, 0, 1, 1);
             tokenIndex++;
           } else if (c0 === 8358) {
-            yield new LexerToken("CURRENCY_SYMBOL", chunkQFTDTX6K_cjs.tokenTypeId("CURRENCY_SYMBOL"), "\u20A6", "\u20A6", 0, 0, 1, 1);
+            yield new LexerToken("CURRENCY_SYMBOL", chunkG2YPPLGX_cjs.tokenTypeId("CURRENCY_SYMBOL"), "\u20A6", "\u20A6", 0, 0, 1, 1);
             tokenIndex++;
           } else if (c0 === 8369) {
-            yield new LexerToken("CURRENCY_SYMBOL", chunkQFTDTX6K_cjs.tokenTypeId("CURRENCY_SYMBOL"), "\u20B1", "\u20B1", 0, 0, 1, 1);
+            yield new LexerToken("CURRENCY_SYMBOL", chunkG2YPPLGX_cjs.tokenTypeId("CURRENCY_SYMBOL"), "\u20B1", "\u20B1", 0, 0, 1, 1);
             tokenIndex++;
           } else if (c0 >= 128) {
-            yield new LexerToken("IDENT", chunkQFTDTX6K_cjs.tokenTypeId("IDENT"), this.input, this.input, 0, 0, 1, 1);
+            yield new LexerToken("IDENT", chunkG2YPPLGX_cjs.tokenTypeId("IDENT"), this.input, this.input, 0, 0, 1, 1);
             tokenIndex++;
           }
           break;
@@ -704,12 +708,12 @@ var _ExpressionLexer = class _ExpressionLexer {
               yield this.tokenizeNumber();
             } else {
               const col = this.pos - this.lineStartPos + 1;
-              yield new LexerToken("DOT", chunkQFTDTX6K_cjs.tokenTypeId("DOT"), ".", ".", this.pos, 0, this.line, col);
+              yield new LexerToken("DOT", chunkG2YPPLGX_cjs.tokenTypeId("DOT"), ".", ".", this.pos, 0, this.line, col);
               this.pos++;
             }
           } else {
             const col = this.pos - this.lineStartPos + 1;
-            yield new LexerToken("DOT", chunkQFTDTX6K_cjs.tokenTypeId("DOT"), ".", ".", this.pos, 0, this.line, col);
+            yield new LexerToken("DOT", chunkG2YPPLGX_cjs.tokenTypeId("DOT"), ".", ".", this.pos, 0, this.line, col);
             this.pos++;
           }
           tokenIndex++;
@@ -732,7 +736,7 @@ var _ExpressionLexer = class _ExpressionLexer {
         // ── Dollar sign $ ─────────────────────────────────────────────
         case 8 /* DOLLAR */: {
           const col = this.pos - this.lineStartPos + 1;
-          yield new LexerToken("DOLLAR", chunkQFTDTX6K_cjs.tokenTypeId("DOLLAR"), "$", "$", this.pos, 0, this.line, col);
+          yield new LexerToken("DOLLAR", chunkG2YPPLGX_cjs.tokenTypeId("DOLLAR"), "$", "$", this.pos, 0, this.line, col);
           this.pos++;
           tokenIndex++;
           break;
@@ -740,7 +744,7 @@ var _ExpressionLexer = class _ExpressionLexer {
         // ── Backtick ` ───────────────────────────────────────────────
         case 11 /* BACKTICK */: {
           const col = this.pos - this.lineStartPos + 1;
-          yield new LexerToken("BACKTICK_OPEN", chunkQFTDTX6K_cjs.tokenTypeId("BACKTICK_OPEN"), "`", "`", this.pos, 0, this.line, col);
+          yield new LexerToken("BACKTICK_OPEN", chunkG2YPPLGX_cjs.tokenTypeId("BACKTICK_OPEN"), "`", "`", this.pos, 0, this.line, col);
           this.pos++;
           if (openSpan) {
             const span = openSpan;
@@ -767,67 +771,67 @@ var _ExpressionLexer = class _ExpressionLexer {
               this.lineStartPos = this.pos;
             }
           } else if (c0 === 215) {
-            yield new LexerToken("STAR", chunkQFTDTX6K_cjs.tokenTypeId("STAR"), "\xD7", "\xD7", this.pos, 0, this.line, col);
+            yield new LexerToken("STAR", chunkG2YPPLGX_cjs.tokenTypeId("STAR"), "\xD7", "\xD7", this.pos, 0, this.line, col);
             this.pos++;
             tokenIndex++;
           } else if (c0 === 247) {
-            yield new LexerToken("SLASH", chunkQFTDTX6K_cjs.tokenTypeId("SLASH"), "\xF7", "\xF7", this.pos, 0, this.line, col);
+            yield new LexerToken("SLASH", chunkG2YPPLGX_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);
+            yield new LexerToken("PLUS_MINUS", chunkG2YPPLGX_cjs.tokenTypeId("PLUS_MINUS"), "\xB1", "\xB1", this.pos, 0, this.line, col);
             this.pos++;
             tokenIndex++;
           } else if (c0 === 8800) {
-            yield new LexerToken("NEQ", chunkQFTDTX6K_cjs.tokenTypeId("NEQ"), "\u2260", "\u2260", this.pos, 0, this.line, col);
+            yield new LexerToken("NEQ", chunkG2YPPLGX_cjs.tokenTypeId("NEQ"), "\u2260", "\u2260", this.pos, 0, this.line, col);
             this.pos++;
             tokenIndex++;
           } else if (c0 === 163) {
-            yield new LexerToken("POUND", chunkQFTDTX6K_cjs.tokenTypeId("POUND"), "\xA3", "\xA3", this.pos, 0, this.line, col);
+            yield new LexerToken("POUND", chunkG2YPPLGX_cjs.tokenTypeId("POUND"), "\xA3", "\xA3", this.pos, 0, this.line, col);
             this.pos++;
             tokenIndex++;
           } else if (c0 === 8364) {
-            yield new LexerToken("EURO", chunkQFTDTX6K_cjs.tokenTypeId("EURO"), "\u20AC", "\u20AC", this.pos, 0, this.line, col);
+            yield new LexerToken("EURO", chunkG2YPPLGX_cjs.tokenTypeId("EURO"), "\u20AC", "\u20AC", this.pos, 0, this.line, col);
             this.pos++;
             tokenIndex++;
           } else if (c0 === 165) {
-            yield new LexerToken("YEN", chunkQFTDTX6K_cjs.tokenTypeId("YEN"), "\xA5", "\xA5", this.pos, 0, this.line, col);
+            yield new LexerToken("YEN", chunkG2YPPLGX_cjs.tokenTypeId("YEN"), "\xA5", "\xA5", this.pos, 0, this.line, col);
             this.pos++;
             tokenIndex++;
           } else if (c0 === 8381) {
-            yield new LexerToken("RUBLE", chunkQFTDTX6K_cjs.tokenTypeId("RUBLE"), "\u20BD", "\u20BD", this.pos, 0, this.line, col);
+            yield new LexerToken("RUBLE", chunkG2YPPLGX_cjs.tokenTypeId("RUBLE"), "\u20BD", "\u20BD", this.pos, 0, this.line, col);
             this.pos++;
             tokenIndex++;
           } else if (c0 === 8361) {
-            yield new LexerToken("WON", chunkQFTDTX6K_cjs.tokenTypeId("WON"), "\u20A9", "\u20A9", this.pos, 0, this.line, col);
+            yield new LexerToken("WON", chunkG2YPPLGX_cjs.tokenTypeId("WON"), "\u20A9", "\u20A9", this.pos, 0, this.line, col);
             this.pos++;
             tokenIndex++;
           } else if (c0 === 8377) {
-            yield new LexerToken("CURRENCY_SYMBOL", chunkQFTDTX6K_cjs.tokenTypeId("CURRENCY_SYMBOL"), "\u20B9", "\u20B9", this.pos, 0, this.line, col);
+            yield new LexerToken("CURRENCY_SYMBOL", chunkG2YPPLGX_cjs.tokenTypeId("CURRENCY_SYMBOL"), "\u20B9", "\u20B9", this.pos, 0, this.line, col);
             this.pos++;
             tokenIndex++;
           } else if (c0 === 8378) {
-            yield new LexerToken("CURRENCY_SYMBOL", chunkQFTDTX6K_cjs.tokenTypeId("CURRENCY_SYMBOL"), "\u20BA", "\u20BA", this.pos, 0, this.line, col);
+            yield new LexerToken("CURRENCY_SYMBOL", chunkG2YPPLGX_cjs.tokenTypeId("CURRENCY_SYMBOL"), "\u20BA", "\u20BA", this.pos, 0, this.line, col);
             this.pos++;
             tokenIndex++;
           } else if (c0 === 8372) {
-            yield new LexerToken("CURRENCY_SYMBOL", chunkQFTDTX6K_cjs.tokenTypeId("CURRENCY_SYMBOL"), "\u20B4", "\u20B4", this.pos, 0, this.line, col);
+            yield new LexerToken("CURRENCY_SYMBOL", chunkG2YPPLGX_cjs.tokenTypeId("CURRENCY_SYMBOL"), "\u20B4", "\u20B4", this.pos, 0, this.line, col);
             this.pos++;
             tokenIndex++;
           } else if (c0 === 8362) {
-            yield new LexerToken("CURRENCY_SYMBOL", chunkQFTDTX6K_cjs.tokenTypeId("CURRENCY_SYMBOL"), "\u20AA", "\u20AA", this.pos, 0, this.line, col);
+            yield new LexerToken("CURRENCY_SYMBOL", chunkG2YPPLGX_cjs.tokenTypeId("CURRENCY_SYMBOL"), "\u20AA", "\u20AA", this.pos, 0, this.line, col);
             this.pos++;
             tokenIndex++;
           } else if (c0 === 8363) {
-            yield new LexerToken("CURRENCY_SYMBOL", chunkQFTDTX6K_cjs.tokenTypeId("CURRENCY_SYMBOL"), "\u20AB", "\u20AB", this.pos, 0, this.line, col);
+            yield new LexerToken("CURRENCY_SYMBOL", chunkG2YPPLGX_cjs.tokenTypeId("CURRENCY_SYMBOL"), "\u20AB", "\u20AB", this.pos, 0, this.line, col);
             this.pos++;
             tokenIndex++;
           } else if (c0 === 8358) {
-            yield new LexerToken("CURRENCY_SYMBOL", chunkQFTDTX6K_cjs.tokenTypeId("CURRENCY_SYMBOL"), "\u20A6", "\u20A6", this.pos, 0, this.line, col);
+            yield new LexerToken("CURRENCY_SYMBOL", chunkG2YPPLGX_cjs.tokenTypeId("CURRENCY_SYMBOL"), "\u20A6", "\u20A6", this.pos, 0, this.line, col);
             this.pos++;
             tokenIndex++;
           } else if (c0 === 8369) {
-            yield new LexerToken("CURRENCY_SYMBOL", chunkQFTDTX6K_cjs.tokenTypeId("CURRENCY_SYMBOL"), "\u20B1", "\u20B1", this.pos, 0, this.line, col);
+            yield new LexerToken("CURRENCY_SYMBOL", chunkG2YPPLGX_cjs.tokenTypeId("CURRENCY_SYMBOL"), "\u20B1", "\u20B1", this.pos, 0, this.line, col);
             this.pos++;
             tokenIndex++;
           } else if (c0 >= 128) {
@@ -868,7 +872,7 @@ var _ExpressionLexer = class _ExpressionLexer {
         }
         const text2 = input.slice(start, pos);
         this.pos = pos;
-        return new LexerToken("NUMBER", chunkQFTDTX6K_cjs.tokenTypeId("NUMBER"), text2, text2, start, 0, this.line, startCol);
+        return new LexerToken("NUMBER", chunkG2YPPLGX_cjs.tokenTypeId("NUMBER"), text2, text2, start, 0, this.line, startCol);
       }
       if (next === 98 || next === 66) {
         pos += 2;
@@ -877,7 +881,7 @@ var _ExpressionLexer = class _ExpressionLexer {
         }
         const text2 = input.slice(start, pos);
         this.pos = pos;
-        return new LexerToken("NUMBER", chunkQFTDTX6K_cjs.tokenTypeId("NUMBER"), text2, text2, start, 0, this.line, startCol);
+        return new LexerToken("NUMBER", chunkG2YPPLGX_cjs.tokenTypeId("NUMBER"), text2, text2, start, 0, this.line, startCol);
       }
       if (next === 111 || next === 79) {
         pos += 2;
@@ -886,7 +890,7 @@ var _ExpressionLexer = class _ExpressionLexer {
         }
         const text2 = input.slice(start, pos);
         this.pos = pos;
-        return new LexerToken("NUMBER", chunkQFTDTX6K_cjs.tokenTypeId("NUMBER"), text2, text2, start, 0, this.line, startCol);
+        return new LexerToken("NUMBER", chunkG2YPPLGX_cjs.tokenTypeId("NUMBER"), text2, text2, start, 0, this.line, startCol);
       }
     }
     let hasIntPart = false;
@@ -947,12 +951,12 @@ var _ExpressionLexer = class _ExpressionLexer {
         pos++;
         const text2 = input.slice(start, pos);
         this.pos = pos;
-        return new LexerToken("BIGINT", chunkQFTDTX6K_cjs.tokenTypeId("BIGINT"), text2, text2, start, 0, this.line, startCol);
+        return new LexerToken("BIGINT", chunkG2YPPLGX_cjs.tokenTypeId("BIGINT"), text2, text2, start, 0, this.line, startCol);
       }
     }
     const text = input.slice(start, pos);
     this.pos = pos;
-    return new LexerToken("NUMBER", chunkQFTDTX6K_cjs.tokenTypeId("NUMBER"), text, text, start, 0, this.line, startCol);
+    return new LexerToken("NUMBER", chunkG2YPPLGX_cjs.tokenTypeId("NUMBER"), text, text, start, 0, this.line, startCol);
   }
   // ── Inline identifier / keyword tokenizer ──────────────────────────────
   /**
@@ -984,22 +988,22 @@ var _ExpressionLexer = class _ExpressionLexer {
       pos++;
       this.pos = pos;
       const fullText = input.slice(start, pos);
-      return new LexerToken("INLINE_SOLVE_START", chunkQFTDTX6K_cjs.tokenTypeId("INLINE_SOLVE_START"), fullText, fullText, start, 0, this.line, startCol);
+      return new LexerToken("INLINE_SOLVE_START", chunkG2YPPLGX_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", chunkQFTDTX6K_cjs.tokenTypeId("UNIT"), identText, identText, start, 0, this.line, startCol);
+        return new LexerToken("UNIT", chunkG2YPPLGX_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, chunkQFTDTX6K_cjs.tokenTypeId(localeKwType), identText, identText, start, 0, this.line, startCol);
+      return new LexerToken(localeKwType, chunkG2YPPLGX_cjs.tokenTypeId(localeKwType), identText, identText, start, 0, this.line, startCol);
     }
     this.pos = pos;
-    return new LexerToken("IDENT", chunkQFTDTX6K_cjs.tokenTypeId("IDENT"), identText, identText, start, 0, this.line, startCol);
+    return new LexerToken("IDENT", chunkG2YPPLGX_cjs.tokenTypeId("IDENT"), identText, identText, start, 0, this.line, startCol);
   }
   /**
    * Peek past in-expression whitespace (space, tab) from `pos` to check
@@ -1072,7 +1076,7 @@ var _ExpressionLexer = class _ExpressionLexer {
         if (twoCharType) {
           const text2 = input.slice(pos, pos + 2);
           this.pos = pos + 2;
-          return new LexerToken(twoCharType, chunkQFTDTX6K_cjs.tokenTypeId(twoCharType), text2, text2, pos, 0, this.line, col);
+          return new LexerToken(twoCharType, chunkG2YPPLGX_cjs.tokenTypeId(twoCharType), text2, text2, pos, 0, this.line, col);
         }
       }
       if (c0 === 47 && c1 === 47) {
@@ -1084,19 +1088,19 @@ var _ExpressionLexer = class _ExpressionLexer {
         }
         const text2 = input.slice(pos, commentPos);
         this.pos = commentPos;
-        return new LexerToken("COMMENT", chunkQFTDTX6K_cjs.tokenTypeId("COMMENT"), text2, text2, pos, 0, this.line, col);
+        return new LexerToken("COMMENT", chunkG2YPPLGX_cjs.tokenTypeId("COMMENT"), text2, text2, pos, 0, this.line, col);
       }
       if (c0 === 60 && c1 === 60) {
         this.pos = pos + 2;
-        return new LexerToken("LSHIFT", chunkQFTDTX6K_cjs.tokenTypeId("LSHIFT"), "<<", "<<", pos, 0, this.line, col);
+        return new LexerToken("LSHIFT", chunkG2YPPLGX_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", chunkQFTDTX6K_cjs.tokenTypeId("URSHIFT"), ">>>", ">>>", pos, 0, this.line, col);
+          return new LexerToken("URSHIFT", chunkG2YPPLGX_cjs.tokenTypeId("URSHIFT"), ">>>", ">>>", pos, 0, this.line, col);
         }
         this.pos = pos + 2;
-        return new LexerToken("RSHIFT", chunkQFTDTX6K_cjs.tokenTypeId("RSHIFT"), ">>", ">>", pos, 0, this.line, col);
+        return new LexerToken("RSHIFT", chunkG2YPPLGX_cjs.tokenTypeId("RSHIFT"), ">>", ">>", pos, 0, this.line, col);
       }
       if (this.hasPluginOps) {
         const pluginInner = this.pluginOperators.get(c0);
@@ -1105,7 +1109,7 @@ var _ExpressionLexer = class _ExpressionLexer {
           if (pluginType) {
             const text2 = input.slice(pos, pos + 2);
             this.pos = pos + 2;
-            return new LexerToken(pluginType, chunkQFTDTX6K_cjs.tokenTypeId(pluginType), text2, text2, pos, 0, this.line, col);
+            return new LexerToken(pluginType, chunkG2YPPLGX_cjs.tokenTypeId(pluginType), text2, text2, pos, 0, this.line, col);
           }
         }
       }
@@ -1120,7 +1124,7 @@ var _ExpressionLexer = class _ExpressionLexer {
     }
     const opType = OP_MAP[c0];
     const text = input.charAt(pos);
-    return new LexerToken(opType || "ERROR", chunkQFTDTX6K_cjs.tokenTypeId(opType || "ERROR"), text, text, pos, 0, this.line, col);
+    return new LexerToken(opType || "ERROR", chunkG2YPPLGX_cjs.tokenTypeId(opType || "ERROR"), text, text, pos, 0, this.line, col);
   }
   // ── String literal tokenizer ──────────────────────────────────────────
   /**
@@ -1156,7 +1160,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", chunkQFTDTX6K_cjs.tokenTypeId("STRING"), value, text, start, lineBreaks, this.line, startCol);
+        return new LexerToken("STRING", chunkG2YPPLGX_cjs.tokenTypeId("STRING"), value, text, start, lineBreaks, this.line, startCol);
       }
       if (c0 === 92 && pos + 1 < len) {
         pos += 2;
@@ -1170,7 +1174,7 @@ var _ExpressionLexer = class _ExpressionLexer {
       pos++;
     }
     this.pos = pos;
-    throw chunkB4HBEFTB_cjs.ErrorFactory.parsing(
+    throw chunkMIGXCBXT_cjs.ErrorFactory.parsing(
       "UNTERMINATED_STRING",
       `Unterminated string literal: ${input.slice(start, pos)}`,
       { literal: input.slice(start, pos), offset: start }
@@ -1397,6 +1401,19 @@ var _ExpressionLexer = class _ExpressionLexer {
       const idx = input.indexOf("s`", pos);
       hasInline = idx !== -1 && idx < len;
     }
+    if (!hasInline) {
+      let onlySkippable = true;
+      for (let i = pos; i < len; i++) {
+        const code = input.charCodeAt(i);
+        if (code >= 128 || _ExpressionLexer.CHAR_CLASS[code] > 1 /* WHITESPACE */) {
+          onlySkippable = false;
+          break;
+        }
+      }
+      if (onlySkippable) {
+        return { type: "empty", skip: true, hasInlineSolve: false };
+      }
+    }
     return { type: "expression", skip: false, hasInlineSolve: hasInline };
   }
   /**
@@ -1475,7 +1492,21 @@ var _ExpressionLexer = class _ExpressionLexer {
       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);
+        return new LexerToken("HEX_COLOUR", chunkG2YPPLGX_cjs.tokenTypeId("HEX_COLOUR"), text2, text2, start, 0, this.line, startCol);
+      }
+      const first = input.charCodeAt(start + 1);
+      const isLetter = first >= 65 && first <= 90 || first >= 97 && first <= 122;
+      if (isLetter) {
+        let tagEnd = start + 2;
+        while (tagEnd < len) {
+          const c = input.charCodeAt(tagEnd);
+          const isTagChar = c >= 48 && c <= 57 || c >= 65 && c <= 90 || c >= 97 && c <= 122 || c === 95 || c === 45;
+          if (!isTagChar) break;
+          tagEnd++;
+        }
+        const name = input.slice(start + 1, tagEnd);
+        this.pos = tagEnd;
+        return new LexerToken("TAG", chunkG2YPPLGX_cjs.tokenTypeId("TAG"), name, name, start, 0, this.line, startCol);
       }
     }
     let pos = this.pos;
@@ -1491,7 +1522,7 @@ var _ExpressionLexer = class _ExpressionLexer {
     }
     const text = input.slice(start, pos);
     this.pos = pos;
-    return new LexerToken("COMMENT", chunkQFTDTX6K_cjs.tokenTypeId("COMMENT"), text, text, start, 0, this.line, startCol);
+    return new LexerToken("COMMENT", chunkG2YPPLGX_cjs.tokenTypeId("COMMENT"), text, text, start, 0, this.line, startCol);
   }
 };
 _ExpressionLexer.CHAR_CLASS = buildCharClassTable();
@@ -1499,5 +1530,5 @@ var ExpressionLexer = _ExpressionLexer;
 
 exports.ExpressionLexer = ExpressionLexer;
 exports.LexerToken = LexerToken;
-//# sourceMappingURL=chunk-YTIYVHL7.cjs.map
-//# sourceMappingURL=chunk-YTIYVHL7.cjs.map
+//# sourceMappingURL=chunk-YJHY7CMN.cjs.map
+//# sourceMappingURL=chunk-YJHY7CMN.cjs.map