@cj-tech-master/excelts 9.3.1 → 9.4.0

package/dist/browser/modules/formula/functions/financial.js

@@ -2,7 +2,7 @@
  * Financial Functions — Native RuntimeValue implementation.
  */
 import { excelToDate } from "../../../utils/utils.base.js";
-import { RVKind, ERRORS, isError, isArray, toNumberRV, toBooleanRV, rvNumber, rvBoolean } from "../runtime/values.js";
+import { RVKind, ERRORS, isError, isArray, toNumberRV, toBooleanRV, topLeft, rvNumber, rvBoolean } from "../runtime/values.js";
 import { isDate1904 } from "./_date-context.js";
 import { flattenNumbers, firstError } from "./_shared.js";
 /**
@@ -20,23 +20,23 @@ function toDate(serial) {
 // Financial Functions
 // ============================================================================
 export const fnPMT = args => {
-    const rate = toNumberRV(args[0]);
+    const rate = toNumberRV(topLeft(args[0]));
     if (isError(rate)) {
         return rate;
     }
-    const nper = toNumberRV(args[1]);
+    const nper = toNumberRV(topLeft(args[1]));
     if (isError(nper)) {
         return nper;
     }
-    const pv = toNumberRV(args[2]);
+    const pv = toNumberRV(topLeft(args[2]));
     if (isError(pv)) {
         return pv;
     }
-    const fv = args.length > 3 ? toNumberRV(args[3]) : rvNumber(0);
+    const fv = args.length > 3 ? toNumberRV(topLeft(args[3])) : rvNumber(0);
     if (isError(fv)) {
         return fv;
     }
-    const type = args.length > 4 ? toNumberRV(args[4]) : rvNumber(0);
+    const type = args.length > 4 ? toNumberRV(topLeft(args[4])) : rvNumber(0);
     if (isError(type)) {
         return type;
     }
@@ -62,23 +62,23 @@ export const fnPMT = args => {
     return rvNumber(-(rate.value * (pv.value * pvif + fv.value)) / (pvif - 1) / (1 + rate.value * typeBit));
 };
 export const fnFV = args => {
-    const rate = toNumberRV(args[0]);
+    const rate = toNumberRV(topLeft(args[0]));
     if (isError(rate)) {
         return rate;
     }
-    const nper = toNumberRV(args[1]);
+    const nper = toNumberRV(topLeft(args[1]));
     if (isError(nper)) {
         return nper;
     }
-    const pmt = toNumberRV(args[2]);
+    const pmt = toNumberRV(topLeft(args[2]));
     if (isError(pmt)) {
         return pmt;
     }
-    const pv = args.length > 3 ? toNumberRV(args[3]) : rvNumber(0);
+    const pv = args.length > 3 ? toNumberRV(topLeft(args[3])) : rvNumber(0);
     if (isError(pv)) {
         return pv;
     }
-    const type = args.length > 4 ? toNumberRV(args[4]) : rvNumber(0);
+    const type = args.length > 4 ? toNumberRV(topLeft(args[4])) : rvNumber(0);
     if (isError(type)) {
         return type;
     }
@@ -97,23 +97,23 @@ export const fnFV = args => {
     return rvNumber(-(pv.value * pvif + pmt.value * (1 + rate.value * typeBit) * ((pvif - 1) / rate.value)));
 };
 export const fnPV = args => {
-    const rate = toNumberRV(args[0]);
+    const rate = toNumberRV(topLeft(args[0]));
     if (isError(rate)) {
         return rate;
     }
-    const nper = toNumberRV(args[1]);
+    const nper = toNumberRV(topLeft(args[1]));
     if (isError(nper)) {
         return nper;
     }
-    const pmt = toNumberRV(args[2]);
+    const pmt = toNumberRV(topLeft(args[2]));
     if (isError(pmt)) {
         return pmt;
     }
-    const fv = args.length > 3 ? toNumberRV(args[3]) : rvNumber(0);
+    const fv = args.length > 3 ? toNumberRV(topLeft(args[3])) : rvNumber(0);
     if (isError(fv)) {
         return fv;
     }
-    const type = args.length > 4 ? toNumberRV(args[4]) : rvNumber(0);
+    const type = args.length > 4 ? toNumberRV(topLeft(args[4])) : rvNumber(0);
     if (isError(type)) {
         return type;
     }
@@ -131,7 +131,7 @@ export const fnPV = args => {
     return rvNumber(-(fv.value + pmt.value * (1 + rate.value * typeBit) * ((pvif - 1) / rate.value)) / pvif);
 };
 export const fnNPV = args => {
-    const rate = toNumberRV(args[0]);
+    const rate = toNumberRV(topLeft(args[0]));
     if (isError(rate)) {
         return rate;
     }
@@ -148,6 +148,12 @@ export const fnNPV = args => {
         if (isArray(a)) {
             for (const row of a.rows) {
                 for (const cell of row) {
+                    // Propagate errors encountered inside the cash-flow range —
+                    // previously silently filtered, hiding `#N/A` / `#DIV/0!`
+                    // that should surface as the NPV result.
+                    if (cell.kind === RVKind.Error) {
+                        return cell;
+                    }
                     if (cell.kind === RVKind.Number) {
                         values.push(cell.value);
                     }
@@ -206,7 +212,13 @@ export const fnIRR = args => {
     if (!hasPos || !hasNeg) {
         return ERRORS.NUM;
     }
-    const guessRV = args.length > 1 ? toNumberRV(args[1]) : rvNumber(0.1);
+    // Excel's `guess` argument defaults to 0.1 when omitted. A user-supplied
+    // BLANK (e.g. `IRR(B2:B6, )` with an empty second slot) should also fall
+    // back to 0.1 — without this the Newton scan starts at `g = 0`, which
+    // sits exactly at the discount-factor singularity of several cash-flow
+    // shapes and can fail to converge. Genuine numeric guesses (including 0
+    // explicitly supplied as a number) are honoured as given.
+    const guessRV = args.length > 1 && args[1].kind !== RVKind.Blank ? toNumberRV(topLeft(args[1])) : rvNumber(0.1);
     if (isError(guessRV)) {
         return guessRV;
     }
@@ -283,23 +295,23 @@ export const fnIRR = args => {
     return ERRORS.NUM;
 };
 export const fnNPER = args => {
-    const rate = toNumberRV(args[0]);
+    const rate = toNumberRV(topLeft(args[0]));
     if (isError(rate)) {
         return rate;
     }
-    const pmt = toNumberRV(args[1]);
+    const pmt = toNumberRV(topLeft(args[1]));
     if (isError(pmt)) {
         return pmt;
     }
-    const pv = toNumberRV(args[2]);
+    const pv = toNumberRV(topLeft(args[2]));
     if (isError(pv)) {
         return pv;
     }
-    const fv = args.length > 3 ? toNumberRV(args[3]) : rvNumber(0);
+    const fv = args.length > 3 ? toNumberRV(topLeft(args[3])) : rvNumber(0);
     if (isError(fv)) {
         return fv;
     }
-    const type = args.length > 4 ? toNumberRV(args[4]) : rvNumber(0);
+    const type = args.length > 4 ? toNumberRV(topLeft(args[4])) : rvNumber(0);
     if (isError(type)) {
         return type;
     }
@@ -329,27 +341,30 @@ export const fnNPER = args => {
     return rvNumber(result);
 };
 export const fnRATE = args => {
-    const nper = toNumberRV(args[0]);
+    const nper = toNumberRV(topLeft(args[0]));
     if (isError(nper)) {
         return nper;
     }
-    const pmt = toNumberRV(args[1]);
+    const pmt = toNumberRV(topLeft(args[1]));
     if (isError(pmt)) {
         return pmt;
     }
-    const pv = toNumberRV(args[2]);
+    const pv = toNumberRV(topLeft(args[2]));
     if (isError(pv)) {
         return pv;
     }
-    const fv = args.length > 3 ? toNumberRV(args[3]) : rvNumber(0);
+    const fv = args.length > 3 ? toNumberRV(topLeft(args[3])) : rvNumber(0);
     if (isError(fv)) {
         return fv;
     }
-    const type = args.length > 4 ? toNumberRV(args[4]) : rvNumber(0);
+    const type = args.length > 4 ? toNumberRV(topLeft(args[4])) : rvNumber(0);
     if (isError(type)) {
         return type;
     }
-    const guess = args.length > 5 ? toNumberRV(args[5]) : rvNumber(0.1);
+    // Blank → default 0.1 (see IRR / XIRR for rationale). For `fv` and
+    // `type` a blank coerces to 0 via `toNumberRV`, which matches Excel's
+    // documented defaults, so those are left as-is.
+    const guess = args.length > 5 && args[5].kind !== RVKind.Blank ? toNumberRV(topLeft(args[5])) : rvNumber(0.1);
     if (isError(guess)) {
         return guess;
     }
@@ -414,15 +429,15 @@ export const fnRATE = args => {
     return ERRORS.NUM;
 };
 export const fnSLN = args => {
-    const cost = toNumberRV(args[0]);
+    const cost = toNumberRV(topLeft(args[0]));
     if (isError(cost)) {
         return cost;
     }
-    const salvage = toNumberRV(args[1]);
+    const salvage = toNumberRV(topLeft(args[1]));
     if (isError(salvage)) {
         return salvage;
     }
-    const life = toNumberRV(args[2]);
+    const life = toNumberRV(topLeft(args[2]));
     if (isError(life)) {
         return life;
     }
@@ -441,19 +456,19 @@ export const fnSLN = args => {
  * Excel rejects `life = 0` and period outside [1, life] with #NUM!.
  */
 export const fnSYD = args => {
-    const cost = toNumberRV(args[0]);
+    const cost = toNumberRV(topLeft(args[0]));
     if (isError(cost)) {
         return cost;
     }
-    const salvage = toNumberRV(args[1]);
+    const salvage = toNumberRV(topLeft(args[1]));
     if (isError(salvage)) {
         return salvage;
     }
-    const life = toNumberRV(args[2]);
+    const life = toNumberRV(topLeft(args[2]));
     if (isError(life)) {
         return life;
     }
-    const per = toNumberRV(args[3]);
+    const per = toNumberRV(topLeft(args[3]));
     if (isError(per)) {
         return per;
     }
@@ -476,31 +491,33 @@ export const fnSYD = args => {
  * periods.
  */
 export const fnVDB = args => {
-    const cost = toNumberRV(args[0]);
+    const cost = toNumberRV(topLeft(args[0]));
     if (isError(cost)) {
         return cost;
     }
-    const salvage = toNumberRV(args[1]);
+    const salvage = toNumberRV(topLeft(args[1]));
     if (isError(salvage)) {
         return salvage;
     }
-    const life = toNumberRV(args[2]);
+    const life = toNumberRV(topLeft(args[2]));
     if (isError(life)) {
         return life;
     }
-    const start = toNumberRV(args[3]);
+    const start = toNumberRV(topLeft(args[3]));
     if (isError(start)) {
         return start;
     }
-    const end = toNumberRV(args[4]);
+    const end = toNumberRV(topLeft(args[4]));
     if (isError(end)) {
         return end;
     }
-    const factorRV = args.length > 5 ? toNumberRV(args[5]) : rvNumber(2);
+    const factorRV = args.length > 5 && args[5].kind !== RVKind.Blank ? toNumberRV(topLeft(args[5])) : rvNumber(2);
     if (isError(factorRV)) {
         return factorRV;
     }
-    const noSwitchRV = args.length > 6 ? toBooleanRV(args[6]) : rvBoolean(false);
+    const noSwitchRV = args.length > 6 && args[6].kind !== RVKind.Blank
+        ? toBooleanRV(topLeft(args[6]))
+        : rvBoolean(false);
     if (isError(noSwitchRV)) {
         return noSwitchRV;
     }
@@ -564,23 +581,27 @@ export const fnVDB = args => {
     return rvNumber(total);
 };
 export const fnDB = args => {
-    const cost = toNumberRV(args[0]);
+    const cost = toNumberRV(topLeft(args[0]));
     if (isError(cost)) {
         return cost;
     }
-    const salvage = toNumberRV(args[1]);
+    const salvage = toNumberRV(topLeft(args[1]));
     if (isError(salvage)) {
         return salvage;
     }
-    const life = toNumberRV(args[2]);
+    const life = toNumberRV(topLeft(args[2]));
     if (isError(life)) {
         return life;
     }
-    const period = toNumberRV(args[3]);
+    const period = toNumberRV(topLeft(args[3]));
     if (isError(period)) {
         return period;
     }
-    const month = args.length > 4 ? toNumberRV(args[4]) : rvNumber(12);
+    // Blank `month` → Excel default 12 (full first year). Without the
+    // blank guard, `toNumberRV(BLANK)` coerces to 0 which then trips the
+    // `month < 1` validation below, silently surfacing #NUM! for
+    // `DB(cost, salvage, life, period, )`.
+    const month = args.length > 4 && args[4].kind !== RVKind.Blank ? toNumberRV(topLeft(args[4])) : rvNumber(12);
     if (isError(month)) {
         return month;
     }
@@ -623,23 +644,25 @@ export const fnDB = args => {
     return rvNumber(depn);
 };
 export const fnDDB = args => {
-    const cost = toNumberRV(args[0]);
+    const cost = toNumberRV(topLeft(args[0]));
     if (isError(cost)) {
         return cost;
     }
-    const salvage = toNumberRV(args[1]);
+    const salvage = toNumberRV(topLeft(args[1]));
     if (isError(salvage)) {
         return salvage;
     }
-    const life = toNumberRV(args[2]);
+    const life = toNumberRV(topLeft(args[2]));
     if (isError(life)) {
         return life;
     }
-    const period = toNumberRV(args[3]);
+    const period = toNumberRV(topLeft(args[3]));
     if (isError(period)) {
         return period;
     }
-    const factor = args.length > 4 ? toNumberRV(args[4]) : rvNumber(2);
+    // Blank `factor` → Excel default 2 (double declining). See DB/IRR for
+    // why blank must be distinguished from an explicit 0.
+    const factor = args.length > 4 && args[4].kind !== RVKind.Blank ? toNumberRV(topLeft(args[4])) : rvNumber(2);
     if (isError(factor)) {
         return factor;
     }
@@ -697,54 +720,54 @@ function ipmtRaw(rate, per, nper, pv, fv, type) {
     return type === 1 ? ipmt / (1 + rate) : ipmt;
 }
 export const fnIPMT = args => {
-    const rate = toNumberRV(args[0]);
+    const rate = toNumberRV(topLeft(args[0]));
     if (isError(rate)) {
         return rate;
     }
-    const per = toNumberRV(args[1]);
+    const per = toNumberRV(topLeft(args[1]));
     if (isError(per)) {
         return per;
     }
-    const nper = toNumberRV(args[2]);
+    const nper = toNumberRV(topLeft(args[2]));
     if (isError(nper)) {
         return nper;
     }
-    const pv = toNumberRV(args[3]);
+    const pv = toNumberRV(topLeft(args[3]));
     if (isError(pv)) {
         return pv;
     }
-    const fv = args.length > 4 ? toNumberRV(args[4]) : rvNumber(0);
+    const fv = args.length > 4 ? toNumberRV(topLeft(args[4])) : rvNumber(0);
     if (isError(fv)) {
         return fv;
     }
-    const type = args.length > 5 ? toNumberRV(args[5]) : rvNumber(0);
+    const type = args.length > 5 ? toNumberRV(topLeft(args[5])) : rvNumber(0);
     if (isError(type)) {
         return type;
     }
     return rvNumber(ipmtRaw(rate.value, per.value, nper.value, pv.value, fv.value, type.value));
 };
 export const fnPPMT = args => {
-    const rate = toNumberRV(args[0]);
+    const rate = toNumberRV(topLeft(args[0]));
     if (isError(rate)) {
         return rate;
     }
-    const per = toNumberRV(args[1]);
+    const per = toNumberRV(topLeft(args[1]));
     if (isError(per)) {
         return per;
     }
-    const nper = toNumberRV(args[2]);
+    const nper = toNumberRV(topLeft(args[2]));
     if (isError(nper)) {
         return nper;
     }
-    const pv = toNumberRV(args[3]);
+    const pv = toNumberRV(topLeft(args[3]));
     if (isError(pv)) {
         return pv;
     }
-    const fv = args.length > 4 ? toNumberRV(args[4]) : rvNumber(0);
+    const fv = args.length > 4 ? toNumberRV(topLeft(args[4])) : rvNumber(0);
     if (isError(fv)) {
         return fv;
     }
-    const type = args.length > 5 ? toNumberRV(args[5]) : rvNumber(0);
+    const type = args.length > 5 ? toNumberRV(topLeft(args[5])) : rvNumber(0);
     if (isError(type)) {
         return type;
     }
@@ -764,7 +787,7 @@ export const fnPPMT = args => {
  * propagates any error it encounters. Text values produce #VALUE!.
  */
 export const fnFVSCHEDULE = args => {
-    const principal = toNumberRV(args[0]);
+    const principal = toNumberRV(topLeft(args[0]));
     if (isError(principal)) {
         return principal;
     }
@@ -815,15 +838,15 @@ export const fnFVSCHEDULE = args => {
  * Excel requires `rate > 0` and `pv, fv > 0`.
  */
 export const fnPDURATION = args => {
-    const rate = toNumberRV(args[0]);
+    const rate = toNumberRV(topLeft(args[0]));
     if (isError(rate)) {
         return rate;
     }
-    const pv = toNumberRV(args[1]);
+    const pv = toNumberRV(topLeft(args[1]));
     if (isError(pv)) {
         return pv;
     }
-    const fv = toNumberRV(args[2]);
+    const fv = toNumberRV(topLeft(args[2]));
     if (isError(fv)) {
         return fv;
     }
@@ -840,15 +863,15 @@ export const fnPDURATION = args => {
  * Excel requires `nper > 0`, `pv > 0`, `fv >= 0`.
  */
 export const fnRRI = args => {
-    const nper = toNumberRV(args[0]);
+    const nper = toNumberRV(topLeft(args[0]));
     if (isError(nper)) {
         return nper;
     }
-    const pv = toNumberRV(args[1]);
+    const pv = toNumberRV(topLeft(args[1]));
     if (isError(pv)) {
         return pv;
     }
-    const fv = toNumberRV(args[2]);
+    const fv = toNumberRV(topLeft(args[2]));
     if (isError(fv)) {
         return fv;
     }
@@ -858,11 +881,11 @@ export const fnRRI = args => {
     return rvNumber(Math.pow(fv.value / pv.value, 1 / nper.value) - 1);
 };
 export const fnEFFECT = args => {
-    const nomRate = toNumberRV(args[0]);
+    const nomRate = toNumberRV(topLeft(args[0]));
     if (isError(nomRate)) {
         return nomRate;
     }
-    const npery = toNumberRV(args[1]);
+    const npery = toNumberRV(topLeft(args[1]));
     if (isError(npery)) {
         return npery;
     }
@@ -872,11 +895,11 @@ export const fnEFFECT = args => {
     return rvNumber(Math.pow(1 + nomRate.value / Math.floor(npery.value), Math.floor(npery.value)) - 1);
 };
 export const fnNOMINAL = args => {
-    const effRate = toNumberRV(args[0]);
+    const effRate = toNumberRV(topLeft(args[0]));
     if (isError(effRate)) {
         return effRate;
     }
-    const npery = toNumberRV(args[1]);
+    const npery = toNumberRV(topLeft(args[1]));
     if (isError(npery)) {
         return npery;
     }
@@ -887,7 +910,7 @@ export const fnNOMINAL = args => {
     return rvNumber(np * (Math.pow(effRate.value + 1, 1 / np) - 1));
 };
 export const fnXNPV = args => {
-    const rate = toNumberRV(args[0]);
+    const rate = toNumberRV(topLeft(args[0]));
     if (isError(rate)) {
         return rate;
     }
@@ -957,7 +980,8 @@ export const fnXIRR = args => {
     if (!xHasPos || !xHasNeg) {
         return ERRORS.NUM;
     }
-    const guessRV = args.length > 2 ? toNumberRV(args[2]) : rvNumber(0.1);
+    // Blank third slot → default 0.1, same rationale as IRR above.
+    const guessRV = args.length > 2 && args[2].kind !== RVKind.Blank ? toNumberRV(topLeft(args[2])) : rvNumber(0.1);
     if (isError(guessRV)) {
         return guessRV;
     }
@@ -1043,11 +1067,11 @@ export const fnMIRR = args => {
         return valuesErr;
     }
     const values = rawValues.map(n => n.value);
-    const financeRate = toNumberRV(args[1]);
+    const financeRate = toNumberRV(topLeft(args[1]));
     if (isError(financeRate)) {
         return financeRate;
     }
-    const reinvestRate = toNumberRV(args[2]);
+    const reinvestRate = toNumberRV(topLeft(args[2]));
     if (isError(reinvestRate)) {
         return reinvestRate;
     }
@@ -1076,19 +1100,19 @@ export const fnMIRR = args => {
     return rvNumber(Math.pow(-npvPos / npvNeg, 1 / (n - 1)) - 1);
 };
 export const fnISPMT = args => {
-    const rate = toNumberRV(args[0]);
+    const rate = toNumberRV(topLeft(args[0]));
     if (isError(rate)) {
         return rate;
     }
-    const per = toNumberRV(args[1]);
+    const per = toNumberRV(topLeft(args[1]));
     if (isError(per)) {
         return per;
     }
-    const nper = toNumberRV(args[2]);
+    const nper = toNumberRV(topLeft(args[2]));
     if (isError(nper)) {
         return nper;
     }
-    const pv = toNumberRV(args[3]);
+    const pv = toNumberRV(topLeft(args[3]));
     if (isError(pv)) {
         return pv;
     }
@@ -1100,27 +1124,27 @@ export const fnISPMT = args => {
     return rvNumber(pv.value * rate.value * (per.value / nper.value - 1));
 };
 export const fnCUMPRINC = args => {
-    const rate = toNumberRV(args[0]);
+    const rate = toNumberRV(topLeft(args[0]));
     if (isError(rate)) {
         return rate;
     }
-    const nper = toNumberRV(args[1]);
+    const nper = toNumberRV(topLeft(args[1]));
     if (isError(nper)) {
         return nper;
     }
-    const pv = toNumberRV(args[2]);
+    const pv = toNumberRV(topLeft(args[2]));
     if (isError(pv)) {
         return pv;
     }
-    const startPeriod = toNumberRV(args[3]);
+    const startPeriod = toNumberRV(topLeft(args[3]));
     if (isError(startPeriod)) {
         return startPeriod;
     }
-    const endPeriod = toNumberRV(args[4]);
+    const endPeriod = toNumberRV(topLeft(args[4]));
     if (isError(endPeriod)) {
         return endPeriod;
     }
-    const type = toNumberRV(args[5]);
+    const type = toNumberRV(topLeft(args[5]));
     if (isError(type)) {
         return type;
     }
@@ -1138,35 +1162,37 @@ export const fnCUMPRINC = args => {
         return ERRORS.NUM;
     }
     let cumPrinc = 0;
+    // PMT is constant across all periods — hoist it out of the loop
+    // rather than recomputing the same value `e - s + 1` times.
+    const pmtVal = pmtRaw(rate.value, nper.value, pv.value, 0, type.value);
     for (let p = s; p <= e; p++) {
-        const pmtVal = pmtRaw(rate.value, nper.value, pv.value, 0, type.value);
         const ipmtVal = ipmtRaw(rate.value, p, nper.value, pv.value, 0, type.value);
         cumPrinc += pmtVal - ipmtVal;
     }
     return rvNumber(cumPrinc);
 };
 export const fnCUMIPMT = args => {
-    const rate = toNumberRV(args[0]);
+    const rate = toNumberRV(topLeft(args[0]));
     if (isError(rate)) {
         return rate;
     }
-    const nper = toNumberRV(args[1]);
+    const nper = toNumberRV(topLeft(args[1]));
     if (isError(nper)) {
         return nper;
     }
-    const pv = toNumberRV(args[2]);
+    const pv = toNumberRV(topLeft(args[2]));
     if (isError(pv)) {
         return pv;
     }
-    const startPeriod = toNumberRV(args[3]);
+    const startPeriod = toNumberRV(topLeft(args[3]));
     if (isError(startPeriod)) {
         return startPeriod;
     }
-    const endPeriod = toNumberRV(args[4]);
+    const endPeriod = toNumberRV(topLeft(args[4]));
     if (isError(endPeriod)) {
         return endPeriod;
     }
-    const type = toNumberRV(args[5]);
+    const type = toNumberRV(topLeft(args[5]));
     if (isError(type)) {
         return type;
     }
@@ -1189,11 +1215,11 @@ export const fnCUMIPMT = args => {
     return rvNumber(cumIpmt);
 };
 export const fnDOLLARDE = args => {
-    const fractionalDollar = toNumberRV(args[0]);
+    const fractionalDollar = toNumberRV(topLeft(args[0]));
     if (isError(fractionalDollar)) {
         return fractionalDollar;
     }
-    const fraction = toNumberRV(args[1]);
+    const fraction = toNumberRV(topLeft(args[1]));
     if (isError(fraction)) {
         return fraction;
     }
@@ -1216,11 +1242,11 @@ export const fnDOLLARDE = args => {
     return rvNumber(sign * (Math.abs(intPart) + numerator / f));
 };
 export const fnDOLLARFR = args => {
-    const decimalDollar = toNumberRV(args[0]);
+    const decimalDollar = toNumberRV(topLeft(args[0]));
     if (isError(decimalDollar)) {
         return decimalDollar;
     }
-    const fraction = toNumberRV(args[1]);
+    const fraction = toNumberRV(topLeft(args[1]));
     if (isError(fraction)) {
         return fraction;
     }
@@ -1256,23 +1282,23 @@ function validateBasis(basis) {
     return null;
 }
 export const fnDISC = args => {
-    const settlement = toNumberRV(args[0]);
+    const settlement = toNumberRV(topLeft(args[0]));
     if (isError(settlement)) {
         return settlement;
     }
-    const maturity = toNumberRV(args[1]);
+    const maturity = toNumberRV(topLeft(args[1]));
     if (isError(maturity)) {
         return maturity;
     }
-    const pr = toNumberRV(args[2]);
+    const pr = toNumberRV(topLeft(args[2]));
     if (isError(pr)) {
         return pr;
     }
-    const redemption = toNumberRV(args[3]);
+    const redemption = toNumberRV(topLeft(args[3]));
     if (isError(redemption)) {
         return redemption;
     }
-    const basis = args.length > 4 ? toNumberRV(args[4]) : rvNumber(0);
+    const basis = args.length > 4 ? toNumberRV(topLeft(args[4])) : rvNumber(0);
     if (isError(basis)) {
         return basis;
     }
@@ -1293,23 +1319,23 @@ export const fnDISC = args => {
     return rvNumber((redemption.value - pr.value) / redemption.value / dcf);
 };
 export const fnPRICEDISC = args => {
-    const settlement = toNumberRV(args[0]);
+    const settlement = toNumberRV(topLeft(args[0]));
     if (isError(settlement)) {
         return settlement;
     }
-    const maturity = toNumberRV(args[1]);
+    const maturity = toNumberRV(topLeft(args[1]));
     if (isError(maturity)) {
         return maturity;
     }
-    const disc = toNumberRV(args[2]);
+    const disc = toNumberRV(topLeft(args[2]));
     if (isError(disc)) {
         return disc;
     }
-    const redemption = toNumberRV(args[3]);
+    const redemption = toNumberRV(topLeft(args[3]));
     if (isError(redemption)) {
         return redemption;
     }
-    const basis = args.length > 4 ? toNumberRV(args[4]) : rvNumber(0);
+    const basis = args.length > 4 ? toNumberRV(topLeft(args[4])) : rvNumber(0);
     if (isError(basis)) {
         return basis;
     }
@@ -1324,23 +1350,23 @@ export const fnPRICEDISC = args => {
     return rvNumber(redemption.value - disc.value * redemption.value * dcf);
 };
 export const fnYIELDDISC = args => {
-    const settlement = toNumberRV(args[0]);
+    const settlement = toNumberRV(topLeft(args[0]));
     if (isError(settlement)) {
         return settlement;
     }
-    const maturity = toNumberRV(args[1]);
+    const maturity = toNumberRV(topLeft(args[1]));
     if (isError(maturity)) {
         return maturity;
     }
-    const pr = toNumberRV(args[2]);
+    const pr = toNumberRV(topLeft(args[2]));
     if (isError(pr)) {
         return pr;
     }
-    const redemption = toNumberRV(args[3]);
+    const redemption = toNumberRV(topLeft(args[3]));
     if (isError(redemption)) {
         return redemption;
     }
-    const basis = args.length > 4 ? toNumberRV(args[4]) : rvNumber(0);
+    const basis = args.length > 4 ? toNumberRV(topLeft(args[4])) : rvNumber(0);
     if (isError(basis)) {
         return basis;
     }
@@ -1358,23 +1384,23 @@ export const fnYIELDDISC = args => {
     return rvNumber((redemption.value - pr.value) / pr.value / dcf);
 };
 export const fnRECEIVED = args => {
-    const settlement = toNumberRV(args[0]);
+    const settlement = toNumberRV(topLeft(args[0]));
     if (isError(settlement)) {
         return settlement;
     }
-    const maturity = toNumberRV(args[1]);
+    const maturity = toNumberRV(topLeft(args[1]));
     if (isError(maturity)) {
         return maturity;
     }
-    const investment = toNumberRV(args[2]);
+    const investment = toNumberRV(topLeft(args[2]));
     if (isError(investment)) {
         return investment;
     }
-    const disc = toNumberRV(args[3]);
+    const disc = toNumberRV(topLeft(args[3]));
     if (isError(disc)) {
         return disc;
     }
-    const basis = args.length > 4 ? toNumberRV(args[4]) : rvNumber(0);
+    const basis = args.length > 4 ? toNumberRV(topLeft(args[4])) : rvNumber(0);
     if (isError(basis)) {
         return basis;
     }
@@ -1393,23 +1419,23 @@ export const fnRECEIVED = args => {
     return rvNumber(investment.value / denom);
 };
 export const fnINTRATE = args => {
-    const settlement = toNumberRV(args[0]);
+    const settlement = toNumberRV(topLeft(args[0]));
     if (isError(settlement)) {
         return settlement;
     }
-    const maturity = toNumberRV(args[1]);
+    const maturity = toNumberRV(topLeft(args[1]));
     if (isError(maturity)) {
         return maturity;
     }
-    const investment = toNumberRV(args[2]);
+    const investment = toNumberRV(topLeft(args[2]));
     if (isError(investment)) {
         return investment;
     }
-    const redemption = toNumberRV(args[3]);
+    const redemption = toNumberRV(topLeft(args[3]));
     if (isError(redemption)) {
         return redemption;
     }
-    const basis = args.length > 4 ? toNumberRV(args[4]) : rvNumber(0);
+    const basis = args.length > 4 ? toNumberRV(topLeft(args[4])) : rvNumber(0);
     if (isError(basis)) {
         return basis;
     }
@@ -1626,31 +1652,31 @@ function validateBondBasis(frequency, basis) {
  *   A   = days from beginning of coupon period to settlement
  */
 export const fnPRICE = args => {
-    const settlementRV = toNumberRV(args[0]);
+    const settlementRV = toNumberRV(topLeft(args[0]));
     if (isError(settlementRV)) {
         return settlementRV;
     }
-    const maturityRV = toNumberRV(args[1]);
+    const maturityRV = toNumberRV(topLeft(args[1]));
     if (isError(maturityRV)) {
         return maturityRV;
     }
-    const rateRV = toNumberRV(args[2]);
+    const rateRV = toNumberRV(topLeft(args[2]));
     if (isError(rateRV)) {
         return rateRV;
     }
-    const yieldRV = toNumberRV(args[3]);
+    const yieldRV = toNumberRV(topLeft(args[3]));
     if (isError(yieldRV)) {
         return yieldRV;
     }
-    const redemptionRV = toNumberRV(args[4]);
+    const redemptionRV = toNumberRV(topLeft(args[4]));
     if (isError(redemptionRV)) {
         return redemptionRV;
     }
-    const frequencyRV = toNumberRV(args[5]);
+    const frequencyRV = toNumberRV(topLeft(args[5]));
     if (isError(frequencyRV)) {
         return frequencyRV;
     }
-    const basisRV = args.length > 6 ? toNumberRV(args[6]) : rvNumber(0);
+    const basisRV = args.length > 6 ? toNumberRV(topLeft(args[6])) : rvNumber(0);
     if (isError(basisRV)) {
         return basisRV;
     }
@@ -1700,31 +1726,31 @@ export const fnPRICE = args => {
  * realistic bond scenarios) followed by a light Newton polish.
  */
 export const fnYIELD = args => {
-    const settlementRV = toNumberRV(args[0]);
+    const settlementRV = toNumberRV(topLeft(args[0]));
     if (isError(settlementRV)) {
         return settlementRV;
     }
-    const maturityRV = toNumberRV(args[1]);
+    const maturityRV = toNumberRV(topLeft(args[1]));
     if (isError(maturityRV)) {
         return maturityRV;
     }
-    const rateRV = toNumberRV(args[2]);
+    const rateRV = toNumberRV(topLeft(args[2]));
     if (isError(rateRV)) {
         return rateRV;
     }
-    const prRV = toNumberRV(args[3]);
+    const prRV = toNumberRV(topLeft(args[3]));
     if (isError(prRV)) {
         return prRV;
     }
-    const redemptionRV = toNumberRV(args[4]);
+    const redemptionRV = toNumberRV(topLeft(args[4]));
     if (isError(redemptionRV)) {
         return redemptionRV;
     }
-    const frequencyRV = toNumberRV(args[5]);
+    const frequencyRV = toNumberRV(topLeft(args[5]));
     if (isError(frequencyRV)) {
         return frequencyRV;
     }
-    const basisRV = args.length > 6 ? toNumberRV(args[6]) : rvNumber(0);
+    const basisRV = args.length > 6 ? toNumberRV(topLeft(args[6])) : rvNumber(0);
     if (isError(basisRV)) {
         return basisRV;
     }
@@ -1787,27 +1813,27 @@ export const fnYIELD = args => {
  * weighted by present value. Expressed in years.
  */
 export const fnDURATION = args => {
-    const settlementRV = toNumberRV(args[0]);
+    const settlementRV = toNumberRV(topLeft(args[0]));
     if (isError(settlementRV)) {
         return settlementRV;
     }
-    const maturityRV = toNumberRV(args[1]);
+    const maturityRV = toNumberRV(topLeft(args[1]));
     if (isError(maturityRV)) {
         return maturityRV;
     }
-    const couponRV = toNumberRV(args[2]);
+    const couponRV = toNumberRV(topLeft(args[2]));
     if (isError(couponRV)) {
         return couponRV;
     }
-    const yieldRV = toNumberRV(args[3]);
+    const yieldRV = toNumberRV(topLeft(args[3]));
     if (isError(yieldRV)) {
         return yieldRV;
     }
-    const frequencyRV = toNumberRV(args[4]);
+    const frequencyRV = toNumberRV(topLeft(args[4]));
     if (isError(frequencyRV)) {
         return frequencyRV;
     }
-    const basisRV = args.length > 5 ? toNumberRV(args[5]) : rvNumber(0);
+    const basisRV = args.length > 5 ? toNumberRV(topLeft(args[5])) : rvNumber(0);
     if (isError(basisRV)) {
         return basisRV;
     }
@@ -1854,11 +1880,11 @@ export const fnMDURATION = args => {
     if (dur.kind !== RVKind.Number) {
         return dur;
     }
-    const yieldRV = toNumberRV(args[3]);
+    const yieldRV = toNumberRV(topLeft(args[3]));
     if (isError(yieldRV)) {
         return yieldRV;
     }
-    const frequencyRV = toNumberRV(args[4]);
+    const frequencyRV = toNumberRV(topLeft(args[4]));
     if (isError(frequencyRV)) {
         return frequencyRV;
     }
@@ -1872,28 +1898,28 @@ export const fnMDURATION = args => {
  * accrued interest from issue to settlement as par * rate * dcf(issue, settlement, basis).
  */
 export const fnACCRINT = args => {
-    const issueRV = toNumberRV(args[0]);
+    const issueRV = toNumberRV(topLeft(args[0]));
     if (isError(issueRV)) {
         return issueRV;
     }
     // first_interest (args[1]) is unused in the simplified implementation.
-    const settlementRV = toNumberRV(args[2]);
+    const settlementRV = toNumberRV(topLeft(args[2]));
     if (isError(settlementRV)) {
         return settlementRV;
     }
-    const rateRV = toNumberRV(args[3]);
+    const rateRV = toNumberRV(topLeft(args[3]));
     if (isError(rateRV)) {
         return rateRV;
     }
-    const parRV = toNumberRV(args[4]);
+    const parRV = toNumberRV(topLeft(args[4]));
     if (isError(parRV)) {
         return parRV;
     }
-    const frequencyRV = toNumberRV(args[5]);
+    const frequencyRV = toNumberRV(topLeft(args[5]));
     if (isError(frequencyRV)) {
         return frequencyRV;
     }
-    const basisRV = args.length > 6 ? toNumberRV(args[6]) : rvNumber(0);
+    const basisRV = args.length > 6 ? toNumberRV(topLeft(args[6])) : rvNumber(0);
     if (isError(basisRV)) {
         return basisRV;
     }
@@ -1919,23 +1945,23 @@ export const fnACCRINT = args => {
  *   result = par × rate × dayCountFraction(issue, settlement, basis)
  */
 export const fnACCRINTM = args => {
-    const issueRV = toNumberRV(args[0]);
+    const issueRV = toNumberRV(topLeft(args[0]));
     if (isError(issueRV)) {
         return issueRV;
     }
-    const settlementRV = toNumberRV(args[1]);
+    const settlementRV = toNumberRV(topLeft(args[1]));
     if (isError(settlementRV)) {
         return settlementRV;
     }
-    const rateRV = toNumberRV(args[2]);
+    const rateRV = toNumberRV(topLeft(args[2]));
     if (isError(rateRV)) {
         return rateRV;
     }
-    const parRV = toNumberRV(args[3]);
+    const parRV = toNumberRV(topLeft(args[3]));
     if (isError(parRV)) {
         return parRV;
     }
-    const basisRV = args.length > 4 ? toNumberRV(args[4]) : rvNumber(0);
+    const basisRV = args.length > 4 ? toNumberRV(topLeft(args[4])) : rvNumber(0);
     if (isError(basisRV)) {
         return basisRV;
     }
@@ -1957,15 +1983,15 @@ export const fnACCRINTM = args => {
  * where DSM is days from settlement to maturity.
  */
 export const fnTBILLPRICE = args => {
-    const settlementRV = toNumberRV(args[0]);
+    const settlementRV = toNumberRV(topLeft(args[0]));
     if (isError(settlementRV)) {
         return settlementRV;
     }
-    const maturityRV = toNumberRV(args[1]);
+    const maturityRV = toNumberRV(topLeft(args[1]));
     if (isError(maturityRV)) {
         return maturityRV;
     }
-    const discountRV = toNumberRV(args[2]);
+    const discountRV = toNumberRV(topLeft(args[2]));
     if (isError(discountRV)) {
         return discountRV;
     }
@@ -1991,15 +2017,15 @@ export const fnTBILLPRICE = args => {
  *   yield = (100 - pr) / pr × (360 / DSM)
  */
 export const fnTBILLYIELD = args => {
-    const settlementRV = toNumberRV(args[0]);
+    const settlementRV = toNumberRV(topLeft(args[0]));
     if (isError(settlementRV)) {
         return settlementRV;
     }
-    const maturityRV = toNumberRV(args[1]);
+    const maturityRV = toNumberRV(topLeft(args[1]));
     if (isError(maturityRV)) {
         return maturityRV;
     }
-    const prRV = toNumberRV(args[2]);
+    const prRV = toNumberRV(topLeft(args[2]));
     if (isError(prRV)) {
         return prRV;
     }
@@ -2020,15 +2046,15 @@ export const fnTBILLYIELD = args => {
  *   TBILLEQ = (365 × discount) / (360 - discount × DSM)
  */
 export const fnTBILLEQ = args => {
-    const settlementRV = toNumberRV(args[0]);
+    const settlementRV = toNumberRV(topLeft(args[0]));
     if (isError(settlementRV)) {
         return settlementRV;
     }
-    const maturityRV = toNumberRV(args[1]);
+    const maturityRV = toNumberRV(topLeft(args[1]));
     if (isError(maturityRV)) {
         return maturityRV;
     }
-    const discountRV = toNumberRV(args[2]);
+    const discountRV = toNumberRV(topLeft(args[2]));
     if (isError(discountRV)) {
         return discountRV;
     }
@@ -2058,27 +2084,27 @@ export const fnTBILLEQ = args => {
  *   price = (100 + DIM × rate × 100) / (1 + DSM × yld) - A × rate × 100
  */
 export const fnPRICEMAT = args => {
-    const settlementRV = toNumberRV(args[0]);
+    const settlementRV = toNumberRV(topLeft(args[0]));
     if (isError(settlementRV)) {
         return settlementRV;
     }
-    const maturityRV = toNumberRV(args[1]);
+    const maturityRV = toNumberRV(topLeft(args[1]));
     if (isError(maturityRV)) {
         return maturityRV;
     }
-    const issueRV = toNumberRV(args[2]);
+    const issueRV = toNumberRV(topLeft(args[2]));
     if (isError(issueRV)) {
         return issueRV;
     }
-    const rateRV = toNumberRV(args[3]);
+    const rateRV = toNumberRV(topLeft(args[3]));
     if (isError(rateRV)) {
         return rateRV;
     }
-    const yldRV = toNumberRV(args[4]);
+    const yldRV = toNumberRV(topLeft(args[4]));
     if (isError(yldRV)) {
         return yldRV;
     }
-    const basisRV = args.length > 5 ? toNumberRV(args[5]) : rvNumber(0);
+    const basisRV = args.length > 5 ? toNumberRV(topLeft(args[5])) : rvNumber(0);
     if (isError(basisRV)) {
         return basisRV;
     }
@@ -2114,27 +2140,27 @@ export const fnPRICEMAT = args => {
  *   yield = ((1 + DIM × rate) / (pr/100 + A × rate) - 1) / DSM
  */
 export const fnYIELDMAT = args => {
-    const settlementRV = toNumberRV(args[0]);
+    const settlementRV = toNumberRV(topLeft(args[0]));
     if (isError(settlementRV)) {
         return settlementRV;
     }
-    const maturityRV = toNumberRV(args[1]);
+    const maturityRV = toNumberRV(topLeft(args[1]));
     if (isError(maturityRV)) {
         return maturityRV;
     }
-    const issueRV = toNumberRV(args[2]);
+    const issueRV = toNumberRV(topLeft(args[2]));
     if (isError(issueRV)) {
         return issueRV;
     }
-    const rateRV = toNumberRV(args[3]);
+    const rateRV = toNumberRV(topLeft(args[3]));
     if (isError(rateRV)) {
         return rateRV;
     }
-    const prRV = toNumberRV(args[4]);
+    const prRV = toNumberRV(topLeft(args[4]));
     if (isError(prRV)) {
         return prRV;
     }
-    const basisRV = args.length > 5 ? toNumberRV(args[5]) : rvNumber(0);
+    const basisRV = args.length > 5 ? toNumberRV(topLeft(args[5])) : rvNumber(0);
     if (isError(basisRV)) {
         return basisRV;
     }
@@ -2174,19 +2200,19 @@ export const fnYIELDMAT = args => {
  * settlement/maturity/frequency/basis values, or an error.
  */
 function parseCoupArgs(args) {
-    const settlementRV = toNumberRV(args[0]);
+    const settlementRV = toNumberRV(topLeft(args[0]));
     if (isError(settlementRV)) {
         return settlementRV;
     }
-    const maturityRV = toNumberRV(args[1]);
+    const maturityRV = toNumberRV(topLeft(args[1]));
     if (isError(maturityRV)) {
         return maturityRV;
     }
-    const frequencyRV = toNumberRV(args[2]);
+    const frequencyRV = toNumberRV(topLeft(args[2]));
     if (isError(frequencyRV)) {
         return frequencyRV;
     }
-    const basisRV = args.length > 3 ? toNumberRV(args[3]) : rvNumber(0);
+    const basisRV = args.length > 3 ? toNumberRV(topLeft(args[3])) : rvNumber(0);
     if (isError(basisRV)) {
         return basisRV;
     }