solve-engine 1.0.0-beta.2 → 1.0.0-beta.4

package/dist/{chunk-RZCWSXTA.cjs → chunk-43G3JT2E.cjs}

@@ -1,19 +1,20 @@
 'use strict';
 
-var chunkC4XZV6E7_cjs = require('./chunk-C4XZV6E7.cjs');
-var chunkEBSPLUW4_cjs = require('./chunk-EBSPLUW4.cjs');
+var chunkNZFKROS7_cjs = require('./chunk-NZFKROS7.cjs');
+var chunkAHCLWAM5_cjs = require('./chunk-AHCLWAM5.cjs');
 var chunkN5YFR4UP_cjs = require('./chunk-N5YFR4UP.cjs');
-var chunkWQTTOGXC_cjs = require('./chunk-WQTTOGXC.cjs');
+var chunk4AVD7NZW_cjs = require('./chunk-4AVD7NZW.cjs');
 var chunkZ2XP767T_cjs = require('./chunk-Z2XP767T.cjs');
-var chunkJ73SJHR3_cjs = require('./chunk-J73SJHR3.cjs');
+var chunk2NPS5DQ3_cjs = require('./chunk-2NPS5DQ3.cjs');
 var chunkVEKIWQ3F_cjs = require('./chunk-VEKIWQ3F.cjs');
-var chunkOT6OJY7C_cjs = require('./chunk-OT6OJY7C.cjs');
+var chunk4CVLFLOB_cjs = require('./chunk-4CVLFLOB.cjs');
 var chunkOC6LTXYS_cjs = require('./chunk-OC6LTXYS.cjs');
-var chunkQNJ4ACRT_cjs = require('./chunk-QNJ4ACRT.cjs');
-var chunkNMD5VRN4_cjs = require('./chunk-NMD5VRN4.cjs');
-var chunkGW32KPCU_cjs = require('./chunk-GW32KPCU.cjs');
-var chunk3YNVWKR2_cjs = require('./chunk-3YNVWKR2.cjs');
-var chunkEHAHVROS_cjs = require('./chunk-EHAHVROS.cjs');
+var chunkNJTXJ5AG_cjs = require('./chunk-NJTXJ5AG.cjs');
+var chunkM4F66R4O_cjs = require('./chunk-M4F66R4O.cjs');
+var chunkR24DI24X_cjs = require('./chunk-R24DI24X.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');
 
 // src/packages/arithmetic/parselets/NumberParselet.ts
@@ -43,7 +44,7 @@ var NumberParselet = class {
     } else if (CHAINED_DOT_THOUSANDS_GROUPS.test(raw)) {
       v = parseFloat(raw.split(".").join(""));
     } else {
-      const locale = chunk3YNVWKR2_cjs.getLocale(parser.getLocaleCode());
+      const locale = chunkOUHT5Z36_cjs.getLocale(parser.getLocaleCode());
       const decimalSep = locale.display.decimalSeparator;
       const thousandsSep = locale.display.thousandsSeparator;
       let normalized = raw;
@@ -126,6 +127,19 @@ var SUFFIX_MAGNITUDE = {
   B: 9,
   T: 12
 };
+var WORD_MAGNITUDE = {
+  thousand: 3,
+  thousands: 3,
+  million: 6,
+  millions: 6,
+  mn: 6,
+  billion: 9,
+  billions: 9,
+  bn: 9,
+  trillion: 12,
+  trillions: 12,
+  tn: 12
+};
 var PLAIN_DECIMAL = /^\d+(\.\d+)?$/;
 function scaleDecimalString(raw, magnitude) {
   const dotIdx = raw.indexOf(".");
@@ -149,13 +163,13 @@ function largeNumberSuffixNormalizerRule(priority = 65) {
       const suffixToken = tokens[pos + 1];
       if (!suffixToken) return null;
       if (suffixToken.type !== "IDENT" && suffixToken.type !== "UNIT") return null;
-      if (numberToken.offset + numberToken.text.length !== suffixToken.offset) return null;
-      const magnitude = SUFFIX_MAGNITUDE[suffixToken.value];
+      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()];
       if (magnitude === void 0) return null;
       const scaled = scaleDecimalString(numberToken.text, magnitude);
       return {
         consumed: 2,
-        replacement: [chunkEBSPLUW4_cjs.createFusedToken("NUMBER", scaled, tokens.slice(pos, pos + 2))],
+        replacement: [chunkAHCLWAM5_cjs.createFusedToken("NUMBER", scaled, tokens.slice(pos, pos + 2))],
         ruleName: "arithmetic:large-number-suffix"
       };
     }
@@ -178,21 +192,25 @@ var ARITHMETIC_PACKAGE = {
     { tokenType: "BIT_NOT", parselet: new PrefixOpParselet(36 /* BIT_NOT */) }
   ],
   infixParselets: [
-    { tokenType: "PLUS", parselet: new BinaryOpParselet(chunkC4XZV6E7_cjs.BindingPower.Sum, 20 /* ADD */) },
-    { tokenType: "MINUS", parselet: new BinaryOpParselet(chunkC4XZV6E7_cjs.BindingPower.Sum, 21 /* SUB */) },
-    { tokenType: "STAR", parselet: new BinaryOpParselet(chunkC4XZV6E7_cjs.BindingPower.Product, 22 /* MUL */) },
-    { tokenType: "SLASH", parselet: new BinaryOpParselet(chunkC4XZV6E7_cjs.BindingPower.Product, 23 /* DIV */) },
-    { tokenType: "MOD", parselet: new BinaryOpParselet(chunkC4XZV6E7_cjs.BindingPower.Product, 24 /* MOD */) },
-    { tokenType: "CARET", parselet: new BinaryOpParselet(chunkC4XZV6E7_cjs.BindingPower.Exponent, 25 /* EXP */) },
-    { tokenType: "TIMES_BY", parselet: new BinaryOpParselet(chunkC4XZV6E7_cjs.BindingPower.Product, 22 /* MUL */) },
-    { tokenType: "MULTIPLY_BY", parselet: new BinaryOpParselet(chunkC4XZV6E7_cjs.BindingPower.Product, 22 /* MUL */) },
-    { tokenType: "DIVIDE_BY", parselet: new BinaryOpParselet(chunkC4XZV6E7_cjs.BindingPower.Product, 23 /* DIV */) },
-    { tokenType: "LSHIFT", parselet: new BinaryOpParselet(chunkC4XZV6E7_cjs.BindingPower.Sum, 30 /* LSHIFT */) },
-    { tokenType: "RSHIFT", parselet: new BinaryOpParselet(chunkC4XZV6E7_cjs.BindingPower.Sum, 31 /* RSHIFT */) },
-    { tokenType: "URSHIFT", parselet: new BinaryOpParselet(chunkC4XZV6E7_cjs.BindingPower.Sum, 32 /* URSHIFT */) },
-    { tokenType: "BIT_AND", parselet: new BinaryOpParselet(chunkC4XZV6E7_cjs.BindingPower.Product, 33 /* BIT_AND */) },
-    { tokenType: "BIT_OR", parselet: new BinaryOpParselet(chunkC4XZV6E7_cjs.BindingPower.Sum, 34 /* BIT_OR */) },
-    { tokenType: "BIT_XOR", parselet: new BinaryOpParselet(chunkC4XZV6E7_cjs.BindingPower.BitwiseXor, 35 /* BIT_XOR */) }
+    { tokenType: "PLUS", parselet: new BinaryOpParselet(chunkNZFKROS7_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 */) }
   ],
   normalizerRules: [largeNumberSuffixNormalizerRule()]
 };
@@ -201,20 +219,178 @@ var ARITHMETIC_PACKAGE = {
 var PercentParselet = class {
   constructor() {
     this.category = "Percentage";
-    this.bindingPower = chunkC4XZV6E7_cjs.BindingPower.Prefix;
+    this.bindingPower = chunkNZFKROS7_cjs.BindingPower.Prefix;
   }
   parse(parser, left, token, builder) {
     builder.emitOpcode(10 /* PUSH_NUMBER */);
     builder.emitNumber(100);
     builder.emitOpcode(23 /* DIV */);
+    builder.emitOpcode(74 /* TO_PERCENTAGE */);
+  }
+};
+
+// src/packages/percentage/parselets/IsWhatParselet.ts
+var IsWhatParselet = class {
+  constructor() {
+    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;
+  }
+  parse(parser, _left, _token, builder) {
+    if (nextWordIs(parser, "what")) {
+      parser.consume();
+      this.parseWhatRate(parser, builder);
+      return;
+    }
+    this.parseWhatBase(parser, builder);
+  }
+  /**
+   * `<part> is what % of|off|on <base>`, solving for the rate.
+   */
+  parseWhatRate(parser, builder) {
+    if (!parser.match("PERCENT")) {
+      throw chunkM4N5GA5Z_cjs.ErrorFactory.parsing(
+        "IS_WHAT_EXPECTED_PERCENT",
+        'Expected "%" after "is what", as in "20 is what % of 200"'
+      );
+    }
+    const preposition = readPreposition(parser);
+    if (preposition === null) {
+      builder.emitOpcode(74 /* TO_PERCENTAGE */);
+      return;
+    }
+    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Conditional, builder);
+    builder.emitOpcode(23 /* DIV */);
+    if (preposition === "off") {
+      builder.emitOpcode(10 /* PUSH_NUMBER */);
+      builder.emitNumber(1);
+      builder.emitOpcode(2 /* SWAP */);
+      builder.emitOpcode(21 /* SUB */);
+    } else if (preposition === "on") {
+      builder.emitOpcode(10 /* PUSH_NUMBER */);
+      builder.emitNumber(1);
+      builder.emitOpcode(21 /* SUB */);
+    }
+    builder.emitOpcode(74 /* TO_PERCENTAGE */);
+  }
+  /**
+   * `<part> is <rate> of|off|on what`, solving for the base.
+   */
+  parseWhatBase(parser, builder) {
+    parser.parseExpression(chunkNZFKROS7_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"');
+      builder.emitOpcode(51 /* CALL_BUILTIN */);
+      builder.emitIndex(LOG_BUILTIN);
+      builder.emitIndex(1);
+      builder.emitOpcode(2 /* SWAP */);
+      builder.emitOpcode(51 /* CALL_BUILTIN */);
+      builder.emitIndex(LOG_BUILTIN);
+      builder.emitIndex(1);
+      builder.emitOpcode(2 /* SWAP */);
+      builder.emitOpcode(23 /* DIV */);
+      return;
+    }
+    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(
+        "IS_WHAT_EXPECTED_PREPOSITION",
+        'Expected "of what", "off what" or "on what", as in "20 is 10% of what"'
+      );
+    }
+    if (preposition === "of") {
+      builder.emitOpcode(23 /* DIV */);
+      return;
+    }
+    builder.emitOpcode(10 /* PUSH_NUMBER */);
+    builder.emitNumber(1);
+    if (preposition === "off") {
+      builder.emitOpcode(2 /* SWAP */);
+      builder.emitOpcode(21 /* SUB */);
+    } else {
+      builder.emitOpcode(20 /* ADD */);
+    }
+    builder.emitOpcode(23 /* DIV */);
+  }
+};
+var LOG_BUILTIN = 5;
+function nextWordIs(parser, word) {
+  return (parser.peek()?.text ?? "").toLowerCase() === word;
+}
+function expectWord(parser, word, example) {
+  if (!nextWordIs(parser, word)) {
+    throw chunkM4N5GA5Z_cjs.ErrorFactory.parsing(
+      "IS_WHAT_EXPECTED_WORD",
+      `Expected "${word}" here, as in ${example}`
+    );
+  }
+  parser.consume();
+}
+function readPreposition(parser) {
+  if (parser.match("OF")) return "of";
+  const word = (parser.peek()?.text ?? "").toLowerCase();
+  if (word === "off" || word === "on") {
+    parser.consume();
+    return word;
+  }
+  return null;
+}
+
+// src/packages/percentage/parselets/OnOffBaseParselet.ts
+var OnOffBaseParselet = class {
+  /** @param sign - `1` for a markup (`on`), `-1` for a discount (`off`). */
+  constructor(sign) {
+    this.sign = sign;
+    this.category = "Percentage";
+    this.bindingPower = chunkNZFKROS7_cjs.BindingPower.Conditional;
+  }
+  parse(parser, _left, _token, builder) {
+    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Conditional, builder);
+    builder.emitOpcode(2 /* SWAP */);
+    builder.emitOpcode(10 /* PUSH_NUMBER */);
+    builder.emitNumber(1);
+    if (this.sign === 1) {
+      builder.emitOpcode(20 /* ADD */);
+    } else {
+      builder.emitOpcode(2 /* SWAP */);
+      builder.emitOpcode(21 /* SUB */);
+    }
+    builder.emitOpcode(22 /* MUL */);
   }
 };
 
