@gby/destroyable 3.4.1 → 3.6.0

package/dist/Destroyable.d.ts

@@ -62,17 +62,20 @@ export declare class Destroyable implements IDestroyable {
      * @remarks
      * 子类根据需要进行重载
      */
-    destroyThis(): Promise<void> | void;
+    destroyThis(): any;
     /**
-     * 销毁
+     * 同步销毁
+     * @remarks
+     * 会逆序依次同步调用所有销毁函数，并不会等待上一个销毁函数异步执行完成
      */
     destroySync(): boolean;
     /**
-     * 异步销毁
+     * 串行销毁
      * @remarks
-     * 会依次执行销毁，并且只有上一个销毁完成之后才会执行下一个销毁
+     * 会逆序依次执行销毁，并且只有上一个销毁完成之后才会执行下一个销毁
+     * @returns 如果所有的销毁函数都是同步的，那么返回 true；如果有任何一个销毁函数是异步的，那么返回一个 Promise 对象
      */
-    destroy(): Promise<boolean>;
+    destroy(): boolean | Promise<boolean>;
 }
 /**
  * 调用已销对象的时抛出错误

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;;OAEG;IACH,WAAW;IA6BX;;;;OAIG;IACG,OAAO;CA6BhB;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;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,GAAG,WASxC;AAKD;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,YAAY,WAYtD"}

package/dist/DestroyableEventEmitter.d.ts

@@ -65,16 +65,19 @@ export declare class DestroyableEventEmitter<EM extends EventMap<EM> = DefaultEv
      * @remarks
      * 子类根据需要进行重载
      */
-    destroyThis(): Promise<void> | void;
+    destroyThis(): any;
     /**
-     * 销毁
+     * 同步销毁
+     * @remarks
+     * 会逆序依次同步调用所有销毁函数，并不会等待上一个销毁函数异步执行完成
      */
     destroySync(): boolean;
     /**
-     * 异步销毁
+     * 串行销毁
      * @remarks
-     * 会依次执行销毁，并且只有上一个销毁完成之后才会执行下一个销毁
+     * 会逆序依次执行销毁，并且只有上一个销毁完成之后才会执行下一个销毁
+     * @returns 如果所有的销毁函数都是同步的，那么返回 true；如果有任何一个销毁函数是异步的，那么返回一个 Promise 对象
      */
-    destroy(): Promise<boolean>;
+    destroy(): boolean | Promise<boolean>;
 }
 //# sourceMappingURL=DestroyableEventEmitter.d.ts.map

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;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"}
+{"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,GAAG;IAKlB;;;;OAIG;IACH,WAAW;IA6BX;;;;;OAKG;IACH,OAAO;CAwBV"}

package/dist/DestroyableEventTarget-D6QEuQ_5.cjs

@@ -0,0 +1 @@
+"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;

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

@@ -1,20 +1,21 @@
-var d = Object.defineProperty;
-var u = (o, s, e) => s in o ? d(o, s, { enumerable: !0, configurable: !0, writable: !0, value: e }) : o[s] = e;
-var h = (o, s, e) => u(o, typeof s != "symbol" ? s + "" : s, e);
-import { EventBus as a } from "@gby/event-bus";
-class l {
+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 时，对象才会被销毁
      */
-    h(this, "refCount", 0);
-    h(this, "_isDestroyed", !1);
+    n(this, "refCount", 0);
+    n(this, "_isDestroyed", !1);
     /**
      * 销毁者
      */
-    h(this, "_destroyers", []);
+    n(this, "_destroyers", []);
   }
   /**
    * 是否已经销毁
@@ -82,7 +83,9 @@ class l {
   destroyThis() {
   }
   /**
-   * 销毁
+   * 同步销毁
+   * @remarks
+   * 会逆序依次同步调用所有销毁函数，并不会等待上一个销毁函数异步执行完成
    */
   destroySync() {
     if (!this.canDestroy) return this.isDestroyed;
@@ -101,50 +104,39 @@ class l {
     } catch (e) {
       console.error("destroyThis 在异步销毁时出错", this, e);
     }
-    return y(this), !0;
+    return h(this), !0;
   }
   /**
-   * 异步销毁
+   * 串行销毁
    * @remarks
-   * 会依次执行销毁，并且只有上一个销毁完成之后才会执行下一个销毁
+   * 会逆序依次执行销毁，并且只有上一个销毁完成之后才会执行下一个销毁
+   * @returns 如果所有的销毁函数都是同步的，那么返回 true；如果有任何一个销毁函数是异步的，那么返回一个 Promise 对象
    */
