assemblerjs 1.1.13 → 1.1.14

package/dist/index34.mjs

@@ -1,142 +1,46 @@
-import { HookManager } from './index36.mjs';
-import { SingletonStrategy, TransientStrategy } from './index46.mjs';
-import { DebugLogger } from './index39.mjs';
-import { isClass } from '@assemblerjs/core';
-import { resolveInstanceInjectionTuple } from './index42.mjs';
-import { resolveInjectionTuple } from './index41.mjs';
-import { Injectable } from './index47.mjs';
+import { HookManager } from './index33.mjs';
+import { DebugLogger } from './index36.mjs';
+import { setDefinitionValue } from './index30.mjs';
 
-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') {
-        if (e.name && typeof e.name === 'string') {
-            return e.name;
-        }
-        const t = e.constructor?.name;
-        if (t && t !== 'Object') {
-            return t;
-        }
-        try {
-            const t = JSON.stringify(e);
-            if (t.length > 100) {
-                return t.substring(0, 100) + '...';
-            }
-            return t;
-        } catch  {
-            return '[UnknownObject]';
-        }
-    }
-    return String(e);
-}
-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 {
-    setContexts(e, t) {
-        this.privateContext = e;
-        this.publicContext = t;
-    }
-    register(i, s = false) {
-        const c = DebugLogger.getInstance();
-        const a = s === 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 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 f;
-    }
-    has(e) {
-        return this.injectables.has(e);
-    }
-    require(e, t, n) {
-        if (!this.injectables.has(e)) {
-            const t = this.resolvingStack.has(e);
-            const r = t ? 'Circular dependency detected' : 'Dependency not registered';
-            const i = a(e);
-            const s = 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: n ? a(n) : 'unknown',
-                type: s,
-                error: c
-            });
-            throw new Error(c);
-        }
-        const r = this.injectables.get(e);
-        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) {
-        const t = this.injectables.get(e);
-        if (t) return t.concrete;
-        return;
-    }
-    tagged(...e) {
-        const t = [];
-        for (const n of e){
-            for (const [e, r] of this.injectables){
-                if (r.tags.includes(n)) t.push(r.build());
-            }
-        }
-        return t;
-    }
-    dispose() {
-        for (const [e, t] of this.injectables){
-            t.dispose();
-        }
-        this.resolvingStack.clear();
-    }
-    get size() {
-        return this.injectables.size;
-    }
-    getRegisteredIdentifiers() {
-        return Array.from(this.injectables.keys()).map((e)=>e?.name || String(e));
-    }
-    constructor(){
-        this.injectables = new Map();
-        this.resolvingStack = new Set();
-        this.singletonStrategy = new SingletonStrategy();
-        this.transientStrategy = new TransientStrategy();
+class AssemblerBuilder {
+    build(t, a) {
+        const n = DebugLogger.getInstance();
+        setDefinitionValue('singleton', true, t);
+        n.logPhaseStart('registration');
+        const r = this.assembler.register([
+            t
+        ]);
+        const i = this.assembler.injectableManager.getRegisteredIdentifiers();
+        n.logPhaseEnd('registration', undefined, {
+            registered: i
+        });
+        n.logPhaseStart('resolution');
+        const l = this.assembler.require(r.identifier, a);
+        n.logPhaseEnd('resolution');
+        const h = this.assembler.hookManager.getCache().find((e)=>e.instance === l);
+        if (!h) {
+            throw new Error('Root instance not found in assemblages cache.');
+        }
+        const g = this.assembler.hookManager.getCache().indexOf(h);
+        this.assembler.hookManager.getCache().splice(g, 1);
+        n.logPhaseStart('hooks:onInit');
+        this.assembler.hookManager.callInitHooks(this.assembler.publicContext);
+        const c = a ? {
+            ...r.configuration,
+            ...a
+        } : r.configuration;
+        HookManager.callHookImmediate(l, 'onInit', this.assembler.publicContext, c);
+        n.logPhaseEnd('hooks:onInit');
+        n.logPhaseStart('hooks:onInited');
+        this.assembler.hookManager.callInitedHooks(this.assembler.publicContext);
+        HookManager.callHookImmediate(l, 'onInited', this.assembler.publicContext, c);
+        n.logPhaseEnd('hooks:onInited');
+        this.assembler.hookManager.clearCache();
+        return l;
+    }
+    constructor(e){
+        this.assembler = e;
     }
 }
 
-export { InjectableManager };
+export { AssemblerBuilder };

package/dist/index35.js

@@ -2,55 +2,36 @@
 
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
-const debugLogger = require('./index39.js');
-
-function t(e) {
-    return typeof e === 'symbol' ? 'symbol' : 'string';
-}
-class ObjectManager {
-    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(s);
-        }
-        this.objects.set(r, o);
-        return o;
-    }
-    has(e) {
-        return this.objects.has(e);
-    }
-    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(s);
-        }
-        return this.objects.get(r);
-    }
-    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);
+class ContextProvider {
+    createPublicContext() {
+        return {
+            has: this.assembler.has.bind(this.assembler),
+            require: this.assembler.require.bind(this.assembler),
+            concrete: this.assembler.concrete.bind(this.assembler),
+            tagged: this.assembler.tagged.bind(this.assembler),
+            dispose: this.assembler.dispose.bind(this.assembler),
+            global: this.assembler.global.bind(this.assembler),
+            on: this.assembler.on.bind(this.assembler),
+            once: this.assembler.once.bind(this.assembler),
+            off: this.assembler.off.bind(this.assembler),
+            events: this.assembler.channels
+        };
     }
-    global(e) {
-        return this.globals.get(e);
+    createPrivateContext(s) {
+        return {
+            ...s,
+            register: this.assembler.register.bind(this.assembler),
+            use: this.assembler.use.bind(this.assembler),
+            addGlobal: this.assembler.addGlobal.bind(this.assembler),
+            prepareInitHook: this.assembler.prepareInitHook.bind(this.assembler),
+            emit: this.assembler.emit.bind(this.assembler),
+            addChannels: this.assembler.addChannels.bind(this.assembler),
+            removeChannels: this.assembler.removeChannels.bind(this.assembler)
+        };
     }
-    constructor(){
-        this.objects = new Map();
-        this.globals = new Map();
+    constructor(s){
+        this.assembler = s;
     }
 }
 
-exports.ObjectManager = ObjectManager;
+exports.ContextProvider = ContextProvider;

package/dist/index35.mjs

@@ -1,52 +1,33 @@
-import { DebugLogger } from './index39.mjs';
-
-function t(e) {
-    return typeof e === 'symbol' ? 'symbol' : 'string';
-}
-class ObjectManager {
-    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(s);
-        }
-        this.objects.set(r, o);
-        return o;
-    }
-    has(e) {
-        return this.objects.has(e);
-    }
-    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(s);
-        }
-        return this.objects.get(r);
-    }
-    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);
+class ContextProvider {
+    createPublicContext() {
+        return {
+            has: this.assembler.has.bind(this.assembler),
+            require: this.assembler.require.bind(this.assembler),
+            concrete: this.assembler.concrete.bind(this.assembler),
+            tagged: this.assembler.tagged.bind(this.assembler),
+            dispose: this.assembler.dispose.bind(this.assembler),
+            global: this.assembler.global.bind(this.assembler),
+            on: this.assembler.on.bind(this.assembler),
+            once: this.assembler.once.bind(this.assembler),
+            off: this.assembler.off.bind(this.assembler),
+            events: this.assembler.channels
+        };
     }
-    global(e) {
-        return this.globals.get(e);
+    createPrivateContext(s) {
+        return {
+            ...s,
+            register: this.assembler.register.bind(this.assembler),
+            use: this.assembler.use.bind(this.assembler),
+            addGlobal: this.assembler.addGlobal.bind(this.assembler),
+            prepareInitHook: this.assembler.prepareInitHook.bind(this.assembler),
+            emit: this.assembler.emit.bind(this.assembler),
+            addChannels: this.assembler.addChannels.bind(this.assembler),
+            removeChannels: this.assembler.removeChannels.bind(this.assembler)
+        };
     }
-    constructor(){
-        this.objects = new Map();
-        this.globals = new Map();
+    constructor(s){
+        this.assembler = s;
     }
 }
 
-export { ObjectManager };
+export { ContextProvider };

package/dist/index36.js

@@ -2,84 +2,167 @@
 
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
-const core = require('@assemblerjs/core');
-const debugLogger = require('./index39.js');
-
-class HookManager {
-    prepareInitHook(o, t) {
-        this.initCache.push({
-            instance: o,
-            configuration: t
+function o(o) {
+    if (o === undefined) return 'undefined';
+    if (o === null) return 'null';
+    if (typeof o === 'function') {
+        if (o.name) return o.name;
+        if (o.constructor?.name && o.constructor.name !== 'Function') {
+            return o.constructor.name;
+        }
+        return 'AnonymousFunction';
+    }
+    if (typeof o === 'object') {
+        if (o.name && typeof o.name === 'string') {
+            return o.name;
+        }
+        const e = o.constructor?.name;
+        if (e && e !== 'Object') {
+            return e;
+        }
+        return '[Object]';
+    }
+    return String(o);
+}
+let NoOpDebugLogger = class NoOpDebugLogger {
+    configure(o) {}
+    log(o, e, t) {}
+    logBuildStart(o) {}
+    logBuildEnd(o, e) {}
+    logRegistration(o) {}
+    logHook(o, e, t) {}
+    logPhaseStart(o, e) {}
+    logPhaseEnd(o, e, t) {}
+    logResolution(o, e, t) {}
+    logConstruction(o) {}
+};
+let ActiveDebugLogger = class ActiveDebugLogger {
+    configure(o) {
+        this.options = {
+            ...this.options,
+            ...o,
+            logPhases: {
+                ...this.options.logPhases,
+                ...o.logPhases || {}
+            }
+        };
+    }
+    logBuildStart(o) {
+        this.log('info', 'Build started', {
+            entry: o.name
+        });
+    }
+    logBuildEnd(o, e) {
+        const t = {
+            entry: o.name
+        };
+        if (e !== undefined) t.duration = `${e.toFixed(2)}ms`;
+        this.log('info', 'Build completed', t);
+    }
+    logRegistration(e) {
+        if (!this.shouldLog('registration')) return;
+        this.log('info', 'Registration', {
+            identifier: o(e.identifier),
+            isSingleton: e.isSingleton,
+            dependencies: e.dependencies.map((e)=>o(e)),
+            tags: e.tags
         });
-        return this.initCache;
     }
-    callInitHooks(o) {
-        for (const t of this.initCache){
-            HookManager.callHookImmediate(t.instance, 'onInit', o, t.configuration);
+    logHook(e, t, n) {
+        if (!this.shouldLog('hooks')) return;
+        const s = this.options.logTimings ? performance.now() : 0;
+        this.log('info', `Hook: ${e}`, {
+            target: o(t),
+            config: n
+        });
+        if (this.options.logTimings) {
+            return ()=>{
+                const o = performance.now() - s;
+                this.log('info', `Hook: ${e} completed`, {
+                    duration: `${o.toFixed(2)}ms`
+                });
+            };
         }
     }
-    callInitedHooks(o) {
-        for (const t of [
-            ...this.initCache
-        ].reverse()){
-            HookManager.callHookImmediate(t.instance, 'onInited', o, t.configuration);
+    logPhaseStart(o, e) {
+        this.log('info', `Phase: ${o} started`, e);
+    }
+    logPhaseEnd(o, e, t) {
+        const n = e !== undefined ? {
+            duration: `${e.toFixed(2)}ms`
+        } : {};
+        if (t) {
+            Object.assign(n, t);
         }
+        this.log('info', `Phase: ${o} ended`, Object.keys(n).length > 0 ? n : undefined);
     }
-    clearCache() {
-        this.initCache.length = 0;
+    logResolution(o, e, t) {
+        if (!this.shouldLog('resolution')) return;
+        this.log('info', `Resolving: ${o}`, {
+            strategy: `${e} strategy`,
+            cache: t ? 'hit' : 'miss'
+        });
     }
-    getCache() {
-        return this.initCache;
+    logConstruction(o) {
+        if (!this.shouldLog('construction')) return;
+        this.log('info', `Constructing: ${o}`);
     }
-    constructor(){
-        this.initCache = [];
+    shouldLog(o) {
+        return !this.options.logPhases || this.options.logPhases[o] !== false;
     }
-}
-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);
-            }
+    log(o, e, t) {
+        if (this.options.logger) {
+            this.options.logger(o, e, t);
         } else {
-            if (r) r();
-            t();
+            const n = `[Assembler:${o}]`;
+            const s = this.options.useColors !== false ? this.colorize(o, n) : n;
+            if (t) {
+                console.log(`${s} ${e}`, t);
+            } else {
+                console.log(`${s} ${e}`);
+            }
         }
-    });
+    }
+    colorize(o, e) {
+        const t = {
+            info: '\x1b[36m',
+            warn: '\x1b[33m',
+            error: '\x1b[31m',
+            reset: '\x1b[0m'
+        };
+        const n = t[o] || t.info;
+        return `${n}${e}${t.reset}`;
+    }
+    constructor(){
+        this.options = {
+            enabled: true,
+            logPhases: {
+                registration: true,
+                resolution: true,
+                construction: true,
+                hooks: true,
+                cache: true
+            },
+            logTimings: false,
+            logDependencyTree: true,
+            useColors: true
+        };
+    }
 };
-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;
+class DebugLogger {
+    static getInstance() {
+        return DebugLogger.instance;
+    }
+    static enable(o) {
+        DebugLogger.instance = new ActiveDebugLogger();
+        if (o) {
+            DebugLogger.instance.configure(o);
         }
-        s.bind(e)(n, a);
-        if (r) r();
-    } else {
-        if (r) r();
     }
-};
+    static disable() {
+        DebugLogger.instance = new NoOpDebugLogger();
+    }
+}
+DebugLogger.instance = new NoOpDebugLogger();
 
-exports.HookManager = HookManager;
+exports.DebugLogger = DebugLogger;