@guanghechen/disposable 1.0.0-alpha.2 → 1.0.0-alpha.3

package/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file. See
 [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.0.0-alpha.3](https://github.com/guanghechen/sora/compare/@guanghechen/disposable@1.0.0-alpha.2...@guanghechen/disposable@1.0.0-alpha.3) (2024-03-09)
+
+### Performance Improvements
+
+- :art: refactor disposable
+  ([3e3d676](https://github.com/guanghechen/sora/commit/3e3d676ade205b6b7325276b3116c32fe194f33f))
+
+# Change Log
+
+All notable changes to this project will be documented in this file. See
+[Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
 # [1.0.0-alpha.2](https://github.com/guanghechen/sora/compare/@guanghechen/disposable@1.0.0-alpha.1...@guanghechen/disposable@1.0.0-alpha.2) (2024-02-03)
 
 ### Performance Improvements

package/lib/cjs/index.cjs

@@ -2,23 +2,45 @@
 
 var disposable_types = require('@guanghechen/disposable.types');
 
-function disposeAll(disposables) {
-    const errors = [];
-    for (const disposable of disposables) {
+class SafeBatchHandler {
+    _errors;
+    _summary;
+    constructor() {
+        this._errors = [];
+        this._summary = undefined;
+    }
+    cleanup() {
+        this._errors.length = 0;
+        this._summary = undefined;
+    }
+    run(action) {
         try {
-            disposable.dispose();
+            action();
         }
-        catch (e) {
-            errors.push(e);
+        catch (error) {
+            this._errors.push(error);
+            this._summary = undefined;
         }
     }
-    if (errors.length === 1) {
-        throw errors[0];
-    }
-    if (errors.length > 1) {
-        throw new AggregateError(errors, 'Encountered errors while disposing');
+    summary() {
+        if (this._summary === undefined) {
+            if (this._errors.length === 1)
+                throw (this._summary = this._errors[0]);
+            if (this._errors.length > 1) {
+                this._summary = new AggregateError(this._errors, 'Encountered errors while disposing');
+            }
+        }
+        if (this._summary !== undefined)
+            throw this._summary;
     }
 }
+function disposeAll(disposables) {
+    const handler = new SafeBatchHandler();
+    for (const disposable of disposables)
+        handler.run(() => disposable.dispose());
+    handler.summary();
+    handler.cleanup();
+}
 
 class BatchDisposable {
     _disposed;
@@ -58,12 +80,6 @@ class Disposable {
         this._onDispose = onDispose;
         this._disposed = false;
     }
-    static fromCallback(onDispose) {
-        return new Disposable(onDispose);
-    }
-    static fromUnsubscribable(unsubscribable) {
-        return new Disposable(() => unsubscribable.unsubscribe());
-    }
     get disposed() {
         return this._disposed;
     }
@@ -84,6 +100,7 @@ function isDisposable(obj) {
 
 exports.BatchDisposable = BatchDisposable;
 exports.Disposable = Disposable;
+exports.SafeBatchHandler = SafeBatchHandler;
 exports.disposeAll = disposeAll;
 exports.isDisposable = isDisposable;
 Object.keys(disposable_types).forEach(function (k) {

package/lib/esm/index.mjs

@@ -1,22 +1,44 @@
 export * from '@guanghechen/disposable.types';
 
-function disposeAll(disposables) {
-    const errors = [];
-    for (const disposable of disposables) {
+class SafeBatchHandler {
+    _errors;
+    _summary;
+    constructor() {
+        this._errors = [];
+        this._summary = undefined;
+    }
+    cleanup() {
+        this._errors.length = 0;
+        this._summary = undefined;
+    }
+    run(action) {
         try {
-            disposable.dispose();
+            action();
         }
-        catch (e) {
-            errors.push(e);
+        catch (error) {
+            this._errors.push(error);
+            this._summary = undefined;
         }
     }
-    if (errors.length === 1) {
-        throw errors[0];
-    }
-    if (errors.length > 1) {
-        throw new AggregateError(errors, 'Encountered errors while disposing');
+    summary() {
+        if (this._summary === undefined) {
+            if (this._errors.length === 1)
+                throw (this._summary = this._errors[0]);
+            if (this._errors.length > 1) {
+                this._summary = new AggregateError(this._errors, 'Encountered errors while disposing');
+            }
+        }
+        if (this._summary !== undefined)
+            throw this._summary;
     }
 }
+function disposeAll(disposables) {
+    const handler = new SafeBatchHandler();
+    for (const disposable of disposables)
+        handler.run(() => disposable.dispose());
+    handler.summary();
+    handler.cleanup();
+}
 
 class BatchDisposable {
     _disposed;
@@ -56,12 +78,6 @@ class Disposable {
         this._onDispose = onDispose;
         this._disposed = false;
     }
-    static fromCallback(onDispose) {
-        return new Disposable(onDispose);
-    }
-    static fromUnsubscribable(unsubscribable) {
-        return new Disposable(() => unsubscribable.unsubscribe());
-    }
     get disposed() {
         return this._disposed;
     }
@@ -80,4 +96,4 @@ function isDisposable(obj) {
         typeof Reflect.get(obj, 'disposed') === 'boolean');
 }
 
-export { BatchDisposable, Disposable, disposeAll, isDisposable };
+export { BatchDisposable, Disposable, SafeBatchHandler, disposeAll, isDisposable };

package/lib/types/index.d.ts

@@ -1,6 +1,5 @@
 import { IBatchDisposable, IDisposable } from '@guanghechen/disposable.types';
 export * from '@guanghechen/disposable.types';
-import { IUnsubscribable } from '@guanghechen/subscribe.types';
 
 declare class BatchDisposable implements IBatchDisposable {
     protected _disposed: boolean;
@@ -14,15 +13,21 @@ declare class BatchDisposable implements IBatchDisposable {
 declare class Disposable implements IDisposable {
     protected readonly _onDispose: () => void;
     protected _disposed: boolean;
-    private constructor();
-    static fromCallback(onDispose: () => void): IDisposable;
-    static fromUnsubscribable(unsubscribable: IUnsubscribable): IDisposable;
+    constructor(onDispose: () => void);
     get disposed(): boolean;
     dispose(): void;
 }
 
+declare class SafeBatchHandler {
+    private readonly _errors;
+    private _summary;
+    constructor();
+    cleanup(): void;
+    run(action: () => void): void;
+    summary(): void | never;
+}
 declare function disposeAll(disposables: Iterable<IDisposable>): void | never;
 
 declare function isDisposable(obj: unknown): obj is IDisposable;
 
-export { BatchDisposable, Disposable, disposeAll, isDisposable };
+export { BatchDisposable, Disposable, SafeBatchHandler, disposeAll, isDisposable };

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@guanghechen/disposable",
-  "version": "1.0.0-alpha.2",
+  "version": "1.0.0-alpha.3",
   "author": {
     "name": "guanghechen",
     "url": "https://github.com/guanghechen/"
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/guanghechen/sora/tree/@guanghechen/disposable@1.0.0-alpha.1",
+    "url": "https://github.com/guanghechen/sora/tree/@guanghechen/disposable@1.0.0-alpha.2",
     "directory": "packages/disposable"
   },
-  "homepage": "https://github.com/guanghechen/sora/tree/@guanghechen/disposable@1.0.0-alpha.1/packages/disposable#readme",
+  "homepage": "https://github.com/guanghechen/sora/tree/@guanghechen/disposable@1.0.0-alpha.2/packages/disposable#readme",
   "keywords": [
     "disposable"
   ],
@@ -34,8 +34,7 @@
     "README.md"
   ],
   "dependencies": {
-    "@guanghechen/disposable.types": "^1.0.0-alpha.2",
-    "@guanghechen/subscribe.types": "^1.0.0-alpha.2"
+    "@guanghechen/disposable.types": "^1.0.0-alpha.2"
   },
-  "gitHead": "9c051a66df3f4dbd8eddd709046af0a975fdc702"
+  "gitHead": "8f4595ed8e3b21ac509a16aeb52cbb686636d9f0"
 }