@univerjs/sheets-formula 0.12.4 → 0.13.0-insiders.20251216-1519cb7

package/lib/es/index.js

@@ -1,12 +1,12 @@
-var en = Object.defineProperty;
-var tn = (n, e, a) => e in n ? en(n, e, { enumerable: !0, configurable: !0, writable: !0, value: a }) : n[e] = a;
-var w = (n, e, a) => tn(n, typeof e != "symbol" ? e + "" : e, a);
-import { CommandType as Yt, ICommandService as re, ObjectMatrix as v, generateRandomId as Xt, IUniverInstanceService as Ee, Rectangle as fe, sequenceExecuteAsync as an, Inject as H, Disposable as z, CellValueType as gt, createDocumentModelWithStyle as nn, WrapTextType as rn, PositionedObjectLayoutType as on, BooleanNumber as un, ObjectRelativeFromV as mn, ObjectRelativeFromH as fn, ImageSourceType as cn, DrawingTypeEnum as ln, BuildTextUtils as sn, InterceptorEffectEnum as ht, LifecycleService as dn, ILogService as pn, IConfigService as be, LocaleService as Wt, isFormulaString as ye, isFormulaId as Ia, cellToRange as Na, Tools as Ke, Direction as Qe, getIntersectRange as ke, RANGE_TYPE as W, UniverInstanceType as j, Injector as st, isRealNum as Ln, createIdentifier as Kt, toDisposable as ee, moveRangeByOffset as qt, DisposableCollection as $e, AbsoluteRefType as je, Optional as Pn, DependentOn as Ra, Plugin as Sa, merge as Aa, touchDependencies as ve, isNodeEnv as jt } from "@univerjs/core";
-import { SetRangeValuesCommand as Ca, SheetsSelectionsService as Tn, getSheetCommandTarget as En, findFirstNonEmptyCell as In, alignToMergedCellsBorders as Rt, expandToContinuousRange as Nn, SetSelectionsOperation as Rn, SheetInterceptorService as dt, INTERCEPTOR_POINT as Da, InterceptCellContentPriority as Sn, SetRangeValuesMutation as Q, SetStyleCommand as kt, SetBorderCommand as ba, ClearSelectionFormatCommand as Oa, handleMoveCols as Ma, EffectRefRangId as Y, runRefRangeMutations as X, handleMoveRows as xa, handleMoveRange as _a, handleInsertRangeMoveRight as ya, handleInsertRangeMoveDown as ga, handleDeleteRangeMoveUp as ha, handleDeleteRangeMoveLeft as qa, handleIRemoveCol as Ua, handleIRemoveRow as Fa, handleInsertCol as Ba, handleInsertRow as va, RemoveDefinedNameCommand as Va, SetDefinedNameCommand as Ga, RemoveSheetCommand as An, SetWorksheetNameCommand as Cn, DeleteRangeMoveLeftCommand as Dn, DeleteRangeMoveUpCommand as bn, RemoveColCommand as On, RemoveRowCommand as Mn, InsertRangeMoveDownCommand as xn, InsertRangeMoveRightCommand as _n, InsertColCommand as yn, InsertRowCommand as gn, MoveColsCommand as hn, MoveRowsCommand as qn, MoveRangeCommand as Un, RemoveSheetMutation as Ut, InsertSheetMutation as Ft, MoveRangeMutation as zt, MoveRowsMutation as Zt, MoveColsMutation as Jt, ReorderRangeMutation as ea, RemoveRowMutation as ta, RemoveColMutation as aa, InsertColMutation as na, InsertRowMutation as ia, SetRowHiddenMutation as ra, SetRowVisibleMutation as oa, SetWorksheetActiveOperation as Ha, SCOPE_WORKBOOK_VALUE_DEFINED_NAME as St, RefRangeService as Fn, handleDefaultRangeChangeWithEffectRefCommands as ua, getSeparateEffectedRangesOnCommand as Bn, handleCommonDefaultRangeChangeWithEffectRefCommands as vn, UniverSheetsPlugin as Vn } from "@univerjs/sheets";
-import { serializeRange as Ce, FormulaDataModel as qe, ErrorType as k, SetImageFormulaDataMutation as Gn, IActiveDirtyManagerService as Qt, SetFormulaCalculationResultMutation as wa, RemoveOtherFormulaMutation as Hn, SetOtherFormulaMutation as wn, SetFormulaCalculationStartMutation as Ne, SetFormulaCalculationStopMutation as ma, ENGINE_FORMULA_CYCLE_REFERENCE_COUNT as fa, SetFormulaCalculationNotificationMutation as Yn, FormulaExecuteStageType as Ve, FormulaExecutedStateType as Me, sequenceNodeType as ie, deserializeRangeWithSheetWithCache as Pe, serializeRangeToRefString as pt, IDefinedNamesService as Lt, LexerTreeBuilder as Pt, generateStringWithSequence as ze, SetDefinedNameMutation as De, SetFormulaDataMutation as Ge, SetArrayFormulaDataMutation as Bt, initSheetFormulaData as ca, RemoveDefinedNameMutation as vt, IFunctionService as Tt, stripErrorMargin as Xn, FunctionType as t, FUNCTION_NAMES_ARRAY as la, FUNCTION_NAMES_COMPATIBILITY as _, FUNCTION_NAMES_CUBE as de, FUNCTION_NAMES_DATABASE as $, FUNCTION_NAMES_DATE as V, FUNCTION_NAMES_ENGINEERING as C, FUNCTION_NAMES_FINANCIAL as D, FUNCTION_NAMES_INFORMATION as G, FUNCTION_NAMES_LOGICAL as K, FUNCTION_NAMES_LOOKUP as g, FUNCTION_NAMES_MATH as E, FUNCTION_NAMES_STATISTICAL as s, FUNCTION_NAMES_TEXT as b, FUNCTION_NAMES_WEB as At, isReferenceStrings as Wn, functionArray as Kn, functionCompatibility as kn, functionCube as Qn, functionDatabase as $n, functionDate as jn, functionEngineering as zn, functionFinancial as Zn, functionInformation as Jn, functionLogical as ei, functionLookup as ti, functionMath as ai, functionMeta as ni, functionStatistical as ii, functionText as ri, functionUniver as oi, functionWeb as ui, SetSuperTableMutation as mi, RemoveSuperTableMutation as fi, serializeRangeWithSheet as Ze, ISuperTableService as ci, serializeRangeWithSpreadsheet as sa, CustomFunction as Vt, AsyncCustomFunction as Ya, UniverFormulaEnginePlugin as Xa, IFormulaCurrentConfigService as li, Lexer as si, AstTreeBuilder as di, Interpreter as pi, generateExecuteAstNodeData as Li, getObjectValue as Pi } from "@univerjs/engine-formula";
-import { Subject as da, BehaviorSubject as Wa, bufferWhen as Ti, filter as pa, map as Ei } from "rxjs";
-import { IRPCChannelService as Ka, fromModule as Ii, toModule as Ni } from "@univerjs/rpc";
-const Ri = {
+var Ja = Object.defineProperty;
+var en = (n, e, a) => e in n ? Ja(n, e, { enumerable: !0, configurable: !0, writable: !0, value: a }) : n[e] = a;
+var w = (n, e, a) => en(n, typeof e != "symbol" ? e + "" : e, a);
+import { CommandType as Yt, ICommandService as re, ObjectMatrix as v, generateRandomId as Xt, IUniverInstanceService as Ie, Rectangle as fe, sequenceExecuteAsync as tn, Inject as H, Disposable as z, CellValueType as gt, createDocumentModelWithStyle as an, WrapTextType as nn, PositionedObjectLayoutType as rn, BooleanNumber as on, ObjectRelativeFromV as un, ObjectRelativeFromH as mn, ImageSourceType as fn, DrawingTypeEnum as cn, BuildTextUtils as ln, InterceptorEffectEnum as ht, LifecycleService as sn, ILogService as dn, IConfigService as be, LocaleService as Wt, isFormulaString as ye, isFormulaId as Ea, cellToRange as Ia, Tools as Ke, Direction as Qe, getIntersectRange as ke, RANGE_TYPE as W, UniverInstanceType as j, Injector as st, isRealNum as pn, createIdentifier as Kt, toDisposable as ee, moveRangeByOffset as qt, DisposableCollection as $e, AbsoluteRefType as je, Optional as Ln, DependentOn as Na, Plugin as Ra, merge as Sa, touchDependencies as ve, isNodeEnv as jt } from "@univerjs/core";
+import { SetRangeValuesCommand as Aa, SheetsSelectionsService as Pn, getSheetCommandTarget as Tn, findFirstNonEmptyCell as En, alignToMergedCellsBorders as Rt, expandToContinuousRange as In, SetSelectionsOperation as Nn, SheetInterceptorService as dt, INTERCEPTOR_POINT as Ca, InterceptCellContentPriority as Rn, SetRangeValuesMutation as Q, SetStyleCommand as kt, SetBorderCommand as Da, ClearSelectionFormatCommand as ba, handleMoveCols as Oa, EffectRefRangId as Y, runRefRangeMutations as X, handleMoveRows as Ma, handleMoveRange as xa, handleInsertRangeMoveRight as _a, handleInsertRangeMoveDown as ya, handleDeleteRangeMoveUp as ga, handleDeleteRangeMoveLeft as ha, handleIRemoveCol as qa, handleIRemoveRow as Ua, handleInsertCol as Fa, handleInsertRow as Ba, RemoveDefinedNameCommand as va, SetDefinedNameCommand as Va, RemoveSheetCommand as Sn, SetWorksheetNameCommand as An, DeleteRangeMoveLeftCommand as Cn, DeleteRangeMoveUpCommand as Dn, RemoveColCommand as bn, RemoveRowCommand as On, InsertRangeMoveDownCommand as Mn, InsertRangeMoveRightCommand as xn, InsertColCommand as _n, InsertRowCommand as yn, MoveColsCommand as gn, MoveRowsCommand as hn, MoveRangeCommand as qn, RemoveSheetMutation as Ut, InsertSheetMutation as Ft, MoveRangeMutation as zt, MoveRowsMutation as Zt, MoveColsMutation as Jt, ReorderRangeMutation as ea, RemoveRowMutation as ta, RemoveColMutation as aa, InsertColMutation as na, InsertRowMutation as ia, SetRowHiddenMutation as ra, SetRowVisibleMutation as oa, SetWorksheetActiveOperation as Ga, SCOPE_WORKBOOK_VALUE_DEFINED_NAME as St, RefRangeService as Un, handleDefaultRangeChangeWithEffectRefCommands as ua, getSeparateEffectedRangesOnCommand as Fn, handleCommonDefaultRangeChangeWithEffectRefCommands as Bn, UniverSheetsPlugin as vn } from "@univerjs/sheets";
+import { serializeRange as Ce, FormulaDataModel as qe, ErrorType as k, SetImageFormulaDataMutation as Vn, IActiveDirtyManagerService as Qt, SetFormulaCalculationResultMutation as Ha, RemoveOtherFormulaMutation as Gn, SetOtherFormulaMutation as Hn, SetFormulaCalculationStartMutation as Pe, SetFormulaStringBatchCalculationMutation as wn, ENGINE_FORMULA_RETURN_DEPENDENCY_TREE as Yn, ENGINE_FORMULA_CYCLE_REFERENCE_COUNT as Xn, SetFormulaCalculationStopMutation as ma, SetFormulaCalculationNotificationMutation as Wn, FormulaExecuteStageType as Ve, FormulaExecutedStateType as Me, sequenceNodeType as ie, deserializeRangeWithSheetWithCache as Te, serializeRangeToRefString as pt, IDefinedNamesService as Lt, LexerTreeBuilder as Pt, generateStringWithSequence as ze, SetDefinedNameMutation as De, SetFormulaDataMutation as Ge, SetArrayFormulaDataMutation as Bt, initSheetFormulaData as fa, RemoveDefinedNameMutation as vt, IFunctionService as Tt, stripErrorMargin as Kn, FunctionType as t, FUNCTION_NAMES_ARRAY as ca, FUNCTION_NAMES_COMPATIBILITY as _, FUNCTION_NAMES_CUBE as de, FUNCTION_NAMES_DATABASE as $, FUNCTION_NAMES_DATE as V, FUNCTION_NAMES_ENGINEERING as C, FUNCTION_NAMES_FINANCIAL as D, FUNCTION_NAMES_INFORMATION as G, FUNCTION_NAMES_LOGICAL as K, FUNCTION_NAMES_LOOKUP as g, FUNCTION_NAMES_MATH as E, FUNCTION_NAMES_STATISTICAL as s, FUNCTION_NAMES_TEXT as b, FUNCTION_NAMES_WEB as At, isReferenceStrings as kn, functionArray as Qn, functionCompatibility as $n, functionCube as jn, functionDatabase as zn, functionDate as Zn, functionEngineering as Jn, functionFinancial as ei, functionInformation as ti, functionLogical as ai, functionLookup as ni, functionMath as ii, functionMeta as ri, functionStatistical as oi, functionText as ui, functionUniver as mi, functionWeb as fi, SetSuperTableMutation as ci, RemoveSuperTableMutation as li, serializeRangeWithSheet as Ze, ISuperTableService as si, serializeRangeWithSpreadsheet as la, CustomFunction as Vt, AsyncCustomFunction as wa, UniverFormulaEnginePlugin as Ya, IFormulaCurrentConfigService as di, Lexer as pi, AstTreeBuilder as Li, Interpreter as Pi, generateExecuteAstNodeData as Ti, getObjectValue as Ei } from "@univerjs/engine-formula";
+import { Subject as sa, BehaviorSubject as Xa, bufferWhen as Ii, filter as da, map as Ni } from "rxjs";
+import { IRPCChannelService as Wa, fromModule as Ri, toModule as Si } from "@univerjs/rpc";
+const Ai = {
   id: "formula.command.insert-function",
   type: Yt.COMMAND,
   handler: async (n, e) => {
@@ -32,21 +32,21 @@ const Ri = {
     const u = {
       value: o.getData()
     };
-    return r.executeCommand(Ca.id, u);
+    return r.executeCommand(Aa.id, u);
   }
-}, Si = {
+}, Ci = {
   id: "sheets-formula.command.quick-sum",
   type: Yt.COMMAND,
   handler: async (n) => {
-    const a = n.get(Tn).getCurrentLastSelection();
+    const a = n.get(Pn).getCurrentLastSelection();
     if (!a) return !1;
-    const i = n.get(Ee), r = En(i);
+    const i = n.get(Ie), r = Tn(i);
     if (!r) return !1;
     const o = a.range, { worksheet: u } = r;
-    let f = In(o, u);
+    let f = En(o, u);
     if (!f) return !1;
     f = Rt(f, u);
-    const m = Nn({
+    const m = In({
       startRow: f.startRow,
       startColumn: f.startColumn,
       endRow: o.endRow,
@@ -84,16 +84,16 @@ const Ri = {
           })})`
         });
     const T = n.get(re);
-    return (await an([
+    return (await tn([
       {
-        id: Ca.id,
+        id: Aa.id,
         params: {
           range: m,
           value: c.getMatrix()
         }
       },
       {
-        id: Rn.id,
+        id: Nn.id,
         params: {
           unitId: r.unitId,
           subUnitId: r.subUnitId,
@@ -113,10 +113,10 @@ const Ri = {
     return !0;
   }
 }, Ue = "sheets-formula.base.config";
-var Te = /* @__PURE__ */ ((n) => (n[n.FORCED = 0] = "FORCED", n[n.WHEN_EMPTY = 1] = "WHEN_EMPTY", n[n.NO_CALCULATION = 2] = "NO_CALCULATION", n))(Te || {});
-const La = {}, Ai = "sheets-formula.remote.config", Pa = {};
-var Ci = Object.getOwnPropertyDescriptor, Di = (n, e, a, i) => {
-  for (var r = i > 1 ? void 0 : i ? Ci(e, a) : e, o = n.length - 1, u; o >= 0; o--)
+var Ee = /* @__PURE__ */ ((n) => (n[n.FORCED = 0] = "FORCED", n[n.WHEN_EMPTY = 1] = "WHEN_EMPTY", n[n.NO_CALCULATION = 2] = "NO_CALCULATION", n))(Ee || {});
+const pa = {}, Di = "sheets-formula.remote.config", La = {};
+var bi = Object.getOwnPropertyDescriptor, Oi = (n, e, a, i) => {
+  for (var r = i > 1 ? void 0 : i ? bi(e, a) : e, o = n.length - 1, u; o >= 0; o--)
     (u = n[o]) && (r = u(r) || r);
   return r;
 }, Ct = (n, e) => (a, i) => e(a, i, n);
@@ -136,7 +136,7 @@ let Je = class extends z {
   _commandExecutedListener() {
     this.disposeWithMe(
       this._commandService.onCommandExecuted(async (e) => {
-        if (e.id === Gn.id) {
+        if (e.id === Vn.id) {
           const a = e.params;
           if (!a) return;
           const { imageFormulaData: i } = a;
@@ -155,8 +155,8 @@ let Je = class extends z {
   // eslint-disable-next-line max-lines-per-function
   _initInterceptorCellContent() {
     this.disposeWithMe(
-      this._sheetInterceptorService.intercept(Da.CELL_CONTENT, {
-        priority: Sn.CELL_IMAGE,
+      this._sheetInterceptorService.intercept(Ca.CELL_CONTENT, {
+        priority: Rn.CELL_IMAGE,
         effect: ht.Value | ht.Style,
         // eslint-disable-next-line max-lines-per-function
         handler: (e, a, i) => {
@@ -176,12 +176,12 @@ let Je = class extends z {
           } = c;
           if (L)
             return i(this._errorValueCell);
-          const N = T || I, d = p || A, S = nn("", {}), R = {
+          const N = T || I, d = p || A, S = an("", {}), R = {
             unitId: r,
             subUnitId: o,
             drawingId: Xt(),
-            drawingType: ln.DRAWING_IMAGE,
-            imageSourceType: cn.URL,
+            drawingType: cn.DRAWING_IMAGE,
+            imageSourceType: fn.URL,
             source: l,
             transform: {
               left: 0,
@@ -195,26 +195,26 @@ let Je = class extends z {
                 height: d
               },
               positionH: {
-                relativeFrom: fn.PAGE,
+                relativeFrom: mn.PAGE,
                 posOffset: 0
               },
               positionV: {
-                relativeFrom: mn.PARAGRAPH,
+                relativeFrom: un.PARAGRAPH,
                 posOffset: 0
               },
               angle: 0
             },
-            behindDoc: un.FALSE,
+            behindDoc: on.FALSE,
             title: "",
             description: "",
-            layoutType: on.INLINE,
+            layoutType: rn.INLINE,
             // Insert inline drawing by default.
-            wrapText: rn.BOTH_SIDES,
+            wrapText: nn.BOTH_SIDES,
             distB: 0,
             distL: 0,
             distR: 0,
             distT: 0
-          }, P = sn.drawing.add({
+          }, P = ln.drawing.add({
             documentDataModel: S,
             drawings: [R],
             selection: {
@@ -262,13 +262,13 @@ let Je = class extends z {
     this._refreshRender = e;
   }
 };
-Je = Di([
+Je = Oi([
   Ct(0, re),
   Ct(1, H(dt)),
   Ct(2, H(qe))
 ], Je);
-var Re = /* @__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))(Re || {}), bi = Object.getOwnPropertyDescriptor, Oi = (n, e, a, i) => {
-  for (var r = i > 1 ? void 0 : i ? bi(e, a) : e, o = n.length - 1, u; o >= 0; o--)
+var Re = /* @__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))(Re || {}), Mi = Object.getOwnPropertyDescriptor, xi = (n, e, a, i) => {
+  for (var r = i > 1 ? void 0 : i ? Mi(e, a) : e, o = n.length - 1, u; o >= 0; o--)
     (u = n[o]) && (r = u(r) || r);
   return r;
 }, Dt = (n, e) => (a, i) => e(a, i, n);
@@ -276,12 +276,12 @@ let et = class extends z {
   constructor(e, a, i) {
     super();
     w(this, "_formulaCacheMap", /* @__PURE__ */ new Map());
-    w(this, "_formulaChangeWithRange$", new da());
+    w(this, "_formulaChangeWithRange$", new sa());
     w(this, "formulaChangeWithRange$", this._formulaChangeWithRange$.asObservable());
     // FIXME: this design could be improved.
-    w(this, "_formulaResult$", new da());
+    w(this, "_formulaResult$", new sa());
     w(this, "formulaResult$", this._formulaResult$.asObservable());
-    w(this, "calculateStarted$", new Wa(!1));
+    w(this, "calculateStarted$", new Xa(!1));
     this._commandService = e, this._activeDirtyManagerService = a, this._lifecycleService = i, this._initFormulaRegister(), this._initFormulaCalculationResultChange();
   }
   dispose() {
@@ -322,7 +322,7 @@ let et = class extends z {
           }
         }
       };
-      this._commandService.executeCommand(wn.id, c).then(() => {
+      this._commandService.executeCommand(Hn.id, c).then(() => {
         this._commandService.executeCommand(
           _e.id,
           { [i]: { [r]: { [u]: !0 } } }
@@ -330,14 +330,14 @@ let et = class extends z {
       });
     };
     this.disposeWithMe(
-      this._formulaChangeWithRange$.pipe(Ti(() => this.calculateStarted$.pipe(pa((a) => a)))).subscribe((a) => a.forEach(e))
+      this._formulaChangeWithRange$.pipe(Ii(() => this.calculateStarted$.pipe(da((a) => a)))).subscribe((a) => a.forEach(e))
     ), this.disposeWithMe(
-      this._formulaChangeWithRange$.pipe(pa(() => this.calculateStarted$.getValue())).subscribe(e)
+      this._formulaChangeWithRange$.pipe(da(() => this.calculateStarted$.getValue())).subscribe(e)
     );
   }
   _initFormulaCalculationResultChange() {
     this.disposeWithMe(this._commandService.onCommandExecuted((e) => {
-      if (e.id === wa.id) {
+      if (e.id === Ha.id) {
         const a = e.params, { unitOtherData: i } = a, r = {};
         for (const o in i) {
           const u = i[o], f = {};
@@ -388,7 +388,7 @@ let et = class extends z {
       subUnitId: a,
       formulaIdList: i
     };
-    this._commandService.executeCommand(Hn.id, r);
+    this._commandService.executeCommand(Gn.id, r);
     const o = this._ensureCacheMap(e, a);
     i.forEach((u) => o.delete(u));
   }
@@ -411,17 +411,17 @@ let et = class extends z {
     ));
   }
 };
-et = Oi([
+et = xi([
   Dt(0, re),
   Dt(1, Qt),
-  Dt(2, H(dn))
+  Dt(2, H(sn))
 ], et);
-var Mi = Object.getOwnPropertyDescriptor, xi = (n, e, a, i) => {
-  for (var r = i > 1 ? void 0 : i ? Mi(e, a) : e, o = n.length - 1, u; o >= 0; o--)
+var _i = Object.getOwnPropertyDescriptor, yi = (n, e, a, i) => {
+  for (var r = i > 1 ? void 0 : i ? _i(e, a) : e, o = n.length - 1, u; o >= 0; o--)
     (u = n[o]) && (r = u(r) || r);
   return r;
 }, pe = (n, e) => (a, i) => e(a, i, n);
-const Ta = { done: 0, count: 0 }, bt = { onlyLocal: !0 };
+const Pa = { done: 0, count: 0 }, bt = { onlyLocal: !0 };
 let ge = class extends z {
   constructor(e, a, i, r, o, u, f) {
     super();
@@ -445,7 +445,7 @@ let ge = class extends z {
      * The mark of forced calculation. If a new mutation triggers dirty area calculation during the forced calculation process, forced calculation is still required.
      */
     w(this, "_forceCalculating", !1);
-    w(this, "_progress$", new Wa(Ta));
+    w(this, "_progress$", new Xa(Pa));
     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 = f, this._commandExecutedListener(), this._initialExecuteFormulaProcessListener(), this._initialExecuteFormula();
   }
@@ -474,19 +474,23 @@ let ge = class extends z {
     this._doneCalculationTaskCount = 0, this._totalCalculationTaskCount = 0, this._emitProgress();
   }
   dispose() {
-    super.dispose(), this._progress$.next(Ta), this._progress$.complete(), clearTimeout(this._setTimeoutKey);
+    super.dispose(), this._progress$.next(Pa), this._progress$.complete(), clearTimeout(this._setTimeoutKey);
   }
   _getCalculationMode() {
     var a;
     const e = this._configService.getConfig(Ue);
-    return (a = e == null ? void 0 : e.initialFormulaComputing) != null ? a : Te.WHEN_EMPTY;
+    return (a = e == null ? void 0 : e.initialFormulaComputing) != null ? a : Ee.WHEN_EMPTY;
   }
   _commandExecutedListener() {
     this.disposeWithMe(
       this._commandService.beforeCommandExecuted((e) => {
-        if (e.id === Ne.id) {
+        if (e.id === Pe.id || e.id === wn.id) {
           const a = e.params;
-          a.rowData = this._formulaDataModel.getHiddenRowsFiltered();
+          if (e.id === Pe.id) {
+            const i = this._configService.getConfig(Yn) || !1;
+            a.isCalculateTreeModel = i;
+          }
+          a.maxIteration = this._configService.getConfig(Xn), a.rowData = this._formulaDataModel.getHiddenRowsFiltered();
         }
       })
     ), this.disposeWithMe(
@@ -494,12 +498,12 @@ let ge = class extends z {
         if (this._activeDirtyManagerService.get(e.id)) {
           if (e.id === Q.id) {
             const i = e.params;
-            if (a && a.onlyLocal === !0 || i.trigger === kt.id || i.trigger === ba.id || i.trigger === Oa.id)
+            if (a && a.onlyLocal === !0 || i.trigger === kt.id || i.trigger === Da.id || i.trigger === ba.id)
               return;
           }
           this._waitingCommandQueue.push(e), clearTimeout(this._setTimeoutKey), this._setTimeoutKey = setTimeout(() => {
             const i = this._generateDirty(this._waitingCommandQueue);
-            this._executingDirtyData = this._mergeDirty(this._executingDirtyData, i), this._executionInProgressParams == null ? this._commandService.executeCommand(Ne.id, { ...this._executingDirtyData }, bt) : (this._restartCalculation = !0, this._commandService.executeCommand(ma.id, {})), this._waitingCommandQueue = [];
+            this._executingDirtyData = this._mergeDirty(this._executingDirtyData, i), this._executionInProgressParams == null ? this._commandService.executeCommand(Pe.id, { ...this._executingDirtyData }, bt) : (this._restartCalculation = !0, this._commandService.executeCommand(ma.id, {})), this._waitingCommandQueue = [];
           }, 100);
         }
       })
@@ -521,24 +525,20 @@ let ge = class extends z {
       dirtyUnitFeatureMap: o,
       dirtyUnitOtherFormulaMap: u,
       forceCalculation: !1,
-      clearDependencyTreeCache: f,
-      maxIteration: this._configService.getConfig(fa)
+      clearDependencyTreeCache: f
       // numfmtItemMap,
     };
   }
   _mergeDirty(e, a) {
     const i = [...e.dirtyRanges, ...a.dirtyRanges], r = { ...e.dirtyNameMap }, o = { ...e.dirtyDefinedNameMap }, u = { ...e.dirtyUnitFeatureMap }, f = { ...e.dirtyUnitOtherFormulaMap }, m = { ...e.clearDependencyTreeCache };
-    this._mergeDirtyNameMap(r, a.dirtyNameMap), this._mergeDirtyNameMap(o, a.dirtyDefinedNameMap), this._mergeDirtyUnitFeatureOrOtherFormulaMap(u, a.dirtyUnitFeatureMap), this._mergeDirtyUnitFeatureOrOtherFormulaMap(f, a.dirtyUnitOtherFormulaMap), this._mergeDirtyNameMap(m, a.clearDependencyTreeCache);
-    const c = e.maxIteration || a.maxIteration;
-    return {
+    return this._mergeDirtyNameMap(r, a.dirtyNameMap), this._mergeDirtyNameMap(o, a.dirtyDefinedNameMap), this._mergeDirtyUnitFeatureOrOtherFormulaMap(u, a.dirtyUnitFeatureMap), this._mergeDirtyUnitFeatureOrOtherFormulaMap(f, a.dirtyUnitOtherFormulaMap), this._mergeDirtyNameMap(m, a.clearDependencyTreeCache), {
       dirtyRanges: i,
       dirtyNameMap: r,
       dirtyDefinedNameMap: o,
       dirtyUnitFeatureMap: u,
       dirtyUnitOtherFormulaMap: f,
       forceCalculation: !!this._forceCalculating,
-      clearDependencyTreeCache: m,
-      maxIteration: c
+      clearDependencyTreeCache: m
     };
   }
   /**
@@ -583,11 +583,11 @@ let ge = class extends z {
     this.disposeWithMe(
       // eslint-disable-next-line max-lines-per-function, complexity
       this._commandService.onCommandExecuted((i) => {
-        if (i.id === Ne.id) {
+        if (i.id === Pe.id) {
           const { forceCalculation: o = !1 } = i.params;
           o && (this._forceCalculating = !0);
         } else i.id === ma.id && this.clearProgress();
-        if (i.id !== Yn.id)
+        if (i.id !== Wn.id)
           return;
         const r = i.params;
         if (r.stageInfo != null) {
@@ -630,7 +630,7 @@ let ge = class extends z {
               break;
           }
           (a === 0 || a === -1) && (e ? (clearTimeout(e), e = null, this.clearProgress()) : this._completeProgress(), a = 0, this._doneCalculationTaskCount = 0, this._totalCalculationTaskCount = 0, this._forceCalculating = !1), o === Me.STOP_EXECUTION && this._restartCalculation ? (this._restartCalculation = !1, this._commandService.executeCommand(
-            Ne.id,
+            Pe.id,
             {
               ...this._executingDirtyData
             },
@@ -653,10 +653,10 @@ let ge = class extends z {
   }
   _initialExecuteFormula() {
     const e = this._getCalculationMode(), a = this._getDirtyDataByCalculationMode(e);
-    this._commandService.executeCommand(Ne.id, a, bt), this._registerOtherFormulaService.calculateStarted$.next(!0);
+    this._commandService.executeCommand(Pe.id, a, bt), this._registerOtherFormulaService.calculateStarted$.next(!0);
   }
   _getDirtyDataByCalculationMode(e) {
-    const a = e === Te.FORCED, i = e === Te.WHEN_EMPTY ? this._formulaDataModel.getFormulaDirtyRanges() : [];
+    const a = e === Ee.FORCED, i = e === Ee.WHEN_EMPTY ? this._formulaDataModel.getFormulaDirtyRanges() : [];
     return {
       forceCalculation: a,
       dirtyRanges: i,
@@ -664,21 +664,20 @@ let ge = class extends z {
       dirtyDefinedNameMap: {},
       dirtyUnitFeatureMap: {},
       dirtyUnitOtherFormulaMap: {},
-      clearDependencyTreeCache: {},
-      maxIteration: this._configService.getConfig(fa)
+      clearDependencyTreeCache: {}
     };
   }
 };
-ge = xi([
+ge = yi([
   pe(0, re),
   pe(1, Qt),
-  pe(2, pn),
+  pe(2, dn),
   pe(3, be),
   pe(4, H(qe)),
   pe(5, H(Wt)),
   pe(6, H(et))
 ], ge);
-function _i(n, e, a) {
+function gi(n, e, a) {
   var i;
   return n == null || n[e] == null || ((i = n[e]) == null ? void 0 : i[a]) == null;
 }
@@ -697,18 +696,18 @@ function Ot(n, e, a) {
     };
 }
 var y = /* @__PURE__ */ ((n) => (n[n.MoveRange = 0] = "MoveRange", n[n.MoveRows = 1] = "MoveRows", n[n.MoveCols = 2] = "MoveCols", n[n.InsertRow = 3] = "InsertRow", n[n.InsertColumn = 4] = "InsertColumn", n[n.RemoveRow = 5] = "RemoveRow", n[n.RemoveColumn = 6] = "RemoveColumn", n[n.DeleteMoveLeft = 7] = "DeleteMoveLeft", n[n.DeleteMoveUp = 8] = "DeleteMoveUp", n[n.InsertMoveDown = 9] = "InsertMoveDown", n[n.InsertMoveRight = 10] = "InsertMoveRight", n[n.SetName = 11] = "SetName", n[n.RemoveSheet = 12] = "RemoveSheet", n[n.SetDefinedName = 13] = "SetDefinedName", n[n.RemoveDefinedName = 14] = "RemoveDefinedName", n))(y || {});
-const yi = [
+const hi = [
   11,
   12,
   13,
   14
   /* RemoveDefinedName */
 ];
-function gi(n, e, a) {
+function qi(n, e, a) {
   const { type: i } = a;
-  return yi.includes(i) ? hi(n, e) : qi(n, e, a);
+  return hi.includes(i) ? Ui(n, e) : Fi(n, e, a);
 }
-function hi(n, e) {
+function Ui(n, e) {
   const a = [], i = [];
   return Object.keys(e).forEach((r) => {
     const o = e[r], u = n[r];
@@ -747,8 +746,8 @@ function hi(n, e) {
     redos: i
   };
 }
-function qi(n, e, a) {
-  const { redoFormulaData: i, undoFormulaData: r } = Ui(n, e, a), o = [], u = [];
+function Fi(n, e, a) {
+  const { redoFormulaData: i, undoFormulaData: r } = Bi(n, e, a), o = [], u = [];
   return Object.keys(i).forEach((f) => {
     Object.keys(i[f]).forEach((m) => {
       if (Object.keys(i[f][m]).length !== 0) {
@@ -782,10 +781,10 @@ function qi(n, e, a) {
     redos: o
   };
 }
-function Ui(n, e, a) {
+function Bi(n, e, a) {
   const i = {}, r = {}, { unitId: o, sheetId: u } = a;
   return (/* @__PURE__ */ new Set([...Object.keys(n), ...Object.keys(e)])).forEach((m) => {
-    if (_i(n, m, u))
+    if (gi(n, m, u))
       return;
     (/* @__PURE__ */ new Set([
       ...Object.keys(n[m] || {}),
@@ -794,8 +793,8 @@ function Ui(n, e, a) {
       var S, R;
       const p = (S = n[m]) == null ? void 0 : S[l], T = (R = e[m]) == null ? void 0 : R[l], L = new v(p || {}), I = new v(T || {});
       let A = [];
-      m !== o || l !== u ? A = Bi(I) : A = Fi(L, I, a);
-      const N = zi(A, L, I), d = Zi(A, L);
+      m !== o || l !== u ? A = Vi(I) : A = vi(L, I, a);
+      const N = Ji(A, L, I), d = er(A, L);
       i[m] || (i[m] = {}), r[m] || (r[m] = {}), i[m][l] = {
         ...i[m][l],
         ...N
@@ -809,11 +808,11 @@ function Ui(n, e, a) {
     undoFormulaData: r
   };
 }
-function Fi(n, e, a) {
+function vi(n, e, a) {
   const { type: i, from: r, to: o, range: u } = a, f = [];
   return n.forValue((m, c, l) => {
-    if (l == null || !ka(l)) return !0;
-    const p = Na(m, c);
+    if (l == null || !Ka(l)) return !0;
+    const p = Ia(m, c);
     let T = null, L = !1;
     if ([
       0,
@@ -821,9 +820,9 @@ function Fi(n, e, a) {
       2
       /* MoveCols */
     ].includes(i))
-      T = vi(i, r, o, p);
+      T = Gi(i, r, o, p);
     else if (u != null) {
-      const I = Vi(p, a);
+      const I = Hi(p, a);
       T = I.newCell, L = I.isReverse;
     }
     if (Ke.diffValue(p, T) && !e.getValue(m, c))
@@ -831,61 +830,61 @@ function Fi(n, e, a) {
     L ? f.unshift({ oldCell: p, newCell: T }) : f.push({ oldCell: p, newCell: T });
   }), f;
 }
-function Bi(n) {
+function Vi(n) {
   const e = [];
   return n.forValue((a, i, r) => {
-    if (r == null || !ka(r)) return !0;
-    const o = Na(a, i);
+    if (r == null || !Ka(r)) return !0;
+    const o = Ia(a, i);
     e.push({ oldCell: o, newCell: o });
   }), e;
 }
-function vi(n, e, a, i) {
+function Gi(n, e, a, i) {
   if (e == null || a == null)
     return null;
   switch (n) {
     case 0:
-      return Gi(e, a, i);
+      return wi(e, a, i);
     case 1:
-      return Hi(e, a, i);
+      return Yi(e, a, i);
     case 2:
-      return wi(e, a, i);
+      return Xi(e, a, i);
     default:
       return null;
   }
 }
-function Vi(n, e) {
+function Hi(n, e) {
   const { type: a, rangeFilteredRows: i } = e, r = e.range;
   let o = null, u = !1;
   switch (a) {
     case 3:
-      o = Yi(r, n), u = !0;
+      o = Wi(r, n), u = !0;
       break;
     case 4:
-      o = Xi(r, n), u = !0;
+      o = Ki(r, n), u = !0;
       break;
     case 5:
-      o = Wi(r, n, i);
+      o = ki(r, n, i);
       break;
     case 6:
-      o = Ki(r, n);
+      o = Qi(r, n);
       break;
     case 7:
-      o = ki(r, n);
+      o = $i(r, n);
       break;
     case 8:
-      o = Qi(r, n);
+      o = ji(r, n);
       break;
     case 9:
-      o = $i(r, n), u = !0;
+      o = zi(r, n), u = !0;
       break;
     case 10:
-      o = ji(r, n), u = !0;
+      o = Zi(r, n), u = !0;
       break;
   }
   return { newCell: o, isReverse: u };
 }
-function Gi(n, e, a) {
-  const i = _a(
+function wi(n, e, a) {
+  const i = xa(
     {
       id: Y.MoveRangeCommandId,
       params: { toRange: e, fromRange: n }
@@ -894,8 +893,8 @@ function Gi(n, e, a) {
   );
   return X(i, a);
 }
-function Hi(n, e, a) {
-  const i = xa(
+function Yi(n, e, a) {
+  const i = Ma(
     {
       id: Y.MoveRowsCommandId,
       params: { toRange: e, fromRange: n }
@@ -904,8 +903,8 @@ function Hi(n, e, a) {
   );
   return X(i, a);
 }
-function wi(n, e, a) {
-  const i = Ma(
+function Xi(n, e, a) {
+  const i = Oa(
     {
       id: Y.MoveColsCommandId,
       params: { toRange: e, fromRange: n }
@@ -914,8 +913,8 @@ function wi(n, e, a) {
   );
   return X(i, a);
 }
-function Yi(n, e) {
-  const a = va(
+function Wi(n, e) {
+  const a = Ba(
     {
       id: Y.InsertRowCommandId,
       params: { range: n, unitId: "", subUnitId: "", direction: Qe.DOWN }
@@ -924,8 +923,8 @@ function Yi(n, e) {
   );
   return X(a, e);
 }
-function Xi(n, e) {
-  const a = Ba(
+function Ki(n, e) {
+  const a = Fa(
     {
       id: Y.InsertColCommandId,
       params: { range: n, unitId: "", subUnitId: "", direction: Qe.RIGHT }
@@ -934,8 +933,8 @@ function Xi(n, e) {
   );
   return X(a, e);
 }
-function Wi(n, e, a) {
-  const i = Fa(
+function ki(n, e, a) {
+  const i = Ua(
     {
       id: Y.RemoveRowCommandId,
       params: { range: n }
@@ -945,8 +944,8 @@ function Wi(n, e, a) {
   );
   return X(i, e);
 }
-function Ki(n, e) {
-  const a = Ua(
+function Qi(n, e) {
+  const a = qa(
     {
       id: Y.RemoveColCommandId,
       params: { range: n }
@@ -955,8 +954,8 @@ function Ki(n, e) {
   );
   return X(a, e);
 }
-function ki(n, e) {
-  const a = qa(
+function $i(n, e) {
+  const a = ha(
     {
       id: Y.DeleteRangeMoveLeftCommandId,
       params: { range: n }
@@ -965,8 +964,8 @@ function ki(n, e) {
   );
   return X(a, e);
 }
-function Qi(n, e) {
-  const a = ha(
+function ji(n, e) {
+  const a = ga(
     {
       id: Y.DeleteRangeMoveUpCommandId,
       params: { range: n }
@@ -975,8 +974,8 @@ function Qi(n, e) {
   );
   return X(a, e);
 }
-function $i(n, e) {
-  const a = ga(
+function zi(n, e) {
+  const a = ya(
     {
       id: Y.InsertRangeMoveDownCommandId,
       params: { range: n }
@@ -985,8 +984,8 @@ function $i(n, e) {
   );
   return X(a, e);
 }
-function ji(n, e) {
-  const a = ya(
+function Zi(n, e) {
+  const a = _a(
     {
       id: Y.InsertRangeMoveRightCommandId,
       params: { range: n }
@@ -995,7 +994,7 @@ function ji(n, e) {
   );
   return X(a, e);
 }
-function zi(n, e, a) {
+function Ji(n, e, a) {
   var r, o, u;
   const i = new v({});
   for (let f = 0; f < n.length; f++) {
@@ -1007,7 +1006,7 @@ function zi(n, e, a) {
   }
   return i.getMatrix();
 }
-function Zi(n, e) {
+function er(n, e) {
   const a = new v({});
   for (let i = n.length - 1; i >= 0; i--) {
     const { oldCell: r, newCell: o } = n[i], u = e.getValue(r.startRow, r.startColumn), f = he(u);
@@ -1021,7 +1020,7 @@ function Zi(n, e) {
 function he(n) {
   if (n == null)
     return null;
-  const { f: e, si: a, x: i = 0, y: r = 0 } = n, o = ye(e), u = Ia(a);
+  const { f: e, si: a, x: i = 0, y: r = 0 } = n, o = ye(e), u = Ea(a);
   if (!o && !u)
     return {
       f: null,
@@ -1030,18 +1029,18 @@ function he(n) {
   const f = {};
   return u && (f.si = a), o && i === 0 && r === 0 && (f.f = e), f.f === void 0 && (f.f = null), f.si === void 0 && (f.si = null), f;
 }
-function Ji(n) {
+function tr(n) {
   const e = new v({});
   return new v(n).forValue((i, r, o) => {
     const u = he(o);
     u !== void 0 && e.setValue(i, r, u);
   }), e.getMatrix();
 }
-function ka(n) {
-  const e = (n == null ? void 0 : n.f) || "", a = (n == null ? void 0 : n.si) || "", i = ye(e), r = Ia(a);
+function Ka(n) {
+  const e = (n == null ? void 0 : n.f) || "", a = (n == null ? void 0 : n.si) || "", i = ye(e), r = Ea(a);
   return !!(i || r);
 }
-function Qa(n, e, a, i, r, o) {
+function ka(n, e, a, i, r, o) {
   if ((r == null || r.length === 0) && (o == null || o.length === 0)) {
     if (n === a && e === i)
       return !0;
@@ -1049,7 +1048,7 @@ function Qa(n, e, a, i, r, o) {
     return !0;
   return !1;
 }
-function $a(n, e, a = 0, i = 0) {
+function Qa(n, e, a = 0, i = 0) {
   const r = [];
   for (let o = 0, u = n.length; o < u; o++) {
     const f = n[o];
@@ -1057,7 +1056,7 @@ function $a(n, e, a = 0, i = 0) {
       r.push(f);
       continue;
     }
-    const { token: m } = f, c = Pe(m), { range: l, sheetName: p, unitId: T } = c, L = fe.moveOffset(l, a, i);
+    const { token: m } = f, c = Te(m), { range: l, sheetName: p, unitId: T } = c, L = fe.moveOffset(l, a, i);
     r.push({
       ...f,
       token: pt({
@@ -1069,7 +1068,7 @@ function $a(n, e, a = 0, i = 0) {
   }
   return r;
 }
-function ja(n, e, a, i) {
+function $a(n, e, a, i) {
   const { type: r, unitId: o, sheetId: u, range: f, from: m, to: c, rangeFilteredRows: l } = e, {
     range: p,
     sheetId: T,
@@ -1078,7 +1077,7 @@ function ja(n, e, a, i) {
     refOffsetX: A,
     refOffsetY: N
   } = n;
-  if (!Qa(
+  if (!ka(
     o,
     u,
     a,
@@ -1095,7 +1094,7 @@ function ja(n, e, a, i) {
     const R = xt(d, m), P = ke(d, m);
     if (P == null || R !== 4)
       return;
-    const h = _a(
+    const h = xa(
       { id: Y.MoveRangeCommandId, params: { toRange: c, fromRange: m } },
       P
     ), M = X(h, P);
@@ -1116,7 +1115,7 @@ function ja(n, e, a, i) {
       endColumn: d.endColumn,
       rangeType: W.NORMAL
     });
-    const h = xa(
+    const h = Ma(
       { id: Y.MoveRowsCommandId, params: { toRange: c, fromRange: m } },
       P
     ), M = X(h, P);
@@ -1137,7 +1136,7 @@ function ja(n, e, a, i) {
       endColumn: d.endColumn,
       rangeType: W.NORMAL
     });
-    const h = Ma(
+    const h = Oa(
       { id: Y.MoveColsCommandId, params: { toRange: c, fromRange: m } },
       P
     ), M = X(h, P);
@@ -1147,7 +1146,7 @@ function ja(n, e, a, i) {
   }
   if (f != null) {
     if (r === y.InsertRow) {
-      const R = va(
+      const R = Ba(
         {
           id: Y.InsertRowCommandId,
           params: { range: f, unitId: "", subUnitId: "", direction: Qe.DOWN }
@@ -1161,7 +1160,7 @@ function ja(n, e, a, i) {
         ...P
       };
     } else if (r === y.InsertColumn) {
-      const R = Ba(
+      const R = Fa(
         {
           id: Y.InsertColCommandId,
           params: { range: f, unitId: "", subUnitId: "", direction: Qe.RIGHT }
@@ -1175,7 +1174,7 @@ function ja(n, e, a, i) {
         ...P
       };
     } else if (r === y.RemoveRow) {
-      const R = Fa(
+      const R = Ua(
         {
           id: Y.RemoveRowCommandId,
           params: { range: f }
@@ -1190,7 +1189,7 @@ function ja(n, e, a, i) {
         ...P
       };
     } else if (r === y.RemoveColumn) {
-      const R = Ua(
+      const R = qa(
         {
           id: Y.RemoveColCommandId,
           params: { range: f }
@@ -1204,7 +1203,7 @@ function ja(n, e, a, i) {
         ...P
       };
     } else if (r === y.DeleteMoveLeft) {
-      const R = qa(
+      const R = ha(
         {
           id: Y.DeleteRangeMoveLeftCommandId,
           params: { range: f }
@@ -1218,7 +1217,7 @@ function ja(n, e, a, i) {
         ...P
       };
     } else if (r === y.DeleteMoveUp) {
-      const R = ha(
+      const R = ga(
         {
           id: Y.DeleteRangeMoveUpCommandId,
           params: { range: f }
@@ -1232,7 +1231,7 @@ function ja(n, e, a, i) {
         ...P
       };
     } else if (r === y.InsertMoveDown) {
-      const R = ga(
+      const R = ya(
         {
           id: Y.InsertRangeMoveDownCommandId,
           params: { range: f }
@@ -1246,7 +1245,7 @@ function ja(n, e, a, i) {
         ...P
       };
     } else if (r === y.InsertMoveRight) {
-      const R = ya(
+      const R = _a(
         {
           id: Y.InsertRangeMoveRightCommandId,
           params: { range: f }
@@ -1365,55 +1364,55 @@ function xe(n) {
     endColumn: Ae(r)
   };
 }
-function za(n, e) {
+function ja(n, e) {
   const { id: a } = e;
   let i = null;
   switch (a) {
-    case Un.id:
-      i = er(e, n);
-      break;
     case qn.id:
-      i = tr(e, n);
+      i = ar(e, n);
       break;
     case hn.id:
-      i = ar(e, n);
+      i = nr(e, n);
       break;
     case gn.id:
-      i = nr(e);
+      i = ir(e, n);
       break;
     case yn.id:
-      i = ir(e);
+      i = rr(e);
       break;
     case _n.id:
-      i = rr(e, n);
+      i = or(e);
       break;
     case xn.id:
-      i = or(e, n);
-      break;
-    case Mn.id:
       i = ur(e, n);
       break;
-    case On.id:
+    case Mn.id:
       i = mr(e, n);
       break;
-    case bn.id:
+    case On.id:
       i = fr(e, n);
       break;
-    case Dn.id:
+    case bn.id:
       i = cr(e, n);
       break;
-    case Cn.id:
+    case Dn.id:
       i = lr(e, n);
       break;
-    case An.id:
+    case Cn.id:
       i = sr(e, n);
       break;
-    case Ga.id:
+    case An.id:
       i = dr(e, n);
       break;
-    case Va.id:
+    case Sn.id:
       i = pr(e, n);
       break;
+    case Va.id:
+      i = Lr(e, n);
+      break;
+    case va.id:
+      i = Pr(e, n);
+      break;
   }
   return i;
 }
@@ -1425,7 +1424,7 @@ function te(n) {
     sheetId: a
   };
 }
-function er(n, e) {
+function ar(n, e) {
   const { params: a } = n;
   if (!a) return null;
   const { fromRange: i, toRange: r } = a;
@@ -1439,7 +1438,7 @@ function er(n, e) {
     sheetId: u
   };
 }
-function tr(n, e) {
+function nr(n, e) {
   const { params: a } = n;
   if (!a) return null;
   const {
@@ -1468,7 +1467,7 @@ function tr(n, e) {
     sheetId: c
   };
 }
-function ar(n, e) {
+function ir(n, e) {
   const { params: a } = n;
   if (!a) return null;
   const {
@@ -1497,7 +1496,7 @@ function ar(n, e) {
     sheetId: c
   };
 }
-function nr(n) {
+function rr(n) {
   const { params: e } = n;
   if (!e) return null;
   const { range: a, unitId: i, subUnitId: r } = e;
@@ -1508,7 +1507,7 @@ function nr(n) {
     sheetId: r
   };
 }
-function ir(n) {
+function or(n) {
   const { params: e } = n;
   if (!e) return null;
   const { range: a, unitId: i, subUnitId: r } = e;
@@ -1519,7 +1518,7 @@ function ir(n) {
     sheetId: r
   };
 }
-function rr(n, e) {
+function ur(n, e) {
   const { params: a } = n;
   if (!a) return null;
   const { range: i } = a, { unitId: r, sheetId: o } = te(e);
@@ -1530,7 +1529,7 @@ function rr(n, e) {
     sheetId: o
   };
 }
-function or(n, e) {
+function mr(n, e) {
   const { params: a } = n;
   if (!a) return null;
   const { range: i } = a, { unitId: r, sheetId: o } = te(e);
@@ -1541,7 +1540,7 @@ function or(n, e) {
     sheetId: o
   };
 }
-function ur(n, e) {
+function fr(n, e) {
   var u, f;
   const { params: a } = n;
   if (!a) return null;
@@ -1554,7 +1553,7 @@ function ur(n, e) {
     rangeFilteredRows: (f = (u = e.getSheetBySheetId(o)) == null ? void 0 : u.getRangeFilterRows(i)) != null ? f : []
   };
 }
-function mr(n, e) {
+function cr(n, e) {
   const { params: a } = n;
   if (!a) return null;
   const { range: i } = a, { unitId: r, sheetId: o } = te(e);
@@ -1565,7 +1564,7 @@ function mr(n, e) {
     sheetId: o
   };
 }
-function fr(n, e) {
+function lr(n, e) {
   const { params: a } = n;
   if (!a) return null;
   const { range: i } = a, { unitId: r, sheetId: o } = te(e);
@@ -1576,7 +1575,7 @@ function fr(n, e) {
     sheetId: o
   };
 }
-function cr(n, e) {
+function sr(n, e) {
   const { params: a } = n;
   if (!a) return null;
   const { range: i } = a, { unitId: r, sheetId: o } = te(e);
@@ -1587,7 +1586,7 @@ function cr(n, e) {
     sheetId: o
   };
 }
-function lr(n, e) {
+function dr(n, e) {
   const { params: a } = n;
   if (!a) return null;
   const { unitId: i, subUnitId: r, name: o } = a, { unitId: u, sheetId: f } = te(e);
@@ -1598,7 +1597,7 @@ function lr(n, e) {
     sheetName: o
   };
 }
-function sr(n, e) {
+function pr(n, e) {
   const { params: a } = n;
   if (!a) return null;
   const { unitId: i, subUnitId: r } = a, { unitId: o, sheetId: u } = te(e);
@@ -1608,7 +1607,7 @@ function sr(n, e) {
     sheetId: r || u
   };
 }
-function dr(n, e) {
+function Lr(n, e) {
   const { params: a } = n;
   if (!a) return null;
   const { unitId: i, name: r, id: o } = a, { sheetId: u } = te(e);
@@ -1620,7 +1619,7 @@ function dr(n, e) {
     definedNameId: o
   };
 }
-function pr(n, e) {
+function Pr(n, e) {
   const { params: a } = n;
   if (!a) return null;
   const { unitId: i, name: r, id: o } = a, { sheetId: u } = te(e);
@@ -1632,8 +1631,8 @@ function pr(n, e) {
     definedNameId: o
   };
 }
-var Lr = Object.getOwnPropertyDescriptor, Pr = (n, e, a, i) => {
-  for (var r = i > 1 ? void 0 : i ? Lr(e, a) : e, o = n.length - 1, u; o >= 0; o--)
+var Tr = Object.getOwnPropertyDescriptor, Er = (n, e, a, i) => {
+  for (var r = i > 1 ? void 0 : i ? Tr(e, a) : e, o = n.length - 1, u; o >= 0; o--)
     (u = n[o]) && (r = u(r) || r);
   return r;
 }, He = (n, e) => (a, i) => e(a, i, n);
@@ -1648,7 +1647,7 @@ let tt = class extends z {
     this.disposeWithMe(
       this._sheetInterceptorService.interceptCommand({
         getMutations: (n) => {
-          if (n.id === Ga.id || n.id === Va.id)
+          if (n.id === Va.id || n.id === va.id)
             return {
               redos: [],
               undos: []
@@ -1659,7 +1658,7 @@ let tt = class extends z {
               redos: [],
               undos: []
             };
-          const a = za(e, n);
+          const a = ja(e, n);
           return a ? this._getUpdateDefinedNameMutations(e, a) : {
             redos: [],
             undos: []
@@ -1688,7 +1687,7 @@ let tt = class extends z {
         const R = l[d];
         if (typeof R == "string" || R.nodeType !== ie.REFERENCE)
           continue;
-        const { token: P } = R, h = Pe(P), { range: M, sheetName: U, unitId: q } = h, x = ((N = n.getSheetBySheetName(U)) == null ? void 0 : N.getSheetId()) || "", F = {
+        const { token: P } = R, h = Te(P), { range: M, sheetName: U, unitId: q } = h, x = ((N = n.getSheetBySheetName(U)) == null ? void 0 : N.getSheetId()) || "", F = {
           range: M,
           sheetId: x,
           unitId: q,
@@ -1712,7 +1711,7 @@ let tt = class extends z {
             unitId: q
           });
         } else
-          B = ja(
+          B = $a(
             F,
             e,
             i,
@@ -1725,7 +1724,7 @@ let tt = class extends z {
       }
       if (!p)
         return !0;
-      const L = ze($a(l, T)), I = {
+      const L = ze(Qa(l, T)), I = {
         id: De.id,
         params: {
           unitId: i,
@@ -1753,14 +1752,14 @@ let tt = class extends z {
     return ((o = this._definedNamesService.getWorksheetByRef(e, i)) == null ? void 0 : o.getSheetId()) === a ? k.REF : null;
   }
 };
-tt = Pr([
+tt = Er([
   He(0, Lt),
-  He(1, Ee),
+  He(1, Ie),
   He(2, H(dt)),
   He(3, H(Pt))
 ], tt);
-var Tr = Object.getOwnPropertyDescriptor, Er = (n, e, a, i) => {
-  for (var r = i > 1 ? void 0 : i ? Tr(e, a) : e, o = n.length - 1, u; o >= 0; o--)
+var 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 = u(r) || r);
   return r;
 }, me = (n, e) => (a, i) => e(a, i, n);
@@ -1783,12 +1782,12 @@ let at = class extends z {
       this._commandService.beforeCommandExecuted((n, e) => {
         if (n.id === Q.id) {
           const a = n.params;
-          if (e && e.onlyLocal === !0 || e && e.syncOnly === !0 || a.trigger === kt.id || a.trigger === ba.id || a.trigger === Oa.id)
+          if (e && e.onlyLocal === !0 || e && e.syncOnly === !0 || a.trigger === kt.id || a.trigger === Da.id || a.trigger === ba.id)
             return;
           this._handleSetRangeValuesMutation(a);
         }
       })
-    ), this.disposeWithMe(this._univerInstanceService.getTypeOfUnitAdded$(j.UNIVER_SHEET).subscribe((n) => this._handleWorkbookAdded(n))), this.disposeWithMe(this._univerInstanceService.getTypeOfUnitDisposed$(j.UNIVER_SHEET).pipe(Ei((n) => n.getUnitId())).subscribe((n) => this._handleWorkbookDisposed(n)));
+    ), this.disposeWithMe(this._univerInstanceService.getTypeOfUnitAdded$(j.UNIVER_SHEET).subscribe((n) => this._handleWorkbookAdded(n))), this.disposeWithMe(this._univerInstanceService.getTypeOfUnitDisposed$(j.UNIVER_SHEET).pipe(Ni((n) => n.getUnitId())).subscribe((n) => this._handleWorkbookDisposed(n)));
   }
   _handleSetRangeValuesMutation(n) {
     const { subUnitId: e, unitId: a, cellValue: i } = n;
@@ -1807,7 +1806,7 @@ let at = class extends z {
       {
         unitId: a,
         subUnitId: e,
-        cellValue: Ji(r)
+        cellValue: tr(r)
       },
       {
         onlyLocal: !0,
@@ -1856,7 +1855,7 @@ let at = class extends z {
     );
   }
   _handleInsertSheetMutation(n) {
-    const { sheet: e, unitId: a } = n, i = this._formulaDataModel.getFormulaData(), { id: r, cellData: o } = e, u = new v(o), f = ca(i, a, r, u);
+    const { sheet: e, unitId: a } = n, i = this._formulaDataModel.getFormulaData(), { id: r, cellData: o } = e, u = new v(o), f = fa(i, a, r, u);
     this._commandService.executeCommand(
       Ge.id,
       {
@@ -1872,14 +1871,14 @@ let at = class extends z {
     const e = {}, a = n.getUnitId(), i = { [a]: {} };
     n.getSheets().forEach((c) => {
       var L;
-      const l = c.getCellMatrix(), p = c.getSheetId(), T = ca(e, a, p, l);
+      const l = c.getCellMatrix(), p = c.getSheetId(), T = fa(e, a, p, l);
       i[a][p] = (L = T[a]) == null ? void 0 : L[p];
     }), this._commandService.executeCommand(Ge.id, { formulaData: i }, { onlyLocal: !0 });
-    const o = this._configService.getConfig(Ue), u = (m = o == null ? void 0 : o.initialFormulaComputing) != null ? m : Te.WHEN_EMPTY, f = this._getDirtyDataByCalculationMode(u);
-    this._commandService.executeCommand(Ne.id, f, { onlyLocal: !0 });
+    const o = this._configService.getConfig(Ue), u = (m = o == null ? void 0 : o.initialFormulaComputing) != null ? m : Ee.WHEN_EMPTY, f = this._getDirtyDataByCalculationMode(u);
+    this._commandService.executeCommand(Pe.id, f, { onlyLocal: !0 });
   }
   _getDirtyDataByCalculationMode(n) {
-    const e = n === Te.FORCED, a = n === Te.WHEN_EMPTY ? this._formulaDataModel.getFormulaDirtyRanges() : [];
+    const e = n === Ee.FORCED, a = n === Ee.WHEN_EMPTY ? this._formulaDataModel.getFormulaDirtyRanges() : [];
     return {
       forceCalculation: e,
       dirtyRanges: a,
@@ -1897,13 +1896,13 @@ let at = class extends z {
         undos: [],
         redos: []
       };
-    const a = za(e, n);
+    const a = ja(e, n);
     if (a) {
       const { unitSheetNameMap: i } = this._formulaDataModel.getCalculateData(), r = this._formulaDataModel.getFormulaData(), { newFormulaData: o } = this._getFormulaReferenceMoveInfo(
         r,
         i,
         a
-      ), { undos: u, redos: f } = gi(r, o, a);
+      ), { undos: u, redos: f } = qi(r, o, a);
       return {
         undos: u,
         redos: f
@@ -1942,21 +1941,21 @@ let at = class extends z {
               continue;
             const { token: ce, nodeType: ne } = O;
             if ((U === y.SetDefinedName || U === y.RemoveDefinedName) && (ne === ie.DEFINED_NAME || ne === ie.FUNCTION)) {
-              const { definedNameId: Be, definedName: Ie } = a;
-              if (Be === void 0 || Ie === void 0)
+              const { definedNameId: Be, definedName: Ne } = a;
+              if (Be === void 0 || Ne === void 0)
                 continue;
               const se = this._definedNamesService.getValueById(u, Be);
               if (se == null || se.name !== ce)
                 continue;
               P[B] = {
                 ...O,
-                token: U === y.SetDefinedName ? Ie : k.REF
+                token: U === y.SetDefinedName ? Ne : k.REF
               }, h = !0, M.push(B);
               continue;
             } else if (ne !== ie.REFERENCE)
               continue;
-            const le = Pe(ce), { range: Z, sheetName: oe, unitId: ue } = le, Fe = ue == null || ue.length === 0 ? u : ue, J = ((F = e == null ? void 0 : e[Fe]) == null ? void 0 : F[oe]) || "";
-            if (!Qa(
+            const le = Te(ce), { range: Z, sheetName: oe, unitId: ue } = le, Fe = ue == null || ue.length === 0 ? u : ue, J = ((F = e == null ? void 0 : e[Fe]) == null ? void 0 : F[oe]) || "";
+            if (!ka(
               a.unitId,
               a.sheetId,
               u,
@@ -1977,10 +1976,10 @@ let at = class extends z {
             if (U === y.SetName) {
               const {
                 unitId: Be,
-                sheetId: Ie,
+                sheetId: Ne,
                 sheetName: se
               } = a;
-              if (se == null || J == null || J.length === 0 || Ie !== J)
+              if (se == null || J == null || J.length === 0 || Ne !== J)
                 continue;
               Oe = pt({
                 range: Z,
@@ -1990,13 +1989,13 @@ let at = class extends z {
             } else if (U === y.RemoveSheet) {
               const {
                 unitId: Be,
-                sheetId: Ie,
+                sheetId: Ne,
                 sheetName: se
               } = a;
-              if (J == null || J.length === 0 || Ie !== J)
+              if (J == null || J.length === 0 || Ne !== J)
                 continue;
               Oe = k.REF;
-            } else U !== y.SetDefinedName && (Oe = ja(
+            } else U !== y.SetDefinedName && (Oe = $a(
               Nt,
               a,
               u,
@@ -2015,7 +2014,7 @@ let at = class extends z {
                 return !0;
             } else
               return !0;
-          const x = $a(P, M, d, S);
+          const x = Qa(P, M, d, S);
           p.setValue(L, I, {
             f: `=${ze(x)}`
           });
@@ -2025,8 +2024,8 @@ let at = class extends z {
     return { newFormulaData: o };
   }
 };
-at = Er([
-  me(0, Ee),
+at = Nr([
+  me(0, Ie),
   me(1, re),
   me(2, H(Pt)),
   me(3, H(qe)),
@@ -2035,9 +2034,9 @@ at = Er([
   me(6, be),
   me(7, H(st))
 ], at);
-const Ir = "SHEETS_FORMULA_PLUGIN";
-var Nr = Object.getOwnPropertyDescriptor, Rr = (n, e, a, i) => {
-  for (var r = i > 1 ? void 0 : i ? Nr(e, a) : e, o = n.length - 1, u; o >= 0; o--)
+const Rr = "SHEETS_FORMULA_PLUGIN";
+var Sr = Object.getOwnPropertyDescriptor, Ar = (n, e, a, i) => {
+  for (var r = i > 1 ? void 0 : i ? Sr(e, a) : e, o = n.length - 1, u; o >= 0; o--)
     (u = n[o]) && (r = u(r) || r);
   return r;
 }, _t = (n, e) => (a, i) => e(a, i, n);
@@ -2335,13 +2334,13 @@ let nt = class extends z {
     return i;
   }
 };
-nt = Rr([
+nt = Ar([
   _t(0, Qt),
-  _t(1, Ee),
+  _t(1, Ie),
   _t(2, H(qe))
 ], nt);
-var Sr = Object.getOwnPropertyDescriptor, Ar = (n, e, a, i) => {
-  for (var r = i > 1 ? void 0 : i ? Sr(e, a) : e, o = n.length - 1, u; o >= 0; o--)
+var Cr = Object.getOwnPropertyDescriptor, Dr = (n, e, a, i) => {
+  for (var r = i > 1 ? void 0 : i ? Cr(e, a) : e, o = n.length - 1, u; o >= 0; o--)
     (u = n[o]) && (r = u(r) || r);
   return r;
 }, Le = (n, e) => (a, i) => e(a, i, n);
@@ -2363,7 +2362,7 @@ let it = class extends z {
             return;
           const { arrayFormulaRange: r, arrayFormulaCellData: o, arrayFormulaEmbedded: u } = i;
           this._formulaDataModel.setArrayFormulaRange(r), this._formulaDataModel.setArrayFormulaCellData(o), e && this._writeArrayFormulaToSnapshot(r, o, u);
-        } else n.id === wa.id && e && (this._addPrefixToFunctionSnapshot(), this._addPrefixToDefinedNamesFunctionSnapshot());
+        } else n.id === Ha.id && e && (this._addPrefixToFunctionSnapshot(), this._addPrefixToDefinedNamesFunctionSnapshot());
       })
     );
   }
@@ -2467,20 +2466,20 @@ let it = class extends z {
   }
   _initInterceptorCellContent() {
     this.disposeWithMe(
-      this._sheetInterceptorService.intercept(Da.CELL_CONTENT, {
+      this._sheetInterceptorService.intercept(Ca.CELL_CONTENT, {
         priority: 100,
         effect: ht.Value,
         handler: (n, e, a) => {
           var l, p, T;
           let i = n;
           const { unitId: r, subUnitId: o, row: u, col: f } = e, m = this._formulaDataModel.getArrayFormulaCellData(), c = (T = (p = (l = m == null ? void 0 : m[r]) == null ? void 0 : l[o]) == null ? void 0 : p[u]) == null ? void 0 : T[f];
-          return c == null ? a(i) : ((!i || i === e.rawData) && (i = { ...e.rawData }), c.v == null && c.t == null ? (i.v = 0, i.t = gt.NUMBER, a(i)) : (i == null ? void 0 : i.t) === gt.NUMBER && i.v !== void 0 && i.v !== null && Ln(i.v) ? (i.v = Xn(Number(i.v)), a(i)) : (i.v = c.v, i.t = c.t, a(i)));
+          return c == null ? a(i) : ((!i || i === e.rawData) && (i = { ...e.rawData }), c.v == null && c.t == null ? (i.v = 0, i.t = gt.NUMBER, a(i)) : (i == null ? void 0 : i.t) === gt.NUMBER && i.v !== void 0 && i.v !== null && pn(i.v) ? (i.v = Kn(Number(i.v)), a(i)) : (i.v = c.v, i.t = c.t, a(i)));
         }
       })
     );
   }
 };
-it = Ar([
+it = Dr([
   Le(0, re),
   Le(1, be),
   Le(2, H(dt)),
@@ -2489,9 +2488,9 @@ it = Ar([
   Le(5, Tt),
   Le(6, Lt)
 ], it);
-const Cr = [
+const br = [
   {
-    functionName: la.ARRAY_CONSTRAIN,
+    functionName: ca.ARRAY_CONSTRAIN,
     functionType: t.Array,
     description: "formula.functionList.ARRAY_CONSTRAIN.description",
     abstract: "formula.functionList.ARRAY_CONSTRAIN.abstract",
@@ -2520,7 +2519,7 @@ const Cr = [
     ]
   },
   {
-    functionName: la.FLATTEN,
+    functionName: ca.FLATTEN,
     functionType: t.Array,
     description: "formula.functionList.FLATTEN.description",
     abstract: "formula.functionList.FLATTEN.abstract",
@@ -2541,7 +2540,7 @@ const Cr = [
       }
     ]
   }
-], Dr = [
+], Or = [
   {
     functionName: _.BETADIST,
     functionType: t.Compatibility,
@@ -3595,7 +3594,7 @@ const Cr = [
       }
     ]
   }
-], br = [
+], Mr = [
   {
     functionName: de.CUBEKPIMEMBER,
     functionType: t.Cube,
@@ -3750,7 +3749,7 @@ const Cr = [
       }
     ]
   }
-], Or = [
+], xr = [
   {
     functionName: $.DAVERAGE,
     functionType: t.Database,
@@ -4099,7 +4098,7 @@ const Cr = [
       }
     ]
   }
-], Mr = [
+], _r = [
   {
     functionName: V.DATE,
     functionType: t.Date,
@@ -4671,7 +4670,7 @@ const Cr = [
       }
     ]
   }
-], xr = [
+], yr = [
   {
     functionName: C.BESSELI,
     functionType: t.Engineering,
@@ -5744,7 +5743,7 @@ const Cr = [
       }
     ]
   }
-], _r = [
+], gr = [
   {
     functionName: D.ACCRINT,
     functionType: t.Financial,
@@ -8005,7 +8004,7 @@ const Cr = [
       }
     ]
   }
-], yr = [
+], hr = [
   {
     functionName: G.CELL,
     functionType: t.Information,
@@ -8414,7 +8413,7 @@ const Cr = [
       }
     ]
   }
-], gr = [
+], qr = [
   {
     functionName: K.AND,
     functionType: t.Logical,
@@ -8888,7 +8887,7 @@ const Cr = [
       }
     ]
   }
-], hr = [
+], Ur = [
   {
     functionName: g.ADDRESS,
     functionType: t.Lookup,
@@ -9941,7 +9940,7 @@ const Cr = [
       }
     ]
   }
-], qr = [
+], Fr = [
   {
     functionName: E.ABS,
     functionType: t.Math,
@@ -11593,7 +11592,7 @@ const Cr = [
       }
     ]
   }
-], Ur = [
+], Br = [
   {
     functionName: s.AVEDEV,
     functionType: t.Statistical,
@@ -14535,7 +14534,7 @@ const Cr = [
       }
     ]
   }
-], Fr = [
+], vr = [
   {
     functionName: b.ASC,
     functionType: t.Text,
@@ -15749,7 +15748,7 @@ const Cr = [
       }
     ]
   }
-], Br = [], vr = [
+], Vr = [], Gr = [
   {
     functionName: At.ENCODEURL,
     functionType: t.Web,
@@ -15809,29 +15808,29 @@ const Cr = [
       }
     ]
   }
-], Vr = [
+], Hr = [
+  ...gr,
   ..._r,
-  ...Mr,
-  ...qr,
+  ...Fr,
+  ...Br,
   ...Ur,
+  ...xr,
+  ...vr,
+  ...qr,
   ...hr,
-  ...Or,
-  ...Fr,
-  ...gr,
   ...yr,
-  ...xr,
+  ...Mr,
+  ...Or,
+  ...Gr,
   ...br,
-  ...Dr,
-  ...vr,
-  ...Cr,
-  ...Br
+  ...Vr
 ];
-function Gr(n, e) {
+function wr(n, e) {
   let a = "";
   return n.aliasFunctionName ? (a = e.t(n.aliasFunctionName), a === n.aliasFunctionName && (a = n.functionName)) : a = n.functionName, a;
 }
-var Hr = Object.getOwnPropertyDescriptor, wr = (n, e, a, i) => {
-  for (var r = i > 1 ? void 0 : i ? Hr(e, a) : e, o = n.length - 1, u; o >= 0; o--)
+var Yr = Object.getOwnPropertyDescriptor, Xr = (n, e, a, i) => {
+  for (var r = i > 1 ? void 0 : i ? Yr(e, a) : e, o = n.length - 1, u; o >= 0; o--)
     (u = n[o]) && (r = u(r) || r);
   return r;
 }, yt = (n, e) => (a, i) => e(a, i, n);
@@ -15894,7 +15893,7 @@ let Gt = class {
     if (e.length === 0)
       return !1;
     const a = e[0].description;
-    return !Wn(a);
+    return !kn(a);
   }
   _initialize() {
     this._localeService.localeChanged$.subscribe(() => {
@@ -15904,8 +15903,6 @@ let Gt = class {
   _initDescription() {
     var i;
     const n = [
-      ...Kn,
-      ...kn,
       ...Qn,
       ...$n,
       ...jn,
@@ -15919,13 +15916,15 @@ let Gt = class {
       ...ii,
       ...ri,
       ...oi,
-      ...ui
-    ].map((r) => r[1]), e = Vr.filter((r) => n.includes(r.functionName)), a = this._configService.getConfig(Ue);
+      ...ui,
+      ...mi,
+      ...fi
+    ].map((r) => r[1]), e = Hr.filter((r) => n.includes(r.functionName)), a = this._configService.getConfig(Ue);
     this._descriptions = e.concat((i = a == null ? void 0 : a.description) != null ? i : []);
   }
   _registerDescriptions() {
     const n = this._localeService, e = this._descriptions.map((a) => ({
-      functionName: Gr(a, n),
+      functionName: wr(a, n),
       functionType: a.functionType,
       description: n.t(a.description),
       abstract: n.t(a.abstract),
@@ -15940,13 +15939,13 @@ let Gt = class {
     this._functionService.registerDescriptions(...e);
   }
 };
-Gt = wr([
+Gt = Xr([
   yt(0, Tt),
   yt(1, H(Wt)),
   yt(2, be)
 ], Gt);
-var Yr = Object.getOwnPropertyDescriptor, Xr = (n, e, a, i) => {
-  for (var r = i > 1 ? void 0 : i ? Yr(e, a) : e, o = n.length - 1, u; o >= 0; o--)
+var Wr = Object.getOwnPropertyDescriptor, Kr = (n, e, a, i) => {
+  for (var r = i > 1 ? void 0 : i ? Wr(e, a) : e, o = n.length - 1, u; o >= 0; o--)
     (u = n[o]) && (r = u(r) || r);
   return r;
 }, we = (n, e) => (a, i) => e(a, i, n);
@@ -15977,7 +15976,7 @@ let rt = class extends z {
     this.disposeWithMe(
       this._commandService.onCommandExecuted((e, a) => {
         if (!(a != null && a.fromCollab)) {
-          if (e.id === Ha.id)
+          if (e.id === Ga.id)
             this._unregisterDescriptionsForNotInSheetId(), this._registerDescriptions();
           else if (e.id === De.id) {
             const i = e.params;
@@ -16062,31 +16061,31 @@ let rt = class extends z {
     }), this._descriptionService.unregisterDescriptions(r);
   }
 };
-rt = Xr([
+rt = Kr([
   we(0, Et),
   we(1, Lt),
-  we(2, Ee),
+  we(2, Ie),
   we(3, re)
 ], rt);
-var Wr = Object.getOwnPropertyDescriptor, Kr = (n, e, a, i) => {
-  for (var r = i > 1 ? void 0 : i ? Wr(e, a) : e, o = n.length - 1, u; o >= 0; o--)
+var kr = Object.getOwnPropertyDescriptor, Qr = (n, e, a, i) => {
+  for (var r = i > 1 ? void 0 : i ? kr(e, a) : e, o = n.length - 1, u; o >= 0; o--)
     (u = n[o]) && (r = u(r) || r);
   return r;
-}, kr = (n, e) => (a, i) => e(a, i, n);
+}, $r = (n, e) => (a, i) => e(a, i, n);
 let ot = class extends z {
   constructor(n) {
     super(), this._commandService = n, [
-      Ri,
-      Si,
+      Ai,
+      Ci,
       _e
     ].forEach((e) => this._commandService.registerCommand(e));
   }
 };
-ot = Kr([
-  kr(0, re)
+ot = Qr([
+  $r(0, re)
 ], ot);
-var Qr = Object.getOwnPropertyDescriptor, $r = (n, e, a, i) => {
-  for (var r = i > 1 ? void 0 : i ? Qr(e, a) : e, o = n.length - 1, u; o >= 0; o--)
+var jr = Object.getOwnPropertyDescriptor, zr = (n, e, a, i) => {
+  for (var r = i > 1 ? void 0 : i ? jr(e, a) : e, o = n.length - 1, u; o >= 0; o--)
     (u = n[o]) && (r = u(r) || r);
   return r;
 }, Ye = (n, e) => (a, i) => e(a, i, n);
@@ -16117,12 +16116,12 @@ let ut = class extends z {
     this.disposeWithMe(
       this._commandService.onCommandExecuted((e, a) => {
         if (!(a != null && a.fromCollab)) {
-          if (e.id === Ha.id)
+          if (e.id === Ga.id)
             this._unregisterDescriptionsForNotInSheetId(), this._registerDescriptions();
-          else if (e.id === mi.id) {
+          else if (e.id === ci.id) {
             const i = e.params;
             this._registerDescription(i);
-          } else if (e.id === fi.id) {
+          } else if (e.id === li.id) {
             const i = e.params;
             this._unregisterDescription(i);
           }
@@ -16205,18 +16204,18 @@ let ut = class extends z {
     }), this._descriptionService.unregisterDescriptions(r);
   }
 };
-ut = $r([
+ut = zr([
   Ye(0, Et),
-  Ye(1, Ee),
+  Ye(1, Ie),
   Ye(2, re),
-  Ye(3, ci)
+  Ye(3, si)
 ], ut);
-var jr = Object.getOwnPropertyDescriptor, zr = (n, e, a, i) => {
-  for (var r = i > 1 ? void 0 : i ? jr(e, a) : e, o = n.length - 1, u; o >= 0; o--)
+var Zr = Object.getOwnPropertyDescriptor, Jr = (n, e, a, i) => {
+  for (var r = i > 1 ? void 0 : i ? Zr(e, a) : e, o = n.length - 1, u; o >= 0; o--)
     (u = n[o]) && (r = u(r) || r);
   return r;
 }, Xe = (n, e) => (a, i) => e(a, i, n);
-function Ea(n, e, a, i) {
+function Ta(n, e, a, i) {
   const r = n.sequenceNodesBuilder(e);
   if (r == null)
     return e;
@@ -16225,7 +16224,7 @@ function Ea(n, e, a, i) {
     const m = r[u];
     if (typeof m == "string" || m.nodeType !== ie.REFERENCE)
       continue;
-    const { token: c } = m, l = Pe(c), { sheetName: p, unitId: T } = l;
+    const { token: c } = m, l = Te(c), { sheetName: p, unitId: T } = l;
     let L = l.range;
     L.startAbsoluteRefType === je.ALL && L.endAbsoluteRefType === je.ALL || (L = qt(L, a, i), o.push({
       unitId: T,
@@ -16242,7 +16241,7 @@ let Ht = class extends z {
   transformFormulaByEffectCommand(n, e, a, i) {
     const r = this._lexerTreeBuilder.sequenceNodesBuilder(a), o = this._univerInstanceService.getCurrentUnitForType(j.UNIVER_SHEET), u = o.getActiveSheet(), f = o.getUnitId(), m = u.getSheetId(), c = r == null ? void 0 : r.map((l) => {
       if (typeof l == "object" && l.nodeType === ie.REFERENCE) {
-        const p = Pe(l.token), { range: T, unitId: L, sheetName: I } = p, A = this._univerInstanceService.getUnit(L || n), N = I ? A == null ? void 0 : A.getSheetBySheetName(I) : A == null ? void 0 : A.getSheetBySheetId(e);
+        const p = Te(l.token), { range: T, unitId: L, sheetName: I } = p, A = this._univerInstanceService.getUnit(L || n), N = I ? A == null ? void 0 : A.getSheetBySheetName(I) : A == null ? void 0 : A.getSheetBySheetId(e);
         if (!N)
           throw new Error("Sheet not found");
         const d = A.getUnitId(), S = N.getSheetId();
@@ -16252,7 +16251,7 @@ let Ht = class extends z {
         let P = "";
         if (R) {
           const h = R.startColumn - T.startColumn, M = R.startRow - T.startRow, U = qt(T, h, M);
-          L && I ? P = sa(L, I, U) : I ? P = Ze(I, U) : P = Ce(U);
+          L && I ? P = la(L, I, U) : I ? P = Ze(I, U) : P = Ce(U);
         } else
           P = k.REF;
         return {
@@ -16275,7 +16274,7 @@ let Ht = class extends z {
           let S = "";
           if (d) {
             const R = d.startColumn - N.range.startColumn, P = d.startRow - N.range.startRow, h = qt(N.range, R, P);
-            N.unitId && N.sheetName ? S = sa(N.unitId, N.sheetName, h) : N.sheetName ? S = Ze(N.sheetName, h) : S = Ce(h);
+            N.unitId && N.sheetName ? S = la(N.unitId, N.sheetName, h) : N.sheetName ? S = Ze(N.sheetName, h) : S = Ce(h);
           } else
             S = k.REF;
           return {
@@ -16289,7 +16288,7 @@ let Ht = class extends z {
     };
     return o == null || o.forEach((m) => {
       if (typeof m == "object" && m.nodeType === ie.REFERENCE) {
-        const c = Pe(m.token), { range: l, unitId: p, sheetName: T } = c, L = this._univerInstanceService.getUnit(p || n), I = T ? L == null ? void 0 : L.getSheetBySheetName(T) : L == null ? void 0 : L.getSheetBySheetId(e);
+        const c = Te(m.token), { range: l, unitId: p, sheetName: T } = c, L = this._univerInstanceService.getUnit(p || n), I = T ? L == null ? void 0 : L.getSheetBySheetName(T) : L == null ? void 0 : L.getSheetBySheetId(e);
         if (!I)
           return;
         const A = L.getUnitId(), N = I.getSheetId(), d = {
@@ -16306,7 +16305,7 @@ let Ht = class extends z {
     const r = ye(a) ? this._lexerTreeBuilder.sequenceNodesBuilder(a) : null, o = [];
     return r == null || r.forEach((u) => {
       if (typeof u == "object" && u.nodeType === ie.REFERENCE) {
-        const f = Pe(u.token), { range: m, unitId: c, sheetName: l } = f;
+        const f = Te(u.token), { range: m, unitId: c, sheetName: l } = f;
         if (m.startAbsoluteRefType === je.ALL && m.endAbsoluteRefType === je.ALL)
           return;
         const p = this._univerInstanceService.getUnit(c || n), T = l ? p == null ? void 0 : p.getSheetBySheetName(l) : p == null ? void 0 : p.getSheetBySheetId(e);
@@ -16329,7 +16328,7 @@ let Ht = class extends z {
   // eslint-disable-next-line max-lines-per-function
   registerRangeFormula(n, e, a, i, r) {
     const o = new $e(), u = i.map((m) => this._getFormulaDependcy(n, e, m, a)), f = (m) => {
-      const c = a[0].startRow, l = a[0].startColumn, p = [{ unitId: n, subUnitId: e, ranges: a }, ...u.flat()], T = [], L = Bn(this._injector, m);
+      const c = a[0].startRow, l = a[0].startColumn, p = [{ unitId: n, subUnitId: e, ranges: a }, ...u.flat()], T = [], L = Fn(this._injector, m);
       for (const { unitId: I, subUnitId: A, ranges: N } of p)
         if (I === L.unitId && A === L.subUnitId) {
           const d = [], S = N[0].startRow, R = N[0].startColumn, P = S - c, h = R - l;
@@ -16351,12 +16350,12 @@ let Ht = class extends z {
         A.sort((P, h) => P.startRow - h.startRow || P.startColumn - h.startColumn);
         const N = /* @__PURE__ */ new Map();
         for (let P = 0; P < I.length; P++) {
-          const h = I[P], M = h.startRow, U = h.startColumn, q = M - c, x = U - l, F = vn(h, m).sort((Z, oe) => Z.startRow - oe.startRow || Z.startColumn - oe.startColumn);
+          const h = I[P], M = h.startRow, U = h.startColumn, q = M - c, x = U - l, F = Bn(h, m).sort((Z, oe) => Z.startRow - oe.startRow || Z.startColumn - oe.startColumn);
           if (!F.length)
             continue;
           const B = F[0].startRow, ae = F[0].startColumn, O = B - c, ce = ae - l, ne = [];
           for (let Z = 0; Z < i.length; Z++) {
-            const oe = i[Z], ue = ye(oe), Fe = ue ? this._lexerTreeBuilder.moveFormulaRefOffset(oe, x, q) : oe, J = ue ? this.transformFormulaByEffectCommand(n, e, Fe, m) : Fe, Nt = Ea(this._lexerTreeBuilder, J, -ce, -O);
+            const oe = i[Z], ue = ye(oe), Fe = ue ? this._lexerTreeBuilder.moveFormulaRefOffset(oe, x, q) : oe, J = ue ? this.transformFormulaByEffectCommand(n, e, Fe, m) : Fe, Nt = Ta(this._lexerTreeBuilder, J, -ce, -O);
             ne.push({
               newFormula: J,
               orginFormula: Nt
@@ -16369,7 +16368,7 @@ let Ht = class extends z {
           };
           N.has(le.key) ? N.get(le.key).push(le) : N.set(le.key, [le]);
         }
-        const d = i.map((P) => Ea(this._lexerTreeBuilder, P, 0, 0)).join("_");
+        const d = i.map((P) => Ta(this._lexerTreeBuilder, P, 0, 0)).join("_");
         if (A.length > 0) {
           const P = A[0].startRow, h = A[0].startColumn, M = [];
           for (let q = 0; q < i.length; q++) {
@@ -16415,51 +16414,51 @@ let Ht = class extends z {
     }), o;
   }
 };
-Ht = zr([
-  Xe(0, H(Fn)),
+Ht = Jr([
+  Xe(0, H(Un)),
   Xe(1, H(Pt)),
-  Xe(2, Ee),
+  Xe(2, Ie),
   Xe(3, H(st))
 ], Ht);
-var Zr = Object.getOwnPropertyDescriptor, Jr = (n, e, a, i) => {
-  for (var r = i > 1 ? void 0 : i ? Zr(e, a) : e, o = n.length - 1, u; o >= 0; o--)
+var eo = Object.getOwnPropertyDescriptor, to = (n, e, a, i) => {
+  for (var r = i > 1 ? void 0 : i ? eo(e, a) : e, o = n.length - 1, u; o >= 0; o--)
     (u = n[o]) && (r = u(r) || r);
   return r;
-}, eo = (n, e) => (a, i) => e(a, i, n);
-const $t = "sheets-formula.remote-register-function.service", Za = Kt($t);
+}, ao = (n, e) => (a, i) => e(a, i, n);
+const $t = "sheets-formula.remote-register-function.service", za = Kt($t);
 let mt = class {
   constructor(n) {
     this._functionService = n;
   }
   async registerFunctions(n) {
-    const e = n.map(([a, i]) => to(a, i));
+    const e = n.map(([a, i]) => no(a, i));
     this._functionService.registerExecutors(...e);
   }
   async registerAsyncFunctions(n) {
-    const e = n.map(([a, i]) => ao(a, i));
+    const e = n.map(([a, i]) => io(a, i));
     this._functionService.registerExecutors(...e);
   }
   async unregisterFunctions(n) {
     this._functionService.unregisterExecutors(...n), this._functionService.unregisterDescriptions(...n), this._functionService.deleteFormulaAstCacheKey(...n);
   }
 };
-mt = Jr([
-  eo(0, Tt)
+mt = to([
+  ao(0, Tt)
 ], mt);
-function to(n, e) {
+function no(n, e) {
   const a = new Vt(e), i = new Function(`return ${n}`)();
   return a.calculateCustom = i, a;
 }
-function ao(n, e) {
-  const a = new Ya(e), i = new Function(`return ${n}`)();
+function io(n, e) {
+  const a = new wa(e), i = new Function(`return ${n}`)();
   return a.calculateCustom = i, a;
 }
-var no = Object.getOwnPropertyDescriptor, io = (n, e, a, i) => {
-  for (var r = i > 1 ? void 0 : i ? no(e, a) : e, o = n.length - 1, u; o >= 0; o--)
+var ro = Object.getOwnPropertyDescriptor, oo = (n, e, a, i) => {
+  for (var r = i > 1 ? void 0 : i ? ro(e, a) : e, o = n.length - 1, u; o >= 0; o--)
     (u = n[o]) && (r = u(r) || r);
   return r;
 }, We = (n, e) => (a, i) => e(a, i, n);
-const ro = Kt(
+const uo = Kt(
   "sheets-formula.register-function-service"
 );
 let wt = class extends z {
@@ -16503,7 +16502,7 @@ let wt = class extends z {
       u.add(this._descriptionService.registerDescriptions([m]));
     } else
       u.add(this._descriptionService.registerDescriptions([i]));
-    const f = o ? new Ya(e) : new Vt(e);
+    const f = o ? new wa(e) : new Vt(e);
     return f.calculateCustom = a, this._functionService.registerExecutors(f), u.add(ee(() => this._functionService.unregisterExecutors(e))), u.add(ee(() => this._functionService.unregisterDescriptions(e))), u.add(ee(() => this._functionService.deleteFormulaAstCacheKey(e))), this._remoteRegisterFunctionService && (this._remoteRegisterFunctionService.registerAsyncFunctions([[a.toString(), e]]), u.add(
       ee(() => this._remoteRegisterFunctionService.unregisterFunctions([e]))
     )), u;
@@ -16520,54 +16519,54 @@ let wt = class extends z {
     return this._remoteRegisterFunctionService.registerFunctions(a), ee(() => this._remoteRegisterFunctionService.unregisterFunctions(e));
   }
 };
-wt = io([
+wt = oo([
   We(0, H(Wt)),
   We(1, H(Et)),
   We(2, Tt),
-  We(3, Pn(Za))
+  We(3, Ln(za))
 ], wt);
-var oo = Object.defineProperty, uo = Object.getOwnPropertyDescriptor, mo = (n, e, a) => e in n ? oo(n, e, { enumerable: !0, configurable: !0, writable: !0, value: a }) : n[e] = a, Ja = (n, e, a, i) => {
-  for (var r = i > 1 ? void 0 : i ? uo(e, a) : e, o = n.length - 1, u; o >= 0; o--)
+var mo = Object.defineProperty, fo = Object.getOwnPropertyDescriptor, co = (n, e, a) => e in n ? mo(n, e, { enumerable: !0, configurable: !0, writable: !0, value: a }) : n[e] = a, Za = (n, e, a, i) => {
+  for (var r = i > 1 ? void 0 : i ? fo(e, a) : e, o = n.length - 1, u; o >= 0; o--)
     (u = n[o]) && (r = u(r) || r);
   return r;
-}, ft = (n, e) => (a, i) => e(a, i, n), It = (n, e, a) => mo(n, typeof e != "symbol" ? e + "" : e, a);
-let ct = class extends Sa {
-  constructor(n = Pa, e, a) {
+}, ft = (n, e) => (a, i) => e(a, i, n), It = (n, e, a) => co(n, typeof e != "symbol" ? e + "" : e, a);
+let ct = class extends Ra {
+  constructor(n = La, e, a) {
     super(), this._config = n, this._injector = e, this._configService = a;
-    const { ...i } = Aa(
+    const { ...i } = Sa(
       {},
-      Pa,
+      La,
       this._config
     );
-    this._configService.setConfig(Ai, i);
+    this._configService.setConfig(Di, i);
   }
   onStarting() {
-    this._injector.add([mt]), this._injector.get(Ka).registerChannel(
+    this._injector.add([mt]), this._injector.get(Wa).registerChannel(
       $t,
-      Ii(this._injector.get(mt))
+      Ri(this._injector.get(mt))
     );
   }
 };
 It(ct, "pluginName", "SHEET_FORMULA_REMOTE_PLUGIN");
 It(ct, "type", j.UNIVER_SHEET);
-ct = Ja([
-  Ra(Xa),
+ct = Za([
+  Na(Ya),
   ft(1, H(st)),
   ft(2, be)
 ], ct);
-let lt = class extends Sa {
-  constructor(n = La, e, a) {
+let lt = class extends Ra {
+  constructor(n = pa, e, a) {
     super(), this._config = n, this._injector = e, this._configService = a;
-    const { ...i } = Aa(
+    const { ...i } = Sa(
       {},
-      La,
+      pa,
       this._config
     );
     this._configService.setConfig(Ue, i, { merge: !0 });
   }
   onStarting() {
     const n = this._injector, e = [
-      [ro, { useClass: wt }],
+      [uo, { useClass: wt }],
       [Et, { useClass: Gt }],
       [ot],
       [Ht],
@@ -16582,9 +16581,9 @@ let lt = class extends Sa {
       [ut]
     ];
     if (this._config.notExecuteFormula) {
-      const a = n.get(Ka);
-      e.push([Za, {
-        useFactory: () => Ni(a.requestChannel($t))
+      const a = n.get(Wa);
+      e.push([za, {
+        useFactory: () => Si(a.requestChannel($t))
       }]);
     }
     e.forEach((a) => n.add(a));
@@ -16610,15 +16609,15 @@ let lt = class extends Sa {
     ]);
   }
 };
-It(lt, "pluginName", Ir);
+It(lt, "pluginName", Rr);
 It(lt, "type", j.UNIVER_SHEET);
-lt = Ja([
-  Ra(Xa, Vn),
+lt = Za([
+  Na(Ya, vn),
   ft(1, H(st)),
   ft(2, be)
 ], lt);
-function Po(n, e, a, i) {
-  const r = n.get(li), o = n.get(si), u = n.get(di), f = n.get(pi);
+function Eo(n, e, a, i) {
+  const r = n.get(di), o = n.get(pi), u = n.get(Li), f = n.get(Pi);
   r.load({
     formulaData: {},
     arrayFormulaCellData: {},
@@ -16634,21 +16633,21 @@ function Po(n, e, a, i) {
     },
     dirtyUnitOtherFormulaMap: {}
   });
-  const m = o.treeBuilder(e), c = u.parse(m), l = f.execute(Li(c));
-  return Pi(l);
+  const m = o.treeBuilder(e), c = u.parse(m), l = f.execute(Ti(c));
+  return Ei(l);
 }
 export {
-  Te as CalculationMode,
+  Ee as CalculationMode,
   Gt as DescriptionService,
   Ht as FormulaRefRangeService,
   Et as IDescriptionService,
-  ro as IRegisterFunctionService,
-  Za as IRemoteRegisterFunctionService,
+  uo as IRegisterFunctionService,
+  za as IRemoteRegisterFunctionService,
   Je as ImageFormulaCellInterceptorController,
-  Ri as InsertFunctionCommand,
+  Ai as InsertFunctionCommand,
   _e as OtherFormulaMarkDirty,
   Ue as PLUGIN_CONFIG_KEY_BASE,
-  Si as QuickSumCommand,
+  Ci as QuickSumCommand,
   wt as RegisterFunctionService,
   et as RegisterOtherFormulaService,
   mt as RemoteRegisterFunctionService,
@@ -16657,5 +16656,5 @@ export {
   lt as UniverSheetsFormulaPlugin,
   tt as UpdateDefinedNameController,
   at as UpdateFormulaController,
-  Po as calculateFormula
+  Eo as calculateFormula
 };