@univerjs/engine-formula 0.24.0 → 0.25.0-insiders.20260608-e4336f7

package/lib/cjs/facade.js

@@ -4,7 +4,7 @@ let _univerjs_core = require("@univerjs/core");
 let _univerjs_engine_formula = require("@univerjs/engine-formula");
 let rxjs = require("rxjs");
 
-//#region \0@oxc-project+runtime@0.129.0/helpers/decorateParam.js
+//#region \0@oxc-project+runtime@0.134.0/helpers/esm/decorateParam.js
 function __decorateParam(paramIndex, decorator) {
 	return function(target, key) {
 		decorator(target, key, paramIndex);
@@ -12,7 +12,7 @@ function __decorateParam(paramIndex, decorator) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.129.0/helpers/decorate.js
+//#region \0@oxc-project+runtime@0.134.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);
@@ -147,7 +147,7 @@ let FFormula = class FFormula extends _univerjs_core_facade.FBase {
 		});
 	}
 	/**
-	* @deprecated Use `onCalculationEnd` instead.
+	* @deprecated Use `onCalculationResultApplied` instead.
 	*/
 	whenComputingCompleteAsync(timeout) {
 		const gcss = this._injector.get(_univerjs_engine_formula.GlobalComputingStatusService);
@@ -155,8 +155,7 @@ let FFormula = class FFormula extends _univerjs_core_facade.FBase {
 		return (0, rxjs.firstValueFrom)((0, rxjs.race)(gcss.computingStatus$.pipe((0, rxjs.filter)((computing) => computing)), (0, rxjs.timer)(timeout !== null && timeout !== void 0 ? timeout : 3e4).pipe((0, rxjs.map)(() => false))));
 	}
 	/**
-	* Waits for the formula calculation to complete.
-	* @returns {Promise<void>} This method returns a promise that resolves when the calculation is complete.
+	* @deprecated Use `onCalculationResultApplied` instead.
 	*/
 	onCalculationEnd() {
 		return new Promise((resolve, reject) => {

package/lib/cjs/index.js

@@ -42,7 +42,7 @@ let BooleanValue = /* @__PURE__ */ function(BooleanValue) {
 }({});
 
 //#endregion
-//#region \0@oxc-project+runtime@0.129.0/helpers/typeof.js
+//#region \0@oxc-project+runtime@0.134.0/helpers/esm/typeof.js
 function _typeof(o) {
 	"@babel/helpers - typeof";
 	return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o) {
@@ -53,7 +53,7 @@ function _typeof(o) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.129.0/helpers/toPrimitive.js
+//#region \0@oxc-project+runtime@0.134.0/helpers/esm/toPrimitive.js
 function toPrimitive(t, r) {
 	if ("object" != _typeof(t) || !t) return t;
 	var e = t[Symbol.toPrimitive];
@@ -66,14 +66,14 @@ function toPrimitive(t, r) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.129.0/helpers/toPropertyKey.js
+//#region \0@oxc-project+runtime@0.134.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.129.0/helpers/defineProperty.js
+//#region \0@oxc-project+runtime@0.134.0/helpers/esm/defineProperty.js
 function _defineProperty(e, r, t) {
 	return (r = toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
 		value: t,
@@ -875,7 +875,7 @@ function getWeekDayByDateSerialNumber(dateSerialNumber) {
 	let date = excelSerialToDate(dateSerialNumber);
 	const leapDayDateTime = Date.UTC(1900, 1, 28);
 	const dateTime = Date.UTC(date.getUTCFullYear(), date.getUTCMonth(), date.getUTCDate());
-	if (!isDate19000229 && dateTime <= leapDayDateTime) date = new Date(dateTime - perDayMilliseconds);
+	if (!isDate19000229 && dateTime <= leapDayDateTime) date = /* @__PURE__ */ new Date(dateTime - perDayMilliseconds);
 	return date.getUTCDay();
 }
 function getTwoDateDaysByBasis(startDateSerialNumber, endDateSerialNumber, basis) {
@@ -1877,7 +1877,7 @@ function splitTableStructuredRef(ref) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.129.0/helpers/decorateParam.js
+//#region \0@oxc-project+runtime@0.134.0/helpers/esm/decorateParam.js
 function __decorateParam(paramIndex, decorator) {
 	return function(target, key) {
 		decorator(target, key, paramIndex);
@@ -1885,7 +1885,7 @@ function __decorateParam(paramIndex, decorator) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.129.0/helpers/decorate.js
+//#region \0@oxc-project+runtime@0.134.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);
@@ -4938,9 +4938,7 @@ let FormulaDataModel = class FormulaDataModel extends _univerjs_core.Disposable
 	}
 	getFormulaData() {
 		const formulaData = {};
-		const allSheets = this._univerInstanceService.getAllUnitsForType(_univerjs_core.UniverInstanceType.UNIVER_SHEET);
-		if (allSheets.length === 0) return formulaData;
-		allSheets.forEach((workbook) => {
+		this._univerInstanceService.getAllUnitsForType(_univerjs_core.UniverInstanceType.UNIVER_SHEET).forEach((workbook) => {
 			const unitId = workbook.getUnitId();
 			formulaData[unitId] = {};
 			workbook.getSheets().forEach((worksheet) => {
@@ -4948,6 +4946,32 @@ let FormulaDataModel = class FormulaDataModel extends _univerjs_core.Disposable
 				initSheetFormulaData(formulaData, unitId, worksheet.getSheetId(), cellMatrix);
 			});
 		});
+		this._univerInstanceService.getAllUnitsForType(_univerjs_core.UniverInstanceType.UNIVER_BASE).forEach((base) => {
+			const snapshot = base.getSnapshot();
+			const unitId = base.getUnitId();
+			formulaData[unitId] = {};
+			Object.values(snapshot.tables).filter((table) => !table.deleted).forEach((table) => {
+				var _table$recordOrder;
+				const tableFormulaData = {};
+				(_table$recordOrder = table.recordOrder) === null || _table$recordOrder === void 0 || _table$recordOrder.forEach((recordId, row) => {
+					const record = table.records[recordId];
+					if (!record || record.deleted) return;
+					table.fieldOrder.forEach((fieldId, col) => {
+						var _field$config$formula, _field$config, _tableFormulaData$row;
+						const field = table.fields[fieldId];
+						if (!field || field.deleted || field.type !== "formula") return;
+						const formula = String((_field$config$formula = (_field$config = field.config) === null || _field$config === void 0 ? void 0 : _field$config.formula) !== null && _field$config$formula !== void 0 ? _field$config$formula : "").trim();
+						if (!formula) return;
+						(_tableFormulaData$row = tableFormulaData[row]) !== null && _tableFormulaData$row !== void 0 || (tableFormulaData[row] = {});
+						tableFormulaData[row][col] = {
+							f: normalizeBaseFormulaForEngine(formula, table, snapshot),
+							si: field.id
+						};
+					});
+				});
+				formulaData[unitId][table.id] = tableFormulaData;
+			});
+		});
 		return formulaData;
 	}
 	getSheetFormulaData(unitId, sheetId) {
@@ -5051,6 +5075,33 @@ let FormulaDataModel = class FormulaDataModel extends _univerjs_core.Disposable
 			unitStylesData[unitId] = workbook.getStyles();
 			unitSheetNameMap[unitId] = sheetNameMap;
 		}
+		const unitAllBases = this._univerInstanceService.getAllUnitsForType(_univerjs_core.UniverInstanceType.UNIVER_BASE);
+		for (const base of unitAllBases) {
+			const snapshot = base.getSnapshot();
+			const unitId = base.getUnitId();
+			const baseData = {};
+			const tableNameMap = {};
+			for (const table of Object.values(snapshot.tables).filter((item) => !item.deleted)) {
+				var _table$recordOrder$fi, _table$recordOrder2;
+				baseData[table.id] = {
+					cellData: new _univerjs_core.ObjectMatrix(buildBaseRuntimeCellData(table)),
+					rowCount: (_table$recordOrder$fi = (_table$recordOrder2 = table.recordOrder) === null || _table$recordOrder2 === void 0 ? void 0 : _table$recordOrder2.filter((recordId) => {
+						var _table$records$record;
+						return !((_table$records$record = table.records[recordId]) === null || _table$records$record === void 0 ? void 0 : _table$records$record.deleted);
+					}).length) !== null && _table$recordOrder$fi !== void 0 ? _table$recordOrder$fi : 0,
+					columnCount: table.fieldOrder.filter((fieldId) => {
+						var _table$fields$fieldId;
+						return !((_table$fields$fieldId = table.fields[fieldId]) === null || _table$fields$fieldId === void 0 ? void 0 : _table$fields$fieldId.deleted);
+					}).length,
+					rowData: {},
+					columnData: {}
+				};
+				tableNameMap[table.name] = table.id;
+			}
+			allUnitData[unitId] = baseData;
+			unitStylesData[unitId] = new _univerjs_core.Styles();
+			unitSheetNameMap[unitId] = tableNameMap;
+		}
 		return {
 			allUnitData,
 			unitStylesData,
@@ -5339,6 +5390,95 @@ function initSheetFormulaData(formulaData, unitId, sheetId, cellMatrix) {
 	const newSheetFormulaData = sheetFormulaDataMatrix.getMatrix();
 	return { [unitId]: { [sheetId]: newSheetFormulaData } };
 }
+const BASE_LEGACY_FIELD_REF_PATTERN = /\{([^}]+)\}/g;
+const BASE_TABLE_FIELD_REF_PATTERN = /\b([A-Z_]\w*)\[([^\]]+)\]/gi;
+const BASE_BRACKET_FIELD_REF_PATTERN = /(^|[^A-Za-z0-9_\]\[])\[([^\]]+)\]/g;
+function normalizeBaseFormulaForEngine(formula, currentTable, snapshot) {
+	const refs = [];
+	const hold = (ref) => {
+		return `__BASE_FORMULA_REF_${refs.push(ref) - 1}__`;
+	};
+	return formula.replace(BASE_LEGACY_FIELD_REF_PATTERN, (_match, fieldName) => hold(createEngineThisRowRef(currentTable, fieldName, snapshot))).replace(BASE_TABLE_FIELD_REF_PATTERN, (_match, sourceTableName, fieldName) => {
+		const targetTable = resolveBaseFormulaTable(sourceTableName, currentTable, snapshot);
+		return targetTable ? hold(createEngineThisRowRef(targetTable, fieldName, snapshot)) : `${sourceTableName}[${fieldName}]`;
+	}).replace(BASE_BRACKET_FIELD_REF_PATTERN, (_match, prefix, fieldName) => `${prefix}${hold(createEngineThisRowRef(currentTable, fieldName, snapshot))}`).replace(/__BASE_FORMULA_REF_(\d+)__/g, (_match, index) => {
+		var _refs$Number;
+		return (_refs$Number = refs[Number(index)]) !== null && _refs$Number !== void 0 ? _refs$Number : "";
+	});
+}
+function createEngineThisRowRef(table, fieldName, snapshot) {
+	return `${getEngineBaseTableName(table, snapshot)}[[#This Row],[${fieldName}]]`;
+}
+function getEngineBaseTableName(table, snapshot) {
+	return Object.values(snapshot.tables).filter((item) => !item.deleted && item.name === table.name).length === 1 ? table.name : table.id;
+}
+function buildBaseRuntimeCellData(table) {
+	var _table$recordOrder$fi2, _table$recordOrder3, _table$records;
+	const cellData = { ...table.cellData };
+	const fieldOrder = table.fieldOrder.filter((fieldId) => table.fields[fieldId] && !table.fields[fieldId].deleted);
+	((_table$recordOrder$fi2 = (_table$recordOrder3 = table.recordOrder) === null || _table$recordOrder3 === void 0 ? void 0 : _table$recordOrder3.filter((recordId) => table.records[recordId] && !table.records[recordId].deleted)) !== null && _table$recordOrder$fi2 !== void 0 ? _table$recordOrder$fi2 : Object.values((_table$records = table.records) !== null && _table$records !== void 0 ? _table$records : {}).filter((record) => !record.deleted).sort((a, b) => a.orderKey.localeCompare(b.orderKey)).map((record) => record.id)).forEach((recordId, row) => {
+		const record = table.records[recordId];
+		if (!record || record.deleted) return;
+		cellData[row] = { ...cellData[row] };
+		fieldOrder.forEach((fieldId, col) => {
+			var _record$values;
+			if (!Object.prototype.hasOwnProperty.call((_record$values = record.values) !== null && _record$values !== void 0 ? _record$values : {}, fieldId)) return;
+			cellData[row][col] = toBaseRuntimeCellData(record.values[fieldId], table.fields[fieldId]);
+		});
+	});
+	return cellData;
+}
+function toBaseRuntimeCellData(value, field) {
+	if (isBaseCellData(value)) return normalizeBaseCellData(value);
+	if ((field === null || field === void 0 ? void 0 : field.type) === "attachment") return {
+		v: "",
+		t: _univerjs_core.CellValueType.STRING
+	};
+	if (Array.isArray(value)) return {
+		v: value.join(", "),
+		t: _univerjs_core.CellValueType.STRING
+	};
+	if ((field === null || field === void 0 ? void 0 : field.type) === "link" && value && typeof value === "object") {
+		var _ref, _link$text;
+		const link = value;
+		return {
+			v: String((_ref = (_link$text = link.text) !== null && _link$text !== void 0 ? _link$text : link.url) !== null && _ref !== void 0 ? _ref : ""),
+			t: _univerjs_core.CellValueType.STRING
+		};
+	}
+	if (value === null || typeof value === "string" || typeof value === "number" || typeof value === "boolean") return {
+		v: value,
+		t: inferBaseRuntimeCellType(value)
+	};
+	return {
+		v: null,
+		t: null
+	};
+}
+function normalizeBaseCellData(cell) {
+	var _cell$v;
+	const type = inferBaseRuntimeCellType((_cell$v = cell.v) !== null && _cell$v !== void 0 ? _cell$v : null);
+	return {
+		...cell,
+		t: type
+	};
+}
+function inferBaseRuntimeCellType(value) {
+	if (typeof value === "number") return _univerjs_core.CellValueType.NUMBER;
+	if (typeof value === "boolean") return _univerjs_core.CellValueType.BOOLEAN;
+	if (typeof value === "string") return _univerjs_core.CellValueType.STRING;
+	return null;
+}
+function isBaseCellData(value) {
+	return !!value && typeof value === "object" && (Object.prototype.hasOwnProperty.call(value, "v") || Object.prototype.hasOwnProperty.call(value, "t") || Object.prototype.hasOwnProperty.call(value, "p") || Object.prototype.hasOwnProperty.call(value, "f") || Object.prototype.hasOwnProperty.call(value, "si"));
+}
+function resolveBaseFormulaTable(tableName, currentTable, snapshot) {
+	if (!tableName || tableName === "table" || tableName === currentTable.id || tableName === currentTable.name) return currentTable;
+	const byId = snapshot.tables[tableName];
+	if (byId && !byId.deleted) return byId;
+	const matches = Object.values(snapshot.tables).filter((table) => !table.deleted && table.name === tableName);
+	return matches.length === 1 ? matches[0] : void 0;
+}
 
 //#endregion
 //#region src/services/sheet-row-filtered.service.ts
@@ -5393,6 +5533,7 @@ let FormulaCurrentConfigService = class FormulaCurrentConfigService extends _uni
 		_defineProperty(this, "_dirtyRanges", []);
 		_defineProperty(this, "_dirtyNameMap", {});
 		_defineProperty(this, "_dirtyDefinedNameMap", {});
+		_defineProperty(this, "_dirtySuperTableMap", {});
 		_defineProperty(this, "_dirtyUnitFeatureMap", {});
 		_defineProperty(this, "_dirtyUnitOtherFormulaMap", {});
 		_defineProperty(this, "_excludedCell", void 0);
@@ -5412,6 +5553,7 @@ let FormulaCurrentConfigService = class FormulaCurrentConfigService extends _uni
 		this._dirtyRanges = [];
 		this._dirtyNameMap = {};
 		this._dirtyDefinedNameMap = {};
+		this._dirtySuperTableMap = {};
 		this._dirtyUnitFeatureMap = {};
 		this._dirtyUnitOtherFormulaMap = {};
 		this._excludedCell = {};
@@ -5462,6 +5604,9 @@ let FormulaCurrentConfigService = class FormulaCurrentConfigService extends _uni
 	getDirtyDefinedNameMap() {
 		return this._dirtyDefinedNameMap;
 	}
+	getDirtySuperTableMap() {
+		return this._dirtySuperTableMap;
+	}
 	getDirtyUnitFeatureMap() {
 		return this._dirtyUnitFeatureMap;
 	}
@@ -5527,6 +5672,7 @@ let FormulaCurrentConfigService = class FormulaCurrentConfigService extends _uni
 		this._dirtyRanges = config.dirtyRanges;
 		this._dirtyNameMap = config.dirtyNameMap;
 		this._dirtyDefinedNameMap = config.dirtyDefinedNameMap;
+		this._dirtySuperTableMap = config.dirtySuperTableMap || {};
 		this._dirtyUnitFeatureMap = config.dirtyUnitFeatureMap;
 		this._dirtyUnitOtherFormulaMap = config.dirtyUnitOtherFormulaMap;
 		this._excludedCell = config.excludedCell;
@@ -5548,6 +5694,7 @@ let FormulaCurrentConfigService = class FormulaCurrentConfigService extends _uni
 			dirtyRanges: this._dirtyRanges,
 			dirtyNameMap: this._dirtyNameMap,
 			dirtyDefinedNameMap: this._dirtyDefinedNameMap,
+			dirtySuperTableMap: this._dirtySuperTableMap,
 			dirtyUnitFeatureMap: this._dirtyUnitFeatureMap,
 			dirtyUnitOtherFormulaMap: this._dirtyUnitOtherFormulaMap,
 			clearDependencyTreeCache: this._clearDependencyTreeCache
@@ -5586,10 +5733,13 @@ let FormulaCurrentConfigService = class FormulaCurrentConfigService extends _uni
 		});
 	}
 	_loadSheetData() {
+		var _workbook$getUnitId, _worksheet$getSheetId;
 		const workbook = this._univerInstanceService.getCurrentUnitOfType(_univerjs_core.UniverInstanceType.UNIVER_SHEET);
 		const worksheet = workbook === null || workbook === void 0 ? void 0 : workbook.getActiveSheet();
-		this._executeUnitId = workbook === null || workbook === void 0 ? void 0 : workbook.getUnitId();
-		this._executeSubUnitId = worksheet === null || worksheet === void 0 ? void 0 : worksheet.getSheetId();
+		const base = workbook ? null : this._univerInstanceService.getCurrentUnitOfType(_univerjs_core.UniverInstanceType.UNIVER_BASE);
+		const table = base ? getFirstLiveBaseTable(base.getSnapshot().tables, base.getSnapshot().tableOrder) : null;
+		this._executeUnitId = (_workbook$getUnitId = workbook === null || workbook === void 0 ? void 0 : workbook.getUnitId()) !== null && _workbook$getUnitId !== void 0 ? _workbook$getUnitId : base === null || base === void 0 ? void 0 : base.getUnitId();
+		this._executeSubUnitId = (_worksheet$getSheetId = worksheet === null || worksheet === void 0 ? void 0 : worksheet.getSheetId()) !== null && _worksheet$getSheetId !== void 0 ? _worksheet$getSheetId : table === null || table === void 0 ? void 0 : table.id;
 		return this._formulaDataModel.getCalculateData();
 	}
 	/**
@@ -5620,6 +5770,14 @@ FormulaCurrentConfigService = __decorate([
 	__decorateParam(2, (0, _univerjs_core.Inject)(FormulaDataModel)),
 	__decorateParam(3, (0, _univerjs_core.Inject)(ISheetRowFilteredService))
 ], FormulaCurrentConfigService);
+function getFirstLiveBaseTable(tables, tableOrder) {
+	var _Object$values$find;
+	for (const tableId of tableOrder) {
+		const table = tables[tableId];
+		if (table && !table.deleted) return table;
+	}
+	return (_Object$values$find = Object.values(tables).find((table) => !table.deleted)) !== null && _Object$values$find !== void 0 ? _Object$values$find : null;
+}
 const IFormulaCurrentConfigService = (0, _univerjs_core.createIdentifier)("univer.formula.current-data.service");
 
 //#endregion
@@ -5662,22 +5820,6 @@ Lexer = __decorate([
 	__decorateParam(2, IFormulaCurrentConfigService)
 ], Lexer);
 
-//#endregion
-//#region src/basics/is-null-cell.ts
-/**
-* Examine if a cell is empty (null) in the formula-related modules. This is not
-* interchangable with {@link isNullCell} from the core package, because for
-* formulas, "custom" field is meaningless.
-*/
-function isNullCellForFormula(cell) {
-	if (cell == null) return true;
-	const { v, f, si, p } = cell;
-	if (!(v == null || typeof v === "string" && v.length === 0)) return false;
-	if (f != null && f.length > 0 || si != null && si.length > 0) return false;
-	if (p != null) return false;
-	return true;
-}
-
 //#endregion
 //#region src/engine/utils/cell.ts
 function getCellValue(cell) {
@@ -5729,7 +5871,7 @@ function isWildcard(str) {
 	return str.indexOf("*") > -1 || str.indexOf("?") > -1;
 }
 function isMatchWildcard(currentValue, value) {
-	const pattern = escapeRegExp(value).replace(/~?[*?]/g, (match) => {
+	const pattern = escapeRegExpForWildcard(value).replace(/~?[*?]/g, (match) => {
 		if (match.startsWith("~")) return `\\${match.substring(1)}`;
 		if (match === "*") return ".*";
 		if (match === "?") return ".";
@@ -5764,7 +5906,7 @@ function compareWithWildcard(currentValue, value, operator) {
 	}
 	return result;
 }
-function escapeRegExp(str) {
+function escapeRegExpForWildcard(str) {
 	return str.replace(/[.+^${}()|[\]\\]/g, "\\$&");
 }
 function getMatchModeValue(matchModeValue) {
@@ -5813,11 +5955,20 @@ const localeCurrencySymbolMap = new Map([
 	[_univerjs_core.LocaleType.VI_VN, "₫"],
 	[_univerjs_core.LocaleType.ZH_CN, "¥"],
 	[_univerjs_core.LocaleType.ZH_TW, "NT$"],
+	[_univerjs_core.LocaleType.ZH_HK, "HK$"],
 	[_univerjs_core.LocaleType.FR_FR, "€"],
 	[_univerjs_core.LocaleType.FA_IR, "﷼"],
 	[_univerjs_core.LocaleType.KO_KR, "₩"],
 	[_univerjs_core.LocaleType.ES_ES, "€"],
-	[_univerjs_core.LocaleType.CA_ES, "€"]
+	[_univerjs_core.LocaleType.CA_ES, "€"],
+	[_univerjs_core.LocaleType.SK_SK, "€"],
+	[_univerjs_core.LocaleType.JA_JP, "¥"],
+	[_univerjs_core.LocaleType.PT_BR, "R$"],
+	[_univerjs_core.LocaleType.DE_DE, "€"],
+	[_univerjs_core.LocaleType.IT_IT, "€"],
+	[_univerjs_core.LocaleType.ID_ID, "Rp"],
+	[_univerjs_core.LocaleType.PL_PL, "zł"],
+	[_univerjs_core.LocaleType.AR_SA, "﷼"]
 ]);
 function getCurrencySymbol(locale) {
 	return localeCurrencySymbolMap.get(locale) || "$";
@@ -8245,7 +8396,7 @@ var BaseReferenceObject = class extends ObjectClassType {
 			if (r < 0 || c < 0) return callback(ErrorValueObject.create("#REF!"), r, c);
 			const cell = this.getCellData(r, c);
 			let result = false;
-			if (isNullCellForFormula(cell)) {
+			if ((0, _univerjs_core.isNullCell)(cell)) {
 				result = callback(null, r, c);
 				continue;
 			}
@@ -9692,10 +9843,10 @@ let FormulaRuntimeService = class FormulaRuntimeService extends _univerjs_core.D
 			const currentCell = unitData === null || unitData === void 0 || (_unitData$formulaUnit = unitData[formulaUnitId]) === null || _unitData$formulaUnit === void 0 || (_unitData$formulaUnit = _unitData$formulaUnit[formulaSheetId]) === null || _unitData$formulaUnit === void 0 || (_unitData$formulaUnit = _unitData$formulaUnit.cellData) === null || _unitData$formulaUnit === void 0 ? void 0 : _unitData$formulaUnit.getValue(r, c);
 			const featureCell = this._getRuntimeFeatureCellValue(r, c, formulaSheetId, formulaUnitId);
 			const isPreviousCellOfCurrentArrayFormula = this._arrayCellHasData(arrayDataCell) && this._isInArrayFormulaRange(previousArrayFormulaRange, r, c) && (currentCell == null || this._isSameCellValue(currentCell, arrayDataCell));
-			const hasRuntimeCell = !isNullCellForFormula(cell);
+			const hasRuntimeCell = !(0, _univerjs_core.isNullCell)(cell);
 			const isInOtherArrayFormulaRange = this._isInOtherArrayFormulaRange(formulaUnitId, formulaSheetId, formulaRow, formulaColumn, r, c);
-			const currentCellBlocks = !isNullCellForFormula(currentCell) && !isPreviousCellOfCurrentArrayFormula;
-			const featureCellBlocks = !isNullCellForFormula(featureCell);
+			const currentCellBlocks = !(0, _univerjs_core.isNullCell)(currentCell) && !isPreviousCellOfCurrentArrayFormula;
+			const featureCellBlocks = !(0, _univerjs_core.isNullCell)(featureCell);
 			if (hasRuntimeCell || isInOtherArrayFormulaRange || currentCellBlocks || featureCellBlocks) return true;
 		}
 		return false;
@@ -9968,9 +10119,11 @@ const COLUMN_LIKE_FUNCTION_NAMES = new Set(ALL_GROUPS.flatMap((g) => Object.valu
 //#region src/engine/utils/generate-ast-node.ts
 const FORMULA_CACHE_LRU_COUNT = 5e3;
 const FORMULA_AST_CACHE = new FormulaAstLRU(FORMULA_CACHE_LRU_COUNT);
+const DIRTY_DEFINED_NAME_SET_CACHE = /* @__PURE__ */ new WeakMap();
+const DIRTY_SUPER_TABLE_PATTERN_CACHE = /* @__PURE__ */ new WeakMap();
 function generateAstNode(unitId, formulaString, lexer, astTreeBuilder, currentConfigService) {
 	let astNode = FORMULA_AST_CACHE.get(`${unitId}${formulaString}`);
-	const noCache = checkIsChangedByDefinedName(unitId, formulaString, currentConfigService);
+	const noCache = checkIsChangedByDefinedName(unitId, formulaString, currentConfigService) || checkIsChangedBySuperTable(unitId, formulaString, currentConfigService);
 	if (!noCache && astNode && !isDirtyDefinedForNode(astNode, currentConfigService)) return astNode;
 	const lexerNode = lexer.treeBuilder(formulaString);
 	if (ERROR_TYPE_SET.has(lexerNode)) return ErrorNode.create(lexerNode);
@@ -9985,14 +10138,37 @@ function generateAstNode(unitId, formulaString, lexer, astTreeBuilder, currentCo
 function checkIsChangedByDefinedName(unitId, formula, currentConfigService) {
 	const unitDefinedNameMap = currentConfigService.getDirtyDefinedNameMap()[unitId];
 	if (unitDefinedNameMap == null) return false;
-	const formulaText = normalizeFormulaText(formula);
-	const names = Object.keys(unitDefinedNameMap);
-	for (let i = 0, len = names.length; i < len; i++) if (normalizeFormulaText(names[i]) === formulaText) return true;
-	return false;
+	return getNormalizedDirtyDefinedNameSet(unitDefinedNameMap).has(normalizeFormulaText(formula));
 }
 function normalizeFormulaText(formula) {
 	return formula.startsWith("=") ? formula.slice(1) : formula;
 }
+function checkIsChangedBySuperTable(unitId, formula, currentConfigService) {
+	var _currentConfigService, _tableReferencePatter;
+	const getDirtySuperTableMap = (_currentConfigService = currentConfigService.getDirtySuperTableMap) === null || _currentConfigService === void 0 ? void 0 : _currentConfigService.bind(currentConfigService);
+	const changedSuperTableMap = getDirtySuperTableMap === null || getDirtySuperTableMap === void 0 ? void 0 : getDirtySuperTableMap();
+	const unitSuperTableMap = changedSuperTableMap === null || changedSuperTableMap === void 0 ? void 0 : changedSuperTableMap[unitId];
+	if (unitSuperTableMap == null) return false;
+	const tableReferencePattern = getDirtySuperTableReferencePattern(unitSuperTableMap);
+	return (_tableReferencePatter = tableReferencePattern === null || tableReferencePattern === void 0 ? void 0 : tableReferencePattern.test(normalizeFormulaText(formula))) !== null && _tableReferencePatter !== void 0 ? _tableReferencePatter : false;
+}
+function getNormalizedDirtyDefinedNameSet(unitDefinedNameMap) {
+	let normalizedNameSet = DIRTY_DEFINED_NAME_SET_CACHE.get(unitDefinedNameMap);
+	if (normalizedNameSet == null) {
+		normalizedNameSet = new Set(Object.keys(unitDefinedNameMap).map(normalizeFormulaText));
+		DIRTY_DEFINED_NAME_SET_CACHE.set(unitDefinedNameMap, normalizedNameSet);
+	}
+	return normalizedNameSet;
+}
+function getDirtySuperTableReferencePattern(unitSuperTableMap) {
+	let tableReferencePattern = DIRTY_SUPER_TABLE_PATTERN_CACHE.get(unitSuperTableMap);
+	if (tableReferencePattern === void 0) {
+		const escapedTableNames = Object.keys(unitSuperTableMap).filter((tableName) => tableName.length > 0).map(_univerjs_core.escapeRegExp);
+		tableReferencePattern = escapedTableNames.length > 0 ? new RegExp(`(^|[^A-Za-z0-9_])(?:${escapedTableNames.join("|")})(\\s*\\[|$|[^A-Za-z0-9_])`, "i") : null;
+		DIRTY_SUPER_TABLE_PATTERN_CACHE.set(unitSuperTableMap, tableReferencePattern);
+	}
+	return tableReferencePattern;
+}
 function isDirtyDefinedForNode(node, currentConfigService) {
 	const definedNameMap = currentConfigService.getDirtyDefinedNameMap();
 	const executeUnitId = currentConfigService.getExecuteUnitId();
@@ -11790,9 +11966,7 @@ var DependencyManagerBaseService = class extends _univerjs_core.Disposable {
 	clearFormulaDependency(unitId, sheetId) {
 		throw new Error("Method not implemented.");
 	}
-	removeFormulaDependencyByDefinedName(unitId, definedName) {
-		throw new Error("Method not implemented.");
-	}
+	removeFormulaDependencyByDefinedName(unitId, definedName) {}
 	searchDependency(search, exceptTreeIds) {
 		return this._dependencyRTreeCache.bulkSearch(search, exceptTreeIds);
 	}
@@ -13901,7 +14075,7 @@ let CalculateController = class CalculateController extends _univerjs_core.Dispo
 		}));
 	}
 	async _calculate(formulaDirtyData) {
-		const { forceCalculation: forceCalculate = false, dirtyRanges = [], dirtyNameMap = {}, dirtyDefinedNameMap = {}, dirtyUnitFeatureMap = {}, dirtyUnitOtherFormulaMap = {}, clearDependencyTreeCache = {}, maxIteration = 1, rowData, isCalculateTreeModel = false } = formulaDirtyData;
+		const { forceCalculation: forceCalculate = false, dirtyRanges = [], dirtyNameMap = {}, dirtyDefinedNameMap = {}, dirtySuperTableMap = {}, dirtyUnitFeatureMap = {}, dirtyUnitOtherFormulaMap = {}, clearDependencyTreeCache = {}, maxIteration = 1, rowData, isCalculateTreeModel = false } = formulaDirtyData;
 		const formulaData = this._formulaDataModel.getFormulaData();
 		const arrayFormulaCellData = this._formulaDataModel.getArrayFormulaCellData();
 		const arrayFormulaRange = this._formulaDataModel.getArrayFormulaRange();
@@ -13913,6 +14087,7 @@ let CalculateController = class CalculateController extends _univerjs_core.Dispo
 			dirtyRanges,
 			dirtyNameMap,
 			dirtyDefinedNameMap,
+			dirtySuperTableMap,
 			dirtyUnitFeatureMap,
 			dirtyUnitOtherFormulaMap,
 			clearDependencyTreeCache,
@@ -24140,14 +24315,14 @@ function guessIsNaNorInfinity(guess, iterF) {
 	const max = Number.MAX_VALUE;
 	const min = -1;
 	const step = 1.6;
-	let low = guess - .01 <= min ? min + g_Eps : guess - .01;
+	let low = guess - .01 <= min ? -.9999999 : guess - .01;
 	let high = guess + .01 >= max ? max - g_Eps : guess + .01;
 	let xBegin;
 	let xEnd;
 	let currentIter = 0;
 	if (guess <= min || guess >= max) return ErrorValueObject.create("#NUM!");
 	for (let i = 0; i < nIM; i++) {
-		xBegin = low <= min ? min + g_Eps : low;
+		xBegin = low <= min ? -.9999999 : low;
 		xEnd = high >= max ? max - g_Eps : high;
 		const x = iterF(xBegin);
 		const y = iterF(xEnd);
@@ -32743,7 +32918,7 @@ var Roundbank = class extends BaseFunction {
 		const integerPart = Math.floor(adjustedNum);
 		const decimalPart = adjustedNum - integerPart;
 		let result = Math.round(adjustedNum);
-		if (decimalPart > .5 - EPSILON && decimalPart < .5 + EPSILON) result = integerPart % 2 === 0 ? integerPart : integerPart + 1;
+		if (decimalPart > .5 - EPSILON && decimalPart < .50000001) result = integerPart % 2 === 0 ? integerPart : integerPart + 1;
 		return numDigits ? result / multiplier : result;
 	}
 };
@@ -40061,10 +40236,7 @@ var Textsplit = class extends BaseFunction {
 		if (valueObject.isNull()) value = "\\s";
 		if (valueObject.isBoolean()) value = value ? "TRUE" : "FALSE";
 		value += "";
-		return this._escapeRegExp(value);
-	}
-	_escapeRegExp(string) {
-		return string.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+		return (0, _univerjs_core.escapeRegExp)(value);
 	}
 };
 
@@ -40447,7 +40619,7 @@ function getObjectValue(result, isUseStrip = false) {
 //#endregion
 //#region package.json
 var name = "@univerjs/engine-formula";
-var version = "0.24.0";
+var version = "0.25.0-insiders.20260608-e4336f7";
 
 //#endregion
 //#region src/services/global-computing-status.service.ts
@@ -40505,7 +40677,7 @@ let ComputingStatusReporterController = class ComputingStatusReporterController
 				const params = command.params;
 				if (params.stageInfo) return observe.next(params.stageInfo.stage === 0 || params.stageInfo.stage === 8);
 			});
-		}).pipe((0, rxjs.distinctUntilChanged)(), (0, rxjs.shareReplay)()));
+		}).pipe((0, rxjs.distinctUntilChanged)(), (0, rxjs.shareReplay)({ refCount: true })));
 		const disposables = new _univerjs_core.DisposableCollection();
 		const subject = new rxjs.BehaviorSubject(true);
 		disposables.add(this._globalComputingSrv.pushComputingStatusSubject(subject));

package/lib/es/facade.js

@@ -3,7 +3,7 @@ import { ICommandService, IConfigService, Inject, Injector } from "@univerjs/cor
 import { ENGINE_FORMULA_CYCLE_REFERENCE_COUNT, ENGINE_FORMULA_RETURN_DEPENDENCY_TREE, GlobalComputingStatusService, IDefinedNamesService, IFunctionService, ISuperTableService, LexerTreeBuilder, SetCellFormulaDependencyCalculationMutation, SetCellFormulaDependencyCalculationResultMutation, SetFormulaCalculationNotificationMutation, SetFormulaCalculationStartMutation, SetFormulaCalculationStopMutation, SetFormulaDependencyCalculationMutation, SetFormulaDependencyCalculationResultMutation, SetFormulaStringBatchCalculationMutation, SetFormulaStringBatchCalculationResultMutation, SetQueryFormulaDependencyAllMutation, SetQueryFormulaDependencyAllResultMutation, SetQueryFormulaDependencyMutation, SetQueryFormulaDependencyResultMutation, SetTriggerFormulaCalculationStartMutation } from "@univerjs/engine-formula";
 import { filter, firstValueFrom, map, race, timer } from "rxjs";
 
-//#region \0@oxc-project+runtime@0.129.0/helpers/decorateParam.js
+//#region \0@oxc-project+runtime@0.134.0/helpers/esm/decorateParam.js
 function __decorateParam(paramIndex, decorator) {
 	return function(target, key) {
 		decorator(target, key, paramIndex);
@@ -11,7 +11,7 @@ function __decorateParam(paramIndex, decorator) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.129.0/helpers/decorate.js
+//#region \0@oxc-project+runtime@0.134.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);
@@ -146,7 +146,7 @@ let FFormula = class FFormula extends FBase {
 		});
 	}
 	/**
-	* @deprecated Use `onCalculationEnd` instead.
+	* @deprecated Use `onCalculationResultApplied` instead.
 	*/
 	whenComputingCompleteAsync(timeout) {
 		const gcss = this._injector.get(GlobalComputingStatusService);
@@ -154,8 +154,7 @@ let FFormula = class FFormula extends FBase {
 		return firstValueFrom(race(gcss.computingStatus$.pipe(filter((computing) => computing)), timer(timeout !== null && timeout !== void 0 ? timeout : 3e4).pipe(map(() => false))));
 	}
 	/**
-	* Waits for the formula calculation to complete.
-	* @returns {Promise<void>} This method returns a promise that resolves when the calculation is complete.
+	* @deprecated Use `onCalculationResultApplied` instead.
 	*/
 	onCalculationEnd() {
 		return new Promise((resolve, reject) => {