@univerjs/sheets-formula 0.15.1 → 0.15.2

package/lib/index.js

@@ -1,9 +1,9 @@
 var Wa = Object.defineProperty;
 var Ka = (a, e, n) => e in a ? Wa(a, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : a[e] = n;
 var K = (a, e, n) => Ka(a, typeof e != "symbol" ? e + "" : e, n);
-import { CommandType as ca, ICommandService as ue, ObjectMatrix as V, generateRandomId as la, IUniverInstanceService as Ee, Rectangle as fe, sequenceExecuteAsync as ka, Inject as H, Disposable as ee, CellValueType as xt, createDocumentModelWithStyle as Qa, WrapTextType as ja, PositionedObjectLayoutType as $a, BooleanNumber as za, ObjectRelativeFromV as Za, ObjectRelativeFromH as Ja, ImageSourceType as en, DrawingTypeEnum as tn, BuildTextUtils as an, InterceptorEffectEnum as _t, ILogService as nn, IConfigService as Ce, LocaleService as Gt, isFormulaString as Me, isFormulaId as sa, cellToRange as da, Tools as Xe, Direction as Ke, getIntersectRange as We, RANGE_TYPE as X, UniverInstanceType as $, Injector as ct, isRealNum as rn, createIdentifier as Ht, toDisposable as J, moveRangeByOffset as yt, DisposableCollection as ke, AbsoluteRefType as Qe, Optional as on, DependentOn as pa, Plugin as La, merge as Pa, touchDependencies as Ue, isNodeEnv as Xt } from "@univerjs/core";
-import { SetRangeValuesCommand as Ta, SheetsSelectionsService as un, getSheetCommandTarget as mn, findFirstNonEmptyCell as fn, alignToMergedCellsBorders as It, expandToContinuousRange as cn, SetSelectionsOperation as ln, SheetInterceptorService as lt, INTERCEPTOR_POINT as Ea, InterceptCellContentPriority as sn, SetRangeValuesMutation as Q, SetStyleCommand as wt, SetBorderCommand as Ia, ClearSelectionFormatCommand as Na, handleMoveCols as Ra, EffectRefRangId as w, runRefRangeMutations as Y, handleMoveRows as Sa, handleMoveRange as Aa, handleInsertRangeMoveRight as Ca, handleInsertRangeMoveDown as Da, handleDeleteRangeMoveUp as ba, handleDeleteRangeMoveLeft as Oa, handleIRemoveCol as Ma, handleIRemoveRow as xa, handleInsertCol as _a, handleInsertRow as ya, RemoveDefinedNameCommand as ga, SetDefinedNameCommand as qa, RemoveSheetCommand as dn, SetWorksheetNameCommand as pn, DeleteRangeMoveLeftCommand as Ln, DeleteRangeMoveUpCommand as Pn, RemoveColCommand as Tn, RemoveRowCommand as En, InsertRangeMoveDownCommand as In, InsertRangeMoveRightCommand as Nn, InsertColCommand as Rn, InsertRowCommand as Sn, MoveColsCommand as An, MoveRowsCommand as Cn, MoveRangeCommand as Dn, RemoveSheetMutation as gt, InsertSheetMutation as qt, SetRangeCustomMetadataCommand as bn, MoveRangeMutation as Wt, MoveRowsMutation as Kt, MoveColsMutation as kt, ReorderRangeMutation as Qt, RemoveRowMutation as jt, RemoveColMutation as $t, InsertColMutation as zt, InsertRowMutation as Zt, SetRowHiddenMutation as Jt, SetRowVisibleMutation as ea, SetWorksheetActiveOperation as ha, SCOPE_WORKBOOK_VALUE_DEFINED_NAME as Nt, RefRangeService as On, handleDefaultRangeChangeWithEffectRefCommands as ta, getSeparateEffectedRangesOnCommand as Mn, handleCommonDefaultRangeChangeWithEffectRefCommands as xn, UniverSheetsPlugin as _n } from "@univerjs/sheets";
-import { serializeRange as Se, FormulaDataModel as ye, ErrorType as k, SetImageFormulaDataMutation as yn, IActiveDirtyManagerService as Ua, RegisterOtherFormulaService as gn, SetFormulaCalculationStartMutation as Fe, SetFormulaStringBatchCalculationMutation as qn, ENGINE_FORMULA_RETURN_DEPENDENCY_TREE as hn, ENGINE_FORMULA_CYCLE_REFERENCE_COUNT as Un, SetFormulaCalculationStopMutation as aa, SetFormulaCalculationNotificationMutation as Fn, FormulaExecuteStageType as Be, FormulaExecutedStateType as be, SetTriggerFormulaCalculationStartMutation as je, sequenceNodeType as ie, deserializeRangeWithSheetWithCache as Pe, serializeRangeToRefString as st, IDefinedNamesService as dt, LexerTreeBuilder as pt, generateStringWithSequence as $e, SetDefinedNameMutation as Ae, SetFormulaDataMutation as ve, SetArrayFormulaDataMutation as ht, initSheetFormulaData as na, RemoveDefinedNameMutation as Ut, IFunctionService as Lt, SetFormulaCalculationResultMutation as Bn, stripErrorMargin as vn, FunctionType as t, FUNCTION_NAMES_ARRAY as ia, FUNCTION_NAMES_COMPATIBILITY as _, FUNCTION_NAMES_CUBE as de, FUNCTION_NAMES_DATABASE as j, FUNCTION_NAMES_DATE as v, FUNCTION_NAMES_ENGINEERING as C, FUNCTION_NAMES_FINANCIAL as D, FUNCTION_NAMES_INFORMATION as G, FUNCTION_NAMES_LOGICAL as W, FUNCTION_NAMES_LOOKUP as g, FUNCTION_NAMES_MATH as T, FUNCTION_NAMES_STATISTICAL as s, FUNCTION_NAMES_TEXT as b, FUNCTION_NAMES_WEB as Rt, isReferenceStrings as Vn, functionArray as Gn, functionCompatibility as Hn, functionCube as wn, functionDatabase as Yn, functionDate as Xn, functionEngineering as Wn, functionFinancial as Kn, functionInformation as kn, functionLogical as Qn, functionLookup as jn, functionMath as $n, functionMeta as zn, functionStatistical as Zn, functionText as Jn, functionUniver as ei, functionWeb as ti, OtherFormulaMarkDirty as ai, SetSuperTableMutation as ni, RemoveSuperTableMutation as ii, serializeRangeWithSheet as ze, ISuperTableService as ri, serializeRangeWithSpreadsheet as ra, CustomFunction as Ft, AsyncCustomFunction as Fa, UniverFormulaEnginePlugin as oi, IFormulaCurrentConfigService as ui, Lexer as mi, AstTreeBuilder as fi, Interpreter as ci, generateExecuteAstNodeData as li, getObjectValue as si } from "@univerjs/engine-formula";
+import { CommandType as ca, ICommandService as ue, ObjectMatrix as V, generateRandomId as la, IUniverInstanceService as Ee, Rectangle as fe, sequenceExecuteAsync as ka, Inject as H, Disposable as ee, CellValueType as xt, createDocumentModelWithStyle as Qa, WrapTextType as ja, PositionedObjectLayoutType as $a, BooleanNumber as za, ObjectRelativeFromV as Za, ObjectRelativeFromH as Ja, ImageSourceType as en, DrawingTypeEnum as tn, BuildTextUtils as an, InterceptorEffectEnum as _t, ILogService as nn, IConfigService as Ce, LocaleService as Gt, isFormulaString as Me, isFormulaId as sa, cellToRange as da, Tools as Xe, Direction as Ke, getIntersectRange as We, RANGE_TYPE as X, UniverInstanceType as k, Injector as ct, isRealNum as rn, createIdentifier as Ht, toDisposable as J, moveRangeByOffset as yt, DisposableCollection as ke, AbsoluteRefType as Qe, Optional as on, DependentOn as pa, Plugin as La, merge as Pa, touchDependencies as Ue, isNodeEnv as Xt } from "@univerjs/core";
+import { SetRangeValuesCommand as Ta, SheetsSelectionsService as un, getSheetCommandTarget as mn, findFirstNonEmptyCell as fn, alignToMergedCellsBorders as It, expandToContinuousRange as cn, SetSelectionsOperation as ln, SheetInterceptorService as lt, INTERCEPTOR_POINT as Ea, InterceptCellContentPriority as sn, SetRangeValuesMutation as j, SetStyleCommand as wt, SetBorderCommand as Ia, ClearSelectionFormatCommand as Na, handleMoveCols as Ra, EffectRefRangId as w, runRefRangeMutations as Y, handleMoveRows as Sa, handleMoveRange as Aa, handleInsertRangeMoveRight as Ca, handleInsertRangeMoveDown as Da, handleDeleteRangeMoveUp as ba, handleDeleteRangeMoveLeft as Oa, handleIRemoveCol as Ma, handleIRemoveRow as xa, handleInsertCol as _a, handleInsertRow as ya, RemoveDefinedNameCommand as ga, SetDefinedNameCommand as qa, RemoveSheetCommand as dn, SetWorksheetNameCommand as pn, DeleteRangeMoveLeftCommand as Ln, DeleteRangeMoveUpCommand as Pn, RemoveColCommand as Tn, RemoveRowCommand as En, InsertRangeMoveDownCommand as In, InsertRangeMoveRightCommand as Nn, InsertColCommand as Rn, InsertRowCommand as Sn, MoveColsCommand as An, MoveRowsCommand as Cn, MoveRangeCommand as Dn, RemoveSheetMutation as gt, InsertSheetMutation as qt, SetRangeCustomMetadataCommand as bn, MoveRangeMutation as Wt, MoveRowsMutation as Kt, MoveColsMutation as kt, ReorderRangeMutation as Qt, RemoveRowMutation as jt, RemoveColMutation as $t, InsertColMutation as zt, InsertRowMutation as Zt, SetRowHiddenMutation as Jt, SetRowVisibleMutation as ea, SetWorksheetActiveOperation as ha, SCOPE_WORKBOOK_VALUE_DEFINED_NAME as Nt, RefRangeService as On, handleDefaultRangeChangeWithEffectRefCommands as ta, getSeparateEffectedRangesOnCommand as Mn, handleCommonDefaultRangeChangeWithEffectRefCommands as xn, UniverSheetsPlugin as _n } from "@univerjs/sheets";
+import { serializeRange as Se, FormulaDataModel as ye, ErrorType as Q, SetImageFormulaDataMutation as yn, IActiveDirtyManagerService as Ua, RegisterOtherFormulaService as gn, SetFormulaCalculationStartMutation as Fe, SetFormulaStringBatchCalculationMutation as qn, ENGINE_FORMULA_RETURN_DEPENDENCY_TREE as hn, ENGINE_FORMULA_CYCLE_REFERENCE_COUNT as Un, SetFormulaCalculationStopMutation as aa, SetFormulaCalculationNotificationMutation as Fn, FormulaExecuteStageType as Be, FormulaExecutedStateType as be, SetTriggerFormulaCalculationStartMutation as je, sequenceNodeType as ie, deserializeRangeWithSheetWithCache as Pe, serializeRangeToRefString as st, IDefinedNamesService as dt, LexerTreeBuilder as pt, generateStringWithSequence as $e, SetDefinedNameMutation as Ae, SetFormulaDataMutation as ve, SetArrayFormulaDataMutation as ht, initSheetFormulaData as na, RemoveDefinedNameMutation as Ut, IFunctionService as Lt, SetFormulaCalculationResultMutation as Bn, stripErrorMargin as vn, FunctionType as t, FUNCTION_NAMES_ARRAY as ia, FUNCTION_NAMES_COMPATIBILITY as _, FUNCTION_NAMES_CUBE as de, FUNCTION_NAMES_DATABASE as $, FUNCTION_NAMES_DATE as v, FUNCTION_NAMES_ENGINEERING as C, FUNCTION_NAMES_FINANCIAL as D, FUNCTION_NAMES_INFORMATION as G, FUNCTION_NAMES_LOGICAL as W, FUNCTION_NAMES_LOOKUP as g, FUNCTION_NAMES_MATH as T, FUNCTION_NAMES_STATISTICAL as s, FUNCTION_NAMES_TEXT as b, FUNCTION_NAMES_WEB as Rt, isReferenceStrings as Vn, functionArray as Gn, functionCompatibility as Hn, functionCube as wn, functionDatabase as Yn, functionDate as Xn, functionEngineering as Wn, functionFinancial as Kn, functionInformation as kn, functionLogical as Qn, functionLookup as jn, functionMath as $n, functionMeta as zn, functionStatistical as Zn, functionText as Jn, functionUniver as ei, functionWeb as ti, OtherFormulaMarkDirty as ai, SetSuperTableMutation as ni, RemoveSuperTableMutation as ii, serializeRangeWithSheet as ze, ISuperTableService as ri, serializeRangeWithSpreadsheet as ra, CustomFunction as Ft, AsyncCustomFunction as Fa, UniverFormulaEnginePlugin as oi, IFormulaCurrentConfigService as ui, Lexer as mi, AstTreeBuilder as fi, Interpreter as ci, generateExecuteAstNodeData as li, getObjectValue as si } from "@univerjs/engine-formula";
 import { BehaviorSubject as di, map as pi } from "rxjs";
 import { IRPCChannelService as Ba, fromModule as Li, toModule as Pi } from "@univerjs/rpc";
 const Ti = {
@@ -11,21 +11,21 @@ const Ti = {
   type: ca.COMMAND,
   handler: async (a, e) => {
     const { list: n, listOfRangeHasNumber: i } = e, r = a.get(ue), o = new V();
-    n.forEach((f) => {
-      const { range: m, primary: c, formula: l } = f, { row: L, column: E } = c, p = la(6);
+    n.forEach((m) => {
+      const { range: f, primary: c, formula: l } = m, { row: L, column: E } = c, p = la(6);
       o.setValue(L, E, {
         f: l,
         si: p
       });
-      const { startRow: S, startColumn: A, endRow: I, endColumn: d } = m;
+      const { startRow: S, startColumn: A, endRow: I, endColumn: d } = f;
       for (let R = S; R <= I; R++)
         for (let N = A; N <= d; N++)
           (R !== L || N !== E) && o.setValue(R, N, {
             si: p
           });
-    }), i && i.length > 0 && i.forEach((f) => {
-      const { primary: m, formula: c } = f;
-      o.setValue(m.row, m.column, {
+    }), i && i.length > 0 && i.forEach((m) => {
+      const { primary: f, formula: c } = m;
+      o.setValue(f.row, f.column, {
         f: c
       });
     });
@@ -43,41 +43,41 @@ const Ti = {
     const i = a.get(Ee), r = mn(i);
     if (!r) return !1;
     const o = n.range, { worksheet: u } = r;
-    let f = fn(o, u);
-    if (!f) return !1;
-    f = It(f, u);
-    const m = cn({
-      startRow: f.startRow,
-      startColumn: f.startColumn,
+    let m = fn(o, u);
+    if (!m) return !1;
+    m = It(m, u);
+    const f = cn({
+      startRow: m.startRow,
+      startColumn: m.startColumn,
       endRow: o.endRow,
       endColumn: o.endColumn
     }, { left: !0, right: !0, up: !0, down: !0 }, u), c = new V(), l = It({
-      startRow: m.endRow,
-      endRow: m.endRow,
-      startColumn: m.startColumn,
-      endColumn: m.endColumn
+      startRow: f.endRow,
+      endRow: f.endRow,
+      startColumn: f.startColumn,
+      endColumn: f.endColumn
     }, u);
-    if (!fe.equals(l, m))
+    if (!fe.equals(l, f))
       for (const p of u.iterateByColumn(l))
         (!p.value || !u.cellHasValue(p.value)) && c.setValue(p.row, p.col, {
           f: `=SUM(${Se({
             startColumn: p.col,
             endColumn: p.col,
-            startRow: m.startRow,
+            startRow: f.startRow,
             endRow: p.row - 1
           })})`
         });
     const L = It({
-      startRow: m.startRow,
-      startColumn: m.endColumn,
-      endRow: m.endRow,
-      endColumn: m.endColumn
+      startRow: f.startRow,
+      startColumn: f.endColumn,
+      endRow: f.endRow,
+      endColumn: f.endColumn
     }, u);
-    if (!fe.equals(L, m))
+    if (!fe.equals(L, f))
       for (const p of u.iterateByRow(L))
         (!p.value || !u.cellHasValue(p.value)) && c.setValue(p.row, p.col, {
           f: `=SUM(${Se({
-            startColumn: m.startColumn,
+            startColumn: f.startColumn,
             endColumn: p.col - 1,
             startRow: p.row,
             endRow: p.row
@@ -88,7 +88,7 @@ const Ti = {
       {
         id: Ta.id,
         params: {
-          range: m,
+          range: f,
           value: c.getMatrix()
         }
       },
@@ -98,8 +98,8 @@ const Ti = {
           unitId: r.unitId,
           subUnitId: r.subUnitId,
           selections: [{
-            range: m,
-            primary: fe.contains(m, n.primary) ? n.primary : { ...f, actualRow: f.startRow, actualColumn: f.startColumn },
+            range: f,
+            primary: fe.contains(f, n.primary) ? n.primary : { ...m, actualRow: m.startRow, actualColumn: m.startColumn },
             style: null
           }]
         }
@@ -118,7 +118,7 @@ let Ze = class extends ee {
   constructor(e, n, i) {
     super();
     K(this, "_errorValueCell", {
-      v: k.VALUE,
+      v: Q.VALUE,
       t: xt.STRING
     });
     K(this, "_refreshRender");
@@ -139,8 +139,8 @@ let Ze = class extends ee {
             i.map((u) => this._getImageNatureSize(u))
           ), o = {};
           r.forEach((u) => {
-            const { unitId: f, sheetId: m, row: c, column: l, ...L } = u;
-            o[f] || (o[f] = {}), o[f][m] || (o[f][m] = new V()), o[f][m].setValue(c, l, L);
+            const { unitId: m, sheetId: f, row: c, column: l, ...L } = u;
+            o[m] || (o[m] = {}), o[m][f] || (o[m][f] = new V()), o[m][f].setValue(c, l, L);
           }), this._formulaDataModel.mergeUnitImageFormulaData(o), this._refreshRender();
         }
       })
@@ -155,7 +155,7 @@ let Ze = class extends ee {
         // eslint-disable-next-line max-lines-per-function
         handler: (e, n, i) => {
           var q, M;
-          const { unitId: r, subUnitId: o, row: u, col: f } = n, m = this._formulaDataModel.getUnitImageFormulaData(), c = (M = (q = m == null ? void 0 : m[r]) == null ? void 0 : q[o]) == null ? void 0 : M.getValue(u, f);
+          const { unitId: r, subUnitId: o, row: u, col: m } = n, f = this._formulaDataModel.getUnitImageFormulaData(), c = (M = (q = f == null ? void 0 : f[r]) == null ? void 0 : q[o]) == null ? void 0 : M.getValue(u, m);
           if (!c)
             return i(e);
           const {
@@ -268,7 +268,7 @@ var Si = Object.getOwnPropertyDescriptor, Ai = (a, e, n, i) => {
 }, pe = (a, e) => (n, i) => e(n, i, a);
 const ma = { done: 0, count: 0 }, At = { onlyLocal: !0 };
 let xe = class extends ee {
-  constructor(e, n, i, r, o, u, f) {
+  constructor(e, n, i, r, o, u, m) {
     super();
     K(this, "_waitingCommandQueue", []);
     K(this, "_executingDirtyData", {
@@ -288,7 +288,7 @@ let xe = class extends ee {
     K(this, "_restartCalculation", !1);
     K(this, "_progress$", new di(ma));
     K(this, "progress$", this._progress$.asObservable());
-    this._commandService = e, this._activeDirtyManagerService = n, this._logService = i, this._configService = r, this._formulaDataModel = o, this._localeService = u, this._registerOtherFormulaService = f, this._commandExecutedListener(), this._initialExecuteFormulaProcessListener(), this._initialExecuteFormula();
+    this._commandService = e, this._activeDirtyManagerService = n, this._logService = i, this._configService = r, this._formulaDataModel = o, this._localeService = u, this._registerOtherFormulaService = m, this._commandExecutedListener(), this._initialExecuteFormulaProcessListener(), this._initialExecuteFormula();
   }
   _emitProgress(e) {
     this._progress$.next({ done: this._doneCalculationTaskCount, count: this._totalCalculationTaskCount, label: e });
@@ -337,7 +337,7 @@ let xe = class extends ee {
     ), this.disposeWithMe(
       this._commandService.onCommandExecuted((e, n) => {
         if (this._activeDirtyManagerService.get(e.id)) {
-          if (e.id === Q.id) {
+          if (e.id === j.id) {
             const i = e.params;
             if (n && n.onlyLocal === !0 || i.trigger === wt.id || i.trigger === Ia.id || i.trigger === Na.id)
               return;
@@ -351,14 +351,14 @@ let xe = class extends ee {
     );
   }
   _generateDirty(e) {
-    const n = [], i = {}, r = {}, o = {}, u = {}, f = {};
-    let m = !1;
+    const n = [], i = {}, r = {}, o = {}, u = {}, m = {};
+    let f = !1;
     for (const c of e) {
       const l = this._activeDirtyManagerService.get(c.id);
       if (l == null)
         continue;
       const L = l.getDirtyData(c), { dirtyRanges: E, dirtyNameMap: p, dirtyDefinedNameMap: S, dirtyUnitFeatureMap: A, dirtyUnitOtherFormulaMap: I, clearDependencyTreeCache: d, forceCalculation: R = !1 } = L;
-      E != null && this._mergeDirtyRanges(n, E), p != null && this._mergeDirtyNameMap(i, p), S != null && this._mergeDirtyNameMap(r, S), A != null && this._mergeDirtyUnitFeatureOrOtherFormulaMap(o, A), I != null && this._mergeDirtyUnitFeatureOrOtherFormulaMap(u, I), d != null && this._mergeDirtyNameMap(f, d), m = m || R;
+      E != null && this._mergeDirtyRanges(n, E), p != null && this._mergeDirtyNameMap(i, p), S != null && this._mergeDirtyNameMap(r, S), A != null && this._mergeDirtyUnitFeatureOrOtherFormulaMap(o, A), I != null && this._mergeDirtyUnitFeatureOrOtherFormulaMap(u, I), d != null && this._mergeDirtyNameMap(m, d), f = f || R;
     }
     return {
       dirtyRanges: n,
@@ -366,23 +366,23 @@ let xe = class extends ee {
       dirtyDefinedNameMap: r,
       dirtyUnitFeatureMap: o,
       dirtyUnitOtherFormulaMap: u,
-      forceCalculation: m,
-      clearDependencyTreeCache: f
+      forceCalculation: f,
+      clearDependencyTreeCache: m
       // numfmtItemMap,
     };
   }
   _mergeDirty(e, n) {
-    const i = [...e.dirtyRanges, ...n.dirtyRanges], r = { ...e.dirtyNameMap }, o = { ...e.dirtyDefinedNameMap }, u = { ...e.dirtyUnitFeatureMap }, f = { ...e.dirtyUnitOtherFormulaMap }, m = { ...e.clearDependencyTreeCache };
-    this._mergeDirtyNameMap(r, n.dirtyNameMap), this._mergeDirtyNameMap(o, n.dirtyDefinedNameMap), this._mergeDirtyUnitFeatureOrOtherFormulaMap(u, n.dirtyUnitFeatureMap), this._mergeDirtyUnitFeatureOrOtherFormulaMap(f, n.dirtyUnitOtherFormulaMap), this._mergeDirtyNameMap(m, n.clearDependencyTreeCache);
+    const i = [...e.dirtyRanges, ...n.dirtyRanges], r = { ...e.dirtyNameMap }, o = { ...e.dirtyDefinedNameMap }, u = { ...e.dirtyUnitFeatureMap }, m = { ...e.dirtyUnitOtherFormulaMap }, f = { ...e.clearDependencyTreeCache };
+    this._mergeDirtyNameMap(r, n.dirtyNameMap), this._mergeDirtyNameMap(o, n.dirtyDefinedNameMap), this._mergeDirtyUnitFeatureOrOtherFormulaMap(u, n.dirtyUnitFeatureMap), this._mergeDirtyUnitFeatureOrOtherFormulaMap(m, n.dirtyUnitOtherFormulaMap), this._mergeDirtyNameMap(f, n.clearDependencyTreeCache);
     const c = e.forceCalculation || n.forceCalculation;
     return {
       dirtyRanges: i,
       dirtyNameMap: r,
       dirtyDefinedNameMap: o,
       dirtyUnitFeatureMap: u,
-      dirtyUnitOtherFormulaMap: f,
+      dirtyUnitOtherFormulaMap: m,
       forceCalculation: c,
-      clearDependencyTreeCache: m
+      clearDependencyTreeCache: f
     };
   }
   /**
@@ -395,8 +395,8 @@ let xe = class extends ee {
       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: l, startColumn: L, endRow: E, endColumn: p } = o.range;
-          if (u === l && f === L && m === E && c === p) {
+          const { startRow: u, startColumn: m, endRow: f, endColumn: c } = i.range, { startRow: l, startColumn: L, endRow: E, endColumn: p } = o.range;
+          if (u === l && m === L && f === E && c === p) {
             r = !0;
             break;
           }
@@ -553,9 +553,9 @@ function Oi(a, e) {
     const o = e[r], u = a[r];
     if (o == null || u == null)
       return !0;
-    Object.keys(o).forEach((f) => {
-      const m = new V(o[f] || {}), c = new V(u[f] || {}), l = new V(), L = new V();
-      if (m.forValue((I, d, R) => {
+    Object.keys(o).forEach((m) => {
+      const f = new V(o[m] || {}), c = new V(u[m] || {}), l = new V(), L = new V();
+      if (f.forValue((I, d, R) => {
         if (R == null)
           return !0;
         const N = _e(R);
@@ -563,20 +563,20 @@ function Oi(a, e) {
       }), l.getSizeOf() === 0)
         return;
       const E = {
-        subUnitId: f,
+        subUnitId: m,
         unitId: r,
         cellValue: l.getMatrix()
       }, p = {
-        id: Q.id,
+        id: j.id,
         params: E
       };
       i.push(p);
       const S = {
-        subUnitId: f,
+        subUnitId: m,
         unitId: r,
         cellValue: L.getMatrix()
       }, A = {
-        id: Q.id,
+        id: j.id,
         params: S
       };
       n.push(A);
@@ -588,29 +588,29 @@ function Oi(a, e) {
 }
 function Mi(a, e, n) {
   const { redoFormulaData: i, undoFormulaData: r } = xi(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) {
+  return Object.keys(i).forEach((m) => {
+    Object.keys(i[m]).forEach((f) => {
+      if (Object.keys(i[m][f]).length !== 0) {
         const c = {
-          subUnitId: m,
-          unitId: f,
-          cellValue: i[f][m]
+          subUnitId: f,
+          unitId: m,
+          cellValue: i[m][f]
         }, l = {
-          id: Q.id,
+          id: j.id,
           params: c
         };
         o.push(l);
       }
     });
-  }), Object.keys(r).forEach((f) => {
-    Object.keys(r[f]).forEach((m) => {
-      if (Object.keys(r[f][m]).length !== 0) {
+  }), Object.keys(r).forEach((m) => {
+    Object.keys(r[m]).forEach((f) => {
+      if (Object.keys(r[m][f]).length !== 0) {
         const c = {
-          subUnitId: m,
-          unitId: f,
-          cellValue: r[f][m]
+          subUnitId: f,
+          unitId: m,
+          cellValue: r[m][f]
         }, l = {
-          id: Q.id,
+          id: j.id,
           params: c
         };
         u.push(l);
@@ -623,23 +623,23 @@ function Mi(a, e, n) {
 }
 function xi(a, e, n) {
   const i = {}, r = {}, { unitId: o, sheetId: u } = n;
-  return (/* @__PURE__ */ new Set([...Object.keys(a), ...Object.keys(e)])).forEach((m) => {
-    if (Ci(a, m, u))
+  return (/* @__PURE__ */ new Set([...Object.keys(a), ...Object.keys(e)])).forEach((f) => {
+    if (Ci(a, f, u))
       return;
     (/* @__PURE__ */ new Set([
-      ...Object.keys(a[m] || {}),
-      ...Object.keys(e[m] || {})
+      ...Object.keys(a[f] || {}),
+      ...Object.keys(e[f] || {})
     ])).forEach((l) => {
       var R, N;
-      const L = (R = a[m]) == null ? void 0 : R[l], E = (N = e[m]) == null ? void 0 : N[l], p = new V(L || {}), S = new V(E || {});
+      const L = (R = a[f]) == null ? void 0 : R[l], E = (N = e[f]) == null ? void 0 : N[l], p = new V(L || {}), S = new V(E || {});
       let A = [];
-      m !== o || l !== u ? A = yi(S) : A = _i(p, S, n);
+      f !== o || l !== u ? A = yi(S) : A = _i(p, S, n);
       const I = Wi(A, p, S), d = Ki(A, p);
-      i[m] || (i[m] = {}), r[m] || (r[m] = {}), i[m][l] = {
-        ...i[m][l],
+      i[f] || (i[f] = {}), r[f] || (r[f] = {}), i[f][l] = {
+        ...i[f][l],
         ...I
-      }, r[m][l] = {
-        ...r[m][l],
+      }, r[f][l] = {
+        ...r[f][l],
         ...d
       };
     });
@@ -649,10 +649,10 @@ function xi(a, e, n) {
   };
 }
 function _i(a, e, n) {
-  const { type: i, from: r, to: o, range: u } = n, f = [];
-  return a.forValue((m, c, l) => {
+  const { type: i, from: r, to: o, range: u } = n, m = [];
+  return a.forValue((f, c, l) => {
     if (l == null || !va(l)) return !0;
-    const L = da(m, c);
+    const L = da(f, c);
     let E = null, p = !1;
     if ([
       0,
@@ -665,10 +665,10 @@ function _i(a, e, n) {
       const S = qi(L, n);
       E = S.newCell, p = S.isReverse;
     }
-    if (Xe.diffValue(L, E) && !e.getValue(m, c))
+    if (Xe.diffValue(L, E) && !e.getValue(f, c))
       return !0;
-    p ? f.unshift({ oldCell: L, newCell: E }) : f.push({ oldCell: L, newCell: E });
-  }), f;
+    p ? m.unshift({ oldCell: L, newCell: E }) : m.push({ oldCell: L, newCell: E });
+  }), m;
 }
 function yi(a) {
   const e = [];
@@ -837,10 +837,10 @@ function Xi(a, e) {
 function Wi(a, e, n) {
   var r, o, u;
   const i = new V({});
-  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 l = (u = n.getValue(m.startRow, m.startColumn)) != null ? u : e.getValue(m.startRow, m.startColumn), L = _e(l);
+  for (let m = 0; m < a.length; m++) {
+    const { oldCell: f, newCell: c } = a[m];
+    if ((r = i.getValue(f.startRow, f.startColumn)) != null && r.f || (o = i.getValue(f.startRow, f.startColumn)) != null && o.si || i.setValue(f.startRow, f.startColumn, { f: null, si: null }), c) {
+      const l = (u = n.getValue(f.startRow, f.startColumn)) != null ? u : e.getValue(f.startRow, f.startColumn), L = _e(l);
       i.setValue(c.startRow, c.startColumn, L);
     }
   }
@@ -849,16 +849,18 @@ function Wi(a, e, n) {
 function Ki(a, e) {
   const n = new V({});
   for (let i = a.length - 1; i >= 0; i--) {
-    const { oldCell: r, newCell: o } = a[i], u = e.getValue(r.startRow, r.startColumn), f = _e(u);
-    if (n.setValue(r.startRow, r.startColumn, f), o) {
-      const m = e.getValue(o.startRow, o.startColumn), c = _e(m);
+    const { oldCell: r, newCell: o } = a[i], u = e.getValue(r.startRow, r.startColumn), m = _e(u);
+    if (n.setValue(r.startRow, r.startColumn, m), o) {
+      const f = e.getValue(o.startRow, o.startColumn), c = _e(f);
       n.setValue(o.startRow, o.startColumn, c != null ? c : { f: null, si: null });
     }
   }
   return n.getMatrix();
 }
 function _e(a) {
-  if (a == null)
+  if (a === void 0)
+    return;
+  if (a === null)
     return {
       f: null,
       si: null
@@ -869,15 +871,16 @@ function _e(a) {
       f: null,
       si: null
     };
-  const f = {};
-  return u && (f.si = n), o && i === 0 && r === 0 && (f.f = e), f.f === void 0 && (f.f = null), f.si === void 0 && (f.si = null), f;
+  const m = {};
+  return u && (m.si = n), o && i === 0 && r === 0 && (m.f = e), m.f === void 0 && (m.f = null), m.si === void 0 && (m.si = null), m;
 }
-function ki(a) {
-  const e = new V({});
-  return new V(a).forValue((i, r, o) => {
-    const u = _e(o);
-    u !== void 0 && e.setValue(i, r, u);
-  }), e.getMatrix();
+function ki(a, e) {
+  const n = new V({});
+  return new V(a).forValue((r, o, u) => {
+    var f;
+    const m = _e(u);
+    m !== void 0 && (e && ((f = e[r]) != null && f[o]) && (m != null && m.f || m != null && m.si) && (m.v = null, m.t = null), n.setValue(r, o, m));
+  }), n.getMatrix();
 }
 function va(a) {
   const e = (a == null ? void 0 : a.f) || "", n = (a == null ? void 0 : a.si) || "", i = Me(e), r = sa(n);
@@ -894,14 +897,14 @@ function Va(a, e, n, i, r, o) {
 function Ga(a, e, n = 0, i = 0) {
   const r = [];
   for (let o = 0, u = a.length; o < u; o++) {
-    const f = a[o];
-    if (typeof f == "string" || f.nodeType !== ie.REFERENCE || e.includes(o)) {
-      r.push(f);
+    const m = a[o];
+    if (typeof m == "string" || m.nodeType !== ie.REFERENCE || e.includes(o)) {
+      r.push(m);
       continue;
     }
-    const { token: m } = f, c = Pe(m), { range: l, sheetName: L, unitId: E } = c, p = fe.moveOffset(l, n, i);
+    const { token: f } = m, c = Pe(f), { range: l, sheetName: L, unitId: E } = c, p = fe.moveOffset(l, n, i);
     r.push({
-      ...f,
+      ...m,
       token: st({
         range: p,
         unitId: E,
@@ -912,7 +915,7 @@ function Ga(a, e, n = 0, i = 0) {
   return r;
 }
 function Ha(a, e, n, i) {
-  const { type: r, unitId: o, sheetId: u, range: f, from: m, to: c, rangeFilteredRows: l } = e, {
+  const { type: r, unitId: o, sheetId: u, range: m, from: f, to: c, rangeFilteredRows: l } = e, {
     range: L,
     sheetId: E,
     unitId: p,
@@ -932,24 +935,24 @@ function Ha(a, e, n, i) {
   const d = fe.moveOffset(L, A, I);
   let R = null;
   if (r === y.MoveRange) {
-    if (m == null || c == null)
+    if (f == null || c == null)
       return;
-    const N = bt(d, m), P = We(d, m);
+    const N = bt(d, f), P = We(d, f);
     if (P == null || N !== 4)
       return;
     const q = Aa(
-      { id: w.MoveRangeCommandId, params: { toRange: c, fromRange: m } },
+      { id: w.MoveRangeCommandId, params: { toRange: c, fromRange: f } },
       P
     ), M = Y(q, P);
     if (M == null)
-      return k.REF;
-    R = Dt(N, M, m, c, d, P);
+      return Q.REF;
+    R = Dt(N, M, f, c, d, P);
   } else if (r === y.MoveRows) {
-    if (m == null || c == null)
+    if (f == null || c == null)
       return;
-    const N = bt(d, m);
-    let P = We(d, m);
-    if (P == null && (m.endRow < d.startRow && c.endRow <= d.startRow || m.startRow > d.endRow && c.startRow > d.endRow))
+    const N = bt(d, f);
+    let P = We(d, f);
+    if (P == null && (f.endRow < d.startRow && c.endRow <= d.startRow || f.startRow > d.endRow && c.startRow > d.endRow))
       return;
     P == null && (P = {
       startRow: d.startRow,
@@ -959,18 +962,18 @@ function Ha(a, e, n, i) {
       rangeType: X.NORMAL
     });
     const q = Sa(
-      { id: w.MoveRowsCommandId, params: { toRange: c, fromRange: m } },
+      { id: w.MoveRowsCommandId, params: { toRange: c, fromRange: f } },
       P
     ), M = Y(q, P);
     if (M == null)
-      return k.REF;
-    R = Dt(N, M, m, c, d, P);
+      return Q.REF;
+    R = Dt(N, M, f, c, d, P);
   } else if (r === y.MoveCols) {
-    if (m == null || c == null)
+    if (f == null || c == null)
       return;
-    const N = bt(d, m);
-    let P = We(d, m);
-    if (P == null && (m.endColumn < d.startColumn && c.endColumn <= d.startColumn || m.startColumn > d.endColumn && c.startColumn > d.endColumn))
+    const N = bt(d, f);
+    let P = We(d, f);
+    if (P == null && (f.endColumn < d.startColumn && c.endColumn <= d.startColumn || f.startColumn > d.endColumn && c.startColumn > d.endColumn))
       return;
     P == null && (P = {
       startRow: d.startRow,
@@ -980,19 +983,19 @@ function Ha(a, e, n, i) {
       rangeType: X.NORMAL
     });
     const q = Ra(
-      { id: w.MoveColsCommandId, params: { toRange: c, fromRange: m } },
+      { id: w.MoveColsCommandId, params: { toRange: c, fromRange: f } },
       P
     ), M = Y(q, P);
     if (M == null)
-      return k.REF;
-    R = Dt(N, M, m, c, d, P);
+      return Q.REF;
+    R = Dt(N, M, f, c, d, P);
   }
-  if (f != null) {
+  if (m != null) {
     if (r === y.InsertRow) {
       const N = ya(
         {
           id: w.InsertRowCommandId,
-          params: { range: f, unitId: "", subUnitId: "", direction: Ke.DOWN }
+          params: { range: m, unitId: "", subUnitId: "", direction: Ke.DOWN }
         },
         d
       ), P = Y(N, d);
@@ -1006,7 +1009,7 @@ function Ha(a, e, n, i) {
       const N = _a(
         {
           id: w.InsertColCommandId,
-          params: { range: f, unitId: "", subUnitId: "", direction: Ke.RIGHT }
+          params: { range: m, unitId: "", subUnitId: "", direction: Ke.RIGHT }
         },
         d
       ), P = Y(N, d);
@@ -1020,13 +1023,13 @@ function Ha(a, e, n, i) {
       const N = xa(
         {
           id: w.RemoveRowCommandId,
-          params: { range: f }
+          params: { range: m }
         },
         d,
         l
       ), P = Y(N, d);
       if (P == null)
-        return k.REF;
+        return Q.REF;
       R = {
         ...d,
         ...P
@@ -1035,12 +1038,12 @@ function Ha(a, e, n, i) {
       const N = Ma(
         {
           id: w.RemoveColCommandId,
-          params: { range: f }
+          params: { range: m }
         },
         d
       ), P = Y(N, d);
       if (P == null)
-        return k.REF;
+        return Q.REF;
       R = {
         ...d,
         ...P
@@ -1049,12 +1052,12 @@ function Ha(a, e, n, i) {
       const N = Oa(
         {
           id: w.DeleteRangeMoveLeftCommandId,
-          params: { range: f }
+          params: { range: m }
         },
         d
       ), P = Y(N, d);
       if (P == null)
-        return k.REF;
+        return Q.REF;
       R = {
         ...d,
         ...P
@@ -1063,12 +1066,12 @@ function Ha(a, e, n, i) {
       const N = ba(
         {
           id: w.DeleteRangeMoveUpCommandId,
-          params: { range: f }
+          params: { range: m }
         },
         d
       ), P = Y(N, d);
       if (P == null)
-        return k.REF;
+        return Q.REF;
       R = {
         ...d,
         ...P
@@ -1077,7 +1080,7 @@ function Ha(a, e, n, i) {
       const N = Da(
         {
           id: w.InsertRangeMoveDownCommandId,
-          params: { range: f }
+          params: { range: m }
         },
         d
       ), P = Y(N, d);
@@ -1091,7 +1094,7 @@ function Ha(a, e, n, i) {
       const N = Ca(
         {
           id: w.InsertRangeMoveRightCommandId,
-          params: { range: f }
+          params: { range: m }
         },
         d
       ), P = Y(N, d);
@@ -1111,7 +1114,7 @@ function Ha(a, e, n, i) {
     });
 }
 function Dt(a, e, n, i, r, o) {
-  const { startRow: u, endRow: f, startColumn: m, endColumn: c, rangeType: l } = Oe(e), {
+  const { startRow: u, endRow: m, startColumn: f, endColumn: c, rangeType: l } = Oe(e), {
     startRow: L,
     startColumn: E,
     endRow: p,
@@ -1130,10 +1133,10 @@ function Dt(a, e, n, i, r, o) {
     rangeType: ae = X.NORMAL
   } = Oe(r), O = { ...r };
   function ce() {
-    return l === X.COLUMN && ae === X.COLUMN ? !0 : m >= F && c <= B;
+    return l === X.COLUMN && ae === X.COLUMN ? !0 : f >= F && c <= B;
   }
   function ne() {
-    return l === X.ROW && ae === X.ROW ? !0 : u >= h && f <= x;
+    return l === X.ROW && ae === X.ROW ? !0 : u >= h && m <= x;
   }
   if (a === 0)
     if (ce())
@@ -1147,9 +1150,9 @@ function Dt(a, e, n, i, r, o) {
       return;
   else if (a === 1)
     if (ce())
-      if (f > x)
-        O.endRow = f;
-      else if (f <= h)
+      if (m > x)
+        O.endRow = m;
+      else if (m <= h)
         O.startRow += x - L + 1;
       else
         return;
@@ -1157,9 +1160,9 @@ function Dt(a, e, n, i, r, o) {
       return;
   else if (a === 2)
     if (ne())
-      if (m < F)
-        O.startColumn = m;
-      else if (m >= B)
+      if (f < F)
+        O.startColumn = f;
+      else if (f >= B)
         O.endColumn -= S + 1 - F;
       else
         return;
@@ -1175,21 +1178,21 @@ function Dt(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 <= F && S >= B || A === X.ROW && ae === X.ROW ? n.endRow < h ? (I >= h && (O.startRow -= p - L + 1), I >= x && (O.endRow -= p - L + 1)) : n.startRow > x ? (R <= x && (O.endRow += p - L + 1), R <= h && (O.startRow += p - L + 1)) : n.startRow >= h && n.endRow <= x && (I <= h ? O.startRow += p - L + 1 : I >= x && (O.endRow -= p - L + 1)) : L <= h && p >= x || A === X.COLUMN && ae === X.COLUMN ? n.endColumn < F ? (d >= F && (O.startColumn -= S - E + 1), d >= B && (O.endColumn -= S - E + 1)) : n.startColumn > B ? (N <= B && (O.endColumn += S - E + 1), N <= F && (O.startColumn += S - E + 1)) : n.startColumn >= F && n.endColumn <= B && (d <= F ? O.startColumn += S - E + 1 : d >= B && (O.endColumn -= S - E + 1)) : ((d <= U + 1 && N >= B || d <= F && N >= M - 1) && I <= h && R >= x || (I <= q + 1 && R >= x || I <= h && R >= P - 1) && d <= F && N >= B, O.startRow = u, O.startColumn = m, O.endRow = f, O.endColumn = c);
+  else a === 4 ? (O.startRow = u, O.startColumn = f, O.endRow = m, O.endColumn = c) : E <= F && S >= B || A === X.ROW && ae === X.ROW ? n.endRow < h ? (I >= h && (O.startRow -= p - L + 1), I >= x && (O.endRow -= p - L + 1)) : n.startRow > x ? (R <= x && (O.endRow += p - L + 1), R <= h && (O.startRow += p - L + 1)) : n.startRow >= h && n.endRow <= x && (I <= h ? O.startRow += p - L + 1 : I >= x && (O.endRow -= p - L + 1)) : L <= h && p >= x || A === X.COLUMN && ae === X.COLUMN ? n.endColumn < F ? (d >= F && (O.startColumn -= S - E + 1), d >= B && (O.endColumn -= S - E + 1)) : n.startColumn > B ? (N <= B && (O.endColumn += S - E + 1), N <= F && (O.startColumn += S - E + 1)) : n.startColumn >= F && n.endColumn <= B && (d <= F ? O.startColumn += S - E + 1 : d >= B && (O.endColumn -= S - E + 1)) : ((d <= U + 1 && N >= B || d <= F && N >= M - 1) && I <= h && R >= x || (I <= q + 1 && R >= x || I <= h && R >= P - 1) && d <= F && N >= B, O.startRow = u, O.startColumn = f, O.endRow = m, O.endColumn = c);
   return O;
 }
 function bt(a, e) {
-  const n = Ne(a.startRow), i = Re(a.endRow), r = Ne(a.startColumn), o = Re(a.endColumn), u = Ne(e.startRow), f = Re(e.endRow), m = Ne(e.startColumn), c = Re(e.endColumn);
+  const n = Ne(a.startRow), i = Re(a.endRow), r = Ne(a.startColumn), o = Re(a.endColumn), u = Ne(e.startRow), m = Re(e.endRow), f = Ne(e.startColumn), c = Re(e.endColumn);
   function l() {
-    return a.rangeType === X.COLUMN && e.rangeType === X.COLUMN ? !0 : n >= u && i <= f;
+    return a.rangeType === X.COLUMN && e.rangeType === X.COLUMN ? !0 : n >= u && i <= m;
   }
   function L() {
-    return a.rangeType === X.ROW && e.rangeType === X.ROW ? !0 : r >= m && o <= c;
+    return a.rangeType === X.ROW && e.rangeType === X.ROW ? !0 : r >= f && o <= c;
   }
   function E() {
     return a.rangeType === X.ALL && e.rangeType === X.ALL;
   }
-  return l() && L() || E() ? 4 : L() && n >= u && n <= f && i > f ? 0 : L() && i >= u && i <= f && n < u ? 1 : l() && r >= m && r <= c && o > c ? 2 : l() && o >= m && o <= c && r < m ? 3 : null;
+  return l() && L() || E() ? 4 : L() && n >= u && n <= m && i > m ? 0 : L() && i >= u && i <= m && n < u ? 1 : l() && r >= f && r <= c && o > c ? 2 : l() && o >= f && o <= c && r < f ? 3 : null;
 }
 function Ne(a) {
   return isNaN(a) ? -1 / 0 : a;
@@ -1287,26 +1290,26 @@ function ji(a, e) {
   const {
     fromRange: { startRow: i, endRow: r },
     toRange: { startRow: o, endRow: u }
-  } = n, f = e.getUnitId(), m = e.getActiveSheet();
-  if (!m) return null;
-  const c = m.getSheetId(), l = {
+  } = n, m = e.getUnitId(), f = e.getActiveSheet();
+  if (!f) return null;
+  const c = f.getSheetId(), l = {
     startRow: i,
     startColumn: 0,
     endRow: r,
-    endColumn: m.getColumnCount() - 1,
+    endColumn: f.getColumnCount() - 1,
     rangeType: X.ROW
   }, L = {
     startRow: o,
     startColumn: 0,
     endRow: u,
-    endColumn: m.getColumnCount() - 1,
+    endColumn: f.getColumnCount() - 1,
     rangeType: X.ROW
   };
   return {
     type: y.MoveRows,
     from: l,
     to: L,
-    unitId: f,
+    unitId: m,
     sheetId: c
   };
 }
@@ -1316,18 +1319,18 @@ function $i(a, e) {
   const {
     fromRange: { startColumn: i, endColumn: r },
     toRange: { startColumn: o, endColumn: u }
-  } = n, f = e.getUnitId(), m = e.getActiveSheet();
-  if (!m) return null;
-  const c = m.getSheetId(), l = {
+  } = n, m = e.getUnitId(), f = e.getActiveSheet();
+  if (!f) return null;
+  const c = f.getSheetId(), l = {
     startRow: 0,
     startColumn: i,
-    endRow: m.getRowCount() - 1,
+    endRow: f.getRowCount() - 1,
     endColumn: r,
     rangeType: X.COLUMN
   }, L = {
     startRow: 0,
     startColumn: o,
-    endRow: m.getRowCount() - 1,
+    endRow: f.getRowCount() - 1,
     endColumn: u,
     rangeType: X.COLUMN
   };
@@ -1335,7 +1338,7 @@ function $i(a, e) {
     type: y.MoveCols,
     from: l,
     to: L,
-    unitId: f,
+    unitId: m,
     sheetId: c
   };
 }
@@ -1384,7 +1387,7 @@ function er(a, e) {
   };
 }
 function tr(a, e) {
-  var u, f;
+  var u, m;
   const { params: n } = a;
   if (!n) return null;
   const { range: i } = n, { unitId: r, sheetId: o } = te(e);
@@ -1393,7 +1396,7 @@ function tr(a, e) {
     range: i,
     unitId: r,
     sheetId: o,
-    rangeFilteredRows: (f = (u = e.getSheetBySheetId(o)) == null ? void 0 : u.getRangeFilterRows(i)) != null ? f : []
+    rangeFilteredRows: (m = (u = e.getSheetBySheetId(o)) == null ? void 0 : u.getRangeFilterRows(i)) != null ? m : []
   };
 }
 function ar(a, e) {
@@ -1432,11 +1435,11 @@ function ir(a, e) {
 function rr(a, e) {
   const { params: n } = a;
   if (!n) return null;
-  const { unitId: i, subUnitId: r, name: o } = n, { unitId: u, sheetId: f } = te(e);
+  const { unitId: i, subUnitId: r, name: o } = n, { unitId: u, sheetId: m } = te(e);
   return {
     type: y.SetName,
     unitId: i || u,
-    sheetId: r || f,
+    sheetId: r || m,
     sheetName: o
   };
 }
@@ -1495,7 +1498,7 @@ let Je = class extends ee {
               redos: [],
               undos: []
             };
-          const e = this._univerInstanceService.getCurrentUnitForType($.UNIVER_SHEET);
+          const e = this._univerInstanceService.getCurrentUnitForType(k.UNIVER_SHEET);
           if (e == null)
             return {
               redos: [],
@@ -1518,10 +1521,10 @@ let Je = class extends ee {
         redos: [],
         undos: []
       };
-    const u = [], f = [];
-    return Object.values(o).forEach((m) => {
+    const u = [], m = [];
+    return Object.values(o).forEach((f) => {
       var I;
-      const { formulaOrRefString: c } = m, l = this._lexerTreeBuilder.sequenceNodesBuilder(c);
+      const { formulaOrRefString: c } = f, l = this._lexerTreeBuilder.sequenceNodesBuilder(c);
       if (l == null)
         return !0;
       let L = !1;
@@ -1540,7 +1543,7 @@ let Je = class extends ee {
         };
         let B = null;
         if (n === y.RemoveSheet)
-          B = this._removeSheet(m, i, r);
+          B = this._removeSheet(f, i, r);
         else if (n === y.SetName) {
           const {
             sheetId: ae,
@@ -1571,7 +1574,7 @@ let Je = class extends ee {
         id: Ae.id,
         params: {
           unitId: i,
-          ...m,
+          ...f,
           formulaOrRefString: p
         }
       };
@@ -1580,19 +1583,19 @@ let Je = class extends ee {
         id: Ae.id,
         params: {
           unitId: i,
-          ...m
+          ...f
         }
       };
-      f.push(A);
+      m.push(A);
     }), {
       redos: u,
-      undos: f
+      undos: m
     };
   }
   _removeSheet(a, e, n) {
     var o;
     const { formulaOrRefString: i } = a;
-    return ((o = this._definedNamesService.getWorksheetByRef(e, i)) == null ? void 0 : o.getSheetId()) === n ? k.REF : null;
+    return ((o = this._definedNamesService.getWorksheetByRef(e, i)) == null ? void 0 : o.getSheetId()) === n ? Q.REF : null;
   }
 };
 Je = cr([
@@ -1607,8 +1610,8 @@ var lr = Object.getOwnPropertyDescriptor, sr = (a, e, n, i) => {
   return r;
 }, me = (a, e) => (n, i) => e(n, i, a);
 let et = class extends ee {
-  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();
+  constructor(a, e, n, i, r, o, u, m) {
+    super(), this._univerInstanceService = a, this._commandService = e, this._lexerTreeBuilder = n, this._formulaDataModel = i, this._sheetInterceptorService = r, this._definedNamesService = o, this._configService = u, this._injector = m, this._commandExecutedListener();
   }
   _commandExecutedListener() {
     this.disposeWithMe(this._sheetInterceptorService.interceptCommand({
@@ -1623,14 +1626,14 @@ let et = class extends ee {
       })
     ), this.disposeWithMe(
       this._commandService.beforeCommandExecuted((a, e) => {
-        if (a.id === Q.id) {
+        if (a.id === j.id) {
           const n = a.params;
           if (e && e.onlyLocal === !0 || e && e.syncOnly === !0 || n.trigger === wt.id || n.trigger === Ia.id || n.trigger === Na.id || n.trigger === bn.id)
             return;
           this._handleSetRangeValuesMutation(n);
         }
       })
-    ), this.disposeWithMe(this._univerInstanceService.getTypeOfUnitAdded$($.UNIVER_SHEET).subscribe((a) => this._handleWorkbookAdded(a))), this.disposeWithMe(this._univerInstanceService.getTypeOfUnitDisposed$($.UNIVER_SHEET).pipe(pi((a) => a.getUnitId())).subscribe((a) => this._handleWorkbookDisposed(a)));
+    ), this.disposeWithMe(this._univerInstanceService.getTypeOfUnitAdded$(k.UNIVER_SHEET).subscribe((a) => this._handleWorkbookAdded(a))), this.disposeWithMe(this._univerInstanceService.getTypeOfUnitDisposed$(k.UNIVER_SHEET).pipe(pi((a) => a.getUnitId())).subscribe((a) => this._handleWorkbookDisposed(a)));
   }
   _handleSetRangeValuesMutation(a) {
     const { subUnitId: e, unitId: n, cellValue: i } = a;
@@ -1645,11 +1648,11 @@ let et = class extends ee {
       }
     };
     this._commandService.executeCommand(
-      Q.id,
+      j.id,
       {
         unitId: n,
         subUnitId: e,
-        cellValue: ki(r)
+        cellValue: ki(r, i)
       },
       {
         onlyLocal: !0,
@@ -1677,7 +1680,7 @@ let et = class extends ee {
     );
   }
   _handleWorkbookDisposed(a, e) {
-    const n = this._formulaDataModel.getFormulaData(), i = Ct(n, a, e), r = this._formulaDataModel.getArrayFormulaRange(), o = Ct(r, a, e), u = this._formulaDataModel.getArrayFormulaCellData(), f = Ct(u, a, e);
+    const n = this._formulaDataModel.getFormulaData(), i = Ct(n, a, e), r = this._formulaDataModel.getArrayFormulaRange(), o = Ct(r, a, e), u = this._formulaDataModel.getArrayFormulaCellData(), m = Ct(u, a, e);
     i && this._commandService.executeCommand(
       ve.id,
       {
@@ -1686,7 +1689,7 @@ let et = class extends ee {
       {
         onlyLocal: !0
       }
-    ), o && f && this._commandService.executeCommand(
+    ), o && m && this._commandService.executeCommand(
       ht.id,
       {
         arrayFormulaRange: r,
@@ -1698,11 +1701,11 @@ let et = class extends ee {
     );
   }
   _handleInsertSheetMutation(a) {
-    const { sheet: e, unitId: n } = a, i = this._formulaDataModel.getFormulaData(), { id: r, cellData: o } = e, u = new V(o), f = na(i, n, r, u);
+    const { sheet: e, unitId: n } = a, i = this._formulaDataModel.getFormulaData(), { id: r, cellData: o } = e, u = new V(o), m = na(i, n, r, u);
     this._commandService.executeCommand(
       ve.id,
       {
-        formulaData: f
+        formulaData: m
       },
       {
         onlyLocal: !0
@@ -1710,15 +1713,15 @@ let et = class extends ee {
     );
   }
   _handleWorkbookAdded(a) {
-    var m;
+    var f;
     const e = {}, n = a.getUnitId(), i = { [n]: {} };
     a.getSheets().forEach((c) => {
       var p;
       const l = c.getCellMatrix(), L = c.getSheetId(), E = na(e, n, L, l);
       i[n][L] = (p = E[n]) == null ? void 0 : p[L];
     }), this._commandService.executeCommand(ve.id, { formulaData: i }, { onlyLocal: !0 });
-    const o = this._configService.getConfig(ge), u = (m = o == null ? void 0 : o.initialFormulaComputing) != null ? m : Te.WHEN_EMPTY, f = this._getDirtyDataByCalculationMode(u);
-    this._commandService.executeCommand(je.id, f, { onlyLocal: !0 });
+    const o = this._configService.getConfig(ge), u = (f = o == null ? void 0 : o.initialFormulaComputing) != null ? f : Te.WHEN_EMPTY, m = this._getDirtyDataByCalculationMode(u);
+    this._commandService.executeCommand(je.id, m, { onlyLocal: !0 });
   }
   _getDirtyDataByCalculationMode(a) {
     const e = a === Te.FORCED, n = a === Te.WHEN_EMPTY ? this._formulaDataModel.getFormulaDirtyRanges() : [];
@@ -1733,7 +1736,7 @@ let et = class extends ee {
     };
   }
   _getUpdateFormula(a) {
-    const e = this._univerInstanceService.getCurrentUnitForType($.UNIVER_SHEET);
+    const e = this._univerInstanceService.getCurrentUnitForType(k.UNIVER_SHEET);
     if (!e)
       return {
         undos: [],
@@ -1745,10 +1748,10 @@ let et = class extends ee {
         r,
         i,
         n
-      ), { undos: u, redos: f } = bi(r, o, n);
+      ), { undos: u, redos: m } = bi(r, o, n);
       return {
         undos: u,
-        redos: f
+        redos: m
       };
     }
     return {
@@ -1763,13 +1766,13 @@ let et = class extends ee {
     if (i.length === 0) return { newFormulaData: {}, oldFormulaData: {} };
     const r = {}, o = {};
     for (const u of i) {
-      const f = a[u];
-      if (f == null)
+      const m = a[u];
+      if (m == null)
         continue;
-      const m = Object.keys(f);
+      const f = Object.keys(m);
       Xe.isDefine(r[u]) || (r[u] = {}), Xe.isDefine(o[u]) || (o[u] = {});
-      for (const c of m) {
-        const l = new V(f[c] || {}), L = new V(), E = [];
+      for (const c of f) {
+        const l = new V(m[c] || {}), L = new V(), E = [];
         l.forValue((p, S, A) => {
           var F;
           if (!A) return !0;
@@ -1792,7 +1795,7 @@ let et = class extends ee {
                 continue;
               P[B] = {
                 ...O,
-                token: U === y.SetDefinedName ? Ie : k.REF
+                token: U === y.SetDefinedName ? Ie : Q.REF
               }, q = !0, M.push(B);
               continue;
             } else if (ne !== ie.REFERENCE)
@@ -1837,7 +1840,7 @@ let et = class extends ee {
               } = n;
               if (Z == null || Z.length === 0 || Ie !== Z)
                 continue;
-              De = k.REF;
+              De = Q.REF;
             } else U !== y.SetDefinedName && (De = Ha(
               Et,
               n,
@@ -1891,8 +1894,8 @@ let tt = class extends ee {
     this._initialConversion();
   }
   _initialConversion() {
-    this._activeDirtyManagerService.register(Q.id, {
-      commandId: Q.id,
+    this._activeDirtyManagerService.register(j.id, {
+      commandId: j.id,
       getDirtyData: (a) => {
         const e = a.params;
         return e.trigger === wt.id ? {} : {
@@ -2096,15 +2099,15 @@ let tt = class extends ee {
     return r.push(...this._getDirtyRangesByCellValue(e, n.subUnitId, n.value)), r.push(...this._getDirtyRangesByCellValue(e, i.subUnitId, i.value)), r.push(...this._getDirtyRangesForArrayFormula(e, i.subUnitId, i.value)), r;
   }
   _getMoveRowsMutationDirtyRange(a) {
-    const { subUnitId: e, unitId: n, sourceRange: i, targetRange: r } = a, o = [], u = this._rangeToMatrix(i).getData(), f = this._rangeToMatrix(r).getData();
-    return o.push(...this._getDirtyRangesByCellValue(n, e, u)), o.push(...this._getDirtyRangesByCellValue(n, e, f)), o.push(...this._getDirtyRangesForArrayFormula(n, e, f)), o;
+    const { subUnitId: e, unitId: n, sourceRange: i, targetRange: r } = a, o = [], u = this._rangeToMatrix(i).getData(), m = this._rangeToMatrix(r).getData();
+    return o.push(...this._getDirtyRangesByCellValue(n, e, u)), o.push(...this._getDirtyRangesByCellValue(n, e, m)), o.push(...this._getDirtyRangesForArrayFormula(n, e, m)), o;
   }
   _getReorderRangeMutationDirtyRange(a) {
     const { unitId: e, subUnitId: n, range: i } = a, r = this._rangeToMatrix(i).getData(), o = [];
     return o.push(...this._getDirtyRangesByCellValue(e, n, r)), o.push(...this._getDirtyRangesForArrayFormula(e, n, r)), o;
   }
   _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;
+    const { subUnitId: n, unitId: i, range: r } = a, o = [], u = this._univerInstanceService.getUniverSheetInstance(i), m = u == null ? void 0 : u.getSheetBySheetId(n), f = (m == null ? void 0 : m.getRowCount()) || 0, c = (m == null ? void 0 : m.getColumnCount()) || 0;
     let l = null;
     const { startRow: L, endRow: E, startColumn: p, endColumn: S } = r;
     e === !0 ? l = this._rangeToMatrix({
@@ -2115,7 +2118,7 @@ let tt = class extends ee {
     }) : l = this._rangeToMatrix({
       startRow: 0,
       startColumn: p,
-      endRow: m,
+      endRow: f,
       endColumn: S
     });
     const A = l.getData();
@@ -2139,8 +2142,8 @@ let tt = class extends ee {
   _rangeToMatrix(a) {
     const e = new V(), { startRow: n, startColumn: i, endRow: r, endColumn: o } = a;
     for (let u = n; u <= r; u++)
-      for (let f = i; f <= o; f++)
-        e.setValue(u, f, {});
+      for (let m = i; m <= o; m++)
+        e.setValue(u, m, {});
     return e;
   }
   _getDirtyRangesByCellValue(a, e, n) {
@@ -2154,15 +2157,15 @@ let tt = class extends ee {
    * All other positions, apart from the top-left corner, need to be marked as dirty.
    */
   _getDirtyRangesForArrayFormula(a, e, n) {
-    var u, f;
+    var u, m;
     const i = [];
     if (n == null)
       return i;
     const r = new V(n), o = this._formulaDataModel.getArrayFormulaRange();
     if ((u = o == null ? void 0 : o[a]) != null && u[e]) {
-      const m = new V((f = o == null ? void 0 : o[a]) == null ? void 0 : f[e]);
+      const f = new V((m = o == null ? void 0 : o[a]) == null ? void 0 : m[e]);
       r.forValue((c, l) => {
-        m.forValue((L, E, p) => {
+        f.forValue((L, E, p) => {
           if (p == null)
             return !0;
           const { startRow: S, startColumn: A, endRow: I, endColumn: d } = p;
@@ -2240,18 +2243,18 @@ let at = class extends ee {
         if (!o)
           return;
         const u = new V();
-        new V(o).forValue((m, c, l) => {
+        new V(o).forValue((f, c, l) => {
           const L = l == null ? void 0 : l.f;
           if ((l == null ? void 0 : l.x) != null || !L || L.length === 0)
             return;
           if (e.has(L)) {
             const p = e.get(L);
-            u.setValue(m, c, { xf: p });
+            u.setValue(f, c, { xf: p });
             return;
           }
           const E = this._lexerTreeBuilder.getNewFormulaWithPrefix(L, this._functionService.hasExecutor.bind(this._functionService));
-          E && (u.setValue(m, c, { xf: E }), e.set(L, E));
-        }), this._commandService.executeCommand(Q.id, {
+          E && (u.setValue(f, c, { xf: E }), e.set(L, E));
+        }), this._commandService.executeCommand(j.id, {
           unitId: n,
           subUnitId: r,
           cellValue: u.getMatrix()
@@ -2265,13 +2268,13 @@ let at = class extends ee {
   _writeArrayFormulaToSnapshot(a, e, n) {
     a && Object.entries(a).forEach(([i, r]) => {
       r && Array.from(Object.entries(r)).forEach(([o, u]) => {
-        const f = new V();
+        const m = new V();
         new V(u).forValue((c, l, L) => {
-          f.setValue(c, l, { ref: Se(L) });
-        }), this._commandService.executeCommand(Q.id, {
+          m.setValue(c, l, { ref: Se(L) });
+        }), this._commandService.executeCommand(j.id, {
           unitId: i,
           subUnitId: o,
-          cellValue: f.getMatrix()
+          cellValue: m.getMatrix()
         }, {
           onlyLocal: !0,
           fromFormula: !0
@@ -2279,10 +2282,10 @@ let at = class extends ee {
       });
     }), n && Object.entries(n).forEach(([i, r]) => {
       r && Array.from(Object.entries(r)).forEach(([o, u]) => {
-        const f = new V();
+        const m = new V();
         new V(u).forValue((c, l) => {
           var E, p, S;
-          (S = (p = (E = a == null ? void 0 : a[i]) == null ? void 0 : E[o]) == null ? void 0 : p[c]) != null && S[l] || f.setValue(c, l, {
+          (S = (p = (E = a == null ? void 0 : a[i]) == null ? void 0 : E[o]) == null ? void 0 : p[c]) != null && S[l] || m.setValue(c, l, {
             ref: Se({
               startRow: c,
               endRow: c,
@@ -2290,10 +2293,10 @@ let at = class extends ee {
               endColumn: l
             })
           });
-        }), this._commandService.executeCommand(Q.id, {
+        }), this._commandService.executeCommand(j.id, {
           unitId: i,
           subUnitId: o,
-          cellValue: f.getMatrix()
+          cellValue: m.getMatrix()
         }, {
           onlyLocal: !0,
           fromFormula: !0
@@ -2301,7 +2304,7 @@ let at = class extends ee {
       });
     }), e && Object.entries(e).forEach(([i, r]) => {
       r && Array.from(Object.entries(r)).forEach(([o, u]) => {
-        this._commandService.executeCommand(Q.id, {
+        this._commandService.executeCommand(j.id, {
           unitId: i,
           subUnitId: o,
           cellValue: u
@@ -2320,7 +2323,7 @@ let at = class extends ee {
         handler: (a, e, n) => {
           var l, L, E;
           let i = a;
-          const { unitId: r, subUnitId: o, row: u, col: f } = e, m = this._formulaDataModel.getArrayFormulaCellData(), c = (E = (L = (l = m == null ? void 0 : m[r]) == null ? void 0 : l[o]) == null ? void 0 : L[u]) == null ? void 0 : E[f];
+          const { unitId: r, subUnitId: o, row: u, col: m } = e, f = this._formulaDataModel.getArrayFormulaCellData(), c = (E = (L = (l = f == null ? void 0 : f[r]) == null ? void 0 : l[o]) == null ? void 0 : L[u]) == null ? void 0 : E[m];
           return c == null ? n(i) : ((!i || i === e.rawData) && (i = { ...e.rawData }), c.v == null && c.t == null ? (i.v = 0, i.t = xt.NUMBER, n(i)) : (i == null ? void 0 : i.t) === xt.NUMBER && i.v !== void 0 && i.v !== null && rn(i.v) ? (i.v = vn(Number(i.v)), n(i)) : (i.v = c.v, i.t = c.t, n(i)));
         }
       })
@@ -3599,7 +3602,7 @@ const Er = [
   }
 ], Rr = [
   {
-    functionName: j.DAVERAGE,
+    functionName: $.DAVERAGE,
     functionType: t.Database,
     description: "formula.functionList.DAVERAGE.description",
     abstract: "formula.functionList.DAVERAGE.abstract",
@@ -3628,7 +3631,7 @@ const Er = [
     ]
   },
   {
-    functionName: j.DCOUNT,
+    functionName: $.DCOUNT,
     functionType: t.Database,
     description: "formula.functionList.DCOUNT.description",
     abstract: "formula.functionList.DCOUNT.abstract",
@@ -3657,7 +3660,7 @@ const Er = [
     ]
   },
   {
-    functionName: j.DCOUNTA,
+    functionName: $.DCOUNTA,
     functionType: t.Database,
     description: "formula.functionList.DCOUNTA.description",
     abstract: "formula.functionList.DCOUNTA.abstract",
@@ -3686,7 +3689,7 @@ const Er = [
     ]
   },
   {
-    functionName: j.DGET,
+    functionName: $.DGET,
     functionType: t.Database,
     description: "formula.functionList.DGET.description",
     abstract: "formula.functionList.DGET.abstract",
@@ -3715,7 +3718,7 @@ const Er = [
     ]
   },
   {
-    functionName: j.DMAX,
+    functionName: $.DMAX,
     functionType: t.Database,
     description: "formula.functionList.DMAX.description",
     abstract: "formula.functionList.DMAX.abstract",
@@ -3744,7 +3747,7 @@ const Er = [
     ]
   },
   {
-    functionName: j.DMIN,
+    functionName: $.DMIN,
     functionType: t.Database,
     description: "formula.functionList.DMIN.description",
     abstract: "formula.functionList.DMIN.abstract",
@@ -3773,7 +3776,7 @@ const Er = [
     ]
   },
   {
-    functionName: j.DPRODUCT,
+    functionName: $.DPRODUCT,
     functionType: t.Database,
     description: "formula.functionList.DPRODUCT.description",
     abstract: "formula.functionList.DPRODUCT.abstract",
@@ -3802,7 +3805,7 @@ const Er = [
     ]
   },
   {
-    functionName: j.DSTDEV,
+    functionName: $.DSTDEV,
     functionType: t.Database,
     description: "formula.functionList.DSTDEV.description",
     abstract: "formula.functionList.DSTDEV.abstract",
@@ -3831,7 +3834,7 @@ const Er = [
     ]
   },
   {
-    functionName: j.DSTDEVP,
+    functionName: $.DSTDEVP,
     functionType: t.Database,
     description: "formula.functionList.DSTDEVP.description",
     abstract: "formula.functionList.DSTDEVP.abstract",
@@ -3860,7 +3863,7 @@ const Er = [
     ]
   },
   {
-    functionName: j.DSUM,
+    functionName: $.DSUM,
     functionType: t.Database,
     description: "formula.functionList.DSUM.description",
     abstract: "formula.functionList.DSUM.abstract",
@@ -3889,7 +3892,7 @@ const Er = [
     ]
   },
   {
-    functionName: j.DVAR,
+    functionName: $.DVAR,
     functionType: t.Database,
     description: "formula.functionList.DVAR.description",
     abstract: "formula.functionList.DVAR.abstract",
@@ -3918,7 +3921,7 @@ const Er = [
     ]
   },
   {
-    functionName: j.DVARP,
+    functionName: $.DVARP,
     functionType: t.Database,
     description: "formula.functionList.DVARP.description",
     abstract: "formula.functionList.DVARP.abstract",
@@ -15703,15 +15706,15 @@ let Bt = class {
   getSearchListByName(a) {
     const e = [], n = this._functionService.getDescriptions(), i = a.toLocaleUpperCase().trim();
     return n.forEach((r) => {
-      const { functionName: o, abstract: u, functionType: f } = r;
-      o.toLocaleUpperCase().indexOf(i) > -1 && f !== t.DefinedName && e.push({ name: o, desc: u });
+      const { functionName: o, abstract: u, functionType: m } = r;
+      o.toLocaleUpperCase().indexOf(i) > -1 && m !== t.DefinedName && e.push({ name: o, desc: u });
     }), e;
   }
   getSearchListByNameFirstLetter(a) {
     const e = [], n = this._functionService.getDescriptions(), i = a.toLocaleUpperCase().trim();
     return n.forEach((r) => {
-      const { functionName: o, abstract: u, functionType: f } = r;
-      o.toLocaleUpperCase().indexOf(i) === 0 && e.push({ name: o, desc: u, functionType: f });
+      const { functionName: o, abstract: u, functionType: m } = r;
+      o.toLocaleUpperCase().indexOf(i) === 0 && e.push({ name: o, desc: u, functionType: m });
     }), e;
   }
   getSearchListByType(a) {
@@ -15815,8 +15818,8 @@ let nt = class extends ee {
   }
   _changeUnitListener() {
     J(
-      this._univerInstanceService.getCurrentTypeOfUnit$($.UNIVER_SHEET).subscribe(() => {
-        this._unRegisterDescriptions(), this._registerDescriptions();
+      this._univerInstanceService.getCurrentTypeOfUnit$(k.UNIVER_SHEET).subscribe((e) => {
+        this._unRegisterDescriptions(), e && this._registerDescriptions();
       })
     );
   }
@@ -15838,11 +15841,10 @@ let nt = class extends ee {
     );
   }
   _registerDescription(e) {
-    const { unitId: n, sheetId: i } = this._getUnitIdAndSheetId();
-    if (n == null || i == null)
-      return;
-    const { name: r, comment: o, formulaOrRefString: u, localSheetId: f } = e;
-    !this._descriptionService.hasDescription(r) && (f == null || f === Nt || f === i) && this._descriptionService.registerDescriptions([{
+    const n = this._getUnitIdAndSheetId(e);
+    if (!n) return;
+    const { sheetId: i } = n, { name: r, comment: o, formulaOrRefString: u, localSheetId: m } = e;
+    !this._descriptionService.hasDescription(r) && (m == null || m === Nt || m === i) && this._descriptionService.registerDescriptions([{
       functionName: r,
       description: u + (o || ""),
       abstract: u,
@@ -15866,47 +15868,44 @@ let nt = class extends ee {
       n.push(r);
     }), this._descriptionService.unregisterDescriptions(n), this._preUnitId = null;
   }
-  _getUnitIdAndSheetId() {
-    const e = this._univerInstanceService.getCurrentUnitForType($.UNIVER_SHEET);
-    if (e == null)
-      return {};
-    const n = e.getActiveSheet();
-    return n == null ? {} : {
-      unitId: e.getUnitId(),
-      sheetId: n.getSheetId()
-    };
+  _getUnitIdAndSheetId(e = {}) {
+    const { unitId: n, subUnitId: i } = e, r = n ? this._univerInstanceService.getUnit(n, k.UNIVER_SHEET) : this._univerInstanceService.getCurrentUnitOfType(k.UNIVER_SHEET);
+    if (!r) return null;
+    const o = i ? r.getSheetBySheetId(i) : r.getActiveSheet(!0);
+    return o ? {
+      unitId: r.getUnitId(),
+      sheetId: o.getSheetId()
+    } : null;
   }
   _registerDescriptions() {
-    const { unitId: e, sheetId: n } = this._getUnitIdAndSheetId();
-    if (e == null || n == null)
-      return;
-    const i = this._definedNamesService.getDefinedNameMap(e);
-    if (!i)
+    const e = this._getUnitIdAndSheetId();
+    if (!e) return;
+    const { unitId: n, sheetId: i } = e, r = this._definedNamesService.getDefinedNameMap(n);
+    if (!r)
       return;
-    const r = [];
-    this._preUnitId = e, Array.from(Object.values(i)).forEach((o) => {
-      const { name: u, comment: f, formulaOrRefString: m, localSheetId: c } = o;
-      !this._descriptionService.hasDescription(u) && (c == null || c === Nt || c === n) && r.push({
-        functionName: u,
-        description: m + (f || ""),
-        abstract: m,
+    const o = [];
+    this._preUnitId = n, Array.from(Object.values(r)).forEach((u) => {
+      const { name: m, comment: f, formulaOrRefString: c, localSheetId: l } = u;
+      !this._descriptionService.hasDescription(m) && (l == null || l === Nt || l === i) && o.push({
+        functionName: m,
+        description: c + (f || ""),
+        abstract: c,
         functionType: t.DefinedName,
         functionParameter: []
       });
-    }), this._descriptionService.registerDescriptions(r);
+    }), this._descriptionService.registerDescriptions(o);
   }
   _unregisterDescriptionsForNotInSheetId() {
-    const { unitId: e, sheetId: n } = this._getUnitIdAndSheetId();
-    if (e == null || n == null)
-      return;
-    const i = this._definedNamesService.getDefinedNameMap(e);
-    if (!i)
+    const e = this._getUnitIdAndSheetId();
+    if (!e) return;
+    const { unitId: n, sheetId: i } = e, r = this._definedNamesService.getDefinedNameMap(n);
+    if (!r)
       return;
-    const r = [];
-    Array.from(Object.values(i)).forEach((o) => {
-      const { name: u, localSheetId: f } = o;
-      f !== Nt && f !== n && r.push(u);
-    }), this._descriptionService.unregisterDescriptions(r);
+    const o = [];
+    Array.from(Object.values(r)).forEach((u) => {
+      const { name: m, localSheetId: f } = u;
+      f !== Nt && f !== i && o.push(m);
+    }), this._descriptionService.unregisterDescriptions(o);
   }
 };
 nt = vr([
@@ -15955,8 +15954,8 @@ let rt = class extends ee {
   }
   _changeUnitListener() {
     J(
-      this._univerInstanceService.getCurrentTypeOfUnit$($.UNIVER_SHEET).subscribe(() => {
-        this._unRegisterDescriptions(), this._registerDescriptions();
+      this._univerInstanceService.getCurrentTypeOfUnit$(k.UNIVER_SHEET).subscribe((e) => {
+        this._unRegisterDescriptions(), e && this._registerDescriptions();
       })
     );
   }
@@ -15978,13 +15977,12 @@ let rt = class extends ee {
     );
   }
   _registerDescription(e) {
-    var u, f;
-    const { unitId: n, sheetId: i } = this._getUnitIdAndSheetId();
-    if (n == null || i == null)
-      return;
-    const { tableName: r, reference: o } = e;
+    var u, m;
+    const n = this._getUnitIdAndSheetId(e);
+    if (!n) return;
+    const { unitId: i } = n, { tableName: r, reference: o } = e;
     if (!this._descriptionService.hasDescription(r)) {
-      const m = ((f = (u = this._univerInstanceService.getUnit(n)) == null ? void 0 : u.getSheetBySheetId(o.sheetId)) == null ? void 0 : f.getName()) || "", c = ze(m, o.range);
+      const f = ((m = (u = this._univerInstanceService.getUnit(i)) == null ? void 0 : u.getSheetBySheetId(o.sheetId)) == null ? void 0 : m.getName()) || "", c = ze(f, o.range);
       this._descriptionService.registerDescriptions([{
         functionName: r,
         description: c,
@@ -16009,41 +16007,38 @@ let rt = class extends ee {
       n.push(r);
     }), this._descriptionService.unregisterDescriptions(n), this._preUnitId = null;
   }
-  _getUnitIdAndSheetId() {
-    const e = this._univerInstanceService.getCurrentUnitForType($.UNIVER_SHEET);
-    if (e == null)
-      return {};
-    const n = e.getActiveSheet();
-    return n == null ? {} : {
-      unitId: e.getUnitId(),
-      sheetId: n.getSheetId()
-    };
+  _getUnitIdAndSheetId(e = {}) {
+    const { unitId: n, subUnitId: i } = e, r = n ? this._univerInstanceService.getUnit(n, k.UNIVER_SHEET) : this._univerInstanceService.getCurrentUnitOfType(k.UNIVER_SHEET);
+    if (!r) return null;
+    const o = i ? r.getSheetBySheetId(i) : r.getActiveSheet(!0);
+    return o ? {
+      unitId: r.getUnitId(),
+      sheetId: o.getSheetId()
+    } : null;
   }
   _registerDescriptions() {
-    const { unitId: e, sheetId: n } = this._getUnitIdAndSheetId();
-    if (e == null || n == null)
-      return;
-    const i = this._superTableService.getTableMap(e);
+    const e = this._getUnitIdAndSheetId();
+    if (!e) return;
+    const { unitId: n } = e, i = this._superTableService.getTableMap(n);
     if (!i)
       return;
     const r = [];
-    this._preUnitId = e, i.forEach((o, u) => {
+    this._preUnitId = n, i.forEach((o, u) => {
       var c, l;
-      const f = ((l = (c = this._univerInstanceService.getUnit(e)) == null ? void 0 : c.getSheetBySheetId(o.sheetId)) == null ? void 0 : l.getName()) || "", m = ze(f, o.range);
+      const m = ((l = (c = this._univerInstanceService.getUnit(n)) == null ? void 0 : c.getSheetBySheetId(o.sheetId)) == null ? void 0 : l.getName()) || "", f = ze(m, o.range);
       this._descriptionService.hasDescription(u) || r.push({
         functionName: u,
-        description: m,
-        abstract: m,
+        description: f,
+        abstract: f,
         functionType: t.Table,
         functionParameter: []
       });
     }), this._descriptionService.registerDescriptions(r);
   }
   _unregisterDescriptionsForNotInSheetId() {
-    const { unitId: e, sheetId: n } = this._getUnitIdAndSheetId();
-    if (e == null || n == null)
-      return;
-    const i = this._superTableService.getTableMap(e);
+    const e = this._getUnitIdAndSheetId();
+    if (!e) return;
+    const { unitId: n } = e, i = this._superTableService.getTableMap(n);
     if (!i)
       return;
     const r = [];
@@ -16068,11 +16063,11 @@ function fa(a, e, n, i) {
   if (r == null)
     return e;
   const o = [];
-  for (let u = 0, f = r.length; u < f; u++) {
-    const m = r[u];
-    if (typeof m == "string" || m.nodeType !== ie.REFERENCE)
+  for (let u = 0, m = r.length; u < m; u++) {
+    const f = r[u];
+    if (typeof f == "string" || f.nodeType !== ie.REFERENCE)
       continue;
-    const { token: c } = m, l = Pe(c), { sheetName: L, unitId: E } = l;
+    const { token: c } = f, l = Pe(c), { sheetName: L, unitId: E } = l;
     let p = l.range;
     p.startAbsoluteRefType === Qe.ALL && p.endAbsoluteRefType === Qe.ALL || (p = yt(p, n, i), o.push({
       unitId: E,
@@ -16087,13 +16082,13 @@ let vt = class extends ee {
     super(), this._refRangeService = a, this._lexerTreeBuilder = e, this._univerInstanceService = n, this._injector = i;
   }
   transformFormulaByEffectCommand(a, e, n, i) {
-    const r = this._lexerTreeBuilder.sequenceNodesBuilder(n), o = this._univerInstanceService.getCurrentUnitForType($.UNIVER_SHEET), u = o.getActiveSheet(), f = o.getUnitId(), m = u.getSheetId(), c = r == null ? void 0 : r.map((l) => {
+    const r = this._lexerTreeBuilder.sequenceNodesBuilder(n), o = this._univerInstanceService.getCurrentUnitForType(k.UNIVER_SHEET), u = o.getActiveSheet(), m = o.getUnitId(), f = u.getSheetId(), c = r == null ? void 0 : r.map((l) => {
       if (typeof l == "object" && l.nodeType === ie.REFERENCE) {
         const L = Pe(l.token), { range: E, unitId: p, sheetName: S } = L, A = this._univerInstanceService.getUnit(p || a), I = S ? A == null ? void 0 : A.getSheetBySheetName(S) : A == null ? void 0 : A.getSheetBySheetId(e);
         if (!I)
           throw new Error("Sheet not found");
         const d = A.getUnitId(), R = I.getSheetId();
-        if (d !== f || R !== m)
+        if (d !== m || R !== f)
           return l;
         const N = ta(E, i);
         let P = "";
@@ -16101,7 +16096,7 @@ let vt = class extends ee {
           const q = N.startColumn - E.startColumn, M = N.startRow - E.startRow, U = yt(E, q, M);
           p && S ? P = ra(p, S, U) : S ? P = ze(S, U) : P = Se(U);
         } else
-          P = k.REF;
+          P = Q.REF;
         return {
           ...l,
           token: P
@@ -16112,19 +16107,19 @@ let vt = class extends ee {
     return c ? `=${$e(c)}` : "";
   }
   registerFormula(a, e, n, i) {
-    const r = /* @__PURE__ */ new Map(), o = this._lexerTreeBuilder.sequenceNodesBuilder(n), u = new ke(), f = (m) => {
-      const c = this._univerInstanceService.getCurrentUnitForType($.UNIVER_SHEET), l = c.getActiveSheet(), L = c.getUnitId(), E = l.getSheetId(), p = o == null ? void 0 : o.map((A) => {
+    const r = /* @__PURE__ */ new Map(), o = this._lexerTreeBuilder.sequenceNodesBuilder(n), u = new ke(), m = (f) => {
+      const c = this._univerInstanceService.getCurrentUnitForType(k.UNIVER_SHEET), l = c.getActiveSheet(), L = c.getUnitId(), E = l.getSheetId(), p = o == null ? void 0 : o.map((A) => {
         if (typeof A == "object" && A.nodeType === ie.REFERENCE) {
           const I = r.get(A.token);
           if (I.unitId !== L || I.subUnitId !== E)
             return A;
-          const d = ta(I.range, m);
+          const d = ta(I.range, f);
           let R = "";
           if (d) {
             const N = d.startColumn - I.range.startColumn, P = d.startRow - I.range.startRow, q = yt(I.range, N, P);
             I.unitId && I.sheetName ? R = ra(I.unitId, I.sheetName, q) : I.sheetName ? R = ze(I.sheetName, q) : R = Se(q);
           } else
-            R = k.REF;
+            R = Q.REF;
           return {
             ...A,
             token: R
@@ -16134,9 +16129,9 @@ let vt = class extends ee {
       }), S = p && $e(p);
       return i(`=${S}`);
     };
-    return o == null || o.forEach((m) => {
-      if (typeof m == "object" && m.nodeType === ie.REFERENCE) {
-        const c = Pe(m.token), { range: l, unitId: L, sheetName: E } = c, p = this._univerInstanceService.getUnit(L || a), S = E ? p == null ? void 0 : p.getSheetBySheetName(E) : p == null ? void 0 : p.getSheetBySheetId(e);
+    return o == null || o.forEach((f) => {
+      if (typeof f == "object" && f.nodeType === ie.REFERENCE) {
+        const c = Pe(f.token), { range: l, unitId: L, sheetName: E } = c, p = this._univerInstanceService.getUnit(L || a), S = E ? p == null ? void 0 : p.getSheetBySheetName(E) : p == null ? void 0 : p.getSheetBySheetId(e);
         if (!S)
           return;
         const A = p.getUnitId(), I = S.getSheetId(), d = {
@@ -16145,7 +16140,7 @@ let vt = class extends ee {
           range: l,
           sheetName: E
         };
-        r.set(m.token, d), u.add(this._refRangeService.registerRefRange(l, f, A, I));
+        r.set(f.token, d), u.add(this._refRangeService.registerRefRange(l, m, A, I));
       }
     }), u;
   }
@@ -16153,13 +16148,13 @@ let vt = class extends ee {
     const r = Me(n) ? this._lexerTreeBuilder.sequenceNodesBuilder(n) : null, o = [];
     return r == null || r.forEach((u) => {
       if (typeof u == "object" && u.nodeType === ie.REFERENCE) {
-        const f = Pe(u.token), { range: m, unitId: c, sheetName: l } = f;
-        if (m.startAbsoluteRefType === Qe.ALL && m.endAbsoluteRefType === Qe.ALL)
+        const m = Pe(u.token), { range: f, unitId: c, sheetName: l } = m;
+        if (f.startAbsoluteRefType === Qe.ALL && f.endAbsoluteRefType === Qe.ALL)
           return;
         const L = this._univerInstanceService.getUnit(c || a), E = l ? L == null ? void 0 : L.getSheetBySheetName(l) : L == null ? void 0 : L.getSheetBySheetId(e);
         if (!E)
           return;
-        const p = L.getUnitId(), S = E.getSheetId(), A = i[0].startRow, I = i[0].startColumn, d = m.startRow, R = m.startColumn, N = i.map((P) => ({
+        const p = L.getUnitId(), S = E.getSheetId(), A = i[0].startRow, I = i[0].startColumn, d = f.startRow, R = f.startColumn, N = i.map((P) => ({
           startRow: P.startRow - A + d,
           endRow: P.endRow - A + d,
           startColumn: P.startColumn - I + R,
@@ -16175,8 +16170,8 @@ let vt = class extends ee {
   }
   // eslint-disable-next-line max-lines-per-function
   registerRangeFormula(a, e, n, i, r) {
-    const o = new ke(), u = i.map((m) => this._getFormulaDependcy(a, e, m, n)), f = (m) => {
-      const c = n[0].startRow, l = n[0].startColumn, L = [{ unitId: a, subUnitId: e, ranges: n }, ...u.flat()], E = [], p = Mn(this._injector, m);
+    const o = new ke(), u = i.map((f) => this._getFormulaDependcy(a, e, f, n)), m = (f) => {
+      const c = n[0].startRow, l = n[0].startColumn, L = [{ unitId: a, subUnitId: e, ranges: n }, ...u.flat()], E = [], p = Mn(this._injector, f);
       for (const { unitId: S, subUnitId: A, ranges: I } of L)
         if (S === p.unitId && A === p.subUnitId) {
           const d = [], R = I[0].startRow, N = I[0].startColumn, P = R - c, q = N - l;
@@ -16198,12 +16193,12 @@ let vt = class extends ee {
         A.sort((P, q) => P.startRow - q.startRow || P.startColumn - q.startColumn);
         const I = /* @__PURE__ */ new Map();
         for (let P = 0; P < S.length; P++) {
-          const q = S[P], M = q.startRow, U = q.startColumn, h = M - c, x = U - l, F = xn(q, m).sort((z, re) => z.startRow - re.startRow || z.startColumn - re.startColumn);
+          const q = S[P], M = q.startRow, U = q.startColumn, h = M - c, x = U - l, F = xn(q, f).sort((z, re) => z.startRow - re.startRow || z.startColumn - re.startColumn);
           if (!F.length)
             continue;
           const B = F[0].startRow, ae = F[0].startColumn, O = B - c, ce = ae - l, ne = [];
           for (let z = 0; z < i.length; z++) {
-            const re = i[z], oe = Me(re), qe = oe ? this._lexerTreeBuilder.moveFormulaRefOffset(re, x, h) : re, Z = oe ? this.transformFormulaByEffectCommand(a, e, qe, m) : qe, Et = fa(this._lexerTreeBuilder, Z, -ce, -O);
+            const re = i[z], oe = Me(re), qe = oe ? this._lexerTreeBuilder.moveFormulaRefOffset(re, x, h) : re, Z = oe ? this.transformFormulaByEffectCommand(a, e, qe, f) : qe, Et = fa(this._lexerTreeBuilder, Z, -ce, -O);
             ne.push({
               newFormula: Z,
               orginFormula: Et
@@ -16251,12 +16246,12 @@ let vt = class extends ee {
         redos: []
       };
     };
-    return n.forEach((m) => {
-      const c = this._refRangeService.registerRefRange(m, f, a, e);
+    return n.forEach((f) => {
+      const c = this._refRangeService.registerRefRange(f, m, a, e);
       o.add(c);
-    }), [...u.flat()].forEach(({ unitId: m, subUnitId: c, ranges: l }) => {
+    }), [...u.flat()].forEach(({ unitId: f, subUnitId: c, ranges: l }) => {
       l.forEach((L) => {
-        const E = this._refRangeService.registerRefRange(L, f, m, c);
+        const E = this._refRangeService.registerRefRange(L, m, f, c);
         o.add(E);
       });
     }), o;
@@ -16326,11 +16321,11 @@ let Vt = class extends ee {
     if (n)
       r.add(this._descriptionService.registerDescriptions(n));
     else {
-      const o = i.map(([u, f, m]) => ({
-        functionName: f,
+      const o = i.map(([u, m, f]) => ({
+        functionName: m,
         functionType: t.User,
         description: "",
-        abstract: m || "",
+        abstract: f || "",
         functionParameter: []
       }));
       r.add(this._functionService.registerDescriptions(...o));
@@ -16340,18 +16335,18 @@ let Vt = class extends ee {
   _registerSingleFunction(a) {
     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 = {
+      const f = {
         functionName: e,
         functionType: t.User,
         description: i,
         abstract: i || "",
         functionParameter: []
       };
-      u.add(this._descriptionService.registerDescriptions([m]));
+      u.add(this._descriptionService.registerDescriptions([f]));
     } else
       u.add(this._descriptionService.registerDescriptions([i]));
-    const f = o ? new Fa(e) : new Ft(e);
-    return f.calculateCustom = n, this._functionService.registerExecutors(f), u.add(J(() => this._functionService.unregisterExecutors(e))), u.add(J(() => this._functionService.unregisterDescriptions(e))), u.add(J(() => this._functionService.deleteFormulaAstCacheKey(e))), this._remoteRegisterFunctionService && (this._remoteRegisterFunctionService.registerAsyncFunctions([[n.toString(), e]]), u.add(
+    const m = o ? new Fa(e) : new Ft(e);
+    return m.calculateCustom = n, this._functionService.registerExecutors(m), u.add(J(() => this._functionService.unregisterExecutors(e))), u.add(J(() => this._functionService.unregisterDescriptions(e))), u.add(J(() => this._functionService.deleteFormulaAstCacheKey(e))), this._remoteRegisterFunctionService && (this._remoteRegisterFunctionService.registerAsyncFunctions([[n.toString(), e]]), u.add(
       J(() => this._remoteRegisterFunctionService.unregisterFunctions([e]))
     )), u;
   }
@@ -16396,7 +16391,7 @@ let mt = class extends La {
   }
 };
 Tt(mt, "pluginName", "SHEET_FORMULA_REMOTE_PLUGIN");
-Tt(mt, "type", $.UNIVER_SHEET);
+Tt(mt, "type", k.UNIVER_SHEET);
 mt = Xa([
   pa(oi),
   ut(1, H(ct)),
@@ -16457,14 +16452,14 @@ let ft = class extends La {
   }
 };
 Tt(ft, "pluginName", dr);
-Tt(ft, "type", $.UNIVER_SHEET);
+Tt(ft, "type", k.UNIVER_SHEET);
 ft = Xa([
   pa(_n),
   ut(1, H(ct)),
   ut(2, Ce)
 ], ft);
 function fo(a, e, n, i) {
-  const r = a.get(ui), o = a.get(mi), u = a.get(fi), f = a.get(ci);
+  const r = a.get(ui), o = a.get(mi), u = a.get(fi), m = a.get(ci);
   r.load({
     formulaData: {},
     arrayFormulaCellData: {},
@@ -16480,7 +16475,7 @@ function fo(a, e, n, i) {
     },
     dirtyUnitOtherFormulaMap: {}
   });
-  const m = o.treeBuilder(e), c = u.parse(m), l = f.execute(li(c));
+  const f = o.treeBuilder(e), c = u.parse(f), l = m.execute(li(c));
   return si(l);
 }
 export {