@univerjs/engine-formula 1.0.0-alpha.1 → 1.0.0-alpha.3

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, Styles, 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 { 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, Styles, Tools, UniverInstanceType, cellToRange, columnLabelToNumber, createIdentifier, generateRandomId, getNumfmtParseValueFilter, hashAlgorithm, isFormulaId, isFormulaString, isNullCell, isRealNum, isTextFormat, isValidRange, merge, moveRangeByOffset, numfmt, regexp, 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";
@@ -478,12 +478,14 @@ var BaseValueObject = class extends ObjectClassType {
 		return ErrorValueObject.create("#NAME?");
 	}
 	concatenate(value, concatenateType = 0) {
-		let currentValue = this.getValue().toString();
+		let currentValue = formatValueForFormulaText(this.getValue());
 		if (typeof value === "string") if (concatenateType === 0) currentValue = value + currentValue;
 		else currentValue += value;
-		else if (typeof value === "number") if (concatenateType === 0) currentValue = value.toString() + currentValue;
-		else currentValue += value.toString();
-		else if (typeof value === "boolean") {
+		else if (typeof value === "number") {
+			const numberString = formatNumberForFormulaText(value);
+			if (concatenateType === 0) currentValue = numberString + currentValue;
+			else currentValue += numberString;
+		} else if (typeof value === "boolean") {
 			const booleanString = value ? "TRUE" : "FALSE";
 			if (concatenateType === 0) currentValue = booleanString + currentValue;
 			else currentValue += booleanString;
@@ -649,6 +651,16 @@ var BaseValueObject = class extends ObjectClassType {
 		return ErrorValueObject.create("#VALUE!");
 	}
 };
+function formatValueForFormulaText(value) {
+	if (typeof value === "number") return formatNumberForFormulaText(value);
+	if (typeof value === "boolean") return value ? "TRUE" : "FALSE";
+	return value == null ? "" : value.toString();
+}
+function formatNumberForFormulaText(value) {
+	if (!Number.isFinite(value)) return value.toString();
+	const rounded = Number(value.toPrecision(15));
+	return Object.is(rounded, -0) ? "0" : rounded.toString();
+}
 const Error_CACHE_LRU_COUNT = 1e3;
 const ErrorValueObjectCache = new FormulaAstLRU(Error_CACHE_LRU_COUNT);
 var ErrorValueObject = class ErrorValueObject extends BaseValueObject {
@@ -681,6 +693,12 @@ var ErrorValueObject = class ErrorValueObject extends BaseValueObject {
 	isError() {
 		return true;
 	}
+	concatenateFront(_valueObject) {
+		return this;
+	}
+	concatenateBack(_valueObject) {
+		return this;
+	}
 };
 
 //#endregion
@@ -751,6 +769,43 @@ function parseFormattedDate(value) {
 function parseFormattedTime(value) {
 	return numfmt.parseTime(value);
 }
+function parseEnglishMonthNameDate(value) {
+	const match = value.trim().match(/^(\d{1,2})\s*([A-Za-z]{3,9})\s*(\d{2,4})$/);
+	if (!match) return null;
+	const [, dayText, monthText, yearText] = match;
+	const month = {
+		jan: 0,
+		january: 0,
+		feb: 1,
+		february: 1,
+		mar: 2,
+		march: 2,
+		apr: 3,
+		april: 3,
+		may: 4,
+		jun: 5,
+		june: 5,
+		jul: 6,
+		july: 6,
+		aug: 7,
+		august: 7,
+		sep: 8,
+		sept: 8,
+		september: 8,
+		oct: 9,
+		october: 9,
+		nov: 10,
+		november: 10,
+		dec: 11,
+		december: 11
+	}[monthText.toLowerCase()];
+	if (month == null) return null;
+	const day = Number(dayText);
+	const year = Number(yearText.length === 2 ? `20${yearText}` : yearText);
+	const date = new Date(Date.UTC(year, month, day));
+	if (date.getUTCFullYear() !== year || date.getUTCMonth() !== month || date.getUTCDate() !== day) return null;
+	return date;
+}
 function isDate(format) {
 	return numfmt.getFormatInfo(format).isDate;
 }
@@ -829,6 +884,7 @@ function getDateSerialNumberByObject(serialNumberObject) {
 		let dateSerial;
 		if (parseFormattedDate(`${dateValue}`)) dateSerial = parseFormattedDate(`${dateValue}`).v;
 		else if (parseFormattedTime(`${dateValue}`)) dateSerial = parseFormattedTime(`${dateValue}`).v;
+		else if (parseEnglishMonthNameDate(`${dateValue}`)) dateSerial = parseEnglishMonthNameDate(`${dateValue}`);
 		else if (isRealNum(dateValue)) dateSerial = +dateValue;
 		else return ErrorValueObject.create("#VALUE!");
 		if (dateSerial instanceof Date) dateSerial = excelDateTimeSerial(dateSerial);
@@ -876,10 +932,11 @@ function getDaysByNASD(startDateSerialNumber, endDateSerialNumber) {
 	let endYear = endDateSerialNumber > 0 ? endDateDate.getUTCFullYear() : 1900;
 	let endMonth = endDateSerialNumber > 0 ? endDateDate.getUTCMonth() + 1 : 1;
 	let endDay = endDateSerialNumber > 0 ? endDateDate.getUTCDate() : 0;
-	if (startMonth === 2) {
-		if (excelSerialToDate(startDateSerialNumber + 1).getUTCMonth() + 1 === 3) startDay = 30;
-	} else if (startDay === 31) startDay = 30;
-	if (endDay === 31) if (startDay < 30) {
+	const startIsLastDayOfFebruary = startMonth === 2 && startDay === getDaysInMonth(startYear, startMonth - 1);
+	if (startIsLastDayOfFebruary) startDay = 30;
+	else if (startDay === 31) startDay = 30;
+	if (endMonth === 2 && endDay === getDaysInMonth(endYear, endMonth - 1) && startIsLastDayOfFebruary) endDay = 30;
+	else if (endDay === 31) if (startDay < 30) {
 		endDateDate = excelSerialToDate(endDateSerialNumber + 1);
 		endYear = endDateDate.getUTCFullYear();
 		endMonth = endDateDate.getUTCMonth() + 1;
@@ -1166,16 +1223,19 @@ var InvertedIndexCache = class {
 		};
 		const _value = normalizeValue(value);
 		if (ERROR_TYPE_SET.has(_value)) result.errorType = _value;
-		else if (_value === 0 || _value === DEFAULT_EMPTY_CELL_KEY) {
+		else if (_value === 0) {
 			const rows = [];
 			const rowsForZero = columnMap.get(0);
 			if (rowsForZero) rows.push(...rowsForZero);
 			const rowsForEmpty = columnMap.get(DEFAULT_EMPTY_CELL_KEY);
 			if (rowsForEmpty) rows.push(...rowsForEmpty);
 			result.matchingRows = rows.filter((row) => rowsInCache.some(([start, end]) => row >= start && row <= end));
-		} else {
+		} else if (_value === DEFAULT_EMPTY_CELL_KEY) {
 			var _columnMap$get;
-			result.matchingRows = Array.from((_columnMap$get = columnMap.get(_value)) !== null && _columnMap$get !== void 0 ? _columnMap$get : []).filter((row) => rowsInCache.some(([start, end]) => row >= start && row <= end));
+			result.matchingRows = Array.from((_columnMap$get = columnMap.get(DEFAULT_EMPTY_CELL_KEY)) !== null && _columnMap$get !== void 0 ? _columnMap$get : []).filter((row) => rowsInCache.some(([start, end]) => row >= start && row <= end));
+		} else {
+			var _columnMap$get2;
+			result.matchingRows = Array.from((_columnMap$get2 = columnMap.get(_value)) !== null && _columnMap$get2 !== void 0 ? _columnMap$get2 : []).filter((row) => rowsInCache.some(([start, end]) => row >= start && row <= end));
 		}
 		return result;
 	}
@@ -1391,7 +1451,7 @@ const REFERENCE_REGEX_SINGLE_COLUMN = `^${UNIT_NAME_SHEET_NAME_REGEX}\\s*?\\${"$
 const REFERENCE_REGEX_SINGLE_COLUMN_PRECOMPILING = new RegExp(REFERENCE_REGEX_SINGLE_COLUMN);
 const TABLE_NAME_REGEX = "((?![~!@#$%^&*()_+<>?:,./;’，。、‘：“《》？~！@#￥%……（）【】\\[\\]\\/\\\\]).)+";
 const TABLE_TITLE_REGEX = "\\[#.+\\]\\s*?,\\s*?";
-const TABLE_CONTENT_REGEX = "\\[((?<!#).)*\\]";
+const TABLE_CONTENT_REGEX = "\\[((?<!#)[\\s\\S])*\\]";
 const TABLE_MULTIPLE_COLUMN_REGEX = `${TABLE_CONTENT_REGEX}${RANGE_SYMBOL}${TABLE_CONTENT_REGEX}`;
 const REFERENCE_TABLE_ALL_COLUMN_REGEX = `^(${UNIT_NAME_REGEX})?${TABLE_NAME_REGEX}$`;
 const REFERENCE_TABLE_SINGLE_COLUMN_REGEX = `^(${UNIT_NAME_REGEX})?${TABLE_NAME_REGEX}(${TABLE_CONTENT_REGEX}|\\[${TABLE_TITLE_REGEX}${TABLE_CONTENT_REGEX}\\])+$`;
@@ -1970,16 +2030,38 @@ let DefinedNamesService = class DefinedNamesService extends Disposable {
 	getDefinedNameMap(unitId) {
 		return this._definedNameMap[unitId];
 	}
-	getValueByName(unitId, name) {
-		const cachedMap = this._nameCacheMap[unitId];
-		if (cachedMap) return cachedMap[name.toLowerCase()] || null;
+	getValueByName(unitId, name, sheetId) {
 		const nameMap = this._definedNameMap[unitId];
 		if (nameMap === void 0) return null;
+		if (sheetId) {
+			var _workbookScope;
+			const normalizedName = name.toLowerCase();
+			let workbookScope = null;
+			let firstMatch = null;
+			for (const item of Object.values(nameMap)) {
+				if (item.name.toLowerCase() !== normalizedName) continue;
+				if (firstMatch == null) firstMatch = item;
+				if (item.localSheetId === sheetId) return item;
+				if (item.localSheetId === "AllDefaultWorkbook" || item.localSheetId == null) {
+					if (workbookScope == null) workbookScope = item;
+				}
+			}
+			return (_workbookScope = workbookScope) !== null && _workbookScope !== void 0 ? _workbookScope : firstMatch;
+		}
+		const cachedMap = this._nameCacheMap[unitId];
+		if (cachedMap) return cachedMap[name.toLowerCase()] || null;
 		let result = null;
-		for (const item of Object.values(nameMap)) if (item.name === name) {
+		const normalizedName = name.toLowerCase();
+		for (const item of Object.values(nameMap)) if (item.name.toLowerCase() === normalizedName && (item.localSheetId === "AllDefaultWorkbook" || item.localSheetId == null)) {
 			result = item;
 			break;
 		}
+		if (!result) {
+			for (const item of Object.values(nameMap)) if (item.name.toLowerCase() === normalizedName) {
+				result = item;
+				break;
+			}
+		}
 		if (result) {
 			this._nameCacheMap[unitId] = this._nameCacheMap[unitId] || {};
 			this._nameCacheMap[unitId][name.toLowerCase()] = result;
@@ -2014,7 +2096,10 @@ let DefinedNamesService = class DefinedNamesService extends Disposable {
 			return;
 		}
 		this._nameCacheMap[unitId] = {};
-		for (const item of Object.values(nameMap)) this._nameCacheMap[unitId][item.name.toLowerCase()] = item;
+		for (const item of Object.values(nameMap)) {
+			const normalizedName = item.name.toLowerCase();
+			if (item.localSheetId === "AllDefaultWorkbook" || item.localSheetId == null || this._nameCacheMap[unitId][normalizedName] == null) this._nameCacheMap[unitId][normalizedName] = item;
+		}
 	}
 	_isDeepDefinedNameMapEmpty() {
 		for (const unitId in this._definedNameMap) if (this.hasDefinedName(unitId)) return false;
@@ -2587,6 +2672,7 @@ let FUNCTION_NAMES_LOGICAL = /* @__PURE__ */ function(FUNCTION_NAMES_LOGICAL) {
 	FUNCTION_NAMES_LOGICAL["BYCOL"] = "BYCOL";
 	FUNCTION_NAMES_LOGICAL["BYROW"] = "BYROW";
 	FUNCTION_NAMES_LOGICAL["FALSE"] = "FALSE";
+	FUNCTION_NAMES_LOGICAL["GROUPBY"] = "GROUPBY";
 	FUNCTION_NAMES_LOGICAL["IF"] = "IF";
 	FUNCTION_NAMES_LOGICAL["IFERROR"] = "IFERROR";
 	FUNCTION_NAMES_LOGICAL["IFNA"] = "IFNA";
@@ -2597,6 +2683,7 @@ let FUNCTION_NAMES_LOGICAL = /* @__PURE__ */ function(FUNCTION_NAMES_LOGICAL) {
 	FUNCTION_NAMES_LOGICAL["MAP"] = "MAP";
 	FUNCTION_NAMES_LOGICAL["NOT"] = "NOT";
 	FUNCTION_NAMES_LOGICAL["OR"] = "OR";
+	FUNCTION_NAMES_LOGICAL["PERCENTOF"] = "PERCENTOF";
 	FUNCTION_NAMES_LOGICAL["REDUCE"] = "REDUCE";
 	FUNCTION_NAMES_LOGICAL["SCAN"] = "SCAN";
 	FUNCTION_NAMES_LOGICAL["SWITCH"] = "SWITCH";
@@ -2624,6 +2711,7 @@ let FUNCTION_NAMES_LOGICAL = /* @__PURE__ */ function(FUNCTION_NAMES_LOGICAL) {
 */
 let FUNCTION_NAMES_LOOKUP = /* @__PURE__ */ function(FUNCTION_NAMES_LOOKUP) {
 	FUNCTION_NAMES_LOOKUP["ADDRESS"] = "ADDRESS";
+	FUNCTION_NAMES_LOOKUP["ANCHORARRAY"] = "ANCHORARRAY";
 	FUNCTION_NAMES_LOOKUP["AREAS"] = "AREAS";
 	FUNCTION_NAMES_LOOKUP["CHOOSE"] = "CHOOSE";
 	FUNCTION_NAMES_LOOKUP["CHOOSECOLS"] = "CHOOSECOLS";
@@ -2946,6 +3034,7 @@ let FUNCTION_NAMES_TEXT = /* @__PURE__ */ function(FUNCTION_NAMES_TEXT) {
 	FUNCTION_NAMES_TEXT["PROPER"] = "PROPER";
 	FUNCTION_NAMES_TEXT["REGEXEXTRACT"] = "REGEXEXTRACT";
 	FUNCTION_NAMES_TEXT["REGEXMATCH"] = "REGEXMATCH";
+	FUNCTION_NAMES_TEXT["REGEXTEST"] = "REGEXTEST";
 	FUNCTION_NAMES_TEXT["REGEXREPLACE"] = "REGEXREPLACE";
 	FUNCTION_NAMES_TEXT["REPLACE"] = "REPLACE";
 	FUNCTION_NAMES_TEXT["REPLACEB"] = "REPLACEB";
@@ -3057,6 +3146,7 @@ const NEW_EXCEL_FUNCTIONS = /* @__PURE__ */ new Set([
 	"SHEETS",
 	"IFNA",
 	"IFS",
+	"GROUPBY",
 	"SWITCH",
 	"XOR",
 	"BETA.DIST",
@@ -3151,7 +3241,7 @@ function deserializeRangeWithSheetWithCache(refString) {
 	if (refCache) return refCache;
 	const result = deserializeRangeWithSheet(refString);
 	referenceToRangeCache.set(refString, result);
-	return deserializeRangeWithSheet(refString);
+	return result;
 }
 function clearReferenceToRangeCache() {
 	referenceToRangeCache.clear();
@@ -3710,7 +3800,7 @@ var LexerTreeBuilder = class extends Disposable {
 		return this._currentLexerNode;
 	}
 	_handleDefinedName(sequenceArray, param) {
-		const { unitId, getValueByName, getSheetName } = param;
+		const { unitId, sheetId, getValueByName, getSheetName } = param;
 		if (unitId == null) return {
 			sequenceString: "",
 			hasDefinedName: false,
@@ -3730,14 +3820,15 @@ var LexerTreeBuilder = class extends Disposable {
 			let token = tokenRaw;
 			if (nodeType === 4 || nodeType === 3) {
 				if (nodeType === 3) token = this._getHasSheetNameDefinedName(tokenRaw, unitId, param);
-				const definedContent = getValueByName(unitId, token);
+				const definedNameToken = token.trim();
+				const definedContent = getValueByName(unitId, definedNameToken, sheetId);
 				if (definedContent) {
 					const refString = definedContent.formulaOrRefString;
 					const nestedDefinedNameParam = this._handleNestedDefinedName(refString, param);
 					if (nestedDefinedNameParam == null || typeof nestedDefinedNameParam !== "object") {
 						sequenceString += nestedDefinedNameParam || "#NAME?";
 						hasDefinedName = true;
-						definedNames.push(token);
+						definedNames.push(definedNameToken);
 					} else if (typeof nestedDefinedNameParam === "object") {
 						const { sequenceString: nestedSequenceString, definedNames: nestedDefinedNames } = nestedDefinedNameParam;
 						sequenceString += nestedSequenceString;
@@ -3746,10 +3837,10 @@ var LexerTreeBuilder = class extends Disposable {
 						});
 						hasDefinedName = true;
 					}
-				} else if (this._checkDefinedNameDirty(token, param)) {
+				} else if (this._checkDefinedNameDirty(definedNameToken, param)) {
 					sequenceString += "#NAME?";
 					hasDefinedName = true;
-					definedNames.push(token);
+					definedNames.push(definedNameToken);
 				} else sequenceString += token;
 			} else sequenceString += token;
 		}
@@ -4163,7 +4254,7 @@ var LexerTreeBuilder = class extends Disposable {
 		}
 	}
 	_nodeMaker(formulaStringRaw, sequenceArray, matchCurrentNodeIndex) {
-		let formulaString = formulaStringRaw.replace(/\r\n$|\r|\n/g, " ");
+		let formulaString = formulaStringRaw.replace(/(?:\r\n|\r|\n)$/g, " ");
 		if (formulaString.substring(0, 1) === "=") formulaString = formulaString.substring(1);
 		const formulaChars = formulaString.split("");
 		const charsCount = formulaChars.length;
@@ -4917,7 +5008,9 @@ let FormulaDataModel = class FormulaDataModel extends Disposable {
 			for (let j = 0; j < worksheets.length; j++) {
 				const worksheet = worksheets[j];
 				const cellMatrix = worksheet.getCellMatrix();
-				initSheetFormulaData(formulaData, unitId, worksheet.getSheetId(), cellMatrix);
+				const sheetId = worksheet.getSheetId();
+				this._initSheetArrayFormulaData(unitId, sheetId, cellMatrix);
+				initSheetFormulaData(formulaData, unitId, sheetId, cellMatrix);
 			}
 		}
 		const allBases = this._univerInstanceService.getAllUnitsForType(UniverInstanceType.UNIVER_BASE);
@@ -4929,7 +5022,6 @@ let FormulaDataModel = class FormulaDataModel extends Disposable {
 			const tables = Object.values(snapshot.tables);
 			for (let j = 0; j < tables.length; j++) {
 				const table = tables[j];
-				if (table.deleted) continue;
 				const tableFormulaData = {};
 				const recordOrder = table.recordOrder;
 				if (!recordOrder) {
@@ -4938,13 +5030,12 @@ let FormulaDataModel = class FormulaDataModel extends Disposable {
 				}
 				for (let row = 0; row < recordOrder.length; row++) {
 					const recordId = recordOrder[row];
-					const record = table.records[recordId];
-					if (!record || record.deleted) continue;
+					if (!table.records[recordId]) continue;
 					for (let col = 0; col < table.fieldOrder.length; col++) {
 						var _field$config$formula, _field$config, _row, _tableFormulaData$_ro;
 						const fieldId = table.fieldOrder[col];
 						const field = table.fields[fieldId];
-						if (!field || field.deleted || field.type !== "formula") continue;
+						if (!field || field.type !== "formula") continue;
 						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) continue;
 						(_tableFormulaData$_ro = tableFormulaData[_row = row]) !== null && _tableFormulaData$_ro !== void 0 || (tableFormulaData[_row] = {});
@@ -4966,7 +5057,9 @@ let FormulaDataModel = class FormulaDataModel extends Disposable {
 		formulaData[unitId] = {};
 		const worksheet = workbook.getSheetBySheetId(sheetId);
 		if (worksheet == null) return {};
-		initSheetFormulaData(formulaData, unitId, sheetId, worksheet.getCellMatrix());
+		const cellMatrix = worksheet.getCellMatrix();
+		this._initSheetArrayFormulaData(unitId, sheetId, cellMatrix);
+		initSheetFormulaData(formulaData, unitId, sheetId, cellMatrix);
 		return formulaData[unitId][sheetId];
 	}
 	getArrayFormulaRange() {
@@ -5066,18 +5159,12 @@ let FormulaDataModel = class FormulaDataModel extends Disposable {
 			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$recordOrder;
+			for (const table of Object.values(snapshot.tables)) {
+				var _table$recordOrder$le, _table$recordOrder;
 				baseData[table.id] = {
 					cellData: new ObjectMatrix(buildBaseRuntimeCellData(table)),
-					rowCount: (_table$recordOrder$fi = (_table$recordOrder = table.recordOrder) === null || _table$recordOrder === void 0 ? void 0 : _table$recordOrder.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,
+					rowCount: (_table$recordOrder$le = (_table$recordOrder = table.recordOrder) === null || _table$recordOrder === void 0 ? void 0 : _table$recordOrder.length) !== null && _table$recordOrder$le !== void 0 ? _table$recordOrder$le : 0,
+					columnCount: table.fieldOrder.length,
 					rowData: {},
 					columnData: {}
 				};
@@ -5263,7 +5350,7 @@ let FormulaDataModel = class FormulaDataModel extends Disposable {
 		for (const unitId in formulaData) {
 			const workbook = formulaData[unitId];
 			if (!workbook) continue;
-			const workbookInstance = this._univerInstanceService.getUnit(unitId);
+			const workbookInstance = this._univerInstanceService.getUnit(unitId, UniverInstanceType.UNIVER_SHEET);
 			if (!workbookInstance) continue;
 			for (const sheetId in workbook) {
 				const sheet = workbook[sheetId];
@@ -5277,7 +5364,7 @@ let FormulaDataModel = class FormulaDataModel extends Disposable {
 						const column = Number(columnStr);
 						const currentCell = sheetInstance.getCellRaw(row, column);
 						const isFormula = isFormulaString(currentCell === null || currentCell === void 0 ? void 0 : currentCell.f) || isFormulaId(currentCell === null || currentCell === void 0 ? void 0 : currentCell.si);
-						const noValue = (currentCell === null || currentCell === void 0 ? void 0 : currentCell.v) === void 0 || (currentCell === null || currentCell === void 0 ? void 0 : currentCell.v) === null || (currentCell === null || currentCell === void 0 ? void 0 : currentCell.v) === "" || (currentCell === null || currentCell === void 0 ? void 0 : currentCell.v) === 0 || (currentCell === null || currentCell === void 0 ? void 0 : currentCell.v) === "0";
+						const noValue = (currentCell === null || currentCell === void 0 ? void 0 : currentCell.v) === void 0 || (currentCell === null || currentCell === void 0 ? void 0 : currentCell.v) === null;
 						if (!(isFormula && noValue)) continue;
 						if (!columnRanges[column]) columnRanges[column] = [];
 						const lastRange = columnRanges[column].slice(-1)[0];
@@ -5326,6 +5413,39 @@ let FormulaDataModel = class FormulaDataModel extends Disposable {
 		});
 		return formulaIdMap;
 	}
+	_initSheetArrayFormulaData(unitId, sheetId, cellMatrix) {
+		let arrayFormulaRangeMatrix;
+		let arrayFormulaCellDataMatrix;
+		const formulaIds = /* @__PURE__ */ new Set();
+		cellMatrix.forValue((_, __, cell) => {
+			const formulaId = cell === null || cell === void 0 ? void 0 : cell.si;
+			if (isFormulaString(cell === null || cell === void 0 ? void 0 : cell.f) && isFormulaId(formulaId)) formulaIds.add(String(formulaId));
+		});
+		cellMatrix.forValue((row, column, cell) => {
+			var _arrayFormulaRangeMat, _this$_arrayFormulaRa7, _arrayFormulaCellData, _this$_arrayFormulaCe5;
+			const ref = cell === null || cell === void 0 ? void 0 : cell.ref;
+			const formula = cell === null || cell === void 0 ? void 0 : cell.f;
+			const formulaId = cell === null || cell === void 0 ? void 0 : cell.si;
+			const hasOwnFormula = isFormulaString(formula);
+			const hasSharedFormula = isFormulaId(formulaId) && formulaIds.has(String(formulaId));
+			if (!hasOwnFormula && !hasSharedFormula || typeof ref !== "string" || ref.length === 0) return true;
+			const { range } = deserializeRangeWithSheet(ref);
+			if (!Number.isFinite(range.startRow) || !Number.isFinite(range.startColumn) || !Number.isFinite(range.endRow) || !Number.isFinite(range.endColumn)) return true;
+			if (range.startRow === row && range.endRow === row && range.startColumn === column && range.endColumn === column && !isArrayConstantFormula(formula)) return true;
+			if (!this._arrayFormulaRange[unitId]) this._arrayFormulaRange[unitId] = {};
+			if (!this._arrayFormulaCellData[unitId]) this._arrayFormulaCellData[unitId] = {};
+			(_arrayFormulaRangeMat = arrayFormulaRangeMatrix) !== null && _arrayFormulaRangeMat !== void 0 || (arrayFormulaRangeMatrix = new ObjectMatrix((_this$_arrayFormulaRa7 = this._arrayFormulaRange[unitId]) === null || _this$_arrayFormulaRa7 === void 0 ? void 0 : _this$_arrayFormulaRa7[sheetId]));
+			(_arrayFormulaCellData = arrayFormulaCellDataMatrix) !== null && _arrayFormulaCellData !== void 0 || (arrayFormulaCellDataMatrix = new ObjectMatrix((_this$_arrayFormulaCe5 = this._arrayFormulaCellData[unitId]) === null || _this$_arrayFormulaCe5 === void 0 ? void 0 : _this$_arrayFormulaCe5[sheetId]));
+			if (arrayFormulaRangeMatrix.getValue(row, column) == null) arrayFormulaRangeMatrix.setValue(row, column, range);
+			for (let r = range.startRow; r <= range.endRow; r++) for (let c = range.startColumn; c <= range.endColumn; c++) {
+				if (arrayFormulaCellDataMatrix.getValue(r, c) != null) continue;
+				const rangeCell = cellMatrix.getValue(r, c);
+				if (rangeCell != null) arrayFormulaCellDataMatrix.setValue(r, c, { ...rangeCell });
+			}
+		});
+		if (arrayFormulaRangeMatrix && this._arrayFormulaRange[unitId]) this._arrayFormulaRange[unitId][sheetId] = arrayFormulaRangeMatrix.getData();
+		if (arrayFormulaCellDataMatrix && this._arrayFormulaCellData[unitId]) this._arrayFormulaCellData[unitId][sheetId] = arrayFormulaCellDataMatrix.getData();
+	}
 };
 FormulaDataModel = __decorate([__decorateParam(0, IUniverInstanceService), __decorateParam(1, Inject(LexerTreeBuilder))], FormulaDataModel);
 function initSheetFormulaData(formulaData, unitId, sheetId, cellMatrix) {
@@ -5360,9 +5480,9 @@ function initSheetFormulaData(formulaData, unitId, sheetId, cellMatrix) {
 		if (isFormulaId(formulaId) && !isFormulaString(formulaString)) {
 			const formulaInfo = formulaIdMap.get(formulaId);
 			if (formulaInfo) {
-				const f = formulaInfo.f;
 				const x = c - formulaInfo.c;
 				const y = r - formulaInfo.r;
+				const f = formulaInfo.f;
 				sheetFormulaDataMatrix.setValue(r, c, {
 					f,
 					si: formulaId,
@@ -5397,12 +5517,9 @@ function createEngineThisRowRef(table, fieldName, snapshot) {
 function getEngineBaseTableName(table, snapshot) {
 	const tables = Object.values(snapshot.tables);
 	let sameNameCount = 0;
-	for (let i = 0; i < tables.length; i++) {
-		const item = tables[i];
-		if (!item.deleted && item.name === table.name) {
-			sameNameCount++;
-			if (sameNameCount > 1) break;
-		}
+	for (let i = 0; i < tables.length; i++) if (tables[i].name === table.name) {
+		sameNameCount++;
+		if (sameNameCount > 1) break;
 	}
 	return sameNameCount === 1 ? table.name : table.id;
 }
@@ -5411,14 +5528,14 @@ function buildBaseRuntimeCellData(table) {
 	const fieldOrder = [];
 	for (let i = 0; i < table.fieldOrder.length; i++) {
 		const fieldId = table.fieldOrder[i];
-		if (table.fields[fieldId] && !table.fields[fieldId].deleted) fieldOrder.push(fieldId);
+		if (table.fields[fieldId]) fieldOrder.push(fieldId);
 	}
 	let recordOrder;
 	if (table.recordOrder) {
 		recordOrder = [];
 		for (let i = 0; i < table.recordOrder.length; i++) {
 			const recordId = table.recordOrder[i];
-			if (table.records[recordId] && !table.records[recordId].deleted) recordOrder.push(recordId);
+			if (table.records[recordId]) recordOrder.push(recordId);
 		}
 	} else {
 		var _table$records;
@@ -5426,7 +5543,7 @@ function buildBaseRuntimeCellData(table) {
 		const records = [];
 		for (let i = 0; i < allRecords.length; i++) {
 			const record = allRecords[i];
-			if (!record.deleted) records.push(record);
+			records.push(record);
 		}
 		records.sort((a, b) => a.orderKey.localeCompare(b.orderKey));
 		recordOrder = [];
@@ -5438,7 +5555,7 @@ function buildBaseRuntimeCellData(table) {
 	for (let row = 0; row < recordOrder.length; row++) {
 		const recordId = recordOrder[row];
 		const record = table.records[recordId];
-		if (!record || record.deleted) continue;
+		if (!record) continue;
 		cellData[row] = { ...cellData[row] };
 		for (let col = 0; col < fieldOrder.length; col++) {
 			var _record$values;
@@ -5490,14 +5607,17 @@ function inferBaseRuntimeCellType(value) {
 	if (typeof value === "string") return CellValueType.STRING;
 	return null;
 }
+function isArrayConstantFormula(formula) {
+	return typeof formula === "string" && /^=\s*\{/.test(formula);
+}
 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);
+	if (byId) return byId;
+	const matches = Object.values(snapshot.tables).filter((table) => table.name === tableName);
 	return matches.length === 1 ? matches[0] : void 0;
 }
 
@@ -5758,7 +5878,7 @@ let FormulaCurrentConfigService = class FormulaCurrentConfigService extends Disp
 		const workbook = this._univerInstanceService.getCurrentUnitOfType(UniverInstanceType.UNIVER_SHEET);
 		const worksheet = workbook === null || workbook === void 0 ? void 0 : workbook.getActiveSheet();
 		const base = workbook ? null : this._univerInstanceService.getCurrentUnitOfType(UniverInstanceType.UNIVER_BASE);
-		const table = base ? getFirstLiveBaseTable(base.getSnapshot().tables, base.getSnapshot().tableOrder) : null;
+		const table = base ? getFirstBaseTable(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();
@@ -5791,33 +5911,18 @@ FormulaCurrentConfigService = __decorate([
 	__decorateParam(2, Inject(FormulaDataModel)),
 	__decorateParam(3, Inject(ISheetRowFilteredService))
 ], FormulaCurrentConfigService);
-function getFirstLiveBaseTable(tables, tableOrder) {
-	var _Object$values$find;
+function getFirstBaseTable(tables, tableOrder) {
+	var _Object$values$;
 	for (const tableId of tableOrder) {
 		const table = tables[tableId];
-		if (table && !table.deleted) return table;
+		if (table) return table;
 	}
-	return (_Object$values$find = Object.values(tables).find((table) => !table.deleted)) !== null && _Object$values$find !== void 0 ? _Object$values$find : null;
+	return (_Object$values$ = Object.values(tables)[0]) !== null && _Object$values$ !== void 0 ? _Object$values$ : null;
 }
 const IFormulaCurrentConfigService = createIdentifier("univer.formula.current-data.service");
 
 //#endregion
 //#region src/engine/analysis/lexer.ts
-/**
-* Copyright 2023-present DreamNum Co., Ltd.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
 let Lexer = class Lexer extends Disposable {
 	constructor(_definedNamesService, _lexerTreeBuilder, _formulaCurrentConfigService) {
 		super();
@@ -5825,10 +5930,11 @@ let Lexer = class Lexer extends Disposable {
 		this._lexerTreeBuilder = _lexerTreeBuilder;
 		this._formulaCurrentConfigService = _formulaCurrentConfigService;
 	}
-	treeBuilder(formulaString, transformSuffix = true) {
+	treeBuilder(formulaString, transformSuffix = true, unitId) {
 		if (this._definedNamesService.getAllDefinedNamesIsEmpty()) return this._lexerTreeBuilder.treeBuilder(formulaString, transformSuffix);
 		return this._lexerTreeBuilder.treeBuilder(formulaString, transformSuffix, {
-			unitId: this._formulaCurrentConfigService.getExecuteUnitId(),
+			unitId: unitId !== null && unitId !== void 0 ? unitId : this._formulaCurrentConfigService.getExecuteUnitId(),
+			sheetId: this._formulaCurrentConfigService.getExecuteSubUnitId(),
 			getValueByName: this._definedNamesService.getValueByName.bind(this._definedNamesService),
 			getDirtyDefinedNameMap: this._formulaCurrentConfigService.getDirtyDefinedNameMap.bind(this._formulaCurrentConfigService),
 			getSheetName: this._formulaCurrentConfigService.getSheetName.bind(this._formulaCurrentConfigService)
@@ -5850,10 +5956,13 @@ function getCellValue(cell) {
 		const body = cell === null || cell === void 0 ? void 0 : cell.p.body;
 		if (body == null) return 0;
 		const data = body.dataStream;
-		return BuildTextUtils.transform.getPlainText(data);
+		return normalizeRichTextFormulaValue(BuildTextUtils.transform.getPlainText(data));
 	}
 	return (_cell$v = cell === null || cell === void 0 ? void 0 : cell.v) !== null && _cell$v !== void 0 ? _cell$v : 0;
 }
+function normalizeRichTextFormulaValue(value) {
+	return value.replace(/\r\n|\r|\n/g, "\r\n");
+}
 /**
 * Extract the formula error from the cell
 * @param cell
@@ -6092,24 +6201,16 @@ function reverseCompareOperator(operator) {
 Reference https://en.wikipedia.org/wiki/Numeric_precision_in_Microsoft_Excel
 */
 function plus(a, b) {
-	const result = a + b;
-	if (Number.isSafeInteger(result)) return result;
-	return new Decimal(a).add(b).toNumber();
+	return a + b;
 }
 function minus(a, b) {
-	const result = a - b;
-	if (Number.isSafeInteger(result)) return result;
-	return new Decimal(a).sub(b).toNumber();
+	return a - b;
 }
 function multiply(a, b) {
-	const result = a * b;
-	if (Number.isSafeInteger(result)) return result;
-	return new Decimal(a).mul(b).toNumber();
+	return a * b;
 }
 function divide(a, b) {
-	const result = a / b;
-	if (Number.isSafeInteger(result)) return result;
-	return new Decimal(a).div(b).toNumber();
+	return a / b;
 }
 /**
 * Rounds a number to a specified number of decimal places.
@@ -6181,7 +6282,7 @@ function sqrt(base) {
 * @returns True if numbers are equal, false otherwise.
 */
 function equals(a, b) {
-	return a === b;
+	return a === b || stripErrorMargin(a) === stripErrorMargin(b);
 }
 /**
 * Checks if the first number is greater than the second number.
@@ -6190,7 +6291,7 @@ function equals(a, b) {
 * @returns True if a is greater than b, false otherwise.
 */
 function greaterThan(a, b) {
-	return a > b;
+	return !equals(a, b) && stripErrorMargin(a) > stripErrorMargin(b);
 }
 /**
 * Checks if the first number is greater than or equal to the second number.
@@ -6199,7 +6300,7 @@ function greaterThan(a, b) {
 * @returns True if a is greater than or equal to b, false otherwise.
 */
 function greaterThanOrEquals(a, b) {
-	return a >= b;
+	return equals(a, b) || stripErrorMargin(a) > stripErrorMargin(b);
 }
 /**
 * Checks if the first number is less than the second number.
@@ -6208,7 +6309,7 @@ function greaterThanOrEquals(a, b) {
 * @returns True if a is less than b, false otherwise.
 */
 function lessThan(a, b) {
-	return a < b;
+	return !equals(a, b) && stripErrorMargin(a) < stripErrorMargin(b);
 }
 /**
 * Checks if the first number is less than or equal to the second number.
@@ -6217,7 +6318,7 @@ function lessThan(a, b) {
 * @returns True if a is less than or equal to b, false otherwise.
 */
 function lessThanOrEquals(a, b) {
-	return a <= b;
+	return equals(a, b) || stripErrorMargin(a) < stripErrorMargin(b);
 }
 /**
 * Complete the number to the specified accuracy and solve the accuracy error,
@@ -6485,8 +6586,8 @@ var BooleanValueObject = class BooleanValueObject extends BaseValueObject {
 			case ">=": return true;
 			case "=":
 			case "<":
-			case "<=":
-			case "<>": return false;
+			case "<=": return false;
+			case "<>": return true;
 		}
 	}
 	concatenateFront(valueObject) {
@@ -7108,12 +7209,13 @@ var StringValueObject = class StringValueObject extends BaseValueObject {
 		return BooleanValueObject.create(result);
 	}
 	_compareString(currentValue, value, operator) {
+		const compareResult = currentValue.localeCompare(value);
 		switch (operator) {
 			case "=": return currentValue === value;
-			case ">": return currentValue > value;
-			case ">=": return currentValue >= value;
-			case "<": return currentValue < value;
-			case "<=": return currentValue <= value;
+			case ">": return compareResult > 0;
+			case ">=": return currentValue === value || compareResult > 0;
+			case "<": return compareResult < 0;
+			case "<=": return currentValue === value || compareResult < 0;
 			case "<>": return currentValue !== value;
 		}
 	}
@@ -7139,6 +7241,7 @@ var StringValueObject = class StringValueObject extends BaseValueObject {
 	}
 	convertToNumberObjectValue() {
 		const rawValue = this.getValue();
+		if (rawValue.trim() === "") return ErrorValueObject.create("#VALUE!");
 		const parseData = getNumfmtParseValueFilter(rawValue);
 		if (parseData && parseData.z) return createNumberValueObjectByRawValue(parseData.v, parseData.z);
 		return createNumberValueObjectByRawValue(rawValue);
@@ -7247,6 +7350,8 @@ var ArrayValueObject = class ArrayValueObject extends BaseValueObject {
 		_defineProperty(this, "_sheetId", "");
 		_defineProperty(this, "_currentRow", -1);
 		_defineProperty(this, "_currentColumn", -1);
+		_defineProperty(this, "_useInvertedIndexCache", false);
+		_defineProperty(this, "_legacyImplicitForAggregate", false);
 		_defineProperty(this, "_sliceCache", /* @__PURE__ */ new Map());
 		_defineProperty(this, "_flattenCache", void 0);
 		_defineProperty(this, "_defaultValue", null);
@@ -7298,6 +7403,15 @@ var ArrayValueObject = class ArrayValueObject extends BaseValueObject {
 	getCurrentColumn() {
 		return this._currentColumn;
 	}
+	usesInvertedIndexCache() {
+		return this._useInvertedIndexCache;
+	}
+	usesLegacyImplicitForAggregate() {
+		return this._legacyImplicitForAggregate;
+	}
+	setLegacyImplicitForAggregate(value) {
+		this._legacyImplicitForAggregate = value;
+	}
 	getArrayValue() {
 		return this._values;
 	}
@@ -7564,6 +7678,7 @@ var ArrayValueObject = class ArrayValueObject extends BaseValueObject {
 			if (itemValue == null || itemValue.isNull()) return true;
 			let matchObject;
 			if (isFuzzyMatching === true) matchObject = itemValue.compare(valueObject, "=");
+			else if (searchType === 0 && itemValue.isNumber() && valueObject.isNumber()) matchObject = BooleanValueObject.create(Number(itemValue.getValue()) === Number(valueObject.getValue()));
 			else matchObject = itemValue.isEqual(valueObject);
 			if ((matchObject === null || matchObject === void 0 ? void 0 : matchObject.getValue()) === true) {
 				result = itemValue;
@@ -7686,7 +7801,7 @@ var ArrayValueObject = class ArrayValueObject extends BaseValueObject {
 				return false;
 			}
 			if (valueObject.isString() || valueObject.isNull() || valueObject.isBoolean()) return true;
-			if (accumulatorAll.isLessThan(valueObject).getValue()) accumulatorAll = valueObject;
+			if (Number(accumulatorAll.getValue()) < Number(valueObject.getValue())) accumulatorAll = valueObject;
 		});
 		return accumulatorAll;
 	}
@@ -7727,7 +7842,7 @@ var ArrayValueObject = class ArrayValueObject extends BaseValueObject {
 		return accumulatorAll;
 	}
 	getNegative() {
-		return ArrayValueObject.create("{0}").minus(this);
+		return this.mapValue((valueObject) => NumberValueObject.create(0).minus(valueObject));
 	}
 	getReciprocal() {
 		return ArrayValueObject.create("{1}").divided(this);
@@ -7779,12 +7894,10 @@ var ArrayValueObject = class ArrayValueObject extends BaseValueObject {
 			for (let c = 0; c < columnCount; c++) {
 				var _this$_values;
 				const row = (_this$_values = this._values) === null || _this$_values === void 0 ? void 0 : _this$_values[r];
-				if (row == null) rowList[c] = ErrorValueObject.create("#VALUE!");
-				else {
-					const currentValue = row[c] || this._defaultValue;
-					if (currentValue) rowList[c] = callbackFn(currentValue, r, c);
-					else rowList[c] = NullValueObject.create();
-				}
+				const currentValue = this.getValueOrDefault(r, c);
+				if (row == null && currentValue == null) rowList[c] = ErrorValueObject.create("#VALUE!");
+				else if (currentValue) rowList[c] = callbackFn(currentValue, r, c);
+				else rowList[c] = NullValueObject.create();
 			}
 			result.push(rowList);
 		}
@@ -8094,7 +8207,7 @@ var ArrayValueObject = class ArrayValueObject extends BaseValueObject {
 		* If comparison operations are conducted for a single numerical value,
 		* then retrieve the judgment from the inverted index. This enhances performance.
 		*/
-		if (batchOperatorType === 5) {
+		if (batchOperatorType === 5 && this._useInvertedIndexCache) {
 			const { rowsInCache, rowsNotInCache } = CELL_INVERTED_INDEX_CACHE.canUseCache(unitId, sheetId, column + startColumn, startRow, startRow + rowCount - 1);
 			if (rowsInCache.length > 0) {
 				if (operator === "=" && !(valueObject.isString() && isWildcard(valueObject.getValue()))) {
@@ -8128,13 +8241,13 @@ var ArrayValueObject = class ArrayValueObject extends BaseValueObject {
 				if (rowsNotInCache.length > 0) for (const interval of rowsNotInCache) {
 					const [start, end] = interval;
 					for (let r = start; r <= end; r++) this.__batchOperatorRowValue(valueObject, column, result, batchOperatorType, r - startRow, unitId, sheetId, startRow, startColumn, operator, isCaseSensitive);
-					CELL_INVERTED_INDEX_CACHE.setContinueBuildingCache(unitId, sheetId, column + startColumn, start, end);
+					if (this._useInvertedIndexCache) CELL_INVERTED_INDEX_CACHE.setContinueBuildingCache(unitId, sheetId, column + startColumn, start, end);
 				}
 				return;
 			}
 		}
 		for (let r = 0; r < rowCount; r++) this.__batchOperatorRowValue(valueObject, column, result, batchOperatorType, r, unitId, sheetId, startRow, startColumn, operator, isCaseSensitive);
-		CELL_INVERTED_INDEX_CACHE.setContinueBuildingCache(unitId, sheetId, column + startColumn, startRow, startRow + rowCount - 1);
+		if (this._useInvertedIndexCache) CELL_INVERTED_INDEX_CACHE.setContinueBuildingCache(unitId, sheetId, column + startColumn, startRow, startRow + rowCount - 1);
 	}
 	__batchOperatorRowValue(valueObject, column, result, batchOperatorType, r, unitId, sheetId, startRow, startColumn, operator, isCaseSensitive) {
 		const currentValue = this.getValueOrDefault(r, column);
@@ -8184,7 +8297,7 @@ var ArrayValueObject = class ArrayValueObject extends BaseValueObject {
 				break;
 		}
 		else result[r][column] = ErrorValueObject.create("#N/A");
-		CELL_INVERTED_INDEX_CACHE.set(unitId, sheetId, column + startColumn, (currentValue === null || currentValue === void 0 ? void 0 : currentValue.isNull()) ? null : currentValue === null || currentValue === void 0 ? void 0 : currentValue.getValue(), r + startRow);
+		if (this._useInvertedIndexCache) CELL_INVERTED_INDEX_CACHE.set(unitId, sheetId, column + startColumn, (currentValue === null || currentValue === void 0 ? void 0 : currentValue.isNull()) ? null : currentValue === null || currentValue === void 0 ? void 0 : currentValue.getValue(), r + startRow);
 	}
 	_batchOperatorArray(valueObject, batchOperatorType, operator, isCaseSensitive) {
 		let rowCount = valueObject.getRowCount();
@@ -8255,7 +8368,9 @@ var ArrayValueObject = class ArrayValueObject extends BaseValueObject {
 			}
 			result.push(rowList);
 		}
-		return this._createNewArray(result, rowCount, columnCount);
+		const newArray = this._createNewArray(result, rowCount, columnCount);
+		if (batchOperatorType === 1) newArray.setLegacyImplicitForAggregate(true);
+		return newArray;
 	}
 	_checkArrayCalculateType(valueObject) {
 		if (valueObject.getRowCount() === 1 && valueObject.getColumnCount() === 1) return 3;
@@ -8272,6 +8387,8 @@ var ArrayValueObject = class ArrayValueObject extends BaseValueObject {
 			this._sheetId = rawValue.sheetId;
 			this._currentRow = rawValue.row;
 			this._currentColumn = rawValue.column;
+			this._useInvertedIndexCache = rawValue.useInvertedIndexCache === true;
+			this._legacyImplicitForAggregate = rawValue.legacyImplicitForAggregate === true;
 			return rawValue.calculateValueList;
 		}
 		rawValue = rawValue.slice(1, -1);
@@ -8294,7 +8411,7 @@ var ArrayValueObject = class ArrayValueObject extends BaseValueObject {
 		this._columnCount = maxColumnCount;
 		return result;
 	}
-	_createNewArray(result, rowCount, columnCount, row = -1, column = -1) {
+	_createNewArray(result, rowCount, columnCount, row = this._currentRow, column = this._currentColumn) {
 		if (this._currentColumn === -1 || this._currentRow === -1) {
 			row = -1;
 			column = -1;
@@ -8410,14 +8527,14 @@ var BaseReferenceObject = class extends ObjectClassType {
 	}
 	iterator(callback) {
 		const { startRow, endRow, startColumn, endColumn } = this.getRangePosition();
-		if (this._checkIfWorksheetMiss()) return callback(ErrorValueObject.create("#VALUE!"), startRow, startColumn);
+		if (this._checkIfWorksheetMiss()) return callback(ErrorValueObject.create("#REF!"), startRow, startColumn);
 		const unitId = this._forcedUnitId || this._defaultUnitId;
 		const sheetId = this._forcedSheetId || this._defaultSheetId;
 		for (let r = startRow; r <= endRow; r++) for (let c = startColumn; c <= endColumn; c++) {
 			if (r < 0 || c < 0) return callback(ErrorValueObject.create("#REF!"), r, c);
 			const cell = this.getCellData(r, c);
 			let result = false;
-			if (isNullCell(cell)) {
+			if (isNullCell(cell) && !isTypedEmptyStringCell(cell)) {
 				result = callback(null, r, c);
 				continue;
 			}
@@ -8434,7 +8551,7 @@ var BaseReferenceObject = class extends ObjectClassType {
 		}
 	}
 	getFirstCell() {
-		if (this._checkIfWorksheetMiss()) return ErrorValueObject.create("#VALUE!");
+		if (this._checkIfWorksheetMiss()) return ErrorValueObject.create("#REF!");
 		const { startRow, startColumn } = this.getRangePosition();
 		const cell = this.getCellData(startRow, startColumn);
 		if (!cell) return NumberValueObject.create(0);
@@ -8613,14 +8730,15 @@ var BaseReferenceObject = class extends ObjectClassType {
 	}
 	getCellValueObject(cell) {
 		const value = getCellValue(cell);
+		const cellValueType = Number(cell.t);
 		if (ERROR_TYPE_SET.has(value)) return ErrorValueObject.create(value);
-		if (cell.t === CellValueType.NUMBER) {
+		if (cellValueType === CellValueType.NUMBER) {
 			const pattern = this._getPatternByCell(cell);
 			if (isTextFormat(pattern)) return StringValueObject.create(value.toString());
 			return createNumberValueObjectByRawValue(value, pattern);
 		}
-		if (cell.t === CellValueType.STRING || cell.t === CellValueType.FORCE_STRING) return StringValueObject.create(value.toString());
-		if (cell.t === CellValueType.BOOLEAN) return createBooleanValueObjectByRawValue(value);
+		if (cellValueType === CellValueType.STRING || cellValueType === CellValueType.FORCE_STRING) return StringValueObject.create(value.toString());
+		if (cellValueType === CellValueType.BOOLEAN) return createBooleanValueObjectByRawValue(value);
 		return ValueObjectFactory.create(value);
 	}
 	_getPatternByCell(cell) {
@@ -8696,7 +8814,7 @@ var BaseReferenceObject = class extends ObjectClassType {
 		if (!row) row = rangeData.startRow;
 		if (!column) column = rangeData.startColumn;
 		const cell = this.getCellData(row, column);
-		if (!cell) return ErrorValueObject.create("#VALUE!");
+		if (!cell) return NullValueObject.create();
 		return this.getCellValueObject(cell);
 	}
 	setCurrentRowAndColumn(row, column) {
@@ -8750,7 +8868,8 @@ var BaseReferenceObject = class extends ObjectClassType {
 			unitId: this.getUnitId(),
 			sheetId: this.getSheetId(),
 			row: startRow,
-			column: startColumn
+			column: startColumn,
+			useInvertedIndexCache: true
 		};
 		const arrayValueObject = ArrayValueObject.create(arrayValueObjectData);
 		useCache && FORMULA_REF_TO_ARRAY_CACHE.set(key, arrayValueObject);
@@ -8780,6 +8899,9 @@ var BaseReferenceObject = class extends ObjectClassType {
 		return ArrayValueObject.create(arrayValueObjectData);
 	}
 };
+function isTypedEmptyStringCell(cell) {
+	return (cell === null || cell === void 0 ? void 0 : cell.v) === "" && (cell.t === CellValueType.STRING || cell.t === CellValueType.FORCE_STRING);
+}
 var AsyncObject = class extends ObjectClassType {
 	constructor(_promise) {
 		super();
@@ -8841,6 +8963,8 @@ var RangeReferenceObject = class extends BaseReferenceObject {
 
 //#endregion
 //#region src/engine/reference-object/cell-reference-object.ts
+const EXCEL_MAX_ROWS = 1048576;
+const EXCEL_MAX_COLUMNS = 16384;
 var CellReferenceObject = class extends BaseReferenceObject {
 	constructor(token) {
 		super(token);
@@ -8852,6 +8976,12 @@ var CellReferenceObject = class extends BaseReferenceObject {
 	isCell() {
 		return true;
 	}
+	isExceedRange() {
+		var _this$getForcedSheetI;
+		if ((this.getForcedSheetId() == null || ((_this$getForcedSheetI = this.getForcedSheetId()) === null || _this$getForcedSheetI === void 0 ? void 0 : _this$getForcedSheetI.length) === 0) && this.getForcedSheetName().length > 0) return true;
+		const { startRow, endRow, startColumn, endColumn } = this.getRangePosition();
+		return startRow < 0 || startColumn < 0 || endRow >= EXCEL_MAX_ROWS || endColumn >= EXCEL_MAX_COLUMNS;
+	}
 	unionBy(referenceObject) {
 		if (!referenceObject.isCell()) return ErrorValueObject.create("#REF!");
 		const cellReferenceObject = referenceObject;
@@ -9335,11 +9465,11 @@ function getPairedRangeAndCriteriaResult(variants, params) {
 			result = sum.divided(count);
 		} else if (formulaName === "MAXIFS") {
 			const picked = targetRange.pick(finalCompareResult);
-			if (picked.getColumnCount() === 0) result = ArrayValueObject.create("0");
+			if (picked.getColumnCount() === 0) result = NumberValueObject.create(0);
 			else result = picked.max();
 		} else if (formulaName === "MINIFS") {
 			const picked = targetRange.pick(finalCompareResult);
-			if (picked.getColumnCount() === 0) result = ArrayValueObject.create("0");
+			if (picked.getColumnCount() === 0) result = NumberValueObject.create(0);
 			else result = picked.min();
 		}
 		if (!results[rowIndex]) results[rowIndex] = [];
@@ -9351,13 +9481,25 @@ function getPairedRangeAndCriteriaResult(variants, params) {
 * Two ArrayValueObject of the same type can be compared
 */
 function filterSameValueObjectResult(array, range, criteria) {
-	const [operator, criteriaObject] = findCompareToken(`${criteria.getValue()}`);
+	const [operator, criteriaObject] = criteria.isString() ? findCompareToken(`${criteria.getValue()}`) : ["=", criteria];
 	return array.mapValue((valueObject, r, c) => {
 		const rangeValueObject = range.get(r, c);
+		const isBlankStringCriteria = criteriaObject.isString() && criteriaObject.getValue() === "";
+		if (operator === "<>" && isBlankStringCriteria && (rangeValueObject === null || rangeValueObject === void 0 ? void 0 : rangeValueObject.isString()) && rangeValueObject.getValue() === "") return BooleanValueObject.create(true);
+		if (criteriaObject.isString() && criteriaObject.getValue() !== "" && (operator === "<" || operator === "<=") && (rangeValueObject == null || rangeValueObject.isNull() || rangeValueObject.isString() && rangeValueObject.getValue() === "")) return BooleanValueObject.create(false);
+		if (criteriaObject.isString() && (rangeValueObject === null || rangeValueObject === void 0 ? void 0 : rangeValueObject.isString()) && (operator === "<" || operator === "<=") && isSameLowerBoundBucket(rangeValueObject.getValue(), criteriaObject.getValue())) return BooleanValueObject.create(false);
+		if ((rangeValueObject === null || rangeValueObject === void 0 ? void 0 : rangeValueObject.isNumber()) && criteriaObject.isString()) {
+			const criteriaNumber = criteriaObject.convertToNumberObjectValue();
+			if (criteriaNumber.isNumber()) return rangeValueObject.compare(criteriaNumber, operator);
+		}
+		if (criteriaObject.isNumber() && criteriaObject.isDateFormat() && (rangeValueObject === null || rangeValueObject === void 0 ? void 0 : rangeValueObject.isString())) {
+			const rangeNumber = rangeValueObject.convertToNumberObjectValue();
+			if (rangeNumber.isNumber()) return rangeNumber.compare(criteriaObject, operator);
+		}
 		if (rangeValueObject && isSameValueObjectType(rangeValueObject, criteriaObject)) return valueObject;
 		if ((rangeValueObject === null || rangeValueObject === void 0 ? void 0 : rangeValueObject.isError()) && criteriaObject.isError() && rangeValueObject.getValue() === criteriaObject.getValue()) return BooleanValueObject.create(true);
 		/**
-		* If the operator is '=' or '<>', we can compare numbers and strings directly in COUNTIF, COUNTIFS, SUMIF, SUMIFS, etc.
+		* If the operator is '=' or '<>', we can compare string numbers against numeric criteria directly in COUNTIF, COUNTIFS, SUMIF, SUMIFS, etc.
 		* Other operators require both valueObjects to be of the same type.
 		* For example:
 		* | A1    | B1  |
@@ -9369,10 +9511,6 @@ function filterSameValueObjectResult(array, range, criteria) {
 		* =COUNTIF(A1:B1, '<=123') will return 1
 		*/
 		if (operator === "=" || operator === "<>") {
-			if ((rangeValueObject === null || rangeValueObject === void 0 ? void 0 : rangeValueObject.isNumber()) && criteriaObject.isString()) {
-				const criteriaNumber = criteriaObject.convertToNumberObjectValue();
-				if (criteriaNumber.isNumber()) return rangeValueObject.compare(criteriaNumber, operator);
-			}
 			if (criteriaObject.isNumber() && (rangeValueObject === null || rangeValueObject === void 0 ? void 0 : rangeValueObject.isString())) {
 				const rangeNumber = rangeValueObject.convertToNumberObjectValue();
 				if (rangeNumber.isNumber()) return rangeNumber.compare(criteriaObject, operator);
@@ -9383,6 +9521,11 @@ function filterSameValueObjectResult(array, range, criteria) {
 		return BooleanValueObject.create(false);
 	});
 }
+function isSameLowerBoundBucket(rangeValue, criteriaValue) {
+	const criteriaMatch = criteriaValue.match(/^(\d+)\|/);
+	const rangeMatch = rangeValue.match(/^(\d+)-/);
+	return criteriaMatch != null && rangeMatch != null && criteriaMatch[1] === rangeMatch[1];
+}
 /**
 * Check if the two valueObjects are of the same type
 * @param left
@@ -9483,6 +9626,7 @@ let FormulaRuntimeService = class FormulaRuntimeService extends Disposable {
 		_defineProperty(this, "_currentColumn", -1);
 		_defineProperty(this, "_currentRowCount", Number.NEGATIVE_INFINITY);
 		_defineProperty(this, "_currentColumnCount", Number.NEGATIVE_INFINITY);
+		_defineProperty(this, "_functionRefInfoOverrideStack", []);
 		_defineProperty(this, "_currentSubUnitId", "");
 		_defineProperty(this, "_currentUnitId", "");
 		_defineProperty(this, "_runtimeData", {});
@@ -9511,10 +9655,12 @@ let FormulaRuntimeService = class FormulaRuntimeService extends Disposable {
 		return this._currentColumn;
 	}
 	get currentRowCount() {
-		return this._currentRowCount;
+		var _this$_functionRefInf, _this$_functionRefInf2;
+		return (_this$_functionRefInf = (_this$_functionRefInf2 = this._functionRefInfoOverrideStack[this._functionRefInfoOverrideStack.length - 1]) === null || _this$_functionRefInf2 === void 0 ? void 0 : _this$_functionRefInf2.rowCount) !== null && _this$_functionRefInf !== void 0 ? _this$_functionRefInf : this._currentRowCount;
 	}
 	get currentColumnCount() {
-		return this._currentColumnCount;
+		var _this$_functionRefInf3, _this$_functionRefInf4;
+		return (_this$_functionRefInf3 = (_this$_functionRefInf4 = this._functionRefInfoOverrideStack[this._functionRefInfoOverrideStack.length - 1]) === null || _this$_functionRefInf4 === void 0 ? void 0 : _this$_functionRefInf4.columnCount) !== null && _this$_functionRefInf3 !== void 0 ? _this$_functionRefInf3 : this._currentColumnCount;
 	}
 	get currentSubUnitId() {
 		return this._currentSubUnitId;
@@ -9608,6 +9754,7 @@ let FormulaRuntimeService = class FormulaRuntimeService extends Disposable {
 		this._isCycleDependency = false;
 		this._totalFormulasToCalculate = 0;
 		this._completedFormulasCount = 0;
+		this._functionRefInfoOverrideStack = [];
 		this.clearReferenceAndNumberformatCache();
 	}
 	clearReferenceAndNumberformatCache() {
@@ -9623,6 +9770,15 @@ let FormulaRuntimeService = class FormulaRuntimeService extends Disposable {
 		this._currentSubUnitId = sheetId;
 		this._currentUnitId = unitId;
 	}
+	setFunctionRefInfoOverride(rowCount, columnCount) {
+		this._functionRefInfoOverrideStack.push({
+			rowCount,
+			columnCount
+		});
+		return () => {
+			this._functionRefInfoOverrideStack.pop();
+		};
+	}
 	clearFunctionDefinitionPrivacyVar() {
 		this._functionDefinitionPrivacyVar.clear();
 	}
@@ -9686,13 +9842,22 @@ let FormulaRuntimeService = class FormulaRuntimeService extends Disposable {
 			* then it is not treated as an array range and is directly assigned.
 			*/
 			if (startRow === endRow && startColumn === endColumn) {
-				const firstCell = objectValueRefOrArray.getFirstCell();
+				const firstCellRaw = objectValueRefOrArray.getFirstCell();
+				const firstCell = firstCellRaw.isNull() ? NumberValueObject.create(0) : firstCellRaw;
 				const valueObject = this._getValueObjectOfRuntimeData(firstCell);
 				sheetData.setValue(row, column, valueObject);
 				clearArrayUnitData.setValue(row, column, valueObject);
 				CELL_INVERTED_INDEX_CACHE.set(unitId, sheetId, column, firstCell.getValue(), row, true);
 				return;
 			}
+			if (this._isCurrentSingleCellArrayFormulaRange(unitId, sheetId, row, column)) {
+				const errorObject = this._getValueObjectOfRuntimeData(ErrorValueObject.create("#VALUE!"));
+				sheetData.setValue(row, column, errorObject);
+				clearArrayUnitData.setValue(row, column, errorObject);
+				runtimeArrayUnitData.setValue(row, column, errorObject);
+				CELL_INVERTED_INDEX_CACHE.set(unitId, sheetId, column, "#VALUE!", row, true);
+				return;
+			}
 			const arrayRange = {
 				startRow: row,
 				startColumn: column,
@@ -9904,6 +10069,11 @@ let FormulaRuntimeService = class FormulaRuntimeService extends Disposable {
 		});
 		return isCellOverlapping;
 	}
+	_isCurrentSingleCellArrayFormulaRange(unitId, sheetId, row, column) {
+		var _this$_currentConfigS4;
+		const range = (_this$_currentConfigS4 = this._currentConfigService.getArrayFormulaRange()[unitId]) === null || _this$_currentConfigS4 === void 0 || (_this$_currentConfigS4 = _this$_currentConfigS4[sheetId]) === null || _this$_currentConfigS4 === void 0 || (_this$_currentConfigS4 = _this$_currentConfigS4[row]) === null || _this$_currentConfigS4 === void 0 ? void 0 : _this$_currentConfigS4[column];
+		return range != null && range.startRow === range.endRow && range.startColumn === range.endColumn;
+	}
 	_isInArrayFormulaRange(range, r, c) {
 		if (range == null) return false;
 		const { startRow, startColumn, endRow, endColumn } = range;
@@ -10142,18 +10312,23 @@ 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) || checkIsChangedBySuperTable(unitId, formulaString, currentConfigService);
-	if (!noCache && astNode && !isDirtyDefinedForNode(astNode, currentConfigService)) return astNode;
-	const lexerNode = lexer.treeBuilder(formulaString);
+function generateAstNode(unitId, formulaString, lexer, astTreeBuilder, currentConfigService, subUnitId) {
+	var _ref;
+	if (subUnitId) {
+		currentConfigService.setExecuteUnitId(unitId);
+		currentConfigService.setExecuteSubUnitId(subUnitId);
+	}
+	const cacheKey = `${unitId}:${(_ref = subUnitId !== null && subUnitId !== void 0 ? subUnitId : currentConfigService.getExecuteSubUnitId()) !== null && _ref !== void 0 ? _ref : ""}:${formulaString}`;
+	let astNode = FORMULA_AST_CACHE.get(cacheKey);
+	if (!(checkIsChangedByDefinedName(unitId, formulaString, currentConfigService) || checkIsChangedBySuperTable(unitId, formulaString, currentConfigService)) && astNode && !isDirtyDefinedForNode(astNode, currentConfigService, unitId)) return astNode;
+	const lexerNode = lexer.treeBuilder(formulaString, true, unitId);
 	if (ERROR_TYPE_SET.has(lexerNode)) return ErrorNode.create(lexerNode);
 	astNode = astTreeBuilder.parse(lexerNode);
 	if (astNode == null) {
 		console.error("generateAstNode astNode is null");
 		return ErrorNode.create(lexerNode);
 	}
-	if (!noCache) FORMULA_AST_CACHE.set(`${unitId}${formulaString}`, astNode);
+	FORMULA_AST_CACHE.set(cacheKey, astNode);
 	return astNode;
 }
 function checkIsChangedByDefinedName(unitId, formula, currentConfigService) {
@@ -10184,15 +10359,15 @@ function getNormalizedDirtyDefinedNameSet(unitDefinedNameMap) {
 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;
+		const tableNames = Object.keys(unitSuperTableMap).filter((tableName) => tableName.length > 0);
+		tableReferencePattern = tableNames.length > 0 ? regexp.createRegExpFromSafeFragment(`(^|[^A-Za-z0-9_])${regexp.or(...tableNames)}(\\s*\\[|$|[^A-Za-z0-9_])`, "i") : null;
 		DIRTY_SUPER_TABLE_PATTERN_CACHE.set(unitSuperTableMap, tableReferencePattern);
 	}
 	return tableReferencePattern;
 }
-function isDirtyDefinedForNode(node, currentConfigService) {
+function isDirtyDefinedForNode(node, currentConfigService, unitId) {
 	const definedNameMap = currentConfigService.getDirtyDefinedNameMap();
-	const executeUnitId = currentConfigService.getExecuteUnitId();
+	const executeUnitId = unitId;
 	if (executeUnitId != null && definedNameMap[executeUnitId] != null) {
 		const names = Object.keys(definedNameMap[executeUnitId]);
 		for (let i = 0, len = names.length; i < len; i++) {
@@ -10207,7 +10382,7 @@ function includeDefinedName(tree, node, currentConfigService) {
 	* Detect whether the dirty map contains a defined name.
 	*/
 	if (node != null) {
-		if (isDirtyDefinedForNode(node, currentConfigService)) return true;
+		if (isDirtyDefinedForNode(node, currentConfigService, tree.unitId)) return true;
 	}
 	return false;
 }
@@ -10317,6 +10492,7 @@ var PrefixNode = class extends BaseAstNode {
 		if (!value.isReferenceObject()) return ErrorValueObject.create("#VALUE!");
 		const currentValue = value;
 		if (currentValue.isCell()) return ErrorValueObject.create("#VALUE!");
+		if (this._preserveAtRangeForFormula2LookupArray()) return currentValue;
 		const runtimeService = this._runtimeService;
 		const currentRow = runtimeService.currentRow || 0;
 		const currentColumn = runtimeService.currentColumn || 0;
@@ -10328,6 +10504,22 @@ var PrefixNode = class extends BaseAstNode {
 		if (currentValue.isTable()) return currentValue.getCellByPosition(currentRow);
 		return ErrorValueObject.create("#VALUE!");
 	}
+	_preserveAtRangeForFormula2LookupArray() {
+		let node = this;
+		let parent = node.getParent();
+		let sawCompareOperator = false;
+		while (parent != null) {
+			if (parent.nodeType === 3) sawCompareOperator || (sawCompareOperator = OPERATOR_TOKEN_COMPARE_SET.has(parent.getToken()));
+			if (parent.nodeType === 4) {
+				const functionName = parent.getToken().toUpperCase();
+				if (sawCompareOperator && functionName === "XMATCH") return parent.getChildren().indexOf(node) === 1;
+				return false;
+			}
+			node = parent;
+			parent = parent.getParent();
+		}
+		return false;
+	}
 };
 let PrefixNodeFactory = class PrefixNodeFactory extends BaseAstNodeFactory {
 	constructor(_functionService, _runtimeService) {
@@ -10402,41 +10594,43 @@ var FunctionNode = class extends BaseAstNode {
 		return 4;
 	}
 	async executeAsync() {
-		const variants = [];
 		const children = this.getChildren();
-		const childrenCount = children.length;
 		this._compatibility();
-		for (let i = 0; i < childrenCount; i++) {
-			const object = children[i].getValue();
-			if (object == null) continue;
-			if (object.isReferenceObject() && !this._functionExecutor.needsReferenceObject) variants.push(object.toArrayValueObject());
-			else variants.push(object);
-		}
-		const resultVariant = await this._calculateAsync(variants);
+		const resultVariant = this._functionExecutor.needsAstChildren ? this._calculateAst(children) : await this._calculateAsync(this._collectVariants(children));
 		let result;
 		if (resultVariant.isAsyncObject() || resultVariant.isAsyncArrayObject()) result = await resultVariant.getValue();
 		else result = resultVariant;
+		result = this._normalizeTopLevelLegacyArrayResult(result);
 		this._setEmbeddedArrayFormulaToResult(result);
 		this._setRefData(result);
 		this.setValue(result);
 		return Promise.resolve(0);
 	}
 	execute() {
-		const variants = [];
 		const children = this.getChildren();
-		const childrenCount = children.length;
 		this._compatibility();
+		const resultVariant = this._functionExecutor.needsAstChildren ? this._calculateAst(children) : this._calculate(this._collectVariants(children));
+		const result = this._normalizeTopLevelLegacyArrayResult(resultVariant);
+		this._setEmbeddedArrayFormulaToResult(result);
+		this._setRefData(result);
+		this.setValue(result);
+	}
+	_collectVariants(children) {
+		const variants = [];
+		const childrenCount = children.length;
 		for (let i = 0; i < childrenCount; i++) {
-			const object = children[i].getValue();
+			const object = this._getChildVariant(children[i]);
 			if (object == null) continue;
-			if (object.isReferenceObject() && this._functionExecutor.needsFilteredOutRows) this._setFilteredOutRows(object);
-			if (object.isReferenceObject() && !this._functionExecutor.needsReferenceObject) variants.push(object.toArrayValueObject());
-			else variants.push(object);
+			variants.push(object);
 		}
-		const resultVariant = this._calculate(variants);
-		this._setEmbeddedArrayFormulaToResult(resultVariant);
-		this._setRefData(resultVariant);
-		this.setValue(resultVariant);
+		return variants;
+	}
+	_getChildVariant(child) {
+		const object = child.getValue();
+		if (object == null) return;
+		if (object.isReferenceObject() && this._functionExecutor.needsFilteredOutRows) this._setFilteredOutRows(object);
+		if (object.isReferenceObject() && !this._functionExecutor.needsReferenceObject) return object.toArrayValueObject();
+		return object;
 	}
 	isFunctionExecutorArgumentsIgnoreNumberPattern() {
 		return this._functionExecutor.isArgumentsIgnoreNumberPattern();
@@ -10451,6 +10645,14 @@ var FunctionNode = class extends BaseAstNode {
 		if (rowCount <= 1 && colCount <= 1) return;
 		this._runtimeService.setUnitArrayFormulaEmbeddedMap();
 	}
+	_normalizeTopLevelLegacyArrayResult(result) {
+		const parent = this.getParent();
+		const isTopLevel = parent == null || parent.nodeType === 9;
+		if (!this._functionExecutor.returnsLegacyArrayAsScalar || !isTopLevel || !result.isArray()) return result;
+		const array = result;
+		if (array.getRowCount() <= 1 && array.getColumnCount() <= 1) return result;
+		return array.getFirstCell();
+	}
 	/**
 	* Compatibility handling for special functions.
 	*/
@@ -10535,6 +10737,16 @@ var FunctionNode = class extends BaseAstNode {
 		}
 		return resultVariant;
 	}
+	_calculateAst(children) {
+		const { minParams, maxParams } = this._functionExecutor;
+		if (minParams !== -1 && maxParams !== -1 && (children.length < minParams || children.length > maxParams)) return ErrorValueObject.create("#N/A");
+		this._setRefInfo();
+		this._handleAddressFunction();
+		return this._functionExecutor.calculateAst(children, (node) => {
+			var _this$_getChildVarian;
+			return (_this$_getChildVarian = this._getChildVariant(node)) !== null && _this$_getChildVarian !== void 0 ? _this$_getChildVarian : null;
+		});
+	}
 	async _calculateAsync(variants) {
 		const { minParams, maxParams } = this._functionExecutor;
 		if (minParams !== -1 && maxParams !== -1 && (variants.length < minParams || variants.length > maxParams)) return ErrorValueObject.create("#N/A");
@@ -10550,15 +10762,15 @@ var FunctionNode = class extends BaseAstNode {
 		return resultVariant;
 	}
 	_setDefinedNamesForFunction() {
-		const editorUnitId = this._currentConfigService.getExecuteUnitId();
+		const editorUnitId = this._runtimeService.currentUnitId;
 		if (editorUnitId == null) return;
 		const definedNames = this._definedNamesService.getDefinedNameMap(editorUnitId);
 		if (definedNames == null) return;
 		this._functionExecutor.setDefinedNames(definedNames);
 	}
 	_setRefInfo() {
-		const { currentUnitId, currentSubUnitId, currentRow, currentColumn } = this._runtimeService;
-		this._functionExecutor.setRefInfo(currentUnitId, currentSubUnitId, currentRow, currentColumn);
+		const { currentUnitId, currentSubUnitId, currentRow, currentColumn, currentRowCount, currentColumnCount } = this._runtimeService;
+		this._functionExecutor.setRefInfo(currentUnitId, currentSubUnitId, currentRow, currentColumn, currentRowCount, currentColumnCount);
 		if (this._functionExecutor.needsSheetRowColumnCount) {
 			const { rowCount, columnCount } = this._currentConfigService.getSheetRowColumnCount(currentUnitId, currentSubUnitId);
 			this._functionExecutor.setSheetRowColumnCount(rowCount, columnCount);
@@ -10629,7 +10841,7 @@ let FunctionNodeFactory = class FunctionNodeFactory extends BaseAstNodeFactory {
 		const { tokenTrim, minusPrefixNode, atPrefixNode } = prefixHandler(param.getToken().trim(), this._functionService, this._runtimeService);
 		const isColon = this._isParentUnionNode(param);
 		if (!Number.isNaN(Number(tokenTrim)) && !isColon) return ErrorNode.create("#VALUE!");
-		const tokenTrimUpper = tokenTrim.toUpperCase();
+		const tokenTrimUpper = normalizeFunctionToken(tokenTrim.toUpperCase());
 		if (isColon && COLUMN_LIKE_FUNCTION_NAMES.has(tokenTrimUpper)) return;
 		if (this._functionService.hasExecutor(tokenTrimUpper)) {
 			const functionNode = this.create(tokenTrimUpper);
@@ -10651,6 +10863,15 @@ FunctionNodeFactory = __decorate([
 	__decorateParam(4, Inject(Injector)),
 	__decorateParam(5, Inject(FormulaDataModel))
 ], FunctionNodeFactory);
+function normalizeFunctionToken(token) {
+	if (token === "REGEXTEST" || token === "_XLFN.REGEXTEST") return "REGEXMATCH";
+	for (const prefix of [
+		"_XLFN.",
+		"_XLWS.",
+		"_XLETA."
+	]) if (token.startsWith(prefix)) return token.slice(prefix.length);
+	return token;
+}
 
 //#endregion
 //#region src/engine/interpreter/interpreter.ts
@@ -10701,6 +10922,7 @@ let Interpreter = class Interpreter extends Disposable {
 	}
 	async _executeAsync(node, refOffsetX = 0, refOffsetY = 0) {
 		if (this._runtimeService.isStopExecution()) return Promise.resolve(1);
+		if (await this._executeLazyFunctionAsync(node, refOffsetX, refOffsetY)) return Promise.resolve(0);
 		const children = node.getChildren();
 		const childrenCount = children.length;
 		for (let i = 0; i < childrenCount; i++) {
@@ -10721,6 +10943,7 @@ let Interpreter = class Interpreter extends Disposable {
 	}
 	_execute(node, refOffsetX = 0, refOffsetY = 0) {
 		if (this._runtimeService.isStopExecution()) return 1;
+		if (this._executeLazyFunction(node, refOffsetX, refOffsetY)) return 0;
 		const children = node.getChildren();
 		const childrenCount = children.length;
 		for (let i = 0; i < childrenCount; i++) {
@@ -10738,6 +10961,161 @@ let Interpreter = class Interpreter extends Disposable {
 		node.execute();
 		return 0;
 	}
+	async _executeLazyFunctionAsync(node, refOffsetX, refOffsetY) {
+		if (node.nodeType !== 4) return false;
+		const token = node.getToken().toUpperCase();
+		if (token === "IF") return await this._executeLazyIfAsync(node, refOffsetX, refOffsetY);
+		if (token === "IFERROR") return await this._executeLazyIfErrorAsync(node, refOffsetX, refOffsetY);
+		return false;
+	}
+	_executeLazyFunction(node, refOffsetX, refOffsetY) {
+		if (node.nodeType !== 4) return false;
+		const token = node.getToken().toUpperCase();
+		if (token === "IF") return this._executeLazyIf(node, refOffsetX, refOffsetY);
+		if (token === "IFERROR") return this._executeLazyIfError(node, refOffsetX, refOffsetY);
+		return false;
+	}
+	async _executeLazyIfAsync(node, refOffsetX, refOffsetY) {
+		const children = node.getChildren();
+		if (children.length < 2 || children.length > 3) return false;
+		await this._executeAsync(children[0], refOffsetX, refOffsetY);
+		const condition = children[0].getValue();
+		if (condition == null || condition.isReferenceObject() || condition.isArray()) return false;
+		if (condition.isError()) {
+			node.setValue(condition);
+			return true;
+		}
+		const selected = condition.getValue() ? children[1] : children[2];
+		if (selected == null) {
+			node.setValue(BooleanValueObject.create(false));
+			return true;
+		}
+		await this._executeAsync(selected, refOffsetX, refOffsetY);
+		node.setValue(this._toLazyIfSelectedValue(selected.getValue(), node));
+		return true;
+	}
+	_executeLazyIf(node, refOffsetX, refOffsetY) {
+		const children = node.getChildren();
+		if (children.length < 2 || children.length > 3) return false;
+		this._execute(children[0], refOffsetX, refOffsetY);
+		const condition = children[0].getValue();
+		if (condition == null || condition.isReferenceObject() || condition.isArray()) return false;
+		if (condition.isError()) {
+			node.setValue(condition);
+			return true;
+		}
+		const selected = condition.getValue() ? children[1] : children[2];
+		if (selected == null) {
+			node.setValue(BooleanValueObject.create(false));
+			return true;
+		}
+		this._execute(selected, refOffsetX, refOffsetY);
+		node.setValue(this._toLazyIfSelectedValue(selected.getValue(), node));
+		return true;
+	}
+	async _executeLazyIfErrorAsync(node, refOffsetX, refOffsetY) {
+		var _children$1$getValue;
+		const children = node.getChildren();
+		if (children.length !== 2) return false;
+		await this._executeAsync(children[0], refOffsetX, refOffsetY);
+		const rawValue = children[0].getValue();
+		const value = this._toLazyIfErrorValue(rawValue);
+		if (value == null || value.isArray()) return false;
+		if (!value.isError()) {
+			node.setValue(value);
+			return true;
+		}
+		await this._executeAsync(children[1], refOffsetX, refOffsetY);
+		node.setValue((_children$1$getValue = children[1].getValue()) !== null && _children$1$getValue !== void 0 ? _children$1$getValue : ErrorValueObject.create("#VALUE!"));
+		return true;
+	}
+	_executeLazyIfError(node, refOffsetX, refOffsetY) {
+		var _children$1$getValue2;
+		const children = node.getChildren();
+		if (children.length !== 2) return false;
+		this._execute(children[0], refOffsetX, refOffsetY);
+		const rawValue = children[0].getValue();
+		const value = this._toLazyIfErrorValue(rawValue);
+		if (value == null || value.isArray()) return false;
+		if (!value.isError()) {
+			node.setValue(value);
+			return true;
+		}
+		this._execute(children[1], refOffsetX, refOffsetY);
+		node.setValue((_children$1$getValue2 = children[1].getValue()) !== null && _children$1$getValue2 !== void 0 ? _children$1$getValue2 : ErrorValueObject.create("#VALUE!"));
+		return true;
+	}
+	_toLazyIfErrorValue(value) {
+		if (value == null) return null;
+		if (!value.isReferenceObject()) {
+			const baseValue = value;
+			return baseValue.isNull() ? NumberValueObject.create(0) : baseValue;
+		}
+		const reference = value;
+		if (reference.getRowCount() !== 1 || reference.getColumnCount() !== 1) return reference.toArrayValueObject();
+		const cellValue = reference.getCellByPosition();
+		return cellValue.isNull() ? NumberValueObject.create(0) : cellValue;
+	}
+	_toLazyIfSelectedValue(value, node) {
+		if (value == null) return ErrorValueObject.create("#VALUE!");
+		if (value.isReferenceObject()) {
+			const reference = value;
+			if (this._preserveLazyIfSelectedReferenceArray(node)) return reference.toArrayValueObject();
+			value = this._implicitLazyIfReferenceValue(reference);
+		}
+		if (value.isArray()) value = this._implicitLazyIfArrayValue(value);
+		if (!value.isArray()) {
+			const baseValue = value;
+			return baseValue.isNull() ? NumberValueObject.create(0) : baseValue;
+		}
+		return value;
+	}
+	_implicitLazyIfReferenceValue(reference) {
+		const range = reference.getRangePosition();
+		const currentRow = this._runtimeService.currentRow || 0;
+		const currentColumn = this._runtimeService.currentColumn || 0;
+		const { startRow, startColumn, endRow, endColumn } = range;
+		if (startRow === endRow && startColumn === endColumn) return reference.getCellByPosition();
+		if (endRow === startRow && currentColumn >= startColumn && currentColumn <= endColumn) return reference.getCellByColumn(currentColumn);
+		if (startColumn === endColumn && currentRow >= startRow && currentRow <= endRow) return reference.getCellByRow(currentRow);
+		return ErrorValueObject.create("#VALUE!");
+	}
+	_preserveLazyIfSelectedReferenceArray(node) {
+		let child = node;
+		let parent = child.getParent();
+		while (parent != null) {
+			if (parent.nodeType === 4) return parent.getToken().toUpperCase() === "MATCH" && parent.getChildren().indexOf(child) === 1;
+			child = parent;
+			parent = parent.getParent();
+		}
+		return false;
+	}
+	_implicitLazyIfArrayValue(array) {
+		if (array.getUnitId() === "" || array.getSheetId() === "" || array.getCurrentRow() < 0 || array.getCurrentColumn() < 0) return array;
+		const startRow = array.getCurrentRow();
+		const startColumn = array.getCurrentColumn();
+		const rowCount = array.getRowCount();
+		const columnCount = array.getColumnCount();
+		const currentRow = this._runtimeService.currentRow || 0;
+		const currentColumn = this._runtimeService.currentColumn || 0;
+		let rowIndex = -1;
+		let columnIndex = -1;
+		if (rowCount === 1 && columnCount === 1) {
+			rowIndex = 0;
+			columnIndex = 0;
+		} else if (rowCount === 1) {
+			rowIndex = 0;
+			columnIndex = currentColumn - startColumn;
+		} else if (columnCount === 1) {
+			rowIndex = currentRow - startRow;
+			columnIndex = 0;
+		} else {
+			rowIndex = currentRow - startRow;
+			columnIndex = currentColumn - startColumn;
+		}
+		if (rowIndex < 0 || rowIndex >= rowCount || columnIndex < 0 || columnIndex >= columnCount) return ErrorValueObject.create("#VALUE!");
+		return array.get(rowIndex, columnIndex) || ErrorValueObject.create("#VALUE!");
+	}
 };
 Interpreter = __decorate([__decorateParam(0, IFormulaRuntimeService)], Interpreter);
 
@@ -10956,9 +11334,10 @@ let LambdaNodeFactory = class LambdaNodeFactory extends BaseAstNodeFactory {
 		for (let i = 0; i < parameterArray.length; i++) {
 			const parameter = parameterArray[i];
 			if (parameter instanceof LexerNode) {
-				const variant = parameter.getChildren()[0];
+				const variant = getLambdaParameterName(parameter);
+				if (variant == null) return ErrorNode.create("#VALUE!");
 				parameter.setToken(DEFAULT_TOKEN_TYPE_LAMBDA_OMIT_PARAMETER);
-				currentLambdaPrivacyVar.set(variant.trim(), void 0);
+				currentLambdaPrivacyVar.set(variant, void 0);
 			} else return ErrorNode.create("#VALUE!");
 		}
 		this._runtimeService.registerFunctionDefinitionPrivacyVar(lambdaId, currentLambdaPrivacyVar);
@@ -10975,6 +11354,20 @@ let LambdaNodeFactory = class LambdaNodeFactory extends BaseAstNodeFactory {
 	}
 };
 LambdaNodeFactory = __decorate([__decorateParam(0, IFormulaRuntimeService), __decorateParam(1, Inject(Interpreter))], LambdaNodeFactory);
+function getLambdaParameterName(parameter) {
+	const children = parameter.getChildren();
+	for (let i = 0; i < children.length; i++) {
+		const child = children[i];
+		if (typeof child === "string") {
+			const token = child.trim();
+			if (token.length > 0) return token;
+		} else {
+			const token = getLambdaParameterName(child);
+			if (token != null) return token;
+		}
+	}
+	return null;
+}
 
 //#endregion
 //#region src/engine/ast-node/lambda-parameter-node.ts
@@ -11085,12 +11478,17 @@ var OperatorNode = class extends BaseAstNode {
 		}
 		if (object1 == null) object1 = NullValueObject.create();
 		if (object2 == null) object2 = NullValueObject.create();
-		if (object1.isReferenceObject()) object1 = object1.toArrayValueObject();
-		if (object2.isReferenceObject()) object2 = object2.toArrayValueObject();
+		if (object1.isReferenceObject()) object1 = this._referenceToOperatorValue(object1);
+		if (object2.isReferenceObject()) object2 = this._referenceToOperatorValue(object2);
 		const result = this._functionExecutor.calculate(object1, object2);
 		this._setEmbeddedArrayFormulaToResult(result);
 		this.setValue(result);
 	}
+	_referenceToOperatorValue(reference) {
+		const array = reference.toArrayValueObject();
+		if (array.getRowCount() === 1 && array.getColumnCount() === 1) return array.get(0, 0);
+		return array;
+	}
 	/**
 	* If it contains an array formula, set the current cell to the cache and send itself as a ref outward
 	*/
@@ -11394,12 +11792,15 @@ var TableReferenceObject = class extends BaseReferenceObject {
 	}
 	/** Column title → column index; returns -1 if not found (caller should handle as parse error) */
 	_titleToIndex(name, titleMap) {
-		var _titleMap$get;
 		const key = name.trim();
 		const hit = titleMap.get(key);
 		if (hit !== void 0) return hit;
 		const keyNorm = key.replace(/\u3000/g, " ").trim();
-		return (_titleMap$get = titleMap.get(keyNorm)) !== null && _titleMap$get !== void 0 ? _titleMap$get : -1;
+		const normalizedHit = titleMap.get(keyNorm);
+		if (normalizedHit !== void 0) return normalizedHit;
+		const lineBreakNorm = keyNorm.replace(/\r\n?/g, "\n");
+		for (const [title, index] of titleMap.entries()) if (title.replace(/\u3000/g, " ").trim().replace(/\r\n?/g, "\n") === lineBreakNorm) return index;
+		return -1;
 	}
 	/** Resolve #This Row's row number; takes first data row (tableStartRow+1) when no context available */
 	_resolveThisRow(tableStartRow, tableEndRow) {
@@ -11493,7 +11894,7 @@ let ReferenceNodeFactory = class ReferenceNodeFactory extends BaseAstNodeFactory
 		}
 	}
 	_getTableMap() {
-		const unitId = this._currentConfigService.getExecuteUnitId();
+		const unitId = this._formulaRuntimeService.currentUnitId;
 		if (!unitId) return;
 		return this._superTableService.getTableMap(unitId);
 	}
@@ -11579,7 +11980,7 @@ var SuffixNode = class extends BaseAstNode {
 		const formulaData = this._currentConfigService.getFormulaData();
 		const formulaString = formulaData === null || formulaData === void 0 || (_formulaData$unitId = formulaData[unitId]) === null || _formulaData$unitId === void 0 || (_formulaData$unitId = _formulaData$unitId[sheetId]) === null || _formulaData$unitId === void 0 || (_formulaData$unitId = _formulaData$unitId[range.startRow]) === null || _formulaData$unitId === void 0 || (_formulaData$unitId = _formulaData$unitId[range.startColumn]) === null || _formulaData$unitId === void 0 ? void 0 : _formulaData$unitId.f;
 		if (!formulaString) return ErrorValueObject.create("#VALUE!");
-		this._lexer.treeBuilder(formulaString);
+		this._lexer.treeBuilder(formulaString, true, unitId);
 		return ErrorValueObject.create("#VALUE!");
 		/** todo */
 	}
@@ -11680,13 +12081,19 @@ var ValueNode = class extends BaseAstNode {
 		return 2;
 	}
 	execute() {
+		const token = this.getToken();
+		const tokenTrim = token.trim();
+		if (tokenTrim.startsWith("\"") && tokenTrim.endsWith("\"")) {
+			this.setValue(StringValueObject.create(tokenTrim.slice(1, -1).replace(/""/g, "\"")));
+			return;
+		}
 		const parent = this.getParent();
 		let isIgnoreNumberPattern = true;
 		if ((parent === null || parent === void 0 ? void 0 : parent.nodeType) === 4) {
 			var _isFunctionExecutorAr, _isFunctionExecutorAr2;
 			isIgnoreNumberPattern = (_isFunctionExecutorAr = (_isFunctionExecutorAr2 = parent.isFunctionExecutorArgumentsIgnoreNumberPattern) === null || _isFunctionExecutorAr2 === void 0 ? void 0 : _isFunctionExecutorAr2.call(parent)) !== null && _isFunctionExecutorAr !== void 0 ? _isFunctionExecutorAr : true;
 		}
-		this.setValue(ValueObjectFactory.create(this.getToken(), isIgnoreNumberPattern));
+		this.setValue(ValueObjectFactory.create(token, isIgnoreNumberPattern));
 	}
 };
 var ValueNodeFactory = class extends BaseAstNodeFactory {
@@ -11852,6 +12259,9 @@ let AstTreeBuilder = class AstTreeBuilder extends Disposable {
 			astNode = getAstNodeTopParent(astNode);
 			if (astNode == null || (astNode === null || astNode === void 0 ? void 0 : astNode.nodeType) === 7) return astNode;
 			switch (astNode.nodeType) {
+				case 8:
+					calculateStack.push(astNode);
+					break;
 				case 4: {
 					const token = astNode.getToken().trim().toUpperCase();
 					if (FORCED_RECALCULATION_FUNCTION_NAME.has(token)) astNode.setForcedCalculateFunction();
@@ -11903,9 +12313,20 @@ let AstTreeBuilder = class AstTreeBuilder extends Disposable {
 			astNode = this._astNodeFactoryList[x].checkAndCreateNodeType(item);
 			if (astNode != null) break;
 		}
-		if (astNode == null) return new ErrorFunctionNode();
+		if (astNode == null) {
+			const aggregatorNode = this._createGroupByAggregatorTokenNode(item);
+			if (aggregatorNode != null) return aggregatorNode;
+			return new ErrorFunctionNode();
+		}
 		return astNode;
 	}
+	_createGroupByAggregatorTokenNode(param) {
+		const token = (typeof param === "string" ? param : param.getToken()).trim().toUpperCase();
+		if (!token.startsWith("_XLETA.")) return null;
+		const name = token.slice(7);
+		if (name !== "SUM" && name !== "COUNT" && name !== "COUNTA" && name !== "PERCENTOF" && name !== "MIN" && name !== "MAX" && name !== "ARRAYTOTEXT") return null;
+		return new BaseAstNode(name);
+	}
 	_initializeAstNode() {
 		this._astNodeFactoryList = [
 			this._astRootNodeFactory,
@@ -13122,7 +13543,7 @@ let FormulaDependencyGenerator = class FormulaDependencyGenerator extends Dispos
 		return this._dependencyTreeCache.get(treeId);
 	}
 	_getTreeNode(tree) {
-		return generateAstNode(tree.unitId, tree.formula, this._lexer, this._astTreeBuilder, this._currentConfigService);
+		return generateAstNode(tree.unitId, tree.formula, this._lexer, this._astTreeBuilder, this._currentConfigService, tree.subUnitId);
 	}
 	*_traverse(treeList, skippedTreeIds) {
 		const stack = treeList;
@@ -13248,12 +13669,12 @@ let FormulaDependencyGenerator = class FormulaDependencyGenerator extends Dispos
 		for (let i = 0, len = treeList.length; i < len; i++) {
 			const tree = treeList[i];
 			if (!tree.formula) continue;
+			this._runtimeService.setCurrent(tree.row, tree.column, tree.rowCount, tree.columnCount, tree.subUnitId, tree.unitId);
 			const node = this._getTreeNode(tree);
 			tree.isDirty = this._includeTree(tree, node);
 			const addressFunctionNodes = this._getAddressFunctionNodeList(node);
 			if (addressFunctionNodes.length > 0) tree.addressFunctionNodes = addressFunctionNodes;
 			if (tree.isVirtual) continue;
-			this._runtimeService.setCurrent(tree.row, tree.column, tree.rowCount, tree.columnCount, tree.subUnitId, tree.unitId);
 			const rangeList = await this._getRangeListByNode({
 				node,
 				refOffsetX: tree.refOffsetX,
@@ -13458,13 +13879,13 @@ let FormulaDependencyGenerator = class FormulaDependencyGenerator extends Dispos
 	async _calculateAddressFunctionRuntimeData(treeDependencyCache, preCalculateTreeList) {
 		while (preCalculateTreeList.length > 0) {
 			const tree = preCalculateTreeList.pop();
+			this._runtimeService.setCurrent(tree.row, tree.column, tree.rowCount, tree.columnCount, tree.subUnitId, tree.unitId);
 			const nodeData = {
 				node: this._getTreeNode(tree),
 				refOffsetX: tree.refOffsetX,
 				refOffsetY: tree.refOffsetY
 			};
 			await this._calculateAddressFunction(treeDependencyCache, tree);
-			this._runtimeService.setCurrent(tree.row, tree.column, tree.rowCount, tree.columnCount, tree.subUnitId, tree.unitId);
 			let value;
 			if (this._interpreter.checkAsyncNode(nodeData.node)) value = await this._interpreter.executeAsync(nodeData);
 			else value = this._interpreter.execute(nodeData);
@@ -13891,7 +14312,8 @@ let CalculateFormulaService = class CalculateFormulaService extends Disposable {
 		const treeCount = treeList.length;
 		while (treeList.length > 0) {
 			const tree = treeList.pop();
-			const node = generateAstNode(tree.unitId, tree.formula, this._lexer, this._astTreeBuilder, this._currentConfigService);
+			this._runtimeService.setCurrent(tree.row, tree.column, tree.rowCount, tree.columnCount, tree.subUnitId, tree.unitId);
+			const node = generateAstNode(tree.unitId, tree.formula, this._lexer, this._astTreeBuilder, this._currentConfigService, tree.subUnitId);
 			const nodeData = {
 				node,
 				refOffsetX: tree.refOffsetX,
@@ -13921,7 +14343,6 @@ let CalculateFormulaService = class CalculateFormulaService extends Disposable {
 					return;
 				}
 			}
-			this._runtimeService.setCurrent(tree.row, tree.column, tree.rowCount, tree.columnCount, tree.subUnitId, tree.unitId);
 			let value;
 			if (getDirtyData != null && tree.featureId != null) {
 				/**
@@ -14014,8 +14435,9 @@ let CalculateFormulaService = class CalculateFormulaService extends Disposable {
 		}
 		return result;
 	}
-	async calculate(formulaString) {
-		const lexerNode = this._lexer.treeBuilder(formulaString);
+	async calculate(formulaString, transformSuffix = true, unitId) {
+		const executeUnitId = unitId || this._runtimeService.currentUnitId || this._currentConfigService.getExecuteUnitId();
+		const lexerNode = this._lexer.treeBuilder(formulaString, transformSuffix, executeUnitId);
 		if (Object.values(ErrorType).includes(lexerNode)) return;
 		const astNode = this._astTreeBuilder.parse(lexerNode);
 		const interpreter = this._interpreter;
@@ -14203,6 +14625,86 @@ CalculateController = __decorate([
 	__decorateParam(2, Inject(FormulaDataModel))
 ], CalculateController);
 
+//#endregion
+//#region src/services/active-dirty-manager.service.ts
+/**
+* Actively mark as dirty, calculate the dirty area based on the command,
+* and plugins can register the ref range they affect into the formula engine.
+*/
+var ActiveDirtyManagerService = class extends Disposable {
+	constructor(..._args) {
+		super(..._args);
+		_defineProperty(this, "_dirtyConversionMap", /* @__PURE__ */ new Map());
+	}
+	dispose() {
+		this._dirtyConversionMap.clear();
+	}
+	remove(commandId) {
+		this._dirtyConversionMap.delete(commandId);
+	}
+	get(commandId) {
+		return this._dirtyConversionMap.get(commandId);
+	}
+	has(commandId) {
+		return this._dirtyConversionMap.has(commandId);
+	}
+	register(commandId, dirtyConversion) {
+		this._dirtyConversionMap.set(commandId, dirtyConversion);
+	}
+	getDirtyConversionMap() {
+		return this._dirtyConversionMap;
+	}
+};
+const IActiveDirtyManagerService = createIdentifier("univer.formula.active-dirty-manager.service");
+
+//#endregion
+//#region src/controllers/super-table-active-dirty.controller.ts
+let SuperTableActiveDirtyController = class SuperTableActiveDirtyController extends Disposable {
+	constructor(_activeDirtyManagerService) {
+		super();
+		this._activeDirtyManagerService = _activeDirtyManagerService;
+		this._initialize();
+	}
+	_initialize() {
+		this._activeDirtyManagerService.register(SetSuperTableMutation.id, {
+			commandId: SetSuperTableMutation.id,
+			getDirtyData: (command) => {
+				const params = command.params;
+				const tableNames = [params.tableName, params.oldTableName].filter((name) => Boolean(name));
+				return {
+					dirtyRanges: [{
+						unitId: params.unitId,
+						sheetId: params.reference.sheetId,
+						range: params.reference.range
+					}],
+					dirtySuperTableMap: { [params.unitId]: Object.fromEntries(tableNames.map((name) => [name, "1"])) },
+					clearDependencyTreeCache: { [params.unitId]: { [params.reference.sheetId]: "1" } }
+				};
+			}
+		});
+		this._activeDirtyManagerService.register(RemoveSuperTableMutation.id, {
+			commandId: RemoveSuperTableMutation.id,
+			getDirtyData: (command) => {
+				const params = command.params;
+				return {
+					dirtyRanges: params.reference ? [{
+						unitId: params.unitId,
+						sheetId: params.reference.sheetId,
+						range: params.reference.range
+					}] : void 0,
+					dirtySuperTableMap: { [params.unitId]: { [params.tableName]: "1" } },
+					clearDependencyTreeCache: params.reference ? { [params.unitId]: { [params.reference.sheetId]: "1" } } : void 0
+				};
+			}
+		});
+		this.disposeWithMe(toDisposable(() => {
+			this._activeDirtyManagerService.remove(SetSuperTableMutation.id);
+			this._activeDirtyManagerService.remove(RemoveSuperTableMutation.id);
+		}));
+	}
+};
+SuperTableActiveDirtyController = __decorate([__decorateParam(0, IActiveDirtyManagerService)], SuperTableActiveDirtyController);
+
 //#endregion
 //#region src/engine/utils/r1c1-reference.ts
 const $relativeRegex = /[\[\]]/g;
@@ -14374,6 +14876,8 @@ var BaseFunction = class {
 		_defineProperty(this, "_subUnitId", void 0);
 		_defineProperty(this, "_row", -1);
 		_defineProperty(this, "_column", -1);
+		_defineProperty(this, "_currentFormulaRowCount", 1);
+		_defineProperty(this, "_currentFormulaColumnCount", 1);
 		_defineProperty(this, "_definedNames", void 0);
 		_defineProperty(this, "_locale", void 0);
 		_defineProperty(this, "_sheetOrder", void 0);
@@ -14437,6 +14941,23 @@ var BaseFunction = class {
 			"needsFilteredOutRows",
 			false
 		);
+		_defineProperty(
+			this,
+			/**
+			* Whether the function needs unevaluated AST children.
+			*/
+			"needsAstChildren",
+			false
+		);
+		_defineProperty(
+			this,
+			/**
+			* Legacy CSE-style array functions should write only the first result cell
+			* when they are used as a top-level normal formula.
+			*/
+			"returnsLegacyArrayAsScalar",
+			false
+		);
 		_defineProperty(
 			this,
 			/**
@@ -14469,6 +14990,12 @@ var BaseFunction = class {
 	get column() {
 		return this._column;
 	}
+	get currentFormulaRowCount() {
+		return this._currentFormulaRowCount;
+	}
+	get currentFormulaColumnCount() {
+		return this._currentFormulaColumnCount;
+	}
 	dispose() {}
 	/**
 	* In Excel, to inject a defined name into a function that has positioning capabilities,
@@ -14479,8 +15006,9 @@ var BaseFunction = class {
 	getDefinedName(name) {
 		const nameMap = this._definedNames;
 		if (nameMap == null) return null;
+		const normalizedName = name.toLowerCase();
 		return Object.values(nameMap).find((value) => {
-			return value.name === name;
+			return value.name.toLowerCase() === normalizedName;
 		});
 	}
 	setDefinedNames(definedNames) {
@@ -14521,11 +15049,13 @@ var BaseFunction = class {
 	isArgumentsIgnoreNumberPattern() {
 		return false;
 	}
-	setRefInfo(unitId, subUnitId, row, column) {
+	setRefInfo(unitId, subUnitId, row, column, rowCount = 1, columnCount = 1) {
 		this._unitId = unitId;
 		this._subUnitId = subUnitId;
 		this._row = row;
 		this._column = column;
+		this._currentFormulaRowCount = rowCount;
+		this._currentFormulaColumnCount = columnCount;
 	}
 	calculateCustom(...arg) {
 		return null;
@@ -14533,6 +15063,9 @@ var BaseFunction = class {
 	calculate(...arg) {
 		return ErrorValueObject.create("#VALUE!");
 	}
+	calculateAst(_children, _getVariant) {
+		return ErrorValueObject.create("#VALUE!");
+	}
 	checkArrayType(variant) {
 		return variant.isReferenceObject() || variant.isValueObject() && variant.isArray();
 	}
@@ -16630,7 +17163,12 @@ function getArrayValuesByAggregateIgnoreOptions(array, options, formulaDataModel
 				if (ignoreErrorValues) continue;
 				return valueObject;
 			}
-			if (!valueObject || valueObject.isNull() || valueObject.isBoolean() || valueObject.isString()) continue;
+			if (!valueObject || valueObject.isNull() || valueObject.isString()) continue;
+			if (!array.isArray() && valueObject.isBoolean()) {
+				values.push(valueObject.getValue() ? 1 : 0);
+				continue;
+			}
+			if (valueObject.isBoolean()) continue;
 			const value = valueObject.getValue();
 			if (!isRealNum(value)) continue;
 			values.push(+value);
@@ -18358,6 +18896,11 @@ var Normsdist = class extends BaseFunction {
 
 //#endregion
 //#region src/functions/compatibility/rank/index.ts
+function isSameRankNumber$2(left, right) {
+	if (left === right || Number.isInteger(left) || Number.isInteger(right)) return left === right;
+	const scale = Math.max(1, Math.abs(left), Math.abs(right));
+	return Math.abs(left - right) <= Number.EPSILON * scale * 2;
+}
 var Rank = class extends BaseFunction {
 	constructor(..._args) {
 		super(..._args);
@@ -18383,7 +18926,7 @@ var Rank = class extends BaseFunction {
 			const numberValue = +numberObject.getValue();
 			const orderValue = +orderObject.getValue();
 			if (Number.isNaN(numberValue) || Number.isNaN(orderValue)) return ErrorValueObject.create("#VALUE!");
-			const result = refNumbers.sort((a, b) => !orderValue ? b - a : a - b).indexOf(numberValue);
+			const result = [...refNumbers].sort((a, b) => !orderValue ? b - a : a - b).findIndex((refNumber) => isSameRankNumber$2(refNumber, numberValue));
 			if (result === -1) return ErrorValueObject.create("#N/A");
 			return NumberValueObject.create(result + 1);
 		});
@@ -18394,12 +18937,12 @@ var Rank = class extends BaseFunction {
 		let refHasError = false;
 		let refErrorObject = ErrorValueObject.create("#N/A");
 		const refNumbers = [];
-		if (!ref.isReferenceObject()) return {
+		if (!ref.isReferenceObject() && !ref.isArray()) return {
 			refHasError: true,
 			refErrorObject,
 			refNumbers
 		};
-		ref.toArrayValueObject().iterator((refObject) => {
+		(ref.isReferenceObject() ? ref.toArrayValueObject() : ref).iterator((refObject) => {
 			const _refObject = refObject;
 			if (_refObject.isError()) {
 				refHasError = true;
@@ -19465,7 +20008,8 @@ var Edate = class extends BaseFunction {
 			const year = _startDate.getUTCFullYear();
 			const month = _startDate.getUTCMonth() + monthsValue;
 			const day = _startDate.getUTCDate();
-			const currentSerial = excelDateSerial(new Date(Date.UTC(year, month, day)));
+			const lastDayOfTargetMonth = new Date(Date.UTC(year, month + 1, 0)).getUTCDate();
+			const currentSerial = excelDateSerial(new Date(Date.UTC(year, month, Math.min(day, lastDayOfTargetMonth))));
 			return NumberValueObject.create(currentSerial, DEFAULT_DATE_FORMAT);
 		});
 	}
@@ -19749,8 +20293,12 @@ var Networkdays = class extends BaseFunction {
 			for (let r = 0; r < rowCount; r++) for (let c = 0; c < columnCount; c++) {
 				const cell = holidays.get(r, c);
 				if (cell.isBoolean()) return ErrorValueObject.create("#VALUE!");
+				if (cell.isNull()) continue;
 				const holidaySerialNumber = getDateSerialNumberByObject(cell);
-				if (typeof holidaySerialNumber !== "number") return holidaySerialNumber;
+				if (typeof holidaySerialNumber !== "number") {
+					if (cell.isString()) continue;
+					return holidaySerialNumber;
+				}
 				holidaysValueArray.push(holidaySerialNumber);
 			}
 		} else {
@@ -19821,8 +20369,12 @@ var NetworkdaysIntl = class extends BaseFunction {
 			for (let r = 0; r < rowCount; r++) for (let c = 0; c < columnCount; c++) {
 				const cell = holidays.get(r, c);
 				if (cell.isBoolean()) return ErrorValueObject.create("#VALUE!");
+				if (cell.isNull()) continue;
 				const holidaySerialNumber = getDateSerialNumberByObject(cell);
-				if (typeof holidaySerialNumber !== "number") return holidaySerialNumber;
+				if (typeof holidaySerialNumber !== "number") {
+					if (cell.isString()) continue;
+					return holidaySerialNumber;
+				}
 				holidaysValueArray.push(holidaySerialNumber);
 			}
 		} else {
@@ -20275,8 +20827,12 @@ var Workday = class extends BaseFunction {
 			for (let r = 0; r < rowCount; r++) for (let c = 0; c < columnCount; c++) {
 				const cell = holidays.get(r, c);
 				if (cell.isBoolean()) return ErrorValueObject.create("#VALUE!");
+				if (cell.isNull()) continue;
 				const holidaySerialNumber = getDateSerialNumberByObject(cell);
-				if (typeof holidaySerialNumber !== "number") return holidaySerialNumber;
+				if (typeof holidaySerialNumber !== "number") {
+					if (cell.isString()) continue;
+					return holidaySerialNumber;
+				}
 				holidaysValueArray.push(holidaySerialNumber);
 			}
 		} else {
@@ -20346,8 +20902,12 @@ var WorkdayIntl = class extends BaseFunction {
 			for (let r = 0; r < rowCount; r++) for (let c = 0; c < columnCount; c++) {
 				const cell = holidays.get(r, c);
 				if (cell.isBoolean()) return ErrorValueObject.create("#VALUE!");
+				if (cell.isNull()) continue;
 				const holidaySerialNumber = getDateSerialNumberByObject(cell);
-				if (typeof holidaySerialNumber !== "number") return holidaySerialNumber;
+				if (typeof holidaySerialNumber !== "number") {
+					if (cell.isString()) continue;
+					return holidaySerialNumber;
+				}
 				holidaysValueArray.push(holidaySerialNumber);
 			}
 		} else {
@@ -27810,6 +28370,232 @@ var False = class extends BaseFunction {
 	}
 };
 
+//#endregion
+//#region src/functions/logical/groupby/index.ts
+var Groupby = class extends BaseFunction {
+	constructor(..._args) {
+		super(..._args);
+		_defineProperty(this, "minParams", 3);
+		_defineProperty(this, "maxParams", 7);
+		_defineProperty(this, "needsReferenceObject", true);
+		_defineProperty(this, "needsAstChildren", true);
+	}
+	calculateAst(children, getVariant) {
+		const rowFields = this._arrayInput(getVariant(children[0]));
+		if (rowFields instanceof ErrorValueObject) return rowFields;
+		const values = this._arrayInput(getVariant(children[1]));
+		if (values instanceof ErrorValueObject) return values;
+		const aggregators = this._aggregators(children[2]);
+		if (aggregators.length === 0) return ErrorValueObject.create("#VALUE!");
+		if (values.rowCount !== rowFields.rowCount) return ErrorValueObject.create("#VALUE!");
+		const includeTotal = children[4] == null ? true : this._numberValue(getVariant(children[4])) !== 0;
+		const sortColumnValue = children[5] == null ? 0 : this._numberValue(getVariant(children[5]));
+		const sortColumn = sortColumnValue === 0 ? void 0 : Math.trunc(sortColumnValue);
+		const filter = children[6] == null ? void 0 : this._arrayInput(getVariant(children[6]));
+		if (filter instanceof ErrorValueObject) return filter;
+		const groupColumnCount = rowFields.columnCount;
+		const valueColumnCount = values.columnCount;
+		const outputValueColumnCount = this._outputValueColumnCount(valueColumnCount, aggregators.length);
+		const groups = [];
+		const allValues = Array.from({ length: valueColumnCount }, () => []);
+		for (let row = 0; row < rowFields.rowCount; row++) {
+			if (filter != null && !this._truthy(filter.valueAt(row, 0))) continue;
+			const key = [];
+			for (let column = 0; column < groupColumnCount; column++) key.push(rowFields.valueAt(row, column));
+			let group = groups.find((item) => this._keysEqual(item.key, key));
+			if (group == null) {
+				group = {
+					key,
+					values: Array.from({ length: valueColumnCount }, () => [])
+				};
+				groups.push(group);
+			}
+			for (let column = 0; column < valueColumnCount; column++) {
+				const value = values.valueAt(row, column);
+				group.values[column].push(value);
+				allValues[column].push(value);
+			}
+		}
+		this._sortGroups(groups, sortColumn);
+		const includeHeader = aggregators.length > 1;
+		const rowCount = groups.length + (includeHeader ? 1 : 0) + (includeTotal ? 1 : 0);
+		const columnCount = groupColumnCount + outputValueColumnCount;
+		const result = [];
+		if (includeHeader) {
+			const header = [];
+			for (let column = 0; column < groupColumnCount; column++) header.push(StringValueObject.create(""));
+			for (let column = 0; column < outputValueColumnCount; column++) header.push(StringValueObject.create(this._aggregatorHeader(this._aggregatorForOutput(aggregators, valueColumnCount, column))));
+			result.push(header);
+		}
+		for (const group of groups) {
+			const row = [...group.key];
+			for (let column = 0; column < outputValueColumnCount; column++) {
+				const valueColumn = this._valueColumnForOutput(valueColumnCount, aggregators.length, column);
+				const aggregator = this._aggregatorForOutput(aggregators, valueColumnCount, column);
+				row.push(this._applyAggregator(aggregator, group.values[valueColumn], allValues[valueColumn]));
+			}
+			result.push(row);
+		}
+		if (includeTotal) {
+			const row = [];
+			for (let column = 0; column < groupColumnCount; column++) row.push(StringValueObject.create(column === 0 ? "Total" : ""));
+			for (let column = 0; column < outputValueColumnCount; column++) {
+				const valueColumn = this._valueColumnForOutput(valueColumnCount, aggregators.length, column);
+				const aggregator = this._aggregatorForOutput(aggregators, valueColumnCount, column);
+				row.push(this._applyAggregator(aggregator, allValues[valueColumn], allValues[valueColumn]));
+			}
+			result.push(row);
+		}
+		return ArrayValueObject.create({
+			calculateValueList: result,
+			rowCount,
+			columnCount,
+			unitId: this.unitId,
+			sheetId: this.subUnitId,
+			row: this.row,
+			column: this.column
+		});
+	}
+	_arrayInput(variant) {
+		if (variant == null) return ErrorValueObject.create("#VALUE!");
+		let value = variant;
+		if (value.isReferenceObject()) value = value.toArrayValueObject();
+		if (value.isError()) return value;
+		if (value.isArray()) {
+			const array = value;
+			return {
+				rowCount: array.getRowCount(),
+				columnCount: array.getColumnCount(),
+				valueAt: (row, column) => {
+					var _array$get;
+					return (_array$get = array.get(row, column)) !== null && _array$get !== void 0 ? _array$get : NullValueObject.create();
+				}
+			};
+		}
+		return {
+			rowCount: 1,
+			columnCount: 1,
+			valueAt: (row, column) => row === 0 && column === 0 ? value : NullValueObject.create()
+		};
+	}
+	_aggregators(node) {
+		const name = this._normalizedFunctionName(node.getToken());
+		if (name === "GROUPBY") return [];
+		if (name === "HSTACK") return node.getChildren().flatMap((child) => this._aggregators(child));
+		if (this._isAggregatorName(name)) return [name];
+		return [];
+	}
+	_normalizedFunctionName(token) {
+		let normalized = token.toUpperCase();
+		for (;;) {
+			const prefix = [
+				"_XLFN.",
+				"_XLWS.",
+				"_XLETA."
+			].find((item) => normalized.startsWith(item));
+			if (prefix == null) return normalized;
+			normalized = normalized.slice(prefix.length);
+		}
+	}
+	_isAggregatorName(name) {
+		return name === "SUM" || name === "COUNT" || name === "COUNTA" || name === "PERCENTOF" || name === "MIN" || name === "MAX" || name === "ARRAYTOTEXT";
+	}
+	_outputValueColumnCount(valueColumnCount, aggregatorCount) {
+		if (valueColumnCount === 1) return aggregatorCount;
+		if (aggregatorCount === 1 || valueColumnCount === aggregatorCount) return valueColumnCount;
+		return Math.min(valueColumnCount, aggregatorCount);
+	}
+	_valueColumnForOutput(valueColumnCount, aggregatorCount, outputColumn) {
+		if (valueColumnCount === 1) return 0;
+		if (aggregatorCount === 1 || valueColumnCount === aggregatorCount) return Math.min(outputColumn, valueColumnCount - 1);
+		return Math.min(outputColumn, valueColumnCount - 1);
+	}
+	_aggregatorForOutput(aggregators, valueColumnCount, outputColumn) {
+		if (aggregators.length === 1 || valueColumnCount === aggregators.length) return aggregators[Math.min(outputColumn, aggregators.length - 1)];
+		return aggregators[Math.min(outputColumn, aggregators.length - 1)];
+	}
+	_aggregatorHeader(aggregator) {
+		return aggregator === "PERCENTOF" ? "%" : aggregator;
+	}
+	_applyAggregator(aggregator, groupValues, allValues) {
+		switch (aggregator) {
+			case "SUM": return NumberValueObject.create(this._sum(groupValues));
+			case "COUNT": return NumberValueObject.create(groupValues.filter((value) => value.isNumber()).length);
+			case "COUNTA": return NumberValueObject.create(groupValues.filter((value) => !value.isNull() && !(value.isString() && value.getValue() === "")).length);
+			case "PERCENTOF": {
+				const allTotal = this._sum(allValues);
+				if (allTotal === 0) return ErrorValueObject.create("#DIV/0!");
+				return NumberValueObject.create(this._sum(groupValues) / allTotal);
+			}
+			case "MIN": {
+				const values = groupValues.map((value) => this._numericValue(value)).filter((value) => value != null);
+				return NumberValueObject.create(values.length === 0 ? 0 : Math.min(...values));
+			}
+			case "MAX": {
+				const values = groupValues.map((value) => this._numericValue(value)).filter((value) => value != null);
+				return NumberValueObject.create(values.length === 0 ? 0 : Math.max(...values));
+			}
+			case "ARRAYTOTEXT": return StringValueObject.create(groupValues.map((value) => this._textValue(value)).filter(Boolean).join(", "));
+		}
+	}
+	_sum(values) {
+		return values.reduce((sum, value) => {
+			var _this$_numericValue;
+			return sum + ((_this$_numericValue = this._numericValue(value)) !== null && _this$_numericValue !== void 0 ? _this$_numericValue : 0);
+		}, 0);
+	}
+	_numericValue(value) {
+		return value.isNumber() ? Number(value.getValue()) : void 0;
+	}
+	_numberValue(variant) {
+		if (variant == null || variant.isError()) return 0;
+		if (variant.isReferenceObject()) variant = variant.getFirstCell();
+		if (variant.isArray()) {
+			var _get;
+			variant = (_get = variant.get(0, 0)) !== null && _get !== void 0 ? _get : NullValueObject.create();
+		}
+		const value = variant.getValue();
+		return typeof value === "number" ? Math.trunc(value) : Math.trunc(Number(value) || 0);
+	}
+	_truthy(value) {
+		if (value.isError() || value.isNull()) return false;
+		return Boolean(value.getValue());
+	}
+	_keysEqual(left, right) {
+		return left.length === right.length && left.every((value, index) => this._keyValue(value) === this._keyValue(right[index]));
+	}
+	_keyValue(value) {
+		if (value.isError()) return `error:${value.getErrorType()}`;
+		if (value.isNull()) return "null:";
+		return `${typeof value.getValue()}:${String(value.getValue())}`;
+	}
+	_sortGroups(groups, sortColumn) {
+		const descending = sortColumn != null && sortColumn < 0;
+		const sortIndex = sortColumn == null ? void 0 : Math.abs(sortColumn) - 1;
+		groups.sort((left, right) => {
+			const compare = sortIndex != null && sortIndex < left.key.length ? this._compareValue(left.key[sortIndex], right.key[sortIndex]) : this._compareKey(left.key, right.key);
+			return descending ? -compare : compare;
+		});
+	}
+	_compareKey(left, right) {
+		for (let index = 0; index < Math.min(left.length, right.length); index++) {
+			const compare = this._compareValue(left[index], right[index]);
+			if (compare !== 0) return compare;
+		}
+		return left.length - right.length;
+	}
+	_compareValue(left, right) {
+		const leftNumber = this._numericValue(left);
+		const rightNumber = this._numericValue(right);
+		if (leftNumber != null && rightNumber != null) return leftNumber - rightNumber;
+		return this._textValue(left).toUpperCase().localeCompare(this._textValue(right).toUpperCase());
+	}
+	_textValue(value) {
+		if (value.isNull()) return "";
+		return String(value.getValue());
+	}
+};
+
 //#endregion
 //#region src/functions/logical/if/index.ts
 var If = class extends BaseFunction {
@@ -27820,12 +28606,18 @@ var If = class extends BaseFunction {
 	}
 	calculate(logicalTest, valueIfTrue, valueIfFalse = BooleanValueObject.create(false)) {
 		let _logicalTest = logicalTest;
+		let useLegacyImplicitSelectedValue = false;
 		if (logicalTest.isArray()) {
-			const rowCount = logicalTest.getRowCount();
-			const columnCount = logicalTest.getColumnCount();
-			if (rowCount === 1 && columnCount === 1) _logicalTest = logicalTest.get(0, 0);
+			const logicalTestArray = logicalTest;
+			const rowCount = logicalTestArray.getRowCount();
+			const columnCount = logicalTestArray.getColumnCount();
+			if (rowCount === 1 && columnCount === 1) _logicalTest = logicalTestArray.get(0, 0);
+			else if (!this._isCurrentArrayFormula() && logicalTestArray.getUnitId() !== "" && logicalTestArray.getSheetId() !== "" && logicalTestArray.getCurrentRow() >= 0 && logicalTestArray.getCurrentColumn() >= 0) {
+				_logicalTest = this._legacyImplicitArrayValue(logicalTestArray);
+				useLegacyImplicitSelectedValue = true;
+			}
 		}
-		if (!_logicalTest.isArray()) return this._handleSingleObject(_logicalTest, valueIfTrue, valueIfFalse);
+		if (!_logicalTest.isArray()) return this._handleSingleObject(_logicalTest, valueIfTrue, valueIfFalse, useLegacyImplicitSelectedValue);
 		const maxRowLength = Math.max(_logicalTest.isArray() ? _logicalTest.getRowCount() : 1, valueIfTrue.isArray() ? valueIfTrue.getRowCount() : 1, valueIfFalse.isArray() ? valueIfFalse.getRowCount() : 1);
 		const maxColumnLength = Math.max(_logicalTest.isArray() ? _logicalTest.getColumnCount() : 1, valueIfTrue.isArray() ? valueIfTrue.getColumnCount() : 1, valueIfFalse.isArray() ? valueIfFalse.getColumnCount() : 1);
 		const logicalTestArray = expandArrayValueObject(maxRowLength, maxColumnLength, _logicalTest, ErrorValueObject.create("#N/A"));
@@ -27834,12 +28626,63 @@ var If = class extends BaseFunction {
 		return logicalTestArray.mapValue((logicalTestValue, rowIndex, columnIndex) => {
 			const valueIfTrueValue = valueIfTrueArray.get(rowIndex, columnIndex);
 			const valueIfFalseValue = valueIfFalseArray.get(rowIndex, columnIndex);
-			return this._handleSingleObject(logicalTestValue, valueIfTrueValue, valueIfFalseValue);
+			return this._handleSingleObject(logicalTestValue, valueIfTrueValue, valueIfFalseValue, false);
 		});
 	}
-	_handleSingleObject(logicalTest, valueIfTrue, valueIfFalse) {
+	_handleSingleObject(logicalTest, valueIfTrue, valueIfFalse, useLegacyImplicitSelectedValue) {
 		if (logicalTest.isError()) return logicalTest;
-		return logicalTest.getValue() ? valueIfTrue : valueIfFalse;
+		const logicalTestValue = this._coerceLogicalTest(logicalTest);
+		if (logicalTestValue.isError()) return logicalTestValue;
+		let selectedValue = logicalTestValue.getValue() ? valueIfTrue : valueIfFalse;
+		if (useLegacyImplicitSelectedValue) selectedValue = this._legacyImplicitSelectedValue(selectedValue);
+		return this._coerceSelectedValue(selectedValue);
+	}
+	_coerceSelectedValue(value) {
+		return value.isNull() ? NumberValueObject.create(0) : value;
+	}
+	_coerceLogicalTest(logicalTest) {
+		if (logicalTest.isNull()) return BooleanValueObject.create(false);
+		if (logicalTest.isBoolean()) return logicalTest;
+		if (logicalTest.isNumber()) return BooleanValueObject.create(Number(logicalTest.getValue()) !== 0);
+		if (logicalTest.isString()) {
+			const value = `${logicalTest.getValue()}`.trim().toUpperCase();
+			if (value === "TRUE") return BooleanValueObject.create(true);
+			if (value === "FALSE") return BooleanValueObject.create(false);
+		}
+		return ErrorValueObject.create("#VALUE!");
+	}
+	_legacyImplicitSelectedValue(value) {
+		if (!value.isArray()) return value;
+		const array = value;
+		if (array.getUnitId() === "" || array.getSheetId() === "" || array.getCurrentRow() < 0 || array.getCurrentColumn() < 0) return value;
+		return this._legacyImplicitArrayValue(array);
+	}
+	_legacyImplicitArrayValue(logicalTest) {
+		const startRow = logicalTest.getCurrentRow();
+		const startColumn = logicalTest.getCurrentColumn();
+		const rowCount = logicalTest.getRowCount();
+		const columnCount = logicalTest.getColumnCount();
+		if (startRow < 0 || startColumn < 0) return ErrorValueObject.create("#VALUE!");
+		let rowIndex = -1;
+		let columnIndex = -1;
+		if (rowCount === 1 && columnCount === 1) {
+			rowIndex = 0;
+			columnIndex = 0;
+		} else if (rowCount === 1) {
+			rowIndex = 0;
+			columnIndex = this.column - startColumn;
+		} else if (columnCount === 1) {
+			rowIndex = this.row - startRow;
+			columnIndex = 0;
+		} else {
+			rowIndex = this.row - startRow;
+			columnIndex = this.column - startColumn;
+		}
+		if (rowIndex < 0 || rowIndex >= rowCount || columnIndex < 0 || columnIndex >= columnCount) return ErrorValueObject.create("#VALUE!");
+		return logicalTest.get(rowIndex, columnIndex) || ErrorValueObject.create("#VALUE!");
+	}
+	_isCurrentArrayFormula() {
+		return this.currentFormulaRowCount > 1 || this.currentFormulaColumnCount > 1;
 	}
 };
 
@@ -27850,8 +28693,11 @@ var Iferror = class extends BaseFunction {
 		super(..._args);
 		_defineProperty(this, "minParams", 2);
 		_defineProperty(this, "maxParams", 2);
+		_defineProperty(this, "needsReferenceObject", true);
 	}
 	calculate(value, valueIfError) {
+		value = this._toValueObject(value);
+		valueIfError = this._toValueObject(valueIfError);
 		if (!value.isArray()) return value.isError() ? valueIfError : value;
 		const maxRowLength = Math.max(value.isArray() ? value.getRowCount() : 1, valueIfError.isArray() ? valueIfError.getRowCount() : 1);
 		const maxColumnLength = Math.max(value.isArray() ? value.getColumnCount() : 1, valueIfError.isArray() ? valueIfError.getColumnCount() : 1);
@@ -27862,6 +28708,12 @@ var Iferror = class extends BaseFunction {
 		});
 		return valueArray;
 	}
+	_toValueObject(value) {
+		if (!value.isReferenceObject()) return value;
+		const reference = value;
+		if (reference.getRowCount() === 1 && reference.getColumnCount() === 1) return reference.getCellByPosition();
+		return reference.toArrayValueObject();
+	}
 };
 
 //#endregion
@@ -28138,6 +28990,23 @@ var Or = class extends BaseFunction {
 	}
 };
 
+//#endregion
+//#region src/functions/logical/percentof/index.ts
+/**
+* PERCENTOF is an Excel GROUPBY aggregator token. It is evaluated by GROUPBY's
+* AST path, not as a standalone scalar function.
+*/
+var Percentof = class extends BaseFunction {
+	constructor(..._args) {
+		super(..._args);
+		_defineProperty(this, "minParams", 0);
+		_defineProperty(this, "maxParams", 0);
+	}
+	calculate(..._variants) {
+		return ErrorValueObject.create("#VALUE!");
+	}
+};
+
 //#endregion
 //#region src/functions/logical/reduce/index.ts
 var Reduce = class extends BaseFunction {
@@ -28421,6 +29290,7 @@ const functionLogical = [
 	[Bycol, "BYCOL"],
 	[Byrow, "BYROW"],
 	[False, "FALSE"],
+	[Groupby, "GROUPBY"],
 	[If, "IF"],
 	[Iferror, "IFERROR"],
 	[Ifna, "IFNA"],
@@ -28431,6 +29301,7 @@ const functionLogical = [
 	[Map$1, "MAP"],
 	[Not, "NOT"],
 	[Or, "OR"],
+	[Percentof, "PERCENTOF"],
 	[Reduce, "REDUCE"],
 	[Scan, "SCAN"],
 	[Switch, "SWITCH"],
@@ -28452,9 +29323,9 @@ var Address = class extends BaseFunction {
 		if (absNumber === null || absNumber === void 0 ? void 0 : absNumber.isError()) return absNumber;
 		if (a1 === null || a1 === void 0 ? void 0 : a1.isError()) return a1;
 		if (sheetText === null || sheetText === void 0 ? void 0 : sheetText.isError()) return sheetText;
-		const _absNumber = absNumber !== null && absNumber !== void 0 ? absNumber : NumberValueObject.create(1);
-		const _a1 = a1 !== null && a1 !== void 0 ? a1 : BooleanValueObject.create(true);
-		const _sheetText = sheetText !== null && sheetText !== void 0 ? sheetText : StringValueObject.create("");
+		const _absNumber = absNumber == null || absNumber.isNull() ? NumberValueObject.create(1) : absNumber;
+		const _a1 = a1 == null || a1.isNull() ? BooleanValueObject.create(true) : a1;
+		const _sheetText = sheetText == null || sheetText.isNull() ? StringValueObject.create("") : sheetText;
 		const maxRowLength = Math.max(rowNumber.isArray() ? rowNumber.getRowCount() : 1, columnNumber.isArray() ? columnNumber.getRowCount() : 1, _absNumber.isArray() ? _absNumber.getRowCount() : 1, _a1.isArray() ? _a1.getRowCount() : 1, _sheetText.isArray() ? _sheetText.getRowCount() : 1);
 		const maxColumnLength = Math.max(rowNumber.isArray() ? rowNumber.getColumnCount() : 1, columnNumber.isArray() ? columnNumber.getColumnCount() : 1, _absNumber.isArray() ? _absNumber.getColumnCount() : 1, _a1.isArray() ? _a1.getColumnCount() : 1, _sheetText.isArray() ? _sheetText.getColumnCount() : 1);
 		const rowNumArray = expandArrayValueObject(maxRowLength, maxColumnLength, rowNumber, ErrorValueObject.create("#N/A"));
@@ -28505,6 +29376,20 @@ function transformAbsoluteRefType(number) {
 	}
 }
 
+//#endregion
+//#region src/functions/lookup/anchorarray/index.ts
+var Anchorarray = class extends BaseFunction {
+	constructor(..._args) {
+		super(..._args);
+		_defineProperty(this, "minParams", 1);
+		_defineProperty(this, "maxParams", 1);
+		_defineProperty(this, "needsReferenceObject", true);
+	}
+	calculate(reference) {
+		return reference;
+	}
+};
+
 //#endregion
 //#region src/functions/lookup/areas/index.ts
 var Areas = class extends BaseFunction {
@@ -29015,9 +29900,13 @@ var Hlookup = class extends BaseFunction {
 		return this._handleSingleObject(lookupValue, searchArray, resultArray, rangeLookupValue);
 	}
 	_handleSingleObject(value, searchArray, resultArray, rangeLookupValue) {
-		if (rangeLookupValue === 0) return this.equalSearch(value, searchArray, resultArray);
+		if (rangeLookupValue === 0) return this._blankResultAsZero(this.equalSearch(value, searchArray, resultArray));
 		return this.binarySearch(value, searchArray, resultArray);
 	}
+	_blankResultAsZero(value) {
+		if (value.isNull()) return NumberValueObject.create(0);
+		return value;
+	}
 };
 
 //#endregion
@@ -29289,6 +30178,17 @@ var Index = class extends BaseFunction {
 
 //#endregion
 //#region src/functions/lookup/indirect/index.ts
+const INDIRECT_ERROR_LITERALS = [
+	"#NULL!",
+	"#DIV/0!",
+	"#VALUE!",
+	"#REF!",
+	"#NAME?",
+	"#NUM!",
+	"#N/A",
+	"#CYCLE!",
+	"#CALC!"
+];
 var Indirect = class extends BaseFunction {
 	constructor(..._args) {
 		super(..._args);
@@ -29317,6 +30217,8 @@ var Indirect = class extends BaseFunction {
 	_handleSingleObject(refTextObject, a1Value) {
 		const refTextValue = `${refTextObject.getValue()}`;
 		if (refTextValue.trim() === "") return ErrorValueObject.create("#REF!");
+		const embeddedError = this._matchErrorLiteral(refTextValue);
+		if (embeddedError != null) return ErrorValueObject.create(embeddedError);
 		const refTextV = this._convertToDefinedName(refTextValue);
 		if (a1Value === 0) {
 			const { range, sheetName, unitId } = deserializeRangeForR1C1(refTextV);
@@ -29355,6 +30257,10 @@ var Indirect = class extends BaseFunction {
 		if (formulaOrRefString.startsWith("=")) return formulaOrRefString.slice(1);
 		return formulaOrRefString;
 	}
+	_matchErrorLiteral(refText) {
+		const normalizedRefText = refText.toUpperCase();
+		return INDIRECT_ERROR_LITERALS.find((errorType) => normalizedRefText.includes(errorType));
+	}
 };
 
 //#endregion
@@ -29422,7 +30328,7 @@ var Match = class extends BaseFunction {
 		const columnCountLookup = lookupArray.getColumnCount();
 		if (rowCountLookup !== 1 && columnCountLookup !== 1) return ErrorValueObject.create("#N/A");
 		if (matchType === null || matchType === void 0 ? void 0 : matchType.isError()) return ErrorValueObject.create("#N/A");
-		const matchTypeValue = this.getMatchTypeValue(matchType);
+		const matchTypeValue = (matchType === null || matchType === void 0 ? void 0 : matchType.isNull()) ? 0 : this.getMatchTypeValue(matchType);
 		if (matchTypeValue == null) return ErrorValueObject.create("#VALUE!");
 		if (lookupValue.isArray()) return lookupValue.map((value) => this._handleSingleObject(value, lookupArray, matchTypeValue));
 		return this._handleSingleObject(lookupValue, lookupArray, matchTypeValue);
@@ -29841,9 +30747,10 @@ var Sort = class extends BaseFunction {
 	}
 	calculate(array, sortIndex, sortOrder, byCol) {
 		let _sortIndex = sortIndex !== null && sortIndex !== void 0 ? sortIndex : NumberValueObject.create(1);
-		const _sortOrder = sortOrder !== null && sortOrder !== void 0 ? sortOrder : NumberValueObject.create(1);
+		let _sortOrder = sortOrder !== null && sortOrder !== void 0 ? sortOrder : NumberValueObject.create(1);
 		const _byCol = byCol !== null && byCol !== void 0 ? byCol : BooleanValueObject.create(false);
 		if (_sortIndex.isNull()) _sortIndex = NumberValueObject.create(1);
+		if (_sortOrder.isNull()) _sortOrder = NumberValueObject.create(1);
 		if (_byCol.isArray()) {
 			const byColRowCount = _byCol.getRowCount();
 			const byColColumnCount = _byCol.getColumnCount();
@@ -30608,9 +31515,26 @@ var Vlookup = class extends BaseFunction {
 		return this._handleSingleObject(lookupValue, searchArray, resultArray, rangeLookupValue);
 	}
 	_handleSingleObject(value, searchArray, resultArray, rangeLookupValue) {
-		if (rangeLookupValue === 0) return this.equalSearch(value, searchArray, resultArray);
+		if (rangeLookupValue === 0) {
+			if (value.isNull()) return this._equalSearchBlankLookupValue(searchArray, resultArray);
+			return this._blankResultAsZero(this.equalSearch(value, searchArray, resultArray));
+		}
 		return this.binarySearch(value, searchArray, resultArray);
 	}
+	_equalSearchBlankLookupValue(searchArray, resultArray) {
+		var _resultArrayValue$;
+		const zero = NumberValueObject.create(0);
+		const matched = searchArray.mapValue((value) => {
+			if (value.isNull()) return BooleanValueObject.create(false);
+			return value.isEqual(zero);
+		});
+		const resultArrayValue = resultArray.pickRaw(matched);
+		return this._blankResultAsZero(((_resultArrayValue$ = resultArrayValue[0]) === null || _resultArrayValue$ === void 0 ? void 0 : _resultArrayValue$[0]) || ErrorValueObject.create("#N/A"));
+	}
+	_blankResultAsZero(value) {
+		if (value.isNull()) return NumberValueObject.create(0);
+		return value;
+	}
 };
 
 //#endregion
@@ -30780,7 +31704,8 @@ var Xlookup = class extends BaseFunction {
 		if (matchMode === null || matchMode === void 0 ? void 0 : matchMode.isNull()) _matchMode = NumberValueObject.create(0);
 		let _searchMode = searchMode !== null && searchMode !== void 0 ? searchMode : NumberValueObject.create(1);
 		if (searchMode === null || searchMode === void 0 ? void 0 : searchMode.isNull()) _searchMode = NumberValueObject.create(1);
-		if (lookupValue.isError()) return lookupValue;
+		const _lookupValue = this._legacyImplicitLookupValue(lookupValue);
+		if (_lookupValue.isError()) return _lookupValue;
 		const rowCountLookup = lookupArray.isArray() ? lookupArray.getRowCount() : 1;
 		const columnCountLookup = lookupArray.isArray() ? lookupArray.getColumnCount() : 1;
 		const rowCountReturn = returnArray.isArray() ? returnArray.getRowCount() : 1;
@@ -30792,7 +31717,7 @@ var Xlookup = class extends BaseFunction {
 		if (matchModeValue instanceof ErrorValueObject) return matchModeValue;
 		const searchModeValue = this.getIndexNumValue(_searchMode);
 		if (searchModeValue instanceof ErrorValueObject) return searchModeValue;
-		return this._getResult(lookupValue, baseValueObjectToArrayValueObject(lookupArray), baseValueObjectToArrayValueObject(returnArray), _ifNotFound, matchModeValue, searchModeValue, rowCountLookup, columnCountLookup, rowCountReturn, columnCountReturn);
+		return this._getResult(_lookupValue, baseValueObjectToArrayValueObject(lookupArray), baseValueObjectToArrayValueObject(returnArray), _ifNotFound, matchModeValue, searchModeValue, rowCountLookup, columnCountLookup, rowCountReturn, columnCountReturn);
 	}
 	_getResult(lookupValue, lookupArray, returnArray, ifNotFound, matchModeValue, searchModeValue, rowCountLookup, columnCountLookup, rowCountReturn, columnCountReturn) {
 		const lookupValueRowCount = lookupValue.isArray() ? lookupValue.getRowCount() : 1;
@@ -30807,7 +31732,7 @@ var Xlookup = class extends BaseFunction {
 				if (checkErrorCombination) return checkErrorCombination;
 				const result = this._handleSingleObject(value, lookupArray, resultArray, matchModeValue, searchModeValue);
 				if (result.isError()) return ifNotFound;
-				return result;
+				return this._blankResultAsZero(result);
 			});
 		}
 		const _lookupValue = lookupValue.isArray() ? lookupValue.get(0, 0) : lookupValue;
@@ -30816,7 +31741,7 @@ var Xlookup = class extends BaseFunction {
 			if (checkErrorCombination) return checkErrorCombination;
 			const result = this._handleSingleObject(_lookupValue, lookupArray, returnArray, matchModeValue, searchModeValue);
 			if (result.isError()) return ifNotFound;
-			return result;
+			return this._blankResultAsZero(result);
 		}
 		let axis = 0;
 		/**
@@ -30828,6 +31753,32 @@ var Xlookup = class extends BaseFunction {
 		if (resultArray == null) return ErrorValueObject.create("#N/A");
 		return resultArray;
 	}
+	_legacyImplicitLookupValue(lookupValue) {
+		if (!lookupValue.isArray()) return lookupValue;
+		const array = lookupValue;
+		if (array.getUnitId() === "" || array.getSheetId() === "" || array.getCurrentRow() < 0 || array.getCurrentColumn() < 0) return lookupValue;
+		const startRow = array.getCurrentRow();
+		const startColumn = array.getCurrentColumn();
+		const rowCount = array.getRowCount();
+		const columnCount = array.getColumnCount();
+		let rowIndex = -1;
+		let columnIndex = -1;
+		if (rowCount === 1 && columnCount === 1) {
+			rowIndex = 0;
+			columnIndex = 0;
+		} else if (rowCount === 1) {
+			rowIndex = 0;
+			columnIndex = this.column - startColumn;
+		} else if (columnCount === 1) {
+			rowIndex = this.row - startRow;
+			columnIndex = 0;
+		} else {
+			rowIndex = this.row - startRow;
+			columnIndex = this.column - startColumn;
+		}
+		if (rowIndex < 0 || rowIndex >= rowCount || columnIndex < 0 || columnIndex >= columnCount) return ErrorValueObject.create("#VALUE!");
+		return array.get(rowIndex, columnIndex) || ErrorValueObject.create("#VALUE!");
+	}
 	_handleExpandObject(value, searchArray, resultArray, matchModeValue, searchModeValue, axis = 0) {
 		if ((searchModeValue === 2 || searchModeValue === -2) && matchModeValue !== 2) {
 			const searchType = getSearchModeValue(searchModeValue);
@@ -30848,6 +31799,10 @@ var Xlookup = class extends BaseFunction {
 		if (matchModeValue === -1 || matchModeValue === 1) return this.orderSearch(value, searchArray, resultArray, matchModeValue === 1 ? 2 : 1, searchModeValue === -1);
 		return this.equalSearch(value, searchArray, resultArray, searchModeValue !== -1);
 	}
+	_blankResultAsZero(value) {
+		if (value.isNull()) return NumberValueObject.create(0);
+		return value;
+	}
 	/**
 	* Wildcard matching and binary search cannot appear at the same time
 	* @param matchModeValue
@@ -30964,6 +31919,7 @@ var Xmatch = class extends BaseFunction {
 */
 const functionLookup = [
 	[Address, "ADDRESS"],
+	[Anchorarray, "ANCHORARRAY"],
 	[Areas, "AREAS"],
 	[Choose, "CHOOSE"],
 	[Choosecols, "CHOOSECOLS"],
@@ -32069,7 +33025,7 @@ var Int = class extends BaseFunction {
 		let _number = number;
 		if (_number.isString()) _number = _number.convertToNumberObjectValue();
 		if (_number.isError()) return _number;
-		const numberValue = Math.floor(+_number.getValue());
+		const numberValue = Math.floor(stripErrorMargin(+_number.getValue()));
 		return NumberValueObject.create(numberValue);
 	}
 };
@@ -33421,6 +34377,7 @@ var Sum = class extends BaseFunction {
 		let accumulatorAll = NumberValueObject.create(0);
 		for (let i = 0; i < variants.length; i++) {
 			let variant = variants[i];
+			variant = this._legacyImplicitDerivedArray(variant);
 			if (variant.isString()) variant = variant.convertToNumberObjectValue();
 			if (variant.isError()) return variant;
 			if (variant.isArray()) variant = variant.sum();
@@ -33430,6 +34387,30 @@ var Sum = class extends BaseFunction {
 		}
 		return accumulatorAll;
 	}
+	_legacyImplicitDerivedArray(variant) {
+		if (!variant.isArray()) return variant;
+		const array = variant;
+		if (array.usesInvertedIndexCache() || !array.usesLegacyImplicitForAggregate()) return variant;
+		const startRow = array.getCurrentRow();
+		const startColumn = array.getCurrentColumn();
+		if (startRow < 0 || startColumn < 0) return variant;
+		const rowCount = array.getRowCount();
+		const columnCount = array.getColumnCount();
+		let rowIndex = -1;
+		let columnIndex = -1;
+		if (rowCount === 1) {
+			rowIndex = 0;
+			columnIndex = this.column - startColumn;
+		} else if (columnCount === 1) {
+			rowIndex = this.row - startRow;
+			columnIndex = 0;
+		} else {
+			rowIndex = this.row - startRow;
+			columnIndex = this.column - startColumn;
+		}
+		if (rowIndex < 0 || rowIndex >= rowCount || columnIndex < 0 || columnIndex >= columnCount) return variant;
+		return array.get(rowIndex, columnIndex) || variant;
+	}
 };
 
 //#endregion
@@ -34003,8 +34984,17 @@ var Compare = class extends BaseFunction {
 	calculate(variant1, variant2) {
 		if (variant1.isError()) return variant1;
 		if (variant2.isError()) return variant2;
+		const variant1Error = this._coerceErrorLiteral(variant1);
+		if (variant1Error) return variant1Error;
+		const variant2Error = this._coerceErrorLiteral(variant2);
+		if (variant2Error) return variant2Error;
 		return variant1.compare(variant2, this._compareType);
 	}
+	_coerceErrorLiteral(variant) {
+		const value = variant.getValue();
+		if (typeof value === "string" && ERROR_TYPE_SET.has(value)) return ErrorValueObject.create(value);
+		return null;
+	}
 };
 
 //#endregion
@@ -34262,6 +35252,7 @@ var Average = class extends BaseFunction {
 		let accumulatorCount = NumberValueObject.create(0);
 		for (let i = 0; i < variants.length; i++) {
 			let variant = variants[i];
+			variant = this._legacyImplicitDerivedArray(variant);
 			if (variant.isString() || variant.isBoolean()) variant = variant.convertToNumberObjectValue();
 			if (variant.isError()) return variant;
 			if (variant.isArray()) {
@@ -34275,6 +35266,30 @@ var Average = class extends BaseFunction {
 		}
 		return accumulatorSum.divided(accumulatorCount);
 	}
+	_legacyImplicitDerivedArray(variant) {
+		if (!variant.isArray()) return variant;
+		const array = variant;
+		if (array.usesInvertedIndexCache()) return variant;
+		const startRow = array.getCurrentRow();
+		const startColumn = array.getCurrentColumn();
+		if (startRow < 0 || startColumn < 0) return variant;
+		const rowCount = array.getRowCount();
+		const columnCount = array.getColumnCount();
+		let rowIndex = -1;
+		let columnIndex = -1;
+		if (rowCount === 1) {
+			rowIndex = 0;
+			columnIndex = this.column - startColumn;
+		} else if (columnCount === 1) {
+			rowIndex = this.row - startRow;
+			columnIndex = 0;
+		} else {
+			rowIndex = this.row - startRow;
+			columnIndex = this.column - startColumn;
+		}
+		if (rowIndex < 0 || rowIndex >= rowCount || columnIndex < 0 || columnIndex >= columnCount) return variant;
+		return array.get(rowIndex, columnIndex) || variant;
+	}
 };
 
 //#endregion
@@ -34807,7 +35822,13 @@ var Countif = class extends BaseFunction {
 	calculate(range, criteria) {
 		if (!range.isReferenceObject()) return ErrorValueObject.create("#VALUE!");
 		let _criteria = criteria;
-		if (criteria.isReferenceObject()) _criteria = criteria.toArrayValueObject();
+		if (criteria.isReferenceObject()) {
+			_criteria = criteria.toArrayValueObject();
+			if (_criteria.getRowCount() === 1 && _criteria.getColumnCount() === 1) {
+				const firstCriteria = _criteria.get(0, 0);
+				_criteria = firstCriteria.isNull() ? NumberValueObject.create(0) : firstCriteria;
+			}
+		}
 		if (_criteria.isArray()) {
 			const resultArray = _criteria.mapValue((criteriaObject) => this._handleSingleObject(range, criteriaObject));
 			if (resultArray.getRowCount() === 1 && resultArray.getColumnCount() === 1) return resultArray.get(0, 0);
@@ -34842,7 +35863,7 @@ var Countifs = class extends BaseFunction {
 		_defineProperty(this, "needsReferenceObject", true);
 	}
 	calculate(...variants) {
-		const { isError, errorObject, rangeIsDifferentSize, criteriaMaxRowLength, criteriaMaxColumnLength, variants: _variants } = parsePairedRangeAndCriteria(variants);
+		const { isError, errorObject, rangeIsDifferentSize, criteriaMaxRowLength, criteriaMaxColumnLength, variants: _variants } = parsePairedRangeAndCriteria(this._legacyImplicitDerivedCriteria(variants));
 		if (isError) return errorObject;
 		if (rangeIsDifferentSize) {
 			if (criteriaMaxRowLength === 1 && criteriaMaxColumnLength === 1) return ErrorValueObject.create("#VALUE!");
@@ -34865,6 +35886,32 @@ var Countifs = class extends BaseFunction {
 			column: this.column
 		});
 	}
+	_legacyImplicitDerivedCriteria(variants) {
+		return variants.map((variant, index) => {
+			if (index % 2 === 0 || !variant.isArray()) return variant;
+			const array = variant;
+			if (array.usesInvertedIndexCache()) return variant;
+			const startRow = array.getCurrentRow();
+			const startColumn = array.getCurrentColumn();
+			if (startRow < 0 || startColumn < 0) return variant;
+			const rowCount = array.getRowCount();
+			const columnCount = array.getColumnCount();
+			let rowIndex = -1;
+			let columnIndex = -1;
+			if (rowCount === 1) {
+				rowIndex = 0;
+				columnIndex = this.column - startColumn;
+			} else if (columnCount === 1) {
+				rowIndex = this.row - startRow;
+				columnIndex = 0;
+			} else {
+				rowIndex = this.row - startRow;
+				columnIndex = this.column - startColumn;
+			}
+			if (rowIndex < 0 || rowIndex >= rowCount || columnIndex < 0 || columnIndex >= columnCount) return variant;
+			return array.get(rowIndex, columnIndex) || variant;
+		});
+	}
 };
 
 //#endregion
@@ -35642,6 +36689,7 @@ var Linest = class extends BaseFunction {
 		super(..._args);
 		_defineProperty(this, "minParams", 1);
 		_defineProperty(this, "maxParams", 4);
+		_defineProperty(this, "returnsLegacyArrayAsScalar", true);
 	}
 	calculate(knownYs, knownXs, constb, stats) {
 		const { isError, errorObject } = checkKnownsArrayDimensions(knownYs, knownXs);
@@ -36171,7 +37219,11 @@ var Median = class extends BaseFunction {
 				if (isError) return errorObject;
 			} else {
 				if (variant.isError()) return variant;
-				if (variant.isNull() || variant.isBoolean()) continue;
+				if (variant.isNull()) continue;
+				if (variant.isBoolean()) {
+					values.push(variant.getValue() ? 1 : 0);
+					continue;
+				}
 				if (variant.isString()) {
 					const _variant = variant.convertToNumberObjectValue();
 					if (_variant.isError()) return _variant;
@@ -36781,6 +37833,11 @@ var QuartileExc = class extends BaseFunction {
 
 //#endregion
 //#region src/functions/statistical/rank-avg/index.ts
+function isSameRankNumber$1(left, right) {
+	if (left === right || Number.isInteger(left) || Number.isInteger(right)) return left === right;
+	const scale = Math.max(1, Math.abs(left), Math.abs(right));
+	return Math.abs(left - right) <= Number.EPSILON * scale * 2;
+}
 var RankAvg = class extends BaseFunction {
 	constructor(..._args) {
 		super(..._args);
@@ -36812,14 +37869,9 @@ var RankAvg = class extends BaseFunction {
 		return resultArray;
 	}
 	_getResult(numberValue, orderValue, refNumbers) {
-		const refOrderNumbers = refNumbers.sort((a, b) => !orderValue ? b - a : a - b);
-		let index = refOrderNumbers.indexOf(numberValue);
+		const refOrderNumbers = [...refNumbers].sort((a, b) => !orderValue ? b - a : a - b);
 		const results = [];
-		while (index >= 0) {
-			const start = index + 1;
-			results.push(start);
-			index = refOrderNumbers.indexOf(numberValue, start);
-		}
+		for (let index = 0; index < refOrderNumbers.length; index++) if (isSameRankNumber$1(refOrderNumbers[index], numberValue)) results.push(index + 1);
 		if (results.length === 0) return ErrorValueObject.create("#N/A");
 		const result = results.reduce((acc, cur) => acc + cur, 0) / results.length;
 		return NumberValueObject.create(result);
@@ -36828,12 +37880,12 @@ var RankAvg = class extends BaseFunction {
 		let refHasError = false;
 		let refErrorObject = ErrorValueObject.create("#N/A");
 		const refNumbers = [];
-		if (!ref.isReferenceObject()) return {
+		if (!ref.isReferenceObject() && !ref.isArray()) return {
 			refHasError: true,
 			refErrorObject,
 			refNumbers
 		};
-		ref.toArrayValueObject().iterator((refObject) => {
+		(ref.isReferenceObject() ? ref.toArrayValueObject() : ref).iterator((refObject) => {
 			const _refObject = refObject;
 			if (_refObject.isError()) {
 				refHasError = true;
@@ -36855,6 +37907,11 @@ var RankAvg = class extends BaseFunction {
 
 //#endregion
 //#region src/functions/statistical/rank-eq/index.ts
+function isSameRankNumber(left, right) {
+	if (left === right || Number.isInteger(left) || Number.isInteger(right)) return left === right;
+	const scale = Math.max(1, Math.abs(left), Math.abs(right));
+	return Math.abs(left - right) <= Number.EPSILON * scale * 2;
+}
 var RankEq = class extends BaseFunction {
 	constructor(..._args) {
 		super(..._args);
@@ -36880,7 +37937,7 @@ var RankEq = class extends BaseFunction {
 			const numberValue = +numberObject.getValue();
 			const orderValue = +orderObject.getValue();
 			if (Number.isNaN(numberValue) || Number.isNaN(orderValue)) return ErrorValueObject.create("#VALUE!");
-			const result = refNumbers.sort((a, b) => !orderValue ? b - a : a - b).indexOf(numberValue);
+			const result = [...refNumbers].sort((a, b) => !orderValue ? b - a : a - b).findIndex((refNumber) => isSameRankNumber(refNumber, numberValue));
 			if (result === -1) return ErrorValueObject.create("#N/A");
 			return NumberValueObject.create(result + 1);
 		});
@@ -36891,12 +37948,12 @@ var RankEq = class extends BaseFunction {
 		let refHasError = false;
 		let refErrorObject = ErrorValueObject.create("#N/A");
 		const refNumbers = [];
-		if (!ref.isReferenceObject()) return {
+		if (!ref.isReferenceObject() && !ref.isArray()) return {
 			refHasError: true,
 			refErrorObject,
 			refNumbers
 		};
-		ref.toArrayValueObject().iterator((refObject) => {
+		(ref.isReferenceObject() ? ref.toArrayValueObject() : ref).iterator((refObject) => {
 			const _refObject = refObject;
 			if (_refObject.isError()) {
 				refHasError = true;
@@ -37968,11 +39025,10 @@ var Concat = class extends BaseFunction {
 					isError = valueObject;
 					return false;
 				}
-				if (valueObject.isBoolean()) concatenatedString += `${valueObject.getValue()}`.toLocaleUpperCase();
-				else if (valueObject.isString() || valueObject.isNumber()) concatenatedString += valueObject.getValue();
+				concatenatedString += formatValueForFormulaText(valueObject.getValue());
 			});
 			if (isError) return isError;
-		} else if (!textValue.isError() && !textValue.isNull()) concatenatedString += textValue.getValue();
+		} else if (!textValue.isError() && !textValue.isNull()) concatenatedString += formatValueForFormulaText(textValue.getValue());
 		return StringValueObject.create(concatenatedString);
 	}
 };
@@ -37999,20 +39055,27 @@ var Concatenate = class extends BaseFunction {
 			}
 		});
 		let result = null;
+		const referenceSource = textValues.find((textValue) => {
+			if (!textValue.isArray()) return false;
+			const arrayValue = textValue;
+			return arrayValue.getUnitId() !== "" && arrayValue.getSheetId() !== "" && arrayValue.getCurrentRow() >= 0 && arrayValue.getCurrentColumn() >= 0;
+		});
 		for (const textValue of textValues) result = expandArrayValueObject(maxRowLength, maxColumnLength, textValue, ErrorValueObject.create("#N/A")).mapValue((textValueObject, rowIndex, columnIndex) => {
-			var _resultValue, _textValue;
+			var _resultValueObject$ge, _textValueObject$getV;
 			const resultValueObject = result && result.get(rowIndex, columnIndex);
 			if (resultValueObject === null || resultValueObject === void 0 ? void 0 : resultValueObject.isError()) return resultValueObject;
 			if (textValueObject.isError()) return textValueObject;
-			let resultValue = resultValueObject === null || resultValueObject === void 0 ? void 0 : resultValueObject.getValue();
-			let textValue = textValueObject === null || textValueObject === void 0 ? void 0 : textValueObject.getValue();
-			if (resultValueObject === null || resultValueObject === void 0 ? void 0 : resultValueObject.isBoolean()) resultValue = `${resultValue}`.toLocaleUpperCase();
-			if (textValueObject === null || textValueObject === void 0 ? void 0 : textValueObject.isBoolean()) textValue = `${textValue}`.toLocaleUpperCase();
-			const resultValueObjectString = (resultValueObject === null || resultValueObject === void 0 ? void 0 : resultValueObject.isNull()) ? "" : (_resultValue = resultValue) !== null && _resultValue !== void 0 ? _resultValue : "";
-			const textValueObjectString = (textValueObject === null || textValueObject === void 0 ? void 0 : textValueObject.isNull()) ? "" : (_textValue = textValue) !== null && _textValue !== void 0 ? _textValue : "";
+			const resultValueObjectString = (resultValueObject === null || resultValueObject === void 0 ? void 0 : resultValueObject.isNull()) ? "" : formatValueForFormulaText((_resultValueObject$ge = resultValueObject === null || resultValueObject === void 0 ? void 0 : resultValueObject.getValue()) !== null && _resultValueObject$ge !== void 0 ? _resultValueObject$ge : null);
+			const textValueObjectString = (textValueObject === null || textValueObject === void 0 ? void 0 : textValueObject.isNull()) ? "" : formatValueForFormulaText((_textValueObject$getV = textValueObject === null || textValueObject === void 0 ? void 0 : textValueObject.getValue()) !== null && _textValueObject$getV !== void 0 ? _textValueObject$getV : null);
 			return StringValueObject.create(`${resultValueObjectString}${textValueObjectString}`);
 		});
 		if (!result) return ErrorValueObject.create("#VALUE!");
+		if (referenceSource && result.isArray()) {
+			const resultArray = result;
+			resultArray.setUnitId(referenceSource.getUnitId());
+			resultArray.setSheetId(referenceSource.getSheetId());
+			resultArray.setCurrent(referenceSource.getCurrentRow(), referenceSource.getCurrentColumn());
+		}
 		return result;
 	}
 };
@@ -39779,13 +40842,17 @@ var Text = class extends BaseFunction {
 			}
 			if (formatTextValue.isNull()) formatTextValue = StringValueObject.create(" ");
 			const formatTextValueString = `${formatTextValue.getValue()}`;
-			const previewText = getFormatPreview(formatTextValueString, textValueNumber);
+			const previewText = getFormatPreview(normalizeExcelWeekdayFormat(formatTextValueString), textValueNumber);
 			return StringValueObject.create(formatTextValueString === " " ? previewText.trimEnd() : previewText);
 		});
 		if (resultArray.getRowCount() === 1 && resultArray.getColumnCount() === 1) return resultArray.get(0, 0);
 		return resultArray;
 	}
 };
+function normalizeExcelWeekdayFormat(formatText) {
+	if (!formatText.includes("Å")) return formatText;
+	return formatText.replace(/\u00C5{4,}/g, "dddd").replace(/\u00C5{1,3}/g, "ddd");
+}
 
 //#endregion
 //#region src/functions/text/textafter/index.ts
@@ -40160,9 +41227,19 @@ var Textsplit = class extends BaseFunction {
 		const _ignoreEmpty = ignoreEmpty !== null && ignoreEmpty !== void 0 ? ignoreEmpty : NumberValueObject.create(0);
 		const _matchMode = matchMode !== null && matchMode !== void 0 ? matchMode : NumberValueObject.create(0);
 		const _padWith = padWith !== null && padWith !== void 0 ? padWith : StringValueObject.create("#N/A");
-		const { _variant: _colDelimiter, values: colDelimiterValue } = this._getStringValues(colDelimiter);
 		const { _variant, values: rowDelimiterValue } = this._getStringValues(_rowDelimiter, false);
 		_rowDelimiter = _variant;
+		const allowBlankColDelimiter = rowDelimiter != null && !rowDelimiter.isNull() && !_rowDelimiter.isError() && rowDelimiterValue.length > 0;
+		let _colDelimiter;
+		let colDelimiterValue;
+		if (allowBlankColDelimiter && this._isBlankScalarDelimiter(colDelimiter)) {
+			_colDelimiter = colDelimiter;
+			colDelimiterValue = [];
+		} else {
+			const { _variant: colDelimiterVariant, values } = this._getStringValues(colDelimiter);
+			_colDelimiter = colDelimiterVariant;
+			colDelimiterValue = values;
+		}
 		const maxRowLength = Math.max(text.isArray() ? text.getRowCount() : 1, _ignoreEmpty.isArray() ? _ignoreEmpty.getRowCount() : 1, _matchMode.isArray() ? _matchMode.getRowCount() : 1);
 		const maxColumnLength = Math.max(text.isArray() ? text.getColumnCount() : 1, _ignoreEmpty.isArray() ? _ignoreEmpty.getColumnCount() : 1, _matchMode.isArray() ? _matchMode.getColumnCount() : 1);
 		const textArray = expandArrayValueObject(maxRowLength, maxColumnLength, text, ErrorValueObject.create("#N/A"));
@@ -40240,7 +41317,7 @@ var Textsplit = class extends BaseFunction {
 		const resultRows = textValue.split(rowDelimiterRegExp);
 		let resultColsMaxCount = 1;
 		let result = resultRows.map((row) => {
-			let cols = row.split(colDelimiterRegExp);
+			let cols = colDelimiterValue.length > 0 ? row.split(colDelimiterRegExp) : [row];
 			if (ignoreEmptyValue) cols = cols.filter((col) => col !== "");
 			resultColsMaxCount = Math.max(resultColsMaxCount, cols.length);
 			return cols;
@@ -40264,7 +41341,10 @@ var Textsplit = class extends BaseFunction {
 		if (valueObject.isNull()) value = "\\s";
 		if (valueObject.isBoolean()) value = value ? "TRUE" : "FALSE";
 		value += "";
-		return escapeRegExp(value);
+		return regexp.escapeRegExp(value);
+	}
+	_isBlankScalarDelimiter(valueObject) {
+		return !valueObject.isArray() && (valueObject.isNull() || `${valueObject.getValue()}` === "");
 	}
 };
 
@@ -40493,6 +41573,7 @@ const functionText = [
 	[Numbervalue, "NUMBERVALUE"],
 	[Regexextract, "REGEXEXTRACT"],
 	[Regexmatch, "REGEXMATCH"],
+	[Regexmatch, "REGEXTEST"],
 	[Regexreplace, "REGEXREPLACE"],
 	[Proper, "PROPER"],
 	[Replace, "REPLACE"],
@@ -40560,6 +41641,58 @@ var Encodeurl = class extends BaseFunction {
 	}
 };
 
+//#endregion
+//#region src/functions/web/filterxml/index.ts
+var Filterxml = class extends BaseFunction {
+	constructor(..._args) {
+		super(..._args);
+		_defineProperty(this, "minParams", 2);
+		_defineProperty(this, "maxParams", 2);
+	}
+	calculate(xml, xpath) {
+		if (xml.isError()) return xml;
+		if (xpath.isError()) return xpath;
+		const tagName = getDescendantTagName(`${xpath.getValue()}`);
+		if (tagName == null) return ErrorValueObject.create("#VALUE!");
+		const values = extractTagTexts(`${xml.getValue()}`, tagName);
+		if (values.length === 0) return ErrorValueObject.create("#VALUE!");
+		return ArrayValueObject.create({
+			calculateValueList: transformToValueObject(values.map((value) => [value])),
+			rowCount: values.length,
+			columnCount: 1,
+			unitId: "",
+			sheetId: "",
+			row: 0,
+			column: 0
+		});
+	}
+};
+function getDescendantTagName(xpath) {
+	const text = xpath.trim();
+	if (!text.startsWith("//")) return null;
+	const tagName = text.slice(2).replace(/\/text\(\)$/, "").trim();
+	return /^[A-Za-z0-9_.-]+$/.test(tagName) ? tagName : null;
+}
+function extractTagTexts(xml, tagName) {
+	const open = `<${tagName}>`;
+	const close = `</${tagName}>`;
+	const values = [];
+	let offset = 0;
+	while (offset < xml.length) {
+		const openIndex = xml.indexOf(open, offset);
+		if (openIndex < 0) break;
+		const valueStart = openIndex + open.length;
+		const closeIndex = xml.indexOf(close, valueStart);
+		if (closeIndex < 0) break;
+		values.push(decodeXmlEntities(xml.slice(valueStart, closeIndex)));
+		offset = closeIndex + close.length;
+	}
+	return values;
+}
+function decodeXmlEntities(value) {
+	return value.replace(/&lt;/g, "<").replace(/&gt;/g, ">").replace(/&amp;/g, "&").replace(/&quot;/g, "\"").replace(/&apos;/g, "'");
+}
+
 //#endregion
 //#region src/functions/web/function-map.ts
 /**
@@ -40577,7 +41710,7 @@ var Encodeurl = class extends BaseFunction {
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-const functionWeb = [[Encodeurl, "ENCODEURL"]];
+const functionWeb = [[Encodeurl, "ENCODEURL"], [Filterxml, "FILTERXML"]];
 
 //#endregion
 //#region src/functions/index.ts
@@ -40647,7 +41780,7 @@ function getObjectValue(result, isUseStrip = false) {
 //#endregion
 //#region package.json
 var name = "@univerjs/engine-formula";
-var version = "1.0.0-alpha.1";
+var version = "1.0.0-alpha.3";
 
 //#endregion
 //#region src/services/global-computing-status.service.ts
@@ -40938,36 +42071,151 @@ SetOtherFormulaController = __decorate([
 ], SetOtherFormulaController);
 
 //#endregion
-//#region src/services/active-dirty-manager.service.ts
-/**
-* Actively mark as dirty, calculate the dirty area based on the command,
-* and plugins can register the ref range they affect into the formula engine.
-*/
-var ActiveDirtyManagerService = class extends Disposable {
-	constructor(..._args) {
-		super(..._args);
-		_defineProperty(this, "_dirtyConversionMap", /* @__PURE__ */ new Map());
+//#region src/services/formula-calculation-trigger.service.ts
+const LOCAL_ONLY = { onlyLocal: true };
+const CALCULATION_DEBOUNCE_TIME = 100;
+let FormulaCalculationTriggerService = class FormulaCalculationTriggerService extends Disposable {
+	constructor(_commandService, _activeDirtyManagerService) {
+		super();
+		this._commandService = _commandService;
+		this._activeDirtyManagerService = _activeDirtyManagerService;
+		_defineProperty(this, "_waitingCommandQueue", []);
+		_defineProperty(this, "_executingDirtyData", createEmptyDirtyData());
+		_defineProperty(this, "_timer", void 0);
+		_defineProperty(this, "_executionInProgress", false);
+		_defineProperty(this, "_restartCalculation", false);
+		this._initialize();
 	}
 	dispose() {
-		this._dirtyConversionMap.clear();
+		clearTimeout(this._timer);
+		this._waitingCommandQueue = [];
+		this._executingDirtyData = createEmptyDirtyData();
+		super.dispose();
 	}
-	remove(commandId) {
-		this._dirtyConversionMap.delete(commandId);
+	_initialize() {
+		this.disposeWithMe(this._commandService.onCommandExecuted((command, options) => {
+			var _conversion$shouldTri;
+			if (command.id === SetFormulaCalculationStartMutation.id) {
+				this._executionInProgress = true;
+				return;
+			}
+			if (command.id === SetFormulaCalculationNotificationMutation.id) {
+				this._handleCalculationNotification(command.params);
+				return;
+			}
+			const conversion = this._activeDirtyManagerService.get(command.id);
+			if (!conversion) return;
+			if (((_conversion$shouldTri = conversion.shouldTrigger) === null || _conversion$shouldTri === void 0 ? void 0 : _conversion$shouldTri.call(conversion, command, options)) === false) return;
+			this._waitingCommandQueue.push(command);
+			clearTimeout(this._timer);
+			this._timer = setTimeout(() => this._flush(), CALCULATION_DEBOUNCE_TIME);
+		}));
 	}
-	get(commandId) {
-		return this._dirtyConversionMap.get(commandId);
+	_flush() {
+		const dirtyData = this._generateDirty(this._waitingCommandQueue);
+		this._waitingCommandQueue = [];
+		this._timer = void 0;
+		if (!hasDirtyData(dirtyData)) return;
+		this._executingDirtyData = mergeDirtyData(this._executingDirtyData, dirtyData);
+		if (this._executionInProgress) {
+			this._restartCalculation = true;
+			this._commandService.executeCommand(SetFormulaCalculationStopMutation.id, {}, LOCAL_ONLY);
+			return;
+		}
+		this._startCalculation();
 	}
-	has(commandId) {
-		return this._dirtyConversionMap.has(commandId);
+	_startCalculation() {
+		this._executionInProgress = true;
+		this._commandService.executeCommand(SetFormulaCalculationStartMutation.id, { ...this._executingDirtyData }, LOCAL_ONLY);
 	}
-	register(commandId, dirtyConversion) {
-		this._dirtyConversionMap.set(commandId, dirtyConversion);
+	_handleCalculationNotification(params) {
+		if (params.stageInfo != null) {
+			this._executionInProgress = true;
+			return;
+		}
+		const state = params.functionsExecutedState;
+		if (state == null) return;
+		this._executionInProgress = false;
+		if (state === 1 && this._restartCalculation) {
+			this._restartCalculation = false;
+			this._startCalculation();
+			return;
+		}
+		this._restartCalculation = false;
+		this._executingDirtyData = createEmptyDirtyData();
 	}
-	getDirtyConversionMap() {
-		return this._dirtyConversionMap;
+	_generateDirty(commands) {
+		return commands.reduce((result, command) => {
+			const conversion = this._activeDirtyManagerService.get(command.id);
+			return conversion ? mergeDirtyData(result, conversion.getDirtyData(command)) : result;
+		}, createEmptyDirtyData());
 	}
 };
-const IActiveDirtyManagerService = createIdentifier("univer.formula.active-dirty-manager.service");
+FormulaCalculationTriggerService = __decorate([__decorateParam(0, ICommandService), __decorateParam(1, IActiveDirtyManagerService)], FormulaCalculationTriggerService);
+function createEmptyDirtyData() {
+	return {
+		forceCalculation: false,
+		dirtyRanges: [],
+		dirtyNameMap: {},
+		dirtyDefinedNameMap: {},
+		dirtySuperTableMap: {},
+		dirtyUnitFeatureMap: {},
+		dirtyUnitOtherFormulaMap: {},
+		clearDependencyTreeCache: {}
+	};
+}
+function mergeDirtyData(left, right) {
+	var _right$dirtyRanges, _left$dirtySuperTable;
+	const dirtyRanges = [...left.dirtyRanges];
+	mergeDirtyRanges(dirtyRanges, (_right$dirtyRanges = right.dirtyRanges) !== null && _right$dirtyRanges !== void 0 ? _right$dirtyRanges : []);
+	return {
+		dirtyRanges,
+		dirtyNameMap: mergeDirtyUnitStringMap(left.dirtyNameMap, right.dirtyNameMap),
+		dirtyDefinedNameMap: mergeDirtyUnitStringMap(left.dirtyDefinedNameMap, right.dirtyDefinedNameMap),
+		dirtySuperTableMap: mergeDirtyUnitStringMap((_left$dirtySuperTable = left.dirtySuperTableMap) !== null && _left$dirtySuperTable !== void 0 ? _left$dirtySuperTable : {}, right.dirtySuperTableMap),
+		dirtyUnitFeatureMap: mergeDirtyUnitNestedMap(left.dirtyUnitFeatureMap, right.dirtyUnitFeatureMap),
+		dirtyUnitOtherFormulaMap: mergeDirtyUnitNestedMap(left.dirtyUnitOtherFormulaMap, right.dirtyUnitOtherFormulaMap),
+		clearDependencyTreeCache: mergeDirtyUnitStringMap(left.clearDependencyTreeCache, right.clearDependencyTreeCache),
+		forceCalculation: left.forceCalculation || Boolean(right.forceCalculation)
+	};
+}
+function mergeDirtyRanges(target, source) {
+	source.forEach((range) => {
+		if (!target.some((item) => item.unitId === range.unitId && item.sheetId === range.sheetId && item.range.startRow === range.range.startRow && item.range.startColumn === range.range.startColumn && item.range.endRow === range.range.endRow && item.range.endColumn === range.range.endColumn)) target.push(range);
+	});
+}
+function mergeDirtyUnitStringMap(left, right) {
+	const result = { ...left };
+	Object.entries(right !== null && right !== void 0 ? right : {}).forEach(([unitId, values]) => {
+		result[unitId] = {
+			...result[unitId],
+			...values
+		};
+	});
+	return result;
+}
+function mergeDirtyUnitNestedMap(left, right) {
+	const result = { ...left };
+	Object.entries(right !== null && right !== void 0 ? right : {}).forEach(([unitId, sheets]) => {
+		const unitResult = { ...result[unitId] };
+		Object.entries(sheets !== null && sheets !== void 0 ? sheets : {}).forEach(([sheetId, values]) => {
+			unitResult[sheetId] = {
+				...unitResult[sheetId],
+				...values
+			};
+		});
+		result[unitId] = unitResult;
+	});
+	return result;
+}
+function hasDirtyData(dirtyData) {
+	return dirtyData.forceCalculation || dirtyData.dirtyRanges.length > 0 || hasNestedValue(dirtyData.dirtyNameMap) || hasNestedValue(dirtyData.dirtyDefinedNameMap) || hasNestedValue(dirtyData.dirtySuperTableMap) || hasNestedValue(dirtyData.dirtyUnitFeatureMap) || hasNestedValue(dirtyData.dirtyUnitOtherFormulaMap) || hasNestedValue(dirtyData.clearDependencyTreeCache);
+}
+function hasNestedValue(value) {
+	if (value == null) return false;
+	if (typeof value !== "object") return true;
+	return Object.values(value).some(hasNestedValue);
+}
 
 //#endregion
 //#region src/services/formula-common.ts
@@ -41169,7 +42417,7 @@ let UniverFormulaEnginePlugin = class UniverFormulaEnginePlugin extends Plugin {
 	}
 	onReady() {
 		var _this$_config;
-		touchDependencies(this._injector, [[FormulaController]]);
+		touchDependencies(this._injector, [[FormulaController], [SuperTableActiveDirtyController]]);
 		if (!((_this$_config = this._config) === null || _this$_config === void 0 ? void 0 : _this$_config.notExecuteFormula)) touchDependencies(this._injector, [
 			[SetOtherFormulaController],
 			[SetFeatureCalculationController],
@@ -41187,6 +42435,7 @@ let UniverFormulaEnginePlugin = class UniverFormulaEnginePlugin extends Plugin {
 			[IFunctionService, { useClass: FunctionService }],
 			[IDefinedNamesService, { useClass: DefinedNamesService }],
 			[IActiveDirtyManagerService, { useClass: ActiveDirtyManagerService }],
+			[FormulaCalculationTriggerService],
 			[RegisterOtherFormulaService],
 			[IHyperlinkEngineFormulaService, { useClass: HyperlinkEngineFormulaService }],
 			[ISheetRowFilteredService, { useClass: SheetRowFilteredService }],
@@ -41194,6 +42443,7 @@ let UniverFormulaEnginePlugin = class UniverFormulaEnginePlugin extends Plugin {
 			[GlobalComputingStatusService],
 			[FormulaDataModel],
 			[FormulaController],
+			[SuperTableActiveDirtyController],
 			[ComputingStatusReporterController]
 		];
 		if (shouldPerformComputing) dependencies.push([IOtherFormulaManagerService, { useClass: OtherFormulaManagerService }], [IFormulaRuntimeService, { useClass: FormulaRuntimeService }], [IFormulaCurrentConfigService, { useClass: FormulaCurrentConfigService }], [IFeatureCalculationManagerService, { useClass: FeatureCalculationManagerService }], [CalculateController], [SetOtherFormulaController], [SetDependencyController], [SetFeatureCalculationController], [Interpreter], [AstTreeBuilder], [Lexer], [AstRootNodeFactory], [FunctionNodeFactory], [LambdaNodeFactory], [LambdaParameterNodeFactory], [OperatorNodeFactory], [PrefixNodeFactory], [ReferenceNodeFactory], [SuffixNodeFactory], [UnionNodeFactory], [ValueNodeFactory]);
@@ -41215,4 +42465,4 @@ _defineProperty(UniverFormulaEnginePlugin, "version", version);
 UniverFormulaEnginePlugin = __decorate([__decorateParam(1, Inject(Injector)), __decorateParam(2, IConfigService)], UniverFormulaEnginePlugin);
 
 //#endregion
-export { ALL_IMPLEMENTED_FUNCTIONS, ALL_IMPLEMENTED_FUNCTIONS_SET, ActiveDirtyManagerService, ArrayValueObject, AstRootNodeFactory, AstTreeBuilder, AsyncArrayObject, AsyncCustomFunction, AsyncObject, BaseFunction, BaseReferenceObject, BaseValueObject, BooleanValue, BooleanValueObject, CELL_INVERTED_INDEX_CACHE, CalculateController, CalculateFormulaService, CustomFunction, DEFAULT_CYCLE_REFERENCE_COUNT, DEFAULT_INTERVAL_COUNT, DEFAULT_TOKEN_LAMBDA_FUNCTION_NAME, DEFAULT_TOKEN_LET_FUNCTION_NAME, DEFAULT_TOKEN_TYPE_LAMBDA_PARAMETER, DEFAULT_TOKEN_TYPE_PARAMETER, DEFAULT_TOKEN_TYPE_ROOT, DefinedNamesService, DependencyManagerBaseService, DependencyManagerService, ENGINE_FORMULA_CYCLE_REFERENCE_COUNT, ENGINE_FORMULA_PLUGIN_CONFIG_KEY, ENGINE_FORMULA_RETURN_DEPENDENCY_TREE, ERROR_TYPE_SET, ErrorType, ErrorValueObject, FORMULA_REF_TO_ARRAY_CACHE, FUNCTION_NAMES_ARRAY, FUNCTION_NAMES_COMPATIBILITY, FUNCTION_NAMES_CUBE, FUNCTION_NAMES_DATABASE, FUNCTION_NAMES_DATE, FUNCTION_NAMES_ENGINEERING, FUNCTION_NAMES_FINANCIAL, FUNCTION_NAMES_INFORMATION, FUNCTION_NAMES_LOGICAL, FUNCTION_NAMES_LOOKUP, FUNCTION_NAMES_MATH, FUNCTION_NAMES_STATISTICAL, FUNCTION_NAMES_TEXT, FUNCTION_NAMES_UNIVER, FUNCTION_NAMES_WEB, FeatureCalculationManagerService, FormulaCurrentConfigService, FormulaDataModel, FormulaDependencyGenerator, FormulaDependencyTree, FormulaDependencyTreeModel, FormulaDependencyTreeType, FormulaDependencyTreeVirtual, FormulaExecuteStageType, FormulaExecutedStateType, FormulaResultStatus, FormulaRuntimeService, FunctionNodeFactory, FunctionService, FunctionType, GlobalComputingStatusService, HyperlinkEngineFormulaService, IActiveDirtyManagerService, ICalculateFormulaService, IDefinedNamesService, IDependencyManagerService, IFeatureCalculationManagerService, IFormulaCurrentConfigService, IFormulaDependencyGenerator, IFormulaRuntimeService, IFunctionService, IHyperlinkEngineFormulaService, IOtherFormulaManagerService, ISheetRowFilteredService, ISuperTableService, Interpreter, LambdaNodeFactory, LambdaParameterNodeFactory, LambdaValueObjectObject, Lexer, LexerNode, LexerTreeBuilder, NEW_EXCEL_FUNCTIONS, NullValueObject, NumberValueObject, OPERATOR_TOKEN_SET, OperatorNodeFactory, OtherFormulaBizType, OtherFormulaManagerService, OtherFormulaMarkDirty, PrefixNodeFactory, RangeReferenceObject, ReferenceNodeFactory, RegisterFunctionMutation, RegisterOtherFormulaService, RemoveDefinedNameMutation, RemoveFeatureCalculationMutation, RemoveOtherFormulaMutation, RemoveSuperTableMutation, SUFFIX_TOKEN_SET, SetArrayFormulaDataMutation, SetCellFormulaDependencyCalculationMutation, SetCellFormulaDependencyCalculationResultMutation, SetDefinedNameMutation, SetDefinedNameMutationFactory, SetFeatureCalculationMutation, SetFormulaCalculationNotificationMutation, SetFormulaCalculationResultMutation, SetFormulaCalculationStartMutation, SetFormulaCalculationStopMutation, SetFormulaDataMutation, SetFormulaDependencyCalculationMutation, SetFormulaDependencyCalculationResultMutation, SetFormulaStringBatchCalculationMutation, SetFormulaStringBatchCalculationResultMutation, SetImageFormulaDataMutation, SetOtherFormulaMutation, SetQueryFormulaDependencyAllMutation, SetQueryFormulaDependencyAllResultMutation, SetQueryFormulaDependencyMutation, SetQueryFormulaDependencyResultMutation, SetSuperTableMutation, SetSuperTableOptionMutation, SetTriggerFormulaCalculationStartMutation, SheetRowFilteredService, StringValueObject, SuffixNodeFactory, SuperTableService, UnionNodeFactory, UniverFormulaEnginePlugin, ValueNodeFactory, ValueObjectFactory, compareToken, convertUnitDataToRuntime, deserializeRangeForR1C1, deserializeRangeWithSheet, deserializeRangeWithSheetWithCache, excelDateSerial, extractFormulaError, functionArray, functionCompatibility, functionCube, functionDatabase, functionDate, functionEngineering, functionFinancial, functionInformation, functionLogical, functionLookup, functionMath, functionMeta, functionStatistical, functionText, functionUniver, functionWeb, generateAstNode, generateExecuteAstNodeData, generateRandomDependencyTreeId, generateStringWithSequence, getAbsoluteRefTypeWitString, getAbsoluteRefTypeWithSingleString, getObjectValue, getRangeWithRefsString, handleNumfmtInCell, handleRefStringInfo, includeFormulaLexerToken, initSheetFormulaData, isFormulaLexerToken, isInDirtyRange, isReferenceString, isReferenceStringWithEffectiveColumn, isReferenceStrings, matchRefDrawToken, matchToken, needsQuoting, normalizeSheetName, operatorToken, prefixToken, quoteSheetName, sequenceNodeType, serializeRange, serializeRangeToRefString, serializeRangeWithSheet, serializeRangeWithSpreadsheet, singleReferenceToGrid, splitTableStructuredRef, strip, stripErrorMargin, unquoteSheetName };
+export { ALL_IMPLEMENTED_FUNCTIONS, ALL_IMPLEMENTED_FUNCTIONS_SET, ActiveDirtyManagerService, ArrayValueObject, AstRootNodeFactory, AstTreeBuilder, AsyncArrayObject, AsyncCustomFunction, AsyncObject, BaseFunction, BaseReferenceObject, BaseValueObject, BooleanValue, BooleanValueObject, CELL_INVERTED_INDEX_CACHE, CalculateController, CalculateFormulaService, CustomFunction, DEFAULT_CYCLE_REFERENCE_COUNT, DEFAULT_INTERVAL_COUNT, DEFAULT_TOKEN_LAMBDA_FUNCTION_NAME, DEFAULT_TOKEN_LET_FUNCTION_NAME, DEFAULT_TOKEN_TYPE_LAMBDA_PARAMETER, DEFAULT_TOKEN_TYPE_PARAMETER, DEFAULT_TOKEN_TYPE_ROOT, DefinedNamesService, DependencyManagerBaseService, DependencyManagerService, ENGINE_FORMULA_CYCLE_REFERENCE_COUNT, ENGINE_FORMULA_PLUGIN_CONFIG_KEY, ENGINE_FORMULA_RETURN_DEPENDENCY_TREE, ERROR_TYPE_SET, ErrorType, ErrorValueObject, FORMULA_REF_TO_ARRAY_CACHE, FUNCTION_NAMES_ARRAY, FUNCTION_NAMES_COMPATIBILITY, FUNCTION_NAMES_CUBE, FUNCTION_NAMES_DATABASE, FUNCTION_NAMES_DATE, FUNCTION_NAMES_ENGINEERING, FUNCTION_NAMES_FINANCIAL, FUNCTION_NAMES_INFORMATION, FUNCTION_NAMES_LOGICAL, FUNCTION_NAMES_LOOKUP, FUNCTION_NAMES_MATH, FUNCTION_NAMES_STATISTICAL, FUNCTION_NAMES_TEXT, FUNCTION_NAMES_UNIVER, FUNCTION_NAMES_WEB, FeatureCalculationManagerService, FormulaCalculationTriggerService, FormulaCurrentConfigService, FormulaDataModel, FormulaDependencyGenerator, FormulaDependencyTree, FormulaDependencyTreeModel, FormulaDependencyTreeType, FormulaDependencyTreeVirtual, FormulaExecuteStageType, FormulaExecutedStateType, FormulaResultStatus, FormulaRuntimeService, FunctionNodeFactory, FunctionService, FunctionType, GlobalComputingStatusService, HyperlinkEngineFormulaService, IActiveDirtyManagerService, ICalculateFormulaService, IDefinedNamesService, IDependencyManagerService, IFeatureCalculationManagerService, IFormulaCurrentConfigService, IFormulaDependencyGenerator, IFormulaRuntimeService, IFunctionService, IHyperlinkEngineFormulaService, IOtherFormulaManagerService, ISheetRowFilteredService, ISuperTableService, Interpreter, LambdaNodeFactory, LambdaParameterNodeFactory, LambdaValueObjectObject, Lexer, LexerNode, LexerTreeBuilder, NEW_EXCEL_FUNCTIONS, NullValueObject, NumberValueObject, OPERATOR_TOKEN_SET, OperatorNodeFactory, OtherFormulaBizType, OtherFormulaManagerService, OtherFormulaMarkDirty, PrefixNodeFactory, RangeReferenceObject, ReferenceNodeFactory, RegisterFunctionMutation, RegisterOtherFormulaService, RemoveDefinedNameMutation, RemoveFeatureCalculationMutation, RemoveOtherFormulaMutation, RemoveSuperTableMutation, SUFFIX_TOKEN_SET, SetArrayFormulaDataMutation, SetCellFormulaDependencyCalculationMutation, SetCellFormulaDependencyCalculationResultMutation, SetDefinedNameMutation, SetDefinedNameMutationFactory, SetFeatureCalculationMutation, SetFormulaCalculationNotificationMutation, SetFormulaCalculationResultMutation, SetFormulaCalculationStartMutation, SetFormulaCalculationStopMutation, SetFormulaDataMutation, SetFormulaDependencyCalculationMutation, SetFormulaDependencyCalculationResultMutation, SetFormulaStringBatchCalculationMutation, SetFormulaStringBatchCalculationResultMutation, SetImageFormulaDataMutation, SetOtherFormulaMutation, SetQueryFormulaDependencyAllMutation, SetQueryFormulaDependencyAllResultMutation, SetQueryFormulaDependencyMutation, SetQueryFormulaDependencyResultMutation, SetSuperTableMutation, SetSuperTableOptionMutation, SetTriggerFormulaCalculationStartMutation, SheetRowFilteredService, StringValueObject, SuffixNodeFactory, SuperTableActiveDirtyController, SuperTableService, UnionNodeFactory, UniverFormulaEnginePlugin, ValueNodeFactory, ValueObjectFactory, compareToken, convertUnitDataToRuntime, deserializeRangeForR1C1, deserializeRangeWithSheet, deserializeRangeWithSheetWithCache, excelDateSerial, extractFormulaError, functionArray, functionCompatibility, functionCube, functionDatabase, functionDate, functionEngineering, functionFinancial, functionInformation, functionLogical, functionLookup, functionMath, functionMeta, functionStatistical, functionText, functionUniver, functionWeb, generateAstNode, generateExecuteAstNodeData, generateRandomDependencyTreeId, generateStringWithSequence, getAbsoluteRefTypeWitString, getAbsoluteRefTypeWithSingleString, getObjectValue, getRangeWithRefsString, handleNumfmtInCell, handleRefStringInfo, includeFormulaLexerToken, initSheetFormulaData, isFormulaLexerToken, isInDirtyRange, isReferenceString, isReferenceStringWithEffectiveColumn, isReferenceStrings, matchRefDrawToken, matchToken, needsQuoting, normalizeSheetName, operatorToken, prefixToken, quoteSheetName, sequenceNodeType, serializeRange, serializeRangeToRefString, serializeRangeWithSheet, serializeRangeWithSpreadsheet, singleReferenceToGrid, splitTableStructuredRef, strip, stripErrorMargin, unquoteSheetName };