@devmm/puredocs-excel-formula 1.1.0 → 1.1.2

package/dist/index.d.cts

@@ -275,7 +275,7 @@ declare namespace FormulaHelper {
      * Everything else — comparisons, wildcards — only gets the compiled `test`.
      */
     interface CompiledCriteria {
-        readonly kind: 'equalsNumber' | 'equalsText' | 'compareNumber' | 'other';
+        readonly kind: 'equalsNumber' | 'equalsText' | 'compareNumber' | 'blankness' | 'other';
         /** For `equalsNumber` and `compareNumber`: the number compared against. */
         readonly number?: number;
         /** For `equalsText`: the criterion, upper-cased (matching is case-insensitive). */
@@ -442,6 +442,8 @@ declare class FormulaContext {
      * cell. Requires the worksheet to expose getSpillRange; otherwise #REF!.
      */
     resolveSpillRange(anchorRef: string): FormulaValue;
+    /** {@link resolveSpillRange} for an anchor on another sheet ('S'!A1#). */
+    resolveSheetSpillRange(sheetName: string, anchorRef: string): FormulaValue;
     getRangeBounds(startRef: string, endRef: string): {
         startRow: number;
         startCol: number;

package/dist/index.d.ts

@@ -275,7 +275,7 @@ declare namespace FormulaHelper {
      * Everything else — comparisons, wildcards — only gets the compiled `test`.
      */
     interface CompiledCriteria {
-        readonly kind: 'equalsNumber' | 'equalsText' | 'compareNumber' | 'other';
+        readonly kind: 'equalsNumber' | 'equalsText' | 'compareNumber' | 'blankness' | 'other';
         /** For `equalsNumber` and `compareNumber`: the number compared against. */
         readonly number?: number;
         /** For `equalsText`: the criterion, upper-cased (matching is case-insensitive). */
@@ -442,6 +442,8 @@ declare class FormulaContext {
      * cell. Requires the worksheet to expose getSpillRange; otherwise #REF!.
      */
     resolveSpillRange(anchorRef: string): FormulaValue;
+    /** {@link resolveSpillRange} for an anchor on another sheet ('S'!A1#). */
+    resolveSheetSpillRange(sheetName: string, anchorRef: string): FormulaValue;
     getRangeBounds(startRef: string, endRef: string): {
         startRow: number;
         startCol: number;

package/dist/index.js

@@ -280,7 +280,7 @@ var _FormulaValue = class _FormulaValue {
     if (value2 === null || value2 === void 0) return _FormulaValue.blank;
     if (typeof value2 === "number") return isNaN(value2) ? _FormulaValue.errorValue : _FormulaValue.number(value2);
     if (typeof value2 === "boolean") return _FormulaValue.boolean(value2);
-    if (typeof value2 === "string") return value2 === "" ? _FormulaValue.blank : _FormulaValue.text(value2);
+    if (typeof value2 === "string") return _FormulaValue.text(value2);
     if (value2 instanceof Date) {
       return _FormulaValue.number(toOADate(value2));
     }
@@ -1818,11 +1818,14 @@ function count(a, c) {
 function countA(a, c) {
   return FormulaValue.number(FormulaHelper.flattenArgs(a, c).filter((v) => !v.isBlank).length);
 }
+function isCountBlank(v) {
+  return v.isBlank || v.isText && v.textValue === "";
+}
 function countBlank(a, c) {
   const v = a[0].evaluate(c);
-  if (!v.isArray) return FormulaValue.number(v.isBlank ? 1 : 0);
+  if (!v.isArray) return FormulaValue.number(isCountBlank(v) ? 1 : 0);
   let n = 0;
-  for (const item of v.arrayVal.values()) if (item.isBlank) n++;
+  for (const item of v.arrayVal.values()) if (isCountBlank(item)) n++;
   return FormulaValue.number(n);
 }
 function countIf(a, c) {
@@ -1830,11 +1833,12 @@ function countIf(a, c) {
   if (range.isError) return range;
   const crit = a[1].evaluate(c);
   if (crit.isError) return crit;
-  const criteria = crit.asText();
-  if (!range.isArray) return FormulaValue.number(FormulaHelper.matchesCriteria(range, criteria) ? 1 : 0);
+  const compiled = FormulaHelper.compileCriteria(crit.asText());
+  if (!range.isArray) return FormulaValue.number(compiled.test(range) ? 1 : 0);
+  const countBlanks = compiled.kind === "blankness";
   let n = 0;
   for (const item of range.arrayVal.values()) {
-    if (!item.isBlank && FormulaHelper.matchesCriteria(item, criteria)) n++;
+    if ((countBlanks || !item.isBlank) && compiled.test(item)) n++;
   }
   return FormulaValue.number(n);
 }
@@ -2811,6 +2815,8 @@ function registerLookup(r) {
   r.register("COLUMNS", columns, 1, 1);
   r.register("OFFSET", offset, 3, 5, true);
   r.register("INDIRECT", indirect, 1, 2, true);
+  r.register("ANCHORARRAY", anchorArray, 1, 1);
+  r.register("SINGLE", single, 1, 1);
 }
 function num2(a, c, i) {
   const r = FormulaHelper.evalDouble(a[i], c);
@@ -3258,6 +3264,15 @@ function offset(a, c) {
     cellRefFromRowCol(newRow + height - 1, newCol + width - 1)
   );
 }
+function anchorArray(a, c) {
+  const arg2 = a[0];
+  if (arg2 instanceof CellReferenceNode) return c.resolveSpillRange(arg2.reference);
+  if (arg2 instanceof SheetCellReferenceNode) return c.resolveSheetSpillRange(arg2.sheetName, arg2.cellReference);
+  return FormulaValue.errorRef;
+}
+function single(a, c) {
+  return new ImplicitIntersectionNode(a[0]).evaluate(c);
+}
 
 // src/functions/statistical-functions.ts
 function registerStatistical(r) {
@@ -4726,6 +4741,8 @@ var FormulaHelper;
       const rhsVal = parseFloat(rhs);
       const rhsNum = isNaN(rhsVal) ? null : rhsVal;
       const rhsValue = rhsNum !== null ? FormulaValue.number(rhsNum) : FormulaValue.text(rhs);
+      if (rhs === "" && op === "=") return { kind: "blankness", test: (v) => v.isBlank };
+      if (rhs === "" && op === "<>") return { kind: "other", test: (v) => !v.isBlank };
       if (op === "=") {
         return rhsNum !== null ? numberEquality(rhsNum) : textEquality(rhs);
       }
@@ -4741,6 +4758,9 @@ var FormulaHelper;
       const pattern = wildcardToRegex(trimmed);
       return { kind: "other", test: (v) => pattern.test(v.asText()) };
     }
+    if (trimmed === "") {
+      return { kind: "blankness", test: (v) => v.isBlank || v.isText && v.textValue === "" };
+    }
     const num5 = parseFloat(trimmed);
     return isNaN(num5) ? textEquality(trimmed) : numberEquality(num5);
   }
@@ -4919,6 +4939,15 @@ var _FormulaContext = class _FormulaContext {
     if (colon < 0) return this.getCellValue(spillRef);
     return this.getRangeValues(spillRef.slice(0, colon), spillRef.slice(colon + 1));
   }
+  /** {@link resolveSpillRange} for an anchor on another sheet ('S'!A1#). */
+  resolveSheetSpillRange(sheetName, anchorRef) {
+    if (!this.workbook) return FormulaValue.errorRef;
+    try {
+      return __privateMethod(this, _FormulaContext_instances, forSheet_fn).call(this, sheetName).resolveSpillRange(anchorRef);
+    } catch {
+      return FormulaValue.errorRef;
+    }
+  }
   getRangeBounds(startRef, endRef) {
     const s = parseCellRef(startRef);
     const e = parseCellRef(endRef);
@@ -5537,6 +5566,7 @@ function createWorkbookRecalcModel(workbook) {
   };
 }
 var MAX_ADOPTED_SPILL_CELLS = 262144;
+var resultOf = (fv2) => fv2.isBlank ? 0 : fv2.toObject();
 var normSheet = (s) => s.toUpperCase();
 var normRef = (r) => r.replace(/\$/g, "").toUpperCase();
 var keyOf = (sheet, ref) => `${normSheet(sheet)}!${normRef(ref)}`;
@@ -6197,7 +6227,7 @@ writeResult_fn = function(e) {
   if (!fv2.isArray) {
     __privateMethod(this, _RecalcEngine_instances, clearSpill_fn).call(this, anchorKey, changed);
     __privateGet(this, _model).setCellArrayRef?.(e.sheetName, e.ref, null);
-    const value2 = fv2.toObject();
+    const value2 = resultOf(fv2);
     __privateMethod(this, _RecalcEngine_instances, writeCell_fn).call(this, e.sheetName, e.ref, value2, e.row, e.col);
     changed.push({ sheet: e.sheet, row: e.row, col: e.col });
     return { result: { sheet: e.sheetName, ref: e.ref, value: value2 }, changed };
@@ -6228,7 +6258,7 @@ writeResult_fn = function(e) {
     for (let dc = 0; dc < cols; dc++) {
       const r = e.row + dr, c = e.col + dc;
       const ref = cellRefFromRowCol(r, c);
-      __privateMethod(this, _RecalcEngine_instances, writeCell_fn).call(this, e.sheetName, ref, arr.get(dr, dc).toObject(), r, c);
+      __privateMethod(this, _RecalcEngine_instances, writeCell_fn).call(this, e.sheetName, ref, resultOf(arr.get(dr, dc)), r, c);
       changed.push({ sheet: e.sheet, row: r, col: c });
       if (dr !== 0 || dc !== 0) {
         const cellKey2 = keyOf(e.sheet, ref);
@@ -6248,7 +6278,7 @@ writeResult_fn = function(e) {
   const spillRef = `${e.ref}:${cellRefFromRowCol(e.row + rows2 - 1, e.col + cols - 1)}`;
   __privateGet(this, _model).setCellArrayRef?.(e.sheetName, e.ref, spillRef);
   return {
-    result: { sheet: e.sheetName, ref: e.ref, value: arr.get(0, 0).toObject(), spill: { rows: rows2, cols } },
+    result: { sheet: e.sheetName, ref: e.ref, value: resultOf(arr.get(0, 0)), spill: { rows: rows2, cols } },
     changed
   };
 };