@idlebox/common 1.4.20 → 1.5.0

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

@@ -0,0 +1,42 @@
+import { convertCaughtError } from '../../autoindex.js';
+import { dispose_name } from './debug.js';
+import { AbstractEnhancedDisposable } from './disposable.js';
+/**
+ * Async version of Disposable
+ * @public
+ */
+export class EnhancedAsyncDisposable extends AbstractEnhancedDisposable {
+    async _dispose(disposables) {
+        for (const d of disposables) {
+            try {
+                if (this._logger.enabled)
+                    this._logger(`dispose ${dispose_name(d)}`);
+                await d.dispose();
+            }
+            catch (e) {
+                this._onDisposeError.fireNoError(convertCaughtError(e));
+            }
+        }
+    }
+    [Symbol.asyncDispose] = this.dispose;
+}
+/**
+ * Disposable everything in same time
+ * @public
+ */
+export class UnorderedAsyncDisposable extends EnhancedAsyncDisposable {
+    async _dispose(disposables) {
+        const ps = disposables.map(async (d) => {
+            try {
+                if (this._logger.enabled)
+                    this._logger(`dispose ${dispose_name(d)}`);
+                await d.dispose();
+            }
+            catch (e) {
+                this._onDisposeError.fireNoError(convertCaughtError(e));
+            }
+        });
+        await Promise.allSettled(ps);
+    }
+}
+//# sourceMappingURL=async-disposable.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"async-disposable.js","sourceRoot":"","sources":["../../../src/lifecycle/dispose/async-disposable.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC1C,OAAO,EAAE,0BAA0B,EAAyB,MAAM,iBAAiB,CAAC;AAEpF;;;GAGG;AACH,MAAM,OAAO,uBAAwB,SAAQ,0BAAgC;IACzD,KAAK,CAAC,QAAQ,CAAC,WAAwC;QACzE,KAAK,MAAM,CAAC,IAAI,WAAW,EAAE,CAAC;YAC7B,IAAI,CAAC;gBACJ,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO;oBAAE,IAAI,CAAC,OAAO,CAAC,WAAW,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;gBACrE,MAAM,CAAC,CAAC,OAAO,EAAE,CAAC;YACnB,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACZ,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC;YACzD,CAAC;QACF,CAAC;IACF,CAAC;IAED,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC;CACrC;AAED;;;GAGG;AACH,MAAM,OAAO,wBAAyB,SAAQ,uBAAuB;IACjD,KAAK,CAAC,QAAQ,CAAC,WAAwC;QACzE,MAAM,EAAE,GAAG,WAAW,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE;YACtC,IAAI,CAAC;gBACJ,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO;oBAAE,IAAI,CAAC,OAAO,CAAC,WAAW,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;gBACrE,MAAM,CAAC,CAAC,OAAO,EAAE,CAAC;YACnB,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACZ,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC;YACzD,CAAC;QACF,CAAC,CAAC,CAAC;QAEH,MAAM,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;IAC9B,CAAC;CACD"}

package/lib/lifecycle/dispose/bridges/function.d.ts

@@ -0,0 +1,17 @@
+import type { IAsyncDisposable, IDisposable } from '../disposable.js';
+/**
+ * Convert "dispose function" to disposable object
+ * @public
+ */
+export declare function functionToDisposable<RT>(fn: () => RT): RT extends Promise<any> ? IAsyncDisposable : IDisposable;
+/**
+ * convert disposable object to function
+ * eg.
+ *
+ * useEffect(() => {
+ * 	const disposable = new Xyz();
+ * 	return toFunction(disposable);
+ * }, [])
+ */
+export declare function disposerFunction<T extends IDisposable | IAsyncDisposable>(obj: T): T extends IAsyncDisposable ? () => Promise<void> : () => void;
+//# sourceMappingURL=function.d.ts.map

package/lib/lifecycle/dispose/bridges/function.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"function.d.ts","sourceRoot":"","sources":["../../../../src/lifecycle/dispose/bridges/function.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAEtE;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,SAAS,OAAO,CAAC,GAAG,CAAC,GAAG,gBAAgB,GAAG,WAAW,CAO/G;AAED;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAAC,CAAC,SAAS,WAAW,GAAG,gBAAgB,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,SAAS,gBAAgB,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,MAAM,IAAI,CAIhJ"}

package/lib/lifecycle/dispose/bridges/function.js

