assemblerjs 1.1.21 → 1.1.23

package/dist/index40.js

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

package/dist/index40.mjs

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

package/dist/index41.js

@@ -2,33 +2,45 @@
 
 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 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);
         }
-        const [, c, r] = e;
-        return new ExecutionPointcutMatcher(c, r);
-    }
-}
-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 /.*/;
+        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);
         }
-        const e = t.replace(/[.+?^${}()|[\]\\]/g, '\\$&').replace(/\*/g, '.*');
-        return new RegExp(`^${e}$`);
     }
-    constructor(t, e){
-        this.classRegex = this.patternToRegex(t);
-        this.methodRegex = this.patternToRegex(e);
+};
+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);
+            }
+        }
     }
 };
 
-exports.PointcutMatcher = PointcutMatcher;
+exports.registerEvents = registerEvents;
+exports.unregisterEvents = unregisterEvents;

package/dist/index41.mjs

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

package/dist/index42.js

@@ -2,53 +2,33 @@
 
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
-const core = require('@assemblerjs/core');
+class SingletonStrategy {
+    resolve(t, e) {
+        const n = t.identifier;
+        if (this.cache.has(n)) {
+            return this.cache.get(n);
+        }
+        const o = t.build(e);
+        const r = e ? {
+            ...t.configuration,
+            ...e
+        } : t.configuration;
+        t.setSingletonInstance(o, r);
+        this.cache.set(n, o);
+        t.privateContext.prepareInitHook(o, t.configuration);
+        return o;
+    }
+    constructor(){
+        this.cache = new Map();
+    }
+}
+class TransientStrategy {
+    resolve(t, e) {
+        const n = t.build(e);
+        t.privateContext.prepareInitHook(n, t.configuration);
+        return n;
+    }
+}
 
-const i = (e)=>{
-    return {
-        identifier: e[0],
-        concrete: e[0],
-        configuration: {}
-    };
-};
-const c = (o)=>{
-    const i = ()=>core.isClass(o[0]) && core.isClass(o[1]);
-    const c = ()=>core.isClass(o[0]) && core.isObject(o[1]);
-    const s = ()=>core.pipe(core.conditionally({
-            if: ()=>i(),
-            then: ()=>{
-                return {
-                    identifier: o[0],
-                    concrete: o[1],
-                    configuration: {}
-                };
-            }
-        }), core.conditionally({
-            if: ()=>c(),
-            then: ()=>{
-                return {
-                    identifier: o[0],
-                    concrete: o[0],
-                    configuration: o[1]
-                };
-            },
-            else: (e)=>e
-        }))();
-    return s();
-};
-const s = (e)=>{
-    return {
-        identifier: e[0],
-        concrete: e[1],
-        configuration: e[2]
-    };
-};
-const resolveInjectionTuple = (e)=>core.switchCase({
-        1: ()=>i(e),
-        2: ()=>c(e),
-        3: ()=>s(e)
-    }, ()=>{
-        throw new Error(`Injection tuple must be of length 1, 2 or 3.`);
-    })(e.length);
-
-exports.resolveInjectionTuple = resolveInjectionTuple;
+exports.SingletonStrategy = SingletonStrategy;
+exports.TransientStrategy = TransientStrategy;

package/dist/index42.mjs

@@ -1,50 +1,29 @@
-import { switchCase, pipe, conditionally, isClass, isObject } from '@assemblerjs/core';
+class SingletonStrategy {
+    resolve(t, e) {
+        const n = t.identifier;
+        if (this.cache.has(n)) {
+            return this.cache.get(n);
+        }
+        const o = t.build(e);
+        const r = e ? {
+            ...t.configuration,
+            ...e
+        } : t.configuration;
+        t.setSingletonInstance(o, r);
+        this.cache.set(n, o);
+        t.privateContext.prepareInitHook(o, t.configuration);
+        return o;
+    }
+    constructor(){
+        this.cache = new Map();
+    }
+}
+class TransientStrategy {
+    resolve(t, e) {
+        const n = t.build(e);
+        t.privateContext.prepareInitHook(n, t.configuration);
+        return n;
+    }
+}
 
