@univerjs/engine-formula 0.23.0 → 0.24.0-insiders.20260528-29f582d

package/lib/cjs/facade.js

@@ -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

@@ -1781,7 +1781,7 @@ function replaceRefPrefixString(token) {
 /**
 * implement getSheetIdByName
 * function getSheetIdByName(name: string) {
-return univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)?.getSheetBySheetName(name)?.getSheetId() || '';
+return univerInstanceService.getCurrentUnitOfType<Workbook>(UniverInstanceType.UNIVER_SHEET)?.getSheetBySheetName(name)?.getSheetId() || '';
 }
 */
 function getRangeWithRefsString(refString, getSheetIdByName) {
@@ -5393,6 +5393,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 +5413,7 @@ let FormulaCurrentConfigService = class FormulaCurrentConfigService extends _uni
 		this._dirtyRanges = [];
 		this._dirtyNameMap = {};
 		this._dirtyDefinedNameMap = {};
+		this._dirtySuperTableMap = {};
 		this._dirtyUnitFeatureMap = {};
 		this._dirtyUnitOtherFormulaMap = {};
 		this._excludedCell = {};
@@ -5462,6 +5464,9 @@ let FormulaCurrentConfigService = class FormulaCurrentConfigService extends _uni
 	getDirtyDefinedNameMap() {
 		return this._dirtyDefinedNameMap;
 	}
+	getDirtySuperTableMap() {
+		return this._dirtySuperTableMap;
+	}
 	getDirtyUnitFeatureMap() {
 		return this._dirtyUnitFeatureMap;
 	}
@@ -5482,7 +5487,7 @@ let FormulaCurrentConfigService = class FormulaCurrentConfigService extends _uni
 		return this._localeService.getCurrentLocale();
 	}
 	getSheetsInfo() {
-		const { id, sheetOrder } = this._univerInstanceService.getCurrentUnitForType(_univerjs_core.UniverInstanceType.UNIVER_SHEET).getSnapshot();
+		const { id, sheetOrder } = this._univerInstanceService.getCurrentUnitOfType(_univerjs_core.UniverInstanceType.UNIVER_SHEET).getSnapshot();
 		return {
 			sheetOrder,
 			sheetNameMap: this._sheetIdToNameMap[id]
@@ -5527,6 +5532,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 +5554,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,7 +5593,7 @@ let FormulaCurrentConfigService = class FormulaCurrentConfigService extends _uni
 		});
 	}
 	_loadSheetData() {
-		const workbook = this._univerInstanceService.getCurrentUnitForType(_univerjs_core.UniverInstanceType.UNIVER_SHEET);
+		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();
@@ -5662,22 +5669,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 +5720,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 +5755,7 @@ function compareWithWildcard(currentValue, value, operator) {
 	}
 	return result;
 }