@@ -0,0 +1,29 @@
+import { functionName, nameObject } from '../../../debugging/object-with-name.js';
+import { dispose_name } from '../debug.js';
+/**
+ * Convert "dispose function" to disposable object
+ * @public
+ */
+export function functionToDisposable(fn) {
+    return {
+        get displayName() {
+            return `disposeFn(${functionName(fn)})`;
+        },
+        dispose: fn,
+    };
+}
+/**
+ * convert disposable object to function
+ * eg.
+ *
+ * useEffect(() => {
+ * 	const disposable = new Xyz();
+ * 	return toFunction(disposable);
+ * }, [])
+ */
+export function disposerFunction(obj) {
+    return nameObject(dispose_name(obj), () => {
+        obj.dispose();
+    });
+}
+//# sourceMappingURL=function.js.map

package/lib/lifecycle/dispose/bridges/function.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"function.js","sourceRoot":"","sources":["../../../../src/lifecycle/dispose/bridges/function.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,wCAAwC,CAAC;AAClF,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAG3C;;;GAGG;AACH,MAAM,UAAU,oBAAoB,CAAK,EAAY;IACpD,OAAO;QACN,IAAI,WAAW;YACd,OAAO,aAAa,YAAY,CAAC,EAAE,CAAC,GAAG,CAAC;QACzC,CAAC;QACD,OAAO,EAAE,EAAE;KACJ,CAAC;AACV,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,gBAAgB,CAA2C,GAAM;IAChF,OAAO,UAAU,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE;QACzC,GAAG,CAAC,OAAO,EAAE,CAAC;IACf,CAAC,CAAQ,CAAC;AACX,CAAC"}

package/lib/lifecycle/dispose/bridges/native.d.ts

@@ -0,0 +1,10 @@
+import type { IAsyncDisposable, IDisposable } from '../disposable.js';
+/**
+ * 把原生的Disposable/AsyncDisposable对象转换为本包可以使用的版本
+ */
+export declare function fromNativeDisposable<T extends AsyncDisposable>(disposable: T): T & IAsyncDisposable;
+export declare function fromNativeDisposable<T extends Disposable>(disposable: T): T & IDisposable;
+export declare function fromNativeDisposable<T extends AsyncDisposable | Disposable>(disposable: T): T & IAsyncDisposable & IDisposable;
+export declare function toNativeDisposable(disposable: IAsyncDisposable): AsyncDisposable;
+export declare function toNativeDisposable(disposable: IDisposable): Disposable;
+//# sourceMappingURL=native.d.ts.map

package/lib/lifecycle/dispose/bridges/native.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"native.d.ts","sourceRoot":"","sources":["../../../../src/lifecycle/dispose/bridges/native.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAEtE;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,CAAC,SAAS,eAAe,EAAE,UAAU,EAAE,CAAC,GAAG,CAAC,GAAG,gBAAgB,CAAC;AACrG,wBAAgB,oBAAoB,CAAC,CAAC,SAAS,UAAU,EAAE,UAAU,EAAE,CAAC,GAAG,CAAC,GAAG,WAAW,CAAC;AAC3F,wBAAgB,oBAAoB,CAAC,CAAC,SAAS,eAAe,GAAG,UAAU,EAAE,UAAU,EAAE,CAAC,GAAG,CAAC,GAAG,gBAAgB,GAAG,WAAW,CAAC;AAQhI,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,gBAAgB,GAAG,eAAe,CAAC;AAClF,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,WAAW,GAAG,UAAU,CAAC"}

package/lib/lifecycle/dispose/bridges/native.js

@@ -0,0 +1,13 @@
+export function fromNativeDisposable(disposable) {
+    if (!('dispose' in disposable)) {
+        Object.assign(disposable, { dispose: disposable[Symbol.asyncDispose] ?? disposable[Symbol.dispose] });
+    }
+    return disposable;
+}
+export function toNativeDisposable(disposable) {
+    if (!('dispose' in disposable)) {
+        Object.assign(disposable, { dispose: disposable[Symbol.asyncDispose] ?? disposable[Symbol.dispose] });
+    }
+    return disposable;
+}
+//# sourceMappingURL=native.js.map

package/lib/lifecycle/dispose/bridges/native.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"native.js","sourceRoot":"","sources":["../../../../src/lifecycle/dispose/bridges/native.ts"],"names":[],"mappings":"AAQA,MAAM,UAAU,oBAAoB,CAAC,UAAe;IACnD,IAAI,CAAC,CAAC,SAAS,IAAI,UAAU,CAAC,EAAE,CAAC;QAChC,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,EAAE,OAAO,EAAE,UAAU,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IACvG,CAAC;IACD,OAAO,UAAiB,CAAC;AAC1B,CAAC;AAID,MAAM,UAAU,kBAAkB,CAAC,UAAe;IACjD,IAAI,CAAC,CAAC,SAAS,IAAI,UAAU,CAAC,EAAE,CAAC;QAChC,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,EAAE,OAAO,EAAE,UAAU,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IACvG,CAAC;IACD,OAAO,UAAiB,CAAC;AAC1B,CAAC"}

