@univerjs/sheets-formula 0.9.2 → 0.9.3-nightly.202507250750

package/lib/index.js

@@ -1,18 +1,18 @@
-var Ya = Object.defineProperty;
-var Xa = (a, e, n) => e in a ? Ya(a, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : a[e] = n;
-var W = (a, e, n) => Xa(a, typeof e != "symbol" ? e + "" : e, n);
-import { CommandType as xt, ICommandService as ce, ObjectMatrix as G, Tools as Me, IUniverInstanceService as Ae, Rectangle as fe, sequenceExecuteAsync as Wa, Inject as X, LifecycleService as Ka, Disposable as ae, ILogService as ka, IConfigService as Ce, LocaleService as _t, isFormulaString as xe, isFormulaId as la, cellToRange as sa, Direction as We, getIntersectRange as Xe, RANGE_TYPE as Y, UniverInstanceType as te, Injector as ot, InterceptorEffectEnum as Qa, CellValueType as Gt, isRealNum as $a, createIdentifier as yt, toDisposable as ie, moveRangeByOffset as Nt, DisposableCollection as Ke, AbsoluteRefType as ke, Optional as ja, DependentOn as da, Plugin as pa, merge as La, touchDependencies as Fe, isNodeEnv as Ht } from "@univerjs/core";
-import { SetRangeValuesCommand as Pa, SheetsSelectionsService as za, getSheetCommandTarget as Za, findFirstNonEmptyCell as Ja, alignToMergedCellsBorders as ct, expandToContinuousRange as en, SetSelectionsOperation as tn, SetRangeValuesMutation as Z, SetStyleCommand as qt, SetBorderCommand as Ta, ClearSelectionFormatCommand as Ea, handleMoveCols as Ia, EffectRefRangId as H, runRefRangeMutations as w, handleMoveRows as Na, handleMoveRange as Ra, handleInsertRangeMoveRight as Sa, handleInsertRangeMoveDown as Aa, handleDeleteRangeMoveUp as Ca, handleDeleteRangeMoveLeft as Da, handleIRemoveCol as ba, handleIRemoveRow as Oa, handleInsertCol as Ma, handleInsertRow as xa, RemoveDefinedNameCommand as _a, SetDefinedNameCommand as ya, RemoveSheetCommand as an, SetWorksheetNameCommand as nn, DeleteRangeMoveLeftCommand as rn, DeleteRangeMoveUpCommand as on, RemoveColCommand as un, RemoveRowCommand as mn, InsertRangeMoveDownCommand as fn, InsertRangeMoveRightCommand as cn, InsertColCommand as ln, InsertRowCommand as sn, MoveColsCommand as dn, MoveRowsCommand as pn, MoveRangeCommand as Ln, SheetInterceptorService as gt, RemoveSheetMutation as Rt, InsertSheetMutation as St, MoveRangeMutation as wt, MoveRowsMutation as Yt, MoveColsMutation as Xt, ReorderRangeMutation as Wt, RemoveRowMutation as Kt, RemoveColMutation as kt, InsertColMutation as Qt, InsertRowMutation as $t, SetRowHiddenMutation as jt, SetRowVisibleMutation as zt, INTERCEPTOR_POINT as Pn, SetWorksheetActiveOperation as Tn, SCOPE_WORKBOOK_VALUE_DEFINED_NAME as lt, RefRangeService as En, handleDefaultRangeChangeWithEffectRefCommands as Zt, getSeparateEffectedRangesOnCommand as In, handleCommonDefaultRangeChangeWithEffectRefCommands as Nn, UniverSheetsPlugin as Rn } from "@univerjs/sheets";
-import { serializeRange as ye, IActiveDirtyManagerService as ht, SetFormulaCalculationResultMutation as Sn, RemoveOtherFormulaMutation as An, SetOtherFormulaMutation as Cn, FormulaDataModel as ut, SetFormulaCalculationStartMutation as Ie, SetFormulaCalculationStopMutation as Jt, ENGINE_FORMULA_CYCLE_REFERENCE_COUNT as ea, SetFormulaCalculationNotificationMutation as Dn, FormulaExecuteStageType as Be, FormulaExecutedStateType as De, sequenceNodeType as ee, deserializeRangeWithSheetWithCache as pe, serializeRangeToRefString as mt, ErrorType as j, IDefinedNamesService as Ut, LexerTreeBuilder as Ft, generateStringWithSequence as Qe, SetDefinedNameMutation as qe, SetFormulaDataMutation as ve, SetArrayFormulaDataMutation as At, initSheetFormulaData as ta, RemoveDefinedNameMutation as Ct, stripErrorMargin as bn, FunctionType as t, FUNCTION_NAMES_ARRAY as aa, FUNCTION_NAMES_COMPATIBILITY as x, FUNCTION_NAMES_CUBE as se, FUNCTION_NAMES_DATABASE as $, FUNCTION_NAMES_DATE as F, FUNCTION_NAMES_ENGINEERING as A, FUNCTION_NAMES_FINANCIAL as C, FUNCTION_NAMES_INFORMATION as v, FUNCTION_NAMES_LOGICAL as K, FUNCTION_NAMES_LOOKUP as _, FUNCTION_NAMES_MATH as L, FUNCTION_NAMES_STATISTICAL as l, FUNCTION_NAMES_TEXT as b, FUNCTION_NAMES_WEB as st, IFunctionService as Bt, isReferenceStrings as On, functionArray as Mn, functionCompatibility as xn, functionCube as _n, functionDatabase as yn, functionDate as qn, functionEngineering as gn, functionFinancial as hn, functionInformation as Un, functionLogical as Fn, functionLookup as Bn, functionMath as vn, functionMeta as Vn, functionStatistical as Gn, functionText as Hn, functionUniver as wn, functionWeb as Yn, serializeRangeWithSpreadsheet as na, serializeRangeWithSheet as ia, CustomFunction as Dt, AsyncCustomFunction as qa, UniverFormulaEnginePlugin as ga, IFormulaCurrentConfigService as Xn, Lexer as Wn, AstTreeBuilder as Kn, Interpreter as kn, generateExecuteAstNodeData as Qn, getObjectValue as $n } from "@univerjs/engine-formula";
-import { Subject as ra, BehaviorSubject as ha, bufferWhen as jn, filter as oa, map as zn } from "rxjs";
-import { IRPCChannelService as Ua, fromModule as Zn, toModule as Jn } from "@univerjs/rpc";
-const ei = {
+var Xa = Object.defineProperty;
+var Wa = (a, e, n) => e in a ? Xa(a, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : a[e] = n;
+var W = (a, e, n) => Wa(a, typeof e != "symbol" ? e + "" : e, n);
+import { CommandType as xt, ICommandService as ce, ObjectMatrix as G, generateRandomId as la, IUniverInstanceService as Ae, Rectangle as fe, sequenceExecuteAsync as Ka, Inject as X, LifecycleService as ka, Disposable as ae, ILogService as Qa, IConfigService as Ce, LocaleService as _t, isFormulaString as Me, isFormulaId as sa, cellToRange as da, Direction as Xe, getIntersectRange as Ye, RANGE_TYPE as Y, UniverInstanceType as te, Injector as rt, Tools as ft, InterceptorEffectEnum as $a, CellValueType as Gt, isRealNum as ja, createIdentifier as yt, toDisposable as ie, moveRangeByOffset as Nt, DisposableCollection as We, AbsoluteRefType as Ke, Optional as za, DependentOn as pa, Plugin as La, merge as Pa, touchDependencies as Ue, isNodeEnv as Ht } from "@univerjs/core";
+import { SetRangeValuesCommand as Ta, SheetsSelectionsService as Za, getSheetCommandTarget as Ja, findFirstNonEmptyCell as en, alignToMergedCellsBorders as ct, expandToContinuousRange as tn, SetSelectionsOperation as an, SetRangeValuesMutation as Z, SetStyleCommand as qt, SetBorderCommand as Ea, ClearSelectionFormatCommand as Ia, handleMoveCols as Na, EffectRefRangId as H, runRefRangeMutations as w, handleMoveRows as Ra, handleMoveRange as Sa, handleInsertRangeMoveRight as Aa, handleInsertRangeMoveDown as Ca, handleDeleteRangeMoveUp as Da, handleDeleteRangeMoveLeft as ba, handleIRemoveCol as Oa, handleIRemoveRow as Ma, handleInsertCol as xa, handleInsertRow as _a, RemoveDefinedNameCommand as ya, SetDefinedNameCommand as qa, RemoveSheetCommand as nn, SetWorksheetNameCommand as rn, DeleteRangeMoveLeftCommand as on, DeleteRangeMoveUpCommand as un, RemoveColCommand as mn, RemoveRowCommand as fn, InsertRangeMoveDownCommand as cn, InsertRangeMoveRightCommand as ln, InsertColCommand as sn, InsertRowCommand as dn, MoveColsCommand as pn, MoveRowsCommand as Ln, MoveRangeCommand as Pn, SheetInterceptorService as gt, RemoveSheetMutation as Rt, InsertSheetMutation as St, MoveRangeMutation as wt, MoveRowsMutation as Yt, MoveColsMutation as Xt, ReorderRangeMutation as Wt, RemoveRowMutation as Kt, RemoveColMutation as kt, InsertColMutation as Qt, InsertRowMutation as $t, SetRowHiddenMutation as jt, SetRowVisibleMutation as zt, INTERCEPTOR_POINT as Tn, SetWorksheetActiveOperation as En, SCOPE_WORKBOOK_VALUE_DEFINED_NAME as lt, RefRangeService as In, handleDefaultRangeChangeWithEffectRefCommands as Zt, getSeparateEffectedRangesOnCommand as Nn, handleCommonDefaultRangeChangeWithEffectRefCommands as Rn, UniverSheetsPlugin as Sn } from "@univerjs/sheets";
+import { serializeRange as _e, IActiveDirtyManagerService as ht, SetFormulaCalculationResultMutation as An, RemoveOtherFormulaMutation as Cn, SetOtherFormulaMutation as Dn, FormulaDataModel as ot, SetFormulaCalculationStartMutation as Ie, SetFormulaCalculationStopMutation as Jt, ENGINE_FORMULA_CYCLE_REFERENCE_COUNT as ea, SetFormulaCalculationNotificationMutation as bn, FormulaExecuteStageType as Fe, FormulaExecutedStateType as De, sequenceNodeType as ee, deserializeRangeWithSheetWithCache as pe, serializeRangeToRefString as ut, ErrorType as j, IDefinedNamesService as Ut, LexerTreeBuilder as Ft, generateStringWithSequence as ke, SetDefinedNameMutation as ye, SetFormulaDataMutation as Be, SetArrayFormulaDataMutation as At, initSheetFormulaData as ta, RemoveDefinedNameMutation as Ct, stripErrorMargin as On, FunctionType as t, FUNCTION_NAMES_ARRAY as aa, FUNCTION_NAMES_COMPATIBILITY as x, FUNCTION_NAMES_CUBE as se, FUNCTION_NAMES_DATABASE as $, FUNCTION_NAMES_DATE as F, FUNCTION_NAMES_ENGINEERING as A, FUNCTION_NAMES_FINANCIAL as C, FUNCTION_NAMES_INFORMATION as v, FUNCTION_NAMES_LOGICAL as K, FUNCTION_NAMES_LOOKUP as _, FUNCTION_NAMES_MATH as L, FUNCTION_NAMES_STATISTICAL as l, FUNCTION_NAMES_TEXT as b, FUNCTION_NAMES_WEB as st, IFunctionService as Bt, isReferenceStrings as Mn, functionArray as xn, functionCompatibility as _n, functionCube as yn, functionDatabase as qn, functionDate as gn, functionEngineering as hn, functionFinancial as Un, functionInformation as Fn, functionLogical as Bn, functionLookup as vn, functionMath as Vn, functionMeta as Gn, functionStatistical as Hn, functionText as wn, functionUniver as Yn, functionWeb as Xn, serializeRangeWithSpreadsheet as na, serializeRangeWithSheet as ia, CustomFunction as Dt, AsyncCustomFunction as ga, UniverFormulaEnginePlugin as ha, IFormulaCurrentConfigService as Wn, Lexer as Kn, AstTreeBuilder as kn, Interpreter as Qn, generateExecuteAstNodeData as $n, getObjectValue as jn } from "@univerjs/engine-formula";
+import { Subject as ra, BehaviorSubject as Ua, bufferWhen as zn, filter as oa, map as Zn } from "rxjs";
+import { IRPCChannelService as Fa, fromModule as Jn, toModule as ei } from "@univerjs/rpc";
+const ti = {
   id: "formula.command.insert-function",
   type: xt.COMMAND,
   handler: async (a, e) => {
     const { list: n, listOfRangeHasNumber: i } = e, r = a.get(ce), o = new G();
     n.forEach((f) => {
-      const { range: m, primary: c, formula: s } = f, { row: P, column: E } = c, p = Me.generateRandomId(6);
+      const { range: m, primary: c, formula: s } = f, { row: P, column: E } = c, p = la(6);
       o.setValue(P, E, {
         f: s,
         si: p
@@ -32,21 +32,21 @@ const ei = {
     const u = {
       value: o.getData()
     };
-    return r.executeCommand(Pa.id, u);
+    return r.executeCommand(Ta.id, u);
   }
-}, ti = {
+}, ai = {
   id: "sheets-formula.command.quick-sum",
   type: xt.COMMAND,
   handler: async (a) => {
-    const n = a.get(za).getCurrentLastSelection();
+    const n = a.get(Za).getCurrentLastSelection();
     if (!n) return !1;
-    const i = a.get(Ae), r = Za(i);
+    const i = a.get(Ae), r = Ja(i);
     if (!r) return !1;
     const o = n.range, { worksheet: u } = r;
-    let f = Ja(o, u);
+    let f = en(o, u);
     if (!f) return !1;
     f = ct(f, u);
-    const m = en({
+    const m = tn({
       startRow: f.startRow,
       startColumn: f.startColumn,
       endRow: o.endRow,
@@ -60,7 +60,7 @@ const ei = {
     if (!fe.equals(s, m))
       for (const p of u.iterateByColumn(s))
         (!p.value || !u.cellHasValue(p.value)) && c.setValue(p.row, p.col, {
-          f: `=SUM(${ye({
+          f: `=SUM(${_e({
             startColumn: p.col,
             endColumn: p.col,
             startRow: m.startRow,
@@ -76,7 +76,7 @@ const ei = {
     if (!fe.equals(P, m))
       for (const p of u.iterateByRow(P))
         (!p.value || !u.cellHasValue(p.value)) && c.setValue(p.row, p.col, {
-          f: `=SUM(${ye({
+          f: `=SUM(${_e({
             startColumn: m.startColumn,
             endColumn: p.col - 1,
             startRow: p.row,
@@ -84,16 +84,16 @@ const ei = {
           })})`
         });
     const E = a.get(ce);
-    return (await Wa([
+    return (await Ka([
       {
-        id: Pa.id,
+        id: Ta.id,
         params: {
           range: m,
           value: c.getMatrix()
         }
       },
       {
-        id: tn.id,
+        id: an.id,
         params: {
           unitId: r.unitId,
           subUnitId: r.subUnitId,
@@ -112,15 +112,15 @@ const ei = {
   handler() {
     return !0;
   }
-}, he = "sheets-formula.base.config";
+}, ge = "sheets-formula.base.config";
 var Le = /* @__PURE__ */ ((a) => (a[a.FORCED = 0] = "FORCED", a[a.WHEN_EMPTY = 1] = "WHEN_EMPTY", a[a.NO_CALCULATION = 2] = "NO_CALCULATION", a))(Le || {});
-const ua = {}, ai = "sheets-formula.remote.config", ma = {};
-var Ne = /* @__PURE__ */ ((a) => (a[a.NOT_REGISTER = 1] = "NOT_REGISTER", a[a.SUCCESS = 2] = "SUCCESS", a[a.WAIT = 3] = "WAIT", a[a.ERROR = 4] = "ERROR", a))(Ne || {}), ni = Object.getOwnPropertyDescriptor, ii = (a, e, n, i) => {
-  for (var r = i > 1 ? void 0 : i ? ni(e, n) : e, o = a.length - 1, u; o >= 0; o--)
+const ua = {}, ni = "sheets-formula.remote.config", ma = {};
+var Ne = /* @__PURE__ */ ((a) => (a[a.NOT_REGISTER = 1] = "NOT_REGISTER", a[a.SUCCESS = 2] = "SUCCESS", a[a.WAIT = 3] = "WAIT", a[a.ERROR = 4] = "ERROR", a))(Ne || {}), ii = Object.getOwnPropertyDescriptor, ri = (a, e, n, i) => {
+  for (var r = i > 1 ? void 0 : i ? ii(e, n) : e, o = a.length - 1, u; o >= 0; o--)
     (u = a[o]) && (r = u(r) || r);
   return r;
 }, dt = (a, e) => (n, i) => e(n, i, a);
-let $e = class extends ae {
+let Qe = class extends ae {
   constructor(e, n, i) {
     super();
     W(this, "_formulaCacheMap", /* @__PURE__ */ new Map());
@@ -129,7 +129,7 @@ let $e = class extends ae {
     // FIXME: this design could be improved.
     W(this, "_formulaResult$", new ra());
     W(this, "formulaResult$", this._formulaResult$.asObservable());
-    W(this, "calculateStarted$", new ha(!1));
+    W(this, "calculateStarted$", new Ua(!1));
     this._commandService = e, this._activeDirtyManagerService = n, this._lifecycleService = i, this._initFormulaRegister(), this._initFormulaCalculationResultChange();
   }
   dispose() {
@@ -142,7 +142,7 @@ let $e = class extends ae {
     return r || (r = /* @__PURE__ */ new Map(), i.set(n, r)), r;
   }
   _createFormulaId(e, n) {
-    return `formula.${e}_${n}_${Me.generateRandomId(8)}`;
+    return `formula.${e}_${n}_${la(8)}`;
   }
   _initFormulaRegister() {
     this._activeDirtyManagerService.register(
@@ -170,7 +170,7 @@ let $e = class extends ae {
           }
         }
       };
-      this._commandService.executeCommand(Cn.id, c).then(() => {
+      this._commandService.executeCommand(Dn.id, c).then(() => {
         this._commandService.executeCommand(
           Oe.id,
           { [i]: { [r]: { [u]: !0 } } }
@@ -178,14 +178,14 @@ let $e = class extends ae {
       });
     };
     this.disposeWithMe(
-      this._formulaChangeWithRange$.pipe(jn(() => this.calculateStarted$.pipe(oa((n) => n)))).subscribe((n) => n.forEach(e))
+      this._formulaChangeWithRange$.pipe(zn(() => this.calculateStarted$.pipe(oa((n) => n)))).subscribe((n) => n.forEach(e))
     ), this.disposeWithMe(
       this._formulaChangeWithRange$.pipe(oa(() => this.calculateStarted$.getValue())).subscribe(e)
     );
   }
   _initFormulaCalculationResultChange() {
     this.disposeWithMe(this._commandService.onCommandExecuted((e) => {
-      if (e.id === Sn.id) {
+      if (e.id === An.id) {
         const n = e.params, { unitOtherData: i } = n, r = {};
         for (const o in i) {
           const u = i[o], f = {};
@@ -236,7 +236,7 @@ let $e = class extends ae {
       subUnitId: n,
       formulaIdList: i
     };
-    this._commandService.executeCommand(An.id, r);
+    this._commandService.executeCommand(Cn.id, r);
     const o = this._ensureCacheMap(e, n);
     i.forEach((u) => o.delete(u));
   }
@@ -259,18 +259,18 @@ let $e = class extends ae {
     ));
   }
 };
-$e = ii([
+Qe = ri([
   dt(0, ce),
   dt(1, ht),
-  dt(2, X(Ka))
-], $e);
-var ri = Object.getOwnPropertyDescriptor, oi = (a, e, n, i) => {
-  for (var r = i > 1 ? void 0 : i ? ri(e, n) : e, o = a.length - 1, u; o >= 0; o--)
+  dt(2, X(ka))
+], Qe);
+var oi = Object.getOwnPropertyDescriptor, ui = (a, e, n, i) => {
+  for (var r = i > 1 ? void 0 : i ? oi(e, n) : e, o = a.length - 1, u; o >= 0; o--)
     (u = a[o]) && (r = u(r) || r);
   return r;
 }, de = (a, e) => (n, i) => e(n, i, a);
 const fa = { done: 0, count: 0 }, pt = { onlyLocal: !0 };
-let _e = class extends ae {
+let xe = class extends ae {
   constructor(e, n, i, r, o, u, f) {
     super();
     W(this, "_waitingCommandQueue", []);
@@ -293,7 +293,7 @@ let _e = class extends ae {
      * 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 ha(fa));
+    W(this, "_progress$", new Ua(fa));
     W(this, "progress$", this._progress$.asObservable());
     this._commandService = e, this._activeDirtyManagerService = n, this._logService = i, this._configService = r, this._formulaDataModel = o, this._localeService = u, this._registerOtherFormulaService = f, this._commandExecutedListener(), this._initialExecuteFormulaProcessListener(), this._initialExecuteFormula();
   }
@@ -326,7 +326,7 @@ let _e = class extends ae {
   }
   _getCalculationMode() {
     var n;
-    const e = this._configService.getConfig(he);
+    const e = this._configService.getConfig(ge);
     return (n = e == null ? void 0 : e.initialFormulaComputing) != null ? n : Le.WHEN_EMPTY;
   }
   _commandExecutedListener() {
@@ -342,7 +342,7 @@ let _e = class extends ae {
         if (this._activeDirtyManagerService.get(e.id)) {
           if (e.id === Z.id) {
             const i = e.params;
-            if (n && n.onlyLocal === !0 || i.trigger === qt.id || i.trigger === Ta.id || i.trigger === Ea.id)
+            if (n && n.onlyLocal === !0 || i.trigger === qt.id || i.trigger === Ea.id || i.trigger === Ia.id)
               return;
           }
           this._waitingCommandQueue.push(e), clearTimeout(this._setTimeoutKey), this._setTimeoutKey = setTimeout(() => {
@@ -435,28 +435,28 @@ let _e = class extends ae {
           const { forceCalculation: o = !1 } = i.params;
           o && (this._forceCalculating = !0);
         } else i.id === Jt.id && this.clearProgress();
-        if (i.id !== Dn.id)
+        if (i.id !== bn.id)
           return;
         const r = i.params;
         if (r.stageInfo != null) {
           const {
             stage: o
           } = r.stageInfo;
-          if (o === Be.START)
+          if (o === Fe.START)
             n === 0 && (this._startExecutionTime = performance.now()), n++, e !== null && (clearTimeout(e), e = null), e = setTimeout(() => {
               e = null, this._startProgress();
             }, 1e3);
-          else if (o === Be.CURRENTLY_CALCULATING) {
+          else if (o === Fe.CURRENTLY_CALCULATING) {
             if (this._executionInProgressParams = r.stageInfo, e === null) {
               const u = this._localeService.t("formula.progress.calculating");
               this._calculateProgress(u);
             }
-          } else if (o === Be.START_DEPENDENCY_ARRAY_FORMULA) {
+          } else if (o === Fe.START_DEPENDENCY_ARRAY_FORMULA) {
             if (this._executionInProgressParams = r.stageInfo, e === null) {
               const u = this._localeService.t("formula.progress.array-analysis");
               this._calculateProgress(u);
             }
-          } else if (o === Be.CURRENTLY_CALCULATING_ARRAY_FORMULA && (this._executionInProgressParams = r.stageInfo, e === null)) {
+          } else if (o === Fe.CURRENTLY_CALCULATING_ARRAY_FORMULA && (this._executionInProgressParams = r.stageInfo, e === null)) {
             const u = this._localeService.t("formula.progress.array-calculation");
             this._calculateProgress(u);
           }
@@ -517,16 +517,16 @@ let _e = class extends ae {
     };
   }
 };
-_e = oi([
+xe = ui([
   de(0, ce),
   de(1, ht),
-  de(2, ka),
+  de(2, Qa),
   de(3, Ce),
-  de(4, X(ut)),
+  de(4, X(ot)),
   de(5, X(_t)),
-  de(6, X($e))
-], _e);
-function ui(a, e, n) {
+  de(6, X(Qe))
+], xe);
+function mi(a, e, n) {
   var i;
   return a == null || a[e] == null || ((i = a[e]) == null ? void 0 : i[n]) == null;
 }
@@ -545,18 +545,18 @@ function Lt(a, e, n) {
     };
 }
 var y = /* @__PURE__ */ ((a) => (a[a.MoveRange = 0] = "MoveRange", a[a.MoveRows = 1] = "MoveRows", a[a.MoveCols = 2] = "MoveCols", a[a.InsertRow = 3] = "InsertRow", a[a.InsertColumn = 4] = "InsertColumn", a[a.RemoveRow = 5] = "RemoveRow", a[a.RemoveColumn = 6] = "RemoveColumn", a[a.DeleteMoveLeft = 7] = "DeleteMoveLeft", a[a.DeleteMoveUp = 8] = "DeleteMoveUp", a[a.InsertMoveDown = 9] = "InsertMoveDown", a[a.InsertMoveRight = 10] = "InsertMoveRight", a[a.SetName = 11] = "SetName", a[a.RemoveSheet = 12] = "RemoveSheet", a[a.SetDefinedName = 13] = "SetDefinedName", a[a.RemoveDefinedName = 14] = "RemoveDefinedName", a))(y || {});
-const mi = [
+const fi = [
   11,
   12,
   13,
   14
   /* RemoveDefinedName */
 ];
-function fi(a, e, n) {
+function ci(a, e, n) {
   const { type: i } = n;
-  return mi.includes(i) ? ci(a, e) : li(a, e, n);
+  return fi.includes(i) ? li(a, e) : si(a, e, n);
 }
-function ci(a, e) {
+function li(a, e) {
   const n = [], i = [];
   return Object.keys(e).forEach((r) => {
     const o = e[r], u = a[r];
@@ -567,7 +567,7 @@ function ci(a, e) {
       if (m.forValue((N, d, D) => {
         if (D == null)
           return !0;
-        const I = ge(D);
+        const I = qe(D);
         I !== null && (s.setValue(N, d, I), P.setValue(N, d, c.getValue(N, d)));
       }), s.getSizeOf() === 0)
         return;
@@ -595,8 +595,8 @@ function ci(a, e) {
     redos: i
   };
 }
-function li(a, e, n) {
-  const { redoFormulaData: i, undoFormulaData: r } = si(a, e, n), o = [], u = [];
+function si(a, e, n) {
+  const { redoFormulaData: i, undoFormulaData: r } = di(a, e, n), o = [], u = [];
   return Object.keys(i).forEach((f) => {
     Object.keys(i[f]).forEach((m) => {
       if (Object.keys(i[f][m]).length !== 0) {
@@ -630,10 +630,10 @@ function li(a, e, n) {
     redos: o
   };
 }
-function si(a, e, n) {
+function di(a, e, n) {
   const i = {}, r = {}, { unitId: o, sheetId: u } = n;
   return (/* @__PURE__ */ new Set([...Object.keys(a), ...Object.keys(e)])).forEach((m) => {
-    if (ui(a, m, u))
+    if (mi(a, m, u))
       return;
     (/* @__PURE__ */ new Set([
       ...Object.keys(a[m] || {}),
@@ -642,8 +642,8 @@ function si(a, e, n) {
       var D, I;
       const P = (D = a[m]) == null ? void 0 : D[s], E = (I = e[m]) == null ? void 0 : I[s], p = new G(P || {}), R = new G(E || {});
       let S = [];
-      m !== o || s !== u ? S = pi(R) : S = di(p, n);
-      const N = Mi(S, p, R), d = xi(S, p);
+      m !== o || s !== u ? S = Li(R) : S = pi(p, n);
+      const N = xi(S, p, R), d = _i(S, p);
       i[m] || (i[m] = {}), r[m] || (r[m] = {}), i[m][s] = {
         ...i[m][s],
         ...N
@@ -657,11 +657,11 @@ function si(a, e, n) {
     undoFormulaData: r
   };
 }
-function di(a, e) {
+function pi(a, e) {
   const { type: n, from: i, to: r, range: o } = e, u = [];
   return a.forValue((f, m, c) => {
-    if (c == null || !Fa(c)) return !0;
-    const s = sa(f, m);
+    if (c == null || !Ba(c)) return !0;
+    const s = da(f, m);
     let P = null, E = !1;
     if ([
       0,
@@ -669,69 +669,69 @@ function di(a, e) {
       2
       /* MoveCols */
     ].includes(n))
-      P = Li(n, i, r, s);
+      P = Pi(n, i, r, s);
     else if (o != null) {
-      const p = Pi(s, e);
+      const p = Ti(s, e);
       P = p.newCell, E = p.isReverse;
     }
     E ? u.unshift({ oldCell: s, newCell: P }) : u.push({ oldCell: s, newCell: P });
   }), u;
 }
-function pi(a) {
+function Li(a) {
   const e = [];
   return a.forValue((n, i, r) => {
-    if (r == null || !Fa(r)) return !0;
-    const o = sa(n, i);
+    if (r == null || !Ba(r)) return !0;
+    const o = da(n, i);
     e.push({ oldCell: o, newCell: o });
   }), e;
 }
-function Li(a, e, n, i) {
+function Pi(a, e, n, i) {
   if (e == null || n == null)
     return null;
   switch (a) {
     case 0:
-      return Ti(e, n, i);
-    case 1:
       return Ei(e, n, i);
-    case 2:
+    case 1:
       return Ii(e, n, i);
+    case 2:
+      return Ni(e, n, i);
     default:
       return null;
   }
 }
-function Pi(a, e) {
+function Ti(a, e) {
   const { type: n, rangeFilteredRows: i } = e, r = e.range;
   let o = null, u = !1;
   switch (n) {
     case 3:
-      o = Ni(r, a), u = !0;
+      o = Ri(r, a), u = !0;
       break;
     case 4:
-      o = Ri(r, a), u = !0;
+      o = Si(r, a), u = !0;
       break;
     case 5:
-      o = Si(r, a, i);
+      o = Ai(r, a, i);
       break;
     case 6:
-      o = Ai(r, a);
+      o = Ci(r, a);
       break;
     case 7:
-      o = Ci(r, a);
+      o = Di(r, a);
       break;
     case 8:
-      o = Di(r, a);
+      o = bi(r, a);
       break;
     case 9:
-      o = bi(r, a), u = !0;
+      o = Oi(r, a), u = !0;
       break;
     case 10:
-      o = Oi(r, a), u = !0;
+      o = Mi(r, a), u = !0;
       break;
   }
   return { newCell: o, isReverse: u };
 }
-function Ti(a, e, n) {
-  const i = Ra(
+function Ei(a, e, n) {
+  const i = Sa(
     {
       id: H.MoveRangeCommandId,
       params: { toRange: e, fromRange: a }
@@ -740,8 +740,8 @@ function Ti(a, e, n) {
   );
   return w(i, n);
 }
-function Ei(a, e, n) {
-  const i = Na(
+function Ii(a, e, n) {
+  const i = Ra(
     {
       id: H.MoveRowsCommandId,
       params: { toRange: e, fromRange: a }
@@ -750,8 +750,8 @@ function Ei(a, e, n) {
   );
   return w(i, n);
 }
-function Ii(a, e, n) {
-  const i = Ia(
+function Ni(a, e, n) {
+  const i = Na(
     {
       id: H.MoveColsCommandId,
       params: { toRange: e, fromRange: a }
@@ -760,28 +760,28 @@ function Ii(a, e, n) {
   );
   return w(i, n);
 }
-function Ni(a, e) {
-  const n = xa(
+function Ri(a, e) {
+  const n = _a(
     {
       id: H.InsertRowCommandId,
-      params: { range: a, unitId: "", subUnitId: "", direction: We.DOWN }
+      params: { range: a, unitId: "", subUnitId: "", direction: Xe.DOWN }
     },
     e
   );
   return w(n, e);
 }
-function Ri(a, e) {
-  const n = Ma(
+function Si(a, e) {
+  const n = xa(
     {
       id: H.InsertColCommandId,
-      params: { range: a, unitId: "", subUnitId: "", direction: We.RIGHT }
+      params: { range: a, unitId: "", subUnitId: "", direction: Xe.RIGHT }
     },
     e
   );
   return w(n, e);
 }
-function Si(a, e, n) {
-  const i = Oa(
+function Ai(a, e, n) {
+  const i = Ma(
     {
       id: H.RemoveRowCommandId,
       params: { range: a }
@@ -791,8 +791,8 @@ function Si(a, e, n) {
   );
   return w(i, e);
 }
-function Ai(a, e) {
-  const n = ba(
+function Ci(a, e) {
+  const n = Oa(
     {
       id: H.RemoveColCommandId,
       params: { range: a }
@@ -801,8 +801,8 @@ function Ai(a, e) {
   );
   return w(n, e);
 }
-function Ci(a, e) {
-  const n = Da(
+function Di(a, e) {
+  const n = ba(
     {
       id: H.DeleteRangeMoveLeftCommandId,
       params: { range: a }
@@ -811,8 +811,8 @@ function Ci(a, e) {
   );
   return w(n, e);
 }
-function Di(a, e) {
-  const n = Ca(
+function bi(a, e) {
+  const n = Da(
     {
       id: H.DeleteRangeMoveUpCommandId,
       params: { range: a }
@@ -821,8 +821,8 @@ function Di(a, e) {
   );
   return w(n, e);
 }
-function bi(a, e) {
-  const n = Aa(
+function Oi(a, e) {
+  const n = Ca(
     {
       id: H.InsertRangeMoveDownCommandId,
       params: { range: a }
@@ -831,8 +831,8 @@ function bi(a, e) {
   );
   return w(n, e);
 }
-function Oi(a, e) {
-  const n = Sa(
+function Mi(a, e) {
+  const n = Aa(
     {
       id: H.InsertRangeMoveRightCommandId,
       params: { range: a }
@@ -841,33 +841,33 @@ function Oi(a, e) {
   );
   return w(n, e);
 }
-function Mi(a, e, n) {
+function xi(a, e, n) {
   var r, o, u;
   const i = new G({});
   for (let f = 0; f < a.length; f++) {
     const { oldCell: m, newCell: c } = a[f];
     if ((r = i.getValue(m.startRow, m.startColumn)) != null && r.f || (o = i.getValue(m.startRow, m.startColumn)) != null && o.si || i.setValue(m.startRow, m.startColumn, { f: null, si: null }), c) {
-      const s = (u = n.getValue(m.startRow, m.startColumn)) != null ? u : e.getValue(m.startRow, m.startColumn), P = ge(s);
+      const s = (u = n.getValue(m.startRow, m.startColumn)) != null ? u : e.getValue(m.startRow, m.startColumn), P = qe(s);
       i.setValue(c.startRow, c.startColumn, P);
     }
   }
   return i.getMatrix();
 }
-function xi(a, e) {
+function _i(a, e) {
   const n = new G({});
   for (let i = a.length - 1; i >= 0; i--) {
-    const { oldCell: r, newCell: o } = a[i], u = e.getValue(r.startRow, r.startColumn), f = ge(u);
+    const { oldCell: r, newCell: o } = a[i], u = e.getValue(r.startRow, r.startColumn), f = qe(u);
     if (n.setValue(r.startRow, r.startColumn, f), o) {
-      const m = e.getValue(o.startRow, o.startColumn), c = ge(m);
+      const m = e.getValue(o.startRow, o.startColumn), c = qe(m);
       n.setValue(o.startRow, o.startColumn, c != null ? c : { f: null, si: null });
     }
   }
   return n.getMatrix();
 }
-function ge(a) {
+function qe(a) {
   if (a == null)
     return;
-  const { f: e, si: n, x: i = 0, y: r = 0 } = a, o = xe(e), u = la(n);
+  const { f: e, si: n, x: i = 0, y: r = 0 } = a, o = Me(e), u = sa(n);
   if (!o && !u)
     return {
       f: null,
@@ -876,18 +876,18 @@ function ge(a) {
   const f = {};
   return u && (f.si = n), o && i === 0 && r === 0 && (f.f = e), f.f === void 0 && (f.f = null), f.si === void 0 && (f.si = null), f;
 }
-function _i(a) {
+function yi(a) {
   const e = new G({});
   return new G(a).forValue((i, r, o) => {
-    const u = ge(o);
+    const u = qe(o);
     u && e.setValue(i, r, u);
   }), e.getMatrix();
 }
-function Fa(a) {
-  const e = (a == null ? void 0 : a.f) || "", n = (a == null ? void 0 : a.si) || "", i = xe(e), r = la(n);
+function Ba(a) {
+  const e = (a == null ? void 0 : a.f) || "", n = (a == null ? void 0 : a.si) || "", i = Me(e), r = sa(n);
   return !!(i || r);
 }
-function Ba(a, e, n, i, r, o) {
+function va(a, e, n, i, r, o) {
   if ((r == null || r.length === 0) && (o == null || o.length === 0)) {
     if (a === n && e === i)
       return !0;
@@ -895,7 +895,7 @@ function Ba(a, e, n, i, r, o) {
     return !0;
   return !1;
 }
-function va(a, e, n = 0, i = 0) {
+function Va(a, e, n = 0, i = 0) {
   const r = [];
   for (let o = 0, u = a.length; o < u; o++) {
     const f = a[o];
@@ -906,7 +906,7 @@ function va(a, e, n = 0, i = 0) {
     const { token: m } = f, c = pe(m), { range: s, sheetName: P, unitId: E } = c, p = fe.moveOffset(s, n, i);
     r.push({
       ...f,
-      token: mt({
+      token: ut({
         range: p,
         unitId: E,
         sheetName: P
@@ -915,7 +915,7 @@ function va(a, e, n = 0, i = 0) {
   }
   return r;
 }
-function Va(a, e, n, i) {
+function Ga(a, e, n, i) {
   const { type: r, unitId: o, sheetId: u, range: f, from: m, to: c, rangeFilteredRows: s } = e, {
     range: P,
     sheetId: E,
@@ -924,7 +924,7 @@ function Va(a, e, n, i) {
     refOffsetX: S,
     refOffsetY: N
   } = a;
-  if (!Ba(
+  if (!va(
     o,
     u,
     n,
@@ -938,10 +938,10 @@ function Va(a, e, n, i) {
   if (r === y.MoveRange) {
     if (m == null || c == null)
       return;
-    const I = Tt(d, m), T = Xe(d, m);
+    const I = Tt(d, m), T = Ye(d, m);
     if (T == null || I !== 4)
       return;
-    const g = Ra(
+    const g = Sa(
       { id: H.MoveRangeCommandId, params: { toRange: c, fromRange: m } },
       T
     ), h = w(g, T);
@@ -952,7 +952,7 @@ function Va(a, e, n, i) {
     if (m == null || c == null)
       return;
     const I = Tt(d, m);
-    let T = Xe(d, m);
+    let T = Ye(d, m);
     if (T == null && (m.endRow < d.startRow && c.endRow <= d.startRow || m.startRow > d.endRow && c.startRow > d.endRow))
       return;
     T == null && (T = {
@@ -962,7 +962,7 @@ function Va(a, e, n, i) {
       endColumn: d.endColumn,
       rangeType: Y.NORMAL
     });
-    const g = Na(
+    const g = Ra(
       { id: H.MoveRowsCommandId, params: { toRange: c, fromRange: m } },
       T
     ), h = w(g, T);
@@ -973,7 +973,7 @@ function Va(a, e, n, i) {
     if (m == null || c == null)
       return;
     const I = Tt(d, m);
-    let T = Xe(d, m);
+    let T = Ye(d, m);
     if (T == null && (m.endColumn < d.startColumn && c.endColumn <= d.startColumn || m.startColumn > d.endColumn && c.startColumn > d.endColumn))
       return;
     T == null && (T = {
@@ -983,7 +983,7 @@ function Va(a, e, n, i) {
       endColumn: d.endColumn,
       rangeType: Y.NORMAL
     });
-    const g = Ia(
+    const g = Na(
       { id: H.MoveColsCommandId, params: { toRange: c, fromRange: m } },
       T
     ), h = w(g, T);
@@ -993,10 +993,10 @@ function Va(a, e, n, i) {
   }
   if (f != null) {
     if (r === y.InsertRow) {
-      const I = xa(
+      const I = _a(
         {
           id: H.InsertRowCommandId,
-          params: { range: f, unitId: "", subUnitId: "", direction: We.DOWN }
+          params: { range: f, unitId: "", subUnitId: "", direction: Xe.DOWN }
         },
         d
       ), T = w(I, d);
@@ -1007,10 +1007,10 @@ function Va(a, e, n, i) {
         ...T
       };
     } else if (r === y.InsertColumn) {
-      const I = Ma(
+      const I = xa(
         {
           id: H.InsertColCommandId,
-          params: { range: f, unitId: "", subUnitId: "", direction: We.RIGHT }
+          params: { range: f, unitId: "", subUnitId: "", direction: Xe.RIGHT }
         },
         d
       ), T = w(I, d);
@@ -1021,7 +1021,7 @@ function Va(a, e, n, i) {
         ...T
       };
     } else if (r === y.RemoveRow) {
-      const I = Oa(
+      const I = Ma(
         {
           id: H.RemoveRowCommandId,
           params: { range: f }
@@ -1036,7 +1036,7 @@ function Va(a, e, n, i) {
         ...T
       };
     } else if (r === y.RemoveColumn) {
-      const I = ba(
+      const I = Oa(
         {
           id: H.RemoveColCommandId,
           params: { range: f }
@@ -1050,7 +1050,7 @@ function Va(a, e, n, i) {
         ...T
       };
     } else if (r === y.DeleteMoveLeft) {
-      const I = Da(
+      const I = ba(
         {
           id: H.DeleteRangeMoveLeftCommandId,
           params: { range: f }
@@ -1064,7 +1064,7 @@ function Va(a, e, n, i) {
         ...T
       };
     } else if (r === y.DeleteMoveUp) {
-      const I = Ca(
+      const I = Da(
         {
           id: H.DeleteRangeMoveUpCommandId,
           params: { range: f }
@@ -1078,7 +1078,7 @@ function Va(a, e, n, i) {
         ...T
       };
     } else if (r === y.InsertMoveDown) {
-      const I = Aa(
+      const I = Ca(
         {
           id: H.InsertRangeMoveDownCommandId,
           params: { range: f }
@@ -1092,7 +1092,7 @@ function Va(a, e, n, i) {
         ...T
       };
     } else if (r === y.InsertMoveRight) {
-      const I = Sa(
+      const I = Aa(
         {
           id: H.InsertRangeMoveRightCommandId,
           params: { range: f }
@@ -1108,7 +1108,7 @@ function Va(a, e, n, i) {
     }
   }
   if (D != null)
-    return mt({
+    return ut({
       range: D,
       sheetName: R,
       unitId: p
@@ -1211,55 +1211,55 @@ function be(a) {
     endColumn: Se(r)
   };
 }
-function Ga(a, e) {
+function Ha(a, e) {
   const { id: n } = e;
   let i = null;
   switch (n) {
+    case Pn.id:
+      i = qi(e, a);
+      break;
     case Ln.id:
-      i = yi(e, a);
+      i = gi(e, a);
       break;
     case pn.id:
-      i = qi(e, a);
+      i = hi(e, a);
       break;
     case dn.id:
-      i = gi(e, a);
+      i = Ui(e);
       break;
     case sn.id:
-      i = hi(e);
+      i = Fi(e);
       break;
     case ln.id:
-      i = Ui(e);
-      break;
-    case cn.id:
-      i = Fi(e, a);
-      break;
-    case fn.id:
       i = Bi(e, a);
       break;
-    case mn.id:
+    case cn.id:
       i = vi(e, a);
       break;
-    case un.id:
+    case fn.id:
       i = Vi(e, a);
       break;
-    case on.id:
+    case mn.id:
       i = Gi(e, a);
       break;
-    case rn.id:
+    case un.id:
       i = Hi(e, a);
       break;
-    case nn.id:
+    case on.id:
       i = wi(e, a);
       break;
-    case an.id:
+    case rn.id:
       i = Yi(e, a);
       break;
-    case ya.id:
+    case nn.id:
       i = Xi(e, a);
       break;
-    case _a.id:
+    case qa.id:
       i = Wi(e, a);
       break;
+    case ya.id:
+      i = Ki(e, a);
+      break;
   }
   return i;
 }
@@ -1271,7 +1271,7 @@ function J(a) {
     sheetId: n
   };
 }
-function yi(a, e) {
+function qi(a, e) {
   const { params: n } = a;
   if (!n) return null;
   const { fromRange: i, toRange: r } = n;
@@ -1285,7 +1285,7 @@ function yi(a, e) {
     sheetId: u
   };
 }
-function qi(a, e) {
+function gi(a, e) {
   const { params: n } = a;
   if (!n) return null;
   const {
@@ -1314,7 +1314,7 @@ function qi(a, e) {
     sheetId: c
   };
 }
-function gi(a, e) {
+function hi(a, e) {
   const { params: n } = a;
   if (!n) return null;
   const {
@@ -1343,7 +1343,7 @@ function gi(a, e) {
     sheetId: c
   };
 }
-function hi(a) {
+function Ui(a) {
   const { params: e } = a;
   if (!e) return null;
   const { range: n, unitId: i, subUnitId: r } = e;
@@ -1354,7 +1354,7 @@ function hi(a) {
     sheetId: r
   };
 }
-function Ui(a) {
+function Fi(a) {
   const { params: e } = a;
   if (!e) return null;
   const { range: n, unitId: i, subUnitId: r } = e;
@@ -1365,7 +1365,7 @@ function Ui(a) {
     sheetId: r
   };
 }
-function Fi(a, e) {
+function Bi(a, e) {
   const { params: n } = a;
   if (!n) return null;
   const { range: i } = n, { unitId: r, sheetId: o } = J(e);
@@ -1376,7 +1376,7 @@ function Fi(a, e) {
     sheetId: o
   };
 }
-function Bi(a, e) {
+function vi(a, e) {
   const { params: n } = a;
   if (!n) return null;
   const { range: i } = n, { unitId: r, sheetId: o } = J(e);
@@ -1387,7 +1387,7 @@ function Bi(a, e) {
     sheetId: o
   };
 }
-function vi(a, e) {
+function Vi(a, e) {
   var u, f;
   const { params: n } = a;
   if (!n) return null;
@@ -1400,7 +1400,7 @@ function vi(a, e) {
     rangeFilteredRows: (f = (u = e.getSheetBySheetId(o)) == null ? void 0 : u.getRangeFilterRows(i)) != null ? f : []
   };
 }
-function Vi(a, e) {
+function Gi(a, e) {
   const { params: n } = a;
   if (!n) return null;
   const { range: i } = n, { unitId: r, sheetId: o } = J(e);
@@ -1411,7 +1411,7 @@ function Vi(a, e) {
     sheetId: o
   };
 }
-function Gi(a, e) {
+function Hi(a, e) {
   const { params: n } = a;
   if (!n) return null;
   const { range: i } = n, { unitId: r, sheetId: o } = J(e);
@@ -1422,7 +1422,7 @@ function Gi(a, e) {
     sheetId: o
   };
 }
-function Hi(a, e) {
+function wi(a, e) {
   const { params: n } = a;
   if (!n) return null;
   const { range: i } = n, { unitId: r, sheetId: o } = J(e);
@@ -1433,7 +1433,7 @@ function Hi(a, e) {
     sheetId: o
   };
 }
-function wi(a, e) {
+function Yi(a, e) {
   const { params: n } = a;
   if (!n) return null;
   const { unitId: i, subUnitId: r, name: o } = n, { unitId: u, sheetId: f } = J(e);
@@ -1444,7 +1444,7 @@ function wi(a, e) {
     sheetName: o
   };
 }
-function Yi(a, e) {
+function Xi(a, e) {
   const { params: n } = a;
   if (!n) return null;
   const { unitId: i, subUnitId: r } = n, { unitId: o, sheetId: u } = J(e);
@@ -1454,7 +1454,7 @@ function Yi(a, e) {
     sheetId: r || u
   };
 }
-function Xi(a, e) {
+function Wi(a, e) {
   const { params: n } = a;
   if (!n) return null;
   const { unitId: i, name: r, id: o } = n, { sheetId: u } = J(e);
@@ -1466,7 +1466,7 @@ function Xi(a, e) {
     definedNameId: o
   };
 }
-function Wi(a, e) {
+function Ki(a, e) {
   const { params: n } = a;
   if (!n) return null;
   const { unitId: i, name: r, id: o } = n, { sheetId: u } = J(e);
@@ -1478,12 +1478,12 @@ function Wi(a, e) {
     definedNameId: o
   };
 }
-var Ki = Object.getOwnPropertyDescriptor, ki = (a, e, n, i) => {
-  for (var r = i > 1 ? void 0 : i ? Ki(e, n) : e, o = a.length - 1, u; o >= 0; o--)
+var ki = Object.getOwnPropertyDescriptor, Qi = (a, e, n, i) => {
+  for (var r = i > 1 ? void 0 : i ? ki(e, n) : e, o = a.length - 1, u; o >= 0; o--)
     (u = a[o]) && (r = u(r) || r);
   return r;
-}, Ve = (a, e) => (n, i) => e(n, i, a);
-let je = class extends ae {
+}, ve = (a, e) => (n, i) => e(n, i, a);
+let $e = class extends ae {
   constructor(a, e, n, i) {
     super(), this._definedNamesService = a, this._univerInstanceService = e, this._sheetInterceptorService = n, this._lexerTreeBuilder = i, this._initialize();
   }
@@ -1494,7 +1494,7 @@ let je = class extends ae {
     this.disposeWithMe(
       this._sheetInterceptorService.interceptCommand({
         getMutations: (a) => {
-          if (a.id === ya.id || a.id === _a.id)
+          if (a.id === qa.id || a.id === ya.id)
             return {
               redos: [],
               undos: []
@@ -1505,7 +1505,7 @@ let je = class extends ae {
               redos: [],
               undos: []
             };
-          const n = Ga(e, a);
+          const n = Ha(e, a);
           return n ? this._getUpdateDefinedNameMutations(e, n) : {
             redos: [],
             undos: []
@@ -1552,13 +1552,13 @@ let je = class extends ae {
           } = e;
           if (O == null || M == null || M.length === 0 || Q !== M)
             continue;
-          V = mt({
+          V = ut({
             range: h,
             sheetName: O,
             unitId: q
           });
         } else
-          V = Va(
+          V = Ga(
             U,
             e,
             i,
@@ -1571,8 +1571,8 @@ let je = class extends ae {
       }
       if (!P)
         return !0;
-      const p = Qe(va(s, E)), R = {
-        id: qe.id,
+      const p = ke(Va(s, E)), R = {
+        id: ye.id,
         params: {
           unitId: i,
           ...m,
@@ -1581,7 +1581,7 @@ let je = class extends ae {
       };
       u.push(R);
       const S = {
-        id: qe.id,
+        id: ye.id,
         params: {
           unitId: i,
           ...m
@@ -1599,18 +1599,18 @@ let je = class extends ae {
     return ((o = this._definedNamesService.getWorksheetByRef(e, i)) == null ? void 0 : o.getSheetId()) === n ? j.REF : null;
   }
 };
-je = ki([
-  Ve(0, Ut),
-  Ve(1, Ae),
-  Ve(2, X(gt)),
-  Ve(3, X(Ft))
-], je);
-var Qi = Object.getOwnPropertyDescriptor, $i = (a, e, n, i) => {
-  for (var r = i > 1 ? void 0 : i ? Qi(e, n) : e, o = a.length - 1, u; o >= 0; o--)
+$e = Qi([
+  ve(0, Ut),
+  ve(1, Ae),
+  ve(2, X(gt)),
+  ve(3, X(Ft))
+], $e);
+var $i = Object.getOwnPropertyDescriptor, ji = (a, e, n, i) => {
+  for (var r = i > 1 ? void 0 : i ? $i(e, n) : e, o = a.length - 1, u; o >= 0; o--)
     (u = a[o]) && (r = u(r) || r);
   return r;
 }, me = (a, e) => (n, i) => e(n, i, a);
-let ze = class extends ae {
+let je = class extends ae {
   constructor(a, e, n, i, r, o, u, f) {
     super(), this._univerInstanceService = a, this._commandService = e, this._lexerTreeBuilder = n, this._formulaDataModel = i, this._sheetInterceptorService = r, this._definedNamesService = o, this._configService = u, this._injector = f, this._commandExecutedListener();
   }
@@ -1629,12 +1629,12 @@ let ze = class extends ae {
       this._commandService.beforeCommandExecuted((a, e) => {
         if (a.id === Z.id) {
           const n = a.params;
-          if (e && e.onlyLocal === !0 || n.trigger === qt.id || n.trigger === Ta.id || n.trigger === Ea.id)
+          if (e && e.onlyLocal === !0 || n.trigger === qt.id || n.trigger === Ea.id || n.trigger === Ia.id)
             return;
           this._handleSetRangeValuesMutation(n);
         }
       })
-    ), this.disposeWithMe(this._univerInstanceService.getTypeOfUnitAdded$(te.UNIVER_SHEET).subscribe((a) => this._handleWorkbookAdded(a))), this.disposeWithMe(this._univerInstanceService.getTypeOfUnitDisposed$(te.UNIVER_SHEET).pipe(zn((a) => a.getUnitId())).subscribe((a) => this._handleWorkbookDisposed(a)));
+    ), this.disposeWithMe(this._univerInstanceService.getTypeOfUnitAdded$(te.UNIVER_SHEET).subscribe((a) => this._handleWorkbookAdded(a))), this.disposeWithMe(this._univerInstanceService.getTypeOfUnitDisposed$(te.UNIVER_SHEET).pipe(Zn((a) => a.getUnitId())).subscribe((a) => this._handleWorkbookDisposed(a)));
   }
   _handleSetRangeValuesMutation(a) {
     const { subUnitId: e, unitId: n, cellValue: i } = a;
@@ -1650,14 +1650,14 @@ let ze = class extends ae {
       {
         unitId: n,
         subUnitId: e,
-        cellValue: _i(r)
+        cellValue: yi(r)
       },
       {
         onlyLocal: !0,
         fromFormula: !0
       }
     ), this._formulaDataModel.updateArrayFormulaCellData(n, e, i), this._formulaDataModel.updateArrayFormulaRange(n, e, i), this._commandService.executeCommand(
-      ve.id,
+      Be.id,
       {
         formulaData: o
       },
@@ -1680,7 +1680,7 @@ let ze = class extends ae {
   _handleWorkbookDisposed(a, e) {
     const n = this._formulaDataModel.getFormulaData(), i = Lt(n, a, e), r = this._formulaDataModel.getArrayFormulaRange(), o = Lt(r, a, e), u = this._formulaDataModel.getArrayFormulaCellData(), f = Lt(u, a, e);
     i && this._commandService.executeCommand(
-      ve.id,
+      Be.id,
       {
         formulaData: i
       },
@@ -1701,7 +1701,7 @@ let ze = class extends ae {
   _handleInsertSheetMutation(a) {
     const { sheet: e, unitId: n } = a, i = this._formulaDataModel.getFormulaData(), { id: r, cellData: o } = e, u = new G(o), f = ta(i, n, r, u);
     this._commandService.executeCommand(
-      ve.id,
+      Be.id,
       {
         formulaData: f
       },
@@ -1717,8 +1717,8 @@ let ze = class extends ae {
       var p;
       const s = c.getCellMatrix(), P = c.getSheetId(), E = ta(e, n, P, s);
       i[n][P] = (p = E[n]) == null ? void 0 : p[P];
-    }), this._commandService.executeCommand(ve.id, { formulaData: i }, { onlyLocal: !0 });
-    const o = this._configService.getConfig(he), u = (m = o == null ? void 0 : o.initialFormulaComputing) != null ? m : Le.WHEN_EMPTY, f = this._getDirtyDataByCalculationMode(u);
+    }), this._commandService.executeCommand(Be.id, { formulaData: i }, { onlyLocal: !0 });
+    const o = this._configService.getConfig(ge), u = (m = o == null ? void 0 : o.initialFormulaComputing) != null ? m : Le.WHEN_EMPTY, f = this._getDirtyDataByCalculationMode(u);
     this._commandService.executeCommand(Ie.id, f, { onlyLocal: !0 });
   }
   _getDirtyDataByCalculationMode(a) {
@@ -1740,13 +1740,13 @@ let ze = class extends ae {
         undos: [],
         redos: []
       };
-    const n = Ga(e, a);
+    const n = Ha(e, a);
     if (n) {
       const { unitSheetNameMap: i } = this._formulaDataModel.getCalculateData(), r = this._formulaDataModel.getFormulaData(), { newFormulaData: o } = this._getFormulaReferenceMoveInfo(
         r,
         i,
         n
-      ), { undos: u, redos: f } = fi(r, o, n);
+      ), { undos: u, redos: f } = ci(r, o, n);
       return {
         undos: u,
         redos: f
@@ -1759,7 +1759,7 @@ let ze = class extends ae {
   }
   // eslint-disable-next-line max-lines-per-function
   _getFormulaReferenceMoveInfo(a, e, n) {
-    if (!Me.isDefine(a)) return { newFormulaData: {}, oldFormulaData: {} };
+    if (!ft.isDefine(a)) return { newFormulaData: {}, oldFormulaData: {} };
     const i = Object.keys(a);
     if (i.length === 0) return { newFormulaData: {}, oldFormulaData: {} };
     const r = {}, o = {};
@@ -1768,7 +1768,7 @@ let ze = class extends ae {
       if (f == null)
         continue;
       const m = Object.keys(f);
-      Me.isDefine(r[u]) || (r[u] = {}), Me.isDefine(o[u]) || (o[u] = {});
+      ft.isDefine(r[u]) || (r[u] = {}), ft.isDefine(o[u]) || (o[u] = {});
       for (const c of m) {
         const s = new G(f[c] || {}), P = new G();
         s.forValue((E, p, R) => {
@@ -1799,7 +1799,7 @@ let ze = class extends ae {
             } else if (Q !== ee.REFERENCE)
               continue;
             const Pe = pe(V), { range: ne, sheetName: re, unitId: k } = Pe, oe = k == null || k.length === 0 ? u : k, z = ((B = e == null ? void 0 : e[oe]) == null ? void 0 : B[re]) || "";
-            if (!Ba(
+            if (!va(
               n.unitId,
               n.sheetId,
               u,
@@ -1808,7 +1808,7 @@ let ze = class extends ae {
               z
             ))
               continue;
-            const Ue = {
+            const he = {
               range: ne,
               sheetId: z,
               unitId: k,
@@ -1825,7 +1825,7 @@ let ze = class extends ae {
               } = n;
               if (le == null || z == null || z.length === 0 || Ee !== z)
                 continue;
-              ue = mt({
+              ue = ut({
                 range: ne,
                 sheetName: le,
                 unitId: k
@@ -1839,8 +1839,8 @@ let ze = class extends ae {
               if (z == null || z.length === 0 || Ee !== z)
                 continue;
               ue = j.REF;
-            } else O !== y.SetDefinedName && (ue = Va(
-              Ue,
+            } else O !== y.SetDefinedName && (ue = Ga(
+              he,
               n,
               u,
               c
@@ -1852,9 +1852,9 @@ let ze = class extends ae {
           }
           if (!T)
             return !0;
-          const h = va(I, g, N, d);
+          const h = Va(I, g, N, d);
           P.setValue(E, p, {
-            f: `=${Qe(h)}`
+            f: `=${ke(h)}`
           });
         }), o[u] && (o[u][c] = P.getData());
       }
@@ -1862,23 +1862,23 @@ let ze = class extends ae {
     return { newFormulaData: o };
   }
 };
-ze = $i([
+je = ji([
   me(0, Ae),
   me(1, ce),
   me(2, X(Ft)),
-  me(3, X(ut)),
+  me(3, X(ot)),
   me(4, X(gt)),
   me(5, Ut),
   me(6, Ce),
-  me(7, X(ot))
-], ze);
-const ji = "SHEETS_FORMULA_PLUGIN";
-var zi = Object.getOwnPropertyDescriptor, Zi = (a, e, n, i) => {
-  for (var r = i > 1 ? void 0 : i ? zi(e, n) : e, o = a.length - 1, u; o >= 0; o--)
+  me(7, X(rt))
+], je);
+const zi = "SHEETS_FORMULA_PLUGIN";
+var Zi = Object.getOwnPropertyDescriptor, Ji = (a, e, n, i) => {
+  for (var r = i > 1 ? void 0 : i ? Zi(e, n) : e, o = a.length - 1, u; o >= 0; o--)
     (u = a[o]) && (r = u(r) || r);
   return r;
 }, Et = (a, e) => (n, i) => e(n, i, a);
-let Ze = class extends ae {
+let ze = class extends ae {
   constructor(a, e, n) {
     super(), this._activeDirtyManagerService = a, this._univerInstanceService = e, this._formulaDataModel = n, this._initialize();
   }
@@ -2059,8 +2059,8 @@ let Ze = class extends ae {
     });
   }
   _initialDefinedName() {
-    this._activeDirtyManagerService.register(qe.id, {
-      commandId: qe.id,
+    this._activeDirtyManagerService.register(ye.id, {
+      commandId: ye.id,
       getDirtyData: (a) => {
         const e = a.params;
         return { dirtyDefinedNameMap: this._getDefinedNameMutation(e) };
@@ -2172,17 +2172,17 @@ let Ze = class extends ae {
     return i;
   }
 };
-Ze = Zi([
+ze = Ji([
   Et(0, ht),
   Et(1, Ae),
-  Et(2, X(ut))
-], Ze);
-var Ji = Object.getOwnPropertyDescriptor, er = (a, e, n, i) => {
-  for (var r = i > 1 ? void 0 : i ? Ji(e, n) : e, o = a.length - 1, u; o >= 0; o--)
+  Et(2, X(ot))
+], ze);
+var er = Object.getOwnPropertyDescriptor, tr = (a, e, n, i) => {
+  for (var r = i > 1 ? void 0 : i ? er(e, n) : e, o = a.length - 1, u; o >= 0; o--)
     (u = a[o]) && (r = u(r) || r);
   return r;
-}, Ge = (a, e) => (n, i) => e(n, i, a);
-let Je = class extends ae {
+}, Ve = (a, e) => (n, i) => e(n, i, a);
+let Ze = class extends ae {
   constructor(a, e, n, i) {
     super(), this._commandService = a, this._configService = e, this._sheetInterceptorService = n, this._formulaDataModel = i, this._initialize();
   }
@@ -2199,7 +2199,7 @@ let Je = class extends ae {
         if (e == null)
           return;
         const { arrayFormulaRange: n, arrayFormulaCellData: i } = e;
-        this._formulaDataModel.setArrayFormulaRange(n), this._formulaDataModel.setArrayFormulaCellData(i), (r = this._configService.getConfig(he)) != null && r.writeArrayFormulaToSnapshot && this._writeArrayFormulaToSnapshot(n, i);
+        this._formulaDataModel.setArrayFormulaRange(n), this._formulaDataModel.setArrayFormulaCellData(i), (r = this._configService.getConfig(ge)) != null && r.writeArrayFormulaToSnapshot && this._writeArrayFormulaToSnapshot(n, i);
       })
     );
   }
@@ -2208,7 +2208,7 @@ let Je = class extends ae {
       i && Array.from(Object.entries(i)).forEach(([r, o]) => {
         const u = new G();
         new G(o).forValue((m, c, s) => {
-          u.setValue(m, c, { ref: ye(s) });
+          u.setValue(m, c, { ref: _e(s) });
         }), this._commandService.executeCommand(Z.id, {
           unitId: n,
           subUnitId: r,
@@ -2233,26 +2233,26 @@ let Je = class extends ae {
   }
   _initInterceptorCellContent() {
     this.disposeWithMe(
-      this._sheetInterceptorService.intercept(Pn.CELL_CONTENT, {
+      this._sheetInterceptorService.intercept(Tn.CELL_CONTENT, {
         priority: 100,
-        effect: Qa.Value,
+        effect: $a.Value,
         handler: (a, e, n) => {
           var s, P, E;
           let i = a;
           const { unitId: r, subUnitId: o, row: u, col: f } = e, m = this._formulaDataModel.getArrayFormulaCellData(), c = (E = (P = (s = m == null ? void 0 : m[r]) == null ? void 0 : s[o]) == null ? void 0 : P[u]) == null ? void 0 : E[f];
-          return c == null ? n(i) : ((!i || i === e.rawData) && (i = { ...e.rawData }), c.v == null && c.t == null ? (i.v = 0, i.t = Gt.NUMBER, n(i)) : (i == null ? void 0 : i.t) === Gt.NUMBER && i.v !== void 0 && i.v !== null && $a(i.v) ? (i.v = bn(Number(i.v)), n(i)) : (i.v = c.v, i.t = c.t, n(i)));
+          return c == null ? n(i) : ((!i || i === e.rawData) && (i = { ...e.rawData }), c.v == null && c.t == null ? (i.v = 0, i.t = Gt.NUMBER, n(i)) : (i == null ? void 0 : i.t) === Gt.NUMBER && i.v !== void 0 && i.v !== null && ja(i.v) ? (i.v = On(Number(i.v)), n(i)) : (i.v = c.v, i.t = c.t, n(i)));
         }
       })
     );
   }
 };
-Je = er([
-  Ge(0, ce),
-  Ge(1, Ce),
-  Ge(2, X(gt)),
-  Ge(3, X(ut))
-], Je);
-const tr = [
+Ze = tr([
+  Ve(0, ce),
+  Ve(1, Ce),
+  Ve(2, X(gt)),
+  Ve(3, X(ot))
+], Ze);
+const ar = [
   {
     functionName: aa.ARRAY_CONSTRAIN,
     functionType: t.Array,
@@ -2304,7 +2304,7 @@ const tr = [
       }
     ]
   }
-], ar = [
+], nr = [
   {
     functionName: x.BETADIST,
     functionType: t.Compatibility,
@@ -3358,7 +3358,7 @@ const tr = [
       }
     ]
   }
-], nr = [
+], ir = [
   {
     functionName: se.CUBEKPIMEMBER,
     functionType: t.Cube,
@@ -3513,7 +3513,7 @@ const tr = [
       }
     ]
   }
-], ir = [
+], rr = [
   {
     functionName: $.DAVERAGE,
     functionType: t.Database,
@@ -3862,7 +3862,7 @@ const tr = [
       }
     ]
   }
-], rr = [
+], or = [
   {
     functionName: F.DATE,
     functionType: t.Date,
@@ -4434,7 +4434,7 @@ const tr = [
       }
     ]
   }
-], or = [
+], ur = [
   {
     functionName: A.BESSELI,
     functionType: t.Engineering,
@@ -5507,7 +5507,7 @@ const tr = [
       }
     ]
   }
-], ur = [
+], mr = [
   {
     functionName: C.ACCRINT,
     functionType: t.Financial,
@@ -7768,7 +7768,7 @@ const tr = [
       }
     ]
   }
-], mr = [
+], fr = [
   {
     functionName: v.CELL,
     functionType: t.Information,
@@ -8177,7 +8177,7 @@ const tr = [
       }
     ]
   }
-], fr = [
+], cr = [
   {
     functionName: K.AND,
     functionType: t.Logical,
@@ -8651,7 +8651,7 @@ const tr = [
       }
     ]
   }
-], cr = [
+], lr = [
   {
     functionName: _.ADDRESS,
     functionType: t.Lookup,
@@ -9683,7 +9683,7 @@ const tr = [
       }
     ]
   }
-], lr = [
+], sr = [
   {
     functionName: L.ABS,
     functionType: t.Math,
@@ -11321,7 +11321,7 @@ const tr = [
       }
     ]
   }
-], sr = [
+], dr = [
   {
     functionName: l.AVEDEV,
     functionType: t.Statistical,
@@ -14263,7 +14263,7 @@ const tr = [
       }
     ]
   }
-], dr = [
+], pr = [
   {
     functionName: b.ASC,
     functionType: t.Text,
@@ -15477,7 +15477,7 @@ const tr = [
       }
     ]
   }
-], pr = [], Lr = [
+], Lr = [], Pr = [
   {
     functionName: st.ENCODEURL,
     functionType: t.Web,
@@ -15537,29 +15537,29 @@ const tr = [
       }
     ]
   }
-], Pr = [
-  ...ur,
-  ...rr,
-  ...lr,
+], Tr = [
+  ...mr,
+  ...or,
   ...sr,
-  ...cr,
-  ...ir,
   ...dr,
+  ...lr,
+  ...rr,
+  ...pr,
+  ...cr,
   ...fr,
-  ...mr,
-  ...or,
+  ...ur,
+  ...ir,
   ...nr,
+  ...Pr,
   ...ar,
-  ...Lr,
-  ...tr,
-  ...pr
+  ...Lr
 ];
-function Tr(a, e) {
+function Er(a, e) {
   let n = "";
   return a.aliasFunctionName ? (n = e.t(a.aliasFunctionName), n === a.aliasFunctionName && (n = a.functionName)) : n = a.functionName, n;
 }
-var Er = Object.getOwnPropertyDescriptor, Ir = (a, e, n, i) => {
-  for (var r = i > 1 ? void 0 : i ? Er(e, n) : e, o = a.length - 1, u; o >= 0; o--)
+var Ir = Object.getOwnPropertyDescriptor, Nr = (a, e, n, i) => {
+  for (var r = i > 1 ? void 0 : i ? Ir(e, n) : e, o = a.length - 1, u; o >= 0; o--)
     (u = a[o]) && (r = u(r) || r);
   return r;
 }, It = (a, e) => (n, i) => e(n, i, a);
@@ -15622,7 +15622,7 @@ let bt = class {
     if (e.length === 0)
       return !1;
     const n = e[0].description;
-    return !On(n);
+    return !Mn(n);
   }
   _initialize() {
     this._localeService.localeChanged$.subscribe(() => {
@@ -15632,7 +15632,6 @@ let bt = class {
   _initDescription() {
     var i;
     const a = [
-      ...Mn,
       ...xn,
       ..._n,
       ...yn,
@@ -15647,13 +15646,14 @@ let bt = class {
       ...Gn,
       ...Hn,
       ...wn,
-      ...Yn
-    ].map((r) => r[1]), e = Pr.filter((r) => a.includes(r.functionName)), n = this._configService.getConfig(he);
+      ...Yn,
+      ...Xn
+    ].map((r) => r[1]), e = Tr.filter((r) => a.includes(r.functionName)), n = this._configService.getConfig(ge);
     this._descriptions = e.concat((i = n == null ? void 0 : n.description) != null ? i : []);
   }
   _registerDescriptions() {
     const a = this._localeService, e = this._descriptions.map((n) => ({
-      functionName: Tr(n, a),
+      functionName: Er(n, a),
       functionType: n.functionType,
       description: a.t(n.description),
       abstract: a.t(n.abstract),
@@ -15668,17 +15668,17 @@ let bt = class {
     this._functionService.registerDescriptions(...e);
   }
 };
-bt = Ir([
+bt = Nr([
   It(0, Bt),
   It(1, X(_t)),
   It(2, Ce)
 ], bt);
-var Nr = Object.getOwnPropertyDescriptor, Rr = (a, e, n, i) => {
-  for (var r = i > 1 ? void 0 : i ? Nr(e, n) : e, o = a.length - 1, u; o >= 0; o--)
+var Rr = Object.getOwnPropertyDescriptor, Sr = (a, e, n, i) => {
+  for (var r = i > 1 ? void 0 : i ? Rr(e, n) : e, o = a.length - 1, u; o >= 0; o--)
     (u = a[o]) && (r = u(r) || r);
   return r;
-}, He = (a, e) => (n, i) => e(n, i, a);
-let et = class extends ae {
+}, Ge = (a, e) => (n, i) => e(n, i, a);
+let Je = class extends ae {
   constructor(e, n, i, r) {
     super();
     W(this, "_preUnitId", null);
@@ -15705,9 +15705,9 @@ let et = class extends ae {
     this.disposeWithMe(
       this._commandService.onCommandExecuted((e, n) => {
         if (!(n != null && n.fromCollab)) {
-          if (e.id === Tn.id)
+          if (e.id === En.id)
             this._unregisterDescriptionsForNotInSheetId(), this._registerDescriptions();
-          else if (e.id === qe.id) {
+          else if (e.id === ye.id) {
             const i = e.params;
             this._registerDescription(i);
           } else if (e.id === Ct.id) {
@@ -15790,34 +15790,34 @@ let et = class extends ae {
     }), this._descriptionService.unregisterDescriptions(r);
   }
 };
-et = Rr([
-  He(0, vt),
-  He(1, Ut),
-  He(2, Ae),
-  He(3, ce)
-], et);
-var Sr = Object.getOwnPropertyDescriptor, Ar = (a, e, n, i) => {
-  for (var r = i > 1 ? void 0 : i ? Sr(e, n) : e, o = a.length - 1, u; o >= 0; o--)
+Je = Sr([
+  Ge(0, vt),
+  Ge(1, Ut),
+  Ge(2, Ae),
+  Ge(3, ce)
+], Je);
+var Ar = Object.getOwnPropertyDescriptor, Cr = (a, e, n, i) => {
+  for (var r = i > 1 ? void 0 : i ? Ar(e, n) : e, o = a.length - 1, u; o >= 0; o--)
     (u = a[o]) && (r = u(r) || r);
   return r;
-}, Cr = (a, e) => (n, i) => e(n, i, a);
-let tt = class extends ae {
+}, Dr = (a, e) => (n, i) => e(n, i, a);
+let et = class extends ae {
   constructor(a) {
     super(), this._commandService = a, [
-      ei,
       ti,
+      ai,
       Oe
     ].forEach((e) => this._commandService.registerCommand(e));
   }
 };
-tt = Ar([
-  Cr(0, ce)
-], tt);
-var Dr = Object.getOwnPropertyDescriptor, br = (a, e, n, i) => {
-  for (var r = i > 1 ? void 0 : i ? Dr(e, n) : e, o = a.length - 1, u; o >= 0; o--)
+et = Cr([
+  Dr(0, ce)
+], et);
+var br = Object.getOwnPropertyDescriptor, Or = (a, e, n, i) => {
+  for (var r = i > 1 ? void 0 : i ? br(e, n) : e, o = a.length - 1, u; o >= 0; o--)
     (u = a[o]) && (r = u(r) || r);
   return r;
-}, we = (a, e) => (n, i) => e(n, i, a);
+}, He = (a, e) => (n, i) => e(n, i, a);
 function ca(a, e, n, i) {
   const r = a.sequenceNodesBuilder(e);
   if (r == null)
@@ -15829,7 +15829,7 @@ function ca(a, e, n, i) {
       continue;
     const { token: c } = m, s = pe(c), { sheetName: P, unitId: E } = s;
     let p = s.range;
-    p.startAbsoluteRefType === ke.ALL && p.endAbsoluteRefType === ke.ALL || (p = Nt(p, n, i), o.push({
+    p.startAbsoluteRefType === Ke.ALL && p.endAbsoluteRefType === Ke.ALL || (p = Nt(p, n, i), o.push({
       unitId: E,
       sheetName: P,
       range: p
@@ -15854,7 +15854,7 @@ let Ot = class extends ae {
         let T = "";
         if (I) {
           const g = I.startColumn - E.startColumn, h = I.startRow - E.startRow, B = Nt(E, g, h);
-          p && R ? T = na(p, R, B) : R ? T = ia(R, B) : T = ye(B);
+          p && R ? T = na(p, R, B) : R ? T = ia(R, B) : T = _e(B);
         } else
           T = j.REF;
         return {
@@ -15864,10 +15864,10 @@ let Ot = class extends ae {
       } else
         return s;
     });
-    return c ? `=${Qe(c)}` : "";
+    return c ? `=${ke(c)}` : "";
   }
   registerFormula(a, e, n, i) {
-    const r = /* @__PURE__ */ new Map(), o = this._lexerTreeBuilder.sequenceNodesBuilder(n), u = new Ke(), f = (m) => {
+    const r = /* @__PURE__ */ new Map(), o = this._lexerTreeBuilder.sequenceNodesBuilder(n), u = new We(), f = (m) => {
       const c = this._univerInstanceService.getCurrentUnitForType(te.UNIVER_SHEET), s = c.getActiveSheet(), P = c.getUnitId(), E = s.getSheetId(), p = o == null ? void 0 : o.map((S) => {
         if (typeof S == "object" && S.nodeType === ee.REFERENCE) {
           const N = r.get(S.token);
@@ -15877,7 +15877,7 @@ let Ot = class extends ae {
           let D = "";
           if (d) {
             const I = d.startColumn - N.range.startColumn, T = d.startRow - N.range.startRow, g = Nt(N.range, I, T);
-            N.unitId && N.sheetName ? D = na(N.unitId, N.sheetName, g) : N.sheetName ? D = ia(N.sheetName, g) : D = ye(g);
+            N.unitId && N.sheetName ? D = na(N.unitId, N.sheetName, g) : N.sheetName ? D = ia(N.sheetName, g) : D = _e(g);
           } else
             D = j.REF;
           return {
@@ -15886,7 +15886,7 @@ let Ot = class extends ae {
           };
         } else
           return S;
-      }), R = p && Qe(p);
+      }), R = p && ke(p);
       return i(`=${R}`);
     };
     return o == null || o.forEach((m) => {
@@ -15905,11 +15905,11 @@ let Ot = class extends ae {
     }), u;
   }
   _getFormulaDependcy(a, e, n, i) {
-    const r = xe(n) ? this._lexerTreeBuilder.sequenceNodesBuilder(n) : null, o = [];
+    const r = Me(n) ? this._lexerTreeBuilder.sequenceNodesBuilder(n) : null, o = [];
     return r == null || r.forEach((u) => {
       if (typeof u == "object" && u.nodeType === ee.REFERENCE) {
         const f = pe(u.token), { range: m, unitId: c, sheetName: s } = f;
-        if (m.startAbsoluteRefType === ke.ALL && m.endAbsoluteRefType === ke.ALL)
+        if (m.startAbsoluteRefType === Ke.ALL && m.endAbsoluteRefType === Ke.ALL)
           return;
         const P = this._univerInstanceService.getUnit(c || a), E = s ? P == null ? void 0 : P.getSheetBySheetName(s) : P == null ? void 0 : P.getSheetBySheetId(e);
         if (!E)
@@ -15930,13 +15930,13 @@ let Ot = class extends ae {
   }
   // eslint-disable-next-line max-lines-per-function
   registerRangeFormula(a, e, n, i, r) {
-    const o = new Ke(), u = i.map((m) => this._getFormulaDependcy(a, e, m, n)), f = (m) => {
-      const c = n[0].startRow, s = n[0].startColumn, P = [{ unitId: a, subUnitId: e, ranges: n }, ...u.flat()], E = [], p = In(this._injector, m);
+    const o = new We(), u = i.map((m) => this._getFormulaDependcy(a, e, m, n)), f = (m) => {
+      const c = n[0].startRow, s = n[0].startColumn, P = [{ unitId: a, subUnitId: e, ranges: n }, ...u.flat()], E = [], p = Nn(this._injector, m);
       for (const { unitId: R, subUnitId: S, ranges: N } of P)
         if (R === p.unitId && S === p.subUnitId) {
           const d = [], D = N[0].startRow, I = N[0].startColumn, T = D - c, g = I - s;
           for (const h of p.ranges) {
-            const B = N.map((q) => Xe(h, q)).filter(Boolean);
+            const B = N.map((q) => Ye(h, q)).filter(Boolean);
             B.length > 0 && d.push(...B);
           }
           d.length > 0 && E.push(
@@ -15953,12 +15953,12 @@ let Ot = class extends ae {
         S.sort((T, g) => T.startRow - g.startRow || T.startColumn - g.startColumn);
         const N = /* @__PURE__ */ new Map();
         for (let T = 0; T < R.length; T++) {
-          const g = R[T], h = g.startRow, B = g.startColumn, q = h - c, M = B - s, U = Nn(g, m).sort((k, oe) => k.startRow - oe.startRow || k.startColumn - oe.startColumn);
+          const g = R[T], h = g.startRow, B = g.startColumn, q = h - c, M = B - s, U = Rn(g, m).sort((k, oe) => k.startRow - oe.startRow || k.startColumn - oe.startColumn);
           if (!U.length)
             continue;
           const V = U[0].startRow, Q = U[0].startColumn, O = V - c, Pe = Q - s, ne = [];
           for (let k = 0; k < i.length; k++) {
-            const oe = i[k], z = xe(oe), Ue = z ? this._lexerTreeBuilder.moveFormulaRefOffset(oe, M, q) : oe, ue = z ? this.transformFormulaByEffectCommand(a, e, Ue, m) : Ue, Te = ca(this._lexerTreeBuilder, ue, -Pe, -O);
+            const oe = i[k], z = Me(oe), he = z ? this._lexerTreeBuilder.moveFormulaRefOffset(oe, M, q) : oe, ue = z ? this.transformFormulaByEffectCommand(a, e, he, m) : he, Te = ca(this._lexerTreeBuilder, ue, -Pe, -O);
             ne.push({
               newFormula: ue,
               orginFormula: Te
@@ -15977,7 +15977,7 @@ let Ot = class extends ae {
           for (let q = 0; q < i.length; q++) {
             const M = i[q];
             h.push({
-              newFormula: xe(M) ? this._lexerTreeBuilder.moveFormulaRefOffset(M, g - s, T - c) : M,
+              newFormula: Me(M) ? this._lexerTreeBuilder.moveFormulaRefOffset(M, g - s, T - c) : M,
               orginFormula: M
             });
           }
@@ -16017,51 +16017,51 @@ let Ot = class extends ae {
     }), o;
   }
 };
-Ot = br([
-  we(0, X(En)),
-  we(1, X(Ft)),
-  we(2, Ae),
-  we(3, X(ot))
+Ot = Or([
+  He(0, X(In)),
+  He(1, X(Ft)),
+  He(2, Ae),
+  He(3, X(rt))
 ], Ot);
-var Or = Object.getOwnPropertyDescriptor, Mr = (a, e, n, i) => {
-  for (var r = i > 1 ? void 0 : i ? Or(e, n) : e, o = a.length - 1, u; o >= 0; o--)
+var Mr = Object.getOwnPropertyDescriptor, xr = (a, e, n, i) => {
+  for (var r = i > 1 ? void 0 : i ? Mr(e, n) : e, o = a.length - 1, u; o >= 0; o--)
     (u = a[o]) && (r = u(r) || r);
   return r;
-}, xr = (a, e) => (n, i) => e(n, i, a);
-const Vt = "sheets-formula.remote-register-function.service", Ha = yt(Vt);
-let at = class {
+}, _r = (a, e) => (n, i) => e(n, i, a);
+const Vt = "sheets-formula.remote-register-function.service", wa = yt(Vt);
+let tt = class {
   constructor(a) {
     this._functionService = a;
   }
   async registerFunctions(a) {
-    const e = a.map(([n, i]) => _r(n, i));
+    const e = a.map(([n, i]) => yr(n, i));
     this._functionService.registerExecutors(...e);
   }
   async registerAsyncFunctions(a) {
-    const e = a.map(([n, i]) => yr(n, i));
+    const e = a.map(([n, i]) => qr(n, i));
     this._functionService.registerExecutors(...e);
   }
   async unregisterFunctions(a) {
     this._functionService.unregisterExecutors(...a), this._functionService.unregisterDescriptions(...a), this._functionService.deleteFormulaAstCacheKey(...a);
   }
 };
-at = Mr([
-  xr(0, Bt)
-], at);
-function _r(a, e) {
+tt = xr([
+  _r(0, Bt)
+], tt);
+function yr(a, e) {
   const n = new Dt(e), i = new Function(`return ${a}`)();
   return n.calculateCustom = i, n;
 }
-function yr(a, e) {
-  const n = new qa(e), i = new Function(`return ${a}`)();
+function qr(a, e) {
+  const n = new ga(e), i = new Function(`return ${a}`)();
   return n.calculateCustom = i, n;
 }
-var qr = Object.getOwnPropertyDescriptor, gr = (a, e, n, i) => {
-  for (var r = i > 1 ? void 0 : i ? qr(e, n) : e, o = a.length - 1, u; o >= 0; o--)
+var gr = Object.getOwnPropertyDescriptor, hr = (a, e, n, i) => {
+  for (var r = i > 1 ? void 0 : i ? gr(e, n) : e, o = a.length - 1, u; o >= 0; o--)
     (u = a[o]) && (r = u(r) || r);
   return r;
-}, Ye = (a, e) => (n, i) => e(n, i, a);
-const hr = yt(
+}, we = (a, e) => (n, i) => e(n, i, a);
+const Ur = yt(
   "sheets-formula.register-function-service"
 );
 let Mt = class extends ae {
@@ -16077,7 +16077,7 @@ let Mt = class extends ae {
   registerFunctions(a) {
     const { locales: e, description: n, calculate: i } = a;
     e && this._localeService.load(e);
-    const r = new Ke();
+    const r = new We();
     if (n)
       r.add(this._descriptionService.registerDescriptions(n));
     else {
@@ -16093,7 +16093,7 @@ let Mt = class extends ae {
     return r.add(this._registerLocalExecutors(i)), this._remoteRegisterFunctionService && r.add(this._registerRemoteExecutors(i)), r;
   }
   _registerSingleFunction(a) {
-    const { name: e, func: n, description: i, locales: r, async: o = !1 } = a, u = new Ke();
+    const { name: e, func: n, description: i, locales: r, async: o = !1 } = a, u = new We();
     if (r && this._localeService.load(r), typeof i == "string") {
       const m = {
         functionName: e,
@@ -16105,7 +16105,7 @@ let Mt = class extends ae {
       u.add(this._descriptionService.registerDescriptions([m]));
     } else
       u.add(this._descriptionService.registerDescriptions([i]));
-    const f = o ? new qa(e) : new Dt(e);
+    const f = o ? new ga(e) : new Dt(e);
     return f.calculateCustom = n, this._functionService.registerExecutors(f), u.add(ie(() => this._functionService.unregisterExecutors(e))), u.add(ie(() => this._functionService.unregisterDescriptions(e))), u.add(ie(() => this._functionService.deleteFormulaAstCacheKey(e))), this._remoteRegisterFunctionService && (this._remoteRegisterFunctionService.registerAsyncFunctions([[n.toString(), e]]), u.add(
       ie(() => this._remoteRegisterFunctionService.unregisterFunctions([e]))
     )), u;
@@ -16122,101 +16122,101 @@ let Mt = class extends ae {
     return this._remoteRegisterFunctionService.registerFunctions(n), ie(() => this._remoteRegisterFunctionService.unregisterFunctions(e));
   }
 };
-Mt = gr([
-  Ye(0, X(_t)),
-  Ye(1, X(vt)),
-  Ye(2, Bt),
-  Ye(3, ja(Ha))
+Mt = hr([
+  we(0, X(_t)),
+  we(1, X(vt)),
+  we(2, Bt),
+  we(3, za(wa))
 ], Mt);
-var Ur = Object.defineProperty, Fr = Object.getOwnPropertyDescriptor, Br = (a, e, n) => e in a ? Ur(a, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : a[e] = n, wa = (a, e, n, i) => {
-  for (var r = i > 1 ? void 0 : i ? Fr(e, n) : e, o = a.length - 1, u; o >= 0; o--)
+var Fr = Object.defineProperty, Br = Object.getOwnPropertyDescriptor, vr = (a, e, n) => e in a ? Fr(a, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : a[e] = n, Ya = (a, e, n, i) => {
+  for (var r = i > 1 ? void 0 : i ? Br(e, n) : e, o = a.length - 1, u; o >= 0; o--)
     (u = a[o]) && (r = u(r) || r);
   return r;
-}, nt = (a, e) => (n, i) => e(n, i, a), ft = (a, e, n) => Br(a, typeof e != "symbol" ? e + "" : e, n);
-let it = class extends pa {
+}, at = (a, e) => (n, i) => e(n, i, a), mt = (a, e, n) => vr(a, typeof e != "symbol" ? e + "" : e, n);
+let nt = class extends La {
   constructor(a = ma, e, n) {
     super(), this._config = a, this._injector = e, this._configService = n;
-    const { ...i } = La(
+    const { ...i } = Pa(
       {},
       ma,
       this._config
     );
-    this._configService.setConfig(ai, i);
+    this._configService.setConfig(ni, i);
   }
   onStarting() {
-    this._injector.add([at]), this._injector.get(Ua).registerChannel(
+    this._injector.add([tt]), this._injector.get(Fa).registerChannel(
       Vt,
-      Zn(this._injector.get(at))
+      Jn(this._injector.get(tt))
     );
   }
 };
-ft(it, "pluginName", "SHEET_FORMULA_REMOTE_PLUGIN");
-ft(it, "type", te.UNIVER_SHEET);
-it = wa([
-  da(ga),
-  nt(1, X(ot)),
-  nt(2, Ce)
-], it);
-let rt = class extends pa {
+mt(nt, "pluginName", "SHEET_FORMULA_REMOTE_PLUGIN");
+mt(nt, "type", te.UNIVER_SHEET);
+nt = Ya([
+  pa(ha),
+  at(1, X(rt)),
+  at(2, Ce)
+], nt);
+let it = class extends La {
   constructor(a = ua, e, n) {
     super(), this._config = a, this._injector = e, this._configService = n;
-    const { ...i } = La(
+    const { ...i } = Pa(
       {},
       ua,
       this._config
     );
-    this._configService.setConfig(he, i, { merge: !0 });
+    this._configService.setConfig(ge, i, { merge: !0 });
   }
   onStarting() {
     const a = this._injector, e = [
-      [hr, { useClass: Mt }],
+      [Ur, { useClass: Mt }],
       [vt, { useClass: bt }],
-      [tt],
+      [et],
       [Ot],
-      [$e],
-      [Je],
-      [_e],
-      [ze],
+      [Qe],
       [Ze],
-      [et],
-      [je]
+      [xe],
+      [je],
+      [ze],
+      [Je],
+      [$e]
     ];
     if (this._config.notExecuteFormula) {
-      const n = a.get(Ua);
-      e.push([Ha, {
-        useFactory: () => Jn(n.requestChannel(Vt))
+      const n = a.get(Fa);
+      e.push([wa, {
+        useFactory: () => ei(n.requestChannel(Vt))
       }]);
     }
     e.forEach((n) => a.add(n));
   }
   onReady() {
-    Fe(this._injector, [
-      [tt],
-      [Ze],
-      [Je],
+    Ue(this._injector, [
+      [et],
       [ze],
-      [je]
-    ]), Ht() && Fe(this._injector, [
-      [_e]
+      [Ze],
+      [je],
+      [$e]
+    ]), Ht() && Ue(this._injector, [
+      [xe]
     ]);
   }
   onRendered() {
-    Fe(this._injector, [
-      [et]
-    ]), Ht() || Fe(this._injector, [
-      [_e]
+    Ue(this._injector, [
+      [Je]
+    ]), Ht() || Ue(this._injector, [
+      [xe]
     ]);
   }
 };
-ft(rt, "pluginName", ji);
-ft(rt, "type", te.UNIVER_SHEET);
-rt = wa([
-  da(ga, Rn),
-  nt(1, X(ot)),
-  nt(2, Ce)
-], rt);
-function Xr(a, e, n, i) {
-  const r = a.get(Xn), o = a.get(Wn), u = a.get(Kn), f = a.get(kn);
+mt(it, "pluginName", zi);
+mt(it, "type", te.UNIVER_SHEET);
+it = Ya([
+  pa(ha, Sn),
+  at(1, X(rt)),
+  at(2, Ce)
+], it);
+function Wr(a, e, n, i) {
+  const r = a.get(Wn), o = a.get(Kn), u = a.get(kn), f = a.get(Qn);
   r.load({
     formulaData: {},
     arrayFormulaCellData: {},
@@ -16232,27 +16232,27 @@ function Xr(a, e, n, i) {
     },
     dirtyUnitOtherFormulaMap: {}
   });
-  const m = o.treeBuilder(e), c = u.parse(m), s = f.execute(Qn(c));
-  return $n(s);
+  const m = o.treeBuilder(e), c = u.parse(m), s = f.execute($n(c));
+  return jn(s);
 }
 export {
   Le as CalculationMode,
   bt as DescriptionService,
   Ot as FormulaRefRangeService,
   vt as IDescriptionService,
-  hr as IRegisterFunctionService,
-  Ha as IRemoteRegisterFunctionService,
-  ei as InsertFunctionCommand,
+  Ur as IRegisterFunctionService,
+  wa as IRemoteRegisterFunctionService,
+  ti as InsertFunctionCommand,
   Oe as OtherFormulaMarkDirty,
-  he as PLUGIN_CONFIG_KEY_BASE,
-  ti as QuickSumCommand,
+  ge as PLUGIN_CONFIG_KEY_BASE,
+  ai as QuickSumCommand,
   Mt as RegisterFunctionService,
-  $e as RegisterOtherFormulaService,
-  at as RemoteRegisterFunctionService,
-  _e as TriggerCalculationController,
-  it as UniverRemoteSheetsFormulaPlugin,
-  rt as UniverSheetsFormulaPlugin,
-  je as UpdateDefinedNameController,
-  ze as UpdateFormulaController,
-  Xr as calculateFormula
+  Qe as RegisterOtherFormulaService,
+  tt as RemoteRegisterFunctionService,
+  xe as TriggerCalculationController,
+  nt as UniverRemoteSheetsFormulaPlugin,
+  it as UniverSheetsFormulaPlugin,
+  $e as UpdateDefinedNameController,
+  je as UpdateFormulaController,
+  Wr as calculateFormula
 };