@flowgram.ai/utils 0.2.6 → 0.2.7

package/dist/index.d.mts

@@ -929,12 +929,11 @@ declare class DisposableImpl implements Disposable {
     get onDispose(): Event<void>;
 }
 declare class DisposableCollection implements Disposable {
-    protected readonly disposables: (Disposable & {
-        _origin: Disposable;
-    })[];
+    protected readonly disposables: Disposable[];
     protected readonly onDisposeEmitter: Emitter<void>;
     private _disposed;
     constructor(...toDispose: Disposable[]);
+    get length(): number;
     get onDispose(): Event<void>;
     get disposed(): boolean;
     dispose(): void;

package/dist/index.d.ts

@@ -929,12 +929,11 @@ declare class DisposableImpl implements Disposable {
     get onDispose(): Event<void>;
 }
 declare class DisposableCollection implements Disposable {
-    protected readonly disposables: (Disposable & {
-        _origin: Disposable;
-    })[];
+    protected readonly disposables: Disposable[];
     protected readonly onDisposeEmitter: Emitter<void>;
     private _disposed;
     constructor(...toDispose: Disposable[]);
+    get length(): number;
     get onDispose(): Event<void>;
     get disposed(): boolean;
     dispose(): void;

package/dist/index.js

@@ -1575,6 +1575,9 @@ var DisposableCollection = class {
     this._disposed = false;
     toDispose.forEach((d) => this.push(d));
   }
+  get length() {
+    return this.disposables.length;
+  }
   get onDispose() {
     return this.onDisposeEmitter.event;
   }
@@ -1598,25 +1601,26 @@ var DisposableCollection = class {
   }
   push(disposable) {
     if (this.disposed) return Disposable.NULL;
+    if (disposable === Disposable.NULL) {
+      return Disposable.NULL;
+    }
     const { disposables } = this;
-    if (disposables.find((d) => d._origin === disposable)) {
+    if (disposables.find((d) => d === disposable)) {
       return Disposable.NULL;
     }
-    let disposableWrap;
+    const originalDispose = disposable.dispose;
     const toRemove = Disposable.create(() => {
-      const index = disposables.indexOf(disposableWrap);
+      const index = disposables.indexOf(disposable);
       if (index !== -1) {
         disposables.splice(index, 1);
       }
+      disposable.dispose = originalDispose;
     });
-    disposableWrap = {
-      dispose: () => {
-        toRemove.dispose();
-        disposable.dispose();
-      },
-      _origin: disposable
+    disposable.dispose = () => {
+      toRemove.dispose();
+      disposable.dispose();
     };
-    disposables.push(disposableWrap);
+    disposables.push(disposable);
     return toRemove;
   }
   pushAll(disposables) {