@univerjs/engine-formula 0.9.1 → 0.9.2

package/lib/es/index.js

@@ -3340,7 +3340,7 @@ function Aa(i) {
   return a;
 }
 /*!
- *  decimal.js v10.5.0
+ *  decimal.js v10.6.0
  *  An arbitrary-precision Decimal type for JavaScript.
  *  https://github.com/MikeMcl/decimal.js
  *  Copyright (c) 2025 Michael Mclaughlin <M8ch88l@gmail.com>
@@ -6273,24 +6273,26 @@ class q extends $t {
   }
 }
 class Vt {
-  static create(a) {
+  static create(a, e = !1) {
     if (a == null)
       return ue.create();
     if (typeof a == "boolean")
       return T.create(a);
     if (typeof a == "string") {
-      const e = a.toLocaleUpperCase().trim();
-      if (yr.has(e))
-        return g.create(e);
-      if (e === er.TRUE || e === er.FALSE)
+      const t = a.toLocaleUpperCase().trim();
+      if (yr.has(t))
+        return g.create(t);
+      if (t === er.TRUE || t === er.FALSE)
         return qn(a);
       if (Q(a))
         return y.create(Number(a));
-      const { isNumberPattern: t, value: r, pattern: n } = bl(a);
-      if (t)
-        return y.create(r, n);
-      const s = a.replace(/\n/g, "").replace(/\r/g, "");
-      return !Tf(s) && jc(s) ? q.create(s) : jf(a);
+      if (!e) {
+        const { isNumberPattern: n, value: s, pattern: o } = bl(a);
+        if (n)
+          return y.create(s, o);
+      }
+      const r = a.replace(/\n/g, "").replace(/\r/g, "");
+      return !Tf(r) && jc(r) ? q.create(r) : jf(a);
     }
     return typeof a == "number" ? Kn(a) : g.create(m.VALUE);
   }
@@ -7798,6 +7800,9 @@ class ah extends Qe {
     const r = this._calculate(a);
     this._setRefData(r), this.setValue(r);
   }
+  isFunctionExecutorArgumentsIgnoreNumberPattern() {
+    return this._functionExecutor.isArgumentsIgnoreNumberPattern();
+  }
   /**
    * Compatibility handling for special functions.
    */
