@univerjs/sheets-formula 0.12.3 → 0.12.4

package/lib/index.js

@@ -1,18 +1,18 @@
 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 wt, ICommandService as re, ObjectMatrix as v, generateRandomId as Yt, IUniverInstanceService as Ee, Rectangle as fe, sequenceExecuteAsync as an, Inject as H, Disposable as z, CellValueType as gt, InterceptorEffectEnum as Ea, 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, LifecycleService as dn, ILogService as pn, IConfigService as be, LocaleService as Xt, 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 Wt, toDisposable as ee, moveRangeByOffset as ht, DisposableCollection as $e, AbsoluteRefType as je, Optional as Pn, DependentOn as Ra, Plugin as Sa, merge as Aa, touchDependencies as ve, isNodeEnv as $t } 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, 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 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 qt, InsertSheetMutation as Ut, MoveRangeMutation as jt, MoveRowsMutation as zt, MoveColsMutation as Zt, ReorderRangeMutation as Jt, RemoveRowMutation as ea, RemoveColMutation as ta, InsertColMutation as aa, InsertRowMutation as na, SetRowHiddenMutation as ia, SetRowVisibleMutation as ra, SetWorksheetActiveOperation as Ha, SCOPE_WORKBOOK_VALUE_DEFINED_NAME as St, RefRangeService as Un, handleDefaultRangeChangeWithEffectRefCommands as oa, 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 kt, SetFormulaCalculationResultMutation as wa, RemoveOtherFormulaMutation as Gn, SetOtherFormulaMutation as Hn, SetFormulaCalculationStartMutation as Ne, SetFormulaCalculationStopMutation as ua, ENGINE_FORMULA_CYCLE_REFERENCE_COUNT as ma, SetFormulaCalculationNotificationMutation as wn, 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 Ft, initSheetFormulaData as fa, RemoveDefinedNameMutation as Bt, IFunctionService as Tt, stripErrorMargin as Yn, 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 Xn, functionArray as Wn, functionCompatibility as Kn, functionCube as kn, functionDatabase as Qn, functionDate as $n, functionEngineering as jn, functionFinancial as zn, functionInformation as Zn, functionLogical as Jn, functionLookup as ei, functionMath as ti, functionMeta as ai, functionStatistical as ni, functionText as ii, functionUniver as ri, functionWeb as oi, SetSuperTableMutation as ui, RemoveSuperTableMutation as mi, serializeRangeWithSheet as Ze, ISuperTableService as fi, serializeRangeWithSpreadsheet as la, CustomFunction as vt, AsyncCustomFunction as Ya, UniverFormulaEnginePlugin as Xa, IFormulaCurrentConfigService as ci, Lexer as li, AstTreeBuilder as si, Interpreter as di, generateExecuteAstNodeData as pi, getObjectValue as Li } from "@univerjs/engine-formula";
