@univerjs/sheets-formula 0.5.2 → 0.5.3

package/lib/es/index.js

@@ -1,18 +1,18 @@
-var Ga = Object.defineProperty;
-var Ha = (n, e, a) => e in n ? Ga(n, e, { enumerable: !0, configurable: !0, writable: !0, value: a }) : n[e] = a;
-var w = (n, e, a) => Ha(n, typeof e != "symbol" ? e + "" : e, a);
-import { CommandType as ua, ICommandService as pe, ObjectMatrix as X, Tools as Ie, Rectangle as Ce, cellToRange as ma, Direction as He, isFormulaString as De, isFormulaId as fa, getIntersectRange as Ve, RANGE_TYPE as Y, Inject as W, Disposable as te, UniverInstanceType as ee, IUniverInstanceService as xe, LifecycleService as Ya, LocaleService as bt, ILogService as Xa, IConfigService as _e, Injector as tt, createIdentifier as Ot, toDisposable as Oe, moveRangeByOffset as Tt, DisposableCollection as Et, AbsoluteRefType as Ye, Optional as wa, Dimension as Ft, InterceptorEffectEnum as Wa, CellValueType as Bt, DependentOn as ca, Plugin as la, merge as sa, touchDependencies as ye, isNodeEnv as vt } from "@univerjs/core";
-import { SetRangeValuesCommand as Ka, SetRangeValuesMutation as ie, handleMoveRange as pa, EffectRefRangId as G, runRefRangeMutations as H, handleMoveRows as da, handleMoveCols as La, handleInsertRow as Pa, handleInsertCol as Ta, handleIRemoveRow as Ea, handleIRemoveCol as Ia, handleDeleteRangeMoveLeft as Na, handleDeleteRangeMoveUp as Ra, handleInsertRangeMoveDown as Aa, handleInsertRangeMoveRight as Sa, RemoveDefinedNameCommand as Ca, SetDefinedNameCommand as Da, RemoveSheetCommand as Qa, SetWorksheetNameCommand as ka, 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 Mt, SetStyleCommand as xt, 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 Qt, INTERCEPTOR_POINT as cn, SetWorksheetActiveOperation as ln, SCOPE_WORKBOOK_VALUE_DEFINED_NAME as ut, UniverSheetsPlugin as sn } from "@univerjs/sheets";
-import { sequenceNodeType as J, deserializeRangeWithSheetWithCache as se, serializeRangeToRefString as at, ErrorType as j, LexerTreeBuilder as _t, generateStringWithSequence as Xe, SetDefinedNameMutation as Me, IDefinedNamesService as qt, SetFormulaCalculationResultMutation as pn, RemoveOtherFormulaMutation as dn, IActiveDirtyManagerService as yt, SetOtherFormulaMutation as Ln, FormulaDataModel as nt, SetFormulaCalculationStartMutation as Ae, SetFormulaCalculationStopMutation as kt, ENGINE_FORMULA_CYCLE_REFERENCE_COUNT as $t, SetFormulaCalculationNotificationMutation as Pn, FormulaExecuteStageType as ge, FormulaExecutedStateType as Ne, SetFormulaDataMutation as he, SetArrayFormulaDataMutation as Rt, initSheetFormulaData as jt, FUNCTION_NAMES_ARRAY as zt, FunctionType as t, FUNCTION_NAMES_COMPATIBILITY as _, FUNCTION_NAMES_CUBE as ce, FUNCTION_NAMES_DATABASE as $, FUNCTION_NAMES_DATE as B, FUNCTION_NAMES_ENGINEERING as A, FUNCTION_NAMES_FINANCIAL as C, FUNCTION_NAMES_INFORMATION as v, FUNCTION_NAMES_LOGICAL as K, FUNCTION_NAMES_LOOKUP as q, FUNCTION_NAMES_MATH as T, FUNCTION_NAMES_STATISTICAL as l, FUNCTION_NAMES_TEXT as D, FUNCTION_NAMES_WEB as mt, isReferenceStrings as Tn, functionArray as En, functionCompatibility as In, functionCube as Nn, functionDatabase as Rn, functionDate as An, functionEngineering as Sn, functionFinancial as Cn, functionInformation as Dn, functionLogical as bn, functionLookup as On, functionMath as Mn, functionMeta as xn, functionStatistical as _n, functionText as qn, functionUniver as yn, functionWeb as gn, IFunctionService as gt, serializeRangeWithSpreadsheet as Zt, serializeRangeWithSheet as Jt, serializeRange as ea, CustomFunction as Ma, RemoveDefinedNameMutation as At, stripErrorMargin as hn, UniverFormulaEnginePlugin as xa } from "@univerjs/engine-formula";
-import { Subject as ta, BehaviorSubject as _a, bufferWhen as Un, filter as aa, map as Fn } from "rxjs";
-import { IRPCChannelService as qa, fromModule as Bn, toModule as vn } from "@univerjs/rpc";
-const Vn = {
+var Ha = Object.defineProperty;
+var Ya = (n, e, a) => e in n ? Ha(n, e, { enumerable: !0, configurable: !0, writable: !0, value: a }) : n[e] = a;
+var X = (n, e, a) => Ya(n, typeof e != "symbol" ? e + "" : e, a);
+import { CommandType as ma, ICommandService as de, ObjectMatrix as w, Tools as Ne, Rectangle as De, cellToRange as fa, Direction as He, isFormulaString as be, isFormulaId as ca, getIntersectRange as Ve, RANGE_TYPE as Y, Inject as W, Disposable as te, UniverInstanceType as ee, IUniverInstanceService as xe, LifecycleService as wa, LocaleService as Ot, ILogService as Xa, IConfigService as _e, Injector as at, createIdentifier as Mt, toDisposable as se, moveRangeByOffset as Et, DisposableCollection as Ye, AbsoluteRefType as we, Optional as Wa, Dimension as Bt, InterceptorEffectEnum as Ka, CellValueType as vt, DependentOn as la, Plugin as sa, merge as pa, touchDependencies as qe, isNodeEnv as Vt } from "@univerjs/core";
+import { SetRangeValuesCommand as Qa, SetRangeValuesMutation as ie, handleMoveRange as da, EffectRefRangId as G, runRefRangeMutations as H, handleMoveRows as La, handleMoveCols as Pa, handleInsertRow as Ta, handleInsertCol as Ea, handleIRemoveRow as Ia, handleIRemoveCol as Na, handleDeleteRangeMoveLeft as Ra, handleDeleteRangeMoveUp as Aa, handleInsertRangeMoveDown as Sa, handleInsertRangeMoveRight as Ca, RemoveDefinedNameCommand as Da, SetDefinedNameCommand as ba, RemoveSheetCommand as ka, SetWorksheetNameCommand as $a, DeleteRangeMoveLeftCommand as ja, DeleteRangeMoveUpCommand as za, RemoveColCommand as Za, RemoveRowCommand as Ja, InsertRangeMoveDownCommand as en, InsertRangeMoveRightCommand as tn, InsertColCommand as an, InsertRowCommand as nn, MoveColsCommand as rn, MoveRowsCommand as on, MoveRangeCommand as un, SheetInterceptorService as xt, SetStyleCommand as _t, SetBorderCommand as Oa, ClearSelectionFormatCommand as Ma, RemoveSheetMutation as It, InsertSheetMutation as Nt, RefRangeService as mn, handleDefaultRangeChangeWithEffectRefCommands as Gt, getSeparateEffectedRangesOnCommand as fn, handleCommonDefaultRangeChangeWithEffectRefCommands as cn, MoveRangeMutation as Ht, MoveRowsMutation as Yt, MoveColsMutation as wt, ReorderRangeMutation as Xt, RemoveRowMutation as Wt, RemoveColMutation as Kt, InsertColMutation as Qt, InsertRowMutation as kt, INTERCEPTOR_POINT as ln, SetWorksheetActiveOperation as sn, SCOPE_WORKBOOK_VALUE_DEFINED_NAME as mt, UniverSheetsPlugin as pn } from "@univerjs/sheets";
+import { sequenceNodeType as J, deserializeRangeWithSheetWithCache as pe, serializeRangeToRefString as nt, ErrorType as j, LexerTreeBuilder as yt, generateStringWithSequence as Xe, SetDefinedNameMutation as Me, IDefinedNamesService as qt, SetFormulaCalculationResultMutation as dn, RemoveOtherFormulaMutation as Ln, IActiveDirtyManagerService as gt, SetOtherFormulaMutation as Pn, FormulaDataModel as it, SetFormulaCalculationStartMutation as Se, SetFormulaCalculationStopMutation as $t, ENGINE_FORMULA_CYCLE_REFERENCE_COUNT as jt, SetFormulaCalculationNotificationMutation as Tn, FormulaExecuteStageType as ge, FormulaExecutedStateType as Re, SetFormulaDataMutation as he, SetArrayFormulaDataMutation as Rt, initSheetFormulaData as zt, FUNCTION_NAMES_ARRAY as Zt, FunctionType as t, FUNCTION_NAMES_COMPATIBILITY as _, FUNCTION_NAMES_CUBE as ce, FUNCTION_NAMES_DATABASE as $, FUNCTION_NAMES_DATE as B, FUNCTION_NAMES_ENGINEERING as A, FUNCTION_NAMES_FINANCIAL as C, FUNCTION_NAMES_INFORMATION as v, FUNCTION_NAMES_LOGICAL as K, FUNCTION_NAMES_LOOKUP as y, FUNCTION_NAMES_MATH as T, FUNCTION_NAMES_STATISTICAL as l, FUNCTION_NAMES_TEXT as D, FUNCTION_NAMES_WEB as ft, isReferenceStrings as En, functionArray as In, functionCompatibility as Nn, functionCube as Rn, functionDatabase as An, functionDate as Sn, functionEngineering as Cn, functionFinancial as Dn, functionInformation as bn, functionLogical as On, functionLookup as Mn, functionMath as xn, functionMeta as _n, functionStatistical as yn, functionText as qn, functionUniver as gn, functionWeb as hn, IFunctionService as ht, serializeRangeWithSpreadsheet as Jt, serializeRangeWithSheet as ea, serializeRange as ta, CustomFunction as At, AsyncCustomFunction as xa, RemoveDefinedNameMutation as St, stripErrorMargin as Un, UniverFormulaEnginePlugin as _a } from "@univerjs/engine-formula";
+import { Subject as aa, BehaviorSubject as ya, bufferWhen as Fn, filter as na, map as Bn } from "rxjs";
+import { IRPCChannelService as qa, fromModule as vn, toModule as Vn } from "@univerjs/rpc";
+const Gn = {
   id: "formula.command.insert-function",
-  type: ua.COMMAND,
+  type: ma.COMMAND,
   handler: async (n, e) => {
-    const { list: a } = e, i = n.get(pe), r = new X();
+    const { list: a } = e, i = n.get(de), r = new w();
     a.forEach((u) => {
-      const { range: m, primary: f, formula: s } = u, { row: p, column: d } = f, L = Ie.generateRandomId(6);
+      const { range: m, primary: f, formula: s } = u, { row: p, column: d } = f, L = Ne.generateRandomId(6);
       r.setValue(p, d, {
         f: s,
         si: L
@@ -27,20 +27,20 @@ const Vn = {
     const o = {
       value: r.getData()
     };
-    return i.executeCommand(Ka.id, o);
+    return i.executeCommand(Qa.id, o);
   }
 }, Ge = {
-  type: ua.MUTATION,
+  type: ma.MUTATION,
   id: "sheet.mutation.data-validation-formula-mark-dirty",
   handler() {
     return !0;
   }
 };
-function Gn(n, e, a) {
+function Hn(n, e, a) {
   var i;
   return n == null || n[e] == null || ((i = n[e]) == null ? void 0 : i[a]) == null;
 }
-function ft(n, e, a) {
+function ct(n, e, a) {
   var i;
   if (a) {
     if (n && n[e] && ((i = n[e]) != null && i[a]))
@@ -54,17 +54,17 @@ function ft(n, e, a) {
       [e]: null
     };
 }
-var y = /* @__PURE__ */ ((n) => (n[n.MoveRange = 0] = "MoveRange", n[n.MoveRows = 1] = "MoveRows", n[n.MoveCols = 2] = "MoveCols", n[n.InsertRow = 3] = "InsertRow", n[n.InsertColumn = 4] = "InsertColumn", n[n.RemoveRow = 5] = "RemoveRow", n[n.RemoveColumn = 6] = "RemoveColumn", n[n.DeleteMoveLeft = 7] = "DeleteMoveLeft", n[n.DeleteMoveUp = 8] = "DeleteMoveUp", n[n.InsertMoveDown = 9] = "InsertMoveDown", n[n.InsertMoveRight = 10] = "InsertMoveRight", n[n.SetName = 11] = "SetName", n[n.RemoveSheet = 12] = "RemoveSheet", n[n.SetDefinedName = 13] = "SetDefinedName", n[n.RemoveDefinedName = 14] = "RemoveDefinedName", n))(y || {});
-const Hn = [
+var q = /* @__PURE__ */ ((n) => (n[n.MoveRange = 0] = "MoveRange", n[n.MoveRows = 1] = "MoveRows", n[n.MoveCols = 2] = "MoveCols", n[n.InsertRow = 3] = "InsertRow", n[n.InsertColumn = 4] = "InsertColumn", n[n.RemoveRow = 5] = "RemoveRow", n[n.RemoveColumn = 6] = "RemoveColumn", n[n.DeleteMoveLeft = 7] = "DeleteMoveLeft", n[n.DeleteMoveUp = 8] = "DeleteMoveUp", n[n.InsertMoveDown = 9] = "InsertMoveDown", n[n.InsertMoveRight = 10] = "InsertMoveRight", n[n.SetName = 11] = "SetName", n[n.RemoveSheet = 12] = "RemoveSheet", n[n.SetDefinedName = 13] = "SetDefinedName", n[n.RemoveDefinedName = 14] = "RemoveDefinedName", n))(q || {});
+const Yn = [
   11,
   12,
   13,
   14
   /* RemoveDefinedName */
 ];
-function Yn(n, e, a) {
+function wn(n, e, a) {
   const { type: i } = a;
-  return Hn.includes(i) ? Xn(n, e) : wn(n, e, a);
+  return Yn.includes(i) ? Xn(n, e) : Wn(n, e, a);
 }
 function Xn(n, e) {
   const a = [], i = [];
@@ -73,11 +73,11 @@ function Xn(n, e) {
     if (o == null || u == null)
       return !0;
     Object.keys(o).forEach((m) => {
-      const f = new X(o[m] || {}), s = new X(u[m] || {}), p = new X(), d = new X();
+      const f = new w(o[m] || {}), s = new w(u[m] || {}), p = new w(), d = new w();
       if (f.forValue((c, N, R) => {
         if (R == null)
           return !0;
-        const P = it(R);
+        const P = rt(R);
         P !== null && (p.setValue(c, N, P), d.setValue(c, N, s.getValue(c, N)));
       }), p.getSizeOf() === 0)
         return;
@@ -105,9 +105,9 @@ function Xn(n, e) {
     redos: i
   };
 }
-function wn(n, e, a) {
-  const { redoFormulaData: i, undoFormulaData: r } = Wn(n, e, a);
-  if (Ie.diffValue(i, r))
+function Wn(n, e, a) {
+  const { redoFormulaData: i, undoFormulaData: r } = Kn(n, e, a);
+  if (Ne.diffValue(i, r))
     return {
       undos: [],
       redos: []
@@ -146,20 +146,20 @@ function wn(n, e, a) {
     redos: o
   };
 }
-function Wn(n, e, a) {
+function Kn(n, e, a) {
   const i = {}, r = {}, { type: o, unitId: u, sheetId: m, range: f, from: s, to: p } = a;
   return (/* @__PURE__ */ new Set([...Object.keys(n), ...Object.keys(e)])).forEach((L) => {
-    if (Gn(n, L, m))
+    if (Hn(n, L, m))
       return;
     (/* @__PURE__ */ new Set([
       ...Object.keys(n[L] || {}),
       ...Object.keys(e[L] || {})
     ])).forEach((I) => {
       var F, U;
-      const S = (F = n[L]) == null ? void 0 : F[I], c = (U = e[L]) == null ? void 0 : U[I], N = new X(S || {}), R = new X(c || {});
+      const S = (F = n[L]) == null ? void 0 : F[I], c = (U = e[L]) == null ? void 0 : U[I], N = new w(S || {}), R = new w(c || {});
       let P = [];
-      L !== u || I !== m ? P = Qn(R) : P = Kn(N, o, s, p, f);
-      const O = ui(P, N, R), M = mi(P, N);
+      L !== u || I !== m ? P = kn(R) : P = Qn(N, o, s, p, f);
+      const O = mi(P, N, R), M = fi(P, N);
       i[L] || (i[L] = {}), r[L] || (r[L] = {}), i[L][I] = {
         ...i[L][I],
         ...O
@@ -173,11 +173,11 @@ function Wn(n, e, a) {
     undoFormulaData: r
   };
 }
-function Kn(n, e, a, i, r) {
+function Qn(n, e, a, i, r) {
   const o = [];
   return n.forValue((u, m, f) => {
-    if (f == null || !ya(f)) return !0;
-    const s = ma(u, m);
+    if (f == null || !ga(f)) return !0;
+    const s = fa(u, m);
     let p = null, d = !1;
     if ([
       0,
@@ -185,68 +185,68 @@ function Kn(n, e, a, i, r) {
       2
       /* MoveCols */
     ].includes(e))
-      p = kn(e, a, i, s);
+      p = $n(e, a, i, s);
     else if (r != null) {
-      const L = $n(e, r, s);
+      const L = jn(e, r, s);
       p = L.newCell, d = L.isReverse;
     }
     d ? o.unshift({ oldCell: s, newCell: p }) : o.push({ oldCell: s, newCell: p });
   }), o;
 }
-function Qn(n) {
+function kn(n) {
   const e = [];
   return n.forValue((a, i, r) => {
-    if (r == null || !ya(r)) return !0;
-    const o = ma(a, i);
+    if (r == null || !ga(r)) return !0;
+    const o = fa(a, i);
     e.push({ oldCell: o, newCell: o });
   }), e;
 }
-function kn(n, e, a, i) {
+function $n(n, e, a, i) {
   if (e == null || a == null)
     return null;
   switch (n) {
     case 0:
-      return jn(e, a, i);
-    case 1:
       return zn(e, a, i);
-    case 2:
+    case 1:
       return Zn(e, a, i);
+    case 2:
+      return Jn(e, a, i);
     default:
       return null;
   }
 }
-function $n(n, e, a) {
+function jn(n, e, a) {
   let i = null, r = !1;
   switch (n) {
     case 3:
-      i = Jn(e, a), r = !0;
+      i = ei(e, a), r = !0;
       break;
     case 4:
-      i = ei(e, a), r = !0;
+      i = ti(e, a), r = !0;
       break;
     case 5:
-      i = ti(e, a);
+      i = ai(e, a);
       break;
     case 6:
-      i = ai(e, a);
+      i = ni(e, a);
       break;
     case 7:
-      i = ni(e, a);
+      i = ii(e, a);
       break;
     case 8:
-      i = ii(e, a);
+      i = ri(e, a);
       break;
     case 9:
-      i = ri(e, a), r = !0;
+      i = oi(e, a), r = !0;
       break;
     case 10:
-      i = oi(e, a), r = !0;
+      i = ui(e, a), r = !0;
       break;
   }
   return { newCell: i, isReverse: r };
 }
-function jn(n, e, a) {
-  const i = pa(
+function zn(n, e, a) {
+  const i = da(
     {
       id: G.MoveRangeCommandId,
       params: { toRange: e, fromRange: n }
@@ -255,8 +255,8 @@ function jn(n, e, a) {
   );
   return H(i, a);
 }
-function zn(n, e, a) {
-  const i = da(
+function Zn(n, e, a) {
+  const i = La(
     {
       id: G.MoveRowsCommandId,
       params: { toRange: e, fromRange: n }
@@ -265,8 +265,8 @@ function zn(n, e, a) {
   );
   return H(i, a);
 }
-function Zn(n, e, a) {
-  const i = La(
+function Jn(n, e, a) {
+  const i = Pa(
     {
       id: G.MoveColsCommandId,
       params: { toRange: e, fromRange: n }
@@ -275,8 +275,8 @@ function Zn(n, e, a) {
   );
   return H(i, a);
 }
-function Jn(n, e) {
-  const a = Pa(
+function ei(n, e) {
+  const a = Ta(
     {
       id: G.InsertRowCommandId,
       params: { range: n, unitId: "", subUnitId: "", direction: He.DOWN }
@@ -285,8 +285,8 @@ function Jn(n, e) {
   );
   return H(a, e);
 }
-function ei(n, e) {
-  const a = Ta(
+function ti(n, e) {
+  const a = Ea(
     {
       id: G.InsertColCommandId,
       params: { range: n, unitId: "", subUnitId: "", direction: He.RIGHT }
@@ -295,8 +295,8 @@ function ei(n, e) {
   );
   return H(a, e);
 }
-function ti(n, e) {
-  const a = Ea(
+function ai(n, e) {
+  const a = Ia(
     {
       id: G.RemoveRowCommandId,
       params: { range: n }
@@ -305,8 +305,8 @@ function ti(n, e) {
   );
   return H(a, e);
 }
-function ai(n, e) {
-  const a = Ia(
+function ni(n, e) {
+  const a = Na(
     {
       id: G.RemoveColCommandId,
       params: { range: n }
@@ -315,8 +315,8 @@ function ai(n, e) {
   );
   return H(a, e);
 }
-function ni(n, e) {
-  const a = Na(
+function ii(n, e) {
+  const a = Ra(
     {
       id: G.DeleteRangeMoveLeftCommandId,
       params: { range: n }
@@ -325,8 +325,8 @@ function ni(n, e) {
   );
   return H(a, e);
 }
-function ii(n, e) {
-  const a = Ra(
+function ri(n, e) {
+  const a = Aa(
     {
       id: G.DeleteRangeMoveUpCommandId,
       params: { range: n }
@@ -335,8 +335,8 @@ function ii(n, e) {
   );
   return H(a, e);
 }
-function ri(n, e) {
-  const a = Aa(
+function oi(n, e) {
+  const a = Sa(
     {
       id: G.InsertRangeMoveDownCommandId,
       params: { range: n }
@@ -345,8 +345,8 @@ function ri(n, e) {
   );
   return H(a, e);
 }
-function oi(n, e) {
-  const a = Sa(
+function ui(n, e) {
+  const a = Ca(
     {
       id: G.InsertRangeMoveRightCommandId,
       params: { range: n }
@@ -355,20 +355,20 @@ function oi(n, e) {
   );
   return H(a, e);
 }
-function ui(n, e, a) {
-  const i = new X({});
+function mi(n, e, a) {
+  const i = new w({});
   return n.forEach((r) => {
-    const { oldCell: o, newCell: u } = r, { startRow: m, startColumn: f } = o, s = a.getValue(m, f) || e.getValue(m, f), p = it(s);
+    const { oldCell: o, newCell: u } = r, { startRow: m, startColumn: f } = o, s = a.getValue(m, f) || e.getValue(m, f), p = rt(s);
     if (i.setValue(m, f, { f: null, si: null }), u) {
       const { startRow: d, startColumn: L } = u;
       i.setValue(d, L, p);
     }
   }), i.getMatrix();
 }
-function mi(n, e) {
-  const a = new X({});
+function fi(n, e) {
+  const a = new w({});
   return n.reverse().forEach((i) => {
-    const { oldCell: r, newCell: o } = i, { startRow: u, startColumn: m } = r, f = e.getValue(u, m), s = it(f);
+    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: d } = o;
       a.setValue(p, d, { f: null, si: null });
@@ -376,10 +376,10 @@ function mi(n, e) {
     a.setValue(u, m, s);
   }), a.getMatrix();
 }
-function it(n) {
+function rt(n) {
   if (n == null)
     return;
-  const { f: e, si: a, x: i = 0, y: r = 0 } = n, o = De(e), u = fa(a);
+  const { f: e, si: a, x: i = 0, y: r = 0 } = n, o = be(e), u = ca(a);
   if (!o && !u)
     return {
       f: null,
@@ -388,18 +388,18 @@ function it(n) {
   const m = {};
   return u && (m.si = a), o && i === 0 && r === 0 && (m.f = e), m.f === void 0 && (m.f = null), m.si === void 0 && (m.si = null), m;
 }
-function fi(n) {
-  const e = new X({});
-  return new X(n).forValue((i, r, o) => {
-    const u = it(o);
+function ci(n) {
+  const e = new w({});
+  return new w(n).forValue((i, r, o) => {
+    const u = rt(o);
     u && e.setValue(i, r, u);
   }), e.getMatrix();
 }
-function ya(n) {
-  const e = (n == null ? void 0 : n.f) || "", a = (n == null ? void 0 : n.si) || "", i = De(e), r = fa(a);
+function ga(n) {
+  const e = (n == null ? void 0 : n.f) || "", a = (n == null ? void 0 : n.si) || "", i = be(e), r = ca(a);
   return !!(i || r);
 }
-function ga(n, e, a, i, r, o) {
+function ha(n, e, a, i, r, o) {
   if ((r == null || r.length === 0) && (o == null || o.length === 0)) {
     if (n === a && e === i)
       return !0;
@@ -407,7 +407,7 @@ function ga(n, e, a, i, r, o) {
     return !0;
   return !1;
 }
-function ha(n, e, a = 0, i = 0) {
+function Ua(n, e, a = 0, i = 0) {
   const r = [];
   for (let o = 0, u = n.length; o < u; o++) {
     const m = n[o];
@@ -415,10 +415,10 @@ function ha(n, e, a = 0, i = 0) {
       r.push(m);
       continue;
     }
-    const { token: f } = m, s = se(f), { range: p, sheetName: d, unitId: L } = s, E = Ce.moveOffset(p, a, i);
+    const { token: f } = m, s = pe(f), { range: p, sheetName: d, unitId: L } = s, E = De.moveOffset(p, a, i);
     r.push({
       ...m,
-      token: at({
+      token: nt({
         range: E,
         unitId: L,
         sheetName: d
@@ -427,7 +427,7 @@ function ha(n, e, a = 0, i = 0) {
   }
   return r;
 }
-function Ua(n, e, a, i) {
+function Fa(n, e, a, i) {
   const { type: r, unitId: o, sheetId: u, range: m, from: f, to: s } = e, {
     range: p,
     sheetId: d,
@@ -436,7 +436,7 @@ function Ua(n, e, a, i) {
     refOffsetX: I,
     refOffsetY: S
   } = n;
-  if (!ga(
+  if (!ha(
     o,
     u,
     a,
@@ -445,25 +445,25 @@ function Ua(n, e, a, i) {
     d
   ))
     return;
-  const c = Ce.moveOffset(p, I, S);
+  const c = De.moveOffset(p, I, S);
   let N = null;
-  if (r === y.MoveRange) {
+  if (r === q.MoveRange) {
     if (f == null || s == null)
       return;
-    const R = lt(c, f), P = Ve(c, f);
+    const R = st(c, f), P = Ve(c, f);
     if (P == null || R !== 4)
       return;
-    const O = pa(
+    const O = da(
       { id: G.MoveRangeCommandId, params: { toRange: s, fromRange: f } },
       P
     ), M = H(O, P);
     if (M == null)
       return j.REF;
-    N = ct(R, M, f, s, c, P);
-  } else if (r === y.MoveRows) {
+    N = lt(R, M, f, s, c, P);
+  } else if (r === q.MoveRows) {
     if (f == null || s == null)
       return;
-    const R = lt(c, f);
+    const R = st(c, f);
     let P = Ve(c, f);
     if (P == null && (f.endRow < c.startRow && s.endRow < c.startRow || f.startRow > c.endRow && s.startRow > c.endRow))
       return;
@@ -474,17 +474,17 @@ function Ua(n, e, a, i) {
       endColumn: c.endColumn,
       rangeType: Y.NORMAL
     });
-    const O = da(
+    const O = La(
       { id: G.MoveRowsCommandId, params: { toRange: s, fromRange: f } },
       P
     ), M = H(O, P);
     if (M == null)
       return j.REF;
-    N = ct(R, M, f, s, c, P);
-  } else if (r === y.MoveCols) {
+    N = lt(R, M, f, s, c, P);
+  } else if (r === q.MoveCols) {
     if (f == null || s == null)
       return;
-    const R = lt(c, f);
+    const R = st(c, f);
     let P = Ve(c, f);
     if (P == null && (f.endColumn < c.startColumn && s.endColumn < c.startColumn || f.startColumn > c.endColumn && s.startColumn > c.endColumn))
       return;
@@ -495,17 +495,17 @@ function Ua(n, e, a, i) {
       endColumn: c.endColumn,
       rangeType: Y.NORMAL
     });
-    const O = La(
+    const O = Pa(
       { id: G.MoveColsCommandId, params: { toRange: s, fromRange: f } },
       P
     ), M = H(O, P);
     if (M == null)
       return j.REF;
-    N = ct(R, M, f, s, c, P);
+    N = lt(R, M, f, s, c, P);
   }
   if (m != null) {
-    if (r === y.InsertRow) {
-      const R = Pa(
+    if (r === q.InsertRow) {
+      const R = Ta(
         {
           id: G.InsertRowCommandId,
           params: { range: m, unitId: "", subUnitId: "", direction: He.DOWN }
@@ -518,8 +518,8 @@ function Ua(n, e, a, i) {
         ...c,
         ...P
       };
-    } else if (r === y.InsertColumn) {
-      const R = Ta(
+    } else if (r === q.InsertColumn) {
+      const R = Ea(
         {
           id: G.InsertColCommandId,
           params: { range: m, unitId: "", subUnitId: "", direction: He.RIGHT }
@@ -532,8 +532,8 @@ function Ua(n, e, a, i) {
         ...c,
         ...P
       };
-    } else if (r === y.RemoveRow) {
-      const R = Ea(
+    } else if (r === q.RemoveRow) {
+      const R = Ia(
         {
           id: G.RemoveRowCommandId,
           params: { range: m }
@@ -546,8 +546,8 @@ function Ua(n, e, a, i) {
         ...c,
         ...P
       };
-    } else if (r === y.RemoveColumn) {
-      const R = Ia(
+    } else if (r === q.RemoveColumn) {
+      const R = Na(
         {
           id: G.RemoveColCommandId,
           params: { range: m }
@@ -560,8 +560,8 @@ function Ua(n, e, a, i) {
         ...c,
         ...P
       };
-    } else if (r === y.DeleteMoveLeft) {
-      const R = Na(
+    } else if (r === q.DeleteMoveLeft) {
+      const R = Ra(
         {
           id: G.DeleteRangeMoveLeftCommandId,
           params: { range: m }
@@ -574,8 +574,8 @@ function Ua(n, e, a, i) {
         ...c,
         ...P
       };
-    } else if (r === y.DeleteMoveUp) {
-      const R = Ra(
+    } else if (r === q.DeleteMoveUp) {
+      const R = Aa(
         {
           id: G.DeleteRangeMoveUpCommandId,
           params: { range: m }
@@ -588,8 +588,8 @@ function Ua(n, e, a, i) {
         ...c,
         ...P
       };
-    } else if (r === y.InsertMoveDown) {
-      const R = Aa(
+    } else if (r === q.InsertMoveDown) {
+      const R = Sa(
         {
           id: G.InsertRangeMoveDownCommandId,
           params: { range: m }
@@ -602,8 +602,8 @@ function Ua(n, e, a, i) {
         ...c,
         ...P
       };
-    } else if (r === y.InsertMoveRight) {
-      const R = Sa(
+    } else if (r === q.InsertMoveRight) {
+      const R = Ca(
         {
           id: G.InsertRangeMoveRightCommandId,
           params: { range: m }
@@ -619,39 +619,39 @@ function Ua(n, e, a, i) {
     }
   }
   if (N != null)
-    return at({
+    return nt({
       range: N,
       sheetName: E,
       unitId: L
     });
 }
-function ct(n, e, a, i, r, o) {
-  const { startRow: u, endRow: m, startColumn: f, endColumn: s, rangeType: p } = Re(e), {
+function lt(n, e, a, i, r, o) {
+  const { startRow: u, endRow: m, startColumn: f, endColumn: s, rangeType: p } = Ae(e), {
     startRow: d,
     startColumn: L,
     endRow: E,
     endColumn: I,
     rangeType: S = Y.NORMAL
-  } = Re(a), { startRow: c, startColumn: N, endRow: R, endColumn: P } = Re(i), {
+  } = Ae(a), { startRow: c, startColumn: N, endRow: R, endColumn: P } = Ae(i), {
     startRow: O,
     endRow: M,
     startColumn: F,
     endColumn: U
-  } = Re(o), {
+  } = Ae(o), {
     startRow: g,
     endRow: x,
     startColumn: h,
     endColumn: V,
     rangeType: k = Y.NORMAL
-  } = Re(r), b = { ...r };
-  function de() {
+  } = Ae(r), b = { ...r };
+  function Le() {
     return p === Y.COLUMN && k === Y.COLUMN ? !0 : f >= h && s <= V;
   }
   function ae() {
     return p === Y.ROW && k === Y.ROW ? !0 : u >= g && m <= x;
   }
   if (n === 0)
-    if (de())
+    if (Le())
       if (u < g)
         b.startRow = u;
       else if (u >= x)
@@ -661,7 +661,7 @@ function ct(n, e, a, i, r, o) {
     else
       return;
   else if (n === 1)
-    if (de())
+    if (Le())
       if (m > x)
         b.endRow = m;
       else if (m <= g)
@@ -693,8 +693,8 @@ function ct(n, e, a, i, r, o) {
   else n === 4 ? (b.startRow = u, b.startColumn = f, b.endRow = m, b.endColumn = s) : L <= h && I >= V || S === Y.ROW && k === Y.ROW ? a.endRow < g ? (c >= g && (b.startRow -= E - d + 1), c >= x && (b.endRow -= E - d + 1)) : a.startRow > x ? (R <= x && (b.endRow += E - d + 1), R <= g && (b.startRow += E - d + 1)) : a.startRow >= g && a.endRow <= x && (c <= g ? b.startRow += E - d + 1 : c >= x && (b.endRow -= E - d + 1)) : d <= g && E >= x || S === Y.COLUMN && k === Y.COLUMN ? a.endColumn < h ? (N >= h && (b.startColumn -= I - L + 1), N >= V && (b.endColumn -= I - L + 1)) : a.startColumn > V ? (P <= V && (b.endColumn += I - L + 1), P <= h && (b.startColumn += I - L + 1)) : a.startColumn >= h && a.endColumn <= V && (N <= h ? b.startColumn += I - L + 1 : N >= V && (b.endColumn -= I - L + 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 lt(n, e) {
-  const a = Te(n.startRow), i = Ee(n.endRow), r = Te(n.startColumn), o = Ee(n.endColumn), u = Te(e.startRow), m = Ee(e.endRow), f = Te(e.startColumn), s = Ee(e.endColumn);
+function st(n, e) {
+  const a = Ee(n.startRow), i = Ie(n.endRow), r = Ee(n.startColumn), o = Ie(n.endColumn), u = Ee(e.startRow), m = Ie(e.endRow), f = Ee(e.startColumn), s = Ie(e.endColumn);
   function p() {
     return n.rangeType === Y.COLUMN && e.rangeType === Y.COLUMN ? !0 : a >= u && i <= m;
   }
@@ -706,71 +706,71 @@ function lt(n, e) {
   }
   return p() && d() || L() ? 4 : d() && a >= u && a <= m && i > m ? 0 : d() && i >= u && i <= m && a < u ? 1 : p() && r >= f && r <= s && o > s ? 2 : p() && o >= f && o <= s && r < f ? 3 : null;
 }
-function Te(n) {
+function Ee(n) {
   return isNaN(n) ? -1 / 0 : n;
 }
-function Ee(n) {
+function Ie(n) {
   return isNaN(n) ? 1 / 0 : n;
 }
-function Re(n) {
+function Ae(n) {
   const { startRow: e, endRow: a, startColumn: i, endColumn: r } = n;
   return {
     ...n,
-    startRow: Te(e),
-    endRow: Ee(a),
-    startColumn: Te(i),
-    endColumn: Ee(r)
+    startRow: Ee(e),
+    endRow: Ie(a),
+    startColumn: Ee(i),
+    endColumn: Ie(r)
   };
 }
-function Fa(n, e) {
+function Ba(n, e) {
   const { id: a } = e;
   let i = null;
   switch (a) {
+    case un.id:
+      i = li(e, n);
+      break;
     case on.id:
-      i = ci(e, n);
+      i = si(e, n);
       break;
     case rn.id:
-      i = li(e, n);
+      i = pi(e, n);
       break;
     case nn.id:
-      i = si(e, n);
+      i = di(e);
       break;
     case an.id:
-      i = pi(e);
+      i = Li(e);
       break;
     case tn.id:
-      i = di(e);
-      break;
-    case en.id:
-      i = Li(e, n);
-      break;
-    case Ja.id:
       i = Pi(e, n);
       break;
-    case Za.id:
+    case en.id:
       i = Ti(e, n);
       break;
-    case za.id:
+    case Ja.id:
       i = Ei(e, n);
       break;
-    case ja.id:
+    case Za.id:
       i = Ii(e, n);
       break;
-    case $a.id:
+    case za.id:
       i = Ni(e, n);
       break;
-    case ka.id:
+    case ja.id:
       i = Ri(e, n);
       break;
-    case Qa.id:
+    case $a.id:
       i = Ai(e, n);
       break;
-    case Da.id:
+    case ka.id:
       i = Si(e, n);
       break;
-    case Ca.id:
+    case ba.id:
       i = Ci(e, n);
       break;
+    case Da.id:
+      i = Di(e, n);
+      break;
   }
   return i;
 }
@@ -782,21 +782,21 @@ function Z(n) {
     sheetId: a
   };
 }
-function ci(n, e) {
+function li(n, e) {
   const { params: a } = n;
   if (!a) return null;
   const { fromRange: i, toRange: r } = a;
   if (!i || !r) return null;
   const { unitId: o, sheetId: u } = Z(e);
   return {
-    type: y.MoveRange,
+    type: q.MoveRange,
     from: i,
     to: r,
     unitId: o,
     sheetId: u
   };
 }
-function li(n, e) {
+function si(n, e) {
   const { params: a } = n;
   if (!a) return null;
   const {
@@ -818,14 +818,14 @@ function li(n, e) {
     rangeType: Y.ROW
   };
   return {
-    type: y.MoveRows,
+    type: q.MoveRows,
     from: p,
     to: d,
     unitId: m,
     sheetId: s
   };
 }
-function si(n, e) {
+function pi(n, e) {
   const { params: a } = n;
   if (!a) return null;
   const {
@@ -847,152 +847,152 @@ function si(n, e) {
     rangeType: Y.COLUMN
   };
   return {
-    type: y.MoveCols,
+    type: q.MoveCols,
     from: p,
     to: d,
     unitId: m,
     sheetId: s
   };
 }
-function pi(n) {
+function di(n) {
   const { params: e } = n;
   if (!e) return null;
   const { range: a, unitId: i, subUnitId: r } = e;
   return {
-    type: y.InsertRow,
+    type: q.InsertRow,
     range: a,
     unitId: i,
     sheetId: r
   };
 }
-function di(n) {
+function Li(n) {
   const { params: e } = n;
   if (!e) return null;
   const { range: a, unitId: i, subUnitId: r } = e;
   return {
-    type: y.InsertColumn,
+    type: q.InsertColumn,
     range: a,
     unitId: i,
     sheetId: r
   };
 }
-function Li(n, e) {
+function Pi(n, e) {
   const { params: a } = n;
   if (!a) return null;
   const { range: i } = a, { unitId: r, sheetId: o } = Z(e);
   return {
-    type: y.InsertMoveRight,
+    type: q.InsertMoveRight,
     range: i,
     unitId: r,
     sheetId: o
   };
 }
-function Pi(n, e) {
+function Ti(n, e) {
   const { params: a } = n;
   if (!a) return null;
   const { range: i } = a, { unitId: r, sheetId: o } = Z(e);
   return {
-    type: y.InsertMoveDown,
+    type: q.InsertMoveDown,
     range: i,
     unitId: r,
     sheetId: o
   };
 }
-function Ti(n, e) {
+function Ei(n, e) {
   const { params: a } = n;
   if (!a) return null;
   const { range: i } = a, { unitId: r, sheetId: o } = Z(e);
   return {
-    type: y.RemoveRow,
+    type: q.RemoveRow,
     range: i,
     unitId: r,
     sheetId: o
   };
 }
-function Ei(n, e) {
+function Ii(n, e) {
   const { params: a } = n;
   if (!a) return null;
   const { range: i } = a, { unitId: r, sheetId: o } = Z(e);
   return {
-    type: y.RemoveColumn,
+    type: q.RemoveColumn,
     range: i,
     unitId: r,
     sheetId: o
   };
 }
-function Ii(n, e) {
+function Ni(n, e) {
   const { params: a } = n;
   if (!a) return null;
   const { range: i } = a, { unitId: r, sheetId: o } = Z(e);
   return {
-    type: y.DeleteMoveUp,
+    type: q.DeleteMoveUp,
     range: i,
     unitId: r,
     sheetId: o
   };
 }
-function Ni(n, e) {
+function Ri(n, e) {
   const { params: a } = n;
   if (!a) return null;
   const { range: i } = a, { unitId: r, sheetId: o } = Z(e);
   return {
-    type: y.DeleteMoveLeft,
+    type: q.DeleteMoveLeft,
     range: i,
     unitId: r,
     sheetId: o
   };
 }
-function Ri(n, e) {
+function Ai(n, e) {
   const { params: a } = n;
   if (!a) return null;
   const { unitId: i, subUnitId: r, name: o } = a, { unitId: u, sheetId: m } = Z(e);
   return {
-    type: y.SetName,
+    type: q.SetName,
     unitId: i || u,
     sheetId: r || m,
     sheetName: o
   };
 }
-function Ai(n, e) {
+function Si(n, e) {
   const { params: a } = n;
   if (!a) return null;
   const { unitId: i, subUnitId: r } = a, { unitId: o, sheetId: u } = Z(e);
   return {
-    type: y.RemoveSheet,
+    type: q.RemoveSheet,
     unitId: i || o,
     sheetId: r || u
   };
 }
-function Si(n, e) {
+function Ci(n, e) {
   const { params: a } = n;
   if (!a) return null;
   const { unitId: i, name: r, id: o } = a, { sheetId: u } = Z(e);
   return {
-    type: y.SetDefinedName,
+    type: q.SetDefinedName,
     unitId: i,
     sheetId: u,
     definedName: r,
     definedNameId: o
   };
 }
-function Ci(n, e) {
+function Di(n, e) {
   const { params: a } = n;
   if (!a) return null;
   const { unitId: i, name: r, id: o } = a, { sheetId: u } = Z(e);
   return {
-    type: y.RemoveDefinedName,
+    type: q.RemoveDefinedName,
     unitId: i,
     sheetId: u,
     definedName: r,
     definedNameId: o
   };
 }
-var Di = Object.defineProperty, bi = Object.getOwnPropertyDescriptor, Oi = (n, e, a, i) => {
-  for (var r = i > 1 ? void 0 : i ? bi(e, a) : e, o = n.length - 1, u; o >= 0; o--)
+var bi = Object.defineProperty, Oi = Object.getOwnPropertyDescriptor, Mi = (n, e, a, i) => {
+  for (var r = i > 1 ? void 0 : i ? Oi(e, a) : e, o = n.length - 1, u; o >= 0; o--)
     (u = n[o]) && (r = (i ? u(e, a, r) : u(r)) || r);
-  return i && r && Di(e, a, r), r;
+  return i && r && bi(e, a, r), r;
 }, Ue = (n, e) => (a, i) => e(a, i, n);
-let we = class extends te {
+let We = class extends te {
   constructor(n, e, a, i) {
     super(), this._definedNamesService = n, this._univerInstanceService = e, this._sheetInterceptorService = a, this._lexerTreeBuilder = i, this._initialize();
   }
@@ -1003,7 +1003,7 @@ let we = class extends te {
     this.disposeWithMe(
       this._sheetInterceptorService.interceptCommand({
         getMutations: (n) => {
-          if (n.id === Da.id || n.id === Ca.id)
+          if (n.id === ba.id || n.id === Da.id)
             return {
               redos: [],
               undos: []
@@ -1014,7 +1014,7 @@ let we = class extends te {
               redos: [],
               undos: []
             };
-          const a = Fa(e, n);
+          const a = Ba(e, n);
           return a ? this._getUpdateDefinedNameMutations(e, a) : {
             redos: [],
             undos: []
@@ -1043,7 +1043,7 @@ let we = class extends te {
         const P = p[N];
         if (typeof P == "string" || P.nodeType !== J.REFERENCE)
           continue;
-        const { token: O } = P, M = se(O), { range: F, sheetName: U, unitId: g } = M, x = ((c = n.getSheetBySheetName(U)) == null ? void 0 : c.getSheetId()) || "", h = {
+        const { token: O } = P, M = pe(O), { range: F, sheetName: U, unitId: g } = M, x = ((c = n.getSheetBySheetName(U)) == null ? void 0 : c.getSheetId()) || "", h = {
           range: F,
           sheetId: x,
           unitId: g,
@@ -1052,22 +1052,22 @@ let we = class extends te {
           refOffsetY: 0
         };
         let V = null;
-        if (a === y.RemoveSheet)
+        if (a === q.RemoveSheet)
           V = this._removeSheet(f, i, r);
-        else if (a === y.SetName) {
+        else if (a === q.SetName) {
           const {
             sheetId: k,
             sheetName: b
           } = e;
           if (b == null || x == null || x.length === 0 || k !== x)
             continue;
-          V = at({
+          V = nt({
             range: F,
             sheetName: b,
             unitId: g
           });
         } else
-          V = Ua(
+          V = Fa(
             h,
             e,
             i,
@@ -1080,7 +1080,7 @@ let we = class extends te {
       }
       if (!d)
         return !0;
-      const E = Xe(ha(p, L)), I = {
+      const E = Xe(Ua(p, L)), I = {
         id: Me.id,
         params: {
           unitId: i,
@@ -1108,27 +1108,27 @@ let we = class extends te {
     return ((o = this._definedNamesService.getWorksheetByRef(e, i)) == null ? void 0 : o.getSheetId()) === a ? j.REF : null;
   }
 };
-we = Oi([
+We = Mi([
   Ue(0, qt),
   Ue(1, xe),
-  Ue(2, W(Mt)),
-  Ue(3, W(_t))
-], we);
-var Se = /* @__PURE__ */ ((n) => (n[n.NOT_REGISTER = 1] = "NOT_REGISTER", n[n.SUCCESS = 2] = "SUCCESS", n[n.WAIT = 3] = "WAIT", n[n.ERROR = 4] = "ERROR", n))(Se || {}), Mi = Object.defineProperty, xi = Object.getOwnPropertyDescriptor, _i = (n, e, a, i) => {
-  for (var r = i > 1 ? void 0 : i ? xi(e, a) : e, o = n.length - 1, u; o >= 0; o--)
+  Ue(2, W(xt)),
+  Ue(3, W(yt))
+], We);
+var Ce = /* @__PURE__ */ ((n) => (n[n.NOT_REGISTER = 1] = "NOT_REGISTER", n[n.SUCCESS = 2] = "SUCCESS", n[n.WAIT = 3] = "WAIT", n[n.ERROR = 4] = "ERROR", n))(Ce || {}), xi = Object.defineProperty, _i = Object.getOwnPropertyDescriptor, yi = (n, e, a, i) => {
+  for (var r = i > 1 ? void 0 : i ? _i(e, a) : e, o = n.length - 1, u; o >= 0; o--)
     (u = n[o]) && (r = (i ? u(e, a, r) : u(r)) || r);
-  return i && r && Mi(e, a, r), r;
-}, st = (n, e) => (a, i) => e(a, i, n);
-let We = class extends te {
+  return i && r && xi(e, a, r), r;
+}, pt = (n, e) => (a, i) => e(a, i, n);
+let Ke = class extends te {
   constructor(e, a, 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 aa());
+    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 aa());
+    X(this, "formulaResult$", this._formulaResult$.asObservable());
+    X(this, "calculateStarted$", new ya(!1));
     this._commandService = e, this._activeDirtyManagerService = a, this._lifecycleService = i, this._initFormulaRegister(), this._initFormulaCalculationResultChange();
   }
   dispose() {
@@ -1141,7 +1141,7 @@ let We = class extends te {
     return r || (r = /* @__PURE__ */ new Map(), i.set(a, r)), r;
   }
   _createFormulaId(e, a) {
-    return `formula.${e}_${a}_${Ie.generateRandomId(8)}`;
+    return `formula.${e}_${a}_${Ne.generateRandomId(8)}`;
   }
   _initFormulaRegister() {
     this._activeDirtyManagerService.register(
@@ -1169,7 +1169,7 @@ let We = class extends te {
           }
         }
       };
-      this._commandService.executeCommand(Ln.id, s).then(() => {
+      this._commandService.executeCommand(Pn.id, s).then(() => {
         this._commandService.executeCommand(
           Ge.id,
           { [i]: { [r]: { [u]: !0 } } }
@@ -1177,14 +1177,14 @@ let We = class extends te {
       });
     };
     this.disposeWithMe(
-      this._formulaChangeWithRange$.pipe(Un(() => this.calculateStarted$.pipe(aa((a) => a)))).subscribe((a) => a.forEach(e))
+      this._formulaChangeWithRange$.pipe(Fn(() => this.calculateStarted$.pipe(na((a) => a)))).subscribe((a) => a.forEach(e))
     ), this.disposeWithMe(
-      this._formulaChangeWithRange$.pipe(aa(() => this.calculateStarted$.getValue())).subscribe(e)
+      this._formulaChangeWithRange$.pipe(na(() => this.calculateStarted$.getValue())).subscribe(e)
     );
   }
   _initFormulaCalculationResultChange() {
     this.disposeWithMe(this._commandService.onCommandExecuted((e) => {
-      if (e.id === pn.id) {
+      if (e.id === dn.id) {
         const a = e.params, { unitOtherData: i } = a, r = {};
         for (const o in i) {
           const u = i[o], m = {};
@@ -1199,10 +1199,10 @@ let We = class extends te {
                 if (!I)
                   continue;
                 I.result || (I.result = {});
-                const S = new X(E), c = new X(I.result);
+                const S = new w(E), c = new w(I.result);
                 S.forValue((N, R, P) => {
                   c.setValue(N, R, P);
-                }), I.status = Se.SUCCESS, I.callbacks.forEach((N) => {
+                }), I.status = Ce.SUCCESS, I.callbacks.forEach((N) => {
                   N(E);
                 }), I.callbacks.clear(), d.push(I);
               }
@@ -1217,7 +1217,7 @@ let We = class extends te {
     const u = this._createFormulaId(e, a);
     return this._ensureCacheMap(e, a).set(u, {
       result: void 0,
-      status: Se.WAIT,
+      status: Ce.WAIT,
       formulaId: u,
       callbacks: /* @__PURE__ */ new Set(),
       extra: o
@@ -1235,13 +1235,13 @@ let We = class extends te {
       subUnitId: a,
       formulaIdList: i
     };
-    this._commandService.executeCommand(dn.id, r);
+    this._commandService.executeCommand(Ln.id, r);
     const o = this._ensureCacheMap(e, a);
     i.forEach((u) => o.delete(u));
   }
   getFormulaValue(e, a, i) {
     const r = this._ensureCacheMap(e, a), o = r.get(i);
-    return o ? o.status === Se.SUCCESS || o.status === Se.ERROR ? Promise.resolve(o) : new Promise((u) => {
+    return o ? o.status === Ce.SUCCESS || o.status === Ce.ERROR ? Promise.resolve(o) : new Promise((u) => {
       o.callbacks.add(() => {
         u(r.get(i));
       });
@@ -1251,26 +1251,26 @@ let We = class extends te {
     return this._ensureCacheMap(e, a).get(i);
   }
 };
-We = _i([
-  st(0, pe),
-  st(1, yt),
-  st(2, W(Ya))
-], We);
-const rt = "sheets-formula.base.config";
+Ke = yi([
+  pt(0, de),
+  pt(1, gt),
+  pt(2, W(wa))
+], Ke);
+const ot = "sheets-formula.base.config";
 var ne = /* @__PURE__ */ ((n) => (n[n.FORCED = 0] = "FORCED", n[n.WHEN_EMPTY = 1] = "WHEN_EMPTY", n[n.NO_CALCULATION = 2] = "NO_CALCULATION", n))(ne || {});
-const na = {}, qi = "sheets-formula.remote.config", ia = {};
-var yi = Object.defineProperty, gi = Object.getOwnPropertyDescriptor, hi = (n, e, a, i) => {
-  for (var r = i > 1 ? void 0 : i ? gi(e, a) : e, o = n.length - 1, u; o >= 0; o--)
+const ia = {}, qi = "sheets-formula.remote.config", ra = {};
+var gi = Object.defineProperty, hi = Object.getOwnPropertyDescriptor, Ui = (n, e, a, i) => {
+  for (var r = i > 1 ? void 0 : i ? hi(e, a) : e, o = n.length - 1, u; o >= 0; o--)
     (u = n[o]) && (r = (i ? u(e, a, r) : u(r)) || r);
-  return i && r && yi(e, a, r), r;
+  return i && r && gi(e, a, r), r;
 }, le = (n, e) => (a, i) => e(a, i, n);
-const ra = { done: 0, count: 0 }, pt = { onlyLocal: !0 };
-let be = class extends te {
+const oa = { done: 0, count: 0 }, dt = { onlyLocal: !0 };
+let Oe = class extends te {
   constructor(e, a, i, r, o, u, m) {
     var s;
     super();
-    w(this, "_waitingCommandQueue", []);
-    w(this, "_executingDirtyData", {
+    X(this, "_waitingCommandQueue", []);
+    X(this, "_executingDirtyData", {
       forceCalculation: !1,
       dirtyRanges: [],
       dirtyNameMap: {},
@@ -1279,21 +1279,21 @@ let be = 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);
-    w(this, "_calculationMode", ne.WHEN_EMPTY);
+    X(this, "_setTimeoutKey", -1);
+    X(this, "_startExecutionTime", 0);
+    X(this, "_totalCalculationTaskCount", 0);
+    X(this, "_doneCalculationTaskCount", 0);
+    X(this, "_executionInProgressParams", null);
+    X(this, "_restartCalculation", !1);
+    X(this, "_calculationMode", ne.WHEN_EMPTY);
     /**
      * 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 ya(oa));
+    X(this, "progress$", this._progress$.asObservable());
     this._commandService = e, this._activeDirtyManagerService = a, this._logService = i, this._configService = r, this._formulaDataModel = o, this._localeService = u, this._registerOtherFormulaService = m;
-    const f = this._configService.getConfig(rt);
+    const f = this._configService.getConfig(ot);
     this._calculationMode = (s = f == null ? void 0 : f.initialFormulaComputing) != null ? s : ne.WHEN_EMPTY, this._commandExecutedListener(), this._initialExecuteFormulaProcessListener(), this._initialExecuteFormula();
   }
   _emitProgress(e) {
@@ -1321,7 +1321,7 @@ let be = class extends te {
     this._doneCalculationTaskCount = 0, this._totalCalculationTaskCount = 0, this._emitProgress();
   }
   dispose() {
-    super.dispose(), this._progress$.next(ra), this._progress$.complete();
+    super.dispose(), this._progress$.next(oa), this._progress$.complete();
   }
   _commandExecutedListener() {
     this.disposeWithMe(
@@ -1329,12 +1329,12 @@ let be = class extends te {
         if (this._activeDirtyManagerService.get(e.id)) {
           if (e.id === ie.id) {
             const i = e.params;
-            if (a && a.onlyLocal === !0 || i.trigger === xt.id || i.trigger === ba.id || i.trigger === Oa.id)
+            if (a && a.onlyLocal === !0 || i.trigger === _t.id || i.trigger === Oa.id || i.trigger === Ma.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(Ae.id, { ...this._executingDirtyData }, pt) : (this._restartCalculation = !0, this._commandService.executeCommand(kt.id, {})), 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($t.id, {})), this._waitingCommandQueue = [];
           }, 100);
         }
       })
@@ -1357,7 +1357,7 @@ let be = class extends te {
       dirtyUnitOtherFormulaMap: u,
       forceCalculation: !1,
       clearDependencyTreeCache: m,
-      maxIteration: this._configService.getConfig($t)
+      maxIteration: this._configService.getConfig(jt)
       // numfmtItemMap,
     };
   }
@@ -1418,11 +1418,11 @@ let be = class extends te {
     this.disposeWithMe(
       // eslint-disable-next-line max-lines-per-function, complexity
       this._commandService.onCommandExecuted((i) => {
-        if (i.id === Ae.id) {
+        if (i.id === Se.id) {
           const { forceCalculation: o = !1 } = i.params;
           o && (this._forceCalculating = !0);
-        } else i.id === kt.id && this.clearProgress();
-        if (i.id !== Pn.id)
+        } else i.id === $t.id && this.clearProgress();
+        if (i.id !== Tn.id)
           return;
         const r = i.params;
         if (r.stageInfo != null) {
@@ -1453,25 +1453,25 @@ let be = class extends te {
           const o = r.functionsExecutedState;
           let u = "";
           switch (a--, o) {
-            case Ne.NOT_EXECUTED:
+            case Re.NOT_EXECUTED:
               u = "No tasks are being executed anymore", this._resetExecutingDirtyData();
               break;
-            case Ne.STOP_EXECUTION:
+            case Re.STOP_EXECUTION:
               u = "The execution of the formula has been stopped", a = 0;
               break;
-            case Ne.SUCCESS:
+            case Re.SUCCESS:
               u = "Formula calculation succeeded", (a === 0 || a === -1) && (u += `. Total time consumed: ${performance.now() - this._startExecutionTime} ms`), this._resetExecutingDirtyData();
               break;
-            case Ne.INITIAL:
+            case Re.INITIAL:
               u = "Waiting for calculation", this._resetExecutingDirtyData();
               break;
           }
-          (a === 0 || a === -1) && (e ? (clearTimeout(e), e = null, this.clearProgress()) : this._completeProgress(), a = 0, this._doneCalculationTaskCount = 0, this._totalCalculationTaskCount = 0, this._forceCalculating = !1), o === Ne.STOP_EXECUTION && this._restartCalculation ? (this._restartCalculation = !1, this._commandService.executeCommand(
-            Ae.id,
+          (a === 0 || a === -1) && (e ? (clearTimeout(e), e = null, this.clearProgress()) : this._completeProgress(), a = 0, this._doneCalculationTaskCount = 0, this._totalCalculationTaskCount = 0, this._forceCalculating = !1), o === Re.STOP_EXECUTION && this._restartCalculation ? (this._restartCalculation = !1, this._commandService.executeCommand(
+            Se.id,
             {
               ...this._executingDirtyData
             },
-            pt
+            dt
           )) : this._executionInProgressParams = null, this._logService.debug("[TriggerCalculationController]", u);
         }
       })
@@ -1490,7 +1490,7 @@ let be = class extends te {
   }
   _initialExecuteFormula() {
     const e = this._getDirtyDataByCalculationMode(this._calculationMode);
-    this._commandService.executeCommand(Ae.id, e, pt), this._registerOtherFormulaService.calculateStarted$.next(!0);
+    this._commandService.executeCommand(Se.id, e, dt), this._registerOtherFormulaService.calculateStarted$.next(!0);
   }
   _getDirtyDataByCalculationMode(e) {
     const a = e === ne.FORCED, i = e === ne.WHEN_EMPTY ? this._formulaDataModel.getFormulaDirtyRanges() : [];
@@ -1502,25 +1502,25 @@ let be = class extends te {
       dirtyUnitFeatureMap: {},
       dirtyUnitOtherFormulaMap: {},
       clearDependencyTreeCache: {},
-      maxIteration: this._configService.getConfig($t)
+      maxIteration: this._configService.getConfig(jt)
     };
   }
 };
-be = hi([
-  le(0, pe),
-  le(1, yt),
+Oe = Ui([
+  le(0, de),
+  le(1, gt),
   le(2, Xa),
   le(3, _e),
-  le(4, W(nt)),
-  le(5, W(bt)),
-  le(6, W(We))
-], be);
-var Ui = Object.defineProperty, Fi = Object.getOwnPropertyDescriptor, Bi = (n, e, a, i) => {
-  for (var r = i > 1 ? void 0 : i ? Fi(e, a) : e, o = n.length - 1, u; o >= 0; o--)
+  le(4, W(it)),
+  le(5, W(Ot)),
+  le(6, W(Ke))
+], Oe);
+var Fi = Object.defineProperty, Bi = Object.getOwnPropertyDescriptor, vi = (n, e, a, i) => {
+  for (var r = i > 1 ? void 0 : i ? Bi(e, a) : e, o = n.length - 1, u; o >= 0; o--)
     (u = n[o]) && (r = (i ? u(e, a, r) : u(r)) || r);
-  return i && r && Ui(e, a, r), r;
+  return i && r && Fi(e, a, r), r;
 }, me = (n, e) => (a, i) => e(a, i, n);
-let Ke = class extends te {
+let Qe = class extends te {
   constructor(n, e, a, i, r, o, u, m) {
     super(), this._univerInstanceService = n, this._commandService = e, this._lexerTreeBuilder = a, this._formulaDataModel = i, this._sheetInterceptorService = r, this._definedNamesService = o, this._configService = u, this._injector = m, this._commandExecutedListener();
   }
@@ -1539,12 +1539,12 @@ let Ke = class extends te {
       this._commandService.beforeCommandExecuted((n, e) => {
         if (n.id === ie.id) {
           const a = n.params;
-          if (e && e.onlyLocal === !0 || a.trigger === xt.id || a.trigger === ba.id || a.trigger === Oa.id)
+          if (e && e.onlyLocal === !0 || a.trigger === _t.id || a.trigger === Oa.id || a.trigger === Ma.id)
             return;
           this._handleSetRangeValuesMutation(a);
         }
       })
-    ), this.disposeWithMe(this._univerInstanceService.getTypeOfUnitAdded$(ee.UNIVER_SHEET).subscribe((n) => this._handleWorkbookAdded(n))), this.disposeWithMe(this._univerInstanceService.getTypeOfUnitDisposed$(ee.UNIVER_SHEET).pipe(Fn((n) => n.getUnitId())).subscribe((n) => this._handleWorkbookDisposed(n)));
+    ), this.disposeWithMe(this._univerInstanceService.getTypeOfUnitAdded$(ee.UNIVER_SHEET).subscribe((n) => this._handleWorkbookAdded(n))), this.disposeWithMe(this._univerInstanceService.getTypeOfUnitDisposed$(ee.UNIVER_SHEET).pipe(Bn((n) => n.getUnitId())).subscribe((n) => this._handleWorkbookDisposed(n)));
   }
   _handleSetRangeValuesMutation(n) {
     const { subUnitId: e, unitId: a, cellValue: i } = n;
@@ -1560,7 +1560,7 @@ let Ke = class extends te {
       {
         unitId: a,
         subUnitId: e,
-        cellValue: fi(r)
+        cellValue: ci(r)
       },
       {
         onlyLocal: !0,
@@ -1588,7 +1588,7 @@ let Ke = class extends te {
     );
   }
   _handleWorkbookDisposed(n, e) {
-    const a = this._formulaDataModel.getFormulaData(), i = ft(a, n, e), r = this._formulaDataModel.getArrayFormulaRange(), o = ft(r, n, e), u = this._formulaDataModel.getArrayFormulaCellData(), m = ft(u, n, e);
+    const a = this._formulaDataModel.getFormulaData(), i = ct(a, n, e), r = this._formulaDataModel.getArrayFormulaRange(), o = ct(r, n, e), u = this._formulaDataModel.getArrayFormulaCellData(), m = ct(u, n, e);
     i && this._commandService.executeCommand(
       he.id,
       {
@@ -1609,7 +1609,7 @@ let Ke = class extends te {
     );
   }
   _handleInsertSheetMutation(n) {
-    const { sheet: e, unitId: a } = n, i = this._formulaDataModel.getFormulaData(), { id: r, cellData: o } = e, u = new X(o), m = jt(i, a, r, u);
+    const { sheet: e, unitId: a } = n, i = this._formulaDataModel.getFormulaData(), { id: r, cellData: o } = e, u = new w(o), m = zt(i, a, r, u);
     this._commandService.executeCommand(
       he.id,
       {
@@ -1625,11 +1625,11 @@ let Ke = class extends te {
     const e = {}, a = n.getUnitId(), i = { [a]: {} };
     n.getSheets().forEach((s) => {
       var E;
-      const p = s.getCellMatrix(), d = s.getSheetId(), L = jt(e, a, d, p);
+      const p = s.getCellMatrix(), d = s.getSheetId(), L = zt(e, a, d, p);
       i[a][d] = (E = L[a]) == null ? void 0 : E[d];
     }), this._commandService.executeCommand(he.id, { formulaData: i }, { onlyLocal: !0 });
-    const o = this._configService.getConfig(rt), u = (f = o == null ? void 0 : o.initialFormulaComputing) != null ? f : ne.WHEN_EMPTY, m = this._getDiryDataByCalculationMode(u);
-    this._commandService.executeCommand(Ae.id, m, { onlyLocal: !0 });
+    const o = this._configService.getConfig(ot), u = (f = o == null ? void 0 : o.initialFormulaComputing) != null ? f : ne.WHEN_EMPTY, m = this._getDiryDataByCalculationMode(u);
+    this._commandService.executeCommand(Se.id, m, { onlyLocal: !0 });
   }
   _getDiryDataByCalculationMode(n) {
     const e = n === ne.FORCED, a = n === ne.WHEN_EMPTY ? this._formulaDataModel.getFormulaDirtyRanges() : [];
@@ -1650,13 +1650,13 @@ let Ke = class extends te {
         undos: [],
         redos: []
       };
-    const a = Fa(e, n);
+    const a = Ba(e, n);
     if (a) {
       const { unitSheetNameMap: i } = this._formulaDataModel.getCalculateData(), r = this._formulaDataModel.getFormulaData(), { newFormulaData: o } = this._getFormulaReferenceMoveInfo(
         r,
         i,
         a
-      ), { undos: u, redos: m } = Yn(r, o, a);
+      ), { undos: u, redos: m } = wn(r, o, a);
       return {
         undos: u,
         redos: m
@@ -1669,7 +1669,7 @@ let Ke = class extends te {
   }
   // eslint-disable-next-line max-lines-per-function
   _getFormulaReferenceMoveInfo(n, e, a) {
-    if (!Ie.isDefine(n)) return { newFormulaData: {}, oldFormulaData: {} };
+    if (!Ne.isDefine(n)) return { newFormulaData: {}, oldFormulaData: {} };
     const i = Object.keys(n);
     if (i.length === 0) return { newFormulaData: {}, oldFormulaData: {} };
     const r = {}, o = {};
@@ -1678,9 +1678,9 @@ let Ke = class extends te {
       if (m == null)
         continue;
       const f = Object.keys(m);
-      Ie.isDefine(r[u]) || (r[u] = {}), Ie.isDefine(o[u]) || (o[u] = {});
+      Ne.isDefine(r[u]) || (r[u] = {}), Ne.isDefine(o[u]) || (o[u] = {});
       for (const s of f) {
-        const p = new X(m[s] || {}), d = new X();
+        const p = new w(m[s] || {}), d = new w();
         p.forValue((L, E, I) => {
           var U;
           if (!I) return !0;
@@ -1694,22 +1694,22 @@ let Ke = class extends te {
             if (typeof h == "string")
               continue;
             const { token: V, nodeType: k } = h, { type: b } = a;
-            if ((b === y.SetDefinedName || b === y.RemoveDefinedName) && (k === J.DEFINED_NAME || k === J.FUNCTION)) {
-              const { definedNameId: Le, definedName: Pe } = a;
-              if (Le === void 0 || Pe === void 0)
+            if ((b === q.SetDefinedName || b === q.RemoveDefinedName) && (k === J.DEFINED_NAME || k === J.FUNCTION)) {
+              const { definedNameId: Pe, definedName: Te } = a;
+              if (Pe === void 0 || Te === void 0)
                 continue;
-              const fe = this._definedNamesService.getValueById(u, Le);
+              const fe = this._definedNamesService.getValueById(u, Pe);
               if (fe == null || fe.name !== V)
                 continue;
               P[g] = {
                 ...h,
-                token: b === y.SetDefinedName ? Pe : j.REF
+                token: b === q.SetDefinedName ? Te : j.REF
               }, O = !0, M.push(g);
               continue;
             } else if (k !== J.REFERENCE)
               continue;
-            const de = se(V), { range: ae, sheetName: re, unitId: Q } = de, oe = Q == null || Q.length === 0 ? u : Q, z = ((U = e == null ? void 0 : e[oe]) == null ? void 0 : U[re]) || "";
-            if (!ga(
+            const Le = pe(V), { range: ae, sheetName: re, unitId: Q } = Le, oe = Q == null || Q.length === 0 ? u : Q, z = ((U = e == null ? void 0 : e[oe]) == null ? void 0 : U[re]) || "";
+            if (!ha(
               a.unitId,
               a.sheetId,
               u,
@@ -1718,7 +1718,7 @@ let Ke = class extends te {
               z
             ))
               continue;
-            const qe = {
+            const ye = {
               range: ae,
               sheetId: z,
               unitId: Q,
@@ -1727,30 +1727,30 @@ let Ke = class extends te {
               refOffsetY: N || 0
             };
             let ue = null;
-            if (b === y.SetName) {
+            if (b === q.SetName) {
               const {
-                unitId: Le,
-                sheetId: Pe,
+                unitId: Pe,
+                sheetId: Te,
                 sheetName: fe
               } = a;
-              if (fe == null || z == null || z.length === 0 || Pe !== z)
+              if (fe == null || z == null || z.length === 0 || Te !== z)
                 continue;
-              ue = at({
+              ue = nt({
                 range: ae,
                 sheetName: fe,
                 unitId: Q
               });
-            } else if (b === y.RemoveSheet) {
+            } else if (b === q.RemoveSheet) {
               const {
-                unitId: Le,
-                sheetId: Pe,
+                unitId: Pe,
+                sheetId: Te,
                 sheetName: fe
               } = a;
-              if (z == null || z.length === 0 || Pe !== z)
+              if (z == null || z.length === 0 || Te !== z)
                 continue;
               ue = j.REF;
-            } else b !== y.SetDefinedName && (ue = Ua(
-              qe,
+            } else b !== q.SetDefinedName && (ue = Fa(
+              ye,
               a,
               u,
               s
@@ -1762,7 +1762,7 @@ let Ke = class extends te {
           }
           if (!O)
             return !0;
-          const F = ha(P, M, c, N);
+          const F = Ua(P, M, c, N);
           d.setValue(L, E, {
             f: `=${Xe(F)}`
           });
@@ -1772,19 +1772,19 @@ let Ke = class extends te {
     return { newFormulaData: o };
   }
 };
-Ke = Bi([
+Qe = vi([
   me(0, xe),
-  me(1, pe),
-  me(2, W(_t)),
-  me(3, W(nt)),
-  me(4, W(Mt)),
+  me(1, de),
+  me(2, W(yt)),
+  me(3, W(it)),
+  me(4, W(xt)),
   me(5, qt),
   me(6, _e),
-  me(7, W(tt))
-], Ke);
-const vi = [
+  me(7, W(at))
+], Qe);
+const Vi = [
   {
-    functionName: zt.ARRAY_CONSTRAIN,
+    functionName: Zt.ARRAY_CONSTRAIN,
     functionType: t.Array,
     description: "formula.functionList.ARRAY_CONSTRAIN.description",
     abstract: "formula.functionList.ARRAY_CONSTRAIN.abstract",
@@ -1813,7 +1813,7 @@ const vi = [
     ]
   },
   {
-    functionName: zt.FLATTEN,
+    functionName: Zt.FLATTEN,
     functionType: t.Array,
     description: "formula.functionList.FLATTEN.description",
     abstract: "formula.functionList.FLATTEN.abstract",
@@ -1834,7 +1834,7 @@ const vi = [
       }
     ]
   }
-], Vi = [
+], Gi = [
   {
     functionName: _.BETADIST,
     functionType: t.Compatibility,
@@ -2888,7 +2888,7 @@ const vi = [
       }
     ]
   }
-], Gi = [
+], Hi = [
   {
     functionName: ce.CUBEKPIMEMBER,
     functionType: t.Cube,
@@ -3043,7 +3043,7 @@ const vi = [
       }
     ]
   }
-], Hi = [
+], Yi = [
   {
     functionName: $.DAVERAGE,
     functionType: t.Database,
@@ -3392,7 +3392,7 @@ const vi = [
       }
     ]
   }
-], Yi = [
+], wi = [
   {
     functionName: B.DATE,
     functionType: t.Date,
@@ -5037,7 +5037,7 @@ const vi = [
       }
     ]
   }
-], wi = [
+], Wi = [
   {
     functionName: C.ACCRINT,
     functionType: t.Financial,
@@ -7298,7 +7298,7 @@ const vi = [
       }
     ]
   }
-], Wi = [
+], Ki = [
   {
     functionName: v.CELL,
     functionType: t.Information,
@@ -7707,7 +7707,7 @@ const vi = [
       }
     ]
   }
-], Ki = [
+], Qi = [
   {
     functionName: K.AND,
     functionType: t.Logical,
@@ -8181,9 +8181,9 @@ const vi = [
       }
     ]
   }
-], Qi = [
+], ki = [
   {
-    functionName: q.ADDRESS,
+    functionName: y.ADDRESS,
     functionType: t.Lookup,
     description: "formula.functionList.ADDRESS.description",
     abstract: "formula.functionList.ADDRESS.abstract",
@@ -8226,7 +8226,7 @@ const vi = [
     ]
   },
   {
-    functionName: q.AREAS,
+    functionName: y.AREAS,
     functionType: t.Lookup,
     description: "formula.functionList.AREAS.description",
     abstract: "formula.functionList.AREAS.abstract",
@@ -8241,7 +8241,7 @@ const vi = [
     ]
   },
   {
-    functionName: q.CHOOSE,
+    functionName: y.CHOOSE,
     functionType: t.Lookup,
     description: "formula.functionList.CHOOSE.description",
     abstract: "formula.functionList.CHOOSE.abstract",
@@ -8270,7 +8270,7 @@ const vi = [
     ]
   },
   {
-    functionName: q.CHOOSECOLS,
+    functionName: y.CHOOSECOLS,
     functionType: t.Lookup,
     description: "formula.functionList.CHOOSECOLS.description",
     abstract: "formula.functionList.CHOOSECOLS.abstract",
@@ -8299,7 +8299,7 @@ const vi = [
     ]
   },
   {
-    functionName: q.CHOOSEROWS,
+    functionName: y.CHOOSEROWS,
     functionType: t.Lookup,
     description: "formula.functionList.CHOOSEROWS.description",
     abstract: "formula.functionList.CHOOSEROWS.abstract",
@@ -8328,7 +8328,7 @@ const vi = [
     ]
   },
   {
-    functionName: q.COLUMN,
+    functionName: y.COLUMN,
     functionType: t.Lookup,
     description: "formula.functionList.COLUMN.description",
     abstract: "formula.functionList.COLUMN.abstract",
@@ -8343,7 +8343,7 @@ const vi = [
     ]
   },
   {
-    functionName: q.COLUMNS,
+    functionName: y.COLUMNS,
     functionType: t.Lookup,
     description: "formula.functionList.COLUMNS.description",
     abstract: "formula.functionList.COLUMNS.abstract",
@@ -8358,7 +8358,7 @@ const vi = [
     ]
   },
   {
-    functionName: q.DROP,
+    functionName: y.DROP,
     functionType: t.Lookup,
     description: "formula.functionList.DROP.description",
     abstract: "formula.functionList.DROP.abstract",
@@ -8387,7 +8387,7 @@ const vi = [
     ]
   },
   {
-    functionName: q.EXPAND,
+    functionName: y.EXPAND,
     functionType: t.Lookup,
     description: "formula.functionList.EXPAND.description",
     abstract: "formula.functionList.EXPAND.abstract",
@@ -8423,7 +8423,7 @@ const vi = [
     ]
   },
   {
-    functionName: q.FILTER,
+    functionName: y.FILTER,
     functionType: t.Lookup,
     description: "formula.functionList.FILTER.description",
     abstract: "formula.functionList.FILTER.abstract",
@@ -8452,7 +8452,7 @@ const vi = [
     ]
   },
   {
-    functionName: q.FORMULATEXT,
+    functionName: y.FORMULATEXT,
     functionType: t.Lookup,
     description: "formula.functionList.FORMULATEXT.description",
     abstract: "formula.functionList.FORMULATEXT.abstract",
@@ -8467,7 +8467,7 @@ const vi = [
     ]
   },
   {
-    functionName: q.GETPIVOTDATA,
+    functionName: y.GETPIVOTDATA,
     functionType: t.Lookup,
     description: "formula.functionList.GETPIVOTDATA.description",
     abstract: "formula.functionList.GETPIVOTDATA.abstract",
@@ -8489,7 +8489,7 @@ const vi = [
     ]
   },
   {
-    functionName: q.HLOOKUP,
+    functionName: y.HLOOKUP,
     functionType: t.Lookup,
     description: "formula.functionList.HLOOKUP.description",
     abstract: "formula.functionList.HLOOKUP.abstract",
@@ -8525,7 +8525,7 @@ const vi = [
     ]
   },
   {
-    functionName: q.HSTACK,
+    functionName: y.HSTACK,
     functionType: t.Lookup,
     description: "formula.functionList.HSTACK.description",
     abstract: "formula.functionList.HSTACK.abstract",
@@ -8547,7 +8547,7 @@ const vi = [
     ]
   },
   {
-    functionName: q.HYPERLINK,
+    functionName: y.HYPERLINK,
     functionType: t.Lookup,
     description: "formula.functionList.HYPERLINK.description",
     abstract: "formula.functionList.HYPERLINK.abstract",
@@ -8569,7 +8569,7 @@ const vi = [
     ]
   },
   {
-    functionName: q.IMAGE,
+    functionName: y.IMAGE,
     functionType: t.Lookup,
     description: "formula.functionList.IMAGE.description",
     abstract: "formula.functionList.IMAGE.abstract",
@@ -8591,7 +8591,7 @@ const vi = [
     ]
   },
   {
-    functionName: q.INDEX,
+    functionName: y.INDEX,
     functionType: t.Lookup,
     description: "formula.functionList.INDEX.description",
     abstract: "formula.functionList.INDEX.abstract",
@@ -8627,7 +8627,7 @@ const vi = [
     ]
   },
   {
-    functionName: q.INDIRECT,
+    functionName: y.INDIRECT,
     functionType: t.Lookup,
     description: "formula.functionList.INDIRECT.description",
     abstract: "formula.functionList.INDIRECT.abstract",
@@ -8649,7 +8649,7 @@ const vi = [
     ]
   },
   {
-    functionName: q.LOOKUP,
+    functionName: y.LOOKUP,
     functionType: t.Lookup,
     description: "formula.functionList.LOOKUP.description",
     abstract: "formula.functionList.LOOKUP.abstract",
@@ -8678,7 +8678,7 @@ const vi = [
     ]
   },
   {
-    functionName: q.MATCH,
+    functionName: y.MATCH,
     functionType: t.Lookup,
     description: "formula.functionList.MATCH.description",
     abstract: "formula.functionList.MATCH.abstract",
@@ -8707,7 +8707,7 @@ const vi = [
     ]
   },
   {
-    functionName: q.OFFSET,
+    functionName: y.OFFSET,
     functionType: t.Lookup,
     description: "formula.functionList.OFFSET.description",
     abstract: "formula.functionList.OFFSET.abstract",
@@ -8750,7 +8750,7 @@ const vi = [
     ]
   },
   {
-    functionName: q.ROW,
+    functionName: y.ROW,
     functionType: t.Lookup,
     description: "formula.functionList.ROW.description",
     abstract: "formula.functionList.ROW.abstract",
@@ -8765,7 +8765,7 @@ const vi = [
     ]
   },
   {
-    functionName: q.ROWS,
+    functionName: y.ROWS,
     functionType: t.Lookup,
     description: "formula.functionList.ROWS.description",
     abstract: "formula.functionList.ROWS.abstract",
@@ -8780,7 +8780,7 @@ const vi = [
     ]
   },
   {
-    functionName: q.RTD,
+    functionName: y.RTD,
     functionType: t.Lookup,
     description: "formula.functionList.RTD.description",
     abstract: "formula.functionList.RTD.abstract",
@@ -8802,7 +8802,7 @@ const vi = [
     ]
   },
   {
-    functionName: q.SORT,
+    functionName: y.SORT,
     functionType: t.Lookup,
     description: "formula.functionList.SORT.description",
     abstract: "formula.functionList.SORT.abstract",
@@ -8838,7 +8838,7 @@ const vi = [
     ]
   },
   {
-    functionName: q.SORTBY,
+    functionName: y.SORTBY,
     functionType: t.Lookup,
     description: "formula.functionList.SORTBY.description",
     abstract: "formula.functionList.SORTBY.abstract",
@@ -8881,7 +8881,7 @@ const vi = [
     ]
   },
   {
-    functionName: q.TAKE,
+    functionName: y.TAKE,
     functionType: t.Lookup,
     description: "formula.functionList.TAKE.description",
     abstract: "formula.functionList.TAKE.abstract",
@@ -8910,7 +8910,7 @@ const vi = [
     ]
   },
   {
-    functionName: q.TOCOL,
+    functionName: y.TOCOL,
     functionType: t.Lookup,
     description: "formula.functionList.TOCOL.description",
     abstract: "formula.functionList.TOCOL.abstract",
@@ -8939,7 +8939,7 @@ const vi = [
     ]
   },
   {
-    functionName: q.TOROW,
+    functionName: y.TOROW,
     functionType: t.Lookup,
     description: "formula.functionList.TOROW.description",
     abstract: "formula.functionList.TOROW.abstract",
@@ -8968,7 +8968,7 @@ const vi = [
     ]
   },
   {
-    functionName: q.TRANSPOSE,
+    functionName: y.TRANSPOSE,
     functionType: t.Lookup,
     description: "formula.functionList.TRANSPOSE.description",
     abstract: "formula.functionList.TRANSPOSE.abstract",
@@ -8983,7 +8983,7 @@ const vi = [
     ]
   },
   {
-    functionName: q.UNIQUE,
+    functionName: y.UNIQUE,
     functionType: t.Lookup,
     description: "formula.functionList.UNIQUE.description",
     abstract: "formula.functionList.UNIQUE.abstract",
@@ -9012,7 +9012,7 @@ const vi = [
     ]
   },
   {
-    functionName: q.VLOOKUP,
+    functionName: y.VLOOKUP,
     functionType: t.Lookup,
     description: "formula.functionList.VLOOKUP.description",
     abstract: "formula.functionList.VLOOKUP.abstract",
@@ -9048,7 +9048,7 @@ const vi = [
     ]
   },
   {
-    functionName: q.VSTACK,
+    functionName: y.VSTACK,
     functionType: t.Lookup,
     description: "formula.functionList.VSTACK.description",
     abstract: "formula.functionList.VSTACK.abstract",
@@ -9070,7 +9070,7 @@ const vi = [
     ]
   },
   {
-    functionName: q.WRAPCOLS,
+    functionName: y.WRAPCOLS,
     functionType: t.Lookup,
     description: "formula.functionList.WRAPCOLS.description",
     abstract: "formula.functionList.WRAPCOLS.abstract",
@@ -9099,7 +9099,7 @@ const vi = [
     ]
   },
   {
-    functionName: q.WRAPROWS,
+    functionName: y.WRAPROWS,
     functionType: t.Lookup,
     description: "formula.functionList.WRAPROWS.description",
     abstract: "formula.functionList.WRAPROWS.abstract",
@@ -9128,7 +9128,7 @@ const vi = [
     ]
   },
   {
-    functionName: q.XLOOKUP,
+    functionName: y.XLOOKUP,
     functionType: t.Lookup,
     description: "formula.functionList.XLOOKUP.description",
     abstract: "formula.functionList.XLOOKUP.abstract",
@@ -9178,7 +9178,7 @@ const vi = [
     ]
   },
   {
-    functionName: q.XMATCH,
+    functionName: y.XMATCH,
     functionType: t.Lookup,
     description: "formula.functionList.XMATCH.description",
     abstract: "formula.functionList.XMATCH.abstract",
@@ -9213,7 +9213,7 @@ const vi = [
       }
     ]
   }
-], ki = [
+], $i = [
   {
     functionName: T.ABS,
     functionType: t.Math,
@@ -10851,7 +10851,7 @@ const vi = [
       }
     ]
   }
-], $i = [
+], ji = [
   {
     functionName: l.AVEDEV,
     functionType: t.Statistical,
@@ -13793,7 +13793,7 @@ const vi = [
       }
     ]
   }
-], ji = [
+], zi = [
   {
     functionName: D.ASC,
     functionType: t.Text,
@@ -14985,9 +14985,9 @@ const vi = [
       }
     ]
   }
-], zi = [], Zi = [
+], Zi = [], Ji = [
   {
-    functionName: mt.ENCODEURL,
+    functionName: ft.ENCODEURL,
     functionType: t.Web,
     description: "formula.functionList.ENCODEURL.description",
     abstract: "formula.functionList.ENCODEURL.abstract",
@@ -15002,7 +15002,7 @@ const vi = [
     ]
   },
   {
-    functionName: mt.FILTERXML,
+    functionName: ft.FILTERXML,
     functionType: t.Web,
     description: "formula.functionList.FILTERXML.description",
     abstract: "formula.functionList.FILTERXML.abstract",
@@ -15024,7 +15024,7 @@ const vi = [
     ]
   },
   {
-    functionName: mt.WEBSERVICE,
+    functionName: ft.WEBSERVICE,
     functionType: t.Web,
     description: "formula.functionList.WEBSERVICE.description",
     abstract: "formula.functionList.WEBSERVICE.abstract",
@@ -15045,36 +15045,36 @@ const vi = [
       }
     ]
   }
-], Ji = [
+], er = [
+  ...Wi,
   ...wi,
-  ...Yi,
-  ...ki,
   ...$i,
-  ...Qi,
-  ...Hi,
   ...ji,
+  ...ki,
+  ...Yi,
+  ...zi,
+  ...Qi,
   ...Ki,
-  ...Wi,
   ...Xi,
+  ...Hi,
   ...Gi,
+  ...Ji,
   ...Vi,
-  ...Zi,
-  ...vi,
-  ...zi
+  ...Zi
 ];
-function er(n, e) {
+function tr(n, e) {
   let a = "";
   return n.aliasFunctionName ? (a = e.t(n.aliasFunctionName), a === n.aliasFunctionName && (a = n.functionName)) : a = n.functionName, a;
 }
-var tr = Object.defineProperty, ar = Object.getOwnPropertyDescriptor, nr = (n, e, a, i) => {
-  for (var r = i > 1 ? void 0 : i ? ar(e, a) : e, o = n.length - 1, u; o >= 0; o--)
+var ar = Object.defineProperty, nr = Object.getOwnPropertyDescriptor, ir = (n, e, a, i) => {
+  for (var r = i > 1 ? void 0 : i ? nr(e, a) : e, o = n.length - 1, u; o >= 0; o--)
     (u = n[o]) && (r = (i ? u(e, a, r) : u(r)) || r);
-  return i && r && tr(e, a, r), r;
-}, dt = (n, e) => (a, i) => e(a, i, n);
-const ht = Ot("formula.description-service");
-let St = class {
+  return i && r && ar(e, a, r), r;
+}, Lt = (n, e) => (a, i) => e(a, i, n);
+const Ut = Mt("formula.description-service");
+let Ct = class {
   constructor(n, e, a) {
-    w(this, "_descriptions", []);
+    X(this, "_descriptions", []);
     this._functionService = n, this._localeService = e, this._configService = a, this._initialize();
   }
   dispose() {
@@ -15111,7 +15111,7 @@ let St = class {
     }), e;
   }
   registerDescriptions(n) {
-    return this._descriptions = this._descriptions.concat(n), this._registerDescriptions(), Oe(() => {
+    return this._descriptions = this._descriptions.concat(n), this._registerDescriptions(), se(() => {
       const e = n.map((a) => a.functionName);
       this.unregisterDescriptions(e);
     });
@@ -15130,7 +15130,7 @@ let St = class {
     if (e.length === 0)
       return !1;
     const a = e[0].description;
-    return !Tn(a);
+    return !En(a);
   }
   _initialize() {
     this._localeService.localeChanged$.subscribe(() => {
@@ -15140,7 +15140,6 @@ let St = class {
   _initDescription() {
     var i;
     const n = [
-      ...En,
       ...In,
       ...Nn,
       ...Rn,
@@ -15153,15 +15152,16 @@ let St = class {
       ...Mn,
       ...xn,
       ..._n,
-      ...qn,
       ...yn,
-      ...gn
-    ].map((r) => r[1]), e = Ji.filter((r) => n.includes(r.functionName)), a = this._configService.getConfig(rt);
+      ...qn,
+      ...gn,
+      ...hn
+    ].map((r) => r[1]), e = er.filter((r) => n.includes(r.functionName)), a = this._configService.getConfig(ot);
     this._descriptions = e.concat((i = a == null ? void 0 : a.description) != null ? i : []);
   }
   _registerDescriptions() {
     const n = this._localeService, e = this._descriptions.map((a) => ({
-      functionName: er(a, n),
+      functionName: tr(a, n),
       functionType: a.functionType,
       description: n.t(a.description),
       abstract: n.t(a.abstract),
@@ -15176,17 +15176,17 @@ let St = class {
     this._functionService.registerDescriptions(...e);
   }
 };
-St = nr([
-  dt(0, gt),
-  dt(1, W(bt)),
-  dt(2, _e)
-], St);
-var ir = Object.defineProperty, rr = Object.getOwnPropertyDescriptor, or = (n, e, a, i) => {
-  for (var r = i > 1 ? void 0 : i ? rr(e, a) : e, o = n.length - 1, u; o >= 0; o--)
+Ct = ir([
+  Lt(0, ht),
+  Lt(1, W(Ot)),
+  Lt(2, _e)
+], Ct);
+var rr = Object.defineProperty, or = Object.getOwnPropertyDescriptor, ur = (n, e, a, i) => {
+  for (var r = i > 1 ? void 0 : i ? or(e, a) : e, o = n.length - 1, u; o >= 0; o--)
     (u = n[o]) && (r = (i ? u(e, a, r) : u(r)) || r);
-  return i && r && ir(e, a, r), r;
+  return i && r && rr(e, a, r), r;
 }, Fe = (n, e) => (a, i) => e(a, i, n);
-function oa(n, e, a, i) {
+function ua(n, e, a, i) {
   const r = n.sequenceNodesBuilder(e);
   if (r == null)
     return e;
@@ -15195,9 +15195,9 @@ function oa(n, e, a, i) {
     const f = r[u];
     if (typeof f == "string" || f.nodeType !== J.REFERENCE)
       continue;
-    const { token: s } = f, p = se(s), { sheetName: d, unitId: L } = p;
+    const { token: s } = f, p = pe(s), { sheetName: d, unitId: L } = p;
     let E = p.range;
-    E.startAbsoluteRefType === Ye.ALL && E.endAbsoluteRefType === Ye.ALL || (E = Tt(E, a, i), o.push({
+    E.startAbsoluteRefType === we.ALL && E.endAbsoluteRefType === we.ALL || (E = Et(E, a, i), o.push({
       unitId: L,
       sheetName: d,
       range: E
@@ -15205,24 +15205,24 @@ function oa(n, e, a, i) {
   }
   return o.map((u) => `${u.unitId}!${u.sheetName}!${u.range.startRow}!${u.range.endRow}!${u.range.startColumn}!${u.range.endColumn}`).join("|");
 }
-let Ct = class extends te {
+let Dt = class extends te {
   constructor(n, e, a, i) {
     super(), this._refRangeService = n, this._lexerTreeBuilder = e, this._univerInstanceService = a, this._injector = i;
   }
   transformFormulaByEffectCommand(n, e, a, i) {
     const r = this._lexerTreeBuilder.sequenceNodesBuilder(a), 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 d = se(p.token), { range: L, unitId: E, sheetName: I } = d, S = this._univerInstanceService.getUnit(E || n), c = I ? S == null ? void 0 : S.getSheetBySheetName(I) : S == null ? void 0 : S.getSheetBySheetId(e);
+        const d = pe(p.token), { range: L, unitId: E, sheetName: I } = d, S = this._univerInstanceService.getUnit(E || n), 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 P = Vt(L, i);
+        const P = Gt(L, i);
         let O = "";
         if (P) {
-          const M = P.startColumn - L.startColumn, F = P.startRow - L.startRow, U = Tt(L, M, F);
-          E && I ? O = Zt(E, I, U) : I ? O = Jt(I, U) : O = ea(U);
+          const M = P.startColumn - L.startColumn, F = P.startRow - L.startRow, U = Et(L, M, F);
+          E && I ? O = Jt(E, I, U) : I ? O = ea(I, U) : O = ta(U);
         } else
           O = j.REF;
         return {
@@ -15235,17 +15235,17 @@ let Ct = class extends te {
     return s ? `=${Xe(s)}` : "";
   }
   registerFormula(n, e, a, i) {
-    const r = /* @__PURE__ */ new Map(), o = this._lexerTreeBuilder.sequenceNodesBuilder(a), u = new Et(), m = (f) => {
+    const r = /* @__PURE__ */ new Map(), o = this._lexerTreeBuilder.sequenceNodesBuilder(a), u = new Ye(), m = (f) => {
       const s = this._univerInstanceService.getCurrentUnitForType(ee.UNIVER_SHEET), p = s.getActiveSheet(), d = s.getUnitId(), L = p.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 !== d || c.subUnitId !== L)
             return S;
-          const N = Vt(c.range, f);
+          const N = Gt(c.range, f);
           let R = "";
           if (N) {
-            const P = N.startColumn - c.range.startColumn, O = N.startRow - c.range.startRow, M = Tt(c.range, P, 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 = Jt(c.unitId, c.sheetName, M) : c.sheetName ? R = ea(c.sheetName, M) : R = ta(M);
           } else
             R = j.REF;
           return {
@@ -15259,7 +15259,7 @@ let Ct = class extends te {
     };
     return o == null || o.forEach((f) => {
       if (typeof f == "object" && f.nodeType === J.REFERENCE) {
-        const s = se(f.token), { range: p, unitId: d, sheetName: L } = s, E = this._univerInstanceService.getUnit(d || n), I = L ? E == null ? void 0 : E.getSheetBySheetName(L) : E == null ? void 0 : E.getSheetBySheetId(e);
+        const s = pe(f.token), { range: p, unitId: d, sheetName: L } = s, E = this._univerInstanceService.getUnit(d || n), I = L ? E == null ? void 0 : E.getSheetBySheetName(L) : E == null ? void 0 : E.getSheetBySheetId(e);
         if (!I)
           return;
         const S = E.getUnitId(), c = I.getSheetId(), N = {
@@ -15273,11 +15273,11 @@ let Ct = class extends te {
     }), u;
   }
   _getFormulaDependcy(n, e, a, i) {
-    const r = De(a) ? this._lexerTreeBuilder.sequenceNodesBuilder(a) : null, o = [];
+    const r = be(a) ? this._lexerTreeBuilder.sequenceNodesBuilder(a) : 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 === Ye.ALL && f.endAbsoluteRefType === Ye.ALL)
+        const m = pe(u.token), { range: f, unitId: s, sheetName: p } = m;
+        if (f.startAbsoluteRefType === we.ALL && f.endAbsoluteRefType === we.ALL)
           return;
         const d = this._univerInstanceService.getUnit(s || n), L = p ? d == null ? void 0 : d.getSheetBySheetName(p) : d == null ? void 0 : d.getSheetBySheetId(e);
         if (!L)
@@ -15298,8 +15298,8 @@ let Ct = class extends te {
   }
   // eslint-disable-next-line max-lines-per-function
   registerRangeFormula(n, e, a, i, r) {
-    const o = new Et(), u = i.map((f) => this._getFormulaDependcy(n, e, f, a)), m = (f) => {
-      const s = a[0].startRow, p = a[0].startColumn, d = [{ unitId: n, subUnitId: e, ranges: a }, ...u.flat()], L = [], E = mn(this._injector, f);
+    const o = new Ye(), u = i.map((f) => this._getFormulaDependcy(n, e, f, a)), m = (f) => {
+      const s = a[0].startRow, p = a[0].startColumn, d = [{ unitId: n, subUnitId: e, ranges: a }, ...u.flat()], L = [], E = fn(this._injector, f);
       for (const { unitId: I, subUnitId: S, ranges: c } of d)
         if (I === E.unitId && S === E.subUnitId) {
           const N = [], R = c[0].startRow, P = c[0].startColumn, O = R - s, M = P - p;
@@ -15317,19 +15317,19 @@ let Ct = class extends te {
           );
         }
       if (L.length > 0) {
-        const I = Ce.splitIntoGrid([...L.flat()]), S = Ce.subtractMulti(a, I);
+        const I = De.splitIntoGrid([...L.flat()]), S = De.subtractMulti(a, 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((Q, oe) => Q.startRow - oe.startRow || Q.startColumn - oe.startColumn);
+          const M = I[O], F = M.startRow, U = M.startColumn, g = F - s, x = U - p, h = cn(M, f).sort((Q, oe) => Q.startRow - oe.startRow || Q.startColumn - oe.startColumn);
           if (!h.length)
             continue;
-          const V = h[0].startRow, k = h[0].startColumn, b = V - s, de = k - p, ae = [];
+          const V = h[0].startRow, k = h[0].startColumn, b = V - s, Le = k - p, ae = [];
           for (let Q = 0; Q < i.length; Q++) {
-            const oe = i[Q], z = De(oe), qe = z ? this._lexerTreeBuilder.moveFormulaRefOffset(oe, x, g) : oe, ue = z ? this.transformFormulaByEffectCommand(n, e, qe, f) : qe, Le = oa(this._lexerTreeBuilder, ue, -de, -b);
+            const oe = i[Q], z = be(oe), ye = z ? this._lexerTreeBuilder.moveFormulaRefOffset(oe, x, g) : oe, ue = z ? this.transformFormulaByEffectCommand(n, e, ye, f) : ye, Pe = ua(this._lexerTreeBuilder, ue, -Le, -b);
             ae.push({
               newFormula: ue,
-              orginFormula: Le
+              orginFormula: Pe
             });
           }
           const re = {
@@ -15339,13 +15339,13 @@ let Ct = class extends te {
           };
           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) => ua(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: De(x) ? this._lexerTreeBuilder.moveFormulaRefOffset(x, M - p, O - s) : x,
+              newFormula: be(x) ? this._lexerTreeBuilder.moveFormulaRefOffset(x, M - p, O - s) : x,
               orginFormula: x
             });
           }
@@ -15361,7 +15361,7 @@ let Ct = class extends te {
           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 = Ce.mergeRanges(F.map((x) => x.ranges).flat());
+          const g = De.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
@@ -15385,53 +15385,67 @@ let Ct = class extends te {
     }), o;
   }
 };
-Ct = or([
-  Fe(0, W(un)),
-  Fe(1, W(_t)),
+Dt = ur([
+  Fe(0, W(mn)),
+  Fe(1, W(yt)),
   Fe(2, xe),
-  Fe(3, W(tt))
-], Ct);
-var ur = Object.defineProperty, mr = Object.getOwnPropertyDescriptor, fr = (n, e, a, i) => {
-  for (var r = i > 1 ? void 0 : i ? mr(e, a) : e, o = n.length - 1, u; o >= 0; o--)
+  Fe(3, W(at))
+], Dt);
+var mr = Object.defineProperty, fr = Object.getOwnPropertyDescriptor, cr = (n, e, a, i) => {
+  for (var r = i > 1 ? void 0 : i ? fr(e, a) : e, o = n.length - 1, u; o >= 0; o--)
     (u = n[o]) && (r = (i ? u(e, a, r) : u(r)) || r);
-  return i && r && ur(e, a, r), r;
-}, cr = (n, e) => (a, i) => e(a, i, n);
-const Ut = "sheets-formula.remote-register-function.service", Ba = Ot(Ut);
-let Qe = class {
+  return i && r && mr(e, a, r), r;
+}, lr = (n, e) => (a, i) => e(a, i, n);
+const Ft = "sheets-formula.remote-register-function.service", va = Mt(Ft);
+let ke = class {
   constructor(n) {
     this._functionService = n;
   }
   async registerFunctions(n) {
-    const e = n.map(([a, i]) => lr(a, i));
+    const e = n.map(([a, i]) => sr(a, i));
+    this._functionService.registerExecutors(...e);
+  }
+  async registerAsyncFunctions(n) {
+    const e = n.map(([a, i]) => pr(a, i));
     this._functionService.registerExecutors(...e);
   }
   async unregisterFunctions(n) {
     this._functionService.unregisterDescriptions(...n);
   }
 };
-Qe = fr([
-  cr(0, gt)
-], Qe);
-function lr(n, e) {
-  const a = new Ma(e), i = new Function(`return ${n}`)();
+ke = cr([
+  lr(0, ht)
+], ke);
+function sr(n, e) {
+  const a = new At(e), i = new Function(`return ${n}`)();
+  return a.calculateCustom = i, a;
+}
+function pr(n, e) {
+  const a = new xa(e), i = new Function(`return ${n}`)();
   return a.calculateCustom = i, a;
 }
-var sr = Object.defineProperty, pr = Object.getOwnPropertyDescriptor, dr = (n, e, a, i) => {
-  for (var r = i > 1 ? void 0 : i ? pr(e, a) : e, o = n.length - 1, u; o >= 0; o--)
+var dr = Object.defineProperty, Lr = Object.getOwnPropertyDescriptor, Pr = (n, e, a, i) => {
+  for (var r = i > 1 ? void 0 : i ? Lr(e, a) : e, o = n.length - 1, u; o >= 0; o--)
     (u = n[o]) && (r = (i ? u(e, a, r) : u(r)) || r);
-  return i && r && sr(e, a, r), r;
+  return i && r && dr(e, a, r), r;
 }, Be = (n, e) => (a, i) => e(a, i, n);
-const Lr = Ot(
+const Tr = Mt(
   "sheets-formula.register-function-service"
 );
-let Dt = class extends te {
+let bt = class extends te {
   constructor(n, e, a, i) {
     super(), this._localeService = n, this._descriptionService = e, this._functionService = a, this._remoteRegisterFunctionService = i;
   }
+  registerFunction(n) {
+    return this._registerSingleFunction(n);
+  }
+  registerAsyncFunction(n) {
+    return this._registerSingleFunction({ ...n, async: !0 });
+  }
   registerFunctions(n) {
     const { locales: e, description: a, calculate: i } = n;
     e && this._localeService.load(e);
-    const r = new Et();
+    const r = new Ye();
     if (a)
       r.add(this._descriptionService.registerDescriptions(a));
     else {
@@ -15446,31 +15460,49 @@ let Dt = class extends te {
     }
     return r.add(this._registerLocalExecutors(i)), this._remoteRegisterFunctionService && r.add(this._registerRemoteExecutors(i)), r;
   }
+  _registerSingleFunction(n) {
+    const { name: e, func: a, description: i, locales: r, async: o = !1 } = n, u = new Ye();
+    if (r && this._localeService.load(r), typeof i == "string") {
+      const f = {
+        functionName: e,
+        functionType: t.User,
+        description: i,
+        abstract: i || "",
+        functionParameter: []
+      };
+      u.add(this._descriptionService.registerDescriptions([f]));
+    } else
+      u.add(this._descriptionService.registerDescriptions([i]));
+    const m = o ? new xa(e) : new At(e);
+    return m.calculateCustom = a, this._functionService.registerExecutors(m), u.add(se(() => this._functionService.unregisterExecutors(e))), this._remoteRegisterFunctionService && (this._remoteRegisterFunctionService.registerAsyncFunctions([[a.toString(), e]]), u.add(
+      se(() => this._remoteRegisterFunctionService.unregisterFunctions([e]))
+    )), u;
+  }
   _registerLocalExecutors(n) {
     const e = n.map(([i, r]) => r), a = n.map(([i, r]) => {
-      const o = new Ma(r);
+      const o = new At(r);
       return o.calculateCustom = i, o;
     });
-    return this._functionService.registerExecutors(...a), Oe(() => this._functionService.unregisterExecutors(...e));
+    return this._functionService.registerExecutors(...a), se(() => this._functionService.unregisterExecutors(...e));
   }
   _registerRemoteExecutors(n) {
     const e = [], a = n.map(([i, r]) => (e.push(r), [i.toString(), r]));
-    return this._remoteRegisterFunctionService.registerFunctions(a), Oe(() => this._remoteRegisterFunctionService.unregisterFunctions(e));
+    return this._remoteRegisterFunctionService.registerFunctions(a), se(() => this._remoteRegisterFunctionService.unregisterFunctions(e));
   }
 };
-Dt = dr([
-  Be(0, W(bt)),
-  Be(1, W(ht)),
-  Be(2, gt),
-  Be(3, wa(Ba))
-], Dt);
-const Pr = "SHEETS_FORMULA_PLUGIN";
-var Tr = Object.defineProperty, Er = Object.getOwnPropertyDescriptor, Ir = (n, e, a, i) => {
-  for (var r = i > 1 ? void 0 : i ? Er(e, a) : e, o = n.length - 1, u; o >= 0; o--)
+bt = Pr([
+  Be(0, W(Ot)),
+  Be(1, W(Ut)),
+  Be(2, ht),
+  Be(3, Wa(va))
+], bt);
+const Er = "SHEETS_FORMULA_PLUGIN";
+var Ir = Object.defineProperty, Nr = Object.getOwnPropertyDescriptor, Rr = (n, e, a, i) => {
+  for (var r = i > 1 ? void 0 : i ? Nr(e, a) : e, o = n.length - 1, u; o >= 0; o--)
     (u = n[o]) && (r = (i ? u(e, a, r) : u(r)) || r);
-  return i && r && Tr(e, a, r), r;
-}, Lt = (n, e) => (a, i) => e(a, i, n);
-let ke = class extends te {
+  return i && r && Ir(e, a, r), r;
+}, Pt = (n, e) => (a, i) => e(a, i, n);
+let $e = class extends te {
   constructor(n, e, a) {
     super(), this._activeDirtyManagerService = n, this._univerInstanceService = e, this._formulaDataModel = a, this._initialize();
   }
@@ -15482,15 +15514,15 @@ let ke = class extends te {
       commandId: ie.id,
       getDirtyData: (n) => {
         const e = n.params;
-        return e.trigger === xt.id ? {} : {
+        return e.trigger === _t.id ? {} : {
           dirtyRanges: this._getSetRangeValuesMutationDirtyRange(e)
         };
       }
     }), this._initialMove(), this._initialRowAndColumn(), this._initialSheet(), this._initialDefinedName();
   }
   _initialMove() {
-    this._activeDirtyManagerService.register(Gt.id, {
-      commandId: Gt.id,
+    this._activeDirtyManagerService.register(Ht.id, {
+      commandId: Ht.id,
       getDirtyData: (n) => {
         const e = n.params;
         return {
@@ -15503,8 +15535,8 @@ let ke = class extends te {
           }
         };
       }
-    }), this._activeDirtyManagerService.register(Ht.id, {
-      commandId: Ht.id,
+    }), this._activeDirtyManagerService.register(Yt.id, {
+      commandId: Yt.id,
       getDirtyData: (n) => {
         const e = n.params;
         return {
@@ -15516,8 +15548,8 @@ let ke = class extends te {
           }
         };
       }
-    }), this._activeDirtyManagerService.register(Yt.id, {
-      commandId: Yt.id,
+    }), this._activeDirtyManagerService.register(wt.id, {
+      commandId: wt.id,
       getDirtyData: (n) => {
         const e = n.params;
         return {
@@ -15545,8 +15577,8 @@ let ke = class extends te {
     });
   }
   _initialRowAndColumn() {
-    this._activeDirtyManagerService.register(wt.id, {
-      commandId: wt.id,
+    this._activeDirtyManagerService.register(Wt.id, {
+      commandId: Wt.id,
       getDirtyData: (n) => {
         const e = n.params;
         return {
@@ -15558,8 +15590,8 @@ let ke = class extends te {
           }
         };
       }
-    }), this._activeDirtyManagerService.register(Wt.id, {
-      commandId: Wt.id,
+    }), this._activeDirtyManagerService.register(Kt.id, {
+      commandId: Kt.id,
       getDirtyData: (n) => {
         const e = n.params;
         return {
@@ -15571,8 +15603,8 @@ let ke = class extends te {
           }
         };
       }
-    }), this._activeDirtyManagerService.register(Kt.id, {
-      commandId: Kt.id,
+    }), this._activeDirtyManagerService.register(Qt.id, {
+      commandId: Qt.id,
       getDirtyData: (n) => {
         const e = n.params;
         return {
@@ -15583,8 +15615,8 @@ let ke = class extends te {
           }
         };
       }
-    }), this._activeDirtyManagerService.register(Qt.id, {
-      commandId: Qt.id,
+    }), this._activeDirtyManagerService.register(kt.id, {
+      commandId: kt.id,
       getDirtyData: (n) => {
         const e = n.params;
         return {
@@ -15628,8 +15660,8 @@ let ke = class extends te {
         const e = n.params;
         return { dirtyDefinedNameMap: this._getDefinedNameMutation(e) };
       }
-    }), this._activeDirtyManagerService.register(At.id, {
-      commandId: At.id,
+    }), this._activeDirtyManagerService.register(St.id, {
+      commandId: St.id,
       getDirtyData: (n) => {
         const e = n.params;
         return { dirtyDefinedNameMap: this._getDefinedNameMutation(e) };
@@ -15657,15 +15689,15 @@ let ke = class extends te {
     return o.push(...this._getDirtyRangesByCellValue(e, a, r)), o.push(...this._getDirtyRangesForArrayFormula(e, a, r)), o;
   }
   _getDeleteRangeMutationDirtyRange(n) {
-    const { subUnitId: e, unitId: a, range: i, shiftDimension: r } = n, o = [], u = this._univerInstanceService.getUniverSheetInstance(a), m = u == null ? void 0 : u.getSheetBySheetId(e), f = (m == null ? void 0 : m.getLastRowWithContent()) || 0, s = (m == null ? void 0 : m.getLastColumnWithContent()) || 0, p = new X();
+    const { subUnitId: e, unitId: a, range: i, shiftDimension: r } = n, o = [], u = this._univerInstanceService.getUniverSheetInstance(a), m = u == null ? void 0 : u.getSheetBySheetId(e), f = (m == null ? void 0 : m.getLastRowWithContent()) || 0, s = (m == null ? void 0 : m.getLastColumnWithContent()) || 0, p = new w();
     let d = null;
     const { startRow: L, startColumn: E, endRow: I, endColumn: S } = i;
-    r === Ft.ROWS ? d = this._rangeToMatrix({
+    r === Bt.ROWS ? d = this._rangeToMatrix({
       startRow: L,
       startColumn: E,
       endRow: f,
       endColumn: S
-    }) : r === Ft.COLUMNS && (d = this._rangeToMatrix({
+    }) : r === Bt.COLUMNS && (d = this._rangeToMatrix({
       startRow: L,
       startColumn: E,
       endRow: I,
@@ -15675,7 +15707,7 @@ let ke = class extends te {
     return o.push(...this._getDirtyRangesByCellValue(a, e, c)), o.push(...this._getDirtyRangesForArrayFormula(a, e, c)), o;
   }
   _getRemoveRowOrColumnMutation(n, e = !0) {
-    const { subUnitId: a, unitId: i, range: r } = n, o = [], u = this._univerInstanceService.getUniverSheetInstance(i), m = u == null ? void 0 : u.getSheetBySheetId(a), f = (m == null ? void 0 : m.getRowCount()) || 0, s = (m == null ? void 0 : m.getColumnCount()) || 0, p = new X();
+    const { subUnitId: a, unitId: i, range: r } = n, o = [], u = this._univerInstanceService.getUniverSheetInstance(i), m = u == null ? void 0 : u.getSheetBySheetId(a), f = (m == null ? void 0 : m.getRowCount()) || 0, s = (m == null ? void 0 : m.getColumnCount()) || 0, p = new w();
     let d = null;
     const { startRow: L, endRow: E, startColumn: I, endColumn: S } = r;
     e === !0 ? d = this._rangeToMatrix({
@@ -15701,7 +15733,7 @@ let ke = class extends te {
     return e[i] == null && (e[i] = {}), e[i][a.id] = a.name, e;
   }
   _rangeToMatrix(n) {
-    const e = new X(), { startRow: a, startColumn: i, endRow: r, endColumn: o } = n;
+    const e = new w(), { startRow: a, startColumn: i, endRow: r, endColumn: o } = n;
     for (let u = a; u <= r; u++)
       for (let m = i; m <= o; m++)
         e.setValue(u, m, {});
@@ -15709,7 +15741,7 @@ let ke = class extends te {
   }
   _getDirtyRangesByCellValue(n, e, a) {
     const i = [];
-    return a == null || new X(a).getDiscreteRanges().forEach((u) => {
+    return a == null || new w(a).getDiscreteRanges().forEach((u) => {
       i.push({ unitId: n, sheetId: e, range: u });
     }), i;
   }
@@ -15722,9 +15754,9 @@ let ke = class extends te {
     const i = [];
     if (a == null)
       return i;
-    const r = new X(a), o = this._formulaDataModel.getArrayFormulaRange();
+    const r = new w(a), o = this._formulaDataModel.getArrayFormulaRange();
     if ((u = o == null ? void 0 : o[n]) != null && u[e]) {
-      const f = new X((m = o == null ? void 0 : o[n]) == null ? void 0 : m[e]);
+      const f = new w((m = o == null ? void 0 : o[n]) == null ? void 0 : m[e]);
       r.forValue((s, p) => {
         f.forValue((d, L, E) => {
           if (E == null)
@@ -15746,17 +15778,17 @@ let ke = class extends te {
     return i;
   }
 };
-ke = Ir([
-  Lt(0, yt),
-  Lt(1, xe),
-  Lt(2, W(nt))
-], ke);
-var Nr = Object.defineProperty, Rr = Object.getOwnPropertyDescriptor, Ar = (n, e, a, i) => {
-  for (var r = i > 1 ? void 0 : i ? Rr(e, a) : e, o = n.length - 1, u; o >= 0; o--)
+$e = Rr([
+  Pt(0, gt),
+  Pt(1, xe),
+  Pt(2, W(it))
+], $e);
+var Ar = Object.defineProperty, Sr = Object.getOwnPropertyDescriptor, Cr = (n, e, a, i) => {
+  for (var r = i > 1 ? void 0 : i ? Sr(e, a) : e, o = n.length - 1, u; o >= 0; o--)
     (u = n[o]) && (r = (i ? u(e, a, r) : u(r)) || r);
-  return i && r && Nr(e, a, r), r;
-}, Pt = (n, e) => (a, i) => e(a, i, n);
-let $e = class extends te {
+  return i && r && Ar(e, a, r), r;
+}, Tt = (n, e) => (a, i) => e(a, i, n);
+let je = class extends te {
   constructor(n, e, a) {
     super(), this._commandService = n, this._sheetInterceptorService = e, this._formulaDataModel = a, this._initialize();
   }
@@ -15778,9 +15810,9 @@ let $e = class extends te {
   }
   _initInterceptorCellContent() {
     this.disposeWithMe(
-      this._sheetInterceptorService.intercept(cn.CELL_CONTENT, {
+      this._sheetInterceptorService.intercept(ln.CELL_CONTENT, {
         priority: 100,
-        effect: Wa.Value,
+        effect: Ka.Value,
         handler: (n, e, a) => {
           var s, p, d;
           const { unitId: i, subUnitId: r, row: o, col: u } = e, m = this._formulaDataModel.getArrayFormulaCellData(), f = (d = (p = (s = m == null ? void 0 : m[i]) == null ? void 0 : s[r]) == null ? void 0 : p[o]) == null ? void 0 : d[u];
@@ -15788,10 +15820,10 @@ let $e = class extends te {
             ...n,
             v: 0,
             // Default value for empty cell
-            t: Bt.NUMBER
-          }) : (n == null ? void 0 : n.t) === Bt.NUMBER && typeof (n == null ? void 0 : n.v) == "number" ? a({
+            t: vt.NUMBER
+          }) : (n == null ? void 0 : n.t) === vt.NUMBER && typeof (n == null ? void 0 : n.v) == "number" ? a({
             ...n,
-            v: hn(n.v)
+            v: Un(n.v)
           }) : a({
             ...n,
             v: f.v,
@@ -15802,34 +15834,34 @@ let $e = class extends te {
     );
   }
 };
-$e = Ar([
-  Pt(0, pe),
-  Pt(1, W(Mt)),
-  Pt(2, W(nt))
-], $e);
-var Sr = Object.defineProperty, Cr = Object.getOwnPropertyDescriptor, Dr = (n, e, a, i) => {
-  for (var r = i > 1 ? void 0 : i ? Cr(e, a) : e, o = n.length - 1, u; o >= 0; o--)
+je = Cr([
+  Tt(0, de),
+  Tt(1, W(xt)),
+  Tt(2, W(it))
+], je);
+var Dr = Object.defineProperty, br = Object.getOwnPropertyDescriptor, Or = (n, e, a, i) => {
+  for (var r = i > 1 ? void 0 : i ? br(e, a) : e, o = n.length - 1, u; o >= 0; o--)
     (u = n[o]) && (r = (i ? u(e, a, r) : u(r)) || r);
-  return i && r && Sr(e, a, r), r;
+  return i && r && Dr(e, a, r), r;
 }, ve = (n, e) => (a, i) => e(a, i, n);
-let je = class extends te {
+let ze = class extends te {
   constructor(e, a, i, r) {
     super();
-    w(this, "_preUnitId", null);
+    X(this, "_preUnitId", null);
     this._descriptionService = e, this._definedNamesService = a, this._univerInstanceService = i, this._commandService = r, this._initialize();
   }
   _initialize() {
     this._descriptionListener(), this._changeUnitListener(), this._changeSheetListener();
   }
   _descriptionListener() {
-    Oe(
+    se(
       this._definedNamesService.update$.subscribe(() => {
         this._registerDescriptions();
       })
     );
   }
   _changeUnitListener() {
-    Oe(
+    se(
       this._univerInstanceService.getCurrentTypeOfUnit$(ee.UNIVER_SHEET).subscribe(() => {
         this._unRegisterDescriptions(), this._registerDescriptions();
       })
@@ -15839,12 +15871,12 @@ let je = class extends te {
     this.disposeWithMe(
       this._commandService.onCommandExecuted((e, a) => {
         if (!(a != null && a.fromCollab)) {
-          if (e.id === ln.id)
+          if (e.id === sn.id)
             this._unregisterDescriptionsForNotInSheetId(), this._registerDescriptions();
           else if (e.id === Me.id) {
             const i = e.params;
             this._registerDescription(i);
-          } else if (e.id === At.id) {
+          } else if (e.id === St.id) {
             const i = e.params;
             this._unregisterDescription(i);
           }
@@ -15857,7 +15889,7 @@ let je = class extends te {
     if (a == null || i == null)
       return;
     const { name: r, comment: o, formulaOrRefString: u, localSheetId: m } = e;
-    !this._descriptionService.hasDescription(r) && (m == null || m === ut || m === i) && this._descriptionService.registerDescriptions([{
+    !this._descriptionService.hasDescription(r) && (m == null || m === mt || m === i) && this._descriptionService.registerDescriptions([{
       functionName: r,
       description: u + (o || ""),
       abstract: u,
@@ -15901,7 +15933,7 @@ let je = class extends te {
     const r = [];
     this._preUnitId = e, Array.from(Object.values(i)).forEach((o) => {
       const { name: u, comment: m, formulaOrRefString: f, localSheetId: s } = o;
-      !this._descriptionService.hasDescription(u) && (s == null || s === ut || s === a) && r.push({
+      !this._descriptionService.hasDescription(u) && (s == null || s === mt || s === a) && r.push({
         functionName: u,
         description: f + (m || ""),
         abstract: f,
@@ -15920,135 +15952,135 @@ let je = class extends te {
     const r = [];
     Array.from(Object.values(i)).forEach((o) => {
       const { name: u, localSheetId: m } = o;
-      m !== ut && m !== a && r.push(u);
+      m !== mt && m !== a && r.push(u);
     }), this._descriptionService.unregisterDescriptions(r);
   }
 };
-je = Dr([
-  ve(0, ht),
+ze = Or([
+  ve(0, Ut),
   ve(1, qt),
   ve(2, xe),
-  ve(3, pe)
-], je);
-var br = Object.defineProperty, Or = Object.getOwnPropertyDescriptor, Mr = (n, e, a, i) => {
-  for (var r = i > 1 ? void 0 : i ? Or(e, a) : e, o = n.length - 1, u; o >= 0; o--)
+  ve(3, de)
+], ze);
+var Mr = Object.defineProperty, xr = Object.getOwnPropertyDescriptor, _r = (n, e, a, i) => {
+  for (var r = i > 1 ? void 0 : i ? xr(e, a) : e, o = n.length - 1, u; o >= 0; o--)
     (u = n[o]) && (r = (i ? u(e, a, r) : u(r)) || r);
-  return i && r && br(e, a, r), r;
-}, xr = (n, e) => (a, i) => e(a, i, n);
-let ze = class extends te {
+  return i && r && Mr(e, a, r), r;
+}, yr = (n, e) => (a, i) => e(a, i, n);
+let Ze = class extends te {
   constructor(n) {
     super(), this._commandService = n, [
-      Vn,
+      Gn,
       Ge
     ].forEach((e) => this._commandService.registerCommand(e));
   }
 };
-ze = Mr([
-  xr(0, pe)
-], ze);
-var va = Object.defineProperty, _r = Object.getOwnPropertyDescriptor, qr = (n, e, a) => e in n ? va(n, e, { enumerable: !0, configurable: !0, writable: !0, value: a }) : n[e] = a, Va = (n, e, a, i) => {
-  for (var r = i > 1 ? void 0 : i ? _r(e, a) : e, o = n.length - 1, u; o >= 0; o--)
+Ze = _r([
+  yr(0, de)
+], Ze);
+var Va = Object.defineProperty, qr = Object.getOwnPropertyDescriptor, gr = (n, e, a) => e in n ? Va(n, e, { enumerable: !0, configurable: !0, writable: !0, value: a }) : n[e] = a, Ga = (n, e, a, i) => {
+  for (var r = i > 1 ? void 0 : i ? qr(e, a) : e, o = n.length - 1, u; o >= 0; o--)
     (u = n[o]) && (r = (i ? u(e, a, r) : u(r)) || r);
-  return i && r && va(e, a, r), r;
-}, Ze = (n, e) => (a, i) => e(a, i, n), ot = (n, e, a) => qr(n, typeof e != "symbol" ? e + "" : e, a);
-let Je = class extends la {
-  constructor(n = ia, e, a) {
+  return i && r && Va(e, a, r), r;
+}, Je = (n, e) => (a, i) => e(a, i, n), ut = (n, e, a) => gr(n, typeof e != "symbol" ? e + "" : e, a);
+let et = class extends sa {
+  constructor(n = ra, e, a) {
     super(), this._config = n, this._injector = e, this._configService = a;
-    const { ...i } = sa(
+    const { ...i } = pa(
       {},
-      ia,
+      ra,
       this._config
     );
     this._configService.setConfig(qi, i);
   }
   onStarting() {
-    this._injector.add([Qe]), this._injector.get(qa).registerChannel(
-      Ut,
-      Bn(this._injector.get(Qe))
+    this._injector.add([ke]), this._injector.get(qa).registerChannel(
+      Ft,
+      vn(this._injector.get(ke))
     );
   }
 };
-ot(Je, "pluginName", "SHEET_FORMULA_REMOTE_PLUGIN");
-ot(Je, "type", ee.UNIVER_SHEET);
-Je = Va([
-  ca(xa),
-  Ze(1, W(tt)),
-  Ze(2, _e)
-], Je);
-let et = class extends la {
-  constructor(n = na, e, a) {
+ut(et, "pluginName", "SHEET_FORMULA_REMOTE_PLUGIN");
+ut(et, "type", ee.UNIVER_SHEET);
+et = Ga([
+  la(_a),
+  Je(1, W(at)),
+  Je(2, _e)
+], et);
+let tt = class extends sa {
+  constructor(n = ia, e, a) {
     super(), this._config = n, this._injector = e, this._configService = a;
-    const { ...i } = sa(
+    const { ...i } = pa(
       {},
-      na,
+      ia,
       this._config
     );
-    this._configService.setConfig(rt, i);
+    this._configService.setConfig(ot, i);
   }
   onStarting() {
     const n = this._injector, e = [
-      [Lr, { useClass: Dt }],
-      [ht, { useClass: St }],
-      [ze],
-      [Ct],
-      [We],
-      [$e],
-      [be],
+      [Tr, { useClass: bt }],
+      [Ut, { useClass: Ct }],
+      [Ze],
+      [Dt],
       [Ke],
-      [ke],
       [je],
-      [we]
+      [Oe],
+      [Qe],
+      [$e],
+      [ze],
+      [We]
     ];
     if (this._config.notExecuteFormula) {
       const a = n.get(qa);
-      e.push([Ba, {
-        useFactory: () => vn(a.requestChannel(Ut))
+      e.push([va, {
+        useFactory: () => Vn(a.requestChannel(Ft))
       }]);
     }
     e.forEach((a) => n.add(a));
   }
   onReady() {
-    ye(this._injector, [
-      [ze],
-      [ke],
+    qe(this._injector, [
+      [Ze],
       [$e],
-      [Ke],
-      [we]
-    ]), vt() && ye(this._injector, [
-      [be]
+      [je],
+      [Qe],
+      [We]
+    ]), Vt() && qe(this._injector, [
+      [Oe]
     ]);
   }
   onRendered() {
-    ye(this._injector, [
-      [je]
-    ]), vt() || ye(this._injector, [
-      [be]
+    qe(this._injector, [
+      [ze]
+    ]), Vt() || qe(this._injector, [
+      [Oe]
     ]);
   }
 };
-ot(et, "pluginName", Pr);
-ot(et, "type", ee.UNIVER_SHEET);
-et = Va([
-  ca(xa, sn),
-  Ze(1, W(tt)),
-  Ze(2, _e)
-], et);
+ut(tt, "pluginName", Er);
+ut(tt, "type", ee.UNIVER_SHEET);
+tt = Ga([
+  la(_a, pn),
+  Je(1, W(at)),
+  Je(2, _e)
+], tt);
 export {
   ne as CalculationMode,
-  St as DescriptionService,
-  Ct as FormulaRefRangeService,
-  ht as IDescriptionService,
-  Lr as IRegisterFunctionService,
-  Ba as IRemoteRegisterFunctionService,
-  Vn as InsertFunctionCommand,
+  Ct as DescriptionService,
+  Dt as FormulaRefRangeService,
+  Ut as IDescriptionService,
+  Tr as IRegisterFunctionService,
+  va as IRemoteRegisterFunctionService,
+  Gn as InsertFunctionCommand,
   Ge as OtherFormulaMarkDirty,
-  rt as PLUGIN_CONFIG_KEY_BASE,
-  Dt as RegisterFunctionService,
-  We as RegisterOtherFormulaService,
-  Qe as RemoteRegisterFunctionService,
-  be as TriggerCalculationController,
-  Je as UniverRemoteSheetsFormulaPlugin,
-  et as UniverSheetsFormulaPlugin,
-  we as UpdateDefinedNameController,
-  Ke as UpdateFormulaController
+  ot as PLUGIN_CONFIG_KEY_BASE,
+  bt as RegisterFunctionService,
+  Ke as RegisterOtherFormulaService,
+  ke as RemoteRegisterFunctionService,
+  Oe as TriggerCalculationController,
+  et as UniverRemoteSheetsFormulaPlugin,
+  tt as UniverSheetsFormulaPlugin,
+  We as UpdateDefinedNameController,
+  Qe as UpdateFormulaController
 };