@univerjs/engine-formula 0.1.11 → 0.1.13

package/lib/types/engine/utils/object-compare.d.ts

@@ -8,7 +8,7 @@ export declare function findCompareToken(str: string): [compareToken, BaseValueO
  * 2. >=apple*: normal value, >apple: obtains the same effect as >=apple*
  * 3. <apple*: normal value, <=apple: obtains the same effect as <apple*
  */
-export declare function valueObjectCompare(range: BaseValueObject, criteria: BaseValueObject, operator?: compareToken): BaseValueObject;
+export declare function valueObjectCompare(range: BaseValueObject, criteria: BaseValueObject, operator?: compareToken, isCaseSensitive?: boolean): BaseValueObject;
 /**
  * Find the Boolean intersection of two ArrayValueObjects
  * @param valueObject1

package/lib/types/engine/utils/reference.d.ts

@@ -33,6 +33,11 @@ export declare function serializeRangeWithSheet(sheetName: string, range: IRange
  */
 export declare function serializeRangeWithSpreadsheet(unit: string, sheetName: string, range: IRange): string;
 export declare function serializeRangeToRefString(gridRangeName: IUnitRangeName): string;
+export declare function singleReferenceToGrid(refBody: string): {
+    row: number;
+    column: number;
+    absoluteRefType: AbsoluteRefType;
+};
 export declare function handleRefStringInfo(refString: string): {
     refBody: string;
     sheetName: string;

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

@@ -8,7 +8,18 @@ export declare function fromObjectToString(array: IArrayValueObject): string;
 export declare function transformToValueObject(array?: Array<Array<number | string | boolean | null>>): BaseValueObject[][];
 export declare function transformToValue(array?: Nullable<BaseValueObject>[][]): (string | number | boolean | null)[][];
 export declare class ArrayValueObject extends BaseValueObject {
+    /**
+     * Create an array value object based on the string or IArrayValueObject data.
+     * @param rawValue
+     * @returns
+     */
     static create(rawValue: string | IArrayValueObject): ArrayValueObject;
+    /**
+     * Create an array value object based on the array data.
+     * @param array
+     * @returns
+     */
+    static createByArray(array: Array<Array<number | string | boolean | null>>): ArrayValueObject;
     private _values;
     private _rowCount;
     private _columnCount;
@@ -122,7 +133,7 @@ export declare class ArrayValueObject extends BaseValueObject {
     divided(valueObject: BaseValueObject): BaseValueObject;
     mod(valueObject: BaseValueObject): BaseValueObject;
     modInverse(valueObject: BaseValueObject): BaseValueObject;
-    compare(valueObject: BaseValueObject, operator: compareToken): BaseValueObject;
+    compare(valueObject: BaseValueObject, operator: compareToken, isCaseSensitive?: boolean): BaseValueObject;
     concatenateFront(valueObject: BaseValueObject): BaseValueObject;
     concatenateBack(valueObject: BaseValueObject): BaseValueObject;
     map(callbackFn: callbackMapFnType): BaseValueObject;

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

@@ -65,7 +65,7 @@ export declare class BaseValueObject extends ObjectClassType {
      * @returns
      */
     mapValue(callbackFn: callbackMapFnType): BaseValueObject;
-    compare(valueObject: BaseValueObject, operator: compareToken): BaseValueObject;
+    compare(valueObject: BaseValueObject, operator: compareToken, isCaseSensitive?: boolean): BaseValueObject;
     isEqual(valueObject: BaseValueObject): BaseValueObject;
     isNotEqual(valueObject: BaseValueObject): BaseValueObject;
     isGreaterThanOrEqual(valueObject: BaseValueObject): BaseValueObject;

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

@@ -111,6 +111,10 @@ export declare class NumberValueObject extends BaseValueObject {
     multiplyBy(value: string | number | boolean): BaseValueObject;
     dividedBy(value: string | number | boolean): BaseValueObject;
     compareBy(value: string | number | boolean, operator: compareToken): BaseValueObject;
+    private _compareString;
+    private _compareNumber;
+    private _compareFiniteNumber;
+    private _compareBoolean;
     pow(valueObject: BaseValueObject): BaseValueObject;
     sqrt(): BaseValueObject;
     cbrt(): BaseValueObject;
@@ -145,8 +149,11 @@ export declare class StringValueObject extends BaseValueObject {
     isString(): boolean;
     concatenateFront(valueObject: BaseValueObject): BaseValueObject;
     concatenateBack(valueObject: BaseValueObject): BaseValueObject;
-    compare(valueObject: BaseValueObject, operator: compareToken): BaseValueObject;
-    compareBy(value: string | number | boolean, operator: compareToken): BaseValueObject;
+    compare(valueObject: BaseValueObject, operator: compareToken, isCaseSensitive?: boolean): BaseValueObject;
+    compareBy(value: string | number | boolean, operator: compareToken, isCaseSensitive?: boolean): BaseValueObject;
+    private _compareString;
+    private _compareNumber;
+    private _compareBoolean;
     convertToNumberObjectValue(): ErrorValueObject | NumberValueObject;
     convertToBooleanObjectValue(): BooleanValueObject;
     private _checkWildcard;

package/lib/types/functions/lookup/address/index.d.ts

@@ -1,8 +1,9 @@
 import { BaseValueObject } from '../../../engine/value-object/base-value-object';
+import { StringValueObject } from '../../../engine/value-object/primitive-object';
 import { BaseFunction } from '../../base-function';
 
 export declare class Address extends BaseFunction {
     minParams: number;
     maxParams: number;
-    calculate(rowNumber: BaseValueObject, columnNumber: BaseValueObject, absNumber?: BaseValueObject, a1?: BaseValueObject, sheetText?: BaseValueObject): BaseValueObject;
+    calculate(rowNumber: BaseValueObject, columnNumber: BaseValueObject, absNumber?: BaseValueObject, a1?: BaseValueObject, sheetText?: BaseValueObject): BaseValueObject | StringValueObject;
 }

package/lib/types/functions/lookup/vlookup/index.d.ts

@@ -6,6 +6,8 @@ export declare class Vlookup extends BaseFunction {
     minParams: number;
     maxParams: number;
     calculate(lookupValue: BaseValueObject, tableArray: BaseValueObject, colIndexNum: BaseValueObject, rangeLookup?: BaseValueObject): BaseValueObject | ArrayValueObject;
+    private _handleArrayColIndexNum;
+    private _handleNonArrayColIndexNum;
     private _handleTableArray;
     private _handleSingleObject;
 }

package/lib/types/functions/text/function-map.d.ts

@@ -1,4 +1,5 @@
 import { Concatenate } from './concatenate';
 import { FUNCTION_NAMES_TEXT } from './function-names';
+import { Lower } from './lower';
 
-export declare const functionText: (FUNCTION_NAMES_TEXT | typeof Concatenate)[][];
+export declare const functionText: ((FUNCTION_NAMES_TEXT | typeof Concatenate)[] | (FUNCTION_NAMES_TEXT | typeof Lower)[])[];

package/lib/types/functions/text/lower/index.d.ts

@@ -1,9 +1,10 @@
 import { BaseValueObject } from '../../../engine/value-object/base-value-object';
+import { StringValueObject } from '../../../engine/value-object/primitive-object';
 import { BaseFunction } from '../../base-function';
 
 export declare class Lower extends BaseFunction {
     minParams: number;
     maxParams: number;
-    calculate(text: BaseValueObject): BaseValueObject;
+    calculate(text: BaseValueObject): BaseValueObject | StringValueObject;
     private _handleSingleText;
 }

package/lib/types/index.d.ts

@@ -35,7 +35,7 @@ export { LexerTreeBuilder } from './engine/analysis/lexer-tree-builder';
 export { BaseReferenceObject, type FunctionVariantType } from './engine/reference-object/base-reference-object';
 export { RangeReferenceObject } from './engine/reference-object/range-reference-object';
 export { deserializeRangeForR1C1 } from './engine/utils/r1c1-reference';
-export { deserializeRangeWithSheet, getAbsoluteRefTypeWithSingleString, getAbsoluteRefTypeWitString, type IAbsoluteRefTypeForRange, serializeRange, serializeRangeToRefString, serializeRangeWithSheet, serializeRangeWithSpreadsheet, isReferenceStringWithEffectiveColumn, getRangeWithRefsString, isReferenceStrings, } from './engine/utils/reference';
+export { deserializeRangeWithSheet, getAbsoluteRefTypeWithSingleString, getAbsoluteRefTypeWitString, type IAbsoluteRefTypeForRange, serializeRange, serializeRangeToRefString, serializeRangeWithSheet, serializeRangeWithSpreadsheet, isReferenceStringWithEffectiveColumn, getRangeWithRefsString, isReferenceStrings, singleReferenceToGrid, } from './engine/utils/reference';
 export { generateStringWithSequence, type ISequenceNode, sequenceNodeType } from './engine/utils/sequence';
 export { ArrayValueObject, ValueObjectFactory } from './engine/value-object/array-value-object';
 export { BaseValueObject, ErrorValueObject } from './engine/value-object/base-value-object';
@@ -43,7 +43,7 @@ export { BooleanValue } from './basics/common';
 export type { PrimitiveValueType } from './engine/value-object/primitive-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';
+export { StringValueObject, NullValueObject } from './engine/value-object/primitive-object';
 export { functionArray } from './functions/array/function-map';
 export { FUNCTION_NAMES_ARRAY } from './functions/array/function-names';
 export { BaseFunction } from './functions/base-function';
@@ -95,3 +95,4 @@ export { IFormulaCurrentConfigService, FormulaCurrentConfigService } from './ser
 export { IActiveDirtyManagerService } from './services/active-dirty-manager.service';
 export type { IRangeChange } from './models/formula-data.model';
 export { handleNumfmtInCell } from './engine/utils/numfmt-kit';
+export { AsyncArrayObject } from './engine/reference-object/base-reference-object';

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

@@ -1,7 +1,6 @@
 import { IUnitRange, Nullable, Disposable, IUniverInstanceService } from '@univerjs/core';
 import { IDirtyUnitFeatureMap, IDirtyUnitOtherFormulaMap, IDirtyUnitSheetDefinedNameMap, IDirtyUnitSheetNameMap, IFormulaData, IFormulaDatasetConfig, IRuntimeUnitDataType, IUnitData, IUnitExcludedCell, IUnitSheetNameMap, IUnitStylesData } from '../basics/common';
 
-export declare const DEFAULT_DOCUMENT_SUB_COMPONENT_ID = "__default_document_sub_component_id20231101__";
 export interface IFormulaCurrentConfigService {
     load(config: IFormulaDatasetConfig): void;
     getUnitData(): IUnitData;