assemblerjs 1.1.4 → 1.1.6

package/dist/index.d.ts

@@ -835,6 +835,7 @@ declare class Injectable<T> implements AbstractInjectable<T> {
 
 declare class InjectableManager {
     private injectables;
+    private resolvingStack;
     private privateContext;
     private publicContext;
     private singletonStrategy;

package/dist/index31.js

@@ -14,11 +14,16 @@ class InjectableManager {
         this.privateContext = e;
         this.publicContext = t;
     }
-    register(s, n = false) {
+    register(n, s = false) {
         const a = debugLogger.DebugLogger.getInstance();
-        const c = n === true ? use.resolveInstanceInjectionTuple(s) : inject.resolveInjectionTuple(s);
+        const c = s === true ? use.resolveInstanceInjectionTuple(n) : inject.resolveInjectionTuple(n);
         if (this.has(c.identifier)) {
-            throw new Error(`An assemblage is already registered with identifier '${c.identifier.name}'.`);
+            const e = `An assemblage is already registered with identifier '${c.identifier.name}'.`;
+            a.log('error', 'Duplicate registration', {
+                identifier: c.identifier.name,
+                error: e
+            });
+            throw new Error(e);
         }
         const l = injectable.Injectable.of(c, this.privateContext, this.publicContext);
         a.logRegistration(l);
@@ -33,19 +38,26 @@ class InjectableManager {
     }
     require(e, t, i) {
         if (!this.injectables.has(e)) {
-            const t = `Class with identifier '${e.name}' has not been registered or is a circular dependency.`;
-            debugLogger.DebugLogger.getInstance().log('error', 'Resolution failed', {
+            const t = this.resolvingStack.has(e);
+            const r = t ? 'Circular dependency detected' : 'Dependency not registered';
+            const n = t ? `Circular dependency detected: '${e.name}' is already being resolved.` : `Class with identifier '${e.name}' has not been registered.`;
+            debugLogger.DebugLogger.getInstance().log('error', r, {
                 identifier: e.name,
                 caller: i ? i?.name || String(i) : 'unknown',
-                error: t
+                error: n
             });
-            throw new Error(t);
+            throw new Error(n);
         }
         const r = this.injectables.get(e);
-        if (r.isSingleton) {
-            return this.singletonStrategy.resolve(r, t);
-        } else {
-            return this.transientStrategy.resolve(r, t);
+        this.resolvingStack.add(r.identifier);
+        try {
+            if (r.isSingleton) {
+                return this.singletonStrategy.resolve(r, t);
+            } else {
+                return this.transientStrategy.resolve(r, t);
+            }
+        } finally{
+            this.resolvingStack.delete(r.identifier);
         }
     }
     concrete(e) {
@@ -66,12 +78,14 @@ class InjectableManager {
         for (const [e, t] of this.injectables){
             t.dispose();
         }
+        this.resolvingStack.clear();
     }
     get size() {
         return this.injectables.size;
     }
     constructor(){
         this.injectables = new Map();
+        this.resolvingStack = new Set();
         this.singletonStrategy = new resolutionStrategies.SingletonStrategy();
         this.transientStrategy = new resolutionStrategies.TransientStrategy();
     }

package/dist/index31.mjs

@@ -10,11 +10,16 @@ class InjectableManager {
         this.privateContext = e;
         this.publicContext = t;
     }
-    register(s, n = false) {
+    register(n, s = false) {
         const a = DebugLogger.getInstance();
-        const c = n === true ? resolveInstanceInjectionTuple(s) : resolveInjectionTuple(s);
+        const c = s === true ? resolveInstanceInjectionTuple(n) : resolveInjectionTuple(n);
         if (this.has(c.identifier)) {
-            throw new Error(`An assemblage is already registered with identifier '${c.identifier.name}'.`);
+            const e = `An assemblage is already registered with identifier '${c.identifier.name}'.`;
+            a.log('error', 'Duplicate registration', {
+                identifier: c.identifier.name,
+                error: e
+            });
+            throw new Error(e);
         }
         const l = Injectable.of(c, this.privateContext, this.publicContext);
         a.logRegistration(l);
@@ -29,19 +34,26 @@ class InjectableManager {
     }
     require(e, t, i) {
         if (!this.injectables.has(e)) {
-            const t = `Class with identifier '${e.name}' has not been registered or is a circular dependency.`;
-            DebugLogger.getInstance().log('error', 'Resolution failed', {
+            const t = this.resolvingStack.has(e);
+            const r = t ? 'Circular dependency detected' : 'Dependency not registered';
+            const n = t ? `Circular dependency detected: '${e.name}' is already being resolved.` : `Class with identifier '${e.name}' has not been registered.`;
+            DebugLogger.getInstance().log('error', r, {
                 identifier: e.name,
                 caller: i ? i?.name || String(i) : 'unknown',
-                error: t
+                error: n
             });
-            throw new Error(t);
+            throw new Error(n);
         }
         const r = this.injectables.get(e);
-        if (r.isSingleton) {
-            return this.singletonStrategy.resolve(r, t);
-        } else {
-            return this.transientStrategy.resolve(r, t);
+        this.resolvingStack.add(r.identifier);
+        try {
+            if (r.isSingleton) {
+                return this.singletonStrategy.resolve(r, t);
+            } else {
+                return this.transientStrategy.resolve(r, t);
+            }
+        } finally{
+            this.resolvingStack.delete(r.identifier);
         }
     }
     concrete(e) {
@@ -62,12 +74,14 @@ class InjectableManager {
         for (const [e, t] of this.injectables){
             t.dispose();
         }
+        this.resolvingStack.clear();
     }
     get size() {
         return this.injectables.size;
     }
     constructor(){
         this.injectables = new Map();
+        this.resolvingStack = new Set();
         this.singletonStrategy = new SingletonStrategy();
         this.transientStrategy = new TransientStrategy();
     }

package/dist/index32.js

@@ -2,22 +2,34 @@
 
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
+const debugLogger = require('./index36.js');
+
 class ObjectManager {
-    use(e, t) {
-        if (this.has(e)) {
-            throw new Error(`A value is already registered with identifier '${String(e)}'.`);
+    use(t, r) {
+        if (this.has(t)) {
+            const r = `A value is already registered with identifier '${String(t)}'.`;
+            debugLogger.DebugLogger.getInstance().log('error', 'Duplicate object registration', {
+                identifier: String(t),
+                error: r
+            });
+            throw new Error(r);
         }
-        this.objects.set(e, t);
-        return t;
+        this.objects.set(t, r);
+        return r;
     }
     has(e) {
         return this.objects.has(e);
     }
-    require(e) {
-        if (!this.objects.has(e)) {
-            throw new Error(`Injected object with identifier '${String(e)}' has not been registered.`);
+    require(t) {
+        if (!this.objects.has(t)) {
+            const r = `Injected object with identifier '${String(t)}' has not been registered.`;
+            debugLogger.DebugLogger.getInstance().log('error', 'Object not found', {
+                identifier: String(t),
+                error: r
+            });
+            throw new Error(r);
         }
-        return this.objects.get(e);
+        return this.objects.get(t);
     }
     addGlobal(e, t) {
         if (this.globals.has(e)) {

package/dist/index32.mjs

@@ -1,19 +1,31 @@
+import { DebugLogger } from './index36.mjs';
+
 class ObjectManager {
-    use(e, t) {
-        if (this.has(e)) {
-            throw new Error(`A value is already registered with identifier '${String(e)}'.`);
+    use(t, r) {
+        if (this.has(t)) {
+            const r = `A value is already registered with identifier '${String(t)}'.`;
+            DebugLogger.getInstance().log('error', 'Duplicate object registration', {
+                identifier: String(t),
+                error: r
+            });
+            throw new Error(r);
         }
-        this.objects.set(e, t);
-        return t;
+        this.objects.set(t, r);
+        return r;
     }
     has(e) {
         return this.objects.has(e);
     }
-    require(e) {
-        if (!this.objects.has(e)) {
-            throw new Error(`Injected object with identifier '${String(e)}' has not been registered.`);
+    require(t) {
+        if (!this.objects.has(t)) {
+            const r = `Injected object with identifier '${String(t)}' has not been registered.`;
+            DebugLogger.getInstance().log('error', 'Object not found', {
+                identifier: String(t),
+                error: r
+            });
+            throw new Error(r);
         }
-        return this.objects.get(e);
+        return this.objects.get(t);
     }
     addGlobal(e, t) {
         if (this.globals.has(e)) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "assemblerjs",
   "description": "A general purpose Dependency Injection library for node and browser.",
-  "version": "1.1.4",
+  "version": "1.1.6",
   "author": "Benoît LAHOZ <info@benoitlahoz.io>",
   "bugs": "https://github.com/benoitlahoz/assemblerjs/issues",
   "homepage": "https://github.com/benoitlahoz/assemblerjs#README",