@univerjs/sheets-formula 0.5.5 → 0.6.0-alpha.0

package/lib/es/index.js

@@ -3,31 +3,36 @@ var Ya = (n, e, a) => e in n ? Ha(n, e, { enumerable: !0, configurable: !0, writ
 var X = (n, e, a) => Ya(n, typeof e != "symbol" ? e + "" : e, a);
 import { CommandType as ma, ICommandService as de, ObjectMatrix as w, Tools as Ne, Rectangle as De, cellToRange as fa, Direction as He, isFormulaString as be, isFormulaId as ca, getIntersectRange as Ve, RANGE_TYPE as Y, Inject as W, Disposable as te, UniverInstanceType as ee, IUniverInstanceService as xe, LifecycleService as wa, LocaleService as Ot, ILogService as Xa, IConfigService as _e, Injector as at, createIdentifier as Mt, toDisposable as se, moveRangeByOffset as Et, DisposableCollection as Ye, AbsoluteRefType as we, Optional as Wa, Dimension as Bt, InterceptorEffectEnum as Ka, CellValueType as vt, isRealNum as Qa, DependentOn as la, Plugin as sa, merge as pa, touchDependencies as qe, isNodeEnv as Vt } from "@univerjs/core";
 import { SetRangeValuesCommand as ka, SetRangeValuesMutation as ie, handleMoveRange as da, EffectRefRangId as G, runRefRangeMutations as H, handleMoveRows as La, handleMoveCols as Pa, handleInsertRow as Ta, handleInsertCol as Ea, handleIRemoveRow as Ia, handleIRemoveCol as Na, handleDeleteRangeMoveLeft as Ra, handleDeleteRangeMoveUp as Aa, handleInsertRangeMoveDown as Sa, handleInsertRangeMoveRight as Ca, RemoveDefinedNameCommand as Da, SetDefinedNameCommand as ba, RemoveSheetCommand as $a, SetWorksheetNameCommand as ja, DeleteRangeMoveLeftCommand as za, DeleteRangeMoveUpCommand as Za, RemoveColCommand as Ja, RemoveRowCommand as en, InsertRangeMoveDownCommand as tn, InsertRangeMoveRightCommand as an, InsertColCommand as nn, InsertRowCommand as rn, MoveColsCommand as on, MoveRowsCommand as un, MoveRangeCommand as mn, SheetInterceptorService as xt, SetStyleCommand as _t, SetBorderCommand as Oa, ClearSelectionFormatCommand as Ma, RemoveSheetMutation as It, InsertSheetMutation as Nt, RefRangeService as fn, handleDefaultRangeChangeWithEffectRefCommands as Gt, getSeparateEffectedRangesOnCommand as cn, handleCommonDefaultRangeChangeWithEffectRefCommands as ln, MoveRangeMutation as Ht, MoveRowsMutation as Yt, MoveColsMutation as wt, ReorderRangeMutation as Xt, RemoveRowMutation as Wt, RemoveColMutation as Kt, InsertColMutation as Qt, InsertRowMutation as kt, INTERCEPTOR_POINT as sn, SetWorksheetActiveOperation as pn, SCOPE_WORKBOOK_VALUE_DEFINED_NAME as mt, UniverSheetsPlugin as dn } from "@univerjs/sheets";
-import { sequenceNodeType as J, deserializeRangeWithSheetWithCache as pe, serializeRangeToRefString as nt, ErrorType as j, LexerTreeBuilder as yt, generateStringWithSequence as Xe, SetDefinedNameMutation as Me, IDefinedNamesService as qt, SetFormulaCalculationResultMutation as Ln, RemoveOtherFormulaMutation as Pn, IActiveDirtyManagerService as gt, SetOtherFormulaMutation as Tn, FormulaDataModel as it, SetFormulaCalculationStartMutation as Se, SetFormulaCalculationStopMutation as $t, ENGINE_FORMULA_CYCLE_REFERENCE_COUNT as jt, SetFormulaCalculationNotificationMutation as En, FormulaExecuteStageType as ge, FormulaExecutedStateType as Re, SetFormulaDataMutation as he, SetArrayFormulaDataMutation as Rt, initSheetFormulaData as zt, FUNCTION_NAMES_ARRAY as Zt, FunctionType as t, FUNCTION_NAMES_COMPATIBILITY as _, FUNCTION_NAMES_CUBE as ce, FUNCTION_NAMES_DATABASE as $, FUNCTION_NAMES_DATE as B, FUNCTION_NAMES_ENGINEERING as A, FUNCTION_NAMES_FINANCIAL as C, FUNCTION_NAMES_INFORMATION as v, FUNCTION_NAMES_LOGICAL as K, FUNCTION_NAMES_LOOKUP as y, FUNCTION_NAMES_MATH as T, FUNCTION_NAMES_STATISTICAL as l, FUNCTION_NAMES_TEXT as D, FUNCTION_NAMES_WEB as ft, isReferenceStrings as In, functionArray as Nn, functionCompatibility as Rn, functionCube as An, functionDatabase as Sn, functionDate as Cn, functionEngineering as Dn, functionFinancial as bn, functionInformation as On, functionLogical as Mn, functionLookup as xn, functionMath as _n, functionMeta as yn, functionStatistical as qn, functionText as gn, functionUniver as hn, functionWeb as Un, IFunctionService as ht, serializeRangeWithSpreadsheet as Jt, serializeRangeWithSheet as ea, serializeRange as ta, CustomFunction as At, AsyncCustomFunction as xa, RemoveDefinedNameMutation as St, stripErrorMargin as Fn, UniverFormulaEnginePlugin as _a } from "@univerjs/engine-formula";
+import { sequenceNodeType as J, deserializeRangeWithSheetWithCache as pe, serializeRangeToRefString as nt, ErrorType as j, LexerTreeBuilder as yt, generateStringWithSequence as Xe, SetDefinedNameMutation as Me, IDefinedNamesService as qt, SetFormulaCalculationResultMutation as Ln, RemoveOtherFormulaMutation as Pn, IActiveDirtyManagerService as gt, SetOtherFormulaMutation as Tn, FormulaDataModel as it, SetFormulaCalculationStartMutation as Se, SetFormulaCalculationStopMutation as $t, ENGINE_FORMULA_CYCLE_REFERENCE_COUNT as jt, SetFormulaCalculationNotificationMutation as En, FormulaExecuteStageType as ge, FormulaExecutedStateType as Re, SetFormulaDataMutation as he, SetArrayFormulaDataMutation as Rt, initSheetFormulaData as zt, FUNCTION_NAMES_ARRAY as Zt, FunctionType as t, FUNCTION_NAMES_COMPATIBILITY as _, FUNCTION_NAMES_CUBE as ce, FUNCTION_NAMES_DATABASE as $, FUNCTION_NAMES_DATE as B, FUNCTION_NAMES_ENGINEERING as A, FUNCTION_NAMES_FINANCIAL as C, FUNCTION_NAMES_INFORMATION as v, FUNCTION_NAMES_LOGICAL as K, FUNCTION_NAMES_LOOKUP as y, FUNCTION_NAMES_MATH as T, FUNCTION_NAMES_STATISTICAL as s, FUNCTION_NAMES_TEXT as D, FUNCTION_NAMES_WEB as ft, isReferenceStrings as In, functionArray as Nn, functionCompatibility as Rn, functionCube as An, functionDatabase as Sn, functionDate as Cn, functionEngineering as Dn, functionFinancial as bn, functionInformation as On, functionLogical as Mn, functionLookup as xn, functionMath as _n, functionMeta as yn, functionStatistical as qn, functionText as gn, functionUniver as hn, functionWeb as Un, IFunctionService as ht, serializeRangeWithSpreadsheet as Jt, serializeRangeWithSheet as ea, serializeRange as ta, CustomFunction as At, AsyncCustomFunction as xa, RemoveDefinedNameMutation as St, stripErrorMargin as Fn, UniverFormulaEnginePlugin as _a } from "@univerjs/engine-formula";
 import { Subject as aa, BehaviorSubject as ya, bufferWhen as Bn, filter as na, map as vn } from "rxjs";
 import { IRPCChannelService as qa, fromModule as Vn, toModule as Gn } from "@univerjs/rpc";
 const Hn = {
   id: "formula.command.insert-function",
   type: ma.COMMAND,
   handler: async (n, e) => {
-    const { list: a } = e, i = n.get(de), r = new w();
-    a.forEach((u) => {
-      const { range: m, primary: f, formula: s } = u, { row: p, column: d } = f, L = Ne.generateRandomId(6);
-      r.setValue(p, d, {
-        f: s,
-        si: L
+    const { list: a, listOfRangeHasNumber: i } = e, r = n.get(de), o = new w();
+    a.forEach((m) => {
+      const { range: f, primary: l, formula: p } = m, { row: L, column: P } = l, E = Ne.generateRandomId(6);
+      o.setValue(L, P, {
+        f: p,
+        si: E
       });
-      const { startRow: E, startColumn: I, endRow: S, endColumn: c } = m;
-      for (let N = E; N <= S; N++)
-        for (let R = I; R <= c; R++)
-          (N !== p || R !== d) && r.setValue(N, R, {
-            si: L
+      const { startRow: I, startColumn: S, endRow: c, endColumn: N } = f;
+      for (let R = I; R <= c; R++)
+        for (let d = S; d <= N; d++)
+          (R !== L || d !== P) && o.setValue(R, d, {
+            si: E
           });
+    }), i && i.length > 0 && i.forEach((m) => {
+      const { primary: f, formula: l } = m;
+      o.setValue(f.row, f.column, {
+        f: l
+      });
     });
-    const o = {
-      value: r.getData()
+    const u = {
+      value: o.getData()
     };
-    return i.executeCommand(ka.id, o);
+    return r.executeCommand(ka.id, u);
   }
 }, Ge = {
   type: ma.MUTATION,
@@ -73,27 +78,27 @@ function Wn(n, e) {
     if (o == null || u == null)
       return !0;
     Object.keys(o).forEach((m) => {
-      const f = new w(o[m] || {}), s = new w(u[m] || {}), p = new w(), d = new w();
+      const f = new w(o[m] || {}), l = new w(u[m] || {}), p = new w(), L = new w();
       if (f.forValue((c, N, R) => {
         if (R == null)
           return !0;
-        const P = rt(R);
-        P !== null && (p.setValue(c, N, P), d.setValue(c, N, s.getValue(c, N)));
+        const d = rt(R);
+        d !== null && (p.setValue(c, N, d), L.setValue(c, N, l.getValue(c, N)));
       }), p.getSizeOf() === 0)
         return;
-      const L = {
+      const P = {
         subUnitId: m,
         unitId: r,
         cellValue: p.getMatrix()
       }, E = {
         id: ie.id,
-        params: L
+        params: P
       };
       i.push(E);
       const I = {
         subUnitId: m,
         unitId: r,
-        cellValue: d.getMatrix()
+        cellValue: L.getMatrix()
       }, S = {
         id: ie.id,
         params: I
@@ -116,13 +121,13 @@ function Kn(n, e, a) {
   return Object.keys(i).forEach((m) => {
     Object.keys(i[m]).forEach((f) => {
       if (Object.keys(i[m][f]).length !== 0) {
-        const s = {
+        const l = {
           subUnitId: f,
           unitId: m,
           cellValue: i[m][f]
         }, p = {
           id: ie.id,
-          params: s
+          params: l
         };
         o.push(p);
       }
@@ -130,13 +135,13 @@ function Kn(n, e, a) {
   }), Object.keys(r).forEach((m) => {
     Object.keys(r[m]).forEach((f) => {
       if (Object.keys(r[m][f]).length !== 0) {
-        const s = {
+        const l = {
           subUnitId: f,
           unitId: m,
           cellValue: r[m][f]
         }, p = {
           id: ie.id,
-          params: s
+          params: l
         };
         u.push(p);
       }
@@ -147,24 +152,24 @@ function Kn(n, e, a) {
   };
 }
 function Qn(n, e, a) {
-  const i = {}, r = {}, { type: o, unitId: u, sheetId: m, range: f, from: s, to: p } = a;
-  return (/* @__PURE__ */ new Set([...Object.keys(n), ...Object.keys(e)])).forEach((L) => {
-    if (Yn(n, L, m))
+  const i = {}, r = {}, { type: o, unitId: u, sheetId: m, range: f, from: l, to: p } = a;
+  return (/* @__PURE__ */ new Set([...Object.keys(n), ...Object.keys(e)])).forEach((P) => {
+    if (Yn(n, P, m))
       return;
     (/* @__PURE__ */ new Set([
-      ...Object.keys(n[L] || {}),
-      ...Object.keys(e[L] || {})
+      ...Object.keys(n[P] || {}),
+      ...Object.keys(e[P] || {})
     ])).forEach((I) => {
       var F, U;
-      const S = (F = n[L]) == null ? void 0 : F[I], c = (U = e[L]) == null ? void 0 : U[I], N = new w(S || {}), R = new w(c || {});
-      let P = [];
-      L !== u || I !== m ? P = $n(R) : P = kn(N, o, s, p, f);
-      const O = fi(P, N, R), M = ci(P, N);
-      i[L] || (i[L] = {}), r[L] || (r[L] = {}), i[L][I] = {
-        ...i[L][I],
+      const S = (F = n[P]) == null ? void 0 : F[I], c = (U = e[P]) == null ? void 0 : U[I], N = new w(S || {}), R = new w(c || {});
+      let d = [];
+      P !== u || I !== m ? d = $n(R) : d = kn(N, o, l, p, f);
+      const O = fi(d, N, R), M = ci(d, N);
+      i[P] || (i[P] = {}), r[P] || (r[P] = {}), i[P][I] = {
+        ...i[P][I],
         ...O
-      }, r[L][I] = {
-        ...r[L][I],
+      }, r[P][I] = {
+        ...r[P][I],
         ...M
       };
     });
@@ -177,20 +182,20 @@ function kn(n, e, a, i, r) {
   const o = [];
   return n.forValue((u, m, f) => {
     if (f == null || !ga(f)) return !0;
-    const s = fa(u, m);
-    let p = null, d = !1;
+    const l = fa(u, m);
+    let p = null, L = !1;
     if ([
       0,
       1,
       2
       /* MoveCols */
     ].includes(e))
-      p = jn(e, a, i, s);
+      p = jn(e, a, i, l);
     else if (r != null) {
-      const L = zn(e, r, s);
-      p = L.newCell, d = L.isReverse;
+      const P = zn(e, r, l);
+      p = P.newCell, L = P.isReverse;
     }
-    d ? o.unshift({ oldCell: s, newCell: p }) : o.push({ oldCell: s, newCell: p });
+    L ? o.unshift({ oldCell: l, newCell: p }) : o.push({ oldCell: l, newCell: p });
   }), o;
 }
 function $n(n) {
@@ -358,22 +363,22 @@ function mi(n, e) {
 function fi(n, e, a) {
   const i = new w({});
   return n.forEach((r) => {
-    const { oldCell: o, newCell: u } = r, { startRow: m, startColumn: f } = o, s = a.getValue(m, f) || e.getValue(m, f), p = rt(s);
+    const { oldCell: o, newCell: u } = r, { startRow: m, startColumn: f } = o, l = a.getValue(m, f) || e.getValue(m, f), p = rt(l);
     if (i.setValue(m, f, { f: null, si: null }), u) {
-      const { startRow: d, startColumn: L } = u;
-      i.setValue(d, L, p);
+      const { startRow: L, startColumn: P } = u;
+      i.setValue(L, P, p);
     }
   }), i.getMatrix();
 }
 function ci(n, e) {
   const a = new w({});
   return n.reverse().forEach((i) => {
-    const { oldCell: r, newCell: o } = i, { startRow: u, startColumn: m } = r, f = e.getValue(u, m), s = rt(f);
+    const { oldCell: r, newCell: o } = i, { startRow: u, startColumn: m } = r, f = e.getValue(u, m), l = rt(f);
     if (o) {
-      const { startRow: p, startColumn: d } = o;
-      a.setValue(p, d, { f: null, si: null });
+      const { startRow: p, startColumn: L } = o;
+      a.setValue(p, L, { f: null, si: null });
     }
-    a.setValue(u, m, s);
+    a.setValue(u, m, l);
   }), a.getMatrix();
 }
 function rt(n) {
@@ -415,23 +420,23 @@ function Ua(n, e, a = 0, i = 0) {
       r.push(m);
       continue;
     }
-    const { token: f } = m, s = pe(f), { range: p, sheetName: d, unitId: L } = s, E = De.moveOffset(p, a, i);
+    const { token: f } = m, l = pe(f), { range: p, sheetName: L, unitId: P } = l, E = De.moveOffset(p, a, i);
     r.push({
       ...m,
       token: nt({
         range: E,
-        unitId: L,
-        sheetName: d
+        unitId: P,
+        sheetName: L
       })
     });
   }
   return r;
 }
 function Fa(n, e, a, i) {
-  const { type: r, unitId: o, sheetId: u, range: m, from: f, to: s } = e, {
+  const { type: r, unitId: o, sheetId: u, range: m, from: f, to: l } = e, {
     range: p,
-    sheetId: d,
-    unitId: L,
+    sheetId: L,
+    unitId: P,
     sheetName: E,
     refOffsetX: I,
     refOffsetY: S
@@ -441,33 +446,33 @@ function Fa(n, e, a, i) {
     u,
     a,
     i,
-    L,
-    d
+    P,
+    L
   ))
     return;
   const c = De.moveOffset(p, I, S);
   let N = null;
   if (r === q.MoveRange) {
-    if (f == null || s == null)
+    if (f == null || l == null)
       return;
-    const R = st(c, f), P = Ve(c, f);
-    if (P == null || R !== 4)
+    const R = st(c, f), d = Ve(c, f);
+    if (d == null || R !== 4)
       return;
     const O = da(
-      { id: G.MoveRangeCommandId, params: { toRange: s, fromRange: f } },
-      P
-    ), M = H(O, P);
+      { id: G.MoveRangeCommandId, params: { toRange: l, fromRange: f } },
+      d
+    ), M = H(O, d);
     if (M == null)
       return j.REF;
-    N = lt(R, M, f, s, c, P);
+    N = lt(R, M, f, l, c, d);
   } else if (r === q.MoveRows) {
-    if (f == null || s == null)
+    if (f == null || l == null)
       return;
     const R = st(c, f);
-    let P = Ve(c, f);
-    if (P == null && (f.endRow < c.startRow && s.endRow < c.startRow || f.startRow > c.endRow && s.startRow > c.endRow))
+    let d = Ve(c, f);
+    if (d == null && (f.endRow < c.startRow && l.endRow < c.startRow || f.startRow > c.endRow && l.startRow > c.endRow))
       return;
-    P == null && (P = {
+    d == null && (d = {
       startRow: c.startRow,
       endRow: c.endRow,
       startColumn: c.startColumn,
@@ -475,20 +480,20 @@ function Fa(n, e, a, i) {
       rangeType: Y.NORMAL
     });
     const O = La(
-      { id: G.MoveRowsCommandId, params: { toRange: s, fromRange: f } },
-      P
-    ), M = H(O, P);
+      { id: G.MoveRowsCommandId, params: { toRange: l, fromRange: f } },
+      d
+    ), M = H(O, d);
     if (M == null)
       return j.REF;
-    N = lt(R, M, f, s, c, P);
+    N = lt(R, M, f, l, c, d);
   } else if (r === q.MoveCols) {
-    if (f == null || s == null)
+    if (f == null || l == null)
       return;
     const R = st(c, f);
-    let P = Ve(c, f);
-    if (P == null && (f.endColumn < c.startColumn && s.endColumn < c.startColumn || f.startColumn > c.endColumn && s.startColumn > c.endColumn))
+    let d = Ve(c, f);
+    if (d == null && (f.endColumn < c.startColumn && l.endColumn < c.startColumn || f.startColumn > c.endColumn && l.startColumn > c.endColumn))
       return;
-    P == null && (P = {
+    d == null && (d = {
       startRow: c.startRow,
       endRow: c.endRow,
       startColumn: c.startColumn,
@@ -496,12 +501,12 @@ function Fa(n, e, a, i) {
       rangeType: Y.NORMAL
     });
     const O = Pa(
-      { id: G.MoveColsCommandId, params: { toRange: s, fromRange: f } },
-      P
-    ), M = H(O, P);
+      { id: G.MoveColsCommandId, params: { toRange: l, fromRange: f } },
+      d
+    ), M = H(O, d);
     if (M == null)
       return j.REF;
-    N = lt(R, M, f, s, c, P);
+    N = lt(R, M, f, l, c, d);
   }
   if (m != null) {
     if (r === q.InsertRow) {
@@ -511,12 +516,12 @@ function Fa(n, e, a, i) {
           params: { range: m, unitId: "", subUnitId: "", direction: He.DOWN }
         },
         c
-      ), P = H(R, c);
-      if (P == null)
+      ), d = H(R, c);
+      if (d == null)
         return;
       N = {
         ...c,
-        ...P
+        ...d
       };
     } else if (r === q.InsertColumn) {
       const R = Ea(
@@ -525,12 +530,12 @@ function Fa(n, e, a, i) {
           params: { range: m, unitId: "", subUnitId: "", direction: He.RIGHT }
         },
         c
-      ), P = H(R, c);
-      if (P == null)
+      ), d = H(R, c);
+      if (d == null)
         return;
       N = {
         ...c,
-        ...P
+        ...d
       };
     } else if (r === q.RemoveRow) {
       const R = Ia(
@@ -539,12 +544,12 @@ function Fa(n, e, a, i) {
           params: { range: m }
         },
         c
-      ), P = H(R, c);
-      if (P == null)
+      ), d = H(R, c);
+      if (d == null)
         return j.REF;
       N = {
         ...c,
-        ...P
+        ...d
       };
     } else if (r === q.RemoveColumn) {
       const R = Na(
@@ -553,12 +558,12 @@ function Fa(n, e, a, i) {
           params: { range: m }
         },
         c
-      ), P = H(R, c);
-      if (P == null)
+      ), d = H(R, c);
+      if (d == null)
         return j.REF;
       N = {
         ...c,
-        ...P
+        ...d
       };
     } else if (r === q.DeleteMoveLeft) {
       const R = Ra(
@@ -567,12 +572,12 @@ function Fa(n, e, a, i) {
           params: { range: m }
         },
         c
-      ), P = H(R, c);
-      if (P == null)
+      ), d = H(R, c);
+      if (d == null)
         return j.REF;
       N = {
         ...c,
-        ...P
+        ...d
       };
     } else if (r === q.DeleteMoveUp) {
       const R = Aa(
@@ -581,12 +586,12 @@ function Fa(n, e, a, i) {
           params: { range: m }
         },
         c
-      ), P = H(R, c);
-      if (P == null)
+      ), d = H(R, c);
+      if (d == null)
         return j.REF;
       N = {
         ...c,
-        ...P
+        ...d
       };
     } else if (r === q.InsertMoveDown) {
       const R = Sa(
@@ -595,12 +600,12 @@ function Fa(n, e, a, i) {
           params: { range: m }
         },
         c
-      ), P = H(R, c);
-      if (P == null)
+      ), d = H(R, c);
+      if (d == null)
         return;
       N = {
         ...c,
-        ...P
+        ...d
       };
     } else if (r === q.InsertMoveRight) {
       const R = Ca(
@@ -609,12 +614,12 @@ function Fa(n, e, a, i) {
           params: { range: m }
         },
         c
-      ), P = H(R, c);
-      if (P == null)
+      ), d = H(R, c);
+      if (d == null)
         return;
       N = {
         ...c,
-        ...P
+        ...d
       };
     }
   }
@@ -622,17 +627,17 @@ function Fa(n, e, a, i) {
     return nt({
       range: N,
       sheetName: E,
-      unitId: L
+      unitId: P
     });
 }
 function lt(n, e, a, i, r, o) {
-  const { startRow: u, endRow: m, startColumn: f, endColumn: s, rangeType: p } = Ae(e), {
-    startRow: d,
-    startColumn: L,
+  const { startRow: u, endRow: m, startColumn: f, endColumn: l, rangeType: p } = Ae(e), {
+    startRow: L,
+    startColumn: P,
     endRow: E,
     endColumn: I,
     rangeType: S = Y.NORMAL
-  } = Ae(a), { startRow: c, startColumn: N, endRow: R, endColumn: P } = Ae(i), {
+  } = Ae(a), { startRow: c, startColumn: N, endRow: R, endColumn: d } = Ae(i), {
     startRow: O,
     endRow: M,
     startColumn: F,
@@ -645,7 +650,7 @@ function lt(n, e, a, i, r, o) {
     rangeType: k = Y.NORMAL
   } = Ae(r), b = { ...r };
   function Le() {
-    return p === Y.COLUMN && k === Y.COLUMN ? !0 : f >= h && s <= V;
+    return p === Y.COLUMN && k === Y.COLUMN ? !0 : f >= h && l <= V;
   }
   function ae() {
     return p === Y.ROW && k === Y.ROW ? !0 : u >= g && m <= x;
@@ -665,7 +670,7 @@ function lt(n, e, a, i, r, o) {
       if (m > x)
         b.endRow = m;
       else if (m <= g)
-        b.startRow += x - d + 1;
+        b.startRow += x - L + 1;
       else
         return;
     else
@@ -682,29 +687,29 @@ function lt(n, e, a, i, r, o) {
       return;
   else if (n === 3)
     if (ae())
-      if (s > V)
-        b.endColumn = s;
-      else if (s <= h)
-        b.startColumn += V - L + 1;
+      if (l > V)
+        b.endColumn = l;
+      else if (l <= h)
+        b.startColumn += V - P + 1;
       else
         return;
     else
       return;
-  else n === 4 ? (b.startRow = u, b.startColumn = f, b.endRow = m, b.endColumn = s) : L <= h && I >= V || S === Y.ROW && k === Y.ROW ? a.endRow < g ? (c >= g && (b.startRow -= E - d + 1), c >= x && (b.endRow -= E - d + 1)) : a.startRow > x ? (R <= x && (b.endRow += E - d + 1), R <= g && (b.startRow += E - d + 1)) : a.startRow >= g && a.endRow <= x && (c <= g ? b.startRow += E - d + 1 : c >= x && (b.endRow -= E - d + 1)) : d <= g && E >= x || S === Y.COLUMN && k === Y.COLUMN ? a.endColumn < h ? (N >= h && (b.startColumn -= I - L + 1), N >= V && (b.endColumn -= I - L + 1)) : a.startColumn > V ? (P <= V && (b.endColumn += I - L + 1), P <= h && (b.startColumn += I - L + 1)) : a.startColumn >= h && a.endColumn <= V && (N <= h ? b.startColumn += I - L + 1 : N >= V && (b.endColumn -= I - L + 1)) : ((N <= U + 1 && P >= V || N <= h && P >= F - 1) && c <= g && R >= x || (c <= M + 1 && R >= x || c <= g && R >= O - 1) && N <= h && P >= V, b.startRow = u, b.startColumn = f, b.endRow = m, b.endColumn = s);
+  else n === 4 ? (b.startRow = u, b.startColumn = f, b.endRow = m, b.endColumn = l) : P <= h && I >= V || S === Y.ROW && k === Y.ROW ? a.endRow < g ? (c >= g && (b.startRow -= E - L + 1), c >= x && (b.endRow -= E - L + 1)) : a.startRow > x ? (R <= x && (b.endRow += E - L + 1), R <= g && (b.startRow += E - L + 1)) : a.startRow >= g && a.endRow <= x && (c <= g ? b.startRow += E - L + 1 : c >= x && (b.endRow -= E - L + 1)) : L <= g && E >= x || S === Y.COLUMN && k === Y.COLUMN ? a.endColumn < h ? (N >= h && (b.startColumn -= I - P + 1), N >= V && (b.endColumn -= I - P + 1)) : a.startColumn > V ? (d <= V && (b.endColumn += I - P + 1), d <= h && (b.startColumn += I - P + 1)) : a.startColumn >= h && a.endColumn <= V && (N <= h ? b.startColumn += I - P + 1 : N >= V && (b.endColumn -= I - P + 1)) : ((N <= U + 1 && d >= V || N <= h && d >= F - 1) && c <= g && R >= x || (c <= M + 1 && R >= x || c <= g && R >= O - 1) && N <= h && d >= V, b.startRow = u, b.startColumn = f, b.endRow = m, b.endColumn = l);
   return b;
 }
 function st(n, e) {
-  const a = Ee(n.startRow), i = Ie(n.endRow), r = Ee(n.startColumn), o = Ie(n.endColumn), u = Ee(e.startRow), m = Ie(e.endRow), f = Ee(e.startColumn), s = Ie(e.endColumn);
+  const a = Ee(n.startRow), i = Ie(n.endRow), r = Ee(n.startColumn), o = Ie(n.endColumn), u = Ee(e.startRow), m = Ie(e.endRow), f = Ee(e.startColumn), l = Ie(e.endColumn);
   function p() {
     return n.rangeType === Y.COLUMN && e.rangeType === Y.COLUMN ? !0 : a >= u && i <= m;
   }
-  function d() {
-    return n.rangeType === Y.ROW && e.rangeType === Y.ROW ? !0 : r >= f && o <= s;
-  }
   function L() {
+    return n.rangeType === Y.ROW && e.rangeType === Y.ROW ? !0 : r >= f && o <= l;
+  }
+  function P() {
     return n.rangeType === Y.ALL && e.rangeType === Y.ALL;
   }
-  return p() && d() || L() ? 4 : d() && a >= u && a <= m && i > m ? 0 : d() && i >= u && i <= m && a < u ? 1 : p() && r >= f && r <= s && o > s ? 2 : p() && o >= f && o <= s && r < f ? 3 : null;
+  return p() && L() || P() ? 4 : L() && a >= u && a <= m && i > m ? 0 : L() && i >= u && i <= m && a < u ? 1 : p() && r >= f && r <= l && o > l ? 2 : p() && o >= f && o <= l && r < f ? 3 : null;
 }
 function Ee(n) {
   return isNaN(n) ? -1 / 0 : n;
@@ -804,13 +809,13 @@ function pi(n, e) {
     toRange: { startRow: o, endRow: u }
   } = a, m = e.getUnitId(), f = e.getActiveSheet();
   if (!f) return null;
-  const s = f.getSheetId(), p = {
+  const l = f.getSheetId(), p = {
     startRow: i,
     startColumn: 0,
     endRow: r,
     endColumn: f.getColumnCount() - 1,
     rangeType: Y.ROW
-  }, d = {
+  }, L = {
     startRow: o,
     startColumn: 0,
     endRow: u,
@@ -820,9 +825,9 @@ function pi(n, e) {
   return {
     type: q.MoveRows,
     from: p,
-    to: d,
+    to: L,
     unitId: m,
-    sheetId: s
+    sheetId: l
   };
 }
 function di(n, e) {
@@ -833,13 +838,13 @@ function di(n, e) {
     toRange: { startColumn: o, endColumn: u }
   } = a, m = e.getUnitId(), f = e.getActiveSheet();
   if (!f) return null;
-  const s = f.getSheetId(), p = {
+  const l = f.getSheetId(), p = {
     startRow: 0,
     startColumn: i,
     endRow: f.getRowCount() - 1,
     endColumn: r,
     rangeType: Y.COLUMN
-  }, d = {
+  }, L = {
     startRow: 0,
     startColumn: o,
     endRow: f.getRowCount() - 1,
@@ -849,9 +854,9 @@ function di(n, e) {
   return {
     type: q.MoveCols,
     from: p,
-    to: d,
+    to: L,
     unitId: m,
-    sheetId: s
+    sheetId: l
   };
 }
 function Li(n) {
@@ -1034,16 +1039,16 @@ let We = class extends te {
     const u = [], m = [];
     return Object.values(o).forEach((f) => {
       var c;
-      const { formulaOrRefString: s } = f, p = this._lexerTreeBuilder.sequenceNodesBuilder(s);
+      const { formulaOrRefString: l } = f, p = this._lexerTreeBuilder.sequenceNodesBuilder(l);
       if (p == null)
         return !0;
-      let d = !1;
-      const L = [];
+      let L = !1;
+      const P = [];
       for (let N = 0, R = p.length; N < R; N++) {
-        const P = p[N];
-        if (typeof P == "string" || P.nodeType !== J.REFERENCE)
+        const d = p[N];
+        if (typeof d == "string" || d.nodeType !== J.REFERENCE)
           continue;
-        const { token: O } = P, M = pe(O), { range: F, sheetName: U, unitId: g } = M, x = ((c = n.getSheetBySheetName(U)) == null ? void 0 : c.getSheetId()) || "", h = {
+        const { token: O } = d, M = pe(O), { range: F, sheetName: U, unitId: g } = M, x = ((c = n.getSheetBySheetName(U)) == null ? void 0 : c.getSheetId()) || "", h = {
           range: F,
           sheetId: x,
           unitId: g,
@@ -1074,13 +1079,13 @@ let We = class extends te {
             r
           );
         V != null && (p[N] = {
-          ...P,
+          ...d,
           token: V
-        }, d = !0, L.push(N));
+        }, L = !0, P.push(N));
       }
-      if (!d)
+      if (!L)
         return !0;
-      const E = Xe(Ua(p, L)), I = {
+      const E = Xe(Ua(p, P)), I = {
         id: Me.id,
         params: {
           unitId: i,
@@ -1159,7 +1164,7 @@ let Ke = class extends te {
       const { unitId: i, subUnitId: r, formulaText: o, formulaId: u, ranges: m } = a;
       if (!this._ensureCacheMap(i, r).has(u))
         return;
-      const s = {
+      const l = {
         unitId: i,
         subUnitId: r,
         formulaMap: {
@@ -1169,7 +1174,7 @@ let Ke = class extends te {
           }
         }
       };
-      this._commandService.executeCommand(Tn.id, s).then(() => {
+      this._commandService.executeCommand(Tn.id, l).then(() => {
         this._commandService.executeCommand(
           Ge.id,
           { [i]: { [r]: { [u]: !0 } } }
@@ -1190,21 +1195,21 @@ let Ke = class extends te {
           const u = i[o], m = {};
           r[o] = m;
           for (const f in u) {
-            const s = this._ensureCacheMap(o, f), p = u[f], d = [];
-            m[f] = d;
-            for (const L in p) {
-              const E = p[L];
-              if (s.has(L)) {
-                const I = s.get(L);
+            const l = this._ensureCacheMap(o, f), p = u[f], L = [];
+            m[f] = L;
+            for (const P in p) {
+              const E = p[P];
+              if (l.has(P)) {
+                const I = l.get(P);
                 if (!I)
                   continue;
                 I.result || (I.result = {});
                 const S = new w(E), c = new w(I.result);
-                S.forValue((N, R, P) => {
-                  c.setValue(N, R, P);
+                S.forValue((N, R, d) => {
+                  c.setValue(N, R, d);
                 }), I.status = Ce.SUCCESS, I.callbacks.forEach((N) => {
                   N(E);
-                }), I.callbacks.clear(), d.push(I);
+                }), I.callbacks.clear(), L.push(I);
               }
             }
           }
@@ -1267,7 +1272,7 @@ var hi = Object.defineProperty, Ui = Object.getOwnPropertyDescriptor, Fi = (n, e
 const oa = { done: 0, count: 0 }, dt = { onlyLocal: !0 };
 let Oe = class extends te {
   constructor(e, a, i, r, o, u, m) {
-    var s;
+    var l;
     super();
     X(this, "_waitingCommandQueue", []);
     X(this, "_executingDirtyData", {
@@ -1294,7 +1299,7 @@ let Oe = class extends te {
     X(this, "progress$", this._progress$.asObservable());
     this._commandService = e, this._activeDirtyManagerService = a, this._logService = i, this._configService = r, this._formulaDataModel = o, this._localeService = u, this._registerOtherFormulaService = m;
     const f = this._configService.getConfig(ot);
-    this._calculationMode = (s = f == null ? void 0 : f.initialFormulaComputing) != null ? s : ne.WHEN_EMPTY, this._commandExecutedListener(), this._initialExecuteFormulaProcessListener(), this._initialExecuteFormula();
+    this._calculationMode = (l = f == null ? void 0 : f.initialFormulaComputing) != null ? l : ne.WHEN_EMPTY, this._commandExecutedListener(), this._initialExecuteFormulaProcessListener(), this._initialExecuteFormula();
   }
   _emitProgress(e) {
     this._progress$.next({ done: this._doneCalculationTaskCount, count: this._totalCalculationTaskCount, label: e });
@@ -1343,11 +1348,11 @@ let Oe = class extends te {
   _generateDirty(e) {
     const a = [], i = {}, r = {}, o = {}, u = {}, m = {};
     for (const f of e) {
-      const s = this._activeDirtyManagerService.get(f.id);
-      if (s == null)
+      const l = this._activeDirtyManagerService.get(f.id);
+      if (l == null)
         continue;
-      const p = s.getDirtyData(f), { dirtyRanges: d, dirtyNameMap: L, dirtyDefinedNameMap: E, dirtyUnitFeatureMap: I, dirtyUnitOtherFormulaMap: S, clearDependencyTreeCache: c } = p;
-      d != null && this._mergeDirtyRanges(a, d), L != null && this._mergeDirtyNameMap(i, L), E != null && this._mergeDirtyNameMap(r, E), I != null && this._mergeDirtyUnitFeatureOrOtherFormulaMap(o, I), S != null && this._mergeDirtyUnitFeatureOrOtherFormulaMap(u, S), c != null && this._mergeDirtyNameMap(m, c);
+      const p = l.getDirtyData(f), { dirtyRanges: L, dirtyNameMap: P, dirtyDefinedNameMap: E, dirtyUnitFeatureMap: I, dirtyUnitOtherFormulaMap: S, clearDependencyTreeCache: c } = p;
+      L != null && this._mergeDirtyRanges(a, L), P != null && this._mergeDirtyNameMap(i, P), E != null && this._mergeDirtyNameMap(r, E), I != null && this._mergeDirtyUnitFeatureOrOtherFormulaMap(o, I), S != null && this._mergeDirtyUnitFeatureOrOtherFormulaMap(u, S), c != null && this._mergeDirtyNameMap(m, c);
     }
     return {
       dirtyRanges: a,
@@ -1364,7 +1369,7 @@ let Oe = class extends te {
   _mergeDirty(e, a) {
     const i = [...e.dirtyRanges, ...a.dirtyRanges], r = { ...e.dirtyNameMap }, o = { ...e.dirtyDefinedNameMap }, u = { ...e.dirtyUnitFeatureMap }, m = { ...e.dirtyUnitOtherFormulaMap }, f = { ...e.clearDependencyTreeCache };
     this._mergeDirtyNameMap(r, a.dirtyNameMap), this._mergeDirtyNameMap(o, a.dirtyDefinedNameMap), this._mergeDirtyUnitFeatureOrOtherFormulaMap(u, a.dirtyUnitFeatureMap), this._mergeDirtyUnitFeatureOrOtherFormulaMap(m, a.dirtyUnitOtherFormulaMap), this._mergeDirtyNameMap(f, a.clearDependencyTreeCache);
-    const s = e.maxIteration || a.maxIteration;
+    const l = e.maxIteration || a.maxIteration;
     return {
       dirtyRanges: i,
       dirtyNameMap: r,
@@ -1373,7 +1378,7 @@ let Oe = class extends te {
       dirtyUnitOtherFormulaMap: m,
       forceCalculation: !!this._forceCalculating,
       clearDependencyTreeCache: f,
-      maxIteration: s
+      maxIteration: l
     };
   }
   /**
@@ -1386,8 +1391,8 @@ let Oe = class extends te {
       let r = !1;
       for (const o of e)
         if (i.unitId === o.unitId && i.sheetId === o.sheetId) {
-          const { startRow: u, startColumn: m, endRow: f, endColumn: s } = i.range, { startRow: p, startColumn: d, endRow: L, endColumn: E } = o.range;
-          if (u === p && m === d && f === L && s === E) {
+          const { startRow: u, startColumn: m, endRow: f, endColumn: l } = i.range, { startRow: p, startColumn: L, endRow: P, endColumn: E } = o.range;
+          if (u === p && m === L && f === P && l === E) {
             r = !0;
             break;
           }
@@ -1623,10 +1628,10 @@ let Qe = class extends te {
   _handleWorkbookAdded(n) {
     var f;
     const e = {}, a = n.getUnitId(), i = { [a]: {} };
-    n.getSheets().forEach((s) => {
+    n.getSheets().forEach((l) => {
       var E;
-      const p = s.getCellMatrix(), d = s.getSheetId(), L = zt(e, a, d, p);
-      i[a][d] = (E = L[a]) == null ? void 0 : E[d];
+      const p = l.getCellMatrix(), L = l.getSheetId(), P = zt(e, a, L, p);
+      i[a][L] = (E = P[a]) == null ? void 0 : E[L];
     }), this._commandService.executeCommand(he.id, { formulaData: i }, { onlyLocal: !0 });
     const o = this._configService.getConfig(ot), u = (f = o == null ? void 0 : o.initialFormulaComputing) != null ? f : ne.WHEN_EMPTY, m = this._getDiryDataByCalculationMode(u);
     this._commandService.executeCommand(Se.id, m, { onlyLocal: !0 });
@@ -1679,18 +1684,18 @@ let Qe = class extends te {
         continue;
       const f = Object.keys(m);
       Ne.isDefine(r[u]) || (r[u] = {}), Ne.isDefine(o[u]) || (o[u] = {});
-      for (const s of f) {
-        const p = new w(m[s] || {}), d = new w();
-        p.forValue((L, E, I) => {
+      for (const l of f) {
+        const p = new w(m[l] || {}), L = new w();
+        p.forValue((P, E, I) => {
           var U;
           if (!I) return !0;
-          const { f: S, x: c, y: N, si: R } = I, P = this._lexerTreeBuilder.sequenceNodesBuilder(S);
-          if (P == null)
+          const { f: S, x: c, y: N, si: R } = I, d = this._lexerTreeBuilder.sequenceNodesBuilder(S);
+          if (d == null)
             return !0;
           let O = !1;
           const M = [];
-          for (let g = 0, x = P.length; g < x; g++) {
-            const h = P[g];
+          for (let g = 0, x = d.length; g < x; g++) {
+            const h = d[g];
             if (typeof h == "string")
               continue;
             const { token: V, nodeType: k } = h, { type: b } = a;
@@ -1701,7 +1706,7 @@ let Qe = class extends te {
               const fe = this._definedNamesService.getValueById(u, Pe);
               if (fe == null || fe.name !== V)
                 continue;
-              P[g] = {
+              d[g] = {
                 ...h,
                 token: b === q.SetDefinedName ? Te : j.REF
               }, O = !0, M.push(g);
@@ -1713,7 +1718,7 @@ let Qe = class extends te {
               a.unitId,
               a.sheetId,
               u,
-              s,
+              l,
               Q,
               z
             ))
@@ -1753,20 +1758,20 @@ let Qe = class extends te {
               ye,
               a,
               u,
-              s
+              l
             ));
-            ue != null && (P[g] = {
+            ue != null && (d[g] = {
               ...h,
               token: ue
             }, O = !0, M.push(g));
           }
           if (!O)
             return !0;
-          const F = Ua(P, M, c, N);
-          d.setValue(L, E, {
+          const F = Ua(d, M, c, N);
+          L.setValue(P, E, {
             f: `=${Xe(F)}`
           });
-        }), o[u] && (o[u][s] = d.getData());
+        }), o[u] && (o[u][l] = L.getData());
       }
     }
     return { newFormulaData: o };
@@ -10853,7 +10858,7 @@ const Gi = [
   }
 ], zi = [
   {
-    functionName: l.AVEDEV,
+    functionName: s.AVEDEV,
     functionType: t.Statistical,
     description: "formula.functionList.AVEDEV.description",
     abstract: "formula.functionList.AVEDEV.abstract",
@@ -10875,7 +10880,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.AVERAGE,
+    functionName: s.AVERAGE,
     aliasFunctionName: "formula.functionList.AVERAGE.aliasFunctionName",
     functionType: t.Statistical,
     description: "formula.functionList.AVERAGE.description",
@@ -10898,7 +10903,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.AVERAGE_WEIGHTED,
+    functionName: s.AVERAGE_WEIGHTED,
     aliasFunctionName: "formula.functionList.AVERAGE_WEIGHTED.aliasFunctionName",
     functionType: t.Statistical,
     description: "formula.functionList.AVERAGE_WEIGHTED.description",
@@ -10935,7 +10940,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.AVERAGEA,
+    functionName: s.AVERAGEA,
     functionType: t.Statistical,
     description: "formula.functionList.AVERAGEA.description",
     abstract: "formula.functionList.AVERAGEA.abstract",
@@ -10957,7 +10962,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.AVERAGEIF,
+    functionName: s.AVERAGEIF,
     functionType: t.Statistical,
     description: "formula.functionList.AVERAGEIF.description",
     abstract: "formula.functionList.AVERAGEIF.abstract",
@@ -10986,7 +10991,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.AVERAGEIFS,
+    functionName: s.AVERAGEIFS,
     functionType: t.Statistical,
     description: "formula.functionList.AVERAGEIFS.description",
     abstract: "formula.functionList.AVERAGEIFS.abstract",
@@ -11029,7 +11034,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.BETA_DIST,
+    functionName: s.BETA_DIST,
     functionType: t.Statistical,
     description: "formula.functionList.BETA_DIST.description",
     abstract: "formula.functionList.BETA_DIST.abstract",
@@ -11079,7 +11084,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.BETA_INV,
+    functionName: s.BETA_INV,
     functionType: t.Statistical,
     description: "formula.functionList.BETA_INV.description",
     abstract: "formula.functionList.BETA_INV.abstract",
@@ -11122,7 +11127,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.BINOM_DIST,
+    functionName: s.BINOM_DIST,
     functionType: t.Statistical,
     description: "formula.functionList.BINOM_DIST.description",
     abstract: "formula.functionList.BINOM_DIST.abstract",
@@ -11158,7 +11163,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.BINOM_DIST_RANGE,
+    functionName: s.BINOM_DIST_RANGE,
     functionType: t.Statistical,
     description: "formula.functionList.BINOM_DIST_RANGE.description",
     abstract: "formula.functionList.BINOM_DIST_RANGE.abstract",
@@ -11194,7 +11199,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.BINOM_INV,
+    functionName: s.BINOM_INV,
     functionType: t.Statistical,
     description: "formula.functionList.BINOM_INV.description",
     abstract: "formula.functionList.BINOM_INV.abstract",
@@ -11223,7 +11228,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.CHISQ_DIST,
+    functionName: s.CHISQ_DIST,
     functionType: t.Statistical,
     description: "formula.functionList.CHISQ_DIST.description",
     abstract: "formula.functionList.CHISQ_DIST.abstract",
@@ -11252,7 +11257,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.CHISQ_DIST_RT,
+    functionName: s.CHISQ_DIST_RT,
     functionType: t.Statistical,
     description: "formula.functionList.CHISQ_DIST_RT.description",
     abstract: "formula.functionList.CHISQ_DIST_RT.abstract",
@@ -11274,7 +11279,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.CHISQ_INV,
+    functionName: s.CHISQ_INV,
     functionType: t.Statistical,
     description: "formula.functionList.CHISQ_INV.description",
     abstract: "formula.functionList.CHISQ_INV.abstract",
@@ -11296,7 +11301,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.CHISQ_INV_RT,
+    functionName: s.CHISQ_INV_RT,
     functionType: t.Statistical,
     description: "formula.functionList.CHISQ_INV_RT.description",
     abstract: "formula.functionList.CHISQ_INV_RT.abstract",
@@ -11318,7 +11323,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.CHISQ_TEST,
+    functionName: s.CHISQ_TEST,
     functionType: t.Statistical,
     description: "formula.functionList.CHISQ_TEST.description",
     abstract: "formula.functionList.CHISQ_TEST.abstract",
@@ -11340,7 +11345,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.CONFIDENCE_NORM,
+    functionName: s.CONFIDENCE_NORM,
     functionType: t.Statistical,
     description: "formula.functionList.CONFIDENCE_NORM.description",
     abstract: "formula.functionList.CONFIDENCE_NORM.abstract",
@@ -11369,7 +11374,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.CONFIDENCE_T,
+    functionName: s.CONFIDENCE_T,
     functionType: t.Statistical,
     description: "formula.functionList.CONFIDENCE_T.description",
     abstract: "formula.functionList.CONFIDENCE_T.abstract",
@@ -11398,7 +11403,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.CORREL,
+    functionName: s.CORREL,
     functionType: t.Statistical,
     description: "formula.functionList.CORREL.description",
     abstract: "formula.functionList.CORREL.abstract",
@@ -11420,7 +11425,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.COUNT,
+    functionName: s.COUNT,
     aliasFunctionName: "formula.functionList.COUNT.aliasFunctionName",
     functionType: t.Statistical,
     description: "formula.functionList.COUNT.description",
@@ -11443,7 +11448,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.COUNTA,
+    functionName: s.COUNTA,
     aliasFunctionName: "formula.functionList.COUNTA.aliasFunctionName",
     functionType: t.Statistical,
     description: "formula.functionList.COUNTA.description",
@@ -11466,7 +11471,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.COUNTBLANK,
+    functionName: s.COUNTBLANK,
     functionType: t.Statistical,
     description: "formula.functionList.COUNTBLANK.description",
     abstract: "formula.functionList.COUNTBLANK.abstract",
@@ -11481,7 +11486,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.COUNTIF,
+    functionName: s.COUNTIF,
     functionType: t.Statistical,
     description: "formula.functionList.COUNTIF.description",
     abstract: "formula.functionList.COUNTIF.abstract",
@@ -11503,7 +11508,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.COUNTIFS,
+    functionName: s.COUNTIFS,
     functionType: t.Statistical,
     description: "formula.functionList.COUNTIFS.description",
     abstract: "formula.functionList.COUNTIFS.abstract",
@@ -11539,7 +11544,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.COVARIANCE_P,
+    functionName: s.COVARIANCE_P,
     functionType: t.Statistical,
     description: "formula.functionList.COVARIANCE_P.description",
     abstract: "formula.functionList.COVARIANCE_P.abstract",
@@ -11561,7 +11566,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.COVARIANCE_S,
+    functionName: s.COVARIANCE_S,
     functionType: t.Statistical,
     description: "formula.functionList.COVARIANCE_S.description",
     abstract: "formula.functionList.COVARIANCE_S.abstract",
@@ -11583,7 +11588,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.DEVSQ,
+    functionName: s.DEVSQ,
     functionType: t.Statistical,
     description: "formula.functionList.DEVSQ.description",
     abstract: "formula.functionList.DEVSQ.abstract",
@@ -11605,7 +11610,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.EXPON_DIST,
+    functionName: s.EXPON_DIST,
     functionType: t.Statistical,
     description: "formula.functionList.EXPON_DIST.description",
     abstract: "formula.functionList.EXPON_DIST.abstract",
@@ -11634,7 +11639,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.F_DIST,
+    functionName: s.F_DIST,
     functionType: t.Statistical,
     description: "formula.functionList.F_DIST.description",
     abstract: "formula.functionList.F_DIST.abstract",
@@ -11670,7 +11675,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.F_DIST_RT,
+    functionName: s.F_DIST_RT,
     functionType: t.Statistical,
     description: "formula.functionList.F_DIST_RT.description",
     abstract: "formula.functionList.F_DIST_RT.abstract",
@@ -11699,7 +11704,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.F_INV,
+    functionName: s.F_INV,
     functionType: t.Statistical,
     description: "formula.functionList.F_INV.description",
     abstract: "formula.functionList.F_INV.abstract",
@@ -11728,7 +11733,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.F_INV_RT,
+    functionName: s.F_INV_RT,
     functionType: t.Statistical,
     description: "formula.functionList.F_INV_RT.description",
     abstract: "formula.functionList.F_INV_RT.abstract",
@@ -11757,7 +11762,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.F_TEST,
+    functionName: s.F_TEST,
     functionType: t.Statistical,
     description: "formula.functionList.F_TEST.description",
     abstract: "formula.functionList.F_TEST.abstract",
@@ -11779,7 +11784,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.FISHER,
+    functionName: s.FISHER,
     functionType: t.Statistical,
     description: "formula.functionList.FISHER.description",
     abstract: "formula.functionList.FISHER.abstract",
@@ -11794,7 +11799,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.FISHERINV,
+    functionName: s.FISHERINV,
     functionType: t.Statistical,
     description: "formula.functionList.FISHERINV.description",
     abstract: "formula.functionList.FISHERINV.abstract",
@@ -11809,7 +11814,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.FORECAST,
+    functionName: s.FORECAST,
     functionType: t.Statistical,
     description: "formula.functionList.FORECAST.description",
     abstract: "formula.functionList.FORECAST.abstract",
@@ -11838,7 +11843,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.FORECAST_ETS,
+    functionName: s.FORECAST_ETS,
     functionType: t.Statistical,
     description: "formula.functionList.FORECAST_ETS.description",
     abstract: "formula.functionList.FORECAST_ETS.abstract",
@@ -11860,7 +11865,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.FORECAST_ETS_CONFINT,
+    functionName: s.FORECAST_ETS_CONFINT,
     functionType: t.Statistical,
     description: "formula.functionList.FORECAST_ETS_CONFINT.description",
     abstract: "formula.functionList.FORECAST_ETS_CONFINT.abstract",
@@ -11882,7 +11887,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.FORECAST_ETS_SEASONALITY,
+    functionName: s.FORECAST_ETS_SEASONALITY,
     functionType: t.Statistical,
     description: "formula.functionList.FORECAST_ETS_SEASONALITY.description",
     abstract: "formula.functionList.FORECAST_ETS_SEASONALITY.abstract",
@@ -11904,7 +11909,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.FORECAST_ETS_STAT,
+    functionName: s.FORECAST_ETS_STAT,
     functionType: t.Statistical,
     description: "formula.functionList.FORECAST_ETS_STAT.description",
     abstract: "formula.functionList.FORECAST_ETS_STAT.abstract",
@@ -11926,7 +11931,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.FORECAST_LINEAR,
+    functionName: s.FORECAST_LINEAR,
     functionType: t.Statistical,
     description: "formula.functionList.FORECAST_LINEAR.description",
     abstract: "formula.functionList.FORECAST_LINEAR.abstract",
@@ -11955,7 +11960,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.FREQUENCY,
+    functionName: s.FREQUENCY,
     functionType: t.Statistical,
     description: "formula.functionList.FREQUENCY.description",
     abstract: "formula.functionList.FREQUENCY.abstract",
@@ -11977,7 +11982,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.GAMMA,
+    functionName: s.GAMMA,
     functionType: t.Statistical,
     description: "formula.functionList.GAMMA.description",
     abstract: "formula.functionList.GAMMA.abstract",
@@ -11992,7 +11997,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.GAMMA_DIST,
+    functionName: s.GAMMA_DIST,
     functionType: t.Statistical,
     description: "formula.functionList.GAMMA_DIST.description",
     abstract: "formula.functionList.GAMMA_DIST.abstract",
@@ -12028,7 +12033,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.GAMMA_INV,
+    functionName: s.GAMMA_INV,
     functionType: t.Statistical,
     description: "formula.functionList.GAMMA_INV.description",
     abstract: "formula.functionList.GAMMA_INV.abstract",
@@ -12057,7 +12062,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.GAMMALN,
+    functionName: s.GAMMALN,
     functionType: t.Statistical,
     description: "formula.functionList.GAMMALN.description",
     abstract: "formula.functionList.GAMMALN.abstract",
@@ -12072,7 +12077,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.GAMMALN_PRECISE,
+    functionName: s.GAMMALN_PRECISE,
     functionType: t.Statistical,
     description: "formula.functionList.GAMMALN_PRECISE.description",
     abstract: "formula.functionList.GAMMALN_PRECISE.abstract",
@@ -12087,7 +12092,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.GAUSS,
+    functionName: s.GAUSS,
     functionType: t.Statistical,
     description: "formula.functionList.GAUSS.description",
     abstract: "formula.functionList.GAUSS.abstract",
@@ -12102,7 +12107,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.GEOMEAN,
+    functionName: s.GEOMEAN,
     functionType: t.Statistical,
     description: "formula.functionList.GEOMEAN.description",
     abstract: "formula.functionList.GEOMEAN.abstract",
@@ -12124,7 +12129,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.GROWTH,
+    functionName: s.GROWTH,
     functionType: t.Statistical,
     description: "formula.functionList.GROWTH.description",
     abstract: "formula.functionList.GROWTH.abstract",
@@ -12160,7 +12165,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.HARMEAN,
+    functionName: s.HARMEAN,
     functionType: t.Statistical,
     description: "formula.functionList.HARMEAN.description",
     abstract: "formula.functionList.HARMEAN.abstract",
@@ -12182,7 +12187,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.HYPGEOM_DIST,
+    functionName: s.HYPGEOM_DIST,
     functionType: t.Statistical,
     description: "formula.functionList.HYPGEOM_DIST.description",
     abstract: "formula.functionList.HYPGEOM_DIST.abstract",
@@ -12225,7 +12230,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.INTERCEPT,
+    functionName: s.INTERCEPT,
     functionType: t.Statistical,
     description: "formula.functionList.INTERCEPT.description",
     abstract: "formula.functionList.INTERCEPT.abstract",
@@ -12247,7 +12252,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.KURT,
+    functionName: s.KURT,
     functionType: t.Statistical,
     description: "formula.functionList.KURT.description",
     abstract: "formula.functionList.KURT.abstract",
@@ -12269,7 +12274,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.LARGE,
+    functionName: s.LARGE,
     functionType: t.Statistical,
     description: "formula.functionList.LARGE.description",
     abstract: "formula.functionList.LARGE.abstract",
@@ -12291,7 +12296,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.LINEST,
+    functionName: s.LINEST,
     functionType: t.Statistical,
     description: "formula.functionList.LINEST.description",
     abstract: "formula.functionList.LINEST.abstract",
@@ -12327,7 +12332,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.LOGEST,
+    functionName: s.LOGEST,
     functionType: t.Statistical,
     description: "formula.functionList.LOGEST.description",
     abstract: "formula.functionList.LOGEST.abstract",
@@ -12363,7 +12368,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.LOGNORM_DIST,
+    functionName: s.LOGNORM_DIST,
     functionType: t.Statistical,
     description: "formula.functionList.LOGNORM_DIST.description",
     abstract: "formula.functionList.LOGNORM_DIST.abstract",
@@ -12399,7 +12404,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.LOGNORM_INV,
+    functionName: s.LOGNORM_INV,
     functionType: t.Statistical,
     description: "formula.functionList.LOGNORM_INV.description",
     abstract: "formula.functionList.LOGNORM_INV.abstract",
@@ -12428,7 +12433,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.MARGINOFERROR,
+    functionName: s.MARGINOFERROR,
     aliasFunctionName: "formula.functionList.MARGINOFERROR.aliasFunctionName",
     functionType: t.Statistical,
     description: "formula.functionList.MARGINOFERROR.description",
@@ -12451,7 +12456,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.MAX,
+    functionName: s.MAX,
     aliasFunctionName: "formula.functionList.MAX.aliasFunctionName",
     functionType: t.Statistical,
     description: "formula.functionList.MAX.description",
@@ -12474,7 +12479,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.MAXA,
+    functionName: s.MAXA,
     functionType: t.Statistical,
     description: "formula.functionList.MAXA.description",
     abstract: "formula.functionList.MAXA.abstract",
@@ -12496,7 +12501,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.MAXIFS,
+    functionName: s.MAXIFS,
     functionType: t.Statistical,
     description: "formula.functionList.MAXIFS.description",
     abstract: "formula.functionList.MAXIFS.abstract",
@@ -12539,7 +12544,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.MEDIAN,
+    functionName: s.MEDIAN,
     functionType: t.Statistical,
     description: "formula.functionList.MEDIAN.description",
     abstract: "formula.functionList.MEDIAN.abstract",
@@ -12561,7 +12566,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.MIN,
+    functionName: s.MIN,
     aliasFunctionName: "formula.functionList.MIN.aliasFunctionName",
     functionType: t.Statistical,
     description: "formula.functionList.MIN.description",
@@ -12584,7 +12589,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.MINA,
+    functionName: s.MINA,
     functionType: t.Statistical,
     description: "formula.functionList.MINA.description",
     abstract: "formula.functionList.MINA.abstract",
@@ -12606,7 +12611,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.MINIFS,
+    functionName: s.MINIFS,
     functionType: t.Statistical,
     description: "formula.functionList.MINIFS.description",
     abstract: "formula.functionList.MINIFS.abstract",
@@ -12649,7 +12654,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.MODE_MULT,
+    functionName: s.MODE_MULT,
     functionType: t.Statistical,
     description: "formula.functionList.MODE_MULT.description",
     abstract: "formula.functionList.MODE_MULT.abstract",
@@ -12671,7 +12676,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.MODE_SNGL,
+    functionName: s.MODE_SNGL,
     functionType: t.Statistical,
     description: "formula.functionList.MODE_SNGL.description",
     abstract: "formula.functionList.MODE_SNGL.abstract",
@@ -12693,7 +12698,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.NEGBINOM_DIST,
+    functionName: s.NEGBINOM_DIST,
     functionType: t.Statistical,
     description: "formula.functionList.NEGBINOM_DIST.description",
     abstract: "formula.functionList.NEGBINOM_DIST.abstract",
@@ -12729,7 +12734,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.NORM_DIST,
+    functionName: s.NORM_DIST,
     functionType: t.Statistical,
     description: "formula.functionList.NORM_DIST.description",
     abstract: "formula.functionList.NORM_DIST.abstract",
@@ -12765,7 +12770,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.NORM_INV,
+    functionName: s.NORM_INV,
     functionType: t.Statistical,
     description: "formula.functionList.NORM_INV.description",
     abstract: "formula.functionList.NORM_INV.abstract",
@@ -12794,7 +12799,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.NORM_S_DIST,
+    functionName: s.NORM_S_DIST,
     functionType: t.Statistical,
     description: "formula.functionList.NORM_S_DIST.description",
     abstract: "formula.functionList.NORM_S_DIST.abstract",
@@ -12816,7 +12821,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.NORM_S_INV,
+    functionName: s.NORM_S_INV,
     functionType: t.Statistical,
     description: "formula.functionList.NORM_S_INV.description",
     abstract: "formula.functionList.NORM_S_INV.abstract",
@@ -12831,7 +12836,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.PEARSON,
+    functionName: s.PEARSON,
     functionType: t.Statistical,
     description: "formula.functionList.PEARSON.description",
     abstract: "formula.functionList.PEARSON.abstract",
@@ -12853,7 +12858,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.PERCENTILE_EXC,
+    functionName: s.PERCENTILE_EXC,
     functionType: t.Statistical,
     description: "formula.functionList.PERCENTILE_EXC.description",
     abstract: "formula.functionList.PERCENTILE_EXC.abstract",
@@ -12875,7 +12880,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.PERCENTILE_INC,
+    functionName: s.PERCENTILE_INC,
     functionType: t.Statistical,
     description: "formula.functionList.PERCENTILE_INC.description",
     abstract: "formula.functionList.PERCENTILE_INC.abstract",
@@ -12897,7 +12902,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.PERCENTRANK_EXC,
+    functionName: s.PERCENTRANK_EXC,
     functionType: t.Statistical,
     description: "formula.functionList.PERCENTRANK_EXC.description",
     abstract: "formula.functionList.PERCENTRANK_EXC.abstract",
@@ -12926,7 +12931,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.PERCENTRANK_INC,
+    functionName: s.PERCENTRANK_INC,
     functionType: t.Statistical,
     description: "formula.functionList.PERCENTRANK_INC.description",
     abstract: "formula.functionList.PERCENTRANK_INC.abstract",
@@ -12955,7 +12960,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.PERMUT,
+    functionName: s.PERMUT,
     functionType: t.Statistical,
     description: "formula.functionList.PERMUT.description",
     abstract: "formula.functionList.PERMUT.abstract",
@@ -12977,7 +12982,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.PERMUTATIONA,
+    functionName: s.PERMUTATIONA,
     functionType: t.Statistical,
     description: "formula.functionList.PERMUTATIONA.description",
     abstract: "formula.functionList.PERMUTATIONA.abstract",
@@ -12999,7 +13004,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.PHI,
+    functionName: s.PHI,
     functionType: t.Statistical,
     description: "formula.functionList.PHI.description",
     abstract: "formula.functionList.PHI.abstract",
@@ -13014,7 +13019,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.POISSON_DIST,
+    functionName: s.POISSON_DIST,
     functionType: t.Statistical,
     description: "formula.functionList.POISSON_DIST.description",
     abstract: "formula.functionList.POISSON_DIST.abstract",
@@ -13043,7 +13048,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.PROB,
+    functionName: s.PROB,
     functionType: t.Statistical,
     description: "formula.functionList.PROB.description",
     abstract: "formula.functionList.PROB.abstract",
@@ -13079,7 +13084,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.QUARTILE_EXC,
+    functionName: s.QUARTILE_EXC,
     functionType: t.Statistical,
     description: "formula.functionList.QUARTILE_EXC.description",
     abstract: "formula.functionList.QUARTILE_EXC.abstract",
@@ -13101,7 +13106,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.QUARTILE_INC,
+    functionName: s.QUARTILE_INC,
     functionType: t.Statistical,
     description: "formula.functionList.QUARTILE_INC.description",
     abstract: "formula.functionList.QUARTILE_INC.abstract",
@@ -13123,7 +13128,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.RANK_AVG,
+    functionName: s.RANK_AVG,
     functionType: t.Statistical,
     description: "formula.functionList.RANK_AVG.description",
     abstract: "formula.functionList.RANK_AVG.abstract",
@@ -13152,7 +13157,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.RANK_EQ,
+    functionName: s.RANK_EQ,
     functionType: t.Statistical,
     description: "formula.functionList.RANK_EQ.description",
     abstract: "formula.functionList.RANK_EQ.abstract",
@@ -13181,7 +13186,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.RSQ,
+    functionName: s.RSQ,
     functionType: t.Statistical,
     description: "formula.functionList.RSQ.description",
     abstract: "formula.functionList.RSQ.abstract",
@@ -13203,7 +13208,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.SKEW,
+    functionName: s.SKEW,
     functionType: t.Statistical,
     description: "formula.functionList.SKEW.description",
     abstract: "formula.functionList.SKEW.abstract",
@@ -13225,7 +13230,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.SKEW_P,
+    functionName: s.SKEW_P,
     functionType: t.Statistical,
     description: "formula.functionList.SKEW_P.description",
     abstract: "formula.functionList.SKEW_P.abstract",
@@ -13247,7 +13252,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.SLOPE,
+    functionName: s.SLOPE,
     functionType: t.Statistical,
     description: "formula.functionList.SLOPE.description",
     abstract: "formula.functionList.SLOPE.abstract",
@@ -13269,7 +13274,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.SMALL,
+    functionName: s.SMALL,
     functionType: t.Statistical,
     description: "formula.functionList.SMALL.description",
     abstract: "formula.functionList.SMALL.abstract",
@@ -13291,7 +13296,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.STANDARDIZE,
+    functionName: s.STANDARDIZE,
     functionType: t.Statistical,
     description: "formula.functionList.STANDARDIZE.description",
     abstract: "formula.functionList.STANDARDIZE.abstract",
@@ -13320,7 +13325,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.STDEV_P,
+    functionName: s.STDEV_P,
     functionType: t.Statistical,
     description: "formula.functionList.STDEV_P.description",
     abstract: "formula.functionList.STDEV_P.abstract",
@@ -13342,7 +13347,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.STDEV_S,
+    functionName: s.STDEV_S,
     functionType: t.Statistical,
     description: "formula.functionList.STDEV_S.description",
     abstract: "formula.functionList.STDEV_S.abstract",
@@ -13364,7 +13369,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.STDEVA,
+    functionName: s.STDEVA,
     functionType: t.Statistical,
     description: "formula.functionList.STDEVA.description",
     abstract: "formula.functionList.STDEVA.abstract",
@@ -13386,7 +13391,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.STDEVPA,
+    functionName: s.STDEVPA,
     functionType: t.Statistical,
     description: "formula.functionList.STDEVPA.description",
     abstract: "formula.functionList.STDEVPA.abstract",
@@ -13408,7 +13413,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.STEYX,
+    functionName: s.STEYX,
     functionType: t.Statistical,
     description: "formula.functionList.STEYX.description",
     abstract: "formula.functionList.STEYX.abstract",
@@ -13430,7 +13435,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.T_DIST,
+    functionName: s.T_DIST,
     functionType: t.Statistical,
     description: "formula.functionList.T_DIST.description",
     abstract: "formula.functionList.T_DIST.abstract",
@@ -13459,7 +13464,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.T_DIST_2T,
+    functionName: s.T_DIST_2T,
     functionType: t.Statistical,
     description: "formula.functionList.T_DIST_2T.description",
     abstract: "formula.functionList.T_DIST_2T.abstract",
@@ -13481,7 +13486,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.T_DIST_RT,
+    functionName: s.T_DIST_RT,
     functionType: t.Statistical,
     description: "formula.functionList.T_DIST_RT.description",
     abstract: "formula.functionList.T_DIST_RT.abstract",
@@ -13503,7 +13508,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.T_INV,
+    functionName: s.T_INV,
     functionType: t.Statistical,
     description: "formula.functionList.T_INV.description",
     abstract: "formula.functionList.T_INV.abstract",
@@ -13525,7 +13530,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.T_INV_2T,
+    functionName: s.T_INV_2T,
     functionType: t.Statistical,
     description: "formula.functionList.T_INV_2T.description",
     abstract: "formula.functionList.T_INV_2T.abstract",
@@ -13547,7 +13552,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.T_TEST,
+    functionName: s.T_TEST,
     functionType: t.Statistical,
     description: "formula.functionList.T_TEST.description",
     abstract: "formula.functionList.T_TEST.abstract",
@@ -13583,7 +13588,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.TREND,
+    functionName: s.TREND,
     functionType: t.Statistical,
     description: "formula.functionList.TREND.description",
     abstract: "formula.functionList.TREND.abstract",
@@ -13619,7 +13624,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.TRIMMEAN,
+    functionName: s.TRIMMEAN,
     functionType: t.Statistical,
     description: "formula.functionList.TRIMMEAN.description",
     abstract: "formula.functionList.TRIMMEAN.abstract",
@@ -13641,7 +13646,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.VAR_P,
+    functionName: s.VAR_P,
     functionType: t.Statistical,
     description: "formula.functionList.VAR_P.description",
     abstract: "formula.functionList.VAR_P.abstract",
@@ -13663,7 +13668,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.VAR_S,
+    functionName: s.VAR_S,
     functionType: t.Statistical,
     description: "formula.functionList.VAR_S.description",
     abstract: "formula.functionList.VAR_S.abstract",
@@ -13685,7 +13690,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.VARA,
+    functionName: s.VARA,
     functionType: t.Statistical,
     description: "formula.functionList.VARA.description",
     abstract: "formula.functionList.VARA.abstract",
@@ -13707,7 +13712,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.VARPA,
+    functionName: s.VARPA,
     functionType: t.Statistical,
     description: "formula.functionList.VARPA.description",
     abstract: "formula.functionList.VARPA.abstract",
@@ -13729,7 +13734,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.WEIBULL_DIST,
+    functionName: s.WEIBULL_DIST,
     functionType: t.Statistical,
     description: "formula.functionList.WEIBULL_DIST.description",
     abstract: "formula.functionList.WEIBULL_DIST.abstract",
@@ -13765,7 +13770,7 @@ const Gi = [
     ]
   },
   {
-    functionName: l.Z_TEST,
+    functionName: s.Z_TEST,
     functionType: t.Statistical,
     description: "formula.functionList.Z_TEST.description",
     abstract: "formula.functionList.Z_TEST.abstract",
@@ -15195,11 +15200,11 @@ function ua(n, e, a, i) {
     const f = r[u];
     if (typeof f == "string" || f.nodeType !== J.REFERENCE)
       continue;
-    const { token: s } = f, p = pe(s), { sheetName: d, unitId: L } = p;
+    const { token: l } = f, p = pe(l), { sheetName: L, unitId: P } = p;
     let E = p.range;
     E.startAbsoluteRefType === we.ALL && E.endAbsoluteRefType === we.ALL || (E = Et(E, a, i), o.push({
-      unitId: L,
-      sheetName: d,
+      unitId: P,
+      sheetName: L,
       range: E
     }));
   }
@@ -15210,18 +15215,18 @@ let Dt = class extends te {
     super(), this._refRangeService = n, this._lexerTreeBuilder = e, this._univerInstanceService = a, this._injector = i;
   }
   transformFormulaByEffectCommand(n, e, a, i) {
-    const r = this._lexerTreeBuilder.sequenceNodesBuilder(a), o = this._univerInstanceService.getCurrentUnitForType(ee.UNIVER_SHEET), u = o.getActiveSheet(), m = o.getUnitId(), f = u.getSheetId(), s = r == null ? void 0 : r.map((p) => {
+    const r = this._lexerTreeBuilder.sequenceNodesBuilder(a), o = this._univerInstanceService.getCurrentUnitForType(ee.UNIVER_SHEET), u = o.getActiveSheet(), m = o.getUnitId(), f = u.getSheetId(), l = r == null ? void 0 : r.map((p) => {
       if (typeof p == "object" && p.nodeType === J.REFERENCE) {
-        const d = pe(p.token), { range: L, unitId: E, sheetName: I } = d, S = this._univerInstanceService.getUnit(E || n), c = I ? S == null ? void 0 : S.getSheetBySheetName(I) : S == null ? void 0 : S.getSheetBySheetId(e);
+        const L = pe(p.token), { range: P, unitId: E, sheetName: I } = L, S = this._univerInstanceService.getUnit(E || n), c = I ? S == null ? void 0 : S.getSheetBySheetName(I) : S == null ? void 0 : S.getSheetBySheetId(e);
         if (!c)
           throw new Error("Sheet not found");
         const N = S.getUnitId(), R = c.getSheetId();
         if (N !== m || R !== f)
           return p;
-        const P = Gt(L, i);
+        const d = Gt(P, i);
         let O = "";
-        if (P) {
-          const M = P.startColumn - L.startColumn, F = P.startRow - L.startRow, U = Et(L, M, F);
+        if (d) {
+          const M = d.startColumn - P.startColumn, F = d.startRow - P.startRow, U = Et(P, M, F);
           E && I ? O = Jt(E, I, U) : I ? O = ea(I, U) : O = ta(U);
         } else
           O = j.REF;
@@ -15232,19 +15237,19 @@ let Dt = class extends te {
       } else
         return p;
     });
-    return s ? `=${Xe(s)}` : "";
+    return l ? `=${Xe(l)}` : "";
   }
   registerFormula(n, e, a, i) {
     const r = /* @__PURE__ */ new Map(), o = this._lexerTreeBuilder.sequenceNodesBuilder(a), u = new Ye(), m = (f) => {
-      const s = this._univerInstanceService.getCurrentUnitForType(ee.UNIVER_SHEET), p = s.getActiveSheet(), d = s.getUnitId(), L = p.getSheetId(), E = o == null ? void 0 : o.map((S) => {
+      const l = this._univerInstanceService.getCurrentUnitForType(ee.UNIVER_SHEET), p = l.getActiveSheet(), L = l.getUnitId(), P = p.getSheetId(), E = o == null ? void 0 : o.map((S) => {
         if (typeof S == "object" && S.nodeType === J.REFERENCE) {
           const c = r.get(S.token);
-          if (c.unitId !== d || c.subUnitId !== L)
+          if (c.unitId !== L || c.subUnitId !== P)
             return S;
           const N = Gt(c.range, f);
           let R = "";
           if (N) {
-            const P = N.startColumn - c.range.startColumn, O = N.startRow - c.range.startRow, M = Et(c.range, P, O);
+            const d = N.startColumn - c.range.startColumn, O = N.startRow - c.range.startRow, M = Et(c.range, d, O);
             c.unitId && c.sheetName ? R = Jt(c.unitId, c.sheetName, M) : c.sheetName ? R = ea(c.sheetName, M) : R = ta(M);
           } else
             R = j.REF;
@@ -15259,14 +15264,14 @@ let Dt = class extends te {
     };
     return o == null || o.forEach((f) => {
       if (typeof f == "object" && f.nodeType === J.REFERENCE) {
-        const s = pe(f.token), { range: p, unitId: d, sheetName: L } = s, E = this._univerInstanceService.getUnit(d || n), I = L ? E == null ? void 0 : E.getSheetBySheetName(L) : E == null ? void 0 : E.getSheetBySheetId(e);
+        const l = pe(f.token), { range: p, unitId: L, sheetName: P } = l, E = this._univerInstanceService.getUnit(L || n), I = P ? E == null ? void 0 : E.getSheetBySheetName(P) : E == null ? void 0 : E.getSheetBySheetId(e);
         if (!I)
           return;
         const S = E.getUnitId(), c = I.getSheetId(), N = {
           unitId: S,
           subUnitId: c,
           range: p,
-          sheetName: L
+          sheetName: P
         };
         r.set(f.token, N), u.add(this._refRangeService.registerRefRange(p, m, S, c));
       }
@@ -15276,13 +15281,13 @@ let Dt = class extends te {
     const r = be(a) ? this._lexerTreeBuilder.sequenceNodesBuilder(a) : null, o = [];
     return r == null || r.forEach((u) => {
       if (typeof u == "object" && u.nodeType === J.REFERENCE) {
-        const m = pe(u.token), { range: f, unitId: s, sheetName: p } = m;
+        const m = pe(u.token), { range: f, unitId: l, sheetName: p } = m;
         if (f.startAbsoluteRefType === we.ALL && f.endAbsoluteRefType === we.ALL)
           return;
-        const d = this._univerInstanceService.getUnit(s || n), L = p ? d == null ? void 0 : d.getSheetBySheetName(p) : d == null ? void 0 : d.getSheetBySheetId(e);
-        if (!L)
+        const L = this._univerInstanceService.getUnit(l || n), P = p ? L == null ? void 0 : L.getSheetBySheetName(p) : L == null ? void 0 : L.getSheetBySheetId(e);
+        if (!P)
           return;
-        const E = d.getUnitId(), I = L.getSheetId(), S = i[0].startRow, c = i[0].startColumn, N = f.startRow, R = f.startColumn, P = i.map((O) => ({
+        const E = L.getUnitId(), I = P.getSheetId(), S = i[0].startRow, c = i[0].startColumn, N = f.startRow, R = f.startColumn, d = i.map((O) => ({
           startRow: O.startRow - S + N,
           endRow: O.endRow - S + N,
           startColumn: O.startColumn - c + R,
@@ -15291,7 +15296,7 @@ let Dt = class extends te {
         o.push({
           unitId: E,
           subUnitId: I,
-          ranges: P
+          ranges: d
         });
       }
     }), o;
@@ -15299,15 +15304,15 @@ let Dt = class extends te {
   // eslint-disable-next-line max-lines-per-function
   registerRangeFormula(n, e, a, i, r) {
     const o = new Ye(), u = i.map((f) => this._getFormulaDependcy(n, e, f, a)), m = (f) => {
-      const s = a[0].startRow, p = a[0].startColumn, d = [{ unitId: n, subUnitId: e, ranges: a }, ...u.flat()], L = [], E = cn(this._injector, f);
-      for (const { unitId: I, subUnitId: S, ranges: c } of d)
+      const l = a[0].startRow, p = a[0].startColumn, L = [{ unitId: n, subUnitId: e, ranges: a }, ...u.flat()], P = [], E = cn(this._injector, f);
+      for (const { unitId: I, subUnitId: S, ranges: c } of L)
         if (I === E.unitId && S === E.subUnitId) {
-          const N = [], R = c[0].startRow, P = c[0].startColumn, O = R - s, M = P - p;
+          const N = [], R = c[0].startRow, d = c[0].startColumn, O = R - l, M = d - p;
           for (const F of E.ranges) {
             const U = c.map((g) => Ve(F, g)).filter(Boolean);
             U.length > 0 && N.push(...U);
           }
-          N.length > 0 && L.push(
+          N.length > 0 && P.push(
             N.map((F) => ({
               startRow: F.startRow - O,
               endRow: F.endRow - O,
@@ -15316,15 +15321,15 @@ let Dt = class extends te {
             }))
           );
         }
-      if (L.length > 0) {
-        const I = De.splitIntoGrid([...L.flat()]), S = De.subtractMulti(a, I);
+      if (P.length > 0) {
+        const I = De.splitIntoGrid([...P.flat()]), S = De.subtractMulti(a, I);
         S.sort((O, M) => O.startRow - M.startRow || O.startColumn - M.startColumn);
         const c = /* @__PURE__ */ new Map();
         for (let O = 0; O < I.length; O++) {
-          const M = I[O], F = M.startRow, U = M.startColumn, g = F - s, x = U - p, h = ln(M, f).sort((Q, oe) => Q.startRow - oe.startRow || Q.startColumn - oe.startColumn);
+          const M = I[O], F = M.startRow, U = M.startColumn, g = F - l, x = U - p, h = ln(M, f).sort((Q, oe) => Q.startRow - oe.startRow || Q.startColumn - oe.startColumn);
           if (!h.length)
             continue;
-          const V = h[0].startRow, k = h[0].startColumn, b = V - s, Le = k - p, ae = [];
+          const V = h[0].startRow, k = h[0].startColumn, b = V - l, Le = k - p, ae = [];
           for (let Q = 0; Q < i.length; Q++) {
             const oe = i[Q], z = be(oe), ye = z ? this._lexerTreeBuilder.moveFormulaRefOffset(oe, x, g) : oe, ue = z ? this.transformFormulaByEffectCommand(n, e, ye, f) : ye, Pe = ua(this._lexerTreeBuilder, ue, -Le, -b);
             ae.push({
@@ -15345,7 +15350,7 @@ let Dt = class extends te {
           for (let g = 0; g < i.length; g++) {
             const x = i[g];
             F.push({
-              newFormula: be(x) ? this._lexerTreeBuilder.moveFormulaRefOffset(x, M - p, O - s) : x,
+              newFormula: be(x) ? this._lexerTreeBuilder.moveFormulaRefOffset(x, M - p, O - l) : x,
               orginFormula: x
             });
           }
@@ -15356,9 +15361,9 @@ let Dt = class extends te {
           };
           c.has(U.key) ? c.get(U.key).push(U) : c.set(U.key, [U]);
         }
-        const R = [], P = Array.from(c.keys());
-        for (let O = P.length - 1; O >= 0; O--) {
-          const M = P[O], F = c.get(M).sort((x, h) => x.ranges[0].startRow - h.ranges[0].startRow || x.ranges[0].startColumn - h.ranges[0].startColumn), U = [];
+        const R = [], d = Array.from(c.keys());
+        for (let O = d.length - 1; O >= 0; O--) {
+          const M = d[O], F = c.get(M).sort((x, h) => x.ranges[0].startRow - h.ranges[0].startRow || x.ranges[0].startColumn - h.ranges[0].startColumn), U = [];
           for (let x = 0; x < F[0].formulas.length; x++)
             U.push(F[0].formulas[x].newFormula);
           const g = De.mergeRanges(F.map((x) => x.ranges).flat());
@@ -15375,12 +15380,12 @@ let Dt = class extends te {
       };
     };
     return a.forEach((f) => {
-      const s = this._refRangeService.registerRefRange(f, m, n, e);
-      o.add(s);
-    }), [...u.flat()].forEach(({ unitId: f, subUnitId: s, ranges: p }) => {
-      p.forEach((d) => {
-        const L = this._refRangeService.registerRefRange(d, m, f, s);
-        o.add(L);
+      const l = this._refRangeService.registerRefRange(f, m, n, e);
+      o.add(l);
+    }), [...u.flat()].forEach(({ unitId: f, subUnitId: l, ranges: p }) => {
+      p.forEach((L) => {
+        const P = this._refRangeService.registerRefRange(L, m, f, l);
+        o.add(P);
       });
     }), o;
   }
@@ -15689,38 +15694,38 @@ let $e = class extends te {
     return o.push(...this._getDirtyRangesByCellValue(e, a, r)), o.push(...this._getDirtyRangesForArrayFormula(e, a, r)), o;
   }
   _getDeleteRangeMutationDirtyRange(n) {
-    const { subUnitId: e, unitId: a, range: i, shiftDimension: r } = n, o = [], u = this._univerInstanceService.getUniverSheetInstance(a), m = u == null ? void 0 : u.getSheetBySheetId(e), f = (m == null ? void 0 : m.getLastRowWithContent()) || 0, s = (m == null ? void 0 : m.getLastColumnWithContent()) || 0, p = new w();
-    let d = null;
-    const { startRow: L, startColumn: E, endRow: I, endColumn: S } = i;
-    r === Bt.ROWS ? d = this._rangeToMatrix({
-      startRow: L,
+    const { subUnitId: e, unitId: a, range: i, shiftDimension: r } = n, o = [], u = this._univerInstanceService.getUniverSheetInstance(a), m = u == null ? void 0 : u.getSheetBySheetId(e), f = (m == null ? void 0 : m.getLastRowWithContent()) || 0, l = (m == null ? void 0 : m.getLastColumnWithContent()) || 0, p = new w();
+    let L = null;
+    const { startRow: P, startColumn: E, endRow: I, endColumn: S } = i;
+    r === Bt.ROWS ? L = this._rangeToMatrix({
+      startRow: P,
       startColumn: E,
       endRow: f,
       endColumn: S
-    }) : r === Bt.COLUMNS && (d = this._rangeToMatrix({
-      startRow: L,
+    }) : r === Bt.COLUMNS && (L = this._rangeToMatrix({
+      startRow: P,
       startColumn: E,
       endRow: I,
-      endColumn: s
-    })), d != null && p.merge(d);
+      endColumn: l
+    })), L != null && p.merge(L);
     const c = p.getData();
     return o.push(...this._getDirtyRangesByCellValue(a, e, c)), o.push(...this._getDirtyRangesForArrayFormula(a, e, c)), o;
   }
   _getRemoveRowOrColumnMutation(n, e = !0) {
-    const { subUnitId: a, unitId: i, range: r } = n, o = [], u = this._univerInstanceService.getUniverSheetInstance(i), m = u == null ? void 0 : u.getSheetBySheetId(a), f = (m == null ? void 0 : m.getRowCount()) || 0, s = (m == null ? void 0 : m.getColumnCount()) || 0, p = new w();
-    let d = null;
-    const { startRow: L, endRow: E, startColumn: I, endColumn: S } = r;
-    e === !0 ? d = this._rangeToMatrix({
-      startRow: L,
+    const { subUnitId: a, unitId: i, range: r } = n, o = [], u = this._univerInstanceService.getUniverSheetInstance(i), m = u == null ? void 0 : u.getSheetBySheetId(a), f = (m == null ? void 0 : m.getRowCount()) || 0, l = (m == null ? void 0 : m.getColumnCount()) || 0, p = new w();
+    let L = null;
+    const { startRow: P, endRow: E, startColumn: I, endColumn: S } = r;
+    e === !0 ? L = this._rangeToMatrix({
+      startRow: P,
       startColumn: 0,
       endRow: E,
-      endColumn: s - 1
-    }) : d = this._rangeToMatrix({
+      endColumn: l - 1
+    }) : L = this._rangeToMatrix({
       startRow: 0,
       startColumn: I,
       endRow: f,
       endColumn: S
-    }), d != null && p.merge(d);
+    }), L != null && p.merge(L);
     const c = p.getData();
     return o.push(...this._getDirtyRangesByCellValue(i, a, c)), o.push(...this._getDirtyRangesForArrayFormula(i, a, c)), o;
   }
@@ -15757,12 +15762,12 @@ let $e = class extends te {
     const r = new w(a), o = this._formulaDataModel.getArrayFormulaRange();
     if ((u = o == null ? void 0 : o[n]) != null && u[e]) {
       const f = new w((m = o == null ? void 0 : o[n]) == null ? void 0 : m[e]);
-      r.forValue((s, p) => {
-        f.forValue((d, L, E) => {
+      r.forValue((l, p) => {
+        f.forValue((L, P, E) => {
           if (E == null)
             return !0;
           const { startRow: I, startColumn: S, endRow: c, endColumn: N } = E;
-          s >= I && s <= c && p >= S && p <= N && i.push({
+          l >= I && l <= c && p >= S && p <= N && i.push({
             unitId: n,
             sheetId: e,
             range: {
@@ -15814,8 +15819,8 @@ let je = class extends te {
         priority: 100,
         effect: Ka.Value,
         handler: (n, e, a) => {
-          var s, p, d;
-          const { unitId: i, subUnitId: r, row: o, col: u } = e, m = this._formulaDataModel.getArrayFormulaCellData(), f = (d = (p = (s = m == null ? void 0 : m[i]) == null ? void 0 : s[r]) == null ? void 0 : p[o]) == null ? void 0 : d[u];
+          var l, p, L;
+          const { unitId: i, subUnitId: r, row: o, col: u } = e, m = this._formulaDataModel.getArrayFormulaCellData(), f = (L = (p = (l = m == null ? void 0 : m[i]) == null ? void 0 : l[r]) == null ? void 0 : p[o]) == null ? void 0 : L[u];
           return f == null ? a(n) : f.v == null && f.t == null ? a({
             ...n,
             v: 0,
@@ -15932,8 +15937,8 @@ let ze = class extends te {
       return;
     const r = [];
     this._preUnitId = e, Array.from(Object.values(i)).forEach((o) => {
-      const { name: u, comment: m, formulaOrRefString: f, localSheetId: s } = o;
-      !this._descriptionService.hasDescription(u) && (s == null || s === mt || s === a) && r.push({
+      const { name: u, comment: m, formulaOrRefString: f, localSheetId: l } = o;
+      !this._descriptionService.hasDescription(u) && (l == null || l === mt || l === a) && r.push({
         functionName: u,
         description: f + (m || ""),
         abstract: f,