perf: improve addOne speed

wopjs · Nov 12, 2024 · 2f8b96d · 2f8b96d
1 parent ffb5332
commit 2f8b96d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 12 deletions.
diff --git a/src/disposable-map.ts b/src/disposable-map.ts
@@ -126,7 +126,7 @@ function set<T extends DisposableType, K>(
   if (isAbortable(disposable)) {
     disposable.abortable(() => this.remove(key));
   }
-  (this._disposables_ ||= new Map()).set(key, disposable);
+  (this._disposables_ ??= new Map()).set(key, disposable);
   return disposable;
 }
 

diff --git a/src/disposable-store.ts b/src/disposable-store.ts
@@ -153,20 +153,25 @@ function has(this: DisposableStore, disposable: DisposableType): boolean {
 
 function add<T extends DisposableType>(
   this: DisposableStore,
-  disposable: T | T[]
+  disposables: T | T[]
 ): T | T[] {
-  const disposables = Array.isArray(disposable) ? disposable : [disposable];
-
-  for (const disposable of disposables) {
-    if (!this._disposables_?.has(disposable)) {
-      (this._disposables_ ||= new Set()).add(disposable);
-      if (isAbortable(disposable)) {
-        disposable.abortable(() => this.remove(disposable));
-      }
+  // eslint-disable-next-line @typescript-eslint/no-unused-expressions
+  Array.isArray(disposables)
+    ? disposables.forEach(_addOne, this)
+    : _addOne.call(this, disposables);
+  return disposables;
+}
+
+function _addOne<T extends DisposableType>(
+  this: DisposableStore,
+  disposable: T
+): void {
+  if (!this._disposables_?.has(disposable)) {
+    (this._disposables_ ??= new Set()).add(disposable);
+    if (isAbortable(disposable)) {
+      disposable.abortable(() => this.remove(disposable));
     }
   }
-
-  return disposable;
 }
 
 function make<T extends DisposableType>(