@devmm/puredocs-excel-formula 1.0.9 → 1.1.1

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). */

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). */

package/dist/index.js

@@ -29,6 +29,13 @@ var FormulaError = /* @__PURE__ */ ((FormulaError2) => {
   FormulaError2[FormulaError2["Spill"] = 9] = "Spill";
   return FormulaError2;
 })(FormulaError || {});
+var DECIMAL = /^[+-]?(?:\d+\.?\d*|\.\d+)(?:[eE][+-]?\d+)?$/;
+function numericText(text) {
+  const trimmed = text.trim();
+  if (!DECIMAL.test(trimmed)) return null;
+  const n = Number(trimmed);
+  return Number.isFinite(n) ? n : null;
+}
 var TailCall = class {
   constructor(lambda, args) {
     this.lambda = lambda;
@@ -273,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));
     }
@@ -1441,6 +1448,7 @@ var indexes = /* @__PURE__ */ new WeakMap();
 function build(arr) {
   const byText = /* @__PURE__ */ new Map();
   const byNumber = /* @__PURE__ */ new Map();
+  const byTextNumber = /* @__PURE__ */ new Map();
   const classes = /* @__PURE__ */ new Map();
   const addToClass = (kind, v, i2) => {
     const group = classes.get(kind);
@@ -1460,6 +1468,14 @@ function build(arr) {
       else byNumber.set(n, [i]);
     } else {
       addToClass(v.kind, v, i);
+      if (v.isText) {
+        const n = numericText(v.textValue);
+        if (n !== null) {
+          const atText2 = byTextNumber.get(n);
+          if (atText2) atText2.push(i);
+          else byTextNumber.set(n, [i]);
+        }
+      }
     }
     i++;
   }
@@ -1468,7 +1484,15 @@ function build(arr) {
   for (let k = 0; k < sortedNumbers.length; k++) {
     cumulative[k + 1] = cumulative[k] + byNumber.get(sortedNumbers[k]).length;
   }
-  return { byText, byNumber, sortedNumbers, cumulative, classes: [...classes.values()] };
+  return {
+    byText,
+    byNumber,
+    sortedNumbers,
+    cumulative,
+    byTextNumber,
+    sortedTextNumbers: Float64Array.from(byTextNumber.keys()).sort(),
+    classes: [...classes.values()]
+  };
 }
 function indexOf(arr) {
   let idx = indexes.get(arr);
@@ -1506,19 +1530,25 @@ function matchingPositions(criteriaRange, criteria, minSize) {
   if (criteria.kind === "equalsNumber") {
     const target = criteria.number;
     const idx = indexOf(arr);
-    const exact2 = idx.byNumber.get(target);
-    let near;
-    const { sortedNumbers } = idx;
-    for (let k = lowerBound(sortedNumbers, target - EPSILON); k < sortedNumbers.length; k++) {
-      const value2 = sortedNumbers[k];
-      if (value2 > target + EPSILON) break;
-      if (value2 === target) continue;
-      if (!criteria.test(FormulaValue.number(value2))) continue;
-      (near ?? (near = [])).push(...idx.byNumber.get(value2));
-    }
+    const groups = [];
+    const collect = (byValue, sorted) => {
+      const exact2 = byValue.get(target);
+      if (exact2) groups.push(exact2);
+      for (let k = lowerBound(sorted, target - EPSILON); k < sorted.length; k++) {
+        const value2 = sorted[k];
+        if (value2 > target + EPSILON) break;
+        if (value2 === target) continue;
+        if (!criteria.test(FormulaValue.number(value2))) continue;
+        groups.push(byValue.get(value2));
+      }
+    };
+    collect(idx.byNumber, idx.sortedNumbers);
+    collect(idx.byTextNumber, idx.sortedTextNumbers);
     const blanks = criteria.test(FormulaValue.blank) ? blankPositions(idx) : void 0;
-    if (!near && !blanks?.length) return exact2 ?? EMPTY;
-    const merged = [...exact2 ?? EMPTY, ...near ?? EMPTY, ...blanks ?? EMPTY];
+    if (blanks?.length) groups.push(blanks);
+    if (groups.length === 0) return EMPTY;
+    if (groups.length === 1) return groups[0];
+    const merged = groups.flat();
     merged.sort((a, b) => a - b);
     return merged;
   }
@@ -1788,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) {
@@ -1800,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);
 }
@@ -4696,11 +4730,14 @@ 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);
       }
       if (op === "<>") {
-        return { kind: "other", test: (v) => !FormulaValue.areEqual(v, rhsValue) };
+        const equals = rhsNum !== null ? numberEquality(rhsNum) : textEquality(rhs);
+        return { kind: "other", test: (v) => !equals.test(v) };
       }
       const wanted = op === ">" ? (c) => c > 0 : op === ">=" ? (c) => c >= 0 : op === "<" ? (c) => c < 0 : (c) => c <= 0;
       const test = (v) => wanted(FormulaValue.compare(v, rhsValue));
@@ -4710,13 +4747,25 @@ 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);
   }
   FormulaHelper2.compileCriteria = compileCriteria;
   function numberEquality(n) {
     const target = FormulaValue.number(n);
-    return { kind: "equalsNumber", number: n, test: (v) => FormulaValue.areEqual(v, target) };
+    return {
+      kind: "equalsNumber",
+      number: n,
+      test: (v) => {
+        if (FormulaValue.areEqual(v, target)) return true;
+        if (!v.isText) return false;
+        const asNumber = numericText(v.textValue);
+        return asNumber !== null && Math.abs(asNumber - n) < 1e-10;
+      }
+    };
   }
   function textEquality(s) {
     const upper2 = s.toUpperCase();