@univerjs/sheets-formula 0.5.0 → 0.5.1

package/lib/es/index.js

@@ -1,9 +1,9 @@
 var Fa = Object.defineProperty;
 var Ba = (n, e, a) => e in n ? Fa(n, e, { enumerable: !0, configurable: !0, writable: !0, value: a }) : n[e] = a;
 var w = (n, e, a) => Ba(n, typeof e != "symbol" ? e + "" : e, a);
-import { CommandType as ia, ICommandService as pe, ObjectMatrix as X, Tools as Ie, Rectangle as Ce, cellToRange as ra, Direction as Ge, isFormulaString as De, isFormulaId as oa, getIntersectRange as ve, RANGE_TYPE as Y, Inject as W, Disposable as te, UniverInstanceType as ee, IUniverInstanceService as xe, LifecycleService as va, LocaleService as bt, ILogService as Va, IConfigService as _e, Injector as et, createIdentifier as Ot, toDisposable as Oe, moveRangeByOffset as Tt, DisposableCollection as Et, AbsoluteRefType as He, Optional as Ga, Dimension as Ft, InterceptorEffectEnum as Ha, CellValueType as Bt, DependentOn as ua, Plugin as ma, touchDependencies as ye, isNodeEnv as vt } from "@univerjs/core";
+import { CommandType as ia, ICommandService as pe, ObjectMatrix as X, Tools as Ie, Rectangle as Ce, cellToRange as ra, Direction as He, isFormulaString as De, isFormulaId as oa, getIntersectRange as Ve, RANGE_TYPE as Y, Inject as W, Disposable as te, UniverInstanceType as ee, IUniverInstanceService as xe, LifecycleService as va, LocaleService as bt, ILogService as Va, IConfigService as _e, Injector as tt, createIdentifier as Ot, toDisposable as Oe, moveRangeByOffset as Tt, DisposableCollection as Et, AbsoluteRefType as Ye, Optional as Ga, Dimension as Ft, InterceptorEffectEnum as Ha, CellValueType as Bt, DependentOn as ua, Plugin as ma, touchDependencies as ye, isNodeEnv as vt } from "@univerjs/core";
 import { SetRangeValuesCommand as Ya, SetRangeValuesMutation as ie, handleMoveRange as fa, EffectRefRangId as G, runRefRangeMutations as H, handleMoveRows as ca, handleMoveCols as la, handleInsertRow as sa, handleInsertCol as pa, handleIRemoveRow as da, handleIRemoveCol as La, handleDeleteRangeMoveLeft as Pa, handleDeleteRangeMoveUp as Ta, handleInsertRangeMoveDown as Ea, handleInsertRangeMoveRight as Ia, RemoveDefinedNameCommand as Na, SetDefinedNameCommand as Ra, RemoveSheetCommand as Xa, SetWorksheetNameCommand as wa, DeleteRangeMoveLeftCommand as Wa, DeleteRangeMoveUpCommand as Ka, RemoveColCommand as Qa, RemoveRowCommand as ka, InsertRangeMoveDownCommand as $a, InsertRangeMoveRightCommand as ja, InsertColCommand as za, InsertRowCommand as Za, MoveColsCommand as Ja, MoveRowsCommand as en, MoveRangeCommand as tn, SheetInterceptorService as Mt, SetStyleCommand as xt, SetBorderCommand as Aa, ClearSelectionFormatCommand as Sa, RemoveSheetMutation as It, InsertSheetMutation as Nt, RefRangeService as an, handleDefaultRangeChangeWithEffectRefCommands as Vt, getSeparateEffectedRangesOnCommand as nn, handleCommonDefaultRangeChangeWithEffectRefCommands as rn, MoveRangeMutation as Gt, MoveRowsMutation as Ht, MoveColsMutation as Yt, ReorderRangeMutation as Xt, RemoveRowMutation as wt, RemoveColMutation as Wt, InsertColMutation as Kt, InsertRowMutation as Qt, INTERCEPTOR_POINT as on, SetWorksheetActiveOperation as un, UniverSheetsPlugin as mn } from "@univerjs/sheets";
