assemblerjs 1.1.3 → 1.1.4

package/dist/index.d.ts

@@ -56,7 +56,7 @@ export declare abstract class AbstractAssembler extends AbstractEventManager imp
     abstract prepareInitHook<T = AbstractAssemblage>(instance: T, configuration?: Record<string, any>): unknown[];
     abstract addGlobal(key: string, value: any): void;
     abstract has<T>(identifier: Identifier<T>): boolean;
-    abstract require<T>(identifier: Identifier<T> | string | symbol, configuration?: Record<string, any>): T;
+    abstract require<T>(identifier: Identifier<T> | string | symbol, configuration?: Record<string, any>, caller?: Identifier<any>): T;
     abstract concrete<T>(identifier: Identifier<T>): Concrete<T> | undefined;
     abstract tagged(...tags: string[]): any[];
     abstract global(key: string): any | undefined;
@@ -345,7 +345,7 @@ export declare class Assembler extends EventManager implements AbstractAssembler
     use<T>(identifier: string | symbol, object: T): T;
     prepareInitHook<T = AbstractAssemblage>(instance: T, configuration?: Record<string, any>): unknown[];
     has<T>(identifier: Identifier<T> | string | symbol): boolean;
-    require<T>(identifier: Identifier<T> | string | symbol, configuration?: Record<string, any>): T;
+    require<T>(identifier: Identifier<T> | string | symbol, configuration?: Record<string, any>, caller?: Identifier<any>): T;
     concrete<T>(identifier: Identifier<T>): Concrete<T> | undefined;
     tagged(...tags: string[]): unknown[];
     addGlobal(key: string, value: any): void;
