@lppedd/di-wise-neo 0.20.0 → 0.21.0

package/dist/cjs/index.d.ts

@@ -627,11 +627,13 @@ interface Container {
      * Disposes this container and all its cached values.
      *
      * Token values implementing a `Disposable` interface (e.g., objects with a `dispose()` function)
-     * are automatically disposed during this process.
+     * are also disposed. All disposals, whether synchronous or asynchronous, are returned as promises
+     * in an array. Callers may await these promises (e.g., using `Promise.allSettled()`) if they want
+     * to ensure that all async work has completed.
      *
      * Note that children containers are disposed first, in creation order.
      */
-    dispose(): void;
+    dispose(): Promise<unknown>[];
 }
 /**
  * Creates a new container.

package/dist/cjs/index.js

@@ -57,7 +57,7 @@ function getTokenName(token) {
 }
 function getFullTokenName([token, name]) {
     const tokenName = token ? token.name || "<unnamed>" : "<undefined token>";
-    return name ? `${tokenName}["${name}"]` : tokenName;
+    return name !== undefined ? `${tokenName}["${name}"]` : tokenName;
 }
 function getCause(error) {
     if (!error) {
@@ -544,8 +544,12 @@ class TokenRegistry {
         return registrations;
     }
     deleteAll() {
-        const tokens = Array.from(this.myRegistrations.keys());
-        const registrations = Array.from(this.myRegistrations.values()).flat();
+        const tokens = [
+            ...this.myRegistrations.keys()
+        ];
+        const registrations = [
+            ...this.myRegistrations.values()
+        ].flat();
         this.myRegistrations.clear();
         return [
             tokens,
@@ -563,7 +567,9 @@ class TokenRegistry {
                 registration.valueRef = undefined;
             }
         }
-        return Array.from(values);
+        return [
+            ...values
+        ];
     }
     getAllFromParent(token, name) {
         let registrations = this.myRegistrations.get(token) || this.myParent?.getAllFromParent(token, name);
@@ -661,7 +667,9 @@ function isDisposable(value) {
                 values.add(valueRef.current);
             }
         }
-        return Array.from(values);
+        return [
+            ...values
+        ];
     }
     resetRegistry() {
         this.checkDisposed();
@@ -672,7 +680,9 @@ function isDisposable(value) {
                 values.add(valueRef.current);
             }
         }
-        return Array.from(values);
+        return [
+            ...values
+        ];
     }
     isRegistered(token, name) {
         this.checkDisposed();
@@ -701,7 +711,9 @@ function isDisposable(value) {
                 values.add(valueRef.current);
             }
         }
-        return Array.from(values);
+        return [
+            ...values
+        ];
     }
     resolve(token, name) {
         this.checkDisposed();
@@ -727,13 +739,14 @@ function isDisposable(value) {
     }
     dispose() {
         if (this.myDisposed) {
-            return;
+            return [];
         }
+        this.myDisposed = true;
+        const promises = [];
         // Dispose children containers first
         for (const child of this.myChildren){
-            child.dispose();
+            promises.push(...child.dispose());
         }
-        this.myDisposed = true;
         this.myChildren.clear();
         this.myParent?.myChildren?.delete(this);
         const [, registrations] = this.myTokenRegistry.deleteAll();
@@ -750,11 +763,18 @@ function isDisposable(value) {
         }
         for (const value of allValues){
             if (isDisposable(value)) {
-                value.dispose();
+                try {
+                    promises.push(Promise.resolve(value.dispose()));
+                } catch (e) {
+                    promises.push(Promise.reject(e));
+                }
             }
         }
-        this.notifyDisposeHooks(Array.from(cacheValues));
+        this.notifyDisposeHooks([
+            ...cacheValues
+        ]);
         this.myHookRegistry.clear();
+        return promises;
     }
     registerClass(Class) {
         const metadata = getMetadata(Class);