+// src/packages/percentage/normalizer/PercentOnOffNormalizerRule.ts
+function percentOnOffNormalizerRule(priority = 68) {
+  return {
+    name: "percentage:on-off",
+    priority,
+    match(tokens, pos) {
+      if (tokens[pos]?.type !== "PERCENT") return null;
+      const word = tokens[pos + 1];
+      if (word?.type !== "IDENT") return null;
+      const text = (word.text ?? word.value ?? "").toLowerCase();
+      if (text !== "on" && text !== "off") return null;
+      const after = (tokens[pos + 2]?.text ?? "").toLowerCase();
+      if (after === "what") return null;
+      return {
+        consumed: 2,
+        replacement: [
+          tokens[pos],
+          chunkAHCLWAM5_cjs.createFusedToken(text === "on" ? "PCT_ON" : "PCT_OFF", text, [word])
+        ],
+        ruleName: "percentage:on-off"
+      };
+    }
+  };
+}
+
 // src/packages/percentage/parselets/OfParselet.ts
 var OfParselet = class {
   constructor() {
     this.category = "Percentage";
-    this.bindingPower = chunkC4XZV6E7_cjs.BindingPower.Product;
+    this.bindingPower = chunkNZFKROS7_cjs.BindingPower.Product;
   }
   parse(parser, left, token, builder) {
     parser.parseExpression(this.bindingPower, builder);
@@ -226,7 +402,7 @@ var OfParselet = class {
 var OfWhatIsParselet = class {
   constructor() {
     this.category = "Percentage";
-    this.bindingPower = chunkC4XZV6E7_cjs.BindingPower.Product;
+    this.bindingPower = chunkNZFKROS7_cjs.BindingPower.Product;
   }
   parse(parser, left, token, builder) {
     parser.parseExpression(this.bindingPower, builder);
@@ -240,7 +416,7 @@ var OnOffWhatIsParselet = class {
   constructor(sign) {
     this.sign = sign;
     this.category = "Percentage";
-    this.bindingPower = chunkC4XZV6E7_cjs.BindingPower.Product;
+    this.bindingPower = chunkNZFKROS7_cjs.BindingPower.Product;
   }
   parse(parser, left, token, builder) {
     builder.emitOpcode(10 /* PUSH_NUMBER */);
@@ -283,7 +459,7 @@ var IncreaseByParselet = class {
   constructor(multiplier) {
     this.multiplier = multiplier;
     this.category = "Percentage";
-    this.bindingPower = chunkC4XZV6E7_cjs.BindingPower.Conditional;
+    this.bindingPower = chunkNZFKROS7_cjs.BindingPower.Conditional;
   }
   parse(parser, left, token, builder) {
     parser.parseExpression(this.bindingPower, builder);
@@ -299,14 +475,14 @@ var IncreaseByParselet = class {
 var PercentageChangeParselet = class {
   constructor() {
     this.category = "Percentage";
-    this.bindingPower = chunkC4XZV6E7_cjs.BindingPower.Conditional;
+    this.bindingPower = chunkNZFKROS7_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") && chunkEHAHVROS_cjs.isKnownUnit(nextToken.value) || nextToken.type === "IN")) {
+    if (nextToken && ((nextToken.type === "UNIT" || nextToken.type === "IDENT") && chunkCLVQBF5C_cjs.isKnownUnit(nextToken.value) || nextToken.type === "IN")) {
       parser.consume();
       builder.emitOpcode(13 /* PUSH_STRING */);
       builder.emitString(nextToken.value);
@@ -328,11 +504,22 @@ var PERCENTAGE_PACKAGE = {
   name: "solve-percentage",
   phrases: {
     "of what is": "OF_WHAT_IS",
+    // Fused so that parsing the rate cannot swallow the "of": it is an infix
+    // operator in its own right ("10% of 200"), so a sub-expression would
+    // consume it and the trailing "what" before this parselet ever looked.
+    "of what": "OF_WHAT",
+    "off what": "OFF_WHAT",
+    "on what": "ON_WHAT",
     "on what is": "ON_WHAT_IS",
     "off what is": "OFF_WHAT_IS"
   },
   infixParselets: [
     { tokenType: "PERCENT", parselet: new PercentParselet() },
+    { tokenType: "IS", parselet: new IsWhatParselet() },
+    // "10% on 200" is 220 and "10% off 200" is 180: the percentage comes
+    // first, the base second. The reverse of "200 + 10%".
+    { tokenType: "PCT_ON", parselet: new OnOffBaseParselet(1) },
+    { tokenType: "PCT_OFF", parselet: new OnOffBaseParselet(-1) },
     { tokenType: "OF", parselet: new OfParselet() },
     { tokenType: "OF_WHAT_IS", parselet: new OfWhatIsParselet() },
     { tokenType: "ON_WHAT_IS", parselet: new OnOffWhatIsParselet(1) },
@@ -344,6 +531,9 @@ var PERCENTAGE_PACKAGE = {
   prefixParselets: [
     { tokenType: "INCREASE", parselet: new IncreaseDecreaseParselet(1) },
     { tokenType: "DECREASE", parselet: new IncreaseDecreaseParselet(-1) }
+  ],
+  normalizerRules: [
+    percentOnOffNormalizerRule()
   ]
 };
 
@@ -370,6 +560,13 @@ var builtinNameToIndex = {
   arcsin: 11,
   arccos: 12,
   arctan: 13,
+  // Degree-taking variants (VMBuiltins.ts 87-92).
+  sind: 87,
+  cosd: 88,
+  tand: 89,
+  asind: 90,
+  acosd: 91,
+  atand: 92,
   sinh: 15,
   cosh: 16,
   tanh: 17,
@@ -456,10 +653,10 @@ var FunctionCallParselet = class {
     parser.consume("LPAREN");
     let argCount = 0;
     if (parser.peek()?.type !== "RPAREN") {
-      parser.parseExpression(chunkC4XZV6E7_cjs.BindingPower.Lowest, builder);
+      parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
       argCount++;
       while (parser.match("COMMA")) {
-        parser.parseExpression(chunkC4XZV6E7_cjs.BindingPower.Lowest, builder);
+        parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
         argCount++;
       }
     }
@@ -562,18 +759,18 @@ function parseIso8601(s) {
 }
 function formatIso8601Local(epochMs) {
   const d = new Date(epochMs);
-  const pad = (n) => String(n).padStart(2, "0");
+  const pad3 = (n) => String(n).padStart(2, "0");
   const year = d.getFullYear();
-  const month = pad(d.getMonth() + 1);
-  const day = pad(d.getDate());
-  const hours = pad(d.getHours());
-  const minutes = pad(d.getMinutes());
-  const seconds = pad(d.getSeconds());
+  const month = pad3(d.getMonth() + 1);
+  const day = pad3(d.getDate());
+  const hours = pad3(d.getHours());
+  const minutes = pad3(d.getMinutes());
+  const seconds = pad3(d.getSeconds());
   const offsetMinutesTotal = -d.getTimezoneOffset();
   const sign = offsetMinutesTotal >= 0 ? "+" : "-";
   const absOffset = Math.abs(offsetMinutesTotal);
-  const offsetHours = pad(Math.floor(absOffset / 60));
-  const offsetMinutes = pad(absOffset % 60);
+  const offsetHours = pad3(Math.floor(absOffset / 60));
+  const offsetMinutes = pad3(absOffset % 60);
   return `${year}-${month}-${day}T${hours}:${minutes}:${seconds}${sign}${offsetHours}:${offsetMinutes}`;
 }
 var MS_TIMESTAMP_THRESHOLD = 1e12;
@@ -582,27 +779,27 @@ function unixTimestampToEpochMs(n) {
 }
 
 // src/packages/datetime/parselets/DatetimeTimestampPluginFunctions.ts
-var WORKDAYS_IN_FN_IDX = chunkJ73SJHR3_cjs.allocatePluginFunctionIndex();
-var WEEKDAY_ON_FN_IDX = chunkJ73SJHR3_cjs.allocatePluginFunctionIndex();
-var TO_DATE_FN_IDX = chunkJ73SJHR3_cjs.allocatePluginFunctionIndex();
-var TO_TIMESTAMP_FN_IDX = chunkJ73SJHR3_cjs.allocatePluginFunctionIndex();
-var MONTH_ON_FN_IDX = chunkJ73SJHR3_cjs.allocatePluginFunctionIndex();
-var WEEK_ON_FN_IDX = chunkJ73SJHR3_cjs.allocatePluginFunctionIndex();
-var IS_WEEKEND_FN_IDX = chunkJ73SJHR3_cjs.allocatePluginFunctionIndex();
-var IS_WORKDAY_FN_IDX = chunkJ73SJHR3_cjs.allocatePluginFunctionIndex();
-var SPAN_BETWEEN_FN_IDX = chunkJ73SJHR3_cjs.allocatePluginFunctionIndex();
+var WORKDAYS_IN_FN_IDX = chunk2NPS5DQ3_cjs.allocatePluginFunctionIndex();
+var WEEKDAY_ON_FN_IDX = chunk2NPS5DQ3_cjs.allocatePluginFunctionIndex();
+var TO_DATE_FN_IDX = chunk2NPS5DQ3_cjs.allocatePluginFunctionIndex();
+var TO_TIMESTAMP_FN_IDX = chunk2NPS5DQ3_cjs.allocatePluginFunctionIndex();
+var MONTH_ON_FN_IDX = chunk2NPS5DQ3_cjs.allocatePluginFunctionIndex();
+var WEEK_ON_FN_IDX = chunk2NPS5DQ3_cjs.allocatePluginFunctionIndex();
+var IS_WEEKEND_FN_IDX = chunk2NPS5DQ3_cjs.allocatePluginFunctionIndex();
+var IS_WORKDAY_FN_IDX = chunk2NPS5DQ3_cjs.allocatePluginFunctionIndex();
+var SPAN_BETWEEN_FN_IDX = chunk2NPS5DQ3_cjs.allocatePluginFunctionIndex();
 function workdaysInDurationHandler(args) {
   const v = args[0];
   let totalDays;
   if (v.type === 6 /* Uom */ && v.unit) {
-    const measure = chunkQNJ4ACRT_cjs.getMeasure(v.unit);
+    const measure = chunkNJTXJ5AG_cjs.getMeasure(v.unit);
     if (measure !== "time") {
       return chunkOC6LTXYS_cjs.errorValue(
         "WORKDAYS_IN_EXPECTED_DURATION",
         `"workdays in" expects a time duration, got unit "${v.unit}"`
       );
     }
-    totalDays = chunkQNJ4ACRT_cjs.convertUnit(v.toNumber(), v.unit, "day");
+    totalDays = chunkNJTXJ5AG_cjs.convertUnit(v.toNumber(), v.unit, "day");
   } else {
     totalDays = v.toNumber();
   }
@@ -763,9 +960,9 @@ var DurationBetweenParselet = class {
   }
   parse(parser, token, builder) {
     const unit = token.value;
-    parser.parseExpression(chunkC4XZV6E7_cjs.BindingPower.Product, builder);
-    parser.consume("PLUS");
-    parser.parseExpression(chunkC4XZV6E7_cjs.BindingPower.Lowest, builder);
+    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Product, builder);
+    parser.consume("AND_CONJ");
+    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
     builder.emitOpcode(50 /* CALL_PLUGIN */);
     builder.emitIndex(SPAN_BETWEEN_FN_IDX);
     builder.emitIndex(2);
@@ -780,7 +977,7 @@ var DayTypePredicateParselet = class {
   constructor(functionIndex) {
     this.functionIndex = functionIndex;
     this.category = "Date/Time";
-    this.bindingPower = chunkC4XZV6E7_cjs.BindingPower.Conditional;
+    this.bindingPower = chunkNZFKROS7_cjs.BindingPower.Conditional;
   }
   parse(parser, left, token, builder) {
     builder.emitOpcode(50 /* CALL_PLUGIN */);
@@ -806,7 +1003,7 @@ var CurrentTimestampParselet = class {
 var ToDateParselet = class {
   constructor() {
     this.category = "Date/Time";
-    this.bindingPower = chunkC4XZV6E7_cjs.BindingPower.Conditional;
+    this.bindingPower = chunkNZFKROS7_cjs.BindingPower.Conditional;
   }
   parse(parser, left, token, builder) {
     builder.emitOpcode(50 /* CALL_PLUGIN */);
@@ -819,7 +1016,7 @@ var ToDateParselet = class {
 var ToTimestampParselet = class {
   constructor() {
     this.category = "Date/Time";
-    this.bindingPower = chunkC4XZV6E7_cjs.BindingPower.Conditional;
+    this.bindingPower = chunkNZFKROS7_cjs.BindingPower.Conditional;
   }
   parse(parser, left, token, builder) {
     builder.emitOpcode(50 /* CALL_PLUGIN */);
@@ -853,7 +1050,7 @@ function untilSinceNormalizerRule(priority = 60) {
       const fusedType = keywordToken.type === "UNTIL" ? "UNTIL_UNIT" : "SINCE_UNIT";
       return {
         consumed: 2,
-        replacement: [chunkEBSPLUW4_cjs.createFusedToken(fusedType, unitToken.value, [unitToken, keywordToken])],
+        replacement: [chunkAHCLWAM5_cjs.createFusedToken(fusedType, unitToken.value, [unitToken, keywordToken])],
         ruleName: `datetime:${keywordToken.type.toLowerCase()}`
       };
     }
@@ -890,7 +1087,7 @@ function betweenUnitNormalizerRule(priority = 60) {
       }
       return {
         consumed: howManyLength + 2,
-        replacement: [chunkEBSPLUW4_cjs.createFusedToken("BETWEEN_UNIT", unitToken.value, sources)],
+        replacement: [chunkAHCLWAM5_cjs.createFusedToken("BETWEEN_UNIT", unitToken.value, sources)],
         ruleName: "datetime:between"
       };
     }
@@ -911,7 +1108,7 @@ function workdayRateDenominatorNormalizerRule(priority = 70) {
       const syntheticOne = {
         ...unit,
         type: "NUMBER",
-        typeId: chunkGW32KPCU_cjs.tokenTypeId("NUMBER"),
+        typeId: chunkR24DI24X_cjs.tokenTypeId("NUMBER"),
         value: "1",
         text: "1"
       };
@@ -926,7 +1123,7 @@ function workdayRateDenominatorNormalizerRule(priority = 70) {
 
 // src/packages/datetime/normalizer/DateLiteralNormalizerRule.ts
 var DATETIME_LITERAL_TYPE = "DATETIME_LITERAL";
-var DATETIME_LITERAL_TYPE_ID = chunkGW32KPCU_cjs.tokenTypeId(DATETIME_LITERAL_TYPE);
+var DATETIME_LITERAL_TYPE_ID = chunkR24DI24X_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})$/;
@@ -946,7 +1143,7 @@ function buildDateToken(day, month, year, sourceTokens, ruleName) {
   }
   const first = sourceTokens[0];
   const text = sourceTokens.map((t) => t.value).join("");
-  const fusedToken = new chunkNMD5VRN4_cjs.LexerToken(
+  const fusedToken = new chunkM4F66R4O_cjs.LexerToken(
     DATETIME_LITERAL_TYPE,
     DATETIME_LITERAL_TYPE_ID,
     String(date.getTime()),
@@ -1008,6 +1205,201 @@ function dateLiteralNormalizerRule() {
   };
 }
 
+// src/packages/datetime/normalizer/MonthNameDateNormalizerRule.ts
+var MONTHS = {
+  january: 1,
+  jan: 1,
+  february: 2,
+  feb: 2,
+  march: 3,
+  mar: 3,
+  april: 4,
+  apr: 4,
+  may: 5,
+  june: 6,
+  jun: 6,
+  july: 7,
+  jul: 7,
+  august: 8,
+  aug: 8,
+  september: 9,
+  sep: 9,
+  sept: 9,
+  october: 10,
+  oct: 10,
+  november: 11,
+  nov: 11,
+  december: 12,
+  dec: 12
+};
+function monthOf(token) {
+  if (token === void 0) return 0;
+  if (token.type !== "IDENT" && token.type !== "UNIT") return 0;
+  return MONTHS[(token.text ?? token.value ?? "").toLowerCase()] ?? 0;
+}
+var PLAIN_INTEGER2 = /^\d+$/;
+function looksLikeYear(digits) {
+  return digits.length === 4;
+}
+function monthNameDateNormalizerRule(priority = 64) {
+  return {
+    name: "datetime:month-name-date",
+    priority,
+    match(tokens, pos) {
+      const RULE = "datetime:month-name-date";
+      const first = tokens[pos];
+      if (first?.type === "NUMBER" && PLAIN_INTEGER2.test(first.text ?? "")) {
+        const month2 = monthOf(tokens[pos + 1]);
+        if (month2 === 0) return null;
+        const day2 = Number(first.text);
+        if (day2 < 1 || day2 > 31) return null;
+        const yearToken2 = tokens[pos + 2];
+        if (yearToken2?.type === "NUMBER" && PLAIN_INTEGER2.test(yearToken2.text ?? "") && looksLikeYear(yearToken2.text ?? "")) {
+          return buildDateToken(day2, month2, Number(yearToken2.text), tokens.slice(pos, pos + 3), RULE);
+        }
+        return buildDateToken(day2, month2, (/* @__PURE__ */ new Date()).getFullYear(), tokens.slice(pos, pos + 2), RULE);
+      }
+      const month = monthOf(first);
+      if (month === 0) return null;
+      const second = tokens[pos + 1];
+      if (second?.type !== "NUMBER" || !PLAIN_INTEGER2.test(second.text ?? "")) return null;
+      if (looksLikeYear(second.text ?? "")) {
+        return buildDateToken(1, month, Number(second.text), tokens.slice(pos, pos + 2), RULE);
+      }
+      const day = Number(second.text);
+      const comma = tokens[pos + 2];
+      const yearToken = tokens[pos + 3];
+      if (comma?.type === "COMMA" && yearToken?.type === "NUMBER" && PLAIN_INTEGER2.test(yearToken.text ?? "") && looksLikeYear(yearToken.text ?? "")) {
+        return buildDateToken(day, month, Number(yearToken.text), tokens.slice(pos, pos + 4), RULE);
+      }
+      if (comma?.type === "NUMBER" && PLAIN_INTEGER2.test(comma.text ?? "") && looksLikeYear(comma.text ?? "")) {
+        return buildDateToken(day, month, Number(comma.text), tokens.slice(pos, pos + 3), RULE);
+      }
+      return buildDateToken(day, month, (/* @__PURE__ */ new Date()).getFullYear(), tokens.slice(pos, pos + 2), RULE);
+    }
+  };
+}
+
+// src/packages/datetime/parselets/DaysInPeriodParselet.ts
+var DAYS_COUNT_BUILTIN = 93;
+var QUARTERS = {
+  q1: [1, 3],
+  q2: [4, 6],
+  q3: [7, 9],
+  q4: [10, 12]
+};
+function daysInMonth(year, month) {
+  return new Date(year, month, 0).getDate();
+}
+function daysInYear(year) {
+  return daysInMonth(year, 2) === 29 ? 366 : 365;
+}
+var DaysInPeriodParselet = class {
+  constructor() {
+    this.category = "Datetime";
+  }
+  parse(parser, _token, builder) {
+    const total = this.readPeriodDays(parser);
+    builder.emitOpcode(10 /* PUSH_NUMBER */);
+    builder.emitNumber(total);
+    builder.emitOpcode(51 /* CALL_BUILTIN */);
+    builder.emitIndex(DAYS_COUNT_BUILTIN);
+    builder.emitIndex(1);
+  }
+  /** The number of days in the period written after `days in`. */
+  readPeriodDays(parser) {
+    const next = parser.peek();
+    const word = (next?.text ?? next?.value ?? "").toLowerCase();
+    const quarter = QUARTERS[word];
+    if (quarter !== void 0) {
+      parser.consume();
+      const year2 = this.readOptionalYear(parser) ?? (/* @__PURE__ */ new Date()).getFullYear();
+      let total = 0;
+      for (let month = quarter[0]; month <= quarter[1]; month++) {
+        total += daysInMonth(year2, month);
+      }
+      return total;
+    }
+    if (next?.type === "DATETIME_LITERAL") {
+      parser.consume();
+      const date = new Date(Number(next.value));
+      return daysInMonth(date.getFullYear(), date.getMonth() + 1);
+    }
+    const year = this.readOptionalYear(parser);
+    if (year !== null) return daysInYear(year);
+    throw chunkM4N5GA5Z_cjs.ErrorFactory.parsing(
+      "DAYS_IN_EXPECTED_PERIOD",
+      'Expected a month, quarter or year, as in "days in February 2020" or "days in Q3"'
+    );
+  }
+  /** A four-digit year sitting at the cursor, consumed if present. */
+  readOptionalYear(parser) {
+    const token = parser.peek();
+    if (token?.type !== "NUMBER") return null;
+    const text = token.text ?? token.value ?? "";
+    if (!/^\d{4}$/.test(text)) return null;
+    parser.consume();
+    return Number(text);
+  }
+};
+
+// src/packages/datetime/normalizer/DaysInPeriodNormalizerRule.ts
+var QUARTERS2 = /* @__PURE__ */ new Set(["q1", "q2", "q3", "q4"]);
+var MONTHS2 = /* @__PURE__ */ new Set([
+  "january",
+  "jan",
+  "february",
+  "feb",
+  "march",
+  "mar",
+  "april",
+  "apr",
+  "may",
+  "june",
+  "jun",
+  "july",
+  "jul",
+  "august",
+  "aug",
+  "september",
+  "sep",
+  "sept",
+  "october",
+  "oct",
+  "november",
+  "nov",
+  "december",
+  "dec"
+]);
+function startsPeriod(token) {
+  if (token === void 0) return false;
+  if (token.type === "DATETIME_LITERAL") return true;
+  const word = (token.text ?? token.value ?? "").toLowerCase();
+  if (token.type === "IDENT" || token.type === "UNIT") {
+    return QUARTERS2.has(word) || MONTHS2.has(word);
+  }
+  return token.type === "NUMBER" && /^\d{4}$/.test(token.text ?? "");
+}
+function daysInPeriodNormalizerRule(priority = 60) {
+  return {
+    name: "datetime:days-in-period",
+    priority,
+    match(tokens, pos) {
+      const days = tokens[pos];
+      if (days === void 0) return null;
+      if ((days.text ?? days.value ?? "").toLowerCase() !== "days") return null;
+      if (days.type !== "UNIT" && days.type !== "IDENT") return null;
+      if (tokens[pos + 1]?.type !== "IN") return null;
+      if (!startsPeriod(tokens[pos + 2])) return null;
+      return {
+        consumed: 2,
+        replacement: [chunkAHCLWAM5_cjs.createFusedToken("DAYS_IN_PERIOD", "days in", [days, tokens[pos + 1]])],
+        ruleName: "datetime:days-in-period"
+      };
+    }
+  };
+}
+
 // src/packages/datetime/normalizer/DailyNoteLinkNormalizerRule.ts
 function dailyNoteLinkNormalizerRule() {
   return {
@@ -1056,6 +1448,10 @@ var DATETIME_PACKAGE = {
     "what week is it": "WEEK_ON",
     "what week is it on": "WEEK_ON",
     "week of": "WEEK_ON",
+    // The spelling Soulver documents. Same question, same handler.
+    "week number on": "WEEK_ON",
+    "week number of": "WEEK_ON",
+    "week number": "WEEK_ON",
     "what week is it in": "WEEK_IN",
     "what week will it be in": "WEEK_IN",
     // Postfix day-type predicates.
@@ -1066,6 +1462,7 @@ var DATETIME_PACKAGE = {
     "is a business day": "IS_WORKDAY"
   },
   prefixParselets: [
+    { tokenType: "DAYS_IN_PERIOD", parselet: new DaysInPeriodParselet() },
     { tokenType: "NOW", parselet: new NowParselet(0) },
     { tokenType: "TODAY", parselet: new NowParselet(0) },
     { tokenType: "TOMORROW", parselet: new NowParselet(1) },
@@ -1096,6 +1493,11 @@ var DATETIME_PACKAGE = {
     betweenUnitNormalizerRule(),
     workdayRateDenominatorNormalizerRule(),
     dateLiteralNormalizerRule(),
+    // Dates with the month spelled out ("March 9, 2024"). Priority 64, just
+    // under the numeric rule, so an all-numeric literal is still claimed by
+    // the rule that has always claimed it.
+    monthNameDateNormalizerRule(),
+    daysInPeriodNormalizerRule(),
     dailyNoteLinkNormalizerRule()
   ],
   pluginFunctions: [
@@ -1434,10 +1836,10 @@ function tryConsumeZoneReference(parser) {
 }
 
 // src/packages/time/parselets/TimezonePluginFunctions.ts
-var ZONE_CONVERT_FN_IDX = chunkJ73SJHR3_cjs.allocatePluginFunctionIndex();
-var TIME_IN_ZONE_FN_IDX = chunkJ73SJHR3_cjs.allocatePluginFunctionIndex();
-var DATE_IN_ZONE_FN_IDX = chunkJ73SJHR3_cjs.allocatePluginFunctionIndex();
-var TIME_DIFFERENCE_FN_IDX = chunkJ73SJHR3_cjs.allocatePluginFunctionIndex();
+var ZONE_CONVERT_FN_IDX = chunk2NPS5DQ3_cjs.allocatePluginFunctionIndex();
+var TIME_IN_ZONE_FN_IDX = chunk2NPS5DQ3_cjs.allocatePluginFunctionIndex();
+var DATE_IN_ZONE_FN_IDX = chunk2NPS5DQ3_cjs.allocatePluginFunctionIndex();
+var TIME_DIFFERENCE_FN_IDX = chunk2NPS5DQ3_cjs.allocatePluginFunctionIndex();
 function zoneConvertHandler(args) {
   const totalMinutes = args[0].toNumber();
   const sourceZoneRef = args[1].value;
@@ -1608,7 +2010,7 @@ var TimeDifferenceParselet = class {
         `Expected a city or zone name after "time difference between" (e.g. "time difference between Seattle and Moscow")`
       );
     }
-    parser.consume("PLUS");
+    parser.consume("AND_CONJ");
     const zone2 = tryConsumeZoneReference(parser);
     if (zone2 === null) {
       throw chunkM4N5GA5Z_cjs.ErrorFactory.parsing(
@@ -1686,14 +2088,14 @@ var VideoTimecodeParselet = class {
 // src/packages/time/timecode/TimecodeMath.ts
 function framesToTimecodeString(totalFrames, fps) {
   const fpsWhole = Math.max(1, Math.round(fps));
-  const pad = (n) => String(n).padStart(2, "0");
+  const pad3 = (n) => String(n).padStart(2, "0");
   const frameCount = Math.trunc(totalFrames);
   const frames = (frameCount % fpsWhole + fpsWhole) % fpsWhole;
   const totalSeconds = Math.floor(frameCount / fpsWhole);
   const hours = Math.floor(totalSeconds / 3600);
   const minutes = Math.floor(totalSeconds % 3600 / 60);
   const seconds = totalSeconds % 60;
-  return `${pad(hours)}:${pad(minutes)}:${pad(seconds)}:${pad(frames)}`;
+  return `${pad3(hours)}:${pad3(minutes)}:${pad3(seconds)}:${pad3(frames)}`;
 }
 
 // src/packages/time/parselets/FrameCountParselet.ts
@@ -1747,7 +2149,7 @@ function clockTimeNormalizerRule(priority = 65) {
     name: "time:clock-time",
     priority,
     match(tokens, pos) {
-      if (chunkEBSPLUW4_cjs.isInsideRangeContext(tokens, pos)) return null;
+      if (chunkAHCLWAM5_cjs.isInsideRangeContext(tokens, pos)) return null;
       const hourToken = tokens[pos];
       if (hourToken.type !== "NUMBER") return null;
       const hour = parseInt(hourToken.value, 10);
@@ -1763,7 +2165,7 @@ function clockTimeNormalizerRule(priority = 65) {
         const consumed = hasAmPm ? 4 : 3;
         return {
           consumed,
-          replacement: [chunkEBSPLUW4_cjs.createFusedToken("CLOCK_TIME", String(totalMinutes), tokens.slice(pos, pos + consumed))],
+          replacement: [chunkAHCLWAM5_cjs.createFusedToken("CLOCK_TIME", String(totalMinutes), tokens.slice(pos, pos + consumed))],
           ruleName: "time:clock-time"
         };
       }
@@ -1773,7 +2175,7 @@ function clockTimeNormalizerRule(priority = 65) {
         if (totalMinutes === null) return null;
         return {
           consumed: 2,
-          replacement: [chunkEBSPLUW4_cjs.createFusedToken("CLOCK_TIME", String(totalMinutes), tokens.slice(pos, pos + 2))],
+          replacement: [chunkAHCLWAM5_cjs.createFusedToken("CLOCK_TIME", String(totalMinutes), tokens.slice(pos, pos + 2))],
           ruleName: "time:clock-time"
         };
       }
@@ -1796,7 +2198,7 @@ function clockTimeIntervalNormalizerRule(priority = 66) {
       if (end?.type !== "CLOCK_TIME") return null;
       return {
         consumed: 3,
-        replacement: [chunkEBSPLUW4_cjs.createFusedToken("CLOCK_TIME_INTERVAL", `${start.value}:${end.value}`, tokens.slice(pos, pos + 3))],
+        replacement: [chunkAHCLWAM5_cjs.createFusedToken("CLOCK_TIME_INTERVAL", `${start.value}:${end.value}`, tokens.slice(pos, pos + 3))],
         ruleName: "time:clock-time-interval"
       };
     }
@@ -1815,7 +2217,7 @@ function fpsRateNormalizerRule(priority = 65) {
       if (fpsToken?.type !== "IDENT" || fpsToken.value.toLowerCase() !== "fps") return null;
       return {
         consumed: 2,
-        replacement: [chunkEBSPLUW4_cjs.createFusedToken("FPS_RATE", numberToken.value, tokens.slice(pos, pos + 2))],
+        replacement: [chunkAHCLWAM5_cjs.createFusedToken("FPS_RATE", numberToken.value, tokens.slice(pos, pos + 2))],
         ruleName: "time:fps-rate"
       };
     }
@@ -1828,7 +2230,7 @@ function laptimeNormalizerRule(priority = 70) {
     name: "time:laptime",
     priority,
     match(tokens, pos) {
-      if (chunkEBSPLUW4_cjs.isInsideRangeContext(tokens, pos)) return null;
+      if (chunkAHCLWAM5_cjs.isInsideRangeContext(tokens, pos)) return null;
       const h = tokens[pos];
       const c1 = tokens[pos + 1];
       const m = tokens[pos + 2];
@@ -1847,7 +2249,7 @@ function laptimeNormalizerRule(priority = 70) {
       const totalSeconds = hours * 3600 + minutes * 60 + seconds;
       return {
         consumed: 5,
-        replacement: [chunkEBSPLUW4_cjs.createFusedToken("LAPTIME", String(totalSeconds), tokens.slice(pos, pos + 5))],
+        replacement: [chunkAHCLWAM5_cjs.createFusedToken("LAPTIME", String(totalSeconds), tokens.slice(pos, pos + 5))],
         ruleName: "time:laptime"
       };
     }
@@ -1860,7 +2262,7 @@ function videoTimecodeNormalizerRule(priority = 75) {
     name: "time:video-timecode",
     priority,
     match(tokens, pos) {
-      if (chunkEBSPLUW4_cjs.isInsideRangeContext(tokens, pos)) return null;
+      if (chunkAHCLWAM5_cjs.isInsideRangeContext(tokens, pos)) return null;
       const h = tokens[pos];
       const c1 = tokens[pos + 1];
       const m = tokens[pos + 2];
@@ -1886,7 +2288,7 @@ function videoTimecodeNormalizerRule(priority = 75) {
       return {
         consumed: 7,
         replacement: [
-          chunkEBSPLUW4_cjs.createFusedToken("VIDEO_TIMECODE", `${hours},${minutes},${seconds},${frames}`, tokens.slice(pos, pos + 7))
+          chunkAHCLWAM5_cjs.createFusedToken("VIDEO_TIMECODE", `${hours},${minutes},${seconds},${frames}`, tokens.slice(pos, pos + 7))
         ],
         ruleName: "time:video-timecode"
       };
@@ -1906,16 +2308,79 @@ function frameCountNormalizerRule(priority = 65) {
       if (framesToken?.type !== "IDENT" || framesToken.value.toLowerCase() !== "frames") return null;
       return {
         consumed: 2,
-        replacement: [chunkEBSPLUW4_cjs.createFusedToken("FRAME_COUNT", numberToken.value, tokens.slice(pos, pos + 2))],
+        replacement: [chunkAHCLWAM5_cjs.createFusedToken("FRAME_COUNT", numberToken.value, tokens.slice(pos, pos + 2))],
         ruleName: "time:frame-count"
       };
     }
   };
 }
 
+// src/packages/time/TimespanConverters.ts
+var TIME_KIND = 14;
+var TIMESPAN_PARTS = [
+  ["week", "weeks", 604800],
+  ["day", "days", 86400],
+  ["hour", "hours", 3600],
+  ["minute", "minutes", 60],
+  ["second", "seconds", 1]
+];
+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()];
+  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"}`);
+  }
+  const negative = total < 0;
+  let remaining = Math.abs(total);
+  const parts = [];
+  for (const [singular, plural, seconds] of TIMESPAN_PARTS) {
+    if (seconds === 1) break;
+    const count = Math.floor(remaining / seconds);
+    if (count > 0) {
+      parts.push(`${count} ${count === 1 ? singular : plural}`);
+      remaining -= count * seconds;
+    }
+  }
+  const secondsLeft = Math.round(remaining * 1e3) / 1e3;
+  if (secondsLeft > 0 || parts.length === 0) {
+    parts.push(`${secondsLeft} ${secondsLeft === 1 ? "second" : "seconds"}`);
+  }
+  return chunkOC6LTXYS_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"}`);
+  }
+  const negative = total < 0;
+  const rounded = Math.round(Math.abs(total) * 1e3) / 1e3;
+  const hours = Math.floor(rounded / 3600);
+  const minutes = Math.floor(rounded % 3600 / 60);
+  const seconds = rounded % 60;
+  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));
+}
+function pad(n) {
+  return n < 10 ? `0${n}` : String(n);
+}
+
 // src/packages/time/TimePackage.ts
 var TIME_PACKAGE = {
   name: "solve-time",
+  asConverters: {
+    // The two ways of writing a duration out. See TimespanConverters.ts.
+    timespan: toTimespanString,
+    laptime: toLaptimeString,
+    lap: toLaptimeString
+  },
   phrases: {
     "time in": "TIME_IN",
     "date in": "DATE_IN",
@@ -2012,14 +2477,14 @@ var keywordLedRollPattern = definePhrasePattern({
     {
       slots: [
         { kind: "keyword", tokenTypes: ["BETWEEN"] },
-        { kind: "expr", bindingPower: chunkC4XZV6E7_cjs.BindingPower.Product },
+        { kind: "expr", bindingPower: chunkNZFKROS7_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
         // separator's token type (a bare `parser.consume()`), so it never
         // surfaced this; matching that real lexer behavior explicitly here
         // rather than the aspirational "AND" the old code's comment implied.
-        { kind: "keyword", tokenTypes: ["PLUS"] },
+        { kind: "keyword", tokenTypes: ["AND_CONJ"] },
         { kind: "expr" }
       ],
       emit: emitDiceRollCall
@@ -2027,7 +2492,7 @@ var keywordLedRollPattern = definePhrasePattern({
     {
       slots: [
         { kind: "keyword", tokenTypes: ["FROM"] },
-        { kind: "expr", bindingPower: chunkC4XZV6E7_cjs.BindingPower.Product },
+        { kind: "expr", bindingPower: chunkNZFKROS7_cjs.BindingPower.Product },
         { kind: "keyword", tokenTypes: ["TO"] },
         { kind: "expr" }
       ],
@@ -2171,11 +2636,11 @@ var GlobalVariableAsyncResolver = class {
       const op = opcodes[i];
       if (op === 62 /* LOAD_GLOBAL_VAR */) {
         const varName = strings[opcodes[i + 1]];
-        if (!chunkJ73SJHR3_cjs.sharedGlobalVariableStore.has(varName)) {
+        if (!chunk2NPS5DQ3_cjs.sharedGlobalVariableStore.has(varName)) {
           return this.pendingResultFor(varName, packageId, signal);
         }
       }
-      i = chunkWQTTOGXC_cjs.nextInstruction(opcodes, i);
+      i = chunk4AVD7NZW_cjs.nextInstruction(opcodes, i);
     }
     return null;
   }
@@ -2183,7 +2648,7 @@ var GlobalVariableAsyncResolver = class {
     let resolver = this.pending.get(varName);
     if (!resolver) {
       resolver = new Promise((resolve) => {
-        const unsubscribe = chunkJ73SJHR3_cjs.sharedGlobalVariableStore.subscribe((name, value) => {
+        const unsubscribe = chunk2NPS5DQ3_cjs.sharedGlobalVariableStore.subscribe((name, value) => {
           if (name !== varName) return;
           unsubscribe();
           this.pending.delete(varName);
@@ -2230,12 +2695,12 @@ var VARIABLES_PACKAGE = {
 
 // src/packages/uom/parselets/UomLiteralParselet.ts
 function resolveUnitAlias(rawUnit) {
-  return chunkOT6OJY7C_cjs.resolveCurrencyAlias(rawUnit) ?? rawUnit;
+  return chunk4CVLFLOB_cjs.resolveCurrencyAlias(rawUnit) ?? rawUnit;
 }
 var UomLiteralParselet = class {
   constructor() {
     this.category = "UoM";
-    this.bindingPower = chunkC4XZV6E7_cjs.BindingPower.Postfix;
+    this.bindingPower = chunkNZFKROS7_cjs.BindingPower.Postfix;
   }
   parse(parser, left, token, builder) {
     const unit = resolveUnitAlias(token.value);
@@ -2268,14 +2733,14 @@ var UomLiteralParselet = class {
 
 // src/packages/uom/parselets/ConvertParselet.ts
 function resolveUnitAlias2(rawUnit) {
-  return chunkOT6OJY7C_cjs.resolveCurrencyAlias(rawUnit) ?? rawUnit;
+  return chunk4CVLFLOB_cjs.resolveCurrencyAlias(rawUnit) ?? rawUnit;
 }
 var ConvertParselet = class {
   constructor() {
     this.category = "UoM";
   }
   parse(parser, token, builder) {
-    parser.parseExpression(chunkC4XZV6E7_cjs.BindingPower.Postfix, builder);
+    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Postfix, builder);
     const nextToken = parser.peek();
     if (nextToken && nextToken.type === "UNIT") {
       parser.consume();
@@ -2340,13 +2805,317 @@ function uomPossibilitiesNormalizerRule(priority = 60) {
       if (questionToken.type !== "QUESTION") return null;
       return {
         consumed: 3,
-        replacement: [chunkEBSPLUW4_cjs.createFusedToken("UOM_POSSIBILITIES_QUERY", unitToken.value, [unitToken, toToken, questionToken])],
+        replacement: [chunkAHCLWAM5_cjs.createFusedToken("UOM_POSSIBILITIES_QUERY", unitToken.value, [unitToken, toToken, questionToken])],
         ruleName: "uom:possibilities"
       };
     }
   };
 }
 
+// src/packages/uom/normalizer/CompoundQuantityNormalizerRule.ts
+var TIME_KIND2 = 14;
+function unitEntry(token, previousKind) {
+  if (token === void 0 || token.type !== "UNIT") return void 0;
+  const spelling = (token.value ?? "").toLowerCase();
+  if (spelling === "m" && previousKind === TIME_KIND2) {
+    return { kind: TIME_KIND2, ratio: 60, spelling: "minutes" };
+  }
+  const entry = chunkMBNQVDVC_cjs.UNIT_TABLE[spelling];
+  return entry === void 0 ? void 0 : { kind: entry[0], ratio: entry[1], spelling };
+}
+var PLAIN_NUMBER = /^\d+(\.\d+)?$/;
+function compoundQuantityNormalizerRule(priority = 63) {
+  return {
+    name: "uom:compound-quantity",
+    priority,
+    match(tokens, pos) {
+      const firstNumber = tokens[pos];
+      if (firstNumber?.type !== "NUMBER" || !PLAIN_NUMBER.test(firstNumber.text ?? "")) return null;
+      const firstUnit = unitEntry(tokens[pos + 1]);
+      if (firstUnit === void 0) return null;
+      const kind = firstUnit.kind;
+      let lastRatio = firstUnit.ratio;
+      let total = Number(firstNumber.text) * lastRatio;
+      let smallestUnit = firstUnit.spelling;
+      let smallestUnitToken = tokens[pos + 1];
+      let consumed = 2;
+      for (; ; ) {
+        const number = tokens[pos + consumed];
+        if (number?.type !== "NUMBER" || !PLAIN_NUMBER.test(number.text ?? "")) break;
+        const entry = unitEntry(tokens[pos + consumed + 1], kind);
+        if (entry === void 0) break;
+        if (entry.kind !== kind || entry.ratio >= lastRatio) break;
+        total += Number(number.text) * entry.ratio;
+        lastRatio = entry.ratio;
+        smallestUnit = entry.spelling;
+        smallestUnitToken = tokens[pos + consumed + 1];
+        consumed += 2;
+      }
+      if (consumed === 2) return null;
+      const source = tokens.slice(pos, pos + consumed);
+      const scaled = total / lastRatio;
+      return {
+        consumed,
+        replacement: [
+          chunkAHCLWAM5_cjs.createFusedToken("NUMBER", String(scaled), source),
+          chunkAHCLWAM5_cjs.createFusedToken("UNIT", smallestUnit, [smallestUnitToken])
+        ],
+        ruleName: "uom:compound-quantity"
+      };
+    }
+  };
+}
+
+// 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;
+}
+function twoUnitConversionNormalizerRule(priority = 59) {
+  return {
+    name: "uom:two-unit-conversion",
+    priority,
+    match(tokens, pos) {
+      const preposition = tokens[pos];
+      if (preposition?.type !== "IN" && preposition?.type !== "TO") return null;
+      if (!isUnit(tokens[pos + 1])) return null;
+      if (tokens[pos + 2]?.type !== "AND_CONJ") return null;
+      if (!isUnit(tokens[pos + 3])) return null;
+      const major = tokens[pos + 1].value;
+      const minor = tokens[pos + 3].value;
+      return {
+        consumed: 4,
+        replacement: [
+          chunkAHCLWAM5_cjs.createFusedToken("IN_TWO_UNITS", `${major} ${minor}`, tokens.slice(pos, pos + 4))
+        ],
+        ruleName: "uom:two-unit-conversion"
+      };
+    }
+  };
+}
+
+// src/packages/uom/normalizer/DegreeSymbolNormalizerRule.ts
+function degreeSymbolNormalizerRule(priority = 74) {
+  return {
+    name: "uom:degree-symbol",
+    priority,
+    match(tokens, pos) {
+      const number = tokens[pos];
+      if (number?.type !== "NUMBER") return null;
+      const symbol = tokens[pos + 1];
+      if (symbol === void 0 || symbol.type !== "IDENT") return null;
+      if ((symbol.text ?? symbol.value ?? "") !== "\xB0") return null;
+      return {
+        consumed: 2,
+        replacement: [number, chunkAHCLWAM5_cjs.createFusedToken("UNIT", "degrees", [symbol])],
+        ruleName: "uom:degree-symbol"
+      };
+    }
+  };
+}
+
+// src/packages/uom/parselets/TwoUnitConversionParselet.ts
+var TwoUnitConversionParselet = class {
+  constructor(builtinIndex) {
+    this.builtinIndex = builtinIndex;
+    this.category = "Uom";
+    this.bindingPower = chunkNZFKROS7_cjs.BindingPower.Conditional;
+  }
+  parse(_parser, _left, token, builder) {
+    const [major, minor] = String(token.value).split(" ");
+    builder.emitOpcode(13 /* PUSH_STRING */);
+    builder.emitString(major);
+    builder.emitOpcode(13 /* PUSH_STRING */);
+    builder.emitString(minor);
+    builder.emitOpcode(51 /* CALL_BUILTIN */);
+    builder.emitIndex(this.builtinIndex);
+    builder.emitIndex(3);
+  }
+};
+
+// 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;
+}
+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;
+}
+function bareRateDenominatorNormalizerRule(priority = 75) {
+  return {
+    name: "uom:bare-rate-denominator",
+    priority,
+    match(tokens, pos) {
+      const head = tokens[pos];
+      if (head === void 0) return null;
+      if (head.type === "NUMBER" && isCountLabel(tokens[pos + 1])) {
+        const label = tokens[pos + 1];
+        const after = tokens[pos + 2];
+        const introduces = after?.type === "SLASH" || after?.type === "IDENT" && PER_WORDS.has((after.text ?? after.value ?? "").toLowerCase());
+        if (introduces && isUnit2(tokens[pos + 3])) {
+          return {
+            consumed: 2,
+            replacement: [head, chunkAHCLWAM5_cjs.createFusedToken("UNIT", label.value, [label])],
+            ruleName: "uom:bare-rate-denominator"
+          };
+        }
+      }
+      if (!isUnit2(tokens[pos + 1])) return null;
+      const isSlash = head.type === "SLASH";
+      const word = (head.text ?? head.value ?? "").toLowerCase();
+      const isPerWord = head.type === "IDENT" && PER_WORDS.has(word);
+      if (!isSlash && !isPerWord) return null;
+      const unitToken = tokens[pos + 1];
+      return {
+        consumed: 2,
+        replacement: [
+          chunkAHCLWAM5_cjs.createFusedToken("PER_UNIT", unitToken.value, [head, unitToken])
+        ],
+        ruleName: "uom:bare-rate-denominator"
+      };
+    }
+  };
+}
+
+// src/packages/uom/parselets/PerUnitParselet.ts
+var PerUnitParselet = class {
+  constructor(builtinIndex) {
+    this.builtinIndex = builtinIndex;
+    this.category = "Uom";
+    this.bindingPower = chunkNZFKROS7_cjs.BindingPower.Product;
+  }
+  parse(_parser, _left, token, builder) {
+    builder.emitOpcode(13 /* PUSH_STRING */);
+    builder.emitString(String(token.value));
+    builder.emitOpcode(51 /* CALL_BUILTIN */);
+    builder.emitIndex(this.builtinIndex);
+    builder.emitIndex(2);
+  }
+};
+
+// src/packages/uom/parselets/AtRateParselet.ts
+var AtRateParselet = class {
+  constructor(builtinIndex) {
+    this.builtinIndex = builtinIndex;
+    this.category = "Uom";
+    this.bindingPower = chunkNZFKROS7_cjs.BindingPower.Product;
+  }
+  parse(parser, _left, _token, builder) {
+    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Conditional, builder);
+    builder.emitOpcode(51 /* CALL_BUILTIN */);
+    builder.emitIndex(this.builtinIndex);
+    builder.emitIndex(2);
+  }
+};
+
+// 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;
+}
+var PER_WORDS2 = /* @__PURE__ */ new Set(["per", "a", "an", "each", "every"]);
+function hasRateAhead(tokens, from) {
+  for (let i = from; i < tokens.length && i < from + 5; i++) {
+    const token = tokens[i];
+    if (token.type === "PER_UNIT") return true;
+    if (token.type === "EOF" || token.type === "COMMA" || token.type === "RATE_AT") return false;
+    const word = (token.text ?? token.value ?? "").toLowerCase();
+    const introducesDenominator = token.type === "SLASH" || token.type === "IDENT" && PER_WORDS2.has(word);
+    if (introducesDenominator && isUnit3(tokens[i + 1])) return true;
+  }
+  return false;
+}
+function atRateNormalizerRule(priority = 73) {
+  return {
+    name: "uom:at-rate",
+    priority,
+    match(tokens, pos) {
+      if (tokens[pos]?.type !== "RATE_AT") return null;
+      if (!hasRateAhead(tokens, pos + 1)) return null;
+      return {
+        consumed: 1,
+        replacement: [chunkAHCLWAM5_cjs.createFusedToken("AT_RATE", "at", [tokens[pos]])],
+        ruleName: "uom:at-rate"
+      };
+    }
+  };
+}
+
+// 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;
+}
+var ARTICLES = /* @__PURE__ */ new Set(["a", "an"]);
+function forDurationNormalizerRule(priority = 76) {
+  return {
+    name: "uom:for-duration",
+    priority,
+    match(tokens, pos) {
+      const head = tokens[pos];
+      if (head?.type !== "FOR_DURATION") return null;
+      const article = tokens[pos + 1];
+      if (article?.type !== "IDENT") return null;
+      if (!ARTICLES.has((article.text ?? article.value ?? "").toLowerCase())) return null;
+      if (!isUnit4(tokens[pos + 2])) return null;
+      return {
+        consumed: 3,
+        replacement: [
+          chunkAHCLWAM5_cjs.createFusedToken("STAR", "*", [head]),
+          chunkAHCLWAM5_cjs.createFusedToken("NUMBER", "1", [article]),
+          tokens[pos + 2]
+        ],
+        ruleName: "uom:for-duration"
+      };
+    }
+  };
+}
+
+// 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;
+}
+var ARTICLES2 = /* @__PURE__ */ new Set(["a", "an"]);
+function reversedConversionNormalizerRule(priority = 61) {
+  return {
+    name: "uom:reversed-conversion",
+    priority,
+    match(tokens, pos) {
+      if (pos !== 0 || !isUnit5(tokens[pos])) return null;
+      if (tokens[pos + 1]?.type !== "IN") return null;
+      const target = tokens[pos];
+      const third = tokens[pos + 2];
+      if (third === void 0) return null;
+      if (third.type === "NUMBER" && isUnit5(tokens[pos + 3])) {
+        return {
+          consumed: 4,
+          replacement: [third, tokens[pos + 3], tokens[pos + 1], target],
+          ruleName: "uom:reversed-conversion"
+        };
+      }
+      const word = (third.text ?? third.value ?? "").toLowerCase();
+      if (third.type === "IDENT" && ARTICLES2.has(word) && isUnit5(tokens[pos + 3])) {
+        return {
+          consumed: 4,
+          replacement: [
+            chunkAHCLWAM5_cjs.createFusedToken("NUMBER", "1", [third]),
+            tokens[pos + 3],
+            tokens[pos + 1],
+            target
+          ],
+          ruleName: "uom:reversed-conversion"
+        };
+      }
+      return null;
+    }
+  };
+}
+
 // src/packages/uom/data/IngredientDensities.ts
 var INGREDIENT_DENSITIES = {
   water: 1,
@@ -2443,7 +3212,7 @@ function getIngredientDensity(name) {
 }
 
 // src/packages/uom/parselets/CookingPluginFunctions.ts
-var COOKING_CONVERT_IDX = chunkJ73SJHR3_cjs.allocatePluginFunctionIndex();
+var COOKING_CONVERT_IDX = chunk2NPS5DQ3_cjs.allocatePluginFunctionIndex();
 function cookingConvertHandler(args) {
   const amountValue = args[0];
   const ingredientName = args[1].value;
@@ -2456,8 +3225,8 @@ function cookingConvertHandler(args) {
   }
   const sourceUnit = amountValue.unit;
   const amount = amountValue.toNumber();
-  const sourceMeasure = chunkQNJ4ACRT_cjs.getMeasure(sourceUnit);
-  const targetMeasure = chunkQNJ4ACRT_cjs.getMeasure(targetUnitText);
+  const sourceMeasure = chunkNJTXJ5AG_cjs.getMeasure(sourceUnit);
+  const targetMeasure = chunkNJTXJ5AG_cjs.getMeasure(targetUnitText);
   const isMassOrVolume = (m) => m === "mass" || m === "volume";
   if (!isMassOrVolume(sourceMeasure)) {
     return chunkOC6LTXYS_cjs.errorValue(
@@ -2472,7 +3241,7 @@ function cookingConvertHandler(args) {
     );
   }
   if (sourceMeasure === targetMeasure) {
-    return chunkOC6LTXYS_cjs.uomValue(chunkQNJ4ACRT_cjs.convertUnit(amount, sourceUnit, targetUnitText), targetUnitText);
+    return chunkOC6LTXYS_cjs.uomValue(chunkNJTXJ5AG_cjs.convertUnit(amount, sourceUnit, targetUnitText), targetUnitText);
   }
   const density = getIngredientDensity(ingredientName);
   if (density === void 0) {
@@ -2482,14 +3251,14 @@ function cookingConvertHandler(args) {
     );
   }
   if (sourceMeasure === "mass") {
-    const grams2 = chunkQNJ4ACRT_cjs.convertUnit(amount, sourceUnit, "g");
+    const grams2 = chunkNJTXJ5AG_cjs.convertUnit(amount, sourceUnit, "g");
     const mL2 = grams2 / density;
-    const result2 = chunkQNJ4ACRT_cjs.convertUnit(mL2, "ml", targetUnitText);
+    const result2 = chunkNJTXJ5AG_cjs.convertUnit(mL2, "ml", targetUnitText);
     return chunkOC6LTXYS_cjs.uomValue(result2, targetUnitText);
   }
-  const mL = chunkQNJ4ACRT_cjs.convertUnit(amount, sourceUnit, "ml");
+  const mL = chunkNJTXJ5AG_cjs.convertUnit(amount, sourceUnit, "ml");
   const grams = mL * density;
-  const result = chunkQNJ4ACRT_cjs.convertUnit(grams, "g", targetUnitText);
+  const result = chunkNJTXJ5AG_cjs.convertUnit(grams, "g", targetUnitText);
   return chunkOC6LTXYS_cjs.uomValue(result, targetUnitText);
 }
 
@@ -2533,7 +3302,7 @@ function ingredientNameNormalizerRule(priority = 68) {
         const candidate = candidateTokens.map((t) => t.value.toLowerCase()).join(" ");
         return {
           consumed: wordCount,
-          replacement: [chunkEBSPLUW4_cjs.createFusedToken("INGREDIENT_NAME", candidate, candidateTokens)],
+          replacement: [chunkAHCLWAM5_cjs.createFusedToken("INGREDIENT_NAME", candidate, candidateTokens)],
           ruleName: "uom-cooking:ingredient-name"
         };
       }
@@ -2550,11 +3319,21 @@ var UOM_PACKAGE = {
     { tokenType: "UOM_POSSIBILITIES_QUERY", parselet: new PossibilitiesParselet() }
   ],
   infixParselets: [
+    { tokenType: "IN_TWO_UNITS", parselet: new TwoUnitConversionParselet(94) },
+    { tokenType: "PER_UNIT", parselet: new PerUnitParselet(95) },
+    { tokenType: "AT_RATE", parselet: new AtRateParselet(96) },
     { tokenType: "UNIT", parselet: new UomLiteralParselet() },
     { tokenType: "INGREDIENT_NAME", parselet: new CookingConversionParselet() }
   ],
   normalizerRules: [
     uomPossibilitiesNormalizerRule(),
+    compoundQuantityNormalizerRule(),
+    twoUnitConversionNormalizerRule(),
+    degreeSymbolNormalizerRule(),
+    atRateNormalizerRule(),
+    forDurationNormalizerRule(),
+    bareRateDenominatorNormalizerRule(),
+    reversedConversionNormalizerRule(),
     ingredientNameNormalizerRule()
   ],
   pluginFunctions: [
@@ -2568,8 +3347,8 @@ var CurrencySymbolParselet = class {
     this.category = "UoM";
   }
   parse(parser, token, builder) {
-    const currency = chunkOT6OJY7C_cjs.resolveCurrencyAlias(token.value) ?? token.value.toUpperCase();
-    parser.parseExpression(chunkC4XZV6E7_cjs.BindingPower.Prefix, builder);
+    const currency = chunk4CVLFLOB_cjs.resolveCurrencyAlias(token.value) ?? token.value.toUpperCase();
+    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Prefix, builder);
     if (parser.peek()?.type === "UNIT") {
       parser.consume();
     }
@@ -2590,7 +3369,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(chunkOT6OJY7C_cjs.resolveCurrencyAlias(targetToken.value) ?? targetToken.value);
+      builder.emitString(chunk4CVLFLOB_cjs.resolveCurrencyAlias(targetToken.value) ?? targetToken.value);
       builder.emitOpcode(84 /* UOM_CONVERT_IN */);
     }
   }
@@ -2599,7 +3378,7 @@ var InParselet = class {
 // src/packages/currency/CurrencyPackage.ts
 var CURRENCY_PACKAGE = {
   name: "solve-currency",
-  asyncResolvers: [new chunkWQTTOGXC_cjs.CurrencyAsyncResolver()],
+  asyncResolvers: [new chunk4AVD7NZW_cjs.CurrencyAsyncResolver()],
   prefixParselets: [
     { tokenType: "DOLLAR", parselet: new CurrencySymbolParselet() },
     { tokenType: "POUND", parselet: new CurrencySymbolParselet() },
@@ -2712,7 +3491,7 @@ var MatrixLiteralParselet = class {
 var MatrixIndexParselet = class {
   constructor() {
     this.category = "Matrix";
-    this.bindingPower = chunkC4XZV6E7_cjs.BindingPower.Postfix;
+    this.bindingPower = chunkNZFKROS7_cjs.BindingPower.Postfix;
   }
   parse(parser, _left, _token, builder) {
     const isSlice = this.hasTopLevelColon(parser);
@@ -2815,8 +3594,8 @@ function parseTransform(parser, builder) {
     }
     return { kind: 2, name };
   }
-  const transformBuilder = new chunkC4XZV6E7_cjs.BytecodeBuilder();
-  parser.parseExpression(chunkC4XZV6E7_cjs.BindingPower.Lowest, transformBuilder);
+  const transformBuilder = new chunkNZFKROS7_cjs.BytecodeBuilder();
+  parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, transformBuilder);
   parser.setBuilder(builder);
   const program = transformBuilder.build();
   if (program.hasAsync) {
@@ -2902,7 +3681,7 @@ var ReduceParselet = class {
     parseCollectionExpr(parser, builder);
     let hasInitial = 0;
     if (parser.match("COMMA")) {
-      parser.parseExpression(chunkC4XZV6E7_cjs.BindingPower.Lowest, builder);
+      parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
       hasInitial = 1;
     }
     parser.consume("RPAREN");
@@ -2917,10 +3696,10 @@ var SumParselet = class {
   }
   parse(parser, _token, builder) {
     parser.consume("LPAREN");
-    const bodyBuilder = new chunkC4XZV6E7_cjs.BytecodeBuilder();
+    const bodyBuilder = new chunkNZFKROS7_cjs.BytecodeBuilder();
     bodyBuilder.emitOpcode(60 /* LOAD_VAR */);
     bodyBuilder.emitString("acc");
-    parser.parseExpression(chunkC4XZV6E7_cjs.BindingPower.Lowest, bodyBuilder);
+    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, bodyBuilder);
     parser.setBuilder(builder);
     bodyBuilder.emitOpcode(20 /* ADD */);
     const bodyProgram = bodyBuilder.build();
@@ -2944,10 +3723,10 @@ var ProdParselet = class {
   }
   parse(parser, _token, builder) {
     parser.consume("LPAREN");
-    const bodyBuilder = new chunkC4XZV6E7_cjs.BytecodeBuilder();
+    const bodyBuilder = new chunkNZFKROS7_cjs.BytecodeBuilder();
     bodyBuilder.emitOpcode(60 /* LOAD_VAR */);
     bodyBuilder.emitString("acc");
-    parser.parseExpression(chunkC4XZV6E7_cjs.BindingPower.Lowest, bodyBuilder);
+    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, bodyBuilder);
     parser.setBuilder(builder);
     bodyBuilder.emitOpcode(22 /* MUL */);
     const bodyProgram = bodyBuilder.build();
@@ -2995,7 +3774,7 @@ function mapReduceCallNormalizerRule(priority = 80) {
       return {
         consumed: 1,
         replacement: [
-          new chunkNMD5VRN4_cjs.LexerToken(tokenType, chunkGW32KPCU_cjs.tokenTypeId(tokenType), token.value, token.value, token.offset, 0, token.line, token.col)
+          new chunkM4F66R4O_cjs.LexerToken(tokenType, chunkR24DI24X_cjs.tokenTypeId(tokenType), token.value, token.value, token.offset, 0, token.line, token.col)
         ],
         ruleName: "mapreduce:call"
       };
@@ -3037,7 +3816,7 @@ var ExpandParselet = class {
   }
   parse(parser, _token, builder) {
     parser.consume("LPAREN");
-    parser.parseExpression(chunkC4XZV6E7_cjs.BindingPower.Lowest, builder);
+    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
     parser.consume("RPAREN");
     builder.emitOpcode(51 /* CALL_BUILTIN */);
     builder.emitIndex(SYMBOLIC_BUILTIN_EXPAND);
@@ -3052,7 +3831,7 @@ var FactorParselet = class {
   }
   parse(parser, _token, builder) {
     parser.consume("LPAREN");
-    parser.parseExpression(chunkC4XZV6E7_cjs.BindingPower.Lowest, builder);
+    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
     parser.consume("RPAREN");
     builder.emitOpcode(51 /* CALL_BUILTIN */);
     builder.emitIndex(SYMBOLIC_BUILTIN_FACTOR);
@@ -3067,9 +3846,9 @@ var SolveParselet = class {
   }
   parse(parser, _token, builder) {
     parser.consume("LPAREN");
-    parser.parseExpression(chunkC4XZV6E7_cjs.BindingPower.Lowest, builder);
+    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
     if (parser.match("EQUALS")) {
-      parser.parseExpression(chunkC4XZV6E7_cjs.BindingPower.Lowest, builder);
+      parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
     } else {
       builder.emitOpcode(10 /* PUSH_NUMBER */);
       builder.emitNumber(0);
@@ -3115,11 +3894,11 @@ var DerParselet = class {
   }
   parse(parser, _token, builder) {
     parser.consume("LPAREN");
-    parser.parseExpression(chunkC4XZV6E7_cjs.BindingPower.Lowest, builder);
+    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
     parser.consume("COMMA");
     consumeVariableName(parser, builder, "der");
     if (parser.match("COMMA")) {
-      parser.parseExpression(chunkC4XZV6E7_cjs.BindingPower.Lowest, builder);
+      parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
     } else {
       builder.emitOpcode(10 /* PUSH_NUMBER */);
       builder.emitNumber(1);
@@ -3138,7 +3917,7 @@ var IntegralParselet = class {
   }
   parse(parser, _token, builder) {
     parser.consume("LPAREN");
-    parser.parseExpression(chunkC4XZV6E7_cjs.BindingPower.Lowest, builder);
+    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
     parser.consume("COMMA");
     consumeVariableName(parser, builder, "integral");
     parser.consume("RPAREN");
@@ -3155,13 +3934,13 @@ var TaylorParselet = class {
   }
   parse(parser, _token, builder) {
     parser.consume("LPAREN");
-    parser.parseExpression(chunkC4XZV6E7_cjs.BindingPower.Lowest, builder);
+    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
     parser.consume("COMMA");
     consumeVariableName(parser, builder, "taylor");
     parser.consume("EQUALS");
-    parser.parseExpression(chunkC4XZV6E7_cjs.BindingPower.Lowest, builder);
+    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
     parser.consume("COMMA");
-    parser.parseExpression(chunkC4XZV6E7_cjs.BindingPower.Lowest, builder);
+    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
     parser.consume("RPAREN");
     builder.emitOpcode(51 /* CALL_BUILTIN */);
     builder.emitIndex(SYMBOLIC_BUILTIN_TAYLOR);
@@ -3178,7 +3957,7 @@ var JacobianParselet = class {
     parser.consume("LPAREN");
     let count = 0;
     do {
-      parser.parseExpression(chunkC4XZV6E7_cjs.BindingPower.Lowest, builder);
+      parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
       count++;
     } while (parser.match("COMMA"));
     parser.consume("RPAREN");
@@ -3209,7 +3988,7 @@ var ConjParselet = class {
   }
   parse(parser, _token, builder) {
     parser.consume("LPAREN");
-    parser.parseExpression(chunkC4XZV6E7_cjs.BindingPower.Lowest, builder);
+    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
     parser.consume("RPAREN");
     builder.emitOpcode(51 /* CALL_BUILTIN */);
     builder.emitIndex(SYMBOLIC_BUILTIN_CONJ);
@@ -3224,7 +4003,7 @@ var ReParselet = class {
   }
   parse(parser, _token, builder) {
     parser.consume("LPAREN");
-    parser.parseExpression(chunkC4XZV6E7_cjs.BindingPower.Lowest, builder);
+    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
     parser.consume("RPAREN");
     builder.emitOpcode(51 /* CALL_BUILTIN */);
     builder.emitIndex(SYMBOLIC_BUILTIN_RE);
@@ -3239,7 +4018,7 @@ var ImParselet = class {
   }
   parse(parser, _token, builder) {
     parser.consume("LPAREN");
-    parser.parseExpression(chunkC4XZV6E7_cjs.BindingPower.Lowest, builder);
+    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
     parser.consume("RPAREN");
     builder.emitOpcode(51 /* CALL_BUILTIN */);
     builder.emitIndex(SYMBOLIC_BUILTIN_IM);
@@ -3254,7 +4033,7 @@ var CancelParselet = class {
   }
   parse(parser, _token, builder) {
     parser.consume("LPAREN");
-    parser.parseExpression(chunkC4XZV6E7_cjs.BindingPower.Lowest, builder);
+    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
     parser.consume("RPAREN");
     builder.emitOpcode(51 /* CALL_BUILTIN */);
     builder.emitIndex(SYMBOLIC_BUILTIN_CANCEL);
@@ -3269,7 +4048,7 @@ var ApartParselet = class {
   }
   parse(parser, _token, builder) {
     parser.consume("LPAREN");
-    parser.parseExpression(chunkC4XZV6E7_cjs.BindingPower.Lowest, builder);
+    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
     parser.consume("RPAREN");
     builder.emitOpcode(51 /* CALL_BUILTIN */);
     builder.emitIndex(SYMBOLIC_BUILTIN_APART);
@@ -3292,9 +4071,9 @@ function imaginaryLiteralNormalizerRule(priority = 75) {
       return {
         consumed: 2,
         replacement: [
-          new chunkNMD5VRN4_cjs.LexerToken(
+          new chunkM4F66R4O_cjs.LexerToken(
             "IMAGINARY",
-            chunkGW32KPCU_cjs.tokenTypeId("IMAGINARY"),
+            chunkR24DI24X_cjs.tokenTypeId("IMAGINARY"),
             number.value,
             number.value,
             number.offset,
@@ -3338,7 +4117,7 @@ function symbolicCallNormalizerRule(priority = 80) {
       return {
         consumed: 1,
         replacement: [
-          new chunkNMD5VRN4_cjs.LexerToken(tokenType, chunkGW32KPCU_cjs.tokenTypeId(tokenType), token.value, token.value, token.offset, 0, token.line, token.col)
+          new chunkM4F66R4O_cjs.LexerToken(tokenType, chunkR24DI24X_cjs.tokenTypeId(tokenType), token.value, token.value, token.offset, 0, token.line, token.col)
         ],
         ruleName: "symbolic:call"
       };
@@ -3510,7 +4289,7 @@ var ComparisonParselet = class {
   constructor(opcode) {
     this.opcode = opcode;
     this.category = "Conditionals";
-    this.bindingPower = chunkC4XZV6E7_cjs.BindingPower.Conditional;
+    this.bindingPower = chunkNZFKROS7_cjs.BindingPower.Conditional;
   }
   parse(parser, left, token, builder) {
     parser.parseExpression(this.bindingPower, builder);
@@ -3573,9 +4352,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 */, chunkC4XZV6E7_cjs.BindingPower.LogicalOr) },
-    { tokenType: "LOGICAL_AND", parselet: new LogicalParselet(130 /* LOGICAL_AND */, chunkC4XZV6E7_cjs.BindingPower.LogicalAnd) },
-    { tokenType: "LOGICAL_OR", parselet: new LogicalParselet(131 /* LOGICAL_OR */, chunkC4XZV6E7_cjs.BindingPower.LogicalOr) }
+    { 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) }
   ]
 };
 
@@ -3589,6 +4368,9 @@ var BUILTIN_CONVERTERS = {
   hex: 71 /* TO_HEX */,
   fraction: 140 /* TO_FRACTION */,
   multiplier: 141 /* TO_MULTIPLIER */,
+  // "20 to 40 as x". Only reachable in converter position, immediately after
+  // "as", so a variable named x is unaffected.
+  x: 141 /* TO_MULTIPLIER */,
   sci: 142 /* TO_SCI */,
   scientific: 142 /* TO_SCI */,
   binary: 143 /* TO_BINARY */,
@@ -3596,10 +4378,15 @@ var BUILTIN_CONVERTERS = {
   octal: 144 /* TO_OCTAL */,
   oct: 144 /* TO_OCTAL */
 };
+var BASE_CONVERTERS = {
+  2: 143 /* TO_BINARY */,
+  8: 144 /* TO_OCTAL */,
+  16: 71 /* TO_HEX */
+};
 var AsConverterParselet = class {
   constructor() {
     this.category = "Converters";
-    this.bindingPower = chunkC4XZV6E7_cjs.BindingPower.Conditional;
+    this.bindingPower = chunkNZFKROS7_cjs.BindingPower.Conditional;
   }
   parse(parser, left, token, builder) {
     const nextToken = parser.peek();
@@ -3616,8 +4403,26 @@ var AsConverterParselet = class {
     }
     parser.consume();
     const name = nextToken.value.toLowerCase();
+    if (name === "base") {
+      const radixToken = parser.peek();
+      const radix = radixToken?.type === "NUMBER" ? Number(radixToken.value) : NaN;
+      const opcode = BASE_CONVERTERS[radix];
+      if (opcode === void 0) {
+        throw chunkM4N5GA5Z_cjs.ErrorFactory.parsing(
+          "AS_CONVERTER_UNSUPPORTED_BASE",
+          `"as base ${radixToken?.value ?? "?"}": only bases ${Object.keys(BASE_CONVERTERS).join(", ")} can be written out`
+        );
+      }
+      parser.consume();
+      builder.emitOpcode(opcode);
+      return;
+    }
     const builtinOp = BUILTIN_CONVERTERS[name];
     if (builtinOp !== void 0) {
+      if (builtinOp === 141 /* TO_MULTIPLIER */ && parser.match("OF")) {
+        parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Conditional, builder);
+        builder.emitOpcode(23 /* DIV */);
+      }
       builder.emitOpcode(builtinOp);
       return;
     }
@@ -3627,11 +4432,181 @@ var AsConverterParselet = class {
   }
 };
 
+// src/packages/converters/parselets/RoundingParselets.ts
+var INCREMENT_WORDS = {
+  ten: 10,
+  hundred: 100,
+  thousand: 1e3,
+  million: 1e6,
+  billion: 1e9
+};
+function emitRoundToIncrement(builder, increment, direction) {
+  builder.emitOpcode(10 /* PUSH_NUMBER */);
+  builder.emitNumber(increment);
+  builder.emitOpcode(23 /* DIV */);
+  emitRoundDirection(builder, direction);
+  builder.emitOpcode(10 /* PUSH_NUMBER */);
+  builder.emitNumber(increment);
+  builder.emitOpcode(22 /* MUL */);
+}
+function emitRoundDirection(builder, direction) {
+  const builtin = direction === "up" ? CEIL_BUILTIN : direction === "down" ? FLOOR_BUILTIN : ROUND_BUILTIN;
+  builder.emitOpcode(51 /* CALL_BUILTIN */);
+  builder.emitIndex(builtin);
+  builder.emitIndex(1);
+}
+var ROUND_BUILTIN = 8;
+var CEIL_BUILTIN = 6;
+var FLOOR_BUILTIN = 7;
+function readDirection(parser) {
+  const next = parser.peek();
+  const word = (next?.text ?? "").toLowerCase();
+  if (word === "up") {
+    parser.consume();
+    return "up";
+  }
+  if (word === "down") {
+    parser.consume();
+    return "down";
+  }
+  return "nearest";
+}
+var RoundedParselet = class {
+  constructor() {
+    this.category = "Converters";
+    this.bindingPower = chunkNZFKROS7_cjs.BindingPower.Conditional;
+  }
+  parse(parser, _left, _token, builder) {
+    const direction = readDirection(parser);
+    if (parser.match("TO_NEAREST")) {
+      emitRoundToIncrement(builder, readIncrement(parser), direction);
+      return;
+    }
+    emitRoundDirection(builder, direction);
+  }
+};
+var ToNearestParselet = class {
+  constructor() {
+    this.category = "Converters";
+    this.bindingPower = chunkNZFKROS7_cjs.BindingPower.Conditional;
+  }
+  parse(parser, _left, _token, builder) {
+    emitRoundToIncrement(builder, readIncrement(parser), "nearest");
+  }
+};
+function readIncrement(parser) {
+  const next = parser.peek();
+  const word = (next?.text ?? "").toLowerCase();
+  const magnitude = INCREMENT_WORDS[word];
+  if (magnitude !== void 0) {
+    parser.consume();
+    return magnitude;
+  }
+  if (next?.type === "NUMBER") {
+    parser.consume();
+    const value = Number(next.value);
+    if (Number.isFinite(value) && value > 0) return value;
+  }
+  throw chunkM4N5GA5Z_cjs.ErrorFactory.parsing(
+    "INVALID_ROUNDING_INCREMENT",
+    `"to nearest ${next?.value ?? "?"}": expected a positive number or one of ${Object.keys(INCREMENT_WORDS).join(", ")}`
+  );
+}
+var DecimalPlacesParselet = class {
+  constructor() {
+    this.category = "Converters";
+    this.bindingPower = chunkNZFKROS7_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(
+        "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 */);
+  }
+};
+
+// src/packages/converters/normalizer/DecimalPlacesNormalizerRule.ts
+var PLACE_WORDS = /* @__PURE__ */ new Set(["dp", "dps", "decimals", "digits", "digit"]);
+var PLACE_PHRASES = /* @__PURE__ */ new Set(["decimal"]);
+function decimalPlacesNormalizerRule(priority = 66) {
+  return {
+    name: "converters:decimal-places",
+    priority,
+    match(tokens, pos) {
+      if (tokens[pos]?.type !== "TO") return null;
+      const count = tokens[pos + 1];
+      if (count?.type !== "NUMBER") return null;
+      const unitToken = tokens[pos + 2];
+      if (!unitToken) return null;
+      const word = (unitToken.text ?? unitToken.value ?? "").toLowerCase();
+      let consumed = 3;
+      if (PLACE_PHRASES.has(word)) {
+        const tail = tokens[pos + 3];
+        const tailWord = (tail?.text ?? "").toLowerCase();
+        if (tailWord !== "place" && tailWord !== "places") return null;
+        consumed = 4;
+      } else if (!PLACE_WORDS.has(word)) {
+        return null;
+      }
+      return {
+        consumed,
+        replacement: [
+          chunkAHCLWAM5_cjs.createFusedToken("DECIMAL_PLACES", count.value, tokens.slice(pos, pos + consumed))
+        ],
+        ruleName: "converters:decimal-places"
+      };
+    }
+  };
+}
+
+// src/packages/converters/normalizer/ConverterPrepositionNormalizerRule.ts
+function converterPrepositionNormalizerRule(priority = 67) {
+  return {
+    name: "converters:preposition",
+    priority,
+    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;
+      return {
+        consumed: 1,
+        replacement: [chunkAHCLWAM5_cjs.createFusedToken("AS", "as", [preposition])],
+        ruleName: "converters:preposition"
+      };
+    }
+  };
+}
+
 // src/packages/converters/ConvertersPackage.ts
 var CONVERTERS_PACKAGE = {
   name: "solve-converters",
+  phrases: {
+    // A phrase, not a bare "nearest": "to" is already an infix operator
+    // (percentage change), so the two words have to arrive as one token for
+    // the parser to tell the grammars apart. See RoundingParselets.ts.
+    "to nearest": "TO_NEAREST",
+    "to the nearest": "TO_NEAREST"
+  },
   infixParselets: [
-    { tokenType: "AS", parselet: new AsConverterParselet() }
+    { tokenType: "AS", parselet: new AsConverterParselet() },
+    { tokenType: "ROUNDED", parselet: new RoundedParselet() },
+    { tokenType: "TO_NEAREST", parselet: new ToNearestParselet() },
+    { tokenType: "DECIMAL_PLACES", parselet: new DecimalPlacesParselet() }
+  ],
+  normalizerRules: [
+    decimalPlacesNormalizerRule(),
+    converterPrepositionNormalizerRule()
   ]
 };
 
@@ -3643,10 +4618,10 @@ var VariadicAggregateParselet = class {
   }
   parse(parser, token, builder) {
     let argCount = 0;
-    parser.parseExpression(chunkC4XZV6E7_cjs.BindingPower.Lowest, builder);
+    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Conjunction, builder);
     argCount++;
-    while (parser.match("COMMA")) {
-      parser.parseExpression(chunkC4XZV6E7_cjs.BindingPower.Lowest, builder);
+    while (parser.match("COMMA") || parser.match("AND_CONJ")) {
+      parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Conjunction, builder);
       argCount++;
     }
     builder.emitOpcode(51 /* CALL_BUILTIN */);
@@ -3655,14 +4630,126 @@ var VariadicAggregateParselet = class {
   }
 };
 
+// src/packages/mathphrases/parselets/UnaryPhraseParselet.ts
+function unaryPhraseParselet(builtinIndex) {
+  return {
+    category: "MathPhrases",
+    parse(parser, _token, builder) {
+      parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
+      builder.emitOpcode(51 /* CALL_BUILTIN */);
+      builder.emitIndex(builtinIndex);
+      builder.emitIndex(1);
+    }
+  };
+}
+
+// src/packages/mathphrases/parselets/RemainderRootParselets.ts
+var remainderOfParselet = {
+  category: "MathPhrases",
+  parse(parser, _token, builder) {
+    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Product, builder);
+    if (!parser.match("DIVIDE_BY") && !parser.match("SLASH")) {
+      throw chunkM4N5GA5Z_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);
+    builder.emitOpcode(24 /* MOD */);
+  }
+};
+var nthRootParselet = {
+  category: "MathPhrases",
+  parse(parser, _token, builder) {
+    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Product, builder);
+    if (!parser.match("OF")) {
+      throw chunkM4N5GA5Z_cjs.ErrorFactory.parsing(
+        "ROOT_EXPECTED_OF",
+        'Expected "of", as in "root 5 of 100"'
+      );
+    }
+    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Conditional, builder);
+    builder.emitOpcode(2 /* SWAP */);
+    builder.emitOpcode(10 /* PUSH_NUMBER */);
+    builder.emitNumber(1);
+    builder.emitOpcode(2 /* SWAP */);
+    builder.emitOpcode(23 /* DIV */);
+    builder.emitOpcode(25 /* EXP */);
+  }
+};
+var logBaseParselet = {
+  category: "MathPhrases",
+  parse(parser, _token, builder) {
+    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Conditional, builder);
+    emitNaturalLog(builder);
+    if (!parser.match("LOG_BASE")) {
+      throw chunkM4N5GA5Z_cjs.ErrorFactory.parsing(
+        "LOG_EXPECTED_BASE",
+        'Expected "base", as in "log 20 base 4"'
+      );
+    }
+    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Conditional, builder);
+    emitNaturalLog(builder);
+    builder.emitOpcode(23 /* DIV */);
+  }
+};
+var LOG_BUILTIN2 = 5;
+function emitNaturalLog(builder) {
+  builder.emitOpcode(51 /* CALL_BUILTIN */);
+  builder.emitIndex(LOG_BUILTIN2);
+  builder.emitIndex(1);
+}
+
+// src/packages/mathphrases/normalizer/FunctionPhraseNormalizerRule.ts
+function functionPhraseNormalizerRule(priority = 69) {
+  return {
+    name: "mathphrases:function-phrase",
+    priority,
+    match(tokens, pos) {
+      const head = tokens[pos];
+      if (head?.type !== "FUNC") return null;
+      const word = (head.value ?? "").toLowerCase();
+      if (word !== "root" && word !== "log") return null;
+      if (tokens[pos + 1]?.type === "LPAREN") return null;
+      if (word === "root") {
+        return {
+          consumed: 1,
+          replacement: [chunkAHCLWAM5_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]);
+        return token;
+      });
+      return {
+        consumed: baseAt - pos + 1,
+        replacement,
+        ruleName: "mathphrases:function-phrase"
+      };
+    }
+  };
+}
+function findBase(tokens, from) {
+  for (let i = from; i < tokens.length && i < from + 8; i++) {
+    const token = tokens[i];
+    if (token.type === "EOF" || token.type === "COMMA" || token.type === "RPAREN") return -1;
+    if ((token.text ?? token.value ?? "").toLowerCase() === "base") return i;
+  }
+  return -1;
+}
+
 // src/packages/mathphrases/parselets/LargerSmallerParselet.ts
 function largerSmallerParselet(builtinIndex) {
   return {
     category: "MathPhrases",
     parse(parser, token, builder) {
-      parser.parseExpression(chunkC4XZV6E7_cjs.BindingPower.Product, builder);
-      parser.consume("PLUS");
-      parser.parseExpression(chunkC4XZV6E7_cjs.BindingPower.Lowest, builder);
+      parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Conjunction, builder);
+      parser.consume("AND_CONJ");
+      parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
       builder.emitOpcode(51 /* CALL_BUILTIN */);
       builder.emitIndex(builtinIndex);
       builder.emitIndex(2);
@@ -3674,7 +4761,7 @@ function largerSmallerParselet(builtinIndex) {
 var halfParselet = {
   category: "MathPhrases",
   parse(parser, token, builder) {
-    parser.parseExpression(chunkC4XZV6E7_cjs.BindingPower.Lowest, builder);
+    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
     builder.emitOpcode(10 /* PUSH_NUMBER */);
     builder.emitNumber(2);
     builder.emitOpcode(23 /* DIV */);
@@ -3685,9 +4772,9 @@ var halfParselet = {
 var midpointParselet = {
   category: "MathPhrases",
   parse(parser, token, builder) {
-    parser.parseExpression(chunkC4XZV6E7_cjs.BindingPower.Product, builder);
-    parser.consume("PLUS");
-    parser.parseExpression(chunkC4XZV6E7_cjs.BindingPower.Lowest, builder);
+    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Conjunction, builder);
+    parser.consume("AND_CONJ");
+    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
     builder.emitOpcode(20 /* ADD */);
     builder.emitOpcode(10 /* PUSH_NUMBER */);
     builder.emitNumber(2);
@@ -3702,8 +4789,8 @@ var randomNumberParselet = definePhrasePattern({
     {
       slots: [
         { kind: "keyword", tokenTypes: ["BETWEEN"] },
-        { kind: "expr", bindingPower: chunkC4XZV6E7_cjs.BindingPower.Product },
-        { kind: "keyword", tokenTypes: ["PLUS"] },
+        { kind: "expr", bindingPower: chunkNZFKROS7_cjs.BindingPower.Product },
+        { kind: "keyword", tokenTypes: ["AND_CONJ"] },
         { kind: "expr" }
       ],
       emit: (builder) => {
@@ -3722,18 +4809,18 @@ var ClampParselet = class {
     this.category = "MathPhrases";
   }
   parse(parser, token, builder) {
-    parser.parseExpression(chunkC4XZV6E7_cjs.BindingPower.Lowest, builder);
+    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
     const mid = parser.peek();
     if (mid?.type === "BETWEEN") {
       parser.consume();
-      parser.parseExpression(chunkC4XZV6E7_cjs.BindingPower.Product, builder);
-      parser.consume("PLUS");
-      parser.parseExpression(chunkC4XZV6E7_cjs.BindingPower.Lowest, builder);
+      parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Product, builder);
+      parser.consume("AND_CONJ");
+      parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
     } else if (mid?.type === "FROM") {
       parser.consume();
-      parser.parseExpression(chunkC4XZV6E7_cjs.BindingPower.Lowest, builder);
+      parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
       parser.consume("TO");
-      parser.parseExpression(chunkC4XZV6E7_cjs.BindingPower.Lowest, builder);
+      parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
     } else {
       throw chunkM4N5GA5Z_cjs.ErrorFactory.parsing(
         "CLAMP_EXPECTED_BETWEEN_OR_FROM",
@@ -3751,7 +4838,7 @@ var PROPORTION_BUILTIN_INDEX = 46;
 var ProportionParselet = class {
   constructor() {
     this.category = "MathPhrases";
-    this.bindingPower = chunkC4XZV6E7_cjs.BindingPower.Conditional;
+    this.bindingPower = chunkNZFKROS7_cjs.BindingPower.Conditional;
   }
   parse(parser, left, token, builder) {
     parser.parseExpression(this.bindingPower, builder);
@@ -3778,6 +4865,10 @@ var TOTAL = 44;
 var COUNT = 45;
 var MIN = 9;
 var MAX = 10;
+var GCD = 38;
+var LCM = 39;
+var SQRT = 0;
+var CBRT = 21;
 var MATHPHRASES_PACKAGE = {
   name: "solve-mathphrases",
   phrases: {
@@ -3786,11 +4877,20 @@ var MATHPHRASES_PACKAGE = {
     "total of": "TOTAL_OF",
     "count of": "COUNT_OF",
     "larger of": "LARGER_OF",
+    "greater of": "LARGER_OF",
     "smaller of": "SMALLER_OF",
+    "lesser of": "SMALLER_OF",
     "half of": "HALF_OF",
     "midpoint between": "MIDPOINT_BETWEEN",
     "random number": "RANDOM_NUMBER",
-    "is to": "IS_TO"
+    "is to": "IS_TO",
+    // Two-operand phrases reusing the gcd/lcm builtins.
+    "remainder of": "REMAINDER_OF",
+    "gcd of": "GCD_OF",
+    "lcm of": "LCM_OF",
+    // sqrt/cbrt spelled the way they are said.
+    "square root of": "SQUARE_ROOT_OF",
+    "cube root of": "CUBE_ROOT_OF"
   },
   prefixParselets: [
     { tokenType: "AVERAGE_OF", parselet: new VariadicAggregateParselet(AVERAGE) },
@@ -3802,31 +4902,170 @@ var MATHPHRASES_PACKAGE = {
     { tokenType: "HALF_OF", parselet: halfParselet },
     { tokenType: "MIDPOINT_BETWEEN", parselet: midpointParselet },
     { tokenType: "RANDOM_NUMBER", parselet: randomNumberParselet },
+    { tokenType: "REMAINDER_OF", parselet: remainderOfParselet },
+    { tokenType: "NTH_ROOT", parselet: nthRootParselet },
+    { tokenType: "LOG_PHRASE", parselet: logBaseParselet },
+    { tokenType: "GCD_OF", parselet: largerSmallerParselet(GCD) },
+    { tokenType: "LCM_OF", parselet: largerSmallerParselet(LCM) },
+    { tokenType: "SQUARE_ROOT_OF", parselet: unaryPhraseParselet(SQRT) },
+    { tokenType: "CUBE_ROOT_OF", parselet: unaryPhraseParselet(CBRT) },
     { tokenType: "CLAMP", parselet: new ClampParselet() }
   ],
   infixParselets: [
     { tokenType: "IS_TO", parselet: new ProportionParselet() }
+  ],
+  normalizerRules: [
+    functionPhraseNormalizerRule()
   ]
 };
 
-// src/packages/finance/parselets/CompoundInterestParselet.ts
-var CompoundInterestParselet = class {
+// src/packages/finance/parselets/InvestmentParselets.ts
+var PERIODS_PER_YEAR = {
+  annually: 1,
+  yearly: 1,
+  // Semi-annual is not on Soulver's page, but it is the one interval a
+  // reader of the other four would expect to exist, and leaving it out makes
+  // the set look arbitrary rather than deliberate.
+  "semi-annually": 2,
+  quarterly: 4,
+  monthly: 12,
+  fortnightly: 26,
+  weekly: 52,
+  daily: 365
+};
+function readCompoundingInterval(parser) {
+  if (!parser.match("COMPOUNDING")) return 1;
+  const token = parser.peek();
+  const name = (token?.text ?? token?.value ?? "").toLowerCase();
+  const periods = PERIODS_PER_YEAR[name];
+  if (periods === void 0) {
+    throw chunkM4N5GA5Z_cjs.ErrorFactory.parsing(
+      "UNKNOWN_COMPOUNDING_INTERVAL",
+      `compounding ${name || "?"}: expected one of ${Object.keys(PERIODS_PER_YEAR).join(", ")}`
+    );
+  }
+  parser.consume();
+  return periods;
+}
+var InvestmentGrowthParselet = class {
+  /**
+   * @param annualIndex - Builtin for the annual case, so the common form
+   * keeps using the same code path (and the same rounding) it always did.
+   * @param intervalIndex - Builtin taking an explicit periods-per-year.
+   */
+  constructor(annualIndex, intervalIndex) {
+    this.annualIndex = annualIndex;
+    this.intervalIndex = intervalIndex;
+    this.category = "Finance";
+    this.bindingPower = chunkNZFKROS7_cjs.BindingPower.Conditional;
+  }
+  parse(parser, _left, _token, builder) {
+    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Conditional, builder);
+    if (!parser.match("RATE_AT")) parser.consume("AT");
+    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Conditional, builder);
+    const periods = readCompoundingInterval(parser);
+    builder.emitOpcode(2 /* SWAP */);
+    if (periods === 1) {
+      builder.emitOpcode(51 /* CALL_BUILTIN */);
+      builder.emitIndex(this.annualIndex);
+      builder.emitIndex(3);
+      return;
+    }
+    builder.emitOpcode(10 /* PUSH_NUMBER */);
+    builder.emitNumber(periods);
+    builder.emitOpcode(51 /* CALL_BUILTIN */);
+    builder.emitIndex(this.intervalIndex);
+    builder.emitIndex(4);
+  }
+};
+var PresentValueParselet = class {
   constructor(builtinIndex) {
     this.builtinIndex = builtinIndex;
     this.category = "Finance";
   }
   parse(parser, _token, builder) {
-    parser.parseExpression(chunkC4XZV6E7_cjs.BindingPower.Lowest, builder);
-    parser.consume("OVER");
-    parser.parseExpression(chunkC4XZV6E7_cjs.BindingPower.Lowest, builder);
-    parser.consume("RATE_AT");
-    parser.parseExpression(chunkC4XZV6E7_cjs.BindingPower.Lowest, builder);
+    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Conditional, builder);
+    if (!parser.match("AFTER") && !parser.match("OVER") && !parser.match("IN")) {
+      parser.consume("AFTER");
+    }
+    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Conditional, builder);
+    if (!parser.match("RATE_AT")) parser.consume("AT");
+    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Conditional, builder);
     builder.emitOpcode(2 /* SWAP */);
     builder.emitOpcode(51 /* CALL_BUILTIN */);
     builder.emitIndex(this.builtinIndex);
     builder.emitIndex(3);
   }
 };
+var ReturnOnInvestmentParselet = class {
+  constructor(builtinIndex) {
+    this.builtinIndex = builtinIndex;
+    this.category = "Finance";
+    this.bindingPower = chunkNZFKROS7_cjs.BindingPower.Conditional;
+  }
+  parse(parser, _left, _token, builder) {
+    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Conditional, builder);
+    parser.consume("RETURNED");
+    builder.emitOpcode(51 /* CALL_BUILTIN */);
+    builder.emitIndex(this.builtinIndex);
+    builder.emitIndex(2);
+  }
+};
+var AnnualReturnParselet = class {
+  constructor(builtinIndex) {
+    this.builtinIndex = builtinIndex;
+    this.category = "Finance";
+  }
+  parse(parser, _token, builder) {
+    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Conditional, builder);
+    parser.consume("INVESTED");
+    parser.parseExpression(chunkNZFKROS7_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);
+    builder.emitOpcode(51 /* CALL_BUILTIN */);
+    builder.emitIndex(this.builtinIndex);
+    builder.emitIndex(3);
+  }
+};
+
+// src/packages/finance/parselets/CompoundInterestParselet.ts
+var CompoundInterestParselet = class {
+  /**
+   * @param builtinIndex - Annual-compounding builtin.
+   * @param intervalIndex - Builtin taking an explicit periods-per-year, used
+   * when the expression ends in "compounding monthly" or similar.
+   */
+  constructor(builtinIndex, intervalIndex) {
+    this.builtinIndex = builtinIndex;
+    this.intervalIndex = intervalIndex;
+    this.category = "Finance";
+  }
+  parse(parser, _token, builder) {
+    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Conditional, builder);
+    if (!parser.match("AFTER") && !parser.match("FOR_DURATION")) {
+      parser.consume("OVER");
+    }
+    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
+    if (!parser.match("RATE_AT")) parser.consume("AT");
+    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
+    const periods = readCompoundingInterval(parser);
+    builder.emitOpcode(2 /* SWAP */);
+    if (periods === 1) {
+      builder.emitOpcode(51 /* CALL_BUILTIN */);
+      builder.emitIndex(this.builtinIndex);
+      builder.emitIndex(3);
+      return;
+    }
+    builder.emitOpcode(10 /* PUSH_NUMBER */);
+    builder.emitNumber(periods);
+    builder.emitOpcode(51 /* CALL_BUILTIN */);
+    builder.emitIndex(this.intervalIndex);
+    builder.emitIndex(4);
+  }
+};
 
 // src/packages/finance/parselets/LoanRepaymentParselet.ts
 var LoanRepaymentParselet = class {
@@ -3836,11 +5075,11 @@ var LoanRepaymentParselet = class {
     this.category = "Finance";
   }
   parse(parser, _token, builder) {
-    parser.parseExpression(chunkC4XZV6E7_cjs.BindingPower.Lowest, builder);
+    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
     parser.consume("OVER");
-    parser.parseExpression(chunkC4XZV6E7_cjs.BindingPower.Lowest, builder);
-    parser.consume("RATE_AT");
-    parser.parseExpression(chunkC4XZV6E7_cjs.BindingPower.Lowest, builder);
+    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
+    if (!parser.match("RATE_AT")) parser.consume("AT");
+    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
     builder.emitOpcode(2 /* SWAP */);
     builder.emitOpcode(10 /* PUSH_NUMBER */);
     builder.emitNumber(this.periodsPerYear);
@@ -3857,9 +5096,9 @@ var SalesTaxParselet = class {
     this.category = "Finance";
   }
   parse(parser, _token, builder) {
-    parser.parseExpression(chunkC4XZV6E7_cjs.BindingPower.Lowest, builder);
+    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
     parser.consume("RATE_AT");
-    parser.parseExpression(chunkC4XZV6E7_cjs.BindingPower.Lowest, builder);
+    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
     builder.emitOpcode(51 /* CALL_BUILTIN */);
     builder.emitIndex(this.builtinIndex);
     builder.emitIndex(2);
@@ -3867,20 +5106,20 @@ var SalesTaxParselet = class {
 };
 
 // src/packages/finance/parselets/InflationPluginFunctions.ts
-var INFLATION_FROM_YEAR_TO_PRESENT_IDX = chunkJ73SJHR3_cjs.allocatePluginFunctionIndex();
-var INFLATION_TO_YEAR_FROM_PRESENT_IDX = chunkJ73SJHR3_cjs.allocatePluginFunctionIndex();
-var INFLATION_FUTURE_VALUE_IDX = chunkJ73SJHR3_cjs.allocatePluginFunctionIndex();
+var INFLATION_FROM_YEAR_TO_PRESENT_IDX = chunk2NPS5DQ3_cjs.allocatePluginFunctionIndex();
+var INFLATION_TO_YEAR_FROM_PRESENT_IDX = chunk2NPS5DQ3_cjs.allocatePluginFunctionIndex();
+var INFLATION_FUTURE_VALUE_IDX = chunk2NPS5DQ3_cjs.allocatePluginFunctionIndex();
 function yearRangeError(code, badYear) {
   return chunkOC6LTXYS_cjs.errorValue(
     code,
-    `Year ${badYear} is outside the bundled CPI table's range (${chunkJ73SJHR3_cjs.CPI_MIN_YEAR}-${chunkJ73SJHR3_cjs.CPI_MAX_YEAR})`
+    `Year ${badYear} is outside the bundled CPI table's range (${chunk2NPS5DQ3_cjs.CPI_MIN_YEAR}-${chunk2NPS5DQ3_cjs.CPI_MAX_YEAR})`
   );
 }
 function inflationFromYearToPresentHandler(args) {
   const amountValue = args[0];
   const fromYear = args[1].toNumber();
   const toYear = (/* @__PURE__ */ new Date()).getFullYear();
-  const result = chunkJ73SJHR3_cjs.adjustForInflation(amountValue.toNumber(), fromYear, toYear);
+  const result = chunk2NPS5DQ3_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);
 }
@@ -3888,7 +5127,7 @@ function inflationToYearFromPresentHandler(args) {
   const amountValue = args[0];
   const fromYear = (/* @__PURE__ */ new Date()).getFullYear();
   const toYear = args[1].toNumber();
-  const result = chunkJ73SJHR3_cjs.adjustForInflation(amountValue.toNumber(), fromYear, toYear);
+  const result = chunk2NPS5DQ3_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);
 }
@@ -3901,8 +5140,8 @@ function inflationFutureValueHandler(args) {
     return chunkOC6LTXYS_cjs.errorValue("INVALID_RATE", `inflationFutureValue: rate ${rate} makes (1 + rate) non-positive`);
   }
   const amount = amountValue.toNumber();
-  const fv = amount * Math.pow(1 + rate, years);
-  return amountValue.type === 6 /* Uom */ ? chunkOC6LTXYS_cjs.uomValue(fv, amountValue.unit) : chunkOC6LTXYS_cjs.numberValue(fv);
+  const worth = amount / Math.pow(1 + rate, years);
+  return amountValue.type === 6 /* Uom */ ? chunkOC6LTXYS_cjs.uomValue(worth, amountValue.unit) : chunkOC6LTXYS_cjs.numberValue(worth);
 }
 
 // src/packages/finance/parselets/InflationQueryParselet.ts
@@ -3913,10 +5152,10 @@ var InflationQueryParselet = class {
     this.category = "Finance";
   }
   parse(parser, _token, builder) {
-    parser.parseExpression(chunkC4XZV6E7_cjs.BindingPower.Product, builder);
+    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Product, builder);
     if (this.variant === "what-was") {
       parser.consume("WORTH_IN");
-      parser.parseExpression(chunkC4XZV6E7_cjs.BindingPower.Lowest, builder);
+      parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
       builder.emitOpcode(50 /* CALL_PLUGIN */);
       builder.emitIndex(INFLATION_TO_YEAR_FROM_PRESENT_IDX);
       builder.emitIndex(2);
@@ -3925,7 +5164,7 @@ var InflationQueryParselet = class {
     const next = parser.peek();
     if (next?.type === "FROM") {
       parser.consume();
-      parser.parseExpression(chunkC4XZV6E7_cjs.BindingPower.Lowest, builder);
+      parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
       builder.emitOpcode(50 /* CALL_PLUGIN */);
       builder.emitIndex(INFLATION_FROM_YEAR_TO_PRESENT_IDX);
       builder.emitIndex(2);
@@ -3933,9 +5172,9 @@ var InflationQueryParselet = class {
     }
     if (next?.type === "IN") {
       parser.consume();
-      parser.parseExpression(chunkC4XZV6E7_cjs.BindingPower.Lowest, builder);
+      parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
       parser.consume("WORTH_IN");
-      parser.parseExpression(chunkC4XZV6E7_cjs.BindingPower.Lowest, builder);
+      parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
       builder.emitOpcode(51 /* CALL_BUILTIN */);
       builder.emitIndex(INFLATION_ADJUST_BUILTIN_IDX);
       builder.emitIndex(3);
@@ -3955,11 +5194,11 @@ var InflationFutureValueParselet = class {
     this.category = "Finance";
   }
   parse(parser, _token, builder) {
-    parser.parseExpression(chunkC4XZV6E7_cjs.BindingPower.Product, builder);
+    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Product, builder);
     parser.consume("IN");
-    parser.parseExpression(chunkC4XZV6E7_cjs.BindingPower.Lowest, builder);
+    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
     parser.consume("ASSUMING");
-    parser.parseExpression(chunkC4XZV6E7_cjs.BindingPower.Lowest, builder);
+    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Lowest, builder);
     const inflationToken = parser.peek();
     const inflationWord = inflationToken && inflationToken.type === "IDENT" ? inflationToken.value.toLowerCase() : void 0;
     if (inflationWord !== "inflation") {
@@ -4008,7 +5247,7 @@ function inYearDollarsNormalizerRule(priority = 70) {
       if (word !== "dollars" && word !== "dollar") return null;
       return {
         consumed: 3,
-        replacement: [chunkEBSPLUW4_cjs.createFusedToken("IN_YEAR_DOLLARS", yearToken.value, tokens.slice(pos, pos + 3))],
+        replacement: [chunkAHCLWAM5_cjs.createFusedToken("IN_YEAR_DOLLARS", yearToken.value, tokens.slice(pos, pos + 3))],
         ruleName: "finance:in-year-dollars"
       };
     }
@@ -4020,8 +5259,14 @@ var COMPOUND_FV = 51;
 var COMPOUND_INTEREST = 52;
 var LOAN_REPAYMENT = 55;
 var LOAN_INTEREST = 56;
-var TAX_ADD = 58;
+var COMPOUND_FV_EVERY = 80;
+var COMPOUND_INTEREST_EVERY = 81;
+var PRESENT_VALUE = 82;
+var ROI = 83;
+var ANNUAL_RETURN = 84;
 var TAX_REMOVE = 59;
+var TAX_IN = 85;
+var TAX_ON = 86;
 var FINANCE_PACKAGE = {
   name: "solve-finance",
   phrases: {
@@ -4037,17 +5282,29 @@ var FINANCE_PACKAGE = {
     "total interest on": "TOTAL_LOAN_INTEREST_ON",
     "tax on": "TAX_ON",
     "tax off": "TAX_OFF",
+    // The tax already inside a gross amount. Soulver documents "VAT in",
+    // "VAT of" and "VAT from" as three spellings of one thing.
+    "tax in": "TAX_IN_PHRASE",
+    "tax of": "TAX_IN_PHRASE",
+    "tax from": "TAX_IN_PHRASE",
+    "vat in": "TAX_IN_PHRASE",
+    "vat of": "TAX_IN_PHRASE",
+    "vat from": "TAX_IN_PHRASE",
     "vat on": "TAX_ON",
     "vat off": "TAX_OFF",
     "what is": "WHAT_IS",
     "what was": "WHAT_WAS",
+    "present value of": "PRESENT_VALUE_OF",
+    "annual return on": "ANNUAL_RETURN_ON",
     "value of": "VALUE_OF",
     "worth in": "WORTH_IN",
     "assuming": "ASSUMING"
   },
   prefixParselets: [
-    { tokenType: "COMPOUND_INTEREST_ON", parselet: new CompoundInterestParselet(COMPOUND_FV) },
-    { tokenType: "INTEREST_ON", parselet: new CompoundInterestParselet(COMPOUND_INTEREST) },
+    { tokenType: "PRESENT_VALUE_OF", parselet: new PresentValueParselet(PRESENT_VALUE) },
+    { tokenType: "ANNUAL_RETURN_ON", parselet: new AnnualReturnParselet(ANNUAL_RETURN) },
+    { tokenType: "COMPOUND_INTEREST_ON", parselet: new CompoundInterestParselet(COMPOUND_FV, COMPOUND_FV_EVERY) },
+    { tokenType: "INTEREST_ON", parselet: new CompoundInterestParselet(COMPOUND_INTEREST, COMPOUND_INTEREST_EVERY) },
     { tokenType: "DAILY_REPAYMENT_ON", parselet: new LoanRepaymentParselet(LOAN_REPAYMENT, 365) },
     { tokenType: "MONTHLY_REPAYMENT_ON", parselet: new LoanRepaymentParselet(LOAN_REPAYMENT, 12) },
     { tokenType: "ANNUAL_REPAYMENT_ON", parselet: new LoanRepaymentParselet(LOAN_REPAYMENT, 1) },
@@ -4056,13 +5313,20 @@ var FINANCE_PACKAGE = {
     { tokenType: "MONTHLY_LOAN_INTEREST_ON", parselet: new LoanRepaymentParselet(LOAN_INTEREST, 12) },
     { tokenType: "ANNUAL_LOAN_INTEREST_ON", parselet: new LoanRepaymentParselet(LOAN_INTEREST, 1) },
     { tokenType: "TOTAL_LOAN_INTEREST_ON", parselet: new LoanRepaymentParselet(LOAN_INTEREST, 0) },
-    { tokenType: "TAX_ON", parselet: new SalesTaxParselet(TAX_ADD) },
+    { tokenType: "TAX_ON", parselet: new SalesTaxParselet(TAX_ON) },
     { tokenType: "TAX_OFF", parselet: new SalesTaxParselet(TAX_REMOVE) },
+    { tokenType: "TAX_IN_PHRASE", parselet: new SalesTaxParselet(TAX_IN) },
     { tokenType: "WHAT_IS", parselet: new InflationQueryParselet("what-is") },
     { tokenType: "WHAT_WAS", parselet: new InflationQueryParselet("what-was") },
     { tokenType: "VALUE_OF", parselet: new InflationFutureValueParselet() }
   ],
   infixParselets: [
+    // The documented bare forms: "$1,000 after 3 years at 7%" and the "for
+    // ... compounding monthly" variant. Both pivot words behave identically;
+    // Soulver uses "after" for the annual form and "for" with an interval.
+    { tokenType: "AFTER", parselet: new InvestmentGrowthParselet(COMPOUND_FV, COMPOUND_FV_EVERY) },
+    { tokenType: "FOR_DURATION", parselet: new InvestmentGrowthParselet(COMPOUND_FV, COMPOUND_FV_EVERY) },
+    { tokenType: "INVESTED", parselet: new ReturnOnInvestmentParselet(ROI) },
     { tokenType: "IN_YEAR_DOLLARS", parselet: new InYearDollarsParselet() }
   ],
   normalizerRules: [
@@ -4132,7 +5396,7 @@ function createQueryResolver(opts) {
           i += 3;
           continue;
         }
-        i = chunkWQTTOGXC_cjs.nextInstruction(opcodes, i);
+        i = chunk4AVD7NZW_cjs.nextInstruction(opcodes, i);
       }
       return null;
     },
@@ -4320,7 +5584,7 @@ function fetchCityWeather(city, signal) {
 }
 
 // src/packages/weather/WeatherPackage.ts
-var WEATHER_FN_IDX = chunkJ73SJHR3_cjs.allocatePluginFunctionIndex();
+var WEATHER_FN_IDX = chunk2NPS5DQ3_cjs.allocatePluginFunctionIndex();
 var { resolver: weatherResolver, pluginFunction: weatherPluginFunction } = createQueryResolver({
   namespace: "weather",
   pluginFunctionIndex: WEATHER_FN_IDX,
@@ -4425,6 +5689,15 @@ function requireYear(text, raw) {
 function tryParseDatePhrase(parser) {
   const first = parser.peek();
   if (!first) return null;
+  if (first.type === "DATETIME_LITERAL") {
+    parser.consume();
+    const date = new Date(Number(first.value));
+    if (Number.isNaN(date.getTime())) return null;
+    return {
+      isoDate: `${date.getFullYear()}-${pad2(date.getMonth() + 1)}-${pad2(date.getDate())}`,
+      raw: first.text ?? first.value
+    };
+  }
   if (first.type === "NUMBER") {
     const g1 = parser.consume();
     const sepTok = parser.peek();
@@ -4550,7 +5823,7 @@ var MAJOR_TICKERS = /* @__PURE__ */ new Set([
 
 // src/packages/stocks/normalizer/StockTickerNormalizerRule.ts
 var STOCK_TICKER_TYPE = "STOCK_TICKER";
-var STOCK_TICKER_TYPE_ID = chunkGW32KPCU_cjs.tokenTypeId(STOCK_TICKER_TYPE);
+var STOCK_TICKER_TYPE_ID = chunkR24DI24X_cjs.tokenTypeId(STOCK_TICKER_TYPE);
 function stockTickerNormalizerRule() {
   return {
     name: "stocks:bare-ticker",
@@ -4560,7 +5833,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 chunkNMD5VRN4_cjs.LexerToken(
+      const fusedToken = new chunkM4F66R4O_cjs.LexerToken(
         STOCK_TICKER_TYPE,
         STOCK_TICKER_TYPE_ID,
         token.value,
@@ -4629,7 +5902,7 @@ function finishStockExpression(parser, builder, ticker, currentFnIdx, historical
   const suffix = tryParseDateSuffix(parser);
   if (sawStar && !suffix) {
     emitStockQuery(builder, ticker, null, currentFnIdx, historicalFnIdx);
-    parser.parseExpression(chunkC4XZV6E7_cjs.BindingPower.Product, builder);
+    parser.parseExpression(chunkNZFKROS7_cjs.BindingPower.Product, builder);
     builder.emitOpcode(22 /* MUL */);
     return;
   }
@@ -4669,8 +5942,8 @@ function bareStockTickerParselet(currentFnIdx, historicalFnIdx) {
 
 // src/packages/stocks/StocksPackage.ts
 function createStocksPackage(config = {}) {
-  const currentFnIdx = chunkJ73SJHR3_cjs.allocatePluginFunctionIndex();
-  const historicalFnIdx = chunkJ73SJHR3_cjs.allocatePluginFunctionIndex();
+  const currentFnIdx = chunk2NPS5DQ3_cjs.allocatePluginFunctionIndex();
+  const historicalFnIdx = chunk2NPS5DQ3_cjs.allocatePluginFunctionIndex();
   function notConfigured(what) {
     return chunkOC6LTXYS_cjs.errorValue(
       "STOCKS_NOT_CONFIGURED",
@@ -4745,7 +6018,7 @@ function knowledgeQueryParselet(pluginFnIdx) {
 
 // src/packages/knowledge/KnowledgePackage.ts
 function createKnowledgePackage(config = {}) {
-  const fnIdx = chunkJ73SJHR3_cjs.allocatePluginFunctionIndex();
+  const fnIdx = chunk2NPS5DQ3_cjs.allocatePluginFunctionIndex();
   const { resolver, pluginFunction } = createQueryResolver({
     namespace: "knowledge",
     pluginFunctionIndex: fnIdx,
@@ -4801,7 +6074,7 @@ function requireContext(context) {
   }
   return null;
 }
-var PREV_FN_IDX = chunkJ73SJHR3_cjs.allocatePluginFunctionIndex();
+var PREV_FN_IDX = chunk2NPS5DQ3_cjs.allocatePluginFunctionIndex();
 function prevHandler(_args, context) {
   const ctxError = requireContext(context);
   if (ctxError) return ctxError;
@@ -4810,7 +6083,7 @@ function prevHandler(_args, context) {
   const err = checkLineValue(v, targetLine);
   return err ?? v;
 }
-var LINE_REF_FN_IDX = chunkJ73SJHR3_cjs.allocatePluginFunctionIndex();
+var LINE_REF_FN_IDX = chunk2NPS5DQ3_cjs.allocatePluginFunctionIndex();
 function lineRefHandler(args, context) {
   const ctxError = requireContext(context);
   if (ctxError) return ctxError;
@@ -4845,13 +6118,13 @@ function aggregateRange(from, to, context, isAverage) {
   const result = isAverage ? total / count : total;
   return sawUom ? chunkOC6LTXYS_cjs.uomValue(result, commonUnit) : chunkOC6LTXYS_cjs.numberValue(result);
 }
-var SUM_RANGE_FN_IDX = chunkJ73SJHR3_cjs.allocatePluginFunctionIndex();
+var SUM_RANGE_FN_IDX = chunk2NPS5DQ3_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 = chunkJ73SJHR3_cjs.allocatePluginFunctionIndex();
+var AVERAGE_RANGE_FN_IDX = chunk2NPS5DQ3_cjs.allocatePluginFunctionIndex();
 function averageRangeHandler(args, context) {
   const ctxError = requireContext(context);
   if (ctxError) return ctxError;
@@ -4888,13 +6161,13 @@ function aggregateAbove(context, isAverage) {
   const result = isAverage ? total / count : total;
   return sawUom ? chunkOC6LTXYS_cjs.uomValue(result, commonUnit) : chunkOC6LTXYS_cjs.numberValue(result);
 }
-var TOTAL_ABOVE_FN_IDX = chunkJ73SJHR3_cjs.allocatePluginFunctionIndex();
+var TOTAL_ABOVE_FN_IDX = chunk2NPS5DQ3_cjs.allocatePluginFunctionIndex();
 function totalAboveHandler(_args, context) {
   const ctxError = requireContext(context);
   if (ctxError) return ctxError;
   return aggregateAbove(context, false);
 }
-var AVERAGE_ABOVE_FN_IDX = chunkJ73SJHR3_cjs.allocatePluginFunctionIndex();
+var AVERAGE_ABOVE_FN_IDX = chunk2NPS5DQ3_cjs.allocatePluginFunctionIndex();
 function averageAboveHandler(_args, context) {
   const ctxError = requireContext(context);
   if (ctxError) return ctxError;
@@ -4966,9 +6239,9 @@ var AboveAggregateParselet = class {
 };
 
 // src/packages/lines/normalizer/LineRefNormalizerRule.ts
-var LINE_REF_TYPE_ID = chunkGW32KPCU_cjs.tokenTypeId("LINE_REF");
-var SUM_RANGE_CALL_TYPE_ID = chunkGW32KPCU_cjs.tokenTypeId("SUM_RANGE_CALL");
-var AVERAGE_RANGE_CALL_TYPE_ID = chunkGW32KPCU_cjs.tokenTypeId("AVERAGE_RANGE_CALL");
+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");
 function lineRefNormalizerRule() {
   return {
     name: "lines:line-ref",
@@ -5005,7 +6278,7 @@ function lineRefNormalizerRule() {
   };
 }
 function makeLineRefToken(lineNumberText, sourceToken) {
-  return new chunkNMD5VRN4_cjs.LexerToken(
+  return new chunkM4F66R4O_cjs.LexerToken(
     "LINE_REF",
     LINE_REF_TYPE_ID,
     lineNumberText,
@@ -5031,7 +6304,7 @@ function rangeCallNormalizerRule() {
       return {
         consumed: 1,
         replacement: [
-          new chunkNMD5VRN4_cjs.LexerToken(tokenType, typeId, token.value, token.value, token.offset, 0, token.line, token.col)
+          new chunkM4F66R4O_cjs.LexerToken(tokenType, typeId, token.value, token.value, token.offset, 0, token.line, token.col)
         ],
         ruleName: "lines:range-call"
       };
@@ -5118,5 +6391,5 @@ exports.WEATHER_PACKAGE = WEATHER_PACKAGE;
 exports.containsSymbolicCall = containsSymbolicCall;
 exports.createKnowledgePackage = createKnowledgePackage;
 exports.createStocksPackage = createStocksPackage;
-//# sourceMappingURL=chunk-RZCWSXTA.cjs.map
-//# sourceMappingURL=chunk-RZCWSXTA.cjs.map
+//# sourceMappingURL=chunk-43G3JT2E.cjs.map
+//# sourceMappingURL=chunk-43G3JT2E.cjs.map