@univerjs/engine-formula 0.10.14-nightly.202511070628 → 0.10.14-nightly.202511070939

package/lib/es/index.js

@@ -971,31 +971,98 @@ class ga extends Ne {
   nodeMakerTest(e) {
     return this._nodeMaker(e);
   }
-  treeBuilder(e, t = !0, r, n) {
+  treeBuilder(e, t = !0, r) {
+    var f;
     if (t === !0) {
-      const h = hs.get(e), d = n == null ? void 0 : n(e);
+      const h = hs.get(e), d = r && ((f = this._simpleCheckDefinedName) == null ? void 0 : f.call(this, e, r));
       if (h && !d)
         return h;
     }
     this._resetCurrentLexerNode(), this._currentLexerNode.setToken(Tt);
-    const s = [];
-    let o = this._nodeMaker(e, s);
-    if (o === m.VALUE || s.length === 0)
-      return o;
-    let u = !1, c = "", l = [];
+    const n = [];
+    let s = this._nodeMaker(e, n);
+    if (s === m.VALUE || n.length === 0)
+      return s;
+    let o = !1, u = "", c = [];
     if (r) {
-      const { hasDefinedName: h, sequenceString: d, definedNames: _ } = r(s);
-      u = h, c = d, l = _;
+      const { hasDefinedName: h, sequenceString: d, definedNames: _ } = this._handleDefinedName(n, r);
+      o = h, u = d, c = _;
     }
-    if (u && (this._resetCurrentLexerNode(), this._currentLexerNode.setToken(Tt), o = this._nodeMaker(`=${c}`), o === m.VALUE))
-      return o;
-    const f = this._getTopNode(this._currentLexerNode);
-    if (f && (this._currentLexerNode = f), t) {
+    if (o && (this._resetCurrentLexerNode(), this._currentLexerNode.setToken(Tt), s = this._nodeMaker(`=${u}`), s === m.VALUE))
+      return s;
+    const l = this._getTopNode(this._currentLexerNode);
+    if (l && (this._currentLexerNode = l), t) {
       if (!this._suffixExpressionHandler(this._currentLexerNode))
         return m.VALUE;
       hs.set(e, this._currentLexerNode);
     }
-    return u && this._currentLexerNode.setDefinedNames(l), this._currentLexerNode;
+    return o && this._currentLexerNode.setDefinedNames(c), this._currentLexerNode;
+  }
+  _handleDefinedName(e, t) {
+    const { unitId: r, getValueByName: n } = t;
+    if (r == null)
+      return {
+        sequenceString: "",
+        hasDefinedName: !1,
+        definedNames: []
+      };
+    const s = this.getSequenceNode(e);
+    let o = "", u = !1;
+    const c = [];
+    for (let l = 0, f = s.length; l < f; l++) {
+      const h = s[l];
+      if (typeof h == "string") {
+        o += h;
+        continue;
+      }
+      const { nodeType: d, token: _ } = h;
+      if (d === $e.REFERENCE || d === $e.FUNCTION) {
+        const C = n(r, _);
+        if (C) {
+          const E = C.formulaOrRefString, b = this._handleNestedDefinedName(E, t);
+          if (b == null || typeof b != "object")
+            o += b || m.NAME, u = !0, c.push(_);
+          else if (typeof b == "object") {
+            const { sequenceString: R, definedNames: p } = b;
+            o += R, p.forEach((N) => {
+              c.push(N);
+            }), u = !0;
+          }
+        } else this._checkDefinedNameDirty(_, t) ? (o += m.NAME, u = !0, c.push(_)) : o += _;
+      } else
+        o += _;
+    }
+    return {
+      sequenceString: o,
+      hasDefinedName: u,
+      definedNames: c
+    };
+  }
+  _handleNestedDefinedName(e, t) {
+    const r = [], n = this._nodeMaker(e, r);
+    return n === m.VALUE || r.length === 0 ? n : this._handleDefinedName(r, t);
+  }
+  _simpleCheckDefinedName(e, t) {
+    const { getDirtyDefinedNameMap: r, unitId: n } = t, s = r(), o = n;
+    if (o != null && s[o] != null) {
+      const u = Object.keys(s[o]);
+      for (let c = 0, l = u.length; c < l; c++) {
+        const f = u[c];
+        if (e.indexOf(f) > -1)
+          return !0;
+      }
+    }
+    return !1;
+  }
+  _checkDefinedNameDirty(e, t) {
+    const { getDirtyDefinedNameMap: r, unitId: n } = t, s = r(), o = n;
+    if (o != null && s[o] != null) {
+      const u = Object.keys(s[o]);
+      for (let c = 0, l = u.length; c < l; c++)
+        if (u[c] === e)
+          return !0;
+    }
+    return !1;
   }
   // eslint-disable-next-line complexity
   _suffixExpressionHandler(e) {
@@ -2664,62 +2731,11 @@ let Ar = class extends Ne {
     super(), this._definedNamesService = i, this._lexerTreeBuilder = a, this._formulaCurrentConfigService = e;
   }
   treeBuilder(i, a = !0) {
-    return this._lexerTreeBuilder.treeBuilder(i, a, this._injectDefinedName.bind(this), this._simpleCheckDefinedName.bind(this));
-  }
-  _simpleCheckDefinedName(i) {
-    const a = this._formulaCurrentConfigService.getDirtyDefinedNameMap(), e = this._formulaCurrentConfigService.getExecuteUnitId();
-    if (e != null && a[e] != null) {
-      const t = Object.keys(a[e]);
-      for (let r = 0, n = t.length; r < n; r++) {
-        const s = t[r];
-        if (i.indexOf(s) > -1)
-          return !0;
-      }
-    }
-    return !1;
-  }
-  _checkDefinedNameDirty(i) {
-    const a = this._formulaCurrentConfigService.getDirtyDefinedNameMap(), e = this._formulaCurrentConfigService.getExecuteUnitId();
-    if (e != null && a[e] != null) {
-      const t = Object.keys(a[e]);
-      for (let r = 0, n = t.length; r < n; r++)
-        if (t[r] === i)
-          return !0;
-    }
-    return !1;
-  }
-  _injectDefinedName(i) {
-    const a = this._formulaCurrentConfigService.getExecuteUnitId();
-    if (a == null)
-      return {
-        sequenceString: "",
-        hasDefinedName: !1,
-        definedNames: []
-      };
-    const e = this._lexerTreeBuilder.getSequenceNode(i);
-    let t = "", r = !1;
-    const n = [];
-    for (let s = 0, o = e.length; s < o; s++) {
-      const u = e[s];
-      if (typeof u == "string") {
-        t += u;
-        continue;
-      }
-      const { nodeType: c, token: l } = u;
-      if (c === $e.REFERENCE || c === $e.FUNCTION) {
-        const f = this._definedNamesService.getValueByName(a, l);
-        if (f) {
-          let h = f.formulaOrRefString;
-          h.substring(0, 1) === X.EQUALS && (h = h.substring(1)), t += h, n.push(f.name), r = !0;
-        } else this._checkDefinedNameDirty(l) ? (t += m.NAME, r = !0, n.push(l)) : t += l;
-      } else
-        t += l;
-    }
-    return {
-      sequenceString: t,
-      hasDefinedName: r,
-      definedNames: n
-    };
+    return this._lexerTreeBuilder.treeBuilder(i, a, {
+      unitId: this._formulaCurrentConfigService.getExecuteUnitId(),
+      getValueByName: this._definedNamesService.getValueByName.bind(this._definedNamesService),
+      getDirtyDefinedNameMap: this._formulaCurrentConfigService.getDirtyDefinedNameMap.bind(this._formulaCurrentConfigService)
+    });
   }
 };
 Ar = Cl([
@@ -30313,12 +30329,7 @@ class lb extends V {
       if (c.isBoolean())
         return c;
       let d = c.getValue();
-      if (c.isNull() && (d = 0), c.isString()) {
-        if (!W(d))
-          return c;
-        d = Number(d);
-      }
-      h.isNull() && (h = j.create(" "));
+      c.isNull() && (d = 0), c.isString() && W(d) && (d = Number(d)), h.isNull() && (h = j.create(" "));
       const _ = `${h.getValue()}`, C = qa(_, d);
       return j.create(_ === " " ? C.trimEnd() : C);
     });

package/lib/index.js

@@ -971,31 +971,98 @@ class ga extends Ne {
   nodeMakerTest(e) {
     return this._nodeMaker(e);
   }
-  treeBuilder(e, t = !0, r, n) {
+  treeBuilder(e, t = !0, r) {
+    var f;
     if (t === !0) {
-      const h = hs.get(e), d = n == null ? void 0 : n(e);
+      const h = hs.get(e), d = r && ((f = this._simpleCheckDefinedName) == null ? void 0 : f.call(this, e, r));
       if (h && !d)
         return h;
     }
     this._resetCurrentLexerNode(), this._currentLexerNode.setToken(Tt);
-    const s = [];
-    let o = this._nodeMaker(e, s);
-    if (o === m.VALUE || s.length === 0)
-      return o;
-    let u = !1, c = "", l = [];
+    const n = [];
+    let s = this._nodeMaker(e, n);
+    if (s === m.VALUE || n.length === 0)
+      return s;
+    let o = !1, u = "", c = [];
     if (r) {
-      const { hasDefinedName: h, sequenceString: d, definedNames: _ } = r(s);
-      u = h, c = d, l = _;
+      const { hasDefinedName: h, sequenceString: d, definedNames: _ } = this._handleDefinedName(n, r);
+      o = h, u = d, c = _;
     }
-    if (u && (this._resetCurrentLexerNode(), this._currentLexerNode.setToken(Tt), o = this._nodeMaker(`=${c}`), o === m.VALUE))
-      return o;
-    const f = this._getTopNode(this._currentLexerNode);
-    if (f && (this._currentLexerNode = f), t) {
+    if (o && (this._resetCurrentLexerNode(), this._currentLexerNode.setToken(Tt), s = this._nodeMaker(`=${u}`), s === m.VALUE))
+      return s;
+    const l = this._getTopNode(this._currentLexerNode);
+    if (l && (this._currentLexerNode = l), t) {
       if (!this._suffixExpressionHandler(this._currentLexerNode))
         return m.VALUE;
       hs.set(e, this._currentLexerNode);
     }
-    return u && this._currentLexerNode.setDefinedNames(l), this._currentLexerNode;
+    return o && this._currentLexerNode.setDefinedNames(c), this._currentLexerNode;
+  }
+  _handleDefinedName(e, t) {
+    const { unitId: r, getValueByName: n } = t;
+    if (r == null)
+      return {
+        sequenceString: "",
+        hasDefinedName: !1,
+        definedNames: []
+      };
+    const s = this.getSequenceNode(e);
+    let o = "", u = !1;
+    const c = [];
+    for (let l = 0, f = s.length; l < f; l++) {
+      const h = s[l];
+      if (typeof h == "string") {
+        o += h;
+        continue;
+      }
+      const { nodeType: d, token: _ } = h;
+      if (d === $e.REFERENCE || d === $e.FUNCTION) {
+        const C = n(r, _);
+        if (C) {
+          const E = C.formulaOrRefString, b = this._handleNestedDefinedName(E, t);
+          if (b == null || typeof b != "object")
+            o += b || m.NAME, u = !0, c.push(_);
+          else if (typeof b == "object") {
+            const { sequenceString: R, definedNames: p } = b;
+            o += R, p.forEach((N) => {
+              c.push(N);
+            }), u = !0;
+          }
+        } else this._checkDefinedNameDirty(_, t) ? (o += m.NAME, u = !0, c.push(_)) : o += _;
+      } else
+        o += _;
+    }
+    return {
+      sequenceString: o,
+      hasDefinedName: u,
+      definedNames: c
+    };
+  }
+  _handleNestedDefinedName(e, t) {
+    const r = [], n = this._nodeMaker(e, r);
+    return n === m.VALUE || r.length === 0 ? n : this._handleDefinedName(r, t);
+  }
+  _simpleCheckDefinedName(e, t) {
+    const { getDirtyDefinedNameMap: r, unitId: n } = t, s = r(), o = n;
+    if (o != null && s[o] != null) {
+      const u = Object.keys(s[o]);
+      for (let c = 0, l = u.length; c < l; c++) {
+        const f = u[c];
+        if (e.indexOf(f) > -1)
+          return !0;
+      }
+    }
+    return !1;
+  }
+  _checkDefinedNameDirty(e, t) {
+    const { getDirtyDefinedNameMap: r, unitId: n } = t, s = r(), o = n;
+    if (o != null && s[o] != null) {
+      const u = Object.keys(s[o]);
+      for (let c = 0, l = u.length; c < l; c++)
+        if (u[c] === e)
+          return !0;
+    }
+    return !1;
   }
   // eslint-disable-next-line complexity
   _suffixExpressionHandler(e) {
@@ -2664,62 +2731,11 @@ let Ar = class extends Ne {
     super(), this._definedNamesService = i, this._lexerTreeBuilder = a, this._formulaCurrentConfigService = e;
   }
   treeBuilder(i, a = !0) {
-    return this._lexerTreeBuilder.treeBuilder(i, a, this._injectDefinedName.bind(this), this._simpleCheckDefinedName.bind(this));
-  }
-  _simpleCheckDefinedName(i) {
-    const a = this._formulaCurrentConfigService.getDirtyDefinedNameMap(), e = this._formulaCurrentConfigService.getExecuteUnitId();
-    if (e != null && a[e] != null) {
-      const t = Object.keys(a[e]);
-      for (let r = 0, n = t.length; r < n; r++) {
-        const s = t[r];
-        if (i.indexOf(s) > -1)
-          return !0;
-      }
-    }
-    return !1;
-  }
-  _checkDefinedNameDirty(i) {
-    const a = this._formulaCurrentConfigService.getDirtyDefinedNameMap(), e = this._formulaCurrentConfigService.getExecuteUnitId();
-    if (e != null && a[e] != null) {
-      const t = Object.keys(a[e]);
-      for (let r = 0, n = t.length; r < n; r++)
-        if (t[r] === i)
-          return !0;
-    }
-    return !1;
-  }
-  _injectDefinedName(i) {
-    const a = this._formulaCurrentConfigService.getExecuteUnitId();
-    if (a == null)
-      return {
-        sequenceString: "",
-        hasDefinedName: !1,
-        definedNames: []
-      };
-    const e = this._lexerTreeBuilder.getSequenceNode(i);
-    let t = "", r = !1;
-    const n = [];
-    for (let s = 0, o = e.length; s < o; s++) {
-      const u = e[s];
-      if (typeof u == "string") {
-        t += u;
-        continue;
-      }
-      const { nodeType: c, token: l } = u;
-      if (c === $e.REFERENCE || c === $e.FUNCTION) {
-        const f = this._definedNamesService.getValueByName(a, l);
-        if (f) {
-          let h = f.formulaOrRefString;
-          h.substring(0, 1) === X.EQUALS && (h = h.substring(1)), t += h, n.push(f.name), r = !0;
-        } else this._checkDefinedNameDirty(l) ? (t += m.NAME, r = !0, n.push(l)) : t += l;
-      } else
-        t += l;
-    }
-    return {
-      sequenceString: t,
-      hasDefinedName: r,
-      definedNames: n
-    };
+    return this._lexerTreeBuilder.treeBuilder(i, a, {
+      unitId: this._formulaCurrentConfigService.getExecuteUnitId(),
+      getValueByName: this._definedNamesService.getValueByName.bind(this._definedNamesService),
+      getDirtyDefinedNameMap: this._formulaCurrentConfigService.getDirtyDefinedNameMap.bind(this._formulaCurrentConfigService)
+    });
   }
 };
 Ar = Cl([
@@ -30313,12 +30329,7 @@ class lb extends V {
       if (c.isBoolean())
         return c;
       let d = c.getValue();
-      if (c.isNull() && (d = 0), c.isString()) {
-        if (!W(d))
-          return c;
-        d = Number(d);
-      }
-      h.isNull() && (h = j.create(" "));
+      c.isNull() && (d = 0), c.isString() && W(d) && (d = Number(d)), h.isNull() && (h = j.create(" "));
       const _ = `${h.getValue()}`, C = qa(_, d);
       return j.create(_ === " " ? C.trimEnd() : C);
     });

package/lib/types/engine/analysis/lexer-tree-builder.d.ts

@@ -1,10 +1,17 @@
+import { Nullable, AbsoluteRefType, Disposable } from '@univerjs/core';
+import { IDirtyUnitSheetDefinedNameMap } from '../../basics/common';
+import { IDefinedNamesServiceParam } from '../../services/defined-names.service';
 import { ISequenceArray, ISequenceNode } from '../utils/sequence';
-import { AbsoluteRefType, Disposable } from '@univerjs/core';
 import { FormulaAstLRU } from '../../basics/cache-lru';
 import { ErrorType } from '../../basics/error-type';
 import { LexerNode } from './lexer-node';
 export declare const FormulaLexerNodeCache: FormulaAstLRU<LexerNode>;
 export declare const FormulaSequenceNodeCache: FormulaAstLRU<(string | ISequenceNode)[]>;
+interface IInjectDefinedNameParam {
+    unitId: Nullable<string>;
+    getValueByName(unitId: string, name: string): Nullable<IDefinedNamesServiceParam>;
+    getDirtyDefinedNameMap(): IDirtyUnitSheetDefinedNameMap;
+}
 export declare class LexerTreeBuilder extends Disposable {
     private _currentLexerNode;
     private _upLevel;
@@ -62,11 +69,11 @@ export declare class LexerTreeBuilder extends Disposable {
     private _minusSplitSequenceNode;
     private _pushSequenceNode;
     nodeMakerTest(formulaString: string): ErrorType.VALUE | (string | LexerNode)[] | undefined;
-    treeBuilder(formulaString: string, transformSuffix?: boolean, injectDefinedName?: (sequenceArray: ISequenceArray[]) => {
-        sequenceString: string;
-        hasDefinedName: boolean;
-        definedNames: string[];
-    }, simpleCheckDefinedName?: (formulaString: string) => boolean): ErrorType.VALUE | LexerNode | (string | LexerNode)[] | undefined;
+    treeBuilder(formulaString: string, transformSuffix?: boolean, injectDefinedNameParam?: IInjectDefinedNameParam): ErrorType.VALUE | LexerNode | (string | LexerNode)[] | undefined;
+    private _handleDefinedName;
+    private _handleNestedDefinedName;
+    private _simpleCheckDefinedName;
+    private _checkDefinedNameDirty;
     private _suffixExpressionHandler;
     private _processSuffixExpressionRemain;
     private _processSuffixExpressionCloseBracket;
@@ -131,3 +138,4 @@ export declare class LexerTreeBuilder extends Disposable {
     private _isScientificNotation;
     private _addSequenceArray;
 }
+export {};

package/lib/types/engine/analysis/lexer.d.ts

@@ -1,5 +1,4 @@
 import { Disposable } from '@univerjs/core';
-import { ErrorType } from '../../basics/error-type';
 import { IFormulaCurrentConfigService } from '../../services/current-data.service';
 import { IDefinedNamesService } from '../../services/defined-names.service';
 import { LexerTreeBuilder } from './lexer-tree-builder';
@@ -8,8 +7,5 @@ export declare class Lexer extends Disposable {
     private readonly _lexerTreeBuilder;
     private readonly _formulaCurrentConfigService;
     constructor(_definedNamesService: IDefinedNamesService, _lexerTreeBuilder: LexerTreeBuilder, _formulaCurrentConfigService: IFormulaCurrentConfigService);
-    treeBuilder(formulaString: string, transformSuffix?: boolean): ErrorType.VALUE | import('./lexer-node').LexerNode | (string | import('./lexer-node').LexerNode)[] | undefined;
-    private _simpleCheckDefinedName;
-    private _checkDefinedNameDirty;
-    private _injectDefinedName;
+    treeBuilder(formulaString: string, transformSuffix?: boolean): import("../..").ErrorType.VALUE | import('./lexer-node').LexerNode | (string | import('./lexer-node').LexerNode)[] | undefined;
 }