@univerjs/sheets-formula 1.0.0-alpha.7 → 1.0.0-beta.0

package/lib/cjs/facade.js

@@ -1,38 +1,10 @@
 let _univerjs_core = require("@univerjs/core");
-let _univerjs_core_facade = require("@univerjs/core/facade");
 let _univerjs_engine_formula = require("@univerjs/engine-formula");
-let _univerjs_formula = require("@univerjs/formula");
-require("@univerjs/formula/facade");
 let _univerjs_engine_formula_facade = require("@univerjs/engine-formula/facade");
 let _univerjs_sheets_formula = require("@univerjs/sheets-formula");
+let _univerjs_core_facade = require("@univerjs/core/facade");
 let _univerjs_sheets_facade = require("@univerjs/sheets/facade");
 
-//#region src/facade/f-univer.ts
-/**
-* @ignore
-*/
-var FUniverSheetsFormulaMixin = class extends _univerjs_core_facade.FUniver {
-	/**
-	* Initialize the FUniver instance.
-	* @ignore
-	*/
-	_initialize() {
-		this._debouncedFormulaCalculation = (0, _univerjs_core.debounce)(() => {
-			this._commandService.executeCommand(_univerjs_engine_formula.SetTriggerFormulaCalculationStartMutation.id, {
-				commands: [],
-				forceCalculation: true
-			}, { onlyLocal: true });
-		}, 10);
-	}
-	registerFunction(config) {
-		const functionsDisposable = this._injector.get(_univerjs_formula.IRegisterFunctionService).registerFunctions(config);
-		this._debouncedFormulaCalculation();
-		return functionsDisposable;
-	}
-};
-_univerjs_core_facade.FUniver.extend(FUniverSheetsFormulaMixin);
-
-//#endregion
 //#region src/facade/f-formula.ts
 var FFormulaSheetsMixin = class extends _univerjs_engine_formula_facade.FFormula {
 	/**
@@ -60,12 +32,11 @@ var FFormulaSheetsMixin = class extends _univerjs_engine_formula_facade.FFormula
 		config.initialFormulaComputing = calculationMode;
 	}
 	registerFunction(name, func, options) {
-		var _options$description;
-		const registerFunctionService = this._injector.get(_univerjs_formula.IRegisterFunctionService);
+		const registerFunctionService = this._injector.get(_univerjs_engine_formula.IRegisterFunctionService);
 		const params = {
 			name,
 			func,
-			description: typeof options === "string" ? options : (_options$description = options === null || options === void 0 ? void 0 : options.description) !== null && _options$description !== void 0 ? _options$description : "",
+			description: typeof options === "string" ? options : (options === null || options === void 0 ? void 0 : options.description) ?? "",
 			locales: typeof options === "object" ? options.locales : void 0
 		};
 		const functionsDisposable = registerFunctionService.registerFunction(params);
@@ -73,12 +44,11 @@ var FFormulaSheetsMixin = class extends _univerjs_engine_formula_facade.FFormula
 		return functionsDisposable;
 	}
 	registerAsyncFunction(name, func, options) {
-		var _options$description2;
-		const registerFunctionService = this._injector.get(_univerjs_formula.IRegisterFunctionService);
+		const registerFunctionService = this._injector.get(_univerjs_engine_formula.IRegisterFunctionService);
 		const params = {
 			name,
 			func,
-			description: typeof options === "string" ? options : (_options$description2 = options === null || options === void 0 ? void 0 : options.description) !== null && _options$description2 !== void 0 ? _options$description2 : "",
+			description: typeof options === "string" ? options : (options === null || options === void 0 ? void 0 : options.description) ?? "",
 			locales: typeof options === "object" ? options.locales : void 0
 		};
 		const functionsDisposable = registerFunctionService.registerAsyncFunction(params);

package/lib/cjs/index.js

@@ -4,7 +4,6 @@ let _univerjs_sheets = require("@univerjs/sheets");
 let _univerjs_engine_formula = require("@univerjs/engine-formula");
 let _univerjs_docs = require("@univerjs/docs");
 let rxjs = require("rxjs");
-let _univerjs_formula = require("@univerjs/formula");
 let _univerjs_rpc = require("@univerjs/rpc");
 
 //#region src/commands/commands/insert-function.command.ts
@@ -30,7 +29,7 @@ const InsertFunctionCommand = {
 			const { primary, formula } = item;
 			cellMatrix.setValue(primary.row, primary.column, { f: formula });
 		});
-		const setRangeValuesParams = { value: cellMatrix.getData() };
+		const setRangeValuesParams = { value: cellMatrix.clone() };
 		return commandService.executeCommand(_univerjs_sheets.SetRangeValuesCommand.id, setRangeValuesParams);
 	}
 };
@@ -155,7 +154,7 @@ const PLUGIN_CONFIG_KEY_MOBILE = "sheets-formula.mobile.config";
 const configSymbolMobile = Symbol(PLUGIN_CONFIG_KEY_MOBILE);
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/decorateParam.js
+//#region \0@oxc-project+runtime@0.140.0/helpers/esm/decorateParam.js
 function __decorateParam(paramIndex, decorator) {
 	return function(target, key) {
 		decorator(target, key, paramIndex);
@@ -163,7 +162,7 @@ function __decorateParam(paramIndex, decorator) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/decorate.js
+//#region \0@oxc-project+runtime@0.140.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);
@@ -277,7 +276,7 @@ function getDataLength(copyDataPiece) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/typeof.js
+//#region \0@oxc-project+runtime@0.140.0/helpers/esm/typeof.js
 function _typeof(o) {
 	"@babel/helpers - typeof";
 	return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o) {
@@ -288,7 +287,7 @@ function _typeof(o) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/toPrimitive.js
+//#region \0@oxc-project+runtime@0.140.0/helpers/esm/toPrimitive.js
 function toPrimitive(t, r) {
 	if ("object" != _typeof(t) || !t) return t;
 	var e = t[Symbol.toPrimitive];
@@ -301,14 +300,14 @@ function toPrimitive(t, r) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/toPropertyKey.js
+//#region \0@oxc-project+runtime@0.140.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.137.0/helpers/esm/defineProperty.js
+//#region \0@oxc-project+runtime@0.140.0/helpers/esm/defineProperty.js
 function _defineProperty(e, r, t) {
 	return (r = toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
 		value: t,
@@ -502,7 +501,7 @@ let TriggerCalculationController = class TriggerCalculationController extends _u
 		this._totalCalculationTaskCount = 0;
 		this._emitProgress();
 	}
-	constructor(_commandService, _univerInstanceService, _logService, _configService, _formulaDataModel, _localeService, _registerOtherFormulaService) {
+	constructor(_commandService, _univerInstanceService, _logService, _configService, _formulaDataModel, _localeService) {
 		super();
 		this._commandService = _commandService;
 		this._univerInstanceService = _univerInstanceService;
@@ -510,7 +509,6 @@ let TriggerCalculationController = class TriggerCalculationController extends _u
 		this._configService = _configService;
 		this._formulaDataModel = _formulaDataModel;
 		this._localeService = _localeService;
-		this._registerOtherFormulaService = _registerOtherFormulaService;
 		_defineProperty(this, "_startExecutionTime", 0);
 		_defineProperty(this, "_totalCalculationTaskCount", 0);
 		_defineProperty(this, "_doneCalculationTaskCount", 0);
@@ -530,9 +528,8 @@ let TriggerCalculationController = class TriggerCalculationController extends _u
 		this._progress$.complete();
 	}
 	_getCalculationMode() {
-		var _config$initialFormul;
 		const config = this._configService.getConfig(PLUGIN_CONFIG_KEY_BASE);
-		return (_config$initialFormul = config === null || config === void 0 ? void 0 : config.initialFormulaComputing) !== null && _config$initialFormul !== void 0 ? _config$initialFormul : 1;
+		return (config === null || config === void 0 ? void 0 : config.initialFormulaComputing) ?? 1;
 	}
 	_commandExecutedListener() {
 		this.disposeWithMe(this._commandService.beforeCommandExecuted((command) => {
@@ -620,9 +617,10 @@ let TriggerCalculationController = class TriggerCalculationController extends _u
 	}
 	_initialExecuteFormula() {
 		const calculationMode = this._getCalculationMode();
-		const params = this._getDirtyDataByCalculationMode(calculationMode);
-		this._commandService.executeCommand(_univerjs_engine_formula.SetTriggerFormulaCalculationStartMutation.id, params, lo);
-		this._registerOtherFormulaService.calculateStarted$.next(true);
+		if (calculationMode !== 2) {
+			const params = this._getDirtyDataByCalculationMode(calculationMode);
+			this._commandService.executeCommand(_univerjs_engine_formula.SetTriggerFormulaCalculationStartMutation.id, params, lo);
+		}
 	}
 	_getDirtyDataByCalculationMode(calculationMode) {
 		return {
@@ -643,8 +641,7 @@ TriggerCalculationController = __decorate([
 	__decorateParam(2, _univerjs_core.ILogService),
 	__decorateParam(3, _univerjs_core.IConfigService),
 	__decorateParam(4, (0, _univerjs_core.Inject)(_univerjs_engine_formula.FormulaDataModel)),
-	__decorateParam(5, (0, _univerjs_core.Inject)(_univerjs_core.LocaleService)),
-	__decorateParam(6, (0, _univerjs_core.Inject)(_univerjs_engine_formula.RegisterOtherFormulaService))
+	__decorateParam(5, (0, _univerjs_core.Inject)(_univerjs_core.LocaleService))
 ], TriggerCalculationController);
 
 //#endregion
@@ -658,7 +655,7 @@ function collectUnitQualifierFormulaPatches(workbook, oldName, newName) {
 			const formula = (0, _univerjs_engine_formula.refactorFormulaUnitQualifier)(cell.f, oldName, newName);
 			if (formula !== cell.f) updates.setValue(row, column, { f: formula });
 		});
-		const cellValue = updates.getData();
+		const cellValue = updates.clone();
 		return Object.keys(cellValue).length > 0 ? [{
 			unitId,
 			subUnitId: sheet.getSheetId(),
@@ -696,8 +693,7 @@ let UnitQualifierRenameController = class UnitQualifierRenameController extends
 				if (!sheet) continue;
 				const undoCellValue = new _univerjs_core.ObjectMatrix();
 				new _univerjs_core.ObjectMatrix(patch.cellValue).forValue((row, column) => {
-					var _sheet$getCellRaw;
-					undoCellValue.setValue(row, column, (_sheet$getCellRaw = sheet.getCellRaw(row, column)) !== null && _sheet$getCellRaw !== void 0 ? _sheet$getCellRaw : null);
+					undoCellValue.setValue(row, column, sheet.getCellRaw(row, column) ?? null);
 				});
 				redos.push({
 					id: _univerjs_sheets.SetRangeValuesMutation.id,
@@ -707,12 +703,12 @@ let UnitQualifierRenameController = class UnitQualifierRenameController extends
 					id: _univerjs_sheets.SetRangeValuesMutation.id,
 					params: {
 						...patch,
-						cellValue: undoCellValue.getData()
+						cellValue: undoCellValue.clone()
 					}
 				});
 			}
 			const definedNames = this._definedNamesService.getDefinedNameMap(workbook.getUnitId());
-			for (const item of Object.values(definedNames !== null && definedNames !== void 0 ? definedNames : {})) {
+			for (const item of Object.values(definedNames ?? {})) {
 				const formulaOrRefString = (0, _univerjs_engine_formula.refactorFormulaUnitQualifier)(item.formulaOrRefString, oldName, newName);
 				if (formulaOrRefString !== item.formulaOrRefString) {
 					redos.push({
@@ -881,12 +877,11 @@ function getFormulaReferenceRange(oldFormulaData, newFormulaData, formulaReferen
 * @returns
 */
 function refRangeFormula(oldFormulaData, newFormulaData, formulaReferenceMoveParam) {
-	var _formulaReferenceMove, _formulaReferenceMove2;
 	const redoFormulaData = {};
 	const undoFormulaData = {};
 	const { unitId: fromUnitId, sheetId: fromSheetId } = formulaReferenceMoveParam;
-	const targetUnitId = (_formulaReferenceMove = formulaReferenceMoveParam.targetUnitId) !== null && _formulaReferenceMove !== void 0 ? _formulaReferenceMove : fromUnitId;
-	const targetSheetId = (_formulaReferenceMove2 = formulaReferenceMoveParam.targetSheetId) !== null && _formulaReferenceMove2 !== void 0 ? _formulaReferenceMove2 : fromSheetId;
+	const targetUnitId = formulaReferenceMoveParam.targetUnitId ?? fromUnitId;
+	const targetSheetId = formulaReferenceMoveParam.targetSheetId ?? fromSheetId;
 	const isCrossSheet = fromUnitId !== targetUnitId || fromSheetId !== targetSheetId;
 	(/* @__PURE__ */ new Set([...Object.keys(oldFormulaData), ...Object.keys(newFormulaData)])).forEach((unitId) => {
 		if (checkFormulaDataNull(oldFormulaData, unitId, fromSheetId)) return;
@@ -1111,8 +1106,7 @@ function getRedoFormulaData(rangeList, oldFormulaMatrix, newFormulaMatrix) {
 			si: null
 		});
 		if (newCell) {
-			var _newFormulaMatrix$get;
-			const newValue = formulaDataItemToCellData((_newFormulaMatrix$get = newFormulaMatrix.getValue(oldCell.startRow, oldCell.startColumn)) !== null && _newFormulaMatrix$get !== void 0 ? _newFormulaMatrix$get : oldFormulaMatrix.getValue(oldCell.startRow, oldCell.startColumn));
+			const newValue = formulaDataItemToCellData(newFormulaMatrix.getValue(oldCell.startRow, oldCell.startColumn) ?? oldFormulaMatrix.getValue(oldCell.startRow, oldCell.startColumn));
 			redoFormulaData.setValue(newCell.startRow, newCell.startColumn, newValue);
 		}
 	}
@@ -1132,7 +1126,7 @@ function getUndoFormulaData(rangeList, oldFormulaMatrix) {
 		undoFormulaData.setValue(oldCell.startRow, oldCell.startColumn, oldCellOldValue);
 		if (newCell) {
 			const newCellOldValue = formulaDataItemToCellData(oldFormulaMatrix.getValue(newCell.startRow, newCell.startColumn));
-			undoFormulaData.setValue(newCell.startRow, newCell.startColumn, newCellOldValue !== null && newCellOldValue !== void 0 ? newCellOldValue : {
+			undoFormulaData.setValue(newCell.startRow, newCell.startColumn, newCellOldValue ?? {
 				f: null,
 				si: null
 			});
@@ -1575,7 +1569,7 @@ function getReferenceMoveParams(workbook, command) {
 			result = handleRefRemoveRow(command, workbook);
 			break;
 		case _univerjs_sheets.RemoveColCommand.id:
-			result = handleRefRemoveCol(command, workbook);
+			result = handleRefRemoveCol(command);
 			break;
 		case _univerjs_sheets.DeleteRangeMoveUpCommand.id:
 			result = handleRefDeleteRangeMoveUp(command, workbook);
@@ -1750,24 +1744,22 @@ function handleRefInsertRangeMoveDown(command, workbook) {
 	};
 }
 function handleRefRemoveRow(command, workbook) {
-	var _workbook$getSheetByS3, _workbook$getSheetByS4;
+	var _workbook$getSheetByS3;
 	const { params } = command;
 	if (!params) return null;
-	const { range } = params;
-	const { unitId, sheetId } = getCurrentSheetInfo(workbook);
+	const { range, unitId, subUnitId: sheetId } = params;
 	return {
 		type: 5,
 		range,
 		unitId,
 		sheetId,
-		rangeFilteredRows: (_workbook$getSheetByS3 = (_workbook$getSheetByS4 = workbook.getSheetBySheetId(sheetId)) === null || _workbook$getSheetByS4 === void 0 ? void 0 : _workbook$getSheetByS4.getRangeFilterRows(range)) !== null && _workbook$getSheetByS3 !== void 0 ? _workbook$getSheetByS3 : []
+		rangeFilteredRows: ((_workbook$getSheetByS3 = workbook.getSheetBySheetId(sheetId)) === null || _workbook$getSheetByS3 === void 0 ? void 0 : _workbook$getSheetByS3.getRangeFilterRows(range)) ?? []
 	};
 }
-function handleRefRemoveCol(command, workbook) {
+function handleRefRemoveCol(command) {
 	const { params } = command;
 	if (!params) return null;
-	const { range } = params;
-	const { unitId, sheetId } = getCurrentSheetInfo(workbook);
+	const { range, unitId, subUnitId: sheetId } = params;
 	return {
 		type: 6,
 		range,
@@ -1931,7 +1923,7 @@ let UpdateDefinedNameController = class UpdateDefinedNameController extends _uni
 			};
 			if (result.type === 12) {
 				var _this$_univerInstance;
-				result.oldUnitName = (_this$_univerInstance = this._univerInstanceService.getUnit(result.unitId, _univerjs_core.UniverInstanceType.UNIVER_SHEET)) === null || _this$_univerInstance === void 0 ? void 0 : _this$_univerInstance.getName();
+				result.oldUnitName = (_this$_univerInstance = this._univerInstanceService.getUnit(result.unitId, _univerjs_core.UniverInstanceType.UNIVER_SHEET)) === null || _this$_univerInstance === void 0 ? void 0 : _this$_univerInstance.name;
 			}
 			return this._getUpdateDefinedNameMutations(workbook, result);
 		} }));
@@ -2138,7 +2130,6 @@ let UpdateFormulaController = class UpdateFormulaController extends _univerjs_co
 		this._commandService.executeCommand(_univerjs_engine_formula.SetFormulaDataMutation.id, { formulaData: newFormulaData }, { onlyLocal: true });
 	}
 	_handleWorkbookAdded(unit) {
-		var _config$initialFormul;
 		const formulaData = {};
 		const unitId = unit.getUnitId();
 		const newFormulaData = { [unitId]: {} };
@@ -2151,7 +2142,7 @@ let UpdateFormulaController = class UpdateFormulaController extends _univerjs_co
 		});
 		this._commandService.executeCommand(_univerjs_engine_formula.SetFormulaDataMutation.id, { formulaData: newFormulaData }, { onlyLocal: true });
 		const config = this._configService.getConfig(PLUGIN_CONFIG_KEY_BASE);
-		const calculationMode = (_config$initialFormul = config === null || config === void 0 ? void 0 : config.initialFormulaComputing) !== null && _config$initialFormul !== void 0 ? _config$initialFormul : 1;
+		const calculationMode = (config === null || config === void 0 ? void 0 : config.initialFormulaComputing) ?? 1;
 		const params = this._getDirtyDataByCalculationMode(calculationMode);
 		this._commandService.executeCommand(_univerjs_engine_formula.SetTriggerFormulaCalculationStartMutation.id, params, { onlyLocal: true });
 	}
@@ -2294,7 +2285,7 @@ let UpdateFormulaController = class UpdateFormulaController extends _univerjs_co
 							};
 							shouldModify = true;
 							refChangeIds.push(i);
