solve-engine 1.0.0-beta.7 → 1.0.0

package/dist/{chunk-CSG5XVNJ.cjs → chunk-3AFRJYP4.cjs}

@@ -1,21 +1,21 @@
 'use strict';
 
-var chunkNZFKROS7_cjs = require('./chunk-NZFKROS7.cjs');
-var chunkAHCLWAM5_cjs = require('./chunk-AHCLWAM5.cjs');
-var chunkN5YFR4UP_cjs = require('./chunk-N5YFR4UP.cjs');
-var chunk4AVD7NZW_cjs = require('./chunk-4AVD7NZW.cjs');
+var chunkPA4VC73I_cjs = require('./chunk-PA4VC73I.cjs');
+var chunkBHTNFEGZ_cjs = require('./chunk-BHTNFEGZ.cjs');
+var chunkADBA3XBE_cjs = require('./chunk-ADBA3XBE.cjs');
+var chunk4B2CNWQU_cjs = require('./chunk-4B2CNWQU.cjs');
 var chunkZ2XP767T_cjs = require('./chunk-Z2XP767T.cjs');
-var chunkBXKJLM5R_cjs = require('./chunk-BXKJLM5R.cjs');
+var chunk6WFMPTGB_cjs = require('./chunk-6WFMPTGB.cjs');
 var chunkVEKIWQ3F_cjs = require('./chunk-VEKIWQ3F.cjs');
-var chunk4CVLFLOB_cjs = require('./chunk-4CVLFLOB.cjs');
-var chunkOC6LTXYS_cjs = require('./chunk-OC6LTXYS.cjs');
-var chunkNJTXJ5AG_cjs = require('./chunk-NJTXJ5AG.cjs');
-var chunkM4F66R4O_cjs = require('./chunk-M4F66R4O.cjs');
-var chunkR24DI24X_cjs = require('./chunk-R24DI24X.cjs');
+var chunkUM6BVY2S_cjs = require('./chunk-UM6BVY2S.cjs');
+var chunkJMXUNXQS_cjs = require('./chunk-JMXUNXQS.cjs');
+var chunkPFUESQTW_cjs = require('./chunk-PFUESQTW.cjs');
+var chunkYWQ6V4ZN_cjs = require('./chunk-YWQ6V4ZN.cjs');
+var chunk5LI5EPGJ_cjs = require('./chunk-5LI5EPGJ.cjs');
 var chunkOUHT5Z36_cjs = require('./chunk-OUHT5Z36.cjs');
-var chunkCLVQBF5C_cjs = require('./chunk-CLVQBF5C.cjs');
-var chunkMBNQVDVC_cjs = require('./chunk-MBNQVDVC.cjs');
-var chunkM4N5GA5Z_cjs = require('./chunk-M4N5GA5Z.cjs');
+var chunkAQNHHJMJ_cjs = require('./chunk-AQNHHJMJ.cjs');
+var chunkAMOJYLG2_cjs = require('./chunk-AMOJYLG2.cjs');
+var chunk5KMIY374_cjs = require('./chunk-5KMIY374.cjs');
 
 // src/packages/arithmetic/parselets/NumberParselet.ts
 var CHAINED_DOT_THOUSANDS_GROUPS = /^\d{1,3}(\.\d{3}){2,}$/;
