@univerjs/engine-formula 0.15.0 → 0.15.1-insiders.20260117-8ce4a01

package/lib/types/engine/dependency/formula-dependency.d.ts

@@ -1,4 +1,4 @@
-import { IRange, IUnitRange, Nullable, Disposable, RTree } from '@univerjs/core';
+import { IRange, IUnitRange, Nullable, Disposable, IUniverInstanceService, RTree } from '@univerjs/core';
 import { IFeatureDirtyRangeType, IFormulaData, IFormulaDataItem, IOtherFormulaData, IUnitData } from '../../basics/common';
 import { IFeatureCalculationManagerParam, IFeatureCalculationManagerService } from '../../services/feature-calculation-manager.service';
 import { FunctionNode } from '../ast-node';
@@ -23,11 +23,12 @@ export interface IFormulaDependencyGenerator {
     getRangeDependentsAndInRangeFormulas(unitRanges: IUnitRange[]): Promise<IFormulaDependentsAndInRangeResults>;
 }
 export declare const IFormulaDependencyGenerator: import('@wendellhu/redi').IdentifierDecorator<IFormulaDependencyGenerator>;
-export declare class FormulaDependencyGenerator extends Disposable {
+export declare class FormulaDependencyGenerator extends Disposable implements IFormulaDependencyGenerator {
     protected readonly _currentConfigService: IFormulaCurrentConfigService;
     protected readonly _runtimeService: IFormulaRuntimeService;
     protected readonly _otherFormulaManagerService: IOtherFormulaManagerService;
     private readonly _featureCalculationManagerService;
+    private readonly _univerInstanceService;
     private readonly _interpreter;
     protected readonly _astTreeBuilder: AstTreeBuilder;
     protected readonly _lexer: Lexer;
@@ -35,8 +36,10 @@ export declare class FormulaDependencyGenerator extends Disposable {
     protected readonly _lexerTreeBuilder: LexerTreeBuilder;
     private _updateRangeFlattenCache;
     protected _dependencyRTreeCacheForAddressFunction: RTree;
-    constructor(_currentConfigService: IFormulaCurrentConfigService, _runtimeService: IFormulaRuntimeService, _otherFormulaManagerService: IOtherFormulaManagerService, _featureCalculationManagerService: IFeatureCalculationManagerService, _interpreter: Interpreter, _astTreeBuilder: AstTreeBuilder, _lexer: Lexer, _dependencyManagerService: IDependencyManagerService, _lexerTreeBuilder: LexerTreeBuilder);
+    constructor(_currentConfigService: IFormulaCurrentConfigService, _runtimeService: IFormulaRuntimeService, _otherFormulaManagerService: IOtherFormulaManagerService, _featureCalculationManagerService: IFeatureCalculationManagerService, _univerInstanceService: IUniverInstanceService, _interpreter: Interpreter, _astTreeBuilder: AstTreeBuilder, _lexer: Lexer, _dependencyManagerService: IDependencyManagerService, _lexerTreeBuilder: LexerTreeBuilder);
     dispose(): void;
+    private _initUnitDispose;
+    private _disposeByUnitId;
     generate(isCalculateTreeModel?: boolean): Promise<(FormulaDependencyTree | FormulaDependencyTreeVirtual)[]>;
     private _dependencyFeatureCalculation;
     private _clearFeatureCalculationNode;

package/lib/types/engine/reference-object/base-reference-object.d.ts

@@ -36,12 +36,7 @@ export declare class BaseReferenceObject extends ObjectClassType {
         x: number;
         y: number;
     };
-    getRangePosition(): {
-        startRow: number;
-        endRow: number;
-        startColumn: number;
-        endColumn: number;
-    };
+    getRangePosition(): IRange;
     isReferenceObject(): boolean;
     iterator(callback: (valueObject: Nullable<BaseValueObject>, rowIndex: number, columnIndex: number) => Nullable<boolean>): Nullable<boolean>;
     getFirstCell(): BaseValueObject;
@@ -120,12 +115,7 @@ export declare class BaseReferenceObject extends ObjectClassType {
     getCellPattern(unitId: string, sheetId: string, row: number, column: number): string;
     toArrayValueObject(useCache?: boolean): ArrayValueObject;
     toUnitRange(): {
-        range: {
-            startRow: number;
-            endRow: number;
-            startColumn: number;
-            endColumn: number;
-        };
+        range: IRange;
         sheetId: string;
         unitId: string;
     };

package/lib/types/engine/reference-object/multi-area-reference-object.d.ts

@@ -62,19 +62,9 @@ export declare class MultiAreaReferenceObject extends BaseReferenceObject {
      * - inner `_areas[row]` dimension => columns
      */
     toArrayValueObject(): ArrayValueObject;
-    getRangePosition(): {
-        startRow: number;
-        endRow: number;
-        startColumn: number;
-        endColumn: number;
-    };
+    getRangePosition(): import('@univerjs/core').IRange;
     toUnitRange(): {
-        range: {
-            startRow: number;
-            endRow: number;
-            startColumn: number;
-            endColumn: number;
-        };
+        range: import('@univerjs/core').IRange;
         sheetId: string;
         unitId: string;
     };

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

@@ -101,24 +101,11 @@ export declare class FFormula extends FBase {
      */
     calculationEnd(callback: (functionsExecutedState: FormulaExecutedStateType) => void): IDisposable;
     /**
-     * Wait for computing in the Univer instance to complete. Please note that this does not only include formula calculation,
-     * but also other computing tasks, e.g. pivot table calculation.
-     * @param {number} [timeout] The maximum time to wait for the computing to complete, in milliseconds. The default
-     * value is 30,000 milliseconds.
-     * @returns {Promise<boolean>} This method returns `true` if the computing is complete. If the timeout is reached, this
-     * method returns `false`.
-     *
-     * @example
-     * ```ts
-     * const formulaEngine = univerAPI.getFormula();
-     * formulaEngine.whenComputingCompleteAsync(3000).then((isComplete) => {
-     *   console.log('Computing complete:', isComplete);
-     * });
-     * ```
+     * @deprecated Use `onCalculationEnd` instead.
      */
     whenComputingCompleteAsync(timeout?: number): Promise<boolean>;
     /**
-     * @deprecated Use `whenComputingCompleteAsync` instead.
+     * Waits for the formula calculation to complete.
      * @returns {Promise<void>} This method returns a promise that resolves when the calculation is complete.
      */
     onCalculationEnd(): Promise<void>;

package/lib/types/index.d.ts

@@ -17,6 +17,7 @@ export type { IArrayFormulaEmbeddedMap, IArrayFormulaRangeType, IArrayFormulaUni
 export { BooleanValue } from './basics/common';
 export { type IOtherFormulaData } from './basics/common';
 export type { IExprTreeNode, ISuperTable, IUnitRowData } from './basics/common';
+export { excelDateSerial } from './basics/date';
 export { isInDirtyRange } from './basics/dirty';
 export { ERROR_TYPE_SET, ErrorType } from './basics/error-type';
 export { type ISheetFormulaError } from './basics/error-type';