@lppedd/di-wise-neo 0.14.0 → 0.14.1

package/dist/cjs/index.d.ts

@@ -55,18 +55,14 @@ interface Type<T> {
      * The name of the type.
      */
     readonly name: string;
-    /**
-     * Returns the stringified representation of the type.
-     */
-    readonly toString: () => string;
     /**
      * Ensures that different `Type<T>` types are not structurally compatible.
      *
-     * This property is never used at runtime.
+     * This property is always `undefined` and is never used at runtime.
      *
      * @private
      */
-    readonly __type?: T;
+    readonly __type: T | undefined;
 }
 /**
  * An injectable type `T` with a default {@link Provider} and optional default registration options.
@@ -91,7 +87,7 @@ interface Constructor<Instance extends object> {
 /**
  * Token type.
  */
-type Token<Value = any> = [Value] extends [object] ? Type<Value> | Constructor<Value> : Type<Value>;
+type Token<Value = any> = [Value] extends [object] ? Type<Value> | Constructor<Value & object> : Type<Value>;
 /**
  * Describes a {@link Token} array with at least one element.
  */

package/dist/cjs/index.js

@@ -575,13 +575,66 @@ function isDisposable(value) {
             if (isConstructor(token)) {
                 this.registerClass(token);
             } else {
-                this.registerType(token, token.provider, token.options);
+                this.registerToken(token, token.provider, token.options);
             }
         } else {
-            this.registerType(...args);
+            this.registerToken(...args);
         }
         return this;
     }
+    unregister(token, name) {
+        this.checkDisposed();
+        const registrations = this.myTokenRegistry.delete(token, name);
+        const values = new Set();
+        for (const registration of registrations){
+            const value = registration.value;
+            if (value) {
+                values.add(value.current);
+            }
+        }
+        return Array.from(values);
+    }
+    resolve(token, name) {
+        this.checkDisposed();
+        return this.resolveToken(token, name, false);
+    }
+    tryResolve(token, name) {
+        this.checkDisposed();
+        return this.resolveToken(token, name, true);
+    }
+    resolveAll(token) {
+        this.checkDisposed();
+        return this.resolveAllToken(token, false);
+    }
+    tryResolveAll(token) {
+        this.checkDisposed();
+        return this.resolveAllToken(token, true);
+    }
+    dispose() {
+        if (this.myDisposed) {
+            return;
+        }
+        // Dispose children containers first
+        for (const child of this.myChildren){
+            child.dispose();
+        }
+        this.myChildren.clear();
+        // Remove ourselves from our parent container
+        this.myParent?.myChildren?.delete(this);
+        this.myDisposed = true;
+        const [, registrations] = this.myTokenRegistry.deleteAll();
+        const disposedRefs = new Set();
+        // Dispose all resolved (aka instantiated) tokens that implement the Disposable interface
+        for (const registration of registrations){
+            const value = registration.value?.current;
+            if (isDisposable(value) && !disposedRefs.has(value)) {
+                disposedRefs.add(value);
+                value.dispose();
+            }
+        }
+        // Allow values to be GCed
+        disposedRefs.clear();
+    }
     registerClass(Class) {
         const metadata = getMetadata(Class);
         const name = metadata.name;
@@ -614,7 +667,7 @@ function isDisposable(value) {
             this.resolveProviderValue(Class, registration);
         }
     }
-    registerType(token, provider, options) {
+    registerToken(token, provider, options) {
         const name = provider.name;
         check(name === undefined || name.trim(), `name qualifier for token ${getTokenName(token)} must not be empty`);
         if (isClassProvider(provider)) {
@@ -647,59 +700,6 @@ function isDisposable(value) {
             });
         }
     }
-    unregister(token, name) {
-        this.checkDisposed();
-        const registrations = this.myTokenRegistry.delete(token, name);
-        const values = new Set();
-        for (const registration of registrations){
-            const value = registration.value;
-            if (value) {
-                values.add(value.current);
-            }
-        }
-        return Array.from(values);
-    }
-    resolve(token, name) {
-        this.checkDisposed();
-        return this.resolveToken(token, name, false);
-    }
-    tryResolve(token, name) {
-        this.checkDisposed();
-        return this.resolveToken(token, name, true);
-    }
-    resolveAll(token) {
-        this.checkDisposed();
-        return this.resolveAllToken(token, false);
-    }
-    tryResolveAll(token) {
-        this.checkDisposed();
-        return this.resolveAllToken(token, true);
-    }
-    dispose() {
-        if (this.myDisposed) {
-            return;
-        }
-        // Dispose children containers first
-        for (const child of this.myChildren){
-            child.dispose();
-        }
-        this.myChildren.clear();
-        // Remove ourselves from our parent container
-        this.myParent?.myChildren?.delete(this);
-        this.myDisposed = true;
-        const [, registrations] = this.myTokenRegistry.deleteAll();
-        const disposedRefs = new Set();
-        // Dispose all resolved (aka instantiated) tokens that implement the Disposable interface
-        for (const registration of registrations){
-            const value = registration.value?.current;
-            if (isDisposable(value) && !disposedRefs.has(value)) {
-                disposedRefs.add(value);
-                value.dispose();
-            }
-        }
-        // Allow values to be GCed
-        disposedRefs.clear();
-    }
     resolveToken(token, name, optional) {
         let registration = this.myTokenRegistry.get(token, name);
         if (!registration && isConstructor(token)) {