@univerjs/engine-formula 0.5.0 → 0.5.1

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

@@ -104,6 +104,18 @@ export interface IFormulaData {
         [sheetId: string]: Nullable<IObjectMatrixPrimitiveType<Nullable<IFormulaDataItem>>>;
     }>;
 }
+export interface IFormulaIdMap {
+    f: string;
+    r: number;
+    c: number;
+}
+export interface IFormulaIdMapData {
+    [unitId: string]: Nullable<{
+        [subUnitId: string]: Nullable<{
+            [formulaId: string]: IFormulaIdMap;
+        }>;
+    }>;
+}
 export interface IOtherFormulaData {
     [unitId: string]: Nullable<{
         [subUnitId: string]: Nullable<{

package/lib/types/controller/config.schema.d.ts

@@ -1,7 +1,7 @@
 import { Ctor } from '@univerjs/core';
 import { IFunctionNames } from '../basics/function';
 import { BaseFunction } from '../functions/base-function';
-export declare const PLUGIN_CONFIG_KEY = "engine-formula.config";
+export declare const ENGINE_FORMULA_PLUGIN_CONFIG_KEY = "engine-formula.config";
 export declare const configSymbol: unique symbol;
 export interface IUniverEngineFormulaConfig {
     notExecuteFormula?: boolean;

package/lib/types/index.d.ts

@@ -124,6 +124,6 @@ export { FormulaDependencyTreeVirtual } from './engine/dependency/dependency-tre
 export { generateAstNode } from './engine/utils/generate-ast-node';
 export { type IFeatureCalculationManagerParam } from './services/feature-calculation-manager.service';
 export { DEFAULT_INTERVAL_COUNT } from './services/calculate-formula.service';
-export { type IUniverEngineFormulaConfig, PLUGIN_CONFIG_KEY } from './controller/config.schema';
+export { ENGINE_FORMULA_PLUGIN_CONFIG_KEY, type IUniverEngineFormulaConfig } from './controller/config.schema';
 export { generateRandomDependencyTreeId } from './engine/dependency/formula-dependency';
 export { DependencyManagerBaseService } from './services/dependency-manager.service';

package/lib/types/models/formula-data.model.d.ts

@@ -1,6 +1,5 @@
 import { ICellData, IObjectMatrixPrimitiveType, IRange, IUnitRange, Nullable, Disposable, IUniverInstanceService, ObjectMatrix } from '@univerjs/core';
 import { IArrayFormulaRangeType, IArrayFormulaUnitCellType, IFormulaData, IFormulaDataItem, IRuntimeUnitDataType, IUnitData, IUnitSheetNameMap } from '../basics/common';
-import { IFormulaIdMap } from './utils/formula-data-util';
 import { LexerTreeBuilder } from '../engine/analysis/lexer-tree-builder';
 export interface IRangeChange {
     oldCell: IRange;
@@ -9,7 +8,6 @@ export interface IRangeChange {
 export declare class FormulaDataModel extends Disposable {
     private readonly _univerInstanceService;
     private readonly _lexerTreeBuilder;
-    private _formulaData;
     private _arrayFormulaRange;
     private _arrayFormulaCellData;
     constructor(_univerInstanceService: IUniverInstanceService, _lexerTreeBuilder: LexerTreeBuilder);
@@ -17,19 +15,13 @@ export declare class FormulaDataModel extends Disposable {
     clearPreviousArrayFormulaCellData(clearArrayFormulaCellData: IRuntimeUnitDataType): void;
     mergeArrayFormulaCellData(unitData: IRuntimeUnitDataType): void;
     getFormulaData(): IFormulaData;
-    setFormulaData(value: IFormulaData): void;
+    getSheetFormulaData(unitId: string, sheetId: string): Nullable<IObjectMatrixPrimitiveType<Nullable<IFormulaDataItem>>>;
     getArrayFormulaRange(): IArrayFormulaRangeType;
     setArrayFormulaRange(value: IArrayFormulaRangeType): void;
     getArrayFormulaCellData(): IArrayFormulaUnitCellType;
     setArrayFormulaCellData(value: IArrayFormulaUnitCellType): void;
     mergeArrayFormulaRange(formulaData: IArrayFormulaRangeType): void;
-    mergeFormulaData(formulaData: IFormulaData): void;
     deleteArrayFormulaRange(unitId: string, sheetId: string, row: number, column: number): void;
-    /**
-     * Cache all formulas on the snapshot to the formula model
-     * @returns
-     */
-    initFormulaData(): void;
     getCalculateData(): {
         allUnitData: IUnitData;
         unitSheetNameMap: IUnitSheetNameMap;
@@ -37,14 +29,12 @@ export declare class FormulaDataModel extends Disposable {
     updateFormulaData(unitId: string, sheetId: string, cellValue: IObjectMatrixPrimitiveType<Nullable<ICellData>>): IObjectMatrixPrimitiveType<IFormulaDataItem | null>;
     updateArrayFormulaRange(unitId: string, sheetId: string, cellValue: IObjectMatrixPrimitiveType<Nullable<ICellData>>): void;
     updateArrayFormulaCellData(unitId: string, sheetId: string, cellValue: IObjectMatrixPrimitiveType<Nullable<ICellData>>): void;
-    getFormulaItemBySId(sId: string, sheetId: string, unitId: string): Nullable<IFormulaDataItem>;
-    getFormulaDataItem(row: number, column: number, sheetId: string, unitId: string): Nullable<IFormulaDataItem>;
-    getFormulaIdMap(unitId: string, sheetId: string): Map<string, IFormulaIdMap>;
-    getFormulaStringByCell(row: number, column: number, sheetId: string, unitId: string): string | null;
+    getFormulaStringByCell(row: number, column: number, sheetId: string, unitId: string): Nullable<string>;
     /**
      * Function to get all formula ranges
      * @returns
      */
     getFormulaDirtyRanges(): IUnitRange[];
+    private _getSheetFormulaIdMap;
 }
 export declare function initSheetFormulaData(formulaData: IFormulaData, unitId: string, sheetId: string, cellMatrix: ObjectMatrix<Nullable<ICellData>>): IFormulaData;

package/lib/types/models/utils/formula-data-util.d.ts

@@ -1,9 +1,6 @@
 import { ICellData, IRange, Nullable, ObjectMatrix } from '@univerjs/core';
-import { IFormulaDataItem } from '../../basics/common';
-export interface IFormulaIdMap {
-    f: string;
-    r: number;
-    c: number;
-}
-export declare function updateFormulaDataByCellValue(sheetFormulaDataMatrix: ObjectMatrix<Nullable<IFormulaDataItem>>, newSheetFormulaDataMatrix: ObjectMatrix<IFormulaDataItem | null>, formulaIdMap: Map<string, IFormulaIdMap>, deleteFormulaIdMap: Map<string, string | IFormulaIdMap>, r: number, c: number, cell: Nullable<ICellData>): void;
+import { IFormulaDataItem, IFormulaIdMap } from '../../basics/common';
+export declare function updateFormulaDataByCellValue(sheetFormulaDataMatrix: ObjectMatrix<Nullable<IFormulaDataItem>>, newSheetFormulaDataMatrix: ObjectMatrix<IFormulaDataItem | null>, formulaIdMap: {
+    [formulaId: string]: IFormulaIdMap;
+}, deleteFormulaIdMap: Map<string, string | IFormulaIdMap>, r: number, c: number, cell: Nullable<ICellData>): void;
 export declare function clearArrayFormulaCellDataByCell(arrayFormulaRangeMatrix: ObjectMatrix<IRange>, arrayFormulaCellDataMatrix: ObjectMatrix<Nullable<ICellData>>, r: number, c: number): true | undefined;