@univerjs/engine-formula 0.1.6 → 0.1.7

package/lib/types/commands/mutations/set-array-formula-data.mutation.d.ts

@@ -1,10 +1,11 @@
 import { IArrayFormulaRangeType, IArrayFormulaUnitCellType } from '../../basics/common';
-import { IAccessor } from '@wendellhu/redi';
 import { IMutation } from '@univerjs/core';
 
 export interface ISetArrayFormulaDataMutationParams {
     arrayFormulaRange: IArrayFormulaRangeType;
     arrayFormulaCellData: IArrayFormulaUnitCellType;
 }
-export declare const SetArrayFormulaDataUndoMutationFactory: (accessor: IAccessor) => ISetArrayFormulaDataMutationParams;
+/**
+ * There is no need to process data here, it is used as the main thread to send data to the worker. The main thread has already updated the data in advance, and there is no need to update it again here.
+ */
 export declare const SetArrayFormulaDataMutation: IMutation<ISetArrayFormulaDataMutationParams>;

package/lib/types/commands/mutations/set-defined-name.mutation.d.ts

@@ -1,4 +1,4 @@
-import { IMutation, IRange } from '@univerjs/core';
+import { IMutation } from '@univerjs/core';
 
 export interface ISetDefinedNameMutationSearchParam {
     unitId: string;
@@ -17,9 +17,3 @@ export interface ISetDefinedNameMutationParam extends ISetDefinedNameMutationSea
  */
 export declare const SetDefinedNameMutation: IMutation<ISetDefinedNameMutationParam>;
 export declare const RemoveDefinedNameMutation: IMutation<ISetDefinedNameMutationParam>;
-export interface ISetDefinedNameCurrentMutationParam {
-    unitId: string;
-    sheetId: string;
-    range: IRange;
-}
-export declare const SetDefinedNameCurrentMutation: IMutation<ISetDefinedNameCurrentMutationParam>;

package/lib/types/commands/mutations/set-formula-data.mutation.d.ts

@@ -4,4 +4,7 @@ import { IMutation } from '@univerjs/core';
 export interface ISetFormulaDataMutationParams {
     formulaData: IFormulaData;
 }
+/**
+ * There is no need to process data here, it is used as the main thread to send data to the worker. The main thread has already updated the data in advance, and there is no need to update it again here.
+ */
 export declare const SetFormulaDataMutation: IMutation<ISetFormulaDataMutationParams>;

package/lib/types/engine/value-object/array-value-object.d.ts

@@ -18,6 +18,10 @@ export declare class ArrayValueObject extends BaseValueObject {
     private _currentColumn;
     private _sliceCache;
     private _flattenCache;
+    /**
+     * The default value of the array, null values in comparison results support setting to false
+     */
+    private _defaultValue;
     private _flattenPosition;
     constructor(rawValue: string | IArrayValueObject);
     dispose(): void;
@@ -36,6 +40,7 @@ export declare class ArrayValueObject extends BaseValueObject {
     getArrayValue(): Nullable<BaseValueObject>[][];
     setArrayValue(value: BaseValueObject[][]): void;
     isArray(): boolean;
+    setDefaultValue(value: Nullable<BaseValueObject>): void;
     get(row: number, column: number): BaseValueObject | null;
     getRealValue(row: number, column: number): BaseValueObject | null;
     set(row: number, column: number, value: Nullable<BaseValueObject>): void;

package/lib/types/functions/information/isref/index.d.ts

@@ -1,6 +1,6 @@
 import { BaseFunction } from '../../base-function';
+import { BooleanValueObject } from '../../../engine/value-object/primitive-object';
 import { BaseValueObject, ErrorValueObject } from '../../../engine/value-object/base-value-object';
-import { BooleanValueObject } from '../../..';
 
 export declare class Isref extends BaseFunction {
     needsReferenceObject: boolean;

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

@@ -1,4 +1,4 @@
-import { ArrayValueObject } from '../../..';
+import { ArrayValueObject } from '../../../engine/value-object/array-value-object';
 import { BaseFunction } from '../../base-function';
 import { FunctionVariantType } from '../../../engine/reference-object/base-reference-object';
 

package/lib/types/functions/statistical/maxifs/__tests__/index.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/functions/statistical/maxifs/index.d.ts

@@ -0,0 +1,7 @@
+import { BaseFunction } from '../../base-function';
+import { BaseValueObject, ErrorValueObject } from '../../../engine/value-object/base-value-object';
+import { ArrayValueObject } from '../../../engine/value-object/array-value-object';
+
+export declare class Maxifs extends BaseFunction {
+    calculate(maxRange: BaseValueObject, ...variants: BaseValueObject[]): ErrorValueObject | ArrayValueObject;
+}

package/lib/types/index.d.ts

@@ -15,15 +15,15 @@
  */
 export type { IArrayFormulaRangeType, IArrayFormulaUnitCellType, IDirtyUnitFeatureMap, IDirtyUnitSheetNameMap, IFormulaData, IFormulaDataItem, IFormulaDatasetConfig, IRuntimeUnitDataType, ISheetData, IUnitData, IUnitSheetNameMap, INumfmtItemMap, IDirtyUnitOtherFormulaMap, IDirtyUnitSheetDefinedNameMap, } from './basics/common';
 export { isInDirtyRange } from './basics/dirty';
-export { ErrorType } from './basics/error-type';
+export { ErrorType, ERROR_TYPE_SET } from './basics/error-type';
 export { FunctionType, type IFunctionInfo, type IFunctionParam } from './basics/function';
 export { type IFunctionNames } from './basics/function';
 export { includeFormulaLexerToken, isFormulaLexerToken, normalizeSheetName } from './basics/match-token';
 export { convertUnitDataToRuntime } from './basics/runtime';
 export { matchToken, compareToken, operatorToken } from './basics/token';
 export { RegisterFunctionMutation } from './commands/mutations/register-function.mutation';
-export { type ISetArrayFormulaDataMutationParams, SetArrayFormulaDataMutation, SetArrayFormulaDataUndoMutationFactory, } from './commands/mutations/set-array-formula-data.mutation';
-export { RemoveDefinedNameMutation, SetDefinedNameMutation, SetDefinedNameCurrentMutation, type ISetDefinedNameMutationSearchParam, type ISetDefinedNameMutationParam } from './commands/mutations/set-defined-name.mutation';
+export { type ISetArrayFormulaDataMutationParams, SetArrayFormulaDataMutation, } from './commands/mutations/set-array-formula-data.mutation';
+export { RemoveDefinedNameMutation, SetDefinedNameMutation, type ISetDefinedNameMutationSearchParam, type ISetDefinedNameMutationParam } from './commands/mutations/set-defined-name.mutation';
 export { RemoveFeatureCalculationMutation, SetFeatureCalculationMutation, } from './commands/mutations/set-feature-calculation.mutation';
 export { type ISetFormulaCalculationNotificationMutation, type ISetFormulaCalculationResultMutation, type ISetFormulaCalculationStartMutation, SetFormulaCalculationNotificationMutation, SetFormulaCalculationResultMutation, SetFormulaCalculationStartMutation, SetFormulaCalculationStopMutation, } from './commands/mutations/set-formula-calculation.mutation';
 export { type ISetFormulaDataMutationParams, SetFormulaDataMutation, } from './commands/mutations/set-formula-data.mutation';
@@ -95,3 +95,4 @@ export { isFormulaTransformable, transformFormula } from './engine/utils/relativ
 export { IFormulaRuntimeService, FormulaRuntimeService } from './services/runtime.service';
 export { IFormulaCurrentConfigService, FormulaCurrentConfigService } from './services/current-data.service';
 export { IActiveDirtyManagerService } from './services/active-dirty-manager.service';
+export type { IRangeChange } from './models/formula-data.model';

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

@@ -1,11 +1,11 @@
+import { IFormulaIdMap } from './utils/formula-data-util';
 import { LexerTreeBuilder } from '../engine/analysis/lexer-tree-builder';
 import { IArrayFormulaRangeType, IArrayFormulaUnitCellType, IFormulaData, IFormulaDataItem, INumfmtItemMap, IRuntimeUnitDataType, IUnitData, IUnitSheetNameMap } from '../basics/common';
-import { ICellData, IObjectMatrixPrimitiveType, Nullable, Disposable, IUniverInstanceService, ObjectMatrix } from '@univerjs/core';
+import { ICellData, IObjectMatrixPrimitiveType, IRange, Nullable, Disposable, IUniverInstanceService, ObjectMatrix } from '@univerjs/core';
 
-export interface IFormulaIdMap {
-    f: string;
-    r: number;
-    c: number;
+export interface IRangeChange {
+    oldCell: IRange;
+    newCell: IRange;
 }
 export declare class FormulaDataModel extends Disposable {
     private readonly _currentUniverService;
@@ -28,13 +28,14 @@ export declare class FormulaDataModel extends Disposable {
     setNumfmtItemMap(value: INumfmtItemMap): void;
     updateNumfmtItemMap(value: INumfmtItemMap): void;
     mergeArrayFormulaRange(formulaData: IArrayFormulaRangeType): void;
+    mergeFormulaData(formulaData: IFormulaData): void;
     deleteArrayFormulaRange(unitId: string, sheetId: string, row: number, column: number): void;
     initFormulaData(): void;
     getCalculateData(): {
         allUnitData: IUnitData;
         unitSheetNameMap: IUnitSheetNameMap;
     };
-    updateFormulaData(unitId: string, sheetId: string, cellValue: IObjectMatrixPrimitiveType<Nullable<ICellData>>): void;
+    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;
     updateNumfmtData(unitId: string, sheetId: string, cellValue: IObjectMatrixPrimitiveType<Nullable<ICellData>>): void;
@@ -42,4 +43,8 @@ export declare class FormulaDataModel extends Disposable {
     getFormulaDataItem(row: number, column: number, sheetId: string, unitId: string): IFormulaDataItem | undefined;
     getFormulaIdMap(unitId: string, sheetId: string): Map<string, IFormulaIdMap>;
 }
-export declare function initSheetFormulaData(formulaData: IFormulaData, unitId: string, sheetId: string, cellMatrix: ObjectMatrix<Nullable<ICellData>>): void;
+export declare function initSheetFormulaData(formulaData: IFormulaData, unitId: string, sheetId: string, cellMatrix: ObjectMatrix<Nullable<ICellData>>): {
+    [x: string]: {
+        [x: string]: IObjectMatrixPrimitiveType<IFormulaDataItem>;
+    };
+};

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

@@ -0,0 +1,10 @@
+import { IFormulaDataItem } from '../../basics/common';
+import { ICellData, IRange, Nullable, ObjectMatrix } from '@univerjs/core';
+
+export interface IFormulaIdMap {
+    f: string;
+    r: number;
+    c: number;
+}
+export declare function updateFormulaDataByCellValue(sheetFormulaDataMatrix: ObjectMatrix<IFormulaDataItem>, newSheetFormulaDataMatrix: ObjectMatrix<IFormulaDataItem | null>, formulaIdMap: Map<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;