@univerjs/sheets-formula 0.1.7 → 0.1.9

package/lib/types/commands/mutations/formula.mutation.d.ts

@@ -0,0 +1,10 @@
+import { IMutation } from '@univerjs/core';
+
+export interface IOtherFormulaMarkDirtyParams {
+    [unitId: string]: {
+        [sunUnitId: string]: {
+            [formulaId: string]: boolean;
+        };
+    };
+}
+export declare const OtherFormulaMarkDirty: IMutation<IOtherFormulaMarkDirtyParams>;

package/lib/types/commands/operations/__tests__/create-command-test-bed.d.ts

@@ -1,7 +1,7 @@
 import { Dependency } from '@wendellhu/redi';
 import { IWorkbookData, Univer } from '@univerjs/core';
 
-export declare function createCommandTestBed(workbookConfig?: IWorkbookData, dependencies?: Dependency[]): {
+export declare function createCommandTestBed(workbookData?: IWorkbookData, dependencies?: Dependency[]): {
     univer: Univer;
     get: {
         <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, lookUp?: import('@wendellhu/redi').LookUp | undefined): T;

package/lib/types/controllers/__tests__/create-command-test-bed.d.ts

@@ -6,4 +6,4 @@ export interface ITestBed {
     get: Injector['get'];
     sheet: Workbook;
 }
-export declare function createCommandTestBed(workbookConfig?: IWorkbookData, dependencies?: Dependency[]): ITestBed;
+export declare function createCommandTestBed(workbookData?: IWorkbookData, dependencies?: Dependency[]): ITestBed;

package/lib/types/controllers/active-dirty.controller.d.ts

@@ -3,12 +3,16 @@ import { Disposable, IUniverInstanceService } from '@univerjs/core';
 
 export declare class ActiveDirtyController extends Disposable {
     private readonly _activeDirtyManagerService;
-    private readonly _currentUniverService;
+    private readonly _univerInstanceService;
     private readonly _formulaDataModel;
     private readonly _definedNamesService;
-    constructor(_activeDirtyManagerService: IActiveDirtyManagerService, _currentUniverService: IUniverInstanceService, _formulaDataModel: FormulaDataModel, _definedNamesService: IDefinedNamesService);
+    constructor(_activeDirtyManagerService: IActiveDirtyManagerService, _univerInstanceService: IUniverInstanceService, _formulaDataModel: FormulaDataModel, _definedNamesService: IDefinedNamesService);
     private _initialize;
     private _initialConversion;
+    private _initialMove;
+    private _initialRowAndColumn;
+    private _initialSheet;
+    private _initialDefinedName;
     private _getDefinedNameMutation;
     private _getSetRangeValuesMutationDirtyRange;
     private _getMoveRangeMutationDirtyRange;

package/lib/types/controllers/formula-clipboard.controller.d.ts

@@ -1,7 +1,7 @@
 import { IAccessor, Injector } from '@wendellhu/redi';
-import { ICellDataWithSpanInfo, COPY_TYPE, ISheetClipboardService } from '@univerjs/sheets-ui';
+import { COPY_TYPE, ISheetClipboardService, ICellDataWithSpanInfo, IDiscreteRange } from '@univerjs/sheets-ui';
 import { LexerTreeBuilder } from '@univerjs/engine-formula';
-import { IMutationInfo, IRange, Disposable, IUniverInstanceService, ObjectMatrix } from '@univerjs/core';
+import { IMutationInfo, Disposable, IUniverInstanceService, ObjectMatrix } from '@univerjs/core';
 
 export declare const DEFAULT_PASTE_FORMULA = "default-paste-formula";
 export declare class FormulaClipboardController extends Disposable {
@@ -16,9 +16,10 @@ export declare class FormulaClipboardController extends Disposable {
     private _pasteWithFormulaHook;
     private _onPasteCells;
 }
-export declare function getSetCellFormulaMutations(unitId: string, subUnitId: string, range: IRange, matrix: ObjectMatrix<ICellDataWithSpanInfo>, accessor: IAccessor, copyInfo: {
+export declare function getSetCellFormulaMutations(unitId: string, subUnitId: string, range: IDiscreteRange, matrix: ObjectMatrix<ICellDataWithSpanInfo>, accessor: IAccessor, copyInfo: {
     copyType: COPY_TYPE;
-    copyRange?: IRange;
+    copyRange?: IDiscreteRange;
+    pasteType: string;
 }, lexerTreeBuilder: LexerTreeBuilder, isSpecialPaste?: boolean): {
     undos: IMutationInfo<object>[];
     redos: IMutationInfo<object>[];

package/lib/types/controllers/prompt.controller.d.ts

@@ -19,7 +19,7 @@ export declare class PromptController extends Disposable {
     private readonly _themeService;
     private readonly _selectionManagerService;
     private readonly _sheetSkeletonManagerService;
-    private readonly _currentUniverService;
+    private readonly _univerInstanceService;
     private readonly _selectionRenderService;
     private readonly _descriptionService;
     private readonly _textSelectionManagerService;
@@ -40,7 +40,7 @@ export declare class PromptController extends Disposable {
     private _userCursorMove;
     private _previousEditorUnitId;
     private _existsSequenceNode;
-    constructor(_commandService: ICommandService, _contextService: IContextService, _textSelectionRenderManager: ITextSelectionRenderManager, _editorBridgeService: EditorBridgeService, _formulaPromptService: IFormulaPromptService, _lexerTreeBuilder: LexerTreeBuilder, _renderManagerService: IRenderManagerService, _themeService: ThemeService, _selectionManagerService: SelectionManagerService, _sheetSkeletonManagerService: SheetSkeletonManagerService, _currentUniverService: IUniverInstanceService, _selectionRenderService: ISelectionRenderService, _descriptionService: IDescriptionService, _textSelectionManagerService: TextSelectionManagerService, _docViewModelManagerService: DocViewModelManagerService, _contextMenuService: IContextMenuService, _editorService: IEditorService);
+    constructor(_commandService: ICommandService, _contextService: IContextService, _textSelectionRenderManager: ITextSelectionRenderManager, _editorBridgeService: EditorBridgeService, _formulaPromptService: IFormulaPromptService, _lexerTreeBuilder: LexerTreeBuilder, _renderManagerService: IRenderManagerService, _themeService: ThemeService, _selectionManagerService: SelectionManagerService, _sheetSkeletonManagerService: SheetSkeletonManagerService, _univerInstanceService: IUniverInstanceService, _selectionRenderService: ISelectionRenderService, _descriptionService: IDescriptionService, _textSelectionManagerService: TextSelectionManagerService, _docViewModelManagerService: DocViewModelManagerService, _contextMenuService: IContextMenuService, _editorService: IEditorService);
     dispose(): void;
     private _resetTemp;
     private _initialize;
@@ -104,6 +104,7 @@ export declare class PromptController extends Disposable {
      * @param refSelections
      */
     private _refreshSelectionForReference;
+    private _getPrimary;
     private _getSheetIdByName;
     private _getSheetNameById;
     private _getCurrentUnitIdAndSheetId;
@@ -143,6 +144,10 @@ export declare class PromptController extends Disposable {
     private _refreshFormulaAndCellEditor;
     private _setRemainCapture;
     private _cursorStateListener;
+    private _pressEnter;
+    private _pressTab;
+    private _pressEsc;
+    private _pressArrowKey;
     private _commandExecutedListener;
     private _moveInEditor;
     private _userMouseListener;

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

@@ -1,3 +1,4 @@
+import { IProgressService } from '@univerjs/ui';
 import { INumfmtService } from '@univerjs/sheets';
 import { FormulaDataModel, IActiveDirtyManagerService } from '@univerjs/engine-formula';
 import { Disposable, ICommandService } from '@univerjs/core';
@@ -7,11 +8,13 @@ export declare class TriggerCalculationController extends Disposable {
     private readonly _activeDirtyManagerService;
     private readonly _numfmtService;
     private readonly _formulaDataModel;
+    private readonly _progressService;
     private _waitingCommandQueue;
     private _executingCommandQueue;
     private _setTimeoutKey;
     private _startExecutionTime;
-    constructor(_commandService: ICommandService, _activeDirtyManagerService: IActiveDirtyManagerService, _numfmtService: INumfmtService, _formulaDataModel: FormulaDataModel);
+    private _formulaCalculationDoneCount;
+    constructor(_commandService: ICommandService, _activeDirtyManagerService: IActiveDirtyManagerService, _numfmtService: INumfmtService, _formulaDataModel: FormulaDataModel, _progressService: IProgressService);
     private _initialize;
     private _commandExecutedListener;
     private _generateDirty;
@@ -19,4 +22,9 @@ export declare class TriggerCalculationController extends Disposable {
     private _mergeDirtyUnitFeatureOrOtherFormulaMap;
     private _initialExecuteFormulaProcessListener;
     private _initialExecuteFormula;
+    /**
+     * Update progress by completed count
+     * @param completedCount
+     */
+    private _pushTask;
 }

package/lib/types/controllers/update-formula.controller.d.ts

@@ -15,14 +15,14 @@ import { Disposable, ICommandService, IUniverInstanceService } from '@univerjs/c
    3. onCommandExecuted, before formula calculation, use the setRangeValues information to delete the old formulaData, ArrayFormula and ArrayFormulaCellData, and send the worker (complementary setRangeValues after collaborative conflicts, normal operation triggers formula update, undo/redo are captured and processed here)
  */
 export declare class UpdateFormulaController extends Disposable {
-    private readonly _currentUniverService;
+    private readonly _univerInstanceService;
     private readonly _commandService;
     private readonly _lexerTreeBuilder;
     private readonly _formulaDataModel;
     private _sheetInterceptorService;
     private _selectionManagerService;
     readonly _injector: Injector;
-    constructor(_currentUniverService: IUniverInstanceService, _commandService: ICommandService, _lexerTreeBuilder: LexerTreeBuilder, _formulaDataModel: FormulaDataModel, _sheetInterceptorService: SheetInterceptorService, _selectionManagerService: SelectionManagerService, _injector: Injector);
+    constructor(_univerInstanceService: IUniverInstanceService, _commandService: ICommandService, _lexerTreeBuilder: LexerTreeBuilder, _formulaDataModel: FormulaDataModel, _sheetInterceptorService: SheetInterceptorService, _selectionManagerService: SelectionManagerService, _injector: Injector);
     private _initialize;
     private _commandExecutedListener;
     private _handleSetRangeValuesMutation;

package/lib/types/controllers/utils/offset-formula-data.d.ts

@@ -1,41 +1,14 @@
-import { ISelectionWithStyle } from '@univerjs/sheets';
-import { IArrayFormulaRangeType } from '@univerjs/engine-formula';
-import { ICommandInfo, IObjectMatrixPrimitiveType, IRange, Nullable, ObjectMatrix } from '@univerjs/core';
+import { IArrayFormulaRangeType, IArrayFormulaUnitCellType, IFormulaData } from '@univerjs/engine-formula';
+import { IRange } from '@univerjs/core';
 
-interface IFormulaDataGenerics<T> {
-    [unitId: string]: Nullable<{
-        [sheetId: string]: IObjectMatrixPrimitiveType<T>;
-    }>;
-}
 export interface IRefRangeWithPosition {
     row: number;
     column: number;
     range: IRange;
 }
-export declare function offsetFormula<T>(formulaData: IFormulaDataGenerics<T>, command: ICommandInfo, unitId: string, sheetId: string, selections?: Readonly<Nullable<ISelectionWithStyle[]>>, formulaRangeData?: IFormulaDataGenerics<IRange>, refRanges?: IRefRangeWithPosition[]): IFormulaDataGenerics<T>;
-export declare function offsetArrayFormula(arrayFormulaRange: IArrayFormulaRangeType, command: ICommandInfo, unitId: string, sheetId: string): IArrayFormulaRangeType;
-export declare function checkFormulaDataNull<T>(formulaData: IFormulaDataGenerics<T>, unitId: string, sheetId: string): boolean;
-export declare function removeFormulaData<T>(formulaData: IFormulaDataGenerics<T>, unitId: string, sheetId: string): {
+export declare function checkFormulaDataNull(formulaData: IFormulaData, unitId: string, sheetId: string): boolean;
+export declare function removeFormulaData(formulaData: IFormulaData | IArrayFormulaRangeType | IArrayFormulaUnitCellType, unitId: string, sheetId: string): {
     [x: string]: {
         [x: string]: null;
     };
 } | undefined;
-export declare function removeValueFormulaArray<T>(formulaRange: IRange, formulaMatrix: ObjectMatrix<T>): void;
-export declare function inFormulaRange(row: number, column: number, formulaMatrix?: ObjectMatrix<IRange>): boolean;
-export declare function moveRangeUpdateFormulaData<T>(fromRange: IRange, toRange: IRange, fromArrayFormulaCellDataMatrix: ObjectMatrix<T>, toArrayFormulaCellDataMatrix: ObjectMatrix<T>, arrayFormulaRangeMatrix?: ObjectMatrix<IRange>): void;
-/**
- *  Handle arrayFormulaRange and arrayFormulaCellData. If removing rows affects the array formula, the array formula cell data needs to be cleared and will be regenerated during recalculation.
- * @param range
- * @param formulaMatrix
- * @param formulaRangeMatrix
- * @param refRanges
- */
-export declare function removeFormulaArrayRow<T>(range: IRange, formulaMatrix: ObjectMatrix<T>, formulaRangeMatrix: ObjectMatrix<IRange>, refRanges?: IRefRangeWithPosition[]): void;
-/**
- * Handle arrayFormulaRange and arrayFormulaCellData. If removing columns affects the array formula, the array formula cell data needs to be cleared and will be regenerated during recalculation.
- * @param range
- * @param formulaRangeMatrix
- * @param refRanges
- */
-export declare function removeFormulaArrayColumn<T>(range: IRange, formulaMatrix: ObjectMatrix<T>, formulaRangeMatrix: ObjectMatrix<IRange>, refRanges?: IRefRangeWithPosition[]): void;
-export {};

package/lib/types/controllers/utils/ref-range-formula.d.ts

@@ -62,5 +62,5 @@ export declare function refRangeFormula(oldFormulaData: IFormulaData, newFormula
  * │ =SUM(1)          │ id1 │ 0 │ 1 │           │ id1 │
  * └──────────────────┴─────┴───┴───┴───────────┴─────┘
  */
-export declare function formulaDataItemToCellData(formulaDataItem: IFormulaDataItem): ICellData | null;
+export declare function formulaDataItemToCellData(formulaDataItem: Nullable<IFormulaDataItem>): Nullable<ICellData>;
 export declare function isFormulaDataItem(cell: IFormulaDataItem): boolean;

package/lib/types/formula-ui-plugin.d.ts

@@ -1,6 +1,6 @@
 import { Ctor, Injector } from '@wendellhu/redi';
 import { BaseFunction, IFunctionInfo, IFunctionNames } from '@univerjs/engine-formula';
-import { IUniverInstanceService, LocaleService, Plugin, PluginType } from '@univerjs/core';
+import { LocaleService, Plugin, UniverInstanceType } from '@univerjs/core';
 
 /**
  * The configuration of the formula UI plugin.
@@ -13,10 +13,10 @@ export declare class UniverSheetsFormulaPlugin extends Plugin {
     private _config;
     readonly _injector: Injector;
     private readonly _localeService;
-    private readonly _currentUniverService;
-    static type: PluginType;
-    constructor(_config: Partial<IFormulaUIConfig>, _injector: Injector, _localeService: LocaleService, _currentUniverService: IUniverInstanceService);
+    static pluginName: string;
+    static type: UniverInstanceType;
+    constructor(_config: Partial<IFormulaUIConfig>, _injector: Injector, _localeService: LocaleService);
     initialize(): void;
-    onReady(): void;
+    onStarting(): void;
 }
 export {};

package/lib/types/index.d.ts

@@ -23,3 +23,5 @@ export { RegisterFunctionService } from './services/register-function.service';
 export { IRegisterFunctionService } from './services/register-function.service';
 export { FormulaRefRangeService } from './services/formula-ref-range.service';
 export { SPECIAL_PASTE_FORMULA } from './commands/commands/formula-clipboard.command';
+export { RegisterOtherFormulaService } from './services/register-other-formula.service';
+export type { IFormulaInfo, IOtherFormulaResult } from './services/formula-common';

package/lib/types/locale/en-US.d.ts

@@ -1965,11 +1965,7 @@ declare const _default: {
                     url: string;
                 }[];
                 functionParameter: {
-                    number1: {
-                        name: string;
-                        detail: string;
-                    };
-                    number2: {
+                    value: {
                         name: string;
                         detail: string;
                     };
@@ -2057,11 +2053,7 @@ declare const _default: {
                     url: string;
                 }[];
                 functionParameter: {
-                    number1: {
-                        name: string;
-                        detail: string;
-                    };
-                    number2: {
+                    value: {
                         name: string;
                         detail: string;
                     };
@@ -2877,11 +2869,7 @@ declare const _default: {
                     url: string;
                 }[];
                 functionParameter: {
-                    number1: {
-                        name: string;
-                        detail: string;
-                    };
-                    number2: {
+                    text: {
                         name: string;
                         detail: string;
                     };

package/lib/types/locale/function-list/information/en-US.d.ts

@@ -118,11 +118,7 @@ declare const _default: {
             url: string;
         }[];
         functionParameter: {
-            number1: {
-                name: string;
-                detail: string;
-            };
-            number2: {
+            value: {
                 name: string;
                 detail: string;
             };
@@ -210,11 +206,7 @@ declare const _default: {
             url: string;
         }[];
         functionParameter: {
-            number1: {
-                name: string;
-                detail: string;
-            };
-            number2: {
+            value: {
                 name: string;
                 detail: string;
             };

package/lib/types/locale/function-list/information/ja-JP.d.ts

@@ -126,11 +126,7 @@ declare const _default: {
             url: string;
         }[];
         functionParameter: {
-            number1: {
-                name: string;
-                detail: string;
-            };
-            number2: {
+            value: {
                 name: string;
                 detail: string;
             };
@@ -234,11 +230,7 @@ declare const _default: {
             url: string;
         }[];
         functionParameter: {
-            number1: {
-                name: string;
-                detail: string;
-            };
-            number2: {
+            value: {
                 name: string;
                 detail: string;
             };

package/lib/types/locale/function-list/information/zh-CN.d.ts

@@ -118,11 +118,7 @@ declare const _default: {
             url: string;
         }[];
         functionParameter: {
-            number1: {
-                name: string;
-                detail: string;
-            };
-            number2: {
+            value: {
                 name: string;
                 detail: string;
             };
@@ -210,11 +206,7 @@ declare const _default: {
             url: string;
         }[];
         functionParameter: {
-            number1: {
-                name: string;
-                detail: string;
-            };
-            number2: {
+            value: {
                 name: string;
                 detail: string;
             };

package/lib/types/locale/function-list/text/en-US.d.ts

@@ -338,11 +338,7 @@ declare const _default: {
             url: string;
         }[];
         functionParameter: {
-            number1: {
-                name: string;
-                detail: string;
-            };
-            number2: {
+            text: {
                 name: string;
                 detail: string;
             };

package/lib/types/locale/function-list/text/ja-JP.d.ts

@@ -339,11 +339,7 @@ declare const _default: {
             url: string;
         }[];
         functionParameter: {
-            number1: {
-                name: string;
-                detail: string;
-            };
-            number2: {
+            text: {
                 name: string;
                 detail: string;
             };

package/lib/types/locale/function-list/text/zh-CN.d.ts

@@ -338,11 +338,7 @@ declare const _default: {
             url: string;
         }[];
         functionParameter: {
-            number1: {
-                name: string;
-                detail: string;
-            };
-            number2: {
+            text: {
                 name: string;
                 detail: string;
             };

package/lib/types/locale/zh-CN.d.ts

@@ -1965,11 +1965,7 @@ declare const _default: {
                     url: string;
                 }[];
                 functionParameter: {
-                    number1: {
-                        name: string;
-                        detail: string;
-                    };
-                    number2: {
+                    value: {
                         name: string;
                         detail: string;
                     };
@@ -2057,11 +2053,7 @@ declare const _default: {
                     url: string;
                 }[];
                 functionParameter: {
-                    number1: {
-                        name: string;
-                        detail: string;
-                    };
-                    number2: {
+                    value: {
                         name: string;
                         detail: string;
                     };
@@ -2877,11 +2869,7 @@ declare const _default: {
                     url: string;
                 }[];
                 functionParameter: {
-                    number1: {
-                        name: string;
-                        detail: string;
-                    };
-                    number2: {
+                    text: {
                         name: string;
                         detail: string;
                     };

package/lib/types/services/formula-common.d.ts

@@ -0,0 +1,19 @@
+import { ICellData, Nullable } from '@univerjs/core';
+
+export declare enum FormulaResultStatus {
+    NOT_REGISTER = 1,
+    SUCCESS = 2,
+    WAIT = 3,
+    ERROR = 4
+}
+export interface IOtherFormulaResult {
+    result?: Nullable<ICellData>[][];
+    status: FormulaResultStatus;
+    formulaId: string;
+    callbacks: Set<(value: Nullable<ICellData>[][]) => void>;
+    extra?: Record<string, any>;
+}
+export interface IFormulaInfo {
+    id: string;
+    text: string;
+}

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

@@ -0,0 +1,27 @@
+import { IOtherFormulaResult } from './formula-common';
+import { IActiveDirtyManagerService } from '@univerjs/engine-formula';
+import { Nullable, Disposable, ICommandService } from '@univerjs/core';
+
+export declare class RegisterOtherFormulaService extends Disposable {
+    private readonly _commandService;
+    private _activeDirtyManagerService;
+    private _formulaCacheMap;
+    private _formulaChange$;
+    formulaChange$: import('rxjs').Observable<{
+        unitId: string;
+        subUnitId: string;
+        formulaText: string;
+        formulaId: string;
+    }>;
+    private _formulaResult$;
+    formulaResult$: import('rxjs').Observable<Record<string, Record<string, IOtherFormulaResult[]>>>;
+    constructor(_commandService: ICommandService, _activeDirtyManagerService: IActiveDirtyManagerService);
+    private _ensureCacheMap;
+    private _createFormulaId;
+    private _initFormulaRegister;
+    private _initFormulaCalculationResultChange;
+    registerFormula(unitId: string, subUnitId: string, formulaText: string, extra?: Record<string, any>): string;
+    deleteFormula(unitId: string, subUnitId: string, formulaIdList: string[]): void;
+    getFormulaValue(unitId: string, subUnitId: string, formulaId: string): Promise<Nullable<IOtherFormulaResult>>;
+    getFormulaValueSync(unitId: string, subUnitId: string, formulaId: string): Nullable<IOtherFormulaResult>;
+}