@@ -29,17 +29,17 @@ var NumberParselet = class {
     if (raw.startsWith("0x") || raw.startsWith("0X")) {
       v = parseInt(raw, 16);
       if (Number.isNaN(v)) {
-        throw chunkM4N5GA5Z_cjs.ErrorFactory.parsing("INVALID_NUMBER_LITERAL", `Invalid hex literal: "${raw}"`, { raw });
+        throw chunk5KMIY374_cjs.ErrorFactory.parsing("INVALID_NUMBER_LITERAL", `Invalid hex literal: "${raw}"`, { raw });
       }
     } else if (raw.startsWith("0b") || raw.startsWith("0B")) {
       v = parseInt(raw.slice(2), 2);
       if (Number.isNaN(v)) {
-        throw chunkM4N5GA5Z_cjs.ErrorFactory.parsing("INVALID_NUMBER_LITERAL", `Invalid binary literal: "${raw}"`, { raw });
+        throw chunk5KMIY374_cjs.ErrorFactory.parsing("INVALID_NUMBER_LITERAL", `Invalid binary literal: "${raw}"`, { raw });
       }
     } else if (raw.startsWith("0o") || raw.startsWith("0O")) {
       v = parseInt(raw.slice(2), 8);
       if (Number.isNaN(v)) {
-        throw chunkM4N5GA5Z_cjs.ErrorFactory.parsing("INVALID_NUMBER_LITERAL", `Invalid octal literal: "${raw}"`, { raw });
+        throw chunk5KMIY374_cjs.ErrorFactory.parsing("INVALID_NUMBER_LITERAL", `Invalid octal literal: "${raw}"`, { raw });
       }
     } else if (CHAINED_DOT_THOUSANDS_GROUPS.test(raw)) {
       v = parseFloat(raw.split(".").join(""));
@@ -75,13 +75,14 @@ var PrefixOpParselet = class {
 
 // src/packages/arithmetic/parselets/BinaryOpParselet.ts
 var BinaryOpParselet = class {
-  constructor(bp, opcode) {
+  constructor(bp, opcode, rightAssociative = false) {
     this.opcode = opcode;
     this.category = "Arithmetic";
     this.bindingPower = bp;
+    this.rightBindingPower = rightAssociative ? bp - 1 : bp;
   }
   parse(parser, left, token, builder) {
-    parser.parseExpression(this.bindingPower, builder);
+    parser.parseExpression(this.rightBindingPower, builder);
     builder.emitOpcode(this.opcode);
   }
 };
@@ -164,12 +165,13 @@ function largeNumberSuffixNormalizerRule(priority = 65) {
       if (!suffixToken) return null;
       if (suffixToken.type !== "IDENT" && suffixToken.type !== "UNIT") return null;
       const adjacent = numberToken.offset + numberToken.text.length === suffixToken.offset;
-      const magnitude = adjacent ? SUFFIX_MAGNITUDE[suffixToken.value] ?? WORD_MAGNITUDE[suffixToken.value.toLowerCase()] : WORD_MAGNITUDE[suffixToken.value.toLowerCase()];
+      const wordMagnitude = suffixToken.type === "UNIT" ? void 0 : WORD_MAGNITUDE[suffixToken.value.toLowerCase()];
+      const magnitude = adjacent ? SUFFIX_MAGNITUDE[suffixToken.value] ?? wordMagnitude : wordMagnitude;
       if (magnitude === void 0) return null;
       const scaled = scaleDecimalString(numberToken.text, magnitude);
       return {
         consumed: 2,
-        replacement: [chunkAHCLWAM5_cjs.createFusedToken("NUMBER", scaled, tokens.slice(pos, pos + 2))],
+        replacement: [chunkBHTNFEGZ_cjs.createFusedToken("NUMBER", scaled, tokens.slice(pos, pos + 2))],
         ruleName: "arithmetic:large-number-suffix"
       };
     }
@@ -192,25 +194,35 @@ var ARITHMETIC_PACKAGE = {
     { tokenType: "BIT_NOT", parselet: new PrefixOpParselet(36 /* BIT_NOT */) }
   ],
   infixParselets: [
-    { tokenType: "PLUS", parselet: new BinaryOpParselet(chunkNZFKROS7_cjs.BindingPower.Sum, 20 /* ADD */) },
+    { tokenType: "PLUS", parselet: new BinaryOpParselet(chunkPA4VC73I_cjs.BindingPower.Sum, 20 /* ADD */) },
     // The word "and", which adds exactly like "+" but at a looser binding
     // power so a phrase parselet can use it as a list separator. See
     // Token.ts's AND_CONJ comment for why it is not simply mapped to PLUS.
-    { tokenType: "AND_CONJ", parselet: new BinaryOpParselet(chunkNZFKROS7_cjs.BindingPower.Conjunction, 20 /* ADD */) },
-    { tokenType: "MINUS", parselet: new BinaryOpParselet(chunkNZFKROS7_cjs.BindingPower.Sum, 21 /* SUB */) },
-    { tokenType: "STAR", parselet: new BinaryOpParselet(chunkNZFKROS7_cjs.BindingPower.Product, 22 /* MUL */) },
-    { tokenType: "SLASH", parselet: new BinaryOpParselet(chunkNZFKROS7_cjs.BindingPower.Product, 23 /* DIV */) },
-    { tokenType: "MOD", parselet: new BinaryOpParselet(chunkNZFKROS7_cjs.BindingPower.Product, 24 /* MOD */) },
-    { tokenType: "CARET", parselet: new BinaryOpParselet(chunkNZFKROS7_cjs.BindingPower.Exponent, 25 /* EXP */) },
-    { tokenType: "TIMES_BY", parselet: new BinaryOpParselet(chunkNZFKROS7_cjs.BindingPower.Product, 22 /* MUL */) },
-    { tokenType: "MULTIPLY_BY", parselet: new BinaryOpParselet(chunkNZFKROS7_cjs.BindingPower.Product, 22 /* MUL */) },
-    { tokenType: "DIVIDE_BY", parselet: new BinaryOpParselet(chunkNZFKROS7_cjs.BindingPower.Product, 23 /* DIV */) },
-    { tokenType: "LSHIFT", parselet: new BinaryOpParselet(chunkNZFKROS7_cjs.BindingPower.Sum, 30 /* LSHIFT */) },
-    { tokenType: "RSHIFT", parselet: new BinaryOpParselet(chunkNZFKROS7_cjs.BindingPower.Sum, 31 /* RSHIFT */) },
-    { tokenType: "URSHIFT", parselet: new BinaryOpParselet(chunkNZFKROS7_cjs.BindingPower.Sum, 32 /* URSHIFT */) },
-    { tokenType: "BIT_AND", parselet: new BinaryOpParselet(chunkNZFKROS7_cjs.BindingPower.Product, 33 /* BIT_AND */) },
-    { tokenType: "BIT_OR", parselet: new BinaryOpParselet(chunkNZFKROS7_cjs.BindingPower.Sum, 34 /* BIT_OR */) },
-    { tokenType: "BIT_XOR", parselet: new BinaryOpParselet(chunkNZFKROS7_cjs.BindingPower.BitwiseXor, 35 /* BIT_XOR */) }
+    { tokenType: "AND_CONJ", parselet: new BinaryOpParselet(chunkPA4VC73I_cjs.BindingPower.Conjunction, 20 /* ADD */) },
+    { tokenType: "MINUS", parselet: new BinaryOpParselet(chunkPA4VC73I_cjs.BindingPower.Sum, 21 /* SUB */) },
+    { tokenType: "STAR", parselet: new BinaryOpParselet(chunkPA4VC73I_cjs.BindingPower.Product, 22 /* MUL */) },
+    { tokenType: "SLASH", parselet: new BinaryOpParselet(chunkPA4VC73I_cjs.BindingPower.Product, 23 /* DIV */) },
+    { tokenType: "MOD", parselet: new BinaryOpParselet(chunkPA4VC73I_cjs.BindingPower.Product, 24 /* MOD */) },
+    // `^` is right-associative, so "2 ^ 3 ^ 2" is 2^(3^2) = 512. The Tier 1
+    // fast path in PrecedenceParser is what actually runs for `^`; this
+    // registration has to agree with it or the two tiers describe different
+    // languages.
+    { tokenType: "CARET", parselet: new BinaryOpParselet(chunkPA4VC73I_cjs.BindingPower.Exponent, 25 /* EXP */, true) },
+    { tokenType: "TIMES_BY", parselet: new BinaryOpParselet(chunkPA4VC73I_cjs.BindingPower.Product, 22 /* MUL */) },
+    { tokenType: "MULTIPLY_BY", parselet: new BinaryOpParselet(chunkPA4VC73I_cjs.BindingPower.Product, 22 /* MUL */) },
+    { tokenType: "DIVIDE_BY", parselet: new BinaryOpParselet(chunkPA4VC73I_cjs.BindingPower.Product, 23 /* DIV */) },
+    // The shifts and the bitwise trio, at the levels BindingPower gives them
+    // and therefore at C and JavaScript precedence. These six are declared
+    // twice, here and in BUILTIN_INFIX_BP, and only the Tier 1 numbers are
+    // ever read, so the levels must be the SAME names in both places. When
+    // they were not, the four that had a fast-path entry ran at one level
+    // while `>>>`, which had none, ran at another.
+    { tokenType: "LSHIFT", parselet: new BinaryOpParselet(chunkPA4VC73I_cjs.BindingPower.Shift, 30 /* LSHIFT */) },
+    { tokenType: "RSHIFT", parselet: new BinaryOpParselet(chunkPA4VC73I_cjs.BindingPower.Shift, 31 /* RSHIFT */) },
+    { tokenType: "URSHIFT", parselet: new BinaryOpParselet(chunkPA4VC73I_cjs.BindingPower.Shift, 32 /* URSHIFT */) },
+    { tokenType: "BIT_AND", parselet: new BinaryOpParselet(chunkPA4VC73I_cjs.BindingPower.BitwiseAnd, 33 /* BIT_AND */) },
+    { tokenType: "BIT_OR", parselet: new BinaryOpParselet(chunkPA4VC73I_cjs.BindingPower.BitwiseOr, 34 /* BIT_OR */) },
+    { tokenType: "BIT_XOR", parselet: new BinaryOpParselet(chunkPA4VC73I_cjs.BindingPower.BitwiseXor, 35 /* BIT_XOR */) }
   ],
   normalizerRules: [largeNumberSuffixNormalizerRule()]
 };
@@ -219,7 +231,7 @@ var ARITHMETIC_PACKAGE = {
 var PercentParselet = class {
   constructor() {
     this.category = "Percentage";
-    this.bindingPower = chunkNZFKROS7_cjs.BindingPower.Prefix;
+    this.bindingPower = chunkPA4VC73I_cjs.BindingPower.Prefix;
   }
   parse(parser, left, token, builder) {
     builder.emitOpcode(10 /* PUSH_NUMBER */);
@@ -235,7 +247,7 @@ var IsWhatParselet = class {
     this.category = "Percentage";
     // Below arithmetic, so the whole expression to the left is the value being
     // asked about: `10 + 10 is what % of 200` asks about 20.
-    this.bindingPower = chunkNZFKROS7_cjs.BindingPower.Conditional;
+    this.bindingPower = chunkPA4VC73I_cjs.BindingPower.Conditional;
   }
   parse(parser, _left, _token, builder) {
     if (nextWordIs(parser, "what")) {
@@ -250,7 +262,7 @@ var IsWhatParselet = class {
    */
   parseWhatRate(parser, builder) {
     if (!parser.match("PERCENT")) {
-      throw chunkM4N5GA5Z_cjs.ErrorFactory.parsing(
+      throw chunk5KMIY374_cjs.ErrorFactory.parsing(
         "IS_WHAT_EXPECTED_PERCENT",
         'Expected "%" after "is what", as in "20 is what % of 200"'
       );
@@ -260,7 +272,7 @@ var IsWhatParselet = class {
       builder.emitOpcode(74 /* TO_PERCENTAGE */);
       return;
     }
-    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Conditional, builder);
+    parser.parseExpression(chunkPA4VC73I_cjs.BindingPower.Conditional, builder);
     builder.emitOpcode(23 /* DIV */);
     if (preposition === "off") {
       builder.emitOpcode(10 /* PUSH_NUMBER */);
@@ -278,7 +290,7 @@ var IsWhatParselet = class {
    * `<part> is <rate> of|off|on what`, solving for the base.
    */
   parseWhatBase(parser, builder) {
-    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Conditional, builder);
+    parser.parseExpression(chunkPA4VC73I_cjs.BindingPower.Conditional, builder);
     if (parser.match("TO")) {
       expectWord(parser, "what", '"81 is 9 to what power"');
       expectWord(parser, "power", '"81 is 9 to what power"');
@@ -295,7 +307,7 @@ var IsWhatParselet = class {
     }
     const preposition = parser.match("OF_WHAT") ? "of" : parser.match("OFF_WHAT") ? "off" : parser.match("ON_WHAT") ? "on" : null;
     if (preposition === null) {
-      throw chunkM4N5GA5Z_cjs.ErrorFactory.parsing(
+      throw chunk5KMIY374_cjs.ErrorFactory.parsing(
         "IS_WHAT_EXPECTED_PREPOSITION",
         'Expected "of what", "off what" or "on what", as in "20 is 10% of what"'
       );
@@ -321,7 +333,7 @@ function nextWordIs(parser, word) {
 }
 function expectWord(parser, word, example) {
   if (!nextWordIs(parser, word)) {
-    throw chunkM4N5GA5Z_cjs.ErrorFactory.parsing(
+    throw chunk5KMIY374_cjs.ErrorFactory.parsing(
       "IS_WHAT_EXPECTED_WORD",
       `Expected "${word}" here, as in ${example}`
     );
@@ -344,10 +356,10 @@ var OnOffBaseParselet = class {
   constructor(sign) {
     this.sign = sign;
     this.category = "Percentage";
-    this.bindingPower = chunkNZFKROS7_cjs.BindingPower.Conditional;
+    this.bindingPower = chunkPA4VC73I_cjs.BindingPower.Conditional;
   }
   parse(parser, _left, _token, builder) {
-    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Conditional, builder);
+    parser.parseExpression(chunkPA4VC73I_cjs.BindingPower.Conditional, builder);
     builder.emitOpcode(2 /* SWAP */);
     builder.emitOpcode(10 /* PUSH_NUMBER */);
     builder.emitNumber(1);
@@ -378,7 +390,7 @@ function percentOnOffNormalizerRule(priority = 68) {
         consumed: 2,
         replacement: [
           tokens[pos],
-          chunkAHCLWAM5_cjs.createFusedToken(text === "on" ? "PCT_ON" : "PCT_OFF", text, [word])
+          chunkBHTNFEGZ_cjs.createFusedToken(text === "on" ? "PCT_ON" : "PCT_OFF", text, [word])
         ],
         ruleName: "percentage:on-off"
       };
@@ -390,7 +402,7 @@ function percentOnOffNormalizerRule(priority = 68) {
 var OfParselet = class {
   constructor() {
     this.category = "Percentage";
-    this.bindingPower = chunkNZFKROS7_cjs.BindingPower.Product;
+    this.bindingPower = chunkPA4VC73I_cjs.BindingPower.Product;
   }
   parse(parser, left, token, builder) {
     parser.parseExpression(this.bindingPower, builder);
@@ -402,7 +414,7 @@ var OfParselet = class {
 var OfWhatIsParselet = class {
   constructor() {
     this.category = "Percentage";
-    this.bindingPower = chunkNZFKROS7_cjs.BindingPower.Product;
+    this.bindingPower = chunkPA4VC73I_cjs.BindingPower.Product;
   }
   parse(parser, left, token, builder) {
     parser.parseExpression(this.bindingPower, builder);
@@ -416,7 +428,7 @@ var OnOffWhatIsParselet = class {
   constructor(sign) {
     this.sign = sign;
     this.category = "Percentage";
-    this.bindingPower = chunkNZFKROS7_cjs.BindingPower.Product;
+    this.bindingPower = chunkPA4VC73I_cjs.BindingPower.Product;
   }
   parse(parser, left, token, builder) {
     builder.emitOpcode(10 /* PUSH_NUMBER */);
@@ -459,7 +471,7 @@ var IncreaseByParselet = class {
   constructor(multiplier) {
     this.multiplier = multiplier;
     this.category = "Percentage";
-    this.bindingPower = chunkNZFKROS7_cjs.BindingPower.Conditional;
+    this.bindingPower = chunkPA4VC73I_cjs.BindingPower.Conditional;
   }
   parse(parser, left, token, builder) {
     parser.parseExpression(this.bindingPower, builder);
@@ -475,14 +487,14 @@ var IncreaseByParselet = class {
 var PercentageChangeParselet = class {
   constructor() {
     this.category = "Percentage";
-    this.bindingPower = chunkNZFKROS7_cjs.BindingPower.Conditional;
+    this.bindingPower = chunkPA4VC73I_cjs.BindingPower.Conditional;
   }
   parse(parser, left, token, builder) {
     if (left.type === "UNIT") {
       return;
     }
     const nextToken = parser.peek();
-    if (nextToken && ((nextToken.type === "UNIT" || nextToken.type === "IDENT") && chunkCLVQBF5C_cjs.isKnownUnit(nextToken.value) || nextToken.type === "IN")) {
+    if (nextToken && ((nextToken.type === "UNIT" || nextToken.type === "IDENT") && chunkAQNHHJMJ_cjs.isKnownUnit(nextToken.value) || nextToken.type === "IN")) {
       parser.consume();
       builder.emitOpcode(13 /* PUSH_STRING */);
       builder.emitString(nextToken.value);
@@ -644,7 +656,7 @@ var FunctionCallParselet = class {
     const fnName = token.value.toLowerCase();
     const fnIdx = builtinNameToIndex[fnName];
     if (fnIdx === void 0) {
-      throw chunkM4N5GA5Z_cjs.ErrorFactory.execution(
+      throw chunk5KMIY374_cjs.ErrorFactory.execution(
         "UNKNOWN_FUNCTION",
         `Unknown function: ${fnName}`,
         { functionName: fnName }
@@ -653,10 +665,10 @@ var FunctionCallParselet = class {
     parser.consume("LPAREN");
     let argCount = 0;
     if (parser.peek()?.type !== "RPAREN") {
-      parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
+      parser.parseExpression(chunkPA4VC73I_cjs.BindingPower.Lowest, builder);
       argCount++;
       while (parser.match("COMMA")) {
-        parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
+        parser.parseExpression(chunkPA4VC73I_cjs.BindingPower.Lowest, builder);
         argCount++;
       }
     }
@@ -679,13 +691,16 @@ var FUNCTION_PACKAGE = {
 var NowParselet = class {
   constructor(dayOffset = 0) {
     this.category = "Date/Time";
-    this.msOffset = dayOffset * 24 * 60 * 60 * 1e3;
+    this.dayOffset = dayOffset;
   }
   parse(parser, token, builder) {
     builder.emitOpcode(90 /* DATE_NOW */);
-    if (this.msOffset !== 0) {
+    if (this.dayOffset !== 0) {
       builder.emitOpcode(10 /* PUSH_NUMBER */);
-      builder.emitNumber(this.msOffset);
+      builder.emitNumber(this.dayOffset);
+      builder.emitOpcode(13 /* PUSH_STRING */);
+      builder.emitString("days");
+      builder.emitOpcode(80 /* UOM_CONVERT */);
       builder.emitOpcode(20 /* ADD */);
     }
   }
@@ -710,7 +725,7 @@ var NextLastParselet = class {
     const dayToken = parser.peek();
     const targetDay = dayToken ? WEEKDAY_TOKEN_INDEX[dayToken.type] : void 0;
     if (targetDay === void 0) {
-      throw chunkM4N5GA5Z_cjs.ErrorFactory.parsing(
+      throw chunk5KMIY374_cjs.ErrorFactory.parsing(
         "MISSING_WEEKDAY",
         `"${token.value}" must be followed by a day of the week (e.g. "${token.value} Saturday")`,
         { keyword: token.value, actualType: dayToken?.type, actualValue: dayToken?.value }
@@ -779,34 +794,36 @@ function unixTimestampToEpochMs(n) {
 }
 
 // src/packages/datetime/parselets/DatetimeTimestampPluginFunctions.ts
-var WORKDAYS_IN_FN_IDX = chunkBXKJLM5R_cjs.allocatePluginFunctionIndex();
-var WEEKDAY_ON_FN_IDX = chunkBXKJLM5R_cjs.allocatePluginFunctionIndex();
-var TO_DATE_FN_IDX = chunkBXKJLM5R_cjs.allocatePluginFunctionIndex();
-var TO_TIMESTAMP_FN_IDX = chunkBXKJLM5R_cjs.allocatePluginFunctionIndex();
-var MONTH_ON_FN_IDX = chunkBXKJLM5R_cjs.allocatePluginFunctionIndex();
-var WEEK_ON_FN_IDX = chunkBXKJLM5R_cjs.allocatePluginFunctionIndex();
-var IS_WEEKEND_FN_IDX = chunkBXKJLM5R_cjs.allocatePluginFunctionIndex();
-var IS_WORKDAY_FN_IDX = chunkBXKJLM5R_cjs.allocatePluginFunctionIndex();
-var SPAN_BETWEEN_FN_IDX = chunkBXKJLM5R_cjs.allocatePluginFunctionIndex();
+var WORKDAYS_IN_FN_IDX = chunk6WFMPTGB_cjs.allocatePluginFunctionIndex();
+var WEEKDAY_ON_FN_IDX = chunk6WFMPTGB_cjs.allocatePluginFunctionIndex();
+var TO_DATE_FN_IDX = chunk6WFMPTGB_cjs.allocatePluginFunctionIndex();
+var TO_TIMESTAMP_FN_IDX = chunk6WFMPTGB_cjs.allocatePluginFunctionIndex();
+var MONTH_ON_FN_IDX = chunk6WFMPTGB_cjs.allocatePluginFunctionIndex();
+var WEEK_ON_FN_IDX = chunk6WFMPTGB_cjs.allocatePluginFunctionIndex();
+var IS_WEEKEND_FN_IDX = chunk6WFMPTGB_cjs.allocatePluginFunctionIndex();
+var IS_WORKDAY_FN_IDX = chunk6WFMPTGB_cjs.allocatePluginFunctionIndex();
+var SPAN_BETWEEN_FN_IDX = chunk6WFMPTGB_cjs.allocatePluginFunctionIndex();
 function workdaysInDurationHandler(args) {
   const v = args[0];
   let totalDays;
   if (v.type === 6 /* Uom */ && v.unit) {
-    const measure = chunkNJTXJ5AG_cjs.getMeasure(v.unit);
+    const measure = chunkPFUESQTW_cjs.getMeasure(v.unit);
     if (measure !== "time") {
-      return chunkOC6LTXYS_cjs.errorValue(
+      return chunkJMXUNXQS_cjs.errorValue(
         "WORKDAYS_IN_EXPECTED_DURATION",
         `"workdays in" expects a time duration, got unit "${v.unit}"`
       );
     }
-    totalDays = chunkNJTXJ5AG_cjs.convertUnit(v.toNumber(), v.unit, "day");
+    totalDays = chunkPFUESQTW_cjs.convertUnit(v.toNumber(), v.unit, "day");
   } else {
     totalDays = v.toNumber();
   }
-  const fullWeeks = Math.floor(totalDays / 7);
-  const remainderDays = totalDays - fullWeeks * 7;
-  const workdays = fullWeeks * 5 + Math.min(remainderDays, 5);
-  return chunkOC6LTXYS_cjs.numberValue(workdays);
+  const sign = totalDays < 0 ? -1 : 1;
+  const magnitudeDays = Math.abs(totalDays);
+  const fullWeeks = Math.floor(magnitudeDays / 7);
+  const remainderDays = magnitudeDays - fullWeeks * 7;
+  const workdays = sign * (fullWeeks * 5 + Math.min(remainderDays, 5));
+  return chunkJMXUNXQS_cjs.numberValue(workdays);
 }
 var WEEKDAY_NAMES = [
   "Sunday",
@@ -819,15 +836,15 @@ var WEEKDAY_NAMES = [
 ];
 function asEpochMs(value, fieldName) {
   if (value.type === 4 /* Datetime */) return value.toNumber();
-  return chunkOC6LTXYS_cjs.errorValue(
+  return chunkJMXUNXQS_cjs.errorValue(
     "DATE_FIELD_EXPECTED_DATE",
-    `"${fieldName}" expects a date, got ${chunkOC6LTXYS_cjs.ValueType[value.type] ?? "an unsupported value"}`
+    `"${fieldName}" expects a date, got ${chunkJMXUNXQS_cjs.ValueType[value.type] ?? "an unsupported value"}`
   );
 }
 function weekdayOnDateHandler(args) {
   const epochMs = asEpochMs(args[0], "weekday");
   if (typeof epochMs !== "number") return epochMs;
-  return chunkOC6LTXYS_cjs.stringValue(WEEKDAY_NAMES[new Date(epochMs).getDay()]);
+  return chunkJMXUNXQS_cjs.stringValue(WEEKDAY_NAMES[new Date(epochMs).getDay()]);
 }
 var MONTH_NAMES = [
   "January",
@@ -846,7 +863,7 @@ var MONTH_NAMES = [
 function monthOnDateHandler(args) {
   const epochMs = asEpochMs(args[0], "month");
   if (typeof epochMs !== "number") return epochMs;
-  return chunkOC6LTXYS_cjs.stringValue(MONTH_NAMES[new Date(epochMs).getMonth()]);
+  return chunkJMXUNXQS_cjs.stringValue(MONTH_NAMES[new Date(epochMs).getMonth()]);
 }
 function weekOnDateHandler(args) {
   const epochMs = asEpochMs(args[0], "week");
@@ -857,7 +874,7 @@ function weekOnDateHandler(args) {
   target.setUTCDate(target.getUTCDate() + 4 - isoDay);
   const yearStart = Date.UTC(target.getUTCFullYear(), 0, 1);
   const days = Math.floor((target.getTime() - yearStart) / 864e5);
-  return chunkOC6LTXYS_cjs.numberValue(Math.floor(days / 7) + 1);
+  return chunkJMXUNXQS_cjs.numberValue(Math.floor(days / 7) + 1);
 }
 function isWeekendDate(epochMs) {
   const day = new Date(epochMs).getDay();
@@ -866,15 +883,15 @@ function isWeekendDate(epochMs) {
 function isWeekendOnDateHandler(args) {
   const epochMs = asEpochMs(args[0], "is a weekend");
   if (typeof epochMs !== "number") return epochMs;
-  return chunkOC6LTXYS_cjs.boolValue(isWeekendDate(epochMs));
+  return chunkJMXUNXQS_cjs.boolValue(isWeekendDate(epochMs));
 }
 function isWorkdayOnDateHandler(args) {
   const epochMs = asEpochMs(args[0], "is a workday");
   if (typeof epochMs !== "number") return epochMs;
-  return chunkOC6LTXYS_cjs.boolValue(!isWeekendDate(epochMs));
+  return chunkJMXUNXQS_cjs.boolValue(!isWeekendDate(epochMs));
 }
 function spanBetweenDatesHandler(args) {
-  return chunkOC6LTXYS_cjs.uomValue(Math.abs(args[0].toNumber() - args[1].toNumber()), "ms");
+  return chunkJMXUNXQS_cjs.uomValue(Math.abs(args[0].toNumber() - args[1].toNumber()), "ms");
 }
 function toDateFromAnyHandler(args) {
   const v = args[0];
@@ -884,28 +901,28 @@ function toDateFromAnyHandler(args) {
   if (v.type === 3 /* String */) {
     const ms = parseIso8601(v.value);
     if (ms === null) {
-      return chunkOC6LTXYS_cjs.errorValue(
+      return chunkJMXUNXQS_cjs.errorValue(
         "INVALID_ISO8601_STRING",
         `"${v.value}" is not a recognizable ISO8601 date/time string`
       );
     }
-    return chunkOC6LTXYS_cjs.datetimeValue(ms);
+    return chunkJMXUNXQS_cjs.datetimeValue(ms);
   }
-  return chunkOC6LTXYS_cjs.datetimeValue(unixTimestampToEpochMs(v.toNumber()));
+  return chunkJMXUNXQS_cjs.datetimeValue(unixTimestampToEpochMs(v.toNumber()));
 }
 function toTimestampFromAnyHandler(args) {
   const v = args[0];
   if (v.type === 3 /* String */) {
     const ms = parseIso8601(v.value);
     if (ms === null) {
-      return chunkOC6LTXYS_cjs.errorValue(
+      return chunkJMXUNXQS_cjs.errorValue(
         "INVALID_ISO8601_STRING",
         `"${v.value}" is not a recognizable ISO8601 date/time string`
       );
     }
-    return chunkOC6LTXYS_cjs.numberValue(Math.floor(ms / 1e3));
+    return chunkJMXUNXQS_cjs.numberValue(Math.floor(ms / 1e3));
   }
-  return chunkOC6LTXYS_cjs.numberValue(Math.floor(v.toNumber() / 1e3));
+  return chunkJMXUNXQS_cjs.numberValue(Math.floor(v.toNumber() / 1e3));
 }
 var workdaysInDuration = workdaysInDurationHandler;
 var weekdayOnDate = weekdayOnDateHandler;
@@ -960,9 +977,9 @@ var DurationBetweenParselet = class {
   }
   parse(parser, token, builder) {
     const unit = token.value;
-    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Product, builder);
+    parser.parseExpression(chunkPA4VC73I_cjs.BindingPower.Product, builder);
     parser.consume("AND_CONJ");
-    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
+    parser.parseExpression(chunkPA4VC73I_cjs.BindingPower.Lowest, builder);
     builder.emitOpcode(50 /* CALL_PLUGIN */);
     builder.emitIndex(SPAN_BETWEEN_FN_IDX);
     builder.emitIndex(2);
@@ -977,7 +994,7 @@ var DayTypePredicateParselet = class {
   constructor(functionIndex) {
     this.functionIndex = functionIndex;
     this.category = "Date/Time";
-    this.bindingPower = chunkNZFKROS7_cjs.BindingPower.Conditional;
+    this.bindingPower = chunkPA4VC73I_cjs.BindingPower.Conditional;
   }
   parse(parser, left, token, builder) {
     builder.emitOpcode(50 /* CALL_PLUGIN */);
@@ -1003,7 +1020,7 @@ var CurrentTimestampParselet = class {
 var ToDateParselet = class {
   constructor() {
     this.category = "Date/Time";
-    this.bindingPower = chunkNZFKROS7_cjs.BindingPower.Conditional;
+    this.bindingPower = chunkPA4VC73I_cjs.BindingPower.Conditional;
   }
   parse(parser, left, token, builder) {
     builder.emitOpcode(50 /* CALL_PLUGIN */);
@@ -1016,7 +1033,7 @@ var ToDateParselet = class {
 var ToTimestampParselet = class {
   constructor() {
     this.category = "Date/Time";
-    this.bindingPower = chunkNZFKROS7_cjs.BindingPower.Conditional;
+    this.bindingPower = chunkPA4VC73I_cjs.BindingPower.Conditional;
   }
   parse(parser, left, token, builder) {
     builder.emitOpcode(50 /* CALL_PLUGIN */);
@@ -1050,7 +1067,7 @@ function untilSinceNormalizerRule(priority = 60) {
       const fusedType = keywordToken.type === "UNTIL" ? "UNTIL_UNIT" : "SINCE_UNIT";
       return {
         consumed: 2,
-        replacement: [chunkAHCLWAM5_cjs.createFusedToken(fusedType, unitToken.value, [unitToken, keywordToken])],
+        replacement: [chunkBHTNFEGZ_cjs.createFusedToken(fusedType, unitToken.value, [unitToken, keywordToken])],
         ruleName: `datetime:${keywordToken.type.toLowerCase()}`
       };
     }
@@ -1087,7 +1104,7 @@ function betweenUnitNormalizerRule(priority = 60) {
       }
       return {
         consumed: howManyLength + 2,
-        replacement: [chunkAHCLWAM5_cjs.createFusedToken("BETWEEN_UNIT", unitToken.value, sources)],
+        replacement: [chunkBHTNFEGZ_cjs.createFusedToken("BETWEEN_UNIT", unitToken.value, sources)],
         ruleName: "datetime:between"
       };
     }
@@ -1108,7 +1125,7 @@ function workdayRateDenominatorNormalizerRule(priority = 70) {
       const syntheticOne = {
         ...unit,
         type: "NUMBER",
-        typeId: chunkR24DI24X_cjs.tokenTypeId("NUMBER"),
+        typeId: chunk5LI5EPGJ_cjs.tokenTypeId("NUMBER"),
         value: "1",
         text: "1"
       };
@@ -1123,10 +1140,19 @@ function workdayRateDenominatorNormalizerRule(priority = 70) {
 
 // src/packages/datetime/normalizer/DateLiteralNormalizerRule.ts
 var DATETIME_LITERAL_TYPE = "DATETIME_LITERAL";
-var DATETIME_LITERAL_TYPE_ID = chunkR24DI24X_cjs.tokenTypeId(DATETIME_LITERAL_TYPE);
+var DATETIME_LITERAL_TYPE_ID = chunk5LI5EPGJ_cjs.tokenTypeId(DATETIME_LITERAL_TYPE);
 var PLAIN_INTEGER = /^\d+$/;
 var DOT_DAY_MONTH = /^\d{1,2}\.\d{1,2}$/;
 var DOT_LEADING_YEAR = /^\.(\d{2}|\d{4})$/;
+var DAY_OR_MONTH = /^\d{1,2}$/;
+function writtenAsOneRun(tokens) {
+  for (let i = 0; i < tokens.length - 1; i++) {
+    const token = tokens[i];
+    const end = token.sourceEnd ?? token.offset + token.text.length;
+    if (end !== tokens[i + 1].offset) return false;
+  }
+  return true;
+}
 function resolveYear(digits) {
   if (digits.length === 4) return Number(digits);
   if (digits.length === 2) {
@@ -1143,7 +1169,7 @@ function buildDateToken(day, month, year, sourceTokens, ruleName) {
   }
   const first = sourceTokens[0];
   const text = sourceTokens.map((t) => t.value).join("");
-  const fusedToken = new chunkM4F66R4O_cjs.LexerToken(
+  const fusedToken = new chunkYWQ6V4ZN_cjs.LexerToken(
     DATETIME_LITERAL_TYPE,
     DATETIME_LITERAL_TYPE_ID,
     String(date.getTime()),
@@ -1155,6 +1181,48 @@ function buildDateToken(day, month, year, sourceTokens, ruleName) {
   );
   return { consumed: sourceTokens.length, replacement: [fusedToken], ruleName };
 }
+var ISO_TIMESTAMP = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}(:\d{2}(\.\d+)?)?(Z|[+-]\d{2}:?\d{2})?/;
+var ISO_TOKEN_TYPES = /* @__PURE__ */ new Set(["NUMBER", "MINUS", "PLUS", "COLON", "IDENT"]);
+var ISO_MAX_TOKENS = 16;
+function fuseIsoTimestamp(tokens, pos, ruleName) {
+  const first = tokens[pos];
+  if (first.sourceEnd !== void 0) return null;
+  let text = first.text;
+  let runEnd = first.offset + first.text.length;
+  const window = [first];
+  for (let i = pos + 1; i < tokens.length && window.length < ISO_MAX_TOKENS; i++) {
+    const next = tokens[i];
+    if (next.sourceEnd !== void 0) break;
+    if (next.offset !== runEnd || !ISO_TOKEN_TYPES.has(next.type)) break;
+    text += next.text;
+    runEnd = next.offset + next.text.length;
+    window.push(next);
+  }
+  const matched = ISO_TIMESTAMP.exec(text);
+  if (matched === null) return null;
+  let consumed = 0;
+  let covered = 0;
+  for (const token of window) {
+    covered += token.text.length;
+    consumed++;
+    if (covered >= matched[0].length) break;
+  }
+  if (covered !== matched[0].length) return null;
+  const epochMs = parseIso8601(matched[0]);
+  if (epochMs === null) return null;
+  const fusedToken = new chunkYWQ6V4ZN_cjs.LexerToken(
+    DATETIME_LITERAL_TYPE,
+    DATETIME_LITERAL_TYPE_ID,
+    String(epochMs),
+    matched[0],
+    first.offset,
+    0,
+    first.line,
+    first.col,
+    first.offset + matched[0].length
+  );
+  return { consumed, replacement: [fusedToken], ruleName };
+}
 function dateLiteralNormalizerRule() {
   return {
     name: "datetime:date-literal",
@@ -1180,6 +1248,10 @@ function dateLiteralNormalizerRule() {
         }
         return null;
       }
+      if (t0.value.length === 4 && PLAIN_INTEGER.test(t0.value)) {
+        const timestamp = fuseIsoTimestamp(tokens, pos, "datetime:date-literal:iso-timestamp");
+        if (timestamp) return timestamp;
+      }
       if (!PLAIN_INTEGER.test(t0.value)) return null;
       const sep1 = tokens[pos + 1];
       if (!sep1 || sep1.type !== "SLASH" && sep1.type !== "MINUS") return null;
@@ -1190,14 +1262,18 @@ function dateLiteralNormalizerRule() {
       if (!sep2 || sep2.type !== sep1.type) return null;
       if (!t2 || t2.type !== "NUMBER" || !PLAIN_INTEGER.test(t2.value)) return null;
       const sourceTokens = [t0, sep1, t1, sep2, t2];
+      if (!writtenAsOneRun(sourceTokens)) return null;
       if (sep1.type === "SLASH") {
+        if (!DAY_OR_MONTH.test(t0.value) || !DAY_OR_MONTH.test(t1.value)) return null;
         const year2 = resolveYear(t2.value);
         if (year2 === null) return null;
         return buildDateToken(Number(t0.value), Number(t1.value), year2, sourceTokens, "datetime:date-literal:european");
       }
       if (t0.value.length === 4) {
+        if (!DAY_OR_MONTH.test(t1.value) || !DAY_OR_MONTH.test(t2.value)) return null;
         return buildDateToken(Number(t2.value), Number(t1.value), Number(t0.value), sourceTokens, "datetime:date-literal:iso");
       }
+      if (!DAY_OR_MONTH.test(t0.value) || !DAY_OR_MONTH.test(t1.value)) return null;
       const year = resolveYear(t2.value);
       if (year === null) return null;
       return buildDateToken(Number(t1.value), Number(t0.value), year, sourceTokens, "datetime:date-literal:us");
@@ -1327,7 +1403,7 @@ var DaysInPeriodParselet = class {
     }
     const year = this.readOptionalYear(parser);
     if (year !== null) return daysInYear(year);
-    throw chunkM4N5GA5Z_cjs.ErrorFactory.parsing(
+    throw chunk5KMIY374_cjs.ErrorFactory.parsing(
       "DAYS_IN_EXPECTED_PERIOD",
       'Expected a month, quarter or year, as in "days in February 2020" or "days in Q3"'
     );
@@ -1393,7 +1469,7 @@ function daysInPeriodNormalizerRule(priority = 60) {
       if (!startsPeriod(tokens[pos + 2])) return null;
       return {
         consumed: 2,
-        replacement: [chunkAHCLWAM5_cjs.createFusedToken("DAYS_IN_PERIOD", "days in", [days, tokens[pos + 1]])],
+        replacement: [chunkBHTNFEGZ_cjs.createFusedToken("DAYS_IN_PERIOD", "days in", [days, tokens[pos + 1]])],
         ruleName: "datetime:days-in-period"
       };
     }
@@ -1512,7 +1588,7 @@ var DATETIME_PACKAGE = {
     { index: SPAN_BETWEEN_FN_IDX, handler: spanBetweenDates }
   ],
   asConverters: {
-    iso8601: (value) => chunkOC6LTXYS_cjs.stringValue(formatIso8601Local(value.toNumber())),
+    iso8601: (value) => chunkJMXUNXQS_cjs.stringValue(formatIso8601Local(value.toNumber())),
     // The same three fields the "what X is it" questions answer, in the
     // composable form: `next friday + 2 weeks as weekday`. Question phrases
     // only ever take a bare date expression, whereas `as` binds after a
@@ -1836,10 +1912,10 @@ function tryConsumeZoneReference(parser) {
 }
 
 // src/packages/time/parselets/TimezonePluginFunctions.ts
-var ZONE_CONVERT_FN_IDX = chunkBXKJLM5R_cjs.allocatePluginFunctionIndex();
-var TIME_IN_ZONE_FN_IDX = chunkBXKJLM5R_cjs.allocatePluginFunctionIndex();
-var DATE_IN_ZONE_FN_IDX = chunkBXKJLM5R_cjs.allocatePluginFunctionIndex();
-var TIME_DIFFERENCE_FN_IDX = chunkBXKJLM5R_cjs.allocatePluginFunctionIndex();
+var ZONE_CONVERT_FN_IDX = chunk6WFMPTGB_cjs.allocatePluginFunctionIndex();
+var TIME_IN_ZONE_FN_IDX = chunk6WFMPTGB_cjs.allocatePluginFunctionIndex();
+var DATE_IN_ZONE_FN_IDX = chunk6WFMPTGB_cjs.allocatePluginFunctionIndex();
+var TIME_DIFFERENCE_FN_IDX = chunk6WFMPTGB_cjs.allocatePluginFunctionIndex();
 function zoneConvertHandler(args) {
   const totalMinutes = args[0].toNumber();
   const sourceZoneRef = args[1].value;
@@ -1855,17 +1931,17 @@ function zoneConvertHandler(args) {
   );
   const time = formatTimeInZone(utcMs, targetZoneRef);
   const dayShift = dayShiftBetweenZones(utcMs, targetZoneRef, sourceZoneRef);
-  if (dayShift === 0) return chunkOC6LTXYS_cjs.stringValue(time);
+  if (dayShift === 0) return chunkJMXUNXQS_cjs.stringValue(time);
   const sign = dayShift > 0 ? "+" : "";
-  return chunkOC6LTXYS_cjs.stringValue(`${time} (${sign}${dayShift} day${Math.abs(dayShift) === 1 ? "" : "s"})`);
+  return chunkJMXUNXQS_cjs.stringValue(`${time} (${sign}${dayShift} day${Math.abs(dayShift) === 1 ? "" : "s"})`);
 }
 function timeInZoneHandler(args) {
   const zoneRef = args[0].value;
-  return chunkOC6LTXYS_cjs.stringValue(formatTimeInZone(Date.now(), zoneRef));
+  return chunkJMXUNXQS_cjs.stringValue(formatTimeInZone(Date.now(), zoneRef));
 }
 function dateInZoneHandler(args) {
   const zoneRef = args[0].value;
-  return chunkOC6LTXYS_cjs.stringValue(formatDateInZone(Date.now(), zoneRef));
+  return chunkJMXUNXQS_cjs.stringValue(formatDateInZone(Date.now(), zoneRef));
 }
 function timeDifferenceHandler(args) {
   const zoneRef1 = args[0].value;
@@ -1877,7 +1953,7 @@ function timeDifferenceHandler(args) {
   const offset2 = resolveOffsetMinutes(zoneRef2, now);
   const diff = offset2 - offset1;
   if (diff === 0) {
-    return chunkOC6LTXYS_cjs.stringValue(`${label2} and ${label1} currently share the same UTC offset`);
+    return chunkJMXUNXQS_cjs.stringValue(`${label2} and ${label1} currently share the same UTC offset`);
   }
   const ahead = diff > 0 ? label2 : label1;
   const behind = diff > 0 ? label1 : label2;
@@ -1887,7 +1963,7 @@ function timeDifferenceHandler(args) {
   const parts = [];
   if (hours > 0) parts.push(`${hours} hour${hours === 1 ? "" : "s"}`);
   if (minutes > 0) parts.push(`${minutes} minute${minutes === 1 ? "" : "s"}`);
-  return chunkOC6LTXYS_cjs.stringValue(`${ahead} is ${parts.join(" ")} ahead of ${behind}`);
+  return chunkJMXUNXQS_cjs.stringValue(`${ahead} is ${parts.join(" ")} ahead of ${behind}`);
 }
 
 // src/packages/time/parselets/ClockTimeParselet.ts
@@ -1900,7 +1976,7 @@ var ClockTimeParselet = class {
     const sourceZoneRef = tryConsumeZoneReference(parser);
     if (sourceZoneRef !== null) {
       if (parser.peek()?.type !== "IN") {
-        throw chunkM4N5GA5Z_cjs.ErrorFactory.parsing(
+        throw chunk5KMIY374_cjs.ErrorFactory.parsing(
           "TIME_ZONE_EXPECTED_IN",
           `Expected "in <city>" after the zone name (e.g. "6pm Sydney in Chicago") but got ${parser.peek() ? `"${parser.peek().value}"` : "end of input"}`
         );
@@ -1908,7 +1984,7 @@ var ClockTimeParselet = class {
       parser.consume();
       const target = tryConsumeZoneReference(parser);
       if (target === null) {
-        throw chunkM4N5GA5Z_cjs.ErrorFactory.parsing(
+        throw chunk5KMIY374_cjs.ErrorFactory.parsing(
           "TIME_ZONE_EXPECTED_TARGET",
           `Expected a city or zone name after "in" (e.g. "6pm Sydney in Chicago")`
         );
@@ -1983,7 +2059,7 @@ function timeOrDateInZoneParselet(pluginFnIdx) {
     parse(parser, token, builder) {
       const zone = tryConsumeZoneReference(parser);
       if (zone === null) {
-        throw chunkM4N5GA5Z_cjs.ErrorFactory.parsing(
+        throw chunk5KMIY374_cjs.ErrorFactory.parsing(
           "TIME_ZONE_EXPECTED_CITY",
           `Expected a city or zone name after "${token.value}" (e.g. "time in Paris")`
         );
@@ -2005,7 +2081,7 @@ var TimeDifferenceParselet = class {
   parse(parser, token, builder) {
     const zone1 = tryConsumeZoneReference(parser);
     if (zone1 === null) {
-      throw chunkM4N5GA5Z_cjs.ErrorFactory.parsing(
+      throw chunk5KMIY374_cjs.ErrorFactory.parsing(
         "TIME_DIFFERENCE_EXPECTED_CITY",
         `Expected a city or zone name after "time difference between" (e.g. "time difference between Seattle and Moscow")`
       );
@@ -2013,7 +2089,7 @@ var TimeDifferenceParselet = class {
     parser.consume("AND_CONJ");
     const zone2 = tryConsumeZoneReference(parser);
     if (zone2 === null) {
-      throw chunkM4N5GA5Z_cjs.ErrorFactory.parsing(
+      throw chunk5KMIY374_cjs.ErrorFactory.parsing(
         "TIME_DIFFERENCE_EXPECTED_SECOND_CITY",
         `Expected a second city or zone name after "and" (e.g. "time difference between Seattle and Moscow")`
       );
@@ -2041,7 +2117,7 @@ var VideoTimecodeParselet = class {
     const [hours, minutes, seconds, frames] = token.value.split(",").map(Number);
     const separator = parser.peek();
     if (!separator || separator.type !== "RATE_AT" && separator.type !== "AT") {
-      throw chunkM4N5GA5Z_cjs.ErrorFactory.parsing(
+      throw chunk5KMIY374_cjs.ErrorFactory.parsing(
         "TIMECODE_EXPECTED_FPS",
         `A video timecode must specify a frame rate, e.g. "${token.value.split(",").join(":")} at 30 fps" or "... @ 30 fps"`
       );
@@ -2049,27 +2125,27 @@ var VideoTimecodeParselet = class {
     parser.consume();
     const fpsToken = parser.peek();
     if (!fpsToken || fpsToken.type !== "FPS_RATE") {
-      throw chunkM4N5GA5Z_cjs.ErrorFactory.parsing(
+      throw chunk5KMIY374_cjs.ErrorFactory.parsing(
         "TIMECODE_EXPECTED_FPS",
         `Expected "<number> fps" after "${separator.value}" (e.g. "at 30 fps")`
       );
     }
     parser.consume();
     const fps = parseFloat(fpsToken.value);
-    const fpsWhole = Math.floor(fps);
+    const fpsWhole = Math.round(fps);
     if (frames >= fpsWhole) {
-      throw chunkM4N5GA5Z_cjs.ErrorFactory.parsing(
+      throw chunk5KMIY374_cjs.ErrorFactory.parsing(
         "TIMECODE_FRAME_OUT_OF_RANGE",
         `Frame number ${frames} is out of range for ${fps} fps (must be 0-${fpsWhole - 1})`
       );
     }
-    const totalFrames = Math.round((hours * 3600 + minutes * 60 + seconds) * fps) + frames;
-    let unit = chunkOC6LTXYS_cjs.timecodeUnit(fps);
+    const totalFrames = (hours * 3600 + minutes * 60 + seconds) * fpsWhole + frames;
+    let unit = chunkJMXUNXQS_cjs.timecodeUnit(fps);
     if (parser.peek()?.type === "IN") {
       parser.consume();
       const framesWord = parser.peek();
       if (!framesWord || framesWord.type !== "IDENT" || framesWord.value.toLowerCase() !== "frames") {
-        throw chunkM4N5GA5Z_cjs.ErrorFactory.parsing(
+        throw chunk5KMIY374_cjs.ErrorFactory.parsing(
           "TIMECODE_EXPECTED_FRAMES",
           `Expected "frames" after "in" (e.g. "... in frames") but got ${framesWord ? `"${framesWord.value}"` : "end of input"}`
         );
@@ -2110,7 +2186,7 @@ var FrameCountParselet = class {
       parser.consume();
       const fpsToken = parser.peek();
       if (!fpsToken || fpsToken.type !== "FPS_RATE") {
-        throw chunkM4N5GA5Z_cjs.ErrorFactory.parsing(
+        throw chunk5KMIY374_cjs.ErrorFactory.parsing(
           "TIMECODE_EXPECTED_FPS",
           `Expected "<number> fps" after "${separator.value}" (e.g. "@ 30 fps")`
         );
@@ -2149,7 +2225,7 @@ function clockTimeNormalizerRule(priority = 65) {
     name: "time:clock-time",
     priority,
     match(tokens, pos) {
-      if (chunkAHCLWAM5_cjs.isInsideRangeContext(tokens, pos)) return null;
+      if (chunkBHTNFEGZ_cjs.isInsideRangeContext(tokens, pos)) return null;
       const hourToken = tokens[pos];
       if (hourToken.type !== "NUMBER") return null;
       const hour = parseInt(hourToken.value, 10);
@@ -2165,7 +2241,7 @@ function clockTimeNormalizerRule(priority = 65) {
         const consumed = hasAmPm ? 4 : 3;
         return {
           consumed,
-          replacement: [chunkAHCLWAM5_cjs.createFusedToken("CLOCK_TIME", String(totalMinutes), tokens.slice(pos, pos + consumed))],
+          replacement: [chunkBHTNFEGZ_cjs.createFusedToken("CLOCK_TIME", String(totalMinutes), tokens.slice(pos, pos + consumed))],
           ruleName: "time:clock-time"
         };
       }
@@ -2175,7 +2251,7 @@ function clockTimeNormalizerRule(priority = 65) {
         if (totalMinutes === null) return null;
         return {
           consumed: 2,
-          replacement: [chunkAHCLWAM5_cjs.createFusedToken("CLOCK_TIME", String(totalMinutes), tokens.slice(pos, pos + 2))],
+          replacement: [chunkBHTNFEGZ_cjs.createFusedToken("CLOCK_TIME", String(totalMinutes), tokens.slice(pos, pos + 2))],
           ruleName: "time:clock-time"
         };
       }
@@ -2198,7 +2274,7 @@ function clockTimeIntervalNormalizerRule(priority = 66) {
       if (end?.type !== "CLOCK_TIME") return null;
       return {
         consumed: 3,
-        replacement: [chunkAHCLWAM5_cjs.createFusedToken("CLOCK_TIME_INTERVAL", `${start.value}:${end.value}`, tokens.slice(pos, pos + 3))],
+        replacement: [chunkBHTNFEGZ_cjs.createFusedToken("CLOCK_TIME_INTERVAL", `${start.value}:${end.value}`, tokens.slice(pos, pos + 3))],
         ruleName: "time:clock-time-interval"
       };
     }
@@ -2217,7 +2293,7 @@ function fpsRateNormalizerRule(priority = 65) {
       if (fpsToken?.type !== "IDENT" || fpsToken.value.toLowerCase() !== "fps") return null;
       return {
         consumed: 2,
-        replacement: [chunkAHCLWAM5_cjs.createFusedToken("FPS_RATE", numberToken.value, tokens.slice(pos, pos + 2))],
+        replacement: [chunkBHTNFEGZ_cjs.createFusedToken("FPS_RATE", numberToken.value, tokens.slice(pos, pos + 2))],
         ruleName: "time:fps-rate"
       };
     }
@@ -2230,7 +2306,7 @@ function laptimeNormalizerRule(priority = 70) {
     name: "time:laptime",
     priority,
     match(tokens, pos) {
-      if (chunkAHCLWAM5_cjs.isInsideRangeContext(tokens, pos)) return null;
+      if (chunkBHTNFEGZ_cjs.isInsideRangeContext(tokens, pos)) return null;
       const h = tokens[pos];
       const c1 = tokens[pos + 1];
       const m = tokens[pos + 2];
@@ -2249,7 +2325,7 @@ function laptimeNormalizerRule(priority = 70) {
       const totalSeconds = hours * 3600 + minutes * 60 + seconds;
       return {
         consumed: 5,
-        replacement: [chunkAHCLWAM5_cjs.createFusedToken("LAPTIME", String(totalSeconds), tokens.slice(pos, pos + 5))],
+        replacement: [chunkBHTNFEGZ_cjs.createFusedToken("LAPTIME", String(totalSeconds), tokens.slice(pos, pos + 5))],
         ruleName: "time:laptime"
       };
     }
@@ -2262,7 +2338,7 @@ function videoTimecodeNormalizerRule(priority = 75) {
     name: "time:video-timecode",
     priority,
     match(tokens, pos) {
-      if (chunkAHCLWAM5_cjs.isInsideRangeContext(tokens, pos)) return null;
+      if (chunkBHTNFEGZ_cjs.isInsideRangeContext(tokens, pos)) return null;
       const h = tokens[pos];
       const c1 = tokens[pos + 1];
       const m = tokens[pos + 2];
@@ -2288,7 +2364,7 @@ function videoTimecodeNormalizerRule(priority = 75) {
       return {
         consumed: 7,
         replacement: [
-          chunkAHCLWAM5_cjs.createFusedToken("VIDEO_TIMECODE", `${hours},${minutes},${seconds},${frames}`, tokens.slice(pos, pos + 7))
+          chunkBHTNFEGZ_cjs.createFusedToken("VIDEO_TIMECODE", `${hours},${minutes},${seconds},${frames}`, tokens.slice(pos, pos + 7))
         ],
         ruleName: "time:video-timecode"
       };
@@ -2308,7 +2384,7 @@ function frameCountNormalizerRule(priority = 65) {
       if (framesToken?.type !== "IDENT" || framesToken.value.toLowerCase() !== "frames") return null;
       return {
         consumed: 2,
-        replacement: [chunkAHCLWAM5_cjs.createFusedToken("FRAME_COUNT", numberToken.value, tokens.slice(pos, pos + 2))],
+        replacement: [chunkBHTNFEGZ_cjs.createFusedToken("FRAME_COUNT", numberToken.value, tokens.slice(pos, pos + 2))],
         ruleName: "time:frame-count"
       };
     }
@@ -2327,14 +2403,14 @@ var TIMESPAN_PARTS = [
 function durationSeconds(value) {
   if (value.type === 0 /* Number */) return value.toNumber();
   if (value.type !== 6 /* Uom */ || value.unit === void 0) return null;
-  const entry = chunkMBNQVDVC_cjs.UNIT_TABLE[value.unit.toLowerCase()];
+  const entry = chunkAMOJYLG2_cjs.UNIT_TABLE[value.unit.toLowerCase()];
   if (entry === void 0 || entry[0] !== TIME_KIND) return null;
   return value.toNumber() * entry[1];
 }
 function toTimespanString(value) {
   const total = durationSeconds(value);
   if (total === null) {
-    return chunkOC6LTXYS_cjs.stringValue(`"as timespan" needs a duration, got ${value.unit ?? "a non-duration"}`);
+    return chunkJMXUNXQS_cjs.stringValue(`"as timespan" needs a duration, got ${value.unit ?? "a non-duration"}`);
   }
   const negative = total < 0;
   let remaining = Math.abs(total);
@@ -2351,12 +2427,12 @@ function toTimespanString(value) {
   if (secondsLeft > 0 || parts.length === 0) {
     parts.push(`${secondsLeft} ${secondsLeft === 1 ? "second" : "seconds"}`);
   }
-  return chunkOC6LTXYS_cjs.stringValue((negative ? "-" : "") + parts.join(" "));
+  return chunkJMXUNXQS_cjs.stringValue((negative ? "-" : "") + parts.join(" "));
 }
 function toLaptimeString(value) {
   const total = durationSeconds(value);
   if (total === null) {
-    return chunkOC6LTXYS_cjs.stringValue(`"as laptime" needs a duration, got ${value.unit ?? "a non-duration"}`);
+    return chunkJMXUNXQS_cjs.stringValue(`"as laptime" needs a duration, got ${value.unit ?? "a non-duration"}`);
   }
   const negative = total < 0;
   const rounded = Math.round(Math.abs(total) * 1e3) / 1e3;
@@ -2366,7 +2442,7 @@ function toLaptimeString(value) {
   const whole = Math.floor(seconds);
   const fraction = Math.round((seconds - whole) * 1e3);
   const base = `${pad(hours)}:${pad(minutes)}:${pad(whole)}`;
-  return chunkOC6LTXYS_cjs.stringValue((negative ? "-" : "") + (fraction > 0 ? `${base}.${String(fraction).padStart(3, "0")}` : base));
+  return chunkJMXUNXQS_cjs.stringValue((negative ? "-" : "") + (fraction > 0 ? `${base}.${String(fraction).padStart(3, "0")}` : base));
 }
 function pad(n) {
   return n < 10 ? `0${n}` : String(n);
@@ -2419,7 +2495,7 @@ function definePhrasePattern(opts) {
   for (const alt of opts.alternatives) {
     const first = alt.slots[0];
     if (!first || first.kind !== "keyword") {
-      throw chunkM4N5GA5Z_cjs.ErrorFactory.config(
+      throw chunk5KMIY374_cjs.ErrorFactory.config(
         "INVALID_PHRASE_PATTERN",
         "Every PhraseAlternative's first slot must be a `keyword` slot \u2014 alternatives are chosen by peeking the next token, which only works if the choice is decidable from one leading keyword.",
         { category: opts.category }
@@ -2436,7 +2512,7 @@ function definePhrasePattern(opts) {
       });
       if (!alternative) {
         const expected = opts.alternatives.map((alt) => alt.slots[0].tokenTypes.join("|")).join(", ");
-        throw chunkM4N5GA5Z_cjs.ErrorFactory.parsing(
+        throw chunk5KMIY374_cjs.ErrorFactory.parsing(
           "NO_MATCHING_PHRASE_ALTERNATIVE",
           `Expected one of [${expected}] but got "${next?.type ?? "end of input"}" ("${next?.value ?? ""}")`,
           { category: opts.category, expected, actualType: next?.type, actualValue: next?.value }
@@ -2447,7 +2523,7 @@ function definePhrasePattern(opts) {
         if (slot.kind === "keyword") {
           const token = parser.peek();
           if (!token || !slot.tokenTypes.includes(token.type)) {
-            throw chunkM4N5GA5Z_cjs.ErrorFactory.parsing(
+            throw chunk5KMIY374_cjs.ErrorFactory.parsing(
               "PHRASE_KEYWORD_MISMATCH",
               `Expected one of [${slot.tokenTypes.join("|")}] but got "${token?.type ?? "end of input"}" ("${token?.value ?? ""}")`,
               { category: opts.category, expected: slot.tokenTypes, actualType: token?.type, actualValue: token?.value }
@@ -2477,7 +2553,7 @@ var keywordLedRollPattern = definePhrasePattern({
     {
       slots: [
         { kind: "keyword", tokenTypes: ["BETWEEN"] },
-        { kind: "expr", bindingPower: chunkNZFKROS7_cjs.BindingPower.Product },
+        { kind: "expr", bindingPower: chunkPA4VC73I_cjs.BindingPower.Product },
         // The word "and" lexes as PLUS, not a dedicated AND token, en.ts's
         // keywordMap maps `and: "PLUS"` (a synonym for arithmetic "+").
         // The original hand-written parselet never actually checked the
@@ -2492,7 +2568,7 @@ var keywordLedRollPattern = definePhrasePattern({
     {
       slots: [
         { kind: "keyword", tokenTypes: ["FROM"] },
-        { kind: "expr", bindingPower: chunkNZFKROS7_cjs.BindingPower.Product },
+        { kind: "expr", bindingPower: chunkPA4VC73I_cjs.BindingPower.Product },
         { kind: "keyword", tokenTypes: ["TO"] },
         { kind: "expr" }
       ],
@@ -2547,7 +2623,7 @@ var VariableParselet = class {
   parse(parser, _token, builder) {
     const nameToken = parser.consume();
     if (nameToken.type !== "IDENT" && nameToken.type !== "UNIT") {
-      throw chunkM4N5GA5Z_cjs.ErrorFactory.parsing(
+      throw chunk5KMIY374_cjs.ErrorFactory.parsing(
         "EXPECTED_IDENTIFIER",
         `Expected identifier or unit after colon, got ${nameToken.type}`,
         { tokenType: nameToken.type }
@@ -2586,7 +2662,7 @@ var GlobalVariableParselet = class {
     parser.consume("COLON");
     const nameToken = parser.consume();
     if (nameToken.type !== "IDENT" && nameToken.type !== "UNIT") {
-      throw chunkM4N5GA5Z_cjs.ErrorFactory.parsing(
+      throw chunk5KMIY374_cjs.ErrorFactory.parsing(
         "EXPECTED_IDENTIFIER",
         `Expected identifier after 'global :', got ${nameToken.type}`,
         { tokenType: nameToken.type }
@@ -2636,11 +2712,11 @@ var GlobalVariableAsyncResolver = class {
       const op = opcodes[i];
       if (op === 62 /* LOAD_GLOBAL_VAR */) {
         const varName = strings[opcodes[i + 1]];
-        if (!chunkBXKJLM5R_cjs.sharedGlobalVariableStore.has(varName)) {
+        if (!chunk6WFMPTGB_cjs.sharedGlobalVariableStore.has(varName)) {
           return this.pendingResultFor(varName, packageId, signal);
         }
       }
-      i = chunk4AVD7NZW_cjs.nextInstruction(opcodes, i);
+      i = chunk4B2CNWQU_cjs.nextInstruction(opcodes, i);
     }
     return null;
   }
@@ -2648,7 +2724,7 @@ var GlobalVariableAsyncResolver = class {
     let resolver = this.pending.get(varName);
     if (!resolver) {
       resolver = new Promise((resolve) => {
-        const unsubscribe = chunkBXKJLM5R_cjs.sharedGlobalVariableStore.subscribe((name, value) => {
+        const unsubscribe = chunk6WFMPTGB_cjs.sharedGlobalVariableStore.subscribe((name, value) => {
           if (name !== varName) return;
           unsubscribe();
           this.pending.delete(varName);
@@ -2695,12 +2771,12 @@ var VARIABLES_PACKAGE = {
 
 // src/packages/uom/parselets/UomLiteralParselet.ts
 function resolveUnitAlias(rawUnit) {
-  return chunk4CVLFLOB_cjs.resolveCurrencyAlias(rawUnit) ?? rawUnit;
+  return chunkUM6BVY2S_cjs.resolveCurrencyAlias(rawUnit) ?? rawUnit;
 }
 var UomLiteralParselet = class {
   constructor() {
     this.category = "UoM";
-    this.bindingPower = chunkNZFKROS7_cjs.BindingPower.Postfix;
+    this.bindingPower = chunkPA4VC73I_cjs.BindingPower.Postfix;
   }
   parse(parser, left, token, builder) {
     const unit = resolveUnitAlias(token.value);
@@ -2733,14 +2809,14 @@ var UomLiteralParselet = class {
 
 // src/packages/uom/parselets/ConvertParselet.ts
 function resolveUnitAlias2(rawUnit) {
-  return chunk4CVLFLOB_cjs.resolveCurrencyAlias(rawUnit) ?? rawUnit;
+  return chunkUM6BVY2S_cjs.resolveCurrencyAlias(rawUnit) ?? rawUnit;
 }
 var ConvertParselet = class {
   constructor() {
     this.category = "UoM";
   }
   parse(parser, token, builder) {
-    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Postfix, builder);
+    parser.parseExpression(chunkPA4VC73I_cjs.BindingPower.Postfix, builder);
     const nextToken = parser.peek();
     if (nextToken && nextToken.type === "UNIT") {
       parser.consume();
@@ -2805,7 +2881,7 @@ function uomPossibilitiesNormalizerRule(priority = 60) {
       if (questionToken.type !== "QUESTION") return null;
       return {
         consumed: 3,
-        replacement: [chunkAHCLWAM5_cjs.createFusedToken("UOM_POSSIBILITIES_QUERY", unitToken.value, [unitToken, toToken, questionToken])],
+        replacement: [chunkBHTNFEGZ_cjs.createFusedToken("UOM_POSSIBILITIES_QUERY", unitToken.value, [unitToken, toToken, questionToken])],
         ruleName: "uom:possibilities"
       };
     }
@@ -2820,7 +2896,7 @@ function unitEntry(token, previousKind) {
   if (spelling === "m" && previousKind === TIME_KIND2) {
     return { kind: TIME_KIND2, ratio: 60, spelling: "minutes" };
   }
-  const entry = chunkMBNQVDVC_cjs.UNIT_TABLE[spelling];
+  const entry = chunkAMOJYLG2_cjs.UNIT_TABLE[spelling];
   return entry === void 0 ? void 0 : { kind: entry[0], ratio: entry[1], spelling };
 }
 var PLAIN_NUMBER = /^\d+(\.\d+)?$/;
@@ -2857,8 +2933,8 @@ function compoundQuantityNormalizerRule(priority = 63) {
       return {
         consumed,
         replacement: [
-          chunkAHCLWAM5_cjs.createFusedToken("NUMBER", String(scaled), source),
-          chunkAHCLWAM5_cjs.createFusedToken("UNIT", smallestUnit, [smallestUnitToken])
+          chunkBHTNFEGZ_cjs.createFusedToken("NUMBER", String(scaled), source),
+          chunkBHTNFEGZ_cjs.createFusedToken("UNIT", smallestUnit, [smallestUnitToken])
         ],
         ruleName: "uom:compound-quantity"
       };
@@ -2869,7 +2945,7 @@ function compoundQuantityNormalizerRule(priority = 63) {
 // src/packages/uom/normalizer/TwoUnitConversionNormalizerRule.ts
 function isUnit(token) {
   if (token === void 0 || token.type !== "UNIT") return false;
-  return chunkMBNQVDVC_cjs.UNIT_TABLE[(token.value ?? "").toLowerCase()] !== void 0;
+  return chunkAMOJYLG2_cjs.UNIT_TABLE[(token.value ?? "").toLowerCase()] !== void 0;
 }
 function twoUnitConversionNormalizerRule(priority = 59) {
   return {
@@ -2886,7 +2962,7 @@ function twoUnitConversionNormalizerRule(priority = 59) {
       return {
         consumed: 4,
         replacement: [
-          chunkAHCLWAM5_cjs.createFusedToken("IN_TWO_UNITS", `${major} ${minor}`, tokens.slice(pos, pos + 4))
+          chunkBHTNFEGZ_cjs.createFusedToken("IN_TWO_UNITS", `${major} ${minor}`, tokens.slice(pos, pos + 4))
         ],
         ruleName: "uom:two-unit-conversion"
       };
@@ -2907,7 +2983,7 @@ function degreeSymbolNormalizerRule(priority = 74) {
       if ((symbol.text ?? symbol.value ?? "") !== "\xB0") return null;
       return {
         consumed: 2,
-        replacement: [number, chunkAHCLWAM5_cjs.createFusedToken("UNIT", "degrees", [symbol])],
+        replacement: [number, chunkBHTNFEGZ_cjs.createFusedToken("UNIT", "degrees", [symbol])],
         ruleName: "uom:degree-symbol"
       };
     }
@@ -2919,7 +2995,7 @@ var TwoUnitConversionParselet = class {
   constructor(builtinIndex) {
     this.builtinIndex = builtinIndex;
     this.category = "Uom";
-    this.bindingPower = chunkNZFKROS7_cjs.BindingPower.Conditional;
+    this.bindingPower = chunkPA4VC73I_cjs.BindingPower.Conditional;
   }
   parse(_parser, _left, token, builder) {
     const [major, minor] = String(token.value).split(" ");
@@ -2936,14 +3012,14 @@ var TwoUnitConversionParselet = class {
 // src/packages/uom/normalizer/BareRateDenominatorNormalizerRule.ts
 function isUnit2(token) {
   if (token === void 0 || token.type !== "UNIT") return false;
-  return chunkMBNQVDVC_cjs.UNIT_TABLE[(token.value ?? "").toLowerCase()] !== void 0;
+  return chunkAMOJYLG2_cjs.UNIT_TABLE[(token.value ?? "").toLowerCase()] !== void 0;
 }
 var PER_WORDS = /* @__PURE__ */ new Set(["per", "a", "an", "each", "every"]);
 function isCountLabel(token) {
   if (token === void 0 || token.type !== "IDENT") return false;
   const word = (token.text ?? token.value ?? "").toLowerCase();
   if (PER_WORDS.has(word)) return false;
-  return /^[a-z][a-z_]{2,}$/.test(word) && chunkMBNQVDVC_cjs.UNIT_TABLE[word] === void 0;
+  return /^[a-z][a-z_]{2,}$/.test(word) && chunkAMOJYLG2_cjs.UNIT_TABLE[word] === void 0;
 }
 function bareRateDenominatorNormalizerRule(priority = 75) {
   return {
@@ -2959,7 +3035,7 @@ function bareRateDenominatorNormalizerRule(priority = 75) {
         if (introduces && isUnit2(tokens[pos + 3])) {
           return {
             consumed: 2,
-            replacement: [head, chunkAHCLWAM5_cjs.createFusedToken("UNIT", label.value, [label])],
+            replacement: [head, chunkBHTNFEGZ_cjs.createFusedToken("UNIT", label.value, [label])],
             ruleName: "uom:bare-rate-denominator"
           };
         }
@@ -2973,7 +3049,7 @@ function bareRateDenominatorNormalizerRule(priority = 75) {
       return {
         consumed: 2,
         replacement: [
-          chunkAHCLWAM5_cjs.createFusedToken("PER_UNIT", unitToken.value, [head, unitToken])
+          chunkBHTNFEGZ_cjs.createFusedToken("PER_UNIT", unitToken.value, [head, unitToken])
         ],
         ruleName: "uom:bare-rate-denominator"
       };
@@ -2986,7 +3062,7 @@ var PerUnitParselet = class {
   constructor(builtinIndex) {
     this.builtinIndex = builtinIndex;
     this.category = "Uom";
-    this.bindingPower = chunkNZFKROS7_cjs.BindingPower.Product;
+    this.bindingPower = chunkPA4VC73I_cjs.BindingPower.Product;
   }
   parse(_parser, _left, token, builder) {
     builder.emitOpcode(13 /* PUSH_STRING */);
@@ -3002,10 +3078,10 @@ var AtRateParselet = class {
   constructor(builtinIndex) {
     this.builtinIndex = builtinIndex;
     this.category = "Uom";
-    this.bindingPower = chunkNZFKROS7_cjs.BindingPower.Product;
+    this.bindingPower = chunkPA4VC73I_cjs.BindingPower.Product;
   }
   parse(parser, _left, _token, builder) {
-    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Conditional, builder);
+    parser.parseExpression(chunkPA4VC73I_cjs.BindingPower.Conditional, builder);
     builder.emitOpcode(51 /* CALL_BUILTIN */);
     builder.emitIndex(this.builtinIndex);
     builder.emitIndex(2);
@@ -3015,7 +3091,7 @@ var AtRateParselet = class {
 // src/packages/uom/normalizer/AtRateNormalizerRule.ts
 function isUnit3(token) {
   if (token === void 0 || token.type !== "UNIT") return false;
-  return chunkMBNQVDVC_cjs.UNIT_TABLE[(token.value ?? "").toLowerCase()] !== void 0;
+  return chunkAMOJYLG2_cjs.UNIT_TABLE[(token.value ?? "").toLowerCase()] !== void 0;
 }
 var PER_WORDS2 = /* @__PURE__ */ new Set(["per", "a", "an", "each", "every"]);
 function hasRateAhead(tokens, from) {
@@ -3038,7 +3114,7 @@ function atRateNormalizerRule(priority = 73) {
       if (!hasRateAhead(tokens, pos + 1)) return null;
       return {
         consumed: 1,
-        replacement: [chunkAHCLWAM5_cjs.createFusedToken("AT_RATE", "at", [tokens[pos]])],
+        replacement: [chunkBHTNFEGZ_cjs.createFusedToken("AT_RATE", "at", [tokens[pos]])],
         ruleName: "uom:at-rate"
       };
     }
@@ -3048,7 +3124,7 @@ function atRateNormalizerRule(priority = 73) {
 // src/packages/uom/normalizer/ForDurationNormalizerRule.ts
 function isUnit4(token) {
   if (token === void 0 || token.type !== "UNIT") return false;
-  return chunkMBNQVDVC_cjs.UNIT_TABLE[(token.value ?? "").toLowerCase()] !== void 0;
+  return chunkAMOJYLG2_cjs.UNIT_TABLE[(token.value ?? "").toLowerCase()] !== void 0;
 }
 var ARTICLES = /* @__PURE__ */ new Set(["a", "an"]);
 function forDurationNormalizerRule(priority = 76) {
@@ -3065,8 +3141,8 @@ function forDurationNormalizerRule(priority = 76) {
       return {
         consumed: 3,
         replacement: [
-          chunkAHCLWAM5_cjs.createFusedToken("STAR", "*", [head]),
-          chunkAHCLWAM5_cjs.createFusedToken("NUMBER", "1", [article]),
+          chunkBHTNFEGZ_cjs.createFusedToken("STAR", "*", [head]),
+          chunkBHTNFEGZ_cjs.createFusedToken("NUMBER", "1", [article]),
           tokens[pos + 2]
         ],
         ruleName: "uom:for-duration"
@@ -3078,7 +3154,7 @@ function forDurationNormalizerRule(priority = 76) {
 // src/packages/uom/normalizer/ReversedConversionNormalizerRule.ts
 function isUnit5(token) {
   if (token === void 0 || token.type !== "UNIT") return false;
-  return chunkMBNQVDVC_cjs.UNIT_TABLE[(token.value ?? "").toLowerCase()] !== void 0;
+  return chunkAMOJYLG2_cjs.UNIT_TABLE[(token.value ?? "").toLowerCase()] !== void 0;
 }
 var ARTICLES2 = /* @__PURE__ */ new Set(["a", "an"]);
 function reversedConversionNormalizerRule(priority = 61) {
@@ -3103,7 +3179,7 @@ function reversedConversionNormalizerRule(priority = 61) {
         return {
           consumed: 4,
           replacement: [
-            chunkAHCLWAM5_cjs.createFusedToken("NUMBER", "1", [third]),
+            chunkBHTNFEGZ_cjs.createFusedToken("NUMBER", "1", [third]),
             tokens[pos + 3],
             tokens[pos + 1],
             target
@@ -3212,54 +3288,54 @@ function getIngredientDensity(name) {
 }
 
 // src/packages/uom/parselets/CookingPluginFunctions.ts
-var COOKING_CONVERT_IDX = chunkBXKJLM5R_cjs.allocatePluginFunctionIndex();
+var COOKING_CONVERT_IDX = chunk6WFMPTGB_cjs.allocatePluginFunctionIndex();
 function cookingConvertHandler(args) {
   const amountValue = args[0];
   const ingredientName = args[1].value;
   const targetUnitText = args[2].value;
   if (amountValue.type !== 6 /* Uom */ || !amountValue.unit) {
-    return chunkOC6LTXYS_cjs.errorValue(
+    return chunkJMXUNXQS_cjs.errorValue(
       "COOKING_CONVERSION_REQUIRES_UNIT",
       `Expected a value with a mass or volume unit (e.g. "300g", "10 cups"), got a plain number`
     );
   }
   const sourceUnit = amountValue.unit;
   const amount = amountValue.toNumber();
-  const sourceMeasure = chunkNJTXJ5AG_cjs.getMeasure(sourceUnit);
-  const targetMeasure = chunkNJTXJ5AG_cjs.getMeasure(targetUnitText);
+  const sourceMeasure = chunkPFUESQTW_cjs.getMeasure(sourceUnit);
+  const targetMeasure = chunkPFUESQTW_cjs.getMeasure(targetUnitText);
   const isMassOrVolume = (m) => m === "mass" || m === "volume";
   if (!isMassOrVolume(sourceMeasure)) {
-    return chunkOC6LTXYS_cjs.errorValue(
+    return chunkJMXUNXQS_cjs.errorValue(
       "COOKING_CONVERSION_UNSUPPORTED_UNIT",
       `"${sourceUnit}" is not a recognized mass or volume unit`
     );
   }
   if (!isMassOrVolume(targetMeasure)) {
-    return chunkOC6LTXYS_cjs.errorValue(
+    return chunkJMXUNXQS_cjs.errorValue(
       "COOKING_CONVERSION_UNSUPPORTED_UNIT",
       `"${targetUnitText}" is not a recognized mass or volume unit`
     );
   }
   if (sourceMeasure === targetMeasure) {
-    return chunkOC6LTXYS_cjs.uomValue(chunkNJTXJ5AG_cjs.convertUnit(amount, sourceUnit, targetUnitText), targetUnitText);
+    return chunkJMXUNXQS_cjs.uomValue(chunkPFUESQTW_cjs.convertUnit(amount, sourceUnit, targetUnitText), targetUnitText);
   }
   const density = getIngredientDensity(ingredientName);
   if (density === void 0) {
-    return chunkOC6LTXYS_cjs.errorValue(
+    return chunkJMXUNXQS_cjs.errorValue(
       "COOKING_UNKNOWN_INGREDIENT",
       `No density data for "${ingredientName}" \u2014 cannot convert between mass and volume for this ingredient`
     );
   }
   if (sourceMeasure === "mass") {
-    const grams2 = chunkNJTXJ5AG_cjs.convertUnit(amount, sourceUnit, "g");
+    const grams2 = chunkPFUESQTW_cjs.convertUnit(amount, sourceUnit, "g");
     const mL2 = grams2 / density;
-    const result2 = chunkNJTXJ5AG_cjs.convertUnit(mL2, "ml", targetUnitText);
-    return chunkOC6LTXYS_cjs.uomValue(result2, targetUnitText);
+    const result2 = chunkPFUESQTW_cjs.convertUnit(mL2, "ml", targetUnitText);
+    return chunkJMXUNXQS_cjs.uomValue(result2, targetUnitText);
   }
-  const mL = chunkNJTXJ5AG_cjs.convertUnit(amount, sourceUnit, "ml");
+  const mL = chunkPFUESQTW_cjs.convertUnit(amount, sourceUnit, "ml");
   const grams = mL * density;
-  const result = chunkNJTXJ5AG_cjs.convertUnit(grams, "g", targetUnitText);
-  return chunkOC6LTXYS_cjs.uomValue(result, targetUnitText);
+  const result = chunkPFUESQTW_cjs.convertUnit(grams, "g", targetUnitText);
+  return chunkJMXUNXQS_cjs.uomValue(result, targetUnitText);
 }
 
 // src/packages/uom/parselets/CookingConversionParselet.ts
@@ -3302,7 +3378,7 @@ function ingredientNameNormalizerRule(priority = 68) {
         const candidate = candidateTokens.map((t) => t.value.toLowerCase()).join(" ");
         return {
           consumed: wordCount,
-          replacement: [chunkAHCLWAM5_cjs.createFusedToken("INGREDIENT_NAME", candidate, candidateTokens)],
+          replacement: [chunkBHTNFEGZ_cjs.createFusedToken("INGREDIENT_NAME", candidate, candidateTokens)],
           ruleName: "uom-cooking:ingredient-name"
         };
       }
@@ -3311,6 +3387,27 @@ function ingredientNameNormalizerRule(priority = 68) {
   };
 }
 
+// src/packages/uom/normalizer/MultiWordUnitNormalizerRule.ts
+function multiWordUnitNormalizerRule(priority = 78) {
+  return {
+    name: "uom:multi-word-unit",
+    priority,
+    match(tokens, pos) {
+      const first = tokens[pos];
+      const second = tokens[pos + 1];
+      if (first?.type !== "UNIT" || second?.type !== "UNIT") return null;
+      if (first.offset + first.text.length + 1 !== second.offset) return null;
+      const spelling = `${first.value} ${second.value}`;
+      if (chunkAMOJYLG2_cjs.UNIT_TABLE[spelling] === void 0) return null;
+      return {
+        consumed: 2,
+        replacement: [chunkBHTNFEGZ_cjs.createFusedToken("UNIT", spelling, tokens.slice(pos, pos + 2))],
+        ruleName: "uom:multi-word-unit"
+      };
+    }
+  };
+}
+
 // src/packages/uom/UomPackage.ts
 var UOM_PACKAGE = {
   name: "solve-uom",
@@ -3326,6 +3423,9 @@ var UOM_PACKAGE = {
     { tokenType: "INGREDIENT_NAME", parselet: new CookingConversionParselet() }
   ],
   normalizerRules: [
+    // Highest priority of the unit rules: a two-word spelling has to become one
+    // token before anything else reads the first word as a unit on its own.
+    multiWordUnitNormalizerRule(),
     uomPossibilitiesNormalizerRule(),
     compoundQuantityNormalizerRule(),
     twoUnitConversionNormalizerRule(),
@@ -3347,8 +3447,8 @@ var CurrencySymbolParselet = class {
     this.category = "UoM";
   }
   parse(parser, token, builder) {
-    const currency = chunk4CVLFLOB_cjs.resolveCurrencyAlias(token.value) ?? token.value.toUpperCase();
-    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Prefix, builder);
+    const currency = chunkUM6BVY2S_cjs.resolveCurrencyAlias(token.value) ?? token.value.toUpperCase();
+    parser.parseExpression(chunkPA4VC73I_cjs.BindingPower.Prefix, builder);
     if (parser.peek()?.type === "UNIT") {
       parser.consume();
     }
@@ -3369,7 +3469,7 @@ var InParselet = class {
     if (targetToken && (targetToken.type === "UNIT" || targetToken.type === "DOLLAR" || targetToken.type === "POUND" || targetToken.type === "EURO" || targetToken.type === "YEN" || targetToken.type === "RUBLE" || targetToken.type === "WON" || targetToken.type === "CURRENCY_SYMBOL" || targetToken.type === "IDENT" || targetToken.type === "IN")) {
       parser.consume();
       builder.emitOpcode(13 /* PUSH_STRING */);
-      builder.emitString(chunk4CVLFLOB_cjs.resolveCurrencyAlias(targetToken.value) ?? targetToken.value);
+      builder.emitString(chunkUM6BVY2S_cjs.resolveCurrencyAlias(targetToken.value) ?? targetToken.value);
       builder.emitOpcode(84 /* UOM_CONVERT_IN */);
     }
   }
@@ -3378,7 +3478,7 @@ var InParselet = class {
 // src/packages/currency/CurrencyPackage.ts
 var CURRENCY_PACKAGE = {
   name: "solve-currency",
-  asyncResolvers: [new chunk4AVD7NZW_cjs.CurrencyAsyncResolver()],
+  asyncResolvers: [new chunk4B2CNWQU_cjs.CurrencyAsyncResolver()],
   prefixParselets: [
     { tokenType: "DOLLAR", parselet: new CurrencySymbolParselet() },
     { tokenType: "POUND", parselet: new CurrencySymbolParselet() },
@@ -3454,7 +3554,7 @@ var MatrixLiteralParselet = class {
     let rows = 0;
     let cols = -1;
     if (parser.peek()?.type === "RBRACKET") {
-      throw chunkM4N5GA5Z_cjs.ErrorFactory.parsing(
+      throw chunk5KMIY374_cjs.ErrorFactory.parsing(
         "EMPTY_MATRIX_LITERAL",
         "A matrix literal cannot be empty \u2014 `[]` has no valid shape.",
         {}
@@ -3471,7 +3571,7 @@ var MatrixLiteralParselet = class {
       if (cols === -1) {
         cols = rowCols;
       } else if (rowCols !== cols) {
-        throw chunkM4N5GA5Z_cjs.ErrorFactory.parsing(
+        throw chunk5KMIY374_cjs.ErrorFactory.parsing(
           "RAGGED_MATRIX_LITERAL",
           `Matrix literal rows must all have the same number of columns \u2014 row ${rows + 1} has ${rowCols}, but a previous row has ${cols}.`,
           { expectedCols: cols, actualCols: rowCols, row: rows + 1 }
@@ -3491,7 +3591,7 @@ var MatrixLiteralParselet = class {
 var MatrixIndexParselet = class {
   constructor() {
     this.category = "Matrix";
-    this.bindingPower = chunkNZFKROS7_cjs.BindingPower.Postfix;
+    this.bindingPower = chunkPA4VC73I_cjs.BindingPower.Postfix;
   }
   parse(parser, _left, _token, builder) {
     const isSlice = this.hasTopLevelColon(parser);
@@ -3511,7 +3611,7 @@ var MatrixIndexParselet = class {
       return;
     }
     if (argCount !== 2) {
-      throw chunkM4N5GA5Z_cjs.ErrorFactory.parsing(
+      throw chunk5KMIY374_cjs.ErrorFactory.parsing(
         "INVALID_MATRIX_SLICE_ARITY",
         `Range-based matrix slicing needs exactly 2 arguments ("a[rowRange, colRange]"), got ${argCount}.`,
         { argCount }
@@ -3594,12 +3694,12 @@ function parseTransform(parser, builder) {
     }
     return { kind: 2, name };
   }
-  const transformBuilder = new chunkNZFKROS7_cjs.BytecodeBuilder();
-  parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, transformBuilder);
+  const transformBuilder = new chunkPA4VC73I_cjs.BytecodeBuilder();
+  parser.parseExpression(chunkPA4VC73I_cjs.BindingPower.Lowest, transformBuilder);
   parser.setBuilder(builder);
   const program = transformBuilder.build();
   if (program.hasAsync) {
-    throw chunkM4N5GA5Z_cjs.ErrorFactory.parsing(
+    throw chunk5KMIY374_cjs.ErrorFactory.parsing(
       "MAP_REDUCE_TRANSFORM_MUST_BE_SYNCHRONOUS",
       `map/reduce transform expressions must be synchronous (no weather/stocks/currency calls).`
     );
@@ -3617,7 +3717,7 @@ function consumeCollectionName(parser) {
     parser.consume();
     return token.value;
   }
-  throw chunkM4N5GA5Z_cjs.ErrorFactory.parsing(
+  throw chunk5KMIY374_cjs.ErrorFactory.parsing(
     "MAP_REDUCE_EXPECTED_COLLECTION_NAME",
     `Expected a collection name (e.g. "x" in "x=[1,2,3]") but got ${token ? `"${token.value}"` : "end of input"}.`
   );
@@ -3681,7 +3781,7 @@ var ReduceParselet = class {
     parseCollectionExpr(parser, builder);
     let hasInitial = 0;
     if (parser.match("COMMA")) {
-      parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
+      parser.parseExpression(chunkPA4VC73I_cjs.BindingPower.Lowest, builder);
       hasInitial = 1;
     }
     parser.consume("RPAREN");
@@ -3696,15 +3796,15 @@ var SumParselet = class {
   }
   parse(parser, _token, builder) {
     parser.consume("LPAREN");
-    const bodyBuilder = new chunkNZFKROS7_cjs.BytecodeBuilder();
+    const bodyBuilder = new chunkPA4VC73I_cjs.BytecodeBuilder();
     bodyBuilder.emitOpcode(60 /* LOAD_VAR */);
     bodyBuilder.emitString("acc");
-    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, bodyBuilder);
+    parser.parseExpression(chunkPA4VC73I_cjs.BindingPower.Lowest, bodyBuilder);
     parser.setBuilder(builder);
     bodyBuilder.emitOpcode(20 /* ADD */);
     const bodyProgram = bodyBuilder.build();
     if (bodyProgram.hasAsync) {
-      throw chunkM4N5GA5Z_cjs.ErrorFactory.parsing(
+      throw chunk5KMIY374_cjs.ErrorFactory.parsing(
         "MAP_REDUCE_TRANSFORM_MUST_BE_SYNCHRONOUS",
         `sum's element expression must be synchronous (no weather/stocks/currency calls).`
       );
@@ -3712,7 +3812,9 @@ var SumParselet = class {
     parser.consume("COMMA");
     parseCollectionExpr(parser, builder);
     parser.consume("RPAREN");
-    emitInvoke(builder, 158 /* REDUCE_INVOKE */, { kind: 0, program: bodyProgram }, ["acc", "x"], 0);
+    builder.emitOpcode(10 /* PUSH_NUMBER */);
+    builder.emitNumber(0);
+    emitInvoke(builder, 158 /* REDUCE_INVOKE */, { kind: 0, program: bodyProgram }, ["acc", "x"], 1);
   }
 };
 
@@ -3723,15 +3825,15 @@ var ProdParselet = class {
   }
   parse(parser, _token, builder) {
     parser.consume("LPAREN");
-    const bodyBuilder = new chunkNZFKROS7_cjs.BytecodeBuilder();
+    const bodyBuilder = new chunkPA4VC73I_cjs.BytecodeBuilder();
     bodyBuilder.emitOpcode(60 /* LOAD_VAR */);
     bodyBuilder.emitString("acc");
-    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, bodyBuilder);
+    parser.parseExpression(chunkPA4VC73I_cjs.BindingPower.Lowest, bodyBuilder);
     parser.setBuilder(builder);
     bodyBuilder.emitOpcode(22 /* MUL */);
     const bodyProgram = bodyBuilder.build();
     if (bodyProgram.hasAsync) {
-      throw chunkM4N5GA5Z_cjs.ErrorFactory.parsing(
+      throw chunk5KMIY374_cjs.ErrorFactory.parsing(
         "MAP_REDUCE_TRANSFORM_MUST_BE_SYNCHRONOUS",
         `prod's element expression must be synchronous (no weather/stocks/currency calls).`
       );
@@ -3739,7 +3841,9 @@ var ProdParselet = class {
     parser.consume("COMMA");
     parseCollectionExpr(parser, builder);
     parser.consume("RPAREN");
-    emitInvoke(builder, 158 /* REDUCE_INVOKE */, { kind: 0, program: bodyProgram }, ["acc", "x"], 0);
+    builder.emitOpcode(10 /* PUSH_NUMBER */);
+    builder.emitNumber(1);
+    emitInvoke(builder, 158 /* REDUCE_INVOKE */, { kind: 0, program: bodyProgram }, ["acc", "x"], 1);
   }
 };
 
@@ -3774,7 +3878,7 @@ function mapReduceCallNormalizerRule(priority = 80) {
       return {
         consumed: 1,
         replacement: [
-          new chunkM4F66R4O_cjs.LexerToken(tokenType, chunkR24DI24X_cjs.tokenTypeId(tokenType), token.value, token.value, token.offset, 0, token.line, token.col)
+          new chunkYWQ6V4ZN_cjs.LexerToken(tokenType, chunk5LI5EPGJ_cjs.tokenTypeId(tokenType), token.value, token.value, token.offset, 0, token.line, token.col)
         ],
         ruleName: "mapreduce:call"
       };
@@ -3816,7 +3920,7 @@ var ExpandParselet = class {
   }
   parse(parser, _token, builder) {
     parser.consume("LPAREN");
-    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
+    parser.parseExpression(chunkPA4VC73I_cjs.BindingPower.Lowest, builder);
     parser.consume("RPAREN");
     builder.emitOpcode(51 /* CALL_BUILTIN */);
     builder.emitIndex(SYMBOLIC_BUILTIN_EXPAND);
@@ -3831,7 +3935,7 @@ var FactorParselet = class {
   }
   parse(parser, _token, builder) {
     parser.consume("LPAREN");
-    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
+    parser.parseExpression(chunkPA4VC73I_cjs.BindingPower.Lowest, builder);
     parser.consume("RPAREN");
     builder.emitOpcode(51 /* CALL_BUILTIN */);
     builder.emitIndex(SYMBOLIC_BUILTIN_FACTOR);
@@ -3839,6 +3943,42 @@ var FactorParselet = class {
   }
 };
 
+// src/packages/symbolic/parselets/VariableArgument.ts
+function readVariableName(parser, verb) {
+  const token = parser.peek();
+  if (!token || token.type !== "IDENT" && token.type !== "UNIT") {
+    throw chunk5KMIY374_cjs.ErrorFactory.parsing(
+      "SYMBOLIC_REQUIRES_VARIABLE_NAME",
+      `${verb} needs the name of an unknown here, as in ${verb}(x^2, x).`,
+      { found: token?.type ?? "end of input" }
+    );
+  }
+  parser.consume();
+  return token.value;
+}
+function emitVariableName(builder, name) {
+  builder.emitOpcode(13 /* PUSH_STRING */);
+  builder.emitString(name);
+}
+function parseBoundExpression(parser, builder, verb) {
+  const inner = new chunkPA4VC73I_cjs.BytecodeBuilder();
+  parser.parseExpression(chunkPA4VC73I_cjs.BindingPower.Lowest, inner);
+  parser.setBuilder(builder);
+  const program = inner.build();
+  if (program.hasAsync) {
+    throw chunk5KMIY374_cjs.ErrorFactory.parsing(
+      "SYMBOLIC_ARGUMENT_MUST_BE_SYNCHRONOUS",
+      `${verb}'s expression must be synchronous (no weather/stocks/currency calls).`
+    );
+  }
+  return program;
+}
+function emitBoundExpression(builder, program, name) {
+  const index = builder.emitAnonymousBody([name], program);
+  builder.emitOpcode(159 /* BIND_UNKNOWN */);
+  builder.emitIndex(index);
+}
+
 // src/packages/symbolic/parselets/SolveParselet.ts
 var SolveParselet = class {
   constructor() {
@@ -3846,25 +3986,26 @@ var SolveParselet = class {
   }
   parse(parser, _token, builder) {
     parser.consume("LPAREN");
-    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
-    if (parser.match("EQUALS")) {
-      parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
-    } else {
-      builder.emitOpcode(10 /* PUSH_NUMBER */);
-      builder.emitNumber(0);
-    }
+    const left = parseBoundExpression(parser, builder, "solve");
+    const right = parser.match("EQUALS") ? parseBoundExpression(parser, builder, "solve") : null;
     parser.consume("COMMA");
     const variable = parser.peek();
     if (!variable || variable.type !== "IDENT" && variable.type !== "UNIT") {
-      throw chunkM4N5GA5Z_cjs.ErrorFactory.parsing(
+      throw chunk5KMIY374_cjs.ErrorFactory.parsing(
         "SOLVE_REQUIRES_VARIABLE_NAME",
         `solve's second argument must be the name of the unknown to solve for, as in solve(x^2-4=0, x).`,
         { found: variable?.type ?? "end of input" }
       );
     }
     parser.consume();
-    builder.emitOpcode(13 /* PUSH_STRING */);
-    builder.emitString(variable.value);
+    emitBoundExpression(builder, left, variable.value);
+    if (right) {
+      emitBoundExpression(builder, right, variable.value);
+    } else {
+      builder.emitOpcode(10 /* PUSH_NUMBER */);
+      builder.emitNumber(0);
+    }
+    emitVariableName(builder, variable.value);
     parser.consume("RPAREN");
     builder.emitOpcode(51 /* CALL_BUILTIN */);
     builder.emitIndex(SYMBOLIC_BUILTIN_SOLVE);
@@ -3872,21 +4013,6 @@ var SolveParselet = class {
   }
 };
 
-// src/packages/symbolic/parselets/VariableArgument.ts
-function consumeVariableName(parser, builder, verb) {
-  const token = parser.peek();
-  if (!token || token.type !== "IDENT" && token.type !== "UNIT") {
-    throw chunkM4N5GA5Z_cjs.ErrorFactory.parsing(
-      "SYMBOLIC_REQUIRES_VARIABLE_NAME",
-      `${verb} needs the name of an unknown here, as in ${verb}(x^2, x).`,
-      { found: token?.type ?? "end of input" }
-    );
-  }
-  parser.consume();
-  builder.emitOpcode(13 /* PUSH_STRING */);
-  builder.emitString(token.value);
-}
-
 // src/packages/symbolic/parselets/DerParselet.ts
 var DerParselet = class {
   constructor() {
@@ -3894,11 +4020,13 @@ var DerParselet = class {
   }
   parse(parser, _token, builder) {
     parser.consume("LPAREN");
-    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
+    const expression = parseBoundExpression(parser, builder, "der");
     parser.consume("COMMA");
-    consumeVariableName(parser, builder, "der");
+    const variable = readVariableName(parser, "der");
+    emitBoundExpression(builder, expression, variable);
+    emitVariableName(builder, variable);
     if (parser.match("COMMA")) {
-      parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
+      parser.parseExpression(chunkPA4VC73I_cjs.BindingPower.Lowest, builder);
     } else {
       builder.emitOpcode(10 /* PUSH_NUMBER */);
       builder.emitNumber(1);
@@ -3917,9 +4045,11 @@ var IntegralParselet = class {
   }
   parse(parser, _token, builder) {
     parser.consume("LPAREN");
-    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
+    const expression = parseBoundExpression(parser, builder, "integral");
     parser.consume("COMMA");
-    consumeVariableName(parser, builder, "integral");
+    const variable = readVariableName(parser, "integral");
+    emitBoundExpression(builder, expression, variable);
+    emitVariableName(builder, variable);
     parser.consume("RPAREN");
     builder.emitOpcode(51 /* CALL_BUILTIN */);
     builder.emitIndex(SYMBOLIC_BUILTIN_INTEGRAL);
@@ -3934,13 +4064,15 @@ var TaylorParselet = class {
   }
   parse(parser, _token, builder) {
     parser.consume("LPAREN");
-    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
+    const expression = parseBoundExpression(parser, builder, "taylor");
     parser.consume("COMMA");
-    consumeVariableName(parser, builder, "taylor");
+    const variable = readVariableName(parser, "taylor");
+    emitBoundExpression(builder, expression, variable);
+    emitVariableName(builder, variable);
     parser.consume("EQUALS");
-    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
+    parser.parseExpression(chunkPA4VC73I_cjs.BindingPower.Lowest, builder);
     parser.consume("COMMA");
-    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
+    parser.parseExpression(chunkPA4VC73I_cjs.BindingPower.Lowest, builder);
     parser.consume("RPAREN");
     builder.emitOpcode(51 /* CALL_BUILTIN */);
     builder.emitIndex(SYMBOLIC_BUILTIN_TAYLOR);
@@ -3957,7 +4089,7 @@ var JacobianParselet = class {
     parser.consume("LPAREN");
     let count = 0;
     do {
-      parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
+      parser.parseExpression(chunkPA4VC73I_cjs.BindingPower.Lowest, builder);
       count++;
     } while (parser.match("COMMA"));
     parser.consume("RPAREN");
@@ -3988,7 +4120,7 @@ var ConjParselet = class {
   }
   parse(parser, _token, builder) {
     parser.consume("LPAREN");
-    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
+    parser.parseExpression(chunkPA4VC73I_cjs.BindingPower.Lowest, builder);
     parser.consume("RPAREN");
     builder.emitOpcode(51 /* CALL_BUILTIN */);
     builder.emitIndex(SYMBOLIC_BUILTIN_CONJ);
@@ -4003,7 +4135,7 @@ var ReParselet = class {
   }
   parse(parser, _token, builder) {
     parser.consume("LPAREN");
-    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
+    parser.parseExpression(chunkPA4VC73I_cjs.BindingPower.Lowest, builder);
     parser.consume("RPAREN");
     builder.emitOpcode(51 /* CALL_BUILTIN */);
     builder.emitIndex(SYMBOLIC_BUILTIN_RE);
@@ -4018,7 +4150,7 @@ var ImParselet = class {
   }
   parse(parser, _token, builder) {
     parser.consume("LPAREN");
-    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
+    parser.parseExpression(chunkPA4VC73I_cjs.BindingPower.Lowest, builder);
     parser.consume("RPAREN");
     builder.emitOpcode(51 /* CALL_BUILTIN */);
     builder.emitIndex(SYMBOLIC_BUILTIN_IM);
@@ -4033,7 +4165,7 @@ var CancelParselet = class {
   }
   parse(parser, _token, builder) {
     parser.consume("LPAREN");
-    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
+    parser.parseExpression(chunkPA4VC73I_cjs.BindingPower.Lowest, builder);
     parser.consume("RPAREN");
     builder.emitOpcode(51 /* CALL_BUILTIN */);
     builder.emitIndex(SYMBOLIC_BUILTIN_CANCEL);
@@ -4048,7 +4180,7 @@ var ApartParselet = class {
   }
   parse(parser, _token, builder) {
     parser.consume("LPAREN");
-    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
+    parser.parseExpression(chunkPA4VC73I_cjs.BindingPower.Lowest, builder);
     parser.consume("RPAREN");
     builder.emitOpcode(51 /* CALL_BUILTIN */);
     builder.emitIndex(SYMBOLIC_BUILTIN_APART);
@@ -4071,9 +4203,9 @@ function imaginaryLiteralNormalizerRule(priority = 75) {
       return {
         consumed: 2,
         replacement: [
-          new chunkM4F66R4O_cjs.LexerToken(
+          new chunkYWQ6V4ZN_cjs.LexerToken(
             "IMAGINARY",
-            chunkR24DI24X_cjs.tokenTypeId("IMAGINARY"),
+            chunk5LI5EPGJ_cjs.tokenTypeId("IMAGINARY"),
             number.value,
             number.value,
             number.offset,
@@ -4117,7 +4249,7 @@ function symbolicCallNormalizerRule(priority = 80) {
       return {
         consumed: 1,
         replacement: [
-          new chunkM4F66R4O_cjs.LexerToken(tokenType, chunkR24DI24X_cjs.tokenTypeId(tokenType), token.value, token.value, token.offset, 0, token.line, token.col)
+          new chunkYWQ6V4ZN_cjs.LexerToken(tokenType, chunk5LI5EPGJ_cjs.tokenTypeId(tokenType), token.value, token.value, token.offset, 0, token.line, token.col)
         ],
         ruleName: "symbolic:call"
       };
@@ -4269,10 +4401,8 @@ var BigIntNumberParselet = class {
     this.category = "BigInt";
   }
   parse(parser, token, builder) {
-    let raw = token.value;
-    if (raw.endsWith("n")) raw = raw.slice(0, -1);
     builder.emitOpcode(11 /* PUSH_BIGINT */);
-    builder.emitString(raw);
+    builder.emitString(chunkPA4VC73I_cjs.bigIntLiteralDigits(token.value, parser.getLocaleCode()));
   }
 };
 
@@ -4289,7 +4419,7 @@ var ComparisonParselet = class {
   constructor(opcode) {
     this.opcode = opcode;
     this.category = "Conditionals";
-    this.bindingPower = chunkNZFKROS7_cjs.BindingPower.Conditional;
+    this.bindingPower = chunkPA4VC73I_cjs.BindingPower.Conditional;
   }
   parse(parser, left, token, builder) {
     parser.parseExpression(this.bindingPower, builder);
@@ -4352,9 +4482,9 @@ var CONDITIONALS_PACKAGE = {
     { tokenType: "GT", parselet: new ComparisonParselet(44 /* GT */) },
     { tokenType: "LTE", parselet: new ComparisonParselet(43 /* LTE */) },
     { tokenType: "GTE", parselet: new ComparisonParselet(45 /* GTE */) },
-    { tokenType: "OR", parselet: new LogicalParselet(131 /* LOGICAL_OR */, chunkNZFKROS7_cjs.BindingPower.LogicalOr) },
-    { tokenType: "LOGICAL_AND", parselet: new LogicalParselet(130 /* LOGICAL_AND */, chunkNZFKROS7_cjs.BindingPower.LogicalAnd) },
-    { tokenType: "LOGICAL_OR", parselet: new LogicalParselet(131 /* LOGICAL_OR */, chunkNZFKROS7_cjs.BindingPower.LogicalOr) }
+    { tokenType: "OR", parselet: new LogicalParselet(131 /* LOGICAL_OR */, chunkPA4VC73I_cjs.BindingPower.LogicalOr) },
+    { tokenType: "LOGICAL_AND", parselet: new LogicalParselet(130 /* LOGICAL_AND */, chunkPA4VC73I_cjs.BindingPower.LogicalAnd) },
+    { tokenType: "LOGICAL_OR", parselet: new LogicalParselet(131 /* LOGICAL_OR */, chunkPA4VC73I_cjs.BindingPower.LogicalOr) }
   ]
 };
 
@@ -4386,7 +4516,7 @@ var BASE_CONVERTERS = {
 var AsConverterParselet = class {
   constructor() {
     this.category = "Converters";
-    this.bindingPower = chunkNZFKROS7_cjs.BindingPower.Conditional;
+    this.bindingPower = chunkPA4VC73I_cjs.BindingPower.Conditional;
   }
   parse(parser, left, token, builder) {
     const nextToken = parser.peek();
@@ -4396,7 +4526,7 @@ var AsConverterParselet = class {
       return;
     }
     if (!nextToken || nextToken.type !== "CONVERTER_NAME" && nextToken.type !== "IDENT" && nextToken.type !== "FUNC" && nextToken.type !== "UNIT") {
-      throw chunkM4N5GA5Z_cjs.ErrorFactory.parsing(
+      throw chunk5KMIY374_cjs.ErrorFactory.parsing(
         "AS_CONVERTER_EXPECTED_NAME",
         `Expected a converter name after "as" (e.g. "as hex", "as decimal") but got ${nextToken ? `"${nextToken.value}"` : "end of input"}`
       );
@@ -4408,7 +4538,7 @@ var AsConverterParselet = class {
       const radix = radixToken?.type === "NUMBER" ? Number(radixToken.value) : NaN;
       const opcode = BASE_CONVERTERS[radix];
       if (opcode === void 0) {
-        throw chunkM4N5GA5Z_cjs.ErrorFactory.parsing(
+        throw chunk5KMIY374_cjs.ErrorFactory.parsing(
           "AS_CONVERTER_UNSUPPORTED_BASE",
           `"as base ${radixToken?.value ?? "?"}": only bases ${Object.keys(BASE_CONVERTERS).join(", ")} can be written out`
         );
@@ -4420,7 +4550,7 @@ var AsConverterParselet = class {
     const builtinOp = BUILTIN_CONVERTERS[name];
     if (builtinOp !== void 0) {
       if (builtinOp === 141 /* TO_MULTIPLIER */ && parser.match("OF")) {
-        parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Conditional, builder);
+        parser.parseExpression(chunkPA4VC73I_cjs.BindingPower.Conditional, builder);
         builder.emitOpcode(23 /* DIV */);
       }
       builder.emitOpcode(builtinOp);
@@ -4458,6 +4588,7 @@ function emitRoundDirection(builder, direction) {
 var ROUND_BUILTIN = 8;
 var CEIL_BUILTIN = 6;
 var FLOOR_BUILTIN = 7;
+var ROUND_TO_PLACES_BUILTIN = 97;
 function readDirection(parser) {
   const next = parser.peek();
   const word = (next?.text ?? "").toLowerCase();
@@ -4474,7 +4605,7 @@ function readDirection(parser) {
 var RoundedParselet = class {
   constructor() {
     this.category = "Converters";
-    this.bindingPower = chunkNZFKROS7_cjs.BindingPower.Conditional;
+    this.bindingPower = chunkPA4VC73I_cjs.BindingPower.Conditional;
   }
   parse(parser, _left, _token, builder) {
     const direction = readDirection(parser);
@@ -4488,7 +4619,7 @@ var RoundedParselet = class {
 var ToNearestParselet = class {
   constructor() {
     this.category = "Converters";
-    this.bindingPower = chunkNZFKROS7_cjs.BindingPower.Conditional;
+    this.bindingPower = chunkPA4VC73I_cjs.BindingPower.Conditional;
   }
   parse(parser, _left, _token, builder) {
     emitRoundToIncrement(builder, readIncrement(parser), "nearest");
@@ -4507,7 +4638,7 @@ function readIncrement(parser) {
     const value = Number(next.value);
     if (Number.isFinite(value) && value > 0) return value;
   }
-  throw chunkM4N5GA5Z_cjs.ErrorFactory.parsing(
+  throw chunk5KMIY374_cjs.ErrorFactory.parsing(
     "INVALID_ROUNDING_INCREMENT",
     `"to nearest ${next?.value ?? "?"}": expected a positive number or one of ${Object.keys(INCREMENT_WORDS).join(", ")}`
   );
@@ -4515,24 +4646,21 @@ function readIncrement(parser) {
 var DecimalPlacesParselet = class {
   constructor() {
     this.category = "Converters";
-    this.bindingPower = chunkNZFKROS7_cjs.BindingPower.Conditional;
+    this.bindingPower = chunkPA4VC73I_cjs.BindingPower.Conditional;
   }
   parse(_parser, _left, token, builder) {
     const places = Number(token.value);
     if (!Number.isFinite(places) || places < 0 || places > 100) {
-      throw chunkM4N5GA5Z_cjs.ErrorFactory.parsing(
+      throw chunk5KMIY374_cjs.ErrorFactory.parsing(
         "INVALID_DECIMAL_PLACES",
         `"to ${token.value} dp": expected a place count between 0 and 100`
       );
     }
-    const scale = Math.pow(10, places);
     builder.emitOpcode(10 /* PUSH_NUMBER */);
-    builder.emitNumber(scale);
-    builder.emitOpcode(22 /* MUL */);
-    emitRoundDirection(builder, "nearest");
-    builder.emitOpcode(10 /* PUSH_NUMBER */);
-    builder.emitNumber(scale);
-    builder.emitOpcode(23 /* DIV */);
+    builder.emitNumber(places);
+    builder.emitOpcode(51 /* CALL_BUILTIN */);
+    builder.emitIndex(ROUND_TO_PLACES_BUILTIN);
+    builder.emitIndex(2);
   }
 };
 
@@ -4562,7 +4690,7 @@ function decimalPlacesNormalizerRule(priority = 66) {
       return {
         consumed,
         replacement: [
-          chunkAHCLWAM5_cjs.createFusedToken("DECIMAL_PLACES", count.value, tokens.slice(pos, pos + consumed))
+          chunkBHTNFEGZ_cjs.createFusedToken("DECIMAL_PLACES", count.value, tokens.slice(pos, pos + consumed))
         ],
         ruleName: "converters:decimal-places"
       };
@@ -4571,6 +4699,7 @@ function decimalPlacesNormalizerRule(priority = 66) {
 }
 
 // src/packages/converters/normalizer/ConverterPrepositionNormalizerRule.ts
+var FUNC_TYPED_CONVERTERS = /* @__PURE__ */ new Set(["hex", "bin"]);
 function converterPrepositionNormalizerRule(priority = 67) {
   return {
     name: "converters:preposition",
@@ -4578,10 +4707,12 @@ function converterPrepositionNormalizerRule(priority = 67) {
     match(tokens, pos) {
       const preposition = tokens[pos];
       if (preposition?.type !== "IN" && preposition?.type !== "TO") return null;
-      if (tokens[pos + 1]?.type !== "CONVERTER_NAME") return null;
+      const target = tokens[pos + 1];
+      const isConverterTarget = target?.type === "CONVERTER_NAME" || target?.type === "FUNC" && FUNC_TYPED_CONVERTERS.has(target.value.toLowerCase());
+      if (!isConverterTarget) return null;
       return {
         consumed: 1,
-        replacement: [chunkAHCLWAM5_cjs.createFusedToken("AS", "as", [preposition])],
+        replacement: [chunkBHTNFEGZ_cjs.createFusedToken("AS", "as", [preposition])],
         ruleName: "converters:preposition"
       };
     }
@@ -4618,10 +4749,10 @@ var VariadicAggregateParselet = class {
   }
   parse(parser, token, builder) {
     let argCount = 0;
-    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Conjunction, builder);
+    parser.parseExpression(chunkPA4VC73I_cjs.BindingPower.Conjunction, builder);
     argCount++;
     while (parser.match("COMMA") || parser.match("AND_CONJ")) {
-      parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Conjunction, builder);
+      parser.parseExpression(chunkPA4VC73I_cjs.BindingPower.Conjunction, builder);
       argCount++;
     }
     builder.emitOpcode(51 /* CALL_BUILTIN */);
@@ -4635,7 +4766,7 @@ function unaryPhraseParselet(builtinIndex) {
   return {
     category: "MathPhrases",
     parse(parser, _token, builder) {
-      parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
+      parser.parseExpression(chunkPA4VC73I_cjs.BindingPower.Lowest, builder);
       builder.emitOpcode(51 /* CALL_BUILTIN */);
       builder.emitIndex(builtinIndex);
       builder.emitIndex(1);
@@ -4647,28 +4778,28 @@ function unaryPhraseParselet(builtinIndex) {
 var remainderOfParselet = {
   category: "MathPhrases",
   parse(parser, _token, builder) {
-    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Product, builder);
+    parser.parseExpression(chunkPA4VC73I_cjs.BindingPower.Product, builder);
     if (!parser.match("DIVIDE_BY") && !parser.match("SLASH")) {
-      throw chunkM4N5GA5Z_cjs.ErrorFactory.parsing(
+      throw chunk5KMIY374_cjs.ErrorFactory.parsing(
         "REMAINDER_EXPECTED_DIVIDED_BY",
         'Expected "divided by" or "/", as in "remainder of 21 divided by 5"'
       );
     }
-    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Product, builder);
+    parser.parseExpression(chunkPA4VC73I_cjs.BindingPower.Product, builder);
     builder.emitOpcode(24 /* MOD */);
   }
 };
 var nthRootParselet = {
   category: "MathPhrases",
   parse(parser, _token, builder) {
-    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Product, builder);
+    parser.parseExpression(chunkPA4VC73I_cjs.BindingPower.Product, builder);
     if (!parser.match("OF")) {
-      throw chunkM4N5GA5Z_cjs.ErrorFactory.parsing(
+      throw chunk5KMIY374_cjs.ErrorFactory.parsing(
         "ROOT_EXPECTED_OF",
         'Expected "of", as in "root 5 of 100"'
       );
     }
-    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Conditional, builder);
+    parser.parseExpression(chunkPA4VC73I_cjs.BindingPower.Conditional, builder);
     builder.emitOpcode(2 /* SWAP */);
     builder.emitOpcode(10 /* PUSH_NUMBER */);
     builder.emitNumber(1);
@@ -4680,15 +4811,15 @@ var nthRootParselet = {
 var logBaseParselet = {
   category: "MathPhrases",
   parse(parser, _token, builder) {
-    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Conditional, builder);
+    parser.parseExpression(chunkPA4VC73I_cjs.BindingPower.Conditional, builder);
     emitNaturalLog(builder);
     if (!parser.match("LOG_BASE")) {
-      throw chunkM4N5GA5Z_cjs.ErrorFactory.parsing(
+      throw chunk5KMIY374_cjs.ErrorFactory.parsing(
         "LOG_EXPECTED_BASE",
         'Expected "base", as in "log 20 base 4"'
       );
     }
-    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Conditional, builder);
+    parser.parseExpression(chunkPA4VC73I_cjs.BindingPower.Conditional, builder);
     emitNaturalLog(builder);
     builder.emitOpcode(23 /* DIV */);
   }
@@ -4714,15 +4845,15 @@ function functionPhraseNormalizerRule(priority = 69) {
       if (word === "root") {
         return {
           consumed: 1,
-          replacement: [chunkAHCLWAM5_cjs.createFusedToken("NTH_ROOT", "root", [head])],
+          replacement: [chunkBHTNFEGZ_cjs.createFusedToken("NTH_ROOT", "root", [head])],
           ruleName: "mathphrases:function-phrase"
         };
       }
       const baseAt = findBase(tokens, pos + 1);
       if (baseAt === -1) return null;
       const replacement = tokens.slice(pos, baseAt + 1).map((token, index) => {
-        if (index === 0) return chunkAHCLWAM5_cjs.createFusedToken("LOG_PHRASE", "log", [token]);
-        if (index === baseAt - pos) return chunkAHCLWAM5_cjs.createFusedToken("LOG_BASE", "base", [token]);
+        if (index === 0) return chunkBHTNFEGZ_cjs.createFusedToken("LOG_PHRASE", "log", [token]);
+        if (index === baseAt - pos) return chunkBHTNFEGZ_cjs.createFusedToken("LOG_BASE", "base", [token]);
         return token;
       });
       return {
@@ -4747,9 +4878,9 @@ function largerSmallerParselet(builtinIndex) {
   return {
     category: "MathPhrases",
     parse(parser, token, builder) {
-      parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Conjunction, builder);
+      parser.parseExpression(chunkPA4VC73I_cjs.BindingPower.Conjunction, builder);
       parser.consume("AND_CONJ");
-      parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
+      parser.parseExpression(chunkPA4VC73I_cjs.BindingPower.Lowest, builder);
       builder.emitOpcode(51 /* CALL_BUILTIN */);
       builder.emitIndex(builtinIndex);
       builder.emitIndex(2);
@@ -4761,7 +4892,7 @@ function largerSmallerParselet(builtinIndex) {
 var halfParselet = {
   category: "MathPhrases",
   parse(parser, token, builder) {
-    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
+    parser.parseExpression(chunkPA4VC73I_cjs.BindingPower.Lowest, builder);
     builder.emitOpcode(10 /* PUSH_NUMBER */);
     builder.emitNumber(2);
     builder.emitOpcode(23 /* DIV */);
@@ -4772,9 +4903,9 @@ var halfParselet = {
 var midpointParselet = {
   category: "MathPhrases",
   parse(parser, token, builder) {
-    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Conjunction, builder);
+    parser.parseExpression(chunkPA4VC73I_cjs.BindingPower.Conjunction, builder);
     parser.consume("AND_CONJ");
-    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
+    parser.parseExpression(chunkPA4VC73I_cjs.BindingPower.Lowest, builder);
     builder.emitOpcode(20 /* ADD */);
     builder.emitOpcode(10 /* PUSH_NUMBER */);
     builder.emitNumber(2);
@@ -4789,7 +4920,7 @@ var randomNumberParselet = definePhrasePattern({
     {
       slots: [
         { kind: "keyword", tokenTypes: ["BETWEEN"] },
-        { kind: "expr", bindingPower: chunkNZFKROS7_cjs.BindingPower.Product },
+        { kind: "expr", bindingPower: chunkPA4VC73I_cjs.BindingPower.Product },
         { kind: "keyword", tokenTypes: ["AND_CONJ"] },
         { kind: "expr" }
       ],
@@ -4809,20 +4940,20 @@ var ClampParselet = class {
     this.category = "MathPhrases";
   }
   parse(parser, token, builder) {
-    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
+    parser.parseExpression(chunkPA4VC73I_cjs.BindingPower.Lowest, builder);
     const mid = parser.peek();
     if (mid?.type === "BETWEEN") {
       parser.consume();
-      parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Product, builder);
+      parser.parseExpression(chunkPA4VC73I_cjs.BindingPower.Product, builder);
       parser.consume("AND_CONJ");
-      parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
+      parser.parseExpression(chunkPA4VC73I_cjs.BindingPower.Lowest, builder);
     } else if (mid?.type === "FROM") {
       parser.consume();
-      parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
+      parser.parseExpression(chunkPA4VC73I_cjs.BindingPower.Lowest, builder);
       parser.consume("TO");
-      parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
+      parser.parseExpression(chunkPA4VC73I_cjs.BindingPower.Lowest, builder);
     } else {
-      throw chunkM4N5GA5Z_cjs.ErrorFactory.parsing(
+      throw chunk5KMIY374_cjs.ErrorFactory.parsing(
         "CLAMP_EXPECTED_BETWEEN_OR_FROM",
         `Expected "between" or "from" after "clamp <value>" but got ${mid ? `"${mid.value}"` : "end of input"}`
       );
@@ -4838,7 +4969,7 @@ var PROPORTION_BUILTIN_INDEX = 46;
 var ProportionParselet = class {
   constructor() {
     this.category = "MathPhrases";
-    this.bindingPower = chunkNZFKROS7_cjs.BindingPower.Conditional;
+    this.bindingPower = chunkPA4VC73I_cjs.BindingPower.Conditional;
   }
   parse(parser, left, token, builder) {
     parser.parseExpression(this.bindingPower, builder);
@@ -4847,7 +4978,7 @@ var ProportionParselet = class {
     parser.consume("IS_TO");
     const whatToken = parser.consume();
     if (!whatToken || whatToken.value.toLowerCase() !== "what") {
-      throw chunkM4N5GA5Z_cjs.ErrorFactory.parsing(
+      throw chunk5KMIY374_cjs.ErrorFactory.parsing(
         "PROPORTION_EXPECTED_WHAT",
         `Expected "what" but got ${whatToken ? `"${whatToken.value}"` : "end of input"}`
       );
@@ -4939,7 +5070,7 @@ function readCompoundingInterval(parser) {
   const name = (token?.text ?? token?.value ?? "").toLowerCase();
   const periods = PERIODS_PER_YEAR[name];
   if (periods === void 0) {
-    throw chunkM4N5GA5Z_cjs.ErrorFactory.parsing(
+    throw chunk5KMIY374_cjs.ErrorFactory.parsing(
       "UNKNOWN_COMPOUNDING_INTERVAL",
       `compounding ${name || "?"}: expected one of ${Object.keys(PERIODS_PER_YEAR).join(", ")}`
     );
@@ -4957,12 +5088,12 @@ var InvestmentGrowthParselet = class {
     this.annualIndex = annualIndex;
     this.intervalIndex = intervalIndex;
     this.category = "Finance";
-    this.bindingPower = chunkNZFKROS7_cjs.BindingPower.Conditional;
+    this.bindingPower = chunkPA4VC73I_cjs.BindingPower.Conditional;
   }
   parse(parser, _left, _token, builder) {
-    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Conditional, builder);
+    parser.parseExpression(chunkPA4VC73I_cjs.BindingPower.Conditional, builder);
     if (!parser.match("RATE_AT")) parser.consume("AT");
-    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Conditional, builder);
+    parser.parseExpression(chunkPA4VC73I_cjs.BindingPower.Conditional, builder);
     const periods = readCompoundingInterval(parser);
     builder.emitOpcode(2 /* SWAP */);
     if (periods === 1) {
@@ -4984,13 +5115,13 @@ var PresentValueParselet = class {
     this.category = "Finance";
   }
   parse(parser, _token, builder) {
-    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Conditional, builder);
+    parser.parseExpression(chunkPA4VC73I_cjs.BindingPower.Conditional, builder);
     if (!parser.match("AFTER") && !parser.match("OVER") && !parser.match("IN")) {
       parser.consume("AFTER");
     }
-    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Conditional, builder);
+    parser.parseExpression(chunkPA4VC73I_cjs.BindingPower.Conditional, builder);
     if (!parser.match("RATE_AT")) parser.consume("AT");
-    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Conditional, builder);
+    parser.parseExpression(chunkPA4VC73I_cjs.BindingPower.Conditional, builder);
     builder.emitOpcode(2 /* SWAP */);
     builder.emitOpcode(51 /* CALL_BUILTIN */);
     builder.emitIndex(this.builtinIndex);
@@ -5001,10 +5132,10 @@ var ReturnOnInvestmentParselet = class {
   constructor(builtinIndex) {
     this.builtinIndex = builtinIndex;
     this.category = "Finance";
-    this.bindingPower = chunkNZFKROS7_cjs.BindingPower.Conditional;
+    this.bindingPower = chunkPA4VC73I_cjs.BindingPower.Conditional;
   }
   parse(parser, _left, _token, builder) {
-    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Conditional, builder);
+    parser.parseExpression(chunkPA4VC73I_cjs.BindingPower.Conditional, builder);
     parser.consume("RETURNED");
     builder.emitOpcode(51 /* CALL_BUILTIN */);
     builder.emitIndex(this.builtinIndex);
@@ -5017,14 +5148,14 @@ var AnnualReturnParselet = class {
     this.category = "Finance";
   }
   parse(parser, _token, builder) {
-    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Conditional, builder);
+    parser.parseExpression(chunkPA4VC73I_cjs.BindingPower.Conditional, builder);
     parser.consume("INVESTED");
-    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Conditional, builder);
+    parser.parseExpression(chunkPA4VC73I_cjs.BindingPower.Conditional, builder);
     parser.consume("RETURNED");
     if (!parser.match("AFTER") && !parser.match("OVER") && !parser.match("IN")) {
       parser.consume("AFTER");
     }
-    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Conditional, builder);
+    parser.parseExpression(chunkPA4VC73I_cjs.BindingPower.Conditional, builder);
     builder.emitOpcode(51 /* CALL_BUILTIN */);
     builder.emitIndex(this.builtinIndex);
     builder.emitIndex(3);
@@ -5044,13 +5175,13 @@ var CompoundInterestParselet = class {
     this.category = "Finance";
   }
   parse(parser, _token, builder) {
-    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Conditional, builder);
+    parser.parseExpression(chunkPA4VC73I_cjs.BindingPower.Conditional, builder);
     if (!parser.match("AFTER") && !parser.match("FOR_DURATION")) {
       parser.consume("OVER");
     }
-    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
+    parser.parseExpression(chunkPA4VC73I_cjs.BindingPower.Lowest, builder);
     if (!parser.match("RATE_AT")) parser.consume("AT");
-    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
+    parser.parseExpression(chunkPA4VC73I_cjs.BindingPower.Lowest, builder);
     const periods = readCompoundingInterval(parser);
     builder.emitOpcode(2 /* SWAP */);
     if (periods === 1) {
@@ -5075,11 +5206,11 @@ var LoanRepaymentParselet = class {
     this.category = "Finance";
   }
   parse(parser, _token, builder) {
-    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
+    parser.parseExpression(chunkPA4VC73I_cjs.BindingPower.Lowest, builder);
     parser.consume("OVER");
-    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
+    parser.parseExpression(chunkPA4VC73I_cjs.BindingPower.Lowest, builder);
     if (!parser.match("RATE_AT")) parser.consume("AT");
-    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
+    parser.parseExpression(chunkPA4VC73I_cjs.BindingPower.Lowest, builder);
     builder.emitOpcode(2 /* SWAP */);
     builder.emitOpcode(10 /* PUSH_NUMBER */);
     builder.emitNumber(this.periodsPerYear);
@@ -5096,9 +5227,9 @@ var SalesTaxParselet = class {
     this.category = "Finance";
   }
   parse(parser, _token, builder) {
-    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
+    parser.parseExpression(chunkPA4VC73I_cjs.BindingPower.Lowest, builder);
     parser.consume("RATE_AT");
-    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
+    parser.parseExpression(chunkPA4VC73I_cjs.BindingPower.Lowest, builder);
     builder.emitOpcode(51 /* CALL_BUILTIN */);
     builder.emitIndex(this.builtinIndex);
     builder.emitIndex(2);
@@ -5106,30 +5237,30 @@ var SalesTaxParselet = class {
 };
 
 // src/packages/finance/parselets/InflationPluginFunctions.ts
-var INFLATION_FROM_YEAR_TO_PRESENT_IDX = chunkBXKJLM5R_cjs.allocatePluginFunctionIndex();
-var INFLATION_TO_YEAR_FROM_PRESENT_IDX = chunkBXKJLM5R_cjs.allocatePluginFunctionIndex();
-var INFLATION_FUTURE_VALUE_IDX = chunkBXKJLM5R_cjs.allocatePluginFunctionIndex();
+var INFLATION_FROM_YEAR_TO_PRESENT_IDX = chunk6WFMPTGB_cjs.allocatePluginFunctionIndex();
+var INFLATION_TO_YEAR_FROM_PRESENT_IDX = chunk6WFMPTGB_cjs.allocatePluginFunctionIndex();
+var INFLATION_FUTURE_VALUE_IDX = chunk6WFMPTGB_cjs.allocatePluginFunctionIndex();
 function yearRangeError(code, badYear) {
-  return chunkOC6LTXYS_cjs.errorValue(
+  return chunkJMXUNXQS_cjs.errorValue(
     code,
-    `Year ${badYear} is outside the bundled CPI table's range (${chunkBXKJLM5R_cjs.CPI_MIN_YEAR}-${chunkBXKJLM5R_cjs.CPI_MAX_YEAR})`
+    `Year ${badYear} is outside the bundled CPI table's range (${chunk6WFMPTGB_cjs.CPI_MIN_YEAR}-${chunk6WFMPTGB_cjs.CPI_MAX_YEAR})`
   );
 }
 function inflationFromYearToPresentHandler(args) {
   const amountValue = args[0];
   const fromYear = args[1].toNumber();
   const toYear = (/* @__PURE__ */ new Date()).getFullYear();
-  const result = chunkBXKJLM5R_cjs.adjustForInflation(amountValue.toNumber(), fromYear, toYear);
+  const result = chunk6WFMPTGB_cjs.adjustForInflation(amountValue.toNumber(), fromYear, toYear);
   if (result === void 0) return yearRangeError("INFLATION_YEAR_OUT_OF_RANGE", fromYear);
-  return amountValue.type === 6 /* Uom */ ? chunkOC6LTXYS_cjs.uomValue(result, amountValue.unit) : chunkOC6LTXYS_cjs.numberValue(result);
+  return amountValue.type === 6 /* Uom */ ? chunkJMXUNXQS_cjs.uomValue(result, amountValue.unit) : chunkJMXUNXQS_cjs.numberValue(result);
 }
 function inflationToYearFromPresentHandler(args) {
   const amountValue = args[0];
   const fromYear = (/* @__PURE__ */ new Date()).getFullYear();
   const toYear = args[1].toNumber();
-  const result = chunkBXKJLM5R_cjs.adjustForInflation(amountValue.toNumber(), fromYear, toYear);
+  const result = chunk6WFMPTGB_cjs.adjustForInflation(amountValue.toNumber(), fromYear, toYear);
   if (result === void 0) return yearRangeError("INFLATION_YEAR_OUT_OF_RANGE", toYear);
-  return amountValue.type === 6 /* Uom */ ? chunkOC6LTXYS_cjs.uomValue(result, amountValue.unit) : chunkOC6LTXYS_cjs.numberValue(result);
+  return amountValue.type === 6 /* Uom */ ? chunkJMXUNXQS_cjs.uomValue(result, amountValue.unit) : chunkJMXUNXQS_cjs.numberValue(result);
 }
 function inflationFutureValueHandler(args) {
   const amountValue = args[0];
@@ -5137,25 +5268,36 @@ function inflationFutureValueHandler(args) {
   const rate = args[2].toNumber();
   const years = futureYear - (/* @__PURE__ */ new Date()).getFullYear();
   if (1 + rate <= 0) {
-    return chunkOC6LTXYS_cjs.errorValue("INVALID_RATE", `inflationFutureValue: rate ${rate} makes (1 + rate) non-positive`);
+    return chunkJMXUNXQS_cjs.errorValue("INVALID_RATE", `inflationFutureValue: rate ${rate} makes (1 + rate) non-positive`);
   }
   const amount = amountValue.toNumber();
   const worth = amount / Math.pow(1 + rate, years);
-  return amountValue.type === 6 /* Uom */ ? chunkOC6LTXYS_cjs.uomValue(worth, amountValue.unit) : chunkOC6LTXYS_cjs.numberValue(worth);
+  return amountValue.type === 6 /* Uom */ ? chunkJMXUNXQS_cjs.uomValue(worth, amountValue.unit) : chunkJMXUNXQS_cjs.numberValue(worth);
 }
 
 // src/packages/finance/parselets/InflationQueryParselet.ts
 var INFLATION_ADJUST_BUILTIN_IDX = 60;
+function hasInflationKeyword(parser) {
+  for (let offset = 0; ; offset++) {
+    const token = parser.peekAt(offset);
+    if (!token) return false;
+    if (token.type === "FROM" || token.type === "WORTH_IN") return true;
+  }
+}
 var InflationQueryParselet = class {
   constructor(variant) {
     this.variant = variant;
     this.category = "Finance";
   }
   parse(parser, _token, builder) {
-    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Product, builder);
+    if (!hasInflationKeyword(parser)) {
+      parser.parseExpression(chunkPA4VC73I_cjs.BindingPower.Lowest, builder);
+      return;
+    }
+    parser.parseExpression(chunkPA4VC73I_cjs.BindingPower.Product, builder);
     if (this.variant === "what-was") {
       parser.consume("WORTH_IN");
-      parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
+      parser.parseExpression(chunkPA4VC73I_cjs.BindingPower.Lowest, builder);
       builder.emitOpcode(50 /* CALL_PLUGIN */);
       builder.emitIndex(INFLATION_TO_YEAR_FROM_PRESENT_IDX);
       builder.emitIndex(2);
@@ -5164,7 +5306,7 @@ var InflationQueryParselet = class {
     const next = parser.peek();
     if (next?.type === "FROM") {
       parser.consume();
-      parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
+      parser.parseExpression(chunkPA4VC73I_cjs.BindingPower.Lowest, builder);
       builder.emitOpcode(50 /* CALL_PLUGIN */);
       builder.emitIndex(INFLATION_FROM_YEAR_TO_PRESENT_IDX);
       builder.emitIndex(2);
@@ -5172,16 +5314,16 @@ var InflationQueryParselet = class {
     }
     if (next?.type === "IN") {
       parser.consume();
-      parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
+      parser.parseExpression(chunkPA4VC73I_cjs.BindingPower.Lowest, builder);
       parser.consume("WORTH_IN");
-      parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
+      parser.parseExpression(chunkPA4VC73I_cjs.BindingPower.Lowest, builder);
       builder.emitOpcode(51 /* CALL_BUILTIN */);
       builder.emitIndex(INFLATION_ADJUST_BUILTIN_IDX);
       builder.emitIndex(3);
       return;
     }
     const gotType = next ? next.type : "end of input";
-    throw chunkM4N5GA5Z_cjs.ErrorFactory.parsing(
+    throw chunk5KMIY374_cjs.ErrorFactory.parsing(
       "INFLATION_EXPECTED_FROM_OR_IN",
       `Expected "from <year>" or "in <year> worth in <year>" after "what is <amount>", got ${gotType}`
     );
@@ -5194,16 +5336,16 @@ var InflationFutureValueParselet = class {
     this.category = "Finance";
   }
   parse(parser, _token, builder) {
-    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Product, builder);
+    parser.parseExpression(chunkPA4VC73I_cjs.BindingPower.Product, builder);
     parser.consume("IN");
-    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
+    parser.parseExpression(chunkPA4VC73I_cjs.BindingPower.Lowest, builder);
     parser.consume("ASSUMING");
-    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
+    parser.parseExpression(chunkPA4VC73I_cjs.BindingPower.Lowest, builder);
     const inflationToken = parser.peek();
     const inflationWord = inflationToken && inflationToken.type === "IDENT" ? inflationToken.value.toLowerCase() : void 0;
     if (inflationWord !== "inflation") {
       const got = inflationToken ? inflationToken.value : "end of input";
-      throw chunkM4N5GA5Z_cjs.ErrorFactory.parsing(
+      throw chunk5KMIY374_cjs.ErrorFactory.parsing(
         "INFLATION_EXPECTED_INFLATION_WORD",
         `Expected the word "inflation" after "assuming <rate>%", got "${got}"`
       );
@@ -5247,7 +5389,7 @@ function inYearDollarsNormalizerRule(priority = 70) {
       if (word !== "dollars" && word !== "dollar") return null;
       return {
         consumed: 3,
-        replacement: [chunkAHCLWAM5_cjs.createFusedToken("IN_YEAR_DOLLARS", yearToken.value, tokens.slice(pos, pos + 3))],
+        replacement: [chunkBHTNFEGZ_cjs.createFusedToken("IN_YEAR_DOLLARS", yearToken.value, tokens.slice(pos, pos + 3))],
         ruleName: "finance:in-year-dollars"
       };
     }
@@ -5341,7 +5483,7 @@ var FINANCE_PACKAGE = {
 
 // src/resolvers/QueryResolver.ts
 function defaultOnError(namespace) {
-  return (query, error) => chunkOC6LTXYS_cjs.errorValue(
+  return (query, error) => chunkJMXUNXQS_cjs.errorValue(
     `${namespace.toUpperCase()}_QUERY_FAILED`,
     `Failed to resolve "${query}": ${error instanceof Error ? error.message : String(error)}`
   );
@@ -5396,7 +5538,7 @@ function createQueryResolver(opts) {
           i += 3;
           continue;
         }
-        i = chunk4AVD7NZW_cjs.nextInstruction(opcodes, i);
+        i = chunk4B2CNWQU_cjs.nextInstruction(opcodes, i);
       }
       return null;
     },
@@ -5407,7 +5549,7 @@ function createQueryResolver(opts) {
     const query = args[0]?.value;
     const cached = chunkZ2XP767T_cjs.getActiveQueryClient()?.getQueryData(queryKeyFor(query));
     if (cached !== void 0) return cached;
-    return chunkOC6LTXYS_cjs.errorValue(`${opts.namespace.toUpperCase()}_NOT_PREFLIGHTED`, `No cached result for "${query}"`);
+    return chunkJMXUNXQS_cjs.errorValue(`${opts.namespace.toUpperCase()}_NOT_PREFLIGHTED`, `No cached result for "${query}"`);
   };
   return { resolver, pluginFunction };
 }
@@ -5419,7 +5561,7 @@ function consumeCityName(parser, triggerText) {
     words.push(parser.consume().value);
   }
   if (words.length === 0) {
-    throw chunkM4N5GA5Z_cjs.ErrorFactory.parsing(
+    throw chunk5KMIY374_cjs.ErrorFactory.parsing(
       "WEATHER_EXPECTED_CITY",
       `Expected a city name after "${triggerText}" (e.g. "${triggerText} London")`
     );
@@ -5495,7 +5637,7 @@ async function geocodeCity(city, signal) {
   const url = `${GEOCODING_API_URL}?name=${encodeURIComponent(city)}&count=1&language=en&format=json`;
   const response = await fetch(url, { signal });
   if (!response.ok) {
-    throw chunkM4N5GA5Z_cjs.ErrorFactory.external(
+    throw chunk5KMIY374_cjs.ErrorFactory.external(
       WeatherErrorCodes.GEOCODING_API_ERROR,
       `Open-Meteo geocoding API returned ${response.status} for "${city}"`,
       { city, status: response.status }
@@ -5504,7 +5646,7 @@ async function geocodeCity(city, signal) {
   const json = await response.json();
   const first = json?.results?.[0];
   if (!first) {
-    throw chunkM4N5GA5Z_cjs.ErrorFactory.validation(
+    throw chunk5KMIY374_cjs.ErrorFactory.validation(
       WeatherErrorCodes.CITY_NOT_FOUND,
       `No location found for "${city}"`,
       { city }
@@ -5523,7 +5665,7 @@ async function fetchForecast(lat, lon, signal) {
   });
   const response = await fetch(`${FORECAST_API_URL}?${params.toString()}`, { signal });
   if (!response.ok) {
-    throw chunkM4N5GA5Z_cjs.ErrorFactory.external(
+    throw chunk5KMIY374_cjs.ErrorFactory.external(
       WeatherErrorCodes.FORECAST_API_ERROR,
       `Open-Meteo forecast API returned ${response.status}`,
       { status: response.status }
@@ -5533,7 +5675,7 @@ async function fetchForecast(lat, lon, signal) {
   const current = json?.current;
   const daily = json?.daily;
   if (!current || !daily) {
-    throw chunkM4N5GA5Z_cjs.ErrorFactory.external(
+    throw chunk5KMIY374_cjs.ErrorFactory.external(
       WeatherErrorCodes.FORECAST_RESPONSE_MALFORMED,
       "Open-Meteo forecast response missing current/daily blocks"
     );
@@ -5584,7 +5726,7 @@ function fetchCityWeather(city, signal) {
 }
 
 // src/packages/weather/WeatherPackage.ts
-var WEATHER_FN_IDX = chunkBXKJLM5R_cjs.allocatePluginFunctionIndex();
+var WEATHER_FN_IDX = chunk6WFMPTGB_cjs.allocatePluginFunctionIndex();
 var { resolver: weatherResolver, pluginFunction: weatherPluginFunction } = createQueryResolver({
   namespace: "weather",
   pluginFunctionIndex: WEATHER_FN_IDX,
@@ -5597,17 +5739,17 @@ var { resolver: weatherResolver, pluginFunction: weatherPluginFunction } = creat
     const data = await fetchCityWeather(city, signal);
     switch (kind) {
       case "current":
-        return chunkOC6LTXYS_cjs.stringValue(`${Math.round(data.temperature)}\xB0C, ${data.description}`);
+        return chunkJMXUNXQS_cjs.stringValue(`${Math.round(data.temperature)}\xB0C, ${data.description}`);
       case "temperature":
-        return chunkOC6LTXYS_cjs.uomValue(data.temperature, "C");
+        return chunkJMXUNXQS_cjs.uomValue(data.temperature, "C");
       case "feelslike":
-        return chunkOC6LTXYS_cjs.uomValue(data.apparentTemperature, "C");
+        return chunkJMXUNXQS_cjs.uomValue(data.apparentTemperature, "C");
       case "high":
-        return chunkOC6LTXYS_cjs.uomValue(data.high, "C");
+        return chunkJMXUNXQS_cjs.uomValue(data.high, "C");
       case "low":
-        return chunkOC6LTXYS_cjs.uomValue(data.low, "C");
+        return chunkJMXUNXQS_cjs.uomValue(data.low, "C");
       default:
-        throw chunkM4N5GA5Z_cjs.ErrorFactory.internal(
+        throw chunk5KMIY374_cjs.ErrorFactory.internal(
           WeatherErrorCodes.UNKNOWN_QUERY_KIND,
           `Unknown weather query kind "${kind}"`,
           { kind }
@@ -5670,7 +5812,7 @@ function pad2(n) {
 function validateAndFormat(year, monthIndex, day, raw) {
   const d = new Date(year, monthIndex, day);
   if (d.getFullYear() !== year || d.getMonth() !== monthIndex || d.getDate() !== day) {
-    throw chunkM4N5GA5Z_cjs.ErrorFactory.parsing(
+    throw chunk5KMIY374_cjs.ErrorFactory.parsing(
       "STOCKS_INVALID_DATE",
       `"${raw}" is not a valid calendar date`
     );
@@ -5679,7 +5821,7 @@ function validateAndFormat(year, monthIndex, day, raw) {
 }
 function requireYear(text, raw) {
   if (!/^\d{4}$/.test(text)) {
-    throw chunkM4N5GA5Z_cjs.ErrorFactory.parsing(
+    throw chunk5KMIY374_cjs.ErrorFactory.parsing(
       "STOCKS_INVALID_DATE",
       `Expected a 4-digit year in "${raw}", got "${text}"`
     );
@@ -5736,7 +5878,7 @@ function tryParseDatePhrase(parser) {
       const year = requireYear(yearTok.value, raw);
       return validateAndFormat(year, monthIndex, parseInt(g1.value, 10), raw);
     }
-    throw chunkM4N5GA5Z_cjs.ErrorFactory.parsing(
+    throw chunk5KMIY374_cjs.ErrorFactory.parsing(
       "STOCKS_INVALID_DATE",
       `Expected a date after "on" (e.g. "April 12, 2005" or "4/12/2005"), got "${g1.value}"`
     );
@@ -5823,7 +5965,7 @@ var MAJOR_TICKERS = /* @__PURE__ */ new Set([
 
 // src/packages/stocks/normalizer/StockTickerNormalizerRule.ts
 var STOCK_TICKER_TYPE = "STOCK_TICKER";
-var STOCK_TICKER_TYPE_ID = chunkR24DI24X_cjs.tokenTypeId(STOCK_TICKER_TYPE);
+var STOCK_TICKER_TYPE_ID = chunk5LI5EPGJ_cjs.tokenTypeId(STOCK_TICKER_TYPE);
 function stockTickerNormalizerRule() {
   return {
     name: "stocks:bare-ticker",
@@ -5833,7 +5975,7 @@ function stockTickerNormalizerRule() {
       if (!token || token.type !== "IDENT") return null;
       if (!MAJOR_TICKERS.has(token.value)) return null;
       if (pos > 0 && tokens[pos - 1].type === "COLON") return null;
-      const fusedToken = new chunkM4F66R4O_cjs.LexerToken(
+      const fusedToken = new chunkYWQ6V4ZN_cjs.LexerToken(
         STOCK_TICKER_TYPE,
         STOCK_TICKER_TYPE_ID,
         token.value,
@@ -5859,7 +6001,7 @@ function tryParseDateSuffix(parser) {
     parser.consume();
     const onTok = parser.peek();
     if (!onTok || onTok.type !== "IDENT" || onTok.value.toLowerCase() !== "on") {
-      throw chunkM4N5GA5Z_cjs.ErrorFactory.parsing(
+      throw chunk5KMIY374_cjs.ErrorFactory.parsing(
         "STOCKS_EXPECTED_ON",
         `Expected "on <date>" after "${lower}" (e.g. "AAPL ${lower} on April 12, 2005")`
       );
@@ -5872,7 +6014,7 @@ function tryParseDateSuffix(parser) {
   }
   const date = tryParseDatePhrase(parser);
   if (!date) {
-    throw chunkM4N5GA5Z_cjs.ErrorFactory.parsing(
+    throw chunk5KMIY374_cjs.ErrorFactory.parsing(
       "STOCKS_EXPECTED_DATE",
       `Expected a date after "on" (e.g. "April 12, 2005" or "4/12/2005")`
     );
@@ -5902,7 +6044,7 @@ function finishStockExpression(parser, builder, ticker, currentFnIdx, historical
   const suffix = tryParseDateSuffix(parser);
   if (sawStar && !suffix) {
     emitStockQuery(builder, ticker, null, currentFnIdx, historicalFnIdx);
-    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Product, builder);
+    parser.parseExpression(chunkPA4VC73I_cjs.BindingPower.Product, builder);
     builder.emitOpcode(22 /* MUL */);
     return;
   }
@@ -5916,11 +6058,11 @@ function stockFnParselet(currentFnIdx, historicalFnIdx) {
       const tickerToken = parser.consume();
       let ticker;
       if (tickerToken.type === "STRING") {
-        ticker = chunkN5YFR4UP_cjs.stripQuotes(tickerToken.value).toUpperCase();
+        ticker = chunkADBA3XBE_cjs.stripQuotes(tickerToken.value).toUpperCase();
       } else if (tickerToken.type === "IDENT" || tickerToken.type === STOCK_TICKER_TYPE) {
         ticker = tickerToken.value.toUpperCase();
       } else {
-        throw chunkM4N5GA5Z_cjs.ErrorFactory.parsing(
+        throw chunk5KMIY374_cjs.ErrorFactory.parsing(
           "STOCKS_INVALID_TICKER",
           `Expected a ticker symbol inside stock(...), got "${tickerToken.value}" (${tickerToken.type})`
         );
@@ -5942,10 +6084,10 @@ function bareStockTickerParselet(currentFnIdx, historicalFnIdx) {
 
 // src/packages/stocks/StocksPackage.ts
 function createStocksPackage(config = {}) {
-  const currentFnIdx = chunkBXKJLM5R_cjs.allocatePluginFunctionIndex();
-  const historicalFnIdx = chunkBXKJLM5R_cjs.allocatePluginFunctionIndex();
+  const currentFnIdx = chunk6WFMPTGB_cjs.allocatePluginFunctionIndex();
+  const historicalFnIdx = chunk6WFMPTGB_cjs.allocatePluginFunctionIndex();
   function notConfigured(what) {
-    return chunkOC6LTXYS_cjs.errorValue(
+    return chunkJMXUNXQS_cjs.errorValue(
       "STOCKS_NOT_CONFIGURED",
       `Stock data provider not configured. Supply ${what} via createStocksPackage({ ... }); see the StocksPackage doc comment.`
     );
@@ -5958,7 +6100,7 @@ function createStocksPackage(config = {}) {
     fetchQuery: async (ticker, signal) => {
       if (!config.fetchQuote) return notConfigured("fetchQuote");
       const quote = await config.fetchQuote(ticker, signal);
-      return chunkOC6LTXYS_cjs.uomValue(quote.price, quote.currency ?? "USD");
+      return chunkJMXUNXQS_cjs.uomValue(quote.price, quote.currency ?? "USD");
     }
   });
   const { resolver: historicalResolver, pluginFunction: historicalPluginFunction } = createQueryResolver({
@@ -5970,8 +6112,8 @@ function createStocksPackage(config = {}) {
       const [field, ticker, isoDate] = query.split(":");
       if (!config.fetchHistoricalQuote) return notConfigured("fetchHistoricalQuote");
       const quote = await config.fetchHistoricalQuote(ticker, isoDate, signal);
-      if (field === "volume") return chunkOC6LTXYS_cjs.numberValue(quote.volume ?? 0);
-      return chunkOC6LTXYS_cjs.uomValue(quote.close, quote.currency ?? "USD");
+      if (field === "volume") return chunkJMXUNXQS_cjs.numberValue(quote.volume ?? 0);
+      return chunkJMXUNXQS_cjs.uomValue(quote.close, quote.currency ?? "USD");
     }
   });
   const pkg = {
@@ -6018,20 +6160,20 @@ function knowledgeQueryParselet(pluginFnIdx) {
 
 // src/packages/knowledge/KnowledgePackage.ts
 function createKnowledgePackage(config = {}) {
-  const fnIdx = chunkBXKJLM5R_cjs.allocatePluginFunctionIndex();
+  const fnIdx = chunk6WFMPTGB_cjs.allocatePluginFunctionIndex();
   const { resolver, pluginFunction } = createQueryResolver({
     namespace: "knowledge",
     pluginFunctionIndex: fnIdx,
     staleTimeMs: config.staleTimeMs ?? 5 * 60 * 1e3,
     fetchQuery: async (query, signal) => {
       if (!config.answerQuery) {
-        return chunkOC6LTXYS_cjs.errorValue(
+        return chunkJMXUNXQS_cjs.errorValue(
           "KNOWLEDGE_NOT_CONFIGURED",
           `Knowledge answer provider not configured. Supply answerQuery via createKnowledgePackage({ ... }); see the KnowledgePackage doc comment.`
         );
       }
       const answer = await config.answerQuery(query, signal);
-      return chunkOC6LTXYS_cjs.stringValue(answer);
+      return chunkJMXUNXQS_cjs.stringValue(answer);
     }
   });
   return {
@@ -6058,23 +6200,23 @@ function createKnowledgePackage(config = {}) {
 // src/packages/lines/LinesPluginFunctions.ts
 function checkLineValue(v, lineNumber) {
   if (v === void 0) {
-    return chunkOC6LTXYS_cjs.errorValue("LINE_NOT_YET_EVALUATED", `Line ${lineNumber} has not been evaluated yet (forward reference, or out of range)`);
+    return chunkJMXUNXQS_cjs.errorValue("LINE_NOT_YET_EVALUATED", `Line ${lineNumber} has not been evaluated yet (forward reference, or out of range)`);
   }
   if (v.type === 12 /* Pending */) {
-    return chunkOC6LTXYS_cjs.errorValue("LINE_RESULT_PENDING", `Line ${lineNumber}'s result is still resolving`);
+    return chunkJMXUNXQS_cjs.errorValue("LINE_RESULT_PENDING", `Line ${lineNumber}'s result is still resolving`);
   }
   if (v.type === 13 /* Error */) {
-    return chunkOC6LTXYS_cjs.errorValue("LINE_RESULT_ERROR", `Line ${lineNumber} has an error`);
+    return chunkJMXUNXQS_cjs.errorValue("LINE_RESULT_ERROR", `Line ${lineNumber} has an error`);
   }
   return null;
 }
 function requireContext(context) {
   if (!context?.getLineResult) {
-    return chunkOC6LTXYS_cjs.errorValue("LINE_REF_NO_DOCUMENT", "Cross-line references require a real document \u2014 not available outside one (e.g. evaluateExpression()'s single-expression path)");
+    return chunkJMXUNXQS_cjs.errorValue("LINE_REF_NO_DOCUMENT", "Cross-line references require a real document \u2014 not available outside one (e.g. evaluateExpression()'s single-expression path)");
   }
   return null;
 }
-var PREV_FN_IDX = chunkBXKJLM5R_cjs.allocatePluginFunctionIndex();
+var PREV_FN_IDX = chunk6WFMPTGB_cjs.allocatePluginFunctionIndex();
 function prevHandler(_args, context) {
   const ctxError = requireContext(context);
   if (ctxError) return ctxError;
@@ -6083,7 +6225,7 @@ function prevHandler(_args, context) {
   const err = checkLineValue(v, targetLine);
   return err ?? v;
 }
-var LINE_REF_FN_IDX = chunkBXKJLM5R_cjs.allocatePluginFunctionIndex();
+var LINE_REF_FN_IDX = chunk6WFMPTGB_cjs.allocatePluginFunctionIndex();
 function lineRefHandler(args, context) {
   const ctxError = requireContext(context);
   if (ctxError) return ctxError;
@@ -6103,28 +6245,28 @@ function aggregateRange(from, to, context, isAverage) {
     const err = checkLineValue(v, n);
     if (err) return err;
     if (v.type !== 0 /* Number */ && v.type !== 6 /* Uom */) {
-      return chunkOC6LTXYS_cjs.errorValue("LINE_RANGE_NON_NUMERIC", `Line ${n} is not a plain number or unit value \u2014 cannot include it in a sum/total/average range`);
+      return chunkJMXUNXQS_cjs.errorValue("LINE_RANGE_NON_NUMERIC", `Line ${n} is not a plain number or unit value \u2014 cannot include it in a sum/total/average range`);
     }
     if (v.type === 6 /* Uom */) {
       sawUom = true;
       if (commonUnit === void 0) commonUnit = v.unit;
       else if (v.unit !== commonUnit) {
-        return chunkOC6LTXYS_cjs.errorValue("LINE_RANGE_MIXED_UNITS", `Line ${n}'s unit (${v.unit}) doesn't match the range's first unit (${commonUnit}) \u2014 aggregating mixed units would silently misrepresent the result`);
+        return chunkJMXUNXQS_cjs.errorValue("LINE_RANGE_MIXED_UNITS", `Line ${n}'s unit (${v.unit}) doesn't match the range's first unit (${commonUnit}) \u2014 aggregating mixed units would silently misrepresent the result`);
       }
     }
     total += v.toNumber();
     count++;
   }
   const result = isAverage ? total / count : total;
-  return sawUom ? chunkOC6LTXYS_cjs.uomValue(result, commonUnit) : chunkOC6LTXYS_cjs.numberValue(result);
+  return sawUom ? chunkJMXUNXQS_cjs.uomValue(result, commonUnit) : chunkJMXUNXQS_cjs.numberValue(result);
 }
-var SUM_RANGE_FN_IDX = chunkBXKJLM5R_cjs.allocatePluginFunctionIndex();
+var SUM_RANGE_FN_IDX = chunk6WFMPTGB_cjs.allocatePluginFunctionIndex();
 function sumRangeHandler(args, context) {
   const ctxError = requireContext(context);
   if (ctxError) return ctxError;
   return aggregateRange(args[0].toNumber(), args[1].toNumber(), context, false);
 }
-var AVERAGE_RANGE_FN_IDX = chunkBXKJLM5R_cjs.allocatePluginFunctionIndex();
+var AVERAGE_RANGE_FN_IDX = chunk6WFMPTGB_cjs.allocatePluginFunctionIndex();
 function averageRangeHandler(args, context) {
   const ctxError = requireContext(context);
   if (ctxError) return ctxError;
@@ -6133,7 +6275,7 @@ function averageRangeHandler(args, context) {
 function aggregateAbove(context, isAverage) {
   const boundaryCheck = context.isLineBoundary;
   if (!boundaryCheck) {
-    return chunkOC6LTXYS_cjs.errorValue("LINE_REF_NO_DOCUMENT", '"above" aggregation requires a real document');
+    return chunkJMXUNXQS_cjs.errorValue("LINE_REF_NO_DOCUMENT", '"above" aggregation requires a real document');
   }
   let total = 0;
   let count = 0;
@@ -6145,29 +6287,29 @@ function aggregateAbove(context, isAverage) {
     const err = checkLineValue(v, n);
     if (err) return err;
     if (v.type !== 0 /* Number */ && v.type !== 6 /* Uom */) {
-      return chunkOC6LTXYS_cjs.errorValue("LINE_RANGE_NON_NUMERIC", `Line ${n} is not a plain number or unit value \u2014 cannot include it in "above" aggregation`);
+      return chunkJMXUNXQS_cjs.errorValue("LINE_RANGE_NON_NUMERIC", `Line ${n} is not a plain number or unit value \u2014 cannot include it in "above" aggregation`);
     }
     if (v.type === 6 /* Uom */) {
       sawUom = true;
       if (commonUnit === void 0) commonUnit = v.unit;
       else if (v.unit !== commonUnit) {
-        return chunkOC6LTXYS_cjs.errorValue("LINE_RANGE_MIXED_UNITS", `Line ${n}'s unit (${v.unit}) doesn't match the range's unit (${commonUnit})`);
+        return chunkJMXUNXQS_cjs.errorValue("LINE_RANGE_MIXED_UNITS", `Line ${n}'s unit (${v.unit}) doesn't match the range's unit (${commonUnit})`);
       }
     }
     total += v.toNumber();
     count++;
   }
-  if (count === 0) return chunkOC6LTXYS_cjs.errorValue("LINE_RANGE_EMPTY", "No lines above to aggregate (hit the top of the document, a blank line, or a heading immediately)");
+  if (count === 0) return chunkJMXUNXQS_cjs.errorValue("LINE_RANGE_EMPTY", "No lines above to aggregate (hit the top of the document, a blank line, or a heading immediately)");
   const result = isAverage ? total / count : total;
-  return sawUom ? chunkOC6LTXYS_cjs.uomValue(result, commonUnit) : chunkOC6LTXYS_cjs.numberValue(result);
+  return sawUom ? chunkJMXUNXQS_cjs.uomValue(result, commonUnit) : chunkJMXUNXQS_cjs.numberValue(result);
 }
-var TOTAL_ABOVE_FN_IDX = chunkBXKJLM5R_cjs.allocatePluginFunctionIndex();
+var TOTAL_ABOVE_FN_IDX = chunk6WFMPTGB_cjs.allocatePluginFunctionIndex();
 function totalAboveHandler(_args, context) {
   const ctxError = requireContext(context);
   if (ctxError) return ctxError;
   return aggregateAbove(context, false);
 }
-var AVERAGE_ABOVE_FN_IDX = chunkBXKJLM5R_cjs.allocatePluginFunctionIndex();
+var AVERAGE_ABOVE_FN_IDX = chunk6WFMPTGB_cjs.allocatePluginFunctionIndex();
 function averageAboveHandler(_args, context) {
   const ctxError = requireContext(context);
   if (ctxError) return ctxError;
@@ -6239,9 +6381,9 @@ var AboveAggregateParselet = class {
 };
 
 // src/packages/lines/normalizer/LineRefNormalizerRule.ts
-var LINE_REF_TYPE_ID = chunkR24DI24X_cjs.tokenTypeId("LINE_REF");
-var SUM_RANGE_CALL_TYPE_ID = chunkR24DI24X_cjs.tokenTypeId("SUM_RANGE_CALL");
-var AVERAGE_RANGE_CALL_TYPE_ID = chunkR24DI24X_cjs.tokenTypeId("AVERAGE_RANGE_CALL");
+var LINE_REF_TYPE_ID = chunk5LI5EPGJ_cjs.tokenTypeId("LINE_REF");
+var SUM_RANGE_CALL_TYPE_ID = chunk5LI5EPGJ_cjs.tokenTypeId("SUM_RANGE_CALL");
+var AVERAGE_RANGE_CALL_TYPE_ID = chunk5LI5EPGJ_cjs.tokenTypeId("AVERAGE_RANGE_CALL");
 function lineRefNormalizerRule() {
   return {
     name: "lines:line-ref",
@@ -6278,7 +6420,7 @@ function lineRefNormalizerRule() {
   };
 }
 function makeLineRefToken(lineNumberText, sourceToken) {
-  return new chunkM4F66R4O_cjs.LexerToken(
+  return new chunkYWQ6V4ZN_cjs.LexerToken(
     "LINE_REF",
     LINE_REF_TYPE_ID,
     lineNumberText,
@@ -6304,7 +6446,7 @@ function rangeCallNormalizerRule() {
       return {
         consumed: 1,
         replacement: [
-          new chunkM4F66R4O_cjs.LexerToken(tokenType, typeId, token.value, token.value, token.offset, 0, token.line, token.col)
+          new chunkYWQ6V4ZN_cjs.LexerToken(tokenType, typeId, token.value, token.value, token.offset, 0, token.line, token.col)
         ],
         ruleName: "lines:range-call"
       };
@@ -6391,5 +6533,5 @@ exports.WEATHER_PACKAGE = WEATHER_PACKAGE;
 exports.containsSymbolicCall = containsSymbolicCall;
 exports.createKnowledgePackage = createKnowledgePackage;
 exports.createStocksPackage = createStocksPackage;
-//# sourceMappingURL=chunk-CSG5XVNJ.cjs.map
-//# sourceMappingURL=chunk-CSG5XVNJ.cjs.map
+//# sourceMappingURL=chunk-3AFRJYP4.cjs.map
+//# sourceMappingURL=chunk-3AFRJYP4.cjs.map