assemblerjs 1.1.21 → 1.1.22

package/dist/index34.js

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

package/dist/index34.mjs

@@ -1,81 +1,177 @@
-import { isAsync } from '@assemblerjs/core';
-import { DebugLogger } from './index37.mjs';
-
-class HookManager {
-    prepareInitHook(o, t) {
-        this.initCache.push({
-            instance: o,
-            configuration: t
+function e(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 === 'object') {
+        const o = e.constructor?.name;
+        if (o && o !== 'Object') {
+            return o;
+        }
+        if (e.name && typeof e.name === 'string') {
+            return e.name;
+        }
+        return '[Object]';
+    }
+    return String(e);
+}
+let NoOpDebugLogger = class NoOpDebugLogger {
+    configure(e) {}
+    log(e, o, t) {}
+    logBuildStart(e) {}
+    logBuildEnd(e, o) {}
+    logRegistration(e) {}
+    logHook(e, o, t) {}
+    logPhaseStart(e, o) {}
+    logPhaseEnd(e, o, t) {}
+    logResolution(e, o, t) {}
+    logConstruction(e) {}
+    logInjection(e, o) {}
+};
+let ActiveDebugLogger = class ActiveDebugLogger {
+    configure(e) {
+        this.options = {
+            ...this.options,
+            ...e,
+            logPhases: {
+                ...this.options.logPhases,
+                ...e.logPhases || {}
+            }
+        };
+    }
+    logBuildStart(e) {
+        this.log('info', 'Build started', {
+            entry: e.name
+        });
+    }
+    logBuildEnd(e, o) {
+        const t = {
+            entry: e.name
+        };
+        if (o !== undefined) t.duration = `${o.toFixed(2)}ms`;
+        this.log('info', 'Build completed', t);
+    }
+    logRegistration(o) {
+        if (!this.shouldLog('registration')) return;
+        this.log('info', 'Registration', {
+            identifier: e(o.identifier),
+            isSingleton: o.isSingleton,
+            dependencies: o.dependencies.map((o)=>e(o)),
+            tags: o.tags
         });
-        return this.initCache;
     }
-    callInitHooks(o) {
-        for (const t of this.initCache){
-            HookManager.callHookImmediate(t.instance, 'onInit', o, t.configuration);
+    logHook(o, t, n) {
+        if (!this.shouldLog('hooks')) return;
+        const i = this.options.logTimings ? performance.now() : 0;
+        this.log('info', `Hook: ${o}`, {
+            target: e(t),
+            config: n
+        });
+        if (this.options.logTimings) {
+            return ()=>{
+                const e = performance.now() - i;
+                this.log('info', `Hook: ${o} completed`, {
+                    duration: `${e.toFixed(2)}ms`
+                });
+            };
         }
     }
-    callInitedHooks(o) {
-        for (const t of [
-            ...this.initCache
-        ].reverse()){
-            HookManager.callHookImmediate(t.instance, 'onInited', o, t.configuration);
+    logPhaseStart(e, o) {
+        this.log('info', `Phase: ${e} started`, o);
+    }
+    logPhaseEnd(e, o, t) {
+        const n = o !== undefined ? {
+            duration: `${o.toFixed(2)}ms`
+        } : {};
+        if (t) {
+            Object.assign(n, t);
         }
+        this.log('info', `Phase: ${e} ended`, Object.keys(n).length > 0 ? n : undefined);
     }
-    clearCache() {
-        this.initCache.length = 0;
+    logResolution(e, o, t) {
+        if (!this.shouldLog('resolution')) return;
+        this.log('info', `Resolving: ${e}`, {
+            strategy: `${o} strategy`,
+            cache: t ? 'hit' : 'miss'
+        });
     }
-    getCache() {
-        return this.initCache;
+    logConstruction(e) {
+        if (!this.shouldLog('construction')) return;
+        this.log('info', `Constructing: ${e}`);
     }
-    constructor(){
-        this.initCache = [];
+    logInjection(e, o) {
+        if (!this.shouldLog(e === 'use' ? 'injectionUse' : 'injectionGlobal')) return;
+        this.log('info', `Injecting: @${e === 'use' ? 'Use' : 'Global'}`, o);
     }
-}
-HookManager.callHook = (e, i, n, a)=>{
-    const c = DebugLogger.getInstance();
-    const r = c.logHook(i, e, a);
-    return new Promise((t, c)=>{
-        const s = e[i];
-        if (s) {
-            if (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);
-            }
+    shouldLog(e) {
+        return !this.options.logPhases || this.options.logPhases[e] !== false;
+    }
+    log(e, o, t) {
+        if (this.options.logger) {
+            this.options.logger(e, o, t);
         } else {
-            if (r) r();
-            t();
+            const n = `[Assembler:${e}]`;
+            const i = this.options.useColors !== false ? this.colorize(e, n) : n;
+            if (t) {
+                console.log(`${i} ${o}`, t);
+            } else {
+                console.log(`${i} ${o}`);
+            }
         }
-    });
+    }
+    colorize(e, o) {
+        const t = {
+            info: '\x1b[36m',
+            warn: '\x1b[33m',
+            error: '\x1b[31m',
+            reset: '\x1b[0m'
+        };
+        const n = t[e] || t.info;
+        return `${n}${o}${t.reset}`;
+    }
+    constructor(){
+        this.options = {
+            enabled: true,
+            logPhases: {
+                registration: true,
+                registrationUse: true,
+                registrationGlobals: true,
+                resolution: true,
+                construction: true,
+                hooks: true,
+                cache: true,
+                injectionUse: true,
+                injectionGlobal: true
+            },
+            logTimings: false,
+            logDependencyTree: true,
+            useColors: true
+        };
+    }
 };
-HookManager.callHookImmediate = (e, i, n, a)=>{
-    const c = DebugLogger.getInstance();
-    const r = c.logHook(i, e, a);
-    const s = e[i];
-    if (s) {
-        if (isAsync(s)) {
-            s.bind(e)(n, a).catch(()=>{});
-            if (r) r();
+class DebugLogger {
+    static getInstance() {
+        return DebugLogger.instance;
+    }
+    static enable(e) {
+        if (e?.enabled === false) {
+            DebugLogger.instance = new NoOpDebugLogger();
             return;
         }
-        s.bind(e)(n, a);
-        if (r) r();
-    } else {
-        if (r) r();
+        DebugLogger.instance = new ActiveDebugLogger();
+        if (e) {
+            DebugLogger.instance.configure(e);
+        }
     }
-};
+    static disable() {
+        DebugLogger.instance = new NoOpDebugLogger();
+    }
+}
+DebugLogger.instance = new NoOpDebugLogger();
 
-export { HookManager };
+export { DebugLogger };

package/dist/index35.js

@@ -2,60 +2,68 @@
 
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
-const hookManager = require('./index34.js');
-const debugLogger = require('./index37.js');
-const cycleDetector = require('./index38.js');
-const injectableManager = require('./index32.js');
-const schema = require('./index30.js');
-
-class AssemblerBuilder {
-    build(n, r) {
-        const i = debugLogger.DebugLogger.getInstance();
-        schema.setDefinitionValue('singleton', true, n);
-        i.logPhaseStart('registration');
-        const l = this.assembler.register([
-            n
-        ]);
-        const c = this.assembler.injectableManager.getRegisteredIdentifiers();
-        i.logPhaseEnd('registration', undefined, {
-            registered: c
-        });
-        const h = cycleDetector.CycleDetector.getInstance().detect(this.assembler.injectableManager.getInjectables(), (e)=>injectableManager.formatIdentifier(e));
-        if (h.length > 0) {
-            for (const e of h){
-                i.log('error', 'Circular dependency detected', {
-                    cycle: e.cycle,
-                    path: e.path
-                });
+let AbstractCycleDetector = class AbstractCycleDetector {
+};
+let NoOpCycleDetector = class NoOpCycleDetector extends AbstractCycleDetector {
+    detect() {
+        return [];
+    }
+};
+let ActiveCycleDetector = class ActiveCycleDetector extends AbstractCycleDetector {
+    detect(e, t) {
+        const c = [];
+        const s = new Set();
+        for (const [n] of e){
+            if (s.has(n)) continue;
+            const r = [];
+            const o = new Set();
+            if (this.hasCycleDFS(n, r, o, s, e)) {
+                const e = r.findIndex((e)=>e === n);
+                if (e >= 0) {
+                    const s = r.slice(e).map((e)=>t(e));
+                    c.push({
+                        cycle: s,
+                        path: s.join(' → ')
+                    });
+                }
             }
         }
-        i.logPhaseStart('resolution');
-        const g = this.assembler.require(l.identifier, r);
-        i.logPhaseEnd('resolution');
-        const m = this.assembler.hookManager.getCache().find((e)=>e.instance === g);
-        if (!m) {
-            throw new Error('Root instance not found in assemblages cache.');
+        return c;
+    }
+    hasCycleDFS(e, t, c, s, n) {
+        if (c.has(e)) {
+            t.push(e);
+            return true;
+        }
+        if (s.has(e)) {
+            return false;
         }
-        const b = this.assembler.hookManager.getCache().indexOf(m);
-        this.assembler.hookManager.getCache().splice(b, 1);
-        i.logPhaseStart('hooks:onInit');
-        this.assembler.hookManager.callInitHooks(this.assembler.publicContext);
-        const d = r ? {
-            ...l.configuration,
-            ...r
-        } : l.configuration;
-        hookManager.HookManager.callHookImmediate(g, 'onInit', this.assembler.publicContext, d);
-        i.logPhaseEnd('hooks:onInit');
-        i.logPhaseStart('hooks:onInited');
-        this.assembler.hookManager.callInitedHooks(this.assembler.publicContext);
-        hookManager.HookManager.callHookImmediate(g, 'onInited', this.assembler.publicContext, d);
-        i.logPhaseEnd('hooks:onInited');
-        this.assembler.hookManager.clearCache();
-        return g;
+        t.push(e);
+        c.add(e);
+        const r = n.get(e);
+        if (r?.dependencies && r.dependencies.length > 0) {
+            for (const e of r.dependencies){
+                if (this.hasCycleDFS(e, t, c, s, n)) {
+                    return true;
+                }
+            }
+        }
+        c.delete(e);
+        s.add(e);
+        return false;
+    }
+};
+class CycleDetector {
+    static getInstance() {
+        return CycleDetector.instance;
+    }
+    static enable() {
+        CycleDetector.instance = new ActiveCycleDetector();
     }
-    constructor(e){
-        this.assembler = e;
+    static disable() {
+        CycleDetector.instance = new NoOpCycleDetector();
     }
 }
+CycleDetector.instance = new NoOpCycleDetector();
 
-exports.AssemblerBuilder = AssemblerBuilder;
+exports.CycleDetector = CycleDetector;