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

package/lib/es/index.js

@@ -1,7 +1,8 @@
 var Fi = Object.defineProperty;
 var ki = (n, s, e) => s in n ? Fi(n, s, { enumerable: !0, configurable: !0, writable: !0, value: e }) : n[s] = e;
 var d = (n, s, e) => ki(n, typeof s != "symbol" ? s + "" : s, e);
-import { ObjectMatrix as ne, LRUMap as Ti, hashAlgorithm as $i, Tools as Ye, AbsoluteRefType as Re, RANGE_TYPE as Ne, Disposable as ue, moveRangeByOffset as zs, isValidRange as ji, isRealNum as Xt, DEFAULT_EMPTY_DOCUMENT_VALUE as Ii, isNullCell as pr, CellValueType as qe, BooleanNumber as Yi, isFormulaString as Dt, isFormulaId as Ut, Inject as ce, UniverInstanceType as Qt, IUniverInstanceService as Dn, CommandType as xe, createIdentifier as tt, toDisposable as Hi, Injector as Zt, sortRules as Qi, OnLifecycle as rt, LifecycleStages as nt, requestImmediateMacroTask as zi, IConfigService as Wi, ICommandService as Pt, Optional as Gi, Plugin as Xi, Rectangle as as } from "@univerjs/core";
+import { ObjectMatrix as ne, LRUMap as Ti, hashAlgorithm as $i, Tools as Ye, AbsoluteRefType as Re, RANGE_TYPE as Ne, Disposable as ue, moveRangeByOffset as zs, isValidRange as ji, isRealNum as Xt, DEFAULT_EMPTY_DOCUMENT_VALUE as Ii, isNullCell as pr, CellValueType as qe, BooleanNumber as Yi, isFormulaString as Dt, isFormulaId as Ut, UniverInstanceType as Qt, IUniverInstanceService as Dn, CommandType as xe, toDisposable as Hi, sortRules as Qi, OnLifecycle as tt, LifecycleStages as rt, requestImmediateMacroTask as zi, IConfigService as Wi, ICommandService as Pt, Plugin as Gi, Rectangle as as } from "@univerjs/core";
+import { Inject as ce, createIdentifier as nt, Injector as Zt, Optional as Xi } from "@wendellhu/redi";
 import { Subject as Vt } from "rxjs";
 import { DataSyncPrimaryController as Ki } from "@univerjs/rpc";
 function qi(n, s, e, t, r) {
@@ -63,10 +64,10 @@ function ta(n) {
       return !0;
   return !1;
 }
-function Of(n) {
+function Mf(n) {
   return n[0] === "'" && n[n.length - 1] === "'" ? n.substring(1, n.length - 1) : n;
 }
-function Mf(n) {
+function vf(n) {
   return _r(n) && n !== Q.CLOSE_BRACES && n !== Q.CLOSE_BRACKET && n !== Q.SINGLE_QUOTATION && n !== Q.DOUBLE_QUOTATION || n === " ";
 }
 function ra(n) {
@@ -239,7 +240,7 @@ function Er(n) {
   let t = e.indexOf("$") > -1;
   return Ye.isStringNumber(e) && s && !t && (s = !1, t = !0), s && t ? Re.ALL : s ? Re.COLUMN : t ? Re.ROW : Re.NONE;
 }
-function vf(n) {
+function Ff(n) {
   const s = n.split("!");
   s.length > 1 && (n = s[s.length - 1]);
   const e = n.split(":");
@@ -345,7 +346,7 @@ function dn(n) {
   const { range: s } = et(n);
   return !(s.endColumn >= 16384);
 }
-function Ff(n, s) {
+function kf(n, s) {
   const e = (n == null ? void 0 : n.split(",")) || [];
   return n === "" || e.length === 0 ? [] : da(n) ? e.map((i) => {
     const a = et(i);
@@ -2417,7 +2418,7 @@ const kt = /* @__PURE__ */ Ba(Ma), va = [
   unknown: 11
   /* Custom */
 };
-function kf(n, s, e) {
+function Tf(n, s, e) {
   var u, c;
   if (n == null || s == null)
     return s;
@@ -5214,7 +5215,7 @@ class P extends ue {
     return this.unitId == null || this.subUnitId == null ? h.create(f.REF) : (t.setDefaultUnitId(this.unitId), t.setDefaultSheetId(this.subUnitId), t.setUnitData(e.getUnitData()), t.setRuntimeData(e.getRuntimeData()), t.setArrayFormulaCellData(e.getArrayFormulaCellData()), t.setRuntimeArrayFormulaCellData(e.getRuntimeArrayFormulaCellData()), t);
   }
 }
-class Tf extends P {
+class $f extends P {
   isCustom() {
     return !0;
   }
@@ -9097,7 +9098,7 @@ class $c extends ue {
     this._update$.next(null);
   }
 }
-const Gr = tt("univer.formula.defined-names.service");
+const Gr = nt("univer.formula.defined-names.service");
 var jc = Object.defineProperty, Ic = Object.getOwnPropertyDescriptor, Yc = (n, s, e, t) => {
   for (var r = t > 1 ? void 0 : t ? Ic(s, e) : s, i = n.length - 1, a; i >= 0; i--)
     (a = n[i]) && (r = (t ? a(s, e, r) : a(r)) || r);
@@ -9291,7 +9292,7 @@ let _n = class extends ue {
 _n = Yc([
   Hc(0, Dn)
 ], _n);
-const ht = tt(
+const ht = nt(
   "univer.formula.current-data.service"
 );
 var Qc = Object.defineProperty, zc = Object.getOwnPropertyDescriptor, Wc = (n, s, e, t) => {
@@ -9651,7 +9652,7 @@ let En = class extends ue {
 En = Kc([
   qc(0, ht)
 ], En);
-const He = tt("univer.formula.runtime.service");
+const He = nt("univer.formula.runtime.service");
 var q = /* @__PURE__ */ ((n) => (n.REFERENCE = "ReferenceNode", n.VALUE = "ValueNode", n.OPERATOR = "OperatorNode", n.FUNCTION = "FunctionNode", n.LAMBDA = "LambdaNode", n.LAMBDA_PARAMETER = "LambdaNodeParameter", n.ERROR = "ErrorNode", n.BASE = "Base", n.ROOT = "Root", n.UNION = "UnionNode", n.PREFIX = "PrefixNode", n.SUFFIX = "SuffixNode", n.NULL = "NullNode", n))(q || {});
 const Qe = /* @__PURE__ */ new Map([
   ["ReferenceNode", 7],
@@ -9866,7 +9867,7 @@ class Nc extends ue {
     }
   }
 }
-const mt = tt("univer.formula.function.service");
+const mt = nt("univer.formula.function.service");
 var Zc = Object.defineProperty, Jc = Object.getOwnPropertyDescriptor, el = (n, s, e, t) => {
   for (var r = t > 1 ? void 0 : t ? Jc(s, e) : s, i = n.length - 1, a; i >= 0; i--)
     (a = n[i]) && (r = (t ? a(s, e, r) : a(r)) || r);
@@ -10457,7 +10458,7 @@ class yl extends ue {
     this._tableOptionMap.set(e, t);
   }
 }
-const Tn = tt("univer.formula.super-table.service");
+const Tn = nt("univer.formula.super-table.service");
 class Dl extends rr {
   constructor(s, e, t, r) {
     super(s), this._tableData = e, this._columnDataString = t;
@@ -10925,7 +10926,7 @@ class $l extends ue {
     return this._referenceExecutorMap;
   }
 }
-const Xr = tt(
+const Xr = nt(
   "univer.formula.feature-calculation-manager.service"
 );
 class jl extends ue {
@@ -11001,7 +11002,7 @@ class jl extends ue {
     return this._otherFormulaData;
   }
 }
-const $n = tt(
+const $n = nt(
   "univer.formula.other-formula-manager.service"
 );
 class an extends ue {
@@ -11286,7 +11287,7 @@ class Il extends ue {
     return ((o = (a = this._formulaData[e]) == null ? void 0 : a[t]) == null ? void 0 : o.getValue(r, i)) != null;
   }
 }
-const Kr = tt(
+const Kr = nt(
   "univer.formula.dependency-manager.service"
 );
 var Yl = Object.defineProperty, Hl = Object.getOwnPropertyDescriptor, Ql = (n, s, e, t) => {
@@ -11597,7 +11598,7 @@ let zt = class extends ue {
   }
 };
 zt = Ql([
-  rt(nt.Rendered, zt),
+  tt(rt.Rendered, zt),
   it(0, ht),
   it(1, He),
   it(2, $n),
@@ -11735,7 +11736,7 @@ let Wt = class extends ue {
   }
 };
 Wt = Xl([
-  rt(nt.Rendered, Wt),
+  tt(rt.Rendered, Wt),
   pt(0, Wi),
   pt(1, ce(Mt)),
   pt(2, ht),
@@ -11864,7 +11865,7 @@ let Cr = class extends ue {
   }
 };
 Cr = Zl([
-  rt(nt.Ready, Cr),
+  tt(rt.Ready, Cr),
   gr(0, Pt),
   gr(1, ce(Wt)),
   gr(2, Dn),
@@ -11972,10 +11973,10 @@ let Gt = class extends ue {
   }
 };
 Gt = sf([
-  rt(nt.Ready, Gt),
+  tt(rt.Ready, Gt),
   on(1, Pt),
   on(2, mt),
-  on(3, Gi(Ki))
+  on(3, Xi(Ki))
 ], Gt);
 var af = Object.defineProperty, of = Object.getOwnPropertyDescriptor, uf = (n, s, e, t) => {
   for (var r = t > 1 ? void 0 : t ? of(s, e) : s, i = n.length - 1, a; i >= 0; i--)
@@ -12017,7 +12018,7 @@ let yr = class extends ue {
   }
 };
 yr = uf([
-  rt(nt.Ready, yr),
+  tt(rt.Ready, yr),
   Is(0, Pt),
   Is(1, Gr)
 ], yr);
@@ -12054,7 +12055,7 @@ let Dr = class extends ue {
   }
 };
 Dr = ff([
-  rt(nt.Ready, Dr),
+  tt(rt.Ready, Dr),
   Ys(0, Pt),
   Ys(1, Xr)
 ], Dr);
@@ -12093,7 +12094,7 @@ let br = class extends ue {
   }
 };
 br = df([
-  rt(nt.Ready, br),
+  tt(rt.Ready, br),
   un(0, Pt),
   un(1, $n),
   un(2, Kr)
@@ -12137,7 +12138,7 @@ let Sr = class extends ue {
   }
 };
 Sr = Rf([
-  rt(nt.Ready, Sr),
+  tt(rt.Ready, Sr),
   Hs(0, Pt),
   Hs(1, Tn)
 ], Sr);
@@ -12165,7 +12166,7 @@ class _f extends ue {
     return this._dirtyConversionMap;
   }
 }
-const Ef = tt(
+const Ef = nt(
   "univer.formula.active-dirty-manager.service"
 );
 var Cf = Object.defineProperty, yf = Object.getOwnPropertyDescriptor, Df = (n, s, e, t) => {
@@ -12222,7 +12223,7 @@ let Ar = class extends ue {
   }
 };
 Ar = Df([
-  rt(nt.Ready, Ar),
+  tt(rt.Ready, Ar),
   cn(0, Pt),
   cn(1, Xr),
   cn(1, Kr)
@@ -12234,7 +12235,7 @@ var bf = Object.defineProperty, Sf = Object.getOwnPropertyDescriptor, Af = (n, s
 }, Pf = (n, s) => (e, t) => s(e, t, n);
 const Lf = "base-formula-engine";
 var ln;
-let Qs = (ln = class extends Xi {
+let Qs = (ln = class extends Gi {
   constructor(n, s) {
     super(), this._config = n, this._injector = s;
   }
@@ -12305,7 +12306,7 @@ function xf(n, s) {
   const e = n.sequenceNodesBuilder(s);
   return !(!e || e.every((t) => typeof t == "string" || t.nodeType !== we.REFERENCE));
 }
-function $f(n, s, e, t, r, i) {
+function jf(n, s, e, t, r, i) {
   if (!xf(n, s))
     return s;
   const a = n.sequenceNodesBuilder(s), o = (p, _) => ({ startRow: p, endRow: p, startColumn: _, endColumn: _ }), u = o(e, t), c = as.getRelativeRange(o(r, i), u), l = Ye.deepClone(a), m = Array.isArray(l) ? l.map((p) => {
@@ -12330,7 +12331,7 @@ export {
   bt as BooleanValue,
   $ as BooleanValueObject,
   Wt as CalculateFormulaService,
-  Tf as CustomFunction,
+  $f as CustomFunction,
   $c as DefinedNamesService,
   Jt as ERROR_TYPE_SET,
   f as ErrorType,
@@ -12411,10 +12412,10 @@ export {
   Vc as functionUniver,
   Uc as functionWeb,
   mn as generateStringWithSequence,
-  vf as getAbsoluteRefTypeWitString,
+  Ff as getAbsoluteRefTypeWitString,
   Er as getAbsoluteRefTypeWithSingleString,
-  Ff as getRangeWithRefsString,
-  kf as handleNumfmtInCell,
+  kf as getRangeWithRefsString,
+  Tf as handleNumfmtInCell,
   ta as includeFormulaLexerToken,
   Tc as initSheetFormulaData,
   _r as isFormulaLexerToken,
@@ -12423,9 +12424,9 @@ export {
   ca as isReferenceString,
   dn as isReferenceStringWithEffectiveColumn,
   da as isReferenceStrings,
-  Mf as matchRefDrawToken,
+  vf as matchRefDrawToken,
   Q as matchToken,
-  Of as normalizeSheetName,
+  Mf as normalizeSheetName,
   se as operatorToken,
   we as sequenceNodeType,
   lt as serializeRange,
@@ -12435,5 +12436,5 @@ export {
   Jr as singleReferenceToGrid,
   Cs as strip,
   Va as stripErrorMargin,
-  $f as transformFormula
+  jf as transformFormula
 };

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

@@ -1,4 +1,5 @@
-import { Disposable, ICommandService, Ctor } from '@univerjs/core';
+import { Disposable, ICommandService } from '@univerjs/core';
+import { Ctor } from '@wendellhu/redi';
 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,15 +1,16 @@
-import { Dependency, IWorkbookData, Workbook, Univer } from '@univerjs/core';
+import { IWorkbookData, Workbook, Univer } from '@univerjs/core';
+import { Dependency } from '@wendellhu/redi';
 import { ISheetData } from '../../../basics/common';
 
 export declare function createCommandTestBed(workbookData?: IWorkbookData, dependencies?: Dependency[]): {
     univer: Univer;
     get: {
-        <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;
+        <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;
     };
     sheet: Workbook;
     unitId: string;

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

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

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

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

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

@@ -1,16 +1,17 @@
-import { Dependency, IWorkbookData, Workbook, Univer } from '@univerjs/core';
+import { IWorkbookData, Workbook, Univer } from '@univerjs/core';
+import { Dependency } from '@wendellhu/redi';
 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('@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;
+        <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;
     };
     sheet: Workbook;
     unitId: string;

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

@@ -1,14 +1,15 @@
-import { Dependency, IWorkbookData, Univer } from '@univerjs/core';
+import { IWorkbookData, Univer } from '@univerjs/core';
+import { Dependency } from '@wendellhu/redi';
 
 export declare function createCommandTestBed(workbookData?: IWorkbookData, dependencies?: Dependency[]): {
     univer: Univer;
     get: {
-        <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;
+        <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;
     };
     sheet: import('@univerjs/core').Workbook;
 };

package/lib/types/plugin.d.ts

@@ -1,4 +1,5 @@
-import { Injector, Plugin, Ctor } from '@univerjs/core';
+import { Plugin } from '@univerjs/core';
+import { Ctor, Injector } from '@wendellhu/redi';
 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('@univerjs/core').IdentifierDecorator<ActiveDirtyManagerService>;
+export declare const IActiveDirtyManagerService: import('@wendellhu/redi').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('@univerjs/core').IdentifierDecorator<FormulaCurrentConfigService>;
+export declare const IFormulaCurrentConfigService: import('@wendellhu/redi').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('@univerjs/core').IdentifierDecorator<DefinedNamesService>;
+export declare const IDefinedNamesService: import('@wendellhu/redi').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('@univerjs/core').IdentifierDecorator<DependencyManagerService>;
+export declare const IDependencyManagerService: import('@wendellhu/redi').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('@univerjs/core').IdentifierDecorator<FeatureCalculationManagerService>;
+export declare const IFeatureCalculationManagerService: import('@wendellhu/redi').IdentifierDecorator<FeatureCalculationManagerService>;

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

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