refactor: optimize resolve token

opensumi · Oct 13, 2023 · 1bdacde · 1bdacde
1 parent 5a80b41
commit 1bdacde
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/injector.ts b/src/injector.ts
@@ -316,7 +316,7 @@ export class Injector {
     for (const provider of providers) {
       const originToken = Helper.parseTokenFromProvider(provider);
       const token = Helper.hasTag(provider) ? this.exchangeToken(originToken, provider.tag) : originToken;
-      const current = opts.deep ? this.getCreator(token)[0] : this.creatorMap.get(token);
+      const current = opts.deep ? this.getCreator(token)[0] : this.resolveToken(token)[1];
 
       const shouldBeSet = [
         // use provider's override attribute.
@@ -333,7 +333,7 @@ export class Injector {
 
         this.creatorMap.set(token, creator);
         // use effect to Make sure there are no cycles
-        void this.getCreator(token);
+        void this.resolveToken(token);
 
         if (isClassCreator(creator)) {
           const domain = creator.opts.domain;
@@ -372,7 +372,7 @@ export class Injector {
     }
   }
 
-  private getCreator(token: Token): [InstanceCreator | null, Injector] {
+  private resolveToken(token: Token): [Token, InstanceCreator | undefined] {
     let creator = this.creatorMap.get(token);
 
     const paths = [token];
@@ -387,6 +387,12 @@ export class Injector {
       creator = this.creatorMap.get(token);
     }
 
+    return [token, creator];
+  }
+
+  private getCreator(token: Token): [InstanceCreator | null, Injector] {
+    const creator: InstanceCreator | undefined = this.resolveToken(token)[1];
+
     if (creator) {
       return [creator, this];
     }