@gby/destroyable 2.0.0 → 3.1.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
@@ -40,42 +35,42 @@ export declare class Destroyable {
     /**
      * 添加销毁对象
      * @param obj
-     * @param sync - 表示是否使用  `obj.destroy()` 方法进行销毁；默认使用   `obj.destroyAsync()` 方法进行销毁
+     * @param sync - 表示是否使用  `obj.destroySync()` 方法进行销毁；默认使用   `obj.destroy()` 方法进行销毁
      * @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;
-    /**
-     * 销毁
-     */
-    destroy(): boolean;
+    destroyThis(): Promise<void> | void;
     /**
      * 异步销毁
      * @remarks
      * 会依次执行销毁，并且只有上一个销毁完成之后才会执行下一个销毁
      */
-    destroyAsync(): Promise<boolean>;
+    destroy(): Promise<boolean>;
+    /**
+     * 销毁
+     */
+    destroySync(): boolean;
 }
 /**
  * 调用已销对象的时抛出错误
@@ -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,OAAO,CAAC,IAAI,CAAC,GAAC,IAAI,CAAC;IAKjC;;;;OAIG;IACH,OAAO,IAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAE7B;;OAEG;IACH,WAAW,IAAG,OAAO,CAAC;CAUzB;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/{NodeDestroyable.d.ts → DestroyableEventEmitter.d.ts}

@@ -1,11 +1,11 @@
-import type { FunDestroyer } from "./Destroyable";
+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 NodeDestroyable<EM extends EventMap<EM> = DefaultEventMap> extends EventEmitter<EM> {
+export declare class DestroyableEventEmitter<EM extends EventMap<EM> = DefaultEventMap> extends EventEmitter<EM> implements IDestroyable {
     /**
      * 引用计数
      * @remarks
@@ -40,41 +40,41 @@ export declare class NodeDestroyable<EM extends EventMap<EM> = DefaultEventMap>
     /**
      * 添加销毁对象
      * @param obj
-     * @param sync - 表示是否使用  `obj.destroy()` 方法进行销毁；默认使用   `obj.destroyAsync()` 方法进行销毁
+     * @param sync - 表示是否使用  `obj.destroySync()` 方法进行销毁；默认使用   `obj.destroy()` 方法进行销毁
      * @returns
      */
-    disposeObj<T extends NodeDestroyable>(obj: T, sync?: boolean): T;
+    disposeObj<T extends IDestroyable>(obj: T, sync?: boolean): T;
     /**
      * 取消销毁者函数
      * @param fun
      * @returns
      */
-    cancelDisposeObj<T extends NodeDestroyable>(obj: T): T;
+    cancelDisposeObj<T extends IDestroyable>(obj: T): T;
     /**
      * 添加销毁函数或销毁对象
      * @param fun
      */
     dispose<T extends FunDestroyer>(fun: T): T;
-    dispose<T extends NodeDestroyable>(obj: T, asyncDestroy?: boolean): T;
-    dispose<T extends NodeDestroyable | 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 NodeDestroyable>(obj: T): T;
-    cancelDispose<T extends NodeDestroyable | FunDestroyer>(objOrFun: T): T;
+    cancelDispose<T extends IDestroyable>(obj: T): T;
+    cancelDispose<T extends IDestroyable | FunDestroyer>(objOrFun: T): T;
     /**
      * 自己的销毁方法
      * @remarks
      * 子类根据需要进行重载
      */
-    destroyThis(): void;
+    destroyThis(): Promise<void> | void;
     /**
      * 销毁
      */
-    destroy(): boolean;
+    destroySync(): boolean;
     /**
      * 异步销毁
      * @remarks
      * 会依次执行销毁，并且只有上一个销毁完成之后才会执行下一个销毁
      */
-    destroyAsync(): Promise<boolean>;
+    destroy(): Promise<boolean>;
 }
-//# sourceMappingURL=NodeDestroyable.d.ts.map
+//# 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,CAAE,YAAW,YAAY;IAE5H;;;;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;IAgBpE;;;;OAIG;IACH,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI;IAKnC;;OAEG;IACH,WAAW;IA6BX;;;;OAIG;IACG,OAAO;CA6BhB"}

package/dist/{createDestroyableSubClass-Blnpqngp.js → DestroyableEventTarget-CI_bGgU0.js}

