@univerjs/sheets-formula 1.0.0-alpha.7 → 1.0.0-alpha.8

package/lib/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 {
 	/**

package/lib/index.js

@@ -1,9 +1,8 @@
 import { AbsoluteRefType, BooleanNumber, BuildTextUtils, CellValueType, CommandType, DependentOn, Direction, Disposable, DisposableCollection, DrawingTypeEnum, ICommandService, IConfigService, ILogService, IUndoRedoService, IUniverInstanceService, ImageSourceType, Inject, Injector, InterceptorEffectEnum, LocaleService, ObjectMatrix, Plugin, PositionedObjectLayoutType, RANGE_TYPE, Rectangle, Tools, UniverInstanceType, WrapTextType, cellToRange, createDocumentModelWithStyle, createIdentifier, generateRandomId, getIntersectRange, isFormulaId, isFormulaString, isNodeEnv, isRealNum, merge, moveRangeByOffset, sequenceExecute, sequenceExecuteAsync, toDisposable, touchDependencies } from "@univerjs/core";
 import { AUTO_FILL_APPLY_TYPE, AUTO_FILL_DATA_TYPE, ClearSelectionFormatCommand, DeleteRangeMoveLeftCommand, DeleteRangeMoveUpCommand, EffectRefRangId, IAutoFillService, INTERCEPTOR_POINT, InsertColCommand, InsertColMutation, InsertRangeMoveDownCommand, InsertRangeMoveRightCommand, InsertRowCommand, InsertRowMutation, InsertSheetMutation, InterceptCellContentPriority, MoveColsCommand, MoveColsMutation, MoveRangeCommand, MoveRangeMutation, MoveRowsCommand, MoveRowsMutation, RefRangeService, RemoveColCommand, RemoveColMutation, RemoveDefinedNameCommand, RemoveRowCommand, RemoveRowMutation, RemoveSheetCommand, RemoveSheetMutation, ReorderRangeMutation, SCOPE_WORKBOOK_VALUE_DEFINED_NAME, SetBorderCommand, SetDefinedNameCommand, SetRangeCustomMetadataCommand, SetRangeValuesCommand, SetRangeValuesMutation, SetRowHiddenMutation, SetRowVisibleMutation, SetSelectionsOperation, SetStyleCommand, SetWorkbookNameCommand, SetWorksheetActiveOperation, SetWorksheetNameCommand, SheetInterceptorService, SheetsSelectionsService, UniverSheetsPlugin, alignToMergedCellsBorders, expandToContinuousRange, findFirstNonEmptyCell, getSeparateEffectedRangesOnCommand, getSheetCommandTarget, handleCommonDefaultRangeChangeWithEffectRefCommands, handleDefaultRangeChangeWithEffectRefCommands, handleDeleteRangeMoveLeft, handleDeleteRangeMoveUp, handleIRemoveCol, handleIRemoveRow, handleInsertCol, handleInsertRangeMoveDown, handleInsertRangeMoveRight, handleInsertRow, handleMoveCols, handleMoveRange, handleMoveRows, runRefRangeMutations } from "@univerjs/sheets";
-import { AstTreeBuilder, ENGINE_FORMULA_CYCLE_REFERENCE_COUNT, ENGINE_FORMULA_RETURN_DEPENDENCY_TREE, ErrorType, FormulaDataModel, FormulaExecuteStageType, FormulaExecutedStateType, FunctionType, IActiveDirtyManagerService, IDefinedNamesService, IFormulaCurrentConfigService, IFunctionService, ISuperTableService, Interpreter, Lexer, LexerTreeBuilder, OtherFormulaMarkDirty, RegisterOtherFormulaService, RemoveDefinedNameMutation, RemoveSuperTableMutation, SetArrayFormulaDataMutation, SetDefinedNameMutation, SetFormulaCalculationNotificationMutation, SetFormulaCalculationStartMutation, SetFormulaCalculationStopMutation, SetFormulaDataMutation, SetFormulaStringBatchCalculationMutation, SetImageFormulaDataMutation, SetSuperTableMutation, SetTriggerFormulaCalculationStartMutation, UniverFormulaEnginePlugin, deserializeRangeWithSheetWithCache, generateExecuteAstNodeData, generateStringWithSequence, getObjectValue, initSheetFormulaData, refactorFormulaUnitQualifier, sequenceNodeType, serializeRange, serializeRangeToRefString, serializeRangeWithSheet, serializeRangeWithSpreadsheet, splitTableStructuredRef, stripErrorMargin } from "@univerjs/engine-formula";
+import { AstTreeBuilder, ENGINE_FORMULA_CYCLE_REFERENCE_COUNT, ENGINE_FORMULA_RETURN_DEPENDENCY_TREE, ErrorType, FormulaCalculationSessionService, FormulaDataModel, FormulaExecuteStageType, FormulaExecutedStateType, FormulaResultApplicationType, FunctionType, IActiveDirtyManagerService, IDefinedNamesService, IDescriptionService, IFormulaCurrentConfigService, IFunctionService, ISuperTableService, Interpreter, Lexer, LexerTreeBuilder, RemoveDefinedNameMutation, RemoveSuperTableMutation, SetArrayFormulaDataMutation, SetDefinedNameMutation, SetFormulaCalculationNotificationMutation, SetFormulaCalculationStartMutation, SetFormulaCalculationStopMutation, SetFormulaDataMutation, SetFormulaStringBatchCalculationMutation, SetImageFormulaDataMutation, SetSuperTableMutation, SetTriggerFormulaCalculationStartMutation, UniverFormulaEnginePlugin, deserializeRangeWithSheetWithCache, generateExecuteAstNodeData, generateStringWithSequence, getObjectValue, initSheetFormulaData, refactorFormulaUnitQualifier, sequenceNodeType, serializeRange, serializeRangeToRefString, serializeRangeWithSheet, serializeRangeWithSpreadsheet, splitTableStructuredRef, stripErrorMargin } from "@univerjs/engine-formula";
 import { buildDocTransform } from "@univerjs/docs";
 import { BehaviorSubject, map } from "rxjs";
-import { FormulaCalculationSessionService, FormulaResultApplicationType, IDescriptionService, UniverFormulaPlugin } from "@univerjs/formula";
 import { IRPCChannelService, fromModule, toModule } from "@univerjs/rpc";
 
 //#region src/commands/commands/insert-function.command.ts
@@ -29,7 +28,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(SetRangeValuesCommand.id, setRangeValuesParams);
 	}
 };
@@ -154,7 +153,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);
@@ -162,7 +161,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);
@@ -276,7 +275,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) {
@@ -287,7 +286,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];
@@ -300,14 +299,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,
@@ -501,7 +500,7 @@ let TriggerCalculationController = class TriggerCalculationController extends Di
 		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;
@@ -509,7 +508,6 @@ let TriggerCalculationController = class TriggerCalculationController extends Di
 		this._configService = _configService;
 		this._formulaDataModel = _formulaDataModel;
 		this._localeService = _localeService;
-		this._registerOtherFormulaService = _registerOtherFormulaService;
 		_defineProperty(this, "_startExecutionTime", 0);
 		_defineProperty(this, "_totalCalculationTaskCount", 0);
 		_defineProperty(this, "_doneCalculationTaskCount", 0);
@@ -619,9 +617,10 @@ let TriggerCalculationController = class TriggerCalculationController extends Di
 	}
 	_initialExecuteFormula() {
 		const calculationMode = this._getCalculationMode();
-		const params = this._getDirtyDataByCalculationMode(calculationMode);
-		this._commandService.executeCommand(SetTriggerFormulaCalculationStartMutation.id, params, lo);
-		this._registerOtherFormulaService.calculateStarted$.next(true);
+		if (calculationMode !== 2) {
+			const params = this._getDirtyDataByCalculationMode(calculationMode);
+			this._commandService.executeCommand(SetTriggerFormulaCalculationStartMutation.id, params, lo);
+		}
 	}
 	_getDirtyDataByCalculationMode(calculationMode) {
 		return {
@@ -642,8 +641,7 @@ TriggerCalculationController = __decorate([
 	__decorateParam(2, ILogService),
 	__decorateParam(3, IConfigService),
 	__decorateParam(4, Inject(FormulaDataModel)),
-	__decorateParam(5, Inject(LocaleService)),
-	__decorateParam(6, Inject(RegisterOtherFormulaService))
+	__decorateParam(5, Inject(LocaleService))
 ], TriggerCalculationController);
 
 //#endregion
@@ -657,7 +655,7 @@ function collectUnitQualifierFormulaPatches(workbook, oldName, newName) {
 			const 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(),
@@ -706,7 +704,7 @@ let UnitQualifierRenameController = class UnitQualifierRenameController extends
 					id: SetRangeValuesMutation.id,
 					params: {
 						...patch,
-						cellValue: undoCellValue.getData()
+						cellValue: undoCellValue.clone()
 					}
 				});
 			}
@@ -1574,7 +1572,7 @@ function getReferenceMoveParams(workbook, command) {
 			result = handleRefRemoveRow(command, workbook);
 			break;
 		case RemoveColCommand.id:
-			result = handleRefRemoveCol(command, workbook);
+			result = handleRefRemoveCol(command);
 			break;
 		case DeleteRangeMoveUpCommand.id:
 			result = handleRefDeleteRangeMoveUp(command, workbook);
@@ -1752,8 +1750,7 @@ function handleRefRemoveRow(command, workbook) {
 	var _workbook$getSheetByS3, _workbook$getSheetByS4;
 	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,
@@ -1762,11 +1759,10 @@ function handleRefRemoveRow(command, workbook) {
 		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 : []
 	};
 }
-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,
@@ -1930,7 +1926,7 @@ let UpdateDefinedNameController = class UpdateDefinedNameController extends Disp
 			};
 			if (result.type === 12) {
 				var _this$_univerInstance;
-				result.oldUnitName = (_this$_univerInstance = this._univerInstanceService.getUnit(result.unitId, UniverInstanceType.UNIVER_SHEET)) === null || _this$_univerInstance === void 0 ? void 0 : _this$_univerInstance.getName();
+				result.oldUnitName = (_this$_univerInstance = this._univerInstanceService.getUnit(result.unitId, UniverInstanceType.UNIVER_SHEET)) === null || _this$_univerInstance === void 0 ? void 0 : _this$_univerInstance.name;
 			}
 			return this._getUpdateDefinedNameMutations(workbook, result);
 		} }));
@@ -2349,7 +2345,7 @@ let UpdateFormulaController = class UpdateFormulaController extends Disposable {
 					const newSequenceNodes = updateRefOffset(sequenceNodes, refChangeIds, x, y);
 					newFormulaDataItem.setValue(row, column, { f: `=${generateStringWithSequence(newSequenceNodes)}` });
 				});
-				if (newFormulaData[unitId]) newFormulaData[unitId][sheetId] = newFormulaDataItem.getData();
+				if (newFormulaData[unitId]) newFormulaData[unitId][sheetId] = newFormulaDataItem.clone();
 			}
 		}
 		if (inCrossSheetCutRangeNewFormulas.length > 0 && targetUnitId && targetSheetId) {
@@ -2425,7 +2421,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-alpha.8";
 
 //#endregion
 //#region src/common/plugin-name.ts
@@ -2581,12 +2577,6 @@ let ActiveDirtyController = class ActiveDirtyController extends Disposable {
 		});
 	}
 	_initialSheet() {
-		this._activeDirtyManagerService.register(SetTriggerFormulaCalculationStartMutation.id, {
-			commandId: SetTriggerFormulaCalculationStartMutation.id,
-			getDirtyData: (command) => {
-				return { ...command.params };
-			}
-		});
 		this._activeDirtyManagerService.register(RemoveSheetMutation.id, {
 			commandId: RemoveSheetMutation.id,
 			getDirtyData: (command) => {
@@ -2645,8 +2635,8 @@ let ActiveDirtyController = class ActiveDirtyController extends Disposable {
 	_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));
@@ -2654,7 +2644,7 @@ let ActiveDirtyController = class ActiveDirtyController extends Disposable {
 	}
 	_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));
@@ -2663,7 +2653,7 @@ let ActiveDirtyController = class ActiveDirtyController extends Disposable {
 	_getRemoveRowOrColumnMutation(params, isRow = true) {
 		const { subUnitId: sheetId, unitId, range } = params;
 		const dirtyRanges = [];
-		const workbook = this._univerInstanceService.getUniverSheetInstance(unitId);
+		const workbook = this._univerInstanceService.getUnit(unitId, 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;
@@ -2681,7 +2671,7 @@ let ActiveDirtyController = class ActiveDirtyController extends Disposable {
 			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;
@@ -2993,11 +2983,7 @@ let FormulaController = class FormulaController extends Disposable {
 	constructor(_commandService) {
 		super();
 		this._commandService = _commandService;
-		[
-			InsertFunctionCommand,
-			QuickSumCommand,
-			OtherFormulaMarkDirty
-		].forEach((c) => this._commandService.registerCommand(c));
+		[InsertFunctionCommand, QuickSumCommand].forEach((c) => this._commandService.registerCommand(c));
 	}
 };
 FormulaController = __decorate([__decorateParam(0, ICommandService)], FormulaController);
@@ -3562,7 +3548,7 @@ _defineProperty(UniverSheetsFormulaPlugin, "packageName", name);
 _defineProperty(UniverSheetsFormulaPlugin, "version", version);
 _defineProperty(UniverSheetsFormulaPlugin, "type", UniverInstanceType.UNIVER_SHEET);
 UniverSheetsFormulaPlugin = __decorate([
-	DependentOn(UniverFormulaPlugin, UniverSheetsPlugin),
+	DependentOn(UniverFormulaEnginePlugin, UniverSheetsPlugin),
 	__decorateParam(1, Inject(Injector)),
 	__decorateParam(2, IConfigService)
 ], UniverSheetsFormulaPlugin);

package/lib/types/controllers/defined-name.controller.d.ts

@@ -14,8 +14,7 @@
  * limitations under the License.
  */
 import { Disposable, ICommandService, IUniverInstanceService } from '@univerjs/core';
-import { IDefinedNamesService } from '@univerjs/engine-formula';
-import { IDescriptionService } from '@univerjs/formula';
+import { IDefinedNamesService, IDescriptionService } from '@univerjs/engine-formula';
 /**
  * header highlight
  * column menu: show, hover and mousedown event

package/lib/types/controllers/sheet-formula-calculation-result-apply.controller.d.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import { Disposable, ICommandService } from '@univerjs/core';
-import { FormulaCalculationSessionService } from '@univerjs/formula';
+import { FormulaCalculationSessionService } from '@univerjs/engine-formula';
 export declare class SheetFormulaCalculationResultApplyController extends Disposable {
     private readonly _commandService;
     private readonly _sessionService;

package/lib/types/controllers/super-table.controller.d.ts

@@ -14,8 +14,7 @@
  * limitations under the License.
  */
 import { Disposable, ICommandService, IUniverInstanceService } from '@univerjs/core';
-import { ISuperTableService } from '@univerjs/engine-formula';
-import { IDescriptionService } from '@univerjs/formula';
+import { IDescriptionService, ISuperTableService } from '@univerjs/engine-formula';
 /**
  * header highlight
  * column menu: show, hover and mousedown event

package/lib/types/controllers/trigger-calculation.controller.d.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import { Disposable, ICommandService, IConfigService, ILogService, IUniverInstanceService, LocaleService } from '@univerjs/core';
-import { FormulaDataModel, RegisterOtherFormulaService } from '@univerjs/engine-formula';
+import { FormulaDataModel } from '@univerjs/engine-formula';
 /**
  * This interface is for the progress bar to display the calculation progress.
  */
@@ -33,7 +33,6 @@ export declare class TriggerCalculationController extends Disposable {
     private readonly _configService;
     private readonly _formulaDataModel;
     private readonly _localeService;
-    private readonly _registerOtherFormulaService;
     private _startExecutionTime;
     private _totalCalculationTaskCount;
     private _doneCalculationTaskCount;
@@ -45,7 +44,7 @@ export declare class TriggerCalculationController extends Disposable {
     private _calculateProgress;
     private _completeProgress;
     clearProgress(): void;
-    constructor(_commandService: ICommandService, _univerInstanceService: IUniverInstanceService, _logService: ILogService, _configService: IConfigService, _formulaDataModel: FormulaDataModel, _localeService: LocaleService, _registerOtherFormulaService: RegisterOtherFormulaService);
+    constructor(_commandService: ICommandService, _univerInstanceService: IUniverInstanceService, _logService: ILogService, _configService: IConfigService, _formulaDataModel: FormulaDataModel, _localeService: LocaleService);
     dispose(): void;
     private _getCalculationMode;
     private _commandExecutedListener;

package/lib/types/facade/f-formula.d.ts

@@ -14,8 +14,7 @@
  * limitations under the License.
  */
 import type { IDisposable, ILocales } from '@univerjs/core';
-import type { IFunctionInfo } from '@univerjs/engine-formula';
-import type { IRegisterAsyncFunction, IRegisterFunction } from '@univerjs/formula';
+import type { IFunctionInfo, IRegisterAsyncFunction, IRegisterFunction } from '@univerjs/engine-formula';
 import type { CalculationMode } from '@univerjs/sheets-formula';
 import { FFormula } from '@univerjs/engine-formula/facade';
 /**

package/lib/types/facade/index.d.ts

@@ -13,11 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import './f-univer';
-import '@univerjs/formula/facade';
 import './f-formula';
 import './f-enum';
 import './f-workbook';
 import './f-range';
 export type * from './f-formula';
-export type * from './f-univer';

package/lib/umd/facade.js

@@ -1 +1 @@
-(function(e,t){typeof exports==`object`&&typeof module<`u`?t(require("@univerjs/core"),require("@univerjs/core/facade"),require("@univerjs/engine-formula"),require("@univerjs/formula"),require("@univerjs/formula/facade"),require("@univerjs/engine-formula/facade"),require("@univerjs/sheets-formula"),require("@univerjs/sheets/facade")):typeof define==`function`&&define.amd?define([`@univerjs/core`,`@univerjs/core/facade`,`@univerjs/engine-formula`,`@univerjs/formula`,`@univerjs/formula/facade`,`@univerjs/engine-formula/facade`,`@univerjs/sheets-formula`,`@univerjs/sheets/facade`],t):(e=typeof globalThis<`u`?globalThis:e||self,t(e.UniverCore,e.UniverCoreFacade,e.UniverEngineFormula,e.UniverFormula,e.UniverFormulaFacade,e.UniverEngineFormulaFacade,e.UniverSheetsFormula,e.UniverSheetsFacade))})(this,function(e,t,n,r,i,a,o,s){var c=class extends t.FUniver{_initialize(){this._debouncedFormulaCalculation=(0,e.debounce)(()=>{this._commandService.executeCommand(n.SetTriggerFormulaCalculationStartMutation.id,{commands:[],forceCalculation:!0},{onlyLocal:!0})},10)}registerFunction(e){let t=this._injector.get(r.IRegisterFunctionService).registerFunctions(e);return this._debouncedFormulaCalculation(),t}};t.FUniver.extend(c);var l=class extends a.FFormula{_initialize(){this._debouncedFormulaCalculation=(0,e.debounce)(()=>{this._commandService.executeCommand(n.SetTriggerFormulaCalculationStartMutation.id,{commands:[],forceCalculation:!0},{onlyLocal:!0})},10)}setInitialFormulaComputing(t){let n=this._injector.get(e.LifecycleService).stage,r=this._injector.get(e.ILogService),i=this._injector.get(e.IConfigService);n>e.LifecycleStages.Starting&&r.warn(`[FFormula]`,`CalculationMode is called after the Starting lifecycle and will take effect the next time the Univer Sheet is constructed. If you want it to take effect when the Univer Sheet is initialized this time, consider calling it before the Ready lifecycle or using configuration.`);let a=i.getConfig(o.PLUGIN_CONFIG_KEY_BASE);if(!a){i.setConfig(o.PLUGIN_CONFIG_KEY_BASE,{initialFormulaComputing:t});return}a.initialFormulaComputing=t}registerFunction(e,t,n){var i;let a=this._injector.get(r.IRegisterFunctionService),o={name:e,func:t,description:typeof n==`string`?n:(i=n==null?void 0:n.description)==null?``:i,locales:typeof n==`object`?n.locales:void 0},s=a.registerFunction(o);return this._debouncedFormulaCalculation(),s}registerAsyncFunction(e,t,n){var i;let a=this._injector.get(r.IRegisterFunctionService),o={name:e,func:t,description:typeof n==`string`?n:(i=n==null?void 0:n.description)==null?``:i,locales:typeof n==`object`?n.locales:void 0},s=a.registerAsyncFunction(o);return this._debouncedFormulaCalculation(),s}};a.FFormula.extend(l);var u=class extends t.FEnum{get CalculationMode(){return o.CalculationMode}};t.FEnum.extend(u);var d=class extends s.FWorkbook{getAllFormulaError(){let e=[],t=this._workbook,r=t.getUnitId(),i=t.getSheets(),a=this._injector.get(n.FormulaDataModel).getArrayFormulaCellData();return i.forEach(t=>{var i;let o=t.getName(),s=t.getSheetId(),c=t.getCellMatrix(),l=(a==null||(i=a[r])==null?void 0:i[s])||{};c.forValue((t,r,i)=>{var a;if(!i)return;let s=(0,n.extractFormulaError)(i,!!(!(l==null||(a=l[t])==null)&&a[r]));s&&e.push({sheetName:o,row:t,column:r,formula:i.f||``,errorType:s})})}),e}};s.FWorkbook.extend(d);var f=class extends s.FRange{getFormulaError(){var e;let t=[],r=this._workbook.getUnitId(),i=this._worksheet.getSheetId(),a=this._worksheet.getName(),o=this._workbook.getSheetBySheetId(i);if(!o)return t;let s=this._injector.get(n.FormulaDataModel).getArrayFormulaCellData(),c=(s==null||(e=s[r])==null?void 0:e[i])||{},l=o.getCellMatrix(),{startRow:u,endRow:d,startColumn:f,endColumn:p}=this._range;for(let e=u;e<=d;e++)for(let r=f;r<=p;r++){var m;let i=l.getValue(e,r);if(!i)continue;let o=(0,n.extractFormulaError)(i,!!(!(c==null||(m=c[e])==null)&&m[r]));o&&t.push({sheetName:a,row:e,column:r,formula:i.f||``,errorType:o})}return t}};s.FRange.extend(f)});
+(function(e,t){typeof exports==`object`&&typeof module<`u`?t(require("@univerjs/core"),require("@univerjs/engine-formula"),require("@univerjs/engine-formula/facade"),require("@univerjs/sheets-formula"),require("@univerjs/core/facade"),require("@univerjs/sheets/facade")):typeof define==`function`&&define.amd?define([`@univerjs/core`,`@univerjs/engine-formula`,`@univerjs/engine-formula/facade`,`@univerjs/sheets-formula`,`@univerjs/core/facade`,`@univerjs/sheets/facade`],t):(e=typeof globalThis<`u`?globalThis:e||self,t(e.UniverCore,e.UniverEngineFormula,e.UniverEngineFormulaFacade,e.UniverSheetsFormula,e.UniverCoreFacade,e.UniverSheetsFacade))})(this,function(e,t,n,r,i,a){var o=class extends n.FFormula{_initialize(){this._debouncedFormulaCalculation=(0,e.debounce)(()=>{this._commandService.executeCommand(t.SetTriggerFormulaCalculationStartMutation.id,{commands:[],forceCalculation:!0},{onlyLocal:!0})},10)}setInitialFormulaComputing(t){let n=this._injector.get(e.LifecycleService).stage,i=this._injector.get(e.ILogService),a=this._injector.get(e.IConfigService);n>e.LifecycleStages.Starting&&i.warn(`[FFormula]`,`CalculationMode is called after the Starting lifecycle and will take effect the next time the Univer Sheet is constructed. If you want it to take effect when the Univer Sheet is initialized this time, consider calling it before the Ready lifecycle or using configuration.`);let o=a.getConfig(r.PLUGIN_CONFIG_KEY_BASE);if(!o){a.setConfig(r.PLUGIN_CONFIG_KEY_BASE,{initialFormulaComputing:t});return}o.initialFormulaComputing=t}registerFunction(e,n,r){var i;let a=this._injector.get(t.IRegisterFunctionService),o={name:e,func:n,description:typeof r==`string`?r:(i=r==null?void 0:r.description)==null?``:i,locales:typeof r==`object`?r.locales:void 0},s=a.registerFunction(o);return this._debouncedFormulaCalculation(),s}registerAsyncFunction(e,n,r){var i;let a=this._injector.get(t.IRegisterFunctionService),o={name:e,func:n,description:typeof r==`string`?r:(i=r==null?void 0:r.description)==null?``:i,locales:typeof r==`object`?r.locales:void 0},s=a.registerAsyncFunction(o);return this._debouncedFormulaCalculation(),s}};n.FFormula.extend(o);var s=class extends i.FEnum{get CalculationMode(){return r.CalculationMode}};i.FEnum.extend(s);var c=class extends a.FWorkbook{getAllFormulaError(){let e=[],n=this._workbook,r=n.getUnitId(),i=n.getSheets(),a=this._injector.get(t.FormulaDataModel).getArrayFormulaCellData();return i.forEach(n=>{var i;let o=n.getName(),s=n.getSheetId(),c=n.getCellMatrix(),l=(a==null||(i=a[r])==null?void 0:i[s])||{};c.forValue((n,r,i)=>{var a;if(!i)return;let s=(0,t.extractFormulaError)(i,!!(l!=null&&(a=l[n])!=null&&a[r]));s&&e.push({sheetName:o,row:n,column:r,formula:i.f||``,errorType:s})})}),e}};a.FWorkbook.extend(c);var l=class extends a.FRange{getFormulaError(){var e;let n=[],r=this._workbook.getUnitId(),i=this._worksheet.getSheetId(),a=this._worksheet.getName(),o=this._workbook.getSheetBySheetId(i);if(!o)return n;let s=this._injector.get(t.FormulaDataModel).getArrayFormulaCellData(),c=(s==null||(e=s[r])==null?void 0:e[i])||{},l=o.getCellMatrix(),{startRow:u,endRow:d,startColumn:f,endColumn:p}=this._range;for(let e=u;e<=d;e++)for(let r=f;r<=p;r++){var m;let i=l.getValue(e,r);if(!i)continue;let o=(0,t.extractFormulaError)(i,!!(c!=null&&(m=c[e])!=null&&m[r]));o&&n.push({sheetName:a,row:e,column:r,formula:i.f||``,errorType:o})}return n}};a.FRange.extend(l)});