assemblerjs 1.1.23 → 1.1.24

package/dist/index.d.ts

@@ -914,6 +914,10 @@ export declare interface JoinPoint {
     result?: any;
     /** The error thrown by the method (if any) */
     error?: any;
+    /** The name of the calling assemblage class (if available) */
+    caller?: string;
+    /** The identifier of the calling assemblage (if available) */
+    callerIdentifier?: string | symbol;
 }
 
 declare interface LifecycleManager {

package/dist/index13.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const core = require('@assemblerjs/core');
-const pointcutMatcher = require('./index40.js');
+const pointcutMatcher = require('./index41.js');
 const affect = require('./index12.js');
 const schema = require('./index38.js');
 

package/dist/index13.mjs

@@ -1,5 +1,5 @@
 import { isClass } from '@assemblerjs/core';
-import { PointcutMatcher } from './index40.mjs';
+import { PointcutMatcher } from './index41.mjs';
 import { getAffectedMethods } from './index12.mjs';
 import { getDefinition } from './index38.mjs';
 

package/dist/index39.js

@@ -2,110 +2,45 @@
 
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
-const transversalManager = require('./index13.js');
-const affect = require('./index12.js');
+const eventManager = require('./index6.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;
+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);
         }
-        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;
-                });
-            }
-            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;
+        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);
         }
     }
-    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);
+};
+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);
             }
-        };
-        return s();
+        }
     }
-}
+};
 
-exports.TransversalWeaver = TransversalWeaver;
+exports.registerEvents = registerEvents;
+exports.unregisterEvents = unregisterEvents;

package/dist/index39.mjs

@@ -1,107 +1,41 @@
-import { TransversalManager } from './index13.mjs';
-import { getAffectedMethods } from './index12.mjs';
+import { EventManager } from './index6.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;
+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 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;
-                });
-            }
-            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;
+        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);
         }
     }
-    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);
+};
+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);
             }
-        };
-        return s();
+        }
     }
-}
+};
 
-export { TransversalWeaver };
+export { registerEvents, unregisterEvents };

package/dist/index40.js

@@ -2,33 +2,128 @@
 
 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);