-import { Subject as sa, BehaviorSubject as Wa, bufferWhen as Pi, filter as da, map as Ti } from "rxjs";
-import { IRPCChannelService as Ka, fromModule as Ei, toModule as Ii } from "@univerjs/rpc";
-const Ni = {
+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 = {
   id: "formula.command.insert-function",
-  type: wt.COMMAND,
+  type: Yt.COMMAND,
   handler: async (n, e) => {
     const { list: a, listOfRangeHasNumber: i } = e, r = n.get(re), o = new v();
     a.forEach((f) => {
-      const { range: m, primary: c, formula: l } = f, { row: p, column: T } = c, L = Yt(6);
+      const { range: m, primary: c, formula: l } = f, { row: p, column: T } = c, L = Xt(6);
       o.setValue(p, T, {
         f: l,
         si: L
@@ -34,9 +34,9 @@ const Ni = {
     };
     return r.executeCommand(Ca.id, u);
   }
-}, Ri = {
+}, Si = {
   id: "sheets-formula.command.quick-sum",
-  type: wt.COMMAND,
+  type: Yt.COMMAND,
   handler: async (n) => {
     const a = n.get(Tn).getCurrentLastSelection();
     if (!a) return !1;
@@ -107,16 +107,16 @@ const Ni = {
     ], T)).result;
   }
 }, _e = {
-  type: wt.MUTATION,
+  type: Yt.MUTATION,
   id: "sheet.mutation.data-validation-formula-mark-dirty",
   handler() {
     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 pa = {}, Si = "sheets-formula.remote.config", La = {};
-var Ai = Object.getOwnPropertyDescriptor, Ci = (n, e, a, i) => {
-  for (var r = i > 1 ? void 0 : i ? Ai(e, a) : e, o = n.length - 1, u; o >= 0; o--)
+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--)
     (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 === Vn.id) {
+        if (e.id === Gn.id) {
           const a = e.params;
           if (!a) return;
           const { imageFormulaData: i } = a;
@@ -156,8 +156,8 @@ let Je = class extends z {
   _initInterceptorCellContent() {
     this.disposeWithMe(
       this._sheetInterceptorService.intercept(Da.CELL_CONTENT, {
-        priority: 100,
-        effect: Ea.Value,
+        priority: Sn.CELL_IMAGE,
+        effect: ht.Value | ht.Style,
         // eslint-disable-next-line max-lines-per-function
         handler: (e, a, i) => {
           var h, M;
@@ -179,7 +179,7 @@ let Je = class extends z {
           const N = T || I, d = p || A, S = nn("", {}), R = {
             unitId: r,
             subUnitId: o,
-            drawingId: Yt(),
+            drawingId: Xt(),
             drawingType: ln.DRAWING_IMAGE,
             imageSourceType: cn.URL,
             source: l,
@@ -224,6 +224,7 @@ let Je = class extends z {
             }
           });
           return P ? (S.apply(P), i({
+            ...e,
             p: S.getSnapshot()
           })) : i(this._errorValueCell);
         }
@@ -261,13 +262,13 @@ let Je = class extends z {
     this._refreshRender = e;
   }
 };
-Je = Ci([
+Je = Di([
   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 || {}), 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--)
+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--)
     (u = n[o]) && (r = u(r) || r);
   return r;
 }, Dt = (n, e) => (a, i) => e(a, i, n);
@@ -275,10 +276,10 @@ let et = class extends z {
   constructor(e, a, i) {
     super();
     w(this, "_formulaCacheMap", /* @__PURE__ */ new Map());
-    w(this, "_formulaChangeWithRange$", new sa());
+    w(this, "_formulaChangeWithRange$", new da());
     w(this, "formulaChangeWithRange$", this._formulaChangeWithRange$.asObservable());
     // FIXME: this design could be improved.
-    w(this, "_formulaResult$", new sa());
+    w(this, "_formulaResult$", new da());
     w(this, "formulaResult$", this._formulaResult$.asObservable());
     w(this, "calculateStarted$", new Wa(!1));
     this._commandService = e, this._activeDirtyManagerService = a, this._lifecycleService = i, this._initFormulaRegister(), this._initFormulaCalculationResultChange();
@@ -293,7 +294,7 @@ let et = class extends z {
     return r || (r = /* @__PURE__ */ new Map(), i.set(a, r)), r;
   }
   _createFormulaId(e, a) {
-    return `formula.${e}_${a}_${Yt(8)}`;
+    return `formula.${e}_${a}_${Xt(8)}`;
   }
   _initFormulaRegister() {
     this._activeDirtyManagerService.register(
@@ -321,7 +322,7 @@ let et = class extends z {
           }
         }
       };
-      this._commandService.executeCommand(Hn.id, c).then(() => {
+      this._commandService.executeCommand(wn.id, c).then(() => {
         this._commandService.executeCommand(
           _e.id,
           { [i]: { [r]: { [u]: !0 } } }
@@ -329,9 +330,9 @@ let et = class extends z {
       });
     };
     this.disposeWithMe(
-      this._formulaChangeWithRange$.pipe(Pi(() => this.calculateStarted$.pipe(da((a) => a)))).subscribe((a) => a.forEach(e))
+      this._formulaChangeWithRange$.pipe(Ti(() => this.calculateStarted$.pipe(pa((a) => a)))).subscribe((a) => a.forEach(e))
     ), this.disposeWithMe(
-      this._formulaChangeWithRange$.pipe(da(() => this.calculateStarted$.getValue())).subscribe(e)
+      this._formulaChangeWithRange$.pipe(pa(() => this.calculateStarted$.getValue())).subscribe(e)
     );
   }
   _initFormulaCalculationResultChange() {
@@ -387,7 +388,7 @@ let et = class extends z {
       subUnitId: a,
       formulaIdList: i
     };
-    this._commandService.executeCommand(Gn.id, r);
+    this._commandService.executeCommand(Hn.id, r);
     const o = this._ensureCacheMap(e, a);
     i.forEach((u) => o.delete(u));
   }
@@ -410,17 +411,17 @@ let et = class extends z {
     ));
   }
 };
-et = bi([
+et = Oi([
   Dt(0, re),
-  Dt(1, kt),
+  Dt(1, Qt),
   Dt(2, H(dn))
 ], et);
-var Oi = Object.getOwnPropertyDescriptor, Mi = (n, e, a, i) => {
-  for (var r = i > 1 ? void 0 : i ? Oi(e, a) : e, o = n.length - 1, u; o >= 0; o--)
+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--)
     (u = n[o]) && (r = u(r) || r);
   return r;
 }, pe = (n, e) => (a, i) => e(a, i, n);
-const Pa = { done: 0, count: 0 }, bt = { onlyLocal: !0 };
+const Ta = { done: 0, count: 0 }, bt = { onlyLocal: !0 };
 let ge = class extends z {
   constructor(e, a, i, r, o, u, f) {
     super();
@@ -444,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(Pa));
+    w(this, "_progress$", new Wa(Ta));
     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();
   }
@@ -473,7 +474,7 @@ let ge = class extends z {
     this._doneCalculationTaskCount = 0, this._totalCalculationTaskCount = 0, this._emitProgress();
   }
   dispose() {
-    super.dispose(), this._progress$.next(Pa), this._progress$.complete(), clearTimeout(this._setTimeoutKey);
+    super.dispose(), this._progress$.next(Ta), this._progress$.complete(), clearTimeout(this._setTimeoutKey);
   }
   _getCalculationMode() {
     var a;
@@ -493,12 +494,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 === ba.id || i.trigger === Oa.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(ua.id, {})), 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 = [];
           }, 100);
         }
       })
@@ -521,7 +522,7 @@ let ge = class extends z {
       dirtyUnitOtherFormulaMap: u,
       forceCalculation: !1,
       clearDependencyTreeCache: f,
-      maxIteration: this._configService.getConfig(ma)
+      maxIteration: this._configService.getConfig(fa)
       // numfmtItemMap,
     };
   }
@@ -585,8 +586,8 @@ let ge = class extends z {
         if (i.id === Ne.id) {
           const { forceCalculation: o = !1 } = i.params;
           o && (this._forceCalculating = !0);
-        } else i.id === ua.id && this.clearProgress();
-        if (i.id !== wn.id)
+        } else i.id === ma.id && this.clearProgress();
+        if (i.id !== Yn.id)
           return;
         const r = i.params;
         if (r.stageInfo != null) {
@@ -664,20 +665,20 @@ let ge = class extends z {
       dirtyUnitFeatureMap: {},
       dirtyUnitOtherFormulaMap: {},
       clearDependencyTreeCache: {},
-      maxIteration: this._configService.getConfig(ma)
+      maxIteration: this._configService.getConfig(fa)
     };
   }
 };
-ge = Mi([
+ge = xi([
   pe(0, re),
-  pe(1, kt),
+  pe(1, Qt),
   pe(2, pn),
   pe(3, be),
   pe(4, H(qe)),
-  pe(5, H(Xt)),
+  pe(5, H(Wt)),
   pe(6, H(et))
 ], ge);
-function xi(n, e, a) {
+function _i(n, e, a) {
   var i;
   return n == null || n[e] == null || ((i = n[e]) == null ? void 0 : i[a]) == null;
 }
@@ -696,18 +697,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 _i = [
+const yi = [
   11,
   12,
   13,
   14
   /* RemoveDefinedName */
 ];
-function yi(n, e, a) {
+function gi(n, e, a) {
   const { type: i } = a;
-  return _i.includes(i) ? gi(n, e) : hi(n, e, a);
+  return yi.includes(i) ? hi(n, e) : qi(n, e, a);
 }
-function gi(n, e) {
+function hi(n, e) {
   const a = [], i = [];
   return Object.keys(e).forEach((r) => {
     const o = e[r], u = n[r];
@@ -746,8 +747,8 @@ function gi(n, e) {
     redos: i
   };
 }
-function hi(n, e, a) {
-  const { redoFormulaData: i, undoFormulaData: r } = qi(n, e, a), o = [], u = [];
+function qi(n, e, a) {
+  const { redoFormulaData: i, undoFormulaData: r } = Ui(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) {
@@ -781,10 +782,10 @@ function hi(n, e, a) {
     redos: o
   };
 }
-function qi(n, e, a) {
+function Ui(n, e, a) {
   const i = {}, r = {}, { unitId: o, sheetId: u } = a;
   return (/* @__PURE__ */ new Set([...Object.keys(n), ...Object.keys(e)])).forEach((m) => {
-    if (xi(n, m, u))
+    if (_i(n, m, u))
       return;
     (/* @__PURE__ */ new Set([
       ...Object.keys(n[m] || {}),
@@ -793,8 +794,8 @@ function qi(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 = Fi(I) : A = Ui(L, I, a);
-      const N = ji(A, L, I), d = zi(A, L);
+      m !== o || l !== u ? A = Bi(I) : A = Fi(L, I, a);
+      const N = zi(A, L, I), d = Zi(A, L);
       i[m] || (i[m] = {}), r[m] || (r[m] = {}), i[m][l] = {
         ...i[m][l],
         ...N
@@ -808,7 +809,7 @@ function qi(n, e, a) {
     undoFormulaData: r
   };
 }
-function Ui(n, e, a) {
+function Fi(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;
@@ -820,9 +821,9 @@ function Ui(n, e, a) {
       2
       /* MoveCols */
     ].includes(i))
-      T = Bi(i, r, o, p);
+      T = vi(i, r, o, p);
     else if (u != null) {
-      const I = vi(p, a);
+      const I = Vi(p, a);
       T = I.newCell, L = I.isReverse;
     }
     if (Ke.diffValue(p, T) && !e.getValue(m, c))
@@ -830,7 +831,7 @@ function Ui(n, e, a) {
     L ? f.unshift({ oldCell: p, newCell: T }) : f.push({ oldCell: p, newCell: T });
   }), f;
 }
-function Fi(n) {
+function Bi(n) {
   const e = [];
   return n.forValue((a, i, r) => {
     if (r == null || !ka(r)) return !0;
@@ -838,52 +839,52 @@ function Fi(n) {
     e.push({ oldCell: o, newCell: o });
   }), e;
 }
-function Bi(n, e, a, i) {
+function vi(n, e, a, i) {
   if (e == null || a == null)
     return null;
   switch (n) {
     case 0:
-      return Vi(e, a, i);
-    case 1:
       return Gi(e, a, i);
-    case 2:
+    case 1:
       return Hi(e, a, i);
+    case 2:
+      return wi(e, a, i);
     default:
       return null;
   }
 }
-function vi(n, e) {
+function Vi(n, e) {
   const { type: a, rangeFilteredRows: i } = e, r = e.range;
   let o = null, u = !1;
   switch (a) {
     case 3:
-      o = wi(r, n), u = !0;
+      o = Yi(r, n), u = !0;
       break;
     case 4:
-      o = Yi(r, n), u = !0;
+      o = Xi(r, n), u = !0;
       break;
     case 5:
-      o = Xi(r, n, i);
+      o = Wi(r, n, i);
       break;
     case 6:
-      o = Wi(r, n);
+      o = Ki(r, n);
       break;
     case 7:
-      o = Ki(r, n);
+      o = ki(r, n);
       break;
     case 8:
-      o = ki(r, n);
+      o = Qi(r, n);
       break;
     case 9:
-      o = Qi(r, n), u = !0;
+      o = $i(r, n), u = !0;
       break;
     case 10:
-      o = $i(r, n), u = !0;
+      o = ji(r, n), u = !0;
       break;
   }
   return { newCell: o, isReverse: u };
 }
-function Vi(n, e, a) {
+function Gi(n, e, a) {
   const i = _a(
     {
       id: Y.MoveRangeCommandId,
@@ -893,7 +894,7 @@ function Vi(n, e, a) {
   );
   return X(i, a);
 }
-function Gi(n, e, a) {
+function Hi(n, e, a) {
   const i = xa(
     {
       id: Y.MoveRowsCommandId,
@@ -903,7 +904,7 @@ function Gi(n, e, a) {
   );
   return X(i, a);
 }
-function Hi(n, e, a) {
+function wi(n, e, a) {
   const i = Ma(
     {
       id: Y.MoveColsCommandId,
@@ -913,7 +914,7 @@ function Hi(n, e, a) {
   );
   return X(i, a);
 }
-function wi(n, e) {
+function Yi(n, e) {
   const a = va(
     {
       id: Y.InsertRowCommandId,
@@ -923,7 +924,7 @@ function wi(n, e) {
   );
   return X(a, e);
 }
-function Yi(n, e) {
+function Xi(n, e) {
   const a = Ba(
     {
       id: Y.InsertColCommandId,
@@ -933,7 +934,7 @@ function Yi(n, e) {
   );
   return X(a, e);
 }
-function Xi(n, e, a) {
+function Wi(n, e, a) {
   const i = Fa(
     {
       id: Y.RemoveRowCommandId,
@@ -944,7 +945,7 @@ function Xi(n, e, a) {
   );
   return X(i, e);
 }
-function Wi(n, e) {
+function Ki(n, e) {
   const a = Ua(
     {
       id: Y.RemoveColCommandId,
@@ -954,7 +955,7 @@ function Wi(n, e) {
   );
   return X(a, e);
 }
-function Ki(n, e) {
+function ki(n, e) {
   const a = qa(
     {
       id: Y.DeleteRangeMoveLeftCommandId,
@@ -964,7 +965,7 @@ function Ki(n, e) {
   );
   return X(a, e);
 }
-function ki(n, e) {
+function Qi(n, e) {
   const a = ha(
     {
       id: Y.DeleteRangeMoveUpCommandId,
@@ -974,7 +975,7 @@ function ki(n, e) {
   );
   return X(a, e);
 }
-function Qi(n, e) {
+function $i(n, e) {
   const a = ga(
     {
       id: Y.InsertRangeMoveDownCommandId,
@@ -984,7 +985,7 @@ function Qi(n, e) {
   );
   return X(a, e);
 }
-function $i(n, e) {
+function ji(n, e) {
   const a = ya(
     {
       id: Y.InsertRangeMoveRightCommandId,
@@ -994,7 +995,7 @@ function $i(n, e) {
   );
   return X(a, e);
 }
-function ji(n, e, a) {
+function zi(n, e, a) {
   var r, o, u;
   const i = new v({});
   for (let f = 0; f < n.length; f++) {
@@ -1006,7 +1007,7 @@ function ji(n, e, a) {
   }
   return i.getMatrix();
 }
-function zi(n, e) {
+function Zi(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);
@@ -1029,7 +1030,7 @@ 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 Zi(n) {
+function Ji(n) {
   const e = new v({});
   return new v(n).forValue((i, r, o) => {
     const u = he(o);
@@ -1368,50 +1369,50 @@ function za(n, e) {
   const { id: a } = e;
   let i = null;
   switch (a) {
+    case Un.id:
+      i = er(e, n);
+      break;
     case qn.id:
-      i = Ji(e, n);
+      i = tr(e, n);
       break;
     case hn.id:
-      i = er(e, n);
+      i = ar(e, n);
       break;
     case gn.id:
-      i = tr(e, n);
+      i = nr(e);
       break;
     case yn.id:
-      i = ar(e);
+      i = ir(e);
       break;
     case _n.id:
-      i = nr(e);
+      i = rr(e, n);
       break;
     case xn.id:
-      i = ir(e, n);
+      i = or(e, n);
       break;
     case Mn.id:
-      i = rr(e, n);
+      i = ur(e, n);
       break;
     case On.id:
-      i = or(e, n);
+      i = mr(e, n);
       break;
     case bn.id:
-      i = ur(e, n);
+      i = fr(e, n);
       break;
     case Dn.id:
-      i = mr(e, n);
+      i = cr(e, n);
       break;
     case Cn.id:
-      i = fr(e, n);
+      i = lr(e, n);
       break;
     case An.id:
-      i = cr(e, n);
-      break;
-    case Sn.id:
-      i = lr(e, n);
+      i = sr(e, n);
       break;
     case Ga.id:
-      i = sr(e, n);
+      i = dr(e, n);
       break;
     case Va.id:
-      i = dr(e, n);
+      i = pr(e, n);
       break;
   }
   return i;
@@ -1424,7 +1425,7 @@ function te(n) {
     sheetId: a
   };
 }
-function Ji(n, e) {
+function er(n, e) {
   const { params: a } = n;
   if (!a) return null;
   const { fromRange: i, toRange: r } = a;
@@ -1438,7 +1439,7 @@ function Ji(n, e) {
     sheetId: u
   };
 }
-function er(n, e) {
+function tr(n, e) {
   const { params: a } = n;
   if (!a) return null;
   const {
@@ -1467,7 +1468,7 @@ function er(n, e) {
     sheetId: c
   };
 }
-function tr(n, e) {
+function ar(n, e) {
   const { params: a } = n;
   if (!a) return null;
   const {
@@ -1496,7 +1497,7 @@ function tr(n, e) {
     sheetId: c
   };
 }
-function ar(n) {
+function nr(n) {
   const { params: e } = n;
   if (!e) return null;
   const { range: a, unitId: i, subUnitId: r } = e;
@@ -1507,7 +1508,7 @@ function ar(n) {
     sheetId: r
   };
 }
-function nr(n) {
+function ir(n) {
   const { params: e } = n;
   if (!e) return null;
   const { range: a, unitId: i, subUnitId: r } = e;
@@ -1518,7 +1519,7 @@ function nr(n) {
     sheetId: r
   };
 }
-function ir(n, e) {
+function rr(n, e) {
   const { params: a } = n;
   if (!a) return null;
   const { range: i } = a, { unitId: r, sheetId: o } = te(e);
@@ -1529,7 +1530,7 @@ function ir(n, e) {
     sheetId: o
   };
 }
-function rr(n, e) {
+function or(n, e) {
   const { params: a } = n;
   if (!a) return null;
   const { range: i } = a, { unitId: r, sheetId: o } = te(e);
@@ -1540,7 +1541,7 @@ function rr(n, e) {
     sheetId: o
   };
 }
-function or(n, e) {
+function ur(n, e) {
   var u, f;
   const { params: a } = n;
   if (!a) return null;
@@ -1553,7 +1554,7 @@ function or(n, e) {
     rangeFilteredRows: (f = (u = e.getSheetBySheetId(o)) == null ? void 0 : u.getRangeFilterRows(i)) != null ? f : []
   };
 }
-function ur(n, e) {
+function mr(n, e) {
   const { params: a } = n;
   if (!a) return null;
   const { range: i } = a, { unitId: r, sheetId: o } = te(e);
@@ -1564,7 +1565,7 @@ function ur(n, e) {
     sheetId: o
   };
 }
-function mr(n, e) {
+function fr(n, e) {
   const { params: a } = n;
   if (!a) return null;
   const { range: i } = a, { unitId: r, sheetId: o } = te(e);
@@ -1575,7 +1576,7 @@ function mr(n, e) {
     sheetId: o
   };
 }
-function fr(n, e) {
+function cr(n, e) {
   const { params: a } = n;
   if (!a) return null;
   const { range: i } = a, { unitId: r, sheetId: o } = te(e);
@@ -1586,7 +1587,7 @@ function fr(n, e) {
     sheetId: o
   };
 }
-function cr(n, e) {
+function lr(n, e) {
   const { params: a } = n;
   if (!a) return null;
   const { unitId: i, subUnitId: r, name: o } = a, { unitId: u, sheetId: f } = te(e);
@@ -1597,7 +1598,7 @@ function cr(n, e) {
     sheetName: o
   };
 }
-function lr(n, e) {
+function sr(n, e) {
   const { params: a } = n;
   if (!a) return null;
   const { unitId: i, subUnitId: r } = a, { unitId: o, sheetId: u } = te(e);
@@ -1607,7 +1608,7 @@ function lr(n, e) {
     sheetId: r || u
   };
 }
-function sr(n, e) {
+function dr(n, e) {
   const { params: a } = n;
   if (!a) return null;
   const { unitId: i, name: r, id: o } = a, { sheetId: u } = te(e);
@@ -1619,7 +1620,7 @@ function sr(n, e) {
     definedNameId: o
   };
 }
-function dr(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);
@@ -1631,8 +1632,8 @@ function dr(n, e) {
     definedNameId: o
   };
 }
-var pr = Object.getOwnPropertyDescriptor, Lr = (n, e, a, i) => {
-  for (var r = i > 1 ? void 0 : i ? pr(e, a) : e, o = n.length - 1, u; o >= 0; 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--)
     (u = n[o]) && (r = u(r) || r);
   return r;
 }, He = (n, e) => (a, i) => e(a, i, n);
@@ -1752,14 +1753,14 @@ let tt = class extends z {
     return ((o = this._definedNamesService.getWorksheetByRef(e, i)) == null ? void 0 : o.getSheetId()) === a ? k.REF : null;
   }
 };
-tt = Lr([
+tt = Pr([
   He(0, Lt),
   He(1, Ee),
   He(2, H(dt)),
   He(3, H(Pt))
 ], tt);
-var Pr = Object.getOwnPropertyDescriptor, Tr = (n, e, a, i) => {
-  for (var r = i > 1 ? void 0 : i ? Pr(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;
 }, me = (n, e) => (a, i) => e(a, i, n);
@@ -1773,21 +1774,21 @@ let at = class extends z {
     })), this.disposeWithMe(
       this._commandService.onCommandExecuted((n) => {
         if (n.params)
-          if (n.id === qt.id) {
+          if (n.id === Ut.id) {
             const { subUnitId: e, unitId: a } = n.params;
             this._handleWorkbookDisposed(a, e);
-          } else n.id === Ut.id && this._handleInsertSheetMutation(n.params);
+          } else n.id === Ft.id && this._handleInsertSheetMutation(n.params);
       })
     ), this.disposeWithMe(
       this._commandService.beforeCommandExecuted((n, e) => {
         if (n.id === Q.id) {
           const a = n.params;
-          if (e && e.onlyLocal === !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 === ba.id || a.trigger === Oa.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(Ti((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(Ei((n) => n.getUnitId())).subscribe((n) => this._handleWorkbookDisposed(n)));
   }
   _handleSetRangeValuesMutation(n) {
     const { subUnitId: e, unitId: a, cellValue: i } = n;
@@ -1806,7 +1807,7 @@ let at = class extends z {
       {
         unitId: a,
         subUnitId: e,
-        cellValue: Zi(r)
+        cellValue: Ji(r)
       },
       {
         onlyLocal: !0,
@@ -1821,7 +1822,7 @@ let at = class extends z {
         onlyLocal: !0
       }
     ), this._commandService.executeCommand(
-      Ft.id,
+      Bt.id,
       {
         arrayFormulaRange: this._formulaDataModel.getArrayFormulaRange(),
         arrayFormulaCellData: this._formulaDataModel.getArrayFormulaCellData()
@@ -1844,7 +1845,7 @@ let at = class extends z {
         onlyLocal: !0
       }
     ), o && f && this._commandService.executeCommand(
-      Ft.id,
+      Bt.id,
       {
         arrayFormulaRange: r,
         arrayFormulaCellData: u
@@ -1855,7 +1856,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 = fa(i, a, r, u);
+    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);
     this._commandService.executeCommand(
       Ge.id,
       {
@@ -1871,7 +1872,7 @@ 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 = fa(e, a, p, l);
+      const l = c.getCellMatrix(), p = c.getSheetId(), T = ca(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);
@@ -1902,7 +1903,7 @@ let at = class extends z {
         r,
         i,
         a
-      ), { undos: u, redos: f } = yi(r, o, a);
+      ), { undos: u, redos: f } = gi(r, o, a);
       return {
         undos: u,
         redos: f
@@ -2024,7 +2025,7 @@ let at = class extends z {
     return { newFormulaData: o };
   }
 };
-at = Tr([
+at = Er([
   me(0, Ee),
   me(1, re),
   me(2, H(Pt)),
@@ -2034,9 +2035,9 @@ at = Tr([
   me(6, be),
   me(7, H(st))
 ], at);
-const Er = "SHEETS_FORMULA_PLUGIN";
-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--)
+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--)
     (u = n[o]) && (r = u(r) || r);
   return r;
 }, _t = (n, e) => (a, i) => e(a, i, n);
@@ -2052,15 +2053,15 @@ let nt = class extends z {
       commandId: Q.id,
       getDirtyData: (n) => {
         const e = n.params;
-        return e.trigger === Kt.id ? {} : {
+        return e.trigger === kt.id ? {} : {
           dirtyRanges: this._getSetRangeValuesMutationDirtyRange(e)
         };
       }
     }), this._initialMove(), this._initialRowAndColumn(), this._initialHideRow(), this._initialSheet(), this._initialDefinedName();
   }
   _initialMove() {
-    this._activeDirtyManagerService.register(jt.id, {
-      commandId: jt.id,
+    this._activeDirtyManagerService.register(zt.id, {
+      commandId: zt.id,
       getDirtyData: (n) => {
         const e = n.params;
         return {
@@ -2073,8 +2074,8 @@ let nt = class extends z {
           }
         };
       }
-    }), this._activeDirtyManagerService.register(zt.id, {
-      commandId: zt.id,
+    }), this._activeDirtyManagerService.register(Zt.id, {
+      commandId: Zt.id,
       getDirtyData: (n) => {
         const e = n.params;
         return {
@@ -2086,8 +2087,8 @@ let nt = class extends z {
           }
         };
       }
-    }), this._activeDirtyManagerService.register(Zt.id, {
-      commandId: Zt.id,
+    }), this._activeDirtyManagerService.register(Jt.id, {
+      commandId: Jt.id,
       getDirtyData: (n) => {
         const e = n.params;
         return {
@@ -2099,8 +2100,8 @@ let nt = class extends z {
           }
         };
       }
-    }), this._activeDirtyManagerService.register(Jt.id, {
-      commandId: Jt.id,
+    }), this._activeDirtyManagerService.register(ea.id, {
+      commandId: ea.id,
       getDirtyData: (n) => {
         const e = n.params;
         return {
@@ -2115,8 +2116,8 @@ let nt = class extends z {
     });
   }
   _initialRowAndColumn() {
-    this._activeDirtyManagerService.register(ea.id, {
-      commandId: ea.id,
+    this._activeDirtyManagerService.register(ta.id, {
+      commandId: ta.id,
       getDirtyData: (n) => {
         const e = n.params;
         return {
@@ -2128,8 +2129,8 @@ let nt = class extends z {
           }
         };
       }
-    }), this._activeDirtyManagerService.register(ta.id, {
-      commandId: ta.id,
+    }), this._activeDirtyManagerService.register(aa.id, {
+      commandId: aa.id,
       getDirtyData: (n) => {
         const e = n.params;
         return {
@@ -2141,8 +2142,8 @@ let nt = class extends z {
           }
         };
       }
-    }), this._activeDirtyManagerService.register(aa.id, {
-      commandId: aa.id,
+    }), this._activeDirtyManagerService.register(na.id, {
+      commandId: na.id,
       getDirtyData: (n) => {
         const e = n.params;
         return {
@@ -2153,8 +2154,8 @@ let nt = class extends z {
           }
         };
       }
-    }), this._activeDirtyManagerService.register(na.id, {
-      commandId: na.id,
+    }), this._activeDirtyManagerService.register(ia.id, {
+      commandId: ia.id,
       getDirtyData: (n) => {
         const e = n.params;
         return {
@@ -2168,8 +2169,8 @@ let nt = class extends z {
     });
   }
   _initialHideRow() {
-    this._activeDirtyManagerService.register(ia.id, {
-      commandId: ia.id,
+    this._activeDirtyManagerService.register(ra.id, {
+      commandId: ra.id,
       getDirtyData: (n) => {
         const e = n.params;
         return {
@@ -2181,8 +2182,8 @@ let nt = class extends z {
           }
         };
       }
-    }), this._activeDirtyManagerService.register(ra.id, {
-      commandId: ra.id,
+    }), this._activeDirtyManagerService.register(oa.id, {
+      commandId: oa.id,
       getDirtyData: (n) => {
         const e = n.params;
         return {
@@ -2197,8 +2198,8 @@ let nt = class extends z {
     });
   }
   _initialSheet() {
-    this._activeDirtyManagerService.register(qt.id, {
-      commandId: qt.id,
+    this._activeDirtyManagerService.register(Ut.id, {
+      commandId: Ut.id,
       getDirtyData: (n) => {
         const e = n.params;
         return {
@@ -2210,8 +2211,8 @@ let nt = class extends z {
           }
         };
       }
-    }), this._activeDirtyManagerService.register(Ut.id, {
-      commandId: Ut.id,
+    }), this._activeDirtyManagerService.register(Ft.id, {
+      commandId: Ft.id,
       getDirtyData: (n) => {
         const e = n.params;
         return {
@@ -2227,8 +2228,8 @@ let nt = class extends z {
         const e = n.params;
         return { dirtyDefinedNameMap: this._getDefinedNameMutation(e) };
       }
-    }), this._activeDirtyManagerService.register(Bt.id, {
-      commandId: Bt.id,
+    }), this._activeDirtyManagerService.register(vt.id, {
+      commandId: vt.id,
       getDirtyData: (n) => {
         const e = n.params;
         return { dirtyDefinedNameMap: this._getDefinedNameMutation(e) };
@@ -2334,13 +2335,13 @@ let nt = class extends z {
     return i;
   }
 };
-nt = Nr([
-  _t(0, kt),
+nt = Rr([
+  _t(0, Qt),
   _t(1, Ee),
   _t(2, H(qe))
 ], nt);
-var Rr = Object.getOwnPropertyDescriptor, Sr = (n, e, a, i) => {
-  for (var r = i > 1 ? void 0 : i ? Rr(e, a) : e, o = n.length - 1, u; o >= 0; o--)
+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;
 }, Le = (n, e) => (a, i) => e(a, i, n);
@@ -2356,7 +2357,7 @@ let it = class extends z {
       this._commandService.onCommandExecuted((n) => {
         var a;
         const e = (a = this._configService.getConfig(Ue)) == null ? void 0 : a.writeArrayFormulaToSnapshot;
-        if (n.id === Ft.id) {
+        if (n.id === Bt.id) {
           const i = n.params;
           if (i == null)
             return;
@@ -2468,18 +2469,18 @@ let it = class extends z {
     this.disposeWithMe(
       this._sheetInterceptorService.intercept(Da.CELL_CONTENT, {
         priority: 100,
-        effect: Ea.Value,
+        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 = Yn(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 && Ln(i.v) ? (i.v = Xn(Number(i.v)), a(i)) : (i.v = c.v, i.t = c.t, a(i)));
         }
       })
     );
   }
 };
-it = Sr([
+it = Ar([
   Le(0, re),
   Le(1, be),
   Le(2, H(dt)),
@@ -2488,9 +2489,9 @@ it = Sr([
   Le(5, Tt),
   Le(6, Lt)
 ], it);
-const Ar = [
+const Cr = [
   {
-    functionName: ca.ARRAY_CONSTRAIN,
+    functionName: la.ARRAY_CONSTRAIN,
     functionType: t.Array,
     description: "formula.functionList.ARRAY_CONSTRAIN.description",
     abstract: "formula.functionList.ARRAY_CONSTRAIN.abstract",
@@ -2519,7 +2520,7 @@ const Ar = [
     ]
   },
   {
-    functionName: ca.FLATTEN,
+    functionName: la.FLATTEN,
     functionType: t.Array,
     description: "formula.functionList.FLATTEN.description",
     abstract: "formula.functionList.FLATTEN.abstract",
@@ -2540,7 +2541,7 @@ const Ar = [
       }
     ]
   }
-], Cr = [
+], Dr = [
   {
     functionName: _.BETADIST,
     functionType: t.Compatibility,
@@ -3594,7 +3595,7 @@ const Ar = [
       }
     ]
   }
-], Dr = [
+], br = [
   {
     functionName: de.CUBEKPIMEMBER,
     functionType: t.Cube,
@@ -3749,7 +3750,7 @@ const Ar = [
       }
     ]
   }
-], br = [
+], Or = [
   {
     functionName: $.DAVERAGE,
     functionType: t.Database,
@@ -4098,7 +4099,7 @@ const Ar = [
       }
     ]
   }
-], Or = [
+], Mr = [
   {
     functionName: V.DATE,
     functionType: t.Date,
@@ -4670,7 +4671,7 @@ const Ar = [
       }
     ]
   }
-], Mr = [
+], xr = [
   {
     functionName: C.BESSELI,
     functionType: t.Engineering,
@@ -5743,7 +5744,7 @@ const Ar = [
       }
     ]
   }
-], xr = [
+], _r = [
   {
     functionName: D.ACCRINT,
     functionType: t.Financial,
@@ -8004,7 +8005,7 @@ const Ar = [
       }
     ]
   }
-], _r = [
+], yr = [
   {
     functionName: G.CELL,
     functionType: t.Information,
@@ -8413,7 +8414,7 @@ const Ar = [
       }
     ]
   }
-], yr = [
+], gr = [
   {
     functionName: K.AND,
     functionType: t.Logical,
@@ -8887,7 +8888,7 @@ const Ar = [
       }
     ]
   }
-], gr = [
+], hr = [
   {
     functionName: g.ADDRESS,
     functionType: t.Lookup,
@@ -9940,7 +9941,7 @@ const Ar = [
       }
     ]
   }
-], hr = [
+], qr = [
   {
     functionName: E.ABS,
     functionType: t.Math,
@@ -11592,7 +11593,7 @@ const Ar = [
       }
     ]
   }
-], qr = [
+], Ur = [
   {
     functionName: s.AVEDEV,
     functionType: t.Statistical,
@@ -14534,7 +14535,7 @@ const Ar = [
       }
     ]
   }
-], Ur = [
+], Fr = [
   {
     functionName: b.ASC,
     functionType: t.Text,
@@ -15748,7 +15749,7 @@ const Ar = [
       }
     ]
   }
-], Fr = [], Br = [
+], Br = [], vr = [
   {
     functionName: At.ENCODEURL,
     functionType: t.Web,
@@ -15808,34 +15809,34 @@ const Ar = [
       }
     ]
   }
-], vr = [
-  ...xr,
-  ...Or,
-  ...hr,
+], Vr = [
+  ..._r,
+  ...Mr,
   ...qr,
-  ...gr,
-  ...br,
   ...Ur,
+  ...hr,
+  ...Or,
+  ...Fr,
+  ...gr,
   ...yr,
-  ..._r,
-  ...Mr,
+  ...xr,
+  ...br,
   ...Dr,
+  ...vr,
   ...Cr,
-  ...Br,
-  ...Ar,
-  ...Fr
+  ...Br
 ];
-function Vr(n, e) {
+function Gr(n, e) {
   let a = "";
   return n.aliasFunctionName ? (a = e.t(n.aliasFunctionName), a === n.aliasFunctionName && (a = n.functionName)) : a = n.functionName, a;
 }
-var Gr = Object.getOwnPropertyDescriptor, Hr = (n, e, a, i) => {
-  for (var r = i > 1 ? void 0 : i ? Gr(e, a) : e, o = n.length - 1, u; o >= 0; o--)
+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--)
     (u = n[o]) && (r = u(r) || r);
   return r;
 }, yt = (n, e) => (a, i) => e(a, i, n);
-const Et = Wt("formula.description-service");
-let Vt = class {
+const Et = Kt("formula.description-service");
+let Gt = class {
   constructor(n, e, a) {
     w(this, "_descriptions", []);
     this._functionService = n, this._localeService = e, this._configService = a, this._initialize();
@@ -15893,7 +15894,7 @@ let Vt = class {
     if (e.length === 0)
       return !1;
     const a = e[0].description;
-    return !Xn(a);
+    return !Wn(a);
   }
   _initialize() {
     this._localeService.localeChanged$.subscribe(() => {
@@ -15903,7 +15904,6 @@ let Vt = class {
   _initDescription() {
     var i;
     const n = [
-      ...Wn,
       ...Kn,
       ...kn,
       ...Qn,
@@ -15918,13 +15918,14 @@ let Vt = class {
       ...ni,
       ...ii,
       ...ri,
-      ...oi
-    ].map((r) => r[1]), e = vr.filter((r) => n.includes(r.functionName)), a = this._configService.getConfig(Ue);
+      ...oi,
+      ...ui
+    ].map((r) => r[1]), e = Vr.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: Vr(a, n),
+      functionName: Gr(a, n),
       functionType: a.functionType,
       description: n.t(a.description),
       abstract: n.t(a.abstract),
@@ -15939,13 +15940,13 @@ let Vt = class {
     this._functionService.registerDescriptions(...e);
   }
 };
-Vt = Hr([
+Gt = wr([
   yt(0, Tt),
-  yt(1, H(Xt)),
+  yt(1, H(Wt)),
   yt(2, be)
-], Vt);
-var wr = Object.getOwnPropertyDescriptor, Yr = (n, e, a, i) => {
-  for (var r = i > 1 ? void 0 : i ? wr(e, a) : e, o = n.length - 1, u; o >= 0; o--)
+], 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--)
     (u = n[o]) && (r = u(r) || r);
   return r;
 }, we = (n, e) => (a, i) => e(a, i, n);
@@ -15981,7 +15982,7 @@ let rt = class extends z {
           else if (e.id === De.id) {
             const i = e.params;
             this._registerDescription(i);
-          } else if (e.id === Bt.id) {
+          } else if (e.id === vt.id) {
             const i = e.params;
             this._unregisterDescription(i);
           }
@@ -16061,31 +16062,31 @@ let rt = class extends z {
     }), this._descriptionService.unregisterDescriptions(r);
   }
 };
-rt = Yr([
+rt = Xr([
   we(0, Et),
   we(1, Lt),
   we(2, Ee),
   we(3, re)
 ], rt);
-var Xr = Object.getOwnPropertyDescriptor, Wr = (n, e, a, i) => {
-  for (var r = i > 1 ? void 0 : i ? Xr(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;
-}, Kr = (n, e) => (a, i) => e(a, i, n);
+}, kr = (n, e) => (a, i) => e(a, i, n);
 let ot = class extends z {
   constructor(n) {
     super(), this._commandService = n, [
-      Ni,
       Ri,
+      Si,
       _e
     ].forEach((e) => this._commandService.registerCommand(e));
   }
 };
-ot = Wr([
-  Kr(0, re)
+ot = Kr([
+  kr(0, re)
 ], ot);
-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--)
+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--)
     (u = n[o]) && (r = u(r) || r);
   return r;
 }, Ye = (n, e) => (a, i) => e(a, i, n);
@@ -16118,10 +16119,10 @@ let ut = class extends z {
         if (!(a != null && a.fromCollab)) {
           if (e.id === Ha.id)
             this._unregisterDescriptionsForNotInSheetId(), this._registerDescriptions();
-          else if (e.id === ui.id) {
+          else if (e.id === mi.id) {
             const i = e.params;
             this._registerDescription(i);
-          } else if (e.id === mi.id) {
+          } else if (e.id === fi.id) {
             const i = e.params;
             this._unregisterDescription(i);
           }
@@ -16204,18 +16205,18 @@ let ut = class extends z {
     }), this._descriptionService.unregisterDescriptions(r);
   }
 };
-ut = Qr([
+ut = $r([
   Ye(0, Et),
   Ye(1, Ee),
   Ye(2, re),
-  Ye(3, fi)
+  Ye(3, ci)
 ], ut);
-var $r = Object.getOwnPropertyDescriptor, jr = (n, e, a, i) => {
-  for (var r = i > 1 ? void 0 : i ? $r(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;
 }, Xe = (n, e) => (a, i) => e(a, i, n);
-function Ta(n, e, a, i) {
+function Ea(n, e, a, i) {
   const r = n.sequenceNodesBuilder(e);
   if (r == null)
     return e;
@@ -16226,7 +16227,7 @@ function Ta(n, e, a, i) {
       continue;
     const { token: c } = m, l = Pe(c), { sheetName: p, unitId: T } = l;
     let L = l.range;
-    L.startAbsoluteRefType === je.ALL && L.endAbsoluteRefType === je.ALL || (L = ht(L, a, i), o.push({
+    L.startAbsoluteRefType === je.ALL && L.endAbsoluteRefType === je.ALL || (L = qt(L, a, i), o.push({
       unitId: T,
       sheetName: p,
       range: L
@@ -16234,7 +16235,7 @@ function Ta(n, e, a, i) {
   }
   return o.map((u) => `${u.unitId}!${u.sheetName}!${u.range.startRow}!${u.range.endRow}!${u.range.startColumn}!${u.range.endColumn}`).join("|");
 }
-let Gt = class extends z {
+let Ht = class extends z {
   constructor(n, e, a, i) {
     super(), this._refRangeService = n, this._lexerTreeBuilder = e, this._univerInstanceService = a, this._injector = i;
   }
@@ -16247,11 +16248,11 @@ let Gt = class extends z {
         const d = A.getUnitId(), S = N.getSheetId();
         if (d !== f || S !== m)
           return l;
-        const R = oa(T, i);
+        const R = ua(T, i);
         let P = "";
         if (R) {
-          const h = R.startColumn - T.startColumn, M = R.startRow - T.startRow, U = ht(T, h, M);
-          L && I ? P = la(L, I, U) : I ? P = Ze(I, U) : P = Ce(U);
+          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);
         } else
           P = k.REF;
         return {
@@ -16270,11 +16271,11 @@ let Gt = class extends z {
           const N = r.get(A.token);
           if (N.unitId !== p || N.subUnitId !== T)
             return A;
-          const d = oa(N.range, m);
+          const d = ua(N.range, m);
           let S = "";
           if (d) {
-            const R = d.startColumn - N.range.startColumn, P = d.startRow - N.range.startRow, h = ht(N.range, R, P);
-            N.unitId && N.sheetName ? S = la(N.unitId, N.sheetName, h) : N.sheetName ? S = Ze(N.sheetName, h) : S = Ce(h);
+            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);
           } else
             S = k.REF;
           return {
@@ -16328,7 +16329,7 @@ let Gt = 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 = Fn(this._injector, 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);
       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;
@@ -16350,12 +16351,12 @@ let Gt = 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 = Bn(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 = vn(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 = Ta(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 = Ea(this._lexerTreeBuilder, J, -ce, -O);
             ne.push({
               newFormula: J,
               orginFormula: Nt
@@ -16368,7 +16369,7 @@ let Gt = class extends z {
           };
           N.has(le.key) ? N.get(le.key).push(le) : N.set(le.key, [le]);
         }
-        const d = i.map((P) => Ta(this._lexerTreeBuilder, P, 0, 0)).join("_");
+        const d = i.map((P) => Ea(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++) {
@@ -16414,54 +16415,54 @@ let Gt = class extends z {
     }), o;
   }
 };
-Gt = jr([
-  Xe(0, H(Un)),
+Ht = zr([
+  Xe(0, H(Fn)),
   Xe(1, H(Pt)),
   Xe(2, Ee),
   Xe(3, H(st))
-], Gt);
-var zr = Object.getOwnPropertyDescriptor, Zr = (n, e, a, i) => {
-  for (var r = i > 1 ? void 0 : i ? zr(e, a) : e, o = n.length - 1, u; o >= 0; o--)
+], 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--)
     (u = n[o]) && (r = u(r) || r);
   return r;
-}, Jr = (n, e) => (a, i) => e(a, i, n);
-const Qt = "sheets-formula.remote-register-function.service", Za = Wt(Qt);
+}, eo = (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]) => eo(a, i));
+    const e = n.map(([a, i]) => to(a, i));
     this._functionService.registerExecutors(...e);
   }
   async registerAsyncFunctions(n) {
-    const e = n.map(([a, i]) => to(a, i));
+    const e = n.map(([a, i]) => ao(a, i));
     this._functionService.registerExecutors(...e);
   }
   async unregisterFunctions(n) {
     this._functionService.unregisterExecutors(...n), this._functionService.unregisterDescriptions(...n), this._functionService.deleteFormulaAstCacheKey(...n);
   }
 };
-mt = Zr([
-  Jr(0, Tt)
+mt = Jr([
+  eo(0, Tt)
 ], mt);
-function eo(n, e) {
-  const a = new vt(e), i = new Function(`return ${n}`)();
+function to(n, e) {
+  const a = new Vt(e), i = new Function(`return ${n}`)();
   return a.calculateCustom = i, a;
 }
-function to(n, e) {
+function ao(n, e) {
   const a = new Ya(e), i = new Function(`return ${n}`)();
   return a.calculateCustom = i, a;
 }
-var ao = Object.getOwnPropertyDescriptor, no = (n, e, a, i) => {
-  for (var r = i > 1 ? void 0 : i ? ao(e, a) : e, o = n.length - 1, u; o >= 0; o--)
+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--)
     (u = n[o]) && (r = u(r) || r);
   return r;
 }, We = (n, e) => (a, i) => e(a, i, n);
-const io = Wt(
+const ro = Kt(
   "sheets-formula.register-function-service"
 );
-let Ht = class extends z {
+let wt = class extends z {
   constructor(n, e, a, i) {
     super(), this._localeService = n, this._descriptionService = e, this._functionService = a, this._remoteRegisterFunctionService = i;
   }
@@ -16502,14 +16503,14 @@ let Ht = 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 Ya(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;
   }
   _registerLocalExecutors(n) {
     const e = n.map(([i, r]) => r), a = n.map(([i, r]) => {
-      const o = new vt(r);
+      const o = new Vt(r);
       return o.calculateCustom = i, o;
     });
     return this._functionService.registerExecutors(...a), ee(() => this._functionService.unregisterExecutors(...e));
@@ -16519,31 +16520,31 @@ let Ht = class extends z {
     return this._remoteRegisterFunctionService.registerFunctions(a), ee(() => this._remoteRegisterFunctionService.unregisterFunctions(e));
   }
 };
-Ht = no([
-  We(0, H(Xt)),
+wt = io([
+  We(0, H(Wt)),
   We(1, H(Et)),
   We(2, Tt),
   We(3, Pn(Za))
-], Ht);
-var ro = Object.defineProperty, oo = Object.getOwnPropertyDescriptor, uo = (n, e, a) => e in n ? ro(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 ? oo(e, a) : e, o = n.length - 1, u; o >= 0; o--)
+], 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--)
     (u = n[o]) && (r = u(r) || r);
   return r;
-}, ft = (n, e) => (a, i) => e(a, i, n), It = (n, e, a) => uo(n, typeof e != "symbol" ? e + "" : e, a);
+}, 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 = La, e, a) {
+  constructor(n = Pa, e, a) {
     super(), this._config = n, this._injector = e, this._configService = a;
     const { ...i } = Aa(
       {},
-      La,
+      Pa,
       this._config
     );
-    this._configService.setConfig(Si, i);
+    this._configService.setConfig(Ai, i);
   }
   onStarting() {
     this._injector.add([mt]), this._injector.get(Ka).registerChannel(
-      Qt,
-      Ei(this._injector.get(mt))
+      $t,
+      Ii(this._injector.get(mt))
     );
   }
 };
@@ -16555,21 +16556,21 @@ ct = Ja([
   ft(2, be)
 ], ct);
 let lt = class extends Sa {
-  constructor(n = pa, e, a) {
+  constructor(n = La, e, a) {
     super(), this._config = n, this._injector = e, this._configService = a;
     const { ...i } = Aa(
       {},
-      pa,
+      La,
       this._config
     );
     this._configService.setConfig(Ue, i, { merge: !0 });
   }
   onStarting() {
     const n = this._injector, e = [
-      [io, { useClass: Ht }],
-      [Et, { useClass: Vt }],
+      [ro, { useClass: wt }],
+      [Et, { useClass: Gt }],
       [ot],
-      [Gt],
+      [Ht],
       [et],
       [it],
       [Je],
@@ -16583,7 +16584,7 @@ let lt = class extends Sa {
     if (this._config.notExecuteFormula) {
       const a = n.get(Ka);
       e.push([Za, {
-        useFactory: () => Ii(a.requestChannel(Qt))
+        useFactory: () => Ni(a.requestChannel($t))
       }]);
     }
     e.forEach((a) => n.add(a));
@@ -16596,7 +16597,7 @@ let lt = class extends Sa {
       [Je],
       [at],
       [tt]
-    ]), $t() && ve(this._injector, [
+    ]), jt() && ve(this._injector, [
       [ge]
     ]);
   }
@@ -16604,20 +16605,20 @@ let lt = class extends Sa {
     ve(this._injector, [
       [rt],
       [ut]
-    ]), $t() || ve(this._injector, [
+    ]), jt() || ve(this._injector, [
       [ge]
     ]);
   }
 };
-It(lt, "pluginName", Er);
+It(lt, "pluginName", Ir);
 It(lt, "type", j.UNIVER_SHEET);
 lt = Ja([
-  Ra(Xa, vn),
+  Ra(Xa, Vn),
   ft(1, H(st)),
   ft(2, be)
 ], lt);
-function Lo(n, e, a, i) {
-  const r = n.get(ci), o = n.get(li), u = n.get(si), f = n.get(di);
+function Po(n, e, a, i) {
+  const r = n.get(li), o = n.get(si), u = n.get(di), f = n.get(pi);
   r.load({
     formulaData: {},
     arrayFormulaCellData: {},
@@ -16633,22 +16634,22 @@ function Lo(n, e, a, i) {
     },
     dirtyUnitOtherFormulaMap: {}
   });
-  const m = o.treeBuilder(e), c = u.parse(m), l = f.execute(pi(c));
-  return Li(l);
+  const m = o.treeBuilder(e), c = u.parse(m), l = f.execute(Li(c));
+  return Pi(l);
 }
 export {
   Te as CalculationMode,
-  Vt as DescriptionService,
-  Gt as FormulaRefRangeService,
+  Gt as DescriptionService,
+  Ht as FormulaRefRangeService,
   Et as IDescriptionService,
-  io as IRegisterFunctionService,
+  ro as IRegisterFunctionService,
   Za as IRemoteRegisterFunctionService,
   Je as ImageFormulaCellInterceptorController,
-  Ni as InsertFunctionCommand,
+  Ri as InsertFunctionCommand,
   _e as OtherFormulaMarkDirty,
   Ue as PLUGIN_CONFIG_KEY_BASE,
-  Ri as QuickSumCommand,
-  Ht as RegisterFunctionService,
+  Si as QuickSumCommand,
+  wt as RegisterFunctionService,
   et as RegisterOtherFormulaService,
   mt as RemoteRegisterFunctionService,
   ge as TriggerCalculationController,
@@ -16656,5 +16657,5 @@ export {
   lt as UniverSheetsFormulaPlugin,
   tt as UpdateDefinedNameController,
   at as UpdateFormulaController,
-  Lo as calculateFormula
+  Po as calculateFormula
 };