@univerjs/sheets-formula 0.8.1-nightly.202506191607 → 0.8.2-nightly.202506201607

package/lib/index.js

@@ -1,9 +1,9 @@
 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 Ae, IUniverInstanceService as Ce, Rectangle as fe, sequenceExecuteAsync as Wa, isFormulaString as xe, isFormulaId as la, cellToRange as sa, Direction as Xe, getIntersectRange as Ye, RANGE_TYPE as Y, Inject as X, Disposable as ae, UniverInstanceType as te, LifecycleService as Ka, ILogService as ka, IConfigService as De, LocaleService as _t, Injector as rt, createIdentifier as yt, toDisposable as ie, moveRangeByOffset as Nt, DisposableCollection as We, AbsoluteRefType as Ke, Optional as Qa, InterceptorEffectEnum as $a, CellValueType as Gt, isRealNum as ja, DependentOn as da, Plugin as pa, merge as La, touchDependencies as Ue, isNodeEnv as Ht } from "@univerjs/core";
+import { CommandType as xt, ICommandService as ce, ObjectMatrix as G, Tools as Me, IUniverInstanceService as Ae, Rectangle as fe, sequenceExecuteAsync as Wa, isFormulaString as xe, isFormulaId as la, cellToRange as sa, Direction as We, getIntersectRange as Xe, RANGE_TYPE as Y, Inject as X, Disposable as ae, UniverInstanceType as te, LifecycleService as Ka, ILogService as ka, IConfigService as Ce, LocaleService as _t, Injector as ot, createIdentifier as yt, toDisposable as ie, moveRangeByOffset as Nt, DisposableCollection as Ke, AbsoluteRefType as ke, Optional as Qa, InterceptorEffectEnum as $a, CellValueType as Gt, isRealNum 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, handleMoveCols as Ta, EffectRefRangId as H, runRefRangeMutations as w, handleMoveRows as Ea, handleMoveRange as Ia, handleInsertRangeMoveRight as Na, handleInsertRangeMoveDown as Ra, handleDeleteRangeMoveUp as Sa, handleDeleteRangeMoveLeft as Aa, handleIRemoveCol as Ca, handleIRemoveRow as Da, handleInsertCol as ba, handleInsertRow as Oa, RemoveDefinedNameCommand as Ma, SetDefinedNameCommand as xa, 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 qt, SetStyleCommand as gt, SetBorderCommand as _a, ClearSelectionFormatCommand as ya, RemoveSheetMutation as Rt, InsertSheetMutation as St, RefRangeService as Pn, handleDefaultRangeChangeWithEffectRefCommands as wt, getSeparateEffectedRangesOnCommand as Tn, handleCommonDefaultRangeChangeWithEffectRefCommands as En, MoveRangeMutation as Yt, MoveRowsMutation as Xt, MoveColsMutation as Wt, ReorderRangeMutation as Kt, RemoveRowMutation as kt, RemoveColMutation as Qt, InsertColMutation as $t, InsertRowMutation as jt, SetRowHiddenMutation as zt, SetRowVisibleMutation as Zt, INTERCEPTOR_POINT as In, SetWorksheetActiveOperation as Nn, SCOPE_WORKBOOK_VALUE_DEFINED_NAME as lt, UniverSheetsPlugin as Rn } from "@univerjs/sheets";
-import { serializeRange as ye, sequenceNodeType as ee, deserializeRangeWithSheetWithCache as pe, serializeRangeToRefString as ot, ErrorType as j, IDefinedNamesService as ht, LexerTreeBuilder as Ut, generateStringWithSequence as ke, SetDefinedNameMutation as qe, IActiveDirtyManagerService as Ft, 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 Fe, FormulaExecutedStateType as be, IFormulaCurrentConfigService as bn, Lexer as On, AstTreeBuilder as Mn, Interpreter as xn, generateExecuteAstNodeData as _n, getObjectValue as yn, SetFormulaDataMutation as Be, SetArrayFormulaDataMutation as At, initSheetFormulaData as ta, 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 P, FUNCTION_NAMES_STATISTICAL as l, FUNCTION_NAMES_TEXT as b, FUNCTION_NAMES_WEB as st, IFunctionService as Bt, isReferenceStrings as qn, functionArray as gn, functionCompatibility as hn, functionCube as Un, functionDatabase as Fn, functionDate as Bn, functionEngineering as vn, functionFinancial as Vn, functionInformation as Gn, functionLogical as Hn, functionLookup as wn, functionMath as Yn, functionMeta as Xn, functionStatistical as Wn, functionText as Kn, functionUniver as kn, functionWeb as Qn, serializeRangeWithSpreadsheet as na, serializeRangeWithSheet as ia, CustomFunction as Ct, AsyncCustomFunction as qa, RemoveDefinedNameMutation as Dt, stripErrorMargin as $n, UniverFormulaEnginePlugin as ga } from "@univerjs/engine-formula";
+import { serializeRange as ye, sequenceNodeType as ee, deserializeRangeWithSheetWithCache as pe, serializeRangeToRefString as ut, ErrorType as j, IDefinedNamesService as ht, LexerTreeBuilder as Ut, generateStringWithSequence as Qe, SetDefinedNameMutation as qe, IActiveDirtyManagerService as Ft, SetFormulaCalculationResultMutation as Sn, RemoveOtherFormulaMutation as An, SetOtherFormulaMutation as Cn, FormulaDataModel as mt, SetFormulaCalculationStartMutation as Ie, SetFormulaCalculationStopMutation as Jt, ENGINE_FORMULA_CYCLE_REFERENCE_COUNT as ea, SetFormulaCalculationNotificationMutation as Dn, FormulaExecuteStageType as Be, FormulaExecutedStateType as De, IFormulaCurrentConfigService as bn, Lexer as On, AstTreeBuilder as Mn, Interpreter as xn, generateExecuteAstNodeData as _n, getObjectValue as yn, SetFormulaDataMutation as ve, SetArrayFormulaDataMutation as At, initSheetFormulaData as ta, 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 qn, functionArray as gn, functionCompatibility as hn, functionCube as Un, functionDatabase as Fn, functionDate as Bn, functionEngineering as vn, functionFinancial as Vn, functionInformation as Gn, functionLogical as Hn, functionLookup as wn, functionMath as Yn, functionMeta as Xn, functionStatistical as Wn, functionText as Kn, functionUniver as kn, functionWeb as Qn, serializeRangeWithSpreadsheet as na, serializeRangeWithSheet as ia, CustomFunction as Ct, AsyncCustomFunction as qa, RemoveDefinedNameMutation as Dt, stripErrorMargin as $n, UniverFormulaEnginePlugin as ga } 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 = {
@@ -12,15 +12,15 @@ const ei = {
   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: L, column: E } = c, p = Ae.generateRandomId(6);
-      o.setValue(L, E, {
+      const { range: m, primary: c, formula: s } = f, { row: P, column: E } = c, p = Me.generateRandomId(6);
+      o.setValue(P, E, {
         f: s,
         si: p
       });
       const { startRow: R, startColumn: S, endRow: N, endColumn: d } = m;
       for (let D = R; D <= N; D++)
         for (let I = S; I <= d; I++)
-          (D !== L || I !== E) && o.setValue(D, I, {
+          (D !== P || I !== E) && o.setValue(D, I, {
             si: p
           });
     }), i && i.length > 0 && i.forEach((f) => {
@@ -40,7 +40,7 @@ const ei = {
   handler: async (a) => {
     const n = a.get(za).getCurrentLastSelection();
     if (!n) return !1;
-    const i = a.get(Ce), r = Za(i);
+    const i = a.get(Ae), r = Za(i);
     if (!r) return !1;
     const o = n.range, { worksheet: u } = r;
     let f = Ja(o, u);
@@ -67,14 +67,14 @@ const ei = {
             endRow: p.row - 1
           })})`
         });
-    const L = ct({
+    const P = ct({
       startRow: m.startRow,
       startColumn: m.endColumn,
       endRow: m.endRow,
       endColumn: m.endColumn
     }, u);
-    if (!fe.equals(L, m))
-      for (const p of u.iterateByRow(L))
+    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({
             startColumn: m.startColumn,
@@ -106,7 +106,7 @@ const ei = {
       }
     ], E)).result;
   }
-}, Me = {
+}, Oe = {
   type: xt.MUTATION,
   id: "sheet.mutation.data-validation-formula-mark-dirty",
   handler() {
@@ -150,12 +150,12 @@ function ri(a, e) {
     if (o == null || u == null)
       return !0;
     Object.keys(o).forEach((f) => {
-      const m = new G(o[f] || {}), c = new G(u[f] || {}), s = new G(), L = new G();
+      const m = new G(o[f] || {}), c = new G(u[f] || {}), s = new G(), P = new G();
       if (m.forValue((N, d, D) => {
         if (D == null)
           return !0;
-        const I = mt(D);
-        I !== null && (s.setValue(N, d, I), L.setValue(N, d, c.getValue(N, d)));
+        const I = ge(D);
+        I !== null && (s.setValue(N, d, I), P.setValue(N, d, c.getValue(N, d)));
       }), s.getSizeOf() === 0)
         return;
       const E = {
@@ -170,7 +170,7 @@ function ri(a, e) {
       const R = {
         subUnitId: f,
         unitId: r,
-        cellValue: L.getMatrix()
+        cellValue: P.getMatrix()
       }, S = {
         id: Z.id,
         params: R
@@ -183,13 +183,7 @@ function ri(a, e) {
   };
 }
 function oi(a, e, n) {
-  const { redoFormulaData: i, undoFormulaData: r } = ui(a, e, n);
-  if (Ae.diffValue(i, r))
-    return {
-      undos: [],
-      redos: []
-    };
-  const o = [], u = [];
+  const { redoFormulaData: i, undoFormulaData: r } = ui(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) {
@@ -233,7 +227,7 @@ function ui(a, e, n) {
       ...Object.keys(e[m] || {})
     ])).forEach((s) => {
       var D, I;
-      const L = (D = a[m]) == null ? void 0 : D[s], E = (I = e[m]) == null ? void 0 : I[s], p = new G(L || {}), R = new G(E || {});
+      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 = fi(R) : S = mi(p, n);
       const N = Ai(S, p, R), d = Ci(S, p);
@@ -255,19 +249,19 @@ function mi(a, e) {
   return a.forValue((f, m, c) => {
     if (c == null || !Fa(c)) return !0;
     const s = sa(f, m);
-    let L = null, E = !1;
+    let P = null, E = !1;
     if ([
       0,
       1,
       2
       /* MoveCols */
     ].includes(n))
-      L = ci(n, i, r, s);
+      P = ci(n, i, r, s);
     else if (o != null) {
       const p = li(s, e);
-      L = p.newCell, E = p.isReverse;
+      P = p.newCell, E = p.isReverse;
     }
-    E ? u.unshift({ oldCell: s, newCell: L }) : u.push({ oldCell: s, newCell: L });
+    E ? u.unshift({ oldCell: s, newCell: P }) : u.push({ oldCell: s, newCell: P });
   }), u;
 }
 function fi(a) {
@@ -357,7 +351,7 @@ function Li(a, e) {
   const n = Oa(
     {
       id: H.InsertRowCommandId,
-      params: { range: a, unitId: "", subUnitId: "", direction: Xe.DOWN }
+      params: { range: a, unitId: "", subUnitId: "", direction: We.DOWN }
     },
     e
   );
@@ -367,7 +361,7 @@ function Pi(a, e) {
   const n = ba(
     {
       id: H.InsertColCommandId,
-      params: { range: a, unitId: "", subUnitId: "", direction: Xe.RIGHT }
+      params: { range: a, unitId: "", subUnitId: "", direction: We.RIGHT }
     },
     e
   );
@@ -435,27 +429,29 @@ function Si(a, e) {
   return w(n, e);
 }
 function Ai(a, e, n) {
+  var r, o, u;
   const i = new G({});
-  return a.forEach((r) => {
-    const { oldCell: o, newCell: u } = r, { startRow: f, startColumn: m } = o, c = n.getValue(f, m) || e.getValue(f, m), s = mt(c);
-    if (i.setValue(f, m, { f: null, si: null }), u) {
-      const { startRow: L, startColumn: E } = u;
-      i.setValue(L, E, s);
+  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);
+      i.setValue(c.startRow, c.startColumn, P);
     }
-  }), i.getMatrix();
+  }
+  return i.getMatrix();
 }
 function Ci(a, e) {
   const n = new G({});
-  return a.reverse().forEach((i) => {
-    const { oldCell: r, newCell: o } = i, { startRow: u, startColumn: f } = r, m = e.getValue(u, f), c = mt(m);
-    if (o) {
-      const { startRow: s, startColumn: L } = o;
-      n.setValue(s, L, { f: null, si: null });
+  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);
+    if (n.setValue(r.startRow, r.startColumn, f), o) {
+      const m = e.getValue(o.startRow, o.startColumn), c = ge(m);
+      n.setValue(o.startRow, o.startColumn, c != null ? c : { f: null, si: null });
     }
-    n.setValue(u, f, c);
-  }), n.getMatrix();
+  }
+  return n.getMatrix();
 }
-function mt(a) {
+function ge(a) {
   if (a == null)
     return;
   const { f: e, si: n, x: i = 0, y: r = 0 } = a, o = xe(e), u = la(n);
@@ -470,7 +466,7 @@ function mt(a) {
 function Di(a) {
   const e = new G({});
   return new G(a).forValue((i, r, o) => {
-    const u = mt(o);
+    const u = ge(o);
     u && e.setValue(i, r, u);
   }), e.getMatrix();
 }
@@ -494,13 +490,13 @@ function va(a, e, n = 0, i = 0) {
       r.push(f);
       continue;
     }
-    const { token: m } = f, c = pe(m), { range: s, sheetName: L, unitId: E } = c, p = fe.moveOffset(s, n, i);
+    const { token: m } = f, c = pe(m), { range: s, sheetName: P, unitId: E } = c, p = fe.moveOffset(s, n, i);
     r.push({
       ...f,
-      token: ot({
+      token: ut({
         range: p,
         unitId: E,
-        sheetName: L
+        sheetName: P
       })
     });
   }
@@ -508,7 +504,7 @@ function va(a, e, n = 0, i = 0) {
 }
 function Va(a, e, n, i) {
   const { type: r, unitId: o, sheetId: u, range: f, from: m, to: c, rangeFilteredRows: s } = e, {
-    range: L,
+    range: P,
     sheetId: E,
     unitId: p,
     sheetName: R,
@@ -524,12 +520,12 @@ function Va(a, e, n, i) {
     E
   ))
     return;
-  const d = fe.moveOffset(L, S, N);
+  const d = fe.moveOffset(P, S, N);
   let D = null;
   if (r === y.MoveRange) {
     if (m == null || c == null)
       return;
-    const I = Lt(d, m), T = Ye(d, m);
+    const I = Lt(d, m), T = Xe(d, m);
     if (T == null || I !== 4)
       return;
     const g = Ia(
@@ -543,8 +539,8 @@ function Va(a, e, n, i) {
     if (m == null || c == null)
       return;
     const I = Lt(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))
+    let T = Xe(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 = {
       startRow: d.startRow,
@@ -564,8 +560,8 @@ function Va(a, e, n, i) {
     if (m == null || c == null)
       return;
     const I = Lt(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))
+    let T = Xe(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 = {
       startRow: d.startRow,
@@ -587,7 +583,7 @@ function Va(a, e, n, i) {
       const I = Oa(
         {
           id: H.InsertRowCommandId,
-          params: { range: f, unitId: "", subUnitId: "", direction: Xe.DOWN }
+          params: { range: f, unitId: "", subUnitId: "", direction: We.DOWN }
         },
         d
       ), T = w(I, d);
@@ -601,7 +597,7 @@ function Va(a, e, n, i) {
       const I = ba(
         {
           id: H.InsertColCommandId,
-          params: { range: f, unitId: "", subUnitId: "", direction: Xe.RIGHT }
+          params: { range: f, unitId: "", subUnitId: "", direction: We.RIGHT }
         },
         d
       ), T = w(I, d);
@@ -699,31 +695,31 @@ function Va(a, e, n, i) {
     }
   }
   if (D != null)
-    return ot({
+    return ut({
       range: D,
       sheetName: R,
       unitId: p
     });
 }
 function pt(a, e, n, i, r, o) {
-  const { startRow: u, endRow: f, startColumn: m, endColumn: c, rangeType: s } = Oe(e), {
-    startRow: L,
+  const { startRow: u, endRow: f, startColumn: m, endColumn: c, rangeType: s } = be(e), {
+    startRow: P,
     startColumn: E,
     endRow: p,
     endColumn: R,
     rangeType: S = Y.NORMAL
-  } = Oe(n), { startRow: N, startColumn: d, endRow: D, endColumn: I } = Oe(i), {
+  } = be(n), { startRow: N, startColumn: d, endRow: D, endColumn: I } = be(i), {
     startRow: T,
     endRow: g,
     startColumn: h,
     endColumn: B
-  } = Oe(o), {
+  } = be(o), {
     startRow: q,
     endRow: M,
     startColumn: U,
     endColumn: V,
     rangeType: Q = Y.NORMAL
-  } = Oe(r), O = { ...r };
+  } = be(r), O = { ...r };
   function Pe() {
     return s === Y.COLUMN && Q === Y.COLUMN ? !0 : m >= U && c <= V;
   }
@@ -745,7 +741,7 @@ function pt(a, e, n, i, r, o) {
       if (f > M)
         O.endRow = f;
       else if (f <= q)
-        O.startRow += M - L + 1;
+        O.startRow += M - P + 1;
       else
         return;
     else
@@ -770,7 +766,7 @@ function pt(a, e, n, i, r, o) {
         return;
     else
       return;
-  else a === 4 ? (O.startRow = u, O.startColumn = m, O.endRow = f, O.endColumn = c) : E <= U && R >= V || S === Y.ROW && Q === Y.ROW ? n.endRow < q ? (N >= q && (O.startRow -= p - L + 1), N >= M && (O.endRow -= p - L + 1)) : n.startRow > M ? (D <= M && (O.endRow += p - L + 1), D <= q && (O.startRow += p - L + 1)) : n.startRow >= q && n.endRow <= M && (N <= q ? O.startRow += p - L + 1 : N >= M && (O.endRow -= p - L + 1)) : L <= q && p >= M || S === Y.COLUMN && Q === Y.COLUMN ? n.endColumn < U ? (d >= U && (O.startColumn -= R - E + 1), d >= V && (O.endColumn -= R - E + 1)) : n.startColumn > V ? (I <= V && (O.endColumn += R - E + 1), I <= U && (O.startColumn += R - E + 1)) : n.startColumn >= U && n.endColumn <= V && (d <= U ? O.startColumn += R - E + 1 : d >= V && (O.endColumn -= R - E + 1)) : ((d <= B + 1 && I >= V || d <= U && I >= h - 1) && N <= q && D >= M || (N <= g + 1 && D >= M || N <= q && D >= T - 1) && d <= U && I >= V, O.startRow = u, O.startColumn = m, O.endRow = f, O.endColumn = c);
+  else a === 4 ? (O.startRow = u, O.startColumn = m, O.endRow = f, O.endColumn = c) : E <= U && R >= V || S === Y.ROW && Q === Y.ROW ? n.endRow < q ? (N >= q && (O.startRow -= p - P + 1), N >= M && (O.endRow -= p - P + 1)) : n.startRow > M ? (D <= M && (O.endRow += p - P + 1), D <= q && (O.startRow += p - P + 1)) : n.startRow >= q && n.endRow <= M && (N <= q ? O.startRow += p - P + 1 : N >= M && (O.endRow -= p - P + 1)) : P <= q && p >= M || S === Y.COLUMN && Q === Y.COLUMN ? n.endColumn < U ? (d >= U && (O.startColumn -= R - E + 1), d >= V && (O.endColumn -= R - E + 1)) : n.startColumn > V ? (I <= V && (O.endColumn += R - E + 1), I <= U && (O.startColumn += R - E + 1)) : n.startColumn >= U && n.endColumn <= V && (d <= U ? O.startColumn += R - E + 1 : d >= V && (O.endColumn -= R - E + 1)) : ((d <= B + 1 && I >= V || d <= U && I >= h - 1) && N <= q && D >= M || (N <= g + 1 && D >= M || N <= q && D >= T - 1) && d <= U && I >= V, O.startRow = u, O.startColumn = m, O.endRow = f, O.endColumn = c);
   return O;
 }
 function Lt(a, e) {
@@ -778,13 +774,13 @@ function Lt(a, e) {
   function s() {
     return a.rangeType === Y.COLUMN && e.rangeType === Y.COLUMN ? !0 : n >= u && i <= f;
   }
-  function L() {
+  function P() {
     return a.rangeType === Y.ROW && e.rangeType === Y.ROW ? !0 : r >= m && o <= c;
   }
   function E() {
     return a.rangeType === Y.ALL && e.rangeType === Y.ALL;
   }
-  return s() && L() || E() ? 4 : L() && n >= u && n <= f && i > f ? 0 : L() && i >= u && i <= f && n < u ? 1 : s() && r >= m && r <= c && o > c ? 2 : s() && o >= m && o <= c && r < m ? 3 : null;
+  return s() && P() || E() ? 4 : P() && n >= u && n <= f && i > f ? 0 : P() && i >= u && i <= f && n < u ? 1 : s() && r >= m && r <= c && o > c ? 2 : s() && o >= m && o <= c && r < m ? 3 : null;
 }
 function Re(a) {
   return isNaN(a) ? -1 / 0 : a;
@@ -792,7 +788,7 @@ function Re(a) {
 function Se(a) {
   return isNaN(a) ? 1 / 0 : a;
 }
-function Oe(a) {
+function be(a) {
   const { startRow: e, endRow: n, startColumn: i, endColumn: r } = a;
   return {
     ...a,
@@ -890,7 +886,7 @@ function Oi(a, e) {
     endRow: r,
     endColumn: m.getColumnCount() - 1,
     rangeType: Y.ROW
-  }, L = {
+  }, P = {
     startRow: o,
     startColumn: 0,
     endRow: u,
@@ -900,7 +896,7 @@ function Oi(a, e) {
   return {
     type: y.MoveRows,
     from: s,
-    to: L,
+    to: P,
     unitId: f,
     sheetId: c
   };
@@ -919,7 +915,7 @@ function Mi(a, e) {
     endRow: m.getRowCount() - 1,
     endColumn: r,
     rangeType: Y.COLUMN
-  }, L = {
+  }, P = {
     startRow: 0,
     startColumn: o,
     endRow: m.getRowCount() - 1,
@@ -929,7 +925,7 @@ function Mi(a, e) {
   return {
     type: y.MoveCols,
     from: s,
-    to: L,
+    to: P,
     unitId: f,
     sheetId: c
   };
@@ -1073,8 +1069,8 @@ var Hi = Object.getOwnPropertyDescriptor, wi = (a, e, n, i) => {
   for (var r = i > 1 ? void 0 : i ? Hi(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 Qe = 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();
   }
@@ -1119,7 +1115,7 @@ let Qe = class extends ae {
       const { formulaOrRefString: c } = m, s = this._lexerTreeBuilder.sequenceNodesBuilder(c);
       if (s == null)
         return !0;
-      let L = !1;
+      let P = !1;
       const E = [];
       for (let d = 0, D = s.length; d < D; d++) {
         const I = s[d];
@@ -1143,7 +1139,7 @@ let Qe = class extends ae {
           } = e;
           if (O == null || M == null || M.length === 0 || Q !== M)
             continue;
-          V = ot({
+          V = ut({
             range: h,
             sheetName: O,
             unitId: q
@@ -1158,11 +1154,11 @@ let Qe = class extends ae {
         V != null && (s[d] = {
           ...I,
           token: V
-        }, L = !0, E.push(d));
+        }, P = !0, E.push(d));
       }
-      if (!L)
+      if (!P)
         return !0;
-      const p = ke(va(s, E)), R = {
+      const p = Qe(va(s, E)), R = {
         id: qe.id,
         params: {
           unitId: i,
@@ -1190,18 +1186,18 @@ let Qe = class extends ae {
     return ((o = this._definedNamesService.getWorksheetByRef(e, i)) == null ? void 0 : o.getSheetId()) === n ? j.REF : null;
   }
 };
-Qe = wi([
-  ve(0, ht),
-  ve(1, Ce),
-  ve(2, X(qt)),
-  ve(3, X(Ut))
-], Qe);
+$e = wi([
+  Ve(0, ht),
+  Ve(1, Ae),
+  Ve(2, X(qt)),
+  Ve(3, X(Ut))
+], $e);
 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 || {}), Yi = Object.getOwnPropertyDescriptor, Xi = (a, e, n, i) => {
   for (var r = i > 1 ? void 0 : i ? Yi(e, n) : e, o = a.length - 1, u; o >= 0; o--)
     (u = a[o]) && (r = u(r) || r);
   return r;
 }, Pt = (a, e) => (n, i) => e(n, i, a);
-let $e = class extends ae {
+let je = class extends ae {
   constructor(e, n, i) {
     super();
     W(this, "_formulaCacheMap", /* @__PURE__ */ new Map());
@@ -1223,13 +1219,13 @@ let $e = class extends ae {
     return r || (r = /* @__PURE__ */ new Map(), i.set(n, r)), r;
   }
   _createFormulaId(e, n) {
-    return `formula.${e}_${n}_${Ae.generateRandomId(8)}`;
+    return `formula.${e}_${n}_${Me.generateRandomId(8)}`;
   }
   _initFormulaRegister() {
     this._activeDirtyManagerService.register(
-      Me.id,
+      Oe.id,
       {
-        commandId: Me.id,
+        commandId: Oe.id,
         getDirtyData(n) {
           return {
             dirtyUnitOtherFormulaMap: n.params
@@ -1253,7 +1249,7 @@ let $e = class extends ae {
       };
       this._commandService.executeCommand(Cn.id, c).then(() => {
         this._commandService.executeCommand(
-          Me.id,
+          Oe.id,
           { [i]: { [r]: { [u]: !0 } } }
         );
       });
@@ -1272,8 +1268,8 @@ let $e = class extends ae {
           const u = i[o], f = {};
           r[o] = f;
           for (const m in u) {
-            const c = this._ensureCacheMap(o, m), s = u[m], L = [];
-            f[m] = L;
+            const c = this._ensureCacheMap(o, m), s = u[m], P = [];
+            f[m] = P;
             for (const E in s) {
               const p = s[E];
               if (c.has(E)) {
@@ -1286,7 +1282,7 @@ let $e = class extends ae {
                   N.setValue(d, D, I);
                 }), R.status = Ne.SUCCESS, R.callbacks.forEach((d) => {
                   d(p);
-                }), R.callbacks.clear(), L.push(R);
+                }), R.callbacks.clear(), P.push(R);
               }
             }
           }
@@ -1335,17 +1331,17 @@ let $e = class extends ae {
   markFormulaDirty(e, n, i) {
     const r = this.getFormulaValueSync(e, n, i);
     r && (r.status = Ne.WAIT, this._commandService.executeCommand(
-      Me.id,
+      Oe.id,
       { [e]: { [n]: { [i]: !0 } } }
     ));
   }
 };
-$e = Xi([
+je = Xi([
   Pt(0, ce),
   Pt(1, Ft),
   Pt(2, X(Ka))
-], $e);
-const ge = "sheets-formula.base.config";
+], je);
+const he = "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 = {}, Wi = "sheets-formula.remote.config", ma = {};
 var Ki = Object.getOwnPropertyDescriptor, ki = (a, e, n, i) => {
@@ -1410,7 +1406,7 @@ let _e = class extends ae {
   }
   _getCalculationMode() {
     var n;
-    const e = this._configService.getConfig(ge);
+    const e = this._configService.getConfig(he);
     return (n = e == null ? void 0 : e.initialFormulaComputing) != null ? n : Le.WHEN_EMPTY;
   }
   _commandExecutedListener() {
@@ -1443,8 +1439,8 @@ let _e = class extends ae {
       const c = this._activeDirtyManagerService.get(m.id);
       if (c == null)
         continue;
-      const s = c.getDirtyData(m), { dirtyRanges: L, dirtyNameMap: E, dirtyDefinedNameMap: p, dirtyUnitFeatureMap: R, dirtyUnitOtherFormulaMap: S, clearDependencyTreeCache: N } = s;
-      L != null && this._mergeDirtyRanges(n, L), E != null && this._mergeDirtyNameMap(i, E), p != null && this._mergeDirtyNameMap(r, p), R != null && this._mergeDirtyUnitFeatureOrOtherFormulaMap(o, R), S != null && this._mergeDirtyUnitFeatureOrOtherFormulaMap(u, S), N != null && this._mergeDirtyNameMap(f, N);
+      const s = c.getDirtyData(m), { dirtyRanges: P, dirtyNameMap: E, dirtyDefinedNameMap: p, dirtyUnitFeatureMap: R, dirtyUnitOtherFormulaMap: S, clearDependencyTreeCache: N } = s;
+      P != null && this._mergeDirtyRanges(n, P), E != null && this._mergeDirtyNameMap(i, E), p != null && this._mergeDirtyNameMap(r, p), R != null && this._mergeDirtyUnitFeatureOrOtherFormulaMap(o, R), S != null && this._mergeDirtyUnitFeatureOrOtherFormulaMap(u, S), N != null && this._mergeDirtyNameMap(f, N);
     }
     return {
       dirtyRanges: n,
@@ -1483,8 +1479,8 @@ let _e = class extends ae {
       let r = !1;
       for (const o of e)
         if (i.unitId === o.unitId && i.sheetId === o.sheetId) {
-          const { startRow: u, startColumn: f, endRow: m, endColumn: c } = i.range, { startRow: s, startColumn: L, endRow: E, endColumn: p } = o.range;
-          if (u === s && f === L && m === E && c === p) {
+          const { startRow: u, startColumn: f, endRow: m, endColumn: c } = i.range, { startRow: s, startColumn: P, endRow: E, endColumn: p } = o.range;
+          if (u === s && f === P && m === E && c === p) {
             r = !0;
             break;
           }
@@ -1526,21 +1522,21 @@ let _e = class extends ae {
           const {
             stage: o
           } = r.stageInfo;
-          if (o === Fe.START)
+          if (o === Be.START)
             n === 0 && (this._startExecutionTime = performance.now()), n++, e !== null && (clearTimeout(e), e = null), e = setTimeout(() => {
               e = null, this._startProgress();
             }, 1e3);
-          else if (o === Fe.CURRENTLY_CALCULATING) {
+          else if (o === Be.CURRENTLY_CALCULATING) {
             if (this._executionInProgressParams = r.stageInfo, e === null) {
               const u = this._localeService.t("formula.progress.calculating");
               this._calculateProgress(u);
             }
-          } else if (o === Fe.START_DEPENDENCY_ARRAY_FORMULA) {
+          } else if (o === Be.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 === Fe.CURRENTLY_CALCULATING_ARRAY_FORMULA && (this._executionInProgressParams = r.stageInfo, e === null)) {
+          } else if (o === Be.CURRENTLY_CALCULATING_ARRAY_FORMULA && (this._executionInProgressParams = r.stageInfo, e === null)) {
             const u = this._localeService.t("formula.progress.array-calculation");
             this._calculateProgress(u);
           }
@@ -1548,20 +1544,20 @@ let _e = class extends ae {
           const o = r.functionsExecutedState;
           let u = "";
           switch (n--, o) {
-            case be.NOT_EXECUTED:
+            case De.NOT_EXECUTED:
               u = "No tasks are being executed anymore", this._resetExecutingDirtyData();
               break;
-            case be.STOP_EXECUTION:
+            case De.STOP_EXECUTION:
               u = "The execution of the formula has been stopped", n = 0;
               break;
-            case be.SUCCESS:
+            case De.SUCCESS:
               u = "Formula calculation succeeded", (n === 0 || n === -1) && (u += `. Total time consumed: ${performance.now() - this._startExecutionTime} ms`), this._resetExecutingDirtyData();
               break;
-            case be.INITIAL:
+            case De.INITIAL:
               u = "Waiting for calculation", this._resetExecutingDirtyData();
               break;
           }
-          (n === 0 || n === -1) && (e ? (clearTimeout(e), e = null, this.clearProgress()) : this._completeProgress(), n = 0, this._doneCalculationTaskCount = 0, this._totalCalculationTaskCount = 0, this._forceCalculating = !1), o === be.STOP_EXECUTION && this._restartCalculation ? (this._restartCalculation = !1, this._commandService.executeCommand(
+          (n === 0 || n === -1) && (e ? (clearTimeout(e), e = null, this.clearProgress()) : this._completeProgress(), n = 0, this._doneCalculationTaskCount = 0, this._totalCalculationTaskCount = 0, this._forceCalculating = !1), o === De.STOP_EXECUTION && this._restartCalculation ? (this._restartCalculation = !1, this._commandService.executeCommand(
             Ie.id,
             {
               ...this._executingDirtyData
@@ -1605,10 +1601,10 @@ _e = ki([
   de(0, ce),
   de(1, Ft),
   de(2, ka),
-  de(3, De),
-  de(4, X(ut)),
+  de(3, Ce),
+  de(4, X(mt)),
   de(5, X(_t)),
-  de(6, X($e))
+  de(6, X(je))
 ], _e);
 function Xr(a, e, n, i) {
   const r = a.get(bn), o = a.get(On), u = a.get(Mn), f = a.get(xn);
@@ -1635,7 +1631,7 @@ var Qi = Object.getOwnPropertyDescriptor, $i = (a, e, n, i) => {
     (u = a[o]) && (r = u(r) || r);
   return r;
 }, me = (a, e) => (n, i) => e(n, i, a);
-let je = class extends ae {
+let ze = 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();
   }
@@ -1682,7 +1678,7 @@ let je = class extends ae {
         fromFormula: !0
       }
     ), this._formulaDataModel.updateArrayFormulaCellData(n, e, i), this._formulaDataModel.updateArrayFormulaRange(n, e, i), this._commandService.executeCommand(
-      Be.id,
+      ve.id,
       {
         formulaData: o
       },
@@ -1705,7 +1701,7 @@ let je = class extends ae {
   _handleWorkbookDisposed(a, e) {
     const n = this._formulaDataModel.getFormulaData(), i = dt(n, a, e), r = this._formulaDataModel.getArrayFormulaRange(), o = dt(r, a, e), u = this._formulaDataModel.getArrayFormulaCellData(), f = dt(u, a, e);
     i && this._commandService.executeCommand(
-      Be.id,
+      ve.id,
       {
         formulaData: i
       },
@@ -1726,7 +1722,7 @@ let je = 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(
-      Be.id,
+      ve.id,
       {
         formulaData: f
       },
@@ -1740,10 +1736,10 @@ let je = class extends ae {
     const e = {}, n = a.getUnitId(), i = { [n]: {} };
     a.getSheets().forEach((c) => {
       var p;
-      const s = c.getCellMatrix(), L = c.getSheetId(), E = ta(e, n, L, s);
-      i[n][L] = (p = E[n]) == null ? void 0 : p[L];
-    }), 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);
+      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(Ie.id, f, { onlyLocal: !0 });
   }
   _getDirtyDataByCalculationMode(a) {
@@ -1784,7 +1780,7 @@ let je = class extends ae {
   }
   // eslint-disable-next-line max-lines-per-function
   _getFormulaReferenceMoveInfo(a, e, n) {
-    if (!Ae.isDefine(a)) return { newFormulaData: {}, oldFormulaData: {} };
+    if (!Me.isDefine(a)) return { newFormulaData: {}, oldFormulaData: {} };
     const i = Object.keys(a);
     if (i.length === 0) return { newFormulaData: {}, oldFormulaData: {} };
     const r = {}, o = {};
@@ -1793,9 +1789,9 @@ let je = class extends ae {
       if (f == null)
         continue;
       const m = Object.keys(f);
-      Ae.isDefine(r[u]) || (r[u] = {}), Ae.isDefine(o[u]) || (o[u] = {});
+      Me.isDefine(r[u]) || (r[u] = {}), Me.isDefine(o[u]) || (o[u] = {});
       for (const c of m) {
-        const s = new G(f[c] || {}), L = new G();
+        const s = new G(f[c] || {}), P = new G();
         s.forValue((E, p, R) => {
           var B;
           if (!R) return !0;
@@ -1833,7 +1829,7 @@ let je = class extends ae {
               z
             ))
               continue;
-            const he = {
+            const Ue = {
               range: ne,
               sheetId: z,
               unitId: k,
@@ -1850,7 +1846,7 @@ let je = class extends ae {
               } = n;
               if (le == null || z == null || z.length === 0 || Ee !== z)
                 continue;
-              ue = ot({
+              ue = ut({
                 range: ne,
                 sheetName: le,
                 unitId: k
@@ -1865,38 +1861,38 @@ let je = class extends ae {
                 continue;
               ue = j.REF;
             } else O !== y.SetDefinedName && (ue = Va(
-              he,
+              Ue,
               n,
               u,
               c
             ));
-            ue != null && (I[q] = {
+            ue != null ? (I[q] = {
               ...U,
               token: ue
-            }, T = !0, g.push(q));
+            }, T = !0, g.push(q)) : O === y.MoveRange && D && (T = !0);
           }
           if (!T)
             return !0;
           const h = va(I, g, N, d);
-          L.setValue(E, p, {
-            f: `=${ke(h)}`
+          P.setValue(E, p, {
+            f: `=${Qe(h)}`
           });
-        }), o[u] && (o[u][c] = L.getData());
+        }), o[u] && (o[u][c] = P.getData());
       }
     }
     return { newFormulaData: o };
   }
 };
-je = $i([
-  me(0, Ce),
+ze = $i([
+  me(0, Ae),
   me(1, ce),
   me(2, X(Ut)),
-  me(3, X(ut)),
+  me(3, X(mt)),
   me(4, X(qt)),
   me(5, ht),
-  me(6, De),
-  me(7, X(rt))
-], je);
+  me(6, Ce),
+  me(7, X(ot))
+], ze);
 const ji = [
   {
     functionName: aa.ARRAY_CONSTRAIN,
@@ -9330,7 +9326,7 @@ const ji = [
   }
 ], or = [
   {
-    functionName: P.ABS,
+    functionName: L.ABS,
     functionType: t.Math,
     description: "formula.functionList.ABS.description",
     abstract: "formula.functionList.ABS.abstract",
@@ -9345,7 +9341,7 @@ const ji = [
     ]
   },
   {
-    functionName: P.ACOS,
+    functionName: L.ACOS,
     functionType: t.Math,
     description: "formula.functionList.ACOS.description",
     abstract: "formula.functionList.ACOS.abstract",
@@ -9360,7 +9356,7 @@ const ji = [
     ]
   },
   {
-    functionName: P.ACOSH,
+    functionName: L.ACOSH,
     functionType: t.Math,
     description: "formula.functionList.ACOSH.description",
     abstract: "formula.functionList.ACOSH.abstract",
@@ -9375,7 +9371,7 @@ const ji = [
     ]
   },
   {
-    functionName: P.ACOT,
+    functionName: L.ACOT,
     functionType: t.Math,
     description: "formula.functionList.ACOT.description",
     abstract: "formula.functionList.ACOT.abstract",
@@ -9390,7 +9386,7 @@ const ji = [
     ]
   },
   {
-    functionName: P.ACOTH,
+    functionName: L.ACOTH,
     functionType: t.Math,
     description: "formula.functionList.ACOTH.description",
     abstract: "formula.functionList.ACOTH.abstract",
@@ -9405,7 +9401,7 @@ const ji = [
     ]
   },
   {
-    functionName: P.AGGREGATE,
+    functionName: L.AGGREGATE,
     functionType: t.Math,
     description: "formula.functionList.AGGREGATE.description",
     abstract: "formula.functionList.AGGREGATE.abstract",
@@ -9427,7 +9423,7 @@ const ji = [
     ]
   },
   {
-    functionName: P.ARABIC,
+    functionName: L.ARABIC,
     functionType: t.Math,
     description: "formula.functionList.ARABIC.description",
     abstract: "formula.functionList.ARABIC.abstract",
@@ -9442,7 +9438,7 @@ const ji = [
     ]
   },
   {
-    functionName: P.ASIN,
+    functionName: L.ASIN,
     functionType: t.Math,
     description: "formula.functionList.ASIN.description",
     abstract: "formula.functionList.ASIN.abstract",
@@ -9457,7 +9453,7 @@ const ji = [
     ]
   },
   {
-    functionName: P.ASINH,
+    functionName: L.ASINH,
     functionType: t.Math,
     description: "formula.functionList.ASINH.description",
     abstract: "formula.functionList.ASINH.abstract",
@@ -9472,7 +9468,7 @@ const ji = [
     ]
   },
   {
-    functionName: P.ATAN,
+    functionName: L.ATAN,
     functionType: t.Math,
     description: "formula.functionList.ATAN.description",
     abstract: "formula.functionList.ATAN.abstract",
@@ -9487,7 +9483,7 @@ const ji = [
     ]
   },
   {
-    functionName: P.ATAN2,
+    functionName: L.ATAN2,
     functionType: t.Math,
     description: "formula.functionList.ATAN2.description",
     abstract: "formula.functionList.ATAN2.abstract",
@@ -9509,7 +9505,7 @@ const ji = [
     ]
   },
   {
-    functionName: P.ATANH,
+    functionName: L.ATANH,
     functionType: t.Math,
     description: "formula.functionList.ATANH.description",
     abstract: "formula.functionList.ATANH.abstract",
@@ -9524,7 +9520,7 @@ const ji = [
     ]
   },
   {
-    functionName: P.BASE,
+    functionName: L.BASE,
     functionType: t.Math,
     description: "formula.functionList.BASE.description",
     abstract: "formula.functionList.BASE.abstract",
@@ -9553,7 +9549,7 @@ const ji = [
     ]
   },
   {
-    functionName: P.CEILING,
+    functionName: L.CEILING,
     functionType: t.Math,
     description: "formula.functionList.CEILING.description",
     abstract: "formula.functionList.CEILING.abstract",
@@ -9575,7 +9571,7 @@ const ji = [
     ]
   },
   {
-    functionName: P.CEILING_MATH,
+    functionName: L.CEILING_MATH,
     functionType: t.Math,
     description: "formula.functionList.CEILING_MATH.description",
     abstract: "formula.functionList.CEILING_MATH.abstract",
@@ -9604,7 +9600,7 @@ const ji = [
     ]
   },
   {
-    functionName: P.CEILING_PRECISE,
+    functionName: L.CEILING_PRECISE,
     functionType: t.Math,
     description: "formula.functionList.CEILING_PRECISE.description",
     abstract: "formula.functionList.CEILING_PRECISE.abstract",
@@ -9626,7 +9622,7 @@ const ji = [
     ]
   },
   {
-    functionName: P.COMBIN,
+    functionName: L.COMBIN,
     functionType: t.Math,
     description: "formula.functionList.COMBIN.description",
     abstract: "formula.functionList.COMBIN.abstract",
@@ -9648,7 +9644,7 @@ const ji = [
     ]
   },
   {
-    functionName: P.COMBINA,
+    functionName: L.COMBINA,
     functionType: t.Math,
     description: "formula.functionList.COMBINA.description",
     abstract: "formula.functionList.COMBINA.abstract",
@@ -9670,7 +9666,7 @@ const ji = [
     ]
   },
   {
-    functionName: P.COS,
+    functionName: L.COS,
     functionType: t.Math,
     description: "formula.functionList.COS.description",
     abstract: "formula.functionList.COS.abstract",
@@ -9685,7 +9681,7 @@ const ji = [
     ]
   },
   {
-    functionName: P.COSH,
+    functionName: L.COSH,
     functionType: t.Math,
     description: "formula.functionList.COSH.description",
     abstract: "formula.functionList.COSH.abstract",
@@ -9700,7 +9696,7 @@ const ji = [
     ]
   },
   {
-    functionName: P.COT,
+    functionName: L.COT,
     functionType: t.Math,
     description: "formula.functionList.COT.description",
     abstract: "formula.functionList.COT.abstract",
@@ -9715,7 +9711,7 @@ const ji = [
     ]
   },
   {
-    functionName: P.COTH,
+    functionName: L.COTH,
     functionType: t.Math,
     description: "formula.functionList.COTH.description",
     abstract: "formula.functionList.COTH.abstract",
@@ -9730,7 +9726,7 @@ const ji = [
     ]
   },
   {
-    functionName: P.CSC,
+    functionName: L.CSC,
     functionType: t.Math,
     description: "formula.functionList.CSC.description",
     abstract: "formula.functionList.CSC.abstract",
@@ -9745,7 +9741,7 @@ const ji = [
     ]
   },
   {
-    functionName: P.CSCH,
+    functionName: L.CSCH,
     functionType: t.Math,
     description: "formula.functionList.CSCH.description",
     abstract: "formula.functionList.CSCH.abstract",
@@ -9760,7 +9756,7 @@ const ji = [
     ]
   },
   {
-    functionName: P.DECIMAL,
+    functionName: L.DECIMAL,
     functionType: t.Math,
     description: "formula.functionList.DECIMAL.description",
     abstract: "formula.functionList.DECIMAL.abstract",
@@ -9782,7 +9778,7 @@ const ji = [
     ]
   },
   {
-    functionName: P.DEGREES,
+    functionName: L.DEGREES,
     functionType: t.Math,
     description: "formula.functionList.DEGREES.description",
     abstract: "formula.functionList.DEGREES.abstract",
@@ -9797,7 +9793,7 @@ const ji = [
     ]
   },
   {
-    functionName: P.EVEN,
+    functionName: L.EVEN,
     functionType: t.Math,
     description: "formula.functionList.EVEN.description",
     abstract: "formula.functionList.EVEN.abstract",
@@ -9812,7 +9808,7 @@ const ji = [
     ]
   },
   {
-    functionName: P.EXP,
+    functionName: L.EXP,
     functionType: t.Math,
     description: "formula.functionList.EXP.description",
     abstract: "formula.functionList.EXP.abstract",
@@ -9827,7 +9823,7 @@ const ji = [
     ]
   },
   {
-    functionName: P.FACT,
+    functionName: L.FACT,
     functionType: t.Math,
     description: "formula.functionList.FACT.description",
     abstract: "formula.functionList.FACT.abstract",
@@ -9842,7 +9838,7 @@ const ji = [
     ]
   },
   {
-    functionName: P.FACTDOUBLE,
+    functionName: L.FACTDOUBLE,
     functionType: t.Math,
     description: "formula.functionList.FACTDOUBLE.description",
     abstract: "formula.functionList.FACTDOUBLE.abstract",
@@ -9857,7 +9853,7 @@ const ji = [
     ]
   },
   {
-    functionName: P.FLOOR,
+    functionName: L.FLOOR,
     functionType: t.Math,
     description: "formula.functionList.FLOOR.description",
     abstract: "formula.functionList.FLOOR.abstract",
@@ -9879,7 +9875,7 @@ const ji = [
     ]
   },
   {
-    functionName: P.FLOOR_MATH,
+    functionName: L.FLOOR_MATH,
     functionType: t.Math,
     description: "formula.functionList.FLOOR_MATH.description",
     abstract: "formula.functionList.FLOOR_MATH.abstract",
@@ -9908,7 +9904,7 @@ const ji = [
     ]
   },
   {
-    functionName: P.FLOOR_PRECISE,
+    functionName: L.FLOOR_PRECISE,
     functionType: t.Math,
     description: "formula.functionList.FLOOR_PRECISE.description",
     abstract: "formula.functionList.FLOOR_PRECISE.abstract",
@@ -9930,7 +9926,7 @@ const ji = [
     ]
   },
   {
-    functionName: P.GCD,
+    functionName: L.GCD,
     functionType: t.Math,
     description: "formula.functionList.GCD.description",
     abstract: "formula.functionList.GCD.abstract",
@@ -9952,7 +9948,7 @@ const ji = [
     ]
   },
   {
-    functionName: P.INT,
+    functionName: L.INT,
     functionType: t.Math,
     description: "formula.functionList.INT.description",
     abstract: "formula.functionList.INT.abstract",
@@ -9967,7 +9963,7 @@ const ji = [
     ]
   },
   {
-    functionName: P.ISO_CEILING,
+    functionName: L.ISO_CEILING,
     functionType: t.Math,
     description: "formula.functionList.ISO_CEILING.description",
     abstract: "formula.functionList.ISO_CEILING.abstract",
@@ -9989,7 +9985,7 @@ const ji = [
     ]
   },
   {
-    functionName: P.LCM,
+    functionName: L.LCM,
     functionType: t.Math,
     description: "formula.functionList.LCM.description",
     abstract: "formula.functionList.LCM.abstract",
@@ -10011,7 +10007,7 @@ const ji = [
     ]
   },
   {
-    functionName: P.LET,
+    functionName: L.LET,
     functionType: t.Math,
     description: "formula.functionList.LET.description",
     abstract: "formula.functionList.LET.abstract",
@@ -10033,7 +10029,7 @@ const ji = [
     ]
   },
   {
-    functionName: P.LN,
+    functionName: L.LN,
     functionType: t.Math,
     description: "formula.functionList.LN.description",
     abstract: "formula.functionList.LN.abstract",
@@ -10048,7 +10044,7 @@ const ji = [
     ]
   },
   {
-    functionName: P.LOG,
+    functionName: L.LOG,
     functionType: t.Math,
     description: "formula.functionList.LOG.description",
     abstract: "formula.functionList.LOG.abstract",
@@ -10070,7 +10066,7 @@ const ji = [
     ]
   },
   {
-    functionName: P.LOG10,
+    functionName: L.LOG10,
     functionType: t.Math,
     description: "formula.functionList.LOG10.description",
     abstract: "formula.functionList.LOG10.abstract",
@@ -10085,7 +10081,7 @@ const ji = [
     ]
   },
   {
-    functionName: P.MDETERM,
+    functionName: L.MDETERM,
     functionType: t.Math,
     description: "formula.functionList.MDETERM.description",
     abstract: "formula.functionList.MDETERM.abstract",
@@ -10100,7 +10096,7 @@ const ji = [
     ]
   },
   {
-    functionName: P.MINVERSE,
+    functionName: L.MINVERSE,
     functionType: t.Math,
     description: "formula.functionList.MINVERSE.description",
     abstract: "formula.functionList.MINVERSE.abstract",
@@ -10115,7 +10111,7 @@ const ji = [
     ]
   },
   {
-    functionName: P.MMULT,
+    functionName: L.MMULT,
     functionType: t.Math,
     description: "formula.functionList.MMULT.description",
     abstract: "formula.functionList.MMULT.abstract",
@@ -10137,7 +10133,7 @@ const ji = [
     ]
   },
   {
-    functionName: P.MOD,
+    functionName: L.MOD,
     functionType: t.Math,
     description: "formula.functionList.MOD.description",
     abstract: "formula.functionList.MOD.abstract",
@@ -10159,7 +10155,7 @@ const ji = [
     ]
   },
   {
-    functionName: P.MROUND,
+    functionName: L.MROUND,
     functionType: t.Math,
     description: "formula.functionList.MROUND.description",
     abstract: "formula.functionList.MROUND.abstract",
@@ -10181,7 +10177,7 @@ const ji = [
     ]
   },
   {
-    functionName: P.MULTINOMIAL,
+    functionName: L.MULTINOMIAL,
     functionType: t.Math,
     description: "formula.functionList.MULTINOMIAL.description",
     abstract: "formula.functionList.MULTINOMIAL.abstract",
@@ -10203,7 +10199,7 @@ const ji = [
     ]
   },
   {
-    functionName: P.MUNIT,
+    functionName: L.MUNIT,
     functionType: t.Math,
     description: "formula.functionList.MUNIT.description",
     abstract: "formula.functionList.MUNIT.abstract",
@@ -10218,7 +10214,7 @@ const ji = [
     ]
   },
   {
-    functionName: P.ODD,
+    functionName: L.ODD,
     functionType: t.Math,
     description: "formula.functionList.ODD.description",
     abstract: "formula.functionList.ODD.abstract",
@@ -10233,14 +10229,14 @@ const ji = [
     ]
   },
   {
-    functionName: P.PI,
+    functionName: L.PI,
     functionType: t.Math,
     description: "formula.functionList.PI.description",
     abstract: "formula.functionList.PI.abstract",
     functionParameter: []
   },
   {
-    functionName: P.POWER,
+    functionName: L.POWER,
     functionType: t.Math,
     description: "formula.functionList.POWER.description",
     abstract: "formula.functionList.POWER.abstract",
@@ -10262,7 +10258,7 @@ const ji = [
     ]
   },
   {
-    functionName: P.PRODUCT,
+    functionName: L.PRODUCT,
     functionType: t.Math,
     description: "formula.functionList.PRODUCT.description",
     abstract: "formula.functionList.PRODUCT.abstract",
@@ -10284,7 +10280,7 @@ const ji = [
     ]
   },
   {
-    functionName: P.QUOTIENT,
+    functionName: L.QUOTIENT,
     functionType: t.Math,
     description: "formula.functionList.QUOTIENT.description",
     abstract: "formula.functionList.QUOTIENT.abstract",
@@ -10306,7 +10302,7 @@ const ji = [
     ]
   },
   {
-    functionName: P.RADIANS,
+    functionName: L.RADIANS,
     functionType: t.Math,
     description: "formula.functionList.RADIANS.description",
     abstract: "formula.functionList.RADIANS.abstract",
@@ -10321,14 +10317,14 @@ const ji = [
     ]
   },
   {
-    functionName: P.RAND,
+    functionName: L.RAND,
     functionType: t.Math,
     description: "formula.functionList.RAND.description",
     abstract: "formula.functionList.RAND.abstract",
     functionParameter: []
   },
   {
-    functionName: P.RANDARRAY,
+    functionName: L.RANDARRAY,
     functionType: t.Math,
     description: "formula.functionList.RANDARRAY.description",
     abstract: "formula.functionList.RANDARRAY.abstract",
@@ -10371,7 +10367,7 @@ const ji = [
     ]
   },
   {
-    functionName: P.RANDBETWEEN,
+    functionName: L.RANDBETWEEN,
     functionType: t.Math,
     description: "formula.functionList.RANDBETWEEN.description",
     abstract: "formula.functionList.RANDBETWEEN.abstract",
@@ -10393,7 +10389,7 @@ const ji = [
     ]
   },
   {
-    functionName: P.ROMAN,
+    functionName: L.ROMAN,
     functionType: t.Math,
     description: "formula.functionList.ROMAN.description",
     abstract: "formula.functionList.ROMAN.abstract",
@@ -10415,7 +10411,7 @@ const ji = [
     ]
   },
   {
-    functionName: P.ROUND,
+    functionName: L.ROUND,
     functionType: t.Math,
     description: "formula.functionList.ROUND.description",
     abstract: "formula.functionList.ROUND.abstract",
@@ -10437,7 +10433,7 @@ const ji = [
     ]
   },
   {
-    functionName: P.ROUNDBANK,
+    functionName: L.ROUNDBANK,
     functionType: t.Math,
     description: "formula.functionList.ROUNDBANK.description",
     abstract: "formula.functionList.ROUNDBANK.abstract",
@@ -10459,7 +10455,7 @@ const ji = [
     ]
   },
   {
-    functionName: P.ROUNDDOWN,
+    functionName: L.ROUNDDOWN,
     functionType: t.Math,
     description: "formula.functionList.ROUNDDOWN.description",
     abstract: "formula.functionList.ROUNDDOWN.abstract",
@@ -10481,7 +10477,7 @@ const ji = [
     ]
   },
   {
-    functionName: P.ROUNDUP,
+    functionName: L.ROUNDUP,
     functionType: t.Math,
     description: "formula.functionList.ROUNDUP.description",
     abstract: "formula.functionList.ROUNDUP.abstract",
@@ -10503,7 +10499,7 @@ const ji = [
     ]
   },
   {
-    functionName: P.SEC,
+    functionName: L.SEC,
     functionType: t.Math,
     description: "formula.functionList.SEC.description",
     abstract: "formula.functionList.SEC.abstract",
@@ -10518,7 +10514,7 @@ const ji = [
     ]
   },
   {
-    functionName: P.SECH,
+    functionName: L.SECH,
     functionType: t.Math,
     description: "formula.functionList.SECH.description",
     abstract: "formula.functionList.SECH.abstract",
@@ -10533,7 +10529,7 @@ const ji = [
     ]
   },
   {
-    functionName: P.SERIESSUM,
+    functionName: L.SERIESSUM,
     functionType: t.Math,
     description: "formula.functionList.SERIESSUM.description",
     abstract: "formula.functionList.SERIESSUM.abstract",
@@ -10569,7 +10565,7 @@ const ji = [
     ]
   },
   {
-    functionName: P.SEQUENCE,
+    functionName: L.SEQUENCE,
     functionType: t.Math,
     description: "formula.functionList.SEQUENCE.description",
     abstract: "formula.functionList.SEQUENCE.abstract",
@@ -10605,7 +10601,7 @@ const ji = [
     ]
   },
   {
-    functionName: P.SIGN,
+    functionName: L.SIGN,
     functionType: t.Math,
     description: "formula.functionList.SIGN.description",
     abstract: "formula.functionList.SIGN.abstract",
@@ -10620,7 +10616,7 @@ const ji = [
     ]
   },
   {
-    functionName: P.SIN,
+    functionName: L.SIN,
     functionType: t.Math,
     description: "formula.functionList.SIN.description",
     abstract: "formula.functionList.SIN.abstract",
@@ -10635,7 +10631,7 @@ const ji = [
     ]
   },
   {
-    functionName: P.SINH,
+    functionName: L.SINH,
     functionType: t.Math,
     description: "formula.functionList.SINH.description",
     abstract: "formula.functionList.SINH.abstract",
@@ -10650,7 +10646,7 @@ const ji = [
     ]
   },
   {
-    functionName: P.SQRT,
+    functionName: L.SQRT,
     functionType: t.Math,
     description: "formula.functionList.SQRT.description",
     abstract: "formula.functionList.SQRT.abstract",
@@ -10665,7 +10661,7 @@ const ji = [
     ]
   },
   {
-    functionName: P.SQRTPI,
+    functionName: L.SQRTPI,
     functionType: t.Math,
     description: "formula.functionList.SQRTPI.description",
     abstract: "formula.functionList.SQRTPI.abstract",
@@ -10680,7 +10676,7 @@ const ji = [
     ]
   },
   {
-    functionName: P.SUBTOTAL,
+    functionName: L.SUBTOTAL,
     functionType: t.Math,
     description: "formula.functionList.SUBTOTAL.description",
     abstract: "formula.functionList.SUBTOTAL.abstract",
@@ -10709,7 +10705,7 @@ const ji = [
     ]
   },
   {
-    functionName: P.SUM,
+    functionName: L.SUM,
     aliasFunctionName: "formula.functionList.SUM.aliasFunctionName",
     functionType: t.Math,
     description: "formula.functionList.SUM.description",
@@ -10732,7 +10728,7 @@ const ji = [
     ]
   },
   {
-    functionName: P.SUMIF,
+    functionName: L.SUMIF,
     aliasFunctionName: "formula.functionList.SUMIF.aliasFunctionName",
     functionType: t.Math,
     description: "formula.functionList.SUMIF.description",
@@ -10762,7 +10758,7 @@ const ji = [
     ]
   },
   {
-    functionName: P.SUMIFS,
+    functionName: L.SUMIFS,
     functionType: t.Math,
     description: "formula.functionList.SUMIFS.description",
     abstract: "formula.functionList.SUMIFS.abstract",
@@ -10805,7 +10801,7 @@ const ji = [
     ]
   },
   {
-    functionName: P.SUMPRODUCT,
+    functionName: L.SUMPRODUCT,
     functionType: t.Math,
     description: "formula.functionList.SUMPRODUCT.description",
     abstract: "formula.functionList.SUMPRODUCT.abstract",
@@ -10827,7 +10823,7 @@ const ji = [
     ]
   },
   {
-    functionName: P.SUMSQ,
+    functionName: L.SUMSQ,
     functionType: t.Math,
     description: "formula.functionList.SUMSQ.description",
     abstract: "formula.functionList.SUMSQ.abstract",
@@ -10849,7 +10845,7 @@ const ji = [
     ]
   },
   {
-    functionName: P.SUMX2MY2,
+    functionName: L.SUMX2MY2,
     functionType: t.Math,
     description: "formula.functionList.SUMX2MY2.description",
     abstract: "formula.functionList.SUMX2MY2.abstract",
@@ -10871,7 +10867,7 @@ const ji = [
     ]
   },
   {
-    functionName: P.SUMX2PY2,
+    functionName: L.SUMX2PY2,
     functionType: t.Math,
     description: "formula.functionList.SUMX2PY2.description",
     abstract: "formula.functionList.SUMX2PY2.abstract",
@@ -10893,7 +10889,7 @@ const ji = [
     ]
   },
   {
-    functionName: P.SUMXMY2,
+    functionName: L.SUMXMY2,
     functionType: t.Math,
     description: "formula.functionList.SUMXMY2.description",
     abstract: "formula.functionList.SUMXMY2.abstract",
@@ -10915,7 +10911,7 @@ const ji = [
     ]
   },
   {
-    functionName: P.TAN,
+    functionName: L.TAN,
     functionType: t.Math,
     description: "formula.functionList.TAN.description",
     abstract: "formula.functionList.TAN.abstract",
@@ -10930,7 +10926,7 @@ const ji = [
     ]
   },
   {
-    functionName: P.TANH,
+    functionName: L.TANH,
     functionType: t.Math,
     description: "formula.functionList.TANH.description",
     abstract: "formula.functionList.TANH.abstract",
@@ -10945,7 +10941,7 @@ const ji = [
     ]
   },
   {
-    functionName: P.TRUNC,
+    functionName: L.TRUNC,
     functionType: t.Math,
     description: "formula.functionList.TRUNC.description",
     abstract: "formula.functionList.TRUNC.abstract",
@@ -15293,7 +15289,7 @@ let bt = class {
       ...Kn,
       ...kn,
       ...Qn
-    ].map((r) => r[1]), e = lr.filter((r) => a.includes(r.functionName)), n = this._configService.getConfig(ge);
+    ].map((r) => r[1]), e = lr.filter((r) => a.includes(r.functionName)), n = this._configService.getConfig(he);
     this._descriptions = e.concat((i = n == null ? void 0 : n.description) != null ? i : []);
   }
   _registerDescriptions() {
@@ -15316,13 +15312,13 @@ let bt = class {
 bt = pr([
   Et(0, Bt),
   Et(1, X(_t)),
-  Et(2, De)
+  Et(2, Ce)
 ], bt);
 var Lr = Object.getOwnPropertyDescriptor, Pr = (a, e, n, i) => {
   for (var r = i > 1 ? void 0 : i ? Lr(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);
+}, Ge = (a, e) => (n, i) => e(n, i, a);
 function ca(a, e, n, i) {
   const r = a.sequenceNodesBuilder(e);
   if (r == null)
@@ -15332,11 +15328,11 @@ function ca(a, e, n, i) {
     const m = r[u];
     if (typeof m == "string" || m.nodeType !== ee.REFERENCE)
       continue;
-    const { token: c } = m, s = pe(c), { sheetName: L, unitId: E } = s;
+    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: L,
+      sheetName: P,
       range: p
     }));
   }
@@ -15349,7 +15345,7 @@ let Ot = class extends ae {
   transformFormulaByEffectCommand(a, e, n, i) {
     const r = this._lexerTreeBuilder.sequenceNodesBuilder(n), o = this._univerInstanceService.getCurrentUnitForType(te.UNIVER_SHEET), u = o.getActiveSheet(), f = o.getUnitId(), m = u.getSheetId(), c = r == null ? void 0 : r.map((s) => {
       if (typeof s == "object" && s.nodeType === ee.REFERENCE) {
-        const L = pe(s.token), { range: E, unitId: p, sheetName: R } = L, S = this._univerInstanceService.getUnit(p || a), N = R ? S == null ? void 0 : S.getSheetBySheetName(R) : S == null ? void 0 : S.getSheetBySheetId(e);
+        const P = pe(s.token), { range: E, unitId: p, sheetName: R } = P, S = this._univerInstanceService.getUnit(p || a), N = R ? S == null ? void 0 : S.getSheetBySheetName(R) : S == null ? void 0 : S.getSheetBySheetId(e);
         if (!N)
           throw new Error("Sheet not found");
         const d = S.getUnitId(), D = N.getSheetId();
@@ -15369,14 +15365,14 @@ let Ot = class extends ae {
       } else
         return s;
     });
-    return c ? `=${ke(c)}` : "";
+    return c ? `=${Qe(c)}` : "";
   }
   registerFormula(a, e, n, i) {
-    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(), L = c.getUnitId(), E = s.getSheetId(), p = o == null ? void 0 : o.map((S) => {
+    const r = /* @__PURE__ */ new Map(), o = this._lexerTreeBuilder.sequenceNodesBuilder(n), u = new Ke(), 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);
-          if (N.unitId !== L || N.subUnitId !== E)
+          if (N.unitId !== P || N.subUnitId !== E)
             return S;
           const d = wt(N.range, m);
           let D = "";
@@ -15391,12 +15387,12 @@ let Ot = class extends ae {
           };
         } else
           return S;
-      }), R = p && ke(p);
+      }), R = p && Qe(p);
       return i(`=${R}`);
     };
     return o == null || o.forEach((m) => {
       if (typeof m == "object" && m.nodeType === ee.REFERENCE) {
-        const c = pe(m.token), { range: s, unitId: L, sheetName: E } = c, p = this._univerInstanceService.getUnit(L || a), R = E ? p == null ? void 0 : p.getSheetBySheetName(E) : p == null ? void 0 : p.getSheetBySheetId(e);
+        const c = pe(m.token), { range: s, unitId: P, sheetName: E } = c, p = this._univerInstanceService.getUnit(P || a), R = E ? p == null ? void 0 : p.getSheetBySheetName(E) : p == null ? void 0 : p.getSheetBySheetId(e);
         if (!R)
           return;
         const S = p.getUnitId(), N = R.getSheetId(), d = {
@@ -15414,12 +15410,12 @@ let Ot = class extends ae {
     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 L = this._univerInstanceService.getUnit(c || a), E = s ? L == null ? void 0 : L.getSheetBySheetName(s) : L == null ? void 0 : L.getSheetBySheetId(e);
+        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)
           return;
-        const p = L.getUnitId(), R = E.getSheetId(), S = i[0].startRow, N = i[0].startColumn, d = m.startRow, D = m.startColumn, I = i.map((T) => ({
+        const p = P.getUnitId(), R = E.getSheetId(), S = i[0].startRow, N = i[0].startColumn, d = m.startRow, D = m.startColumn, I = i.map((T) => ({
           startRow: T.startRow - S + d,
           endRow: T.endRow - S + d,
           startColumn: T.startColumn - N + D,
@@ -15435,13 +15431,13 @@ let Ot = class extends ae {
   }
   // eslint-disable-next-line max-lines-per-function
   registerRangeFormula(a, e, n, i, r) {
-    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, L = [{ unitId: a, subUnitId: e, ranges: n }, ...u.flat()], E = [], p = Tn(this._injector, m);
-      for (const { unitId: R, subUnitId: S, ranges: N } of L)
+    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 = Tn(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) => Ye(h, q)).filter(Boolean);
+            const B = N.map((q) => Xe(h, q)).filter(Boolean);
             B.length > 0 && d.push(...B);
           }
           d.length > 0 && E.push(
@@ -15463,7 +15459,7 @@ let Ot = class extends ae {
             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), 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);
+            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);
             ne.push({
               newFormula: ue,
               orginFormula: Te
@@ -15515,18 +15511,18 @@ let Ot = class extends ae {
       const c = this._refRangeService.registerRefRange(m, f, a, e);
       o.add(c);
     }), [...u.flat()].forEach(({ unitId: m, subUnitId: c, ranges: s }) => {
-      s.forEach((L) => {
-        const E = this._refRangeService.registerRefRange(L, f, m, c);
+      s.forEach((P) => {
+        const E = this._refRangeService.registerRefRange(P, f, m, c);
         o.add(E);
       });
     }), o;
   }
 };
 Ot = Pr([
-  Ve(0, X(Pn)),
-  Ve(1, X(Ut)),
-  Ve(2, Ce),
-  Ve(3, X(rt))
+  Ge(0, X(Pn)),
+  Ge(1, X(Ut)),
+  Ge(2, Ae),
+  Ge(3, X(ot))
 ], Ot);
 var Tr = Object.getOwnPropertyDescriptor, Er = (a, e, n, i) => {
   for (var r = i > 1 ? void 0 : i ? Tr(e, n) : e, o = a.length - 1, u; o >= 0; o--)
@@ -15534,7 +15530,7 @@ var Tr = Object.getOwnPropertyDescriptor, Er = (a, e, n, i) => {
   return r;
 }, Ir = (a, e) => (n, i) => e(n, i, a);
 const Vt = "sheets-formula.remote-register-function.service", Ha = yt(Vt);
-let ze = class {
+let Ze = class {
   constructor(a) {
     this._functionService = a;
   }
@@ -15550,9 +15546,9 @@ let ze = class {
     this._functionService.unregisterExecutors(...a), this._functionService.unregisterDescriptions(...a), this._functionService.deleteFormulaAstCacheKey(...a);
   }
 };
-ze = Er([
+Ze = Er([
   Ir(0, Bt)
-], ze);
+], Ze);
 function Nr(a, e) {
   const n = new Ct(e), i = new Function(`return ${a}`)();
   return n.calculateCustom = i, n;
@@ -15565,7 +15561,7 @@ 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--)
     (u = a[o]) && (r = u(r) || r);
   return r;
-}, Ge = (a, e) => (n, i) => e(n, i, a);
+}, He = (a, e) => (n, i) => e(n, i, a);
 const Cr = yt(
   "sheets-formula.register-function-service"
 );
@@ -15582,7 +15578,7 @@ let Mt = class extends ae {
   registerFunctions(a) {
     const { locales: e, description: n, calculate: i } = a;
     e && this._localeService.load(e);
-    const r = new We();
+    const r = new Ke();
     if (n)
       r.add(this._descriptionService.registerDescriptions(n));
     else {
@@ -15598,7 +15594,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 We();
+    const { name: e, func: n, description: i, locales: r, async: o = !1 } = a, u = new Ke();
     if (r && this._localeService.load(r), typeof i == "string") {
       const m = {
         functionName: e,
@@ -15628,10 +15624,10 @@ let Mt = class extends ae {
   }
 };
 Mt = Ar([
-  Ge(0, X(_t)),
-  Ge(1, X(vt)),
-  Ge(2, Bt),
-  Ge(3, Qa(Ha))
+  He(0, X(_t)),
+  He(1, X(vt)),
+  He(2, Bt),
+  He(3, Qa(Ha))
 ], Mt);
 const Dr = "SHEETS_FORMULA_PLUGIN";
 var br = Object.getOwnPropertyDescriptor, Or = (a, e, n, i) => {
@@ -15639,7 +15635,7 @@ var br = Object.getOwnPropertyDescriptor, Or = (a, e, n, i) => {
     (u = a[o]) && (r = u(r) || r);
   return r;
 }, It = (a, e) => (n, i) => e(n, i, a);
-let Ze = class extends ae {
+let Je = class extends ae {
   constructor(a, e, n) {
     super(), this._activeDirtyManagerService = a, this._univerInstanceService = e, this._formulaDataModel = n, this._initialize();
   }
@@ -15857,9 +15853,9 @@ let Ze = class extends ae {
   _getRemoveRowOrColumnMutation(a, e = !0) {
     const { subUnitId: n, unitId: i, range: r } = a, o = [], u = this._univerInstanceService.getUniverSheetInstance(i), f = u == null ? void 0 : u.getSheetBySheetId(n), m = (f == null ? void 0 : f.getRowCount()) || 0, c = (f == null ? void 0 : f.getColumnCount()) || 0;
     let s = null;
-    const { startRow: L, endRow: E, startColumn: p, endColumn: R } = r;
+    const { startRow: P, endRow: E, startColumn: p, endColumn: R } = r;
     e === !0 ? s = this._rangeToMatrix({
-      startRow: L,
+      startRow: P,
       startColumn: 0,
       endRow: E,
       endColumn: c - 1
@@ -15913,7 +15909,7 @@ let Ze = class extends ae {
     if ((u = o == null ? void 0 : o[a]) != null && u[e]) {
       const m = new G((f = o == null ? void 0 : o[a]) == null ? void 0 : f[e]);
       r.forValue((c, s) => {
-        m.forValue((L, E, p) => {
+        m.forValue((P, E, p) => {
           if (p == null)
             return !0;
           const { startRow: R, startColumn: S, endRow: N, endColumn: d } = p;
@@ -15933,17 +15929,17 @@ let Ze = class extends ae {
     return i;
   }
 };
-Ze = Or([
+Je = Or([
   It(0, Ft),
-  It(1, Ce),
-  It(2, X(ut))
-], Ze);
+  It(1, Ae),
+  It(2, X(mt))
+], Je);
 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;
-}, He = (a, e) => (n, i) => e(n, i, a);
-let Je = class extends ae {
+}, we = (a, e) => (n, i) => e(n, i, a);
+let et = class extends ae {
   constructor(a, e, n, i) {
     super(), this._commandService = a, this._configService = e, this._sheetInterceptorService = n, this._formulaDataModel = i, this._initialize();
   }
@@ -15960,7 +15956,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(ge)) != null && r.writeArrayFormulaToSnapshot && this._writeArrayFormulaToSnapshot(n, i);
+        this._formulaDataModel.setArrayFormulaRange(n), this._formulaDataModel.setArrayFormulaCellData(i), (r = this._configService.getConfig(he)) != null && r.writeArrayFormulaToSnapshot && this._writeArrayFormulaToSnapshot(n, i);
       })
     );
   }
@@ -15992,27 +15988,27 @@ let Je = class extends ae {
         priority: 100,
         effect: $a.Value,
         handler: (a, e, n) => {
-          var s, L, E;
+          var s, P, E;
           let i = a;
-          const { unitId: r, subUnitId: o, row: u, col: f } = e, m = this._formulaDataModel.getArrayFormulaCellData(), c = (E = (L = (s = m == null ? void 0 : m[r]) == null ? void 0 : s[o]) == null ? void 0 : L[u]) == null ? void 0 : E[f];
+          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 && ja(i.v) ? (i.v = $n(Number(i.v)), n(i)) : (i.v = c.v, i.t = c.t, n(i)));
         }
       })
     );
   }
 };
-Je = xr([
-  He(0, ce),
-  He(1, De),
-  He(2, X(qt)),
-  He(3, X(ut))
-], Je);
+et = xr([
+  we(0, ce),
+  we(1, Ce),
+  we(2, X(qt)),
+  we(3, X(mt))
+], et);
 var _r = Object.getOwnPropertyDescriptor, yr = (a, e, n, i) => {
   for (var r = i > 1 ? void 0 : i ? _r(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);
-let et = class extends ae {
+}, Ye = (a, e) => (n, i) => e(n, i, a);
+let tt = class extends ae {
   constructor(e, n, i, r) {
     super();
     W(this, "_preUnitId", null);
@@ -16124,35 +16120,35 @@ let et = class extends ae {
     }), this._descriptionService.unregisterDescriptions(r);
   }
 };
-et = yr([
-  we(0, vt),
-  we(1, ht),
-  we(2, Ce),
-  we(3, ce)
-], et);
+tt = yr([
+  Ye(0, vt),
+  Ye(1, ht),
+  Ye(2, Ae),
+  Ye(3, ce)
+], tt);
 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--)
     (u = a[o]) && (r = u(r) || r);
   return r;
 }, hr = (a, e) => (n, i) => e(n, i, a);
-let tt = class extends ae {
+let at = class extends ae {
   constructor(a) {
     super(), this._commandService = a, [
       ei,
       ti,
-      Me
+      Oe
     ].forEach((e) => this._commandService.registerCommand(e));
   }
 };
-tt = gr([
+at = gr([
   hr(0, ce)
-], tt);
+], at);
 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--)
     (u = a[o]) && (r = u(r) || r);
   return r;
-}, at = (a, e) => (n, i) => e(n, i, a), ft = (a, e, n) => Br(a, typeof e != "symbol" ? e + "" : e, n);
-let nt = class extends pa {
+}, 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 {
   constructor(a = ma, e, n) {
     super(), this._config = a, this._injector = e, this._configService = n;
     const { ...i } = La(
@@ -16163,20 +16159,20 @@ let nt = class extends pa {
     this._configService.setConfig(Wi, i);
   }
   onStarting() {
-    this._injector.add([ze]), this._injector.get(Ua).registerChannel(
+    this._injector.add([Ze]), this._injector.get(Ua).registerChannel(
       Vt,
-      Zn(this._injector.get(ze))
+      Zn(this._injector.get(Ze))
     );
   }
 };
-ft(nt, "pluginName", "SHEET_FORMULA_REMOTE_PLUGIN");
-ft(nt, "type", te.UNIVER_SHEET);
-nt = wa([
+ft(it, "pluginName", "SHEET_FORMULA_REMOTE_PLUGIN");
+ft(it, "type", te.UNIVER_SHEET);
+it = wa([
   da(ga),
-  at(1, X(rt)),
-  at(2, De)
-], nt);
-let it = class extends pa {
+  nt(1, X(ot)),
+  nt(2, Ce)
+], it);
+let rt = class extends pa {
   constructor(a = ua, e, n) {
     super(), this._config = a, this._injector = e, this._configService = n;
     const { ...i } = La(
@@ -16184,21 +16180,21 @@ let it = class extends pa {
       ua,
       this._config
     );
-    this._configService.setConfig(ge, i, { merge: !0 });
+    this._configService.setConfig(he, i, { merge: !0 });
   }
   onStarting() {
     const a = this._injector, e = [
       [Cr, { useClass: Mt }],
       [vt, { useClass: bt }],
-      [tt],
+      [at],
       [Ot],
-      [$e],
-      [Je],
-      [_e],
       [je],
-      [Ze],
       [et],
-      [Qe]
+      [_e],
+      [ze],
+      [Je],
+      [tt],
+      [$e]
     ];
     if (this._config.notExecuteFormula) {
       const n = a.get(Ua);
@@ -16209,31 +16205,31 @@ let it = class extends pa {
     e.forEach((n) => a.add(n));
   }
   onReady() {
-    Ue(this._injector, [
-      [tt],
-      [Ze],
+    Fe(this._injector, [
+      [at],
       [Je],
-      [je],
-      [Qe]
-    ]), Ht() && Ue(this._injector, [
+      [et],
+      [ze],
+      [$e]
+    ]), Ht() && Fe(this._injector, [
       [_e]
     ]);
   }
   onRendered() {
-    Ue(this._injector, [
-      [et]
-    ]), Ht() || Ue(this._injector, [
+    Fe(this._injector, [
+      [tt]
+    ]), Ht() || Fe(this._injector, [
       [_e]
     ]);
   }
 };
-ft(it, "pluginName", Dr);
-ft(it, "type", te.UNIVER_SHEET);
-it = wa([
+ft(rt, "pluginName", Dr);
+ft(rt, "type", te.UNIVER_SHEET);
+rt = wa([
   da(ga, Rn),
-  at(1, X(rt)),
-  at(2, De)
-], it);
+  nt(1, X(ot)),
+  nt(2, Ce)
+], rt);
 export {
   Le as CalculationMode,
   bt as DescriptionService,
@@ -16242,16 +16238,16 @@ export {
   Cr as IRegisterFunctionService,
   Ha as IRemoteRegisterFunctionService,
   ei as InsertFunctionCommand,
-  Me as OtherFormulaMarkDirty,
-  ge as PLUGIN_CONFIG_KEY_BASE,
+  Oe as OtherFormulaMarkDirty,
+  he as PLUGIN_CONFIG_KEY_BASE,
   ti as QuickSumCommand,
   Mt as RegisterFunctionService,
-  $e as RegisterOtherFormulaService,
-  ze as RemoteRegisterFunctionService,
+  je as RegisterOtherFormulaService,
+  Ze as RemoteRegisterFunctionService,
   _e as TriggerCalculationController,
-  nt as UniverRemoteSheetsFormulaPlugin,
-  it as UniverSheetsFormulaPlugin,
-  Qe as UpdateDefinedNameController,
-  je as UpdateFormulaController,
+  it as UniverRemoteSheetsFormulaPlugin,
+  rt as UniverSheetsFormulaPlugin,
+  $e as UpdateDefinedNameController,
+  ze as UpdateFormulaController,
   Xr as calculateFormula
 };