@univerjs/sheets-formula 0.25.0 → 1.0.0-alpha.0

package/lib/cjs/index.js

@@ -153,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.133.0/helpers/esm/decorateParam.js
+//#region \0@oxc-project+runtime@0.137.0/helpers/esm/decorateParam.js
 function __decorateParam(paramIndex, decorator) {
 	return function(target, key) {
 		decorator(target, key, paramIndex);
@@ -161,7 +161,7 @@ function __decorateParam(paramIndex, decorator) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.133.0/helpers/esm/decorate.js
+//#region \0@oxc-project+runtime@0.137.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);
@@ -275,7 +275,7 @@ function getDataLength(copyDataPiece) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.133.0/helpers/esm/typeof.js
+//#region \0@oxc-project+runtime@0.137.0/helpers/esm/typeof.js
 function _typeof(o) {
 	"@babel/helpers - typeof";
 	return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o) {
@@ -286,7 +286,7 @@ function _typeof(o) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.133.0/helpers/esm/toPrimitive.js
+//#region \0@oxc-project+runtime@0.137.0/helpers/esm/toPrimitive.js
 function toPrimitive(t, r) {
 	if ("object" != _typeof(t) || !t) return t;
 	var e = t[Symbol.toPrimitive];
@@ -299,14 +299,14 @@ function toPrimitive(t, r) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.133.0/helpers/esm/toPropertyKey.js
+//#region \0@oxc-project+runtime@0.137.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.133.0/helpers/esm/defineProperty.js
+//#region \0@oxc-project+runtime@0.137.0/helpers/esm/defineProperty.js
 function _defineProperty(e, r, t) {
 	return (r = toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
 		value: t,
@@ -1176,9 +1176,9 @@ function refRangeFormula(oldFormulaData, newFormulaData, formulaReferenceMovePar
 	const targetUnitId = (_formulaReferenceMove = formulaReferenceMoveParam.targetUnitId) !== null && _formulaReferenceMove !== void 0 ? _formulaReferenceMove : fromUnitId;
 	const targetSheetId = (_formulaReferenceMove2 = formulaReferenceMoveParam.targetSheetId) !== null && _formulaReferenceMove2 !== void 0 ? _formulaReferenceMove2 : fromSheetId;
 	const isCrossSheet = fromUnitId !== targetUnitId || fromSheetId !== targetSheetId;
-	new Set([...Object.keys(oldFormulaData), ...Object.keys(newFormulaData)]).forEach((unitId) => {
+	(/* @__PURE__ */ new Set([...Object.keys(oldFormulaData), ...Object.keys(newFormulaData)])).forEach((unitId) => {
 		if (checkFormulaDataNull(oldFormulaData, unitId, fromSheetId)) return;
-		new Set([...Object.keys(oldFormulaData[unitId] || {}), ...Object.keys(newFormulaData[unitId] || {})]).forEach((currentSheetId) => {
+		(/* @__PURE__ */ new Set([...Object.keys(oldFormulaData[unitId] || {}), ...Object.keys(newFormulaData[unitId] || {})])).forEach((currentSheetId) => {
 			var _oldFormulaData$unitI, _newFormulaData$unitI;
 			const currentOldFormulaData = (_oldFormulaData$unitI = oldFormulaData[unitId]) === null || _oldFormulaData$unitI === void 0 ? void 0 : _oldFormulaData$unitI[currentSheetId];
 			const currentNewFormulaData = (_newFormulaData$unitI = newFormulaData[unitId]) === null || _newFormulaData$unitI === void 0 ? void 0 : _newFormulaData$unitI[currentSheetId];
@@ -2325,7 +2325,7 @@ let UpdateFormulaController = class UpdateFormulaController extends _univerjs_co
 		this.disposeWithMe(this._commandService.beforeCommandExecuted((command, options) => {
 			if (command.id === _univerjs_sheets.SetRangeValuesMutation.id) {
 				const params = command.params;
-				if (options && options.onlyLocal === true || options && options.syncOnly === true || options && options.fromChangeset === true || params.trigger === _univerjs_sheets.SetStyleCommand.id || params.trigger === _univerjs_sheets.SetBorderCommand.id || params.trigger === _univerjs_sheets.ClearSelectionFormatCommand.id || params.trigger === _univerjs_sheets.SetRangeCustomMetadataCommand.id) return;
+				if (shouldSkipFormulaUpdateForSetRangeValues(params, options)) return;
 				this._handleSetRangeValuesMutation(params);
 			}
 		}));
@@ -2616,6 +2616,40 @@ UpdateFormulaController = __decorate([
 	__decorateParam(6, _univerjs_core.IConfigService),
 	__decorateParam(7, (0, _univerjs_core.Inject)(_univerjs_core.Injector))
 ], UpdateFormulaController);
+/**
+* Whether to skip the formula update when the setRangeValues mutation is executed.
+* The style-only cell value does not affect the formula calculation, so it can be skipped.
+*/
+function shouldSkipFormulaUpdateForSetRangeValues(params, options) {
+	if (options && (options.onlyLocal === true || options.syncOnly === true || options.fromChangeset === true)) return true;
+	const { cellValue, trigger } = params;
+	if (trigger && [
+		_univerjs_sheets.SetStyleCommand.id,
+		_univerjs_sheets.SetBorderCommand.id,
+		_univerjs_sheets.ClearSelectionFormatCommand.id,
+		_univerjs_sheets.SetRangeCustomMetadataCommand.id
+	].includes(trigger)) return true;
+	if (!cellValue) return true;
+	return isStyleOnlyCellValue(cellValue);
+}
+function isStyleOnlyCellValue(cellValue) {
+	const matrix = new _univerjs_core.ObjectMatrix(cellValue);
+	let hasCell = false;
+	let styleOnly = true;
+	matrix.forValue((_row, _col, cell) => {
+		hasCell = true;
+		if (!cell) {
+			styleOnly = false;
+			return false;
+		}
+		const keys = Object.keys(cell);
+		if (keys.length !== 1 || keys[0] !== "s") {
+			styleOnly = false;
+			return false;
+		}
+	});
+	return hasCell && styleOnly;
+}
 function tableReferenceContainsColumn(columnStruct, columnNames) {
 	if (!(columnNames === null || columnNames === void 0 ? void 0 : columnNames.length) || columnStruct.length === 0) return false;
 	const columnNameSet = new Set(columnNames);
@@ -2630,7 +2664,7 @@ function tableReferenceContainsColumn(columnStruct, columnNames) {
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets-formula";
-var version = "0.25.0";
+var version = "1.0.0-alpha.0";
 
 //#endregion
 //#region src/common/plugin-name.ts
@@ -2999,10 +3033,11 @@ ActiveDirtyController = __decorate([
 //#endregion
 //#region src/controllers/array-formula-cell-interceptor.controller.ts
 let ArrayFormulaCellInterceptorController = class ArrayFormulaCellInterceptorController extends _univerjs_core.Disposable {
-	constructor(_commandService, _configService, _sheetInterceptorService, _formulaDataModel, _lexerTreeBuilder, _functionService, _definedNamesService) {
+	constructor(_commandService, _configService, _univerInstanceService, _sheetInterceptorService, _formulaDataModel, _lexerTreeBuilder, _functionService, _definedNamesService) {
 		super();
 		this._commandService = _commandService;
 		this._configService = _configService;
+		this._univerInstanceService = _univerInstanceService;
 		this._sheetInterceptorService = _sheetInterceptorService;
 		this._formulaDataModel = _formulaDataModel;
 		this._lexerTreeBuilder = _lexerTreeBuilder;
@@ -3053,86 +3088,93 @@ let ArrayFormulaCellInterceptorController = class ArrayFormulaCellInterceptorCon
 	_addPrefixToFunctionSnapshot() {
 		const dataModel = this._formulaDataModel.getFormulaData();
 		const cacheMap = /* @__PURE__ */ new Map();
-		Object.entries(dataModel).forEach(([unitId, subUnitData]) => {
-			subUnitData && Array.from(Object.entries(subUnitData)).forEach(([subUnitId, formulaDataItem]) => {
-				if (!formulaDataItem) return;
-				const cellValue = new _univerjs_core.ObjectMatrix();
-				new _univerjs_core.ObjectMatrix(formulaDataItem).forValue((row, col, value) => {
-					const functionText = value === null || value === void 0 ? void 0 : value.f;
-					if ((value === null || value === void 0 ? void 0 : value.x) != null || !functionText || functionText.length === 0) return;
-					if (cacheMap.has(functionText)) {
-						const cachedFormula = cacheMap.get(functionText);
-						cellValue.setValue(row, col, { xf: cachedFormula });
-						return;
-					}
-					const newFormula = this._lexerTreeBuilder.getNewFormulaWithPrefix(functionText, this._functionService.hasExecutor.bind(this._functionService));
-					if (newFormula) {
-						cellValue.setValue(row, col, { xf: newFormula });
-						cacheMap.set(functionText, newFormula);
-					}
-				});
-				this._commandService.executeCommand(_univerjs_sheets.SetRangeValuesMutation.id, {
-					unitId,
-					subUnitId,
-					cellValue: cellValue.getMatrix()
-				}, {
-					onlyLocal: true,
-					fromFormula: true
-				});
+		this._forEachSheetSnapshotData(dataModel, (unitId, subUnitId, formulaDataItem) => {
+			if (!formulaDataItem) return;
+			const cellValue = new _univerjs_core.ObjectMatrix();
+			new _univerjs_core.ObjectMatrix(formulaDataItem).forValue((row, col, value) => {
+				const functionText = value === null || value === void 0 ? void 0 : value.f;
+				if ((value === null || value === void 0 ? void 0 : value.x) != null || !functionText || functionText.length === 0) return;
+				if (cacheMap.has(functionText)) {
+					const cachedFormula = cacheMap.get(functionText);
+					cellValue.setValue(row, col, { xf: cachedFormula });
+					return;
+				}
+				const newFormula = this._lexerTreeBuilder.getNewFormulaWithPrefix(functionText, this._functionService.hasExecutor.bind(this._functionService));
+				if (newFormula) {
+					cellValue.setValue(row, col, { xf: newFormula });
+					cacheMap.set(functionText, newFormula);
+				}
+			});
+			this._commandService.executeCommand(_univerjs_sheets.SetRangeValuesMutation.id, {
+				unitId,
+				subUnitId,
+				cellValue: cellValue.getMatrix()
+			}, {
+				onlyLocal: true,
+				fromFormula: true
 			});
 		});
 		cacheMap.clear();
 	}
+	_forEachSheetSnapshotData(snapshotData, iterator) {
+		if (!snapshotData) return;
+		const workbooks = this._univerInstanceService.getAllUnitsForType(_univerjs_core.UniverInstanceType.UNIVER_SHEET);
+		for (const workbook of workbooks) {
+			const unitId = workbook.getUnitId();
+			const subUnitData = snapshotData[unitId];
+			if (!subUnitData) continue;
+			for (const worksheet of workbook.getSheets()) {
+				const subUnitId = worksheet.getSheetId();
+				const data = subUnitData[subUnitId];
+				if (data == null) continue;
+				iterator(unitId, subUnitId, data);
+			}
+		}
+	}
 	_writeArrayFormulaToSnapshot(arrayFormulaRange, arrayFormulaCellData, arrayFormulaEmbedded) {
-		arrayFormulaRange && Object.entries(arrayFormulaRange).forEach(([unitId, subUnitData]) => {
-			subUnitData && Array.from(Object.entries(subUnitData)).forEach(([subUnitId, rangeData]) => {
-				const cellValue = new _univerjs_core.ObjectMatrix();
-				new _univerjs_core.ObjectMatrix(rangeData).forValue((row, col, value) => {
-					cellValue.setValue(row, col, { ref: (0, _univerjs_engine_formula.serializeRange)(value) });
-				});
-				this._commandService.executeCommand(_univerjs_sheets.SetRangeValuesMutation.id, {
-					unitId,
-					subUnitId,
-					cellValue: cellValue.getMatrix()
-				}, {
-					onlyLocal: true,
-					fromFormula: true
-				});
+		this._forEachSheetSnapshotData(arrayFormulaRange, (unitId, subUnitId, rangeData) => {
+			const cellValue = new _univerjs_core.ObjectMatrix();
+			new _univerjs_core.ObjectMatrix(rangeData).forValue((row, col, value) => {
+				cellValue.setValue(row, col, { ref: (0, _univerjs_engine_formula.serializeRange)(value) });
+			});
+			this._commandService.executeCommand(_univerjs_sheets.SetRangeValuesMutation.id, {
+				unitId,
+				subUnitId,
+				cellValue: cellValue.getMatrix()
+			}, {
+				onlyLocal: true,
+				fromFormula: true
 			});
 		});
-		arrayFormulaEmbedded && Object.entries(arrayFormulaEmbedded).forEach(([unitId, subUnitData]) => {
-			subUnitData && Array.from(Object.entries(subUnitData)).forEach(([subUnitId, rangeData]) => {
-				const cellValue = new _univerjs_core.ObjectMatrix();
-				new _univerjs_core.ObjectMatrix(rangeData).forValue((row, col) => {
-					var _arrayFormulaRange$un;
-					if (arrayFormulaRange === null || arrayFormulaRange === void 0 || (_arrayFormulaRange$un = arrayFormulaRange[unitId]) === null || _arrayFormulaRange$un === void 0 || (_arrayFormulaRange$un = _arrayFormulaRange$un[subUnitId]) === null || _arrayFormulaRange$un === void 0 || (_arrayFormulaRange$un = _arrayFormulaRange$un[row]) === null || _arrayFormulaRange$un === void 0 ? void 0 : _arrayFormulaRange$un[col]) return;
-					cellValue.setValue(row, col, { ref: (0, _univerjs_engine_formula.serializeRange)({
-						startRow: row,
-						endRow: row,
-						startColumn: col,
-						endColumn: col
-					}) });
-				});
-				this._commandService.executeCommand(_univerjs_sheets.SetRangeValuesMutation.id, {
-					unitId,
-					subUnitId,
-					cellValue: cellValue.getMatrix()
-				}, {
-					onlyLocal: true,
-					fromFormula: true
-				});
+		this._forEachSheetSnapshotData(arrayFormulaEmbedded, (unitId, subUnitId, rangeData) => {
+			const cellValue = new _univerjs_core.ObjectMatrix();
+			new _univerjs_core.ObjectMatrix(rangeData).forValue((row, col) => {
+				var _arrayFormulaRange$un;
+				if (arrayFormulaRange === null || arrayFormulaRange === void 0 || (_arrayFormulaRange$un = arrayFormulaRange[unitId]) === null || _arrayFormulaRange$un === void 0 || (_arrayFormulaRange$un = _arrayFormulaRange$un[subUnitId]) === null || _arrayFormulaRange$un === void 0 || (_arrayFormulaRange$un = _arrayFormulaRange$un[row]) === null || _arrayFormulaRange$un === void 0 ? void 0 : _arrayFormulaRange$un[col]) return;
+				cellValue.setValue(row, col, { ref: (0, _univerjs_engine_formula.serializeRange)({
+					startRow: row,
+					endRow: row,
+					startColumn: col,
+					endColumn: col
+				}) });
+			});
+			this._commandService.executeCommand(_univerjs_sheets.SetRangeValuesMutation.id, {
+				unitId,
+				subUnitId,
+				cellValue: cellValue.getMatrix()
+			}, {
+				onlyLocal: true,
+				fromFormula: true
 			});
 		});
-		arrayFormulaCellData && Object.entries(arrayFormulaCellData).forEach(([unitId, subUnitData]) => {
-			subUnitData && Array.from(Object.entries(subUnitData)).forEach(([subUnitId, rowData]) => {
-				this._commandService.executeCommand(_univerjs_sheets.SetRangeValuesMutation.id, {
-					unitId,
-					subUnitId,
-					cellValue: rowData
-				}, {
-					onlyLocal: true,
-					fromFormula: true
-				});
+		this._forEachSheetSnapshotData(arrayFormulaCellData, (unitId, subUnitId, rowData) => {
+			this._commandService.executeCommand(_univerjs_sheets.SetRangeValuesMutation.id, {
+				unitId,
+				subUnitId,
+				cellValue: rowData
+			}, {
+				onlyLocal: true,
+				fromFormula: true
 			});
 		});
 	}
@@ -3167,11 +3209,12 @@ let ArrayFormulaCellInterceptorController = class ArrayFormulaCellInterceptorCon
 ArrayFormulaCellInterceptorController = __decorate([
 	__decorateParam(0, _univerjs_core.ICommandService),
 	__decorateParam(1, _univerjs_core.IConfigService),
-	__decorateParam(2, (0, _univerjs_core.Inject)(_univerjs_sheets.SheetInterceptorService)),
-	__decorateParam(3, (0, _univerjs_core.Inject)(_univerjs_engine_formula.FormulaDataModel)),
-	__decorateParam(4, (0, _univerjs_core.Inject)(_univerjs_engine_formula.LexerTreeBuilder)),
-	__decorateParam(5, _univerjs_engine_formula.IFunctionService),
-	__decorateParam(6, _univerjs_engine_formula.IDefinedNamesService)
+	__decorateParam(2, _univerjs_core.IUniverInstanceService),
+	__decorateParam(3, (0, _univerjs_core.Inject)(_univerjs_sheets.SheetInterceptorService)),
+	__decorateParam(4, (0, _univerjs_core.Inject)(_univerjs_engine_formula.FormulaDataModel)),
+	__decorateParam(5, (0, _univerjs_core.Inject)(_univerjs_engine_formula.LexerTreeBuilder)),
+	__decorateParam(6, _univerjs_engine_formula.IFunctionService),
+	__decorateParam(7, _univerjs_engine_formula.IDefinedNamesService)
 ], ArrayFormulaCellInterceptorController);
 
 //#endregion