@univerjs/engine-formula 0.1.0-alpha.2 → 0.1.0-beta.0

package/lib/types/functions/meta/compare/compare.d.ts

@@ -15,9 +15,10 @@
  */
 import { compareToken } from '../../../basics/token';
 import type { FunctionVariantType } from '../../../engine/reference-object/base-reference-object';
+import { type BaseValueObject } from '../../../engine/value-object/base-value-object';
 import { BaseFunction } from '../../base-function';
 export declare class Compare extends BaseFunction {
     private _compareType;
     setCompareType(token: compareToken): void;
-    calculate(variant1: FunctionVariantType, variant2: FunctionVariantType): import("../../../engine/value-object/base-value-object").CalculateValueType;
+    calculate(variant1: FunctionVariantType, variant2: FunctionVariantType): BaseValueObject;
 }

package/lib/types/functions/meta/divided/divided.d.ts

@@ -14,7 +14,8 @@
  * limitations under the License.
  */
 import type { FunctionVariantType } from '../../../engine/reference-object/base-reference-object';
+import { type BaseValueObject } from '../../../engine/value-object/base-value-object';
 import { BaseFunction } from '../../base-function';
 export declare class Divided extends BaseFunction {
-    calculate(variant1: FunctionVariantType, variant2: FunctionVariantType): import("../../../engine/value-object/base-value-object").CalculateValueType;
+    calculate(variant1: FunctionVariantType, variant2: FunctionVariantType): BaseValueObject;
 }

package/lib/types/functions/meta/minus/minus.d.ts

@@ -14,7 +14,8 @@
  * limitations under the License.
  */
 import type { FunctionVariantType } from '../../../engine/reference-object/base-reference-object';
+import type { BaseValueObject } from '../../../engine/value-object/base-value-object';
 import { BaseFunction } from '../../base-function';
 export declare class Minus extends BaseFunction {
-    calculate(variant1: FunctionVariantType, variant2: FunctionVariantType): import("../../../engine/value-object/base-value-object").CalculateValueType;
+    calculate(variant1: FunctionVariantType, variant2: FunctionVariantType): BaseValueObject;
 }

package/lib/types/functions/meta/multiply/multiply.d.ts

@@ -14,7 +14,8 @@
  * limitations under the License.
  */
 import type { FunctionVariantType } from '../../../engine/reference-object/base-reference-object';
+import { type BaseValueObject } from '../../../engine/value-object/base-value-object';
 import { BaseFunction } from '../../base-function';
 export declare class Multiply extends BaseFunction {
-    calculate(variant1: FunctionVariantType, variant2: FunctionVariantType): import("../../../engine/value-object/base-value-object").CalculateValueType;
+    calculate(variant1: FunctionVariantType, variant2: FunctionVariantType): BaseValueObject;
 }

package/lib/types/functions/meta/plus/plus.d.ts

@@ -14,7 +14,8 @@
  * limitations under the License.
  */
 import type { FunctionVariantType } from '../../../engine/reference-object/base-reference-object';
+import { type BaseValueObject } from '../../../engine/value-object/base-value-object';
 import { BaseFunction } from '../../base-function';
 export declare class Plus extends BaseFunction {
-    calculate(variant1: FunctionVariantType, variant2: FunctionVariantType): import("../../../engine/value-object/base-value-object").CalculateValueType;
+    calculate(variant1: FunctionVariantType, variant2: FunctionVariantType): BaseValueObject;
 }

package/lib/types/functions/statistical/average/average.d.ts

@@ -16,5 +16,5 @@
 import type { FunctionVariantType } from '../../../engine/reference-object/base-reference-object';
 import { BaseFunction } from '../../base-function';
 export declare class Average extends BaseFunction {
-    calculate(...variants: FunctionVariantType[]): import("../../../engine/value-object/base-value-object").CalculateValueType;
+    calculate(...variants: FunctionVariantType[]): FunctionVariantType;
 }

package/lib/types/{engine/other-object/error-value-object.d.ts → functions/statistical/counta/counta.d.ts}

