closes #2

zheksoon · Apr 12, 2024 · 3bb326b · 3bb326b
1 parent 8dac7bc
commit 3bb326b
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 30 deletions.
diff --git a/src/container.ts b/src/container.ts
@@ -83,48 +83,48 @@ export class Container {
   ): InstanceOf<T> {
     this.resolutionContainer = resolutionContainer || new Container();
 
-    let cls = clsOrToken as TokenOrClass;
+    try {
+      if (this.resolutionSet.has(clsOrToken)) {
+        throw new DependencyCycleError();
+      }
 
-    let scope: ScopeHandler;
+      let cls = clsOrToken as TokenOrClass;
 
-    let container: Container = this;
+      let scope: ScopeHandler;
 
-    const descriptor = this.getTokenDescriptor(clsOrToken);
+      let container: Container = this;
 
-    if (!descriptor) {
-      if (clsOrToken instanceof Token) {
-        throw new TokenNotRegisteredError();
-      }
+      const descriptor = this.getTokenDescriptor(clsOrToken);
 
-      cls = clsOrToken;
+      this.resolutionSet.add(clsOrToken);
 
-      scope = cls.scope || Scopes.Transient();
+      if (!descriptor) {
+        if (clsOrToken instanceof Token) {
+          throw new TokenNotRegisteredError();
+        }
 
-      container = this;
-    } else {
-      if ("class" in descriptor) {
-        cls = descriptor.class as ScopedClass;
+        cls = clsOrToken;
 
-        scope = descriptor.scope || cls.scope || Scopes.Transient();
+        scope = cls.scope || Scopes.Transient();
 
-        container = descriptor.container;
-      } else if ("value" in descriptor) {
-        return descriptor.value;
-      } else if ("factory" in descriptor) {
-        // @ts-ignore
-        return descriptor.factory(container, ...args);
+        container = this;
       } else {
-        throw new Error("Invalid descriptor");
-      }
-    }
-
-    try {
-      if (this.resolutionSet.has(clsOrToken)) {
-        throw new DependencyCycleError();
+        if ("class" in descriptor) {
+          cls = descriptor.class as ScopedClass;
+
+          scope = descriptor.scope || cls.scope || Scopes.Transient();
+
+          container = descriptor.container;
+        } else if ("value" in descriptor) {
+          return descriptor.value;
+        } else if ("factory" in descriptor) {
+          // @ts-ignore
+          return descriptor.factory(container, ...args);
+        } else {
+          throw new Error("Invalid descriptor");
+        }
       }
 
-      this.resolutionSet.add(clsOrToken);
-
       return scope(cls, args, container, this.resolutionContainer);
     } finally {
       this.resolutionSet.delete(clsOrToken);

diff --git a/test/dioma.test.ts b/test/dioma.test.ts
@@ -1521,6 +1521,19 @@ describe("Dioma", () => {
 
           expect(value).toBeInstanceOf(TokenClass);
         });
+
+        it("should throw error when there is a circular dependency", () => {
+          const token = new Token<string>();
+
+          container.register({
+            token,
+            factory: (container, value: string) => container.inject(token),
+          });
+
+          expect(() => container.inject(token, "test")).toThrowError(
+            DependencyCycleError
+          );
+        });
       });
     });
   });