-function escapeRegExp(str) {
+function escapeRegExpForWildcard(str) {
 	return str.replace(/[.+^${}()|[\]\\]/g, "\\$&");
 }
 function getMatchModeValue(matchModeValue) {
@@ -5813,11 +5804,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 +8245,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 +9692,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 +9968,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 +9987,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 +11815,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 +13924,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 +13936,7 @@ let CalculateController = class CalculateController extends _univerjs_core.Dispo
 			dirtyRanges,
 			dirtyNameMap,
 			dirtyDefinedNameMap,
+			dirtySuperTableMap,
 			dirtyUnitFeatureMap,
 			dirtyUnitOtherFormulaMap,
 			clearDependencyTreeCache,
@@ -40061,10 +40085,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 +40468,7 @@ function getObjectValue(result, isUseStrip = false) {
 //#endregion
 //#region package.json
 var name = "@univerjs/engine-formula";
-var version = "0.23.0";
+var version = "0.24.0-insiders.20260528-29f582d";
 
 //#endregion
 //#region src/services/global-computing-status.service.ts

package/lib/es/facade.js

@@ -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) => {

package/lib/es/index.js

@@ -1,4 +1,4 @@
-import { AbsoluteRefType, AsyncLock, BooleanNumber, BuildTextUtils, CellValueType, CommandType, DataStreamTreeTokenType, Disposable, DisposableCollection, ICommandService, IConfigService, IUniverInstanceService, Inject, Injector, LRUMap, LifecycleService, LocaleService, LocaleType, MAX_COLUMN_COUNT, MAX_ROW_COUNT, ObjectMatrix, Optional, Plugin, RANGE_TYPE, RTree, Rectangle, RichTextBuilder, Tools, UniverInstanceType, cellToRange, columnLabelToNumber, createIdentifier, generateRandomId, getNumfmtParseValueFilter, hashAlgorithm, isFormulaId, isFormulaString, isRealNum, isTextFormat, isValidRange, merge, moveRangeByOffset, numfmt, requestImmediateMacroTask, sortRules, toDisposable, touchDependencies } from "@univerjs/core";
+import { AbsoluteRefType, AsyncLock, BooleanNumber, BuildTextUtils, CellValueType, CommandType, DataStreamTreeTokenType, Disposable, DisposableCollection, ICommandService, IConfigService, IUniverInstanceService, Inject, Injector, LRUMap, LifecycleService, LocaleService, LocaleType, MAX_COLUMN_COUNT, MAX_ROW_COUNT, ObjectMatrix, Optional, Plugin, RANGE_TYPE, RTree, Rectangle, RichTextBuilder, Tools, UniverInstanceType, cellToRange, columnLabelToNumber, createIdentifier, escapeRegExp, generateRandomId, getNumfmtParseValueFilter, hashAlgorithm, isFormulaId, isFormulaString, isNullCell, isRealNum, isTextFormat, isValidRange, merge, moveRangeByOffset, numfmt, requestImmediateMacroTask, sortRules, toDisposable, touchDependencies } from "@univerjs/core";
 import IntervalTree from "@flatten-js/interval-tree";
 import { BehaviorSubject, Observable, Subject, bufferWhen, combineLatest, distinctUntilChanged, filter, map, shareReplay, skip } from "rxjs";
 import Decimal from "decimal.js";
@@ -1751,7 +1751,7 @@ function replaceRefPrefixString(token) {
 /**
 * implement getSheetIdByName
 * function getSheetIdByName(name: string) {
-return univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)?.getSheetBySheetName(name)?.getSheetId() || '';
+return univerInstanceService.getCurrentUnitOfType<Workbook>(UniverInstanceType.UNIVER_SHEET)?.getSheetBySheetName(name)?.getSheetId() || '';
 }
 */
 function getRangeWithRefsString(refString, getSheetIdByName) {
@@ -5363,6 +5363,7 @@ let FormulaCurrentConfigService = class FormulaCurrentConfigService extends Disp
 		_defineProperty(this, "_dirtyRanges", []);
 		_defineProperty(this, "_dirtyNameMap", {});
 		_defineProperty(this, "_dirtyDefinedNameMap", {});
+		_defineProperty(this, "_dirtySuperTableMap", {});
 		_defineProperty(this, "_dirtyUnitFeatureMap", {});
 		_defineProperty(this, "_dirtyUnitOtherFormulaMap", {});
 		_defineProperty(this, "_excludedCell", void 0);
@@ -5382,6 +5383,7 @@ let FormulaCurrentConfigService = class FormulaCurrentConfigService extends Disp
 		this._dirtyRanges = [];
 		this._dirtyNameMap = {};
 		this._dirtyDefinedNameMap = {};
+		this._dirtySuperTableMap = {};
 		this._dirtyUnitFeatureMap = {};
 		this._dirtyUnitOtherFormulaMap = {};
 		this._excludedCell = {};
@@ -5432,6 +5434,9 @@ let FormulaCurrentConfigService = class FormulaCurrentConfigService extends Disp
 	getDirtyDefinedNameMap() {
 		return this._dirtyDefinedNameMap;
 	}
+	getDirtySuperTableMap() {
+		return this._dirtySuperTableMap;
+	}
 	getDirtyUnitFeatureMap() {
 		return this._dirtyUnitFeatureMap;
 	}
@@ -5452,7 +5457,7 @@ let FormulaCurrentConfigService = class FormulaCurrentConfigService extends Disp
 		return this._localeService.getCurrentLocale();
 	}
 	getSheetsInfo() {
-		const { id, sheetOrder } = this._univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET).getSnapshot();
+		const { id, sheetOrder } = this._univerInstanceService.getCurrentUnitOfType(UniverInstanceType.UNIVER_SHEET).getSnapshot();
 		return {
 			sheetOrder,
 			sheetNameMap: this._sheetIdToNameMap[id]
@@ -5497,6 +5502,7 @@ let FormulaCurrentConfigService = class FormulaCurrentConfigService extends Disp
 		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;
@@ -5518,6 +5524,7 @@ let FormulaCurrentConfigService = class FormulaCurrentConfigService extends Disp
 			dirtyRanges: this._dirtyRanges,
 			dirtyNameMap: this._dirtyNameMap,
 			dirtyDefinedNameMap: this._dirtyDefinedNameMap,
+			dirtySuperTableMap: this._dirtySuperTableMap,
 			dirtyUnitFeatureMap: this._dirtyUnitFeatureMap,
 			dirtyUnitOtherFormulaMap: this._dirtyUnitOtherFormulaMap,
 			clearDependencyTreeCache: this._clearDependencyTreeCache
@@ -5556,7 +5563,7 @@ let FormulaCurrentConfigService = class FormulaCurrentConfigService extends Disp
 		});
 	}
 	_loadSheetData() {
-		const workbook = this._univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET);
+		const workbook = this._univerInstanceService.getCurrentUnitOfType(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();
@@ -5632,22 +5639,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) {
@@ -5699,7 +5690,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 ".";
@@ -5734,7 +5725,7 @@ function compareWithWildcard(currentValue, value, operator) {
 	}
 	return result;
 }
-function escapeRegExp(str) {
+function escapeRegExpForWildcard(str) {
 	return str.replace(/[.+^${}()|[\]\\]/g, "\\$&");
 }
 function getMatchModeValue(matchModeValue) {
@@ -5783,11 +5774,20 @@ const localeCurrencySymbolMap = new Map([
 	[LocaleType.VI_VN, "₫"],
 	[LocaleType.ZH_CN, "¥"],
 	[LocaleType.ZH_TW, "NT$"],
+	[LocaleType.ZH_HK, "HK$"],
 	[LocaleType.FR_FR, "€"],
 	[LocaleType.FA_IR, "﷼"],
 	[LocaleType.KO_KR, "₩"],
 	[LocaleType.ES_ES, "€"],
-	[LocaleType.CA_ES, "€"]
+	[LocaleType.CA_ES, "€"],
+	[LocaleType.SK_SK, "€"],
+	[LocaleType.JA_JP, "¥"],
+	[LocaleType.PT_BR, "R$"],
+	[LocaleType.DE_DE, "€"],
+	[LocaleType.IT_IT, "€"],
+	[LocaleType.ID_ID, "Rp"],
+	[LocaleType.PL_PL, "zł"],
+	[LocaleType.AR_SA, "﷼"]
 ]);
 function getCurrencySymbol(locale) {
 	return localeCurrencySymbolMap.get(locale) || "$";
@@ -8215,7 +8215,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 (isNullCell(cell)) {
 				result = callback(null, r, c);
 				continue;
 			}
@@ -9662,10 +9662,10 @@ let FormulaRuntimeService = class FormulaRuntimeService extends Disposable {
 			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 = !isNullCell(cell);
 			const isInOtherArrayFormulaRange = this._isInOtherArrayFormulaRange(formulaUnitId, formulaSheetId, formulaRow, formulaColumn, r, c);
-			const currentCellBlocks = !isNullCellForFormula(currentCell) && !isPreviousCellOfCurrentArrayFormula;
-			const featureCellBlocks = !isNullCellForFormula(featureCell);
+			const currentCellBlocks = !isNullCell(currentCell) && !isPreviousCellOfCurrentArrayFormula;
+			const featureCellBlocks = !isNullCell(featureCell);
 			if (hasRuntimeCell || isInOtherArrayFormulaRange || currentCellBlocks || featureCellBlocks) return true;
 		}
 		return false;
@@ -9938,9 +9938,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);
@@ -9955,14 +9957,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(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();
@@ -11760,9 +11785,7 @@ var DependencyManagerBaseService = class extends 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);
 	}
@@ -13871,7 +13894,7 @@ let CalculateController = class CalculateController extends Disposable {
 		}));
 	}
 	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();
@@ -13883,6 +13906,7 @@ let CalculateController = class CalculateController extends Disposable {
 			dirtyRanges,
 			dirtyNameMap,
 			dirtyDefinedNameMap,
+			dirtySuperTableMap,
 			dirtyUnitFeatureMap,
 			dirtyUnitOtherFormulaMap,
 			clearDependencyTreeCache,
@@ -40031,10 +40055,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 escapeRegExp(value);
 	}
 };
 
@@ -40417,7 +40438,7 @@ function getObjectValue(result, isUseStrip = false) {
 //#endregion
 //#region package.json
 var name = "@univerjs/engine-formula";
-var version = "0.23.0";
+var version = "0.24.0-insiders.20260528-29f582d";
 
 //#endregion
 //#region src/services/global-computing-status.service.ts

package/lib/facade.js

@@ -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) => {