@univerjs/engine-formula 0.10.14 → 0.11.0-nightly.202511151013

package/lib/types/functions/math/subtotal/index.d.ts

@@ -1,4 +1,5 @@
 import { FunctionVariantType } from '../../../engine/reference-object/base-reference-object';
+import { ArrayValueObject } from '../../../engine/value-object/array-value-object';
 import { BaseFunction } from '../../base-function';
 export declare class Subtotal extends BaseFunction {
     minParams: number;
@@ -6,7 +7,7 @@ export declare class Subtotal extends BaseFunction {
     needsReferenceObject: boolean;
     needsFilteredOutRows: boolean;
     needsFormulaDataModel: boolean;
-    calculate(functionNum: FunctionVariantType, ...refs: FunctionVariantType[]): FunctionVariantType;
+    calculate(functionNum: FunctionVariantType, ...refs: FunctionVariantType[]): ArrayValueObject | FunctionVariantType;
     private _handleSingleObject;
     private _getIndexNumValue;
     private _average;

package/lib/types/functions/math/sumproduct/index.d.ts

@@ -4,6 +4,27 @@ export declare class Sumproduct extends BaseFunction {
     minParams: number;
     maxParams: number;
     calculate(array1: BaseValueObject, ...variants: BaseValueObject[]): BaseValueObject;
+    /**
+     * Validate all variants:
+     * - propagate first error BaseValueObject
+     * - ensure array dimensions are compatible with base (rowCount/columnCount)
+     * Returns an ErrorValueObject / BaseValueObject on failure, or null when OK.
+     */
+    private _validateVariants;
+    /**
+     * Core SUMPRODUCT loop.
+     * - baseArray already contains numeric values from array1
+     * - variants may be scalar or array; non-number cells are treated as 0
+     * - any error cell short-circuits with that error
+     */
+    private _sumProduct;
+    /**
+     * Get the value object of a variant at (r, c).
+     * - For scalar variants, returns the variant itself.
+     * - For array variants, returns the cell at (r, c).
+     *   If cell does not exist, returns null and let caller convert to #VALUE!.
+     */
+    private _getVariantCell;
     private _initArray1;
     private _getResultArrayByArray1;
 }

package/lib/types/functions/new-excel-functions.d.ts

@@ -0,0 +1,2 @@
+import { IFunctionNames } from '../basics/function';
+export declare const NEW_EXCEL_FUNCTIONS: Set<IFunctionNames>;

package/lib/types/functions/text/function-map.d.ts

@@ -1,7 +1,6 @@
-import { Concat } from './concat';
 import { Concatenate } from './concatenate';
 import { FUNCTION_NAMES_TEXT } from './function-names';
 import { Textafter } from './textafter';
 import { Textbefore } from './textbefore';
 import { Textsplit } from './textsplit';
-export declare const functionText: ((FUNCTION_NAMES_TEXT | typeof Concat)[] | (FUNCTION_NAMES_TEXT | typeof Concatenate)[] | (FUNCTION_NAMES_TEXT | typeof Textafter)[] | (FUNCTION_NAMES_TEXT | typeof Textbefore)[] | (FUNCTION_NAMES_TEXT | typeof Textsplit)[])[];
+export declare const functionText: ((FUNCTION_NAMES_TEXT | typeof Concatenate)[] | (FUNCTION_NAMES_TEXT | typeof Textafter)[] | (FUNCTION_NAMES_TEXT | typeof Textbefore)[] | (FUNCTION_NAMES_TEXT | typeof Textsplit)[])[];

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 { IArrayFormulaRangeType, IArrayFormulaUnitCellType, IDirtyUnitFeatureMap, IDirtyUnitOtherFormulaMap, IDirtyUnitSheetDefinedNameMap, IDirtyUnitSheetNameMap, IFeatureDirtyRangeType, IFormulaData, IFormulaDataItem, IFormulaDatasetConfig, IRuntimeUnitDataType, ISheetData, IUnitData, IUnitSheetNameMap, } from './basics/common';
+export type { IArrayFormulaEmbeddedMap, IArrayFormulaRangeType, IArrayFormulaUnitCellType, IDirtyUnitFeatureMap, IDirtyUnitOtherFormulaMap, IDirtyUnitSheetDefinedNameMap, IDirtyUnitSheetNameMap, IFeatureDirtyRangeType, IFormulaData, IFormulaDataItem, IFormulaDatasetConfig, IRuntimeUnitDataType, ISheetData, IUnitData, IUnitSheetNameMap, } from './basics/common';
 export { BooleanValue } from './basics/common';
 export { type IOtherFormulaData } from './basics/common';
 export { type IUnitRowData } from './basics/common';
@@ -26,7 +26,8 @@ export { includeFormulaLexerToken, isFormulaLexerToken, normalizeSheetName } fro
 export { matchRefDrawToken } from './basics/match-token';
 export { isReferenceString } from './basics/regex';
 export { convertUnitDataToRuntime } from './basics/runtime';
-export { compareToken, matchToken, operatorToken } from './basics/token';
+export { compareToken, matchToken, OPERATOR_TOKEN_SET, operatorToken, prefixToken, SUFFIX_TOKEN_SET } from './basics/token';
+export { DEFAULT_TOKEN_LAMBDA_FUNCTION_NAME, DEFAULT_TOKEN_LET_FUNCTION_NAME, DEFAULT_TOKEN_TYPE_LAMBDA_PARAMETER, DEFAULT_TOKEN_TYPE_PARAMETER, DEFAULT_TOKEN_TYPE_ROOT } from './basics/token-type';
 export { RegisterFunctionMutation } from './commands/mutations/register-function.mutation';
 export { type ISetArrayFormulaDataMutationParams, SetArrayFormulaDataMutation } from './commands/mutations/set-array-formula-data.mutation';
 export { type ISetDefinedNameMutationParam, type ISetDefinedNameMutationSearchParam, RemoveDefinedNameMutation, SetDefinedNameMutation } from './commands/mutations/set-defined-name.mutation';
@@ -36,6 +37,7 @@ export { type ISetFormulaCalculationNotificationMutation, type ISetFormulaCalcul
 export { type ISetFormulaDataMutationParams, SetFormulaDataMutation } from './commands/mutations/set-formula-data.mutation';
 export { type IRemoveOtherFormulaMutationParams, type ISetOtherFormulaMutationParams, RemoveOtherFormulaMutation, SetOtherFormulaMutation } from './commands/mutations/set-other-formula.mutation';
 export { RemoveSuperTableMutation, SetSuperTableMutation, SetSuperTableOptionMutation } from './commands/mutations/set-super-table.mutation';
+export type { ISetSuperTableMutationParam, ISetSuperTableMutationSearchParam } from './commands/mutations/set-super-table.mutation';
 export { CalculateController } from './controller/calculate.controller';
 export { ENGINE_FORMULA_CYCLE_REFERENCE_COUNT, ENGINE_FORMULA_PLUGIN_CONFIG_KEY, type IUniverEngineFormulaConfig } from './controller/config.schema';
 export { Lexer } from './engine/analysis/lexer';
@@ -43,7 +45,7 @@ export { LexerNode } from './engine/analysis/lexer-node';
 export { LexerTreeBuilder } from './engine/analysis/lexer-tree-builder';
 export { AstTreeBuilder } from './engine/analysis/parser';
 export { AstRootNodeFactory } from './engine/ast-node/ast-root-node';
-export type { BaseAstNode } from './engine/ast-node/base-ast-node.js';
+export type { BaseAstNode, IAstNodeNodeJson } from './engine/ast-node/base-ast-node';
 export { FunctionNodeFactory } from './engine/ast-node/function-node';
 export { LambdaNodeFactory } from './engine/ast-node/lambda-node';
 export { LambdaParameterNodeFactory } from './engine/ast-node/lambda-parameter-node';
@@ -68,7 +70,7 @@ export { generateAstNode } from './engine/utils/generate-ast-node';
 export { strip, stripErrorMargin } from './engine/utils/math-kit';
 export { handleNumfmtInCell } from './engine/utils/numfmt-kit';
 export { deserializeRangeForR1C1 } from './engine/utils/r1c1-reference';
-export { deserializeRangeWithSheet, getAbsoluteRefTypeWithSingleString, getAbsoluteRefTypeWitString, getRangeWithRefsString, type IAbsoluteRefTypeForRange, isReferenceStrings, isReferenceStringWithEffectiveColumn, serializeRange, serializeRangeToRefString, serializeRangeWithSheet, serializeRangeWithSpreadsheet, singleReferenceToGrid, } from './engine/utils/reference';
+export { deserializeRangeWithSheet, getAbsoluteRefTypeWithSingleString, getAbsoluteRefTypeWitString, getRangeWithRefsString, type IAbsoluteRefTypeForRange, isReferenceStrings, isReferenceStringWithEffectiveColumn, needsQuoting, quoteSheetName, serializeRange, serializeRangeToRefString, serializeRangeWithSheet, serializeRangeWithSpreadsheet, singleReferenceToGrid, unquoteSheetName, } from './engine/utils/reference';
 export { handleRefStringInfo } from './engine/utils/reference';
 export { deserializeRangeWithSheetWithCache } from './engine/utils/reference-cache';
 export { generateStringWithSequence, type ISequenceNode, sequenceNodeType } from './engine/utils/sequence';
@@ -102,6 +104,7 @@ export { FUNCTION_NAMES_LOOKUP } from './functions/lookup/function-names';
 export { functionMath } from './functions/math/function-map';
 export { FUNCTION_NAMES_MATH } from './functions/math/function-names';
 export { functionMeta } from './functions/meta/function-map';
+export { NEW_EXCEL_FUNCTIONS } from './functions/new-excel-functions';
 export { functionStatistical } from './functions/statistical/function-map';
 export { FUNCTION_NAMES_STATISTICAL } from './functions/statistical/function-names';
 export { functionText } from './functions/text/function-map';

package/lib/types/services/defined-names.service.d.ts

@@ -7,6 +7,7 @@ export interface IDefinedNamesServiceParam {
     comment?: string;
     localSheetId?: string;
     hidden?: boolean;
+    formulaOrRefStringWithPrefix?: string;
 }
 export interface IDefinedNamesServiceFocusParam extends IDefinedNamesServiceParam {
     unitId: string;
@@ -34,6 +35,7 @@ export interface IDefinedNamesService {
     focusRange$: Observable<IDefinedNamesServiceFocusParam>;
     focusRange(unitId: string, id: string): void;
     getWorksheetByRef(unitId: string, ref: string): Nullable<Worksheet>;
+    getAllDefinedNames(): IDefinedNameMap;
 }
 export declare class DefinedNamesService extends Disposable implements IDefinedNamesService {
     private readonly _univerInstanceService;
@@ -61,6 +63,7 @@ export declare class DefinedNamesService extends Disposable implements IDefinedN
     getValueByName(unitId: string, name: string): IDefinedNamesServiceParam | null;
     getValueById(unitId: string, id: string): IDefinedNamesServiceParam;
     hasDefinedName(unitId: string): boolean;
+    getAllDefinedNames(): IDefinedNameMap;
     private _update;
     private _updateCache;
 }

package/lib/types/services/runtime.service.d.ts

@@ -1,5 +1,5 @@
 import { Nullable, Disposable } from '@univerjs/core';
-import { IArrayFormulaRangeType, IFeatureDirtyRangeType, IRuntimeOtherUnitDataType, IRuntimeUnitDataType } from '../basics/common';
+import { IArrayFormulaEmbeddedMap, IArrayFormulaRangeType, IFeatureDirtyRangeType, IRuntimeOtherUnitDataType, IRuntimeUnitDataType } from '../basics/common';
 import { BaseAstNode } from '../engine/ast-node/base-ast-node';
 import { FunctionVariantType } from '../engine/reference-object/base-reference-object';
 import { IFormulaCurrentConfigService } from './current-data.service';
@@ -28,6 +28,7 @@ export declare enum FormulaExecutedStateType {
 export interface IAllRuntimeData {
     unitData: IRuntimeUnitDataType;
     arrayFormulaRange: IArrayFormulaRangeType;
+    arrayFormulaEmbedded: IArrayFormulaEmbeddedMap;
     unitOtherData: IRuntimeOtherUnitDataType;
     functionsExecutedState: FormulaExecutedStateType;
     arrayFormulaCellData: IRuntimeUnitDataType;
@@ -94,6 +95,9 @@ export interface IFormulaRuntimeService {
     setRuntimeFeatureCellData(featureId: string, featureData: IRuntimeUnitDataType): void;
     setRuntimeFeatureRange(featureId: string, featureRange: IFeatureDirtyRangeType): void;
     clearReferenceAndNumberformatCache(): void;
+    getUnitArrayFormulaEmbeddedMap(): IArrayFormulaEmbeddedMap;
+    setUnitArrayFormulaEmbeddedMap(): void;
+    clearArrayObjectCache(): void;
 }
 export declare class FormulaRuntimeService extends Disposable implements IFormulaRuntimeService {
     private readonly _currentConfigService;
@@ -109,6 +113,7 @@ export declare class FormulaRuntimeService extends Disposable implements IFormul
     private _runtimeData;
     private _runtimeOtherData;
     private _unitArrayFormulaRange;
+    private _unitArrayFormulaEmbeddedMap;
     private _runtimeArrayFormulaCellData;
     private _runtimeClearArrayFormulaCellData;
     private _runtimeFeatureRange;
@@ -161,6 +166,8 @@ export declare class FormulaRuntimeService extends Disposable implements IFormul
     private _getValueObjectOfRuntimeData;
     getUnitData(): IRuntimeUnitDataType;
     getUnitArrayFormula(): IArrayFormulaRangeType;
+    getUnitArrayFormulaEmbeddedMap(): IArrayFormulaEmbeddedMap;
+    setUnitArrayFormulaEmbeddedMap(): void;
     getRuntimeOtherData(): IRuntimeOtherUnitDataType;
     getRuntimeArrayFormulaCellData(): IRuntimeUnitDataType;
     getRuntimeClearArrayFormulaCellData(): IRuntimeUnitDataType;
@@ -174,6 +181,7 @@ export declare class FormulaRuntimeService extends Disposable implements IFormul
     setRuntimeFeatureCellData(featureId: string, featureData: IRuntimeUnitDataType): void;
     getAllRuntimeData(): IAllRuntimeData;
     getRuntimeState(): IExecutionInProgressParams;
+    clearArrayObjectCache(): void;
     private _checkIfArrayFormulaRangeHasData;
     private _getRuntimeFeatureCellValue;
     private _arrayCellHasData;

package/lib/types/services/super-table.service.d.ts

@@ -1,4 +1,5 @@
 import { Nullable, Disposable } from '@univerjs/core';
+import { Observable } from 'rxjs';
 import { ISuperTable, TableOptionType } from '../basics/common';
 export interface ISuperTableOptionParam {
     tableOption: string;
@@ -10,15 +11,20 @@ export interface ISuperTableService {
     registerTable(unitId: string, tableName: string, reference: ISuperTable): void;
     registerTableOptionMap(tableOption: string, tableOptionType: TableOptionType): void;
     remove(unitId: string, tableName: string): void;
+    update$: Observable<unknown>;
 }
 export declare class SuperTableService extends Disposable implements ISuperTableService {
     private _tableMap;
     private _tableOptionMap;
+    private readonly _update$;
+    readonly update$: Observable<unknown>;
+    constructor();
     dispose(): void;
     remove(unitId: string, tableName: string): void;
     getTableMap(unitId: string): Map<string, ISuperTable> | undefined;
     getTableOptionMap(): Map<string, TableOptionType>;
     registerTable(unitId: string, tableName: string, reference: ISuperTable): void;
     registerTableOptionMap(tableOption: string, tableOptionType: TableOptionType): void;
+    private _update;
 }
 export declare const ISuperTableService: import('@wendellhu/redi').IdentifierDecorator<ISuperTableService>;