-  async destroy() {
+  destroy() {
     if (!this.canDestroy) return this.isDestroyed;
-    let s = this._destroyers.length;
-    for (; --s >= 0; ) {
-      const e = this._destroyers[s];
-      try {
-        const r = e();
-        r && r instanceof Promise && await r;
-      } catch (r) {
-        console.error("销毁函数在异步销毁时出错", this, e, r);
-      }
-    }
-    this._destroyers.length = 0;
-    try {
-      const e = this.destroyThis();
-      e && e instanceof Promise && await e;
-    } catch (e) {
-      console.error("destroyThis 在异步销毁时出错", this, e);
-    }
-    return y(this), !0;
+    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);
+    });
+    return e instanceof Promise ? e.then(() => (h(this), !0)) : (h(this), !0);
   }
 }
-function c() {
+function u() {
   throw "已销毁";
 }
-function p(o) {
-  for (var s in o)
-    typeof o[s] == "function" && (o[s] = c);
-  return o._isDestroyed = !0, !0;
+function T(i) {
+  for (var s in i)
+    typeof i[s] == "function" && (i[s] = u);
+  return i._isDestroyed = !0, !0;
 }
-function y(o) {
-  for (var s in o)
-    !(s in l.prototype) && typeof o[s] == "function" && (o[s] = c);
-  return o._isDestroyed = !0, !0;
+function h(i) {
+  for (var s in i)
+    !(s in p.prototype) && typeof i[s] == "function" && (i[s] = u);
+  return i._isDestroyed = !0, !0;
 }
-function D(o) {
-  class s extends o {
+function x(i) {
+  class s extends i {
     constructor() {
       super(...arguments);
       /**
@@ -152,12 +144,12 @@ function D(o) {
        * @remarks
        * 引用计数为 0 时，对象才会被销毁
        */
-      h(this, "refCount", 0);
-      h(this, "_isDestroyed", !1);
+      n(this, "refCount", 0);
+      n(this, "_isDestroyed", !1);
       /**
        * 销毁者
        */
-      h(this, "_destroyers", []);
+      n(this, "_destroyers", []);
     }
     /**
      * 是否已经销毁
@@ -185,8 +177,8 @@ function D(o) {
      * @returns 
      */
     cancelDisposeFun(t) {
-      const i = this._destroyers.indexOf(t);
-      return this._destroyers.splice(i, 1), t;
+      const o = this._destroyers.indexOf(t);
+      return this._destroyers.splice(o, 1), t;
     }
     /**
      * 添加销毁对象
@@ -194,13 +186,13 @@ function D(o) {
      * @param sync - 表示是否使用  `obj.destroySync()` 方法进行销毁；默认使用   `obj.destroy()` 方法进行销毁
      * @returns 
      */
-    disposeObj(t, i) {
-      const n = i ? function() {
+    disposeObj(t, o) {
+      const d = o ? function() {
         return t.destroySync();
       } : function() {
         return t.destroy();
       };
-      return this.disposeFun(n), t.__destroyable_destroyer = n, t;
+      return this.disposeFun(d), t.__destroyable_destroyer = d, t;
     }
     /**
      * 取消销毁者函数
@@ -208,11 +200,11 @@ function D(o) {
      * @returns 
      */
     cancelDisposeObj(t) {
-      const i = t.__destroyable_destroyer;
-      return i && this.cancelDisposeFun(i), t;
+      const o = t.__destroyable_destroyer;
+      return o && this.cancelDisposeFun(o), t;
     }
-    dispose(t, i) {
-      return typeof t == "function" ? this.disposeFun(t) : this.disposeObj(t, i);
+    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);
@@ -225,59 +217,48 @@ function D(o) {
     destroyThis() {
     }
     /**
-     * 异步销毁
+     * 同步销毁
      * @remarks
-     * 会依次执行销毁，并且只有上一个销毁完成之后才会执行下一个销毁
+     * 会逆序依次同步调用所有销毁函数，并不会等待上一个销毁函数异步执行完成
      */
-    async destroy() {
+    destroySync() {
       if (!this.canDestroy) return this.isDestroyed;
       let t = this._destroyers.length;
       for (; --t >= 0; ) {
-        const i = this._destroyers[t];
+        const o = this._destroyers[t];
         try {
-          const n = i();
-          n && n instanceof Promise && await n;
-        } catch (n) {
-          console.error("销毁函数在异步销毁时出错", this, i, n);
+          o();
+        } catch (d) {
+          console.error("销毁函数在同步销毁时出错", this, o, d);
         }
       }
       this._destroyers.length = 0;
       try {
-        const i = this.destroyThis();
-        i && i instanceof Promise && await i;
-      } catch (i) {
-        console.error("destroyThis 在异步销毁时出错", this, i);
+        this.destroyThis();
+      } catch (o) {
+        console.error("destroyThis 在异步销毁时出错", this, o);
       }
-      return y(this), !0;
+      return h(this), !0;
     }
     /**
-     * 同步销毁
+     * 串行销毁
      * @remarks
-     * 会依次执行销毁函数，但并不会等待每个异步销毁函数解决
+     * 会逆序依次执行销毁，并且只有上一个销毁完成之后才会执行下一个销毁
+     * @returns 如果所有的销毁函数都是同步的，那么返回 true；如果有任何一个销毁函数是异步的，那么返回一个 Promise 对象
      */
-    destroySync() {
+    destroy() {
       if (!this.canDestroy) return this.isDestroyed;
-      let t = this._destroyers.length;
-      for (; --t >= 0; ) {
-        const i = this._destroyers[t];
-        try {
-          i();
-        } catch (n) {
-          console.error("销毁函数在同步销毁时出错", this, i, n);
-        }
-      }
-      this._destroyers.length = 0;
-      try {
-        this.destroyThis();
-      } catch (i) {
-        console.error("destroyThis 在异步销毁时出错", this, i);
-      }
-      return y(this), !0;
+      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);
+      });
+      return o instanceof Promise ? o.then(() => (h(this), !0)) : (h(this), !0);
     }
   }
   return s;
 }
-class g extends a {
+class C extends f {
   constructor() {
     super(...arguments);
     /**
@@ -285,12 +266,12 @@ class g extends a {
      * @remarks
      * 引用计数为 0 时，对象才会被销毁
      */
-    h(this, "refCount", 0);
-    h(this, "_isDestroyed", !1);
+    n(this, "refCount", 0);
+    n(this, "_isDestroyed", !1);
     /**
      * 销毁者
      */
-    h(this, "_destroyers", []);
+    n(this, "_destroyers", []);
   }
   /**
    * 是否已经销毁
@@ -358,7 +339,9 @@ class g extends a {
   destroyThis() {
   }
   /**
-   * 销毁
+   * 同步销毁
+   * @remarks
+   * 会逆序依次同步调用所有销毁函数，并不会等待上一个销毁函数异步执行完成
    */
   destroySync() {
     if (!this.canDestroy) return this.isDestroyed;
@@ -377,40 +360,29 @@ class g extends a {
     } catch (r) {
       console.error("destroyThis 在异步销毁时出错", this, r);
     }
-    return y(this), !0;
+    return h(this), !0;
   }
   /**
-   * 异步销毁
+   * 串行销毁
    * @remarks
-   * 会依次执行销毁，并且只有上一个销毁完成之后才会执行下一个销毁
+   * 会逆序依次执行销毁，并且只有上一个销毁完成之后才会执行下一个销毁
+   * @returns 如果所有的销毁函数都是同步的，那么返回 true；如果有任何一个销毁函数是异步的，那么返回一个 Promise 对象
    */
-  async destroy() {
+  destroy() {
     if (!this.canDestroy) return this.isDestroyed;
-    let e = this._destroyers.length;
-    for (; --e >= 0; ) {
-      const r = this._destroyers[e];
-      try {
-        const t = r();
-        t && t instanceof Promise && await t;
-      } catch (t) {
-        console.error("销毁函数在异步销毁时出错", this, r, t);
-      }
-    }
-    this._destroyers.length = 0;
-    try {
-      const r = this.destroyThis();
-      r && r instanceof Promise && await r;
-    } catch (r) {
-      console.error("destroyThis 在异步销毁时出错", this, r);
-    }
-    return y(this), !0;
+    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);
+    });
+    return r instanceof Promise ? r.then(() => (h(this), !0)) : (h(this), !0);
   }
 }
 export {
-  l as D,
-  y as a,
-  g as b,
-  D as c,
-  p as d,
-  c as t
+  p as D,
+  h as a,
+  C as b,
+  x as c,
+  T as d,
+  u as t
 };

package/dist/DestroyableEventTarget.d.ts

@@ -63,16 +63,19 @@ export declare class DestroyableEventTarget<EM extends Record<string, any> = Rec
      * @remarks
      * 子类根据需要进行重载
      */
-    destroyThis(): Promise<void> | void;
+    destroyThis(): any;
     /**
-     * 销毁
+     * 同步销毁
+     * @remarks
+     * 会逆序依次同步调用所有销毁函数，并不会等待上一个销毁函数异步执行完成
      */
     destroySync(): boolean;
     /**
-     * 异步销毁
+     * 串行销毁
      * @remarks
-     * 会依次执行销毁，并且只有上一个销毁完成之后才会执行下一个销毁
+     * 会逆序依次执行销毁，并且只有上一个销毁完成之后才会执行下一个销毁
+     * @returns 如果所有的销毁函数都是同步的，那么返回 true；如果有任何一个销毁函数是异步的，那么返回一个 Promise 对象
      */
-    destroy(): Promise<boolean>;
+    destroy(): boolean | Promise<boolean>;
 }
 //# sourceMappingURL=DestroyableEventTarget.d.ts.map

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;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;IAapE;;;;OAIG;IACH,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI;IAKnC;;OAEG;IACH,WAAW;IA6BX;;;;OAIG;IACG,OAAO;CA6BhB"}
+{"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

@@ -67,19 +67,20 @@ export declare function createDestroyableSubClass<P extends new (...args: any) =
          * @remarks
          * 子类根据需要进行重载
          */
-        destroyThis(): Promise<void> | void;
+        destroyThis(): any;
         /**
-         * 异步销毁
+         * 同步销毁
          * @remarks
-         * 会依次执行销毁，并且只有上一个销毁完成之后才会执行下一个销毁
+         * 会逆序依次同步调用所有销毁函数，并不会等待上一个销毁函数异步执行完成
          */
-        destroy(): Promise<boolean>;
+        destroySync(): boolean;
         /**
-         * 同步销毁
+         * 串行销毁
          * @remarks
-         * 会依次执行销毁函数，但并不会等待每个异步销毁函数解决
+         * 会逆序依次执行销毁，并且只有上一个销毁完成之后才会执行下一个销毁
+         * @returns 如果所有的销毁函数都是同步的，那么返回 true；如果有任何一个销毁函数是异步的，那么返回一个 Promise 对象
          */
-        destroySync(): boolean;
+        destroy(): boolean | Promise<boolean>;
         constructor: Function;
         toString(): string;
         toLocaleString(): string;

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;AAGxD;;;;;;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;QAMnC;;;;WAIG;;QA8BH;;;;WAIG;;;;;;;;;;MAgCV;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-DSGfqvV0.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-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;

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-DFVzomDG.js";
+import { D as a, b as t, c as r, a as o, d as b, t as y } from "./DestroyableEventTarget-DdEIvJNx.js";
 export {
   a as Destroyable,
   t as DestroyableEventTarget,

package/dist/index.cjs

@@ -1 +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-DSGfqvV0.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.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.destroyDestroyable(this),!0}async destroy(){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.Destroyable=o.Destroyable;exports.DestroyableEventTarget=o.DestroyableEventTarget;exports.createDestroyableSubClass=o.createDestroyableSubClass;exports.destroyDestroyable=o.destroyDestroyable;exports.destroyObject=o.destroyObject;exports.throwOnDestroyed=o.throwOnDestroyed;exports.DestroyableEventEmitter=h;
+"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;

package/dist/index.js

@@ -1,10 +1,11 @@
-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-DFVzomDG.js";
-import { D as p, b as _, c as m, d as g, t as x } from "./DestroyableEventTarget-DFVzomDG.js";
-import { EventEmitter as d } from "node:events";
-class u extends d {
+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);
     /**
@@ -55,12 +56,12 @@ class u extends d {
    * @returns 
    */
   disposeObj(e, s) {
-    const t = s ? function() {
+    const o = s ? function() {
       return e.destroySync();
     } : function() {
       return e.destroy();
     };
-    return this.disposeFun(t), e.__destroyable_destroyer = t, e;
+    return this.disposeFun(o), e.__destroyable_destroyer = o, e;
   }
   /**
    * 取消销毁者函数
@@ -85,7 +86,9 @@ class u extends d {
   destroyThis() {
   }
   /**
-   * 销毁
+   * 同步销毁
+   * @remarks
+   * 会逆序依次同步调用所有销毁函数，并不会等待上一个销毁函数异步执行完成
    */
   destroySync() {
     if (!this.canDestroy) return this.isDestroyed;
@@ -94,8 +97,8 @@ class u extends d {
       const s = this._destroyers[e];
       try {
         s();
-      } catch (t) {
-        console.error("销毁函数在同步销毁时出错", this, s, t);
+      } catch (o) {
+        console.error("销毁函数在同步销毁时出错", this, s, o);
       }
     }
     this._destroyers.length = 0;
@@ -107,38 +110,27 @@ class u extends d {
     return n(this), !0;
   }
   /**
-   * 异步销毁
+   * 串行销毁
    * @remarks
-   * 会依次执行销毁，并且只有上一个销毁完成之后才会执行下一个销毁
+   * 会逆序依次执行销毁，并且只有上一个销毁完成之后才会执行下一个销毁
+   * @returns 如果所有的销毁函数都是同步的，那么返回 true；如果有任何一个销毁函数是异步的，那么返回一个 Promise 对象
    */
-  async destroy() {
+  destroy() {
     if (!this.canDestroy) return this.isDestroyed;
-    let e = this._destroyers.length;
-    for (; --e >= 0; ) {
-      const s = this._destroyers[e];
-      try {
-        const t = s();
-        t && t instanceof Promise && await t;
-      } catch (t) {
-        console.error("销毁函数在异步销毁时出错", this, s, t);
-      }
-    }
-    this._destroyers.length = 0;
-    try {
-      const s = this.destroyThis();
-      s && s instanceof Promise && await s;
-    } catch (s) {
-      console.error("destroyThis 在异步销毁时出错", this, s);
-    }
-    return n(this), !0;
+    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);
+    });
+    return s instanceof Promise ? s.then(() => (n(this), !0)) : (n(this), !0);
   }
 }
 export {
-  p as Destroyable,
-  u as DestroyableEventEmitter,
-  _ as DestroyableEventTarget,
-  m as createDestroyableSubClass,
+  b as Destroyable,
+  f as DestroyableEventEmitter,
+  g as DestroyableEventTarget,
+  x as createDestroyableSubClass,
   n as destroyDestroyable,
-  g as destroyObject,
-  x as throwOnDestroyed
+  E as destroyObject,
+  T as throwOnDestroyed
 };

package/dist/type.d.ts

@@ -48,13 +48,16 @@ export interface IDestroyable {
     cancelDispose<T extends IDestroyable>(obj: T): T;
     cancelDispose<T extends IDestroyable | FunDestroyer>(objOrFun: T): T;
     /**
-     * 异步销毁
+     * 串行销毁
      * @remarks
-     * 会依次执行销毁，并且只有上一个销毁完成之后才会执行下一个销毁
+     * 会逆序依次执行销毁，并且只有上一个销毁完成之后才会执行下一个销毁
+     * @returns 如果所有的销毁函数都是同步的，那么返回 true；如果有任何一个销毁函数是异步的，那么返回一个 Promise 对象
      */
-    destroy(): Promise<boolean>;
+    destroy(): boolean | Promise<boolean>;
     /**
-     * 销毁
+     * 同步销毁
+     * @remarks
+     * 会逆序依次同步调用所有销毁函数，并不会等待上一个销毁函数异步执行完成
      */
     destroySync(): boolean;
 }

package/dist/type.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"type.d.ts","sourceRoot":"","sources":["../src/type.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC;AAQtC;;GAEG;AACH,MAAM,WAAW,YAAY;IAEzB;;;;OAIG;IACH,QAAQ,EAAE,MAAM,CAAC;IAEjB;;;;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;IAGrE;;;;OAIG;IACH,OAAO,IAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAG7B;;OAEG;IACH,WAAW,IAAG,OAAO,CAAC;CAEzB;AAKD;;GAEG;AACH,MAAM,MAAM,sBAAsB,GAAG,KAAK,GAAG,IAAI,EAAE,GAAG,KAAK,YAAY,CAAC;AAGxE;;GAEG;AACH,MAAM,WAAW,uBAAuB;IACpC,KAAK,GAAG,IAAI,EAAE,GAAG,GAAE,YAAY,CAAC;CACnC;AAGD;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAC9B,KAAK,GAAG,IAAI,EAAE,GAAG,GAAE,YAAY,CAAC;IAChC,SAAS,EAAC,YAAY,CAAC;CAC1B"}
+{"version":3,"file":"type.d.ts","sourceRoot":"","sources":["../src/type.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC;AAQtC;;GAEG;AACH,MAAM,WAAW,YAAY;IAEzB;;;;OAIG;IACH,QAAQ,EAAE,MAAM,CAAC;IAEjB;;;;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;IAGrE;;;;;OAKG;IACH,OAAO,IAAK,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAGvC;;;;OAIG;IACH,WAAW,IAAG,OAAO,CAAC;CAEzB;AAKD;;GAEG;AACH,MAAM,MAAM,sBAAsB,GAAG,KAAK,GAAG,IAAI,EAAE,GAAG,KAAK,YAAY,CAAC;AAGxE;;GAEG;AACH,MAAM,WAAW,uBAAuB;IACpC,KAAK,GAAG,IAAI,EAAE,GAAG,GAAE,YAAY,CAAC;CACnC;AAGD;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAC9B,KAAK,GAAG,IAAI,EAAE,GAAG,GAAE,YAAY,CAAC;IAChC,SAAS,EAAC,YAAY,CAAC;CAC1B"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gby/destroyable",
-  "version": "3.4.1",
+  "version": "3.6.0",
   "description": "@gby/destroyable 提供了用于构建可销毁对象的类的基类，用于使得地管理可销毁对象的生命周期",
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",
@@ -55,7 +55,8 @@
     "vite-node": "latest"
   },
   "dependencies": {
-    "@gby/event-bus": "^1.2.3"
+    "@gby/event-bus": "^1.2.3",
+    "com-tools": "^2.21.1"
   },
   "scripts": {
     "serve": "vite",

package/dist/DestroyableEventTarget-DSGfqvV0.cjs

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