@devmm/puredocs-excel-formula 1.1.0 → 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

@@ -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);
 }
@@ -4726,6 +4730,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 +4747,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);
   }