package/lib/lifecycle/dispose/bridges/streams.d.ts

@@ -0,0 +1,21 @@
+import type { IAsyncDisposable } from '../disposable.js';
+type ClosableAsync = {
+    close(): Promise<any>;
+    close(cb: (e?: Error) => void): void;
+};
+/**
+ * Convert "dispose function" to disposable object
+ * @public
+ */
+export declare function closableToDisposable<T extends ClosableAsync>(closable: T): IAsyncDisposable;
+type EndableAsync = {
+    end(): Promise<any>;
+    end(cb: (e?: Error) => void): void;
+};
+/**
+ * Convert "dispose function" to disposable object
+ * @public
+ */
+export declare function endableToDisposable<T extends EndableAsync>(endable: T): IAsyncDisposable;
+export {};
+//# sourceMappingURL=streams.d.ts.map

package/lib/lifecycle/dispose/bridges/streams.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"streams.d.ts","sourceRoot":"","sources":["../../../../src/lifecycle/dispose/bridges/streams.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEzD,KAAK,aAAa,GAAG;IACpB,KAAK,IAAI,OAAO,CAAC,GAAG,CAAC,CAAC;IACtB,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,KAAK,IAAI,GAAG,IAAI,CAAC;CACrC,CAAC;AAEF;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,CAAC,SAAS,aAAa,EAAE,QAAQ,EAAE,CAAC,GAAG,gBAAgB,CAuB3F;AAED,KAAK,YAAY,GAAG;IACnB,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC,CAAC;IACpB,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,KAAK,IAAI,GAAG,IAAI,CAAC;CACnC,CAAC;AAEF;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,CAAC,SAAS,YAAY,EAAE,OAAO,EAAE,CAAC,GAAG,gBAAgB,CAuBxF"}

package/lib/lifecycle/dispose/bridges/streams.js

@@ -0,0 +1,60 @@
+import { objectName } from '../../../debugging/object-with-name.js';
+/**
+ * Convert "dispose function" to disposable object
+ * @public
+ */
+export function closableToDisposable(closable) {
+    const promised = closable.close.length === 0;
+    return {
+        get displayName() {
+            return `closable(${objectName(closable) || 'unknown'})`;
+        },
+        dispose() {
+            if (promised) {
+                return closable.close();
+            }
+            else {
+                return new Promise((resolve, reject) => {
+                    return closable.close((error) => {
+                        if (error) {
+                            reject(error);
+                        }
+                        else {
+                            resolve();
+                        }
+                    });
+                });
+            }
+        },
+    };
+}
+/**
+ * Convert "dispose function" to disposable object
+ * @public
+ */
+export function endableToDisposable(endable) {
+    const promised = endable.end.length === 0;
+    return {
+        get displayName() {
+            return `endable(${objectName(endable) || 'unknown'})`;
+        },
+        dispose() {
+            if (promised) {
+                return endable.end();
+            }
+            else {
+                return new Promise((resolve, reject) => {
+                    return endable.end((error) => {
+                        if (error) {
+                            reject(error);
+                        }
+                        else {
+                            resolve();
+                        }
+                    });
+                });
+            }
+        },
+    };
+}
+//# sourceMappingURL=streams.js.map

package/lib/lifecycle/dispose/bridges/streams.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"streams.js","sourceRoot":"","sources":["../../../../src/lifecycle/dispose/bridges/streams.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,wCAAwC,CAAC;AAQpE;;;GAGG;AACH,MAAM,UAAU,oBAAoB,CAA0B,QAAW;IACxE,MAAM,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,CAAC;IAE7C,OAAO;QACN,IAAI,WAAW;YACd,OAAO,YAAY,UAAU,CAAC,QAAQ,CAAC,IAAI,SAAS,GAAG,CAAC;QACzD,CAAC;QACD,OAAO;YACN,IAAI,QAAQ,EAAE,CAAC;gBACd,OAAO,QAAQ,CAAC,KAAK,EAAE,CAAC;YACzB,CAAC;iBAAM,CAAC;gBACP,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;oBAC5C,OAAO,QAAQ,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;wBAC/B,IAAI,KAAK,EAAE,CAAC;4BACX,MAAM,CAAC,KAAK,CAAC,CAAC;wBACf,CAAC;6BAAM,CAAC;4BACP,OAAO,EAAE,CAAC;wBACX,CAAC;oBACF,CAAC,CAAC,CAAC;gBACJ,CAAC,CAAC,CAAC;YACJ,CAAC;QACF,CAAC;KACD,CAAC;AACH,CAAC;AAOD;;;GAGG;AACH,MAAM,UAAU,mBAAmB,CAAyB,OAAU;IACrE,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,KAAK,CAAC,CAAC;IAE1C,OAAO;QACN,IAAI,WAAW;YACd,OAAO,WAAW,UAAU,CAAC,OAAO,CAAC,IAAI,SAAS,GAAG,CAAC;QACvD,CAAC;QACD,OAAO;YACN,IAAI,QAAQ,EAAE,CAAC;gBACd,OAAO,OAAO,CAAC,GAAG,EAAE,CAAC;YACtB,CAAC;iBAAM,CAAC;gBACP,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;oBAC5C,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;wBAC5B,IAAI,KAAK,EAAE,CAAC;4BACX,MAAM,CAAC,KAAK,CAAC,CAAC;wBACf,CAAC;6BAAM,CAAC;4BACP,OAAO,EAAE,CAAC;wBACX,CAAC;oBACF,CAAC,CAAC,CAAC;gBACJ,CAAC,CAAC,CAAC;YACJ,CAAC;QACF,CAAC;KACD,CAAC;AACH,CAAC"}