@@ -1,149 +1,22 @@
-var d = Object.defineProperty;
-var u = (i, s, e) => s in i ? d(i, s, { enumerable: !0, configurable: !0, writable: !0, value: e }) : i[s] = e;
-var y = (i, s, e) => u(i, typeof s != "symbol" ? s + "" : s, e);
-class a {
-  constructor() {
-    /**
-     * 引用计数
-     * @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 e = this._destroyers.indexOf(s);
-    return this._destroyers.splice(e, 1), s;
-  }
-  /**
-   * 添加销毁对象
-   * @param obj 
-   * @param sync - 表示是否使用  `obj.destroy()` 方法进行销毁；默认使用   `obj.destroyAsync()` 方法进行销毁
-   * @returns 
-   */
-  disposeObj(s, e) {
-    const o = e ? function() {
-      return s.destroy();
-    } : function() {
-      return s.destroyAsync();
-    };
-    return this.disposeFun(o), s.__destroyable_destroyer = o, s;
-  }
-  /**
-   * 取消销毁者函数
-   * @param fun 
-   * @returns 
-   */
-  cancelDisposeObj(s) {
-    const e = s.__destroyable_destroyer;
-    return e && this.cancelDisposeFun(e), s;
-  }
-  dispose(s, e) {
-    return typeof s == "function" ? this.disposeFun(s) : this.disposeObj(s, e);
-  }
-  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 e = this._destroyers[s];
-      try {
-        e();
-      } catch (o) {
-        console.error("销毁函数在同步销毁时出错", this, e, o);
-      }
-    }
-    this._destroyers.length = 0;
-    try {
-      this.destroyThis();
-    } catch (e) {
-      console.error("destroyThis 在异步销毁时出错", this, e);
-    }
-    return h(this), !0;
-  }
-  /**
-   * 异步销毁
-   * @remarks
-   * 会依次执行销毁，并且只有上一个销毁完成之后才会执行下一个销毁
-   */
-  async destroyAsync() {
-    if (!this.canDestroy) return this.isDestroyed;
-    let s = this._destroyers.length;
-    for (; --s >= 0; ) {
-      const e = this._destroyers[s];
-      try {
-        const o = e();
-        o && o instanceof Promise && await o;
-      } catch (o) {
-        console.error("销毁函数在异步销毁时出错", this, e, o);
-      }
-    }
-    this._destroyers.length = 0;
-    try {
-      const e = this.destroyThis();
-      e && e instanceof Promise && await e;
-    } catch (e) {
-      console.error("destroyThis 在异步销毁时出错", this, e);
-    }
-    return h(this), !0;
-  }
-}
-function c() {
+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 f(i) {
-  for (var s in i)
-    typeof i[s] == "function" && (i[s] = c);
+function D(i) {
+  for (var o in i)
+    typeof i[o] == "function" && (i[o] = h);
   return i._isDestroyed = !0, !0;
 }
-function h(i) {
-  for (var s in i)
-    !(s in a.prototype) && typeof i[s] == "function" && (i[s] = c);
+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 D(i) {
-  class s extends i {
+function p(i) {
+  class o extends i {
     constructor() {
       super(...arguments);
       /**
@@ -175,46 +48,46 @@ function D(i) {
      * @param fun 
      * @returns 返回销毁者的顺序
      */
-    disposeFun(t) {
-      return this._destroyers.push(t), t;
+    disposeFun(e) {
+      return this._destroyers.push(e), e;
     }
     /**
      * 取消销毁者函数
      * @param fun 
      * @returns 
      */
-    cancelDisposeFun(t) {
-      const r = this._destroyers.indexOf(t);
-      return this._destroyers.splice(r, 1), t;
+    cancelDisposeFun(e) {
+      const r = this._destroyers.indexOf(e);
+      return this._destroyers.splice(r, 1), e;
     }
     /**
      * 添加销毁对象
      * @param obj 
-     * @param sync - 表示是否使用  `obj.destroy()` 方法进行销毁；默认使用   `obj.destroyAsync()` 方法进行销毁
+     * @param sync - 表示是否使用  `obj.destroySync()` 方法进行销毁；默认使用   `obj.destroy()` 方法进行销毁
      * @returns 
      */
-    disposeObj(t, r) {
+    disposeObj(e, r) {
       const n = r ? function() {
-        return t.destroy();
+        return e.destroySync();
       } : function() {
-        return t.destroyAsync();
+        return e.destroy();
       };
-      return this.disposeFun(n), t.__destroyable_destroyer = n, t;
+      return this.disposeFun(n), e.__destroyable_destroyer = n, e;
     }
     /**
      * 取消销毁者函数
      * @param fun 
      * @returns 
      */
-    cancelDisposeObj(t) {
-      const r = t.__destroyable_destroyer;
-      return r && this.cancelDisposeFun(r), t;
+    cancelDisposeObj(e) {
+      const r = e.__destroyable_destroyer;
+      return r && this.cancelDisposeFun(r), e;
     }
-    dispose(t, r) {
-      return typeof t == "function" ? this.disposeFun(t) : this.disposeObj(t, r);
+    dispose(e, r) {
+      return typeof e == "function" ? this.disposeFun(e) : this.disposeObj(e, r);
     }
-    cancelDispose(t) {
-      return typeof t == "function" ? this.cancelDisposeFun(t) : this.cancelDisposeObj(t);
+    cancelDispose(e) {
+      return typeof e == "function" ? this.cancelDisposeFun(e) : this.cancelDisposeObj(e);
     }
     /**
      * 自己的销毁方法
@@ -224,60 +97,191 @@ function D(i) {
     destroyThis() {
     }
     /**
-     * 销毁
+     * 异步销毁
+     * @remarks
+     * 会依次执行销毁，并且只有上一个销毁完成之后才会执行下一个销毁
      */
-    destroy() {
+    async destroy() {
       if (!this.canDestroy) return this.isDestroyed;
-      let t = this._destroyers.length;
-      for (; --t >= 0; ) {
-        const r = this._destroyers[t];
+      let e = this._destroyers.length;
+      for (; --e >= 0; ) {
+        const r = this._destroyers[e];
         try {
-          r();
+          const n = r();
+          n && n instanceof Promise && await n;
         } catch (n) {
-          console.error("销毁函数在同步销毁时出错", this, r, n);
+          console.error("销毁函数在异步销毁时出错", this, r, n);
         }
       }
       this._destroyers.length = 0;
       try {
-        this.destroyThis();
+        const r = this.destroyThis();
+        r && r instanceof Promise && await r;
       } catch (r) {
         console.error("destroyThis 在异步销毁时出错", this, r);
       }
-      return h(this), !0;
+      return d(this), !0;
     }
     /**
-     * 异步销毁
+     * 同步销毁
      * @remarks
-     * 会依次执行销毁，并且只有上一个销毁完成之后才会执行下一个销毁
+     * 会依次执行销毁函数，但并不会等待每个异步销毁函数解决
      */
-    async destroyAsync() {
+    destroySync() {
       if (!this.canDestroy) return this.isDestroyed;
-      let t = this._destroyers.length;
-      for (; --t >= 0; ) {
-        const r = this._destroyers[t];
+      let e = this._destroyers.length;
+      for (; --e >= 0; ) {
+        const r = this._destroyers[e];
         try {
-          const n = r();
-          n && n instanceof Promise && await n;
+          r();
         } catch (n) {
-          console.error("销毁函数在异步销毁时出错", this, r, n);
+          console.error("销毁函数在同步销毁时出错", this, r, n);
         }
       }
       this._destroyers.length = 0;
       try {
-        const r = this.destroyThis();
-        r && r instanceof Promise && await r;
+        this.destroyThis();
       } catch (r) {
         console.error("destroyThis 在异步销毁时出错", this, r);
       }
-      return h(this), !0;
+      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.destroySync()` 方法进行销毁；默认使用   `obj.destroy()` 方法进行销毁
+   * @returns 
+   */
+  disposeObj(s, t) {
+    const e = t ? function() {
+      return s.destroySync();
+    } : function() {
+      return s.destroy();
+    };
+    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() {
+  }
+  /**
+   * 销毁
+   */
+  destroySync() {
+    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 destroy() {
+    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;
   }
-  return s;
 }
 export {
-  a as D,
-  h as a,
-  D as c,
-  f as d,
-  c as t
+  _ as D,
+  d as a,
+  p as c,
+  D as d,
+  h as t
 };

package/dist/DestroyableEventTarget-NFP7x4Ni.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.destroySync()}:function(){return e.destroy()};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(){}async destroy(){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}destroySync(){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}}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.destroySync()}:function(){return s.destroy()};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(){}destroySync(){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 destroy(){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;