@@ -8534,7 +8539,9 @@ class Sh extends Qe {
     return ie.VALUE;
   }
   execute() {
-    this.setValue(Vt.create(this.getToken()));
+    var e;
+    const a = ((e = this.getParent()) == null ? void 0 : e.nodeType) === ie.FUNCTION && this.getParent().isFunctionExecutorArgumentsIgnoreNumberPattern();
+    this.setValue(Vt.create(this.getToken(), a));
   }
 }
 class To extends bt {
@@ -10632,6 +10639,9 @@ class V {
   isCustom() {
     return !1;
   }
+  isArgumentsIgnoreNumberPattern() {
+    return !1;
+  }
   setRefInfo(a, e, t, r) {
     this._unitId = a, this._subUnitId = e, this._row = t, this._column = r;
   }
@@ -24580,6 +24590,7 @@ class p_ extends V {
     A(this, "maxParams", 255);
     A(this, "needsReferenceObject", !0);
     A(this, "needsFilteredOutRows", !0);
+    A(this, "needsFormulaDataModel", !0);
   }
   calculate(e, ...t) {
     return e.isError() ? e : e.isReferenceObject() ? e.toArrayValueObject().mapValue((r) => this._handleSingleObject(r, ...t)) : this._handleSingleObject(e, ...t);
@@ -24745,24 +24756,33 @@ class p_ extends V {
     return r.isError() ? r : this._isBlankArrayObject(r) ? g.create(m.DIV_BY_ZERO) : r.var();
   }
   _flattenRefArray(e, ...t) {
+    var n, s;
     const r = [];
     r[0] = [];
-    for (let n = 0; n < t.length; n++) {
-      const s = t[n];
-      if (s.isError())
-        return s;
-      if (!s.isReferenceObject())
+    for (let o = 0; o < t.length; o++) {
+      const u = t[o];
+      if (u.isError())
+        return u;
+      if (!u.isReferenceObject())
         return g.create(m.VALUE);
-      const o = s.getFilteredOutRows(), u = s.getRowData();
-      let c;
-      if (s.iterator((l, f) => {
-        if (o.includes(f) || e && this._isRowHidden(u, f) || l == null || l.isNull() || l.isString() || l.isBoolean())
+      const c = u.getFilteredOutRows(), l = u.getRowData(), f = u.getUnitId(), h = u.getSheetId(), _ = (s = (n = u.getUnitData()[f]) == null ? void 0 : n[h]) == null ? void 0 : s.cellData;
+      let C;
+      if (u.iterator((E, b, R) => {
+        if (c.includes(b) || e && this._isRowHidden(l, b))
           return !0;
-        if (l.isError())
-          return c = l, !1;
-        r[0].push(l);
-      }), c != null && c.isError())
-        return c;
+        const p = _.getValue(b, R);
+        if (p != null && p.f || p != null && p.si) {
+          const N = this._formulaDataModel.getFormulaStringByCell(b, R, h, f);
+          if (N && N.indexOf(`${this.name}(`) > -1)
+            return !0;
+        }
+        if (E == null || E.isNull() || E.isString() || E.isBoolean())
+          return !0;
+        if (E.isError())
+          return C = E, !1;
+        r[0].push(E);
+      }), C != null && C.isError())
+        return C;
     }
     return Nr(r, 1, r[0].length);
   }
@@ -30156,6 +30176,9 @@ class ib extends V {
     A(this, "minParams", 2);
     A(this, "maxParams", 2);
   }
+  isArgumentsIgnoreNumberPattern() {
+    return !0;
+  }
   calculate(e, t) {
     if (e.isError())
       return e;
@@ -30167,27 +30190,27 @@ class ib extends V {
     ), n = Math.max(
       e.isArray() ? e.getColumnCount() : 1,
       t.isArray() ? t.getColumnCount() : 1
-    ), s = O(r, n, e), o = O(r, n, t);
-    return s.map((u, c, l) => {
-      if (u.isError())
-        return u;
-      let f = o.get(c, l) || j.create(" ");
-      if (f.isError())
-        return f;
-      if (f.isBoolean())
+    ), s = O(r, n, e), o = O(r, n, t), u = s.map((c, l, f) => {
+      if (c.isError())
+        return c;
+      let h = o.get(l, f) || j.create(" ");
+      if (h.isError())
+        return h;
+      if (h.isBoolean())
         return g.create(m.VALUE);
-      if (u.isBoolean())
-        return u;
-      let h = u.getValue();
-      if (u.isNull() && (h = 0), u.isString()) {
-        if (!Q(h))
-          return u;
-        h = Number(h);
+      if (c.isBoolean())
+        return c;
+      let d = c.getValue();
+      if (c.isNull() && (d = 0), c.isString()) {
+        if (!Q(d))
+          return c;
+        d = Number(d);
       }
-      f.isNull() && (f = j.create(" "));
-      const d = `${f.getValue()}`, _ = Wa(d, h);
-      return j.create(d === " " ? _.trimEnd() : _);
+      h.isNull() && (h = j.create(" "));
+      const _ = `${h.getValue()}`, C = Wa(_, d);
+      return j.create(_ === " " ? C.trimEnd() : C);
     });
+    return u.getRowCount() === 1 && u.getColumnCount() === 1 ? u.get(0, 0) : u;
   }
 }
 class ob extends V {

package/lib/index.js

@@ -3340,7 +3340,7 @@ function Aa(i) {
   return a;
 }
 /*!
- *  decimal.js v10.5.0
+ *  decimal.js v10.6.0
  *  An arbitrary-precision Decimal type for JavaScript.
  *  https://github.com/MikeMcl/decimal.js
  *  Copyright (c) 2025 Michael Mclaughlin <M8ch88l@gmail.com>
@@ -6273,24 +6273,26 @@ class q extends $t {
   }
 }
 class Vt {
-  static create(a) {
+  static create(a, e = !1) {
     if (a == null)
       return ue.create();
     if (typeof a == "boolean")
       return T.create(a);
     if (typeof a == "string") {
-      const e = a.toLocaleUpperCase().trim();
-      if (yr.has(e))
-        return g.create(e);
-      if (e === er.TRUE || e === er.FALSE)
+      const t = a.toLocaleUpperCase().trim();
+      if (yr.has(t))
+        return g.create(t);
+      if (t === er.TRUE || t === er.FALSE)
         return qn(a);
       if (Q(a))
         return y.create(Number(a));
-      const { isNumberPattern: t, value: r, pattern: n } = bl(a);
-      if (t)
-        return y.create(r, n);
-      const s = a.replace(/\n/g, "").replace(/\r/g, "");
-      return !Tf(s) && jc(s) ? q.create(s) : jf(a);
+      if (!e) {
+        const { isNumberPattern: n, value: s, pattern: o } = bl(a);
+        if (n)
+          return y.create(s, o);
+      }
+      const r = a.replace(/\n/g, "").replace(/\r/g, "");
+      return !Tf(r) && jc(r) ? q.create(r) : jf(a);
     }
     return typeof a == "number" ? Kn(a) : g.create(m.VALUE);
   }
@@ -7798,6 +7800,9 @@ class ah extends Qe {
     const r = this._calculate(a);
     this._setRefData(r), this.setValue(r);
   }
+  isFunctionExecutorArgumentsIgnoreNumberPattern() {
+    return this._functionExecutor.isArgumentsIgnoreNumberPattern();
+  }
   /**
    * Compatibility handling for special functions.
    */
@@ -8534,7 +8539,9 @@ class Sh extends Qe {
     return ie.VALUE;
   }
   execute() {
-    this.setValue(Vt.create(this.getToken()));
+    var e;
+    const a = ((e = this.getParent()) == null ? void 0 : e.nodeType) === ie.FUNCTION && this.getParent().isFunctionExecutorArgumentsIgnoreNumberPattern();
+    this.setValue(Vt.create(this.getToken(), a));
   }
 }
 class To extends bt {
@@ -10632,6 +10639,9 @@ class V {
   isCustom() {
     return !1;
   }
+  isArgumentsIgnoreNumberPattern() {
+    return !1;
+  }
   setRefInfo(a, e, t, r) {
     this._unitId = a, this._subUnitId = e, this._row = t, this._column = r;
   }
@@ -24580,6 +24590,7 @@ class p_ extends V {
     A(this, "maxParams", 255);
     A(this, "needsReferenceObject", !0);
     A(this, "needsFilteredOutRows", !0);
+    A(this, "needsFormulaDataModel", !0);
   }
   calculate(e, ...t) {
     return e.isError() ? e : e.isReferenceObject() ? e.toArrayValueObject().mapValue((r) => this._handleSingleObject(r, ...t)) : this._handleSingleObject(e, ...t);
@@ -24745,24 +24756,33 @@ class p_ extends V {
     return r.isError() ? r : this._isBlankArrayObject(r) ? g.create(m.DIV_BY_ZERO) : r.var();
   }
   _flattenRefArray(e, ...t) {
+    var n, s;
     const r = [];
     r[0] = [];
-    for (let n = 0; n < t.length; n++) {
-      const s = t[n];
-      if (s.isError())
-        return s;
-      if (!s.isReferenceObject())
+    for (let o = 0; o < t.length; o++) {
+      const u = t[o];
+      if (u.isError())
+        return u;
+      if (!u.isReferenceObject())
         return g.create(m.VALUE);
-      const o = s.getFilteredOutRows(), u = s.getRowData();
-      let c;
-      if (s.iterator((l, f) => {
-        if (o.includes(f) || e && this._isRowHidden(u, f) || l == null || l.isNull() || l.isString() || l.isBoolean())
+      const c = u.getFilteredOutRows(), l = u.getRowData(), f = u.getUnitId(), h = u.getSheetId(), _ = (s = (n = u.getUnitData()[f]) == null ? void 0 : n[h]) == null ? void 0 : s.cellData;
+      let C;
+      if (u.iterator((E, b, R) => {
+        if (c.includes(b) || e && this._isRowHidden(l, b))
           return !0;
-        if (l.isError())
-          return c = l, !1;
-        r[0].push(l);
-      }), c != null && c.isError())
-        return c;
+        const p = _.getValue(b, R);
+        if (p != null && p.f || p != null && p.si) {
+          const N = this._formulaDataModel.getFormulaStringByCell(b, R, h, f);
+          if (N && N.indexOf(`${this.name}(`) > -1)
+            return !0;
+        }
+        if (E == null || E.isNull() || E.isString() || E.isBoolean())
+          return !0;
+        if (E.isError())
+          return C = E, !1;
+        r[0].push(E);
+      }), C != null && C.isError())
+        return C;
     }
     return Nr(r, 1, r[0].length);
   }
@@ -30156,6 +30176,9 @@ class ib extends V {
     A(this, "minParams", 2);
     A(this, "maxParams", 2);
   }
+  isArgumentsIgnoreNumberPattern() {
+    return !0;
+  }
   calculate(e, t) {
     if (e.isError())
       return e;
@@ -30167,27 +30190,27 @@ class ib extends V {
     ), n = Math.max(
       e.isArray() ? e.getColumnCount() : 1,
       t.isArray() ? t.getColumnCount() : 1
-    ), s = O(r, n, e), o = O(r, n, t);
-    return s.map((u, c, l) => {
-      if (u.isError())
-        return u;
-      let f = o.get(c, l) || j.create(" ");
-      if (f.isError())
-        return f;
-      if (f.isBoolean())
+    ), s = O(r, n, e), o = O(r, n, t), u = s.map((c, l, f) => {
+      if (c.isError())
+        return c;
+      let h = o.get(l, f) || j.create(" ");
+      if (h.isError())
+        return h;
+      if (h.isBoolean())
         return g.create(m.VALUE);
-      if (u.isBoolean())
-        return u;
-      let h = u.getValue();
-      if (u.isNull() && (h = 0), u.isString()) {
-        if (!Q(h))
-          return u;
-        h = Number(h);
+      if (c.isBoolean())
+        return c;
+      let d = c.getValue();
+      if (c.isNull() && (d = 0), c.isString()) {
+        if (!Q(d))
+          return c;
+        d = Number(d);
       }
-      f.isNull() && (f = j.create(" "));
-      const d = `${f.getValue()}`, _ = Wa(d, h);
-      return j.create(d === " " ? _.trimEnd() : _);
+      h.isNull() && (h = j.create(" "));
+      const _ = `${h.getValue()}`, C = Wa(_, d);
+      return j.create(_ === " " ? C.trimEnd() : C);
     });
+    return u.getRowCount() === 1 && u.getColumnCount() === 1 ? u.get(0, 0) : u;
   }
 }
 class ob extends V {

package/lib/types/engine/ast-node/function-node.d.ts

@@ -20,6 +20,7 @@ export declare class FunctionNode extends BaseAstNode {
     get nodeType(): NodeType;
     executeAsync(): Promise<AstNodePromiseType>;
     execute(): void;
+    isFunctionExecutorArgumentsIgnoreNumberPattern(): boolean;
     /**
      * Compatibility handling for special functions.
      */

package/lib/types/engine/reference-object/base-reference-object.d.ts

@@ -1,10 +1,10 @@
 import { ICellData, IRange, Nullable } from '@univerjs/core';
 import { IRuntimeUnitDataType, IUnitData, IUnitSheetNameMap, IUnitStylesData } from '../../basics/common';
-import { BaseValueObject, ErrorValueObject } from '../value-object/base-value-object';
+import { BaseValueObject } from '../value-object/base-value-object';
 import { FormulaAstLRU } from '../../basics/cache-lru';
 import { ObjectClassType } from '../../basics/object-class-type';
 import { ArrayValueObject } from '../value-object/array-value-object';
-import { NullValueObject, NumberValueObject, StringValueObject } from '../value-object/primitive-object';
+import { StringValueObject } from '../value-object/primitive-object';
 export type NodeValueType = BaseValueObject | BaseReferenceObject | AsyncObject | AsyncArrayObject;
 export type FunctionVariantType = BaseValueObject | BaseReferenceObject;
 export declare const FORMULA_REF_TO_ARRAY_CACHE: FormulaAstLRU<ArrayValueObject>;
@@ -48,7 +48,7 @@ export declare class BaseReferenceObject extends ObjectClassType {
     };
     isReferenceObject(): boolean;
     iterator(callback: (valueObject: Nullable<BaseValueObject>, rowIndex: number, columnIndex: number) => Nullable<boolean>): Nullable<boolean>;
-    getFirstCell(): ErrorValueObject | NullValueObject | NumberValueObject | import('../..').BooleanValueObject | StringValueObject | ArrayValueObject;
+    getFirstCell(): BaseValueObject | StringValueObject;
     getRangeData(): IRange;
     setRangeData(range: IRange): void;
     getUnitId(): string;
@@ -95,10 +95,10 @@ export declare class BaseReferenceObject extends ObjectClassType {
     isTable(): boolean;
     unionBy(referenceObject: BaseReferenceObject): NodeValueType;
     unionRange(rangeData1: IRange, rangeData2: IRange): IRange;
-    getCellValueObject(cell: ICellData): ErrorValueObject | NullValueObject | NumberValueObject | import('../..').BooleanValueObject | StringValueObject | ArrayValueObject;
+    getCellValueObject(cell: ICellData): BaseValueObject | StringValueObject;
     private _getPatternByCell;
-    getCellByRow(row: number): ErrorValueObject | NullValueObject | NumberValueObject | import('../..').BooleanValueObject | StringValueObject | ArrayValueObject;
-    getCellByColumn(column: number): ErrorValueObject | NullValueObject | NumberValueObject | import('../..').BooleanValueObject | StringValueObject | ArrayValueObject;
+    getCellByRow(row: number): BaseValueObject | StringValueObject;
+    getCellByColumn(column: number): BaseValueObject | StringValueObject;
     getCurrentActiveSheetData(): import('../../basics/common').ISheetItem;
     getCurrentStylesData(): import('@univerjs/core').Styles;
     getCurrentRuntimeSheetData(): import('@univerjs/core').ObjectMatrix<Nullable<ICellData>> | undefined;
@@ -106,7 +106,7 @@ export declare class BaseReferenceObject extends ObjectClassType {
     getCurrentRuntimeActiveArrayFormulaCellData(): import('@univerjs/core').ObjectMatrix<Nullable<ICellData>> | undefined;
     getCellData(row: number, column: number): Nullable<ICellData>;
     getRuntimeFeatureCellValue(row: number, column: number): ICellData | undefined;
-    getCellByPosition(rowRaw?: number, columnRaw?: number): ErrorValueObject | NullValueObject | NumberValueObject | import('../..').BooleanValueObject | StringValueObject | ArrayValueObject;
+    getCellByPosition(rowRaw?: number, columnRaw?: number): BaseValueObject | StringValueObject;
     /**
      * Get the pattern of the cell
      * @param unitId

package/lib/types/engine/value-object/array-value-object.d.ts

@@ -1,8 +1,7 @@
 import { Nullable } from '@univerjs/core';
-import { callbackMapFnType, IArrayValueObject, BaseValueObject, ErrorValueObject } from './base-value-object';
+import { callbackMapFnType, IArrayValueObject, BaseValueObject } from './base-value-object';
 import { compareToken } from '../../basics/token';
 import { ArrayBinarySearchType, ArrayOrderSearchType } from '../utils/compare';
-import { BooleanValueObject, NullValueObject, NumberValueObject, StringValueObject } from './primitive-object';
 export declare function fromObjectToString(array: IArrayValueObject): string;
 export declare function transformToValueObject(array?: Array<Array<number | string | boolean | null>>): BaseValueObject[][];
 export declare function transformToValue(array?: Nullable<BaseValueObject>[][]): (string | number | boolean | null)[][];
@@ -226,5 +225,5 @@ export declare class ArrayValueObject extends BaseValueObject {
     private _createNewArray;
 }
 export declare class ValueObjectFactory {
-    static create(rawValue: string | number | boolean | null): ErrorValueObject | NullValueObject | NumberValueObject | BooleanValueObject | StringValueObject | ArrayValueObject;
+    static create(rawValue: string | number | boolean | null, isIgnoreNumberPattern?: boolean): BaseValueObject;
 }

package/lib/types/functions/base-function.d.ts

@@ -90,6 +90,7 @@ export declare class BaseFunction {
     isAsync(): boolean;
     isAddress(): boolean;
     isCustom(): boolean;
+    isArgumentsIgnoreNumberPattern(): boolean;
     setRefInfo(unitId: string, subUnitId: string, row: number, column: number): void;
     calculateCustom(...arg: Array<FormulaFunctionValueType>): FormulaFunctionResultValueType | Promise<FormulaFunctionResultValueType>;
     calculate(...arg: BaseValueObject[]): NodeValueType;

package/lib/types/functions/math/subtotal/index.d.ts

@@ -5,6 +5,7 @@ export declare class Subtotal extends BaseFunction {
     maxParams: number;
     needsReferenceObject: boolean;
     needsFilteredOutRows: boolean;
+    needsFormulaDataModel: boolean;
     calculate(functionNum: FunctionVariantType, ...refs: FunctionVariantType[]): FunctionVariantType;
     private _handleSingleObject;
     private _getIndexNumValue;

package/lib/types/functions/text/text/index.d.ts

@@ -3,5 +3,6 @@ import { BaseFunction } from '../../base-function';
 export declare class Text extends BaseFunction {
     minParams: number;
     maxParams: number;
+    isArgumentsIgnoreNumberPattern(): boolean;
     calculate(text: BaseValueObject, formatText: BaseValueObject): BaseValueObject;
 }