@@ -13,14 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import type { ErrorType } from '../../basics/error-type';
-import { ObjectClassType } from '../../basics/object-class-type';
-export declare class ErrorValueObject extends ObjectClassType {
-    private _errorType;
-    static errorMap: Map<ErrorType, ErrorValueObject>;
-    constructor(_errorType: ErrorType);
-    static create(errorType: ErrorType): ErrorValueObject;
-    getErrorType(): ErrorType;
-    isEqual(object: ObjectClassType): boolean;
-    isErrorObject(): boolean;
+import type { FunctionVariantType } from '../../../engine/reference-object/base-reference-object';
+import type { BaseValueObject } from '../../../engine/value-object/base-value-object';
+import { BaseFunction } from '../../base-function';
+export declare class CountA extends BaseFunction {
+    calculate(...variants: FunctionVariantType[]): BaseValueObject;
 }

package/lib/types/functions/statistical/function-names.d.ts

@@ -17,5 +17,6 @@ export declare enum FUNCTION_NAMES_STATISTICAL {
     AVERAGE = "AVERAGE",
     COUNT = "COUNT",
     MAX = "MAX",
-    MIN = "MIN"
+    MIN = "MIN",
+    COUNTA = "COUNTA"
 }

package/lib/types/functions/statistical/max/max.d.ts

@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 import type { FunctionVariantType } from '../../../engine/reference-object/base-reference-object';
-import type { BaseValueObject } from '../../../engine/value-object/base-value-object';
 import { BaseFunction } from '../../base-function';
 export declare class Max extends BaseFunction {
-    calculate(...variants: FunctionVariantType[]): BaseValueObject;
+    calculate(...variants: FunctionVariantType[]): FunctionVariantType;
     private _validator;
 }

package/lib/types/index.d.ts

@@ -19,6 +19,7 @@ export { ErrorType } 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 } from './basics/token';
 export { compareToken } from './basics/token';
 export { type ISetArrayFormulaDataMutationParams, SetArrayFormulaDataMutation, SetArrayFormulaDataUndoMutationFactory, } from './commands/mutations/set-array-formula-data.mutation';
@@ -30,12 +31,11 @@ export { RemoveOtherFormulaMutation, SetOtherFormulaMutation } from './commands/
 export { RemoveSuperTableMutation, SetSuperTableMutation, SetSuperTableOptionMutation, } from './commands/mutations/set-super-table.mutation';
 export { LexerNode } from './engine/analysis/lexer-node';
 export { LexerTreeBuilder } from './engine/analysis/lexer-tree-builder';
-export { ErrorValueObject } from './engine/other-object/error-value-object';
 export { BaseReferenceObject, type FunctionVariantType } from './engine/reference-object/base-reference-object';
 export { RangeReferenceObject } from './engine/reference-object/range-reference-object';
 export { generateStringWithSequence, type ISequenceNode, sequenceNodeType } from './engine/utils/sequence';
 export { ArrayValueObject, ValueObjectFactory } from './engine/value-object/array-value-object';
-export { BaseValueObject } from './engine/value-object/base-value-object';
+export { BaseValueObject, ErrorValueObject } from './engine/value-object/base-value-object';
 export { NumberValueObject } from './engine/value-object/primitive-object';
 export { BooleanValueObject } from './engine/value-object/primitive-object';
 export { StringValueObject } from './engine/value-object/primitive-object';

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

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import type { ICellData, Nullable, ObjectMatrixPrimitiveType } from '@univerjs/core';
+import type { ICellData, IObjectMatrixPrimitiveType, Nullable } from '@univerjs/core';
 import { Disposable, IUniverInstanceService, ObjectMatrix } from '@univerjs/core';
 import type { IArrayFormulaRangeType, IArrayFormulaUnitCellType, IFormulaData, IFormulaDataItem, IRuntimeUnitDataType, IUnitData, IUnitSheetNameMap } from '../basics/common';
 import { LexerTreeBuilder } from '../engine/analysis/lexer-tree-builder';
@@ -44,9 +44,9 @@ export declare class FormulaDataModel extends Disposable {
         allUnitData: IUnitData;
         unitSheetNameMap: IUnitSheetNameMap;
     };
-    updateFormulaData(unitId: string, sheetId: string, cellValue: ObjectMatrixPrimitiveType<ICellData | null>): void;
+    updateFormulaData(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): IFormulaDataItem;
     getFormulaIdMap(unitId: string, sheetId: string): Map<string, IFormulaIdMap>;
 }
-export declare function initSheetFormulaData(formulaData: IFormulaData, unitId: string, sheetId: string, cellMatrix: ObjectMatrix<ICellData>): void;
+export declare function initSheetFormulaData(formulaData: IFormulaData, unitId: string, sheetId: string, cellMatrix: ObjectMatrix<Nullable<ICellData>>): void;

package/lib/types/services/current-data.service.d.ts

@@ -59,7 +59,6 @@ export declare class FormulaCurrentConfigService extends Disposable implements I
     registerUnitData(unitData: IUnitData): void;
     registerFormulaData(formulaData: IFormulaData): void;
     registerSheetNameMap(sheetNameMap: IUnitSheetNameMap): void;
-    private _dataToRuntime;
     private _loadSheetData;
 }
 export declare const IFormulaCurrentConfigService: import("@wendellhu/redi").IdentifierDecorator<FormulaCurrentConfigService>;

package/lib/types/services/runtime.service.d.ts

@@ -17,7 +17,7 @@ import type { Nullable } from '@univerjs/core';
 import { Disposable } from '@univerjs/core';
 import type { IArrayFormulaRangeType, IFeatureDirtyRangeType, IRuntimeOtherUnitDataType, IRuntimeUnitDataType } from '../basics/common';
 import type { BaseAstNode } from '../engine/ast-node/base-ast-node';
-import type { FunctionVariantType } from '../engine/reference-object/base-reference-object';
+import { type FunctionVariantType } from '../engine/reference-object/base-reference-object';
 import { IFormulaCurrentConfigService } from './current-data.service';
 /**
  * IDLE: Idle phase of the formula engine.