-							if (si && (x !== null && x !== void 0 ? x : 0) === 0 && (y !== null && y !== void 0 ? y : 0) === 0) shouldModifySi.push(si);
+							if (si && (x ?? 0) === 0 && (y ?? 0) === 0) shouldModifySi.push(si);
 						}
 						/**
 						* If the reference sequence range is not affected by the move, and the move is a cross-worksheet cut operation, it may be necessary to rewrite the sheet name in the ref string after move, to make sure the ref still works after move.
@@ -2335,7 +2326,7 @@ let UpdateFormulaController = class UpdateFormulaController extends _univerjs_co
 						0
 					].includes(type)) {
 						if (from && from.startRow <= row && row <= from.endRow && from.startColumn <= column && column <= from.endColumn) {
-							if ((x !== null && x !== void 0 ? x : 0) === 0 && (y !== null && y !== void 0 ? y : 0) === 0) shouldModifySi.push(si);
+							if ((x ?? 0) === 0 && (y ?? 0) === 0) shouldModifySi.push(si);
 						} else if (!shouldModifySi.includes(si)) return true;
 					} else return true;
 					if (inCrossSheetCutRange) {
@@ -2350,17 +2341,16 @@ let UpdateFormulaController = class UpdateFormulaController extends _univerjs_co
 					const newSequenceNodes = updateRefOffset(sequenceNodes, refChangeIds, x, y);
 					newFormulaDataItem.setValue(row, column, { f: `=${(0, _univerjs_engine_formula.generateStringWithSequence)(newSequenceNodes)}` });
 				});
-				if (newFormulaData[unitId]) newFormulaData[unitId][sheetId] = newFormulaDataItem.getData();
+				if (newFormulaData[unitId]) newFormulaData[unitId][sheetId] = newFormulaDataItem.clone();
 			}
 		}
 		if (inCrossSheetCutRangeNewFormulas.length > 0 && targetUnitId && targetSheetId) {
 			if (!newFormulaData[targetUnitId]) newFormulaData[targetUnitId] = {};
 			if (!newFormulaData[targetUnitId][targetSheetId]) newFormulaData[targetUnitId][targetSheetId] = {};
 			for (const newFormula of inCrossSheetCutRangeNewFormulas) {
-				var _to$startRow, _from$startRow, _to$startColumn, _from$startColumn;
 				const { fromRow, fromColumn, formulaString } = newFormula;
-				const targetRow = fromRow + (((_to$startRow = to === null || to === void 0 ? void 0 : to.startRow) !== null && _to$startRow !== void 0 ? _to$startRow : 0) - ((_from$startRow = from === null || from === void 0 ? void 0 : from.startRow) !== null && _from$startRow !== void 0 ? _from$startRow : 0));
-				const targetColumn = fromColumn + (((_to$startColumn = to === null || to === void 0 ? void 0 : to.startColumn) !== null && _to$startColumn !== void 0 ? _to$startColumn : 0) - ((_from$startColumn = from === null || from === void 0 ? void 0 : from.startColumn) !== null && _from$startColumn !== void 0 ? _from$startColumn : 0));
+				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] = {};
 				newFormulaData[targetUnitId][targetSheetId][targetRow][targetColumn] = { f: formulaString };
 			}
@@ -2426,7 +2416,7 @@ function tableReferenceContainsColumn(columnStruct, columnNames) {
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets-formula";
-var version = "1.0.0-alpha.7";
+var version = "1.0.0-beta.0";
 
 //#endregion
 //#region src/common/plugin-name.ts
@@ -2582,12 +2572,6 @@ let ActiveDirtyController = class ActiveDirtyController extends _univerjs_core.D
 		});
 	}
 	_initialSheet() {
-		this._activeDirtyManagerService.register(_univerjs_engine_formula.SetTriggerFormulaCalculationStartMutation.id, {
-			commandId: _univerjs_engine_formula.SetTriggerFormulaCalculationStartMutation.id,
-			getDirtyData: (command) => {
-				return { ...command.params };
-			}
-		});
 		this._activeDirtyManagerService.register(_univerjs_sheets.RemoveSheetMutation.id, {
 			commandId: _univerjs_sheets.RemoveSheetMutation.id,
 			getDirtyData: (command) => {
@@ -2646,8 +2630,8 @@ let ActiveDirtyController = class ActiveDirtyController extends _univerjs_core.D
 	_getMoveRowsMutationDirtyRange(params) {
 		const { subUnitId: sheetId, unitId, sourceRange, targetRange } = params;
 		const dirtyRanges = [];
-		const sourceMatrix = this._rangeToMatrix(sourceRange).getData();
-		const targetMatrix = this._rangeToMatrix(targetRange).getData();
+		const sourceMatrix = this._rangeToMatrix(sourceRange).clone();
+		const targetMatrix = this._rangeToMatrix(targetRange).clone();
 		dirtyRanges.push(...this._getDirtyRangesByCellValue(unitId, sheetId, sourceMatrix));
 		dirtyRanges.push(...this._getDirtyRangesByCellValue(unitId, sheetId, targetMatrix));
 		dirtyRanges.push(...this._getDirtyRangesForArrayFormula(unitId, sheetId, targetMatrix));
@@ -2655,7 +2639,7 @@ let ActiveDirtyController = class ActiveDirtyController extends _univerjs_core.D
 	}
 	_getReorderRangeMutationDirtyRange(params) {
 		const { unitId, subUnitId: sheetId, range } = params;
-		const matrix = this._rangeToMatrix(range).getData();
+		const matrix = this._rangeToMatrix(range).clone();
 		const dirtyRanges = [];
 		dirtyRanges.push(...this._getDirtyRangesByCellValue(unitId, sheetId, matrix));
 		dirtyRanges.push(...this._getDirtyRangesForArrayFormula(unitId, sheetId, matrix));
@@ -2664,7 +2648,7 @@ let ActiveDirtyController = class ActiveDirtyController extends _univerjs_core.D
 	_getRemoveRowOrColumnMutation(params, isRow = true) {
 		const { subUnitId: sheetId, unitId, range } = params;
 		const dirtyRanges = [];
-		const workbook = this._univerInstanceService.getUniverSheetInstance(unitId);
+		const workbook = this._univerInstanceService.getUnit(unitId, _univerjs_core.UniverInstanceType.UNIVER_SHEET);
 		const worksheet = workbook === null || workbook === void 0 ? void 0 : workbook.getSheetBySheetId(sheetId);
 		const rowCount = (worksheet === null || worksheet === void 0 ? void 0 : worksheet.getRowCount()) || 0;
 		const columnCount = (worksheet === null || worksheet === void 0 ? void 0 : worksheet.getColumnCount()) || 0;
@@ -2682,7 +2666,7 @@ let ActiveDirtyController = class ActiveDirtyController extends _univerjs_core.D
 			endRow: rowCount,
 			endColumn
 		});
-		const matrixData = matrix.getData();
+		const matrixData = matrix.clone();
 		dirtyRanges.push(...this._getDirtyRangesByCellValue(unitId, sheetId, matrixData));
 		dirtyRanges.push(...this._getDirtyRangesForArrayFormula(unitId, sheetId, matrixData));
 		return dirtyRanges;
@@ -2967,7 +2951,7 @@ let DefinedNameController = class DefinedNameController extends _univerjs_core.D
 	}
 };
 DefinedNameController = __decorate([
-	__decorateParam(0, _univerjs_formula.IDescriptionService),
+	__decorateParam(0, _univerjs_engine_formula.IDescriptionService),
 	__decorateParam(1, _univerjs_engine_formula.IDefinedNamesService),
 	__decorateParam(2, _univerjs_core.IUniverInstanceService),
 	__decorateParam(3, _univerjs_core.ICommandService)
@@ -2994,11 +2978,7 @@ let FormulaController = class FormulaController extends _univerjs_core.Disposabl
 	constructor(_commandService) {
 		super();
 		this._commandService = _commandService;
-		[
-			InsertFunctionCommand,
-			QuickSumCommand,
-			_univerjs_engine_formula.OtherFormulaMarkDirty
-		].forEach((c) => this._commandService.registerCommand(c));
+		[InsertFunctionCommand, QuickSumCommand].forEach((c) => this._commandService.registerCommand(c));
 	}
 };
 FormulaController = __decorate([__decorateParam(0, _univerjs_core.ICommandService)], FormulaController);
@@ -3026,11 +3006,11 @@ let SheetFormulaCalculationResultApplyController = class SheetFormulaCalculation
 		this._commandService = _commandService;
 		this._sessionService = _sessionService;
 		this.disposeWithMe(this._commandService.onCommandExecuted((command, options) => {
-			if (command.id === _univerjs_sheets.SetRangeValuesMutation.id && (options === null || options === void 0 ? void 0 : options.applyFormulaCalculationResult)) this._sessionService.markResultApplied(_univerjs_formula.FormulaResultApplicationType.SHEET);
+			if (command.id === _univerjs_sheets.SetRangeValuesMutation.id && (options === null || options === void 0 ? void 0 : options.applyFormulaCalculationResult)) this._sessionService.markResultApplied(_univerjs_engine_formula.FormulaResultApplicationType.SHEET);
 		}));
 	}
 };
-SheetFormulaCalculationResultApplyController = __decorate([__decorateParam(0, _univerjs_core.ICommandService), __decorateParam(1, (0, _univerjs_core.Inject)(_univerjs_formula.FormulaCalculationSessionService))], SheetFormulaCalculationResultApplyController);
+SheetFormulaCalculationResultApplyController = __decorate([__decorateParam(0, _univerjs_core.ICommandService), __decorateParam(1, (0, _univerjs_core.Inject)(_univerjs_engine_formula.FormulaCalculationSessionService))], SheetFormulaCalculationResultApplyController);
 
 //#endregion
 //#region src/controllers/super-table.controller.ts
@@ -3153,7 +3133,7 @@ let SuperTableController = class SuperTableController extends _univerjs_core.Dis
 	}
 };
 SuperTableController = __decorate([
-	__decorateParam(0, _univerjs_formula.IDescriptionService),
+	__decorateParam(0, _univerjs_engine_formula.IDescriptionService),
 	__decorateParam(1, _univerjs_core.IUniverInstanceService),
 	__decorateParam(2, _univerjs_core.ICommandService),
 	__decorateParam(3, _univerjs_engine_formula.ISuperTableService)
@@ -3537,7 +3517,7 @@ let UniverSheetsFormulaPlugin = class UniverSheetsFormulaPlugin extends _univerj
 			dependencies.push([IRemoteRegisterFunctionService, { useFactory: () => (0, _univerjs_rpc.toModule)(rpcChannelService.requestChannel(RemoteRegisterFunctionServiceName)) }]);
 		}
 		dependencies.forEach((dependency) => j.add(dependency));
-		if ((_this$_config$descrip = this._config.description) === null || _this$_config$descrip === void 0 ? void 0 : _this$_config$descrip.length) this.disposeWithMe(j.get(_univerjs_formula.IDescriptionService).registerDescriptions(this._config.description));
+		if ((_this$_config$descrip = this._config.description) === null || _this$_config$descrip === void 0 ? void 0 : _this$_config$descrip.length) this.disposeWithMe(j.get(_univerjs_engine_formula.IDescriptionService).registerDescriptions(this._config.description));
 	}
 	onReady() {
 		(0, _univerjs_core.touchDependencies)(this._injector, [
@@ -3563,7 +3543,7 @@ _defineProperty(UniverSheetsFormulaPlugin, "packageName", name);
 _defineProperty(UniverSheetsFormulaPlugin, "version", version);
 _defineProperty(UniverSheetsFormulaPlugin, "type", _univerjs_core.UniverInstanceType.UNIVER_SHEET);
 UniverSheetsFormulaPlugin = __decorate([
-	(0, _univerjs_core.DependentOn)(_univerjs_formula.UniverFormulaPlugin, _univerjs_sheets.UniverSheetsPlugin),
+	(0, _univerjs_core.DependentOn)(_univerjs_engine_formula.UniverFormulaEnginePlugin, _univerjs_sheets.UniverSheetsPlugin),
 	__decorateParam(1, (0, _univerjs_core.Inject)(_univerjs_core.Injector)),
 	__decorateParam(2, _univerjs_core.IConfigService)
 ], UniverSheetsFormulaPlugin);

package/lib/es/facade.js

@@ -1,38 +1,10 @@
 import { IConfigService, ILogService, LifecycleService, LifecycleStages, debounce } from "@univerjs/core";
-import { FEnum, FUniver } from "@univerjs/core/facade";
-import { FormulaDataModel, SetTriggerFormulaCalculationStartMutation, extractFormulaError } from "@univerjs/engine-formula";
-import { IRegisterFunctionService } from "@univerjs/formula";
-import "@univerjs/formula/facade";
+import { FormulaDataModel, IRegisterFunctionService, SetTriggerFormulaCalculationStartMutation, extractFormulaError } from "@univerjs/engine-formula";
 import { FFormula } from "@univerjs/engine-formula/facade";
 import { CalculationMode, PLUGIN_CONFIG_KEY_BASE } from "@univerjs/sheets-formula";
+import { FEnum } from "@univerjs/core/facade";
 import { FRange, FWorkbook } from "@univerjs/sheets/facade";
 
-//#region src/facade/f-univer.ts
-/**
-* @ignore
-*/
-var FUniverSheetsFormulaMixin = class extends FUniver {
-	/**
-	* Initialize the FUniver instance.
-	* @ignore
-	*/
-	_initialize() {
-		this._debouncedFormulaCalculation = debounce(() => {
-			this._commandService.executeCommand(SetTriggerFormulaCalculationStartMutation.id, {
-				commands: [],
-				forceCalculation: true
-			}, { onlyLocal: true });
-		}, 10);
-	}
-	registerFunction(config) {
-		const functionsDisposable = this._injector.get(IRegisterFunctionService).registerFunctions(config);
-		this._debouncedFormulaCalculation();
-		return functionsDisposable;
-	}
-};
-FUniver.extend(FUniverSheetsFormulaMixin);
-
-//#endregion
 //#region src/facade/f-formula.ts
 var FFormulaSheetsMixin = class extends FFormula {
 	/**
@@ -60,12 +32,11 @@ var FFormulaSheetsMixin = class extends FFormula {
 		config.initialFormulaComputing = calculationMode;
 	}
 	registerFunction(name, func, options) {
-		var _options$description;
 		const registerFunctionService = this._injector.get(IRegisterFunctionService);
 		const params = {
 			name,
 			func,
-			description: typeof options === "string" ? options : (_options$description = options === null || options === void 0 ? void 0 : options.description) !== null && _options$description !== void 0 ? _options$description : "",
+			description: typeof options === "string" ? options : (options === null || options === void 0 ? void 0 : options.description) ?? "",
 			locales: typeof options === "object" ? options.locales : void 0
 		};
 		const functionsDisposable = registerFunctionService.registerFunction(params);
@@ -73,12 +44,11 @@ var FFormulaSheetsMixin = class extends FFormula {
 		return functionsDisposable;
 	}
 	registerAsyncFunction(name, func, options) {
-		var _options$description2;
 		const registerFunctionService = this._injector.get(IRegisterFunctionService);
 		const params = {
 			name,
 			func,
-			description: typeof options === "string" ? options : (_options$description2 = options === null || options === void 0 ? void 0 : options.description) !== null && _options$description2 !== void 0 ? _options$description2 : "",
+			description: typeof options === "string" ? options : (options === null || options === void 0 ? void 0 : options.description) ?? "",
 			locales: typeof options === "object" ? options.locales : void 0
 		};
 		const functionsDisposable = registerFunctionService.registerAsyncFunction(params);