package/lib/lifecycle/dispose/debug.js

@@ -2,12 +2,26 @@ import debug from 'debug';
 /** @internal */
 export const _debug_dispose = debug('dispose');
 /** @internal */
-export function dispose_name(dis, defaultName = '<unknown>') {
-    return dis.displayName || dis.name || name_of_func(dis.constructor) || name_of_func(dis.dispose) || defaultName;
+export function dispose_name(disposable, defaultName = '<unknown>') {
+    const dis = disposable;
+    return (dis.displayName ||
+        dis.name ||
+        name_of_func(dis.constructor) ||
+        name_of_func(dis.dispose) ||
+        name_of_func(dis[Symbol.dispose]) ||
+        name_of_func(dis[Symbol.asyncDispose]) ||
+        defaultName);
 }
 function name_of_func(obj) {
     const name = obj.name;
-    if (name === 'Object' || name === 'Function' || name === 'AsyncFunction' || name === 'GeneratorFunction' || name === 'AsyncGeneratorFunction' || name === 'Disposable' || name === 'AsyncDisposable' || name.toLowerCase() === 'dispose') {
+    if (name === 'Object' ||
+        name === 'Function' ||
+        name === 'AsyncFunction' ||
+        name === 'GeneratorFunction' ||
+        name === 'AsyncGeneratorFunction' ||
+        name === 'Disposable' ||
+        name === 'AsyncDisposable' ||
+        name.toLowerCase() === 'dispose') {
         return '';
     }
     return name;

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

@@ -1 +1 @@
-{"version":3,"file":"debug.js","sourceRoot":"","sources":["../../../src/lifecycle/dispose/debug.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,gBAAgB;AAChB,MAAM,CAAC,MAAM,cAAc,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC;AAE/C,gBAAgB;AAChB,MAAM,UAAU,YAAY,CAAC,GAAmC,EAAE,WAAW,GAAG,WAAW;IAC1F,OAAO,GAAG,CAAC,WAAW,IAAI,GAAG,CAAC,IAAI,IAAI,YAAY,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,WAAW,CAAC;AACjH,CAAC;AACD,SAAS,YAAY,CAAC,GAAQ;IAC7B,MAAM,IAAI,GAAW,GAAG,CAAC,IAAI,CAAC;IAE9B,IAAI,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,UAAU,IAAI,IAAI,KAAK,eAAe,IAAI,IAAI,KAAK,mBAAmB,IAAI,IAAI,KAAK,wBAAwB,IAAI,IAAI,KAAK,YAAY,IAAI,IAAI,KAAK,iBAAiB,IAAI,IAAI,CAAC,WAAW,EAAE,KAAK,SAAS,EAAE,CAAC;QAC1O,OAAO,EAAE,CAAC;IACX,CAAC;IAED,OAAO,IAAI,CAAC;AACb,CAAC"}
+{"version":3,"file":"debug.js","sourceRoot":"","sources":["../../../src/lifecycle/dispose/debug.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,gBAAgB;AAChB,MAAM,CAAC,MAAM,cAAc,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC;AAE/C,gBAAgB;AAChB,MAAM,UAAU,YAAY,CAAC,UAAyE,EAAE,WAAW,GAAG,WAAW;IAChI,MAAM,GAAG,GAAG,UAAiB,CAAC;IAC9B,OAAO,CACN,GAAG,CAAC,WAAW;QACf,GAAG,CAAC,IAAI;QACR,YAAY,CAAC,GAAG,CAAC,WAAW,CAAC;QAC7B,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC;QACzB,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACjC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QACtC,WAAW,CACX,CAAC;AACH,CAAC;AACD,SAAS,YAAY,CAAC,GAAQ;IAC7B,MAAM,IAAI,GAAW,GAAG,CAAC,IAAI,CAAC;IAE9B,IACC,IAAI,KAAK,QAAQ;QACjB,IAAI,KAAK,UAAU;QACnB,IAAI,KAAK,eAAe;QACxB,IAAI,KAAK,mBAAmB;QAC5B,IAAI,KAAK,wBAAwB;QACjC,IAAI,KAAK,YAAY;QACrB,IAAI,KAAK,iBAAiB;QAC1B,IAAI,CAAC,WAAW,EAAE,KAAK,SAAS,EAC/B,CAAC;QACF,OAAO,EAAE,CAAC;IACX,CAAC;IAED,OAAO,IAAI,CAAC;AACb,CAAC"}

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

@@ -0,0 +1,68 @@
+import type { MaybeNamed } from '../../debugging/object-with-name.js';
+import { Emitter } from '../event/event.js';
+import type { EventRegister } from '../event/type.js';
+export declare enum DuplicateDisposeAction {
+    Disable = 0,
+    Warning = 1,
+    Allow = 2
+}
+/** @public */
+export interface IDisposableEvents {
+    onDisposeError: EventRegister<Error>;
+    onBeforeDispose: EventRegister<void>;
+    readonly hasDisposed: boolean;
+}
+/** @public */
+export interface IDisposable extends MaybeNamed {
+    dispose(): void;
+}
+/** @public */
+export interface IAsyncDisposable extends MaybeNamed {
+    dispose(): void | Promise<void>;
+}
+type _Type<Async extends boolean> = Async extends true ? IAsyncDisposable : IDisposable;
+type _RType<Async extends boolean> = Async extends true ? Promise<void> : void;
+/**
+ * 增强型Disposable
+ */
+export declare abstract class AbstractEnhancedDisposable<Async extends boolean> implements IDisposableEvents {
+    protected readonly _onDisposeError: Emitter<Error>;
+    readonly onDisposeError: EventRegister<Error>;
+    protected readonly _onBeforeDispose: Emitter<void>;
+    readonly onBeforeDispose: EventRegister<void>;
+    protected readonly _onPostDispose: Emitter<void>;
+    readonly onPostDispose: EventRegister<void>;
+    /** for debug */
+    readonly displayName?: string;
+    protected readonly _logger: import("debug").Debugger;
+    constructor(displayName?: string);
+    /**
+     * @throws if already disposed
+     */
+    assertNotDisposed(): void;
+    /**
+     * the "DisposableStack"
+     */
+    protected readonly _disposables: _Type<Async>[];
+    /**
+     * register a disposable object
+     */
+    _register<T extends _Type<Async>>(d: T): T;
+    _register<T extends _Type<Async> & IDisposableEvents>(d: T, autoDereference?: boolean): T;
+    _unregister(d: _Type<Async>): boolean;
+    protected readonly duplicateDispose: DuplicateDisposeAction;
+    private _disposed?;
+    get disposed(): boolean;
+    /**
+     * @deprecated use disposed
+     */
+    get hasDisposed(): boolean;
+    /**
+     * 释放相关资源
+     */
+    dispose(): _RType<Async>;
+    get [Symbol.toStringTag](): string;
+    protected abstract _dispose(disposables: readonly _Type<Async>[]): _RType<Async>;
+}
+export {};
+//# sourceMappingURL=disposable.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"disposable.d.ts","sourceRoot":"","sources":["../../../src/lifecycle/dispose/disposable.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAC;AAEtE,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,iBAAwB;IAC1D,SAAgB,cAAc,EAAE,aAAa,CAAC,KAAK,CAAC,CAAiC;IAErF,SAAS,CAAC,QAAQ,CAAC,gBAAgB,gBAAuB;IAC1D,SAAgB,eAAe,EAAE,aAAa,CAAC,IAAI,CAAC,CAAkC;IAEtF,SAAS,CAAC,QAAQ,CAAC,cAAc,gBAAuB;IACxD,SAAgB,aAAa,EAAE,aAAa,CAAC,IAAI,CAAC,CAAgC;IAElF,gBAAgB;IAChB,SAAgB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrC,SAAS,CAAC,QAAQ,CAAC,OAAO,2BAAC;gBAEf,WAAW,CAAC,EAAE,MAAM;IAiBhC;;OAEG;IACI,iBAAiB;IAMxB;;OAEG;IACH,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,KAAK,CAAC,KAAK,CAAC,EAAE,CAAM;IAErD;;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;IAazF,WAAW,CAAC,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC;IAMlC,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,sBAAsB,CAAkC;IAC7F,OAAO,CAAC,SAAS,CAAC,CAGhB;IACF,IAAW,QAAQ,YAElB;IACD;;OAEG;IACH,IAAW,WAAW,YAErB;IACD;;OAEG;IACI,OAAO,IAAI,MAAM,CAAC,KAAK,CAAC;IAiC/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

@@ -0,0 +1,119 @@
+import { createStackTraceHolder } from '../../error/stack-trace.js';
+import { Emitter } from '../event/event.js';
+import { fromNativeDisposable } from './bridges/native.js';
+import { _debug_dispose, dispose_name } from './debug.js';
+import { DuplicateDisposed } from './disposedError.js';
+export var DuplicateDisposeAction;
+(function (DuplicateDisposeAction) {
+    DuplicateDisposeAction[DuplicateDisposeAction["Disable"] = 0] = "Disable";
+    DuplicateDisposeAction[DuplicateDisposeAction["Warning"] = 1] = "Warning";
+    DuplicateDisposeAction[DuplicateDisposeAction["Allow"] = 2] = "Allow";
+})(DuplicateDisposeAction || (DuplicateDisposeAction = {}));
+/**
+ * 增强型Disposable
+ */
+export class AbstractEnhancedDisposable {
+    _onDisposeError = new Emitter();
+    onDisposeError = this._onDisposeError.register;
+    _onBeforeDispose = new Emitter();
+    onBeforeDispose = this._onBeforeDispose.register;
+    _onPostDispose = new Emitter();
+    onPostDispose = this._onPostDispose.register;
+    /** for debug */
+    displayName;
+    _logger;
+    constructor(displayName) {
+        if (displayName !== undefined) {
+            this.displayName = displayName;
+        }
+        else if (!this.displayName) {
+            displayName = dispose_name(this, 'AsyncDisposable');
+            this.displayName = displayName;
+        }
+        this._logger = _debug_dispose.extend(this.displayName || 'disposable');
+        this._onPostDispose.handle(() => {
+            this._onPostDispose.dispose();
+        });
+        this._disposables.push(this._onBeforeDispose);
+        this._disposables.push(this._onDisposeError);
+    }
+    /**
+     * @throws if already disposed
+     */
+    assertNotDisposed() {
+        if (this._disposed) {
+            throw new DuplicateDisposed(this, this._disposed.trace);
+        }
+    }
+    /**
+     * the "DisposableStack"
+     */
+    _disposables = [];
+    _register(d, autoDereference) {
+        if (this._logger.enabled)
+            this._logger(`register ${dispose_name(d)}`);
+        this.assertNotDisposed();
+        this._disposables.unshift(fromNativeDisposable(d));
+        if (autoDereference) {
+            d.onBeforeDispose(() => {
+                this._unregister(d);
+            });
+        }
+        return d;
+    }
+    _unregister(d) {
+        if (this._logger.enabled)
+            this._logger(`unregister ${dispose_name(d)}`);
+        this.assertNotDisposed();
+        return this._disposables.splice(this._disposables.indexOf(d), 1).length > 0;
+    }
+    duplicateDispose = DuplicateDisposeAction.Warning;
+    _disposed;
+    get disposed() {
+        return !!this._disposed;
+    }
+    /**
+     * @deprecated use disposed
+     */
+    get hasDisposed() {
+        return !!this._disposed;
+    }
+    /**
+     * 释放相关资源
+     */
+    dispose() {
+        if (this._disposed) {
+            if (this.duplicateDispose === DuplicateDisposeAction.Allow)
+                return this._disposed.result;
+            const dupErr = new DuplicateDisposed(this, this._disposed.trace);
+            if (this.duplicateDispose === DuplicateDisposeAction.Disable) {
+                throw dupErr;
+            }
+            else {
+                console.warn(dupErr);
+                return this._disposed.result;
+            }
+        }
+        this._onBeforeDispose.fireNoError();
+        let r;
+        try {
+            r = this._dispose(this._disposables);
+        }
+        finally {
+            this._disposables.length = 0;
+            Object.freeze(this._disposables);
+            this._disposed = {
+                trace: createStackTraceHolder('disposed', this.dispose),
+                result: r,
+            };
+        }
+        if (r && 'then' in r) {
+            r.then(() => { });
+        }
+        return r;
+    }
+    get [Symbol.toStringTag]() {
+        return this.displayName || 'unknown disposable';
+    }
+}
+//# sourceMappingURL=disposable.js.map

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

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

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

@@ -1,17 +1,12 @@
-import type { IDisposable } from './lifecycle.js';
-export interface IEventListenerOptions {
-    capture?: boolean;
-    once?: boolean;
-    passive?: boolean;
+import type { IDisposable } from './disposable.js';
+export declare function addAnyKindOfListener(host: IEventEmitterObject | IShorthandEmitterObject, name: string, handler: Function): void;
+export interface IShorthandEmitterObject {
+    on(type: string, handler: Function): void;
+    off(type: string, handler: Function): void;
 }
-export interface IEventHostObject<T extends Function> {
-    addEventListener(type: string, handler: T, options?: IEventListenerOptions): any;
-    removeEventListener(type: string, handler: T, options?: IEventListenerOptions): any;
+export interface IEventEmitterObject {
+    addListener(type: string, handler: Function): void;
+    removeListener(type: string, handler: Function): void;
 }
-export interface IEventEmitterObject<T extends Function> {
-    addListener(type: string, handler: T): any;
-    removeListener(type: string, handler: T): any;
-}
-export declare function addDisposableEventListener<T extends Function>(target: IEventHostObject<T> | IEventEmitterObject<T>, type: string, options: IEventListenerOptions, handler: T): IDisposable;
-export declare function addDisposableEventListener<T extends Function>(target: IEventHostObject<T> | IEventEmitterObject<T>, type: string, handler: T): IDisposable;
+export declare function addDisposableEventListener(target: IEventEmitterObject | IShorthandEmitterObject, type: string, handler: Function): IDisposable;
 //# sourceMappingURL=disposableEvent.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"disposableEvent.d.ts","sourceRoot":"","sources":["../../../src/lifecycle/dispose/disposableEvent.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAIlD,MAAM,WAAW,qBAAqB;IACrC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,OAAO,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,gBAAgB,CAAC,CAAC,SAAS,QAAQ;IACnD,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,CAAC,EAAE,qBAAqB,GAAG,GAAG,CAAC;IACjF,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,CAAC,EAAE,qBAAqB,GAAG,GAAG,CAAC;CACpF;AAED,MAAM,WAAW,mBAAmB,CAAC,CAAC,SAAS,QAAQ;IACtD,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,GAAG,GAAG,CAAC;IAC3C,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,GAAG,GAAG,CAAC;CAC9C;AAED,wBAAgB,0BAA0B,CAAC,CAAC,SAAS,QAAQ,EAAE,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC,GAAG,mBAAmB,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,qBAAqB,EAAE,OAAO,EAAE,CAAC,GAAG,WAAW,CAAC;AAE5L,wBAAgB,0BAA0B,CAAC,CAAC,SAAS,QAAQ,EAAE,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC,GAAG,mBAAmB,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,GAAG,WAAW,CAAC"}
+{"version":3,"file":"disposableEvent.d.ts","sourceRoot":"","sources":["../../../src/lifecycle/dispose/disposableEvent.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAEnD,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,mBAAmB,GAAG,uBAAuB,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,QAMxH;AAED,MAAM,WAAW,uBAAuB;IACvC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,GAAG,IAAI,CAAC;IAC1C,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,GAAG,IAAI,CAAC;CAC3C;AAED,MAAM,WAAW,mBAAmB;IACnC,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,GAAG,IAAI,CAAC;IACnD,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,GAAG,IAAI,CAAC;CACtD;AAED,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,mBAAmB,GAAG,uBAAuB,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,GAAG,WAAW,CAe9I"}

package/lib/lifecycle/dispose/disposableEvent.js

@@ -1,75 +1,25 @@
-export function addDisposableEventListener(target, type, _options, _handler) {
-    if (!_handler) {
-        if (typeof _options === 'function') {
-            _handler = _options;
-            _options = undefined;
-        }
-        else {
-            throw new Error('missing handler');
-        }
+export function addAnyKindOfListener(host, name, handler) {
+    if ('on' in host) {
+        host.on(name, handler);
     }
-    const handler = _handler;
-    const options = _options;
-    let remove;
-    if ('addEventListener' in target) {
-        if (passiveSupported === undefined || abortSupported === undefined) {
-            checkAllSupport(target);
-        }
-        const [abort, xOptions] = check(options);
-        target.addEventListener(type, handler, xOptions);
-        if (abort) {
-            remove = () => {
-                abort;
-            };
-        }
-        else {
-            remove = () => {
-                target.removeEventListener(type, handler, xOptions);
-            };
-        }
+    else if ('addListener' in host) {
+        host.addListener(name, handler);
     }
-    else {
+}
+export function addDisposableEventListener(target, type, handler) {
+    let remove;
+    if ('addListener' in target) {
         target.addListener(type, handler);
         remove = () => {
             target.removeListener(type, handler);
         };
     }
-    return { dispose: remove };
-}
-let passiveSupported;
-let abortSupported;
-function check(options = {}) {
-    if (!passiveSupported) {
-        return [undefined, (options.capture || false)];
-    }
-    if (abortSupported) {
-        const controller = new AbortController();
-        options.signal = controller.signal;
-        return [controller, options];
-    }
-    return [undefined, options];
-}
-function checkAllSupport(ele) {
-    passiveSupported = checkSupport('passive', ele);
-    abortSupported = typeof AbortController !== 'undefined' && checkSupport('signal', ele);
-}
-function checkSupport(field, ele) {
-    let supported = false;
-    try {
-        const options = {
-            get [field]() {
-                // This function will be called when the browser
-                //   attempts to access the passive property.
-                supported = true;
-                return undefined;
-            },
+    else {
+        target.on(type, handler);
+        remove = () => {
+            target.off(type, handler);
         };
-        ele.addEventListener('_test_', null, options);
-        ele.removeEventListener('_test_', null, options);
-    }
-    catch (_err) {
-        supported = false;
     }
-    return supported;
+    return { dispose: remove };
 }
 //# sourceMappingURL=disposableEvent.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"disposableEvent.js","sourceRoot":"","sources":["../../../src/lifecycle/dispose/disposableEvent.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"disposableEvent.js","sourceRoot":"","sources":["../../../src/lifecycle/dispose/disposableEvent.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,oBAAoB,CAAC,IAAmD,EAAE,IAAY,EAAE,OAAiB;IACxH,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC;QAClB,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACxB,CAAC;SAAM,IAAI,aAAa,IAAI,IAAI,EAAE,CAAC;QAClC,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACjC,CAAC;AACF,CAAC;AAYD,MAAM,UAAU,0BAA0B,CAAC,MAAqD,EAAE,IAAY,EAAE,OAAiB;IAChI,IAAI,MAA8B,CAAC;IAEnC,IAAI,aAAa,IAAI,MAAM,EAAE,CAAC;QAC7B,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAClC,MAAM,GAAG,GAAG,EAAE;YACb,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACtC,CAAC,CAAC;IACH,CAAC;SAAM,CAAC;QACP,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACzB,MAAM,GAAG,GAAG,EAAE;YACb,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC3B,CAAC,CAAC;IACH,CAAC;IACD,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;AAC5B,CAAC"}

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

@@ -1,12 +1,17 @@
-import type { StackTraceHolder } from '../../error/stackTrace.js';
+import type { StackTraceHolder } from '../../error/stack-trace.js';
+export declare class Disposed extends Error {
+    private readonly previous;
+    constructor(message: string | undefined, previous: StackTraceHolder);
+    get stack(): string;
+}
 /**
  * Error when call dispose() twice
  */
-export declare class DisposedError extends Error {
-    readonly previous: StackTraceHolder;
+export declare class DuplicateDisposed extends Error {
+    private readonly previous;
     readonly inspectString: string;
     constructor(object: any, previous: StackTraceHolder);
     tryCreateConsoleWarning(): Promise<void>;
+    is(other: unknown): other is DuplicateDisposed;
 }
-export declare function isDisposedError(error: any): boolean;
 //# sourceMappingURL=disposedError.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"disposedError.d.ts","sourceRoot":"","sources":["../../../src/lifecycle/dispose/disposedError.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAElE;;GAEG;AACH,qBAAa,aAAc,SAAQ,KAAK;aAItB,QAAQ,EAAE,gBAAgB;IAH3C,SAAgB,aAAa,EAAE,MAAM,CAAC;gBAErC,MAAM,EAAE,GAAG,EACK,QAAQ,EAAE,gBAAgB;IAiB9B,uBAAuB;CAMpC;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,GAAG,GAAG,OAAO,CAEnD"}
+{"version":3,"file":"disposedError.d.ts","sourceRoot":"","sources":["../../../src/lifecycle/dispose/disposedError.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAGnE,qBAAa,QAAS,SAAQ,KAAK;IAGjC,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBADzB,OAAO,oBAA6B,EACnB,QAAQ,EAAE,gBAAgB;IAM5C,IAAa,KAAK,WAEjB;CACD;AAED;;GAEG;AACH,qBAAa,iBAAkB,SAAQ,KAAK;IAI1C,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAH1B,SAAgB,aAAa,EAAE,MAAM,CAAC;gBAErC,MAAM,EAAE,GAAG,EACM,QAAQ,EAAE,gBAAgB;IAkB/B,uBAAuB;IAYpC,EAAE,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,iBAAiB;CAG9C"}