-import { sequenceNodeType as J, deserializeRangeWithSheetWithCache as se, serializeRangeToRefString as tt, ErrorType as j, LexerTreeBuilder as _t, generateStringWithSequence as Ye, SetDefinedNameMutation as Me, IDefinedNamesService as qt, SetFormulaCalculationResultMutation as fn, RemoveOtherFormulaMutation as cn, IActiveDirtyManagerService as yt, SetOtherFormulaMutation as ln, FormulaDataModel as at, SetFormulaCalculationStartMutation as Ae, SetFormulaCalculationStopMutation as kt, SetFormulaCalculationNotificationMutation as sn, FormulaExecuteStageType as ot, FormulaExecutedStateType as Ne, SetFormulaDataMutation as ge, SetArrayFormulaDataMutation as Rt, initSheetFormulaData as $t, FUNCTION_NAMES_ARRAY as jt, FunctionType as t, FUNCTION_NAMES_COMPATIBILITY as _, FUNCTION_NAMES_CUBE as ce, FUNCTION_NAMES_DATABASE as $, FUNCTION_NAMES_DATE as B, FUNCTION_NAMES_ENGINEERING as A, FUNCTION_NAMES_FINANCIAL as C, FUNCTION_NAMES_INFORMATION as v, FUNCTION_NAMES_LOGICAL as K, FUNCTION_NAMES_LOOKUP as q, FUNCTION_NAMES_MATH as T, FUNCTION_NAMES_STATISTICAL as l, FUNCTION_NAMES_TEXT as D, FUNCTION_NAMES_WEB as ut, isReferenceStrings as pn, functionArray as dn, functionCompatibility as Ln, functionCube as Pn, functionDatabase as Tn, functionDate as En, functionEngineering as In, functionFinancial as Nn, functionInformation as Rn, functionLogical as An, functionLookup as Sn, functionMath as Cn, functionMeta as Dn, functionStatistical as bn, functionText as On, functionUniver as Mn, functionWeb as xn, IFunctionService as gt, serializeRangeWithSpreadsheet as zt, serializeRangeWithSheet as Zt, serializeRange as Jt, CustomFunction as Ca, RemoveDefinedNameMutation as At, stripErrorMargin as _n, UniverFormulaEnginePlugin as Da } from "@univerjs/engine-formula";
+import { sequenceNodeType as J, deserializeRangeWithSheetWithCache as se, serializeRangeToRefString as at, ErrorType as j, LexerTreeBuilder as _t, generateStringWithSequence as Xe, SetDefinedNameMutation as Me, IDefinedNamesService as qt, SetFormulaCalculationResultMutation as fn, RemoveOtherFormulaMutation as cn, IActiveDirtyManagerService as yt, SetOtherFormulaMutation as ln, FormulaDataModel as nt, SetFormulaCalculationStartMutation as Ae, SetFormulaCalculationStopMutation as kt, SetFormulaCalculationNotificationMutation as sn, FormulaExecuteStageType as ge, FormulaExecutedStateType as Ne, SetFormulaDataMutation as he, SetArrayFormulaDataMutation as Rt, initSheetFormulaData as $t, FUNCTION_NAMES_ARRAY as jt, FunctionType as t, FUNCTION_NAMES_COMPATIBILITY as _, FUNCTION_NAMES_CUBE as ce, FUNCTION_NAMES_DATABASE as $, FUNCTION_NAMES_DATE as B, FUNCTION_NAMES_ENGINEERING as A, FUNCTION_NAMES_FINANCIAL as C, FUNCTION_NAMES_INFORMATION as v, FUNCTION_NAMES_LOGICAL as K, FUNCTION_NAMES_LOOKUP as q, FUNCTION_NAMES_MATH as T, FUNCTION_NAMES_STATISTICAL as l, FUNCTION_NAMES_TEXT as D, FUNCTION_NAMES_WEB as ut, isReferenceStrings as pn, functionArray as dn, functionCompatibility as Ln, functionCube as Pn, functionDatabase as Tn, functionDate as En, functionEngineering as In, functionFinancial as Nn, functionInformation as Rn, functionLogical as An, functionLookup as Sn, functionMath as Cn, functionMeta as Dn, functionStatistical as bn, functionText as On, functionUniver as Mn, functionWeb as xn, IFunctionService as gt, serializeRangeWithSpreadsheet as zt, serializeRangeWithSheet as Zt, serializeRange as Jt, CustomFunction as Ca, RemoveDefinedNameMutation as At, stripErrorMargin as _n, UniverFormulaEnginePlugin as Da } from "@univerjs/engine-formula";
 import { Subject as ea, BehaviorSubject as ba, bufferWhen as qn, filter as ta, map as yn } from "rxjs";
 import { IRPCChannelService as Oa, fromModule as gn, toModule as hn } from "@univerjs/rpc";
 const Un = {
@@ -29,7 +29,7 @@ const Un = {
     };
     return i.executeCommand(Ya.id, o);
   }
