@idlebox/common 1.5.20 → 1.5.22

package/lib/lifecycle/dispose/disposable.d.ts

@@ -7,10 +7,13 @@ export declare enum DuplicateDisposeAction {
     Allow = 2
 }
 /** @public */
-export interface IDisposableEvents {
-    onDisposeError: EventRegister<Error>;
-    onBeforeDispose: EventRegister<void>;
-    readonly hasDisposed: boolean;
+export interface IDisposableEvents extends IBackReferenceDisposableEvent {
+    readonly onDisposeError: EventRegister<Error>;
+    readonly onPostDispose: EventRegister<void>;
+    readonly disposed: boolean;
+}
+export interface IBackReferenceDisposableEvent {
+    readonly onBeforeDispose: EventRegister<void>;
 }
 /** @public */
 export interface IDisposable extends MaybeNamed {
@@ -50,14 +53,14 @@ export declare abstract class AbstractEnhancedDisposable<Async extends boolean>
      * register a disposable object
      */
     _register<T extends _Type<Async>>(d: T): T;
-    _register<T extends _Type<Async> & IDisposableEvents>(d: T, autoDereference?: boolean): T;
+    _register<T extends _Type<Async> & IBackReferenceDisposableEvent>(d: T, autoDereference?: boolean): T;
     _unregister(d: _Type<Async>): boolean;
-    private _disposed?;
+    private __dispose_state;
     get disposed(): boolean;
     /**
-     * @deprecated use disposed
+     * 正在dispose中（已开始但未完成）
      */
-    get hasDisposed(): boolean;
+    get disposing(): boolean;
     /**
      * 释放相关资源
      */

package/lib/lifecycle/dispose/disposable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"disposable.d.ts","sourceRoot":"","sources":["../../../src/lifecycle/dispose/disposable.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAC;AAGtE,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAKtD,oBAAY,sBAAsB;IACjC,OAAO,IAAI;IACX,OAAO,IAAI;IACX,KAAK,IAAI;CACT;AAED,cAAc;AACd,MAAM,WAAW,iBAAiB;IACjC,cAAc,EAAE,aAAa,CAAC,KAAK,CAAC,CAAC;IACrC,eAAe,EAAE,aAAa,CAAC,IAAI,CAAC,CAAC;IACrC,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC;CAC9B;AAED,cAAc;AACd,MAAM,WAAW,WAAY,SAAQ,UAAU;IAC9C,OAAO,IAAI,IAAI,CAAC;CAChB;AAED,cAAc;AACd,MAAM,WAAW,gBAAiB,SAAQ,UAAU;IACnD,OAAO,IAAI,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAChC;AAED,KAAK,KAAK,CAAC,KAAK,SAAS,OAAO,IAAI,KAAK,SAAS,IAAI,GAAG,gBAAgB,GAAG,WAAW,CAAC;AACxF,KAAK,MAAM,CAAC,KAAK,SAAS,OAAO,IAAI,KAAK,SAAS,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;AAE/E;;GAEG;AACH,8BAAsB,0BAA0B,CAAC,KAAK,SAAS,OAAO,CAAE,YAAW,iBAAiB;IACnG,SAAS,CAAC,QAAQ,CAAC,eAAe,iBAAC;IACnC,SAAgB,cAAc,uBAAC;IAC/B,SAAS,CAAC,QAAQ,CAAC,gBAAgB,gBAAC;IACpC,SAAgB,eAAe,sBAAC;IAChC,SAAS,CAAC,QAAQ,CAAC,cAAc,gBAAC;IAClC,SAAgB,aAAa,sBAAC;IAE9B,eAAe;IACf,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,sBAAsB,CAAkC;IAE7F;;OAEG;IACH,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,KAAK,CAAC,KAAK,CAAC,EAAE,CAAM;IAErD,gBAAgB;IAChB,SAAgB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrC,SAAS,CAAC,QAAQ,CAAC,OAAO,2BAAC;gBAEf,WAAW,CAAC,EAAE,MAAM;IAoBhC;;OAEG;IACI,iBAAiB;IAMxB;;OAEG;IACI,SAAS,CAAC,CAAC,SAAS,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC;IAC1C,SAAS,CAAC,CAAC,SAAS,KAAK,CAAC,KAAK,CAAC,GAAG,iBAAiB,EAAE,CAAC,EAAE,CAAC,EAAE,eAAe,CAAC,EAAE,OAAO,GAAG,CAAC;IAiBzF,WAAW,CAAC,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC;IAUlC,OAAO,CAAC,SAAS,CAAC,CAGhB;IACF,IAAW,QAAQ,YAElB;IACD;;OAEG;IACH,IAAW,WAAW,YAErB;IAED;;OAEG;IACI,OAAO,IAAI,MAAM,CAAC,KAAK,CAAC;IAoC/B,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,MAAM,CAEjC;IAED,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,WAAW,EAAE,SAAS,KAAK,CAAC,KAAK,CAAC,EAAE,GAAG,MAAM,CAAC,KAAK,CAAC;CAChF"}
+{"version":3,"file":"disposable.d.ts","sourceRoot":"","sources":["../../../src/lifecycle/dispose/disposable.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAC;AAKtE,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAKtD,oBAAY,sBAAsB;IACjC,OAAO,IAAI;IACX,OAAO,IAAI;IACX,KAAK,IAAI;CACT;AAED,cAAc;AACd,MAAM,WAAW,iBAAkB,SAAQ,6BAA6B;IACvE,QAAQ,CAAC,cAAc,EAAE,aAAa,CAAC,KAAK,CAAC,CAAC;IAC9C,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC,IAAI,CAAC,CAAC;IAC5C,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;CAC3B;AAED,MAAM,WAAW,6BAA6B;IAC7C,QAAQ,CAAC,eAAe,EAAE,aAAa,CAAC,IAAI,CAAC,CAAC;CAC9C;AAED,cAAc;AACd,MAAM,WAAW,WAAY,SAAQ,UAAU;IAC9C,OAAO,IAAI,IAAI,CAAC;CAChB;AAED,cAAc;AACd,MAAM,WAAW,gBAAiB,SAAQ,UAAU;IACnD,OAAO,IAAI,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAChC;AAED,KAAK,KAAK,CAAC,KAAK,SAAS,OAAO,IAAI,KAAK,SAAS,IAAI,GAAG,gBAAgB,GAAG,WAAW,CAAC;AACxF,KAAK,MAAM,CAAC,KAAK,SAAS,OAAO,IAAI,KAAK,SAAS,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;AAkB/E;;GAEG;AACH,8BAAsB,0BAA0B,CAAC,KAAK,SAAS,OAAO,CAAE,YAAW,iBAAiB;IACnG,SAAS,CAAC,QAAQ,CAAC,eAAe,iBAAC;IACnC,SAAgB,cAAc,uBAAC;IAC/B,SAAS,CAAC,QAAQ,CAAC,gBAAgB,gBAAC;IACpC,SAAgB,eAAe,sBAAC;IAChC,SAAS,CAAC,QAAQ,CAAC,cAAc,gBAAC;IAClC,SAAgB,aAAa,sBAAC;IAE9B,eAAe;IACf,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,sBAAsB,CAAkC;IAE7F;;OAEG;IACH,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,KAAK,CAAC,KAAK,CAAC,EAAE,CAAM;IAErD,gBAAgB;IAChB,SAAgB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrC,SAAS,CAAC,QAAQ,CAAC,OAAO,2BAAC;gBAEf,WAAW,CAAC,EAAE,MAAM;IAoBhC;;OAEG;IACI,iBAAiB;IAMxB;;OAEG;IACI,SAAS,CAAC,CAAC,SAAS,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC;IAC1C,SAAS,CAAC,CAAC,SAAS,KAAK,CAAC,KAAK,CAAC,GAAG,6BAA6B,EAAE,CAAC,EAAE,CAAC,EAAE,eAAe,CAAC,EAAE,OAAO,GAAG,CAAC;IAkBrG,WAAW,CAAC,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC;IAUlC,OAAO,CAAC,eAAe,CAA6C;IACpE,IAAW,QAAQ,YAElB;IAED;;OAEG;IACH,IAAW,SAAS,YAEnB;IAED;;OAEG;IACI,OAAO,IAAI,MAAM,CAAC,KAAK,CAAC;IA0E/B,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,MAAM,CAEjC;IAED,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,WAAW,EAAE,SAAS,KAAK,CAAC,KAAK,CAAC,EAAE,GAAG,MAAM,CAAC,KAAK,CAAC;CAChF"}

package/lib/lifecycle/dispose/disposable.js

@@ -1,6 +1,8 @@
 import { defineInspectMethod } from '../../debugging/inspect.js';
+import { convertCaughtError } from '../../error/convert-unknown.js';
+import { prettyPrintError } from '../../error/pretty.nodejs.js';
 import { createStackTraceHolder } from '../../error/stack-trace.js';
-import { definePublicConstant } from '../../object/definePublicConstant.js';
+import { isPromiseLike } from '../../promise/is-promise.js';
 import { Emitter } from '../event/event.js';
 import { fromNativeDisposable } from './bridges/native.js';
 import { _debug_dispose, dispose_name, forgetParent, rememberParent } from './debug.js';
@@ -41,19 +43,19 @@ export class AbstractEnhancedDisposable {
         this._logger = defineInspectMethod(_debug_dispose.extend(this.displayName || 'disposable'), () => {
             return `[Function debug]`;
         });
-        this._onDisposeError = this._register(new Emitter(`${this.displayName}:errorEvent`));
+        this._onDisposeError = new Emitter(`${this.displayName}:errorEvent`, Emitter.EAction.PrintIgnore);
         this.onDisposeError = this._onDisposeError.register;
-        this._onBeforeDispose = this._register(new Emitter(`${this.displayName}:beforeEvent`));
+        this._onBeforeDispose = new Emitter(`${this.displayName}:beforeEvent`, Emitter.EAction.PrintIgnore);
         this.onBeforeDispose = this._onBeforeDispose.register;
-        this._onPostDispose = new Emitter(`${this.displayName}:postEvent`);
+        this._onPostDispose = new Emitter(`${this.displayName}:postEvent`, Emitter.EAction.PrintIgnore);
         this.onPostDispose = this._onPostDispose.register;
     }
     /**
      * @throws if already disposed
      */
     assertNotDisposed() {
-        if (this._disposed) {
-            throw new DuplicateDisposedError(this, this._disposed.trace);
+        if (this.__dispose_state.trace) {
+            throw new DuplicateDisposedError(this, this.__dispose_state.trace);
         }
     }
     _register(d, autoDereference) {
@@ -65,6 +67,8 @@ export class AbstractEnhancedDisposable {
         this._disposables.unshift(fromNativeDisposable(d));
         if (autoDereference) {
             d.onBeforeDispose(() => {
+                if (this.disposing || this.disposed)
+                    return;
                 this._unregister(d);
             });
         }
@@ -80,47 +84,81 @@ export class AbstractEnhancedDisposable {
             forgetParent(d, this);
         return rmOk;
     }
-    _disposed;
+    __dispose_state = { finished: false };
     get disposed() {
-        return !!this._disposed;
+        return this.__dispose_state.finished;
     }
     /**
-     * @deprecated use disposed
+     * 正在dispose中（已开始但未完成）
      */
-    get hasDisposed() {
-        return !!this._disposed;
+    get disposing() {
+        return !this.__dispose_state.finished && !!this.__dispose_state.trace;
     }
     /**
      * 释放相关资源
      */
     dispose() {
-        if (this._disposed) {
-            if (this.duplicateDispose === DuplicateDisposeAction.Allow)
-                return this._disposed.result;
-            const dupErr = new DuplicateDisposedError(this, this._disposed.trace);
+        if (this.__dispose_state.trace) {
+            // 释放已开始或已结束
+            if (this.duplicateDispose === DuplicateDisposeAction.Allow) {
+                if (this.__dispose_state.error) {
+                    throw this.__dispose_state.error;
+                }
+                else {
+                    /**
+                     * biome-ignore lint/style/noNonNullAssertion: 完全无需考虑
+                     *
+                     * 异步dispose的同步部分，重复调用dispose，会返回undefined而非Promise
+                     * 但这正好是希望的，否则死锁了
+                     */
+                    return this.__dispose_state.result;
+                }
+            }
+            const dupErr = new DuplicateDisposedError(this, this.__dispose_state.trace);
             dupErr.consoleWarning();
             if (this.duplicateDispose === DuplicateDisposeAction.Disable) {
                 throw dupErr;
             }
             else {
-                return this._disposed.result;
+                return this.__dispose_state.result;
             }
+            // never
         }
-        this._onBeforeDispose.fireNoError();
-        const r = this._dispose(this._disposables);
-        const trace = createStackTraceHolder('disposed', this.dispose);
         const cleanup = () => {
-            definePublicConstant(this, '_disposed', {
-                // 记录 disposed 状态，顺便也记录调用栈
-                trace: trace,
-                result: r,
-            });
+            this.__dispose_state.finished = true;
             Object.assign(this, { _disposables: null });
-            this._onPostDispose.fireNoError();
+            this._onPostDispose.fire();
             this._onPostDispose.dispose();
+            this._onDisposeError.dispose();
         };
-        if (r && 'then' in r) {
-            r.finally(cleanup);
+        // 第一时间设置trace
+        this.__dispose_state.trace = createStackTraceHolder('disposed', this.dispose);
+        this._onBeforeDispose.fire();
+        this._onBeforeDispose.dispose();
+        try {
+            this.__dispose_state.result = this._dispose(this._disposables);
+        }
+        catch (e) {
+            // 同步错误处理
+            const err = convertCaughtError(e);
+            this.__dispose_state.error = err;
+            this._onDisposeError.fire(err);
+            if (this._onDisposeError.listenerCount() === 0) {
+                prettyPrintError('unhandled sync dispose error', err);
+            }
+            cleanup();
+            throw this.__dispose_state.error;
+        }
+        const r = this.__dispose_state.result;
+        if (isPromiseLike(r)) {
+            // 异步错误处理
+            r.catch((e) => {
+                e = convertCaughtError(e);
+                this._onDisposeError.fire(e);
+                if (this._onDisposeError.listenerCount() === 0) {
+                    prettyPrintError('unhandled async dispose error', e);
+                }
+            }).finally(cleanup);
         }
         else {
             cleanup();

package/lib/lifecycle/dispose/disposable.js.map

@@ -1 +1 @@
-{"version":3,"file":"disposable.js","sourceRoot":"","sources":["../../../src/lifecycle/dispose/disposable.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"disposable.js","sourceRoot":"","sources":["../../../src/lifecycle/dispose/disposable.ts"],"names":[],"mappings":"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"}

package/lib/lifecycle/dispose/sync-disposable.d.ts

@@ -4,7 +4,7 @@ import { AbstractEnhancedDisposable, type IDisposable } from './disposable.js';
  */
 export declare abstract class DisposableOnce implements IDisposable {
     private _disposed?;
-    get hasDisposed(): boolean;
+    get disposed(): boolean;
     dispose(): void;
     [Symbol.dispose](): void;
     protected abstract _dispose(): void;
@@ -13,6 +13,11 @@ export declare abstract class DisposableOnce implements IDisposable {
  * 完整版disposable类
  * 可以继承
  * 也可以直接用（相当于一个DisposableStack）
+ *
+ * 抛出异常的行为会延迟到所有资源都尝试释放完毕之后，因此显然只会抛出其中一个异常给dispose()的调用者
+ * 每一个资源释放失败，都会分别触发onDisposeError事件，如果此事件存在监听器，则最后不会抛出异常（处非监听器本身重新抛出）
+ * 不支持在dispose过程中添加onError事件监听器
+ *
  */
 export declare class EnhancedDisposable extends AbstractEnhancedDisposable<false> implements IDisposable {
     protected _dispose(disposables: readonly IDisposable[]): void;

package/lib/lifecycle/dispose/sync-disposable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sync-disposable.d.ts","sourceRoot":"","sources":["../../../src/lifecycle/dispose/sync-disposable.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,0BAA0B,EAAE,KAAK,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAG/E;;GAEG;AACH,8BAAsB,cAAe,YAAW,WAAW;IAC1D,OAAO,CAAC,SAAS,CAAC,CAAmB;IAErC,IAAW,WAAW,YAErB;IACM,OAAO,IAAI,IAAI;IAStB,CAAC,MAAM,CAAC,OAAO,CAAC;IAGhB,SAAS,CAAC,QAAQ,CAAC,QAAQ,IAAI,IAAI;CACnC;AAED;;;;GAIG;AACH,qBAAa,kBAAmB,SAAQ,0BAA0B,CAAC,KAAK,CAAE,YAAW,WAAW;cAC5E,QAAQ,CAAC,WAAW,EAAE,SAAS,WAAW,EAAE,GAAG,IAAI;IAgB/D,CAAC,MAAM,CAAC,OAAO,CAAC,aAAgB;CACvC"}
+{"version":3,"file":"sync-disposable.d.ts","sourceRoot":"","sources":["../../../src/lifecycle/dispose/sync-disposable.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,0BAA0B,EAAE,KAAK,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAG/E;;GAEG;AACH,8BAAsB,cAAe,YAAW,WAAW;IAC1D,OAAO,CAAC,SAAS,CAAC,CAAmB;IAErC,IAAW,QAAQ,YAElB;IACM,OAAO,IAAI,IAAI;IAStB,CAAC,MAAM,CAAC,OAAO,CAAC;IAGhB,SAAS,CAAC,QAAQ,CAAC,QAAQ,IAAI,IAAI;CACnC;AAED;;;;;;;;;GASG;AACH,qBAAa,kBAAmB,SAAQ,0BAA0B,CAAC,KAAK,CAAE,YAAW,WAAW;cAC5E,QAAQ,CAAC,WAAW,EAAE,SAAS,WAAW,EAAE,GAAG,IAAI;IA2B/D,CAAC,MAAM,CAAC,OAAO,CAAC,aAAgB;CACvC"}

package/lib/lifecycle/dispose/sync-disposable.js

@@ -8,7 +8,7 @@ import { DuplicateDisposedError } from './disposedError.js';
  */
 export class DisposableOnce {
     _disposed;
-    get hasDisposed() {
+    get disposed() {
         return !!this._disposed;
     }
     dispose() {
@@ -28,9 +28,16 @@ export class DisposableOnce {
  * 完整版disposable类
  * 可以继承
  * 也可以直接用（相当于一个DisposableStack）
+ *
+ * 抛出异常的行为会延迟到所有资源都尝试释放完毕之后，因此显然只会抛出其中一个异常给dispose()的调用者
+ * 每一个资源释放失败，都会分别触发onDisposeError事件，如果此事件存在监听器，则最后不会抛出异常（处非监听器本身重新抛出）
+ * 不支持在dispose过程中添加onError事件监听器
+ *
  */
 export class EnhancedDisposable extends AbstractEnhancedDisposable {
     _dispose(disposables) {
+        const hasListener = this._onDisposeError.listenerCount() > 0;
+        let lastError = null;
         for (const item of disposables.values()) {
             try {
                 if (this._logger.enabled)
@@ -38,13 +45,22 @@ export class EnhancedDisposable extends AbstractEnhancedDisposable {
                 item.dispose();
             }
             catch (e) {
-                const ee = convertCaughtError(e);
-                this._onDisposeError.fire(ee);
-                if (!this._onDisposeError.listenerCount()) {
-                    console.error('Unhandled error during dispose: %s', ee.stack);
+                if (hasListener) {
+                    try {
+                        this._onDisposeError.fire(convertCaughtError(e));
+                    }
+                    catch (e) {
+                        lastError = e;
+                    }
+                }
+                else {
+                    lastError = e;
                 }
             }
         }
+        if (lastError) {
+            throw lastError;
+        }
     }
     /// compitable with stack
     [Symbol.dispose] = this.dispose;

package/lib/lifecycle/dispose/sync-disposable.js.map

@@ -1 +1 @@
-{"version":3,"file":"sync-disposable.js","sourceRoot":"","sources":["../../../src/lifecycle/dispose/sync-disposable.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,EAAE,sBAAsB,EAAyB,MAAM,4BAA4B,CAAC;AAC3F,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC1C,OAAO,EAAE,0BAA0B,EAAoB,MAAM,iBAAiB,CAAC;AAC/E,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAE5D;;GAEG;AACH,MAAM,OAAgB,cAAc;IAC3B,SAAS,CAAoB;IAErC,IAAW,WAAW;QACrB,OAAO,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC;IACzB,CAAC;IACM,OAAO;QACb,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACpB,MAAM,CAAC,GAAG,IAAI,sBAAsB,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;YAC3D,CAAC,CAAC,cAAc,EAAE,CAAC;YACnB,OAAO;QACR,CAAC;QACD,IAAI,CAAC,SAAS,GAAG,sBAAsB,CAAC,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QAClE,IAAI,CAAC,QAAQ,EAAE,CAAC;IACjB,CAAC;IACD,CAAC,MAAM,CAAC,OAAO,CAAC;QACf,IAAI,CAAC,OAAO,EAAE,CAAC;IAChB,CAAC;CAED;AAED;;;;GAIG;AACH,MAAM,OAAO,kBAAmB,SAAQ,0BAAiC;IACrD,QAAQ,CAAC,WAAmC;QAC9D,KAAK,MAAM,IAAI,IAAI,WAAW,CAAC,MAAM,EAAE,EAAE,CAAC;YACzC,IAAI,CAAC;gBACJ,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO;oBAAE,IAAI,CAAC,OAAO,CAAC,WAAW,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;gBACxE,IAAI,CAAC,OAAO,EAAE,CAAC;YAChB,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACZ,MAAM,EAAE,GAAG,kBAAkB,CAAC,CAAC,CAAC,CAAC;gBACjC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;gBAC9B,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,aAAa,EAAE,EAAE,CAAC;oBAC3C,OAAO,CAAC,KAAK,CAAC,oCAAoC,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC;gBAC/D,CAAC;YACF,CAAC;QACF,CAAC;IACF,CAAC;IAED,yBAAyB;IAClB,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC;CACvC"}
+{"version":3,"file":"sync-disposable.js","sourceRoot":"","sources":["../../../src/lifecycle/dispose/sync-disposable.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,EAAE,sBAAsB,EAAyB,MAAM,4BAA4B,CAAC;AAC3F,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC1C,OAAO,EAAE,0BAA0B,EAAoB,MAAM,iBAAiB,CAAC;AAC/E,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAE5D;;GAEG;AACH,MAAM,OAAgB,cAAc;IAC3B,SAAS,CAAoB;IAErC,IAAW,QAAQ;QAClB,OAAO,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC;IACzB,CAAC;IACM,OAAO;QACb,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACpB,MAAM,CAAC,GAAG,IAAI,sBAAsB,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;YAC3D,CAAC,CAAC,cAAc,EAAE,CAAC;YACnB,OAAO;QACR,CAAC;QACD,IAAI,CAAC,SAAS,GAAG,sBAAsB,CAAC,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QAClE,IAAI,CAAC,QAAQ,EAAE,CAAC;IACjB,CAAC;IACD,CAAC,MAAM,CAAC,OAAO,CAAC;QACf,IAAI,CAAC,OAAO,EAAE,CAAC;IAChB,CAAC;CAED;AAED;;;;;;;;;GASG;AACH,MAAM,OAAO,kBAAmB,SAAQ,0BAAiC;IACrD,QAAQ,CAAC,WAAmC;QAC9D,MAAM,WAAW,GAAG,IAAI,CAAC,eAAe,CAAC,aAAa,EAAE,GAAG,CAAC,CAAC;QAE7D,IAAI,SAAS,GAAG,IAAI,CAAC;QACrB,KAAK,MAAM,IAAI,IAAI,WAAW,CAAC,MAAM,EAAE,EAAE,CAAC;YACzC,IAAI,CAAC;gBACJ,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO;oBAAE,IAAI,CAAC,OAAO,CAAC,WAAW,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;gBACxE,IAAI,CAAC,OAAO,EAAE,CAAC;YAChB,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACZ,IAAI,WAAW,EAAE,CAAC;oBACjB,IAAI,CAAC;wBACJ,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC;oBAClD,CAAC;oBAAC,OAAO,CAAC,EAAE,CAAC;wBACZ,SAAS,GAAG,CAAC,CAAC;oBACf,CAAC;gBACF,CAAC;qBAAM,CAAC;oBACP,SAAS,GAAG,CAAC,CAAC;gBACf,CAAC;YACF,CAAC;QACF,CAAC;QAED,IAAI,SAAS,EAAE,CAAC;YACf,MAAM,SAAS,CAAC;QACjB,CAAC;IACF,CAAC;IAED,yBAAyB;IAClB,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC;CACvC"}

package/lib/lifecycle/event/event.d.ts

@@ -1,17 +1,39 @@
 import { inspectSymbol } from '../../debugging/inspect.js';
 import type { IDisposable } from '../dispose/disposable.js';
 import type { EventHandler, EventRegister, IEventEmitter } from './type.js';
+declare enum FireErrorAction {
+    Throw = 0,
+    Delay = 1,
+    Ignore = 2,
+    PrintIgnore = 3
+}
 /**
  * @public
  */
 export declare class Emitter<T = unknown> implements IEventEmitter<T> {
     readonly displayName: string;
-    protected _callbacks?: (EventHandler<T> | undefined)[];
+    private readonly onErrorDefault;
+    protected readonly _callbacks: (EventHandler<T> | undefined)[];
     private executing;
     private _something_change_during_call;
-    constructor(displayName?: string);
+    static readonly EAction: typeof FireErrorAction;
+    constructor(displayName?: string, onErrorDefault?: FireErrorAction);
     listenerCount(): number;
-    fire(data: T): void;
+    private __fireThrow;
+    private __fireDelay;
+    private __fireIgnore;
+    private __firePrintIgnore;
+    /**
+     * @param data
+     * @param error {Emitter.EAction} 如何处理错误
+     *  - Throw: 默认行为，遇到错误立即抛出，后续监听器不再被调用
+     *  - Delay: 等所有监听器都调用完后，如果有错误则抛出AggregateError，包含所有错误
+     *  - Ignore: 忽略所有错误，继续调用全部监听器
+     *  - PrintIgnore: 忽略所有错误，但打印错误信息
+     * @returns
+     */
+    fire(data: T, error?: FireErrorAction): void;
+    /** @deprecated use fire(data, Emitter.Error.Ignore) */
     fireNoError(data: T): void;
     get register(): EventRegister<T>;
     get event(): EventRegister<T>;
@@ -31,7 +53,7 @@ export declare class Emitter<T = unknown> implements IEventEmitter<T> {
     wait(): Promise<T>;
     private checkDeleted;
     private _disposed;
-    get hasDisposed(): boolean;
+    get disposed(): boolean;
     /**
      * 运行过程中可以dispose，本次运行仍然会继续到最后
      * 但立即不能再次调用类似handle的方法
@@ -41,4 +63,5 @@ export declare class Emitter<T = unknown> implements IEventEmitter<T> {
     [inspectSymbol](_depth: number, options: any): string;
     private requireNotExecuting;
 }
+export {};
 //# sourceMappingURL=event.d.ts.map

package/lib/lifecycle/event/event.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"event.d.ts","sourceRoot":"","sources":["../../../src/lifecycle/event/event.ts"],"names":[],"mappings":"AACA,OAAO,EAAuB,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAIhF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAE5D,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAI5E;;GAEG;AACH,qBAAa,OAAO,CAAC,CAAC,GAAG,OAAO,CAAE,YAAW,aAAa,CAAC,CAAC,CAAC;aAKhC,WAAW,EAAE,MAAM;IAJ/C,SAAS,CAAC,UAAU,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,EAAE,CAAC;IACvD,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,6BAA6B,CAAS;gBAElB,WAAW,GAAE,MAAsB;IAiBxD,aAAa;IAIb,IAAI,CAAC,IAAI,EAAE,CAAC;IAiBZ,WAAW,CAAC,IAAI,EAAE,CAAC;IAqB1B,IAAI,QAAQ,IAAI,aAAa,CAAC,CAAC,CAAC,CAE/B;IAED,IAAI,KAAK,IAAI,aAAa,CAAC,CAAC,CAAC,CAE5B;IAED;;;OAGG;IACH,MAAM,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,WAAW;IAsB9C;;OAEG;IACH,IAAI,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,WAAW;IAS5C;;OAEG;IACH,OAAO,CAAC,UAAU,CAAC,CAAgB;IACnC,IAAI,IAAI,OAAO,CAAC,CAAC,CAAC;IAUlB,OAAO,CAAC,YAAY;IAUpB,OAAO,CAAC,SAAS,CAAS;IAC1B,IAAW,WAAW,YAErB;IAED;;;OAGG;IACH,OAAO;IA8BP,QAAQ,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,aAAgB;IAEzC,CAAC,aAAa,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG;IAW5C,OAAO,CAAC,mBAAmB;CAK3B"}
+{"version":3,"file":"event.d.ts","sourceRoot":"","sources":["../../../src/lifecycle/event/event.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAMhF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAE5D,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAI5E,aAAK,eAAe;IACnB,KAAK,IAAI;IACT,KAAK,IAAI;IACT,MAAM,IAAI;IACV,WAAW,IAAI;CACf;AAED;;GAEG;AACH,qBAAa,OAAO,CAAC,CAAC,GAAG,OAAO,CAAE,YAAW,aAAa,CAAC,CAAC,CAAC;aAQ3C,WAAW,EAAE,MAAM;IACnC,OAAO,CAAC,QAAQ,CAAC,cAAc;IARhC,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,EAAE,CAAM;IACpE,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,6BAA6B,CAAS;IAE9C,MAAM,CAAC,QAAQ,CAAC,OAAO,yBAAmB;gBAGzB,WAAW,GAAE,MAAsB,EAClC,cAAc,GAAE,eAAuC;IAkBlE,aAAa;IAIpB,OAAO,CAAC,WAAW;IAKnB,OAAO,CAAC,WAAW;IAWnB,OAAO,CAAC,YAAY;IAOpB,OAAO,CAAC,iBAAiB;IAWzB;;;;;;;;OAQG;IACI,IAAI,CAAC,IAAI,EAAE,CAAC,EAAE,KAAK,kBAAsB;IA0BhD,uDAAuD;IAChD,WAAW,CAAC,IAAI,EAAE,CAAC;IAI1B,IAAI,QAAQ,IAAI,aAAa,CAAC,CAAC,CAAC,CAE/B;IAED,IAAI,KAAK,IAAI,aAAa,CAAC,CAAC,CAAC,CAE5B;IAED;;;OAGG;IACH,MAAM,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,WAAW;IAmB9C;;OAEG;IACH,IAAI,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,WAAW;IAS5C;;OAEG;IACH,OAAO,CAAC,UAAU,CAAC,CAAgB;IACnC,IAAI,IAAI,OAAO,CAAC,CAAC,CAAC;IAUlB,OAAO,CAAC,YAAY;IAUpB,OAAO,CAAC,SAAS,CAAS;IAC1B,IAAW,QAAQ,YAElB;IAED;;;OAGG;IACH,OAAO;IA+BP,QAAQ,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,aAAgB;IAEzC,CAAC,aAAa,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG;IAW5C,OAAO,CAAC,mBAAmB;CAK3B"}

package/lib/lifecycle/event/event.js

@@ -1,20 +1,31 @@
-import { Exit } from '@idlebox/errors';
 import { defineInspectMethod, inspectSymbol } from '../../debugging/inspect.js';
 import { nameObject, objectName } from '../../debugging/object-with-name.js';
+import { convertCaughtError } from '../../error/convert-unknown.js';
+import { prettyPrintError } from '../../error/pretty.nodejs.js';
 import { createStackTraceHolder } from '../../error/stack-trace.js';
 import { functionToDisposable } from '../dispose/bridges/function.js';
 import { DisposedError } from '../dispose/disposedError.js';
 const anonymousName = 'AnonymousEmitter';
+var FireErrorAction;
+(function (FireErrorAction) {
+    FireErrorAction[FireErrorAction["Throw"] = 0] = "Throw";
+    FireErrorAction[FireErrorAction["Delay"] = 1] = "Delay";
+    FireErrorAction[FireErrorAction["Ignore"] = 2] = "Ignore";
+    FireErrorAction[FireErrorAction["PrintIgnore"] = 3] = "PrintIgnore";
+})(FireErrorAction || (FireErrorAction = {}));
 /**
  * @public
  */
 export class Emitter {
     displayName;
-    _callbacks;
+    onErrorDefault;
+    _callbacks = [];
     executing = false;
     _something_change_during_call = false;
-    constructor(displayName = anonymousName) {
+    static EAction = FireErrorAction;
+    constructor(displayName = anonymousName, onErrorDefault = FireErrorAction.Throw) {
         this.displayName = displayName;
+        this.onErrorDefault = onErrorDefault;
         this.handle = Object.defineProperties(this.handle.bind(this), {
             once: {
                 get: () => this.once.bind(this),
@@ -22,7 +33,7 @@ export class Emitter {
             wait: {
                 get: () => this.wait.bind(this),
             },
-            hasDisposed: {
+            disposed: {
                 get: () => this._disposed,
             },
         });
@@ -31,46 +42,86 @@ export class Emitter {
         });
     }
     listenerCount() {
-        return this._callbacks?.length ?? 0;
+        return this._callbacks.length;
     }
-    fire(data) {
-        this.requireNotExecuting();
-        if (!this._callbacks)
-            return;
-        this.executing = true;
-        try {
-            for (const callback of this._callbacks) {
+    __fireThrow(data) {
+        for (const callback of this._callbacks) {
+            callback?.(data);
+        }
+    }
+    __fireDelay(data) {
+        const errors = [];
+        for (const callback of this._callbacks) {
+            try {
                 callback?.(data);
             }
+            catch (e) {
+                errors.push(convertCaughtError(e));
+            }
         }
-        finally {
-            this.executing = false;
-            if (this._something_change_during_call) {
-                this.checkDeleted();
+        return errors;
+    }
+    __fireIgnore(data) {
+        for (const callback of this._callbacks) {
+            try {
+                callback?.(data);
             }
+            catch { }
         }
     }
-    fireNoError(data) {
-        this.requireNotExecuting();
-        if (!this._callbacks)
-            return;
-        this.executing = true;
+    __firePrintIgnore(data) {
         for (const callback of this._callbacks) {
             try {
                 callback?.(data);
             }
             catch (e) {
-                if (e instanceof Exit) {
-                    break;
+                const ee = convertCaughtError(e);
+                prettyPrintError('error while handling event', ee);
+            }
+        }
+    }
+    /**
+     * @param data
+     * @param error {Emitter.EAction} 如何处理错误
+     *  - Throw: 默认行为，遇到错误立即抛出，后续监听器不再被调用
+     *  - Delay: 等所有监听器都调用完后，如果有错误则抛出AggregateError，包含所有错误
+     *  - Ignore: 忽略所有错误，继续调用全部监听器
+     *  - PrintIgnore: 忽略所有错误，但打印错误信息
+     * @returns
+     */
+    fire(data, error = this.onErrorDefault) {
+        this.requireNotExecuting();
+        if (!this._callbacks.length)
+            return;
+        this.executing = true;
+        try {
+            if (error === FireErrorAction.Throw) {
+                this.__fireThrow(data);
+            }
+            else if (error === FireErrorAction.Delay) {
+                const errors = this.__fireDelay(data);
+                if (errors.length) {
+                    throw new AggregateError(errors, 'multiple errors while handling event');
                 }
-                console.error('Emitter.fireNoError: error ignored: %s', e instanceof Error ? e.stack : e);
+            }
+            else if (error === FireErrorAction.Ignore) {
+                this.__fireIgnore(data);
+            }
+            else if (error === FireErrorAction.PrintIgnore) {
+                this.__firePrintIgnore(data);
             }
         }
-        this.executing = false;
-        if (this._something_change_during_call) {
-            this.checkDeleted();
+        finally {
+            this.executing = false;
+            if (this._something_change_during_call) {
+                this.checkDeleted();
+            }
         }
     }
+    /** @deprecated use fire(data, Emitter.Error.Ignore) */
+    fireNoError(data) {
+        this.fire(data, FireErrorAction.Ignore);
+    }
     get register() {
         return this.handle;
     }
@@ -83,20 +134,17 @@ export class Emitter {
      */
     handle(callback) {
         this.requireNotExecuting();
-        if (!this._callbacks)
-            this._callbacks = [];
-        const callbacks = this._callbacks;
-        callbacks.unshift(callback);
+        this._callbacks.unshift(callback);
         return functionToDisposable(nameObject(`removeListener(${objectName(callback)})`, () => {
-            const index = callbacks.indexOf(callback);
+            const index = this._callbacks.indexOf(callback);
             if (index === -1)
                 return;
             if (this.executing) {
                 this._something_change_during_call = true;
-                callbacks[index] = undefined;
+                this._callbacks[index] = undefined;
             }
             else {
-                callbacks.splice(index, 1);
+                this._callbacks.splice(index, 1);
             }
         }));
     }
@@ -135,7 +183,7 @@ export class Emitter {
         }
     }
     _disposed = false;
-    get hasDisposed() {
+    get disposed() {
         return this._disposed;
     }
     /**
@@ -146,14 +194,15 @@ export class Emitter {
         if (this._disposed)
             return;
         this._disposed = true;
-        this._callbacks = undefined;
+        this._callbacks.length = 0;
+        Object.assign(this, { _callbacks: null });
         if (this._waittings) {
             for (const rej of this._waittings) {
                 rej(new Error('disposed'));
             }
         }
         this._waittings = undefined;
-        const trace = createStackTraceHolder('disposed');
+        const trace = createStackTraceHolder('disposed', this.dispose);
         const makeUnCallable = (name) => {
             Object.assign(this, {
                 [name]() {

package/lib/lifecycle/event/event.js.map

@@ -1 +1 @@
-{"version":3,"file":"event.js","sourceRoot":"","sources":["../../../src/lifecycle/event/event.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"event.js","sourceRoot":"","sources":["../../../src/lifecycle/event/event.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAChF,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAC;AAC7E,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AACpE,OAAO,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AAEtE,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAG5D,MAAM,aAAa,GAAG,kBAAkB,CAAC;AAEzC,IAAK,eAKJ;AALD,WAAK,eAAe;IACnB,uDAAS,CAAA;IACT,uDAAS,CAAA;IACT,yDAAU,CAAA;IACV,mEAAe,CAAA;AAChB,CAAC,EALI,eAAe,KAAf,eAAe,QAKnB;AAED;;GAEG;AACH,MAAM,OAAO,OAAO;IAQF;IACC;IARC,UAAU,GAAoC,EAAE,CAAC;IAC5D,SAAS,GAAG,KAAK,CAAC;IAClB,6BAA6B,GAAG,KAAK,CAAC;IAE9C,MAAM,CAAU,OAAO,GAAG,eAAe,CAAC;IAE1C,YACiB,cAAsB,aAAa,EAClC,iBAAkC,eAAe,CAAC,KAAK;QADxD,gBAAW,GAAX,WAAW,CAAwB;QAClC,mBAAc,GAAd,cAAc,CAAyC;QAExE,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;YAC7D,IAAI,EAAE;gBACL,GAAG,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;aAC/B;YACD,IAAI,EAAE;gBACL,GAAG,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;aAC/B;YACD,QAAQ,EAAE;gBACT,GAAG,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS;aACzB;SACD,CAAC,CAAC;QACH,mBAAmB,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE;YACpD,OAAO,OAAO,CAAC,OAAO,CAAC,oBAAoB,IAAI,CAAC,WAAW,GAAG,EAAE,SAAS,CAAC,CAAC;QAC5E,CAAC,CAAC,CAAC;IACJ,CAAC;IAEM,aAAa;QACnB,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC;IAC/B,CAAC;IAEO,WAAW,CAAC,IAAO;QAC1B,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACxC,QAAQ,EAAE,CAAC,IAAI,CAAC,CAAC;QAClB,CAAC;IACF,CAAC;IACO,WAAW,CAAC,IAAO;QAC1B,MAAM,MAAM,GAAY,EAAE,CAAC;QAC3B,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACxC,IAAI,CAAC;gBACJ,QAAQ,EAAE,CAAC,IAAI,CAAC,CAAC;YAClB,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACZ,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC;YACpC,CAAC;QACF,CAAC;QACD,OAAO,MAAM,CAAC;IACf,CAAC;IACO,YAAY,CAAC,IAAO;QAC3B,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACxC,IAAI,CAAC;gBACJ,QAAQ,EAAE,CAAC,IAAI,CAAC,CAAC;YAClB,CAAC;YAAC,MAAM,CAAC,CAAA,CAAC;QACX,CAAC;IACF,CAAC;IACO,iBAAiB,CAAC,IAAO;QAChC,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACxC,IAAI,CAAC;gBACJ,QAAQ,EAAE,CAAC,IAAI,CAAC,CAAC;YAClB,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACZ,MAAM,EAAE,GAAG,kBAAkB,CAAC,CAAC,CAAC,CAAC;gBACjC,gBAAgB,CAAC,4BAA4B,EAAE,EAAE,CAAC,CAAC;YACpD,CAAC;QACF,CAAC;IACF,CAAC;IAED;;;;;;;;OAQG;IACI,IAAI,CAAC,IAAO,EAAE,KAAK,GAAG,IAAI,CAAC,cAAc;QAC/C,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAC3B,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM;YAAE,OAAO;QAEpC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;QACtB,IAAI,CAAC;YACJ,IAAI,KAAK,KAAK,eAAe,CAAC,KAAK,EAAE,CAAC;gBACrC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;YACxB,CAAC;iBAAM,IAAI,KAAK,KAAK,eAAe,CAAC,KAAK,EAAE,CAAC;gBAC5C,MAAM,MAAM,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;gBACtC,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;oBACnB,MAAM,IAAI,cAAc,CAAC,MAAM,EAAE,sCAAsC,CAAC,CAAC;gBAC1E,CAAC;YACF,CAAC;iBAAM,IAAI,KAAK,KAAK,eAAe,CAAC,MAAM,EAAE,CAAC;gBAC7C,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;YACzB,CAAC;iBAAM,IAAI,KAAK,KAAK,eAAe,CAAC,WAAW,EAAE,CAAC;gBAClD,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;YAC9B,CAAC;QACF,CAAC;gBAAS,CAAC;YACV,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;YACvB,IAAI,IAAI,CAAC,6BAA6B,EAAE,CAAC;gBACxC,IAAI,CAAC,YAAY,EAAE,CAAC;YACrB,CAAC;QACF,CAAC;IACF,CAAC;IAED,uDAAuD;IAChD,WAAW,CAAC,IAAO;QACzB,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,eAAe,CAAC,MAAM,CAAC,CAAC;IACzC,CAAC;IAED,IAAI,QAAQ;QACX,OAAO,IAAI,CAAC,MAAa,CAAC;IAC3B,CAAC;IAED,IAAI,KAAK;QACR,OAAO,IAAI,CAAC,MAAa,CAAC;IAC3B,CAAC;IAED;;;OAGG;IACH,MAAM,CAAC,QAAyB;QAC/B,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAE3B,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAElC,OAAO,oBAAoB,CAC1B,UAAU,CAAC,kBAAkB,UAAU,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG,EAAE;YAC1D,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YAChD,IAAI,KAAK,KAAK,CAAC,CAAC;gBAAE,OAAO;YACzB,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;gBACpB,IAAI,CAAC,6BAA6B,GAAG,IAAI,CAAC;gBAC1C,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,SAAS,CAAC;YACpC,CAAC;iBAAM,CAAC;gBACP,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;YAClC,CAAC;QACF,CAAC,CAAC,CACF,CAAC;IACH,CAAC;IAED;;OAEG;IACH,IAAI,CAAC,QAAyB;QAC7B,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAC3B,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;YACvC,QAAQ,CAAC,IAAI,CAAC,CAAC;YACf,UAAU,CAAC,OAAO,EAAE,CAAC;QACtB,CAAC,CAAC,CAAC;QACH,OAAO,UAAU,CAAC;IACnB,CAAC;IAED;;OAEG;IACK,UAAU,CAAiB;IACnC,IAAI;QACH,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACtC,IAAI,CAAC,IAAI,CAAC,UAAU;gBAAE,IAAI,CAAC,UAAU,GAAG,IAAI,GAAG,EAAY,CAAC;YAC5D,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YAC5B,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;gBAClB,OAAO,CAAC,IAAI,CAAC,CAAC;YACf,CAAC,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;IACJ,CAAC;IAEO,YAAY;QACnB,IAAI,CAAC,IAAI,CAAC,UAAU;YAAE,OAAO;QAE7B,KAAK,IAAI,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;YACtD,IAAI,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,SAAS,EAAE,CAAC;gBACtC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YAC9B,CAAC;QACF,CAAC;IACF,CAAC;IAEO,SAAS,GAAG,KAAK,CAAC;IAC1B,IAAW,QAAQ;QAClB,OAAO,IAAI,CAAC,SAAS,CAAC;IACvB,CAAC;IAED;;;OAGG;IACH,OAAO;QACN,IAAI,IAAI,CAAC,SAAS;YAAE,OAAO;QAC3B,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;QAEtB,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC;QAC3B,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;QAE1C,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACrB,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;gBACnC,GAAG,CAAC,IAAI,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC;YAC5B,CAAC;QACF,CAAC;QAED,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;QAE5B,MAAM,KAAK,GAAG,sBAAsB,CAAC,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QAE/D,MAAM,cAAc,GAAG,CAAC,IAAY,EAAE,EAAE;YACvC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE;gBACnB,CAAC,IAAI,CAAC;oBACL,MAAM,IAAI,aAAa,CAAC,gBAAgB,IAAI,CAAC,WAAW,IAAI,IAAI,iCAAiC,EAAE,KAAK,CAAC,CAAC;gBAC3G,CAAC;aACD,CAAC,CAAC;QACJ,CAAC,CAAC;QAEF,cAAc,CAAC,MAAM,CAAC,CAAC;QACvB,cAAc,CAAC,aAAa,CAAC,CAAC;QAC9B,cAAc,CAAC,QAAQ,CAAC,CAAC;QACzB,cAAc,CAAC,qBAAqB,CAAC,CAAC;IACvC,CAAC;IAEQ,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC;IAEzC,CAAC,aAAa,CAAC,CAAC,MAAc,EAAE,OAAY;QAC3C,IAAI,CAAC,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC;QAC9D,IAAI,IAAI,CAAC,WAAW,KAAK,aAAa,EAAE,CAAC;YACxC,CAAC,IAAI,IAAI,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,QAAQ,CAAC,GAAG,CAAC;QACzD,CAAC;QACD,CAAC,IAAI,eAAe,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,aAAa,EAAE,EAAE,QAAQ,CAAC,EAAE,CAAC;QAEtE,CAAC,IAAI,IAAI,CAAC;QACV,OAAO,CAAC,CAAC;IACV,CAAC;IAEO,mBAAmB;QAC1B,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;QACtD,CAAC;IACF,CAAC"}

package/lib/lifecycle/event/type.d.ts

@@ -44,7 +44,7 @@ export interface IEventEmitter<T = unknown> extends IDisposable {
      * 创建一个等待下次触发的promise
      */
     wait(): Promise<T>;
-    readonly hasDisposed: boolean;
+    readonly disposed: boolean;
 }
 export type EventHandler<T> = (data: T) => void;
 /**
@@ -54,7 +54,7 @@ export interface EventRegister<T> {
     (callback: EventHandler<T>): IDisposable;
     once(callback: EventHandler<T>): IDisposable;
     wait(): IDisposable;
-    readonly hasDisposed: boolean;
+    readonly disposed: boolean;
 }
 export type EventEmitterMap<T extends Record<string, unknown>> = {
     [K in keyof T]: Emitter<T[K]>;