assemblerjs 1.1.6 → 1.1.7

package/dist/index31.js

@@ -5,18 +5,44 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 const hookManager = require('./index33.js');
 const resolutionStrategies = require('./index43.js');
 const debugLogger = require('./index36.js');
+const core = require('@assemblerjs/core');
 const use = require('./index42.js');
 const inject = require('./index41.js');
 const injectable = require('./index44.js');
 
+function c(e) {
+    if (e?.name) return e.name;
+    if (typeof e === 'string') return e;
+    if (typeof e === 'symbol') return e.toString();
+    if (typeof e === 'number') return String(e);
+    if (typeof e === 'boolean') return String(e);
+    if (typeof e === 'object' && e !== null) {
+        try {
+            const t = JSON.stringify(e);
+            if (t.length > 100) {
+                return t.substring(0, 100) + '...';
+            }
+            return t;
+        } catch  {
+            return `[${e.constructor?.name || 'Object'}]`;
+        }
+    }
+    return String(e);
+}
+function l(e) {
+    if (core.isClass(e)) return 'class';
+    if (typeof e === 'string') return 'string';
+    if (typeof e === 'symbol') return 'symbol';
+    return 'unknown';
+}
 class InjectableManager {
     setContexts(e, t) {
         this.privateContext = e;
         this.publicContext = t;
     }
-    register(n, s = false) {
+    register(i, s = false) {
         const a = debugLogger.DebugLogger.getInstance();
-        const c = s === true ? use.resolveInstanceInjectionTuple(n) : inject.resolveInjectionTuple(n);
+        const c = s === true ? use.resolveInstanceInjectionTuple(i) : inject.resolveInjectionTuple(i);
         if (this.has(c.identifier)) {
             const e = `An assemblage is already registered with identifier '${c.identifier.name}'.`;
             a.log('error', 'Duplicate registration', {
@@ -36,28 +62,31 @@ class InjectableManager {
     has(e) {
         return this.injectables.has(e);
     }
-    require(e, t, i) {
+    require(e, t, r) {
         if (!this.injectables.has(e)) {
             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: n
+            const n = t ? 'Circular dependency detected' : 'Dependency not registered';
+            const i = c(e);
+            const s = l(e);
+            const a = t ? `Circular dependency detected: '${i}' is already being resolved.` : `Dependency '${i}' has not been registered (Class/Service not found in current assemblies).`;
+            debugLogger.DebugLogger.getInstance().log('error', n, {
+                identifier: i,
+                caller: r ? c(r) : 'unknown',
+                type: s,
+                error: a
             });
-            throw new Error(n);
+            throw new Error(a);
         }
-        const r = this.injectables.get(e);
-        this.resolvingStack.add(r.identifier);
+        const n = this.injectables.get(e);
+        this.resolvingStack.add(n.identifier);
         try {
-            if (r.isSingleton) {
-                return this.singletonStrategy.resolve(r, t);
+            if (n.isSingleton) {
+                return this.singletonStrategy.resolve(n, t);
             } else {
-                return this.transientStrategy.resolve(r, t);
+                return this.transientStrategy.resolve(n, t);
             }
         } finally{
-            this.resolvingStack.delete(r.identifier);
+            this.resolvingStack.delete(n.identifier);
         }
     }
     concrete(e) {
@@ -67,9 +96,9 @@ class InjectableManager {
     }
     tagged(...e) {
         const t = [];
-        for (const i of e){
-            for (const [e, r] of this.injectables){
-                if (r.tags.includes(i)) t.push(r.build());
+        for (const r of e){
+            for (const [e, n] of this.injectables){
+                if (n.tags.includes(r)) t.push(n.build());
             }
         }
         return t;

package/dist/index31.mjs

@@ -1,18 +1,44 @@
 import { HookManager } from './index33.mjs';
 import { SingletonStrategy, TransientStrategy } from './index43.mjs';
 import { DebugLogger } from './index36.mjs';
+import { isClass } from '@assemblerjs/core';
 import { resolveInstanceInjectionTuple } from './index42.mjs';
 import { resolveInjectionTuple } from './index41.mjs';
 import { Injectable } from './index44.mjs';
 
+function c(e) {
+    if (e?.name) return e.name;
+    if (typeof e === 'string') return e;
+    if (typeof e === 'symbol') return e.toString();
+    if (typeof e === 'number') return String(e);
+    if (typeof e === 'boolean') return String(e);
+    if (typeof e === 'object' && e !== null) {
+        try {
+            const t = JSON.stringify(e);
+            if (t.length > 100) {
+                return t.substring(0, 100) + '...';
+            }
+            return t;
+        } catch  {
+            return `[${e.constructor?.name || 'Object'}]`;
+        }
+    }
+    return String(e);
+}
+function l(e) {
+    if (isClass(e)) return 'class';
+    if (typeof e === 'string') return 'string';
+    if (typeof e === 'symbol') return 'symbol';
+    return 'unknown';
+}
 class InjectableManager {
     setContexts(e, t) {
         this.privateContext = e;
         this.publicContext = t;
     }
-    register(n, s = false) {
+    register(i, s = false) {
         const a = DebugLogger.getInstance();
-        const c = s === true ? resolveInstanceInjectionTuple(n) : resolveInjectionTuple(n);
+        const c = s === true ? resolveInstanceInjectionTuple(i) : resolveInjectionTuple(i);
         if (this.has(c.identifier)) {
             const e = `An assemblage is already registered with identifier '${c.identifier.name}'.`;
             a.log('error', 'Duplicate registration', {
@@ -32,28 +58,31 @@ class InjectableManager {
     has(e) {
         return this.injectables.has(e);
     }
-    require(e, t, i) {
+    require(e, t, r) {
         if (!this.injectables.has(e)) {
             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: n
+            const n = t ? 'Circular dependency detected' : 'Dependency not registered';
+            const i = c(e);
+            const s = l(e);
+            const a = t ? `Circular dependency detected: '${i}' is already being resolved.` : `Dependency '${i}' has not been registered (Class/Service not found in current assemblies).`;
+            DebugLogger.getInstance().log('error', n, {
+                identifier: i,
+                caller: r ? c(r) : 'unknown',
+                type: s,
+                error: a
             });
-            throw new Error(n);
+            throw new Error(a);
         }
-        const r = this.injectables.get(e);
-        this.resolvingStack.add(r.identifier);
+        const n = this.injectables.get(e);
+        this.resolvingStack.add(n.identifier);
         try {
-            if (r.isSingleton) {
-                return this.singletonStrategy.resolve(r, t);
+            if (n.isSingleton) {
+                return this.singletonStrategy.resolve(n, t);
             } else {
-                return this.transientStrategy.resolve(r, t);
+                return this.transientStrategy.resolve(n, t);
             }
         } finally{
-            this.resolvingStack.delete(r.identifier);
+            this.resolvingStack.delete(n.identifier);
         }
     }
     concrete(e) {
@@ -63,9 +92,9 @@ class InjectableManager {
     }
     tagged(...e) {
         const t = [];
-        for (const i of e){
-            for (const [e, r] of this.injectables){
-                if (r.tags.includes(i)) t.push(r.build());
+        for (const r of e){
+            for (const [e, n] of this.injectables){
+                if (n.tags.includes(r)) t.push(n.build());
             }
         }
         return t;

package/dist/index32.js

@@ -4,32 +4,39 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const debugLogger = require('./index36.js');
 
+function t(e) {
+    return typeof e === 'symbol' ? 'symbol' : 'string';
+}
 class ObjectManager {
-    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
+    use(r, o) {
+        if (this.has(r)) {
+            const o = typeof r === 'symbol' ? r.toString() : String(r);
+            const s = `Object/value '${o}' is already registered (cannot register twice).`;
+            debugLogger.DebugLogger.getInstance().log('error', 'Duplicate object/value registration', {
+                identifier: o,
+                type: t(r),
+                error: s
             });
-            throw new Error(r);
+            throw new Error(s);
         }
-        this.objects.set(t, r);
-        return r;
+        this.objects.set(r, o);
+        return o;
     }
     has(e) {
         return this.objects.has(e);
     }
-    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
+    require(r) {
+        if (!this.objects.has(r)) {
+            const o = typeof r === 'symbol' ? r.toString() : String(r);
+            const s = `Object/value '${o}' has not been registered in the object store.`;
+            debugLogger.DebugLogger.getInstance().log('error', 'Object/value not found', {
+                identifier: o,
+                type: t(r),
+                error: s
             });
-            throw new Error(r);
+            throw new Error(s);
         }
-        return this.objects.get(t);
+        return this.objects.get(r);
     }
     addGlobal(e, t) {
         if (this.globals.has(e)) {

package/dist/index32.mjs

@@ -1,31 +1,38 @@
 import { DebugLogger } from './index36.mjs';
 
+function t(e) {
+    return typeof e === 'symbol' ? 'symbol' : 'string';
+}
 class ObjectManager {
-    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
+    use(r, o) {
+        if (this.has(r)) {
+            const o = typeof r === 'symbol' ? r.toString() : String(r);
+            const s = `Object/value '${o}' is already registered (cannot register twice).`;
+            DebugLogger.getInstance().log('error', 'Duplicate object/value registration', {
+                identifier: o,
+                type: t(r),
+                error: s
             });
-            throw new Error(r);
+            throw new Error(s);
         }
-        this.objects.set(t, r);
-        return r;
+        this.objects.set(r, o);
+        return o;
     }
     has(e) {
         return this.objects.has(e);
     }
-    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
+    require(r) {
+        if (!this.objects.has(r)) {
+            const o = typeof r === 'symbol' ? r.toString() : String(r);
+            const s = `Object/value '${o}' has not been registered in the object store.`;
+            DebugLogger.getInstance().log('error', 'Object/value not found', {
+                identifier: o,
+                type: t(r),
+                error: s
             });
-            throw new Error(r);
+            throw new Error(s);
         }
-        return this.objects.get(t);
+        return this.objects.get(r);
     }
     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.6",
+  "version": "1.1.7",
   "author": "Benoît LAHOZ <info@benoitlahoz.io>",
   "bugs": "https://github.com/benoitlahoz/assemblerjs/issues",
   "homepage": "https://github.com/benoitlahoz/assemblerjs#README",