@flowgram.ai/utils 0.1.0-alpha.6 → 0.1.0-alpha.8

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) {
@@ -1837,6 +1841,7 @@ var Cache;
         return cache;
       },
       getMore(count, autoDelete = true) {
+        var _a;
         if (count === cache.length) {
         } else if (count > cache.length) {
           let added = count - cache.length;
@@ -1845,7 +1850,7 @@ var Cache;
             added--;
           }
         } else if (autoDelete) {
-          const deleteLimit = opts.deleteLimit ?? 0;
+          const deleteLimit = (_a = opts.deleteLimit) != null ? _a : 0;
           if (cache.length - count > deleteLimit) {
             const deleted = cache.splice(count);
             deleted.forEach((el) => el.dispose && el.dispose());
@@ -1861,11 +1866,12 @@ var Cache;
         const newCache = [];
         const findedMap = /* @__PURE__ */ new Map();
         cache.forEach((item) => {
+          var _a;
           const finded = items.find((i) => i.key === item.key);
           if (finded) {
             findedMap.set(item.key, item);
           } else {
-            item.dispose?.();
+            (_a = item.dispose) == null ? void 0 : _a.call(item);
           }
         });
         items.forEach((item) => {
@@ -1887,11 +1893,12 @@ var Cache;
         const newCache = [];
         const findedMap = /* @__PURE__ */ new Map();
         cache.forEach((cacheItem) => {
+          var _a;
           const finded = items.find((ref) => ref === cacheItem.key);
           if (finded) {
             findedMap.set(cacheItem.key, cacheItem);
           } else {
-            cacheItem.dispose?.();
+            (_a = cacheItem.dispose) == null ? void 0 : _a.call(cacheItem);
           }
         });
         items.forEach((item) => {
@@ -1971,11 +1978,11 @@ var SchemaDecoration;
     return {
       type: "object",
       properties: {
-        ...baseDecoration?.properties,
+        ...baseDecoration == null ? void 0 : baseDecoration.properties,
         ...properties
       },
       mixinDefaults: {
-        ...baseDecoration?.mixinDefaults,
+        ...baseDecoration == null ? void 0 : baseDecoration.mixinDefaults,
         ...mixinDefaults
       }
     };