@univerjs/engine-formula 0.24.0 → 0.25.0

package/lib/index.js

@@ -1,4 +1,4 @@
-import { AbsoluteRefType, AsyncLock, BooleanNumber, BuildTextUtils, CellValueType, CommandType, DataStreamTreeTokenType, Disposable, DisposableCollection, ICommandService, IConfigService, IUniverInstanceService, Inject, Injector, LRUMap, LifecycleService, LocaleService, LocaleType, MAX_COLUMN_COUNT, MAX_ROW_COUNT, ObjectMatrix, Optional, Plugin, RANGE_TYPE, RTree, Rectangle, RichTextBuilder, Tools, UniverInstanceType, cellToRange, columnLabelToNumber, createIdentifier, generateRandomId, getNumfmtParseValueFilter, hashAlgorithm, isFormulaId, isFormulaString, isRealNum, isTextFormat, isValidRange, merge, moveRangeByOffset, numfmt, requestImmediateMacroTask, sortRules, toDisposable, touchDependencies } from "@univerjs/core";
+import { AbsoluteRefType, AsyncLock, BooleanNumber, BuildTextUtils, CellValueType, CommandType, DataStreamTreeTokenType, Disposable, DisposableCollection, ICommandService, IConfigService, IUniverInstanceService, Inject, Injector, LRUMap, LifecycleService, LocaleService, LocaleType, MAX_COLUMN_COUNT, MAX_ROW_COUNT, ObjectMatrix, Optional, Plugin, RANGE_TYPE, RTree, Rectangle, RichTextBuilder, Tools, UniverInstanceType, cellToRange, columnLabelToNumber, createIdentifier, escapeRegExp, generateRandomId, getNumfmtParseValueFilter, hashAlgorithm, isFormulaId, isFormulaString, isNullCell, isRealNum, isTextFormat, isValidRange, merge, moveRangeByOffset, numfmt, requestImmediateMacroTask, sortRules, toDisposable, touchDependencies } from "@univerjs/core";
 import IntervalTree from "@flatten-js/interval-tree";
 import { BehaviorSubject, Observable, Subject, bufferWhen, combineLatest, distinctUntilChanged, filter, map, shareReplay, skip } from "rxjs";
 import Decimal from "decimal.js";
@@ -12,7 +12,7 @@ let BooleanValue = /* @__PURE__ */ function(BooleanValue) {
 }({});
 
 //#endregion
