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

package/dist/{chunk-6NTVRDQV.cjs → chunk-M4Q47KHF.cjs}

@@ -1,12 +1,13 @@
 'use strict';
 
 var chunk47LRVGOT_cjs = require('./chunk-47LRVGOT.cjs');
-var chunkJ73SJHR3_cjs = require('./chunk-J73SJHR3.cjs');
-var chunkXJCMXB2E_cjs = require('./chunk-XJCMXB2E.cjs');
+var chunk2NPS5DQ3_cjs = require('./chunk-2NPS5DQ3.cjs');
+var chunk2MV4HBKC_cjs = require('./chunk-2MV4HBKC.cjs');
 var chunkMZOVP3WI_cjs = require('./chunk-MZOVP3WI.cjs');
-var chunkHTXVVJRA_cjs = require('./chunk-HTXVVJRA.cjs');
+var chunk4CVLFLOB_cjs = require('./chunk-4CVLFLOB.cjs');
 var chunkOC6LTXYS_cjs = require('./chunk-OC6LTXYS.cjs');
-var chunkQNJ4ACRT_cjs = require('./chunk-QNJ4ACRT.cjs');
+var chunkNJTXJ5AG_cjs = require('./chunk-NJTXJ5AG.cjs');
+var chunkMBNQVDVC_cjs = require('./chunk-MBNQVDVC.cjs');
 var chunkM4N5GA5Z_cjs = require('./chunk-M4N5GA5Z.cjs');
 
 // src/vm/DependencyGraph.ts
@@ -332,7 +333,7 @@ var ScopeManager = class {
 };
 
 // src/vm/VM.ts
