@univerjs/sheets-formula 1.0.0-rc.0 → 1.0.0

package/lib/index.js

@@ -69,7 +69,7 @@ const PLUGIN_CONFIG_KEY_MOBILE = "sheets-formula.mobile.config";
 const configSymbolMobile = Symbol(PLUGIN_CONFIG_KEY_MOBILE);
 
 //#endregion
-//#region \0@oxc-project+runtime@0.140.0/helpers/esm/decorateParam.js
+//#region \0@oxc-project+runtime@0.149.0/helpers/esm/decorateParam.js
 function __decorateParam(paramIndex, decorator) {
 	return function(target, key) {
 		decorator(target, key, paramIndex);
@@ -77,7 +77,7 @@ function __decorateParam(paramIndex, decorator) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.140.0/helpers/esm/decorate.js
+//#region \0@oxc-project+runtime@0.149.0/helpers/esm/decorate.js
 function __decorate(decorators, target, key, desc) {
 	var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
 	if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -173,9 +173,7 @@ function directionToOffset(step, len, direction, location, sourceIndex) {
 		case Direction.DOWN:
 			offsetY = targetRows[sourceIndex] - sourceRows[sourceIndex];
 			break;
-		case Direction.LEFT:
-			offsetX = -step * len;
-			break;
+		case Direction.LEFT: offsetX = -step * len;
 	}
 	return {
 		offsetX,
@@ -191,7 +189,7 @@ function getDataLength(copyDataPiece) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.140.0/helpers/esm/typeof.js
+//#region \0@oxc-project+runtime@0.149.0/helpers/esm/typeof.js
 function _typeof(o) {
 	"@babel/helpers - typeof";
 	return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o) {
@@ -202,7 +200,7 @@ function _typeof(o) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.140.0/helpers/esm/toPrimitive.js
+//#region \0@oxc-project+runtime@0.149.0/helpers/esm/toPrimitive.js
 function toPrimitive(t, r) {
 	if ("object" != _typeof(t) || !t) return t;
 	var e = t[Symbol.toPrimitive];
@@ -215,14 +213,14 @@ function toPrimitive(t, r) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.140.0/helpers/esm/toPropertyKey.js
+//#region \0@oxc-project+runtime@0.149.0/helpers/esm/toPropertyKey.js
 function toPropertyKey(t) {
 	var i = toPrimitive(t, "string");
 	return "symbol" == _typeof(i) ? i : i + "";
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.140.0/helpers/esm/defineProperty.js
+//#region \0@oxc-project+runtime@0.149.0/helpers/esm/defineProperty.js
 function _defineProperty(e, r, t) {
 	return (r = toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
 		value: t,
@@ -261,10 +259,10 @@ let ImageFormulaCellInterceptorController = class ImageFormulaCellInterceptorCon
 				const updateRuntimeImageFormulaData = await Promise.all(imageFormulaData.map((imageFormulaInfo) => {
 					return this._getImageNatureSize(imageFormulaInfo);
 				}));
-				const unitImageFormulaData = {};
+				const unitImageFormulaData = Object.create(null);
 				updateRuntimeImageFormulaData.forEach((imageFormulaInfo) => {
 					const { unitId, sheetId, row, column, ...imageInfo } = imageFormulaInfo;
-					if (!unitImageFormulaData[unitId]) unitImageFormulaData[unitId] = {};
+					if (!unitImageFormulaData[unitId]) unitImageFormulaData[unitId] = Object.create(null);
 					if (!unitImageFormulaData[unitId][sheetId]) unitImageFormulaData[unitId][sheetId] = new ObjectMatrix();
 					unitImageFormulaData[unitId][sheetId].setValue(row, column, imageInfo);
 				});
@@ -511,9 +509,7 @@ let TriggerCalculationController = class TriggerCalculationController extends Di
 						result = "Formula calculation succeeded";
 						if (calculationProcessCount === 0 || calculationProcessCount === -1) result += `. Total time consumed: ${performance.now() - this._startExecutionTime} ms`;
 						break;
-					case FormulaExecutedStateType.INITIAL:
-						result = "Waiting for calculation";
-						break;
+					case FormulaExecutedStateType.INITIAL: result = "Waiting for calculation";
 				}
 				if (calculationProcessCount === 0 || calculationProcessCount === -1) {
 					if (startDependencyTimer) {
@@ -792,8 +788,8 @@ function getFormulaReferenceRange(oldFormulaData, newFormulaData, formulaReferen
 * @returns
 */
 function refRangeFormula(oldFormulaData, newFormulaData, formulaReferenceMoveParam) {
-	const redoFormulaData = {};
-	const undoFormulaData = {};
+	const redoFormulaData = Object.create(null);
+	const undoFormulaData = Object.create(null);
 	const { unitId: fromUnitId, sheetId: fromSheetId } = formulaReferenceMoveParam;
 	const targetUnitId = formulaReferenceMoveParam.targetUnitId ?? fromUnitId;
 	const targetSheetId = formulaReferenceMoveParam.targetSheetId ?? fromSheetId;
@@ -811,8 +807,8 @@ function refRangeFormula(oldFormulaData, newFormulaData, formulaReferenceMovePar
 			else rangeList = processFormulaChanges(oldFormulaMatrix, newFormulaMatrix, formulaReferenceMoveParam);
 			const sheetRedoFormulaData = getRedoFormulaData(rangeList, oldFormulaMatrix, newFormulaMatrix);
 			const sheetUndoFormulaData = getUndoFormulaData(rangeList, oldFormulaMatrix);
-			if (!redoFormulaData[unitId]) redoFormulaData[unitId] = {};
-			if (!undoFormulaData[unitId]) undoFormulaData[unitId] = {};
+			if (!redoFormulaData[unitId]) redoFormulaData[unitId] = Object.create(null);
+			if (!undoFormulaData[unitId]) undoFormulaData[unitId] = Object.create(null);
 			redoFormulaData[unitId][currentSheetId] = {
 				...redoFormulaData[unitId][currentSheetId],
 				...sheetRedoFormulaData
@@ -912,8 +908,6 @@ function handleInsertDelete(oldCell, formulaReferenceMoveParam) {
 		case 10:
 			newCell = handleRefInsertMoveRight(range, oldCell);
 			isReverse = true;
-			break;
-		default: break;
 	}
 	return {
 		newCell,
@@ -921,34 +915,37 @@ function handleInsertDelete(oldCell, formulaReferenceMoveParam) {
 	};
 }
 function handleRefMoveRange$1(from, to, oldCell) {
-	return runRefRangeMutations(handleMoveRange({
+	const operators = handleMoveRange({
 		id: EffectRefRangId.MoveRangeCommandId,
 		params: {
 			toRange: to,
 			fromRange: from
 		}
-	}, oldCell), oldCell);
+	}, oldCell);
+	return runRefRangeMutations(operators, oldCell);
 }
 function handleRefMoveRows$1(from, to, oldCell) {
-	return runRefRangeMutations(handleMoveRows({
+	const operators = handleMoveRows({
 		id: EffectRefRangId.MoveRowsCommandId,
 		params: {
 			toRange: to,
 			fromRange: from
 		}
-	}, oldCell), oldCell);
+	}, oldCell);
+	return runRefRangeMutations(operators, oldCell);
 }
 function handleRefMoveCols$1(from, to, oldCell) {
-	return runRefRangeMutations(handleMoveCols({
+	const operators = handleMoveCols({
 		id: EffectRefRangId.MoveColsCommandId,
 		params: {
 			toRange: to,
 			fromRange: from
 		}
-	}, oldCell), oldCell);
+	}, oldCell);
+	return runRefRangeMutations(operators, oldCell);
 }
 function handleRefInsertRow$1(range, oldCell) {
-	return runRefRangeMutations(handleInsertRow({
+	const operators = handleInsertRow({
 		id: EffectRefRangId.InsertRowCommandId,
 		params: {
 			range,
@@ -956,10 +953,11 @@ function handleRefInsertRow$1(range, oldCell) {
 			subUnitId: "",
 			direction: Direction.DOWN
 		}
-	}, oldCell), oldCell);
+	}, oldCell);
+	return runRefRangeMutations(operators, oldCell);
 }
 function handleRefInsertCol$1(range, oldCell) {
-	return runRefRangeMutations(handleInsertCol({
+	const operators = handleInsertCol({
 		id: EffectRefRangId.InsertColCommandId,
 		params: {
 			range,
@@ -967,43 +965,50 @@ function handleRefInsertCol$1(range, oldCell) {
 			subUnitId: "",
 			direction: Direction.RIGHT
 		}
-	}, oldCell), oldCell);
+	}, oldCell);
+	return runRefRangeMutations(operators, oldCell);
 }
 function handleRefRemoveRow$1(range, oldCell, rangeFilteredRows) {
-	return runRefRangeMutations(handleIRemoveRow({
+	const operators = handleIRemoveRow({
 		id: EffectRefRangId.RemoveRowCommandId,
 		params: { range }
-	}, oldCell, rangeFilteredRows), oldCell);
+	}, oldCell, rangeFilteredRows);
+	return runRefRangeMutations(operators, oldCell);
 }
 function handleRefRemoveCol$1(range, oldCell) {
-	return runRefRangeMutations(handleIRemoveCol({
+	const operators = handleIRemoveCol({
 		id: EffectRefRangId.RemoveColCommandId,
 		params: { range }
-	}, oldCell), oldCell);
+	}, oldCell);
+	return runRefRangeMutations(operators, oldCell);
 }
 function handleRefDeleteMoveLeft(range, oldCell) {
-	return runRefRangeMutations(handleDeleteRangeMoveLeft({
+	const operators = handleDeleteRangeMoveLeft({
 		id: EffectRefRangId.DeleteRangeMoveLeftCommandId,
 		params: { range }
-	}, oldCell), oldCell);
+	}, oldCell);
+	return runRefRangeMutations(operators, oldCell);
 }
 function handleRefDeleteMoveUp(range, oldCell) {
-	return runRefRangeMutations(handleDeleteRangeMoveUp({
+	const operators = handleDeleteRangeMoveUp({
 		id: EffectRefRangId.DeleteRangeMoveUpCommandId,
 		params: { range }
-	}, oldCell), oldCell);
+	}, oldCell);
+	return runRefRangeMutations(operators, oldCell);
 }
 function handleRefInsertMoveDown(range, oldCell) {
-	return runRefRangeMutations(handleInsertRangeMoveDown({
+	const operators = handleInsertRangeMoveDown({
 		id: EffectRefRangId.InsertRangeMoveDownCommandId,
 		params: { range }
-	}, oldCell), oldCell);
+	}, oldCell);
+	return runRefRangeMutations(operators, oldCell);
 }
 function handleRefInsertMoveRight(range, oldCell) {
-	return runRefRangeMutations(handleInsertRangeMoveRight({
+	const operators = handleInsertRangeMoveRight({
 		id: EffectRefRangId.InsertRangeMoveRightCommandId,
 		params: { range }
-	}, oldCell), oldCell);
+	}, oldCell);
+	return runRefRangeMutations(operators, oldCell);
 }
 /**
 * Delete the old value at the old position on the match, and add the new value at the new position (the new value first checks whether the old position has offset content, if so, use the new offset content, if not, take the old value)
@@ -1156,13 +1161,14 @@ function getNewRangeByMoveParam(unitRangeWidthOffset, formulaReferenceMoveParam,
 		const moveEdge = checkMoveEdge(sequenceRange, from);
 		const remainRange = getIntersectRange(sequenceRange, from);
 		if (remainRange == null || moveEdge !== 4) return;
-		const result = runRefRangeMutations(handleMoveRange({
+		const operators = handleMoveRange({
 			id: EffectRefRangId.MoveRangeCommandId,
 			params: {
 				toRange: to,
 				fromRange: from
 			}
-		}, remainRange), remainRange);
+		}, remainRange);
+		const result = runRefRangeMutations(operators, remainRange);
 		if (result == null) return ErrorType.REF;
 		newRange = getMoveNewRange(moveEdge, result, from, to, sequenceRange, remainRange);
 	} else if (type === 1) {
@@ -1177,13 +1183,14 @@ function getNewRangeByMoveParam(unitRangeWidthOffset, formulaReferenceMoveParam,
 			endColumn: sequenceRange.endColumn,
 			rangeType: RANGE_TYPE.NORMAL
 		};
-		const result = runRefRangeMutations(handleMoveRows({
+		const operators = handleMoveRows({
 			id: EffectRefRangId.MoveRowsCommandId,
 			params: {
 				toRange: to,
 				fromRange: from
 			}
-		}, remainRange), remainRange);
+		}, remainRange);
+		const result = runRefRangeMutations(operators, remainRange);
 		if (result == null) return ErrorType.REF;
 		newRange = getMoveNewRange(moveEdge, result, from, to, sequenceRange, remainRange);
 	} else if (type === 2) {
@@ -1198,19 +1205,20 @@ function getNewRangeByMoveParam(unitRangeWidthOffset, formulaReferenceMoveParam,
 			endColumn: sequenceRange.endColumn,
 			rangeType: RANGE_TYPE.NORMAL
 		};
-		const result = runRefRangeMutations(handleMoveCols({
+		const operators = handleMoveCols({
 			id: EffectRefRangId.MoveColsCommandId,
 			params: {
 				toRange: to,
 				fromRange: from
 			}
-		}, remainRange), remainRange);
+		}, remainRange);
+		const result = runRefRangeMutations(operators, remainRange);
 		if (result == null) return ErrorType.REF;
 		newRange = getMoveNewRange(moveEdge, result, from, to, sequenceRange, remainRange);
 	}
 	if (range != null) {
 		if (type === 3) {
-			const result = runRefRangeMutations(handleInsertRow({
+			const operators = handleInsertRow({
 				id: EffectRefRangId.InsertRowCommandId,
 				params: {
 					range,
@@ -1218,14 +1226,15 @@ function getNewRangeByMoveParam(unitRangeWidthOffset, formulaReferenceMoveParam,
 					subUnitId: "",
 					direction: Direction.DOWN
 				}
-			}, sequenceRange), sequenceRange);
+			}, sequenceRange);
+			const result = runRefRangeMutations(operators, sequenceRange);
 			if (result == null) return;
 			newRange = {
 				...sequenceRange,
 				...result
 			};
 		} else if (type === 4) {
-			const result = runRefRangeMutations(handleInsertCol({
+			const operators = handleInsertCol({
 				id: EffectRefRangId.InsertColCommandId,
 				params: {
 					range,
@@ -1233,67 +1242,74 @@ function getNewRangeByMoveParam(unitRangeWidthOffset, formulaReferenceMoveParam,
 					subUnitId: "",
 					direction: Direction.RIGHT
 				}
-			}, sequenceRange), sequenceRange);
+			}, sequenceRange);
+			const result = runRefRangeMutations(operators, sequenceRange);
 			if (result == null) return;
 			newRange = {
 				...sequenceRange,
 				...result
 			};
 		} else if (type === 5) {
-			const result = runRefRangeMutations(handleIRemoveRow({
+			const operators = handleIRemoveRow({
 				id: EffectRefRangId.RemoveRowCommandId,
 				params: { range }
-			}, sequenceRange, rangeFilteredRows), sequenceRange);
+			}, sequenceRange, rangeFilteredRows);
+			const result = runRefRangeMutations(operators, sequenceRange);
 			if (result == null) return ErrorType.REF;
 			newRange = {
 				...sequenceRange,
 				...result
 			};
 		} else if (type === 6) {
-			const result = runRefRangeMutations(handleIRemoveCol({
+			const operators = handleIRemoveCol({
 				id: EffectRefRangId.RemoveColCommandId,
 				params: { range }
-			}, sequenceRange), sequenceRange);
+			}, sequenceRange);
+			const result = runRefRangeMutations(operators, sequenceRange);
 			if (result == null) return ErrorType.REF;
 			newRange = {
 				...sequenceRange,
 				...result
 			};
 		} else if (type === 7) {
-			const result = runRefRangeMutations(handleDeleteRangeMoveLeft({
+			const operators = handleDeleteRangeMoveLeft({
 				id: EffectRefRangId.DeleteRangeMoveLeftCommandId,
 				params: { range }
-			}, sequenceRange), sequenceRange);
+			}, sequenceRange);
+			const result = runRefRangeMutations(operators, sequenceRange);
 			if (result == null) return ErrorType.REF;
 			newRange = {
 				...sequenceRange,
 				...result
 			};
 		} else if (type === 8) {
-			const result = runRefRangeMutations(handleDeleteRangeMoveUp({
+			const operators = handleDeleteRangeMoveUp({
 				id: EffectRefRangId.DeleteRangeMoveUpCommandId,
 				params: { range }
-			}, sequenceRange), sequenceRange);
+			}, sequenceRange);
+			const result = runRefRangeMutations(operators, sequenceRange);
 			if (result == null) return ErrorType.REF;
 			newRange = {
 				...sequenceRange,
 				...result
 			};
 		} else if (type === 9) {
-			const result = runRefRangeMutations(handleInsertRangeMoveDown({
+			const operators = handleInsertRangeMoveDown({
 				id: EffectRefRangId.InsertRangeMoveDownCommandId,
 				params: { range }
-			}, sequenceRange), sequenceRange);
+			}, sequenceRange);
+			const result = runRefRangeMutations(operators, sequenceRange);
 			if (result == null) return;
 			newRange = {
 				...sequenceRange,
 				...result
 			};
 		} else if (type === 10) {
-			const result = runRefRangeMutations(handleInsertRangeMoveRight({
+			const operators = handleInsertRangeMoveRight({
 				id: EffectRefRangId.InsertRangeMoveRightCommandId,
 				params: { range }
-			}, sequenceRange), sequenceRange);
+			}, sequenceRange);
+			const result = runRefRangeMutations(operators, sequenceRange);
 			if (result == null) return;
 			newRange = {
 				...sequenceRange,
@@ -1338,23 +1354,31 @@ function getMoveNewRange(moveEdge, result, from, to, origin, remain) {
 		if (rangeType === RANGE_TYPE.ROW && originRangeType === RANGE_TYPE.ROW) return true;
 		return startRow >= originStartRow && endRow <= originEndRow;
 	}
-	if (moveEdge === 0) if (rowsCover()) if (startRow < originStartRow) newRange.startRow = startRow;
-	else if (startRow >= originEndRow) newRange.endRow -= fromEndRow + 1 - originStartRow;
-	else return;
-	else return;
-	else if (moveEdge === 1) if (rowsCover()) if (endRow > originEndRow) newRange.endRow = endRow;
-	else if (endRow <= originStartRow) newRange.startRow += originEndRow - fromStartRow + 1;
-	else return;
-	else return;
-	else if (moveEdge === 2) if (columnsCover()) if (startColumn < originStartColumn) newRange.startColumn = startColumn;
-	else if (startColumn >= originEndColumn) newRange.endColumn -= fromEndColumn + 1 - originStartColumn;
-	else return;
-	else return;
-	else if (moveEdge === 3) if (columnsCover()) if (endColumn > originEndColumn) newRange.endColumn = endColumn;
-	else if (endColumn <= originStartColumn) newRange.startColumn += originEndColumn - fromStartColumn + 1;
-	else return;
-	else return;
-	else if (moveEdge === 4) {
+	if (moveEdge === 0) {
+		if (rowsCover()) {
+			if (startRow < originStartRow) newRange.startRow = startRow;
+			else if (startRow >= originEndRow) newRange.endRow -= fromEndRow + 1 - originStartRow;
+			else return;
+		} else return;
+	} else if (moveEdge === 1) {
+		if (rowsCover()) {
+			if (endRow > originEndRow) newRange.endRow = endRow;
+			else if (endRow <= originStartRow) newRange.startRow += originEndRow - fromStartRow + 1;
+			else return;
+		} else return;
+	} else if (moveEdge === 2) {
+		if (columnsCover()) {
+			if (startColumn < originStartColumn) newRange.startColumn = startColumn;
+			else if (startColumn >= originEndColumn) newRange.endColumn -= fromEndColumn + 1 - originStartColumn;
+			else return;
+		} else return;
+	} else if (moveEdge === 3) {
+		if (columnsCover()) {
+			if (endColumn > originEndColumn) newRange.endColumn = endColumn;
+			else if (endColumn <= originStartColumn) newRange.startColumn += originEndColumn - fromStartColumn + 1;
+			else return;
+		} else return;
+	} else if (moveEdge === 4) {
 		newRange.startRow = startRow;
 		newRange.startColumn = startColumn;
 		newRange.endRow = endRow;
@@ -1514,9 +1538,7 @@ function getReferenceMoveParams(workbook, command) {
 			result = handleRefRemoveSheetTableName(command, workbook);
 			break;
 		case REMOVE_SHEET_TABLE_COLUMN_AT_COMMAND_ID:
-		case REMOVE_SHEET_TABLE_COLUMN_COMMAND_ID:
-			result = handleRefRemoveSheetTableColumn(command, workbook);
-			break;
+		case REMOVE_SHEET_TABLE_COLUMN_COMMAND_ID: result = handleRefRemoveSheetTableColumn(command, workbook);
 	}
 	return result;
 }
@@ -2007,7 +2029,7 @@ let UpdateFormulaController = class UpdateFormulaController extends Disposable {
 			return;
 		}
 		const newFormulaData = { [unitId]: { [sheetId]: newSheetFormulaData } };
-		this._commandService.executeCommand(SetRangeValuesMutation.id, {
+		this._commandService.syncExecuteCommand(SetRangeValuesMutation.id, {
 			unitId,
 			subUnitId: sheetId,
 			cellValue: formulaDataToCellData(newSheetFormulaData, cellValue)
@@ -2027,7 +2049,8 @@ let UpdateFormulaController = class UpdateFormulaController extends Disposable {
 	}
 	_handleWorkbookDisposed(unitId, sheetId) {
 		this._formulaDataModel.clearFormulaIdMap(unitId, sheetId);
-		const newFormulaData = removeFormulaData(this._formulaDataModel.getFormulaData(), unitId, sheetId);
+		const formulaData = this._formulaDataModel.getFormulaData();
+		const newFormulaData = removeFormulaData(formulaData, unitId, sheetId);
 		const arrayFormulaRange = this._formulaDataModel.getArrayFormulaRange();
 		const newArrayFormulaRange = removeFormulaData(arrayFormulaRange, unitId, sheetId);
 		const arrayFormulaCellData = this._formulaDataModel.getArrayFormulaCellData();
@@ -2047,7 +2070,7 @@ let UpdateFormulaController = class UpdateFormulaController extends Disposable {
 		this._commandService.executeCommand(SetFormulaDataMutation.id, { formulaData: newFormulaData }, { onlyLocal: true });
 	}
 	_handleWorkbookAdded(unit) {
-		const formulaData = {};
+		const formulaData = Object.create(null);
 		const unitId = unit.getUnitId();
 		const newFormulaData = { [unitId]: {} };
 		unit.getSheets().forEach((worksheet) => {
@@ -2068,11 +2091,11 @@ let UpdateFormulaController = class UpdateFormulaController extends Disposable {
 		return {
 			forceCalculation: calculationMode === 0,
 			dirtyRanges: calculationMode === 1 ? this._formulaDataModel.getFormulaDirtyRanges() : [],
-			dirtyNameMap: {},
-			dirtyDefinedNameMap: {},
-			dirtyUnitFeatureMap: {},
-			dirtyUnitOtherFormulaMap: {},
-			clearDependencyTreeCache: {}
+			dirtyNameMap: Object.create(null),
+			dirtyDefinedNameMap: Object.create(null),
+			dirtyUnitFeatureMap: Object.create(null),
+			dirtyUnitOtherFormulaMap: Object.create(null),
+			clearDependencyTreeCache: Object.create(null)
 		};
 	}
 	_getUpdateFormula(command) {
@@ -2105,14 +2128,14 @@ let UpdateFormulaController = class UpdateFormulaController extends Disposable {
 		if (!Tools.isDefine(formulaData)) return { newFormulaData: {} };
 		const formulaDataKeys = Object.keys(formulaData);
 		if (formulaDataKeys.length === 0) return { newFormulaData: {} };
-		const newFormulaData = {};
+		const newFormulaData = Object.create(null);
 		const { unitId: fromUnitId, sheetId: fromSheetId, sheetName: fromSheetName, targetUnitId, targetSheetId, type, from, to } = formulaReferenceMoveParam;
 		const inCrossSheetCutRangeNewFormulas = [];
 		for (const unitId of formulaDataKeys) {
 			const sheetData = formulaData[unitId];
 			if (sheetData == null) continue;
 			const sheetDataKeys = Object.keys(sheetData);
-			if (!Tools.isDefine(newFormulaData[unitId])) newFormulaData[unitId] = {};
+			if (!Tools.isDefine(newFormulaData[unitId])) newFormulaData[unitId] = Object.create(null);
 			for (const sheetId of sheetDataKeys) {
 				const matrixData = new ObjectMatrix(sheetData[sheetId] || {});
 				const newFormulaDataItem = new ObjectMatrix();
@@ -2232,21 +2255,22 @@ let UpdateFormulaController = class UpdateFormulaController extends Disposable {
 							}
 						}
 					}
-					if (!shouldModify)
- /**
-					* If the operation is a move type, and the formula cell has si and is the same as the current shouldModifySi, unpack the si to f.
-					* Or the source formula cell is in the moved range.
-					* This is to ensure that the si formula can be recalculated correctly after the move.
-					*/
-					if (si && [
-						1,
-						2,
-						0
-					].includes(type)) {
-						if (from && from.startRow <= row && row <= from.endRow && from.startColumn <= column && column <= from.endColumn) {
-							if ((x ?? 0) === 0 && (y ?? 0) === 0) shouldModifySi.push(si);
-						} else if (!shouldModifySi.includes(si)) return true;
-					} else return true;
+					if (!shouldModify) {
+						/**
+						* If the operation is a move type, and the formula cell has si and is the same as the current shouldModifySi, unpack the si to f.
+						* Or the source formula cell is in the moved range.
+						* This is to ensure that the si formula can be recalculated correctly after the move.
+						*/
+						if (si && [
+							1,
+							2,
+							0
+						].includes(type)) {
+							if (from && from.startRow <= row && row <= from.endRow && from.startColumn <= column && column <= from.endColumn) {
+								if ((x ?? 0) === 0 && (y ?? 0) === 0) shouldModifySi.push(si);
+							} else if (!shouldModifySi.includes(si)) return true;
+						} else return true;
+					}
 					if (inCrossSheetCutRange) {
 						const newSequenceNodes = updateRefOffset(inCrossSheetCutRangeSequenceNodes, refChangeIds, x, y);
 						inCrossSheetCutRangeNewFormulas.push({
@@ -2263,13 +2287,13 @@ let UpdateFormulaController = class UpdateFormulaController extends Disposable {
 			}
 		}
 		if (inCrossSheetCutRangeNewFormulas.length > 0 && targetUnitId && targetSheetId) {
-			if (!newFormulaData[targetUnitId]) newFormulaData[targetUnitId] = {};
-			if (!newFormulaData[targetUnitId][targetSheetId]) newFormulaData[targetUnitId][targetSheetId] = {};
+			if (!newFormulaData[targetUnitId]) newFormulaData[targetUnitId] = Object.create(null);
+			if (!newFormulaData[targetUnitId][targetSheetId]) newFormulaData[targetUnitId][targetSheetId] = Object.create(null);
 			for (const newFormula of inCrossSheetCutRangeNewFormulas) {
 				const { fromRow, fromColumn, formulaString } = newFormula;
 				const targetRow = fromRow + (((to === null || to === void 0 ? void 0 : to.startRow) ?? 0) - ((from === null || from === void 0 ? void 0 : from.startRow) ?? 0));
 				const targetColumn = fromColumn + (((to === null || to === void 0 ? void 0 : to.startColumn) ?? 0) - ((from === null || from === void 0 ? void 0 : from.startColumn) ?? 0));
-				if (!newFormulaData[targetUnitId][targetSheetId][targetRow]) newFormulaData[targetUnitId][targetSheetId][targetRow] = {};
+				if (!newFormulaData[targetUnitId][targetSheetId][targetRow]) newFormulaData[targetUnitId][targetSheetId][targetRow] = Object.create(null);
 				newFormulaData[targetUnitId][targetSheetId][targetRow][targetColumn] = { f: formulaString };
 			}
 		}
@@ -2334,7 +2358,7 @@ function tableReferenceContainsColumn(columnStruct, columnNames) {
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets-formula";
-var version = "1.0.0-rc.0";
+var version = "1.0.0";
 
 //#endregion
 //#region src/common/plugin-name.ts
@@ -2599,16 +2623,16 @@ let ActiveDirtyController = class ActiveDirtyController extends Disposable {
 		return dirtyRanges;
 	}
 	_getRemoveSheetMutation(params) {
-		const dirtyNameMap = {};
+		const dirtyNameMap = Object.create(null);
 		const { subUnitId: sheetId, unitId, subUnitName } = params;
-		if (dirtyNameMap[unitId] == null) dirtyNameMap[unitId] = {};
+		if (dirtyNameMap[unitId] == null) dirtyNameMap[unitId] = Object.create(null);
 		dirtyNameMap[unitId][sheetId] = subUnitName;
 		return dirtyNameMap;
 	}
 	_getInsertSheetMutation(params) {
-		const dirtyNameMap = {};
+		const dirtyNameMap = Object.create(null);
 		const { sheet, unitId } = params;
-		if (dirtyNameMap[unitId] == null) dirtyNameMap[unitId] = {};
+		if (dirtyNameMap[unitId] == null) dirtyNameMap[unitId] = Object.create(null);
 		dirtyNameMap[unitId][sheet.id] = sheet.name;
 		return dirtyNameMap;
 	}
@@ -2710,6 +2734,9 @@ let ArrayFormulaCellInterceptorController = class ArrayFormulaCellInterceptorCon
 				const cellData = arrayFormulaCellData === null || arrayFormulaCellData === void 0 || (_arrayFormulaCellData = arrayFormulaCellData[unitId]) === null || _arrayFormulaCellData === void 0 || (_arrayFormulaCellData = _arrayFormulaCellData[subUnitId]) === null || _arrayFormulaCellData === void 0 || (_arrayFormulaCellData = _arrayFormulaCellData[row]) === null || _arrayFormulaCellData === void 0 ? void 0 : _arrayFormulaCellData[col];
 				if (cellData == null) return next(cell);
 				if (!cell || cell === location.rawData) cell = { ...location.rawData };
+				cell.v = cellData.v;
+				cell.t = cellData.t;
+				cell.isInArrayFormulaRange = true;
 				if (cellData.v == null && cellData.t == null) {
 					cell.v = 0;
 					cell.t = CellValueType.NUMBER;
@@ -2719,8 +2746,6 @@ let ArrayFormulaCellInterceptorController = class ArrayFormulaCellInterceptorCon
 					cell.v = stripErrorMargin(Number(cell.v));
 					return next(cell);
 				}
-				cell.v = cellData.v;
-				cell.t = cellData.t;
 				return next(cell);
 			}
 		}));
@@ -2980,7 +3005,8 @@ let SuperTableController = class SuperTableController extends Disposable {
 		const { tableName, reference } = param;
 		if (!this._descriptionService.hasDescription(tableName)) {
 			var _this$_univerInstance;
-			const refString = serializeRangeWithSheet(((_this$_univerInstance = this._univerInstanceService.getUnit(unitId)) === null || _this$_univerInstance === void 0 || (_this$_univerInstance = _this$_univerInstance.getSheetBySheetId(reference.sheetId)) === null || _this$_univerInstance === void 0 ? void 0 : _this$_univerInstance.getName()) || "", reference.range);
+			const sheetName = ((_this$_univerInstance = this._univerInstanceService.getUnit(unitId)) === null || _this$_univerInstance === void 0 || (_this$_univerInstance = _this$_univerInstance.getSheetBySheetId(reference.sheetId)) === null || _this$_univerInstance === void 0 ? void 0 : _this$_univerInstance.getName()) || "";
+			const refString = serializeRangeWithSheet(sheetName, reference.range);
 			this._descriptionService.registerDescriptions([{
 				functionName: tableName,
 				description: refString,
@@ -3026,7 +3052,8 @@ let SuperTableController = class SuperTableController extends Disposable {
 		this._preUnitId = unitId;
 		superTables.forEach((table, tableName) => {
 			var _this$_univerInstance2;
-			const refString = serializeRangeWithSheet(((_this$_univerInstance2 = this._univerInstanceService.getUnit(unitId)) === null || _this$_univerInstance2 === void 0 || (_this$_univerInstance2 = _this$_univerInstance2.getSheetBySheetId(table.sheetId)) === null || _this$_univerInstance2 === void 0 ? void 0 : _this$_univerInstance2.getName()) || "", table.range);
+			const sheetName = ((_this$_univerInstance2 = this._univerInstanceService.getUnit(unitId)) === null || _this$_univerInstance2 === void 0 || (_this$_univerInstance2 = _this$_univerInstance2.getSheetBySheetId(table.sheetId)) === null || _this$_univerInstance2 === void 0 ? void 0 : _this$_univerInstance2.getName()) || "";
+			const refString = serializeRangeWithSheet(sheetName, table.range);
 			if (!this._descriptionService.hasDescription(tableName)) functionList.push({
 				functionName: tableName,
 				description: refString,
@@ -3106,7 +3133,9 @@ let FormulaRefRangeService = class FormulaRefRangeService extends Disposable {
 				const newRange = handleDefaultRangeChangeWithEffectRefCommands(range, params);
 				let newToken = "";
 				if (newRange) {
-					const finalRange = moveRangeByOffset(range, newRange.startColumn - range.startColumn, newRange.startRow - range.startRow);
+					const offsetX = newRange.startColumn - range.startColumn;
+					const offsetY = newRange.startRow - range.startRow;
+					const finalRange = moveRangeByOffset(range, offsetX, offsetY);
 					if (rangeUnitId && rangeSheetName) newToken = serializeRangeWithSpreadsheet(rangeUnitId, rangeSheetName, finalRange);
 					else if (rangeSheetName) newToken = serializeRangeWithSheet(rangeSheetName, finalRange);
 					else newToken = serializeRange(finalRange);
@@ -3488,7 +3517,8 @@ function calculateFormula(inject, formulaString, unitId, sheetData) {
 	});
 	const lexerNode = lexer.treeBuilder(formulaString);
 	const astNode = astTreeBuilder.parse(lexerNode);
-	return getObjectValue(interpreter.execute(generateExecuteAstNodeData(astNode)));
+	const result = interpreter.execute(generateExecuteAstNodeData(astNode));
+	return getObjectValue(result);
 }
 
 //#endregion