@univerjs/sheets-formula 0.6.3 → 0.6.4

package/lib/es/index.js

@@ -1,26 +1,26 @@
-var Va = Object.defineProperty;
-var Ga = (a, e, n) => e in a ? Va(a, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : a[e] = n;
-var w = (a, e, n) => Ga(a, typeof e != "symbol" ? e + "" : e, n);
-import { CommandType as ua, ICommandService as de, ObjectMatrix as W, Tools as Ne, Rectangle as De, isFormulaString as be, isFormulaId as ma, cellToRange as fa, Direction as He, getIntersectRange as Ve, RANGE_TYPE as Y, IUniverInstanceService as xe, Inject as X, Disposable as te, UniverInstanceType as ee, LifecycleService as Ha, ILogService as Ya, IConfigService as _e, LocaleService as Ot, Injector as at, createIdentifier as Mt, toDisposable as le, moveRangeByOffset as Et, DisposableCollection as Ye, AbsoluteRefType as Xe, Optional as Xa, InterceptorEffectEnum as wa, CellValueType as Bt, isRealNum as Wa, DependentOn as ca, Plugin as la, merge as sa, touchDependencies as qe, isNodeEnv as vt } from "@univerjs/core";
-import { SetRangeValuesCommand as Ka, SetRangeValuesMutation as ne, handleMoveCols as pa, EffectRefRangId as G, runRefRangeMutations as H, handleMoveRows as da, handleMoveRange as La, handleInsertRangeMoveRight as Pa, handleInsertRangeMoveDown as Ta, handleDeleteRangeMoveUp as Ea, handleDeleteRangeMoveLeft as Ia, handleIRemoveCol as Na, handleIRemoveRow as Ra, handleInsertCol as Aa, handleInsertRow as Sa, RemoveDefinedNameCommand as Ca, SetDefinedNameCommand as Da, RemoveSheetCommand as ka, SetWorksheetNameCommand as Qa, DeleteRangeMoveLeftCommand as $a, DeleteRangeMoveUpCommand as ja, RemoveColCommand as za, RemoveRowCommand as Za, InsertRangeMoveDownCommand as Ja, InsertRangeMoveRightCommand as en, InsertColCommand as tn, InsertRowCommand as an, MoveColsCommand as nn, MoveRowsCommand as rn, MoveRangeCommand as on, SheetInterceptorService as xt, SetStyleCommand as _t, SetBorderCommand as ba, ClearSelectionFormatCommand as Oa, RemoveSheetMutation as It, InsertSheetMutation as Nt, RefRangeService as un, handleDefaultRangeChangeWithEffectRefCommands as Vt, getSeparateEffectedRangesOnCommand as mn, handleCommonDefaultRangeChangeWithEffectRefCommands as fn, MoveRangeMutation as Gt, MoveRowsMutation as Ht, MoveColsMutation as Yt, ReorderRangeMutation as Xt, RemoveRowMutation as wt, RemoveColMutation as Wt, InsertColMutation as Kt, InsertRowMutation as kt, INTERCEPTOR_POINT as cn, SetWorksheetActiveOperation as ln, SCOPE_WORKBOOK_VALUE_DEFINED_NAME as mt, UniverSheetsPlugin as sn } from "@univerjs/sheets";
-import { sequenceNodeType as J, deserializeRangeWithSheetWithCache as se, serializeRangeToRefString as nt, ErrorType as j, IDefinedNamesService as yt, LexerTreeBuilder as qt, generateStringWithSequence as we, SetDefinedNameMutation as Me, IActiveDirtyManagerService as gt, SetFormulaCalculationResultMutation as pn, RemoveOtherFormulaMutation as dn, SetOtherFormulaMutation as Ln, FormulaDataModel as it, SetFormulaCalculationStartMutation as Se, SetFormulaCalculationStopMutation as Qt, ENGINE_FORMULA_CYCLE_REFERENCE_COUNT as $t, SetFormulaCalculationNotificationMutation as Pn, FormulaExecuteStageType as ge, FormulaExecutedStateType as Re, IFormulaCurrentConfigService as Tn, Lexer as En, AstTreeBuilder as In, Interpreter as Nn, generateExecuteAstNodeData as Rn, getObjectValue as An, SetFormulaDataMutation as he, SetArrayFormulaDataMutation as Rt, initSheetFormulaData as jt, FunctionType as t, FUNCTION_NAMES_ARRAY as zt, FUNCTION_NAMES_COMPATIBILITY as _, FUNCTION_NAMES_CUBE as fe, FUNCTION_NAMES_DATABASE as $, FUNCTION_NAMES_DATE as B, FUNCTION_NAMES_ENGINEERING as A, FUNCTION_NAMES_FINANCIAL as C, FUNCTION_NAMES_INFORMATION as v, FUNCTION_NAMES_LOGICAL as K, FUNCTION_NAMES_LOOKUP as y, FUNCTION_NAMES_MATH as L, FUNCTION_NAMES_STATISTICAL as l, FUNCTION_NAMES_TEXT as D, FUNCTION_NAMES_WEB as ft, IFunctionService as ht, isReferenceStrings as Sn, functionArray as Cn, functionCompatibility as Dn, functionCube as bn, functionDatabase as On, functionDate as Mn, functionEngineering as xn, functionFinancial as _n, functionInformation as yn, functionLogical as qn, functionLookup as gn, functionMath as hn, functionMeta as Un, functionStatistical as Fn, functionText as Bn, functionUniver as vn, functionWeb as Vn, serializeRangeWithSpreadsheet as Zt, serializeRangeWithSheet as Jt, serializeRange as ea, CustomFunction as At, AsyncCustomFunction as Ma, RemoveDefinedNameMutation as St, stripErrorMargin as Gn, UniverFormulaEnginePlugin as xa } from "@univerjs/engine-formula";
-import { Subject as ta, BehaviorSubject as _a, bufferWhen as Hn, filter as aa, map as Yn } from "rxjs";
-import { IRPCChannelService as ya, fromModule as Xn, toModule as wn } from "@univerjs/rpc";
-const Wn = {
+var Ha = Object.defineProperty;
+var wa = (a, e, n) => e in a ? Ha(a, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : a[e] = n;
+var X = (a, e, n) => wa(a, typeof e != "symbol" ? e + "" : e, n);
+import { CommandType as fa, ICommandService as pe, ObjectMatrix as W, Tools as Ae, Rectangle as be, isFormulaString as Oe, isFormulaId as ca, cellToRange as la, Direction as He, getIntersectRange as Ge, RANGE_TYPE as w, IUniverInstanceService as _e, Inject as Y, Disposable as te, UniverInstanceType as ee, LifecycleService as Ya, ILogService as Xa, IConfigService as ye, LocaleService as Ot, Injector as at, createIdentifier as Mt, toDisposable as ne, moveRangeByOffset as Et, DisposableCollection as we, AbsoluteRefType as Ye, Optional as Wa, InterceptorEffectEnum as Ka, CellValueType as Bt, isRealNum as ka, DependentOn as sa, Plugin as da, merge as pa, touchDependencies as ge, isNodeEnv as vt } from "@univerjs/core";
+import { SetRangeValuesCommand as Qa, SetRangeValuesMutation as ie, handleMoveCols as La, EffectRefRangId as G, runRefRangeMutations as H, handleMoveRows as Pa, handleMoveRange as Ta, handleInsertRangeMoveRight as Ea, handleInsertRangeMoveDown as Ia, handleDeleteRangeMoveUp as Na, handleDeleteRangeMoveLeft as Ra, handleIRemoveCol as Aa, handleIRemoveRow as Sa, handleInsertCol as Ca, handleInsertRow as Da, RemoveDefinedNameCommand as ba, SetDefinedNameCommand as Oa, RemoveSheetCommand as $a, SetWorksheetNameCommand as ja, DeleteRangeMoveLeftCommand as za, DeleteRangeMoveUpCommand as Za, RemoveColCommand as Ja, RemoveRowCommand as en, InsertRangeMoveDownCommand as tn, InsertRangeMoveRightCommand as an, InsertColCommand as nn, InsertRowCommand as rn, MoveColsCommand as on, MoveRowsCommand as un, MoveRangeCommand as mn, SheetInterceptorService as xt, SetStyleCommand as _t, SetBorderCommand as Ma, ClearSelectionFormatCommand as xa, RemoveSheetMutation as It, InsertSheetMutation as Nt, RefRangeService as fn, handleDefaultRangeChangeWithEffectRefCommands as Vt, getSeparateEffectedRangesOnCommand as cn, handleCommonDefaultRangeChangeWithEffectRefCommands as ln, MoveRangeMutation as Gt, MoveRowsMutation as Ht, MoveColsMutation as wt, ReorderRangeMutation as Yt, RemoveRowMutation as Xt, RemoveColMutation as Wt, InsertColMutation as Kt, InsertRowMutation as kt, SetRowHiddenMutation as Qt, SetRowVisibleMutation as $t, INTERCEPTOR_POINT as sn, SetWorksheetActiveOperation as dn, SCOPE_WORKBOOK_VALUE_DEFINED_NAME as mt, UniverSheetsPlugin as pn } from "@univerjs/sheets";
+import { sequenceNodeType as J, deserializeRangeWithSheetWithCache as se, serializeRangeToRefString as nt, ErrorType as j, IDefinedNamesService as yt, LexerTreeBuilder as qt, generateStringWithSequence as Xe, SetDefinedNameMutation as xe, IActiveDirtyManagerService as gt, SetFormulaCalculationResultMutation as Ln, RemoveOtherFormulaMutation as Pn, SetOtherFormulaMutation as Tn, FormulaDataModel as it, SetFormulaCalculationStartMutation as Ee, SetFormulaCalculationStopMutation as jt, ENGINE_FORMULA_CYCLE_REFERENCE_COUNT as zt, SetFormulaCalculationNotificationMutation as En, FormulaExecuteStageType as he, FormulaExecutedStateType as Se, IFormulaCurrentConfigService as In, Lexer as Nn, AstTreeBuilder as Rn, Interpreter as An, generateExecuteAstNodeData as Sn, getObjectValue as Cn, SetFormulaDataMutation as Ue, SetArrayFormulaDataMutation as Rt, initSheetFormulaData as Zt, FunctionType as t, FUNCTION_NAMES_ARRAY as Jt, FUNCTION_NAMES_COMPATIBILITY as _, FUNCTION_NAMES_CUBE as ce, FUNCTION_NAMES_DATABASE as $, FUNCTION_NAMES_DATE as B, FUNCTION_NAMES_ENGINEERING as A, FUNCTION_NAMES_FINANCIAL as C, FUNCTION_NAMES_INFORMATION as v, FUNCTION_NAMES_LOGICAL as K, FUNCTION_NAMES_LOOKUP as y, FUNCTION_NAMES_MATH as L, FUNCTION_NAMES_STATISTICAL as l, FUNCTION_NAMES_TEXT as D, FUNCTION_NAMES_WEB as ft, IFunctionService as ht, isReferenceStrings as Dn, functionArray as bn, functionCompatibility as On, functionCube as Mn, functionDatabase as xn, functionDate as _n, functionEngineering as yn, functionFinancial as qn, functionInformation as gn, functionLogical as hn, functionLookup as Un, functionMath as Fn, functionMeta as Bn, functionStatistical as vn, functionText as Vn, functionUniver as Gn, functionWeb as Hn, serializeRangeWithSpreadsheet as ea, serializeRangeWithSheet as ta, serializeRange as aa, CustomFunction as At, AsyncCustomFunction as _a, RemoveDefinedNameMutation as St, stripErrorMargin as wn, UniverFormulaEnginePlugin as ya } from "@univerjs/engine-formula";
+import { Subject as na, BehaviorSubject as qa, bufferWhen as Yn, filter as ia, map as Xn } from "rxjs";
+import { IRPCChannelService as ga, fromModule as Wn, toModule as Kn } from "@univerjs/rpc";
+const kn = {
   id: "formula.command.insert-function",
-  type: ua.COMMAND,
+  type: fa.COMMAND,
   handler: async (a, e) => {
-    const { list: n, listOfRangeHasNumber: i } = e, r = a.get(de), o = new W();
+    const { list: n, listOfRangeHasNumber: i } = e, r = a.get(pe), o = new W();
     n.forEach((m) => {
-      const { range: f, primary: s, formula: p } = m, { row: T, column: P } = s, E = Ne.generateRandomId(6);
+      const { range: f, primary: s, formula: d } = m, { row: T, column: P } = s, E = Ae.generateRandomId(6);
       o.setValue(T, P, {
-        f: p,
+        f: d,
         si: E
       });
       const { startRow: I, startColumn: S, endRow: c, endColumn: N } = f;
       for (let R = I; R <= c; R++)
-        for (let d = S; d <= N; d++)
-          (R !== T || d !== P) && o.setValue(R, d, {
+        for (let p = S; p <= N; p++)
+          (R !== T || p !== P) && o.setValue(R, p, {
             si: E
           });
     }), i && i.length > 0 && i.forEach((m) => {
@@ -32,16 +32,16 @@ const Wn = {
     const u = {
       value: o.getData()
     };
-    return r.executeCommand(Ka.id, u);
+    return r.executeCommand(Qa.id, u);
   }
-}, Ge = {
-  type: ua.MUTATION,
+}, De = {
+  type: fa.MUTATION,
   id: "sheet.mutation.data-validation-formula-mark-dirty",
   handler() {
     return !0;
   }
 };
-function Kn(a, e, n) {
+function Qn(a, e, n) {
   var i;
   return a == null || a[e] == null || ((i = a[e]) == null ? void 0 : i[n]) == null;
 }
@@ -60,38 +60,38 @@ function ct(a, e, n) {
     };
 }
 var q = /* @__PURE__ */ ((a) => (a[a.MoveRange = 0] = "MoveRange", a[a.MoveRows = 1] = "MoveRows", a[a.MoveCols = 2] = "MoveCols", a[a.InsertRow = 3] = "InsertRow", a[a.InsertColumn = 4] = "InsertColumn", a[a.RemoveRow = 5] = "RemoveRow", a[a.RemoveColumn = 6] = "RemoveColumn", a[a.DeleteMoveLeft = 7] = "DeleteMoveLeft", a[a.DeleteMoveUp = 8] = "DeleteMoveUp", a[a.InsertMoveDown = 9] = "InsertMoveDown", a[a.InsertMoveRight = 10] = "InsertMoveRight", a[a.SetName = 11] = "SetName", a[a.RemoveSheet = 12] = "RemoveSheet", a[a.SetDefinedName = 13] = "SetDefinedName", a[a.RemoveDefinedName = 14] = "RemoveDefinedName", a))(q || {});
-const kn = [
+const $n = [
   11,
   12,
   13,
   14
   /* RemoveDefinedName */
 ];
-function Qn(a, e, n) {
+function jn(a, e, n) {
   const { type: i } = n;
-  return kn.includes(i) ? $n(a, e) : jn(a, e, n);
+  return $n.includes(i) ? zn(a, e) : Zn(a, e, n);
 }
-function $n(a, e) {
+function zn(a, e) {
   const n = [], i = [];
   return Object.keys(e).forEach((r) => {
     const o = e[r], u = a[r];
     if (o == null || u == null)
       return !0;
     Object.keys(o).forEach((m) => {
-      const f = new W(o[m] || {}), s = new W(u[m] || {}), p = new W(), T = new W();
+      const f = new W(o[m] || {}), s = new W(u[m] || {}), d = new W(), T = new W();
       if (f.forValue((c, N, R) => {
         if (R == null)
           return !0;
-        const d = rt(R);
-        d !== null && (p.setValue(c, N, d), T.setValue(c, N, s.getValue(c, N)));
-      }), p.getSizeOf() === 0)
+        const p = rt(R);
+        p !== null && (d.setValue(c, N, p), T.setValue(c, N, s.getValue(c, N)));
+      }), d.getSizeOf() === 0)
         return;
       const P = {
         subUnitId: m,
         unitId: r,
-        cellValue: p.getMatrix()
+        cellValue: d.getMatrix()
       }, E = {
-        id: ne.id,
+        id: ie.id,
         params: P
       };
       i.push(E);
@@ -100,7 +100,7 @@ function $n(a, e) {
         unitId: r,
         cellValue: T.getMatrix()
       }, S = {
-        id: ne.id,
+        id: ie.id,
         params: I
       };
       n.push(S);
@@ -110,9 +110,9 @@ function $n(a, e) {
     redos: i
   };
 }
-function jn(a, e, n) {
-  const { redoFormulaData: i, undoFormulaData: r } = zn(a, e, n);
-  if (Ne.diffValue(i, r))
+function Zn(a, e, n) {
+  const { redoFormulaData: i, undoFormulaData: r } = Jn(a, e, n);
+  if (Ae.diffValue(i, r))
     return {
       undos: [],
       redos: []
@@ -125,11 +125,11 @@ function jn(a, e, n) {
           subUnitId: f,
           unitId: m,
           cellValue: i[m][f]
-        }, p = {
-          id: ne.id,
+        }, d = {
+          id: ie.id,
           params: s
         };
-        o.push(p);
+        o.push(d);
       }
     });
   }), Object.keys(r).forEach((m) => {
@@ -139,11 +139,11 @@ function jn(a, e, n) {
           subUnitId: f,
           unitId: m,
           cellValue: r[m][f]
-        }, p = {
-          id: ne.id,
+        }, d = {
+          id: ie.id,
           params: s
         };
-        u.push(p);
+        u.push(d);
       }
     });
   }), {
@@ -151,10 +151,10 @@ function jn(a, e, n) {
     redos: o
   };
 }
-function zn(a, e, n) {
-  const i = {}, r = {}, { type: o, unitId: u, sheetId: m, range: f, from: s, to: p } = n;
+function Jn(a, e, n) {
+  const i = {}, r = {}, { type: o, unitId: u, sheetId: m, range: f, from: s, to: d } = n;
   return (/* @__PURE__ */ new Set([...Object.keys(a), ...Object.keys(e)])).forEach((P) => {
-    if (Kn(a, P, m))
+    if (Qn(a, P, m))
       return;
     (/* @__PURE__ */ new Set([
       ...Object.keys(a[P] || {}),
@@ -162,9 +162,9 @@ function zn(a, e, n) {
     ])).forEach((I) => {
       var F, U;
       const S = (F = a[P]) == null ? void 0 : F[I], c = (U = e[P]) == null ? void 0 : U[I], N = new W(S || {}), R = new W(c || {});
-      let d = [];
-      P !== u || I !== m ? d = Jn(R) : d = Zn(N, o, s, p, f);
-      const O = pi(d, N, R), M = di(d, N);
+      let p = [];
+      P !== u || I !== m ? p = ti(R) : p = ei(N, o, s, d, f);
+      const O = Li(p, N, R), M = Pi(p, N);
       i[P] || (i[P] = {}), r[P] || (r[P] = {}), i[P][I] = {
         ...i[P][I],
         ...O
@@ -178,80 +178,80 @@ function zn(a, e, n) {
     undoFormulaData: r
   };
 }
-function Zn(a, e, n, i, r) {
+function ei(a, e, n, i, r) {
   const o = [];
   return a.forValue((u, m, f) => {
-    if (f == null || !qa(f)) return !0;
-    const s = fa(u, m);
-    let p = null, T = !1;
+    if (f == null || !ha(f)) return !0;
+    const s = la(u, m);
+    let d = null, T = !1;
     if ([
       0,
       1,
       2
       /* MoveCols */
     ].includes(e))
-      p = ei(e, n, i, s);
+      d = ai(e, n, i, s);
     else if (r != null) {
-      const P = ti(e, r, s);
-      p = P.newCell, T = P.isReverse;
+      const P = ni(e, r, s);
+      d = P.newCell, T = P.isReverse;
     }
-    T ? o.unshift({ oldCell: s, newCell: p }) : o.push({ oldCell: s, newCell: p });
+    T ? o.unshift({ oldCell: s, newCell: d }) : o.push({ oldCell: s, newCell: d });
   }), o;
 }
-function Jn(a) {
+function ti(a) {
   const e = [];
   return a.forValue((n, i, r) => {
-    if (r == null || !qa(r)) return !0;
-    const o = fa(n, i);
+    if (r == null || !ha(r)) return !0;
+    const o = la(n, i);
     e.push({ oldCell: o, newCell: o });
   }), e;
 }
-function ei(a, e, n, i) {
+function ai(a, e, n, i) {
   if (e == null || n == null)
     return null;
   switch (a) {
     case 0:
-      return ai(e, n, i);
+      return ii(e, n, i);
     case 1:
-      return ni(e, n, i);
+      return ri(e, n, i);
     case 2:
-      return ii(e, n, i);
+      return oi(e, n, i);
     default:
       return null;
   }
 }
-function ti(a, e, n) {
+function ni(a, e, n) {
   let i = null, r = !1;
   switch (a) {
     case 3:
-      i = ri(e, n), r = !0;
+      i = ui(e, n), r = !0;
       break;
     case 4:
-      i = oi(e, n), r = !0;
+      i = mi(e, n), r = !0;
       break;
     case 5:
-      i = ui(e, n);
+      i = fi(e, n);
       break;
     case 6:
-      i = mi(e, n);
+      i = ci(e, n);
       break;
     case 7:
-      i = fi(e, n);
+      i = li(e, n);
       break;
     case 8:
-      i = ci(e, n);
+      i = si(e, n);
       break;
     case 9:
-      i = li(e, n), r = !0;
+      i = di(e, n), r = !0;
       break;
     case 10:
-      i = si(e, n), r = !0;
+      i = pi(e, n), r = !0;
       break;
   }
   return { newCell: i, isReverse: r };
 }
-function ai(a, e, n) {
-  const i = La(
+function ii(a, e, n) {
+  const i = Ta(
     {
       id: G.MoveRangeCommandId,
       params: { toRange: e, fromRange: a }
@@ -260,8 +260,8 @@ function ai(a, e, n) {
   );
   return H(i, n);
 }
-function ni(a, e, n) {
-  const i = da(
+function ri(a, e, n) {
+  const i = Pa(
     {
       id: G.MoveRowsCommandId,
       params: { toRange: e, fromRange: a }
@@ -270,8 +270,8 @@ function ni(a, e, n) {
   );
   return H(i, n);
 }
-function ii(a, e, n) {
-  const i = pa(
+function oi(a, e, n) {
+  const i = La(
     {
       id: G.MoveColsCommandId,
       params: { toRange: e, fromRange: a }
@@ -280,8 +280,8 @@ function ii(a, e, n) {
   );
   return H(i, n);
 }
-function ri(a, e) {
-  const n = Sa(
+function ui(a, e) {
+  const n = Da(
     {
       id: G.InsertRowCommandId,
       params: { range: a, unitId: "", subUnitId: "", direction: He.DOWN }
@@ -290,8 +290,8 @@ function ri(a, e) {
   );
   return H(n, e);
 }
-function oi(a, e) {
-  const n = Aa(
+function mi(a, e) {
+  const n = Ca(
     {
       id: G.InsertColCommandId,
       params: { range: a, unitId: "", subUnitId: "", direction: He.RIGHT }
@@ -300,8 +300,8 @@ function oi(a, e) {
   );
   return H(n, e);
 }
-function ui(a, e) {
-  const n = Ra(
+function fi(a, e) {
+  const n = Sa(
     {
       id: G.RemoveRowCommandId,
       params: { range: a }
@@ -310,8 +310,8 @@ function ui(a, e) {
   );
   return H(n, e);
 }
-function mi(a, e) {
-  const n = Na(
+function ci(a, e) {
+  const n = Aa(
     {
       id: G.RemoveColCommandId,
       params: { range: a }
@@ -320,8 +320,8 @@ function mi(a, e) {
   );
   return H(n, e);
 }
-function fi(a, e) {
-  const n = Ia(
+function li(a, e) {
+  const n = Ra(
     {
       id: G.DeleteRangeMoveLeftCommandId,
       params: { range: a }
@@ -330,8 +330,8 @@ function fi(a, e) {
   );
   return H(n, e);
 }
-function ci(a, e) {
-  const n = Ea(
+function si(a, e) {
+  const n = Na(
     {
       id: G.DeleteRangeMoveUpCommandId,
       params: { range: a }
@@ -340,8 +340,8 @@ function ci(a, e) {
   );
   return H(n, e);
 }
-function li(a, e) {
-  const n = Ta(
+function di(a, e) {
+  const n = Ia(
     {
       id: G.InsertRangeMoveDownCommandId,
       params: { range: a }
@@ -350,8 +350,8 @@ function li(a, e) {
   );
   return H(n, e);
 }
-function si(a, e) {
-  const n = Pa(
+function pi(a, e) {
+  const n = Ea(
     {
       id: G.InsertRangeMoveRightCommandId,
       params: { range: a }
@@ -360,23 +360,23 @@ function si(a, e) {
   );
   return H(n, e);
 }
-function pi(a, e, n) {
+function Li(a, e, n) {
   const i = new W({});
   return a.forEach((r) => {
-    const { oldCell: o, newCell: u } = r, { startRow: m, startColumn: f } = o, s = n.getValue(m, f) || e.getValue(m, f), p = rt(s);
+    const { oldCell: o, newCell: u } = r, { startRow: m, startColumn: f } = o, s = n.getValue(m, f) || e.getValue(m, f), d = rt(s);
     if (i.setValue(m, f, { f: null, si: null }), u) {
       const { startRow: T, startColumn: P } = u;
-      i.setValue(T, P, p);
+      i.setValue(T, P, d);
     }
   }), i.getMatrix();
 }
-function di(a, e) {
+function Pi(a, e) {
   const n = new W({});
   return a.reverse().forEach((i) => {
     const { oldCell: r, newCell: o } = i, { startRow: u, startColumn: m } = r, f = e.getValue(u, m), s = rt(f);
     if (o) {
-      const { startRow: p, startColumn: T } = o;
-      n.setValue(p, T, { f: null, si: null });
+      const { startRow: d, startColumn: T } = o;
+      n.setValue(d, T, { f: null, si: null });
     }
     n.setValue(u, m, s);
   }), n.getMatrix();
@@ -384,7 +384,7 @@ function di(a, e) {
 function rt(a) {
   if (a == null)
     return;
-  const { f: e, si: n, x: i = 0, y: r = 0 } = a, o = be(e), u = ma(n);
+  const { f: e, si: n, x: i = 0, y: r = 0 } = a, o = Oe(e), u = ca(n);
   if (!o && !u)
     return {
       f: null,
@@ -393,18 +393,18 @@ function rt(a) {
   const m = {};
   return u && (m.si = n), o && i === 0 && r === 0 && (m.f = e), m.f === void 0 && (m.f = null), m.si === void 0 && (m.si = null), m;
 }
-function Li(a) {
+function Ti(a) {
   const e = new W({});
   return new W(a).forValue((i, r, o) => {
     const u = rt(o);
     u && e.setValue(i, r, u);
   }), e.getMatrix();
 }
-function qa(a) {
-  const e = (a == null ? void 0 : a.f) || "", n = (a == null ? void 0 : a.si) || "", i = be(e), r = ma(n);
+function ha(a) {
+  const e = (a == null ? void 0 : a.f) || "", n = (a == null ? void 0 : a.si) || "", i = Oe(e), r = ca(n);
   return !!(i || r);
 }
-function ga(a, e, n, i, r, o) {
+function Ua(a, e, n, i, r, o) {
   if ((r == null || r.length === 0) && (o == null || o.length === 0)) {
     if (a === n && e === i)
       return !0;
@@ -412,7 +412,7 @@ function ga(a, e, n, i, r, o) {
     return !0;
   return !1;
 }
-function ha(a, e, n = 0, i = 0) {
+function Fa(a, e, n = 0, i = 0) {
   const r = [];
   for (let o = 0, u = a.length; o < u; o++) {
     const m = a[o];
@@ -420,7 +420,7 @@ function ha(a, e, n = 0, i = 0) {
       r.push(m);
       continue;
     }
-    const { token: f } = m, s = se(f), { range: p, sheetName: T, unitId: P } = s, E = De.moveOffset(p, n, i);
+    const { token: f } = m, s = se(f), { range: d, sheetName: T, unitId: P } = s, E = be.moveOffset(d, n, i);
     r.push({
       ...m,
       token: nt({
@@ -432,16 +432,16 @@ function ha(a, e, n = 0, i = 0) {
   }
   return r;
 }
-function Ua(a, e, n, i) {
+function Ba(a, e, n, i) {
   const { type: r, unitId: o, sheetId: u, range: m, from: f, to: s } = e, {
-    range: p,
+    range: d,
     sheetId: T,
     unitId: P,
     sheetName: E,
     refOffsetX: I,
     refOffsetY: S
   } = a;
-  if (!ga(
+  if (!Ua(
     o,
     u,
     n,
@@ -450,176 +450,176 @@ function Ua(a, e, n, i) {
     T
   ))
     return;
-  const c = De.moveOffset(p, I, S);
+  const c = be.moveOffset(d, I, S);
   let N = null;
   if (r === q.MoveRange) {
     if (f == null || s == null)
       return;
-    const R = st(c, f), d = Ve(c, f);
-    if (d == null || R !== 4)
+    const R = st(c, f), p = Ge(c, f);
+    if (p == null || R !== 4)
       return;
-    const O = La(
+    const O = Ta(
       { id: G.MoveRangeCommandId, params: { toRange: s, fromRange: f } },
-      d
-    ), M = H(O, d);
+      p
+    ), M = H(O, p);
     if (M == null)
       return j.REF;
-    N = lt(R, M, f, s, c, d);
+    N = lt(R, M, f, s, c, p);
   } else if (r === q.MoveRows) {
     if (f == null || s == null)
       return;
     const R = st(c, f);
-    let d = Ve(c, f);
-    if (d == null && (f.endRow < c.startRow && s.endRow < c.startRow || f.startRow > c.endRow && s.startRow > c.endRow))
+    let p = Ge(c, f);
+    if (p == null && (f.endRow < c.startRow && s.endRow < c.startRow || f.startRow > c.endRow && s.startRow > c.endRow))
       return;
-    d == null && (d = {
+    p == null && (p = {
       startRow: c.startRow,
       endRow: c.endRow,
       startColumn: c.startColumn,
       endColumn: c.endColumn,
-      rangeType: Y.NORMAL
+      rangeType: w.NORMAL
     });
-    const O = da(
+    const O = Pa(
       { id: G.MoveRowsCommandId, params: { toRange: s, fromRange: f } },
-      d
-    ), M = H(O, d);
+      p
+    ), M = H(O, p);
     if (M == null)
       return j.REF;
-    N = lt(R, M, f, s, c, d);
+    N = lt(R, M, f, s, c, p);
   } else if (r === q.MoveCols) {
     if (f == null || s == null)
       return;
     const R = st(c, f);
-    let d = Ve(c, f);
-    if (d == null && (f.endColumn < c.startColumn && s.endColumn < c.startColumn || f.startColumn > c.endColumn && s.startColumn > c.endColumn))
+    let p = Ge(c, f);
+    if (p == null && (f.endColumn < c.startColumn && s.endColumn < c.startColumn || f.startColumn > c.endColumn && s.startColumn > c.endColumn))
       return;
-    d == null && (d = {
+    p == null && (p = {
       startRow: c.startRow,
       endRow: c.endRow,
       startColumn: c.startColumn,
       endColumn: c.endColumn,
-      rangeType: Y.NORMAL
+      rangeType: w.NORMAL
     });
-    const O = pa(
+    const O = La(
       { id: G.MoveColsCommandId, params: { toRange: s, fromRange: f } },
-      d
-    ), M = H(O, d);
+      p
+    ), M = H(O, p);
     if (M == null)
       return j.REF;
-    N = lt(R, M, f, s, c, d);
+    N = lt(R, M, f, s, c, p);
   }
   if (m != null) {
     if (r === q.InsertRow) {
-      const R = Sa(
+      const R = Da(
         {
           id: G.InsertRowCommandId,
           params: { range: m, unitId: "", subUnitId: "", direction: He.DOWN }
         },
         c
-      ), d = H(R, c);
-      if (d == null)
+      ), p = H(R, c);
+      if (p == null)
         return;
       N = {
         ...c,
-        ...d
+        ...p
       };
     } else if (r === q.InsertColumn) {
-      const R = Aa(
+      const R = Ca(
         {
           id: G.InsertColCommandId,
           params: { range: m, unitId: "", subUnitId: "", direction: He.RIGHT }
         },
         c
-      ), d = H(R, c);
-      if (d == null)
+      ), p = H(R, c);
+      if (p == null)
         return;
       N = {
         ...c,
-        ...d
+        ...p
       };
     } else if (r === q.RemoveRow) {
-      const R = Ra(
+      const R = Sa(
         {
           id: G.RemoveRowCommandId,
           params: { range: m }
         },
         c
-      ), d = H(R, c);
-      if (d == null)
+      ), p = H(R, c);
+      if (p == null)
         return j.REF;
       N = {
         ...c,
-        ...d
+        ...p
       };
     } else if (r === q.RemoveColumn) {
-      const R = Na(
+      const R = Aa(
         {
           id: G.RemoveColCommandId,
           params: { range: m }
         },
         c
-      ), d = H(R, c);
-      if (d == null)
+      ), p = H(R, c);
+      if (p == null)
         return j.REF;
       N = {
         ...c,
-        ...d
+        ...p
       };
     } else if (r === q.DeleteMoveLeft) {
-      const R = Ia(
+      const R = Ra(
         {
           id: G.DeleteRangeMoveLeftCommandId,
           params: { range: m }
         },
         c
-      ), d = H(R, c);
-      if (d == null)
+      ), p = H(R, c);
+      if (p == null)
         return j.REF;
       N = {
         ...c,
-        ...d
+        ...p
       };
     } else if (r === q.DeleteMoveUp) {
-      const R = Ea(
+      const R = Na(
         {
           id: G.DeleteRangeMoveUpCommandId,
           params: { range: m }
         },
         c
-      ), d = H(R, c);
-      if (d == null)
+      ), p = H(R, c);
+      if (p == null)
         return j.REF;
       N = {
         ...c,
-        ...d
+        ...p
       };
     } else if (r === q.InsertMoveDown) {
-      const R = Ta(
+      const R = Ia(
         {
           id: G.InsertRangeMoveDownCommandId,
           params: { range: m }
         },
         c
-      ), d = H(R, c);
-      if (d == null)
+      ), p = H(R, c);
+      if (p == null)
         return;
       N = {
         ...c,
-        ...d
+        ...p
       };
     } else if (r === q.InsertMoveRight) {
-      const R = Pa(
+      const R = Ea(
         {
           id: G.InsertRangeMoveRightCommandId,
           params: { range: m }
         },
         c
-      ), d = H(R, c);
-      if (d == null)
+      ), p = H(R, c);
+      if (p == null)
         return;
       N = {
         ...c,
-        ...d
+        ...p
       };
     }
   }
@@ -631,29 +631,29 @@ function Ua(a, e, n, i) {
     });
 }
 function lt(a, e, n, i, r, o) {
-  const { startRow: u, endRow: m, startColumn: f, endColumn: s, rangeType: p } = Ae(e), {
+  const { startRow: u, endRow: m, startColumn: f, endColumn: s, rangeType: d } = Ce(e), {
     startRow: T,
     startColumn: P,
     endRow: E,
     endColumn: I,
-    rangeType: S = Y.NORMAL
-  } = Ae(n), { startRow: c, startColumn: N, endRow: R, endColumn: d } = Ae(i), {
+    rangeType: S = w.NORMAL
+  } = Ce(n), { startRow: c, startColumn: N, endRow: R, endColumn: p } = Ce(i), {
     startRow: O,
     endRow: M,
     startColumn: F,
     endColumn: U
-  } = Ae(o), {
+  } = Ce(o), {
     startRow: g,
     endRow: x,
     startColumn: h,
     endColumn: V,
-    rangeType: Q = Y.NORMAL
-  } = Ae(r), b = { ...r };
+    rangeType: Q = w.NORMAL
+  } = Ce(r), b = { ...r };
   function Le() {
-    return p === Y.COLUMN && Q === Y.COLUMN ? !0 : f >= h && s <= V;
+    return d === w.COLUMN && Q === w.COLUMN ? !0 : f >= h && s <= V;
   }
   function ae() {
-    return p === Y.ROW && Q === Y.ROW ? !0 : u >= g && m <= x;
+    return d === w.ROW && Q === w.ROW ? !0 : u >= g && m <= x;
   }
   if (a === 0)
     if (Le())
@@ -695,86 +695,86 @@ function lt(a, e, n, i, r, o) {
         return;
     else
       return;
-  else a === 4 ? (b.startRow = u, b.startColumn = f, b.endRow = m, b.endColumn = s) : P <= h && I >= V || S === Y.ROW && Q === Y.ROW ? n.endRow < g ? (c >= g && (b.startRow -= E - T + 1), c >= x && (b.endRow -= E - T + 1)) : n.startRow > x ? (R <= x && (b.endRow += E - T + 1), R <= g && (b.startRow += E - T + 1)) : n.startRow >= g && n.endRow <= x && (c <= g ? b.startRow += E - T + 1 : c >= x && (b.endRow -= E - T + 1)) : T <= g && E >= x || S === Y.COLUMN && Q === Y.COLUMN ? n.endColumn < h ? (N >= h && (b.startColumn -= I - P + 1), N >= V && (b.endColumn -= I - P + 1)) : n.startColumn > V ? (d <= V && (b.endColumn += I - P + 1), d <= h && (b.startColumn += I - P + 1)) : n.startColumn >= h && n.endColumn <= V && (N <= h ? b.startColumn += I - P + 1 : N >= V && (b.endColumn -= I - P + 1)) : ((N <= U + 1 && d >= V || N <= h && d >= F - 1) && c <= g && R >= x || (c <= M + 1 && R >= x || c <= g && R >= O - 1) && N <= h && d >= V, b.startRow = u, b.startColumn = f, b.endRow = m, b.endColumn = s);
+  else a === 4 ? (b.startRow = u, b.startColumn = f, b.endRow = m, b.endColumn = s) : P <= h && I >= V || S === w.ROW && Q === w.ROW ? n.endRow < g ? (c >= g && (b.startRow -= E - T + 1), c >= x && (b.endRow -= E - T + 1)) : n.startRow > x ? (R <= x && (b.endRow += E - T + 1), R <= g && (b.startRow += E - T + 1)) : n.startRow >= g && n.endRow <= x && (c <= g ? b.startRow += E - T + 1 : c >= x && (b.endRow -= E - T + 1)) : T <= g && E >= x || S === w.COLUMN && Q === w.COLUMN ? n.endColumn < h ? (N >= h && (b.startColumn -= I - P + 1), N >= V && (b.endColumn -= I - P + 1)) : n.startColumn > V ? (p <= V && (b.endColumn += I - P + 1), p <= h && (b.startColumn += I - P + 1)) : n.startColumn >= h && n.endColumn <= V && (N <= h ? b.startColumn += I - P + 1 : N >= V && (b.endColumn -= I - P + 1)) : ((N <= U + 1 && p >= V || N <= h && p >= F - 1) && c <= g && R >= x || (c <= M + 1 && R >= x || c <= g && R >= O - 1) && N <= h && p >= V, b.startRow = u, b.startColumn = f, b.endRow = m, b.endColumn = s);
   return b;
 }
 function st(a, e) {
-  const n = Ee(a.startRow), i = Ie(a.endRow), r = Ee(a.startColumn), o = Ie(a.endColumn), u = Ee(e.startRow), m = Ie(e.endRow), f = Ee(e.startColumn), s = Ie(e.endColumn);
-  function p() {
-    return a.rangeType === Y.COLUMN && e.rangeType === Y.COLUMN ? !0 : n >= u && i <= m;
+  const n = Ne(a.startRow), i = Re(a.endRow), r = Ne(a.startColumn), o = Re(a.endColumn), u = Ne(e.startRow), m = Re(e.endRow), f = Ne(e.startColumn), s = Re(e.endColumn);
+  function d() {
+    return a.rangeType === w.COLUMN && e.rangeType === w.COLUMN ? !0 : n >= u && i <= m;
   }
   function T() {
-    return a.rangeType === Y.ROW && e.rangeType === Y.ROW ? !0 : r >= f && o <= s;
+    return a.rangeType === w.ROW && e.rangeType === w.ROW ? !0 : r >= f && o <= s;
   }
   function P() {
-    return a.rangeType === Y.ALL && e.rangeType === Y.ALL;
+    return a.rangeType === w.ALL && e.rangeType === w.ALL;
   }
-  return p() && T() || P() ? 4 : T() && n >= u && n <= m && i > m ? 0 : T() && i >= u && i <= m && n < u ? 1 : p() && r >= f && r <= s && o > s ? 2 : p() && o >= f && o <= s && r < f ? 3 : null;
+  return d() && T() || P() ? 4 : T() && n >= u && n <= m && i > m ? 0 : T() && i >= u && i <= m && n < u ? 1 : d() && r >= f && r <= s && o > s ? 2 : d() && o >= f && o <= s && r < f ? 3 : null;
 }
-function Ee(a) {
+function Ne(a) {
   return isNaN(a) ? -1 / 0 : a;
 }
-function Ie(a) {
+function Re(a) {
   return isNaN(a) ? 1 / 0 : a;
 }
-function Ae(a) {
+function Ce(a) {
   const { startRow: e, endRow: n, startColumn: i, endColumn: r } = a;
   return {
     ...a,
-    startRow: Ee(e),
-    endRow: Ie(n),
-    startColumn: Ee(i),
-    endColumn: Ie(r)
+    startRow: Ne(e),
+    endRow: Re(n),
+    startColumn: Ne(i),
+    endColumn: Re(r)
   };
 }
-function Fa(a, e) {
+function va(a, e) {
   const { id: n } = e;
   let i = null;
   switch (n) {
+    case mn.id:
+      i = Ei(e, a);
+      break;
+    case un.id:
+      i = Ii(e, a);
+      break;
     case on.id:
-      i = Pi(e, a);
+      i = Ni(e, a);
       break;
     case rn.id:
-      i = Ti(e, a);
+      i = Ri(e);
       break;
     case nn.id:
-      i = Ei(e, a);
+      i = Ai(e);
       break;
     case an.id:
-      i = Ii(e);
+      i = Si(e, a);
       break;
     case tn.id:
-      i = Ni(e);
+      i = Ci(e, a);
       break;
     case en.id:
-      i = Ri(e, a);
+      i = Di(e, a);
       break;
     case Ja.id:
-      i = Ai(e, a);
+      i = bi(e, a);
       break;
     case Za.id:
-      i = Si(e, a);
+      i = Oi(e, a);
       break;
     case za.id:
-      i = Ci(e, a);
+      i = Mi(e, a);
       break;
     case ja.id:
-      i = Di(e, a);
+      i = xi(e, a);
       break;
     case $a.id:
-      i = bi(e, a);
-      break;
-    case Qa.id:
-      i = Oi(e, a);
-      break;
-    case ka.id:
-      i = Mi(e, a);
+      i = _i(e, a);
       break;
-    case Da.id:
-      i = xi(e, a);
+    case Oa.id:
+      i = yi(e, a);
       break;
-    case Ca.id:
-      i = _i(e, a);
+    case ba.id:
+      i = qi(e, a);
       break;
   }
   return i;
@@ -787,7 +787,7 @@ function Z(a) {
     sheetId: n
   };
 }
-function Pi(a, e) {
+function Ei(a, e) {
   const { params: n } = a;
   if (!n) return null;
   const { fromRange: i, toRange: r } = n;
@@ -801,7 +801,7 @@ function Pi(a, e) {
     sheetId: u
   };
 }
-function Ti(a, e) {
+function Ii(a, e) {
   const { params: n } = a;
   if (!n) return null;
   const {
@@ -809,28 +809,28 @@ function Ti(a, e) {
     toRange: { startRow: o, endRow: u }
   } = n, m = e.getUnitId(), f = e.getActiveSheet();
   if (!f) return null;
-  const s = f.getSheetId(), p = {
+  const s = f.getSheetId(), d = {
     startRow: i,
     startColumn: 0,
     endRow: r,
     endColumn: f.getColumnCount() - 1,
-    rangeType: Y.ROW
+    rangeType: w.ROW
   }, T = {
     startRow: o,
     startColumn: 0,
     endRow: u,
     endColumn: f.getColumnCount() - 1,
-    rangeType: Y.ROW
+    rangeType: w.ROW
   };
   return {
     type: q.MoveRows,
-    from: p,
+    from: d,
     to: T,
     unitId: m,
     sheetId: s
   };
 }
-function Ei(a, e) {
+function Ni(a, e) {
   const { params: n } = a;
   if (!n) return null;
   const {
@@ -838,28 +838,28 @@ function Ei(a, e) {
     toRange: { startColumn: o, endColumn: u }
   } = n, m = e.getUnitId(), f = e.getActiveSheet();
   if (!f) return null;
-  const s = f.getSheetId(), p = {
+  const s = f.getSheetId(), d = {
     startRow: 0,
     startColumn: i,
     endRow: f.getRowCount() - 1,
     endColumn: r,
-    rangeType: Y.COLUMN
+    rangeType: w.COLUMN
   }, T = {
     startRow: 0,
     startColumn: o,
     endRow: f.getRowCount() - 1,
     endColumn: u,
-    rangeType: Y.COLUMN
+    rangeType: w.COLUMN
   };
   return {
     type: q.MoveCols,
-    from: p,
+    from: d,
     to: T,
     unitId: m,
     sheetId: s
   };
 }
-function Ii(a) {
+function Ri(a) {
   const { params: e } = a;
   if (!e) return null;
   const { range: n, unitId: i, subUnitId: r } = e;
@@ -870,7 +870,7 @@ function Ii(a) {
     sheetId: r
   };
 }
-function Ni(a) {
+function Ai(a) {
   const { params: e } = a;
   if (!e) return null;
   const { range: n, unitId: i, subUnitId: r } = e;
@@ -881,7 +881,7 @@ function Ni(a) {
     sheetId: r
   };
 }
-function Ri(a, e) {
+function Si(a, e) {
   const { params: n } = a;
   if (!n) return null;
   const { range: i } = n, { unitId: r, sheetId: o } = Z(e);
@@ -892,7 +892,7 @@ function Ri(a, e) {
     sheetId: o
   };
 }
-function Ai(a, e) {
+function Ci(a, e) {
   const { params: n } = a;
   if (!n) return null;
   const { range: i } = n, { unitId: r, sheetId: o } = Z(e);
@@ -903,7 +903,7 @@ function Ai(a, e) {
     sheetId: o
   };
 }
-function Si(a, e) {
+function Di(a, e) {
   const { params: n } = a;
   if (!n) return null;
   const { range: i } = n, { unitId: r, sheetId: o } = Z(e);
@@ -914,7 +914,7 @@ function Si(a, e) {
     sheetId: o
   };
 }
-function Ci(a, e) {
+function bi(a, e) {
   const { params: n } = a;
   if (!n) return null;
   const { range: i } = n, { unitId: r, sheetId: o } = Z(e);
@@ -925,7 +925,7 @@ function Ci(a, e) {
     sheetId: o
   };
 }
-function Di(a, e) {
+function Oi(a, e) {
   const { params: n } = a;
   if (!n) return null;
   const { range: i } = n, { unitId: r, sheetId: o } = Z(e);
@@ -936,7 +936,7 @@ function Di(a, e) {
     sheetId: o
   };
 }
-function bi(a, e) {
+function Mi(a, e) {
   const { params: n } = a;
   if (!n) return null;
   const { range: i } = n, { unitId: r, sheetId: o } = Z(e);
@@ -947,7 +947,7 @@ function bi(a, e) {
     sheetId: o
   };
 }
-function Oi(a, e) {
+function xi(a, e) {
   const { params: n } = a;
   if (!n) return null;
   const { unitId: i, subUnitId: r, name: o } = n, { unitId: u, sheetId: m } = Z(e);
@@ -958,7 +958,7 @@ function Oi(a, e) {
     sheetName: o
   };
 }
-function Mi(a, e) {
+function _i(a, e) {
   const { params: n } = a;
   if (!n) return null;
   const { unitId: i, subUnitId: r } = n, { unitId: o, sheetId: u } = Z(e);
@@ -968,7 +968,7 @@ function Mi(a, e) {
     sheetId: r || u
   };
 }
-function xi(a, e) {
+function yi(a, e) {
   const { params: n } = a;
   if (!n) return null;
   const { unitId: i, name: r, id: o } = n, { sheetId: u } = Z(e);
@@ -980,7 +980,7 @@ function xi(a, e) {
     definedNameId: o
   };
 }
-function _i(a, e) {
+function qi(a, e) {
   const { params: n } = a;
   if (!n) return null;
   const { unitId: i, name: r, id: o } = n, { sheetId: u } = Z(e);
@@ -992,11 +992,11 @@ function _i(a, e) {
     definedNameId: o
   };
 }
-var yi = Object.getOwnPropertyDescriptor, qi = (a, e, n, i) => {
-  for (var r = i > 1 ? void 0 : i ? yi(e, n) : e, o = a.length - 1, u; o >= 0; o--)
+var gi = Object.getOwnPropertyDescriptor, hi = (a, e, n, i) => {
+  for (var r = i > 1 ? void 0 : i ? gi(e, n) : e, o = a.length - 1, u; o >= 0; o--)
     (u = a[o]) && (r = u(r) || r);
   return r;
-}, Ue = (a, e) => (n, i) => e(n, i, a);
+}, Fe = (a, e) => (n, i) => e(n, i, a);
 let We = class extends te {
   constructor(a, e, n, i) {
     super(), this._definedNamesService = a, this._univerInstanceService = e, this._sheetInterceptorService = n, this._lexerTreeBuilder = i, this._initialize();
@@ -1008,7 +1008,7 @@ let We = class extends te {
     this.disposeWithMe(
       this._sheetInterceptorService.interceptCommand({
         getMutations: (a) => {
-          if (a.id === Da.id || a.id === Ca.id)
+          if (a.id === Oa.id || a.id === ba.id)
             return {
               redos: [],
               undos: []
@@ -1019,7 +1019,7 @@ let We = class extends te {
               redos: [],
               undos: []
             };
-          const n = Fa(e, a);
+          const n = va(e, a);
           return n ? this._getUpdateDefinedNameMutations(e, n) : {
             redos: [],
             undos: []
@@ -1039,16 +1039,16 @@ let We = class extends te {
     const u = [], m = [];
     return Object.values(o).forEach((f) => {
       var c;
-      const { formulaOrRefString: s } = f, p = this._lexerTreeBuilder.sequenceNodesBuilder(s);
-      if (p == null)
+      const { formulaOrRefString: s } = f, d = this._lexerTreeBuilder.sequenceNodesBuilder(s);
+      if (d == null)
         return !0;
       let T = !1;
       const P = [];
-      for (let N = 0, R = p.length; N < R; N++) {
-        const d = p[N];
-        if (typeof d == "string" || d.nodeType !== J.REFERENCE)
+      for (let N = 0, R = d.length; N < R; N++) {
+        const p = d[N];
+        if (typeof p == "string" || p.nodeType !== J.REFERENCE)
           continue;
-        const { token: O } = d, M = se(O), { range: F, sheetName: U, unitId: g } = M, x = ((c = a.getSheetBySheetName(U)) == null ? void 0 : c.getSheetId()) || "", h = {
+        const { token: O } = p, M = se(O), { range: F, sheetName: U, unitId: g } = M, x = ((c = a.getSheetBySheetName(U)) == null ? void 0 : c.getSheetId()) || "", h = {
           range: F,
           sheetId: x,
           unitId: g,
@@ -1072,21 +1072,21 @@ let We = class extends te {
             unitId: g
           });
         } else
-          V = Ua(
+          V = Ba(
             h,
             e,
             i,
             r
           );
-        V != null && (p[N] = {
-          ...d,
+        V != null && (d[N] = {
+          ...p,
           token: V
         }, T = !0, P.push(N));
       }
       if (!T)
         return !0;
-      const E = we(ha(p, P)), I = {
-        id: Me.id,
+      const E = Xe(Fa(d, P)), I = {
+        id: xe.id,
         params: {
           unitId: i,
           ...f,
@@ -1095,7 +1095,7 @@ let We = class extends te {
       };
       u.push(I);
       const S = {
-        id: Me.id,
+        id: xe.id,
         params: {
           unitId: i,
           ...f
@@ -1113,27 +1113,27 @@ let We = class extends te {
     return ((o = this._definedNamesService.getWorksheetByRef(e, i)) == null ? void 0 : o.getSheetId()) === n ? j.REF : null;
   }
 };
-We = qi([
-  Ue(0, yt),
-  Ue(1, xe),
-  Ue(2, X(xt)),
-  Ue(3, X(qt))
+We = hi([
+  Fe(0, yt),
+  Fe(1, _e),
+  Fe(2, Y(xt)),
+  Fe(3, Y(qt))
 ], We);
-var Ce = /* @__PURE__ */ ((a) => (a[a.NOT_REGISTER = 1] = "NOT_REGISTER", a[a.SUCCESS = 2] = "SUCCESS", a[a.WAIT = 3] = "WAIT", a[a.ERROR = 4] = "ERROR", a))(Ce || {}), gi = Object.getOwnPropertyDescriptor, hi = (a, e, n, i) => {
-  for (var r = i > 1 ? void 0 : i ? gi(e, n) : e, o = a.length - 1, u; o >= 0; o--)
+var Ie = /* @__PURE__ */ ((a) => (a[a.NOT_REGISTER = 1] = "NOT_REGISTER", a[a.SUCCESS = 2] = "SUCCESS", a[a.WAIT = 3] = "WAIT", a[a.ERROR = 4] = "ERROR", a))(Ie || {}), Ui = Object.getOwnPropertyDescriptor, Fi = (a, e, n, i) => {
+  for (var r = i > 1 ? void 0 : i ? Ui(e, n) : e, o = a.length - 1, u; o >= 0; o--)
     (u = a[o]) && (r = u(r) || r);
   return r;
-}, pt = (a, e) => (n, i) => e(n, i, a);
+}, dt = (a, e) => (n, i) => e(n, i, a);
 let Ke = class extends te {
   constructor(e, n, i) {
     super();
-    w(this, "_formulaCacheMap", /* @__PURE__ */ new Map());
-    w(this, "_formulaChangeWithRange$", new ta());
-    w(this, "formulaChangeWithRange$", this._formulaChangeWithRange$.asObservable());
+    X(this, "_formulaCacheMap", /* @__PURE__ */ new Map());
+    X(this, "_formulaChangeWithRange$", new na());
+    X(this, "formulaChangeWithRange$", this._formulaChangeWithRange$.asObservable());
     // FIXME: this design could be improved.
-    w(this, "_formulaResult$", new ta());
-    w(this, "formulaResult$", this._formulaResult$.asObservable());
-    w(this, "calculateStarted$", new _a(!1));
+    X(this, "_formulaResult$", new na());
+    X(this, "formulaResult$", this._formulaResult$.asObservable());
+    X(this, "calculateStarted$", new qa(!1));
     this._commandService = e, this._activeDirtyManagerService = n, this._lifecycleService = i, this._initFormulaRegister(), this._initFormulaCalculationResultChange();
   }
   dispose() {
@@ -1146,13 +1146,13 @@ let Ke = class extends te {
     return r || (r = /* @__PURE__ */ new Map(), i.set(n, r)), r;
   }
   _createFormulaId(e, n) {
-    return `formula.${e}_${n}_${Ne.generateRandomId(8)}`;
+    return `formula.${e}_${n}_${Ae.generateRandomId(8)}`;
   }
   _initFormulaRegister() {
     this._activeDirtyManagerService.register(
-      Ge.id,
+      De.id,
       {
-        commandId: Ge.id,
+        commandId: De.id,
         getDirtyData(n) {
           return {
             dirtyUnitOtherFormulaMap: n.params
@@ -1174,40 +1174,40 @@ let Ke = class extends te {
           }
         }
       };
-      this._commandService.executeCommand(Ln.id, s).then(() => {
+      this._commandService.executeCommand(Tn.id, s).then(() => {
         this._commandService.executeCommand(
-          Ge.id,
+          De.id,
           { [i]: { [r]: { [u]: !0 } } }
         );
       });
     };
     this.disposeWithMe(
-      this._formulaChangeWithRange$.pipe(Hn(() => this.calculateStarted$.pipe(aa((n) => n)))).subscribe((n) => n.forEach(e))
+      this._formulaChangeWithRange$.pipe(Yn(() => this.calculateStarted$.pipe(ia((n) => n)))).subscribe((n) => n.forEach(e))
     ), this.disposeWithMe(
-      this._formulaChangeWithRange$.pipe(aa(() => this.calculateStarted$.getValue())).subscribe(e)
+      this._formulaChangeWithRange$.pipe(ia(() => this.calculateStarted$.getValue())).subscribe(e)
     );
   }
   _initFormulaCalculationResultChange() {
     this.disposeWithMe(this._commandService.onCommandExecuted((e) => {
-      if (e.id === pn.id) {
+      if (e.id === Ln.id) {
         const n = e.params, { unitOtherData: i } = n, r = {};
         for (const o in i) {
           const u = i[o], m = {};
           r[o] = m;
           for (const f in u) {
-            const s = this._ensureCacheMap(o, f), p = u[f], T = [];
+            const s = this._ensureCacheMap(o, f), d = u[f], T = [];
             m[f] = T;
-            for (const P in p) {
-              const E = p[P];
+            for (const P in d) {
+              const E = d[P];
               if (s.has(P)) {
                 const I = s.get(P);
                 if (!I)
                   continue;
                 I.result || (I.result = {});
                 const S = new W(E), c = new W(I.result);
-                S.forValue((N, R, d) => {
-                  c.setValue(N, R, d);
-                }), I.status = Ce.SUCCESS, I.callbacks.forEach((N) => {
+                S.forValue((N, R, p) => {
+                  c.setValue(N, R, p);
+                }), I.status = Ie.SUCCESS, I.callbacks.forEach((N) => {
                   N(E);
                 }), I.callbacks.clear(), T.push(I);
               }
@@ -1222,7 +1222,7 @@ let Ke = class extends te {
     const u = this._createFormulaId(e, n);
     return this._ensureCacheMap(e, n).set(u, {
       result: void 0,
-      status: Ce.WAIT,
+      status: Ie.WAIT,
       formulaId: u,
       callbacks: /* @__PURE__ */ new Set(),
       extra: o
@@ -1240,13 +1240,13 @@ let Ke = class extends te {
       subUnitId: n,
       formulaIdList: i
     };
-    this._commandService.executeCommand(dn.id, r);
+    this._commandService.executeCommand(Pn.id, r);
     const o = this._ensureCacheMap(e, n);
     i.forEach((u) => o.delete(u));
   }
   getFormulaValue(e, n, i) {
     const r = this._ensureCacheMap(e, n), o = r.get(i);
-    return o ? o.status === Ce.SUCCESS || o.status === Ce.ERROR ? Promise.resolve(o) : new Promise((u) => {
+    return o ? o.status === Ie.SUCCESS || o.status === Ie.ERROR ? Promise.resolve(o) : new Promise((u) => {
       o.callbacks.add(() => {
         u(r.get(i));
       });
@@ -1255,26 +1255,33 @@ let Ke = class extends te {
   getFormulaValueSync(e, n, i) {
     return this._ensureCacheMap(e, n).get(i);
   }
+  markFormulaDirty(e, n, i) {
+    const r = this.getFormulaValueSync(e, n, i);
+    r && (r.status = Ie.WAIT, this._commandService.executeCommand(
+      De.id,
+      { [e]: { [n]: { [i]: !0 } } }
+    ));
+  }
 };
-Ke = hi([
-  pt(0, de),
-  pt(1, gt),
-  pt(2, X(Ha))
+Ke = Fi([
+  dt(0, pe),
+  dt(1, gt),
+  dt(2, Y(Ya))
 ], Ke);
 const ot = "sheets-formula.base.config";
-var pe = /* @__PURE__ */ ((a) => (a[a.FORCED = 0] = "FORCED", a[a.WHEN_EMPTY = 1] = "WHEN_EMPTY", a[a.NO_CALCULATION = 2] = "NO_CALCULATION", a))(pe || {});
-const na = {}, Ui = "sheets-formula.remote.config", ia = {};
-var Fi = Object.getOwnPropertyDescriptor, Bi = (a, e, n, i) => {
-  for (var r = i > 1 ? void 0 : i ? Fi(e, n) : e, o = a.length - 1, u; o >= 0; o--)
+var de = /* @__PURE__ */ ((a) => (a[a.FORCED = 0] = "FORCED", a[a.WHEN_EMPTY = 1] = "WHEN_EMPTY", a[a.NO_CALCULATION = 2] = "NO_CALCULATION", a))(de || {});
+const ra = {}, Bi = "sheets-formula.remote.config", oa = {};
+var vi = Object.getOwnPropertyDescriptor, Vi = (a, e, n, i) => {
+  for (var r = i > 1 ? void 0 : i ? vi(e, n) : e, o = a.length - 1, u; o >= 0; o--)
     (u = a[o]) && (r = u(r) || r);
   return r;
-}, ce = (a, e) => (n, i) => e(n, i, a);
-const ra = { done: 0, count: 0 }, dt = { onlyLocal: !0 };
-let Oe = class extends te {
+}, le = (a, e) => (n, i) => e(n, i, a);
+const ua = { done: 0, count: 0 }, pt = { onlyLocal: !0 };
+let Me = class extends te {
   constructor(e, n, i, r, o, u, m) {
     super();
-    w(this, "_waitingCommandQueue", []);
-    w(this, "_executingDirtyData", {
+    X(this, "_waitingCommandQueue", []);
+    X(this, "_executingDirtyData", {
       forceCalculation: !1,
       dirtyRanges: [],
       dirtyNameMap: {},
@@ -1283,18 +1290,18 @@ let Oe = class extends te {
       dirtyUnitOtherFormulaMap: {},
       clearDependencyTreeCache: {}
     });
-    w(this, "_setTimeoutKey", -1);
-    w(this, "_startExecutionTime", 0);
-    w(this, "_totalCalculationTaskCount", 0);
-    w(this, "_doneCalculationTaskCount", 0);
-    w(this, "_executionInProgressParams", null);
-    w(this, "_restartCalculation", !1);
+    X(this, "_setTimeoutKey", -1);
+    X(this, "_startExecutionTime", 0);
+    X(this, "_totalCalculationTaskCount", 0);
+    X(this, "_doneCalculationTaskCount", 0);
+    X(this, "_executionInProgressParams", null);
+    X(this, "_restartCalculation", !1);
     /**
      * 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 _a(ra));
-    w(this, "progress$", this._progress$.asObservable());
+    X(this, "_forceCalculating", !1);
+    X(this, "_progress$", new qa(ua));
+    X(this, "progress$", this._progress$.asObservable());
     this._commandService = e, this._activeDirtyManagerService = n, this._logService = i, this._configService = r, this._formulaDataModel = o, this._localeService = u, this._registerOtherFormulaService = m, this._commandExecutedListener(), this._initialExecuteFormulaProcessListener(), this._initialExecuteFormula();
   }
   _emitProgress(e) {
@@ -1322,25 +1329,32 @@ let Oe = class extends te {
     this._doneCalculationTaskCount = 0, this._totalCalculationTaskCount = 0, this._emitProgress();
   }
   dispose() {
-    super.dispose(), this._progress$.next(ra), this._progress$.complete(), clearTimeout(this._setTimeoutKey);
+    super.dispose(), this._progress$.next(ua), this._progress$.complete(), clearTimeout(this._setTimeoutKey);
   }
   _getCalculationMode() {
     var n;
     const e = this._configService.getConfig(ot);
-    return (n = e == null ? void 0 : e.initialFormulaComputing) != null ? n : pe.WHEN_EMPTY;
+    return (n = e == null ? void 0 : e.initialFormulaComputing) != null ? n : de.WHEN_EMPTY;
   }
   _commandExecutedListener() {
     this.disposeWithMe(
+      this._commandService.beforeCommandExecuted((e) => {
+        if (e.id === Ee.id) {
+          const n = e.params;
+          n.rowData = this._formulaDataModel.getHiddenRowsFiltered();
+        }
+      })
+    ), this.disposeWithMe(
       this._commandService.onCommandExecuted((e, n) => {
         if (this._activeDirtyManagerService.get(e.id)) {
-          if (e.id === ne.id) {
+          if (e.id === ie.id) {
             const i = e.params;
-            if (n && n.onlyLocal === !0 || i.trigger === _t.id || i.trigger === ba.id || i.trigger === Oa.id)
+            if (n && n.onlyLocal === !0 || i.trigger === _t.id || i.trigger === Ma.id || i.trigger === xa.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(Se.id, { ...this._executingDirtyData }, dt) : (this._restartCalculation = !0, this._commandService.executeCommand(Qt.id, {})), this._waitingCommandQueue = [];
+            this._executingDirtyData = this._mergeDirty(this._executingDirtyData, i), this._executionInProgressParams == null ? this._commandService.executeCommand(Ee.id, { ...this._executingDirtyData }, pt) : (this._restartCalculation = !0, this._commandService.executeCommand(jt.id, {})), this._waitingCommandQueue = [];
           }, 100);
         }
       })
@@ -1352,7 +1366,7 @@ let Oe = class extends te {
       const s = this._activeDirtyManagerService.get(f.id);
       if (s == null)
         continue;
-      const p = s.getDirtyData(f), { dirtyRanges: T, dirtyNameMap: P, dirtyDefinedNameMap: E, dirtyUnitFeatureMap: I, dirtyUnitOtherFormulaMap: S, clearDependencyTreeCache: c } = p;
+      const d = s.getDirtyData(f), { dirtyRanges: T, dirtyNameMap: P, dirtyDefinedNameMap: E, dirtyUnitFeatureMap: I, dirtyUnitOtherFormulaMap: S, clearDependencyTreeCache: c } = d;
       T != null && this._mergeDirtyRanges(n, T), P != null && this._mergeDirtyNameMap(i, P), E != null && this._mergeDirtyNameMap(r, E), I != null && this._mergeDirtyUnitFeatureOrOtherFormulaMap(o, I), S != null && this._mergeDirtyUnitFeatureOrOtherFormulaMap(u, S), c != null && this._mergeDirtyNameMap(m, c);
     }
     return {
@@ -1363,7 +1377,7 @@ let Oe = class extends te {
       dirtyUnitOtherFormulaMap: u,
       forceCalculation: !1,
       clearDependencyTreeCache: m,
-      maxIteration: this._configService.getConfig($t)
+      maxIteration: this._configService.getConfig(zt)
       // numfmtItemMap,
     };
   }
@@ -1392,8 +1406,8 @@ let Oe = class extends te {
       let r = !1;
       for (const o of e)
         if (i.unitId === o.unitId && i.sheetId === o.sheetId) {
-          const { startRow: u, startColumn: m, endRow: f, endColumn: s } = i.range, { startRow: p, startColumn: T, endRow: P, endColumn: E } = o.range;
-          if (u === p && m === T && f === P && s === E) {
+          const { startRow: u, startColumn: m, endRow: f, endColumn: s } = i.range, { startRow: d, startColumn: T, endRow: P, endColumn: E } = o.range;
+          if (u === d && m === T && f === P && s === E) {
             r = !0;
             break;
           }
@@ -1424,32 +1438,32 @@ let Oe = class extends te {
     this.disposeWithMe(
       // eslint-disable-next-line max-lines-per-function, complexity
       this._commandService.onCommandExecuted((i) => {
-        if (i.id === Se.id) {
+        if (i.id === Ee.id) {
           const { forceCalculation: o = !1 } = i.params;
           o && (this._forceCalculating = !0);
-        } else i.id === Qt.id && this.clearProgress();
-        if (i.id !== Pn.id)
+        } else i.id === jt.id && this.clearProgress();
+        if (i.id !== En.id)
           return;
         const r = i.params;
         if (r.stageInfo != null) {
           const {
             stage: o
           } = r.stageInfo;
-          if (o === ge.START)
+          if (o === he.START)
             n === 0 && (this._startExecutionTime = performance.now()), n++, e !== null && (clearTimeout(e), e = null), e = setTimeout(() => {
               e = null, this._startProgress();
             }, 1e3);
-          else if (o === ge.CURRENTLY_CALCULATING) {
+          else if (o === he.CURRENTLY_CALCULATING) {
             if (this._executionInProgressParams = r.stageInfo, e === null) {
               const u = this._localeService.t("formula.progress.calculating");
               this._calculateProgress(u);
             }
-          } else if (o === ge.START_DEPENDENCY_ARRAY_FORMULA) {
+          } else if (o === he.START_DEPENDENCY_ARRAY_FORMULA) {
             if (this._executionInProgressParams = r.stageInfo, e === null) {
               const u = this._localeService.t("formula.progress.array-analysis");
               this._calculateProgress(u);
             }
-          } else if (o === ge.CURRENTLY_CALCULATING_ARRAY_FORMULA && (this._executionInProgressParams = r.stageInfo, e === null)) {
+          } else if (o === he.CURRENTLY_CALCULATING_ARRAY_FORMULA && (this._executionInProgressParams = r.stageInfo, e === null)) {
             const u = this._localeService.t("formula.progress.array-calculation");
             this._calculateProgress(u);
           }
@@ -1457,25 +1471,25 @@ let Oe = class extends te {
           const o = r.functionsExecutedState;
           let u = "";
           switch (n--, o) {
-            case Re.NOT_EXECUTED:
+            case Se.NOT_EXECUTED:
               u = "No tasks are being executed anymore", this._resetExecutingDirtyData();
               break;
-            case Re.STOP_EXECUTION:
+            case Se.STOP_EXECUTION:
               u = "The execution of the formula has been stopped", n = 0;
               break;
-            case Re.SUCCESS:
+            case Se.SUCCESS:
               u = "Formula calculation succeeded", (n === 0 || n === -1) && (u += `. Total time consumed: ${performance.now() - this._startExecutionTime} ms`), this._resetExecutingDirtyData();
               break;
-            case Re.INITIAL:
+            case Se.INITIAL:
               u = "Waiting for calculation", this._resetExecutingDirtyData();
               break;
           }
-          (n === 0 || n === -1) && (e ? (clearTimeout(e), e = null, this.clearProgress()) : this._completeProgress(), n = 0, this._doneCalculationTaskCount = 0, this._totalCalculationTaskCount = 0, this._forceCalculating = !1), o === Re.STOP_EXECUTION && this._restartCalculation ? (this._restartCalculation = !1, this._commandService.executeCommand(
-            Se.id,
+          (n === 0 || n === -1) && (e ? (clearTimeout(e), e = null, this.clearProgress()) : this._completeProgress(), n = 0, this._doneCalculationTaskCount = 0, this._totalCalculationTaskCount = 0, this._forceCalculating = !1), o === Se.STOP_EXECUTION && this._restartCalculation ? (this._restartCalculation = !1, this._commandService.executeCommand(
+            Ee.id,
             {
               ...this._executingDirtyData
             },
-            dt
+            pt
           )) : this._executionInProgressParams = null, this._logService.debug("[TriggerCalculationController]", u);
         }
       })
@@ -1494,10 +1508,10 @@ let Oe = class extends te {
   }
   _initialExecuteFormula() {
     const e = this._getCalculationMode(), n = this._getDirtyDataByCalculationMode(e);
-    this._commandService.executeCommand(Se.id, n, dt), this._registerOtherFormulaService.calculateStarted$.next(!0);
+    this._commandService.executeCommand(Ee.id, n, pt), this._registerOtherFormulaService.calculateStarted$.next(!0);
   }
   _getDirtyDataByCalculationMode(e) {
-    const n = e === pe.FORCED, i = e === pe.WHEN_EMPTY ? this._formulaDataModel.getFormulaDirtyRanges() : [];
+    const n = e === de.FORCED, i = e === de.WHEN_EMPTY ? this._formulaDataModel.getFormulaDirtyRanges() : [];
     return {
       forceCalculation: n,
       dirtyRanges: i,
@@ -1506,21 +1520,21 @@ let Oe = class extends te {
       dirtyUnitFeatureMap: {},
       dirtyUnitOtherFormulaMap: {},
       clearDependencyTreeCache: {},
-      maxIteration: this._configService.getConfig($t)
+      maxIteration: this._configService.getConfig(zt)
     };
   }
 };
-Oe = Bi([
-  ce(0, de),
-  ce(1, gt),
-  ce(2, Ya),
-  ce(3, _e),
-  ce(4, X(it)),
-  ce(5, X(Ot)),
-  ce(6, X(Ke))
-], Oe);
-function hr(a, e, n, i) {
-  const r = a.get(Tn), o = a.get(En), u = a.get(In), m = a.get(Nn);
+Me = Vi([
+  le(0, pe),
+  le(1, gt),
+  le(2, Xa),
+  le(3, ye),
+  le(4, Y(it)),
+  le(5, Y(Ot)),
+  le(6, Y(Ke))
+], Me);
+function Fr(a, e, n, i) {
+  const r = a.get(In), o = a.get(Nn), u = a.get(Rn), m = a.get(An);
   r.load({
     formulaData: {},
     arrayFormulaCellData: {},
@@ -1536,14 +1550,14 @@ function hr(a, e, n, i) {
     },
     dirtyUnitOtherFormulaMap: {}
   });
-  const f = o.treeBuilder(e), s = u.parse(f), p = m.execute(Rn(s));
-  return An(p);
+  const f = o.treeBuilder(e), s = u.parse(f), d = m.execute(Sn(s));
+  return Cn(d);
 }
-var vi = Object.getOwnPropertyDescriptor, Vi = (a, e, n, i) => {
-  for (var r = i > 1 ? void 0 : i ? vi(e, n) : e, o = a.length - 1, u; o >= 0; o--)
+var Gi = Object.getOwnPropertyDescriptor, Hi = (a, e, n, i) => {
+  for (var r = i > 1 ? void 0 : i ? Gi(e, n) : e, o = a.length - 1, u; o >= 0; o--)
     (u = a[o]) && (r = u(r) || r);
   return r;
-}, ue = (a, e) => (n, i) => e(n, i, a);
+}, me = (a, e) => (n, i) => e(n, i, a);
 let ke = class extends te {
   constructor(a, e, n, i, r, o, u, m) {
     super(), this._univerInstanceService = a, this._commandService = e, this._lexerTreeBuilder = n, this._formulaDataModel = i, this._sheetInterceptorService = r, this._definedNamesService = o, this._configService = u, this._injector = m, this._commandExecutedListener();
@@ -1561,14 +1575,14 @@ let ke = class extends te {
       })
     ), this.disposeWithMe(
       this._commandService.beforeCommandExecuted((a, e) => {
-        if (a.id === ne.id) {
+        if (a.id === ie.id) {
           const n = a.params;
-          if (e && e.onlyLocal === !0 || n.trigger === _t.id || n.trigger === ba.id || n.trigger === Oa.id)
+          if (e && e.onlyLocal === !0 || n.trigger === _t.id || n.trigger === Ma.id || n.trigger === xa.id)
             return;
           this._handleSetRangeValuesMutation(n);
         }
       })
-    ), this.disposeWithMe(this._univerInstanceService.getTypeOfUnitAdded$(ee.UNIVER_SHEET).subscribe((a) => this._handleWorkbookAdded(a))), this.disposeWithMe(this._univerInstanceService.getTypeOfUnitDisposed$(ee.UNIVER_SHEET).pipe(Yn((a) => a.getUnitId())).subscribe((a) => this._handleWorkbookDisposed(a)));
+    ), this.disposeWithMe(this._univerInstanceService.getTypeOfUnitAdded$(ee.UNIVER_SHEET).subscribe((a) => this._handleWorkbookAdded(a))), this.disposeWithMe(this._univerInstanceService.getTypeOfUnitDisposed$(ee.UNIVER_SHEET).pipe(Xn((a) => a.getUnitId())).subscribe((a) => this._handleWorkbookDisposed(a)));
   }
   _handleSetRangeValuesMutation(a) {
     const { subUnitId: e, unitId: n, cellValue: i } = a;
@@ -1580,18 +1594,18 @@ let ke = class extends te {
       }
     };
     this._commandService.executeCommand(
-      ne.id,
+      ie.id,
       {
         unitId: n,
         subUnitId: e,
-        cellValue: Li(r)
+        cellValue: Ti(r)
       },
       {
         onlyLocal: !0,
         fromFormula: !0
       }
     ), this._formulaDataModel.updateArrayFormulaCellData(n, e, i), this._formulaDataModel.updateArrayFormulaRange(n, e, i), this._commandService.executeCommand(
-      he.id,
+      Ue.id,
       {
         formulaData: o
       },
@@ -1614,7 +1628,7 @@ let ke = class extends te {
   _handleWorkbookDisposed(a, e) {
     const n = this._formulaDataModel.getFormulaData(), i = ct(n, a, e), r = this._formulaDataModel.getArrayFormulaRange(), o = ct(r, a, e), u = this._formulaDataModel.getArrayFormulaCellData(), m = ct(u, a, e);
     i && this._commandService.executeCommand(
-      he.id,
+      Ue.id,
       {
         formulaData: i
       },
@@ -1633,9 +1647,9 @@ let ke = class extends te {
     );
   }
   _handleInsertSheetMutation(a) {
-    const { sheet: e, unitId: n } = a, i = this._formulaDataModel.getFormulaData(), { id: r, cellData: o } = e, u = new W(o), m = jt(i, n, r, u);
+    const { sheet: e, unitId: n } = a, i = this._formulaDataModel.getFormulaData(), { id: r, cellData: o } = e, u = new W(o), m = Zt(i, n, r, u);
     this._commandService.executeCommand(
-      he.id,
+      Ue.id,
       {
         formulaData: m
       },
@@ -1649,14 +1663,14 @@ let ke = class extends te {
     const e = {}, n = a.getUnitId(), i = { [n]: {} };
     a.getSheets().forEach((s) => {
       var E;
-      const p = s.getCellMatrix(), T = s.getSheetId(), P = jt(e, n, T, p);
+      const d = s.getCellMatrix(), T = s.getSheetId(), P = Zt(e, n, T, d);
       i[n][T] = (E = P[n]) == null ? void 0 : E[T];
-    }), this._commandService.executeCommand(he.id, { formulaData: i }, { onlyLocal: !0 });
-    const o = this._configService.getConfig(ot), u = (f = o == null ? void 0 : o.initialFormulaComputing) != null ? f : pe.WHEN_EMPTY, m = this._getDiryDataByCalculationMode(u);
-    this._commandService.executeCommand(Se.id, m, { onlyLocal: !0 });
+    }), this._commandService.executeCommand(Ue.id, { formulaData: i }, { onlyLocal: !0 });
+    const o = this._configService.getConfig(ot), u = (f = o == null ? void 0 : o.initialFormulaComputing) != null ? f : de.WHEN_EMPTY, m = this._getDirtyDataByCalculationMode(u);
+    this._commandService.executeCommand(Ee.id, m, { onlyLocal: !0 });
   }
-  _getDiryDataByCalculationMode(a) {
-    const e = a === pe.FORCED, n = a === pe.WHEN_EMPTY ? this._formulaDataModel.getFormulaDirtyRanges() : [];
+  _getDirtyDataByCalculationMode(a) {
+    const e = a === de.FORCED, n = a === de.WHEN_EMPTY ? this._formulaDataModel.getFormulaDirtyRanges() : [];
     return {
       forceCalculation: e,
       dirtyRanges: n,
@@ -1674,13 +1688,13 @@ let ke = class extends te {
         undos: [],
         redos: []
       };
-    const n = Fa(e, a);
+    const n = va(e, a);
     if (n) {
       const { unitSheetNameMap: i } = this._formulaDataModel.getCalculateData(), r = this._formulaDataModel.getFormulaData(), { newFormulaData: o } = this._getFormulaReferenceMoveInfo(
         r,
         i,
         n
-      ), { undos: u, redos: m } = Qn(r, o, n);
+      ), { undos: u, redos: m } = jn(r, o, n);
       return {
         undos: u,
         redos: m
@@ -1693,7 +1707,7 @@ let ke = class extends te {
   }
   // eslint-disable-next-line max-lines-per-function
   _getFormulaReferenceMoveInfo(a, e, n) {
-    if (!Ne.isDefine(a)) return { newFormulaData: {}, oldFormulaData: {} };
+    if (!Ae.isDefine(a)) return { newFormulaData: {}, oldFormulaData: {} };
     const i = Object.keys(a);
     if (i.length === 0) return { newFormulaData: {}, oldFormulaData: {} };
     const r = {}, o = {};
@@ -1702,19 +1716,19 @@ let ke = class extends te {
       if (m == null)
         continue;
       const f = Object.keys(m);
-      Ne.isDefine(r[u]) || (r[u] = {}), Ne.isDefine(o[u]) || (o[u] = {});
+      Ae.isDefine(r[u]) || (r[u] = {}), Ae.isDefine(o[u]) || (o[u] = {});
       for (const s of f) {
-        const p = new W(m[s] || {}), T = new W();
-        p.forValue((P, E, I) => {
+        const d = new W(m[s] || {}), T = new W();
+        d.forValue((P, E, I) => {
           var U;
           if (!I) return !0;
-          const { f: S, x: c, y: N, si: R } = I, d = this._lexerTreeBuilder.sequenceNodesBuilder(S);
-          if (d == null)
+          const { f: S, x: c, y: N, si: R } = I, p = this._lexerTreeBuilder.sequenceNodesBuilder(S);
+          if (p == null)
             return !0;
           let O = !1;
           const M = [];
-          for (let g = 0, x = d.length; g < x; g++) {
-            const h = d[g];
+          for (let g = 0, x = p.length; g < x; g++) {
+            const h = p[g];
             if (typeof h == "string")
               continue;
             const { token: V, nodeType: Q } = h, { type: b } = n;
@@ -1722,18 +1736,18 @@ let ke = class extends te {
               const { definedNameId: Pe, definedName: Te } = n;
               if (Pe === void 0 || Te === void 0)
                 continue;
-              const me = this._definedNamesService.getValueById(u, Pe);
-              if (me == null || me.name !== V)
+              const fe = this._definedNamesService.getValueById(u, Pe);
+              if (fe == null || fe.name !== V)
                 continue;
-              d[g] = {
+              p[g] = {
                 ...h,
                 token: b === q.SetDefinedName ? Te : j.REF
               }, O = !0, M.push(g);
               continue;
             } else if (Q !== J.REFERENCE)
               continue;
-            const Le = se(V), { range: ae, sheetName: ie, unitId: k } = Le, re = k == null || k.length === 0 ? u : k, z = ((U = e == null ? void 0 : e[re]) == null ? void 0 : U[ie]) || "";
-            if (!ga(
+            const Le = se(V), { range: ae, sheetName: re, unitId: k } = Le, oe = k == null || k.length === 0 ? u : k, z = ((U = e == null ? void 0 : e[oe]) == null ? void 0 : U[re]) || "";
+            if (!Ua(
               n.unitId,
               n.sheetId,
               u,
@@ -1742,53 +1756,53 @@ let ke = class extends te {
               z
             ))
               continue;
-            const ye = {
+            const qe = {
               range: ae,
               sheetId: z,
               unitId: k,
-              sheetName: ie,
+              sheetName: re,
               refOffsetX: c || 0,
               refOffsetY: N || 0
             };
-            let oe = null;
+            let ue = null;
             if (b === q.SetName) {
               const {
                 unitId: Pe,
                 sheetId: Te,
-                sheetName: me
+                sheetName: fe
               } = n;
-              if (me == null || z == null || z.length === 0 || Te !== z)
+              if (fe == null || z == null || z.length === 0 || Te !== z)
                 continue;
-              oe = nt({
+              ue = nt({
                 range: ae,
-                sheetName: me,
+                sheetName: fe,
                 unitId: k
               });
             } else if (b === q.RemoveSheet) {
               const {
                 unitId: Pe,
                 sheetId: Te,
-                sheetName: me
+                sheetName: fe
               } = n;
               if (z == null || z.length === 0 || Te !== z)
                 continue;
-              oe = j.REF;
-            } else b !== q.SetDefinedName && (oe = Ua(
-              ye,
+              ue = j.REF;
+            } else b !== q.SetDefinedName && (ue = Ba(
+              qe,
               n,
               u,
               s
             ));
-            oe != null && (d[g] = {
+            ue != null && (p[g] = {
               ...h,
-              token: oe
+              token: ue
             }, O = !0, M.push(g));
           }
           if (!O)
             return !0;
-          const F = ha(d, M, c, N);
+          const F = Fa(p, M, c, N);
           T.setValue(P, E, {
-            f: `=${we(F)}`
+            f: `=${Xe(F)}`
           });
         }), o[u] && (o[u][s] = T.getData());
       }
@@ -1796,19 +1810,19 @@ let ke = class extends te {
     return { newFormulaData: o };
   }
 };
-ke = Vi([
-  ue(0, xe),
-  ue(1, de),
-  ue(2, X(qt)),
-  ue(3, X(it)),
-  ue(4, X(xt)),
-  ue(5, yt),
-  ue(6, _e),
-  ue(7, X(at))
+ke = Hi([
+  me(0, _e),
+  me(1, pe),
+  me(2, Y(qt)),
+  me(3, Y(it)),
+  me(4, Y(xt)),
+  me(5, yt),
+  me(6, ye),
+  me(7, Y(at))
 ], ke);
-const Gi = [
+const wi = [
   {
-    functionName: zt.ARRAY_CONSTRAIN,
+    functionName: Jt.ARRAY_CONSTRAIN,
     functionType: t.Array,
     description: "formula.functionList.ARRAY_CONSTRAIN.description",
     abstract: "formula.functionList.ARRAY_CONSTRAIN.abstract",
@@ -1837,7 +1851,7 @@ const Gi = [
     ]
   },
   {
-    functionName: zt.FLATTEN,
+    functionName: Jt.FLATTEN,
     functionType: t.Array,
     description: "formula.functionList.FLATTEN.description",
     abstract: "formula.functionList.FLATTEN.abstract",
@@ -1858,7 +1872,7 @@ const Gi = [
       }
     ]
   }
-], Hi = [
+], Yi = [
   {
     functionName: _.BETADIST,
     functionType: t.Compatibility,
@@ -2912,9 +2926,9 @@ const Gi = [
       }
     ]
   }
-], Yi = [
+], Xi = [
   {
-    functionName: fe.CUBEKPIMEMBER,
+    functionName: ce.CUBEKPIMEMBER,
     functionType: t.Cube,
     description: "formula.functionList.CUBEKPIMEMBER.description",
     abstract: "formula.functionList.CUBEKPIMEMBER.abstract",
@@ -2936,7 +2950,7 @@ const Gi = [
     ]
   },
   {
-    functionName: fe.CUBEMEMBER,
+    functionName: ce.CUBEMEMBER,
     functionType: t.Cube,
     description: "formula.functionList.CUBEMEMBER.description",
     abstract: "formula.functionList.CUBEMEMBER.abstract",
@@ -2958,7 +2972,7 @@ const Gi = [
     ]
   },
   {
-    functionName: fe.CUBEMEMBERPROPERTY,
+    functionName: ce.CUBEMEMBERPROPERTY,
     functionType: t.Cube,
     description: "formula.functionList.CUBEMEMBERPROPERTY.description",
     abstract: "formula.functionList.CUBEMEMBERPROPERTY.abstract",
@@ -2980,7 +2994,7 @@ const Gi = [
     ]
   },
   {
-    functionName: fe.CUBERANKEDMEMBER,
+    functionName: ce.CUBERANKEDMEMBER,
     functionType: t.Cube,
     description: "formula.functionList.CUBERANKEDMEMBER.description",
     abstract: "formula.functionList.CUBERANKEDMEMBER.abstract",
@@ -3002,7 +3016,7 @@ const Gi = [
     ]
   },
   {
-    functionName: fe.CUBESET,
+    functionName: ce.CUBESET,
     functionType: t.Cube,
     description: "formula.functionList.CUBESET.description",
     abstract: "formula.functionList.CUBESET.abstract",
@@ -3024,7 +3038,7 @@ const Gi = [
     ]
   },
   {
-    functionName: fe.CUBESETCOUNT,
+    functionName: ce.CUBESETCOUNT,
     functionType: t.Cube,
     description: "formula.functionList.CUBESETCOUNT.description",
     abstract: "formula.functionList.CUBESETCOUNT.abstract",
@@ -3046,7 +3060,7 @@ const Gi = [
     ]
   },
   {
-    functionName: fe.CUBEVALUE,
+    functionName: ce.CUBEVALUE,
     functionType: t.Cube,
     description: "formula.functionList.CUBEVALUE.description",
     abstract: "formula.functionList.CUBEVALUE.abstract",
@@ -3067,7 +3081,7 @@ const Gi = [
       }
     ]
   }
-], Xi = [
+], Wi = [
   {
     functionName: $.DAVERAGE,
     functionType: t.Database,
@@ -3416,7 +3430,7 @@ const Gi = [
       }
     ]
   }
-], wi = [
+], Ki = [
   {
     functionName: B.DATE,
     functionType: t.Date,
@@ -3988,7 +4002,7 @@ const Gi = [
       }
     ]
   }
-], Wi = [
+], ki = [
   {
     functionName: A.BESSELI,
     functionType: t.Engineering,
@@ -5061,7 +5075,7 @@ const Gi = [
       }
     ]
   }
-], Ki = [
+], Qi = [
   {
     functionName: C.ACCRINT,
     functionType: t.Financial,
@@ -7322,7 +7336,7 @@ const Gi = [
       }
     ]
   }
-], ki = [
+], $i = [
   {
     functionName: v.CELL,
     functionType: t.Information,
@@ -7731,7 +7745,7 @@ const Gi = [
       }
     ]
   }
-], Qi = [
+], ji = [
   {
     functionName: K.AND,
     functionType: t.Logical,
@@ -8205,7 +8219,7 @@ const Gi = [
       }
     ]
   }
-], $i = [
+], zi = [
   {
     functionName: y.ADDRESS,
     functionType: t.Lookup,
@@ -9237,7 +9251,7 @@ const Gi = [
       }
     ]
   }
-], ji = [
+], Zi = [
   {
     functionName: L.ABS,
     functionType: t.Math,
@@ -10875,7 +10889,7 @@ const Gi = [
       }
     ]
   }
-], zi = [
+], Ji = [
   {
     functionName: l.AVEDEV,
     functionType: t.Statistical,
@@ -13817,7 +13831,7 @@ const Gi = [
       }
     ]
   }
-], Zi = [
+], er = [
   {
     functionName: D.ASC,
     functionType: t.Text,
@@ -15031,7 +15045,7 @@ const Gi = [
       }
     ]
   }
-], Ji = [], er = [
+], tr = [], ar = [
   {
     functionName: ft.ENCODEURL,
     functionType: t.Web,
@@ -15091,36 +15105,36 @@ const Gi = [
       }
     ]
   }
-], tr = [
+], nr = [
+  ...Qi,
   ...Ki,
-  ...wi,
-  ...ji,
+  ...Zi,
+  ...Ji,
   ...zi,
+  ...Wi,
+  ...er,
+  ...ji,
   ...$i,
-  ...Xi,
-  ...Zi,
-  ...Qi,
   ...ki,
-  ...Wi,
+  ...Xi,
   ...Yi,
-  ...Hi,
-  ...er,
-  ...Gi,
-  ...Ji
+  ...ar,
+  ...wi,
+  ...tr
 ];
-function ar(a, e) {
+function ir(a, e) {
   let n = "";
   return a.aliasFunctionName ? (n = e.t(a.aliasFunctionName), n === a.aliasFunctionName && (n = a.functionName)) : n = a.functionName, n;
 }
-var nr = Object.getOwnPropertyDescriptor, ir = (a, e, n, i) => {
-  for (var r = i > 1 ? void 0 : i ? nr(e, n) : e, o = a.length - 1, u; o >= 0; o--)
+var rr = Object.getOwnPropertyDescriptor, or = (a, e, n, i) => {
+  for (var r = i > 1 ? void 0 : i ? rr(e, n) : e, o = a.length - 1, u; o >= 0; o--)
     (u = a[o]) && (r = u(r) || r);
   return r;
 }, Lt = (a, e) => (n, i) => e(n, i, a);
 const Ut = Mt("formula.description-service");
 let Ct = class {
   constructor(a, e, n) {
-    w(this, "_descriptions", []);
+    X(this, "_descriptions", []);
     this._functionService = a, this._localeService = e, this._configService = n, this._initialize();
   }
   dispose() {
@@ -15157,7 +15171,7 @@ let Ct = class {
     }), e;
   }
   registerDescriptions(a) {
-    return this._descriptions = this._descriptions.concat(a), this._registerDescriptions(), le(() => {
+    return this._descriptions = this._descriptions.concat(a), this._registerDescriptions(), ne(() => {
       const e = a.map((n) => n.functionName);
       this.unregisterDescriptions(e);
     });
@@ -15176,7 +15190,7 @@ let Ct = class {
     if (e.length === 0)
       return !1;
     const n = e[0].description;
-    return !Sn(n);
+    return !Dn(n);
   }
   _initialize() {
     this._localeService.localeChanged$.subscribe(() => {
@@ -15186,8 +15200,6 @@ let Ct = class {
   _initDescription() {
     var i;
     const a = [
-      ...Cn,
-      ...Dn,
       ...bn,
       ...On,
       ...Mn,
@@ -15201,13 +15213,15 @@ let Ct = class {
       ...Fn,
       ...Bn,
       ...vn,
-      ...Vn
-    ].map((r) => r[1]), e = tr.filter((r) => a.includes(r.functionName)), n = this._configService.getConfig(ot);
+      ...Vn,
+      ...Gn,
+      ...Hn
+    ].map((r) => r[1]), e = nr.filter((r) => a.includes(r.functionName)), n = this._configService.getConfig(ot);
     this._descriptions = e.concat((i = n == null ? void 0 : n.description) != null ? i : []);
   }
   _registerDescriptions() {
     const a = this._localeService, e = this._descriptions.map((n) => ({
-      functionName: ar(n, a),
+      functionName: ir(n, a),
       functionType: n.functionType,
       description: a.t(n.description),
       abstract: a.t(n.abstract),
@@ -15222,17 +15236,17 @@ let Ct = class {
     this._functionService.registerDescriptions(...e);
   }
 };
-Ct = ir([
+Ct = or([
   Lt(0, ht),
-  Lt(1, X(Ot)),
-  Lt(2, _e)
+  Lt(1, Y(Ot)),
+  Lt(2, ye)
 ], Ct);
-var rr = Object.getOwnPropertyDescriptor, or = (a, e, n, i) => {
-  for (var r = i > 1 ? void 0 : i ? rr(e, n) : e, o = a.length - 1, u; o >= 0; o--)
+var ur = Object.getOwnPropertyDescriptor, mr = (a, e, n, i) => {
+  for (var r = i > 1 ? void 0 : i ? ur(e, n) : e, o = a.length - 1, u; o >= 0; o--)
     (u = a[o]) && (r = u(r) || r);
   return r;
-}, Fe = (a, e) => (n, i) => e(n, i, a);
-function oa(a, e, n, i) {
+}, Be = (a, e) => (n, i) => e(n, i, a);
+function ma(a, e, n, i) {
   const r = a.sequenceNodesBuilder(e);
   if (r == null)
     return e;
@@ -15241,9 +15255,9 @@ function oa(a, e, n, i) {
     const f = r[u];
     if (typeof f == "string" || f.nodeType !== J.REFERENCE)
       continue;
-    const { token: s } = f, p = se(s), { sheetName: T, unitId: P } = p;
-    let E = p.range;
-    E.startAbsoluteRefType === Xe.ALL && E.endAbsoluteRefType === Xe.ALL || (E = Et(E, n, i), o.push({
+    const { token: s } = f, d = se(s), { sheetName: T, unitId: P } = d;
+    let E = d.range;
+    E.startAbsoluteRefType === Ye.ALL && E.endAbsoluteRefType === Ye.ALL || (E = Et(E, n, i), o.push({
       unitId: P,
       sheetName: T,
       range: E
@@ -15256,33 +15270,33 @@ let Dt = class extends te {
     super(), this._refRangeService = a, this._lexerTreeBuilder = e, this._univerInstanceService = n, this._injector = i;
   }
   transformFormulaByEffectCommand(a, e, n, i) {
-    const r = this._lexerTreeBuilder.sequenceNodesBuilder(n), o = this._univerInstanceService.getCurrentUnitForType(ee.UNIVER_SHEET), u = o.getActiveSheet(), m = o.getUnitId(), f = u.getSheetId(), s = r == null ? void 0 : r.map((p) => {
-      if (typeof p == "object" && p.nodeType === J.REFERENCE) {
-        const T = se(p.token), { range: P, unitId: E, sheetName: I } = T, S = this._univerInstanceService.getUnit(E || a), c = I ? S == null ? void 0 : S.getSheetBySheetName(I) : S == null ? void 0 : S.getSheetBySheetId(e);
+    const r = this._lexerTreeBuilder.sequenceNodesBuilder(n), o = this._univerInstanceService.getCurrentUnitForType(ee.UNIVER_SHEET), u = o.getActiveSheet(), m = o.getUnitId(), f = u.getSheetId(), s = r == null ? void 0 : r.map((d) => {
+      if (typeof d == "object" && d.nodeType === J.REFERENCE) {
+        const T = se(d.token), { range: P, unitId: E, sheetName: I } = T, S = this._univerInstanceService.getUnit(E || a), c = I ? S == null ? void 0 : S.getSheetBySheetName(I) : S == null ? void 0 : S.getSheetBySheetId(e);
         if (!c)
           throw new Error("Sheet not found");
         const N = S.getUnitId(), R = c.getSheetId();
         if (N !== m || R !== f)
-          return p;
-        const d = Vt(P, i);
+          return d;
+        const p = Vt(P, i);
         let O = "";
-        if (d) {
-          const M = d.startColumn - P.startColumn, F = d.startRow - P.startRow, U = Et(P, M, F);
-          E && I ? O = Zt(E, I, U) : I ? O = Jt(I, U) : O = ea(U);
+        if (p) {
+          const M = p.startColumn - P.startColumn, F = p.startRow - P.startRow, U = Et(P, M, F);
+          E && I ? O = ea(E, I, U) : I ? O = ta(I, U) : O = aa(U);
         } else
           O = j.REF;
         return {
-          ...p,
+          ...d,
           token: O
         };
       } else
-        return p;
+        return d;
     });
-    return s ? `=${we(s)}` : "";
+    return s ? `=${Xe(s)}` : "";
   }
   registerFormula(a, e, n, i) {
-    const r = /* @__PURE__ */ new Map(), o = this._lexerTreeBuilder.sequenceNodesBuilder(n), u = new Ye(), m = (f) => {
-      const s = this._univerInstanceService.getCurrentUnitForType(ee.UNIVER_SHEET), p = s.getActiveSheet(), T = s.getUnitId(), P = p.getSheetId(), E = o == null ? void 0 : o.map((S) => {
+    const r = /* @__PURE__ */ new Map(), o = this._lexerTreeBuilder.sequenceNodesBuilder(n), u = new we(), m = (f) => {
+      const s = this._univerInstanceService.getCurrentUnitForType(ee.UNIVER_SHEET), d = s.getActiveSheet(), T = s.getUnitId(), P = d.getSheetId(), E = o == null ? void 0 : o.map((S) => {
         if (typeof S == "object" && S.nodeType === J.REFERENCE) {
           const c = r.get(S.token);
           if (c.unitId !== T || c.subUnitId !== P)
@@ -15290,8 +15304,8 @@ let Dt = class extends te {
           const N = Vt(c.range, f);
           let R = "";
           if (N) {
-            const d = N.startColumn - c.range.startColumn, O = N.startRow - c.range.startRow, M = Et(c.range, d, O);
-            c.unitId && c.sheetName ? R = Zt(c.unitId, c.sheetName, M) : c.sheetName ? R = Jt(c.sheetName, M) : R = ea(M);
+            const p = N.startColumn - c.range.startColumn, O = N.startRow - c.range.startRow, M = Et(c.range, p, O);
+            c.unitId && c.sheetName ? R = ea(c.unitId, c.sheetName, M) : c.sheetName ? R = ta(c.sheetName, M) : R = aa(M);
           } else
             R = j.REF;
           return {
@@ -15300,35 +15314,35 @@ let Dt = class extends te {
           };
         } else
           return S;
-      }), I = E && we(E);
+      }), I = E && Xe(E);
       return i(`=${I}`);
     };
     return o == null || o.forEach((f) => {
       if (typeof f == "object" && f.nodeType === J.REFERENCE) {
-        const s = se(f.token), { range: p, unitId: T, sheetName: P } = s, E = this._univerInstanceService.getUnit(T || a), I = P ? E == null ? void 0 : E.getSheetBySheetName(P) : E == null ? void 0 : E.getSheetBySheetId(e);
+        const s = se(f.token), { range: d, unitId: T, sheetName: P } = s, E = this._univerInstanceService.getUnit(T || a), I = P ? E == null ? void 0 : E.getSheetBySheetName(P) : E == null ? void 0 : E.getSheetBySheetId(e);
         if (!I)
           return;
         const S = E.getUnitId(), c = I.getSheetId(), N = {
           unitId: S,
           subUnitId: c,
-          range: p,
+          range: d,
           sheetName: P
         };
-        r.set(f.token, N), u.add(this._refRangeService.registerRefRange(p, m, S, c));
+        r.set(f.token, N), u.add(this._refRangeService.registerRefRange(d, m, S, c));
       }
     }), u;
   }
   _getFormulaDependcy(a, e, n, i) {
-    const r = be(n) ? this._lexerTreeBuilder.sequenceNodesBuilder(n) : null, o = [];
+    const r = Oe(n) ? this._lexerTreeBuilder.sequenceNodesBuilder(n) : null, o = [];
     return r == null || r.forEach((u) => {
       if (typeof u == "object" && u.nodeType === J.REFERENCE) {
-        const m = se(u.token), { range: f, unitId: s, sheetName: p } = m;
-        if (f.startAbsoluteRefType === Xe.ALL && f.endAbsoluteRefType === Xe.ALL)
+        const m = se(u.token), { range: f, unitId: s, sheetName: d } = m;
+        if (f.startAbsoluteRefType === Ye.ALL && f.endAbsoluteRefType === Ye.ALL)
           return;
-        const T = this._univerInstanceService.getUnit(s || a), P = p ? T == null ? void 0 : T.getSheetBySheetName(p) : T == null ? void 0 : T.getSheetBySheetId(e);
+        const T = this._univerInstanceService.getUnit(s || a), P = d ? T == null ? void 0 : T.getSheetBySheetName(d) : T == null ? void 0 : T.getSheetBySheetId(e);
         if (!P)
           return;
-        const E = T.getUnitId(), I = P.getSheetId(), S = i[0].startRow, c = i[0].startColumn, N = f.startRow, R = f.startColumn, d = i.map((O) => ({
+        const E = T.getUnitId(), I = P.getSheetId(), S = i[0].startRow, c = i[0].startColumn, N = f.startRow, R = f.startColumn, p = i.map((O) => ({
           startRow: O.startRow - S + N,
           endRow: O.endRow - S + N,
           startColumn: O.startColumn - c + R,
@@ -15337,20 +15351,20 @@ let Dt = class extends te {
         o.push({
           unitId: E,
           subUnitId: I,
-          ranges: d
+          ranges: p
         });
       }
     }), o;
   }
   // eslint-disable-next-line max-lines-per-function
   registerRangeFormula(a, e, n, i, r) {
-    const o = new Ye(), u = i.map((f) => this._getFormulaDependcy(a, e, f, n)), m = (f) => {
-      const s = n[0].startRow, p = n[0].startColumn, T = [{ unitId: a, subUnitId: e, ranges: n }, ...u.flat()], P = [], E = mn(this._injector, f);
+    const o = new we(), u = i.map((f) => this._getFormulaDependcy(a, e, f, n)), m = (f) => {
+      const s = n[0].startRow, d = n[0].startColumn, T = [{ unitId: a, subUnitId: e, ranges: n }, ...u.flat()], P = [], E = cn(this._injector, f);
       for (const { unitId: I, subUnitId: S, ranges: c } of T)
         if (I === E.unitId && S === E.subUnitId) {
-          const N = [], R = c[0].startRow, d = c[0].startColumn, O = R - s, M = d - p;
+          const N = [], R = c[0].startRow, p = c[0].startColumn, O = R - s, M = p - d;
           for (const F of E.ranges) {
-            const U = c.map((g) => Ve(F, g)).filter(Boolean);
+            const U = c.map((g) => Ge(F, g)).filter(Boolean);
             U.length > 0 && N.push(...U);
           }
           N.length > 0 && P.push(
@@ -15363,35 +15377,35 @@ let Dt = class extends te {
           );
         }
       if (P.length > 0) {
-        const I = De.splitIntoGrid([...P.flat()]), S = De.subtractMulti(n, I);
+        const I = be.splitIntoGrid([...P.flat()]), S = be.subtractMulti(n, I);
         S.sort((O, M) => O.startRow - M.startRow || O.startColumn - M.startColumn);
         const c = /* @__PURE__ */ new Map();
         for (let O = 0; O < I.length; O++) {
-          const M = I[O], F = M.startRow, U = M.startColumn, g = F - s, x = U - p, h = fn(M, f).sort((k, re) => k.startRow - re.startRow || k.startColumn - re.startColumn);
+          const M = I[O], F = M.startRow, U = M.startColumn, g = F - s, x = U - d, h = ln(M, f).sort((k, oe) => k.startRow - oe.startRow || k.startColumn - oe.startColumn);
           if (!h.length)
             continue;
-          const V = h[0].startRow, Q = h[0].startColumn, b = V - s, Le = Q - p, ae = [];
+          const V = h[0].startRow, Q = h[0].startColumn, b = V - s, Le = Q - d, ae = [];
           for (let k = 0; k < i.length; k++) {
-            const re = i[k], z = be(re), ye = z ? this._lexerTreeBuilder.moveFormulaRefOffset(re, x, g) : re, oe = z ? this.transformFormulaByEffectCommand(a, e, ye, f) : ye, Pe = oa(this._lexerTreeBuilder, oe, -Le, -b);
+            const oe = i[k], z = Oe(oe), qe = z ? this._lexerTreeBuilder.moveFormulaRefOffset(oe, x, g) : oe, ue = z ? this.transformFormulaByEffectCommand(a, e, qe, f) : qe, Pe = ma(this._lexerTreeBuilder, ue, -Le, -b);
             ae.push({
-              newFormula: oe,
+              newFormula: ue,
               orginFormula: Pe
             });
           }
-          const ie = {
+          const re = {
             formulas: ae,
             ranges: h,
             key: ae.map((k) => k.orginFormula).join("_")
           };
-          c.has(ie.key) ? c.get(ie.key).push(ie) : c.set(ie.key, [ie]);
+          c.has(re.key) ? c.get(re.key).push(re) : c.set(re.key, [re]);
         }
-        const N = i.map((O) => oa(this._lexerTreeBuilder, O, 0, 0)).join("_");
+        const N = i.map((O) => ma(this._lexerTreeBuilder, O, 0, 0)).join("_");
         if (S.length > 0) {
           const O = S[0].startRow, M = S[0].startColumn, F = [];
           for (let g = 0; g < i.length; g++) {
             const x = i[g];
             F.push({
-              newFormula: be(x) ? this._lexerTreeBuilder.moveFormulaRefOffset(x, M - p, O - s) : x,
+              newFormula: Oe(x) ? this._lexerTreeBuilder.moveFormulaRefOffset(x, M - d, O - s) : x,
               orginFormula: x
             });
           }
@@ -15402,12 +15416,12 @@ let Dt = class extends te {
           };
           c.has(U.key) ? c.get(U.key).push(U) : c.set(U.key, [U]);
         }
-        const R = [], d = Array.from(c.keys());
-        for (let O = d.length - 1; O >= 0; O--) {
-          const M = d[O], F = c.get(M).sort((x, h) => x.ranges[0].startRow - h.ranges[0].startRow || x.ranges[0].startColumn - h.ranges[0].startColumn), U = [];
+        const R = [], p = Array.from(c.keys());
+        for (let O = p.length - 1; O >= 0; O--) {
+          const M = p[O], F = c.get(M).sort((x, h) => x.ranges[0].startRow - h.ranges[0].startRow || x.ranges[0].startColumn - h.ranges[0].startColumn), U = [];
           for (let x = 0; x < F[0].formulas.length; x++)
             U.push(F[0].formulas[x].newFormula);
-          const g = De.mergeRanges(F.map((x) => x.ranges).flat());
+          const g = be.mergeRanges(F.map((x) => x.ranges).flat());
           g.sort((x, h) => x.startRow - h.startRow || x.startColumn - h.startColumn), R.push({
             formulas: U,
             ranges: g
@@ -15423,59 +15437,59 @@ let Dt = class extends te {
     return n.forEach((f) => {
       const s = this._refRangeService.registerRefRange(f, m, a, e);
       o.add(s);
-    }), [...u.flat()].forEach(({ unitId: f, subUnitId: s, ranges: p }) => {
-      p.forEach((T) => {
+    }), [...u.flat()].forEach(({ unitId: f, subUnitId: s, ranges: d }) => {
+      d.forEach((T) => {
         const P = this._refRangeService.registerRefRange(T, m, f, s);
         o.add(P);
       });
     }), o;
   }
 };
-Dt = or([
-  Fe(0, X(un)),
-  Fe(1, X(qt)),
-  Fe(2, xe),
-  Fe(3, X(at))
+Dt = mr([
+  Be(0, Y(fn)),
+  Be(1, Y(qt)),
+  Be(2, _e),
+  Be(3, Y(at))
 ], Dt);
-var ur = Object.getOwnPropertyDescriptor, mr = (a, e, n, i) => {
-  for (var r = i > 1 ? void 0 : i ? ur(e, n) : e, o = a.length - 1, u; o >= 0; o--)
+var fr = Object.getOwnPropertyDescriptor, cr = (a, e, n, i) => {
+  for (var r = i > 1 ? void 0 : i ? fr(e, n) : e, o = a.length - 1, u; o >= 0; o--)
     (u = a[o]) && (r = u(r) || r);
   return r;
-}, fr = (a, e) => (n, i) => e(n, i, a);
-const Ft = "sheets-formula.remote-register-function.service", Ba = Mt(Ft);
+}, lr = (a, e) => (n, i) => e(n, i, a);
+const Ft = "sheets-formula.remote-register-function.service", Va = Mt(Ft);
 let Qe = class {
   constructor(a) {
     this._functionService = a;
   }
   async registerFunctions(a) {
-    const e = a.map(([n, i]) => cr(n, i));
+    const e = a.map(([n, i]) => sr(n, i));
     this._functionService.registerExecutors(...e);
   }
   async registerAsyncFunctions(a) {
-    const e = a.map(([n, i]) => lr(n, i));
+    const e = a.map(([n, i]) => dr(n, i));
     this._functionService.registerExecutors(...e);
   }
   async unregisterFunctions(a) {
-    this._functionService.unregisterDescriptions(...a);
+    this._functionService.unregisterExecutors(...a), this._functionService.unregisterDescriptions(...a), this._functionService.deleteFormulaAstCacheKey(...a);
   }
 };
-Qe = mr([
-  fr(0, ht)
+Qe = cr([
+  lr(0, ht)
 ], Qe);
-function cr(a, e) {
+function sr(a, e) {
   const n = new At(e), i = new Function(`return ${a}`)();
   return n.calculateCustom = i, n;
 }
-function lr(a, e) {
-  const n = new Ma(e), i = new Function(`return ${a}`)();
+function dr(a, e) {
+  const n = new _a(e), i = new Function(`return ${a}`)();
   return n.calculateCustom = i, n;
 }
-var sr = Object.getOwnPropertyDescriptor, pr = (a, e, n, i) => {
-  for (var r = i > 1 ? void 0 : i ? sr(e, n) : e, o = a.length - 1, u; o >= 0; o--)
+var pr = Object.getOwnPropertyDescriptor, Lr = (a, e, n, i) => {
+  for (var r = i > 1 ? void 0 : i ? pr(e, n) : e, o = a.length - 1, u; o >= 0; o--)
     (u = a[o]) && (r = u(r) || r);
   return r;
-}, Be = (a, e) => (n, i) => e(n, i, a);
-const dr = Mt(
+}, ve = (a, e) => (n, i) => e(n, i, a);
+const Pr = Mt(
   "sheets-formula.register-function-service"
 );
 let bt = class extends te {
@@ -15491,7 +15505,7 @@ let bt = class extends te {
   registerFunctions(a) {
     const { locales: e, description: n, calculate: i } = a;
     e && this._localeService.load(e);
-    const r = new Ye();
+    const r = new we();
     if (n)
       r.add(this._descriptionService.registerDescriptions(n));
     else {
@@ -15507,7 +15521,7 @@ let bt = class extends te {
     return r.add(this._registerLocalExecutors(i)), this._remoteRegisterFunctionService && r.add(this._registerRemoteExecutors(i)), r;
   }
   _registerSingleFunction(a) {
-    const { name: e, func: n, description: i, locales: r, async: o = !1 } = a, u = new Ye();
+    const { name: e, func: n, description: i, locales: r, async: o = !1 } = a, u = new we();
     if (r && this._localeService.load(r), typeof i == "string") {
       const f = {
         functionName: e,
@@ -15519,9 +15533,9 @@ let bt = class extends te {
       u.add(this._descriptionService.registerDescriptions([f]));
     } else
       u.add(this._descriptionService.registerDescriptions([i]));
-    const m = o ? new Ma(e) : new At(e);
-    return m.calculateCustom = n, this._functionService.registerExecutors(m), u.add(le(() => this._functionService.unregisterExecutors(e))), this._remoteRegisterFunctionService && (this._remoteRegisterFunctionService.registerAsyncFunctions([[n.toString(), e]]), u.add(
-      le(() => this._remoteRegisterFunctionService.unregisterFunctions([e]))
+    const m = o ? new _a(e) : new At(e);
+    return m.calculateCustom = n, this._functionService.registerExecutors(m), u.add(ne(() => this._functionService.unregisterExecutors(e))), u.add(ne(() => this._functionService.unregisterDescriptions(e))), u.add(ne(() => this._functionService.deleteFormulaAstCacheKey(e))), this._remoteRegisterFunctionService && (this._remoteRegisterFunctionService.registerAsyncFunctions([[n.toString(), e]]), u.add(
+      ne(() => this._remoteRegisterFunctionService.unregisterFunctions([e]))
     )), u;
   }
   _registerLocalExecutors(a) {
@@ -15529,22 +15543,22 @@ let bt = class extends te {
       const o = new At(r);
       return o.calculateCustom = i, o;
     });
-    return this._functionService.registerExecutors(...n), le(() => this._functionService.unregisterExecutors(...e));
+    return this._functionService.registerExecutors(...n), ne(() => this._functionService.unregisterExecutors(...e));
   }
   _registerRemoteExecutors(a) {
     const e = [], n = a.map(([i, r]) => (e.push(r), [i.toString(), r]));
-    return this._remoteRegisterFunctionService.registerFunctions(n), le(() => this._remoteRegisterFunctionService.unregisterFunctions(e));
+    return this._remoteRegisterFunctionService.registerFunctions(n), ne(() => this._remoteRegisterFunctionService.unregisterFunctions(e));
   }
 };
-bt = pr([
-  Be(0, X(Ot)),
-  Be(1, X(Ut)),
-  Be(2, ht),
-  Be(3, Xa(Ba))
+bt = Lr([
+  ve(0, Y(Ot)),
+  ve(1, Y(Ut)),
+  ve(2, ht),
+  ve(3, Wa(Va))
 ], bt);
-const Lr = "SHEETS_FORMULA_PLUGIN";
-var Pr = Object.getOwnPropertyDescriptor, Tr = (a, e, n, i) => {
-  for (var r = i > 1 ? void 0 : i ? Pr(e, n) : e, o = a.length - 1, u; o >= 0; o--)
+const Tr = "SHEETS_FORMULA_PLUGIN";
+var Er = Object.getOwnPropertyDescriptor, Ir = (a, e, n, i) => {
+  for (var r = i > 1 ? void 0 : i ? Er(e, n) : e, o = a.length - 1, u; o >= 0; o--)
     (u = a[o]) && (r = u(r) || r);
   return r;
 }, Pt = (a, e) => (n, i) => e(n, i, a);
@@ -15556,15 +15570,15 @@ let $e = class extends te {
     this._initialConversion();
   }
   _initialConversion() {
-    this._activeDirtyManagerService.register(ne.id, {
-      commandId: ne.id,
+    this._activeDirtyManagerService.register(ie.id, {
+      commandId: ie.id,
       getDirtyData: (a) => {
         const e = a.params;
         return e.trigger === _t.id ? {} : {
           dirtyRanges: this._getSetRangeValuesMutationDirtyRange(e)
         };
       }
-    }), this._initialMove(), this._initialRowAndColumn(), this._initialSheet(), this._initialDefinedName();
+    }), this._initialMove(), this._initialRowAndColumn(), this._initialHideRow(), this._initialSheet(), this._initialDefinedName();
   }
   _initialMove() {
     this._activeDirtyManagerService.register(Gt.id, {
@@ -15594,8 +15608,8 @@ let $e = class extends te {
           }
         };
       }
-    }), this._activeDirtyManagerService.register(Yt.id, {
-      commandId: Yt.id,
+    }), this._activeDirtyManagerService.register(wt.id, {
+      commandId: wt.id,
       getDirtyData: (a) => {
         const e = a.params;
         return {
@@ -15607,8 +15621,8 @@ let $e = class extends te {
           }
         };
       }
-    }), this._activeDirtyManagerService.register(Xt.id, {
-      commandId: Xt.id,
+    }), this._activeDirtyManagerService.register(Yt.id, {
+      commandId: Yt.id,
       getDirtyData: (a) => {
         const e = a.params;
         return {
@@ -15623,8 +15637,8 @@ let $e = class extends te {
     });
   }
   _initialRowAndColumn() {
-    this._activeDirtyManagerService.register(wt.id, {
-      commandId: wt.id,
+    this._activeDirtyManagerService.register(Xt.id, {
+      commandId: Xt.id,
       getDirtyData: (a) => {
         const e = a.params;
         return {
@@ -15675,6 +15689,35 @@ let $e = class extends te {
       }
     });
   }
+  _initialHideRow() {
+    this._activeDirtyManagerService.register(Qt.id, {
+      commandId: Qt.id,
+      getDirtyData: (a) => {
+        const e = a.params;
+        return {
+          dirtyRanges: this._getHideRowMutation(e),
+          clearDependencyTreeCache: {
+            [e.unitId]: {
+              [e.subUnitId]: "1"
+            }
+          }
+        };
+      }
+    }), this._activeDirtyManagerService.register($t.id, {
+      commandId: $t.id,
+      getDirtyData: (a) => {
+        const e = a.params;
+        return {
+          dirtyRanges: this._getHideRowMutation(e),
+          clearDependencyTreeCache: {
+            [e.unitId]: {
+              [e.subUnitId]: "1"
+            }
+          }
+        };
+      }
+    });
+  }
   _initialSheet() {
     this._activeDirtyManagerService.register(It.id, {
       commandId: It.id,
@@ -15700,8 +15743,8 @@ let $e = class extends te {
     });
   }
   _initialDefinedName() {
-    this._activeDirtyManagerService.register(Me.id, {
-      commandId: Me.id,
+    this._activeDirtyManagerService.register(xe.id, {
+      commandId: xe.id,
       getDirtyData: (a) => {
         const e = a.params;
         return { dirtyDefinedNameMap: this._getDefinedNameMutation(e) };
@@ -15736,22 +15779,29 @@ let $e = class extends te {
   }
   _getRemoveRowOrColumnMutation(a, e = !0) {
     const { subUnitId: n, unitId: i, range: r } = a, o = [], u = this._univerInstanceService.getUniverSheetInstance(i), m = u == null ? void 0 : u.getSheetBySheetId(n), f = (m == null ? void 0 : m.getRowCount()) || 0, s = (m == null ? void 0 : m.getColumnCount()) || 0;
-    let p = null;
+    let d = null;
     const { startRow: T, endRow: P, startColumn: E, endColumn: I } = r;
-    e === !0 ? p = this._rangeToMatrix({
+    e === !0 ? d = this._rangeToMatrix({
       startRow: T,
       startColumn: 0,
       endRow: P,
       endColumn: s - 1
-    }) : p = this._rangeToMatrix({
+    }) : d = this._rangeToMatrix({
       startRow: 0,
       startColumn: E,
       endRow: f,
       endColumn: I
     });
-    const S = p.getData();
+    const S = d.getData();
     return o.push(...this._getDirtyRangesByCellValue(i, n, S)), o.push(...this._getDirtyRangesForArrayFormula(i, n, S)), o;
   }
+  _getHideRowMutation(a) {
+    const { subUnitId: e, unitId: n, ranges: i } = a, r = [];
+    return i.forEach((o) => {
+      const u = this._rangeToMatrix(o).getMatrix();
+      r.push(...this._getDirtyRangesByCellValue(n, e, u));
+    }), r;
+  }
   _getRemoveSheetMutation(a) {
     const e = {}, { subUnitId: n, unitId: i, subUnitName: r } = a;
     return e[i] == null && (e[i] = {}), e[i][n] = r, e;
@@ -15785,12 +15835,12 @@ let $e = class extends te {
     const r = new W(n), o = this._formulaDataModel.getArrayFormulaRange();
     if ((u = o == null ? void 0 : o[a]) != null && u[e]) {
       const f = new W((m = o == null ? void 0 : o[a]) == null ? void 0 : m[e]);
-      r.forValue((s, p) => {
+      r.forValue((s, d) => {
         f.forValue((T, P, E) => {
           if (E == null)
             return !0;
           const { startRow: I, startColumn: S, endRow: c, endColumn: N } = E;
-          s >= I && s <= c && p >= S && p <= N && i.push({
+          s >= I && s <= c && d >= S && d <= N && i.push({
             unitId: a,
             sheetId: e,
             range: {
@@ -15806,13 +15856,13 @@ let $e = class extends te {
     return i;
   }
 };
-$e = Tr([
+$e = Ir([
   Pt(0, gt),
-  Pt(1, xe),
-  Pt(2, X(it))
+  Pt(1, _e),
+  Pt(2, Y(it))
 ], $e);
-var Er = Object.getOwnPropertyDescriptor, Ir = (a, e, n, i) => {
-  for (var r = i > 1 ? void 0 : i ? Er(e, n) : e, o = a.length - 1, u; o >= 0; o--)
+var Nr = Object.getOwnPropertyDescriptor, Rr = (a, e, n, i) => {
+  for (var r = i > 1 ? void 0 : i ? Nr(e, n) : e, o = a.length - 1, u; o >= 0; o--)
     (u = a[o]) && (r = u(r) || r);
   return r;
 }, Tt = (a, e) => (n, i) => e(n, i, a);
@@ -15838,20 +15888,20 @@ let je = class extends te {
   }
   _initInterceptorCellContent() {
     this.disposeWithMe(
-      this._sheetInterceptorService.intercept(cn.CELL_CONTENT, {
+      this._sheetInterceptorService.intercept(sn.CELL_CONTENT, {
         priority: 100,
-        effect: wa.Value,
+        effect: Ka.Value,
         handler: (a, e, n) => {
-          var s, p, T;
-          const { unitId: i, subUnitId: r, row: o, col: u } = e, m = this._formulaDataModel.getArrayFormulaCellData(), f = (T = (p = (s = m == null ? void 0 : m[i]) == null ? void 0 : s[r]) == null ? void 0 : p[o]) == null ? void 0 : T[u];
+          var s, d, T;
+          const { unitId: i, subUnitId: r, row: o, col: u } = e, m = this._formulaDataModel.getArrayFormulaCellData(), f = (T = (d = (s = m == null ? void 0 : m[i]) == null ? void 0 : s[r]) == null ? void 0 : d[o]) == null ? void 0 : T[u];
           return f == null ? n(a) : f.v == null && f.t == null ? n({
             ...a,
             v: 0,
             // Default value for empty cell
             t: Bt.NUMBER
-          }) : (a == null ? void 0 : a.t) === Bt.NUMBER && a.v !== void 0 && a.v !== null && Wa(a.v) ? n({
+          }) : (a == null ? void 0 : a.t) === Bt.NUMBER && a.v !== void 0 && a.v !== null && ka(a.v) ? n({
             ...a,
-            v: Gn(Number(a.v))
+            v: wn(Number(a.v))
           }) : n({
             ...a,
             v: f.v,
@@ -15862,34 +15912,34 @@ let je = class extends te {
     );
   }
 };
-je = Ir([
-  Tt(0, de),
-  Tt(1, X(xt)),
-  Tt(2, X(it))
+je = Rr([
+  Tt(0, pe),
+  Tt(1, Y(xt)),
+  Tt(2, Y(it))
 ], je);
-var Nr = Object.getOwnPropertyDescriptor, Rr = (a, e, n, i) => {
-  for (var r = i > 1 ? void 0 : i ? Nr(e, n) : e, o = a.length - 1, u; o >= 0; o--)
+var Ar = Object.getOwnPropertyDescriptor, Sr = (a, e, n, i) => {
+  for (var r = i > 1 ? void 0 : i ? Ar(e, n) : e, o = a.length - 1, u; o >= 0; o--)
     (u = a[o]) && (r = u(r) || r);
   return r;
-}, ve = (a, e) => (n, i) => e(n, i, a);
+}, Ve = (a, e) => (n, i) => e(n, i, a);
 let ze = class extends te {
   constructor(e, n, i, r) {
     super();
-    w(this, "_preUnitId", null);
+    X(this, "_preUnitId", null);
     this._descriptionService = e, this._definedNamesService = n, this._univerInstanceService = i, this._commandService = r, this._initialize();
   }
   _initialize() {
     this._descriptionListener(), this._changeUnitListener(), this._changeSheetListener();
   }
   _descriptionListener() {
-    le(
+    ne(
       this._definedNamesService.update$.subscribe(() => {
         this._registerDescriptions();
       })
     );
   }
   _changeUnitListener() {
-    le(
+    ne(
       this._univerInstanceService.getCurrentTypeOfUnit$(ee.UNIVER_SHEET).subscribe(() => {
         this._unRegisterDescriptions(), this._registerDescriptions();
       })
@@ -15899,9 +15949,9 @@ let ze = class extends te {
     this.disposeWithMe(
       this._commandService.onCommandExecuted((e, n) => {
         if (!(n != null && n.fromCollab)) {
-          if (e.id === ln.id)
+          if (e.id === dn.id)
             this._unregisterDescriptionsForNotInSheetId(), this._registerDescriptions();
-          else if (e.id === Me.id) {
+          else if (e.id === xe.id) {
             const i = e.params;
             this._registerDescription(i);
           } else if (e.id === St.id) {
@@ -15984,132 +16034,132 @@ let ze = class extends te {
     }), this._descriptionService.unregisterDescriptions(r);
   }
 };
-ze = Rr([
-  ve(0, Ut),
-  ve(1, yt),
-  ve(2, xe),
-  ve(3, de)
+ze = Sr([
+  Ve(0, Ut),
+  Ve(1, yt),
+  Ve(2, _e),
+  Ve(3, pe)
 ], ze);
-var Ar = Object.getOwnPropertyDescriptor, Sr = (a, e, n, i) => {
-  for (var r = i > 1 ? void 0 : i ? Ar(e, n) : e, o = a.length - 1, u; o >= 0; o--)
+var Cr = Object.getOwnPropertyDescriptor, Dr = (a, e, n, i) => {
+  for (var r = i > 1 ? void 0 : i ? Cr(e, n) : e, o = a.length - 1, u; o >= 0; o--)
     (u = a[o]) && (r = u(r) || r);
   return r;
-}, Cr = (a, e) => (n, i) => e(n, i, a);
+}, br = (a, e) => (n, i) => e(n, i, a);
 let Ze = class extends te {
   constructor(a) {
     super(), this._commandService = a, [
-      Wn,
-      Ge
+      kn,
+      De
     ].forEach((e) => this._commandService.registerCommand(e));
   }
 };
-Ze = Sr([
-  Cr(0, de)
+Ze = Dr([
+  br(0, pe)
 ], Ze);
-var Dr = Object.defineProperty, br = Object.getOwnPropertyDescriptor, Or = (a, e, n) => e in a ? Dr(a, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : a[e] = n, va = (a, e, n, i) => {
-  for (var r = i > 1 ? void 0 : i ? br(e, n) : e, o = a.length - 1, u; o >= 0; o--)
+var Or = Object.defineProperty, Mr = Object.getOwnPropertyDescriptor, xr = (a, e, n) => e in a ? Or(a, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : a[e] = n, Ga = (a, e, n, i) => {
+  for (var r = i > 1 ? void 0 : i ? Mr(e, n) : e, o = a.length - 1, u; o >= 0; o--)
     (u = a[o]) && (r = u(r) || r);
   return r;
-}, Je = (a, e) => (n, i) => e(n, i, a), ut = (a, e, n) => Or(a, typeof e != "symbol" ? e + "" : e, n);
-let et = class extends la {
-  constructor(a = ia, e, n) {
+}, Je = (a, e) => (n, i) => e(n, i, a), ut = (a, e, n) => xr(a, typeof e != "symbol" ? e + "" : e, n);
+let et = class extends da {
+  constructor(a = oa, e, n) {
     super(), this._config = a, this._injector = e, this._configService = n;
-    const { ...i } = sa(
+    const { ...i } = pa(
       {},
-      ia,
+      oa,
       this._config
     );
-    this._configService.setConfig(Ui, i);
+    this._configService.setConfig(Bi, i);
   }
   onStarting() {
-    this._injector.add([Qe]), this._injector.get(ya).registerChannel(
+    this._injector.add([Qe]), this._injector.get(ga).registerChannel(
       Ft,
-      Xn(this._injector.get(Qe))
+      Wn(this._injector.get(Qe))
     );
   }
 };
 ut(et, "pluginName", "SHEET_FORMULA_REMOTE_PLUGIN");
 ut(et, "type", ee.UNIVER_SHEET);
-et = va([
-  ca(xa),
-  Je(1, X(at)),
-  Je(2, _e)
+et = Ga([
+  sa(ya),
+  Je(1, Y(at)),
+  Je(2, ye)
 ], et);
-let tt = class extends la {
-  constructor(a = na, e, n) {
+let tt = class extends da {
+  constructor(a = ra, e, n) {
     super(), this._config = a, this._injector = e, this._configService = n;
-    const { ...i } = sa(
+    const { ...i } = pa(
       {},
-      na,
+      ra,
       this._config
     );
     this._configService.setConfig(ot, i, { merge: !0 });
   }
   onStarting() {
     const a = this._injector, e = [
-      [dr, { useClass: bt }],
+      [Pr, { useClass: bt }],
       [Ut, { useClass: Ct }],
       [Ze],
       [Dt],
       [Ke],
       [je],
-      [Oe],
+      [Me],
       [ke],
       [$e],
       [ze],
       [We]
     ];
     if (this._config.notExecuteFormula) {
-      const n = a.get(ya);
-      e.push([Ba, {
-        useFactory: () => wn(n.requestChannel(Ft))
+      const n = a.get(ga);
+      e.push([Va, {
+        useFactory: () => Kn(n.requestChannel(Ft))
       }]);
     }
     e.forEach((n) => a.add(n));
   }
   onReady() {
-    qe(this._injector, [
+    ge(this._injector, [
       [Ze],
       [$e],
       [je],
       [ke],
       [We]
-    ]), vt() && qe(this._injector, [
-      [Oe]
+    ]), vt() && ge(this._injector, [
+      [Me]
     ]);
   }
   onRendered() {
-    qe(this._injector, [
+    ge(this._injector, [
       [ze]
-    ]), vt() || qe(this._injector, [
-      [Oe]
+    ]), vt() || ge(this._injector, [
+      [Me]
     ]);
   }
 };
-ut(tt, "pluginName", Lr);
+ut(tt, "pluginName", Tr);
 ut(tt, "type", ee.UNIVER_SHEET);
-tt = va([
-  ca(xa, sn),
-  Je(1, X(at)),
-  Je(2, _e)
+tt = Ga([
+  sa(ya, pn),
+  Je(1, Y(at)),
+  Je(2, ye)
 ], tt);
 export {
-  pe as CalculationMode,
+  de as CalculationMode,
   Ct as DescriptionService,
   Dt as FormulaRefRangeService,
   Ut as IDescriptionService,
-  dr as IRegisterFunctionService,
-  Ba as IRemoteRegisterFunctionService,
-  Wn as InsertFunctionCommand,
-  Ge as OtherFormulaMarkDirty,
+  Pr as IRegisterFunctionService,
+  Va as IRemoteRegisterFunctionService,
+  kn as InsertFunctionCommand,
+  De as OtherFormulaMarkDirty,
   ot as PLUGIN_CONFIG_KEY_BASE,
   bt as RegisterFunctionService,
   Ke as RegisterOtherFormulaService,
   Qe as RemoteRegisterFunctionService,
-  Oe as TriggerCalculationController,
+  Me as TriggerCalculationController,
   et as UniverRemoteSheetsFormulaPlugin,
   tt as UniverSheetsFormulaPlugin,
   We as UpdateDefinedNameController,
   ke as UpdateFormulaController,
-  hr as calculateFormula
+  Fr as calculateFormula
 };