@univerjs/engine-formula 0.2.3 → 0.2.4-alpha.0

package/lib/types/basics/date.d.ts

@@ -1,18 +1,5 @@
-/**
- * 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.
- */
+import { BaseValueObject, ErrorValueObject } from '../engine/value-object/base-value-object';
+
 export declare const DEFAULT_DATE_FORMAT = "yyyy/mm/dd;@";
 export declare const DEFAULT_NOW_FORMAT = "yyyy/mm/dd hh:mm";
 export declare const DEFAULT_TIME_FORMAT = "h:mm A/P";
@@ -35,6 +22,7 @@ export declare function excelDateSerial(date: Date): number;
  */
 export declare function excelDateTimeSerial(date: Date): number;
 export declare function excelSerialToDate(serial: number): Date;
+export declare function excelSerialToDateTime(serial: number): Date;
 export declare function formatDateDefault(date: Date): string;
 /**
  * Validate date string
@@ -48,3 +36,9 @@ export declare function parseFormattedDate(value: string): any;
 export declare function parseFormattedValue(value: string): any;
 export declare function parseFormattedTime(value: string): any;
 export declare function isDate(format: string): any;
+export declare function isValidWeekend(weekend: number | string): boolean;
+export declare function getWeekendArray(weekend: number | string): number[];
+export declare function countWorkingDays(startDateSerialNumber: number, endDateSerialNumber: number, weekend?: number | string, holidays?: number[]): number;
+export declare function getDateSerialNumberByWorkingDays(startDateSerialNumber: number, workingDays: number, weekend?: number | string, holidays?: number[]): (number | ErrorValueObject);
+export declare function getDateSerialNumberByObject(serialNumberObject: BaseValueObject): (ErrorValueObject | number);
+export declare function getWeekDayByDateSerialNumber(dateSerialNumber: number): number;

package/lib/types/controller/formula.controller.d.ts

@@ -1,5 +1,4 @@
-import { Disposable, ICommandService } from '@univerjs/core';
-import { Ctor } from '@wendellhu/redi';
+import { Disposable, ICommandService, Ctor } from '@univerjs/core';
 import { DataSyncPrimaryController } from '@univerjs/rpc';
 import { IFunctionNames } from '../basics/function';
 import { BaseFunction } from '../functions/base-function';

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

@@ -1,16 +1,15 @@
-import { IWorkbookData, Workbook, Univer } from '@univerjs/core';
-import { Dependency } from '@wendellhu/redi';
+import { Dependency, IWorkbookData, Workbook, Univer } from '@univerjs/core';
 import { ISheetData } from '../../../basics/common';
 
 export declare function createCommandTestBed(workbookData?: IWorkbookData, dependencies?: Dependency[]): {
     univer: Univer;
     get: {
-        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, lookUp?: import('@wendellhu/redi').LookUp): T;
-        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, quantity: import("@wendellhu/redi").Quantity.MANY, lookUp?: import('@wendellhu/redi').LookUp): T[];
-        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, quantity: import("@wendellhu/redi").Quantity.OPTIONAL, lookUp?: import('@wendellhu/redi').LookUp): T | null;
-        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, quantity: import("@wendellhu/redi").Quantity.REQUIRED, lookUp?: import('@wendellhu/redi').LookUp): T;
-        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, quantity?: import('@wendellhu/redi').Quantity, lookUp?: import('@wendellhu/redi').LookUp): T[] | T | null;
-        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, quantityOrLookup?: import('@wendellhu/redi').Quantity | import('@wendellhu/redi').LookUp, lookUp?: import('@wendellhu/redi').LookUp): T[] | T | null;
+        <T>(id: import('@univerjs/core').DependencyIdentifier<T>, lookUp?: import('@univerjs/core').LookUp): T;
+        <T>(id: import('@univerjs/core').DependencyIdentifier<T>, quantity: import("@univerjs/core").Quantity.MANY, lookUp?: import('@univerjs/core').LookUp): T[];
+        <T>(id: import('@univerjs/core').DependencyIdentifier<T>, quantity: import("@univerjs/core").Quantity.OPTIONAL, lookUp?: import('@univerjs/core').LookUp): T | null;
+        <T>(id: import('@univerjs/core').DependencyIdentifier<T>, quantity: import("@univerjs/core").Quantity.REQUIRED, lookUp?: import('@univerjs/core').LookUp): T;
+        <T>(id: import('@univerjs/core').DependencyIdentifier<T>, quantity?: import('@univerjs/core').Quantity, lookUp?: import('@univerjs/core').LookUp): T[] | T | null;
+        <T>(id: import('@univerjs/core').DependencyIdentifier<T>, quantityOrLookup?: import('@univerjs/core').Quantity | import('@univerjs/core').LookUp, lookUp?: import('@univerjs/core').LookUp): T[] | T | null;
     };
     sheet: Workbook;
     unitId: string;

package/lib/types/engine/ast-node/function-node.d.ts

@@ -1,4 +1,4 @@
-import { Injector } from '@wendellhu/redi';
+import { Injector } from '@univerjs/core';
 import { AstNodePromiseType } from '../../basics/common';
 import { BaseFunction } from '../../functions/base-function';
 import { IFormulaCurrentConfigService } from '../../services/current-data.service';

package/lib/types/engine/ast-node/prefix-node.d.ts

@@ -1,5 +1,4 @@
-import { Nullable } from '@univerjs/core';
-import { IAccessor, Injector } from '@wendellhu/redi';
+import { IAccessor, Nullable, Injector } from '@univerjs/core';
 import { BaseFunction } from '../../functions/base-function';
 import { IFunctionService } from '../../services/function.service';
 import { LexerNode } from '../analysis/lexer-node';

package/lib/types/engine/ast-node/reference-node.d.ts

@@ -1,4 +1,4 @@
-import { IAccessor, Injector } from '@wendellhu/redi';
+import { IAccessor, Injector } from '@univerjs/core';
 import { IFormulaRuntimeService } from '../../services/runtime.service';
 import { ISuperTableService } from '../../services/super-table.service';
 import { LexerNode } from '../analysis/lexer-node';

package/lib/types/engine/ast-node/suffix-node.d.ts

@@ -1,4 +1,4 @@
-import { IAccessor, Injector } from '@wendellhu/redi';
+import { IAccessor, Injector } from '@univerjs/core';
 import { BaseFunction } from '../../functions/base-function';
 import { IFunctionService } from '../../services/function.service';
 import { LexerNode } from '../analysis/lexer-node';

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

@@ -89,6 +89,7 @@ export declare class BaseReferenceObject extends ObjectClassType {
     unionBy(referenceObject: BaseReferenceObject): NodeValueType;
     unionRange(rangeData1: IRange, rangeData2: IRange): IRange;
     getCellValueObject(cell: ICellData): ErrorValueObject | NullValueObject | NumberValueObject | import('../value-object/primitive-object').BooleanValueObject | StringValueObject | ArrayValueObject;
+    private _getPatternByCell;
     getCellByRow(row: number): ErrorValueObject | NullValueObject | NumberValueObject | import('../value-object/primitive-object').BooleanValueObject | StringValueObject | ArrayValueObject;
     getCellByColumn(column: number): ErrorValueObject | NullValueObject | NumberValueObject | import('../value-object/primitive-object').BooleanValueObject | StringValueObject | ArrayValueObject;
     getCurrentActiveSheetData(): import('../../basics/common').ISheetItem;

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

@@ -1,5 +1,4 @@
-import { Injector } from '@wendellhu/redi';
-import { Nullable } from '@univerjs/core';
+import { Injector, Nullable } from '@univerjs/core';
 import { IFunctionService } from '../../services/function.service';
 import { PrefixNode } from '../ast-node/prefix-node';
 

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

@@ -165,4 +165,4 @@ export declare class StringValueObject extends BaseValueObject {
 }
 export declare function createBooleanValueObjectByRawValue(rawValue: string | number | boolean): BooleanValueObject;
 export declare function createStringValueObjectByRawValue(rawValue: string | number | boolean): StringValueObject;
-export declare function createNumberValueObjectByRawValue(rawValue: string | number | boolean): ErrorValueObject | NumberValueObject;
+export declare function createNumberValueObjectByRawValue(rawValue: string | number | boolean, pattern?: string): ErrorValueObject | NumberValueObject;

package/lib/types/functions/__tests__/create-function-test-bed.d.ts

@@ -1,17 +1,16 @@
-import { IWorkbookData, Workbook, Univer } from '@univerjs/core';
-import { Dependency } from '@wendellhu/redi';
+import { Dependency, IWorkbookData, Workbook, Univer } from '@univerjs/core';
 import { ISheetData } from '../../basics/common';
 import { FunctionVariantType } from '../../engine/reference-object/base-reference-object';
 
 export declare function createFunctionTestBed(workbookData?: IWorkbookData, dependencies?: Dependency[]): {
     univer: Univer;
     get: {
-        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, lookUp?: import('@wendellhu/redi').LookUp): T;
-        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, quantity: import("@wendellhu/redi").Quantity.MANY, lookUp?: import('@wendellhu/redi').LookUp): T[];
-        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, quantity: import("@wendellhu/redi").Quantity.OPTIONAL, lookUp?: import('@wendellhu/redi').LookUp): T | null;
-        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, quantity: import("@wendellhu/redi").Quantity.REQUIRED, lookUp?: import('@wendellhu/redi').LookUp): T;
-        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, quantity?: import('@wendellhu/redi').Quantity, lookUp?: import('@wendellhu/redi').LookUp): T[] | T | null;
-        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, quantityOrLookup?: import('@wendellhu/redi').Quantity | import('@wendellhu/redi').LookUp, lookUp?: import('@wendellhu/redi').LookUp): T[] | T | null;
+        <T>(id: import('@univerjs/core').DependencyIdentifier<T>, lookUp?: import('@univerjs/core').LookUp): T;
+        <T>(id: import('@univerjs/core').DependencyIdentifier<T>, quantity: import("@univerjs/core").Quantity.MANY, lookUp?: import('@univerjs/core').LookUp): T[];
+        <T>(id: import('@univerjs/core').DependencyIdentifier<T>, quantity: import("@univerjs/core").Quantity.OPTIONAL, lookUp?: import('@univerjs/core').LookUp): T | null;
+        <T>(id: import('@univerjs/core').DependencyIdentifier<T>, quantity: import("@univerjs/core").Quantity.REQUIRED, lookUp?: import('@univerjs/core').LookUp): T;
+        <T>(id: import('@univerjs/core').DependencyIdentifier<T>, quantity?: import('@univerjs/core').Quantity, lookUp?: import('@univerjs/core').LookUp): T[] | T | null;
+        <T>(id: import('@univerjs/core').DependencyIdentifier<T>, quantityOrLookup?: import('@univerjs/core').Quantity | import('@univerjs/core').LookUp, lookUp?: import('@univerjs/core').LookUp): T[] | T | null;
     };
     sheet: Workbook;
     unitId: string;

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

@@ -1,4 +1,6 @@
 import { DateFunction } from './date';
 import { FUNCTION_NAMES_DATE } from './function-names';
+import { NetworkdaysIntl } from './networkdays-intl';
+import { WorkdayIntl } from './workday-intl';
 
-export declare const functionDate: (FUNCTION_NAMES_DATE | typeof DateFunction)[][];
+export declare const functionDate: ((FUNCTION_NAMES_DATE | typeof DateFunction)[] | (FUNCTION_NAMES_DATE | typeof NetworkdaysIntl)[] | (FUNCTION_NAMES_DATE | typeof WorkdayIntl)[])[];

package/lib/types/functions/date/hour/__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/date/hour/index.d.ts

@@ -0,0 +1,9 @@
+import { BaseValueObject } from '../../../engine/value-object/base-value-object';
+import { BaseFunction } from '../../base-function';
+
+export declare class Hour extends BaseFunction {
+    minParams: number;
+    maxParams: number;
+    calculate(serialNumber: BaseValueObject): BaseValueObject;
+    private _handleSingleObject;
+}

package/lib/types/functions/date/minute/__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/date/minute/index.d.ts

@@ -0,0 +1,9 @@
+import { BaseValueObject } from '../../../engine/value-object/base-value-object';
+import { BaseFunction } from '../../base-function';
+
+export declare class Minute extends BaseFunction {
+    minParams: number;
+    maxParams: number;
+    calculate(serialNumber: BaseValueObject): BaseValueObject;
+    private _handleSingleObject;
+}

package/lib/types/functions/date/networkdays/__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/date/networkdays/index.d.ts

@@ -0,0 +1,8 @@
+import { BaseValueObject } from '../../../engine/value-object/base-value-object';
+import { BaseFunction } from '../../base-function';
+
+export declare class Networkdays extends BaseFunction {
+    minParams: number;
+    maxParams: number;
+    calculate(startDate: BaseValueObject, endDate: BaseValueObject, holidays?: BaseValueObject): BaseValueObject;
+}

package/lib/types/functions/date/networkdays-intl/__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/date/networkdays-intl/index.d.ts

@@ -0,0 +1,9 @@
+import { BaseValueObject } from '../../../engine/value-object/base-value-object';
+import { BaseFunction } from '../../base-function';
+
+export declare class NetworkdaysIntl extends BaseFunction {
+    minParams: number;
+    maxParams: number;
+    calculate(startDate: BaseValueObject, endDate: BaseValueObject, weekend?: BaseValueObject, holidays?: BaseValueObject): BaseValueObject;
+    private _handleSingleObject;
+}

package/lib/types/functions/date/second/__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/date/second/index.d.ts

@@ -0,0 +1,9 @@
+import { BaseValueObject } from '../../../engine/value-object/base-value-object';
+import { BaseFunction } from '../../base-function';
+
+export declare class Second extends BaseFunction {
+    minParams: number;
+    maxParams: number;
+    calculate(serialNumber: BaseValueObject): BaseValueObject;
+    private _handleSingleObject;
+}

package/lib/types/functions/date/weekday/__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/date/weekday/index.d.ts

@@ -0,0 +1,9 @@
+import { BaseValueObject } from '../../../engine/value-object/base-value-object';
+import { BaseFunction } from '../../base-function';
+
+export declare class Weekday extends BaseFunction {
+    minParams: number;
+    maxParams: number;
+    calculate(serialNumber: BaseValueObject, returnType?: BaseValueObject): BaseValueObject;
+    private _handleSingleObject;
+}

package/lib/types/functions/date/workday/__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/date/workday/index.d.ts

@@ -0,0 +1,8 @@
+import { BaseValueObject } from '../../../engine/value-object/base-value-object';
+import { BaseFunction } from '../../base-function';
+
+export declare class Workday extends BaseFunction {
+    minParams: number;
+    maxParams: number;
+    calculate(startDate: BaseValueObject, days: BaseValueObject, holidays?: BaseValueObject): BaseValueObject;
+}

package/lib/types/functions/date/workday-intl/__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/date/workday-intl/index.d.ts

@@ -0,0 +1,9 @@
+import { BaseValueObject } from '../../../engine/value-object/base-value-object';
+import { BaseFunction } from '../../base-function';
+
+export declare class WorkdayIntl extends BaseFunction {
+    minParams: number;
+    maxParams: number;
+    calculate(startDate: BaseValueObject, days: BaseValueObject, weekend?: BaseValueObject, holidays?: BaseValueObject): BaseValueObject;
+    private _handleSingleObject;
+}

package/lib/types/functions/math/sumproduct/__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/math/sumproduct/index.d.ts

@@ -0,0 +1,8 @@
+import { BaseValueObject } from '../../../engine/value-object/base-value-object';
+import { BaseFunction } from '../../base-function';
+
+export declare class Sumproduct extends BaseFunction {
+    minParams: number;
+    maxParams: number;
+    calculate(array1: BaseValueObject, ...variants: BaseValueObject[]): BaseValueObject;
+}

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

@@ -1,15 +1,14 @@
-import { IWorkbookData, Univer } from '@univerjs/core';
-import { Dependency } from '@wendellhu/redi';
+import { Dependency, IWorkbookData, Univer } from '@univerjs/core';
 
 export declare function createCommandTestBed(workbookData?: IWorkbookData, dependencies?: Dependency[]): {
     univer: Univer;
     get: {
-        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, lookUp?: import('@wendellhu/redi').LookUp): T;
-        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, quantity: import("@wendellhu/redi").Quantity.MANY, lookUp?: import('@wendellhu/redi').LookUp): T[];
-        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, quantity: import("@wendellhu/redi").Quantity.OPTIONAL, lookUp?: import('@wendellhu/redi').LookUp): T | null;
-        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, quantity: import("@wendellhu/redi").Quantity.REQUIRED, lookUp?: import('@wendellhu/redi').LookUp): T;
-        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, quantity?: import('@wendellhu/redi').Quantity, lookUp?: import('@wendellhu/redi').LookUp): T[] | T | null;
-        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, quantityOrLookup?: import('@wendellhu/redi').Quantity | import('@wendellhu/redi').LookUp, lookUp?: import('@wendellhu/redi').LookUp): T[] | T | null;
+        <T>(id: import('@univerjs/core').DependencyIdentifier<T>, lookUp?: import('@univerjs/core').LookUp): T;
+        <T>(id: import('@univerjs/core').DependencyIdentifier<T>, quantity: import("@univerjs/core").Quantity.MANY, lookUp?: import('@univerjs/core').LookUp): T[];
+        <T>(id: import('@univerjs/core').DependencyIdentifier<T>, quantity: import("@univerjs/core").Quantity.OPTIONAL, lookUp?: import('@univerjs/core').LookUp): T | null;
+        <T>(id: import('@univerjs/core').DependencyIdentifier<T>, quantity: import("@univerjs/core").Quantity.REQUIRED, lookUp?: import('@univerjs/core').LookUp): T;
+        <T>(id: import('@univerjs/core').DependencyIdentifier<T>, quantity?: import('@univerjs/core').Quantity, lookUp?: import('@univerjs/core').LookUp): T[] | T | null;
+        <T>(id: import('@univerjs/core').DependencyIdentifier<T>, quantityOrLookup?: import('@univerjs/core').Quantity | import('@univerjs/core').LookUp, lookUp?: import('@univerjs/core').LookUp): T[] | T | null;
     };
     sheet: import('@univerjs/core').Workbook;
 };

package/lib/types/plugin.d.ts

@@ -1,5 +1,4 @@
-import { Plugin } from '@univerjs/core';
-import { Ctor, Injector } from '@wendellhu/redi';
+import { Injector, Plugin, Ctor } from '@univerjs/core';
 import { IFunctionNames } from './basics/function';
 import { BaseFunction } from './functions/base-function';
 

package/lib/types/services/active-dirty-manager.service.d.ts

@@ -32,4 +32,4 @@ export declare class ActiveDirtyManagerService extends Disposable implements IAc
     register(commandId: string, dirtyConversion: IDirtyConversionManagerParams): void;
     getDirtyConversionMap(): Map<string, IDirtyConversionManagerParams>;
 }
-export declare const IActiveDirtyManagerService: import('@wendellhu/redi').IdentifierDecorator<ActiveDirtyManagerService>;
+export declare const IActiveDirtyManagerService: import('@univerjs/core').IdentifierDecorator<ActiveDirtyManagerService>;

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

@@ -72,4 +72,4 @@ export declare class FormulaCurrentConfigService extends Disposable implements I
     private _mergeNameMap;
     private _loadSheetData;
 }
-export declare const IFormulaCurrentConfigService: import('@wendellhu/redi').IdentifierDecorator<FormulaCurrentConfigService>;
+export declare const IFormulaCurrentConfigService: import('@univerjs/core').IdentifierDecorator<FormulaCurrentConfigService>;

package/lib/types/services/defined-names.service.d.ts

@@ -60,4 +60,4 @@ export declare class DefinedNamesService extends Disposable implements IDefinedN
     hasDefinedName(unitId: string): boolean;
     private _update;
 }
-export declare const IDefinedNamesService: import('@wendellhu/redi').IdentifierDecorator<DefinedNamesService>;
+export declare const IDefinedNamesService: import('@univerjs/core').IdentifierDecorator<DefinedNamesService>;

package/lib/types/services/dependency-manager.service.d.ts

@@ -77,4 +77,4 @@ export declare class DependencyManagerService extends Disposable implements IDep
     clearFormulaDependency(unitId: string, sheetId: string): void;
     hasFormulaDependency(unitId: string, sheetId: string, row: number, column: number): boolean;
 }
-export declare const IDependencyManagerService: import('@wendellhu/redi').IdentifierDecorator<DependencyManagerService>;
+export declare const IDependencyManagerService: import('@univerjs/core').IdentifierDecorator<DependencyManagerService>;

package/lib/types/services/feature-calculation-manager.service.d.ts

@@ -34,4 +34,4 @@ export declare class FeatureCalculationManagerService extends Disposable impleme
     register(featureId: string, referenceExecutor: IFeatureCalculationManagerParam): void;
     getReferenceExecutorMap(): Map<string, IFeatureCalculationManagerParam>;
 }
-export declare const IFeatureCalculationManagerService: import('@wendellhu/redi').IdentifierDecorator<FeatureCalculationManagerService>;
+export declare const IFeatureCalculationManagerService: import('@univerjs/core').IdentifierDecorator<FeatureCalculationManagerService>;

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

@@ -1,5 +1,4 @@
-import { Nullable, Disposable } from '@univerjs/core';
-import { IDisposable } from '@wendellhu/redi';
+import { IDisposable, Nullable, Disposable } from '@univerjs/core';
 import { IFunctionInfo, IFunctionNames } from '../basics/function';
 import { BaseFunction } from '../functions/base-function';
 
@@ -43,4 +42,4 @@ export declare class FunctionService extends Disposable implements IFunctionServ
     hasDescription(functionToken: IFunctionNames): boolean;
     unregisterDescriptions(...functionTokens: IFunctionNames[]): void;
 }
-export declare const IFunctionService: import('@wendellhu/redi').IdentifierDecorator<FunctionService>;
+export declare const IFunctionService: import('@univerjs/core').IdentifierDecorator<FunctionService>;

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

@@ -36,4 +36,4 @@ export declare class OtherFormulaManagerService extends Disposable implements IO
     batchRemove(formulaData: IDirtyUnitOtherFormulaMap): void;
     getOtherFormulaData(): IOtherFormulaData;
 }
-export declare const IOtherFormulaManagerService: import('@wendellhu/redi').IdentifierDecorator<OtherFormulaManagerService>;
+export declare const IOtherFormulaManagerService: import('@univerjs/core').IdentifierDecorator<OtherFormulaManagerService>;

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

@@ -179,4 +179,4 @@ export declare class FormulaRuntimeService extends Disposable implements IFormul
     private _checkIfArrayFormulaExceeded;
     private _isInDirtyRange;
 }
-export declare const IFormulaRuntimeService: import('@wendellhu/redi').IdentifierDecorator<FormulaRuntimeService>;
+export declare const IFormulaRuntimeService: import('@univerjs/core').IdentifierDecorator<FormulaRuntimeService>;

package/lib/types/services/super-table.service.d.ts

@@ -22,4 +22,4 @@ export declare class SuperTableService extends Disposable implements ISuperTable
     registerTable(unitId: string, tableName: string, reference: ISuperTable): void;
     registerTableOptionMap(tableOption: string, tableOptionType: TableOptionType): void;
 }
-export declare const ISuperTableService: import('@wendellhu/redi').IdentifierDecorator<ISuperTableService>;
+export declare const ISuperTableService: import('@univerjs/core').IdentifierDecorator<ISuperTableService>;