assemblerjs 1.1.15 → 1.1.17

package/dist/index38.mjs

@@ -1,107 +1,57 @@
-import { TransversalManager } from './index13.mjs';
-import { getAffectedMethods } from './index12.mjs';
+import { HookManager } from './index37.mjs';
+import { DebugLogger } from './index40.mjs';
+import { CycleDetector } from './index41.mjs';
+import { formatIdentifier } from './index35.mjs';
+import { setDefinitionValue } from './index30.mjs';
 
-class TransversalWeaver {
-    static weave(n, r, o) {
-        const c = TransversalManager.getInstance(o);
-        const s = c.getAspectsForTarget(r);
-        const a = Object.getPrototypeOf(n);
-        const f = Object.getOwnPropertyNames(a).some((t)=>{
-            if (t === 'constructor') return false;
-            const n = Object.getOwnPropertyDescriptor(a, t);
-            if (!n) return false;
-            const r = n.value && typeof n.value === 'function';
-            const o = n.get && typeof n.get === 'function';
-            if (!r && !o) return false;
-            const c = getAffectedMethods(a, t);
-            return c.length > 0;
+class AssemblerBuilder {
+    build(n, r) {
+        const i = DebugLogger.getInstance();
+        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
         });
-        if (s.length === 0 && !f) {
-            return n;
-        }
-        return new Proxy(n, {
-            get (t, e, n) {
-                const r = Reflect.get(t, e, n);
-                if (typeof r !== 'function') {
-                    return r;
-                }
-                return function(...n) {
-                    const o = String(e);
-                    const a = {
-                        target: t,
-                        methodName: o,
-                        args: n
-                    };
-                    const f = c.getAdvicesForJoinPoint(a, s, t, e);
-                    return TransversalWeaver.executeAdviceChain(f, r, t, n, a);
-                };
-            }
-        });
-    }
-    static executeAdviceChain(t, e, n, r, o) {
-        const c = t.filter((t)=>t.type === 'before');
-        const s = t.filter((t)=>t.type === 'around');
-        const a = t.filter((t)=>t.type === 'after');
-        try {
-            for (const t of c){
-                const e = {
-                    ...o,
-                    config: t.config
-                };
-                t.method.call(t.transversalInstance, e);
-            }
-            let t;
-            if (s.length > 0) {
-                t = this.buildAroundChain(s, e, n, r, o);
-            } else {
-                t = e.apply(n, r);
-            }
-            if (t instanceof Promise) {
-                return t.then((t)=>{
-                    for (const e of a){
-                        const n = {
-                            ...o,
-                            result: t
-                        };
-                        e.method.call(e.transversalInstance, n);
-                    }
-                    return t;
-                }).catch((t)=>{
-                    o.error = t;
-                    throw t;
+        const h = CycleDetector.getInstance().detect(this.assembler.injectableManager.getInjectables(), (e)=>formatIdentifier(e));
+        if (h.length > 0) {
+            for (const e of h){
+                i.log('error', 'Circular dependency detected', {
+                    cycle: e.cycle,
+                    path: e.path
                 });
             }
-            for (const e of a){
-                const n = {
-                    ...o,
-                    result: t,
-                    config: e.config
-                };
-                e.method.call(e.transversalInstance, n);
-            }
-            return t;
-        } catch (t) {
-            o.error = t;
-            throw t;
         }
+        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.');
+        }
+        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.callHookImmediate(g, 'onInit', this.assembler.publicContext, d);
+        i.logPhaseEnd('hooks:onInit');
+        i.logPhaseStart('hooks:onInited');
+        this.assembler.hookManager.callInitedHooks(this.assembler.publicContext);
+        HookManager.callHookImmediate(g, 'onInited', this.assembler.publicContext, d);
+        i.logPhaseEnd('hooks:onInited');
+        this.assembler.hookManager.clearCache();
+        return g;
     }
-    static buildAroundChain(t, e, n, r, o) {
-        let c = 0;
-        const s = ()=>{
-            if (c < t.length) {
-                const e = t[c++];
-                const n = {
-                    ...o,
-                    proceed: s,
-                    config: e.config
-                };
-                return e.method.call(e.transversalInstance, n);
-            } else {
-                return e.apply(n, r);
-            }
-        };
-        return s();
+    constructor(e){
+        this.assembler = e;
     }
 }
 
-export { TransversalWeaver };
+export { AssemblerBuilder };

package/dist/index39.js

@@ -2,33 +2,36 @@
 
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
-class PointcutMatcher {
-    static parse(t) {
-        const e = t.match(/^execution\(([^.]+)\.([^)]+)\)$/);
-        if (!e) {
-            throw new Error(`Invalid pointcut expression: ${t}`);
-        }
-        const [, c, r] = e;
-        return new ExecutionPointcutMatcher(c, r);
+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
+        };
     }
-}
-let ExecutionPointcutMatcher = class ExecutionPointcutMatcher {
-    matches(t) {
-        const e = t.target.constructor.name;
-        const c = t.methodName;
-        return this.classRegex.test(e) && this.methodRegex.test(c);
-    }
-    patternToRegex(t) {
-        if (t === '*') {
-            return /.*/;
-        }
-        const e = t.replace(/[.+?^${}()|[\]\\]/g, '\\$&').replace(/\*/g, '.*');
-        return new RegExp(`^${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(t, e){
-        this.classRegex = this.patternToRegex(t);
-        this.methodRegex = this.patternToRegex(e);
+    constructor(s){
+        this.assembler = s;
     }
-};
+}
 
-exports.PointcutMatcher = PointcutMatcher;
+exports.ContextProvider = ContextProvider;

package/dist/index39.mjs

@@ -1,30 +1,33 @@
-class PointcutMatcher {
-    static parse(t) {
-        const e = t.match(/^execution\(([^.]+)\.([^)]+)\)$/);
-        if (!e) {
-            throw new Error(`Invalid pointcut expression: ${t}`);
-        }
-        const [, c, r] = e;
-        return new ExecutionPointcutMatcher(c, r);
+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
+        };
     }
-}
-let ExecutionPointcutMatcher = class ExecutionPointcutMatcher {
-    matches(t) {
-        const e = t.target.constructor.name;
-        const c = t.methodName;
-        return this.classRegex.test(e) && this.methodRegex.test(c);
-    }
-    patternToRegex(t) {
-        if (t === '*') {
-            return /.*/;
-        }
-        const e = t.replace(/[.+?^${}()|[\]\\]/g, '\\$&').replace(/\*/g, '.*');
-        return new RegExp(`^${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(t, e){
-        this.classRegex = this.patternToRegex(t);
-        this.methodRegex = this.patternToRegex(e);
+    constructor(s){
+        this.assembler = s;
     }
-};
+}
 
-export { PointcutMatcher };
+export { ContextProvider };

package/dist/index4.js

@@ -3,20 +3,25 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const core = require('@assemblerjs/core');
-const injectableManager = require('./index32.js');
-const objectManager = require('./index33.js');
-const hookManager = require('./index34.js');
-const assemblerBuilder = require('./index35.js');
-const contextProvider = require('./index36.js');
-const debugLogger = require('./index37.js');
+const injectableManager = require('./index35.js');
+const objectManager = require('./index36.js');
+const hookManager = require('./index37.js');
+const assemblerBuilder = require('./index38.js');
+const contextProvider = require('./index39.js');
+const debugLogger = require('./index40.js');
+const cycleDetector = require('./index41.js');
 const eventManager = require('./index6.js');
 
 class Assembler extends eventManager.EventManager {
     static enableDebug(e) {
         debugLogger.DebugLogger.enable(e);
+        if (e?.enabled !== false && e?.detectCycles === true) {
+            cycleDetector.CycleDetector.enable();
+        }
     }
     static disableDebug() {
         debugLogger.DebugLogger.disable();
+        cycleDetector.CycleDetector.disable();
     }
     static build(e, t) {
         const r = debugLogger.DebugLogger.getInstance();

package/dist/index4.mjs

@@ -1,18 +1,23 @@
 import { clearInstance } from '@assemblerjs/core';
-import { InjectableManager } from './index32.mjs';
-import { ObjectManager } from './index33.mjs';
-import { HookManager } from './index34.mjs';
-import { AssemblerBuilder } from './index35.mjs';
-import { ContextProvider } from './index36.mjs';
-import { DebugLogger } from './index37.mjs';
+import { InjectableManager } from './index35.mjs';
+import { ObjectManager } from './index36.mjs';
+import { HookManager } from './index37.mjs';
+import { AssemblerBuilder } from './index38.mjs';
+import { ContextProvider } from './index39.mjs';
+import { DebugLogger } from './index40.mjs';
+import { CycleDetector } from './index41.mjs';
 import { EventManager } from './index6.mjs';
 
 class Assembler extends EventManager {
     static enableDebug(e) {
         DebugLogger.enable(e);
+        if (e?.enabled !== false && e?.detectCycles === true) {
+            CycleDetector.enable();
+        }
     }
     static disableDebug() {
         DebugLogger.disable();
+        CycleDetector.disable();
     }
     static build(e, t) {
         const r = DebugLogger.getInstance();

package/dist/index40.js

@@ -2,45 +2,171 @@
 
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
-const eventManager = require('./index6.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);
+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;
         }
-        for (const e of t.events){
-            n.on(e, (...n)=>{
-                t.privateContext.emit(e, ...n);
-            });
+        return 'AnonymousFunction';
+    }
+    if (typeof o === 'object') {
+        if (o.name && typeof o.name === 'string') {
+            return o.name;
         }
-    } else {
-        for (const e of t.events){
-            if (!t.privateContext.events.has(e)) t.privateContext.addChannels(e);
+        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) {}
 };
-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);
+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
+        });
+    }
+    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`
+                });
+            };
+        }
+    }
+    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);
+    }
+    logResolution(o, e, t) {
+        if (!this.shouldLog('resolution')) return;
+        this.log('info', `Resolving: ${o}`, {
+            strategy: `${e} strategy`,
+            cache: t ? 'hit' : 'miss'
+        });
+    }
+    logConstruction(o) {
+        if (!this.shouldLog('construction')) return;
+        this.log('info', `Constructing: ${o}`);
+    }
+    shouldLog(o) {
+        return !this.options.logPhases || this.options.logPhases[o] !== false;
+    }
+    log(o, e, t) {
+        if (this.options.logger) {
+            this.options.logger(o, e, t);
+        } else {
+            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
+        };
+    }
 };
+class DebugLogger {
+    static getInstance() {
+        return DebugLogger.instance;
+    }
+    static enable(o) {
+        if (o?.enabled === false) {
+            DebugLogger.instance = new NoOpDebugLogger();
+            return;
+        }
+        DebugLogger.instance = new ActiveDebugLogger();
+        if (o) {
+            DebugLogger.instance.configure(o);
+        }
+    }
+    static disable() {
+        DebugLogger.instance = new NoOpDebugLogger();
+    }
+}
+DebugLogger.instance = new NoOpDebugLogger();
 
-exports.registerEvents = registerEvents;
-exports.unregisterEvents = unregisterEvents;
+exports.DebugLogger = DebugLogger;