@cj-tech-master/excelts 9.3.1 → 9.4.0

package/dist/cjs/modules/formula/functions/text.js

@@ -55,8 +55,8 @@ const fnTEXTJOIN = args => {
     if (e0) {
         return e0;
     }
-    const delimiter = (0, values_1.toStringRV)(args[0]);
-    const ignoreEmptyRV = (0, values_1.toBooleanRV)(args[1]);
+    const delimiter = (0, values_1.toStringRV)((0, values_1.topLeft)(args[0]));
+    const ignoreEmptyRV = (0, values_1.toBooleanRV)((0, values_1.topLeft)(args[1]));
     if ((0, values_1.isError)(ignoreEmptyRV)) {
         return ignoreEmptyRV;
     }
@@ -102,7 +102,8 @@ const fnLEFT = args => {
     if (err) {
         return err;
     }
-    const text = (0, values_1.toStringRV)(args[0]);
+    // Implicit intersection on the text arg (see MID for rationale).
+    const text = (0, values_1.toStringRV)((0, values_1.topLeft)(args[0]));
     let n;
     if (args.length > 1) {
         // Use `argToNumber` so array arguments get implicit-intersection to
@@ -131,7 +132,7 @@ const fnRIGHT = args => {
     if (err) {
         return err;
     }
-    const text = (0, values_1.toStringRV)(args[0]);
+    const text = (0, values_1.toStringRV)((0, values_1.topLeft)(args[0]));
     let n;
     if (args.length > 1) {
         // Implicit intersection via `argToNumber` — see LEFT for rationale.
@@ -159,9 +160,11 @@ const fnMID = args => {
     if (err) {
         return err;
     }
-    const text = (0, values_1.toStringRV)(args[0]);
-    // Implicit intersection on both numeric arguments so array inputs
-    // collapse to their top-left cells before coercion.
+    // Implicit intersection on the text arg — without topLeft, passing
+    // an array would route through `toStringRV`'s default branch and
+    // silently return the empty string, making `MID(A1:A2, 1, 3)` look
+    // like an empty cell instead of a 3-char prefix of the first cell.
+    const text = (0, values_1.toStringRV)((0, values_1.topLeft)(args[0]));
     const startNumRV = (0, _shared_1.argToNumber)(args[1]);
     if ((0, values_1.isError)(startNumRV)) {
         return startNumRV;
@@ -258,7 +261,7 @@ const fnSUBSTITUTE = args => {
         return (0, values_1.rvString)(text);
     }
     if (args.length > 3) {
-        const instanceNumRV = (0, values_1.toNumberRV)(args[3]);
+        const instanceNumRV = (0, values_1.toNumberRV)((0, values_1.topLeft)(args[3]));
         if ((0, values_1.isError)(instanceNumRV)) {
             return instanceNumRV;
         }
@@ -283,7 +286,7 @@ const fnREPLACE = args => {
     if (err) {
         return err;
     }
-    const text = (0, values_1.toStringRV)(args[0]);
+    const text = (0, values_1.toStringRV)((0, values_1.topLeft)(args[0]));
     // Implicit intersection on the numeric arguments — see LEFT.
     const startNumRV = (0, _shared_1.argToNumber)(args[1]);
     if ((0, values_1.isError)(startNumRV)) {
@@ -305,7 +308,7 @@ const fnREPLACE = args => {
     if (e3) {
         return e3;
     }
-    const newText = (0, values_1.toStringRV)(args[3]);
+    const newText = (0, values_1.toStringRV)((0, values_1.topLeft)(args[3]));
     return (0, values_1.rvString)(text.slice(0, startNum - 1) + newText + text.slice(startNum - 1 + numChars));
 };
 exports.fnREPLACE = fnREPLACE;
@@ -321,8 +324,9 @@ const fnFIND = args => {
     if (err1) {
         return err1;
     }
-    const findText = (0, values_1.toStringRV)(args[0]);
-    const withinText = (0, values_1.toStringRV)(args[1]);
+    // Implicit intersection on text args so arrays collapse to top-left.
+    const findText = (0, values_1.toStringRV)((0, values_1.topLeft)(args[0]));
+    const withinText = (0, values_1.toStringRV)((0, values_1.topLeft)(args[1]));
     let startNum;
     if (args.length > 2) {
         // Implicit intersection so an array supplied as start_num collapses
@@ -353,8 +357,9 @@ const fnSEARCH = args => {
     if (err1) {
         return err1;
     }
-    let findText = (0, values_1.toStringRV)(args[0]);
-    const withinText = (0, values_1.toStringRV)(args[1]);
+    // Implicit intersection on text args (see FIND for rationale).
+    let findText = (0, values_1.toStringRV)((0, values_1.topLeft)(args[0]));
+    const withinText = (0, values_1.toStringRV)((0, values_1.topLeft)(args[1]));
     let startNum;
     if (args.length > 2) {
         const startNumRV = (0, _shared_1.argToNumber)(args[2]);
@@ -395,7 +400,7 @@ const fnREPT = args => {
         return err;
     }
     const text = (0, values_1.toStringRV)((0, values_1.topLeft)(args[0]));
-    const timesRV = (0, values_1.toNumberRV)(args[1]);
+    const timesRV = (0, values_1.toNumberRV)((0, values_1.topLeft)(args[1]));
     if ((0, values_1.isError)(timesRV)) {
         return timesRV;
     }
@@ -425,7 +430,7 @@ const fnTEXT = args => {
     if (e1) {
         return e1;
     }
-    const fmt = (0, values_1.toStringRV)(args[1]);
+    const fmt = (0, values_1.toStringRV)((0, values_1.topLeft)(args[1]));
     // "@" format = return text as-is
     if (fmt === "@") {
         return (0, values_1.rvString)((0, values_1.toStringRV)(rawVal));
@@ -603,10 +608,52 @@ function formatNumber(val, fmt) {
         tokens.push({ kind: "literal", text: ch });
     }
     // Count integer/fraction digit slots and decide whether to group.
+    // Trailing commas after the last integer digit token — before the
+    // decimal point or end of pattern — act as a "scale by 1/1000^k"
+    // multiplier (Excel's "thousands scaling"), not thousand separators.
+    // Example: `#,##0,` → 1,234,567 → "1,235" (divide by 1000).
+    // Example: `#,##0,,` → 1,234,567,890 → "1,234" (divide by 1,000,000).
     let sawDot = false;
     const intDigitSlots = [];
     const fracDigitSlots = [];
     let hasGrouping = false;
+    // Scan for trailing commas that sit strictly after the last integer
+    // digit slot but before any dot or fractional slot. Each such comma
+    // divides the value by 1000. Scan from end-of-pattern backward to
+    // locate them.
+    let scalingFactor = 1;
+    {
+        // Find the last integer digit-slot index.
+        let lastIntDigitIdx = -1;
+        let dotIdx = -1;
+        for (let i = 0; i < tokens.length; i++) {
+            const t = tokens[i];
+            if (t.kind === "dot") {
+                dotIdx = i;
+                break;
+            }
+            if (t.kind === "digit") {
+                lastIntDigitIdx = i;
+            }
+        }
+        // Trailing commas live after `lastIntDigitIdx` and strictly before
+        // `dotIdx` (if present). They must be adjacent — only run-of-commas
+        // directly abutting the last integer digit count as scaling.
+        if (lastIntDigitIdx !== -1) {
+            const stopBefore = dotIdx === -1 ? tokens.length : dotIdx;
+            let k = lastIntDigitIdx + 1;
+            while (k < stopBefore && tokens[k].kind === "comma") {
+                scalingFactor *= 1000;
+                // Remove this comma so later logic doesn't treat it as a
+                // thousand-separator or literal artefact. We mutate the token
+                // to a no-op literal with empty text.
+                tokens[k] = { kind: "literal", text: "" };
+                k++;
+            }
+        }
+    }
+    // Apply the scaling before any other formatting work.
+    const scaledVal = val / scalingFactor;
     for (const t of tokens) {
         if (t.kind === "dot") {
             sawDot = true;
@@ -630,7 +677,7 @@ function formatNumber(val, fmt) {
         return fmt; // Nothing to format; return the (raw) pattern.
     }
     // Round to the requested fractional precision.
-    const rounded = roundHalfAwayFromZeroFmt(val, fracDigitSlots.length);
+    const rounded = roundHalfAwayFromZeroFmt(scaledVal, fracDigitSlots.length);
     const sign = rounded < 0 ? "-" : "";
     const absStr = Math.abs(rounded).toFixed(fracDigitSlots.length);
     const [intPartRaw, fracPart = ""] = absStr.split(".");
@@ -710,11 +757,19 @@ function formatNumber(val, fmt) {
             emittedOverflow = true;
         }
         const slotIdx = intCursor;
-        // Integer slots map right-to-left onto `groupedInt`'s right-to-left
-        // ordering. We'll compute the source character for this slot from
-        // the right edge.
-        const srcIdx = overflowDigits + slotIdx;
-        if (srcIdx < groupedInt.length) {
+        // Right-align the integer into the digit slots: leading `#` slots
+        // emit nothing when the value is shorter than the pattern, and
+        // leading `0` slots pad with a zero. Previously the logic treated
+        // every slot as if the integer started at slot 0 (left-align),
+        // which made `TEXT(0, "#,##0")` produce "00" instead of "0".
+        //
+        // The number of "padding" slots that must appear before the first
+        // real digit equals `totalIntSlots − groupedInt.length` when that
+        // value is positive (overflow path zeroes it out since we already
+        // prepended the overflow digits before the first slot).
+        const paddingSlots = overflowDigits > 0 ? 0 : Math.max(0, totalIntSlots - groupedInt.length);
+        const srcIdx = overflowDigits + slotIdx - paddingSlots;
+        if (srcIdx >= 0 && srcIdx < groupedInt.length) {
             out += groupedInt[srcIdx];
         }
         else if (t.char === "0") {
@@ -1038,7 +1093,7 @@ const fnEXACT = args => {
     if (err1) {
         return err1;
     }
-    return (0, values_1.rvBoolean)((0, values_1.toStringRV)(args[0]) === (0, values_1.toStringRV)(args[1]));
+    return (0, values_1.rvBoolean)((0, values_1.toStringRV)((0, values_1.topLeft)(args[0])) === (0, values_1.toStringRV)((0, values_1.topLeft)(args[1])));
 };
 exports.fnEXACT = fnEXACT;
 // ============================================================================
@@ -1104,7 +1159,7 @@ const fnUNICHAR = args => {
     if (err) {
         return err;
     }
-    const nRV = (0, values_1.toNumberRV)(args[0]);
+    const nRV = (0, values_1.toNumberRV)((0, values_1.topLeft)(args[0]));
     if ((0, values_1.isError)(nRV)) {
         return nRV;
     }
@@ -1125,7 +1180,7 @@ const fnUNICODE = args => {
     if (err) {
         return err;
     }
-    const text = (0, values_1.toStringRV)(args[0]);
+    const text = (0, values_1.toStringRV)((0, values_1.topLeft)(args[0]));
     if (text.length === 0) {
         return values_1.ERRORS.VALUE;
     }
@@ -1138,18 +1193,18 @@ const fnBAHTTEXT = args => {
     if (err) {
         return err;
     }
-    return (0, values_1.rvString)((0, values_1.toStringRV)(args[0]));
+    return (0, values_1.rvString)((0, values_1.toStringRV)((0, values_1.topLeft)(args[0])));
 };
 exports.fnBAHTTEXT = fnBAHTTEXT;
 const fnDOLLAR = args => {
-    const numRV = (0, values_1.toNumberRV)(args[0]);
+    const numRV = (0, values_1.toNumberRV)((0, values_1.topLeft)(args[0]));
     if ((0, values_1.isError)(numRV)) {
         return numRV;
     }
     const num = numRV.value;
     let decimals;
     if (args.length > 1) {
-        const decRV = (0, values_1.toNumberRV)(args[1]);
+        const decRV = (0, values_1.toNumberRV)((0, values_1.topLeft)(args[1]));
         if ((0, values_1.isError)(decRV)) {
             return decRV;
         }
@@ -1175,14 +1230,14 @@ const fnDOLLAR = args => {
 };
 exports.fnDOLLAR = fnDOLLAR;
 const fnFIXED = args => {
-    const numRV = (0, values_1.toNumberRV)(args[0]);
+    const numRV = (0, values_1.toNumberRV)((0, values_1.topLeft)(args[0]));
     if ((0, values_1.isError)(numRV)) {
         return numRV;
     }
     const num = numRV.value;
     let decimals;
     if (args.length > 1) {
-        const decRV = (0, values_1.toNumberRV)(args[1]);
+        const decRV = (0, values_1.toNumberRV)((0, values_1.topLeft)(args[1]));
         if ((0, values_1.isError)(decRV)) {
             return decRV;
         }
@@ -1193,7 +1248,7 @@ const fnFIXED = args => {
     }
     let noCommas;
     if (args.length > 2) {
-        const ncRV = (0, values_1.toBooleanRV)(args[2]);
+        const ncRV = (0, values_1.toBooleanRV)((0, values_1.topLeft)(args[2]));
         if ((0, values_1.isError)(ncRV)) {
             return ncRV;
         }
@@ -1225,7 +1280,7 @@ const fnASC = args => {
     if (err) {
         return err;
     }
-    const text = (0, values_1.toStringRV)(args[0]);
+    const text = (0, values_1.toStringRV)((0, values_1.topLeft)(args[0]));
     return (0, values_1.rvString)(text.replace(/[\uFF01-\uFF5E]/g, ch => String.fromCharCode(ch.charCodeAt(0) - 0xfee0)));
 };
 exports.fnASC = fnASC;
@@ -1234,7 +1289,7 @@ const fnDBCS = args => {
     if (err) {
         return err;
     }
-    const text = (0, values_1.toStringRV)(args[0]);
+    const text = (0, values_1.toStringRV)((0, values_1.topLeft)(args[0]));
     return (0, values_1.rvString)(text.replace(/[!-~]/g, ch => String.fromCharCode(ch.charCodeAt(0) + 0xfee0)));
 };
 exports.fnDBCS = fnDBCS;
@@ -1255,14 +1310,15 @@ const fnNUMBERVALUE = args => {
     if (e0) {
         return e0;
     }
-    let text = (0, values_1.toStringRV)(args[0]);
+    // Implicit intersection on every text arg.
+    let text = (0, values_1.toStringRV)((0, values_1.topLeft)(args[0]));
     let decSep = ".";
     if (args.length > 1) {
         const e1 = (0, _shared_1.checkError)(args[1]);
         if (e1) {
             return e1;
         }
-        decSep = (0, values_1.toStringRV)(args[1]);
+        decSep = (0, values_1.toStringRV)((0, values_1.topLeft)(args[1]));
     }
     let grpSep = ",";
     if (args.length > 2) {
@@ -1270,15 +1326,19 @@ const fnNUMBERVALUE = args => {
         if (e2) {
             return e2;
         }
-        grpSep = (0, values_1.toStringRV)(args[2]);
+        grpSep = (0, values_1.toStringRV)((0, values_1.topLeft)(args[2]));
     }
     text = text.split(grpSep).join("");
     if (decSep !== ".") {
         text = text.replace(decSep, ".");
     }
-    // Handle percentage
-    const isPct = text.endsWith("%");
-    if (isPct) {
+    // Handle percentage. Excel divides by 100 for EACH trailing `%`, so
+    // `NUMBERVALUE("50%%")` = 50 / 10000 = 0.005. Previously we only
+    // recognised the first `%` and treated `50%%` as the literal string
+    // "50%" → NaN → #VALUE!.
+    let pctCount = 0;
+    while (text.endsWith("%")) {
+        pctCount++;
         text = text.slice(0, -1);
     }
     // `Number("")` is 0, not NaN — reject empty / whitespace-only inputs
@@ -1290,7 +1350,7 @@ const fnNUMBERVALUE = args => {
     if (isNaN(n)) {
         return values_1.ERRORS.VALUE;
     }
-    return (0, values_1.rvNumber)(isPct ? n / 100 : n);
+    return (0, values_1.rvNumber)(pctCount > 0 ? n / Math.pow(100, pctCount) : n);
 };
 exports.fnNUMBERVALUE = fnNUMBERVALUE;
 // ============================================================================
@@ -1309,7 +1369,7 @@ exports.fnNUMBERVALUE = fnNUMBERVALUE;
 function parseTextBeforeAfterTail(args) {
     let inst = 1;
     if (args.length > 2) {
-        const instRV = (0, values_1.toNumberRV)(args[2]);
+        const instRV = (0, values_1.toNumberRV)((0, values_1.topLeft)(args[2]));
         if ((0, values_1.isError)(instRV)) {
             return instRV;
         }
@@ -1317,7 +1377,7 @@ function parseTextBeforeAfterTail(args) {
     }
     let matchMode = 0;
     if (args.length > 3) {
-        const mmRV = (0, values_1.toNumberRV)(args[3]);
+        const mmRV = (0, values_1.toNumberRV)((0, values_1.topLeft)(args[3]));
         if ((0, values_1.isError)(mmRV)) {
             return mmRV;
         }
@@ -1329,7 +1389,7 @@ function parseTextBeforeAfterTail(args) {
     }
     let matchEnd = 0;
     if (args.length > 4) {
-        const meRV = (0, values_1.toNumberRV)(args[4]);
+        const meRV = (0, values_1.toNumberRV)((0, values_1.topLeft)(args[4]));
         if ((0, values_1.isError)(meRV)) {
             return meRV;
         }
@@ -1351,8 +1411,8 @@ const fnTEXTBEFORE = args => {
     if (e1) {
         return e1;
     }
-    const text = (0, values_1.toStringRV)(args[0]);
-    const delimiter = (0, values_1.toStringRV)(args[1]);
+    const text = (0, values_1.toStringRV)((0, values_1.topLeft)(args[0]));
+    const delimiter = (0, values_1.toStringRV)((0, values_1.topLeft)(args[1]));
     const tail = parseTextBeforeAfterTail(args);
     if ("kind" in tail && tail.kind === 4 /* RVKind.Error */) {
         return tail;
@@ -1406,8 +1466,8 @@ const fnTEXTAFTER = args => {
     if (e1) {
         return e1;
     }
-    const text = (0, values_1.toStringRV)(args[0]);
-    const delimiter = (0, values_1.toStringRV)(args[1]);
+    const text = (0, values_1.toStringRV)((0, values_1.topLeft)(args[0]));
+    const delimiter = (0, values_1.toStringRV)((0, values_1.topLeft)(args[1]));
     const tail = parseTextBeforeAfterTail(args);
     if ("kind" in tail && tail.kind === 4 /* RVKind.Error */) {
         return tail;
@@ -1453,21 +1513,21 @@ const fnTEXTSPLIT = args => {
     if (e0) {
         return e0;
     }
-    const text = (0, values_1.toStringRV)(args[0]);
+    const text = (0, values_1.toStringRV)((0, values_1.topLeft)(args[0]));
     let colDelimiter = "";
     if (args.length > 1) {
         const e1 = (0, _shared_1.checkError)(args[1]);
         if (e1) {
             return e1;
         }
-        colDelimiter = (0, values_1.toStringRV)(args[1]);
+        colDelimiter = (0, values_1.toStringRV)((0, values_1.topLeft)(args[1]));
     }
-    const rowDelimiter = args.length > 2 && args[2].kind !== 0 /* RVKind.Blank */ ? (0, values_1.toStringRV)(args[2]) : "";
+    const rowDelimiter = args.length > 2 && args[2].kind !== 0 /* RVKind.Blank */ ? (0, values_1.toStringRV)((0, values_1.topLeft)(args[2])) : "";
     // `ignore_empty` (4th arg, default FALSE) — when TRUE, suppress empty
     // fragments produced by consecutive delimiters.
     let ignoreEmpty = false;
     if (args.length > 3 && args[3].kind !== 0 /* RVKind.Blank */) {
-        const ieRV = (0, values_1.toBooleanRV)(args[3]);
+        const ieRV = (0, values_1.toBooleanRV)((0, values_1.topLeft)(args[3]));
         if ((0, values_1.isError)(ieRV)) {
             return ieRV;
         }
@@ -1479,7 +1539,7 @@ const fnTEXTSPLIT = args => {
     // consistent with Excel's specification for TEXTSPLIT.
     let matchMode = 0;
     if (args.length > 4 && args[4].kind !== 0 /* RVKind.Blank */) {
-        const mmRV = (0, values_1.toNumberRV)(args[4]);
+        const mmRV = (0, values_1.toNumberRV)((0, values_1.topLeft)(args[4]));
         if ((0, values_1.isError)(mmRV)) {
             return mmRV;
         }

package/dist/cjs/modules/formula/integration/calculate-formulas-impl.js

@@ -171,10 +171,29 @@ function calculateFormulasImpl(workbook) {
     let evalOrder = (0, dependency_analysis_1.topologicalSort)(graph);
     // ── Step 6: Evaluate ──
     const session = new evaluator_1.EvalSession();
+    // Convert user-registered functions (keyed opaquely on WorkbookLike)
+    // into the evaluator's typed `FunctionDescriptor` shape. We take a
+    // snapshot up front so later mutations to the workbook's map during
+    // evaluation can't observe a half-built state.
+    let userFunctions;
+    if (workbook.userFunctions && workbook.userFunctions.size > 0) {
+        const adapted = new Map();
+        for (const [name, desc] of workbook.userFunctions) {
+            const upperName = name.toUpperCase();
+            adapted.set(upperName, {
+                name: upperName,
+                minArity: desc.minArity,
+                maxArity: desc.maxArity,
+                invoke: desc.invoke
+            });
+        }
+        userFunctions = adapted;
+    }
     const ctx = {
         snapshot,
         compiledFormulas: compiledMap,
-        currentSheet: snapshot.worksheets[0]?.name ?? ""
+        currentSheet: snapshot.worksheets[0]?.name ?? "",
+        userFunctions
     };
     // Evaluate in topological order
     evaluateInOrder(evalOrder, compiledMap, results, ctx, session);

package/dist/cjs/modules/formula/materialize/build-writeback-plan.js

@@ -53,6 +53,13 @@ function buildWritebackPlan(snapshot, compiled, results, previousSpills, previou
     // Build ghost map from previous spills (validated against snapshot)
     const ghostMap = new Map();
     for (const [srcKey, region] of previousSpills) {
+        // Hoist the worksheet lookup once per region — the previous code did
+        // `snapshot.worksheetsById.get(…)` inside the inner cell loop,
+        // paying the Map lookup cost `region.rows × region.cols` times.
+        const ws = snapshot.worksheetsById.get(region.worksheetId);
+        if (!ws) {
+            continue;
+        }
         for (let r = 0; r < region.rows; r++) {
             for (let c = 0; c < region.cols; c++) {
                 if (r === 0 && c === 0) {
@@ -62,12 +69,9 @@ function buildWritebackPlan(snapshot, compiled, results, previousSpills, previou
                 const targetCol = region.sourceCol + c;
                 const targetKey = (0, workbook_snapshot_1.spillCellKeyFromId)(region.worksheetId, targetRow, targetCol);
                 // Validate ghost cell is still unmodified
-                const ws = snapshot.worksheetsById.get(region.worksheetId);
-                if (ws) {
-                    const cell = ws.cells.get((0, workbook_snapshot_1.snapshotCellKey)(targetRow, targetCol));
-                    if (isGhostUnmodified(cell, targetKey, previousGhosts)) {
-                        ghostMap.set(targetKey, srcKey);
-                    }
+                const cell = ws.cells.get((0, workbook_snapshot_1.snapshotCellKey)(targetRow, targetCol));
+                if (isGhostUnmodified(cell, targetKey, previousGhosts)) {
+                    ghostMap.set(targetKey, srcKey);
                 }
             }
         }