@lppedd/di-wise-neo 0.18.1 → 0.19.0

package/dist/cjs/index.d.ts

@@ -130,7 +130,7 @@ interface ClassRef<Instance extends object> {
     readonly getRefClass: () => Constructor<Instance>;
 }
 interface TokenRef<Value> {
-    readonly getRefTokens: () => Set<Token<Value>>;
+    readonly getRefToken: () => Token<Value>;
 }
 /**
  * Allows referencing a class declared later in the file by wrapping it
@@ -140,12 +140,10 @@ interface TokenRef<Value> {
  */
 declare function classRef<Instance extends object>(Class: () => Constructor<Instance>): ClassRef<Instance>;
 /**
- * Allows referencing one or multiple tokens declared later in the file by wrapping them
+ * Allows referencing a token declared later in the file by wrapping it
  * into a lazily evaluated function.
- *
- * @__NO_SIDE_EFFECTS__
  */
-declare function tokenRef<Value>(token: () => Token<Value> | Tokens<Value>): TokenRef<Value>;
+declare function tokenRef<Value>(token: () => Token<Value>): TokenRef<Value>;
 
 /**
  * Provides a class instance for a token via a class constructor.
@@ -739,7 +737,6 @@ declare function Injectable<VA, VB, VC, This extends VA & VB & VC & object>(toke
 declare function Injectable<VA, VB, VC, VD, This extends VA & VB & VC & VD & object>(tokenA: Token<VA>, tokenB: Token<VB>, tokenC: Token<VC>, tokenD: Token<VD>): ClassDecorator<This>;
 declare function Injectable<VA, VB, VC, VD, VE, This extends VA & VB & VC & VD & VE & object>(tokenA: Token<VA>, tokenB: Token<VB>, tokenC: Token<VC>, tokenD: Token<VD>, tokenE: Token<VE>): ClassDecorator<This>;
 declare function Injectable<VA, VB, VC, VD, VE, VF, This extends VA & VB & VC & VD & VE & VF & object>(tokenA: Token<VA>, tokenB: Token<VB>, tokenC: Token<VC>, tokenD: Token<VD>, tokenE: Token<VE>, tokenF: Token<VF>): ClassDecorator<This>;
-declare function Injectable<This extends object>(...tokens: Tokens<unknown>): ClassDecorator<This>;
 /**
  * Class decorator that registers additional aliasing tokens for the decorated type
  * when the type is first registered in the container.

package/dist/cjs/index.js

@@ -33,9 +33,8 @@ function throwResolutionError(tokenInfo, aliases, cause) {
 // @internal
 function throwParameterResolutionError(ctor, methodKey, dependency, cause) {
     const location = getLocation(ctor, methodKey);
-    const [token] = dependency.tokenRef.getRefTokens();
     const tokenName = getFullTokenName([
-        token,
+        dependency.tokenRef.getRefToken(),
         dependency.name
     ]);
     const msg = tag(`failed to resolve dependency for ${location}(parameter #${dependency.index}: ${tokenName})`);
@@ -227,13 +226,14 @@ function injectBy(thisArg, token, name) {
         getRefClass: ()=>Class()
     };
 }
-/**
- * Allows referencing one or multiple tokens declared later in the file by wrapping them
- * into a lazily evaluated function.
- *
- * @__NO_SIDE_EFFECTS__
- */ function tokenRef(token) {
+// @__NO_SIDE_EFFECTS__
+function tokenRef(token) {
     return {
+        getRefToken: ()=>{
+            const tokenOrTokens = token();
+            check(!Array.isArray(tokenOrTokens), "internal error: single token expected");
+            return tokenOrTokens;
+        },
         getRefTokens: ()=>{
             // Normalize the single token here so that we don't have to do it at every getRefTokens call site
             const tokenOrTokens = token();
@@ -250,7 +250,7 @@ function isClassRef(value) {
 }
 // @internal
 function isTokenRef(value) {
-    return value != null && typeof value === "object" && typeof value.getRefTokens === "function";
+    return value != null && typeof value === "object" && typeof value.getRefToken === "function";
 }
 
 // @internal
@@ -261,6 +261,10 @@ class Metadata {
             methods: new Map()
         };
         this.tokenRef = {
+            // prettier-ignore
+            getRefToken: ()=>{
+                check(false, "internal error: unexpected call");
+            },
             getRefTokens: ()=>new Set()
         };
         this.provider = {
@@ -1055,7 +1059,7 @@ function isDisposable(value) {
     }
     // Call context: decorator-based injection
     resolveDependency(dependency, instance) {
-        const [token] = dependency.tokenRef.getRefTokens();
+        const token = dependency.tokenRef.getRefToken();
         check(token, `token passed to @${dependency.appliedBy} was undefined (possible circular imports)`);
         const name = dependency.name;
         switch(dependency.appliedBy){
@@ -1163,10 +1167,11 @@ function Injectable(...args) {
         const metadata = getMetadata(Class);
         const arg0 = args[0];
         const ref = isTokenRef(arg0) ? arg0 : tokenRef(()=>args);
-        const existingTokensRef = metadata.tokenRef;
+        const currentRef = metadata.tokenRef;
         metadata.tokenRef = {
+            getRefToken: ()=>currentRef.getRefToken(),
             getRefTokens: ()=>{
-                const existingTokens = existingTokensRef.getRefTokens();
+                const existingTokens = currentRef.getRefTokens();
                 for (const token of ref.getRefTokens()){
                     existingTokens.add(token);
                 }