+const transversalManager = require('./index13.js');
+const affect = require('./index12.js');
+
+class TransversalWeaver {
+    static registerCaller(e, t, r) {
+        this.callerRegistry.set(e, {
+            className: t,
+            identifier: 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 getCallerMetadata(e) {
+        return this.callerRegistry.get(e);
     }
-    patternToRegex(t) {
-        if (t === '*') {
-            return /.*/;
+    static weave(r, n, s) {
+        const a = transversalManager.TransversalManager.getInstance(s);
+        const c = a.getAspectsForTarget(n);
+        const o = Object.getPrototypeOf(r);
+        const i = Object.getOwnPropertyNames(o).some((e)=>{
+            if (e === 'constructor') return false;
+            const r = Object.getOwnPropertyDescriptor(o, e);
+            if (!r) return false;
+            const n = r.value && typeof r.value === 'function';
+            const s = r.get && typeof r.get === 'function';
+            if (!n && !s) return false;
+            const a = affect.getAffectedMethods(o, e);
+            return a.length > 0;
+        });
+        if (c.length === 0 && !i) {
+            return r;
         }
-        const e = t.replace(/[.+?^${}()|[\]\\]/g, '\\$&').replace(/\*/g, '.*');
-        return new RegExp(`^${e}$`);
+        const l = new Proxy(r, {
+            get (e, t, r) {
+                const n = Reflect.get(e, t, r);
+                if (typeof n !== 'function') {
+                    return n;
+                }
+                return function(...r) {
+                    const s = String(t);
+                    const o = TransversalWeaver.callerRegistry.get(this);
+                    const i = {
+                        target: e,
+                        methodName: s,
+                        args: r,
+                        caller: o?.className,
+                        callerIdentifier: o?.identifier
+                    };
+                    const l = a.getAdvicesForJoinPoint(i, c, e, t);
+                    return TransversalWeaver.executeAdviceChain(l, n, e, r, i);
+                };
+            }
+        });
+        TransversalWeaver.callerRegistry.set(l, {
+            className: n.name,
+            identifier: n.name
+        });
+        return l;
     }
-    constructor(t, e){
-        this.classRegex = this.patternToRegex(t);
-        this.methodRegex = this.patternToRegex(e);
+    static executeAdviceChain(e, t, r, n, s) {
+        const a = e.filter((e)=>e.type === 'before');
+        const c = e.filter((e)=>e.type === 'around');
+        const o = e.filter((e)=>e.type === 'after');
+        try {
+            for (const e of a){
+                const t = {
+                    ...s,
+                    config: e.config
+                };
+                e.method.call(e.transversalInstance, t);
+            }
+            let e;
+            if (c.length > 0) {
+                e = this.buildAroundChain(c, t, r, n, s);
+            } else {
+                e = t.apply(r, n);
+            }
+            if (e instanceof Promise) {
+                return e.then((e)=>{
+                    for (const t of o){
+                        const r = {
+                            ...s,
+                            result: e
+                        };
+                        t.method.call(t.transversalInstance, r);
+                    }
+                    return e;
+                }).catch((e)=>{
+                    s.error = e;
+                    throw e;
+                });
+            }
+            for (const t of o){
+                const r = {
+                    ...s,
+                    result: e,
+                    config: t.config
+                };
+                t.method.call(t.transversalInstance, r);
+            }
+            return e;
+        } catch (e) {
+            s.error = e;
+            throw e;
+        }
+    }
+    static buildAroundChain(e, t, r, n, s) {
+        let a = 0;
+        const c = ()=>{
+            if (a < e.length) {
+                const t = e[a++];
+                const r = {
+                    ...s,
+                    proceed: c,
+                    config: t.config
+                };
+                return t.method.call(t.transversalInstance, r);
+            } else {
+                return t.apply(r, n);
+            }
+        };
+        return c();
     }
-};
+}
+TransversalWeaver.callerRegistry = new WeakMap();
 
-exports.PointcutMatcher = PointcutMatcher;
+exports.TransversalWeaver = TransversalWeaver;

package/dist/index40.mjs

@@ -1,30 +1,125 @@
-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);
+import { TransversalManager } from './index13.mjs';
+import { getAffectedMethods } from './index12.mjs';
+
+class TransversalWeaver {
+    static registerCaller(e, t, r) {
+        this.callerRegistry.set(e, {
+            className: t,
+            identifier: 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 getCallerMetadata(e) {
+        return this.callerRegistry.get(e);
     }
-    patternToRegex(t) {
-        if (t === '*') {
-            return /.*/;
+    static weave(r, n, s) {
+        const a = TransversalManager.getInstance(s);
+        const c = a.getAspectsForTarget(n);
+        const o = Object.getPrototypeOf(r);
+        const i = Object.getOwnPropertyNames(o).some((e)=>{
+            if (e === 'constructor') return false;
+            const r = Object.getOwnPropertyDescriptor(o, e);
+            if (!r) return false;
+            const n = r.value && typeof r.value === 'function';
+            const s = r.get && typeof r.get === 'function';
+            if (!n && !s) return false;
+            const a = getAffectedMethods(o, e);
+            return a.length > 0;
+        });
+        if (c.length === 0 && !i) {
+            return r;
         }
-        const e = t.replace(/[.+?^${}()|[\]\\]/g, '\\$&').replace(/\*/g, '.*');
-        return new RegExp(`^${e}$`);
+        const l = new Proxy(r, {
+            get (e, t, r) {
+                const n = Reflect.get(e, t, r);
+                if (typeof n !== 'function') {
+                    return n;
+                }
+                return function(...r) {
+                    const s = String(t);
+                    const o = TransversalWeaver.callerRegistry.get(this);
+                    const i = {
+                        target: e,
+                        methodName: s,
+                        args: r,
+                        caller: o?.className,
+                        callerIdentifier: o?.identifier
+                    };
+                    const l = a.getAdvicesForJoinPoint(i, c, e, t);
+                    return TransversalWeaver.executeAdviceChain(l, n, e, r, i);
+                };
+            }
+        });
+        TransversalWeaver.callerRegistry.set(l, {
+            className: n.name,
+            identifier: n.name
+        });
+        return l;
     }
-    constructor(t, e){
-        this.classRegex = this.patternToRegex(t);
-        this.methodRegex = this.patternToRegex(e);
+    static executeAdviceChain(e, t, r, n, s) {
+        const a = e.filter((e)=>e.type === 'before');
+        const c = e.filter((e)=>e.type === 'around');
+        const o = e.filter((e)=>e.type === 'after');
+        try {
+            for (const e of a){
+                const t = {
+                    ...s,
+                    config: e.config
+                };
+                e.method.call(e.transversalInstance, t);
+            }
+            let e;
+            if (c.length > 0) {
+                e = this.buildAroundChain(c, t, r, n, s);
+            } else {
+                e = t.apply(r, n);
+            }
+            if (e instanceof Promise) {
+                return e.then((e)=>{
+                    for (const t of o){
+                        const r = {
+                            ...s,
+                            result: e
+                        };
+                        t.method.call(t.transversalInstance, r);
+                    }
+                    return e;
+                }).catch((e)=>{
+                    s.error = e;
+                    throw e;
+                });
+            }
+            for (const t of o){
+                const r = {
+                    ...s,
+                    result: e,
+                    config: t.config
+                };
+                t.method.call(t.transversalInstance, r);
+            }
+            return e;
+        } catch (e) {
+            s.error = e;
+            throw e;
+        }
+    }
+    static buildAroundChain(e, t, r, n, s) {
+        let a = 0;
+        const c = ()=>{
+            if (a < e.length) {
+                const t = e[a++];
+                const r = {
+                    ...s,
+                    proceed: c,
+                    config: t.config
+                };
+                return t.method.call(t.transversalInstance, r);
+            } else {
+                return t.apply(r, n);
+            }
+        };
+        return c();
     }
-};
+}
+TransversalWeaver.callerRegistry = new WeakMap();
 
-export { PointcutMatcher };
+export { TransversalWeaver };

package/dist/index41.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;

package/dist/index41.mjs

@@ -1,41 +1,30 @@
-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);
-        }
-        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;
-    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);
     }
 };
 
-export { registerEvents, unregisterEvents };
+export { PointcutMatcher };

package/dist/index45.js

@@ -8,7 +8,7 @@ const reflection = require('./index36.js');
 const debugLogger = require('./index34.js');
 const injectableBuilder = require('./index50.js');
 const dependencies = require('./index51.js');
-const helpers = require('./index41.js');
+const helpers = require('./index39.js');
 const hookManager = require('./index31.js');
 const helpers$1 = require('./index3.js');
 const use = require('./index43.js');

package/dist/index45.mjs

@@ -4,7 +4,7 @@ import { defineCustomMetadata } from './index36.mjs';
 import { DebugLogger } from './index34.mjs';
 import { InjectableBuilder } from './index50.mjs';
 import { resolveDependencies } from './index51.mjs';
-import { unregisterEvents } from './index41.mjs';
+import { unregisterEvents } from './index39.mjs';
 import { HookManager } from './index31.mjs';
 import { isAssemblage } from './index3.mjs';
 import { isFactory } from './index43.mjs';

package/dist/index50.js

@@ -3,8 +3,8 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const dependencies = require('./index51.js');
-const transversalWeaver = require('./index39.js');
-const helpers = require('./index41.js');
+const transversalWeaver = require('./index40.js');
+const helpers = require('./index39.js');
 
 class InjectableBuilder {
     build(i) {

package/dist/index50.mjs

@@ -1,6 +1,6 @@
 import { resolveInjectableParameters } from './index51.mjs';
-import { TransversalWeaver } from './index39.mjs';
-import { registerEvents } from './index41.mjs';
+import { TransversalWeaver } from './index40.mjs';
+import { registerEvents } from './index39.mjs';
 
 class InjectableBuilder {
     build(i) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "assemblerjs",
   "description": "A general purpose Dependency Injection library for node and browser.",
-  "version": "1.1.23",
+  "version": "1.1.24",
   "author": "Benoît LAHOZ <info@benoitlahoz.io>",
   "bugs": "https://github.com/benoitlahoz/assemblerjs/issues",
   "homepage": "https://github.com/benoitlahoz/assemblerjs#README",