@gby/destroyable 3.5.0 → 3.6.1

package/dist/Destroyable.d.ts

@@ -62,7 +62,7 @@ export declare class Destroyable implements IDestroyable {
      * @remarks
      * 子类根据需要进行重载
      */
-    destroyThis(): Promise<void> | void;
+    destroyThis(): any;
     /**
      * 同步销毁
      * @remarks
@@ -83,12 +83,16 @@ export declare class Destroyable implements IDestroyable {
 export declare function throwOnDestroyed(): void;
 /**
  * 销毁对象
+ * @remarks
+ * 会将所有的方法都替换为抛出已销毁错误的函数
  * @param object
  * @returns
  */
 export declare function destroyObject(object: any): boolean;
 /**
  * 销毁 Destroyable 对象
+ * @remarks
+ * 会将所有非 Destroyable.prototype 的方法都替换为抛出已销毁错误的函数
  * @param object
  * @returns
  */

package/dist/Destroyable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Destroyable.d.ts","sourceRoot":"","sources":["../src/Destroyable.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAMzD;;GAEG;AACH,qBAAa,WAAY,YAAW,YAAY;IAE5C;;;;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;IAapE;;;;OAIG;IACH,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI;IAKnC;;;;OAIG;IACH,WAAW;IA6BX;;;;;OAKG;IACH,OAAO;CAuBV;AAKD;;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"}
+{"version":3,"file":"Destroyable.d.ts","sourceRoot":"","sources":["../src/Destroyable.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAMzD;;GAEG;AACH,qBAAa,WAAY,YAAW,YAAY;IAE5C;;;;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;IAapE;;;;OAIG;IACH,WAAW,IAAI,GAAG;IAKlB;;;;OAIG;IACH,WAAW;IA6BX;;;;;OAKG;IACH,OAAO;CAuBV;AAKD;;GAEG;AACH,wBAAgB,gBAAgB,SAE/B;AAKD;;;;;;GAMG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,GAAG,WASxC;AAKD;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,YAAY,WAYtD"}

package/dist/DestroyableEventEmitter.d.ts

@@ -1,11 +1,11 @@
 import type { FunDestroyer, IDestroyable } from "./type";
 import { EventEmitter } from "node:events";
-export type EventMap<T> = Record<keyof T, any[]> | DefaultEventMap;
+export type EventMap<T> = Record<keyof T, any[]>;
 export type DefaultEventMap = [never];
 /**
  * 可销毁的对象，继承自 Node 的 EventEmitter
  */
-export declare class DestroyableEventEmitter<EM extends EventMap<EM> = DefaultEventMap> extends EventEmitter<EM> implements IDestroyable {
+export declare class DestroyableEventEmitter<EM extends EventMap<EM> = any> extends EventEmitter<EM> implements IDestroyable {
     /**
      * 引用计数
      * @remarks
@@ -65,7 +65,7 @@ export declare class DestroyableEventEmitter<EM extends EventMap<EM> = DefaultEv
      * @remarks
      * 子类根据需要进行重载
      */
-    destroyThis(): Promise<void> | void;
+    destroyThis(): any;
     /**
      * 同步销毁
      * @remarks

package/dist/DestroyableEventEmitter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DestroyableEventEmitter.d.ts","sourceRoot":"","sources":["../src/DestroyableEventEmitter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAEzD,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAI3C,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;;;;OAIG;IACH,WAAW;IA6BX;;;;;OAKG;IACH,OAAO;CAwBV"}
+{"version":3,"file":"DestroyableEventEmitter.d.ts","sourceRoot":"","sources":["../src/DestroyableEventEmitter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAEzD,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAI3C,MAAM,MAAM,QAAQ,CAAC,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC;AACjD,MAAM,MAAM,eAAe,GAAG,CAAC,KAAK,CAAC,CAAC;AAEtC;;GAEG;AACH,qBAAa,uBAAuB,CAAC,EAAE,SAAS,QAAQ,CAAC,EAAE,CAAC,GAAG,GAAG,CAAE,SAAQ,YAAY,CAAC,EAAE,CAAE,YAAW,YAAY;IAEhH;;;;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,GAAG;IAKlB;;;;OAIG;IACH,WAAW;IA6BX;;;;;OAKG;IACH,OAAO;CAwBV"}

package/dist/{DestroyableEventTarget-DdEIvJNx.js → DestroyableEventTarget-CIMBV0bD.js}

@@ -1,50 +1,45 @@
-var l = Object.defineProperty;
-var a = (i, s, e) => s in i ? l(i, s, { enumerable: !0, configurable: !0, writable: !0, value: e }) : i[s] = e;
-var n = (i, s, e) => a(i, typeof s != "symbol" ? s + "" : s, e);
-import { serialCallAllFuns as y } from "com-tools";
-import { EventBus as f } from "@gby/event-bus";
-class p {
-  constructor() {
-    /**
-     * 引用计数
-     * @remarks
-     * 引用计数为 0 时，对象才会被销毁
-     */
-    n(this, "refCount", 0);
-    n(this, "_isDestroyed", !1);
-    /**
-     * 销毁者
-     */
-    n(this, "_destroyers", []);
-  }
+import { serialCallAllFuns as h } from "com-tools";
+import { EventBus as u } from "@gby/event-bus";
+class c {
+  /**
+   * 引用计数
+   * @remarks
+   * 引用计数为 0 时，对象才会被销毁
+   */
+  refCount = 0;
   /**
    * 是否已经销毁
    */
   get isDestroyed() {
     return this._isDestroyed;
   }
+  _isDestroyed = !1;
   /**
    * 是否可以销毁
    */
   get canDestroy() {
     return !this.isDestroyed && this.refCount <= 0;
   }
+  /**
+   * 销毁者
+   */
+  _destroyers = [];
   /**
    * 添加销毁者
    * @param fun 
    * @returns 返回销毁者的顺序
    */
-  disposeFun(s) {
-    return this._destroyers.push(s), s;
+  disposeFun(e) {
+    return this._destroyers.push(e), e;
   }
   /**
    * 取消销毁者函数
    * @param fun 
    * @returns 
    */
-  cancelDisposeFun(s) {
-    const e = this._destroyers.indexOf(s);
-    return this._destroyers.splice(e, 1), s;
+  cancelDisposeFun(e) {
+    const t = this._destroyers.indexOf(e);
+    return this._destroyers.splice(t, 1), e;
   }
   /**
    * 添加销毁对象
@@ -52,28 +47,28 @@ class p {
    * @param sync - 表示是否使用  `obj.destroySync()` 方法进行销毁；默认使用   `obj.destroy()` 方法进行销毁
    * @returns 
    */
-  disposeObj(s, e) {
-    const r = e ? function() {
-      return s.destroySync();
+  disposeObj(e, t) {
+    const s = t ? function() {
+      return e.destroySync();
     } : function() {
-      return s.destroy();
+      return e.destroy();
     };
-    return this.disposeFun(r), s.__destroyable_destroyer = r, s;
+    return this.disposeFun(s), e.__destroyable_destroyer = s, e;
   }
   /**
    * 取消销毁者函数
    * @param fun 
    * @returns 
    */
-  cancelDisposeObj(s) {
-    const e = s.__destroyable_destroyer;
-    return e && this.cancelDisposeFun(e), s;
+  cancelDisposeObj(e) {
+    const t = e.__destroyable_destroyer;
+    return t && this.cancelDisposeFun(t), e;
   }
-  dispose(s, e) {
-    return typeof s == "function" ? this.disposeFun(s) : this.disposeObj(s, e);
+  dispose(e, t) {
+    return typeof e == "function" ? this.disposeFun(e) : this.disposeObj(e, t);
   }
-  cancelDispose(s) {
-    return typeof s == "function" ? this.cancelDisposeFun(s) : this.cancelDisposeObj(s);
+  cancelDispose(e) {
+    return typeof e == "function" ? this.cancelDisposeFun(e) : this.cancelDisposeObj(e);
   }
   /**
    * 自己的销毁方法
@@ -89,22 +84,22 @@ class p {
    */
   destroySync() {
     if (!this.canDestroy) return this.isDestroyed;
-    let s = this._destroyers.length;
-    for (; --s >= 0; ) {
-      const e = this._destroyers[s];
+    let e = this._destroyers.length;
+    for (; --e >= 0; ) {
+      const t = this._destroyers[e];
       try {
-        e();
-      } catch (r) {
-        console.error("销毁函数在同步销毁时出错", this, e, r);
+        t();
+      } catch (s) {
+        console.error("销毁函数在同步销毁时出错", this, t, s);
       }
     }
     this._destroyers.length = 0;
     try {
       this.destroyThis();
-    } catch (e) {
-      console.error("destroyThis 在异步销毁时出错", this, e);
+    } catch (t) {
+      console.error("destroyThis 在异步销毁时出错", this, t);
     }
-    return h(this), !0;
+    return o(this), !0;
   }
   /**
    * 串行销毁
@@ -114,71 +109,68 @@ class p {
    */
   destroy() {
     if (!this.canDestroy) return this.isDestroyed;
-    const s = this._destroyers.toReversed();
-    s.push(this.destroyThis), this._destroyers.length = 0;
-    const e = y(s, this, null, (r, t) => {
-      console.error("销毁函数在串行销毁时出错", this, t, r);
+    const e = this._destroyers.toReversed();
+    e.push(this.destroyThis), this._destroyers.length = 0;
+    const t = h(e, this, null, (s, r) => {
+      console.error("销毁函数在串行销毁时出错", this, r, s);
     });
-    return e instanceof Promise ? e.then(() => (h(this), !0)) : (h(this), !0);
+    return t instanceof Promise ? t.then(() => (o(this), !0)) : (o(this), !0);
   }
 }
-function u() {
+function d() {
   throw "已销毁";
 }
-function T(i) {
-  for (var s in i)
-    typeof i[s] == "function" && (i[s] = u);
+function f(i) {
+  for (var e in i)
+    typeof i[e] == "function" && (i[e] = d);
   return i._isDestroyed = !0, !0;
 }
-function h(i) {
-  for (var s in i)
-    !(s in p.prototype) && typeof i[s] == "function" && (i[s] = u);
+function o(i) {
+  for (var e in i)
+    !(e in c.prototype) && typeof i[e] == "function" && (i[e] = d);
   return i._isDestroyed = !0, !0;
 }
-function x(i) {
-  class s extends i {
-    constructor() {
-      super(...arguments);
-      /**
-       * 引用计数
-       * @remarks
-       * 引用计数为 0 时，对象才会被销毁
-       */
-      n(this, "refCount", 0);
-      n(this, "_isDestroyed", !1);
-      /**
-       * 销毁者
-       */
-      n(this, "_destroyers", []);
-    }
+function p(i) {
+  class e extends i {
+    /**
+     * 引用计数
+     * @remarks
+     * 引用计数为 0 时，对象才会被销毁
+     */
+    refCount = 0;
     /**
      * 是否已经销毁
      */
     get isDestroyed() {
       return this._isDestroyed;
     }
+    _isDestroyed = !1;
     /**
      * 是否可以销毁
      */
     get canDestroy() {
       return !this.isDestroyed && this.refCount <= 0;
     }
+    /**
+     * 销毁者
+     */
+    _destroyers = [];
     /**
      * 添加销毁者
      * @param fun 
      * @returns 返回销毁者的顺序
      */
-    disposeFun(t) {
-      return this._destroyers.push(t), t;
+    disposeFun(s) {
+      return this._destroyers.push(s), s;
     }
     /**
      * 取消销毁者函数
      * @param fun 
      * @returns 
      */
-    cancelDisposeFun(t) {
-      const o = this._destroyers.indexOf(t);
-      return this._destroyers.splice(o, 1), t;
+    cancelDisposeFun(s) {
+      const r = this._destroyers.indexOf(s);
+      return this._destroyers.splice(r, 1), s;
     }
     /**
      * 添加销毁对象
@@ -186,28 +178,28 @@ function x(i) {
      * @param sync - 表示是否使用  `obj.destroySync()` 方法进行销毁；默认使用   `obj.destroy()` 方法进行销毁
      * @returns 
      */
-    disposeObj(t, o) {
-      const d = o ? function() {
-        return t.destroySync();
+    disposeObj(s, r) {
+      const n = r ? function() {
+        return s.destroySync();
       } : function() {
-        return t.destroy();
+        return s.destroy();
       };
-      return this.disposeFun(d), t.__destroyable_destroyer = d, t;
+      return this.disposeFun(n), s.__destroyable_destroyer = n, s;
     }
     /**
      * 取消销毁者函数
      * @param fun 
      * @returns 
      */
-    cancelDisposeObj(t) {
-      const o = t.__destroyable_destroyer;
-      return o && this.cancelDisposeFun(o), t;
+    cancelDisposeObj(s) {
+      const r = s.__destroyable_destroyer;
+      return r && this.cancelDisposeFun(r), s;
     }
-    dispose(t, o) {
-      return typeof t == "function" ? this.disposeFun(t) : this.disposeObj(t, o);
+    dispose(s, r) {
+      return typeof s == "function" ? this.disposeFun(s) : this.disposeObj(s, r);
     }
-    cancelDispose(t) {
-      return typeof t == "function" ? this.cancelDisposeFun(t) : this.cancelDisposeObj(t);
+    cancelDispose(s) {
+      return typeof s == "function" ? this.cancelDisposeFun(s) : this.cancelDisposeObj(s);
     }
     /**
      * 自己的销毁方法
@@ -223,22 +215,22 @@ function x(i) {
      */
     destroySync() {
       if (!this.canDestroy) return this.isDestroyed;
-      let t = this._destroyers.length;
-      for (; --t >= 0; ) {
-        const o = this._destroyers[t];
+      let s = this._destroyers.length;
+      for (; --s >= 0; ) {
+        const r = this._destroyers[s];
         try {
-          o();
-        } catch (d) {
-          console.error("销毁函数在同步销毁时出错", this, o, d);
+          r();
+        } catch (n) {
+          console.error("销毁函数在同步销毁时出错", this, r, n);
         }
       }
       this._destroyers.length = 0;
       try {
         this.destroyThis();
-      } catch (o) {
-        console.error("destroyThis 在异步销毁时出错", this, o);
+      } catch (r) {
+        console.error("destroyThis 在异步销毁时出错", this, r);
       }
-      return h(this), !0;
+      return o(this), !0;
     }
     /**
      * 串行销毁
@@ -248,43 +240,40 @@ function x(i) {
      */
     destroy() {
       if (!this.canDestroy) return this.isDestroyed;
-      const t = this._destroyers.toReversed();
-      t.push(this.destroyThis), this._destroyers.length = 0;
-      const o = y(t, this, null, (d, c) => {
-        console.error("销毁函数在串行销毁时出错", this, c, d);
+      const s = this._destroyers.toReversed();
+      s.push(this.destroyThis), this._destroyers.length = 0;
+      const r = h(s, this, null, (n, y) => {
+        console.error("销毁函数在串行销毁时出错", this, y, n);
       });
-      return o instanceof Promise ? o.then(() => (h(this), !0)) : (h(this), !0);
+      return r instanceof Promise ? r.then(() => (o(this), !0)) : (o(this), !0);
     }
   }
-  return s;
+  return e;
 }
-class C extends f {
-  constructor() {
-    super(...arguments);
-    /**
-     * 引用计数
-     * @remarks
-     * 引用计数为 0 时，对象才会被销毁
-     */
-    n(this, "refCount", 0);
-    n(this, "_isDestroyed", !1);
-    /**
-     * 销毁者
-     */
-    n(this, "_destroyers", []);
-  }
+class D extends u {
+  /**
+   * 引用计数
+   * @remarks
+   * 引用计数为 0 时，对象才会被销毁
+   */
+  refCount = 0;
   /**
    * 是否已经销毁
    */
   get isDestroyed() {
     return this._isDestroyed;
   }
+  _isDestroyed = !1;
   /**
    * 是否可以销毁
    */
   get canDestroy() {
     return !this.isDestroyed && this.refCount <= 0;
   }
+  /**
+   * 销毁者
+   */
+  _destroyers = [];
   /**
    * 添加销毁者
    * @param fun 
@@ -299,8 +288,8 @@ class C extends f {
    * @returns 
    */
   cancelDisposeFun(e) {
-    const r = this._destroyers.indexOf(e);
-    return this._destroyers.splice(r, 1), e;
+    const t = this._destroyers.indexOf(e);
+    return this._destroyers.splice(t, 1), e;
   }
   /**
    * 添加销毁对象
@@ -308,13 +297,13 @@ class C extends f {
    * @param sync - 表示是否使用  `obj.destroySync()` 方法进行销毁；默认使用   `obj.destroy()` 方法进行销毁
    * @returns 
    */
-  disposeObj(e, r) {
-    const t = r ? function() {
+  disposeObj(e, t) {
+    const s = t ? function() {
       return e.destroySync();
     } : function() {
       return e.destroy();
     };
-    return this.disposeFun(t), e.__destroyable_destroyer = t, e;
+    return this.disposeFun(s), e.__destroyable_destroyer = s, e;
   }
   /**
    * 取消销毁者函数
@@ -322,11 +311,11 @@ class C extends f {
    * @returns 
    */
   cancelDisposeObj(e) {
-    const r = e.__destroyable_destroyer;
-    return r && this.cancelDisposeFun(r), e;
+    const t = e.__destroyable_destroyer;
+    return t && this.cancelDisposeFun(t), e;
   }
-  dispose(e, r) {
-    return typeof e == "function" ? this.disposeFun(e) : this.disposeObj(e, r);
+  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);
@@ -347,20 +336,20 @@ class C extends f {
     if (!this.canDestroy) return this.isDestroyed;
     let e = this._destroyers.length;
     for (; --e >= 0; ) {
-      const r = this._destroyers[e];
+      const t = this._destroyers[e];
       try {
-        r();
-      } catch (t) {
-        console.error("销毁函数在同步销毁时出错", this, r, t);
+        t();
+      } catch (s) {
+        console.error("销毁函数在同步销毁时出错", this, t, s);
       }
     }
     this._destroyers.length = 0;
     try {
       this.destroyThis();
-    } catch (r) {
-      console.error("destroyThis 在异步销毁时出错", this, r);
+    } catch (t) {
+      console.error("destroyThis 在异步销毁时出错", this, t);
     }
-    return h(this), !0;
+    return o(this), !0;
   }
   /**
    * 串行销毁
@@ -372,17 +361,17 @@ class C extends f {
     if (!this.canDestroy) return this.isDestroyed;
     const e = this._destroyers.toReversed();
     e.push(this.destroyThis), this._destroyers.length = 0;
-    const r = y(e, this, null, (t, o) => {
-      console.error("销毁函数在串行销毁时出错", this, o, t);
+    const t = h(e, this, null, (s, r) => {
+      console.error("销毁函数在串行销毁时出错", this, r, s);
     });
-    return r instanceof Promise ? r.then(() => (h(this), !0)) : (h(this), !0);
+    return t instanceof Promise ? t.then(() => (o(this), !0)) : (o(this), !0);
   }
 }
 export {
-  p as D,
-  h as a,
-  C as b,
-  x as c,
-  T as d,
-  u as t
+  c as D,
+  D as a,
+  f as b,
+  p as c,
+  o as d,
+  d as t
 };

package/dist/DestroyableEventTarget-uZtYhcb1.cjs

@@ -0,0 +1 @@
+"use strict";const h=require("com-tools"),c=require("@gby/event-bus");class d{refCount=0;get isDestroyed(){return this._isDestroyed}_isDestroyed=!1;get canDestroy(){return!this.isDestroyed&&this.refCount<=0}_destroyers=[];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.destroySync()}:function(){return e.destroy()};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(){}destroySync(){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(this),!0}destroy(){if(!this.canDestroy)return this.isDestroyed;const e=this._destroyers.toReversed();e.push(this.destroyThis),this._destroyers.length=0;const t=h.serialCallAllFuns(e,this,null,(s,r)=>{console.error("销毁函数在串行销毁时出错",this,r,s)});return t instanceof Promise?t.then(()=>(o(this),!0)):(o(this),!0)}}function y(){throw"已销毁"}function l(i){for(var e in i)typeof i[e]=="function"&&(i[e]=y);return i._isDestroyed=!0,!0}function o(i){for(var e in i)!(e in d.prototype)&&typeof i[e]=="function"&&(i[e]=y);return i._isDestroyed=!0,!0}function a(i){class e extends i{refCount=0;get isDestroyed(){return this._isDestroyed}_isDestroyed=!1;get canDestroy(){return!this.isDestroyed&&this.refCount<=0}_destroyers=[];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 n=r?function(){return s.destroySync()}:function(){return s.destroy()};return this.disposeFun(n),s.__destroyable_destroyer=n,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(){}destroySync(){if(!this.canDestroy)return this.isDestroyed;let s=this._destroyers.length;for(;--s>=0;){const r=this._destroyers[s];try{r()}catch(n){console.error("销毁函数在同步销毁时出错",this,r,n)}}this._destroyers.length=0;try{this.destroyThis()}catch(r){console.error("destroyThis 在异步销毁时出错",this,r)}return o(this),!0}destroy(){if(!this.canDestroy)return this.isDestroyed;const s=this._destroyers.toReversed();s.push(this.destroyThis),this._destroyers.length=0;const r=h.serialCallAllFuns(s,this,null,(n,u)=>{console.error("销毁函数在串行销毁时出错",this,u,n)});return r instanceof Promise?r.then(()=>(o(this),!0)):(o(this),!0)}}return e}class f extends c.EventBus{refCount=0;get isDestroyed(){return this._isDestroyed}_isDestroyed=!1;get canDestroy(){return!this.isDestroyed&&this.refCount<=0}_destroyers=[];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.destroySync()}:function(){return e.destroy()};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(){}destroySync(){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(this),!0}destroy(){if(!this.canDestroy)return this.isDestroyed;const e=this._destroyers.toReversed();e.push(this.destroyThis),this._destroyers.length=0;const t=h.serialCallAllFuns(e,this,null,(s,r)=>{console.error("销毁函数在串行销毁时出错",this,r,s)});return t instanceof Promise?t.then(()=>(o(this),!0)):(o(this),!0)}}exports.Destroyable=d;exports.DestroyableEventTarget=f;exports.createDestroyableSubClass=a;exports.destroyDestroyable=o;exports.destroyObject=l;exports.throwOnDestroyed=y;

package/dist/DestroyableEventTarget.d.ts

@@ -63,7 +63,7 @@ export declare class DestroyableEventTarget<EM extends Record<string, any> = Rec
      * @remarks
      * 子类根据需要进行重载
      */
-    destroyThis(): Promise<void> | void;
+    destroyThis(): any;
     /**
      * 同步销毁
      * @remarks

package/dist/DestroyableEventTarget.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DestroyableEventTarget.d.ts","sourceRoot":"","sources":["../src/DestroyableEventTarget.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAEzD,OAAO,EAAC,QAAQ,EAAC,MAAM,gBAAgB,CAAC;AAIxC;;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;IAapE;;;;OAIG;IACH,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI;IAKnC;;;;OAIG;IACH,WAAW;IA6BX;;;;;OAKG;IACH,OAAO;CAuBV"}
+{"version":3,"file":"DestroyableEventTarget.d.ts","sourceRoot":"","sources":["../src/DestroyableEventTarget.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAEzD,OAAO,EAAC,QAAQ,EAAC,MAAM,gBAAgB,CAAC;AAIxC;;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;IAapE;;;;OAIG;IACH,WAAW,IAAI,GAAG;IAKlB;;;;OAIG;IACH,WAAW;IA6BX;;;;;OAKG;IACH,OAAO;CAuBV"}

package/dist/createDestroyableSubClass.d.ts

@@ -17,12 +17,12 @@ export declare function createDestroyableSubClass<P extends new (...args: any) =
         /**
          * 是否已经销毁
          */
-        readonly isDestroyed: boolean;
+        get isDestroyed(): boolean;
         _isDestroyed: boolean;
         /**
          * 是否可以销毁
          */
-        readonly canDestroy: boolean;
+        get canDestroy(): boolean;
         /**
          * 销毁者
          */
@@ -67,7 +67,7 @@ export declare function createDestroyableSubClass<P extends new (...args: any) =
          * @remarks
          * 子类根据需要进行重载
          */
-        destroyThis(): Promise<void> | void;
+        destroyThis(): any;
         /**
          * 同步销毁
          * @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,EAAC,YAAY,EAAE,MAAM,QAAQ,CAAC;AAIxD;;;;;;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;uBACY,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI;QAQnC;;;;WAIG;;QA2BF;;;;;WAKG;;;;;;;;;;MAgCX;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,QAAQ,CAAC;AAIxD;;;;;;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;uBACY,GAAG;QAQlB;;;;WAIG;;QA2BF;;;;;WAKG;;;;;;;;;;MAgCX;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

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

package/dist/index-web.js

@@ -1,4 +1,4 @@
-import { D as a, b as t, c as r, a as o, d as b, t as y } from "./DestroyableEventTarget-DdEIvJNx.js";
+import { D as a, a as t, c as r, d as o, b, t as y } from "./DestroyableEventTarget-CIMBV0bD.js";
 export {
   a as Destroyable,
   t as DestroyableEventTarget,

package/dist/index.cjs

@@ -1 +1 @@
-"use strict";var d=Object.defineProperty;var c=(o,r,e)=>r in o?d(o,r,{enumerable:!0,configurable:!0,writable:!0,value:e}):o[r]=e;var n=(o,r,e)=>c(o,typeof r!="symbol"?r+"":r,e);Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const s=require("./DestroyableEventTarget-D6QEuQ_5.cjs"),l=require("node:events"),h=require("com-tools");class u extends l.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 i=t?function(){return e.destroySync()}:function(){return e.destroy()};return this.disposeFun(i),e.__destroyable_destroyer=i,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(){}destroySync(){if(!this.canDestroy)return this.isDestroyed;let e=this._destroyers.length;for(;--e>=0;){const t=this._destroyers[e];try{t()}catch(i){console.error("销毁函数在同步销毁时出错",this,t,i)}}this._destroyers.length=0;try{this.destroyThis()}catch(t){console.error("destroyThis 在异步销毁时出错",this,t)}return s.destroyDestroyable(this),!0}destroy(){if(!this.canDestroy)return this.isDestroyed;const e=this._destroyers.toReversed();e.push(this.destroyThis),this._destroyers.length=0;const t=h.serialCallAllFuns(e,this,null,(i,y)=>{console.error("销毁函数在串行销毁时出错",this,y,i)});return t instanceof Promise?t.then(()=>(s.destroyDestroyable(this),!0)):(s.destroyDestroyable(this),!0)}}exports.Destroyable=s.Destroyable;exports.DestroyableEventTarget=s.DestroyableEventTarget;exports.createDestroyableSubClass=s.createDestroyableSubClass;exports.destroyDestroyable=s.destroyDestroyable;exports.destroyObject=s.destroyObject;exports.throwOnDestroyed=s.throwOnDestroyed;exports.DestroyableEventEmitter=u;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const s=require("./DestroyableEventTarget-uZtYhcb1.cjs"),i=require("node:events"),n=require("com-tools");class y extends i.EventEmitter{refCount=0;get isDestroyed(){return this._isDestroyed}_isDestroyed=!1;get canDestroy(){return!this.isDestroyed&&this.refCount<=0}_destroyers=[];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 r=t?function(){return e.destroySync()}:function(){return e.destroy()};return this.disposeFun(r),e.__destroyable_destroyer=r,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(){}destroySync(){if(!this.canDestroy)return this.isDestroyed;let e=this._destroyers.length;for(;--e>=0;){const t=this._destroyers[e];try{t()}catch(r){console.error("销毁函数在同步销毁时出错",this,t,r)}}this._destroyers.length=0;try{this.destroyThis()}catch(t){console.error("destroyThis 在异步销毁时出错",this,t)}return s.destroyDestroyable(this),!0}destroy(){if(!this.canDestroy)return this.isDestroyed;const e=this._destroyers.toReversed();e.push(this.destroyThis),this._destroyers.length=0;const t=n.serialCallAllFuns(e,this,null,(r,o)=>{console.error("销毁函数在串行销毁时出错",this,o,r)});return t instanceof Promise?t.then(()=>(s.destroyDestroyable(this),!0)):(s.destroyDestroyable(this),!0)}}exports.Destroyable=s.Destroyable;exports.DestroyableEventTarget=s.DestroyableEventTarget;exports.createDestroyableSubClass=s.createDestroyableSubClass;exports.destroyDestroyable=s.destroyDestroyable;exports.destroyObject=s.destroyObject;exports.throwOnDestroyed=s.throwOnDestroyed;exports.DestroyableEventEmitter=y;

package/dist/index.js

@@ -1,37 +1,31 @@
-var d = Object.defineProperty;
-var h = (r, t, e) => t in r ? d(r, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : r[t] = e;
-var i = (r, t, e) => h(r, typeof t != "symbol" ? t + "" : t, e);
-import { a as n } from "./DestroyableEventTarget-DdEIvJNx.js";
-import { D as b, b as g, c as x, d as E, t as T } from "./DestroyableEventTarget-DdEIvJNx.js";
-import { EventEmitter as c } from "node:events";
-import { serialCallAllFuns as u } from "com-tools";
-class f extends c {
-  constructor() {
-    super(...arguments);
-    /**
-     * 引用计数
-     * @remarks
-     * 引用计数为 0 时，对象才会被销毁
-     */
-    i(this, "refCount", 0);
-    i(this, "_isDestroyed", !1);
-    /**
-     * 销毁者
-     */
-    i(this, "_destroyers", []);
-  }
+import { d as r } from "./DestroyableEventTarget-CIMBV0bD.js";
+import { D as p, a as D, c as f, b as _, t as m } from "./DestroyableEventTarget-CIMBV0bD.js";
+import { EventEmitter as i } from "node:events";
+import { serialCallAllFuns as n } from "com-tools";
+class u extends i {
+  /**
+   * 引用计数
+   * @remarks
+   * 引用计数为 0 时，对象才会被销毁
+   */
+  refCount = 0;
   /**
    * 是否已经销毁
    */
   get isDestroyed() {
     return this._isDestroyed;
   }
+  _isDestroyed = !1;
   /**
    * 是否可以销毁
    */
   get canDestroy() {
     return !this.isDestroyed && this.refCount <= 0;
   }
+  /**
+   * 销毁者
+   */
+  _destroyers = [];
   /**
    * 添加销毁者
    * @param fun 
@@ -56,12 +50,12 @@ class f extends c {
    * @returns 
    */
   disposeObj(e, s) {
-    const o = s ? function() {
+    const t = s ? function() {
       return e.destroySync();
     } : function() {
       return e.destroy();
     };
-    return this.disposeFun(o), e.__destroyable_destroyer = o, e;
+    return this.disposeFun(t), e.__destroyable_destroyer = t, e;
   }
   /**
    * 取消销毁者函数
@@ -97,8 +91,8 @@ class f extends c {
       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;
@@ -107,7 +101,7 @@ class f extends c {
     } catch (s) {
       console.error("destroyThis 在异步销毁时出错", this, s);
     }
-    return n(this), !0;
+    return r(this), !0;
   }
   /**
    * 串行销毁
@@ -119,18 +113,18 @@ class f extends c {
     if (!this.canDestroy) return this.isDestroyed;
     const e = this._destroyers.toReversed();
     e.push(this.destroyThis), this._destroyers.length = 0;
-    const s = u(e, this, null, (o, y) => {
-      console.error("销毁函数在串行销毁时出错", this, y, o);
+    const s = n(e, this, null, (t, o) => {
+      console.error("销毁函数在串行销毁时出错", this, o, t);
     });
-    return s instanceof Promise ? s.then(() => (n(this), !0)) : (n(this), !0);
+    return s instanceof Promise ? s.then(() => (r(this), !0)) : (r(this), !0);
   }
 }
 export {
-  b as Destroyable,
-  f as DestroyableEventEmitter,
-  g as DestroyableEventTarget,
-  x as createDestroyableSubClass,
-  n as destroyDestroyable,
-  E as destroyObject,
-  T as throwOnDestroyed
+  p as Destroyable,
+  u as DestroyableEventEmitter,
+  D as DestroyableEventTarget,
+  f as createDestroyableSubClass,
+  r as destroyDestroyable,
+  _ as destroyObject,
+  m as throwOnDestroyed
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gby/destroyable",
-  "version": "3.5.0",
+  "version": "3.6.1",
   "description": "@gby/destroyable 提供了用于构建可销毁对象的类的基类，用于使得地管理可销毁对象的生命周期",
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",
@@ -45,7 +45,7 @@
   "devDependencies": {
     "@microsoft/api-documenter": "latest",
     "@microsoft/api-extractor": "latest",
-    "@types/node": "^24.3.0",
+    "@types/node": "^25.3.2",
     "build-tls": "latest",
     "dts-bundle-generator": "latest",
     "package-tls": "latest",
@@ -55,8 +55,8 @@
     "vite-node": "latest"
   },
   "dependencies": {
-    "@gby/event-bus": "^1.2.3",
-    "com-tools": "^2.21.1"
+    "@gby/event-bus": "^1.3.0",
+    "com-tools": "^2.21.2"
   },
   "scripts": {
     "serve": "vite",

package/dist/DestroyableEventTarget-D6QEuQ_5.cjs

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