plugin-tls 4.6.0 → 4.7.0

package/dist/index.js

@@ -1,8 +1,9 @@
 import { Destroyable as O } from "@gby/destroyable";
-import { serialCallFuns as g } from "com-tools";
-import { m as a, a as m, b as u, T as d, c as P, d as h, P as f } from "./createTierModeOptionsPluginHost-3jPWAW92.js";
-import { M as W, e as J, f as Q, g as R, h as X, i as Y, j as Z, k as L, l as K, n as tt, o as et, p as nt, q as st, r as rt, s as it, t as ot, u as ut, v as at, w as pt, x as gt, y as ct, z as lt, A as dt, B as ht, C as ft, D as Mt, E as Ot, F as mt, G as Pt, H as yt } from "./createTierModeOptionsPluginHost-3jPWAW92.js";
-function _(s, e) {
+import { serialCallFuns as c } from "com-tools";
+import { m as a, a as y, b as u, T as d, c as P, d as f, P as M } from "./createTierModeOptionsPluginHost-D-fKYlcA.js";
+import { M as J, e as Q, f as X, g as Y, h as Z, i as L, j as K, k as tt, l as et, n as nt, o as st, p as rt, q as it, r as ot, s as ut, t as at, u as pt, v as ct, w as gt, x as lt, y as ht, z as dt, A as ft, B as Mt, C as mt, D as Ot, E as yt, F as Pt, G as xt, H as Tt } from "./createTierModeOptionsPluginHost-D-fKYlcA.js";
+import { waitAsyncable as g } from "type-tls";
+function C(s, e) {
   return e;
 }
 function b(s) {
@@ -10,23 +11,30 @@ function b(s) {
     return t;
   };
 }
-function C(s, e) {
+function D(s, e) {
   return a(s.prototype, e), e;
 }
-function D(s) {
+function v(s) {
   return function(t) {
     return a(s.prototype, t), t;
   };
 }
-function U(s, e) {
+function H(s, e) {
   return a(s.prototype, e), s;
 }
-function v(s) {
+function j(s) {
   return function(t) {
     return a(s.prototype, t), s;
   };
 }
 class I extends O {
+  /**
+   * 父级插件管理者
+   * 
+   * @remarks
+   * 当子类创建了子类插件管理者时，为了能让父类插件管理者的插件生效，需要将父类插件管理者设置为其 parent
+   */
+  parent;
   /**
    * 插件的宿主
    */
@@ -38,8 +46,8 @@ class I extends O {
   /**
    * @param host - 插件的宿主
    */
-  constructor(e) {
-    super(), e && (this.host = e);
+  constructor(e, t) {
+    super(), this.parent = t, e && (this.host = e);
   }
   destroyThis() {
     return this.plugins.clear(), this.host = null, super.destroyThis();
@@ -50,7 +58,16 @@ class I extends O {
    * @returns 是否注册了插件
    */
   hasUsed(e) {
-    return this.plugins.has(e);
+    return this.parent?.hasUsed(e) || this.plugins.has(e);
+  }
+  /**
+   * 获取插件 或 扩展 的 use 的返回值
+   * @param plugin 
+   * @returns 
+   */
+  getUseReturn(e) {
+    const { parent: t } = this;
+    return t?.hasUsed(e) ? t.getUseReturn(e) : this.plugins.get(e);
   }
   /**
    * 使用插件、注册插件
@@ -58,10 +75,9 @@ class I extends O {
    * @param args - 传递给插件的选项
    */
   use(e, ...t) {
-    const { plugins: n } = this;
-    if (n.has(e)) return n.get(e);
-    const r = e.onUse(this.host, ...t);
-    return n.set(e, r), r;
+    if (this.hasUsed(e)) return this.getUseReturn(e);
+    const n = e.onUse(this.host, ...t);
+    return this.plugins.set(e, n), n;
   }
   /**
    * 插件宿主实例的注册插件的方法
@@ -72,7 +88,7 @@ class I extends O {
    */
   instUse(e, t, ...n) {
     const { plugins: r } = this;
-    if (r.has(t)) return r.get(t);
+    if (this.hasUsed(t)) return this.getUseReturn(t);
     const i = this.use(t, ...n);
     return t.onCreate?.(e), i;
   }
@@ -85,10 +101,10 @@ class I extends O {
    * @param hostInst - 插件宿主的新实例
    */
   onCreate(e, ...t) {
-    const n = [];
-    for (const [r] of this.plugins)
-      r.onCreate && n.push(r.onCreate.bind(r));
-    return g(n, void 0, [e, ...t]);
+    const n = this.parent?.onCreate(e, ...t), r = [];
+    for (const [i] of this.plugins)
+      i.onCreate && r.push(i.onCreate.bind(i));
+    return g(n, () => c(r, void 0, [e, ...t]));
   }
   /**
    * 插件宿主创建实例时调用
@@ -99,10 +115,10 @@ class I extends O {
    * @param args - 初始化宿主实例时的参数
    */
   onInit(e, ...t) {
-    const n = [];
-    for (const [r] of this.plugins)
-      r.onInit && n.push(r.onInit.bind(r));
-    return g(n, void 0, [e, ...t]);
+    const n = this.parent?.onInit(e, ...t), r = [];
+    for (const [i] of this.plugins)
+      i.onInit && r.push(i.onInit.bind(i));
+    return g(n, () => c(r, void 0, [e, ...t]));
   }
   /**
    * 插件宿主被销毁时调用
@@ -113,12 +129,21 @@ class I extends O {
    */
   onDestroy(e) {
     const t = [];
-    for (const [n] of this.plugins)
-      n.onDestroy && t.push(n.onDestroy.bind(n));
-    return t.reverse(), g(t, void 0, [e]);
+    for (const [i] of this.plugins)
+      i.onDestroy && t.push(i.onDestroy.bind(i));
+    t.reverse();
+    const n = c(t, void 0, [e]), { parent: r } = this;
+    return r ? g(n, () => r.onDestroy(e)) : n;
   }
 }
-class H extends O {
+class R extends O {
+  /**
+   * 父级插件管理者
+   * 
+   * @remarks
+   * 当子类创建了子类插件管理者时，为了能让父类插件管理者的插件生效，需要将父类插件管理者设置为其 parent
+   */
+  parent;
   /**
    * 插件的宿主
    */
@@ -129,9 +154,10 @@ class H extends O {
   plugins = /* @__PURE__ */ new Set();
   /**
    * @param host - 插件的宿主
+   * @param parent - 父级插件管理者
    */
-  constructor(e) {
-    super(), e && (this.host = e);
+  constructor(e, t) {
+    super(), this.parent = t, e && (this.host = e);
   }
   destroyThis() {
     return this.plugins.clear(), this.host = null, super.destroyThis();
@@ -142,7 +168,7 @@ class H extends O {
    * @returns 是否注册了插件
    */
   hasUsed(e) {
-    return this.plugins.has(e);
+    return this.parent?.hasUsed(e) || this.plugins.has(e);
   }
   /**
    * 使用插件、注册插件
@@ -150,8 +176,7 @@ class H extends O {
    * @returns 返回插件对象本身
    */
   use(e) {
-    const { plugins: t } = this;
-    return t.has(e) || (m(this.host.prototype, e), t.add(e)), e;
+    return this.hasUsed(e) || (y(this.host.prototype, e), this.plugins.add(e)), e;
   }
   /**
    * 插件宿主实例的注册插件的方法
@@ -161,8 +186,7 @@ class H extends O {
    * @param hostInst - 插件宿主的新实例
    */
   instUse(e, t, ...n) {
-    const { plugins: r } = this;
-    return r.has(t) || (this.use(t), t.onCreate?.call(e, e, ...n)), t;
+    return this.hasUsed(t) || (this.use(t), t.onCreate?.call(e, e, ...n)), t;
   }
   /**
    * 插件宿主创建实例时调用
@@ -173,10 +197,10 @@ class H extends O {
    * @param hostInst - 插件宿主的新实例
    */
   onCreate(e, ...t) {
-    const n = [];
-    for (const r of this.plugins)
-      r.onCreate && n.push(r.onCreate);
-    return g(n, e, [e, ...t]);
+    const n = this.parent?.onCreate(e, ...t), r = [];
+    for (const i of this.plugins)
+      i.onCreate && r.push(i.onCreate);
+    return g(n, () => c(r, e, [e, ...t]));
   }
   /**
    * 插件宿主创建实例时调用
@@ -187,10 +211,10 @@ class H extends O {
    * @param args - 初始化宿主实例时的参数
    */
   onInit(e, ...t) {
-    const n = [];
-    for (const r of this.plugins)
-      r.onInit && n.push(r.onInit);
-    return g(n, e, [e, ...t]);
+    const n = this.parent?.onInit(e, ...t), r = [];
+    for (const i of this.plugins)
+      i.onInit && r.push(i.onInit);
+    return g(n, () => c(r, e, [e, ...t]));
   }
   /**
    * 插件宿主被销毁时调用
@@ -201,12 +225,14 @@ class H extends O {
    */
   onDestroy(e) {
     const t = [];
-    for (const n of this.plugins)
-      n.onDestroy && t.push(n.onDestroy);
-    return t.reverse(), g(t, e, [e]);
+    for (const i of this.plugins)
+      i.onDestroy && t.push(i.onDestroy);
+    t.reverse();
+    const n = c(t, e, [e]), { parent: r } = this;
+    return r ? g(n, () => r.onDestroy(e)) : n;
   }
 }
-function M(s, e) {
+function m(s, e) {
   const t = [{ target: s, props: e }];
   let n;
   for (; n = t.shift(); ) {
@@ -221,32 +247,32 @@ function M(s, e) {
   }
   return s;
 }
-function y(s, e) {
+function x(s, e) {
   const t = {}, n = [{ target: s, props: e, targetProps: t }];
   let r;
   for (; r = n.shift(); ) {
     const { target: i, props: p, targetProps: o } = r;
-    for (const [l, c] of Object.entries(p)) {
-      if (c != null && typeof c == "object" && (!c.constructor || c.constructor === Object)) {
-        n.push({ target: i[l], props: c, targetProps: o[l] = {} });
+    for (const [h, l] of Object.entries(p)) {
+      if (l != null && typeof l == "object" && (!l.constructor || l.constructor === Object)) {
+        n.push({ target: i[h], props: l, targetProps: o[h] = {} });
         continue;
       }
-      o[l] = i[l];
+      o[h] = i[h];
     }
   }
   return t;
 }
-function j(s, e) {
-  const t = y(s, e);
+function k(s, e) {
+  const t = x(s, e);
   function n() {
-    M(s, e);
+    m(s, e);
   }
   function r() {
-    M(s, t);
+    m(s, t);
   }
   return { set: n, unset: r };
 }
-function k(s, e) {
+function B(s, e) {
   const t = e ?? "defaultOptions", n = `_${t}`;
   return function(i) {
     const p = u(i, {
@@ -267,7 +293,7 @@ function k(s, e) {
     });
   };
 }
-function B(s, e, t) {
+function N(s, e, t) {
   const n = `_${e}`;
   return u(s.prototype, {
     /**
@@ -278,7 +304,7 @@ function B(s, e, t) {
     }
   }), t;
 }
-function N(s, e, t) {
+function V(s, e, t) {
   const n = u(s, {
     /**
      * 全局级别的默认选项
@@ -303,7 +329,7 @@ function N(s, e, t) {
     }
   }), s;
 }
-const V = {
+const q = {
   onUse(s, e, t) {
     const n = e ?? P;
     a(s, {
@@ -336,19 +362,19 @@ const V = {
   onCreate(s, e) {
     s.modeOptions.setOption(e);
   }
-}, q = {
+}, F = {
   onUse(s, e, t) {
     a(s, {
       /**
        * 全局级别的默认选项
        */
-      defaultOptions: new h(e, t)
+      defaultOptions: new f(e, t)
     }), a(s.prototype, {
       /**
        * 实例级的默认选项
        */
       get defaultOptions() {
-        return this._defaultOptions || (this._defaultOptions = new h(void 0, s.defaultOptions));
+        return this._defaultOptions || (this._defaultOptions = new f(void 0, s.defaultOptions));
       }
     });
   },
@@ -356,23 +382,23 @@ const V = {
     s.defaultOptions.option = e;
   }
 };
-function F(s, e) {
+function A(s, e) {
   const t = u(s, {
     /**
      * 全局级别的默认选项
      */
-    defaultOptions: new h(e)
+    defaultOptions: new f(e)
   });
   return u(t.prototype, {
     /**
      * 实例级的默认选项
      */
     get defaultOptions() {
-      return this._defaultOptions || (this._defaultOptions = new h(void 0, this.constructor.defaultOptions));
+      return this._defaultOptions || (this._defaultOptions = new f(void 0, this.constructor.defaultOptions));
     }
   }), s;
 }
-function x(s) {
+function T(s) {
   const e = u(s, {
     /**
      * 是否使用独立的插件管理器
@@ -383,7 +409,7 @@ function x(s) {
      * PluginHost 的插件管理器
      */
     get pluginManager() {
-      return (!this._pluginManager || this.isolatedPluginManager && !this.hasOwnProperty("_pluginManager")) && (this._pluginManager = new f(this)), this._pluginManager;
+      return (!this._pluginManager || this.isolatedPluginManager && !this.hasOwnProperty("_pluginManager")) && (this._pluginManager = new M(this, this._pluginManager)), this._pluginManager;
     },
     // _pluginManager: PluginManager<HOST,Plugin>;
     /**
@@ -446,7 +472,7 @@ function x(s) {
   }), s;
 }
 function S(s) {
-  const e = x(s);
+  const e = T(s);
   return new Proxy(e, {
     construct: function(t, n, r) {
       const i = new t(...n);
@@ -465,9 +491,9 @@ function z(s) {
      * 插件管理器
      */
     static get pluginManager() {
-      return this.isolatedPluginManager && !this.hasOwnProperty("_pluginManager") && (this._pluginManager = new f(this)), this._pluginManager;
+      return this.isolatedPluginManager && !this.hasOwnProperty("_pluginManager") && (this._pluginManager = new M(this, this._pluginManager)), this._pluginManager;
     }
-    static _pluginManager = new f(this);
+    static _pluginManager = new M(this);
     /**
      * 插件管理器 {@link PluginHostExtends.pluginManager}
      */
@@ -537,61 +563,61 @@ function z(s) {
   };
 }
 export {
-  H as ExtendManager,
-  W as ModeOptions,
-  f as PluginExtendManager,
-  J as PluginHost,
+  R as ExtendManager,
+  J as ModeOptions,
+  M as PluginExtendManager,
+  Q as PluginHost,
   I as PluginManager,
   d as TierModeOptions,
-  Q as TierModeOptionsPluginHost,
-  h as TierOptions,
-  R as TierOptionsPluginHost,
-  k as addDefaultOptions,
-  B as addInstOptions,
-  x as becomePluginHost,
+  X as TierModeOptionsPluginHost,
+  f as TierOptions,
+  Y as TierOptionsPluginHost,
+  B as addDefaultOptions,
+  N as addInstOptions,
+  T as becomePluginHost,
   z as becomePluginHost_Extends,
   S as becomePluginHost_Proxy,
-  N as becomeTierModeOptionsHost,
-  F as becomeTierOptionsHost,
+  V as becomeTierModeOptionsHost,
+  A as becomeTierOptionsHost,
   P as commonModeName,
   b as createDefineExtend,
-  X as createDefineIExtend,
-  Y as createDefineMixin,
-  v as createExtendTarget,
-  Z as createIExtendTarget,
-  L as createMixinTarget,
-  K as createPluginHost,
-  j as createPropertySetter,
-  D as createTargetExtend,
-  tt as createTargetIExtend,
-  et as createTargetMixin,
-  nt as createTierModeOptionsPluginHost,
-  st as createTierOptionsPluginHost,
-  _ as defineExtend,
-  rt as defineIExtend,
-  it as defineMixin,
-  ot as extendMark,
-  U as extendTarget,
-  ut as getPropertyValue,
-  at as getPropertyValueByPath,
-  y as getTargetProperties,
-  pt as iextendTarget,
-  gt as isPlugin,
-  M as mergeProperties,
+  Z as createDefineIExtend,
+  L as createDefineMixin,
+  j as createExtendTarget,
+  K as createIExtendTarget,
+  tt as createMixinTarget,
+  et as createPluginHost,
+  k as createPropertySetter,
+  v as createTargetExtend,
+  nt as createTargetIExtend,
+  st as createTargetMixin,
+  rt as createTierModeOptionsPluginHost,
+  it as createTierOptionsPluginHost,
+  C as defineExtend,
+  ot as defineIExtend,
+  ut as defineMixin,
+  at as extendMark,
+  H as extendTarget,
+  pt as getPropertyValue,
+  ct as getPropertyValueByPath,
+  x as getTargetProperties,
+  gt as iextendTarget,
+  lt as isPlugin,
+  m as mergeProperties,
   a as mixin,
-  ct as mixinByOmit,
-  lt as mixinByPick,
-  m as mixinIExtend,
+  ht as mixinByOmit,
+  dt as mixinByPick,
+  y as mixinIExtend,
   u as mixinTarget,
-  dt as parsePropertyPath,
-  ht as pickHostExtendMembers,
-  ft as setPropertyValue,
-  Mt as setPropertyValueByPath,
-  C as targetExtend,
-  Ot as targetIExtend,
-  mt as targetMixin,
-  Pt as tierModeOptionsDecorator,
-  V as tierModeOptionsPlugin,
-  yt as tierOptionsDecorator,
-  q as tierOptionsPlugin
+  ft as parsePropertyPath,
+  Mt as pickHostExtendMembers,
+  mt as setPropertyValue,
+  Ot as setPropertyValueByPath,
+  D as targetExtend,
+  yt as targetIExtend,
+  Pt as targetMixin,
+  xt as tierModeOptionsDecorator,
+  q as tierModeOptionsPlugin,
+  Tt as tierOptionsDecorator,
+  F as tierOptionsPlugin
 };

package/dist/plugin-manager/ExtendManager.d.ts

@@ -1,15 +1,24 @@
-import type { AnyFunction, AbstractConstructor } from "type-tls";
+import type { AbstractConstructor } from "type-tls";
 import { Destroyable } from "@gby/destroyable";
 import type { IExtend, AnyIExtend } from "./IExtend";
 import type { ExtendOptions } from "./extend";
+import type { AsyncableArray } from "./type";
 /**
  * 插件管理者
  *
  * @remarks
  * 负责管理插件的注册、应用 等
+ * 支持插件的级联（通过 parent）：当子类创建了子类插件管理者时，为了能让父类插件管理者的插件生效，需要将父类插件管理者设置为其 parent
  *
  */
 export declare class ExtendManager<HostClass extends AbstractConstructor> extends Destroyable {
+    /**
+     * 父级插件管理者
+     *
+     * @remarks
+     * 当子类创建了子类插件管理者时，为了能让父类插件管理者的插件生效，需要将父类插件管理者设置为其 parent
+     */
+    parent?: ExtendManager<HostClass> | null;
     /**
      * 插件的宿主
      */
@@ -20,8 +29,9 @@ export declare class ExtendManager<HostClass extends AbstractConstructor> extend
     readonly plugins: Set<IExtend<HostClass>>;
     /**
      * @param host - 插件的宿主
+     * @param parent - 父级插件管理者
      */
-    constructor(host?: HostClass);
+    constructor(host?: HostClass, parent?: ExtendManager<HostClass> | null);
     destroyThis(): any;
     /**
      * 是否注册了插件
@@ -51,7 +61,7 @@ export declare class ExtendManager<HostClass extends AbstractConstructor> extend
      * 如果插件的 created 方法返回 Promise，则会等待 Promise  resolve
      * @param hostInst - 插件宿主的新实例
      */
-    onCreate(hostInst: InstanceType<HostClass>, ...args: ConstructorParameters<HostClass>): import("com-tools").SerialCallFunsReturn<AnyFunction>;
+    onCreate(hostInst: InstanceType<HostClass>, ...args: ConstructorParameters<HostClass>): AsyncableArray;
     /**
      * 插件宿主创建实例时调用
      *
@@ -60,7 +70,7 @@ export declare class ExtendManager<HostClass extends AbstractConstructor> extend
      * @param hostInst - 插件宿主的新实例
      * @param args - 初始化宿主实例时的参数
      */
-    onInit(hostInst: InstanceType<HostClass>, ...args: any): import("com-tools").SerialCallFunsReturn<AnyFunction>;
+    onInit(hostInst: InstanceType<HostClass>, ...args: any): AsyncableArray;
     /**
      * 插件宿主被销毁时调用
      *
@@ -68,6 +78,6 @@ export declare class ExtendManager<HostClass extends AbstractConstructor> extend
      * 会调用每个插件的 {@link IExtend.onDestroy} 方法
      * @param hostInst - 被销毁的插件实例
      */
-    onDestroy(hostInst: InstanceType<HostClass>): import("com-tools").SerialCallFunsReturn<AnyFunction>;
+    onDestroy(hostInst: InstanceType<HostClass>): AsyncableArray;
 }
 //# sourceMappingURL=ExtendManager.d.ts.map

package/dist/plugin-manager/ExtendManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ExtendManager.d.ts","sourceRoot":"","sources":["../../src/plugin-manager/ExtendManager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AACjE,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAG/C,OAAO,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAG9C;;;;;;GAMG;AACH,qBAAa,aAAa,CAAC,SAAS,SAAS,mBAAmB,CAAE,SAAQ,WAAW;IAEjF;;OAEG;IACH,IAAI,EAAG,SAAS,CAAC;IAEjB;;OAEG;IACH,QAAQ,CAAC,OAAO,0BAAiC;IAIjD;;OAEG;gBACS,IAAI,CAAC,EAAE,SAAS;IAOnB,WAAW;IAMpB;;;;OAIG;IACH,OAAO,CAAC,MAAM,EAAE,GAAG;IAInB;;;;OAIG;IACH,GAAG,CAAC,CAAC,SAAS,UAAU,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,aAAa,CAAC,SAAS,EAAE,CAAC,CAAC,GAAE,CAAC;IAQ3E;;;;;;OAMG;IACH,OAAO,CAAC,CAAC,SAAS,UAAU,CAAC,SAAS,CAAC,EAAE,QAAQ,EAAE,YAAY,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,aAAa,CAAC,SAAS,EAAE,CAAC,CAAC,EAAG,GAAG,IAAI,EAAC,qBAAqB,CAAC,SAAS,CAAC,GAAE,CAAC;IAQ7J;;;;;;;OAOG;IACH,QAAQ,CAAC,QAAQ,EAAE,YAAY,CAAC,SAAS,CAAC,EAAG,GAAG,IAAI,EAAC,qBAAqB,CAAC,SAAS,CAAC;IAWrF;;;;;;;OAOG;IACH,MAAM,CAAC,QAAQ,EAAE,YAAY,CAAC,SAAS,CAAC,EAAC,GAAG,IAAI,EAAC,GAAG;IAWpD;;;;;;OAMG;IACH,SAAS,CAAC,QAAQ,EAAE,YAAY,CAAC,SAAS,CAAC;CAY9C"}
+{"version":3,"file":"ExtendManager.d.ts","sourceRoot":"","sources":["../../src/plugin-manager/ExtendManager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAe,mBAAmB,EAAE,MAAM,UAAU,CAAC;AACjE,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAG/C,OAAO,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAE9C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AAE7C;;;;;;;GAOG;AACH,qBAAa,aAAa,CAAC,SAAS,SAAS,mBAAmB,CAAE,SAAQ,WAAW;IAEjF;;;;;OAKG;IACH,MAAM,CAAC,EAAE,aAAa,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC;IAEzC;;OAEG;IACH,IAAI,EAAG,SAAS,CAAC;IAEjB;;OAEG;IACH,QAAQ,CAAC,OAAO,0BAAiC;IAIjD;;;OAGG;gBACS,IAAI,CAAC,EAAE,SAAS,EAAE,MAAM,CAAC,EAAE,aAAa,CAAC,SAAS,CAAC,GAAG,IAAI;IAQ7D,WAAW;IAMpB;;;;OAIG;IACH,OAAO,CAAC,MAAM,EAAE,GAAG,GAAG,OAAO;IAI7B;;;;OAIG;IACH,GAAG,CAAC,CAAC,SAAS,UAAU,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,aAAa,CAAC,SAAS,EAAE,CAAC,CAAC,GAAG,CAAC;IAO5E;;;;;;OAMG;IACH,OAAO,CAAC,CAAC,SAAS,UAAU,CAAC,SAAS,CAAC,EAAE,QAAQ,EAAE,YAAY,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,aAAa,CAAC,SAAS,EAAE,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,qBAAqB,CAAC,SAAS,CAAC,GAAG,CAAC;IAO9J;;;;;;;OAOG;IACH,QAAQ,CAAC,QAAQ,EAAE,YAAY,CAAC,SAAS,CAAC,EAAE,GAAG,IAAI,EAAE,qBAAqB,CAAC,SAAS,CAAC,GAAG,cAAc;IActG;;;;;;;OAOG;IACH,MAAM,CAAC,QAAQ,EAAE,YAAY,CAAC,SAAS,CAAC,EAAE,GAAG,IAAI,EAAE,GAAG,GAAE,cAAc;IAatE;;;;;;OAMG;IACH,SAAS,CAAC,QAAQ,EAAE,YAAY,CAAC,SAAS,CAAC,GAAE,cAAc;CAe9D"}

package/dist/plugin-manager/PluginExtendManager.d.ts

@@ -1,8 +1,9 @@
-import type { AnyFunction, AbstractConstructor, ClassType } from "type-tls";
+import { type AbstractConstructor, type ClassType } from "type-tls";
 import { Destroyable } from "@gby/destroyable";
 import type { IExtend, AnyIExtend } from "./IExtend";
 import type { AnyIPlugin, IPlugin, PluginUseArgs, PluginUseReturn } from "./IPlugin";
 import type { ExtendOptions } from "./extend";
+import type { AsyncableArray } from "./type";
 /**
  * 用于标识是扩展的标记
  */
@@ -13,9 +14,17 @@ export declare const extendMark: unique symbol;
  * @remarks
  * 负责管理插件 和 扩展的注册、应用 等
  * 相当于 PluginManager + ExtendManager
+ * 支持插件的级联（通过 parent）：当子类创建了子类插件管理者时，为了能让父类插件管理者的插件生效，需要将父类插件管理者设置为其 parent
  *
  */
 export declare class PluginExtendManager<Host, HostClass extends AbstractConstructor<Host> = ClassType<Host>> extends Destroyable {
+    /**
+     * 父级插件管理者
+     *
+     * @remarks
+     * 当子类创建了子类插件管理者时，为了能让父类插件管理者的插件生效，需要将父类插件管理者设置为其 parent
+     */
+    parent?: PluginExtendManager<Host, HostClass> | null;
     /**
      * 插件的宿主
      */
@@ -27,7 +36,7 @@ export declare class PluginExtendManager<Host, HostClass extends AbstractConstru
     /**
      * @param host - 插件的宿主
      */
-    constructor(host?: HostClass);
+    constructor(host?: HostClass, parent?: PluginExtendManager<Host, HostClass> | null);
     destroyThis(): any;
     /**
      * 是否注册了插件 或 扩展
@@ -35,6 +44,12 @@ export declare class PluginExtendManager<Host, HostClass extends AbstractConstru
      * @returns 是否注册了插件 或 扩展
      */
     hasUsed(plugin: any): boolean;
+    /**
+     * 获取插件 或 扩展 的 use 的返回值
+     * @param plugin
+     * @returns
+     */
+    getUseReturn(plugin: any): any;
     /**
      * 判断一个对象是否是插件
      * @param target
@@ -77,7 +92,7 @@ export declare class PluginExtendManager<Host, HostClass extends AbstractConstru
      * 如果插件的 created 方法返回 Promise，则会等待 Promise  resolve
      * @param hostInst - 插件宿主的新实例
      */
-    onCreate(hostInst: Host, ...args: any): import("com-tools").SerialCallFunsReturn<AnyFunction>;
+    onCreate(hostInst: Host, ...args: any): AsyncableArray;
     /**
      * 插件宿主创建实例时调用
      *
@@ -86,7 +101,7 @@ export declare class PluginExtendManager<Host, HostClass extends AbstractConstru
      * @param hostInst - 插件宿主的新实例
      * @param args - 初始化宿主实例时的参数
      */
-    onInit(hostInst: Host, ...args: any): import("com-tools").SerialCallFunsReturn<AnyFunction>;
+    onInit(hostInst: Host, ...args: any): AsyncableArray;
     /**
      * 插件宿主被销毁时调用
      *
@@ -94,6 +109,6 @@ export declare class PluginExtendManager<Host, HostClass extends AbstractConstru
      * 会调用每个插件的 {@link IPlugin.onDestroy} 方法
      * @param hostInst - 被销毁的插件实例
      */
-    onDestroy(hostInst: Host): import("com-tools").SerialCallFunsReturn<AnyFunction>;
+    onDestroy(hostInst: Host): AsyncableArray;
 }
 //# sourceMappingURL=PluginExtendManager.d.ts.map

package/dist/plugin-manager/PluginExtendManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PluginExtendManager.d.ts","sourceRoot":"","sources":["../../src/plugin-manager/PluginExtendManager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,mBAAmB,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAC5E,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAG/C,OAAO,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAErD,OAAO,KAAK,EAAE,UAAU,EAAE,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AACrF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAG9C;;GAEG;AACH,eAAO,MAAM,UAAU,eAAmB,CAAC;AAG3C;;;;;;;GAOG;AACH,qBAAa,mBAAmB,CAAC,IAAI,EAAC,SAAS,SAAS,mBAAmB,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,IAAI,CAAC,CAAE,SAAQ,WAAW;IAEpH;;OAEG;IACH,IAAI,EAAG,SAAS,CAAC;IAEjB;;OAEG;IACH,QAAQ,CAAC,OAAO,0DAA6D;IAG7E;;OAEG;gBACS,IAAI,CAAC,EAAE,SAAS;IAOnB,WAAW;IAMpB;;;;OAIG;IACH,OAAO,CAAC,MAAM,EAAE,GAAG;IAKnB;;;;OAIG;IACH,QAAQ,CAAC,MAAM,EAAE,GAAG,GAAG,MAAM,IAAI,OAAO,CAAC,IAAI,EAAC,SAAS,CAAC;IAQxD;;;;OAIG;IACH,SAAS,CAAC,CAAC,SAAS,UAAU,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,aAAa,CAAC,SAAS,EAAE,CAAC,CAAC,GAAE,CAAC;IAQ9E;;;;;;OAMG;IACH,aAAa,CAAC,CAAC,SAAS,UAAU,CAAC,SAAS,CAAC,EAAE,QAAQ,EAAE,YAAY,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,aAAa,CAAC,SAAS,EAAE,CAAC,CAAC,EAAG,GAAG,IAAI,EAAC,qBAAqB,CAAC,SAAS,CAAC,GAAE,CAAC;IAQhK;;;;OAIG;IACH,SAAS,CAAC,CAAC,SAAS,UAAU,CAAC,IAAI,EAAC,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC,EAAC,GAAG,IAAI,EAAE,aAAa,CAAC,CAAC,CAAC,GAAG,eAAe,CAAC,CAAC,CAAC;IAQxG;;;;;;OAMG;IACH,aAAa,CAAC,CAAC,SAAS,UAAU,CAAC,IAAI,EAAC,SAAS,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,GAAG,OAAO,EAAE,aAAa,CAAC,CAAC,CAAC,GAAG,eAAe,CAAC,CAAC,CAAC;IAUhI;;;;;;;OAOG;IACH,QAAQ,CAAC,QAAQ,EAAE,IAAI,EAAG,GAAG,IAAI,EAAC,GAAG;IAYrC;;;;;;;OAOG;IACH,MAAM,CAAC,QAAQ,EAAE,IAAI,EAAC,GAAG,IAAI,EAAC,GAAG;IAYjC;;;;;;OAMG;IACH,SAAS,CAAC,QAAQ,EAAE,IAAI;CAa3B"}
+{"version":3,"file":"PluginExtendManager.d.ts","sourceRoot":"","sources":["../../src/plugin-manager/PluginExtendManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,KAAK,mBAAmB,EAAE,KAAK,SAAS,EAAiB,MAAM,UAAU,CAAC;AACrG,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAG/C,OAAO,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAErD,OAAO,KAAK,EAAE,UAAU,EAAE,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AACrF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAC9C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AAG7C;;GAEG;AACH,eAAO,MAAM,UAAU,eAAmB,CAAC;AAG3C;;;;;;;;GAQG;AACH,qBAAa,mBAAmB,CAAC,IAAI,EAAC,SAAS,SAAS,mBAAmB,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,IAAI,CAAC,CAAE,SAAQ,WAAW;IAEpH;;;;;OAKG;IACH,MAAM,CAAC,EAAE,mBAAmB,CAAC,IAAI,EAAC,SAAS,CAAC,GAAG,IAAI,CAAC;IAEpD;;OAEG;IACH,IAAI,EAAG,SAAS,CAAC;IAEjB;;OAEG;IACH,QAAQ,CAAC,OAAO,0DAA6D;IAG7E;;OAEG;gBACS,IAAI,CAAC,EAAE,SAAS,EAAC,MAAM,CAAC,EAAE,mBAAmB,CAAC,IAAI,EAAC,SAAS,CAAC,GAAG,IAAI;IAQvE,WAAW;IAMpB;;;;OAIG;IACH,OAAO,CAAC,MAAM,EAAE,GAAG,GAAE,OAAO;IAK5B;;;;OAIG;IACH,YAAY,CAAC,MAAM,EAAE,GAAG,GAAE,GAAG;IAS7B;;;;OAIG;IACH,QAAQ,CAAC,MAAM,EAAE,GAAG,GAAG,MAAM,IAAI,OAAO,CAAC,IAAI,EAAC,SAAS,CAAC;IAOxD;;;;OAIG;IACH,SAAS,CAAC,CAAC,SAAS,UAAU,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,aAAa,CAAC,SAAS,EAAE,CAAC,CAAC,GAAE,CAAC;IAO9E;;;;;;OAMG;IACH,aAAa,CAAC,CAAC,SAAS,UAAU,CAAC,SAAS,CAAC,EAAE,QAAQ,EAAE,YAAY,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,aAAa,CAAC,SAAS,EAAE,CAAC,CAAC,EAAG,GAAG,IAAI,EAAC,qBAAqB,CAAC,SAAS,CAAC,GAAE,CAAC;IAOhK;;;;OAIG;IACH,SAAS,CAAC,CAAC,SAAS,UAAU,CAAC,IAAI,EAAC,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC,EAAC,GAAG,IAAI,EAAE,aAAa,CAAC,CAAC,CAAC,GAAG,eAAe,CAAC,CAAC,CAAC;IAOxG;;;;;;OAMG;IACH,aAAa,CAAC,CAAC,SAAS,UAAU,CAAC,IAAI,EAAC,SAAS,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,GAAG,OAAO,EAAE,aAAa,CAAC,CAAC,CAAC,GAAG,eAAe,CAAC,CAAC,CAAC;IAShI;;;;;;;OAOG;IACH,QAAQ,CAAC,QAAQ,EAAE,IAAI,EAAG,GAAG,IAAI,EAAC,GAAG,GAAE,cAAc;IAarD;;;;;;;OAOG;IACH,MAAM,CAAC,QAAQ,EAAE,IAAI,EAAC,GAAG,IAAI,EAAC,GAAG,GAAE,cAAc;IAajD;;;;;;OAMG;IACH,SAAS,CAAC,QAAQ,EAAE,IAAI,GAAE,cAAc;CAgB3C"}