@@ -842,7 +842,7 @@ declare class InjectableManager {
     setContexts(privateContext: AssemblerPrivateContext, publicContext: AssemblerContext): void;
     register<T>(injection: Injection<T>, instance?: boolean): Injectable<T>;
     has<T>(identifier: Identifier<T>): boolean;
-    require<T>(identifier: Identifier<T>, configuration?: Record<string, any>): T;
+    require<T>(identifier: Identifier<T>, configuration?: Record<string, any>, caller?: Identifier<any>): T;
     concrete<T>(identifier: Identifier<T>): any | undefined;
     tagged(...tags: string[]): unknown[];
     dispose(): void;

package/dist/index18.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const parameterDecoratorFactory = require('./index17.js');
-const resolverStore = require('./index32.js');
+const resolverStore = require('./index38.js');
 
 let ContextResolver = class ContextResolver {
     resolve(e, r, t) {

package/dist/index18.mjs

@@ -1,5 +1,5 @@
 import { ParameterDecoratorFactory } from './index17.mjs';
-import { ResolverStore } from './index32.mjs';
+import { ResolverStore } from './index38.mjs';
 
 let ContextResolver = class ContextResolver {
     resolve(e, r, t) {

package/dist/index19.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const parameterDecoratorFactory = require('./index17.js');
-const resolverStore = require('./index32.js');
+const resolverStore = require('./index38.js');
 
 let ConfigurationResolver = class ConfigurationResolver {
     resolve(r, o, e, n) {

package/dist/index19.mjs

@@ -1,5 +1,5 @@
 import { ParameterDecoratorFactory } from './index17.mjs';
-import { ResolverStore } from './index32.mjs';
+import { ResolverStore } from './index38.mjs';
 
 let ConfigurationResolver = class ConfigurationResolver {
     resolve(r, o, e, n) {

package/dist/index20.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const parameterDecoratorFactory = require('./index17.js');
-const resolverStore = require('./index32.js');
+const resolverStore = require('./index38.js');
 
 let DefinitionResolver = class DefinitionResolver {
     resolve(e, r) {

package/dist/index20.mjs

@@ -1,5 +1,5 @@
 import { ParameterDecoratorFactory } from './index17.mjs';
-import { ResolverStore } from './index32.mjs';
+import { ResolverStore } from './index38.mjs';
 
 let DefinitionResolver = class DefinitionResolver {
     resolve(e, r) {

package/dist/index21.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const parameterDecoratorFactory = require('./index17.js');
-const resolverStore = require('./index32.js');
+const resolverStore = require('./index38.js');
 
 let DisposeResolver = class DisposeResolver {
     resolve(e, r, s) {

package/dist/index21.mjs

@@ -1,5 +1,5 @@
 import { ParameterDecoratorFactory } from './index17.mjs';
-import { ResolverStore } from './index32.mjs';
+import { ResolverStore } from './index38.mjs';
 
 let DisposeResolver = class DisposeResolver {
     resolve(e, r, s) {

package/dist/index22.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 const reflection = require('./index29.js');
 const parameterDecoratorFactory = require('./index17.js');
 const helpers = require('./index25.js');
-const resolverStore = require('./index32.js');
+const resolverStore = require('./index38.js');
 
 let UseResolver = class UseResolver {
     resolve(r, o, t) {

package/dist/index22.mjs

@@ -1,7 +1,7 @@
 import { getOwnCustomMetadata } from './index29.mjs';
 import { ParameterDecoratorFactory } from './index17.mjs';
 import { getParamValueKey } from './index25.mjs';
-import { ResolverStore } from './index32.mjs';
+import { ResolverStore } from './index38.mjs';
 
 let UseResolver = class UseResolver {
     resolve(r, o, t) {

package/dist/index23.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 const reflection = require('./index29.js');
 const parameterDecoratorFactory = require('./index17.js');
 const helpers = require('./index25.js');
-const resolverStore = require('./index32.js');
+const resolverStore = require('./index38.js');
 
 let GlobalResolver = class GlobalResolver {
     resolve(e, r, a) {

package/dist/index23.mjs

@@ -1,7 +1,7 @@
 import { getOwnCustomMetadata } from './index29.mjs';
 import { ParameterDecoratorFactory } from './index17.mjs';
 import { getParamValueKey } from './index25.mjs';
-import { ResolverStore } from './index32.mjs';
+import { ResolverStore } from './index38.mjs';
 
 let GlobalResolver = class GlobalResolver {
     resolve(e, r, a) {

package/dist/index24.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 const reflection = require('./index29.js');
 const parameterDecoratorFactory = require('./index17.js');
 const helpers = require('./index25.js');
-const resolverStore = require('./index32.js');
+const resolverStore = require('./index38.js');
 
 let OptionalResolver = class OptionalResolver {
     resolve(o, t, n) {

package/dist/index24.mjs

@@ -1,7 +1,7 @@
 import { getParamTypes, getOwnCustomMetadata } from './index29.mjs';
 import { ParameterDecoratorFactory } from './index17.mjs';
 import { getParamValueKey } from './index25.mjs';
-import { ResolverStore } from './index32.mjs';
+import { ResolverStore } from './index38.mjs';
 
 let OptionalResolver = class OptionalResolver {
     resolve(o, t, n) {

package/dist/index31.js

@@ -2,45 +2,79 @@
 
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
-const eventManager = require('./index6.js');
+const hookManager = require('./index33.js');
+const resolutionStrategies = require('./index43.js');
+const debugLogger = require('./index36.js');
+const use = require('./index42.js');
+const inject = require('./index41.js');
+const injectable = require('./index44.js');
 
-const registerEvents = (t, n)=>{
-    const o = t.concrete !== undefined && t.concrete.prototype instanceof eventManager.EventManager;
-    if (o) {
-        const e = n;
-        const o = e.channels;
-        for (const n of t.events){
-            if (!o.has(n)) e.addChannels(n);
-            if (!t.privateContext.events.has(n)) t.privateContext.addChannels(n);
+class InjectableManager {
+    setContexts(e, t) {
+        this.privateContext = e;
+        this.publicContext = t;
+    }
+    register(s, n = false) {
+        const a = debugLogger.DebugLogger.getInstance();
+        const c = n === true ? use.resolveInstanceInjectionTuple(s) : inject.resolveInjectionTuple(s);
+        if (this.has(c.identifier)) {
+            throw new Error(`An assemblage is already registered with identifier '${c.identifier.name}'.`);
+        }
+        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);
         }
-        for (const e of t.events){
-            n.on(e, (...n)=>{
-                t.privateContext.emit(e, ...n);
+        return l;
+    }
+    has(e) {
+        return this.injectables.has(e);
+    }
+    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', {
+                identifier: e.name,
+                caller: i ? i?.name || String(i) : 'unknown',
+                error: t
             });
+            throw new Error(t);
         }
-    } else {
-        for (const e of t.events){
-            if (!t.privateContext.events.has(e)) t.privateContext.addChannels(e);
+        const r = this.injectables.get(e);
+        if (r.isSingleton) {
+            return this.singletonStrategy.resolve(r, t);
+        } else {
+            return this.transientStrategy.resolve(r, t);
         }
     }
-};
-const unregisterEvents = (t, n)=>{
-    const o = t.concrete !== undefined && t.concrete.prototype instanceof eventManager.EventManager;
-    if (o) {
-        const e = n;
-        for (const n of t.events){
-            e.off(n);
-        }
-        e.removeChannels(...t.events);
-        t.privateContext.removeChannels(...t.events);
-    } else {
-        for (const e of t.events){
-            if (t.privateContext.events.has(e)) {
-                t.privateContext.removeChannels(e);
+    concrete(e) {
+        const t = this.injectables.get(e);
+        if (t) return t.concrete;
+        return;
+    }
+    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());
             }
         }
+        return t;
+    }
+    dispose() {
+        for (const [e, t] of this.injectables){
+            t.dispose();
+        }
+    }
+    get size() {
+        return this.injectables.size;
+    }
+    constructor(){
+        this.injectables = new Map();
+        this.singletonStrategy = new resolutionStrategies.SingletonStrategy();
+        this.transientStrategy = new resolutionStrategies.TransientStrategy();
     }
-};
+}
 
-exports.registerEvents = registerEvents;
-exports.unregisterEvents = unregisterEvents;
+exports.InjectableManager = InjectableManager;

package/dist/index31.mjs

@@ -1,41 +1,76 @@
-import { EventManager } from './index6.mjs';
+import { HookManager } from './index33.mjs';
+import { SingletonStrategy, TransientStrategy } from './index43.mjs';
+import { DebugLogger } from './index36.mjs';
+import { resolveInstanceInjectionTuple } from './index42.mjs';
+import { resolveInjectionTuple } from './index41.mjs';
+import { Injectable } from './index44.mjs';
 
-const registerEvents = (t, n)=>{
-    const o = t.concrete !== undefined && t.concrete.prototype instanceof EventManager;
-    if (o) {
-        const e = n;
-        const o = e.channels;
-        for (const n of t.events){
-            if (!o.has(n)) e.addChannels(n);
-            if (!t.privateContext.events.has(n)) t.privateContext.addChannels(n);
+class InjectableManager {
+    setContexts(e, t) {
+        this.privateContext = e;
+        this.publicContext = t;
+    }
+    register(s, n = false) {
+        const a = DebugLogger.getInstance();
+        const c = n === true ? resolveInstanceInjectionTuple(s) : resolveInjectionTuple(s);
+        if (this.has(c.identifier)) {
+            throw new Error(`An assemblage is already registered with identifier '${c.identifier.name}'.`);
+        }
+        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);
         }
-        for (const e of t.events){
-            n.on(e, (...n)=>{
-                t.privateContext.emit(e, ...n);
+        return l;
+    }
+    has(e) {
+        return this.injectables.has(e);
+    }
+    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', {
+                identifier: e.name,
+                caller: i ? i?.name || String(i) : 'unknown',
+                error: t
             });
+            throw new Error(t);
         }
-    } else {
-        for (const e of t.events){
-            if (!t.privateContext.events.has(e)) t.privateContext.addChannels(e);
+        const r = this.injectables.get(e);
+        if (r.isSingleton) {
+            return this.singletonStrategy.resolve(r, t);
+        } else {
+            return this.transientStrategy.resolve(r, t);
         }
     }
-};
-const unregisterEvents = (t, n)=>{
-    const o = t.concrete !== undefined && t.concrete.prototype instanceof EventManager;
-    if (o) {
-        const e = n;
-        for (const n of t.events){
-            e.off(n);
-        }
-        e.removeChannels(...t.events);
-        t.privateContext.removeChannels(...t.events);
-    } else {
-        for (const e of t.events){
-            if (t.privateContext.events.has(e)) {
-                t.privateContext.removeChannels(e);
+    concrete(e) {
+        const t = this.injectables.get(e);
+        if (t) return t.concrete;
+        return;
+    }
+    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());
             }
         }
+        return t;
+    }
+    dispose() {
+        for (const [e, t] of this.injectables){
+            t.dispose();
+        }
+    }
+    get size() {
+        return this.injectables.size;
+    }
+    constructor(){
+        this.injectables = new Map();
+        this.singletonStrategy = new SingletonStrategy();
+        this.transientStrategy = new TransientStrategy();
     }
-};
+}
 
-export { registerEvents, unregisterEvents };
+export { InjectableManager };

package/dist/index32.js

@@ -2,27 +2,36 @@
 
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
-class ResolverStore {
-    static register(e, r) {
-        this.resolvers.set(e, r);
+class ObjectManager {
+    use(e, t) {
+        if (this.has(e)) {
+            throw new Error(`A value is already registered with identifier '${String(e)}'.`);
+        }
+        this.objects.set(e, t);
+        return t;
+    }
+    has(e) {
+        return this.objects.has(e);
     }
-    static getResolver(e) {
-        const r = this.resolvers.get(e);
-        if (!r) {
-            throw new Error(`No resolver found for decorator type: ${e}`);
+    require(e) {
+        if (!this.objects.has(e)) {
+            throw new Error(`Injected object with identifier '${String(e)}' has not been registered.`);
         }
-        return new r();
+        return this.objects.get(e);
     }
-    static hasResolver(e) {
-        return this.resolvers.has(e);
+    addGlobal(e, t) {
+        if (this.globals.has(e)) {
+            throw new Error(`Global value with key '${e}' has already been registered.`);
+        }
+        this.globals.set(e, t);
     }
-    static getRegisteredTypes() {
-        return Array.from(this.resolvers.keys());
+    global(e) {
+        return this.globals.get(e);
     }
-    static clear() {
-        this.resolvers.clear();
+    constructor(){
+        this.objects = new Map();
+        this.globals = new Map();
     }
 }
-ResolverStore.resolvers = new Map();
 
-exports.ResolverStore = ResolverStore;
+exports.ObjectManager = ObjectManager;

package/dist/index32.mjs

@@ -1,24 +1,33 @@
-class ResolverStore {
-    static register(e, r) {
-        this.resolvers.set(e, r);
+class ObjectManager {
+    use(e, t) {
+        if (this.has(e)) {
+            throw new Error(`A value is already registered with identifier '${String(e)}'.`);
+        }
+        this.objects.set(e, t);
+        return t;
+    }
+    has(e) {
+        return this.objects.has(e);
     }
-    static getResolver(e) {
-        const r = this.resolvers.get(e);
-        if (!r) {
-            throw new Error(`No resolver found for decorator type: ${e}`);
+    require(e) {
+        if (!this.objects.has(e)) {
+            throw new Error(`Injected object with identifier '${String(e)}' has not been registered.`);
         }
-        return new r();
+        return this.objects.get(e);
     }
-    static hasResolver(e) {
-        return this.resolvers.has(e);
+    addGlobal(e, t) {
+        if (this.globals.has(e)) {
+            throw new Error(`Global value with key '${e}' has already been registered.`);
+        }
+        this.globals.set(e, t);
     }
-    static getRegisteredTypes() {
-        return Array.from(this.resolvers.keys());
+    global(e) {
+        return this.globals.get(e);
     }
-    static clear() {
-        this.resolvers.clear();
+    constructor(){
+        this.objects = new Map();
+        this.globals = new Map();
     }
 }
-ResolverStore.resolvers = new Map();
 
-export { ResolverStore };
+export { ObjectManager };

package/dist/index33.js

@@ -2,73 +2,84 @@
 
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
-const hookManager = require('./index35.js');
-const resolutionStrategies = require('./index43.js');
-const debugLogger = require('./index38.js');
-const use = require('./index42.js');
-const inject = require('./index41.js');
-const injectable = require('./index44.js');
+const core = require('@assemblerjs/core');
+const debugLogger = require('./index36.js');
 
-class InjectableManager {
-    setContexts(e, t) {
-        this.privateContext = e;
-        this.publicContext = t;
+class HookManager {
+    prepareInitHook(o, t) {
+        this.initCache.push({
+            instance: o,
+            configuration: t
+        });
+        return this.initCache;
     }
-    register(r, n = false) {
-        const a = debugLogger.DebugLogger.getInstance();
-        const c = n === true ? use.resolveInstanceInjectionTuple(r) : inject.resolveInjectionTuple(r);
-        if (this.has(c.identifier)) {
-            throw new Error(`An assemblage is already registered with identifier '${c.identifier.name}'.`);
+    callInitHooks(o) {
+        for (const t of this.initCache){
+            HookManager.callHookImmediate(t.instance, 'onInit', o, t.configuration);
         }
-        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);
+    }
+    callInitedHooks(o) {
+        for (const t of [
+            ...this.initCache
+        ].reverse()){
+            HookManager.callHookImmediate(t.instance, 'onInited', o, t.configuration);
         }
-        return l;
     }
-    has(e) {
-        return this.injectables.has(e);
+    clearCache() {
+        this.initCache.length = 0;
     }
-    require(e, t) {
-        if (!this.injectables.has(e)) {
-            throw new Error(`Class with identifier '${e.name}' has not been registered or is a circular dependency.`);
-        }
-        const i = this.injectables.get(e);
-        if (i.isSingleton) {
-            return this.singletonStrategy.resolve(i, t);
-        } else {
-            return this.transientStrategy.resolve(i, t);
-        }
+    getCache() {
+        return this.initCache;
     }
-    concrete(e) {
-        const t = this.injectables.get(e);
-        if (t) return t.concrete;
-        return;
+    constructor(){
+        this.initCache = [];
     }
-    tagged(...e) {
-        const t = [];
-        for (const i of e){
-            for (const [e, s] of this.injectables){
-                if (s.tags.includes(i)) t.push(s.build());
+}
+HookManager.callHook = (e, i, n, a)=>{
+    const c = debugLogger.DebugLogger.getInstance();
+    const r = c.logHook(i, e, a);
+    return new Promise((t, c)=>{
+        const s = e[i];
+        if (s) {
+            if (core.isAsync(s)) {
+                s.bind(e)(n, a).then(()=>{
+                    if (r) r();
+                    t();
+                }).catch((o)=>{
+                    if (r) r();
+                    c(o);
+                });
+                return;
+            }
+            try {
+                s.bind(e)(n, a);
+                if (r) r();
+                t();
+            } catch (o) {
+                if (r) r();
+                c(o);
             }
+        } else {
+            if (r) r();
+            t();
         }
-        return t;
-    }
-    dispose() {
-        for (const [e, t] of this.injectables){
-            t.dispose();
+    });
+};
+HookManager.callHookImmediate = (e, i, n, a)=>{
+    const c = debugLogger.DebugLogger.getInstance();
+    const r = c.logHook(i, e, a);
+    const s = e[i];
+    if (s) {
+        if (core.isAsync(s)) {
+            s.bind(e)(n, a).catch(()=>{});
+            if (r) r();
+            return;
         }
+        s.bind(e)(n, a);
+        if (r) r();
+    } else {
+        if (r) r();
     }
-    get size() {
-        return this.injectables.size;
-    }
-    constructor(){
-        this.injectables = new Map();
-        this.singletonStrategy = new resolutionStrategies.SingletonStrategy();
-        this.transientStrategy = new resolutionStrategies.TransientStrategy();
-    }
-}
+};
 
-exports.InjectableManager = InjectableManager;
+exports.HookManager = HookManager;