@univerjs/sheets-formula 0.5.0-alpha.0 → 0.5.0-beta.0

package/lib/types/controllers/trigger-calculation.controller.d.ts

@@ -1,5 +1,6 @@
 import { Disposable, ICommandService, IConfigService, ILogService, LocaleService } from '@univerjs/core';
 import { FormulaDataModel, IActiveDirtyManagerService } from '@univerjs/engine-formula';
+import { RegisterOtherFormulaService } from '../services/register-other-formula.service';
 /**
  * This interface is for the progress bar to display the calculation progress.
  */
@@ -18,6 +19,7 @@ export declare class TriggerCalculationController extends Disposable {
     private readonly _configService;
     private readonly _formulaDataModel;
     private readonly _localeService;
+    private readonly _registerOtherFormulaService;
     private _waitingCommandQueue;
     private _executingDirtyData;
     private _setTimeoutKey;
@@ -38,7 +40,7 @@ export declare class TriggerCalculationController extends Disposable {
     private _calculateProgress;
     private _completeProgress;
     clearProgress(): void;
-    constructor(_commandService: ICommandService, _activeDirtyManagerService: IActiveDirtyManagerService, _logService: ILogService, _configService: IConfigService, _formulaDataModel: FormulaDataModel, _localeService: LocaleService);
+    constructor(_commandService: ICommandService, _activeDirtyManagerService: IActiveDirtyManagerService, _logService: ILogService, _configService: IConfigService, _formulaDataModel: FormulaDataModel, _localeService: LocaleService, _registerOtherFormulaService: RegisterOtherFormulaService);
     dispose(): void;
     private _commandExecutedListener;
     private _generateDirty;

package/lib/types/services/__test__/formula-ref.spec.d.ts

@@ -0,0 +1,16 @@
+/**
+ * Copyright 2023-present DreamNum Inc.
+ *
+ * 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.
+ */
+export {};

package/lib/types/services/__test__/util.d.ts

@@ -0,0 +1,7 @@
+import { Dependency, IWorkbookData, Workbook, Injector, Univer } from '@univerjs/core';
+export interface ITestBed {
+    univer: Univer;
+    get: Injector['get'];
+    sheet: Workbook;
+}
+export declare function createCommandTestBed(workbookData?: IWorkbookData, dependencies?: Dependency[]): ITestBed;

package/lib/types/services/formula-ref-range.service.d.ts

@@ -1,4 +1,4 @@
-import { IDisposable, IMutationInfo, IRange, Disposable, IUniverInstanceService } from '@univerjs/core';
+import { IDisposable, IMutationInfo, IRange, Disposable, Injector, IUniverInstanceService } from '@univerjs/core';
 import { EffectRefRangeParams, RefRangeService } from '@univerjs/sheets';
 import { LexerTreeBuilder } from '@univerjs/engine-formula';
 export type FormulaChangeMap = Record<string, Record<string, Record<string, string>>>;
@@ -6,8 +6,8 @@ export type FormulaChangeCallback = (formulaString: string) => {
     redos: IMutationInfo[];
     undos: IMutationInfo[];
 };
-export type RangeFormulaChangeCallback = (formulas: {
-    formulaString: string;
+export type RangeFormulaChangeCallback = (infos: {
+    formulas: string[];
     ranges: IRange[];
 }[]) => {
     redos: IMutationInfo[];
@@ -17,7 +17,10 @@ export declare class FormulaRefRangeService extends Disposable {
     private readonly _refRangeService;
     private readonly _lexerTreeBuilder;
     private readonly _univerInstanceService;
-    constructor(_refRangeService: RefRangeService, _lexerTreeBuilder: LexerTreeBuilder, _univerInstanceService: IUniverInstanceService);
+    private readonly _injector;
+    constructor(_refRangeService: RefRangeService, _lexerTreeBuilder: LexerTreeBuilder, _univerInstanceService: IUniverInstanceService, _injector: Injector);
     transformFormulaByEffectCommand(unitId: string, subUnitId: string, formula: string, params: EffectRefRangeParams): string;
     registerFormula(unitId: string, subUnitId: string, formula: string, callback: FormulaChangeCallback): IDisposable;
+    private _getFormulaDependcy;
+    registerRangeFormula(unitId: string, subUnitId: string, oldRanges: IRange[], formulas: string[], callback: RangeFormulaChangeCallback): IDisposable;
 }

package/lib/types/services/register-other-formula.service.d.ts

@@ -1,23 +1,12 @@
-import { IRange, Nullable, Disposable, ICommandService } from '@univerjs/core';
+import { IRange, Nullable, Disposable, ICommandService, LifecycleService } from '@univerjs/core';
 import { IActiveDirtyManagerService } from '@univerjs/engine-formula';
+import { BehaviorSubject } from 'rxjs';
 import { IOtherFormulaResult } from './formula-common';
 export declare class RegisterOtherFormulaService extends Disposable {
     private readonly _commandService;
     private _activeDirtyManagerService;
+    private readonly _lifecycleService;
     private _formulaCacheMap;
-    /**
-     * @deprecated Use _formulaChangeWithRange$ instead
-     */
-    private _formulaChange$;
-    /**
-     * @deprecated Use formulaChangeWithRange$ instead
-     */
-    formulaChange$: import('rxjs').Observable<{
-        unitId: string;
-        subUnitId: string;
-        formulaText: string;
-        formulaId: string;
-    }>;
     private _formulaChangeWithRange$;
     formulaChangeWithRange$: import('rxjs').Observable<{
         unitId: string;
@@ -28,21 +17,13 @@ export declare class RegisterOtherFormulaService extends Disposable {
     }>;
     private _formulaResult$;
     formulaResult$: import('rxjs').Observable<Record<string, Record<string, IOtherFormulaResult[]>>>;
-    constructor(_commandService: ICommandService, _activeDirtyManagerService: IActiveDirtyManagerService);
+    calculateStarted$: BehaviorSubject<boolean>;
+    constructor(_commandService: ICommandService, _activeDirtyManagerService: IActiveDirtyManagerService, _lifecycleService: LifecycleService);
     dispose(): void;
     private _ensureCacheMap;
     private _createFormulaId;
     private _initFormulaRegister;
     private _initFormulaCalculationResultChange;
-    /**
-     * @deprecated Use registerFormulaWithRange instead
-     * @param unitId
-     * @param subUnitId
-     * @param formulaText
-     * @param extra
-     * @returns
-     */
-    registerFormula(unitId: string, subUnitId: string, formulaText: string, extra?: Record<string, any>): string;
     registerFormulaWithRange(unitId: string, subUnitId: string, formulaText: string, ranges?: IRange[], extra?: Record<string, any>): string;
     deleteFormula(unitId: string, subUnitId: string, formulaIdList: string[]): void;
     getFormulaValue(unitId: string, subUnitId: string, formulaId: string): Promise<Nullable<IOtherFormulaResult>>;