@lppedd/di-wise-neo 0.11.0 → 0.11.1

package/dist/cjs/index.d.ts

@@ -116,11 +116,11 @@ interface FactoryProvider<Value> {
 /**
  * Provides a static - already constructed - value for a token.
  */
-interface ValueProvider<T> {
+interface ValueProvider<Value> {
     /**
      * The static value to associate with the token.
      */
-    readonly useValue: T;
+    readonly useValue: Value;
     /**
      * An optional name to qualify this provider.
      * If specified, the token must be resolved using the same name.
@@ -147,10 +147,7 @@ interface ExistingProvider<Value> {
     /**
      * The existing token to alias.
      */
-    readonly useExisting: Token<Value> | {
-        readonly token: Token<Value>;
-        readonly name?: string;
-    };
+    readonly useExisting: Token<Value> | [Token<Value>, string?];
     /**
      * An optional name to qualify this provider.
      * If specified, the token must be resolved using the same name.
@@ -497,12 +494,12 @@ interface TokenRef<Value = any> {
     readonly getRefToken: () => Token<Value>;
 }
 /**
- * Allows referencing tokens that are declared later in the file by wrapping them
+ * Allows referencing tokens declared later in the file by wrapping them
  * in a lazily evaluated function.
  */
 declare function forwardRef<Value>(token: () => Tokens<Value>): TokensRef<Value>;
 /**
- * Allows referencing a token that is declared later in the file by wrapping it
+ * Allows referencing a token declared later in the file by wrapping it
  * in a lazily evaluated function.
  */
 declare function forwardRef<Value>(token: () => Token<Value>): TokenRef<Value>;
@@ -522,8 +519,8 @@ declare function Inject<Value>(token: Token<Value>): ParameterDecorator;
 /**
  * Parameter decorator that injects the value associated with the given token.
  *
- * Allows referencing a token that is declared later in the file by using
- * the {@link forwardRef} helper function.
+ * Allows referencing a token declared later in the file by using the
+ * {@link forwardRef} helper function.
  *
  * Throws an error if the token is not registered in the container.
  *
@@ -588,8 +585,8 @@ declare function InjectAll<Value>(token: Token<Value>): ParameterDecorator;
  * Parameter decorator that injects all values provided by the registrations
  * associated with the given token.
  *
- * Allows referencing a token that is declared later in the file by using
- * the {@link forwardRef} helper function.
+ * Allows referencing a token declared later in the file by using the
+ * {@link forwardRef} helper function.
  *
  * Throws an error if the token is not registered in the container.
  *
@@ -638,8 +635,8 @@ declare function Optional<Value>(token: Token<Value>): ParameterDecorator;
  * Parameter decorator that injects the value associated with the given token,
  * or `undefined` if the token is not registered in the container.
  *
- * Allows referencing a token that is declared later in the file by using
- * the {@link forwardRef} helper function.
+ * Allows referencing a token declared later in the file by using the
+ * {@link forwardRef} helper function.
  *
  * @example
  * ```ts
@@ -669,8 +666,8 @@ declare function OptionalAll<Value>(token: Token<Value>): ParameterDecorator;
  * associated with the given token, or an empty array if the token is not registered
  * in the container.
  *
- * Allows referencing a token that is declared later in the file by using
- * the {@link forwardRef} helper function.
+ * Allows referencing a token declared later in the file by using the
+ * {@link forwardRef} helper function.
  *
  * @example
  * ```ts

package/dist/cjs/index.js

@@ -55,8 +55,7 @@ function getTokenPath(tokens) {
 function getTokenName(token) {
     return token.name || "<unnamed>";
 }
-function getFullTokenName(tokenInfo) {
-    const [token, name] = tokenInfo;
+function getFullTokenName([token, name]) {
     const tokenName = token.name || "<unnamed>";
     return name ? `${tokenName}["${name}"]` : tokenName;
 }
@@ -83,8 +82,7 @@ class KeyedStack {
         return this.myKeys.has(key);
     }
     peek() {
-        const entry = this.myEntries.at(-1);
-        return entry?.value;
+        return this.myEntries.at(-1)?.value;
     }
     push(key, value) {
         check(!this.has(key), "invariant violation");
@@ -132,7 +130,7 @@ class WeakRefMap {
 // @internal
 function createResolution() {
     return {
-        tokenStack: [],
+        tokens: [],
         stack: new KeyedStack(),
         values: new WeakRefMap(),
         dependents: new WeakRefMap()
@@ -330,8 +328,9 @@ const Scope = {
     Container: "Container"
 };
 
-const typeSymbol = Symbol("di-wise-neo.typeToken");
 /**
+ * Type API.
+ */ /**
  * Creates a type token.
  *
  * @example
@@ -345,7 +344,6 @@ const typeSymbol = Symbol("di-wise-neo.typeToken");
         name: `Type<${typeName}>`,
         inter: createType,
         union: createType,
-        __type: typeSymbol,
         toString () {
             return type.name;
         }
@@ -353,10 +351,6 @@ const typeSymbol = Symbol("di-wise-neo.typeToken");
     return type;
 }
 // @internal
-function isType(token) {
-    return token.__type === typeSymbol;
-}
-// @internal
 function isConstructor(token) {
     return typeof token === "function";
 }
@@ -418,22 +412,22 @@ class TokenRegistry {
     }
     delete(token, name) {
         const registrations = this.myMap.get(token);
-        if (registrations) {
-            if (name !== undefined) {
-                const removedRegistrations = [];
-                const newRegistrations = [];
-                for (const registration of registrations){
-                    const array = registration.name === name ? removedRegistrations : newRegistrations;
-                    array.push(registration);
-                }
-                if (removedRegistrations.length > 0) {
-                    this.myMap.set(token, newRegistrations);
-                    return removedRegistrations;
-                }
+        if (!registrations) {
+            return [];
+        }
+        if (name !== undefined) {
+            const removed = [];
+            const updated = [];
+            for (const registration of registrations){
+                (registration.name === name ? removed : updated).push(registration);
+            }
+            if (removed.length > 0) {
+                this.myMap.set(token, updated);
+                return removed;
             }
-            this.myMap.delete(token);
         }
-        return registrations ?? [];
+        this.myMap.delete(token);
+        return registrations;
     }
     deleteAll() {
         const tokens = Array.from(this.myMap.keys());
@@ -595,10 +589,10 @@ function isDisposable(value) {
                 this.myTokenRegistry.set(token, {
                     name: name,
                     provider: {
-                        useExisting: {
-                            token: Class,
-                            name: name
-                        }
+                        useExisting: [
+                            Class,
+                            name
+                        ]
                     }
                 });
             }
@@ -614,7 +608,7 @@ function isDisposable(value) {
                 const metadata = getMetadata(provider.useClass);
                 const registration = {
                     // An explicit provider name overrides what is specified via @Named
-                    name: metadata.name ?? provider.name,
+                    name: metadata.name ?? name,
                     provider: metadata.provider,
                     options: {
                         // Explicit registration options override what is specified via class decorators (e.g., @Scoped)
@@ -757,12 +751,8 @@ function isDisposable(value) {
     }
     getTargetToken(provider) {
         const token = provider.useExisting;
-        return isType(token) || isConstructor(token) //
-         ? [
+        return Array.isArray(token) ? token : [
             token
-        ] : [
-            token.token,
-            token.name
         ];
     }
     autoRegisterClass(Class, name) {
@@ -810,7 +800,7 @@ function isDisposable(value) {
         if (resolution.stack.has(provider)) {
             const dependentRef = resolution.dependents.get(provider);
             check(dependentRef, ()=>{
-                const path = getTokenPath(resolution.tokenStack.concat(token).map((t)=>[
+                const path = getTokenPath(resolution.tokens.concat(token).map((t)=>[
                         t
                     ]));
                 return `circular dependency detected while resolving ${path}`;
@@ -820,7 +810,7 @@ function isDisposable(value) {
         const scope = registration.options?.scope ?? this.myOptions.defaultScope;
         const cleanups = [
             provideInjectionContext(context),
-            resolution.tokenStack.push(token) && (()=>resolution.tokenStack.pop()),
+            resolution.tokens.push(token) && (()=>resolution.tokens.pop()),
             !isBuilder(provider) && resolution.stack.push(provider, {
                 provider,
                 scope
@@ -1006,8 +996,7 @@ function isDisposable(value) {
 function forwardRef(token) {
     return {
         getRefTokens: ()=>{
-            // Normalize the single token here, so that we don't have
-            // to do it at every getRefTokens call site
+            // Normalize the single token here so that we don't have to do it at every getRefTokens call site
             const tokenOrTokens = token();
             const tokensArray = Array.isArray(tokenOrTokens) ? tokenOrTokens : [
                 tokenOrTokens