-function createVM(registry, maxStackDepth = 200, maxInstructions = 5e4, maxFunctionRecursionDepth = 50, context = chunkJ73SJHR3_cjs.defaultEngineContext) {
+function createVM(registry, maxStackDepth = 200, maxInstructions = 5e4, maxFunctionRecursionDepth = 50, context = chunk2NPS5DQ3_cjs.defaultEngineContext) {
   const stack = [];
   const variables = /* @__PURE__ */ new Map();
   let instructionCount = 0;
@@ -494,12 +495,49 @@ function invokeFrameBody(params, program, args, vm, pipeline, expression, contex
   }
   return bodyResult.value;
 }
+function unifyRatePeriods(l, r) {
+  if (l.type !== 6 /* Uom */ || r.type !== 6 /* Uom */) return null;
+  const leftUnit = l.unit;
+  const rightUnit = r.unit;
+  if (leftUnit === void 0 || rightUnit === void 0) return null;
+  const leftSlash = leftUnit.indexOf("/");
+  const rightSlash = rightUnit.indexOf("/");
+  if (leftSlash < 0 || rightSlash < 0) return null;
+  if (leftUnit.slice(0, leftSlash) !== rightUnit.slice(0, rightSlash)) return null;
+  const leftPeriod = chunkMBNQVDVC_cjs.UNIT_TABLE[leftUnit.slice(leftSlash + 1).toLowerCase()];
+  const rightPeriod = chunkMBNQVDVC_cjs.UNIT_TABLE[rightUnit.slice(rightSlash + 1).toLowerCase()];
+  if (leftPeriod === void 0 || rightPeriod === void 0) return null;
+  if (leftPeriod[0] !== rightPeriod[0]) return null;
+  return l.toNumber() * (rightPeriod[1] / leftPeriod[1]);
+}
+function moneyTimesQuantity(l, r) {
+  if (l.type !== 6 /* Uom */ || r.type !== 6 /* Uom */) return null;
+  const leftUnit = l.unit;
+  const rightUnit = r.unit;
+  if (leftUnit === void 0 || rightUnit === void 0) return null;
+  if (leftUnit.includes("/") || rightUnit.includes("/")) return null;
+  const leftIsMoney = chunk4CVLFLOB_cjs.CURRENCY_DISPLAY[leftUnit.toUpperCase()] !== void 0;
+  const rightIsMoney = chunk4CVLFLOB_cjs.CURRENCY_DISPLAY[rightUnit.toUpperCase()] !== void 0;
+  if (leftIsMoney === rightIsMoney) return null;
+  return chunkOC6LTXYS_cjs.uomValue(l.toNumber() * r.toNumber(), leftIsMoney ? leftUnit : rightUnit);
+}
+function combinePercentage(l, r, sign) {
+  if (l.type === 5 /* Percentage */) {
+    if (r.type !== 5 /* Percentage */ && r.type !== 0 /* Number */) return null;
+    return chunkOC6LTXYS_cjs.percentageValue(l.toNumber() + sign * r.toNumber());
+  }
+  if (r.type !== 5 /* Percentage */) return null;
+  const factor = 1 + sign * r.toNumber();
+  if (l.type === 0 /* Number */) return chunkOC6LTXYS_cjs.numberValue(l.toNumber() * factor);
+  if (l.type === 6 /* Uom */ && l.unit !== void 0) return chunkOC6LTXYS_cjs.uomValue(l.toNumber() * factor, l.unit);
+  return null;
+}
 function extractDurationMs(value) {
   if (value.type === 6 /* Uom */) {
     const unit = value.unit;
-    if (unit && chunkQNJ4ACRT_cjs.getMeasure(unit) === "time") {
+    if (unit && chunkNJTXJ5AG_cjs.getMeasure(unit) === "time") {
       try {
-        return chunkQNJ4ACRT_cjs.convertUnit(value.toNumber(), unit, "ms");
+        return chunkNJTXJ5AG_cjs.convertUnit(value.toNumber(), unit, "ms");
       } catch {
       }
     }
@@ -533,8 +571,8 @@ function combineTimecode(tc, r, sign) {
   if (r.type === 6 /* Uom */ && r.unit === "frames") {
     return chunkOC6LTXYS_cjs.uomValue(tc.toNumber() + sign * r.toNumber(), tc.unit);
   }
-  if (r.type === 6 /* Uom */ && r.unit && chunkQNJ4ACRT_cjs.getMeasure(r.unit) === "time") {
-    const seconds = chunkQNJ4ACRT_cjs.convertUnit(r.toNumber(), r.unit, "s");
+  if (r.type === 6 /* Uom */ && r.unit && chunkNJTXJ5AG_cjs.getMeasure(r.unit) === "time") {
+    const seconds = chunkNJTXJ5AG_cjs.convertUnit(r.toNumber(), r.unit, "s");
     return chunkOC6LTXYS_cjs.uomValue(tc.toNumber() + sign * seconds * fps, tc.unit);
   }
   return chunkOC6LTXYS_cjs.uomValue(tc.toNumber() + sign * r.toNumber(), tc.unit);
@@ -545,15 +583,15 @@ function isTruthy(value) {
 }
 function multiplyRateByMatchingUom(rate, multiplier) {
   const { numerator, denominator } = chunkOC6LTXYS_cjs.splitRateUnit(rate.unit);
-  const rateMeasure = chunkQNJ4ACRT_cjs.getMeasure(denominator);
-  const multiplierMeasure = chunkQNJ4ACRT_cjs.getMeasure(multiplier.unit);
+  const rateMeasure = chunkNJTXJ5AG_cjs.getMeasure(denominator);
+  const multiplierMeasure = chunkNJTXJ5AG_cjs.getMeasure(multiplier.unit);
   if (!rateMeasure || rateMeasure !== multiplierMeasure) {
     return chunkOC6LTXYS_cjs.errorValue(
       "RATE_MUL_MEASURE_MISMATCH",
       `Cannot multiply a "${denominator}"-denominated rate by "${multiplier.unit}" \u2014 different measures`
     );
   }
-  const multiplierInDenominatorUnit = chunkQNJ4ACRT_cjs.convertUnit(multiplier.toNumber(), multiplier.unit, denominator);
+  const multiplierInDenominatorUnit = chunkNJTXJ5AG_cjs.convertUnit(multiplier.toNumber(), multiplier.unit, denominator);
   const total = rate.toNumber() * multiplierInDenominatorUnit;
   return numerator ? chunkOC6LTXYS_cjs.uomValue(total, numerator) : chunkOC6LTXYS_cjs.numberValue(total);
 }
@@ -584,9 +622,10 @@ function toFractionString(n) {
   const numerator = whole * k1 + h1;
   return `${negative ? "-" : ""}${numerator}/${k1}`;
 }
-function toMultiplierString(n) {
-  const multiplier = Math.round((1 + n) * 1e6) / 1e6;
-  return `${multiplier}x`;
+function toMultiplierString(value) {
+  const n = value.toNumber();
+  const multiple = value.type === 5 /* Percentage */ ? 1 + n : n;
+  return `${Math.round(multiple * 1e6) / 1e6}x`;
 }
 function toScientificString(n) {
   if (n === 0) return "0e+0";
@@ -675,14 +714,20 @@ function executeBytecode(bytecode, vm, pipeline, expression, context, symbolicTo
         // ═══════════════════════════════════════════════════════════════
         case 20 /* ADD */: {
           const r = safePop(stack), l = safePop(stack);
-          if (l.type === 0 /* Number */ && r.type === 0 /* Number */) {
+          const pctAdd = combinePercentage(l, r, 1);
+          const ratePeriodAdd = pctAdd === null ? unifyRatePeriods(l, r) : null;
+          if (pctAdd !== null) {
+            stack.push(pctAdd);
+          } else if (ratePeriodAdd !== null) {
+            stack.push(chunkOC6LTXYS_cjs.uomValue(ratePeriodAdd + r.toNumber(), r.unit));
+          } else if (l.type === 0 /* Number */ && r.type === 0 /* Number */) {
             stack.push(chunkOC6LTXYS_cjs.numberValue(l.value + r.value));
           } else if (l.type === 10 /* Boolean */ && r.type === 10 /* Boolean */) {
             stack.push(chunkOC6LTXYS_cjs.boolValue(l.value && r.value));
           } else if (l.type === 4 /* Datetime */) {
             if (r.type === 4 /* Datetime */) {
               stack.push(chunkOC6LTXYS_cjs.errorValue("INVALID_DATETIME_OP", "Cannot add two datetimes together"));
-            } else if (r.type === 6 /* Uom */ && chunkQNJ4ACRT_cjs.isWorkdayUnit(r.unit)) {
+            } else if (r.type === 6 /* Uom */ && chunkNJTXJ5AG_cjs.isWorkdayUnit(r.unit)) {
               stack.push(chunkOC6LTXYS_cjs.datetimeValue(addBusinessDays(l.toNumber(), r.toNumber())));
             } else {
               stack.push(chunkOC6LTXYS_cjs.datetimeValue(l.toNumber() + extractDurationMs(r)));
@@ -690,18 +735,24 @@ function executeBytecode(bytecode, vm, pipeline, expression, context, symbolicTo
           } else if (l.type === 6 /* Uom */ && chunkOC6LTXYS_cjs.isTimecodeUnit(l.unit)) {
             stack.push(combineTimecode(l, r, 1));
           } else {
-            stack.push(chunkJ73SJHR3_cjs.binaryOp(l, r, (a, b) => a + b, (a, b) => a + b, "add"));
+            stack.push(chunk2NPS5DQ3_cjs.binaryOp(l, r, (a, b) => a + b, (a, b) => a + b, "add"));
           }
           break;
         }
         case 21 /* SUB */: {
           const r = safePop(stack), l = safePop(stack);
-          if (l.type === 0 /* Number */ && r.type === 0 /* Number */) {
+          const pctSub = combinePercentage(l, r, -1);
+          const ratePeriodSub = pctSub === null ? unifyRatePeriods(l, r) : null;
+          if (pctSub !== null) {
+            stack.push(pctSub);
+          } else if (ratePeriodSub !== null) {
+            stack.push(chunkOC6LTXYS_cjs.uomValue(ratePeriodSub - r.toNumber(), r.unit));
+          } else if (l.type === 0 /* Number */ && r.type === 0 /* Number */) {
             stack.push(chunkOC6LTXYS_cjs.numberValue(l.value - r.value));
           } else if (l.type === 4 /* Datetime */) {
             if (r.type === 4 /* Datetime */) {
               stack.push(chunkOC6LTXYS_cjs.uomValue(l.toNumber() - r.toNumber(), "ms"));
-            } else if (r.type === 6 /* Uom */ && chunkQNJ4ACRT_cjs.isWorkdayUnit(r.unit)) {
+            } else if (r.type === 6 /* Uom */ && chunkNJTXJ5AG_cjs.isWorkdayUnit(r.unit)) {
               stack.push(chunkOC6LTXYS_cjs.datetimeValue(addBusinessDays(l.toNumber(), -r.toNumber())));
             } else {
               stack.push(chunkOC6LTXYS_cjs.datetimeValue(l.toNumber() - extractDurationMs(r)));
@@ -709,7 +760,7 @@ function executeBytecode(bytecode, vm, pipeline, expression, context, symbolicTo
           } else if (l.type === 6 /* Uom */ && chunkOC6LTXYS_cjs.isTimecodeUnit(l.unit)) {
             stack.push(combineTimecode(l, r, -1));
           } else {
-            stack.push(chunkJ73SJHR3_cjs.binaryOp(l, r, (a, b) => a - b, (a, b) => a - b, "sub"));
+            stack.push(chunk2NPS5DQ3_cjs.binaryOp(l, r, (a, b) => a - b, (a, b) => a - b, "sub"));
           }
           break;
         }
@@ -718,35 +769,37 @@ function executeBytecode(bytecode, vm, pipeline, expression, context, symbolicTo
           if (l.type === 0 /* Number */ && r.type === 0 /* Number */) {
             stack.push(chunkOC6LTXYS_cjs.numberValue(l.value * r.value));
           } else if (l.type === 7 /* Matrix */ && r.type === 7 /* Matrix */) {
-            stack.push(chunkHTXVVJRA_cjs.matrixMultiply(l.value, r.value));
+            stack.push(chunk4CVLFLOB_cjs.matrixMultiply(l.value, r.value));
           } else if (l.type === 6 /* Uom */ && chunkOC6LTXYS_cjs.isRateUnit(l.unit) && r.type === 6 /* Uom */ && r.unit) {
             stack.push(multiplyRateByMatchingUom(l, r));
           } else if (r.type === 6 /* Uom */ && chunkOC6LTXYS_cjs.isRateUnit(r.unit) && l.type === 6 /* Uom */ && l.unit) {
             stack.push(multiplyRateByMatchingUom(r, l));
+          } else if (moneyTimesQuantity(l, r) !== null) {
+            stack.push(moneyTimesQuantity(l, r));
           } else {
-            stack.push(chunkJ73SJHR3_cjs.binaryOp(l, r, (a, b) => a * b, (a, b) => a * b, "mul"));
+            stack.push(chunk2NPS5DQ3_cjs.binaryOp(l, r, (a, b) => a * b, (a, b) => a * b, "mul"));
           }
           break;
         }
         case 23 /* DIV */: {
           const r = safePop(stack), l = safePop(stack);
           if (l.type === 6 /* Uom */ && r.type === 6 /* Uom */) {
-            const { lv, rv, sameMeasure } = chunkJ73SJHR3_cjs.unifyUom(l, r);
+            const { lv, rv, sameMeasure } = chunk2NPS5DQ3_cjs.unifyUom(l, r);
             if (sameMeasure) {
               stack.push(chunkOC6LTXYS_cjs.numberValue(lv / rv));
-            } else if (chunkXJCMXB2E_cjs.sharedCurrencyExchange.isCurrency(l.unit) && chunkXJCMXB2E_cjs.sharedCurrencyExchange.isCurrency(r.unit)) {
+            } else if (chunk2MV4HBKC_cjs.sharedCurrencyExchange.isCurrency(l.unit) && chunk2MV4HBKC_cjs.sharedCurrencyExchange.isCurrency(r.unit)) {
               stack.push(chunkOC6LTXYS_cjs.errorValue("INCOMPATIBLE_UNITS", `Cannot combine incompatible units: ${l.unit} and ${r.unit}`));
             } else {
               stack.push(chunkOC6LTXYS_cjs.rateValue(lv / rv, l.unit, r.unit));
             }
           } else {
-            stack.push(chunkJ73SJHR3_cjs.binaryOp(l, r, (a, b) => a / b, (a, b) => a / b, "div"));
+            stack.push(chunk2NPS5DQ3_cjs.binaryOp(l, r, (a, b) => a / b, (a, b) => a / b, "div"));
           }
           break;
         }
         case 24 /* MOD */: {
           const r = safePop(stack), l = safePop(stack);
-          stack.push(chunkJ73SJHR3_cjs.binaryOp(l, r, (a, b) => a % b, (a, b) => a % b));
+          stack.push(chunk2NPS5DQ3_cjs.binaryOp(l, r, (a, b) => a % b, (a, b) => a % b));
           break;
         }
         case 25 /* EXP */: {
@@ -772,7 +825,7 @@ function executeBytecode(bytecode, vm, pipeline, expression, context, symbolicTo
             break;
           }
           if (l.type === 9 /* Symbolic */ || r.type === 9 /* Symbolic */) {
-            stack.push(chunkJ73SJHR3_cjs.symbolicPow(l, r));
+            stack.push(chunk2NPS5DQ3_cjs.symbolicPow(l, r));
             break;
           }
           stack.push(chunkOC6LTXYS_cjs.numberValue(Math.pow(l.toNumber(), r.toNumber())));
@@ -782,7 +835,7 @@ function executeBytecode(bytecode, vm, pipeline, expression, context, symbolicTo
           const v = safePop(stack);
           if (v.type === 2 /* BigInt */) stack.push(chunkOC6LTXYS_cjs.bigIntValue(-v.value));
           else if (v.type === 6 /* Uom */) stack.push(chunkOC6LTXYS_cjs.uomValue(-v.toNumber(), v.unit));
-          else if (v.type === 9 /* Symbolic */) stack.push(chunkJ73SJHR3_cjs.symbolicNeg(v));
+          else if (v.type === 9 /* Symbolic */) stack.push(chunk2NPS5DQ3_cjs.symbolicNeg(v));
           else stack.push(chunkOC6LTXYS_cjs.numberValue(-v.toNumber()));
           break;
         }
@@ -861,10 +914,10 @@ function executeBytecode(bytecode, vm, pipeline, expression, context, symbolicTo
           if (l.type === 0 /* Number */ && r.type === 0 /* Number */) {
             stack.push(chunkOC6LTXYS_cjs.boolValue(l.value === r.value));
           } else if (l.type === 6 /* Uom */ && r.type === 6 /* Uom */) {
-            const { lv, rv, sameMeasure } = chunkJ73SJHR3_cjs.unifyUom(l, r);
+            const { lv, rv, sameMeasure } = chunk2NPS5DQ3_cjs.unifyUom(l, r);
             stack.push(chunkOC6LTXYS_cjs.boolValue(sameMeasure && lv === rv));
           } else if (l.type === 7 /* Matrix */ && r.type === 7 /* Matrix */) {
-            stack.push(chunkHTXVVJRA_cjs.matrixCompare(l.value, r.value, (a, b) => a === b));
+            stack.push(chunk4CVLFLOB_cjs.matrixCompare(l.value, r.value, (a, b) => a === b));
           } else {
             stack.push(chunkOC6LTXYS_cjs.boolValue(l.toNumber() === r.toNumber()));
           }
@@ -875,10 +928,10 @@ function executeBytecode(bytecode, vm, pipeline, expression, context, symbolicTo
           if (l.type === 0 /* Number */ && r.type === 0 /* Number */) {
             stack.push(chunkOC6LTXYS_cjs.boolValue(l.value !== r.value));
           } else if (l.type === 6 /* Uom */ && r.type === 6 /* Uom */) {
-            const { lv, rv, sameMeasure } = chunkJ73SJHR3_cjs.unifyUom(l, r);
+            const { lv, rv, sameMeasure } = chunk2NPS5DQ3_cjs.unifyUom(l, r);
             stack.push(chunkOC6LTXYS_cjs.boolValue(!sameMeasure || lv !== rv));
           } else if (l.type === 7 /* Matrix */ && r.type === 7 /* Matrix */) {
-            stack.push(chunkHTXVVJRA_cjs.matrixCompare(l.value, r.value, (a, b) => a !== b));
+            stack.push(chunk4CVLFLOB_cjs.matrixCompare(l.value, r.value, (a, b) => a !== b));
           } else {
             stack.push(chunkOC6LTXYS_cjs.boolValue(l.toNumber() !== r.toNumber()));
           }
@@ -889,7 +942,7 @@ function executeBytecode(bytecode, vm, pipeline, expression, context, symbolicTo
           if (l.type === 0 /* Number */ && r.type === 0 /* Number */) {
             stack.push(chunkOC6LTXYS_cjs.boolValue(l.value < r.value));
           } else if (l.type === 7 /* Matrix */ && r.type === 7 /* Matrix */) {
-            stack.push(chunkHTXVVJRA_cjs.matrixCompare(l.value, r.value, (a, b) => a < b));
+            stack.push(chunk4CVLFLOB_cjs.matrixCompare(l.value, r.value, (a, b) => a < b));
           } else {
             stack.push(chunkOC6LTXYS_cjs.boolValue(l.toNumber() < r.toNumber()));
           }
@@ -900,7 +953,7 @@ function executeBytecode(bytecode, vm, pipeline, expression, context, symbolicTo
           if (l.type === 0 /* Number */ && r.type === 0 /* Number */) {
             stack.push(chunkOC6LTXYS_cjs.boolValue(l.value <= r.value));
           } else if (l.type === 7 /* Matrix */ && r.type === 7 /* Matrix */) {
-            stack.push(chunkHTXVVJRA_cjs.matrixCompare(l.value, r.value, (a, b) => a <= b));
+            stack.push(chunk4CVLFLOB_cjs.matrixCompare(l.value, r.value, (a, b) => a <= b));
           } else {
             stack.push(chunkOC6LTXYS_cjs.boolValue(l.toNumber() <= r.toNumber()));
           }
@@ -911,7 +964,7 @@ function executeBytecode(bytecode, vm, pipeline, expression, context, symbolicTo
           if (l.type === 0 /* Number */ && r.type === 0 /* Number */) {
             stack.push(chunkOC6LTXYS_cjs.boolValue(l.value > r.value));
           } else if (l.type === 7 /* Matrix */ && r.type === 7 /* Matrix */) {
-            stack.push(chunkHTXVVJRA_cjs.matrixCompare(l.value, r.value, (a, b) => a > b));
+            stack.push(chunk4CVLFLOB_cjs.matrixCompare(l.value, r.value, (a, b) => a > b));
           } else {
             stack.push(chunkOC6LTXYS_cjs.boolValue(l.toNumber() > r.toNumber()));
           }
@@ -922,7 +975,7 @@ function executeBytecode(bytecode, vm, pipeline, expression, context, symbolicTo
           if (l.type === 0 /* Number */ && r.type === 0 /* Number */) {
             stack.push(chunkOC6LTXYS_cjs.boolValue(l.value >= r.value));
           } else if (l.type === 7 /* Matrix */ && r.type === 7 /* Matrix */) {
-            stack.push(chunkHTXVVJRA_cjs.matrixCompare(l.value, r.value, (a, b) => a >= b));
+            stack.push(chunk4CVLFLOB_cjs.matrixCompare(l.value, r.value, (a, b) => a >= b));
           } else {
             stack.push(chunkOC6LTXYS_cjs.boolValue(l.toNumber() >= r.toNumber()));
           }
@@ -982,11 +1035,11 @@ function executeBytecode(bytecode, vm, pipeline, expression, context, symbolicTo
             if (arg.type === 9 /* Symbolic */) sawSymbolic = true;
             args.push(arg);
           }
-          const fn = chunkJ73SJHR3_cjs.builtinFunctions[fnIdx];
+          const fn = chunk2NPS5DQ3_cjs.builtinFunctions[fnIdx];
           if (fn) {
             const ordered = args.reverse();
-            const routeSymbolically = sawSymbolic && !chunkJ73SJHR3_cjs.SYMBOLIC_NATIVE_BUILTINS.has(fnIdx);
-            stack.push(routeSymbolically ? chunkJ73SJHR3_cjs.symbolicBuiltin(fnIdx, ordered) : fn(ordered));
+            const routeSymbolically = sawSymbolic && !chunk2NPS5DQ3_cjs.SYMBOLIC_NATIVE_BUILTINS.has(fnIdx);
+            stack.push(routeSymbolically ? chunk2NPS5DQ3_cjs.symbolicBuiltin(fnIdx, ordered) : fn(ordered));
           }
           break;
         }
@@ -1052,7 +1105,7 @@ function executeBytecode(bytecode, vm, pipeline, expression, context, symbolicTo
           if (val !== void 0) {
             stack.push(val);
           } else if (symbolicTolerant) {
-            stack.push(chunkOC6LTXYS_cjs.symbolicValue(chunkHTXVVJRA_cjs.varNode(varName)));
+            stack.push(chunkOC6LTXYS_cjs.symbolicValue(chunk4CVLFLOB_cjs.varNode(varName)));
           } else {
             throw chunkM4N5GA5Z_cjs.ErrorFactory.execution(
               "UNDEFINED_VARIABLE",
@@ -1071,7 +1124,7 @@ function executeBytecode(bytecode, vm, pipeline, expression, context, symbolicTo
         }
         case 62 /* LOAD_GLOBAL_VAR */: {
           const varName = strings[opcodes[ip++]];
-          const globalValue = chunkJ73SJHR3_cjs.sharedGlobalVariableStore.get(varName);
+          const globalValue = chunk2NPS5DQ3_cjs.sharedGlobalVariableStore.get(varName);
           if (globalValue === void 0) {
             throw chunkM4N5GA5Z_cjs.ErrorFactory.internal({
               code: "GLOBAL_VARIABLE_NOT_RESOLVED",
@@ -1087,7 +1140,7 @@ function executeBytecode(bytecode, vm, pipeline, expression, context, symbolicTo
         case 63 /* STORE_GLOBAL_VAR */: {
           const val = safePop(stack);
           const varName = strings[opcodes[ip++]];
-          chunkJ73SJHR3_cjs.sharedGlobalVariableStore.set(varName, hasArena ? chunkOC6LTXYS_cjs.persistentValue(val) : val);
+          chunk2NPS5DQ3_cjs.sharedGlobalVariableStore.set(varName, hasArena ? chunkOC6LTXYS_cjs.persistentValue(val) : val);
           stack.push(val);
           break;
         }
@@ -1116,7 +1169,7 @@ function executeBytecode(bytecode, vm, pipeline, expression, context, symbolicTo
         }
         case 141 /* TO_MULTIPLIER */: {
           const v = safePop(stack);
-          stack.push(chunkOC6LTXYS_cjs.stringValue(toMultiplierString(v.toNumber())));
+          stack.push(chunkOC6LTXYS_cjs.stringValue(toMultiplierString(v)));
           break;
         }
         case 142 /* TO_SCI */: {
@@ -1139,7 +1192,7 @@ function executeBytecode(bytecode, vm, pipeline, expression, context, symbolicTo
         case 145 /* CALL_AS_CONVERTER */: {
           const name = safePop(stack).value.toLowerCase();
           const value = safePop(stack);
-          const converter = chunkJ73SJHR3_cjs.asConverterRegistry.get(name);
+          const converter = chunk2NPS5DQ3_cjs.asConverterRegistry.get(name);
           if (!converter) {
             stack.push(chunkOC6LTXYS_cjs.errorValue("UNKNOWN_AS_CONVERTER", `Unknown converter "as ${name}"`));
           } else {
@@ -1160,12 +1213,12 @@ function executeBytecode(bytecode, vm, pipeline, expression, context, symbolicTo
           const toUnit = safePop(stack).value;
           const fromUnit = safePop(stack).value;
           const val = safePop(stack).toNumber();
-          const measure = chunkQNJ4ACRT_cjs.getMeasure(fromUnit);
-          const isCurrency = chunkXJCMXB2E_cjs.sharedCurrencyExchange.isCurrency(fromUnit) && chunkXJCMXB2E_cjs.sharedCurrencyExchange.isCurrency(toUnit);
-          if (measure && chunkQNJ4ACRT_cjs.getMeasure(toUnit) === measure) {
-            stack.push(chunkOC6LTXYS_cjs.uomValue(chunkQNJ4ACRT_cjs.convertUnit(val, fromUnit, toUnit), toUnit));
+          const measure = chunkNJTXJ5AG_cjs.getMeasure(fromUnit);
+          const isCurrency = chunk2MV4HBKC_cjs.sharedCurrencyExchange.isCurrency(fromUnit) && chunk2MV4HBKC_cjs.sharedCurrencyExchange.isCurrency(toUnit);
+          if (measure && chunkNJTXJ5AG_cjs.getMeasure(toUnit) === measure) {
+            stack.push(chunkOC6LTXYS_cjs.uomValue(chunkNJTXJ5AG_cjs.convertUnit(val, fromUnit, toUnit), toUnit));
           } else if (isCurrency) {
-            const converted = chunkXJCMXB2E_cjs.sharedCurrencyExchange.convertSync(val, fromUnit, toUnit);
+            const converted = chunk2MV4HBKC_cjs.sharedCurrencyExchange.convertSync(val, fromUnit, toUnit);
             if (converted !== null) {
               stack.push(chunkOC6LTXYS_cjs.uomValue(converted, toUnit));
             } else {
@@ -1178,14 +1231,14 @@ function executeBytecode(bytecode, vm, pipeline, expression, context, symbolicTo
         }
         case 85 /* UOM_POSSIBILITIES */: {
           const unit = safePop(stack).value;
-          const possibilities = chunkQNJ4ACRT_cjs.getConvertiblePossibilities(unit);
+          const possibilities = chunkNJTXJ5AG_cjs.getConvertiblePossibilities(unit);
           stack.push(chunkOC6LTXYS_cjs.stringValue(possibilities.length > 0 ? possibilities.join(", ") : `No known units for "${unit}"`));
           break;
         }
         case 83 /* UOM_BEST */: {
           const unit = safePop(stack).value;
           const val = safePop(stack).toNumber();
-          const { value, unit: bestUnit } = chunkQNJ4ACRT_cjs.getBestUnit(val, unit);
+          const { value, unit: bestUnit } = chunkNJTXJ5AG_cjs.getBestUnit(val, unit);
           stack.push(chunkOC6LTXYS_cjs.uomValue(value, bestUnit));
           break;
         }
@@ -1195,12 +1248,12 @@ function executeBytecode(bytecode, vm, pipeline, expression, context, symbolicTo
           if (left.type === 6 /* Uom */) {
             const fromUnit = left.unit;
             const val = left.toNumber();
-            const measure = chunkQNJ4ACRT_cjs.getMeasure(fromUnit);
-            const isCurrency = chunkXJCMXB2E_cjs.sharedCurrencyExchange.isCurrency(fromUnit) && chunkXJCMXB2E_cjs.sharedCurrencyExchange.isCurrency(toUnit);
-            if (measure && chunkQNJ4ACRT_cjs.getMeasure(toUnit) === measure) {
-              stack.push(chunkOC6LTXYS_cjs.uomValue(chunkQNJ4ACRT_cjs.convertUnit(val, fromUnit, toUnit), toUnit));
+            const measure = chunkNJTXJ5AG_cjs.getMeasure(fromUnit);
+            const isCurrency = chunk2MV4HBKC_cjs.sharedCurrencyExchange.isCurrency(fromUnit) && chunk2MV4HBKC_cjs.sharedCurrencyExchange.isCurrency(toUnit);
+            if (measure && chunkNJTXJ5AG_cjs.getMeasure(toUnit) === measure) {
+              stack.push(chunkOC6LTXYS_cjs.uomValue(chunkNJTXJ5AG_cjs.convertUnit(val, fromUnit, toUnit), toUnit));
             } else if (isCurrency) {
-              const converted = chunkXJCMXB2E_cjs.sharedCurrencyExchange.convertSync(val, fromUnit, toUnit);
+              const converted = chunk2MV4HBKC_cjs.sharedCurrencyExchange.convertSync(val, fromUnit, toUnit);
               if (converted !== null) {
                 stack.push(chunkOC6LTXYS_cjs.uomValue(converted, toUnit));
               } else {
@@ -1256,8 +1309,8 @@ function executeBytecode(bytecode, vm, pipeline, expression, context, symbolicTo
             break;
           }
           const { numerator, denominator } = chunkOC6LTXYS_cjs.splitRateUnit(rate.unit);
-          const rateMeasure = chunkQNJ4ACRT_cjs.getMeasure(denominator);
-          const targetMeasure = chunkQNJ4ACRT_cjs.getMeasure(newDenominatorUnit);
+          const rateMeasure = chunkNJTXJ5AG_cjs.getMeasure(denominator);
+          const targetMeasure = chunkNJTXJ5AG_cjs.getMeasure(newDenominatorUnit);
           if (!rateMeasure || rateMeasure !== targetMeasure) {
             stack.push(chunkOC6LTXYS_cjs.errorValue(
               "RATE_CONVERT_MEASURE_MISMATCH",
@@ -1265,7 +1318,7 @@ function executeBytecode(bytecode, vm, pipeline, expression, context, symbolicTo
             ));
             break;
           }
-          const factor = chunkQNJ4ACRT_cjs.convertUnit(1, newDenominatorUnit, denominator);
+          const factor = chunkNJTXJ5AG_cjs.convertUnit(1, newDenominatorUnit, denominator);
           stack.push(chunkOC6LTXYS_cjs.rateValue(rate.toNumber() * factor, numerator, newDenominatorUnit));
           break;
         }
@@ -1328,7 +1381,7 @@ function executeBytecode(bytecode, vm, pipeline, expression, context, symbolicTo
             const cellVal = safePop(stack);
             rowMajor[i] = cellVal.type === 10 /* Boolean */ ? cellVal.value : cellVal.type === 9 /* Symbolic */ ? cellVal.value : cellVal.toNumber();
           }
-          stack.push(chunkOC6LTXYS_cjs.matrixValue(rows, cols, chunkHTXVVJRA_cjs.rowMajorToColumnMajor(rows, cols, rowMajor)));
+          stack.push(chunkOC6LTXYS_cjs.matrixValue(rows, cols, chunk4CVLFLOB_cjs.rowMajorToColumnMajor(rows, cols, rowMajor)));
           break;
         }
         case 153 /* MAT_INDEX1 */: {
@@ -1354,8 +1407,8 @@ function executeBytecode(bytecode, vm, pipeline, expression, context, symbolicTo
             ));
             break;
           }
-          const cell = chunkHTXVVJRA_cjs.matIndex(m, index);
-          stack.push(chunkHTXVVJRA_cjs.matrixEntryToValue(cell));
+          const cell = chunk4CVLFLOB_cjs.matIndex(m, index);
+          stack.push(chunk4CVLFLOB_cjs.matrixEntryToValue(cell));
           break;
         }
         case 154 /* MAT_INDEX2 */: {
@@ -1379,15 +1432,15 @@ function executeBytecode(bytecode, vm, pipeline, expression, context, symbolicTo
           const m = matrixVal.value;
           const row = Math.trunc(rowVal.toNumber());
           const col = Math.trunc(colVal.toNumber());
-          if (!chunkHTXVVJRA_cjs.inBounds(m, row, col)) {
+          if (!chunk4CVLFLOB_cjs.inBounds(m, row, col)) {
             stack.push(chunkOC6LTXYS_cjs.errorValue(
               "MATRIX_INDEX_OUT_OF_BOUNDS",
               `[${row}, ${col}] is out of bounds for a ${m.rows}x${m.cols} matrix.`
             ));
             break;
           }
-          const cell = chunkHTXVVJRA_cjs.matAt(m, row, col);
-          stack.push(chunkHTXVVJRA_cjs.matrixEntryToValue(cell));
+          const cell = chunk4CVLFLOB_cjs.matAt(m, row, col);
+          stack.push(chunk4CVLFLOB_cjs.matrixEntryToValue(cell));
           break;
         }
         case 156 /* RANGE_NEW */: {
@@ -1457,7 +1510,7 @@ function executeBytecode(bytecode, vm, pipeline, expression, context, symbolicTo
           const data = new Array(newRows * newCols);
           for (let r = 0; r < newRows; r++) {
             for (let c = 0; c < newCols; c++) {
-              data[r + c * newRows] = chunkHTXVVJRA_cjs.matAt(m, rowRange.min + r, colRange.min + c);
+              data[r + c * newRows] = chunk4CVLFLOB_cjs.matAt(m, rowRange.min + r, colRange.min + c);
             }
           }
           stack.push(chunkOC6LTXYS_cjs.matrixValue(newRows, newCols, data));
@@ -1511,7 +1564,7 @@ function executeBytecode(bytecode, vm, pipeline, expression, context, symbolicTo
           const cellArrays = new Array(collectionCount);
           let mapEarlyError;
           for (let i = 0; i < collectionCount; i++) {
-            const resolved = chunkHTXVVJRA_cjs.collectionToValues(rawCollections[i]);
+            const resolved = chunk4CVLFLOB_cjs.collectionToValues(rawCollections[i]);
             if (!Array.isArray(resolved)) {
               mapEarlyError = resolved;
               break;
@@ -1536,7 +1589,7 @@ function executeBytecode(bytecode, vm, pipeline, expression, context, symbolicTo
           for (let i = 0; i < collectionLength; i++) {
             const args = new Array(collectionCount);
             for (let j = 0; j < collectionCount; j++) args[j] = cellArrays[j][i];
-            const resultVal = kind === 1 ? chunkJ73SJHR3_cjs.builtinFunctions[ref]?.(args) ?? chunkOC6LTXYS_cjs.errorValue("UNKNOWN_BUILTIN_FUNCTION", `map: unknown builtin function index ${ref}`) : invokeFrameBody(paramNames, program, args, vm, pipeline, expression, context, !!symbolicTolerant);
+            const resultVal = kind === 1 ? chunk2NPS5DQ3_cjs.builtinFunctions[ref]?.(args) ?? chunkOC6LTXYS_cjs.errorValue("UNKNOWN_BUILTIN_FUNCTION", `map: unknown builtin function index ${ref}`) : invokeFrameBody(paramNames, program, args, vm, pipeline, expression, context, !!symbolicTolerant);
             if (resultVal.type === 13 /* Error */) {
               mapError = resultVal;
               break;
@@ -1586,7 +1639,7 @@ function executeBytecode(bytecode, vm, pipeline, expression, context, symbolicTo
             paramNames = fn.params;
             program = fn.program;
           }
-          const cells = chunkHTXVVJRA_cjs.collectionToValues(collectionVal);
+          const cells = chunk4CVLFLOB_cjs.collectionToValues(collectionVal);
           if (!Array.isArray(cells)) {
             stack.push(cells);
             break;
@@ -1611,7 +1664,7 @@ function executeBytecode(bytecode, vm, pipeline, expression, context, symbolicTo
           let reduceError;
           for (let i = startIdx; i < cells.length; i++) {
             const args = [acc, cells[i]];
-            const resultVal = kind === 1 ? chunkJ73SJHR3_cjs.builtinFunctions[ref]?.(args) ?? chunkOC6LTXYS_cjs.errorValue("UNKNOWN_BUILTIN_FUNCTION", `reduce: unknown builtin function index ${ref}`) : invokeFrameBody(paramNames, program, args, vm, pipeline, expression, context, !!symbolicTolerant);
+            const resultVal = kind === 1 ? chunk2NPS5DQ3_cjs.builtinFunctions[ref]?.(args) ?? chunkOC6LTXYS_cjs.errorValue("UNKNOWN_BUILTIN_FUNCTION", `reduce: unknown builtin function index ${ref}`) : invokeFrameBody(paramNames, program, args, vm, pipeline, expression, context, !!symbolicTolerant);
             if (resultVal.type === 13 /* Error */) {
               reduceError = resultVal;
               break;
@@ -1638,5 +1691,5 @@ exports.DependencyGraph = DependencyGraph;
 exports.ScopeManager = ScopeManager;
 exports.createVM = createVM;
 exports.executeBytecode = executeBytecode;
-//# sourceMappingURL=chunk-6NTVRDQV.cjs.map
-//# sourceMappingURL=chunk-6NTVRDQV.cjs.map
+//# sourceMappingURL=chunk-M4Q47KHF.cjs.map
+//# sourceMappingURL=chunk-M4Q47KHF.cjs.map