-}, Ve = {
+}, Ge = {
   type: ia.MUTATION,
   id: "sheet.mutation.data-validation-formula-mark-dirty",
   handler() {
@@ -77,7 +77,7 @@ function Vn(n, e) {
       if (f.forValue((c, N, R) => {
         if (R == null)
           return !0;
-        const P = nt(R);
+        const P = it(R);
         P !== null && (p.setValue(c, N, P), d.setValue(c, N, s.getValue(c, N)));
       }), p.getSizeOf() === 0)
         return;
@@ -279,7 +279,7 @@ function $n(n, e) {
   const a = sa(
     {
       id: G.InsertRowCommandId,
-      params: { range: n, unitId: "", subUnitId: "", direction: Ge.DOWN }
+      params: { range: n, unitId: "", subUnitId: "", direction: He.DOWN }
     },
     e
   );
@@ -289,7 +289,7 @@ function jn(n, e) {
   const a = pa(
     {
       id: G.InsertColCommandId,
-      params: { range: n, unitId: "", subUnitId: "", direction: Ge.RIGHT }
+      params: { range: n, unitId: "", subUnitId: "", direction: He.RIGHT }
     },
     e
   );
@@ -358,7 +358,7 @@ function ai(n, e) {
 function ni(n, e, a) {
   const i = new X({});
   return n.forEach((r) => {
-    const { oldCell: o, newCell: u } = r, { startRow: m, startColumn: f } = o, s = a.getValue(m, f) || e.getValue(m, f), p = nt(s);
+    const { oldCell: o, newCell: u } = r, { startRow: m, startColumn: f } = o, s = a.getValue(m, f) || e.getValue(m, f), p = it(s);
     if (i.setValue(m, f, { f: null, si: null }), u) {
       const { startRow: d, startColumn: L } = u;
       i.setValue(d, L, p);
@@ -368,7 +368,7 @@ function ni(n, e, a) {
 function ii(n, e) {
   const a = new X({});
   return n.reverse().forEach((i) => {
-    const { oldCell: r, newCell: o } = i, { startRow: u, startColumn: m } = r, f = e.getValue(u, m), s = nt(f);
+    const { oldCell: r, newCell: o } = i, { startRow: u, startColumn: m } = r, f = e.getValue(u, m), s = it(f);
     if (o) {
       const { startRow: p, startColumn: d } = o;
       a.setValue(p, d, { f: null, si: null });
@@ -376,7 +376,7 @@ function ii(n, e) {
     a.setValue(u, m, s);
   }), a.getMatrix();
 }
-function nt(n) {
+function it(n) {
   if (n == null)
     return;
   const { f: e, si: a, x: i = 0, y: r = 0 } = n, o = De(e), u = oa(a);
@@ -391,7 +391,7 @@ function nt(n) {
 function ri(n) {
   const e = new X({});
   return new X(n).forValue((i, r, o) => {
-    const u = nt(o);
+    const u = it(o);
     u && e.setValue(i, r, u);
   }), e.getMatrix();
 }
@@ -418,7 +418,7 @@ function _a(n, e, a = 0, i = 0) {
     const { token: f } = m, s = se(f), { range: p, sheetName: d, unitId: L } = s, E = Ce.moveOffset(p, a, i);
     r.push({
       ...m,
-      token: tt({
+      token: at({
         range: E,
         unitId: L,
         sheetName: d
@@ -450,7 +450,7 @@ function qa(n, e, a, i) {
   if (r === y.MoveRange) {
     if (f == null || s == null)
       return;
-    const R = ct(c, f), P = ve(c, f);
+    const R = ct(c, f), P = Ve(c, f);
     if (P == null || R !== 4)
       return;
     const O = fa(
@@ -464,7 +464,7 @@ function qa(n, e, a, i) {
     if (f == null || s == null)
       return;
     const R = ct(c, f);
-    let P = ve(c, f);
+    let P = Ve(c, f);
     if (P == null && (f.endRow < c.startRow && s.endRow < c.startRow || f.startRow > c.endRow && s.startRow > c.endRow))
       return;
     P == null && (P = {
@@ -485,7 +485,7 @@ function qa(n, e, a, i) {
     if (f == null || s == null)
       return;
     const R = ct(c, f);
-    let P = ve(c, f);
+    let P = Ve(c, f);
     if (P == null && (f.endColumn < c.startColumn && s.endColumn < c.startColumn || f.startColumn > c.endColumn && s.startColumn > c.endColumn))
       return;
     P == null && (P = {
@@ -508,7 +508,7 @@ function qa(n, e, a, i) {
       const R = sa(
         {
           id: G.InsertRowCommandId,
-          params: { range: m, unitId: "", subUnitId: "", direction: Ge.DOWN }
+          params: { range: m, unitId: "", subUnitId: "", direction: He.DOWN }
         },
         c
       ), P = H(R, c);
@@ -522,7 +522,7 @@ function qa(n, e, a, i) {
       const R = pa(
         {
           id: G.InsertColCommandId,
-          params: { range: m, unitId: "", subUnitId: "", direction: Ge.RIGHT }
+          params: { range: m, unitId: "", subUnitId: "", direction: He.RIGHT }
         },
         c
       ), P = H(R, c);
@@ -619,7 +619,7 @@ function qa(n, e, a, i) {
     }
   }
   if (N != null)
-    return tt({
+    return at({
       range: N,
       sheetName: E,
       unitId: L
@@ -991,8 +991,8 @@ var Ri = Object.defineProperty, Ai = Object.getOwnPropertyDescriptor, Si = (n, e
   for (var r = i > 1 ? void 0 : i ? Ai(e, a) : e, o = n.length - 1, u; o >= 0; o--)
     (u = n[o]) && (r = (i ? u(e, a, r) : u(r)) || r);
   return i && r && Ri(e, a, r), r;
-}, he = (n, e) => (a, i) => e(a, i, n);
-let Xe = class extends te {
+}, Ue = (n, e) => (a, i) => e(a, i, n);
+let we = class extends te {
   constructor(n, e, a, i) {
     super(), this._definedNamesService = n, this._univerInstanceService = e, this._sheetInterceptorService = a, this._lexerTreeBuilder = i, this._initialize();
   }
@@ -1061,7 +1061,7 @@ let Xe = class extends te {
           } = e;
           if (b == null || x == null || x.length === 0 || k !== x)
             continue;
-          V = tt({
+          V = at({
             range: F,
             sheetName: b,
             unitId: g
@@ -1080,7 +1080,7 @@ let Xe = class extends te {
       }
       if (!d)
         return !0;
-      const E = Ye(_a(p, L)), I = {
+      const E = Xe(_a(p, L)), I = {
         id: Me.id,
         params: {
           unitId: i,
@@ -1108,18 +1108,18 @@ let Xe = class extends te {
     return ((o = this._definedNamesService.getWorksheetByRef(e, i)) == null ? void 0 : o.getSheetId()) === a ? j.REF : null;
   }
 };
-Xe = Si([
-  he(0, qt),
-  he(1, xe),
-  he(2, W(Mt)),
-  he(3, W(_t))
-], Xe);
+we = Si([
+  Ue(0, qt),
+  Ue(1, xe),
+  Ue(2, W(Mt)),
+  Ue(3, W(_t))
+], we);
 var Se = /* @__PURE__ */ ((n) => (n[n.NOT_REGISTER = 1] = "NOT_REGISTER", n[n.SUCCESS = 2] = "SUCCESS", n[n.WAIT = 3] = "WAIT", n[n.ERROR = 4] = "ERROR", n))(Se || {}), Ci = Object.defineProperty, Di = Object.getOwnPropertyDescriptor, bi = (n, e, a, i) => {
   for (var r = i > 1 ? void 0 : i ? Di(e, a) : e, o = n.length - 1, u; o >= 0; o--)
     (u = n[o]) && (r = (i ? u(e, a, r) : u(r)) || r);
   return i && r && Ci(e, a, r), r;
 }, lt = (n, e) => (a, i) => e(a, i, n);
-let we = class extends te {
+let We = class extends te {
   constructor(e, a, i) {
     super();
     w(this, "_formulaCacheMap", /* @__PURE__ */ new Map());
@@ -1145,9 +1145,9 @@ let we = class extends te {
   }
   _initFormulaRegister() {
     this._activeDirtyManagerService.register(
-      Ve.id,
+      Ge.id,
       {
-        commandId: Ve.id,
+        commandId: Ge.id,
         getDirtyData(a) {
           return {
             dirtyUnitOtherFormulaMap: a.params
@@ -1171,7 +1171,7 @@ let we = class extends te {
       };
       this._commandService.executeCommand(ln.id, s).then(() => {
         this._commandService.executeCommand(
-          Ve.id,
+          Ge.id,
           { [i]: { [r]: { [u]: !0 } } }
         );
       });
@@ -1251,12 +1251,12 @@ let we = class extends te {
     return this._ensureCacheMap(e, a).get(i);
   }
 };
-we = bi([
+We = bi([
   lt(0, pe),
   lt(1, yt),
   lt(2, W(va))
-], we);
-const it = "sheets-formula.base.config";
+], We);
+const rt = "sheets-formula.base.config";
 var ne = /* @__PURE__ */ ((n) => (n[n.FORCED = 0] = "FORCED", n[n.WHEN_EMPTY = 1] = "WHEN_EMPTY", n[n.NO_CALCULATION = 2] = "NO_CALCULATION", n))(ne || {});
 const Oi = {}, Mi = "sheets-formula.remote.config", xi = {};
 var _i = Object.defineProperty, qi = Object.getOwnPropertyDescriptor, yi = (n, e, a, i) => {
@@ -1293,7 +1293,7 @@ let be = class extends te {
     w(this, "_progress$", new ba(aa));
     w(this, "progress$", this._progress$.asObservable());
     this._commandService = e, this._activeDirtyManagerService = a, this._logService = i, this._configService = r, this._formulaDataModel = o, this._localeService = u, this._registerOtherFormulaService = m;
-    const f = this._configService.getConfig(it);
+    const f = this._configService.getConfig(rt);
     this._calculationMode = (s = f == null ? void 0 : f.initialFormulaComputing) != null ? s : ne.WHEN_EMPTY, this._commandExecutedListener(), this._initialExecuteFormulaProcessListener(), this._initialExecuteFormula();
   }
   _emitProgress(e) {
@@ -1416,11 +1416,7 @@ let be = class extends te {
       this._commandService.onCommandExecuted((i) => {
         if (i.id === Ae.id) {
           const { forceCalculation: o = !1 } = i.params;
-          if (o && (this._forceCalculating = !0), this._calculationMode === ne.NO_CALCULATION)
-            return;
-          a === 0 && (this._startExecutionTime = performance.now()), a++, e !== null && (clearTimeout(e), e = null), e = setTimeout(() => {
-            e = null, this._startProgress();
-          }, 1e3);
+          o && (this._forceCalculating = !0);
         } else i.id === kt.id && this.clearProgress();
         if (i.id !== sn.id)
           return;
@@ -1429,17 +1425,23 @@ let be = class extends te {
           const {
             stage: o
           } = r.stageInfo;
-          if (o === ot.CURRENTLY_CALCULATING) {
+          if (o === ge.START) {
+            if (this._calculationMode === ne.NO_CALCULATION)
+              return;
+            a === 0 && (this._startExecutionTime = performance.now()), a++, e !== null && (clearTimeout(e), e = null), e = setTimeout(() => {
+              e = null, this._startProgress();
+            }, 1e3);
+          } else if (o === ge.CURRENTLY_CALCULATING) {
             if (this._executionInProgressParams = r.stageInfo, e === null) {
               const u = this._localeService.t("formula.progress.calculating");
               this._calculateProgress(u);
             }
-          } else if (o === ot.START_DEPENDENCY_ARRAY_FORMULA) {
+          } else if (o === ge.START_DEPENDENCY_ARRAY_FORMULA) {
             if (this._executionInProgressParams = r.stageInfo, e === null) {
               const u = this._localeService.t("formula.progress.array-analysis");
               this._calculateProgress(u);
             }
-          } else if (o === ot.CURRENTLY_CALCULATING_ARRAY_FORMULA && (this._executionInProgressParams = r.stageInfo, e === null)) {
+          } else if (o === ge.CURRENTLY_CALCULATING_ARRAY_FORMULA && (this._executionInProgressParams = r.stageInfo, e === null)) {
             const u = this._localeService.t("formula.progress.array-calculation");
             this._calculateProgress(u);
           }
@@ -1504,16 +1506,16 @@ be = yi([
   le(1, yt),
   le(2, Va),
   le(3, _e),
-  le(4, W(at)),
+  le(4, W(nt)),
   le(5, W(bt)),
-  le(6, W(we))
+  le(6, W(We))
 ], be);
 var gi = Object.defineProperty, hi = Object.getOwnPropertyDescriptor, Ui = (n, e, a, i) => {
   for (var r = i > 1 ? void 0 : i ? hi(e, a) : e, o = n.length - 1, u; o >= 0; o--)
     (u = n[o]) && (r = (i ? u(e, a, r) : u(r)) || r);
   return i && r && gi(e, a, r), r;
 }, me = (n, e) => (a, i) => e(a, i, n);
-let We = class extends te {
+let Ke = class extends te {
   constructor(n, e, a, i, r, o, u, m) {
     super(), this._univerInstanceService = n, this._commandService = e, this._lexerTreeBuilder = a, this._formulaDataModel = i, this._sheetInterceptorService = r, this._definedNamesService = o, this._configService = u, this._injector = m, this._commandExecutedListener();
   }
@@ -1521,18 +1523,22 @@ let We = class extends te {
     this.disposeWithMe(this._sheetInterceptorService.interceptCommand({
       getMutations: (n) => this._getUpdateFormula(n)
     })), this.disposeWithMe(
-      this._commandService.onCommandExecuted((n, e) => {
+      this._commandService.onCommandExecuted((n) => {
         if (n.params)
-          if (n.id === ie.id) {
-            const a = n.params;
-            if (e && e.onlyLocal === !0 || a.trigger === xt.id || a.trigger === Aa.id || a.trigger === Sa.id)
-              return;
-            this._handleSetRangeValuesMutation(a);
-          } else if (n.id === It.id) {
-            const { subUnitId: a, unitId: i } = n.params;
-            this._handleWorkbookDisposed(i, a);
+          if (n.id === It.id) {
+            const { subUnitId: e, unitId: a } = n.params;
+            this._handleWorkbookDisposed(a, e);
           } else n.id === Nt.id && this._handleInsertSheetMutation(n.params);
       })
+    ), this.disposeWithMe(
+      this._commandService.beforeCommandExecuted((n, e) => {
+        if (n.id === ie.id) {
+          const a = n.params;
+          if (e && e.onlyLocal === !0 || a.trigger === xt.id || a.trigger === Aa.id || a.trigger === Sa.id)
+            return;
+          this._handleSetRangeValuesMutation(a);
+        }
+      })
     ), this.disposeWithMe(this._univerInstanceService.getTypeOfUnitAdded$(ee.UNIVER_SHEET).subscribe((n) => this._handleWorkbookAdded(n))), this.disposeWithMe(this._univerInstanceService.getTypeOfUnitDisposed$(ee.UNIVER_SHEET).pipe(yn((n) => n.getUnitId())).subscribe((n) => this._handleWorkbookDisposed(n)));
   }
   _handleSetRangeValuesMutation(n) {
@@ -1556,7 +1562,7 @@ let We = class extends te {
         fromFormula: !0
       }
     ), this._formulaDataModel.updateArrayFormulaCellData(a, e, i), this._formulaDataModel.updateArrayFormulaRange(a, e, i), this._commandService.executeCommand(
-      ge.id,
+      he.id,
       {
         formulaData: o
       },
@@ -1579,7 +1585,7 @@ let We = class extends te {
   _handleWorkbookDisposed(n, e) {
     const a = this._formulaDataModel.getFormulaData(), i = mt(a, n, e), r = this._formulaDataModel.getArrayFormulaRange(), o = mt(r, n, e), u = this._formulaDataModel.getArrayFormulaCellData(), m = mt(u, n, e);
     i && this._commandService.executeCommand(
-      ge.id,
+      he.id,
       {
         formulaData: i
       },
@@ -1600,7 +1606,7 @@ let We = class extends te {
   _handleInsertSheetMutation(n) {
     const { sheet: e, unitId: a } = n, i = this._formulaDataModel.getFormulaData(), { id: r, cellData: o } = e, u = new X(o), m = $t(i, a, r, u);
     this._commandService.executeCommand(
-      ge.id,
+      he.id,
       {
         formulaData: m
       },
@@ -1611,13 +1617,13 @@ let We = class extends te {
   }
   _handleWorkbookAdded(n) {
     var f;
-    const e = this._formulaDataModel.getFormulaData(), a = n.getUnitId(), i = { [a]: {} };
+    const e = {}, a = n.getUnitId(), i = { [a]: {} };
     n.getSheets().forEach((s) => {
       var E;
       const p = s.getCellMatrix(), d = s.getSheetId(), L = $t(e, a, d, p);
       i[a][d] = (E = L[a]) == null ? void 0 : E[d];
-    }), this._commandService.executeCommand(ge.id, { formulaData: i }, { onlyLocal: !0 });
-    const o = this._configService.getConfig(it), u = (f = o == null ? void 0 : o.initialFormulaComputing) != null ? f : ne.WHEN_EMPTY, m = this._getDiryDataByCalculationMode(u);
+    }), this._commandService.executeCommand(he.id, { formulaData: i }, { onlyLocal: !0 });
+    const o = this._configService.getConfig(rt), u = (f = o == null ? void 0 : o.initialFormulaComputing) != null ? f : ne.WHEN_EMPTY, m = this._getDiryDataByCalculationMode(u);
     this._commandService.executeCommand(Ae.id, m, { onlyLocal: !0 });
   }
   _getDiryDataByCalculationMode(n) {
@@ -1724,7 +1730,7 @@ let We = class extends te {
               } = a;
               if (fe == null || z == null || z.length === 0 || Pe !== z)
                 continue;
-              ue = tt({
+              ue = at({
                 range: ae,
                 sheetName: fe,
                 unitId: Q
@@ -1753,7 +1759,7 @@ let We = class extends te {
             return !0;
           const F = _a(P, M, c, N);
           d.setValue(L, E, {
-            f: `=${Ye(F)}`
+            f: `=${Xe(F)}`
           });
         }), o[u] && (o[u][s] = d.getData());
       }
@@ -1761,16 +1767,16 @@ let We = class extends te {
     return { newFormulaData: o };
   }
 };
-We = Ui([
+Ke = Ui([
   me(0, xe),
   me(1, pe),
   me(2, W(_t)),
-  me(3, W(at)),
+  me(3, W(nt)),
   me(4, W(Mt)),
   me(5, qt),
   me(6, _e),
-  me(7, W(et))
-], We);
+  me(7, W(tt))
+], Ke);
 const Fi = [
   {
     functionName: jt.ARRAY_CONSTRAIN,
@@ -15145,7 +15151,7 @@ let St = class {
       ...On,
       ...Mn,
       ...xn
-    ].map((r) => r[1]), e = zi.filter((r) => n.includes(r.functionName)), a = this._configService.getConfig(it);
+    ].map((r) => r[1]), e = zi.filter((r) => n.includes(r.functionName)), a = this._configService.getConfig(rt);
     this._descriptions = e.concat((i = a == null ? void 0 : a.description) != null ? i : []);
   }
   _registerDescriptions() {
@@ -15174,7 +15180,7 @@ var ar = Object.defineProperty, nr = Object.getOwnPropertyDescriptor, ir = (n, e
   for (var r = i > 1 ? void 0 : i ? nr(e, a) : e, o = n.length - 1, u; o >= 0; o--)
     (u = n[o]) && (r = (i ? u(e, a, r) : u(r)) || r);
   return i && r && ar(e, a, r), r;
-}, Ue = (n, e) => (a, i) => e(a, i, n);
+}, Fe = (n, e) => (a, i) => e(a, i, n);
 function na(n, e, a, i) {
   const r = n.sequenceNodesBuilder(e);
   if (r == null)
@@ -15186,7 +15192,7 @@ function na(n, e, a, i) {
       continue;
     const { token: s } = f, p = se(s), { sheetName: d, unitId: L } = p;
     let E = p.range;
-    E.startAbsoluteRefType === He.ALL && E.endAbsoluteRefType === He.ALL || (E = Tt(E, a, i), o.push({
+    E.startAbsoluteRefType === Ye.ALL && E.endAbsoluteRefType === Ye.ALL || (E = Tt(E, a, i), o.push({
       unitId: L,
       sheetName: d,
       range: E
@@ -15221,7 +15227,7 @@ let Ct = class extends te {
       } else
         return p;
     });
-    return s ? `=${Ye(s)}` : "";
+    return s ? `=${Xe(s)}` : "";
   }
   registerFormula(n, e, a, i) {
     const r = /* @__PURE__ */ new Map(), o = this._lexerTreeBuilder.sequenceNodesBuilder(a), u = new Et(), m = (f) => {
@@ -15243,7 +15249,7 @@ let Ct = class extends te {
           };
         } else
           return S;
-      }), I = E && Ye(E);
+      }), I = E && Xe(E);
       return i(`=${I}`);
     };
     return o == null || o.forEach((f) => {
@@ -15266,7 +15272,7 @@ let Ct = class extends te {
     return r == null || r.forEach((u) => {
       if (typeof u == "object" && u.nodeType === J.REFERENCE) {
         const m = se(u.token), { range: f, unitId: s, sheetName: p } = m;
-        if (f.startAbsoluteRefType === He.ALL && f.endAbsoluteRefType === He.ALL)
+        if (f.startAbsoluteRefType === Ye.ALL && f.endAbsoluteRefType === Ye.ALL)
           return;
         const d = this._univerInstanceService.getUnit(s || n), L = p ? d == null ? void 0 : d.getSheetBySheetName(p) : d == null ? void 0 : d.getSheetBySheetId(e);
         if (!L)
@@ -15293,7 +15299,7 @@ let Ct = class extends te {
         if (I === E.unitId && S === E.subUnitId) {
           const N = [], R = c[0].startRow, P = c[0].startColumn, O = R - s, M = P - p;
           for (const F of E.ranges) {
-            const U = c.map((g) => ve(F, g)).filter(Boolean);
+            const U = c.map((g) => Ve(F, g)).filter(Boolean);
             U.length > 0 && N.push(...U);
           }
           N.length > 0 && L.push(
@@ -15375,10 +15381,10 @@ let Ct = class extends te {
   }
 };
 Ct = ir([
-  Ue(0, W(an)),
-  Ue(1, W(_t)),
-  Ue(2, xe),
-  Ue(3, W(et))
+  Fe(0, W(an)),
+  Fe(1, W(_t)),
+  Fe(2, xe),
+  Fe(3, W(tt))
 ], Ct);
 var rr = Object.defineProperty, or = Object.getOwnPropertyDescriptor, ur = (n, e, a, i) => {
   for (var r = i > 1 ? void 0 : i ? or(e, a) : e, o = n.length - 1, u; o >= 0; o--)
@@ -15386,7 +15392,7 @@ var rr = Object.defineProperty, or = Object.getOwnPropertyDescriptor, ur = (n, e
   return i && r && rr(e, a, r), r;
 }, mr = (n, e) => (a, i) => e(a, i, n);
 const Ut = "sheets-formula.remote-register-function.service", ga = Ot(Ut);
-let Ke = class {
+let Qe = class {
   constructor(n) {
     this._functionService = n;
   }
@@ -15398,9 +15404,9 @@ let Ke = class {
     this._functionService.unregisterDescriptions(...n);
   }
 };
-Ke = ur([
+Qe = ur([
   mr(0, gt)
-], Ke);
+], Qe);
 function fr(n, e) {
   const a = new Ca(e), i = new Function(`return ${n}`)();
   return a.calculateCustom = i, a;
@@ -15409,7 +15415,7 @@ var cr = Object.defineProperty, lr = Object.getOwnPropertyDescriptor, sr = (n, e
   for (var r = i > 1 ? void 0 : i ? lr(e, a) : e, o = n.length - 1, u; o >= 0; o--)
     (u = n[o]) && (r = (i ? u(e, a, r) : u(r)) || r);
   return i && r && cr(e, a, r), r;
-}, Fe = (n, e) => (a, i) => e(a, i, n);
+}, Be = (n, e) => (a, i) => e(a, i, n);
 const pr = Ot(
   "sheets-formula.register-function-service"
 );
@@ -15448,10 +15454,10 @@ let Dt = class extends te {
   }
 };
 Dt = sr([
-  Fe(0, W(bt)),
-  Fe(1, W(ht)),
-  Fe(2, gt),
-  Fe(3, Ga(ga))
+  Be(0, W(bt)),
+  Be(1, W(ht)),
+  Be(2, gt),
+  Be(3, Ga(ga))
 ], Dt);
 const dr = "SHEETS_FORMULA_PLUGIN";
 var Lr = Object.defineProperty, Pr = Object.getOwnPropertyDescriptor, Tr = (n, e, a, i) => {
@@ -15459,7 +15465,7 @@ var Lr = Object.defineProperty, Pr = Object.getOwnPropertyDescriptor, Tr = (n, e
     (u = n[o]) && (r = (i ? u(e, a, r) : u(r)) || r);
   return i && r && Lr(e, a, r), r;
 }, dt = (n, e) => (a, i) => e(a, i, n);
-let Qe = class extends te {
+let ke = class extends te {
   constructor(n, e, a) {
     super(), this._activeDirtyManagerService = n, this._univerInstanceService = e, this._formulaDataModel = a, this._initialize();
   }
@@ -15735,17 +15741,17 @@ let Qe = class extends te {
     return i;
   }
 };
-Qe = Tr([
+ke = Tr([
   dt(0, yt),
   dt(1, xe),
-  dt(2, W(at))
-], Qe);
+  dt(2, W(nt))
+], ke);
 var Er = Object.defineProperty, Ir = Object.getOwnPropertyDescriptor, Nr = (n, e, a, i) => {
   for (var r = i > 1 ? void 0 : i ? Ir(e, a) : e, o = n.length - 1, u; o >= 0; o--)
     (u = n[o]) && (r = (i ? u(e, a, r) : u(r)) || r);
   return i && r && Er(e, a, r), r;
 }, Lt = (n, e) => (a, i) => e(a, i, n);
-let ke = class extends te {
+let $e = class extends te {
   constructor(n, e, a) {
     super(), this._commandService = n, this._sheetInterceptorService = e, this._formulaDataModel = a, this._initialize();
   }
@@ -15791,18 +15797,18 @@ let ke = class extends te {
     );
   }
 };
-ke = Nr([
+$e = Nr([
   Lt(0, pe),
   Lt(1, W(Mt)),
-  Lt(2, W(at))
-], ke);
+  Lt(2, W(nt))
+], $e);
 var Rr = Object.defineProperty, Ar = Object.getOwnPropertyDescriptor, Sr = (n, e, a, i) => {
   for (var r = i > 1 ? void 0 : i ? Ar(e, a) : e, o = n.length - 1, u; o >= 0; o--)
     (u = n[o]) && (r = (i ? u(e, a, r) : u(r)) || r);
   return i && r && Rr(e, a, r), r;
-}, Be = (n, e) => (a, i) => e(a, i, n);
+}, ve = (n, e) => (a, i) => e(a, i, n);
 const Pt = "AllDefaultWorkbook";
-let $e = class extends te {
+let je = class extends te {
   constructor(e, a, i, r) {
     super();
     w(this, "_preUnitId", null);
@@ -15914,72 +15920,72 @@ let $e = class extends te {
     }), this._descriptionService.unregisterDescriptions(r);
   }
 };
-$e = Sr([
-  Be(0, ht),
-  Be(1, qt),
-  Be(2, xe),
-  Be(3, pe)
-], $e);
+je = Sr([
+  ve(0, ht),
+  ve(1, qt),
+  ve(2, xe),
+  ve(3, pe)
+], je);
 var Cr = Object.defineProperty, Dr = Object.getOwnPropertyDescriptor, br = (n, e, a, i) => {
   for (var r = i > 1 ? void 0 : i ? Dr(e, a) : e, o = n.length - 1, u; o >= 0; o--)
     (u = n[o]) && (r = (i ? u(e, a, r) : u(r)) || r);
   return i && r && Cr(e, a, r), r;
 }, Or = (n, e) => (a, i) => e(a, i, n);
-let je = class extends te {
+let ze = class extends te {
   constructor(n) {
     super(), this._commandService = n, [
       Un,
-      Ve
+      Ge
     ].forEach((e) => this._commandService.registerCommand(e));
   }
 };
-je = br([
+ze = br([
   Or(0, pe)
-], je);
+], ze);
 var ha = Object.defineProperty, Mr = Object.getOwnPropertyDescriptor, xr = (n, e, a) => e in n ? ha(n, e, { enumerable: !0, configurable: !0, writable: !0, value: a }) : n[e] = a, Ua = (n, e, a, i) => {
   for (var r = i > 1 ? void 0 : i ? Mr(e, a) : e, o = n.length - 1, u; o >= 0; o--)
     (u = n[o]) && (r = (i ? u(e, a, r) : u(r)) || r);
   return i && r && ha(e, a, r), r;
-}, ze = (n, e) => (a, i) => e(a, i, n), rt = (n, e, a) => xr(n, typeof e != "symbol" ? e + "" : e, a);
-let Ze = class extends ma {
+}, Ze = (n, e) => (a, i) => e(a, i, n), ot = (n, e, a) => xr(n, typeof e != "symbol" ? e + "" : e, a);
+let Je = class extends ma {
   constructor(n = xi, e, a) {
     super(), this._config = n, this._injector = e, this._configService = a;
     const { ...i } = this._config;
     this._configService.setConfig(Mi, i);
   }
   onStarting() {
-    this._injector.add([Ke]), this._injector.get(Oa).registerChannel(
+    this._injector.add([Qe]), this._injector.get(Oa).registerChannel(
       Ut,
-      gn(this._injector.get(Ke))
+      gn(this._injector.get(Qe))
     );
   }
 };
-rt(Ze, "pluginName", "SHEET_FORMULA_REMOTE_PLUGIN");
-rt(Ze, "type", ee.UNIVER_SHEET);
-Ze = Ua([
+ot(Je, "pluginName", "SHEET_FORMULA_REMOTE_PLUGIN");
+ot(Je, "type", ee.UNIVER_SHEET);
+Je = Ua([
   ua(Da),
-  ze(1, W(et)),
-  ze(2, _e)
-], Ze);
-let Je = class extends ma {
+  Ze(1, W(tt)),
+  Ze(2, _e)
+], Je);
+let et = class extends ma {
   constructor(n = Oi, e, a) {
     super(), this._config = n, this._injector = e, this._configService = a;
     const { ...i } = this._config;
-    this._configService.setConfig(it, i);
+    this._configService.setConfig(rt, i);
   }
   onStarting() {
     const n = this._injector, e = [
       [pr, { useClass: Dt }],
       [ht, { useClass: St }],
-      [je],
+      [ze],
       [Ct],
-      [we],
-      [ke],
-      [be],
       [We],
-      [Qe],
       [$e],
-      [Xe]
+      [be],
+      [Ke],
+      [ke],
+      [je],
+      [we]
     ];
     if (this._config.notExecuteFormula) {
       const a = n.get(Oa);
@@ -15991,30 +15997,30 @@ let Je = class extends ma {
   }
   onReady() {
     ye(this._injector, [
-      [je],
-      [Qe],
+      [ze],
       [ke],
-      [We],
-      [Xe]
+      [$e],
+      [Ke],
+      [we]
     ]), vt() && ye(this._injector, [
       [be]
     ]);
   }
   onRendered() {
     ye(this._injector, [
-      [$e]
+      [je]
     ]), vt() || ye(this._injector, [
       [be]
     ]);
   }
 };
-rt(Je, "pluginName", dr);
-rt(Je, "type", ee.UNIVER_SHEET);
-Je = Ua([
+ot(et, "pluginName", dr);
+ot(et, "type", ee.UNIVER_SHEET);
+et = Ua([
   ua(Da, mn),
-  ze(1, W(et)),
-  ze(2, _e)
-], Je);
+  Ze(1, W(tt)),
+  Ze(2, _e)
+], et);
 export {
   ne as CalculationMode,
   St as DescriptionService,
@@ -16023,14 +16029,14 @@ export {
   pr as IRegisterFunctionService,
   ga as IRemoteRegisterFunctionService,
   Un as InsertFunctionCommand,
-  Ve as OtherFormulaMarkDirty,
-  it as PLUGIN_CONFIG_KEY_BASE,
+  Ge as OtherFormulaMarkDirty,
+  rt as PLUGIN_CONFIG_KEY_BASE,
   Dt as RegisterFunctionService,
-  we as RegisterOtherFormulaService,
-  Ke as RemoteRegisterFunctionService,
+  We as RegisterOtherFormulaService,
+  Qe as RemoteRegisterFunctionService,
   be as TriggerCalculationController,
-  Ze as UniverRemoteSheetsFormulaPlugin,
-  Je as UniverSheetsFormulaPlugin,
-  Xe as UpdateDefinedNameController,
-  We as UpdateFormulaController
+  Je as UniverRemoteSheetsFormulaPlugin,
+  et as UniverSheetsFormulaPlugin,
+  we as UpdateDefinedNameController,
+  Ke as UpdateFormulaController
 };