@gby/destroyable 1.1.0 → 3.0.0

package/dist/Destroyable.d.ts

@@ -5,7 +5,7 @@ export type FunDestroyer = () => void;
 /**
  * 可销毁的对象
  */
-export declare class Destroyable {
+export interface IDestroyable {
     /**
      * 引用计数
      * @remarks
@@ -15,16 +15,11 @@ export declare class Destroyable {
     /**
      * 是否已经销毁
      */
-    get isDestroyed(): boolean;
-    _isDestroyed: boolean;
+    readonly isDestroyed: boolean;
     /**
      * 是否可以销毁
      */
-    get canDestroy(): boolean;
-    /**
-     * 销毁者
-     */
-    _destroyers: FunDestroyer[];
+    readonly canDestroy: boolean;
     /**
      * 添加销毁者
      * @param fun
@@ -43,29 +38,29 @@ export declare class Destroyable {
      * @param sync - 表示是否使用  `obj.destroy()` 方法进行销毁；默认使用   `obj.destroyAsync()` 方法进行销毁
      * @returns
      */
-    disposeObj<T extends Destroyable>(obj: T, sync?: boolean): T;
+    disposeObj<T extends IDestroyable>(obj: T, sync?: boolean): T;
     /**
      * 取消销毁者函数
      * @param fun
      * @returns
      */
-    cancelDisposeObj<T extends Destroyable>(obj: T): T;
+    cancelDisposeObj<T extends IDestroyable>(obj: T): T;
     /**
      * 添加销毁函数或销毁对象
      * @param fun
      */
     dispose<T extends FunDestroyer>(fun: T): T;
-    dispose<T extends Destroyable>(obj: T, asyncDestroy?: boolean): T;
-    dispose<T extends Destroyable | FunDestroyer>(objOrFun: T, asyncDestroy?: boolean): T;
+    dispose<T extends IDestroyable>(obj: T, asyncDestroy?: boolean): T;
+    dispose<T extends IDestroyable | FunDestroyer>(objOrFun: T, asyncDestroy?: boolean): T;
     cancelDispose<T extends FunDestroyer>(fun: T): T;
-    cancelDispose<T extends Destroyable>(obj: T): T;
-    cancelDispose<T extends Destroyable | FunDestroyer>(objOrFun: T): T;
+    cancelDispose<T extends IDestroyable>(obj: T): T;
+    cancelDispose<T extends IDestroyable | FunDestroyer>(objOrFun: T): T;
     /**
      * 自己的销毁方法
      * @remarks
      * 子类根据需要进行重载
      */
-    destroyThis(): void;
+    destroyThis(): any;
     /**
      * 销毁
      */
@@ -92,5 +87,5 @@ export declare function destroyObject(object: any): boolean;
  * @param object
  * @returns
  */
-export declare function destroyDestroyable(object: any): boolean;
+export declare function destroyDestroyable(object: IDestroyable): boolean;
 //# sourceMappingURL=Destroyable.d.ts.map

package/dist/Destroyable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Destroyable.d.ts","sourceRoot":"","sources":["../src/Destroyable.ts"],"names":[],"mappings":"AACA;;GAEG;AACH,MAAM,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC;AAGtC;;GAEG;AACH,qBAAa,WAAW;IAEpB;;;;OAIG;IACH,QAAQ,SAAK;IAEb;;OAEG;IACH,IAAI,WAAW,YAEd;IACD,YAAY,UAAS;IAErB;;OAEG;IACH,IAAI,UAAU,YAEb;IAED;;OAEG;IACH,WAAW,EAAE,YAAY,EAAE,CAAM;IAEjC;;;;OAIG;IACH,UAAU,CAAC,CAAC,SAAS,YAAY,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC;IAK7C;;;;OAIG;IACH,gBAAgB,CAAC,CAAC,SAAS,YAAY,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC;IAMnD;;;;;OAKG;IACH,UAAU,CAAC,CAAC,SAAS,WAAW,EAAE,GAAG,EAAE,CAAC,EAAC,IAAI,CAAC,EAAC,OAAO,GAAG,CAAC;IAQ1D;;;;OAIG;IACH,gBAAgB,CAAC,CAAC,SAAS,WAAW,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC;IASlD;;;OAGG;IACH,OAAO,CAAC,CAAC,SAAS,YAAY,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC;IAC1C,OAAO,CAAC,CAAC,SAAS,WAAW,EAAE,GAAG,EAAE,CAAC,EAAC,YAAY,CAAC,EAAC,OAAO,GAAG,CAAC;IAC/D,OAAO,CAAC,CAAC,SAAS,WAAW,GAAG,YAAY,EAAE,QAAQ,EAAE,CAAC,EAAC,YAAY,CAAC,EAAC,OAAO,GAAG,CAAC;IASnF,aAAa,CAAC,CAAC,SAAS,YAAY,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC;IAChD,aAAa,CAAC,CAAC,SAAS,WAAW,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC;IAC/C,aAAa,CAAC,CAAC,SAAS,WAAW,GAAG,YAAY,EAAE,QAAQ,EAAE,CAAC,GAAG,CAAC;IAcnE;;;;OAIG;IACH,WAAW;IAKX;;OAEG;IACH,OAAO;IA6BP;;;;OAIG;IACG,YAAY;CA6BrB;AAOD;;GAEG;AACH,wBAAgB,gBAAgB,SAE/B;AAKD;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,GAAG,WASxC;AAKD;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,GAAG,WAY7C"}
+{"version":3,"file":"Destroyable.d.ts","sourceRoot":"","sources":["../src/Destroyable.ts"],"names":[],"mappings":"AACA;;GAEG;AACH,MAAM,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC;AAGtC;;GAEG;AACH,MAAM,WAAW,YAAY;IAEzB;;;;OAIG;IACH,QAAQ,EAAE,MAAM,CAAC;IAEjB;;OAEG;IACH,QAAQ,CAAC,WAAW,EAAC,OAAO,CAAC;IAE7B;;OAEG;IACH,QAAQ,CAAC,UAAU,EAAC,OAAO,CAAC;IAG5B;;;;OAIG;IACH,UAAU,CAAC,CAAC,SAAS,YAAY,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC;IAE9C;;;;OAIG;IACH,gBAAgB,CAAC,CAAC,SAAS,YAAY,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC;IAEpD;;;;;OAKG;IACH,UAAU,CAAC,CAAC,SAAS,YAAY,EAAE,GAAG,EAAE,CAAC,EAAC,IAAI,CAAC,EAAC,OAAO,GAAG,CAAC,CAAC;IAE5D;;;;OAIG;IACH,gBAAgB,CAAC,CAAC,SAAS,YAAY,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC;IAEpD;;;OAGG;IACH,OAAO,CAAC,CAAC,SAAS,YAAY,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC;IAC3C,OAAO,CAAC,CAAC,SAAS,YAAY,EAAE,GAAG,EAAE,CAAC,EAAC,YAAY,CAAC,EAAC,OAAO,GAAG,CAAC,CAAA;IAChE,OAAO,CAAC,CAAC,SAAS,YAAY,GAAG,YAAY,EAAE,QAAQ,EAAE,CAAC,EAAC,YAAY,CAAC,EAAC,OAAO,GAAG,CAAC,CAAC;IAGrF,aAAa,CAAC,CAAC,SAAS,YAAY,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC;IACjD,aAAa,CAAC,CAAC,SAAS,YAAY,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,CAAA;IAChD,aAAa,CAAC,CAAC,SAAS,YAAY,GAAG,YAAY,EAAE,QAAQ,EAAE,CAAC,GAAG,CAAC,CAAC;IASrE;;;;OAIG;IACH,WAAW,IAAG,GAAG,CAAC;IAGlB;;OAEG;IACH,OAAO,IAAG,OAAO,CAAC;IAOlB;;;;OAIG;IACH,YAAY,IAAK,OAAO,CAAC,OAAO,CAAC,CAAC;CAGrC;AAOD;;GAEG;AACH,wBAAgB,gBAAgB,SAE/B;AAKD;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,GAAG,WASxC;AAKD;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,YAAY,WAYtD"}

package/dist/DestroyableEventEmitter.d.ts

@@ -0,0 +1,80 @@
+import type { FunDestroyer, IDestroyable } from "./Destroyable";
+import { EventEmitter } from "node:events";
+export type EventMap<T> = Record<keyof T, any[]> | DefaultEventMap;
+export type DefaultEventMap = [never];
+/**
+ * 可销毁的对象
+ */
+export declare class DestroyableEventEmitter<EM extends EventMap<EM> = DefaultEventMap> extends EventEmitter<EM> implements IDestroyable {
+    /**
+     * 引用计数
+     * @remarks
+     * 引用计数为 0 时，对象才会被销毁
+     */
+    refCount: number;
+    /**
+     * 是否已经销毁
+     */
+    get isDestroyed(): boolean;
+    _isDestroyed: boolean;
+    /**
+     * 是否可以销毁
+     */
+    get canDestroy(): boolean;
+    /**
+     * 销毁者
+     */
+    _destroyers: FunDestroyer[];
+    /**
+     * 添加销毁者
+     * @param fun
+     * @returns 返回销毁者的顺序
+     */
+    disposeFun<T extends FunDestroyer>(fun: T): T;
+    /**
+     * 取消销毁者函数
+     * @param fun
+     * @returns
+     */
+    cancelDisposeFun<T extends FunDestroyer>(fun: T): T;
+    /**
+     * 添加销毁对象
+     * @param obj
+     * @param sync - 表示是否使用  `obj.destroy()` 方法进行销毁；默认使用   `obj.destroyAsync()` 方法进行销毁
+     * @returns
+     */
+    disposeObj<T extends IDestroyable>(obj: T, sync?: boolean): T;
+    /**
+     * 取消销毁者函数
+     * @param fun
+     * @returns
+     */
+    cancelDisposeObj<T extends IDestroyable>(obj: T): T;
+    /**
+     * 添加销毁函数或销毁对象
+     * @param fun
+     */
+    dispose<T extends FunDestroyer>(fun: T): T;
+    dispose<T extends IDestroyable>(obj: T, asyncDestroy?: boolean): T;
+    dispose<T extends IDestroyable | FunDestroyer>(objOrFun: T, asyncDestroy?: boolean): T;
+    cancelDispose<T extends FunDestroyer>(fun: T): T;
+    cancelDispose<T extends IDestroyable>(obj: T): T;
+    cancelDispose<T extends IDestroyable | FunDestroyer>(objOrFun: T): T;
+    /**
+     * 自己的销毁方法
+     * @remarks
+     * 子类根据需要进行重载
+     */
+    destroyThis(): void;
+    /**
+     * 销毁
+     */
+    destroy(): boolean;
+    /**
+     * 异步销毁
+     * @remarks
+     * 会依次执行销毁，并且只有上一个销毁完成之后才会执行下一个销毁
+     */
+    destroyAsync(): Promise<boolean>;
+}
+//# sourceMappingURL=DestroyableEventEmitter.d.ts.map

package/dist/DestroyableEventEmitter.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"DestroyableEventEmitter.d.ts","sourceRoot":"","sources":["../src/DestroyableEventEmitter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAEhE,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAG3C,MAAM,MAAM,QAAQ,CAAC,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC,GAAG,eAAe,CAAC;AACnE,MAAM,MAAM,eAAe,GAAG,CAAC,KAAK,CAAC,CAAC;AAEtC;;GAEG;AACH,qBAAa,uBAAuB,CAAC,EAAE,SAAS,QAAQ,CAAC,EAAE,CAAC,GAAG,eAAe,CAAE,SAAQ,YAAY,CAAC,EAAE,CAAG,YAAW,YAAY;IAE7H;;;;OAIG;IACH,QAAQ,SAAK;IAEb;;OAEG;IACH,IAAI,WAAW,YAEd;IACD,YAAY,UAAS;IAErB;;OAEG;IACH,IAAI,UAAU,YAEb;IAED;;OAEG;IACH,WAAW,EAAE,YAAY,EAAE,CAAM;IAEjC;;;;OAIG;IACH,UAAU,CAAC,CAAC,SAAS,YAAY,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC;IAK7C;;;;OAIG;IACH,gBAAgB,CAAC,CAAC,SAAS,YAAY,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC;IAMnD;;;;;OAKG;IACH,UAAU,CAAC,CAAC,SAAS,YAAY,EAAE,GAAG,EAAE,CAAC,EAAE,IAAI,CAAC,EAAE,OAAO,GAAG,CAAC;IAQ7D;;;;OAIG;IACH,gBAAgB,CAAC,CAAC,SAAS,YAAY,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC;IASnD;;;OAGG;IACH,OAAO,CAAC,CAAC,SAAS,YAAY,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC;IAC1C,OAAO,CAAC,CAAC,SAAS,YAAY,EAAE,GAAG,EAAE,CAAC,EAAE,YAAY,CAAC,EAAE,OAAO,GAAG,CAAC;IAClE,OAAO,CAAC,CAAC,SAAS,YAAY,GAAG,YAAY,EAAE,QAAQ,EAAE,CAAC,EAAE,YAAY,CAAC,EAAE,OAAO,GAAG,CAAC;IAStF,aAAa,CAAC,CAAC,SAAS,YAAY,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC;IAChD,aAAa,CAAC,CAAC,SAAS,YAAY,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC;IAChD,aAAa,CAAC,CAAC,SAAS,YAAY,GAAG,YAAY,EAAE,QAAQ,EAAE,CAAC,GAAG,CAAC;IAcpE;;;;OAIG;IACH,WAAW;IAKX;;OAEG;IACH,OAAO;IA6BP;;;;OAIG;IACG,YAAY;CA6BrB"}

package/dist/DestroyableEventTarget-3_XyRRfB.js

@@ -0,0 +1,285 @@
+var c = Object.defineProperty;
+var u = (i, o, s) => o in i ? c(i, o, { enumerable: !0, configurable: !0, writable: !0, value: s }) : i[o] = s;
+var y = (i, o, s) => u(i, typeof o != "symbol" ? o + "" : o, s);
+import { EventBus as a } from "@gby/event-bus";
+function h() {
+  throw "已销毁";
+}
+function D(i) {
+  for (var o in i)
+    typeof i[o] == "function" && (i[o] = h);
+  return i._isDestroyed = !0, !0;
+}
+function d(i) {
+  for (var o in i)
+    !(o in Destroyable.prototype) && typeof i[o] == "function" && (i[o] = h);
+  return i._isDestroyed = !0, !0;
+}
+function p(i) {
+  class o extends i {
+    constructor() {
+      super(...arguments);
+      /**
+       * 引用计数
+       * @remarks
+       * 引用计数为 0 时，对象才会被销毁
+       */
+      y(this, "refCount", 0);
+      y(this, "_isDestroyed", !1);
+      /**
+       * 销毁者
+       */
+      y(this, "_destroyers", []);
+    }
+    /**
+     * 是否已经销毁
+     */
+    get isDestroyed() {
+      return this._isDestroyed;
+    }
+    /**
+     * 是否可以销毁
+     */
+    get canDestroy() {
+      return !this.isDestroyed && this.refCount <= 0;
+    }
+    /**
+     * 添加销毁者
+     * @param fun 
+     * @returns 返回销毁者的顺序
+     */
+    disposeFun(e) {
+      return this._destroyers.push(e), e;
+    }
+    /**
+     * 取消销毁者函数
+     * @param fun 
+     * @returns 
+     */
+    cancelDisposeFun(e) {
+      const r = this._destroyers.indexOf(e);
+      return this._destroyers.splice(r, 1), e;
+    }
+    /**
+     * 添加销毁对象
+     * @param obj 
+     * @param sync - 表示是否使用  `obj.destroy()` 方法进行销毁；默认使用   `obj.destroyAsync()` 方法进行销毁
+     * @returns 
+     */
+    disposeObj(e, r) {
+      const n = r ? function() {
+        return e.destroy();
+      } : function() {
+        return e.destroyAsync();
+      };
+      return this.disposeFun(n), e.__destroyable_destroyer = n, e;
+    }
+    /**
+     * 取消销毁者函数
+     * @param fun 
+     * @returns 
+     */
+    cancelDisposeObj(e) {
+      const r = e.__destroyable_destroyer;
+      return r && this.cancelDisposeFun(r), e;
+    }
+    dispose(e, r) {
+      return typeof e == "function" ? this.disposeFun(e) : this.disposeObj(e, r);
+    }
+    cancelDispose(e) {
+      return typeof e == "function" ? this.cancelDisposeFun(e) : this.cancelDisposeObj(e);
+    }
+    /**
+     * 自己的销毁方法
+     * @remarks
+     * 子类根据需要进行重载
+     */
+    destroyThis() {
+    }
+    /**
+     * 销毁
+     */
+    destroy() {
+      if (!this.canDestroy) return this.isDestroyed;
+      let e = this._destroyers.length;
+      for (; --e >= 0; ) {
+        const r = this._destroyers[e];
+        try {
+          r();
+        } catch (n) {
+          console.error("销毁函数在同步销毁时出错", this, r, n);
+        }
+      }
+      this._destroyers.length = 0;
+      try {
+        this.destroyThis();
+      } catch (r) {
+        console.error("destroyThis 在异步销毁时出错", this, r);
+      }
+      return d(this), !0;
+    }
+    /**
+     * 异步销毁
+     * @remarks
+     * 会依次执行销毁，并且只有上一个销毁完成之后才会执行下一个销毁
+     */
+    async destroyAsync() {
+      if (!this.canDestroy) return this.isDestroyed;
+      let e = this._destroyers.length;
+      for (; --e >= 0; ) {
+        const r = this._destroyers[e];
+        try {
+          const n = r();
+          n && n instanceof Promise && await n;
+        } catch (n) {
+          console.error("销毁函数在异步销毁时出错", this, r, n);
+        }
+      }
+      this._destroyers.length = 0;
+      try {
+        const r = this.destroyThis();
+        r && r instanceof Promise && await r;
+      } catch (r) {
+        console.error("destroyThis 在异步销毁时出错", this, r);
+      }
+      return d(this), !0;
+    }
+  }
+  return o;
+}
+class _ extends a {
+  constructor() {
+    super(...arguments);
+    /**
+     * 引用计数
+     * @remarks
+     * 引用计数为 0 时，对象才会被销毁
+     */
+    y(this, "refCount", 0);
+    y(this, "_isDestroyed", !1);
+    /**
+     * 销毁者
+     */
+    y(this, "_destroyers", []);
+  }
+  /**
+   * 是否已经销毁
+   */
+  get isDestroyed() {
+    return this._isDestroyed;
+  }
+  /**
+   * 是否可以销毁
+   */
+  get canDestroy() {
+    return !this.isDestroyed && this.refCount <= 0;
+  }
+  /**
+   * 添加销毁者
+   * @param fun 
+   * @returns 返回销毁者的顺序
+   */
+  disposeFun(s) {
+    return this._destroyers.push(s), s;
+  }
+  /**
+   * 取消销毁者函数
+   * @param fun 
+   * @returns 
+   */
+  cancelDisposeFun(s) {
+    const t = this._destroyers.indexOf(s);
+    return this._destroyers.splice(t, 1), s;
+  }
+  /**
+   * 添加销毁对象
+   * @param obj 
+   * @param sync - 表示是否使用  `obj.destroy()` 方法进行销毁；默认使用   `obj.destroyAsync()` 方法进行销毁
+   * @returns 
+   */
+  disposeObj(s, t) {
+    const e = t ? function() {
+      return s.destroy();
+    } : function() {
+      return s.destroyAsync();
+    };
+    return this.disposeFun(e), s.__destroyable_destroyer = e, s;
+  }
+  /**
+   * 取消销毁者函数
+   * @param fun 
+   * @returns 
+   */
+  cancelDisposeObj(s) {
+    const t = s.__destroyable_destroyer;
+    return t && this.cancelDisposeFun(t), s;
+  }
+  dispose(s, t) {
+    return typeof s == "function" ? this.disposeFun(s) : this.disposeObj(s, t);
+  }
+  cancelDispose(s) {
+    return typeof s == "function" ? this.cancelDisposeFun(s) : this.cancelDisposeObj(s);
+  }
+  /**
+   * 自己的销毁方法
+   * @remarks
+   * 子类根据需要进行重载
+   */
+  destroyThis() {
+  }
+  /**
+   * 销毁
+   */
+  destroy() {
+    if (!this.canDestroy) return this.isDestroyed;
+    let s = this._destroyers.length;
+    for (; --s >= 0; ) {
+      const t = this._destroyers[s];
+      try {
+        t();
+      } catch (e) {
+        console.error("销毁函数在同步销毁时出错", this, t, e);
+      }
+    }
+    this._destroyers.length = 0;
+    try {
+      this.destroyThis();
+    } catch (t) {
+      console.error("destroyThis 在异步销毁时出错", this, t);
+    }
+    return d(this), !0;
+  }
+  /**
+   * 异步销毁
+   * @remarks
+   * 会依次执行销毁，并且只有上一个销毁完成之后才会执行下一个销毁
+   */
+  async destroyAsync() {
+    if (!this.canDestroy) return this.isDestroyed;
+    let s = this._destroyers.length;
+    for (; --s >= 0; ) {
+      const t = this._destroyers[s];
+      try {
+        const e = t();
+        e && e instanceof Promise && await e;
+      } catch (e) {
+        console.error("销毁函数在异步销毁时出错", this, t, e);
+      }
+    }
+    this._destroyers.length = 0;
+    try {
+      const t = this.destroyThis();
+      t && t instanceof Promise && await t;
+    } catch (t) {
+      console.error("destroyThis 在异步销毁时出错", this, t);
+    }
+    return d(this), !0;
+  }
+}
+export {
+  _ as D,
+  d as a,
+  p as c,
+  D as d,
+  h as t
+};

package/dist/DestroyableEventTarget-B26KR0Ul.cjs

@@ -0,0 +1 @@
+"use strict";var h=Object.defineProperty;var u=(i,o,s)=>o in i?h(i,o,{enumerable:!0,configurable:!0,writable:!0,value:s}):i[o]=s;var y=(i,o,s)=>u(i,typeof o!="symbol"?o+"":o,s);const a=require("@gby/event-bus");function d(){throw"已销毁"}function l(i){for(var o in i)typeof i[o]=="function"&&(i[o]=d);return i._isDestroyed=!0,!0}function c(i){for(var o in i)!(o in Destroyable.prototype)&&typeof i[o]=="function"&&(i[o]=d);return i._isDestroyed=!0,!0}function f(i){class o extends i{constructor(){super(...arguments);y(this,"refCount",0);y(this,"_isDestroyed",!1);y(this,"_destroyers",[])}get isDestroyed(){return this._isDestroyed}get canDestroy(){return!this.isDestroyed&&this.refCount<=0}disposeFun(e){return this._destroyers.push(e),e}cancelDisposeFun(e){const r=this._destroyers.indexOf(e);return this._destroyers.splice(r,1),e}disposeObj(e,r){const n=r?function(){return e.destroy()}:function(){return e.destroyAsync()};return this.disposeFun(n),e.__destroyable_destroyer=n,e}cancelDisposeObj(e){const r=e.__destroyable_destroyer;return r&&this.cancelDisposeFun(r),e}dispose(e,r){return typeof e=="function"?this.disposeFun(e):this.disposeObj(e,r)}cancelDispose(e){return typeof e=="function"?this.cancelDisposeFun(e):this.cancelDisposeObj(e)}destroyThis(){}destroy(){if(!this.canDestroy)return this.isDestroyed;let e=this._destroyers.length;for(;--e>=0;){const r=this._destroyers[e];try{r()}catch(n){console.error("销毁函数在同步销毁时出错",this,r,n)}}this._destroyers.length=0;try{this.destroyThis()}catch(r){console.error("destroyThis 在异步销毁时出错",this,r)}return c(this),!0}async destroyAsync(){if(!this.canDestroy)return this.isDestroyed;let e=this._destroyers.length;for(;--e>=0;){const r=this._destroyers[e];try{const n=r();n&&n instanceof Promise&&await n}catch(n){console.error("销毁函数在异步销毁时出错",this,r,n)}}this._destroyers.length=0;try{const r=this.destroyThis();r&&r instanceof Promise&&await r}catch(r){console.error("destroyThis 在异步销毁时出错",this,r)}return c(this),!0}}return o}class D extends a.EventBus{constructor(){super(...arguments);y(this,"refCount",0);y(this,"_isDestroyed",!1);y(this,"_destroyers",[])}get isDestroyed(){return this._isDestroyed}get canDestroy(){return!this.isDestroyed&&this.refCount<=0}disposeFun(s){return this._destroyers.push(s),s}cancelDisposeFun(s){const t=this._destroyers.indexOf(s);return this._destroyers.splice(t,1),s}disposeObj(s,t){const e=t?function(){return s.destroy()}:function(){return s.destroyAsync()};return this.disposeFun(e),s.__destroyable_destroyer=e,s}cancelDisposeObj(s){const t=s.__destroyable_destroyer;return t&&this.cancelDisposeFun(t),s}dispose(s,t){return typeof s=="function"?this.disposeFun(s):this.disposeObj(s,t)}cancelDispose(s){return typeof s=="function"?this.cancelDisposeFun(s):this.cancelDisposeObj(s)}destroyThis(){}destroy(){if(!this.canDestroy)return this.isDestroyed;let s=this._destroyers.length;for(;--s>=0;){const t=this._destroyers[s];try{t()}catch(e){console.error("销毁函数在同步销毁时出错",this,t,e)}}this._destroyers.length=0;try{this.destroyThis()}catch(t){console.error("destroyThis 在异步销毁时出错",this,t)}return c(this),!0}async destroyAsync(){if(!this.canDestroy)return this.isDestroyed;let s=this._destroyers.length;for(;--s>=0;){const t=this._destroyers[s];try{const e=t();e&&e instanceof Promise&&await e}catch(e){console.error("销毁函数在异步销毁时出错",this,t,e)}}this._destroyers.length=0;try{const t=this.destroyThis();t&&t instanceof Promise&&await t}catch(t){console.error("destroyThis 在异步销毁时出错",this,t)}return c(this),!0}}exports.DestroyableEventTarget=D;exports.createDestroyableSubClass=f;exports.destroyDestroyable=c;exports.destroyObject=l;exports.throwOnDestroyed=d;

package/dist/DestroyableEventTarget.d.ts

@@ -0,0 +1,78 @@
+import type { FunDestroyer, IDestroyable } from "./Destroyable";
+import { EventBus } from "@gby/event-bus";
+/**
+ * 可销毁的对象
+ */
+export declare class DestroyableEventTarget<EM extends Record<string, any> = Record<string, any>> extends EventBus<EM> implements IDestroyable {
+    /**
+     * 引用计数
+     * @remarks
+     * 引用计数为 0 时，对象才会被销毁
+     */
+    refCount: number;
+    /**
+     * 是否已经销毁
+     */
+    get isDestroyed(): boolean;
+    _isDestroyed: boolean;
+    /**
+     * 是否可以销毁
+     */
+    get canDestroy(): boolean;
+    /**
+     * 销毁者
+     */
+    _destroyers: FunDestroyer[];
+    /**
+     * 添加销毁者
+     * @param fun
+     * @returns 返回销毁者的顺序
+     */
+    disposeFun<T extends FunDestroyer>(fun: T): T;
+    /**
+     * 取消销毁者函数
+     * @param fun
+     * @returns
+     */
+    cancelDisposeFun<T extends FunDestroyer>(fun: T): T;
+    /**
+     * 添加销毁对象
+     * @param obj
+     * @param sync - 表示是否使用  `obj.destroy()` 方法进行销毁；默认使用   `obj.destroyAsync()` 方法进行销毁
+     * @returns
+     */
+    disposeObj<T extends IDestroyable>(obj: T, sync?: boolean): T;
+    /**
+     * 取消销毁者函数
+     * @param fun
+     * @returns
+     */
+    cancelDisposeObj<T extends IDestroyable>(obj: T): T;
+    /**
+     * 添加销毁函数或销毁对象
+     * @param fun
+     */
+    dispose<T extends FunDestroyer>(fun: T): T;
+    dispose<T extends IDestroyable>(obj: T, asyncDestroy?: boolean): T;
+    dispose<T extends IDestroyable | FunDestroyer>(objOrFun: T, asyncDestroy?: boolean): T;
+    cancelDispose<T extends FunDestroyer>(fun: T): T;
+    cancelDispose<T extends IDestroyable>(obj: T): T;
+    cancelDispose<T extends IDestroyable | FunDestroyer>(objOrFun: T): T;
+    /**
+     * 自己的销毁方法
+     * @remarks
+     * 子类根据需要进行重载
+     */
+    destroyThis(): void;
+    /**
+     * 销毁
+     */
+    destroy(): boolean;
+    /**
+     * 异步销毁
+     * @remarks
+     * 会依次执行销毁，并且只有上一个销毁完成之后才会执行下一个销毁
+     */
+    destroyAsync(): Promise<boolean>;
+}
+//# sourceMappingURL=DestroyableEventTarget.d.ts.map

package/dist/DestroyableEventTarget.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"DestroyableEventTarget.d.ts","sourceRoot":"","sources":["../src/DestroyableEventTarget.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAEhE,OAAO,EAAC,QAAQ,EAAC,MAAM,gBAAgB,CAAC;AAGxC;;GAEG;AACH,qBAAa,sBAAsB,CAAC,EAAE,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAE,SAAQ,QAAQ,CAAC,EAAE,CAAE,YAAW,YAAY;IAElI;;;;OAIG;IACH,QAAQ,SAAK;IAEb;;OAEG;IACH,IAAI,WAAW,YAEd;IACD,YAAY,UAAS;IAErB;;OAEG;IACH,IAAI,UAAU,YAEb;IAED;;OAEG;IACH,WAAW,EAAE,YAAY,EAAE,CAAM;IAEjC;;;;OAIG;IACH,UAAU,CAAC,CAAC,SAAS,YAAY,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC;IAK7C;;;;OAIG;IACH,gBAAgB,CAAC,CAAC,SAAS,YAAY,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC;IAMnD;;;;;OAKG;IACH,UAAU,CAAC,CAAC,SAAS,YAAY,EAAE,GAAG,EAAE,CAAC,EAAE,IAAI,CAAC,EAAE,OAAO,GAAG,CAAC;IAQ7D;;;;OAIG;IACH,gBAAgB,CAAC,CAAC,SAAS,YAAY,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC;IASnD;;;OAGG;IACH,OAAO,CAAC,CAAC,SAAS,YAAY,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC;IAC1C,OAAO,CAAC,CAAC,SAAS,YAAY,EAAE,GAAG,EAAE,CAAC,EAAE,YAAY,CAAC,EAAE,OAAO,GAAG,CAAC;IAClE,OAAO,CAAC,CAAC,SAAS,YAAY,GAAG,YAAY,EAAE,QAAQ,EAAE,CAAC,EAAE,YAAY,CAAC,EAAE,OAAO,GAAG,CAAC;IAStF,aAAa,CAAC,CAAC,SAAS,YAAY,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC;IAChD,aAAa,CAAC,CAAC,SAAS,YAAY,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC;IAChD,aAAa,CAAC,CAAC,SAAS,YAAY,GAAG,YAAY,EAAE,QAAQ,EAAE,CAAC,GAAG,CAAC;IAcpE;;;;OAIG;IACH,WAAW;IAKX;;OAEG;IACH,OAAO;IA6BP;;;;OAIG;IACG,YAAY;CA6BrB"}

package/dist/createDestroyableSubClass.d.ts

@@ -1,4 +1,4 @@
-import type { FunDestroyer } from "./Destroyable";
+import type { FunDestroyer, IDestroyable } from "./Destroyable";
 /**
  * 创建可销毁的子类
  * @remarks
@@ -45,23 +45,23 @@ export declare function createDestroyableSubClass<P extends new (...args: any) =
          * @param sync - 表示是否使用  `obj.destroy()` 方法进行销毁；默认使用   `obj.destroyAsync()` 方法进行销毁
          * @returns
          */
-        disposeObj<T extends /*elided*/ any>(obj: T, sync?: boolean): T;
+        disposeObj<T extends IDestroyable>(obj: T, sync?: boolean): T;
         /**
          * 取消销毁者函数
          * @param fun
          * @returns
          */
-        cancelDisposeObj<T extends /*elided*/ any>(obj: T): T;
+        cancelDisposeObj<T extends IDestroyable>(obj: T): T;
         /**
          * 添加销毁函数或销毁对象
          * @param fun
          */
         dispose<T extends FunDestroyer>(fun: T): T;
-        dispose<T extends /*elided*/ any>(obj: T, asyncDestroy?: boolean): T;
-        dispose<T extends /*elided*/ any | FunDestroyer>(objOrFun: T, asyncDestroy?: boolean): T;
+        dispose<T extends IDestroyable>(obj: T, asyncDestroy?: boolean): T;
+        dispose<T extends IDestroyable | FunDestroyer>(objOrFun: T, asyncDestroy?: boolean): T;
         cancelDispose<T extends FunDestroyer>(fun: T): T;
-        cancelDispose<T extends /*elided*/ any>(obj: T): T;
-        cancelDispose<T extends /*elided*/ any | FunDestroyer>(objOrFun: T): T;
+        cancelDispose<T extends IDestroyable>(obj: T): T;
+        cancelDispose<T extends IDestroyable | FunDestroyer>(objOrFun: T): T;
         /**
          * 自己的销毁方法
          * @remarks

package/dist/createDestroyableSubClass.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createDestroyableSubClass.d.ts","sourceRoot":"","sources":["../src/createDestroyableSubClass.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAGlD;;;;;;GAMG;AACH,wBAAgB,yBAAyB,CAAC,CAAC,SAAS,KAAK,GAAG,IAAI,EAAE,GAAG,KAAK,MAAM,EAAE,WAAW,EAAE,CAAC;kBAA9B,GAAG;QAQ7D;;;;WAIG;;QAGH;;WAEG;;;QAMH;;WAEG;;QAMH;;WAEG;qBACU,YAAY,EAAE;QAE3B;;;;WAIG;mBACQ,CAAC,SAAS,YAAY,OAAO,CAAC,GAAG,CAAC;QAK7C;;;;WAIG;yBACc,CAAC,SAAS,YAAY,OAAO,CAAC,GAAG,CAAC;QAMnD;;;;;WAKG;mBACQ,CAAC,8BAA8B,CAAC,SAAS,OAAO,GAAG,CAAC;QAQ/D;;;;WAIG;yBACc,CAAC,8BAA8B,CAAC,GAAG,CAAC;QASrD;;;WAGG;gBACK,CAAC,SAAS,YAAY,OAAO,CAAC,GAAG,CAAC;gBAClC,CAAC,8BAA8B,CAAC,iBAAiB,OAAO,GAAG,CAAC;gBAC5D,CAAC,SAAS,iBAAiB,YAAY,YAAY,CAAC,iBAAiB,OAAO,GAAG,CAAC;sBAS1E,CAAC,SAAS,YAAY,OAAO,CAAC,GAAG,CAAC;sBAClC,CAAC,8BAA8B,CAAC,GAAG,CAAC;sBACpC,CAAC,SAAS,iBAAiB,YAAY,YAAY,CAAC,GAAG,CAAC;QActE;;;;WAIG;;QAMH;;WAEG;;QA8BH;;;;WAIG;;;;;;;;;;MAmCV;AAMD;;GAEG;AACH,MAAM,MAAM,mBAAmB,CAAC,WAAW,SAAS,KAAK,GAAG,IAAI,EAAE,GAAG,KAAK,MAAM,IAAI,UAAU,CAAC,OAAO,yBAAyB,CAAC,WAAW,CAAC,CAAC,CAAC;AAE9I;;GAEG;AACH,MAAM,MAAM,cAAc,CAAC,WAAW,SAAS,KAAK,GAAG,IAAI,EAAE,GAAG,KAAK,MAAM,IAAI,YAAY,CAAC,mBAAmB,CAAC,WAAW,CAAC,CAAC,CAAC"}
+{"version":3,"file":"createDestroyableSubClass.d.ts","sourceRoot":"","sources":["../src/createDestroyableSubClass.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAC,YAAY,EAAE,MAAM,eAAe,CAAC;AAG/D;;;;;;GAMG;AACH,wBAAgB,yBAAyB,CAAC,CAAC,SAAS,KAAK,GAAG,IAAI,EAAE,GAAG,KAAK,MAAM,EAAE,WAAW,EAAE,CAAC;kBAA9B,GAAG;QAQ7D;;;;WAIG;;QAGH;;WAEG;;;QAMH;;WAEG;;QAMH;;WAEG;qBACU,YAAY,EAAE;QAE3B;;;;WAIG;mBACQ,CAAC,SAAS,YAAY,OAAO,CAAC,GAAG,CAAC;QAK7C;;;;WAIG;yBACc,CAAC,SAAS,YAAY,OAAO,CAAC,GAAG,CAAC;QAMnD;;;;;WAKG;mBACQ,CAAC,SAAS,YAAY,OAAO,CAAC,SAAS,OAAO,GAAG,CAAC;QAQ7D;;;;WAIG;yBACc,CAAC,SAAS,YAAY,OAAO,CAAC,GAAG,CAAC;QASnD;;;WAGG;gBACK,CAAC,SAAS,YAAY,OAAO,CAAC,GAAG,CAAC;gBAClC,CAAC,SAAS,YAAY,OAAO,CAAC,iBAAiB,OAAO,GAAG,CAAC;gBAC1D,CAAC,SAAS,YAAY,GAAG,YAAY,YAAY,CAAC,iBAAiB,OAAO,GAAG,CAAC;sBASxE,CAAC,SAAS,YAAY,OAAO,CAAC,GAAG,CAAC;sBAClC,CAAC,SAAS,YAAY,OAAO,CAAC,GAAG,CAAC;sBAClC,CAAC,SAAS,YAAY,GAAG,YAAY,YAAY,CAAC,GAAG,CAAC;QAcpE;;;;WAIG;;QAMH;;WAEG;;QA8BH;;;;WAIG;;;;;;;;;;MAmCV;AAMD;;GAEG;AACH,MAAM,MAAM,mBAAmB,CAAC,WAAW,SAAS,KAAK,GAAG,IAAI,EAAE,GAAG,KAAK,MAAM,IAAI,UAAU,CAAC,OAAO,yBAAyB,CAAC,WAAW,CAAC,CAAC,CAAC;AAE9I;;GAEG;AACH,MAAM,MAAM,cAAc,CAAC,WAAW,SAAS,KAAK,GAAG,IAAI,EAAE,GAAG,KAAK,MAAM,IAAI,YAAY,CAAC,mBAAmB,CAAC,WAAW,CAAC,CAAC,CAAC"}

package/dist/index-web.cjs

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("./DestroyableEventTarget-B26KR0Ul.cjs");exports.DestroyableEventTarget=e.DestroyableEventTarget;exports.createDestroyableSubClass=e.createDestroyableSubClass;exports.destroyDestroyable=e.destroyDestroyable;exports.destroyObject=e.destroyObject;exports.throwOnDestroyed=e.throwOnDestroyed;

package/dist/index-web.d.ts

@@ -0,0 +1,12 @@
+/**
+ * 可销毁的
+ *
+ * @remarks
+ * @gby/destroyable 提供了用于构建可销毁对象的类的基类，用于使得地管理可销毁对象的生命周期
+ *
+ * @packageDocumentation
+ */
+export * from './Destroyable';
+export * from "./createDestroyableSubClass";
+export * from "./DestroyableEventTarget";
+//# sourceMappingURL=index-web.d.ts.map

package/dist/index-web.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index-web.d.ts","sourceRoot":"","sources":["../src/index-web.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,cAAc,eAAe,CAAC;AAC9B,cAAc,6BAA6B,CAAC;AAC5C,cAAc,0BAA0B,CAAC"}

package/dist/index-web.js

@@ -0,0 +1,8 @@
+import { D as t, c as a, a as r, d as o, t as y } from "./DestroyableEventTarget-3_XyRRfB.js";
+export {
+  t as DestroyableEventTarget,
+  a as createDestroyableSubClass,
+  r as destroyDestroyable,
+  o as destroyObject,
+  y as throwOnDestroyed
+};

package/dist/index.cjs

@@ -0,0 +1 @@
+"use strict";var y=Object.defineProperty;var d=(i,r,e)=>r in i?y(i,r,{enumerable:!0,configurable:!0,writable:!0,value:e}):i[r]=e;var n=(i,r,e)=>d(i,typeof r!="symbol"?r+"":r,e);Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const o=require("./DestroyableEventTarget-B26KR0Ul.cjs"),c=require("node:events");class h extends c.EventEmitter{constructor(){super(...arguments);n(this,"refCount",0);n(this,"_isDestroyed",!1);n(this,"_destroyers",[])}get isDestroyed(){return this._isDestroyed}get canDestroy(){return!this.isDestroyed&&this.refCount<=0}disposeFun(e){return this._destroyers.push(e),e}cancelDisposeFun(e){const t=this._destroyers.indexOf(e);return this._destroyers.splice(t,1),e}disposeObj(e,t){const s=t?function(){return e.destroy()}:function(){return e.destroyAsync()};return this.disposeFun(s),e.__destroyable_destroyer=s,e}cancelDisposeObj(e){const t=e.__destroyable_destroyer;return t&&this.cancelDisposeFun(t),e}dispose(e,t){return typeof e=="function"?this.disposeFun(e):this.disposeObj(e,t)}cancelDispose(e){return typeof e=="function"?this.cancelDisposeFun(e):this.cancelDisposeObj(e)}destroyThis(){}destroy(){if(!this.canDestroy)return this.isDestroyed;let e=this._destroyers.length;for(;--e>=0;){const t=this._destroyers[e];try{t()}catch(s){console.error("销毁函数在同步销毁时出错",this,t,s)}}this._destroyers.length=0;try{this.destroyThis()}catch(t){console.error("destroyThis 在异步销毁时出错",this,t)}return o.destroyDestroyable(this),!0}async destroyAsync(){if(!this.canDestroy)return this.isDestroyed;let e=this._destroyers.length;for(;--e>=0;){const t=this._destroyers[e];try{const s=t();s&&s instanceof Promise&&await s}catch(s){console.error("销毁函数在异步销毁时出错",this,t,s)}}this._destroyers.length=0;try{const t=this.destroyThis();t&&t instanceof Promise&&await t}catch(t){console.error("destroyThis 在异步销毁时出错",this,t)}return o.destroyDestroyable(this),!0}}exports.DestroyableEventTarget=o.DestroyableEventTarget;exports.createDestroyableSubClass=o.createDestroyableSubClass;exports.destroyDestroyable=o.destroyDestroyable;exports.destroyObject=o.destroyObject;exports.throwOnDestroyed=o.throwOnDestroyed;exports.DestroyableEventEmitter=h;

package/dist/index.d.ts

@@ -8,5 +8,6 @@
  */
 export * from './Destroyable';
 export * from "./createDestroyableSubClass";
-export * from "./DestroyableSub";
+export * from "./DestroyableEventTarget";
+export * from "./DestroyableEventEmitter";
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,cAAc,eAAe,CAAC;AAC9B,cAAc,6BAA6B,CAAA;AAC3C,cAAc,kBAAkB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,cAAc,eAAe,CAAC;AAC9B,cAAc,6BAA6B,CAAC;AAC5C,cAAc,0BAA0B,CAAC;AACzC,cAAc,2BAA2B,CAAC"}

package/dist/index.js

@@ -1,21 +1,23 @@
-var u = Object.defineProperty;
-var a = (i, e, s) => e in i ? u(i, e, { enumerable: !0, configurable: !0, writable: !0, value: s }) : i[e] = s;
-var y = (i, e, s) => a(i, typeof e != "symbol" ? e + "" : e, s);
-import { EventBus as l } from "@gby/event-bus";
-import { EventEmitter as f } from "node:events";
-class p {
+var y = Object.defineProperty;
+var c = (o, r, e) => r in o ? y(o, r, { enumerable: !0, configurable: !0, writable: !0, value: e }) : o[r] = e;
+var i = (o, r, e) => c(o, typeof r != "symbol" ? r + "" : r, e);
+import { a as n } from "./DestroyableEventTarget-3_XyRRfB.js";
+import { D as p, c as _, d as m, t as g } from "./DestroyableEventTarget-3_XyRRfB.js";
+import { EventEmitter as d } from "node:events";
+class u extends d {
   constructor() {
+    super(...arguments);
     /**
      * 引用计数
      * @remarks
      * 引用计数为 0 时，对象才会被销毁
      */
-    y(this, "refCount", 0);
-    y(this, "_isDestroyed", !1);
+    i(this, "refCount", 0);
+    i(this, "_isDestroyed", !1);
     /**
      * 销毁者
      */
-    y(this, "_destroyers", []);
+    i(this, "_destroyers", []);
   }
   /**
    * 是否已经销毁
@@ -53,12 +55,12 @@ class p {
    * @returns 
    */
   disposeObj(e, s) {
-    const o = s ? function() {
+    const t = s ? function() {
       return e.destroy();
     } : function() {
       return e.destroyAsync();
     };
-    return this.disposeFun(o), e.__destroyable_destroyer = o, e;
+    return this.disposeFun(t), e.__destroyable_destroyer = t, e;
   }
   /**
    * 取消销毁者函数
@@ -92,8 +94,8 @@ class p {
       const s = this._destroyers[e];
       try {
         s();
-      } catch (o) {
-        console.error("销毁函数在同步销毁时出错", this, s, o);
+      } catch (t) {
+        console.error("销毁函数在同步销毁时出错", this, s, t);
       }
     }
     this._destroyers.length = 0;
@@ -102,7 +104,7 @@ class p {
     } catch (s) {
       console.error("destroyThis 在异步销毁时出错", this, s);
     }
-    return c(this), !0;
+    return n(this), !0;
   }
   /**
    * 异步销毁
@@ -115,10 +117,10 @@ class p {
     for (; --e >= 0; ) {
       const s = this._destroyers[e];
       try {
-        const o = s();
-        o && o instanceof Promise && await o;
-      } catch (o) {
-        console.error("销毁函数在异步销毁时出错", this, s, o);
+        const t = s();
+        t && t instanceof Promise && await t;
+      } catch (t) {
+        console.error("销毁函数在异步销毁时出错", this, s, t);
       }
     }
     this._destroyers.length = 0;
@@ -128,161 +130,14 @@ class p {
     } catch (s) {
       console.error("destroyThis 在异步销毁时出错", this, s);
     }
-    return c(this), !0;
+    return n(this), !0;
   }
 }
-function h() {
-  throw "已销毁";
-}
-function w(i) {
-  for (var e in i)
-    typeof i[e] == "function" && (i[e] = h);
-  return i._isDestroyed = !0, !0;
-}
-function c(i) {
-  for (var e in i)
-    !(e in p.prototype) && typeof i[e] == "function" && (i[e] = h);
-  return i._isDestroyed = !0, !0;
-}
-function d(i) {
-  class e extends i {
-    constructor() {
-      super(...arguments);
-      /**
-       * 引用计数
-       * @remarks
-       * 引用计数为 0 时，对象才会被销毁
-       */
-      y(this, "refCount", 0);
-      y(this, "_isDestroyed", !1);
-      /**
-       * 销毁者
-       */
-      y(this, "_destroyers", []);
-    }
-    /**
-     * 是否已经销毁
-     */
-    get isDestroyed() {
-      return this._isDestroyed;
-    }
-    /**
-     * 是否可以销毁
-     */
-    get canDestroy() {
-      return !this.isDestroyed && this.refCount <= 0;
-    }
-    /**
-     * 添加销毁者
-     * @param fun 
-     * @returns 返回销毁者的顺序
-     */
-    disposeFun(t) {
-      return this._destroyers.push(t), t;
-    }
-    /**
-     * 取消销毁者函数
-     * @param fun 
-     * @returns 
-     */
-    cancelDisposeFun(t) {
-      const r = this._destroyers.indexOf(t);
-      return this._destroyers.splice(r, 1), t;
-    }
-    /**
-     * 添加销毁对象
-     * @param obj 
-     * @param sync - 表示是否使用  `obj.destroy()` 方法进行销毁；默认使用   `obj.destroyAsync()` 方法进行销毁
-     * @returns 
-     */
-    disposeObj(t, r) {
-      const n = r ? function() {
-        return t.destroy();
-      } : function() {
-        return t.destroyAsync();
-      };
-      return this.disposeFun(n), t.__destroyable_destroyer = n, t;
-    }
-    /**
-     * 取消销毁者函数
-     * @param fun 
-     * @returns 
-     */
-    cancelDisposeObj(t) {
-      const r = t.__destroyable_destroyer;
-      return r && this.cancelDisposeFun(r), t;
-    }
-    dispose(t, r) {
-      return typeof t == "function" ? this.disposeFun(t) : this.disposeObj(t, r);
-    }
-    cancelDispose(t) {
-      return typeof t == "function" ? this.cancelDisposeFun(t) : this.cancelDisposeObj(t);
-    }
-    /**
-     * 自己的销毁方法
-     * @remarks
-     * 子类根据需要进行重载
-     */
-    destroyThis() {
-    }
-    /**
-     * 销毁
-     */
-    destroy() {
-      if (!this.canDestroy) return this.isDestroyed;
-      let t = this._destroyers.length;
-      for (; --t >= 0; ) {
-        const r = this._destroyers[t];
-        try {
-          r();
-        } catch (n) {
-          console.error("销毁函数在同步销毁时出错", this, r, n);
-        }
-      }
-      this._destroyers.length = 0;
-      try {
-        this.destroyThis();
-      } catch (r) {
-        console.error("destroyThis 在异步销毁时出错", this, r);
-      }
-      return c(this), !0;
-    }
-    /**
-     * 异步销毁
-     * @remarks
-     * 会依次执行销毁，并且只有上一个销毁完成之后才会执行下一个销毁
-     */
-    async destroyAsync() {
-      if (!this.canDestroy) return this.isDestroyed;
-      let t = this._destroyers.length;
-      for (; --t >= 0; ) {
-        const r = this._destroyers[t];
-        try {
-          const n = r();
-          n && n instanceof Promise && await n;
-        } catch (n) {
-          console.error("销毁函数在异步销毁时出错", this, r, n);
-        }
-      }
-      this._destroyers.length = 0;
-      try {
-        const r = this.destroyThis();
-        r && r instanceof Promise && await r;
-      } catch (r) {
-        console.error("destroyThis 在异步销毁时出错", this, r);
-      }
-      return c(this), !0;
-    }
-  }
-  return e;
-}
-const x = d(l), T = d(f);
 export {
-  p as Destroyable,
-  T as NodeDestroyable,
-  x as WebDestroyable,
-  d as createDestroyableSubClass,
-  c as destroyDestroyable,
-  w as destroyObject,
-  h as throwOnDestroyed
+  u as DestroyableEventEmitter,
+  p as DestroyableEventTarget,
+  _ as createDestroyableSubClass,
+  n as destroyDestroyable,
+  m as destroyObject,
+  g as throwOnDestroyed
 };

package/package.json

@@ -1,15 +1,19 @@
 {
   "name": "@gby/destroyable",
-  "version": "1.1.0",
+  "version": "3.0.0",
   "description": "@gby/destroyable 提供了用于构建可销毁对象的类的基类，用于使得地管理可销毁对象的生命周期",
-  "main": "./dist/index.umd.cjs",
+  "main": "./dist/index.cjs",
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "exports": {
-    "require": "./dist/index.umd.cjs",
+    "browser": {
+      "require": "./dist/index-web.cjs",
+      "types": "./dist/index-web.d.ts",
+      "import": "./dist/index-web.js"
+    },
+    "require": "./dist/index.cjs",
     "types": "./dist/index.d.ts",
-    "import": "./dist/index.js",
-    "default": "./dist/index.js"
+    "import": "./dist/index.js"
   },
   "type": "module",
   "sideEffects": false,

package/dist/DestroyableSub.d.ts

@@ -1,83 +0,0 @@
-import { EventBus } from "@gby/event-bus";
-import { EventEmitter } from "node:events";
-/**
- * WebDestroyable 类对象
- */
-export declare const WebDestroyable: {
-    new (...args: any): {
-        refCount: number;
-        readonly isDestroyed: boolean;
-        _isDestroyed: boolean;
-        readonly canDestroy: boolean;
-        _destroyers: import("./Destroyable").FunDestroyer[];
-        disposeFun<T extends import("./Destroyable").FunDestroyer>(fun: T): T;
-        cancelDisposeFun<T extends import("./Destroyable").FunDestroyer>(fun: T): T;
-        disposeObj<T extends /*elided*/ any>(obj: T, sync?: boolean): T;
-        cancelDisposeObj<T extends /*elided*/ any>(obj: T): T;
-        dispose<T extends import("./Destroyable").FunDestroyer>(fun: T): T;
-        dispose<T extends /*elided*/ any>(obj: T, asyncDestroy?: boolean): T;
-        dispose<T extends import("./Destroyable").FunDestroyer | /*elided*/ any>(objOrFun: T, asyncDestroy?: boolean): T;
-        cancelDispose<T extends import("./Destroyable").FunDestroyer>(fun: T): T;
-        cancelDispose<T extends /*elided*/ any>(obj: T): T;
-        cancelDispose<T extends import("./Destroyable").FunDestroyer | /*elided*/ any>(objOrFun: T): T;
-        destroyThis(): void;
-        destroy(): boolean;
-        destroyAsync(): Promise<boolean>;
-        constructor: Function;
-        toString(): string;
-        toLocaleString(): string;
-        valueOf(): Object;
-        hasOwnProperty(v: PropertyKey): boolean;
-        isPrototypeOf(v: Object): boolean;
-        propertyIsEnumerable(v: PropertyKey): boolean;
-    };
-} & typeof EventBus;
-/**
- * WebDestroyable 类的类型
- */
-export type WebDestroyableClass = typeof WebDestroyable;
-/**
- * WebDestroyable 实例的类型
- */
-export type WebDestroyable = InstanceType<WebDestroyableClass>;
-/**
- * NodeDestroyable 类对象
- */
-export declare const NodeDestroyable: {
-    new (...args: any): {
-        refCount: number;
-        readonly isDestroyed: boolean;
-        _isDestroyed: boolean;
-        readonly canDestroy: boolean;
-        _destroyers: import("./Destroyable").FunDestroyer[];
-        disposeFun<T extends import("./Destroyable").FunDestroyer>(fun: T): T;
-        cancelDisposeFun<T extends import("./Destroyable").FunDestroyer>(fun: T): T;
-        disposeObj<T extends /*elided*/ any>(obj: T, sync?: boolean): T;
-        cancelDisposeObj<T extends /*elided*/ any>(obj: T): T;
-        dispose<T extends import("./Destroyable").FunDestroyer>(fun: T): T;
-        dispose<T extends /*elided*/ any>(obj: T, asyncDestroy?: boolean): T;
-        dispose<T extends import("./Destroyable").FunDestroyer | /*elided*/ any>(objOrFun: T, asyncDestroy?: boolean): T;
-        cancelDispose<T extends import("./Destroyable").FunDestroyer>(fun: T): T;
-        cancelDispose<T extends /*elided*/ any>(obj: T): T;
-        cancelDispose<T extends import("./Destroyable").FunDestroyer | /*elided*/ any>(objOrFun: T): T;
-        destroyThis(): void;
-        destroy(): boolean;
-        destroyAsync(): Promise<boolean>;
-        constructor: Function;
-        toString(): string;
-        toLocaleString(): string;
-        valueOf(): Object;
-        hasOwnProperty(v: PropertyKey): boolean;
-        isPrototypeOf(v: Object): boolean;
-        propertyIsEnumerable(v: PropertyKey): boolean;
-    };
-} & typeof EventEmitter;
-/**
- * NodeDestroyable 类的类型
- */
-export type NodeDestroyableClass = typeof NodeDestroyable;
-/**
- * NodeDestroyable 实例的类型
- */
-export type NodeDestroyable = InstanceType<NodeDestroyableClass>;
-//# sourceMappingURL=DestroyableSub.d.ts.map

package/dist/DestroyableSub.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"DestroyableSub.d.ts","sourceRoot":"","sources":["../src/DestroyableSub.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,QAAQ,EAAC,MAAM,gBAAgB,CAAC;AACxC,OAAO,EAAC,YAAY,EAAC,MAAM,aAAa,CAAC;AAEzC;;GAEG;AACH,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;mBAAsC,CAAC;AAElE;;GAEG;AACH,MAAM,MAAM,mBAAmB,GAAG,OAAO,cAAc,CAAC;AAExD;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG,YAAY,CAAC,mBAAmB,CAAC,CAAC;AAE/D;;GAEG;AACH,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;uBAA0C,CAAC;AAEvE;;GAEG;AACH,MAAM,MAAM,oBAAoB,GAAG,OAAO,eAAe,CAAC;AAE1D;;GAEG;AACH,MAAM,MAAM,eAAe,GAAG,YAAY,CAAC,oBAAoB,CAAC,CAAC"}

package/dist/index.iife.js

@@ -1 +0,0 @@
-var Destroyable=function(o,c){"use strict";var m=Object.defineProperty;var w=(o,c,y)=>c in o?m(o,c,{enumerable:!0,configurable:!0,writable:!0,value:y}):o[c]=y;var h=(o,c,y)=>w(o,typeof c!="symbol"?c+"":c,y);class y{constructor(){h(this,"refCount",0);h(this,"_isDestroyed",!1);h(this,"_destroyers",[])}get isDestroyed(){return this._isDestroyed}get canDestroy(){return!this.isDestroyed&&this.refCount<=0}disposeFun(e){return this._destroyers.push(e),e}cancelDisposeFun(e){const t=this._destroyers.indexOf(e);return this._destroyers.splice(t,1),e}disposeObj(e,t){const n=t?function(){return e.destroy()}:function(){return e.destroyAsync()};return this.disposeFun(n),e.__destroyable_destroyer=n,e}cancelDisposeObj(e){const t=e.__destroyable_destroyer;return t&&this.cancelDisposeFun(t),e}dispose(e,t){return typeof e=="function"?this.disposeFun(e):this.disposeObj(e,t)}cancelDispose(e){return typeof e=="function"?this.cancelDisposeFun(e):this.cancelDisposeObj(e)}destroyThis(){}destroy(){if(!this.canDestroy)return this.isDestroyed;let e=this._destroyers.length;for(;--e>=0;){const t=this._destroyers[e];try{t()}catch(n){console.error("销毁函数在同步销毁时出错",this,t,n)}}this._destroyers.length=0;try{this.destroyThis()}catch(t){console.error("destroyThis 在异步销毁时出错",this,t)}return u(this),!0}async destroyAsync(){if(!this.canDestroy)return this.isDestroyed;let e=this._destroyers.length;for(;--e>=0;){const t=this._destroyers[e];try{const n=t();n&&n instanceof Promise&&await n}catch(n){console.error("销毁函数在异步销毁时出错",this,t,n)}}this._destroyers.length=0;try{const t=this.destroyThis();t&&t instanceof Promise&&await t}catch(t){console.error("destroyThis 在异步销毁时出错",this,t)}return u(this),!0}}function a(){throw"已销毁"}function f(i){for(var e in i)typeof i[e]=="function"&&(i[e]=a);return i._isDestroyed=!0,!0}function u(i){for(var e in i)!(e in y.prototype)&&typeof i[e]=="function"&&(i[e]=a);return i._isDestroyed=!0,!0}function l(i){class e extends i{constructor(){super(...arguments);h(this,"refCount",0);h(this,"_isDestroyed",!1);h(this,"_destroyers",[])}get isDestroyed(){return this._isDestroyed}get canDestroy(){return!this.isDestroyed&&this.refCount<=0}disposeFun(s){return this._destroyers.push(s),s}cancelDisposeFun(s){const r=this._destroyers.indexOf(s);return this._destroyers.splice(r,1),s}disposeObj(s,r){const d=r?function(){return s.destroy()}:function(){return s.destroyAsync()};return this.disposeFun(d),s.__destroyable_destroyer=d,s}cancelDisposeObj(s){const r=s.__destroyable_destroyer;return r&&this.cancelDisposeFun(r),s}dispose(s,r){return typeof s=="function"?this.disposeFun(s):this.disposeObj(s,r)}cancelDispose(s){return typeof s=="function"?this.cancelDisposeFun(s):this.cancelDisposeObj(s)}destroyThis(){}destroy(){if(!this.canDestroy)return this.isDestroyed;let s=this._destroyers.length;for(;--s>=0;){const r=this._destroyers[s];try{r()}catch(d){console.error("销毁函数在同步销毁时出错",this,r,d)}}this._destroyers.length=0;try{this.destroyThis()}catch(r){console.error("destroyThis 在异步销毁时出错",this,r)}return u(this),!0}async destroyAsync(){if(!this.canDestroy)return this.isDestroyed;let s=this._destroyers.length;for(;--s>=0;){const r=this._destroyers[s];try{const d=r();d&&d instanceof Promise&&await d}catch(d){console.error("销毁函数在异步销毁时出错",this,r,d)}}this._destroyers.length=0;try{const r=this.destroyThis();r&&r instanceof Promise&&await r}catch(r){console.error("destroyThis 在异步销毁时出错",this,r)}return u(this),!0}}return e}var D=Object.defineProperty,p=(i,e,t)=>e in i?D(i,e,{enumerable:!0,configurable:!0,writable:!0,value:t}):i[e]=t,_=(i,e,t)=>(p(i,e+"",t),t);if(!globalThis.CustomEvent){class i extends Event{constructor(t,n){super(t,n),_(this,"detail"),this.detail=n==null?void 0:n.detail}}globalThis.CustomEvent=i}class v extends EventTarget{addEventListener(e,t,n){const s=n==null?void 0:n.times;if(s){const r=typeof t=="function"?t:t==null?void 0:t.handleEvent;if(r)return this.multipleListen(e,r,s)}return super.addEventListener(e,t,n),()=>{this.removeEventListener(e,t,n)}}dispatchEvent(e,t){const n=e instanceof Event?e:new CustomEvent(e,{detail:t,bubbles:!1,cancelable:!0,composed:!1});return super.dispatchEvent(n)}onceListen(e,t,n){return this.addEventListener(e,t,{...n,once:!0})}multipleListen(e,t,n){let s=0;const r=new AbortController,d=r.signal;return super.addEventListener(e,E=>{++s>=n&&r.abort(),t.call(this,E)},{signal:d}),function(){r.abort()}}}const b=l(v),g=l(c.EventEmitter);return o.Destroyable=y,o.NodeDestroyable=g,o.WebDestroyable=b,o.createDestroyableSubClass=l,o.destroyDestroyable=u,o.destroyObject=f,o.throwOnDestroyed=a,Object.defineProperty(o,Symbol.toStringTag,{value:"Module"}),o}({},node_events);

package/dist/index.umd.cjs

@@ -1 +0,0 @@
-(function(i,o){typeof exports=="object"&&typeof module<"u"?o(exports,require("@gby/event-bus"),require("node:events")):typeof define=="function"&&define.amd?define(["exports","@gby/event-bus","node:events"],o):(i=typeof globalThis<"u"?globalThis:i||self,o(i.Destroyable={},i.eventBus,i.node_events))})(this,function(i,o,h){"use strict";var b=Object.defineProperty;var g=(i,o,h)=>o in i?b(i,o,{enumerable:!0,configurable:!0,writable:!0,value:h}):i[o]=h;var c=(i,o,h)=>g(i,typeof o!="symbol"?o+"":o,h);class l{constructor(){c(this,"refCount",0);c(this,"_isDestroyed",!1);c(this,"_destroyers",[])}get isDestroyed(){return this._isDestroyed}get canDestroy(){return!this.isDestroyed&&this.refCount<=0}disposeFun(e){return this._destroyers.push(e),e}cancelDisposeFun(e){const t=this._destroyers.indexOf(e);return this._destroyers.splice(t,1),e}disposeObj(e,t){const y=t?function(){return e.destroy()}:function(){return e.destroyAsync()};return this.disposeFun(y),e.__destroyable_destroyer=y,e}cancelDisposeObj(e){const t=e.__destroyable_destroyer;return t&&this.cancelDisposeFun(t),e}dispose(e,t){return typeof e=="function"?this.disposeFun(e):this.disposeObj(e,t)}cancelDispose(e){return typeof e=="function"?this.cancelDisposeFun(e):this.cancelDisposeObj(e)}destroyThis(){}destroy(){if(!this.canDestroy)return this.isDestroyed;let e=this._destroyers.length;for(;--e>=0;){const t=this._destroyers[e];try{t()}catch(y){console.error("销毁函数在同步销毁时出错",this,t,y)}}this._destroyers.length=0;try{this.destroyThis()}catch(t){console.error("destroyThis 在异步销毁时出错",this,t)}return u(this),!0}async destroyAsync(){if(!this.canDestroy)return this.isDestroyed;let e=this._destroyers.length;for(;--e>=0;){const t=this._destroyers[e];try{const y=t();y&&y instanceof Promise&&await y}catch(y){console.error("销毁函数在异步销毁时出错",this,t,y)}}this._destroyers.length=0;try{const t=this.destroyThis();t&&t instanceof Promise&&await t}catch(t){console.error("destroyThis 在异步销毁时出错",this,t)}return u(this),!0}}function a(){throw"已销毁"}function D(n){for(var e in n)typeof n[e]=="function"&&(n[e]=a);return n._isDestroyed=!0,!0}function u(n){for(var e in n)!(e in l.prototype)&&typeof n[e]=="function"&&(n[e]=a);return n._isDestroyed=!0,!0}function f(n){class e extends n{constructor(){super(...arguments);c(this,"refCount",0);c(this,"_isDestroyed",!1);c(this,"_destroyers",[])}get isDestroyed(){return this._isDestroyed}get canDestroy(){return!this.isDestroyed&&this.refCount<=0}disposeFun(s){return this._destroyers.push(s),s}cancelDisposeFun(s){const r=this._destroyers.indexOf(s);return this._destroyers.splice(r,1),s}disposeObj(s,r){const d=r?function(){return s.destroy()}:function(){return s.destroyAsync()};return this.disposeFun(d),s.__destroyable_destroyer=d,s}cancelDisposeObj(s){const r=s.__destroyable_destroyer;return r&&this.cancelDisposeFun(r),s}dispose(s,r){return typeof s=="function"?this.disposeFun(s):this.disposeObj(s,r)}cancelDispose(s){return typeof s=="function"?this.cancelDisposeFun(s):this.cancelDisposeObj(s)}destroyThis(){}destroy(){if(!this.canDestroy)return this.isDestroyed;let s=this._destroyers.length;for(;--s>=0;){const r=this._destroyers[s];try{r()}catch(d){console.error("销毁函数在同步销毁时出错",this,r,d)}}this._destroyers.length=0;try{this.destroyThis()}catch(r){console.error("destroyThis 在异步销毁时出错",this,r)}return u(this),!0}async destroyAsync(){if(!this.canDestroy)return this.isDestroyed;let s=this._destroyers.length;for(;--s>=0;){const r=this._destroyers[s];try{const d=r();d&&d instanceof Promise&&await d}catch(d){console.error("销毁函数在异步销毁时出错",this,r,d)}}this._destroyers.length=0;try{const r=this.destroyThis();r&&r instanceof Promise&&await r}catch(r){console.error("destroyThis 在异步销毁时出错",this,r)}return u(this),!0}}return e}const _=f(o.EventBus),p=f(h.EventEmitter);i.Destroyable=l,i.NodeDestroyable=p,i.WebDestroyable=_,i.createDestroyableSubClass=f,i.destroyDestroyable=u,i.destroyObject=D,i.throwOnDestroyed=a,Object.defineProperty(i,Symbol.toStringTag,{value:"Module"})});