assemblerjs 1.1.7 → 1.1.8

package/dist/index31.js

@@ -3,20 +3,31 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const hookManager = require('./index33.js');
-const resolutionStrategies = require('./index43.js');
+const resolutionStrategies = require('./index41.js');
 const debugLogger = require('./index36.js');
 const core = require('@assemblerjs/core');
 const use = require('./index42.js');
-const inject = require('./index41.js');
+const inject = require('./index43.js');
 const injectable = require('./index44.js');
 
-function c(e) {
-    if (e?.name) return e.name;
+function a(e) {
+    if (e === undefined) return 'undefined';
+    if (e === null) return 'null';
+    if (typeof e === 'function') {
+        if (e.name) return e.name;
+        if (e.constructor?.name && e.constructor.name !== 'Function') {
+            return e.constructor.name;
+        }
+        return 'AnonymousFunction';
+    }
     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) {
+    if (typeof e === 'object') {
+        if (e.name && typeof e.name === 'string') {
+            return e.name;
+        }
         try {
             const t = JSON.stringify(e);
             if (t.length > 100) {
@@ -24,15 +35,24 @@ function c(e) {
             }
             return t;
         } catch  {
-            return `[${e.constructor?.name || 'Object'}]`;
+            const t = e.constructor?.name;
+            if (t && t !== 'Object') {
+                return `[${t}]`;
+            }
+            return '[UnknownObject]';
         }
     }
     return String(e);
 }
-function l(e) {
-    if (core.isClass(e)) return 'class';
+function f(e) {
+    if (core.isClass(e)) {
+        const t = e.prototype && Object.getOwnPropertyNames(e.prototype).length > 1;
+        return t ? 'class' : 'class';
+    }
+    if (typeof e === 'function') return 'function';
     if (typeof e === 'string') return 'string';
     if (typeof e === 'symbol') return 'symbol';
+    if (typeof e === 'object' && e !== null) return 'object';
     return 'unknown';
 }
 class InjectableManager {
@@ -40,53 +60,53 @@ class InjectableManager {
         this.privateContext = e;
         this.publicContext = t;
     }
-    register(i, s = false) {
-        const a = debugLogger.DebugLogger.getInstance();
-        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', {
-                identifier: c.identifier.name,
+    register(i, o = false) {
+        const c = debugLogger.DebugLogger.getInstance();
+        const a = o === true ? use.resolveInstanceInjectionTuple(i) : inject.resolveInjectionTuple(i);
+        if (this.has(a.identifier)) {
+            const e = `An assemblage is already registered with identifier '${a.identifier.name}'.`;
+            c.log('error', 'Duplicate registration', {
+                identifier: a.identifier.name,
                 error: e
             });
             throw new Error(e);
         }
-        const l = injectable.Injectable.of(c, this.privateContext, this.publicContext);
-        a.logRegistration(l);
-        this.injectables.set(l.identifier, l);
-        if (l.concrete) {
-            hookManager.HookManager.callHook(l.concrete, 'onRegister', this.publicContext, l.configuration);
+        const f = injectable.Injectable.of(a, this.privateContext, this.publicContext);
+        c.logRegistration(f);
+        this.injectables.set(f.identifier, f);
+        if (f.concrete) {
+            hookManager.HookManager.callHook(f.concrete, 'onRegister', this.publicContext, f.configuration);
         }
-        return l;
+        return f;
     }
     has(e) {
         return this.injectables.has(e);
     }
-    require(e, t, r) {
+    require(e, t, n) {
         if (!this.injectables.has(e)) {
             const t = this.resolvingStack.has(e);
-            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, {
+            const r = t ? 'Circular dependency detected' : 'Dependency not registered';
+            const i = a(e);
+            const o = f(e);
+            const c = 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', r, {
                 identifier: i,
-                caller: r ? c(r) : 'unknown',
-                type: s,
-                error: a
+                caller: n ? a(n) : 'unknown',
+                type: o,
+                error: c
             });
-            throw new Error(a);
+            throw new Error(c);
         }
-        const n = this.injectables.get(e);
-        this.resolvingStack.add(n.identifier);
+        const r = this.injectables.get(e);
+        this.resolvingStack.add(r.identifier);
         try {
-            if (n.isSingleton) {
-                return this.singletonStrategy.resolve(n, t);
+            if (r.isSingleton) {
+                return this.singletonStrategy.resolve(r, t);
             } else {
-                return this.transientStrategy.resolve(n, t);
+                return this.transientStrategy.resolve(r, t);
             }
         } finally{
-            this.resolvingStack.delete(n.identifier);
+            this.resolvingStack.delete(r.identifier);
         }
     }
     concrete(e) {
@@ -96,9 +116,9 @@ class InjectableManager {
     }
     tagged(...e) {
         const t = [];
-        for (const r of e){
-            for (const [e, n] of this.injectables){
-                if (n.tags.includes(r)) t.push(n.build());
+        for (const n of e){
+            for (const [e, r] of this.injectables){
+                if (r.tags.includes(n)) t.push(r.build());
             }
         }
         return t;

package/dist/index31.mjs

@@ -1,18 +1,29 @@
 import { HookManager } from './index33.mjs';
-import { SingletonStrategy, TransientStrategy } from './index43.mjs';
+import { SingletonStrategy, TransientStrategy } from './index41.mjs';
 import { DebugLogger } from './index36.mjs';
 import { isClass } from '@assemblerjs/core';
 import { resolveInstanceInjectionTuple } from './index42.mjs';
-import { resolveInjectionTuple } from './index41.mjs';
+import { resolveInjectionTuple } from './index43.mjs';
 import { Injectable } from './index44.mjs';
 
-function c(e) {
-    if (e?.name) return e.name;
+function a(e) {
+    if (e === undefined) return 'undefined';
+    if (e === null) return 'null';
+    if (typeof e === 'function') {
+        if (e.name) return e.name;
+        if (e.constructor?.name && e.constructor.name !== 'Function') {
+            return e.constructor.name;
+        }
+        return 'AnonymousFunction';
+    }
     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) {
+    if (typeof e === 'object') {
+        if (e.name && typeof e.name === 'string') {
+            return e.name;
+        }
         try {
             const t = JSON.stringify(e);
             if (t.length > 100) {
@@ -20,15 +31,24 @@ function c(e) {
             }
             return t;
         } catch  {
-            return `[${e.constructor?.name || 'Object'}]`;
+            const t = e.constructor?.name;
+            if (t && t !== 'Object') {
+                return `[${t}]`;
+            }
+            return '[UnknownObject]';
         }
     }
     return String(e);
 }
-function l(e) {
-    if (isClass(e)) return 'class';
+function f(e) {
+    if (isClass(e)) {
+        const t = e.prototype && Object.getOwnPropertyNames(e.prototype).length > 1;
+        return t ? 'class' : 'class';
+    }
+    if (typeof e === 'function') return 'function';
     if (typeof e === 'string') return 'string';
     if (typeof e === 'symbol') return 'symbol';
+    if (typeof e === 'object' && e !== null) return 'object';
     return 'unknown';
 }
 class InjectableManager {
@@ -36,53 +56,53 @@ class InjectableManager {
         this.privateContext = e;
         this.publicContext = t;
     }
-    register(i, s = false) {
-        const a = DebugLogger.getInstance();
-        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', {
-                identifier: c.identifier.name,
+    register(i, o = false) {
+        const c = DebugLogger.getInstance();
+        const a = o === true ? resolveInstanceInjectionTuple(i) : resolveInjectionTuple(i);
+        if (this.has(a.identifier)) {
+            const e = `An assemblage is already registered with identifier '${a.identifier.name}'.`;
+            c.log('error', 'Duplicate registration', {
+                identifier: a.identifier.name,
                 error: e
             });
             throw new Error(e);
         }
-        const l = Injectable.of(c, this.privateContext, this.publicContext);
-        a.logRegistration(l);
-        this.injectables.set(l.identifier, l);
-        if (l.concrete) {
-            HookManager.callHook(l.concrete, 'onRegister', this.publicContext, l.configuration);
+        const f = Injectable.of(a, this.privateContext, this.publicContext);
+        c.logRegistration(f);
+        this.injectables.set(f.identifier, f);
+        if (f.concrete) {
+            HookManager.callHook(f.concrete, 'onRegister', this.publicContext, f.configuration);
         }
-        return l;
+        return f;
     }
     has(e) {
         return this.injectables.has(e);
     }
-    require(e, t, r) {
+    require(e, t, n) {
         if (!this.injectables.has(e)) {
             const t = this.resolvingStack.has(e);
-            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, {
+            const r = t ? 'Circular dependency detected' : 'Dependency not registered';
+            const i = a(e);
+            const o = f(e);
+            const c = 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', r, {
                 identifier: i,
-                caller: r ? c(r) : 'unknown',
-                type: s,
-                error: a
+                caller: n ? a(n) : 'unknown',
+                type: o,
+                error: c
             });
-            throw new Error(a);
+            throw new Error(c);
         }
-        const n = this.injectables.get(e);
-        this.resolvingStack.add(n.identifier);
+        const r = this.injectables.get(e);
+        this.resolvingStack.add(r.identifier);
         try {
-            if (n.isSingleton) {
-                return this.singletonStrategy.resolve(n, t);
+            if (r.isSingleton) {
+                return this.singletonStrategy.resolve(r, t);
             } else {
-                return this.transientStrategy.resolve(n, t);
+                return this.transientStrategy.resolve(r, t);
             }
         } finally{
-            this.resolvingStack.delete(n.identifier);
+            this.resolvingStack.delete(r.identifier);
         }
     }
     concrete(e) {
@@ -92,9 +112,9 @@ class InjectableManager {
     }
     tagged(...e) {
         const t = [];
-        for (const r of e){
-            for (const [e, n] of this.injectables){
-                if (n.tags.includes(r)) t.push(n.build());
+        for (const n of e){
+            for (const [e, r] of this.injectables){
+                if (r.tags.includes(n)) t.push(r.build());
             }
         }
         return t;

package/dist/index41.js

@@ -2,53 +2,33 @@
 
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
-const core = require('@assemblerjs/core');
+class SingletonStrategy {
+    resolve(t, e) {
+        const n = t.identifier;
+        if (this.cache.has(n)) {
+            return this.cache.get(n);
+        }
+        const o = t.build(e);
+        const r = e ? {
+            ...t.configuration,
+            ...e
+        } : t.configuration;
+        t.setSingletonInstance(o, r);
+        this.cache.set(n, o);
+        t.privateContext.prepareInitHook(o, t.configuration);
+        return o;
+    }
+    constructor(){
+        this.cache = new Map();
+    }
+}
+class TransientStrategy {
+    resolve(t, e) {
+        const n = t.build(e);
+        t.privateContext.prepareInitHook(n, t.configuration);
+        return n;
+    }
+}
 
-const i = (e)=>{
-    return {
-        identifier: e[0],
-        concrete: e[0],
-        configuration: {}
-    };
-};
-const c = (o)=>{
-    const i = ()=>core.isClass(o[0]) && core.isClass(o[1]);
-    const c = ()=>core.isClass(o[0]) && core.isObject(o[1]);
-    const s = ()=>core.pipe(core.conditionally({
-            if: ()=>i(),
-            then: ()=>{
-                return {
-                    identifier: o[0],
-                    concrete: o[1],
-                    configuration: {}
-                };
-            }
-        }), core.conditionally({
-            if: ()=>c(),
-            then: ()=>{
-                return {
-                    identifier: o[0],
-                    concrete: o[0],
-                    configuration: o[1]
-                };
-            },
-            else: (e)=>e
-        }))();
-    return s();
-};
-const s = (e)=>{
-    return {
-        identifier: e[0],
-        concrete: e[1],
-        configuration: e[2]
-    };
-};
-const resolveInjectionTuple = (e)=>core.switchCase({
-        1: ()=>i(e),
-        2: ()=>c(e),
-        3: ()=>s(e)
-    }, ()=>{
-        throw new Error(`Injection tuple must be of length 1, 2 or 3.`);
-    })(e.length);
-
-exports.resolveInjectionTuple = resolveInjectionTuple;
+exports.SingletonStrategy = SingletonStrategy;
+exports.TransientStrategy = TransientStrategy;

package/dist/index41.mjs

@@ -1,50 +1,29 @@
-import { switchCase, pipe, conditionally, isClass, isObject } from '@assemblerjs/core';
+class SingletonStrategy {
+    resolve(t, e) {
+        const n = t.identifier;
+        if (this.cache.has(n)) {
+            return this.cache.get(n);
+        }
+        const o = t.build(e);
+        const r = e ? {
+            ...t.configuration,
+            ...e
+        } : t.configuration;
+        t.setSingletonInstance(o, r);
+        this.cache.set(n, o);
+        t.privateContext.prepareInitHook(o, t.configuration);
+        return o;
+    }
+    constructor(){
+        this.cache = new Map();
+    }
+}
+class TransientStrategy {
+    resolve(t, e) {
+        const n = t.build(e);
+        t.privateContext.prepareInitHook(n, t.configuration);
+        return n;
+    }
+}
 
-const i = (e)=>{
-    return {
-        identifier: e[0],
-        concrete: e[0],
-        configuration: {}
-    };
-};
-const c = (o)=>{
-    const i = ()=>isClass(o[0]) && isClass(o[1]);
-    const c = ()=>isClass(o[0]) && isObject(o[1]);
-    const s = ()=>pipe(conditionally({
-            if: ()=>i(),
-            then: ()=>{
-                return {
-                    identifier: o[0],
-                    concrete: o[1],
-                    configuration: {}
-                };
-            }
-        }), conditionally({
-            if: ()=>c(),
-            then: ()=>{
-                return {
-                    identifier: o[0],
-                    concrete: o[0],
-                    configuration: o[1]
-                };
-            },
-            else: (e)=>e
-        }))();
-    return s();
-};
-const s = (e)=>{
-    return {
-        identifier: e[0],
-        concrete: e[1],
-        configuration: e[2]
-    };
-};
-const resolveInjectionTuple = (e)=>switchCase({
-        1: ()=>i(e),
-        2: ()=>c(e),
-        3: ()=>s(e)
-    }, ()=>{
-        throw new Error(`Injection tuple must be of length 1, 2 or 3.`);
-    })(e.length);
-
-export { resolveInjectionTuple };
+export { SingletonStrategy, TransientStrategy };

package/dist/index43.js

@@ -2,33 +2,53 @@
 
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
-class SingletonStrategy {
-    resolve(t, e) {
-        const n = t.identifier;
-        if (this.cache.has(n)) {
-            return this.cache.get(n);
-        }
-        const o = t.build(e);
-        const r = e ? {
-            ...t.configuration,
-            ...e
-        } : t.configuration;
-        t.setSingletonInstance(o, r);
-        this.cache.set(n, o);
-        t.privateContext.prepareInitHook(o, t.configuration);
-        return o;
-    }
-    constructor(){
-        this.cache = new Map();
-    }
-}
-class TransientStrategy {
-    resolve(t, e) {
-        const n = t.build(e);
-        t.privateContext.prepareInitHook(n, t.configuration);
-        return n;
-    }
-}
+const core = require('@assemblerjs/core');
 
-exports.SingletonStrategy = SingletonStrategy;
-exports.TransientStrategy = TransientStrategy;
+const i = (e)=>{
+    return {
+        identifier: e[0],
+        concrete: e[0],
+        configuration: {}
+    };
+};
+const c = (o)=>{
+    const i = ()=>core.isClass(o[0]) && core.isClass(o[1]);
+    const c = ()=>core.isClass(o[0]) && core.isObject(o[1]);
+    const s = ()=>core.pipe(core.conditionally({
+            if: ()=>i(),
+            then: ()=>{
+                return {
+                    identifier: o[0],
+                    concrete: o[1],
+                    configuration: {}
+                };
+            }
+        }), core.conditionally({
+            if: ()=>c(),
+            then: ()=>{
+                return {
+                    identifier: o[0],
+                    concrete: o[0],
+                    configuration: o[1]
+                };
+            },
+            else: (e)=>e
+        }))();
+    return s();
+};
+const s = (e)=>{
+    return {
+        identifier: e[0],
+        concrete: e[1],
+        configuration: e[2]
+    };
+};
+const resolveInjectionTuple = (e)=>core.switchCase({
+        1: ()=>i(e),
+        2: ()=>c(e),
+        3: ()=>s(e)
+    }, ()=>{
+        throw new Error(`Injection tuple must be of length 1, 2 or 3.`);
+    })(e.length);
+
+exports.resolveInjectionTuple = resolveInjectionTuple;

package/dist/index43.mjs

@@ -1,29 +1,50 @@
-class SingletonStrategy {
-    resolve(t, e) {
-        const n = t.identifier;
-        if (this.cache.has(n)) {
-            return this.cache.get(n);
-        }
-        const o = t.build(e);
-        const r = e ? {
-            ...t.configuration,
-            ...e
-        } : t.configuration;
-        t.setSingletonInstance(o, r);
-        this.cache.set(n, o);
-        t.privateContext.prepareInitHook(o, t.configuration);
-        return o;
-    }
-    constructor(){
-        this.cache = new Map();
-    }
-}
-class TransientStrategy {
-    resolve(t, e) {
-        const n = t.build(e);
-        t.privateContext.prepareInitHook(n, t.configuration);
-        return n;
-    }
-}
+import { switchCase, pipe, conditionally, isClass, isObject } from '@assemblerjs/core';
 
-export { SingletonStrategy, TransientStrategy };
+const i = (e)=>{
+    return {
+        identifier: e[0],
+        concrete: e[0],
+        configuration: {}
+    };
+};
+const c = (o)=>{
+    const i = ()=>isClass(o[0]) && isClass(o[1]);
+    const c = ()=>isClass(o[0]) && isObject(o[1]);
+    const s = ()=>pipe(conditionally({
+            if: ()=>i(),
+            then: ()=>{
+                return {
+                    identifier: o[0],
+                    concrete: o[1],
+                    configuration: {}
+                };
+            }
+        }), conditionally({
+            if: ()=>c(),
+            then: ()=>{
+                return {
+                    identifier: o[0],
+                    concrete: o[0],
+                    configuration: o[1]
+                };
+            },
+            else: (e)=>e
+        }))();
+    return s();
+};
+const s = (e)=>{
+    return {
+        identifier: e[0],
+        concrete: e[1],
+        configuration: e[2]
+    };
+};
+const resolveInjectionTuple = (e)=>switchCase({
+        1: ()=>i(e),
+        2: ()=>c(e),
+        3: ()=>s(e)
+    }, ()=>{
+        throw new Error(`Injection tuple must be of length 1, 2 or 3.`);
+    })(e.length);
+
+export { resolveInjectionTuple };

package/package.json

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