-//#region \0@oxc-project+runtime@0.129.0/helpers/typeof.js
+//#region \0@oxc-project+runtime@0.133.0/helpers/esm/typeof.js
 function _typeof(o) {
 	"@babel/helpers - typeof";
 	return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o) {
@@ -23,7 +23,7 @@ function _typeof(o) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.129.0/helpers/toPrimitive.js
+//#region \0@oxc-project+runtime@0.133.0/helpers/esm/toPrimitive.js
 function toPrimitive(t, r) {
 	if ("object" != _typeof(t) || !t) return t;
 	var e = t[Symbol.toPrimitive];
@@ -36,14 +36,14 @@ function toPrimitive(t, r) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.129.0/helpers/toPropertyKey.js
+//#region \0@oxc-project+runtime@0.133.0/helpers/esm/toPropertyKey.js
 function toPropertyKey(t) {
 	var i = toPrimitive(t, "string");
 	return "symbol" == _typeof(i) ? i : i + "";
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.129.0/helpers/defineProperty.js
+//#region \0@oxc-project+runtime@0.133.0/helpers/esm/defineProperty.js
 function _defineProperty(e, r, t) {
 	return (r = toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
 		value: t,
@@ -845,7 +845,7 @@ function getWeekDayByDateSerialNumber(dateSerialNumber) {
 	let date = excelSerialToDate(dateSerialNumber);
 	const leapDayDateTime = Date.UTC(1900, 1, 28);
 	const dateTime = Date.UTC(date.getUTCFullYear(), date.getUTCMonth(), date.getUTCDate());
-	if (!isDate19000229 && dateTime <= leapDayDateTime) date = new Date(dateTime - perDayMilliseconds);
+	if (!isDate19000229 && dateTime <= leapDayDateTime) date = /* @__PURE__ */ new Date(dateTime - perDayMilliseconds);
 	return date.getUTCDay();
 }
 function getTwoDateDaysByBasis(startDateSerialNumber, endDateSerialNumber, basis) {
@@ -1847,7 +1847,7 @@ function splitTableStructuredRef(ref) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.129.0/helpers/decorateParam.js
+//#region \0@oxc-project+runtime@0.133.0/helpers/esm/decorateParam.js
 function __decorateParam(paramIndex, decorator) {
 	return function(target, key) {
 		decorator(target, key, paramIndex);
@@ -1855,7 +1855,7 @@ function __decorateParam(paramIndex, decorator) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.129.0/helpers/decorate.js
+//#region \0@oxc-project+runtime@0.133.0/helpers/esm/decorate.js
 function __decorate(decorators, target, key, desc) {
 	var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
 	if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -5363,6 +5363,7 @@ let FormulaCurrentConfigService = class FormulaCurrentConfigService extends Disp
 		_defineProperty(this, "_dirtyRanges", []);
 		_defineProperty(this, "_dirtyNameMap", {});
 		_defineProperty(this, "_dirtyDefinedNameMap", {});
+		_defineProperty(this, "_dirtySuperTableMap", {});
 		_defineProperty(this, "_dirtyUnitFeatureMap", {});
 		_defineProperty(this, "_dirtyUnitOtherFormulaMap", {});
 		_defineProperty(this, "_excludedCell", void 0);
@@ -5382,6 +5383,7 @@ let FormulaCurrentConfigService = class FormulaCurrentConfigService extends Disp
 		this._dirtyRanges = [];
 		this._dirtyNameMap = {};
 		this._dirtyDefinedNameMap = {};
+		this._dirtySuperTableMap = {};
 		this._dirtyUnitFeatureMap = {};
 		this._dirtyUnitOtherFormulaMap = {};
 		this._excludedCell = {};
@@ -5432,6 +5434,9 @@ let FormulaCurrentConfigService = class FormulaCurrentConfigService extends Disp
 	getDirtyDefinedNameMap() {
 		return this._dirtyDefinedNameMap;
 	}
+	getDirtySuperTableMap() {
+		return this._dirtySuperTableMap;
+	}
 	getDirtyUnitFeatureMap() {
 		return this._dirtyUnitFeatureMap;
 	}
@@ -5497,6 +5502,7 @@ let FormulaCurrentConfigService = class FormulaCurrentConfigService extends Disp
 		this._dirtyRanges = config.dirtyRanges;
 		this._dirtyNameMap = config.dirtyNameMap;
 		this._dirtyDefinedNameMap = config.dirtyDefinedNameMap;
+		this._dirtySuperTableMap = config.dirtySuperTableMap || {};
 		this._dirtyUnitFeatureMap = config.dirtyUnitFeatureMap;
 		this._dirtyUnitOtherFormulaMap = config.dirtyUnitOtherFormulaMap;
 		this._excludedCell = config.excludedCell;
@@ -5518,6 +5524,7 @@ let FormulaCurrentConfigService = class FormulaCurrentConfigService extends Disp
 			dirtyRanges: this._dirtyRanges,
 			dirtyNameMap: this._dirtyNameMap,
 			dirtyDefinedNameMap: this._dirtyDefinedNameMap,
+			dirtySuperTableMap: this._dirtySuperTableMap,
 			dirtyUnitFeatureMap: this._dirtyUnitFeatureMap,
 			dirtyUnitOtherFormulaMap: this._dirtyUnitOtherFormulaMap,
 			clearDependencyTreeCache: this._clearDependencyTreeCache
@@ -5632,22 +5639,6 @@ Lexer = __decorate([
 	__decorateParam(2, IFormulaCurrentConfigService)
 ], Lexer);
 
-//#endregion
-//#region src/basics/is-null-cell.ts
-/**
-* Examine if a cell is empty (null) in the formula-related modules. This is not
-* interchangable with {@link isNullCell} from the core package, because for
-* formulas, "custom" field is meaningless.
-*/
-function isNullCellForFormula(cell) {
-	if (cell == null) return true;
-	const { v, f, si, p } = cell;
-	if (!(v == null || typeof v === "string" && v.length === 0)) return false;
-	if (f != null && f.length > 0 || si != null && si.length > 0) return false;
-	if (p != null) return false;
-	return true;
-}
-
 //#endregion
 //#region src/engine/utils/cell.ts
 function getCellValue(cell) {
@@ -5699,7 +5690,7 @@ function isWildcard(str) {
 	return str.indexOf("*") > -1 || str.indexOf("?") > -1;
 }
 function isMatchWildcard(currentValue, value) {
-	const pattern = escapeRegExp(value).replace(/~?[*?]/g, (match) => {
+	const pattern = escapeRegExpForWildcard(value).replace(/~?[*?]/g, (match) => {
 		if (match.startsWith("~")) return `\\${match.substring(1)}`;
 		if (match === "*") return ".*";
 		if (match === "?") return ".";
@@ -5734,7 +5725,7 @@ function compareWithWildcard(currentValue, value, operator) {
 	}
 	return result;
 }
-function escapeRegExp(str) {
+function escapeRegExpForWildcard(str) {
 	return str.replace(/[.+^${}()|[\]\\]/g, "\\$&");
 }
 function getMatchModeValue(matchModeValue) {
@@ -5783,11 +5774,20 @@ const localeCurrencySymbolMap = new Map([
 	[LocaleType.VI_VN, "₫"],
 	[LocaleType.ZH_CN, "¥"],
 	[LocaleType.ZH_TW, "NT$"],
+	[LocaleType.ZH_HK, "HK$"],
 	[LocaleType.FR_FR, "€"],
 	[LocaleType.FA_IR, "﷼"],
 	[LocaleType.KO_KR, "₩"],
 	[LocaleType.ES_ES, "€"],
-	[LocaleType.CA_ES, "€"]
+	[LocaleType.CA_ES, "€"],
+	[LocaleType.SK_SK, "€"],
+	[LocaleType.JA_JP, "¥"],
+	[LocaleType.PT_BR, "R$"],
+	[LocaleType.DE_DE, "€"],
+	[LocaleType.IT_IT, "€"],
+	[LocaleType.ID_ID, "Rp"],
+	[LocaleType.PL_PL, "zł"],
+	[LocaleType.AR_SA, "﷼"]
 ]);
 function getCurrencySymbol(locale) {
 	return localeCurrencySymbolMap.get(locale) || "$";
@@ -8215,7 +8215,7 @@ var BaseReferenceObject = class extends ObjectClassType {
 			if (r < 0 || c < 0) return callback(ErrorValueObject.create("#REF!"), r, c);
 			const cell = this.getCellData(r, c);
 			let result = false;
-			if (isNullCellForFormula(cell)) {
+			if (isNullCell(cell)) {
 				result = callback(null, r, c);
 				continue;
 			}
@@ -9662,10 +9662,10 @@ let FormulaRuntimeService = class FormulaRuntimeService extends Disposable {
 			const currentCell = unitData === null || unitData === void 0 || (_unitData$formulaUnit = unitData[formulaUnitId]) === null || _unitData$formulaUnit === void 0 || (_unitData$formulaUnit = _unitData$formulaUnit[formulaSheetId]) === null || _unitData$formulaUnit === void 0 || (_unitData$formulaUnit = _unitData$formulaUnit.cellData) === null || _unitData$formulaUnit === void 0 ? void 0 : _unitData$formulaUnit.getValue(r, c);
 			const featureCell = this._getRuntimeFeatureCellValue(r, c, formulaSheetId, formulaUnitId);
 			const isPreviousCellOfCurrentArrayFormula = this._arrayCellHasData(arrayDataCell) && this._isInArrayFormulaRange(previousArrayFormulaRange, r, c) && (currentCell == null || this._isSameCellValue(currentCell, arrayDataCell));
-			const hasRuntimeCell = !isNullCellForFormula(cell);
+			const hasRuntimeCell = !isNullCell(cell);
 			const isInOtherArrayFormulaRange = this._isInOtherArrayFormulaRange(formulaUnitId, formulaSheetId, formulaRow, formulaColumn, r, c);
-			const currentCellBlocks = !isNullCellForFormula(currentCell) && !isPreviousCellOfCurrentArrayFormula;
-			const featureCellBlocks = !isNullCellForFormula(featureCell);
+			const currentCellBlocks = !isNullCell(currentCell) && !isPreviousCellOfCurrentArrayFormula;
+			const featureCellBlocks = !isNullCell(featureCell);
 			if (hasRuntimeCell || isInOtherArrayFormulaRange || currentCellBlocks || featureCellBlocks) return true;
 		}
 		return false;
@@ -9938,9 +9938,11 @@ const COLUMN_LIKE_FUNCTION_NAMES = new Set(ALL_GROUPS.flatMap((g) => Object.valu
 //#region src/engine/utils/generate-ast-node.ts
 const FORMULA_CACHE_LRU_COUNT = 5e3;
 const FORMULA_AST_CACHE = new FormulaAstLRU(FORMULA_CACHE_LRU_COUNT);
+const DIRTY_DEFINED_NAME_SET_CACHE = /* @__PURE__ */ new WeakMap();
+const DIRTY_SUPER_TABLE_PATTERN_CACHE = /* @__PURE__ */ new WeakMap();
 function generateAstNode(unitId, formulaString, lexer, astTreeBuilder, currentConfigService) {
 	let astNode = FORMULA_AST_CACHE.get(`${unitId}${formulaString}`);
-	const noCache = checkIsChangedByDefinedName(unitId, formulaString, currentConfigService);
+	const noCache = checkIsChangedByDefinedName(unitId, formulaString, currentConfigService) || checkIsChangedBySuperTable(unitId, formulaString, currentConfigService);
 	if (!noCache && astNode && !isDirtyDefinedForNode(astNode, currentConfigService)) return astNode;
 	const lexerNode = lexer.treeBuilder(formulaString);
 	if (ERROR_TYPE_SET.has(lexerNode)) return ErrorNode.create(lexerNode);
@@ -9955,14 +9957,37 @@ function generateAstNode(unitId, formulaString, lexer, astTreeBuilder, currentCo
 function checkIsChangedByDefinedName(unitId, formula, currentConfigService) {
 	const unitDefinedNameMap = currentConfigService.getDirtyDefinedNameMap()[unitId];
 	if (unitDefinedNameMap == null) return false;
-	const formulaText = normalizeFormulaText(formula);
-	const names = Object.keys(unitDefinedNameMap);
-	for (let i = 0, len = names.length; i < len; i++) if (normalizeFormulaText(names[i]) === formulaText) return true;
-	return false;
+	return getNormalizedDirtyDefinedNameSet(unitDefinedNameMap).has(normalizeFormulaText(formula));
 }
 function normalizeFormulaText(formula) {
 	return formula.startsWith("=") ? formula.slice(1) : formula;
 }
+function checkIsChangedBySuperTable(unitId, formula, currentConfigService) {
+	var _currentConfigService, _tableReferencePatter;
+	const getDirtySuperTableMap = (_currentConfigService = currentConfigService.getDirtySuperTableMap) === null || _currentConfigService === void 0 ? void 0 : _currentConfigService.bind(currentConfigService);
+	const changedSuperTableMap = getDirtySuperTableMap === null || getDirtySuperTableMap === void 0 ? void 0 : getDirtySuperTableMap();
+	const unitSuperTableMap = changedSuperTableMap === null || changedSuperTableMap === void 0 ? void 0 : changedSuperTableMap[unitId];
+	if (unitSuperTableMap == null) return false;
+	const tableReferencePattern = getDirtySuperTableReferencePattern(unitSuperTableMap);
+	return (_tableReferencePatter = tableReferencePattern === null || tableReferencePattern === void 0 ? void 0 : tableReferencePattern.test(normalizeFormulaText(formula))) !== null && _tableReferencePatter !== void 0 ? _tableReferencePatter : false;
+}
+function getNormalizedDirtyDefinedNameSet(unitDefinedNameMap) {
+	let normalizedNameSet = DIRTY_DEFINED_NAME_SET_CACHE.get(unitDefinedNameMap);
+	if (normalizedNameSet == null) {
+		normalizedNameSet = new Set(Object.keys(unitDefinedNameMap).map(normalizeFormulaText));
+		DIRTY_DEFINED_NAME_SET_CACHE.set(unitDefinedNameMap, normalizedNameSet);
+	}
+	return normalizedNameSet;
+}
+function getDirtySuperTableReferencePattern(unitSuperTableMap) {
+	let tableReferencePattern = DIRTY_SUPER_TABLE_PATTERN_CACHE.get(unitSuperTableMap);
+	if (tableReferencePattern === void 0) {
+		const escapedTableNames = Object.keys(unitSuperTableMap).filter((tableName) => tableName.length > 0).map(escapeRegExp);
+		tableReferencePattern = escapedTableNames.length > 0 ? new RegExp(`(^|[^A-Za-z0-9_])(?:${escapedTableNames.join("|")})(\\s*\\[|$|[^A-Za-z0-9_])`, "i") : null;
+		DIRTY_SUPER_TABLE_PATTERN_CACHE.set(unitSuperTableMap, tableReferencePattern);
+	}
+	return tableReferencePattern;
+}
 function isDirtyDefinedForNode(node, currentConfigService) {
 	const definedNameMap = currentConfigService.getDirtyDefinedNameMap();
 	const executeUnitId = currentConfigService.getExecuteUnitId();
@@ -11760,9 +11785,7 @@ var DependencyManagerBaseService = class extends Disposable {
 	clearFormulaDependency(unitId, sheetId) {
 		throw new Error("Method not implemented.");
 	}
-	removeFormulaDependencyByDefinedName(unitId, definedName) {
-		throw new Error("Method not implemented.");
-	}
+	removeFormulaDependencyByDefinedName(unitId, definedName) {}
 	searchDependency(search, exceptTreeIds) {
 		return this._dependencyRTreeCache.bulkSearch(search, exceptTreeIds);
 	}
@@ -13871,7 +13894,7 @@ let CalculateController = class CalculateController extends Disposable {
 		}));
 	}
 	async _calculate(formulaDirtyData) {
-		const { forceCalculation: forceCalculate = false, dirtyRanges = [], dirtyNameMap = {}, dirtyDefinedNameMap = {}, dirtyUnitFeatureMap = {}, dirtyUnitOtherFormulaMap = {}, clearDependencyTreeCache = {}, maxIteration = 1, rowData, isCalculateTreeModel = false } = formulaDirtyData;
+		const { forceCalculation: forceCalculate = false, dirtyRanges = [], dirtyNameMap = {}, dirtyDefinedNameMap = {}, dirtySuperTableMap = {}, dirtyUnitFeatureMap = {}, dirtyUnitOtherFormulaMap = {}, clearDependencyTreeCache = {}, maxIteration = 1, rowData, isCalculateTreeModel = false } = formulaDirtyData;
 		const formulaData = this._formulaDataModel.getFormulaData();
 		const arrayFormulaCellData = this._formulaDataModel.getArrayFormulaCellData();
 		const arrayFormulaRange = this._formulaDataModel.getArrayFormulaRange();
@@ -13883,6 +13906,7 @@ let CalculateController = class CalculateController extends Disposable {
 			dirtyRanges,
 			dirtyNameMap,
 			dirtyDefinedNameMap,
+			dirtySuperTableMap,
 			dirtyUnitFeatureMap,
 			dirtyUnitOtherFormulaMap,
 			clearDependencyTreeCache,
@@ -24110,14 +24134,14 @@ function guessIsNaNorInfinity(guess, iterF) {
 	const max = Number.MAX_VALUE;
 	const min = -1;
 	const step = 1.6;
-	let low = guess - .01 <= min ? min + g_Eps : guess - .01;
+	let low = guess - .01 <= min ? -.9999999 : guess - .01;
 	let high = guess + .01 >= max ? max - g_Eps : guess + .01;
 	let xBegin;
 	let xEnd;
 	let currentIter = 0;
 	if (guess <= min || guess >= max) return ErrorValueObject.create("#NUM!");
 	for (let i = 0; i < nIM; i++) {
-		xBegin = low <= min ? min + g_Eps : low;
+		xBegin = low <= min ? -.9999999 : low;
 		xEnd = high >= max ? max - g_Eps : high;
 		const x = iterF(xBegin);
 		const y = iterF(xEnd);
@@ -32713,7 +32737,7 @@ var Roundbank = class extends BaseFunction {
 		const integerPart = Math.floor(adjustedNum);
 		const decimalPart = adjustedNum - integerPart;
 		let result = Math.round(adjustedNum);
-		if (decimalPart > .5 - EPSILON && decimalPart < .5 + EPSILON) result = integerPart % 2 === 0 ? integerPart : integerPart + 1;
+		if (decimalPart > .5 - EPSILON && decimalPart < .50000001) result = integerPart % 2 === 0 ? integerPart : integerPart + 1;
 		return numDigits ? result / multiplier : result;
 	}
 };
@@ -40031,10 +40055,7 @@ var Textsplit = class extends BaseFunction {
 		if (valueObject.isNull()) value = "\\s";
 		if (valueObject.isBoolean()) value = value ? "TRUE" : "FALSE";
 		value += "";
-		return this._escapeRegExp(value);
-	}
-	_escapeRegExp(string) {
-		return string.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+		return escapeRegExp(value);
 	}
 };
 
@@ -40417,7 +40438,7 @@ function getObjectValue(result, isUseStrip = false) {
 //#endregion
 //#region package.json
 var name = "@univerjs/engine-formula";
-var version = "0.24.0";
+var version = "0.25.0";
 
 //#endregion
 //#region src/services/global-computing-status.service.ts
@@ -40475,7 +40496,7 @@ let ComputingStatusReporterController = class ComputingStatusReporterController
 				const params = command.params;
 				if (params.stageInfo) return observe.next(params.stageInfo.stage === 0 || params.stageInfo.stage === 8);
 			});
-		}).pipe(distinctUntilChanged(), shareReplay()));
+		}).pipe(distinctUntilChanged(), shareReplay({ refCount: true })));
 		const disposables = new DisposableCollection();
 		const subject = new BehaviorSubject(true);
 		disposables.add(this._globalComputingSrv.pushComputingStatusSubject(subject));

package/lib/types/basics/common.d.ts

@@ -85,9 +85,14 @@ export interface IDirtyUnitSheetNameMap {
         [sheetId: string]: string;
     }>;
 }
-export interface IDirtyUnitSheetDefinedNameMap {
+export interface IDirtyUnitDefinedNameMap {
     [unitId: string]: Nullable<{
-        [name: string]: string;
+        [definedName: string]: string;
+    }>;
+}
+export interface IDirtyUnitSuperTableMap {
+    [unitId: string]: Nullable<{
+        [tableName: string]: string;
     }>;
 }
 export interface IDirtyUnitFeatureMap {
@@ -213,7 +218,8 @@ export interface IFormulaDatasetConfig {
     forceCalculate: boolean;
     dirtyRanges: IUnitRange[];
     dirtyNameMap: IDirtyUnitSheetNameMap;
-    dirtyDefinedNameMap: IDirtyUnitSheetNameMap;
+    dirtyDefinedNameMap: IDirtyUnitDefinedNameMap;
+    dirtySuperTableMap?: IDirtyUnitSuperTableMap;
     dirtyUnitFeatureMap: IDirtyUnitFeatureMap;
     dirtyUnitOtherFormulaMap: IDirtyUnitOtherFormulaMap;
     clearDependencyTreeCache?: IUnitSheetIdToNameMap;

package/lib/types/commands/mutations/set-super-table.mutation.d.ts

@@ -21,6 +21,7 @@ export interface ISetSuperTableMutationSearchParam {
     tableName: string;
 }
 export interface ISetSuperTableMutationParam extends ISetSuperTableMutationSearchParam {
+    oldTableName?: string;
     reference: ISuperTable;
 }
 /**

package/lib/types/engine/analysis/lexer-tree-builder.d.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import type { Nullable } from '@univerjs/core';
-import type { IDirtyUnitSheetDefinedNameMap, IExprTreeNode, ISuperTable } from '../../basics/common';
+import type { IDirtyUnitDefinedNameMap, IExprTreeNode, ISuperTable } from '../../basics/common';
 import type { IFunctionNames } from '../../basics/function';
 import type { IDefinedNamesServiceParam } from '../../services/defined-names.service';
 import type { ISequenceArray, ISequenceNode } from '../utils/sequence';
@@ -27,7 +27,7 @@ export declare const FormulaSequenceNodeCache: FormulaAstLRU<(string | ISequence
 interface IInjectDefinedNameParam {
     unitId: Nullable<string>;
     getValueByName(unitId: string, name: string): Nullable<IDefinedNamesServiceParam>;
-    getDirtyDefinedNameMap(): IDirtyUnitSheetDefinedNameMap;
+    getDirtyDefinedNameMap(): IDirtyUnitDefinedNameMap;
     getSheetName: (unitId: string, sheetId: string) => string;
 }
 export declare class LexerTreeBuilder extends Disposable {

package/lib/types/engine/utils/compare.d.ts

@@ -34,6 +34,5 @@ export declare function isWildcard(str: string): boolean;
 export declare function isMatchWildcard(currentValue: string, value: string): boolean;
 export declare function replaceWildcard(value: string): string;
 export declare function compareWithWildcard(currentValue: string, value: string, operator: compareToken): boolean;
-export declare function escapeRegExp(str: string): string;
 export declare function getMatchModeValue(matchModeValue: number): ArrayOrderSearchType;
 export declare function getSearchModeValue(searchModeValue: number): ArrayBinarySearchType;

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

@@ -118,12 +118,11 @@ export declare class FFormula extends FBase {
      */
     calculationEnd(callback: (functionsExecutedState: FormulaExecutedStateType) => void): IDisposable;
     /**
-     * @deprecated Use `onCalculationEnd` instead.
+     * @deprecated Use `onCalculationResultApplied` instead.
      */
     whenComputingCompleteAsync(timeout?: number): Promise<boolean>;
     /**
-     * Waits for the formula calculation to complete.
-     * @returns {Promise<void>} This method returns a promise that resolves when the calculation is complete.
+     * @deprecated Use `onCalculationResultApplied` instead.
      */
     onCalculationEnd(): Promise<void>;
     /**

package/lib/types/functions/text/textsplit/index.d.ts

@@ -25,5 +25,4 @@ export declare class Textsplit extends BaseFunction {
     private _getResult;
     private _checkVariantsError;
     private _getRegExpStringValue;
-    private _escapeRegExp;
 }

package/lib/types/index.d.ts

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export type { IArrayFormulaEmbeddedMap, IArrayFormulaRangeType, IArrayFormulaUnitCellType, IDirtyUnitFeatureMap, IDirtyUnitOtherFormulaMap, IDirtyUnitSheetDefinedNameMap, IDirtyUnitSheetNameMap, IFeatureDirtyRangeType, IFormulaData, IFormulaDataItem, IFormulaDatasetConfig, IFormulaExecuteResultMap, IFormulaStringMap, IRuntimeImageFormulaDataType, IRuntimeUnitDataType, ISheetData, IUnitData, IUnitImageFormulaDataType, IUnitSheetNameMap, } from './basics/common';
+export type { IArrayFormulaEmbeddedMap, IArrayFormulaRangeType, IArrayFormulaUnitCellType, IDirtyUnitDefinedNameMap, IDirtyUnitFeatureMap, IDirtyUnitOtherFormulaMap, IDirtyUnitSheetNameMap, IDirtyUnitSuperTableMap, IFeatureDirtyRangeType, IFormulaData, IFormulaDataItem, IFormulaDatasetConfig, IFormulaExecuteResultMap, IFormulaStringMap, IRuntimeImageFormulaDataType, IRuntimeUnitDataType, ISheetData, IUnitData, IUnitImageFormulaDataType, IUnitSheetNameMap, } from './basics/common';
 export { BooleanValue } from './basics/common';
 export { type IOtherFormulaData } from './basics/common';
 export type { IExprTreeNode, ISuperTable, IUnitRowData } from './basics/common';

package/lib/types/services/active-dirty-manager.service.d.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import type { ICommandInfo, IUnitRange, Nullable } from '@univerjs/core';
-import type { IDirtyUnitFeatureMap, IDirtyUnitOtherFormulaMap, IDirtyUnitSheetDefinedNameMap, IDirtyUnitSheetNameMap } from '../basics/common';
+import type { IDirtyUnitDefinedNameMap, IDirtyUnitFeatureMap, IDirtyUnitOtherFormulaMap, IDirtyUnitSheetNameMap, IDirtyUnitSuperTableMap } from '../basics/common';
 import { Disposable } from '@univerjs/core';
 export interface IDirtyConversionManagerParams {
     commandId: string;
@@ -22,7 +22,8 @@ export interface IDirtyConversionManagerParams {
         forceCalculation?: boolean;
         dirtyRanges?: IUnitRange[];
         dirtyNameMap?: IDirtyUnitSheetNameMap;
-        dirtyDefinedNameMap?: IDirtyUnitSheetDefinedNameMap;
+        dirtyDefinedNameMap?: IDirtyUnitDefinedNameMap;
+        dirtySuperTableMap?: IDirtyUnitSuperTableMap;
         dirtyUnitFeatureMap?: IDirtyUnitFeatureMap;
         dirtyUnitOtherFormulaMap?: IDirtyUnitOtherFormulaMap;
         clearDependencyTreeCache?: IDirtyUnitSheetNameMap;

package/lib/types/services/current-data.service.d.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import type { IUnitRange, LocaleType, Nullable } from '@univerjs/core';
-import type { IArrayFormulaRangeType, IDirtyUnitFeatureMap, IDirtyUnitOtherFormulaMap, IDirtyUnitSheetDefinedNameMap, IDirtyUnitSheetNameMap, IFormulaData, IFormulaDatasetConfig, IRuntimeUnitDataType, IUnitData, IUnitExcludedCell, IUnitRowData, IUnitSheetIdToNameMap, IUnitSheetNameMap, IUnitStylesData } from '../basics/common';
+import type { IArrayFormulaRangeType, IDirtyUnitDefinedNameMap, IDirtyUnitFeatureMap, IDirtyUnitOtherFormulaMap, IDirtyUnitSheetNameMap, IDirtyUnitSuperTableMap, IFormulaData, IFormulaDatasetConfig, IRuntimeUnitDataType, IUnitData, IUnitExcludedCell, IUnitRowData, IUnitSheetIdToNameMap, IUnitSheetNameMap, IUnitStylesData } from '../basics/common';
 import { Disposable, IUniverInstanceService, LocaleService } from '@univerjs/core';
 import { FormulaDataModel } from '../models/formula-data.model';
 import { ISheetRowFilteredService } from './sheet-row-filtered.service';
@@ -22,7 +22,8 @@ export interface IFormulaDirtyData {
     forceCalculation: boolean;
     dirtyRanges: IUnitRange[];
     dirtyNameMap: IDirtyUnitSheetNameMap;
-    dirtyDefinedNameMap: IDirtyUnitSheetDefinedNameMap;
+    dirtyDefinedNameMap: IDirtyUnitDefinedNameMap;
+    dirtySuperTableMap?: IDirtyUnitSuperTableMap;
     dirtyUnitFeatureMap: IDirtyUnitFeatureMap;
     dirtyUnitOtherFormulaMap: IDirtyUnitOtherFormulaMap;
     clearDependencyTreeCache: IDirtyUnitSheetNameMap;
@@ -42,7 +43,8 @@ export interface IFormulaCurrentConfigService {
     isForceCalculate(): boolean;
     getDirtyRanges(): IUnitRange[];
     getDirtyNameMap(): IDirtyUnitSheetNameMap;
-    getDirtyDefinedNameMap(): IDirtyUnitSheetDefinedNameMap;
+    getDirtyDefinedNameMap(): IDirtyUnitDefinedNameMap;
+    getDirtySuperTableMap(): IDirtyUnitSuperTableMap;
     getDirtyUnitFeatureMap(): IDirtyUnitFeatureMap;
     registerUnitData(unitData: IUnitData): void;
     registerFormulaData(formulaData: IFormulaData): void;
@@ -90,6 +92,7 @@ export declare class FormulaCurrentConfigService extends Disposable implements I
     private _dirtyRanges;
     private _dirtyNameMap;
     private _dirtyDefinedNameMap;
+    private _dirtySuperTableMap;
     private _dirtyUnitFeatureMap;
     private _dirtyUnitOtherFormulaMap;
     private _excludedCell;
@@ -112,7 +115,8 @@ export declare class FormulaCurrentConfigService extends Disposable implements I
     isForceCalculate(): boolean;
     getDirtyRanges(): IUnitRange[];
     getDirtyNameMap(): IDirtyUnitSheetNameMap;
-    getDirtyDefinedNameMap(): IDirtyUnitSheetDefinedNameMap;
+    getDirtyDefinedNameMap(): IDirtyUnitDefinedNameMap;
+    getDirtySuperTableMap(): IDirtyUnitSuperTableMap;
     getDirtyUnitFeatureMap(): IDirtyUnitFeatureMap;
     getDirtyUnitOtherFormulaMap(): IDirtyUnitOtherFormulaMap;
     getSheetName(unitId: string, sheetId: string): string;

package/lib/umd/facade.js

@@ -1 +1 @@
-(function(e,t){typeof exports==`object`&&typeof module<`u`?t(exports,require(`@univerjs/core/facade`),require(`@univerjs/core`),require(`@univerjs/engine-formula`),require(`rxjs`)):typeof define==`function`&&define.amd?define([`exports`,`@univerjs/core/facade`,`@univerjs/core`,`@univerjs/engine-formula`,`rxjs`],t):(e=typeof globalThis<`u`?globalThis:e||self,t(e.UniverEngineFormulaFacade={},e.UniverCoreFacade,e.UniverCore,e.UniverEngineFormula,e.rxjs))})(this,function(e,t,n,r,i){Object.defineProperty(e,Symbol.toStringTag,{value:`Module`});function a(e,t){return function(n,r){t(n,r,e)}}function o(e,t,n,r){var i=arguments.length,a=i<3?t:r===null?r=Object.getOwnPropertyDescriptor(t,n):r,o;if(typeof Reflect==`object`&&typeof Reflect.decorate==`function`)a=Reflect.decorate(e,t,n,r);else for(var s=e.length-1;s>=0;s--)(o=e[s])&&(a=(i<3?o(a):i>3?o(t,n,a):o(t,n))||a);return i>3&&a&&Object.defineProperty(t,n,a),a}let s=class extends t.FBase{constructor(e,t,n,r,i,a,o){super(),this._commandService=e,this._injector=t,this._lexerTreeBuilder=n,this._configService=r,this._functionService=i,this._definedNamesService=a,this._superTableService=o,this._initialize()}_initialize(){}get lexerTreeBuilder(){return this._lexerTreeBuilder}moveFormulaRefOffset(e,t,n,r){return this._lexerTreeBuilder.moveFormulaRefOffset(e,t,n,r)}sequenceNodesBuilder(e){return this._lexerTreeBuilder.sequenceNodesBuilder(e)||[]}executeCalculation(){this._commandService.executeCommand(r.SetTriggerFormulaCalculationStartMutation.id,{commands:[],forceCalculation:!0},{onlyLocal:!0})}stopCalculation(){this._commandService.executeCommand(r.SetFormulaCalculationStopMutation.id,{})}calculationStart(e){return this._commandService.onCommandExecuted(t=>{if(t.id===r.SetFormulaCalculationStartMutation.id){let n=t.params;e(n.forceCalculation)}})}calculationEnd(e){return this._commandService.onCommandExecuted(t=>{if(t.id!==r.SetFormulaCalculationNotificationMutation.id)return;let n=t.params;n.functionsExecutedState!==void 0&&e(n.functionsExecutedState)})}whenComputingCompleteAsync(e){let t=this._injector.get(r.GlobalComputingStatusService);return t.computingStatus?Promise.resolve(!0):(0,i.firstValueFrom)((0,i.race)(t.computingStatus$.pipe((0,i.filter)(e=>e)),(0,i.timer)(e==null?3e4:e).pipe((0,i.map)(()=>!1))))}onCalculationEnd(){return new Promise((e,t)=>{let n=setTimeout(()=>{t(Error(`Calculation end timeout`))},3e4),r=this.calculationEnd(()=>{clearTimeout(n),r.dispose(),e()})})}calculationProcessing(e){return this._commandService.onCommandExecuted(t=>{if(t.id!==r.SetFormulaCalculationNotificationMutation.id)return;let n=t.params;n.stageInfo!==void 0&&e(n.stageInfo)})}setMaxIteration(e){this._configService.setConfig(r.ENGINE_FORMULA_CYCLE_REFERENCE_COUNT,e)}executeFormulas(e,t=3e4){return new Promise((n,i)=>{let a=this._commandService.onCommandExecuted(e=>{if(e.id!==r.SetFormulaStringBatchCalculationResultMutation.id)return;let t=e.params;clearTimeout(o),a.dispose(),t.result==null?i(Error(`Formula batch calculation returned no result`)):n(t.result)}),o=setTimeout(()=>{a.dispose(),i(Error(`Formula batch calculation timeout`))},t);this._commandService.executeCommand(r.SetFormulaStringBatchCalculationMutation.id,{formulas:e},{onlyLocal:!0})})}getAllDependencyTrees(e=3e4){return new Promise((t,n)=>{let i=this._commandService.onCommandExecuted(e=>{if(e.id!==r.SetFormulaDependencyCalculationResultMutation.id)return;let n=e.params;clearTimeout(a),i.dispose(),n.result==null?t([]):t(n.result)}),a=setTimeout(()=>{i.dispose(),n(Error(`Formula dependency calculation timeout`))},e);this._commandService.executeCommand(r.SetFormulaDependencyCalculationMutation.id,void 0,{onlyLocal:!0})})}getCellDependencyTree(e,t=3e4){return new Promise((n,i)=>{let a=this._commandService.onCommandExecuted(e=>{if(e.id!==r.SetCellFormulaDependencyCalculationResultMutation.id)return;let t=e.params;clearTimeout(o),a.dispose(),n(t.result)}),o=setTimeout(()=>{a.dispose(),i(Error(`Cell dependency calculation timeout`))},t);this._commandService.executeCommand(r.SetCellFormulaDependencyCalculationMutation.id,e,{onlyLocal:!0})})}getRangeDependents(e,t=3e4){return new Promise((n,i)=>{let a=this._commandService.onCommandExecuted(e=>{if(e.id!==r.SetQueryFormulaDependencyResultMutation.id)return;let t=e.params;clearTimeout(o),a.dispose(),t.result==null?n([]):n(t.result)}),o=setTimeout(()=>{a.dispose(),i(Error(`Range dependents calculation timeout`))},t);this._commandService.executeCommand(r.SetQueryFormulaDependencyMutation.id,{unitRanges:e},{onlyLocal:!0})})}getInRangeFormulas(e,t=3e4){return new Promise((n,i)=>{let a=this._commandService.onCommandExecuted(e=>{if(e.id!==r.SetQueryFormulaDependencyResultMutation.id)return;let t=e.params;clearTimeout(o),a.dispose(),t.result==null?n([]):n(t.result)}),o=setTimeout(()=>{a.dispose(),i(Error(`In-range formulas calculation timeout`))},t);this._commandService.executeCommand(r.SetQueryFormulaDependencyMutation.id,{unitRanges:e,isInRange:!0},{onlyLocal:!0})})}setFormulaReturnDependencyTree(e){this._configService.setConfig(r.ENGINE_FORMULA_RETURN_DEPENDENCY_TREE,e)}getFormulaExpressTree(e,t){return this._lexerTreeBuilder.getFormulaExprTree(e,t,this._functionService.hasExecutor.bind(this._functionService),this._definedNamesService.getValueByName.bind(this._definedNamesService),this._superTableService.getTable.bind(this._superTableService))}getRangeDependentsAndInRangeFormulas(e,t=3e4){return new Promise((n,i)=>{let a=this._commandService.onCommandExecuted(e=>{if(e.id!==r.SetQueryFormulaDependencyAllResultMutation.id)return;let t=e.params;clearTimeout(o),a.dispose(),t.result==null?n({dependents:[],inRanges:[]}):n(t.result)}),o=setTimeout(()=>{a.dispose(),i(Error(`Range dependents calculation timeout`))},t);this._commandService.executeCommand(r.SetQueryFormulaDependencyAllMutation.id,{unitRanges:e},{onlyLocal:!0})})}};s=o([a(0,(0,n.Inject)(n.ICommandService)),a(1,(0,n.Inject)(n.Injector)),a(2,(0,n.Inject)(r.LexerTreeBuilder)),a(3,n.IConfigService),a(4,r.IFunctionService),a(5,r.IDefinedNamesService),a(6,r.ISuperTableService)],s);var c=class extends t.FUniver{getFormula(){return this._injector.createInstance(s)}};t.FUniver.extend(c),Object.defineProperty(e,`FFormula`,{enumerable:!0,get:function(){return s}})});
+(function(e,t){typeof exports==`object`&&typeof module<`u`?t(exports,require("@univerjs/core/facade"),require("@univerjs/core"),require("@univerjs/engine-formula"),require("rxjs")):typeof define==`function`&&define.amd?define([`exports`,`@univerjs/core/facade`,`@univerjs/core`,`@univerjs/engine-formula`,`rxjs`],t):(e=typeof globalThis<`u`?globalThis:e||self,t(e.UniverEngineFormulaFacade={},e.UniverCoreFacade,e.UniverCore,e.UniverEngineFormula,e.rxjs))})(this,function(e,t,n,r,i){Object.defineProperty(e,Symbol.toStringTag,{value:`Module`});function a(e,t){return function(n,r){t(n,r,e)}}function o(e,t,n,r){var i=arguments.length,a=i<3?t:r===null?r=Object.getOwnPropertyDescriptor(t,n):r,o;if(typeof Reflect==`object`&&typeof Reflect.decorate==`function`)a=Reflect.decorate(e,t,n,r);else for(var s=e.length-1;s>=0;s--)(o=e[s])&&(a=(i<3?o(a):i>3?o(t,n,a):o(t,n))||a);return i>3&&a&&Object.defineProperty(t,n,a),a}let s=class extends t.FBase{constructor(e,t,n,r,i,a,o){super(),this._commandService=e,this._injector=t,this._lexerTreeBuilder=n,this._configService=r,this._functionService=i,this._definedNamesService=a,this._superTableService=o,this._initialize()}_initialize(){}get lexerTreeBuilder(){return this._lexerTreeBuilder}moveFormulaRefOffset(e,t,n,r){return this._lexerTreeBuilder.moveFormulaRefOffset(e,t,n,r)}sequenceNodesBuilder(e){return this._lexerTreeBuilder.sequenceNodesBuilder(e)||[]}executeCalculation(){this._commandService.executeCommand(r.SetTriggerFormulaCalculationStartMutation.id,{commands:[],forceCalculation:!0},{onlyLocal:!0})}stopCalculation(){this._commandService.executeCommand(r.SetFormulaCalculationStopMutation.id,{})}calculationStart(e){return this._commandService.onCommandExecuted(t=>{if(t.id===r.SetFormulaCalculationStartMutation.id){let n=t.params;e(n.forceCalculation)}})}calculationEnd(e){return this._commandService.onCommandExecuted(t=>{if(t.id!==r.SetFormulaCalculationNotificationMutation.id)return;let n=t.params;n.functionsExecutedState!==void 0&&e(n.functionsExecutedState)})}whenComputingCompleteAsync(e){let t=this._injector.get(r.GlobalComputingStatusService);return t.computingStatus?Promise.resolve(!0):(0,i.firstValueFrom)((0,i.race)(t.computingStatus$.pipe((0,i.filter)(e=>e)),(0,i.timer)(e==null?3e4:e).pipe((0,i.map)(()=>!1))))}onCalculationEnd(){return new Promise((e,t)=>{let n=setTimeout(()=>{t(Error(`Calculation end timeout`))},3e4),r=this.calculationEnd(()=>{clearTimeout(n),r.dispose(),e()})})}calculationProcessing(e){return this._commandService.onCommandExecuted(t=>{if(t.id!==r.SetFormulaCalculationNotificationMutation.id)return;let n=t.params;n.stageInfo!==void 0&&e(n.stageInfo)})}setMaxIteration(e){this._configService.setConfig(r.ENGINE_FORMULA_CYCLE_REFERENCE_COUNT,e)}executeFormulas(e,t=3e4){return new Promise((n,i)=>{let a=this._commandService.onCommandExecuted(e=>{if(e.id!==r.SetFormulaStringBatchCalculationResultMutation.id)return;let t=e.params;clearTimeout(o),a.dispose(),t.result==null?i(Error(`Formula batch calculation returned no result`)):n(t.result)}),o=setTimeout(()=>{a.dispose(),i(Error(`Formula batch calculation timeout`))},t);this._commandService.executeCommand(r.SetFormulaStringBatchCalculationMutation.id,{formulas:e},{onlyLocal:!0})})}getAllDependencyTrees(e=3e4){return new Promise((t,n)=>{let i=this._commandService.onCommandExecuted(e=>{if(e.id!==r.SetFormulaDependencyCalculationResultMutation.id)return;let n=e.params;clearTimeout(a),i.dispose(),n.result==null?t([]):t(n.result)}),a=setTimeout(()=>{i.dispose(),n(Error(`Formula dependency calculation timeout`))},e);this._commandService.executeCommand(r.SetFormulaDependencyCalculationMutation.id,void 0,{onlyLocal:!0})})}getCellDependencyTree(e,t=3e4){return new Promise((n,i)=>{let a=this._commandService.onCommandExecuted(e=>{if(e.id!==r.SetCellFormulaDependencyCalculationResultMutation.id)return;let t=e.params;clearTimeout(o),a.dispose(),n(t.result)}),o=setTimeout(()=>{a.dispose(),i(Error(`Cell dependency calculation timeout`))},t);this._commandService.executeCommand(r.SetCellFormulaDependencyCalculationMutation.id,e,{onlyLocal:!0})})}getRangeDependents(e,t=3e4){return new Promise((n,i)=>{let a=this._commandService.onCommandExecuted(e=>{if(e.id!==r.SetQueryFormulaDependencyResultMutation.id)return;let t=e.params;clearTimeout(o),a.dispose(),t.result==null?n([]):n(t.result)}),o=setTimeout(()=>{a.dispose(),i(Error(`Range dependents calculation timeout`))},t);this._commandService.executeCommand(r.SetQueryFormulaDependencyMutation.id,{unitRanges:e},{onlyLocal:!0})})}getInRangeFormulas(e,t=3e4){return new Promise((n,i)=>{let a=this._commandService.onCommandExecuted(e=>{if(e.id!==r.SetQueryFormulaDependencyResultMutation.id)return;let t=e.params;clearTimeout(o),a.dispose(),t.result==null?n([]):n(t.result)}),o=setTimeout(()=>{a.dispose(),i(Error(`In-range formulas calculation timeout`))},t);this._commandService.executeCommand(r.SetQueryFormulaDependencyMutation.id,{unitRanges:e,isInRange:!0},{onlyLocal:!0})})}setFormulaReturnDependencyTree(e){this._configService.setConfig(r.ENGINE_FORMULA_RETURN_DEPENDENCY_TREE,e)}getFormulaExpressTree(e,t){return this._lexerTreeBuilder.getFormulaExprTree(e,t,this._functionService.hasExecutor.bind(this._functionService),this._definedNamesService.getValueByName.bind(this._definedNamesService),this._superTableService.getTable.bind(this._superTableService))}getRangeDependentsAndInRangeFormulas(e,t=3e4){return new Promise((n,i)=>{let a=this._commandService.onCommandExecuted(e=>{if(e.id!==r.SetQueryFormulaDependencyAllResultMutation.id)return;let t=e.params;clearTimeout(o),a.dispose(),t.result==null?n({dependents:[],inRanges:[]}):n(t.result)}),o=setTimeout(()=>{a.dispose(),i(Error(`Range dependents calculation timeout`))},t);this._commandService.executeCommand(r.SetQueryFormulaDependencyAllMutation.id,{unitRanges:e},{onlyLocal:!0})})}};s=o([a(0,(0,n.Inject)(n.ICommandService)),a(1,(0,n.Inject)(n.Injector)),a(2,(0,n.Inject)(r.LexerTreeBuilder)),a(3,n.IConfigService),a(4,r.IFunctionService),a(5,r.IDefinedNamesService),a(6,r.ISuperTableService)],s);var c=class extends t.FUniver{getFormula(){return this._injector.createInstance(s)}};t.FUniver.extend(c),Object.defineProperty(e,"FFormula",{enumerable:!0,get:function(){return s}})});