-const i = (e)=>{
-    return {
-        identifier: e[0],
-        concrete: e[0],
-        configuration: {}
-    };
-};
-const c = (o)=>{
-    const i = ()=>isClass(o[0]) && isClass(o[1]);
-    const c = ()=>isClass(o[0]) && isObject(o[1]);
-    const s = ()=>pipe(conditionally({
-            if: ()=>i(),
-            then: ()=>{
-                return {
-                    identifier: o[0],
-                    concrete: o[1],
-                    configuration: {}
-                };
-            }
-        }), conditionally({
-            if: ()=>c(),
-            then: ()=>{
-                return {
-                    identifier: o[0],
-                    concrete: o[0],
-                    configuration: o[1]
-                };
-            },
-            else: (e)=>e
-        }))();
-    return s();
-};
-const s = (e)=>{
-    return {
-        identifier: e[0],
-        concrete: e[1],
-        configuration: e[2]
-    };
-};
-const resolveInjectionTuple = (e)=>switchCase({
-        1: ()=>i(e),
-        2: ()=>c(e),
-        3: ()=>s(e)
-    }, ()=>{
-        throw new Error(`Injection tuple must be of length 1, 2 or 3.`);
-    })(e.length);
-
-export { resolveInjectionTuple };
+export { SingletonStrategy, TransientStrategy };

package/dist/index44.js

@@ -2,33 +2,53 @@
 
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
-class SingletonStrategy {
-    resolve(t, e) {
-        const n = t.identifier;
-        if (this.cache.has(n)) {
-            return this.cache.get(n);
-        }
-        const o = t.build(e);
-        const r = e ? {
-            ...t.configuration,
-            ...e
-        } : t.configuration;
-        t.setSingletonInstance(o, r);
-        this.cache.set(n, o);
-        t.privateContext.prepareInitHook(o, t.configuration);
-        return o;
-    }
-    constructor(){
-        this.cache = new Map();
-    }
-}
-class TransientStrategy {
-    resolve(t, e) {
-        const n = t.build(e);
-        t.privateContext.prepareInitHook(n, t.configuration);
-        return n;
-    }
-}
+const core = require('@assemblerjs/core');
 
-exports.SingletonStrategy = SingletonStrategy;
-exports.TransientStrategy = TransientStrategy;
+const i = (e)=>{
+    return {
+        identifier: e[0],
+        concrete: e[0],
+        configuration: {}
+    };
+};
+const c = (o)=>{
+    const i = ()=>core.isClass(o[0]) && core.isClass(o[1]);
+    const c = ()=>core.isClass(o[0]) && core.isObject(o[1]);
+    const s = ()=>core.pipe(core.conditionally({
+            if: ()=>i(),
+            then: ()=>{
+                return {
+                    identifier: o[0],
+                    concrete: o[1],
+                    configuration: {}
+                };
+            }
+        }), core.conditionally({
+            if: ()=>c(),
+            then: ()=>{
+                return {
+                    identifier: o[0],
+                    concrete: o[0],
+                    configuration: o[1]
+                };
+            },
+            else: (e)=>e
+        }))();
+    return s();
+};
+const s = (e)=>{
+    return {
+        identifier: e[0],
+        concrete: e[1],
+        configuration: e[2]
+    };
+};
+const resolveInjectionTuple = (e)=>core.switchCase({
+        1: ()=>i(e),
+        2: ()=>c(e),
+        3: ()=>s(e)
+    }, ()=>{
+        throw new Error(`Injection tuple must be of length 1, 2 or 3.`);
+    })(e.length);
+
+exports.resolveInjectionTuple = resolveInjectionTuple;