assemblerjs 1.1.19 → 1.1.20

package/dist/index38.mjs

@@ -1,168 +1,41 @@
-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;
+import { EventManager } from './index6.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);
         }
-        return 'AnonymousFunction';
-    }
-    if (typeof o === 'object') {
-        const e = o.constructor?.name;
-        if (e && e !== 'Object') {
-            return e;
+        for (const e of t.events){
+            n.on(e, (...n)=>{
+                t.privateContext.emit(e, ...n);
+            });
         }
-        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);
         }
-        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
-        });
-    }
-    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}`);
+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);
             }
         }
     }
-    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();
 
-export { DebugLogger };
+export { registerEvents, unregisterEvents };

package/dist/index39.js

@@ -2,68 +2,110 @@
 
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
-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(' → ')
-                    });
+const transversalManager = require('./index13.js');
+const affect = require('./index12.js');
+
+class TransversalWeaver {
+    static weave(n, r, o) {
+        const c = transversalManager.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 = affect.getAffectedMethods(a, t);
+            return c.length > 0;
+        });
+        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);
+                };
             }
-        }
-        return c;
+        });
     }
-    hasCycleDFS(e, t, c, s, n) {
-        if (c.has(e)) {
-            t.push(e);
-            return true;
-        }
-        if (s.has(e)) {
-            return false;
-        }
-        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;
-                }
+    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;
+                });
+            }
+            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;
         }
-        c.delete(e);
-        s.add(e);
-        return false;
     }
-};
-class CycleDetector {
-    static getInstance() {
-        return CycleDetector.instance;
-    }
-    static enable() {
-        CycleDetector.instance = new ActiveCycleDetector();
-    }
-    static disable() {
-        CycleDetector.instance = new NoOpCycleDetector();
+    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();
     }
 }
-CycleDetector.instance = new NoOpCycleDetector();
 
-exports.CycleDetector = CycleDetector;
+exports.TransversalWeaver = TransversalWeaver;

package/dist/index39.mjs

@@ -1,65 +1,107 @@
-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(' → ')
-                    });
+import { TransversalManager } from './index13.mjs';
+import { getAffectedMethods } from './index12.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;
+        });
+        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);
+                };
             }
-        }
-        return c;
+        });
     }
-    hasCycleDFS(e, t, c, s, n) {
-        if (c.has(e)) {
-            t.push(e);
-            return true;
-        }
-        if (s.has(e)) {
-            return false;
-        }
-        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;
-                }
+    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;
+                });
+            }
+            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;
         }
-        c.delete(e);
-        s.add(e);
-        return false;
     }
-};
-class CycleDetector {
-    static getInstance() {
-        return CycleDetector.instance;
-    }
-    static enable() {
-        CycleDetector.instance = new ActiveCycleDetector();
-    }
-    static disable() {
-        CycleDetector.instance = new NoOpCycleDetector();
+    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();
     }
 }
-CycleDetector.instance = new NoOpCycleDetector();
 
-export { CycleDetector };
+export { TransversalWeaver };

package/dist/index4.js

@@ -3,13 +3,13 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const core = require('@assemblerjs/core');
-const injectableManager = require('./index33.js');
-const objectManager = require('./index34.js');
-const hookManager = require('./index35.js');
-const assemblerBuilder = require('./index36.js');
-const contextProvider = require('./index37.js');
-const debugLogger = require('./index38.js');
-const cycleDetector = require('./index39.js');
+const injectableManager = require('./index31.js');
+const objectManager = require('./index32.js');
+const hookManager = require('./index33.js');
+const assemblerBuilder = require('./index34.js');
+const contextProvider = require('./index35.js');
+const debugLogger = require('./index36.js');
+const cycleDetector = require('./index37.js');
 const eventManager = require('./index6.js');
 
 class Assembler extends eventManager.EventManager {

package/dist/index4.mjs

@@ -1,11 +1,11 @@
 import { clearInstance } from '@assemblerjs/core';
-import { InjectableManager } from './index33.mjs';
-import { ObjectManager } from './index34.mjs';
-import { HookManager } from './index35.mjs';
-import { AssemblerBuilder } from './index36.mjs';
-import { ContextProvider } from './index37.mjs';
-import { DebugLogger } from './index38.mjs';
-import { CycleDetector } from './index39.mjs';
+import { InjectableManager } from './index31.mjs';
+import { ObjectManager } from './index32.mjs';
+import { HookManager } from './index33.mjs';
+import { AssemblerBuilder } from './index34.mjs';
+import { ContextProvider } from './index35.mjs';
+import { DebugLogger } from './index36.mjs';
+import { CycleDetector } from './index37.mjs';
 import { EventManager } from './index6.mjs';
 
 class Assembler extends EventManager {

package/dist/index40.js

@@ -2,45 +2,33 @@
 
 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);
-        }
-        for (const e of t.events){
-            n.on(e, (...n)=>{
-                t.privateContext.emit(e, ...n);
-            });
-        }
-    } else {
-        for (const e of t.events){
-            if (!t.privateContext.events.has(e)) t.privateContext.addChannels(e);
+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);
     }
-};
-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 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}$`);
+    }
+    constructor(t, e){
+        this.classRegex = this.patternToRegex(t);
+        this.methodRegex = this.patternToRegex(e);
     }
 };
 
-exports.registerEvents = registerEvents;
-exports.unregisterEvents = unregisterEvents;
+exports.PointcutMatcher = PointcutMatcher;