assemblerjs 1.1.26 → 1.1.27

package/dist/index13.js

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

package/dist/index13.mjs

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

package/dist/index32.js

@@ -44,7 +44,7 @@ function formatIdentifier(e) {
     }
     return String(e);
 }
-function c(e) {
+function a(e) {
     if (core.isClass(e)) {
         const t = e.prototype && Object.getOwnPropertyNames(e.prototype).length > 1;
         return t ? 'class' : 'class';
@@ -61,18 +61,18 @@ class InjectableManager {
         this.publicContext = t;
     }
     register(i, o = false) {
-        const a = debugLogger.DebugLogger.getInstance();
-        const c = o === true ? use.resolveInstanceInjectionTuple(i) : inject.resolveInjectionTuple(i);
-        if (this.has(c.identifier)) {
-            const e = `An assemblage is already registered with identifier '${c.identifier.name}'.`;
-            a.log('error', 'Duplicate registration', {
-                identifier: c.identifier.name,
+        const c = debugLogger.DebugLogger.getInstance();
+        const a = o === true ? use.resolveInstanceInjectionTuple(i) : inject.resolveInjectionTuple(i);
+        if (this.has(a.identifier)) {
+            const e = `An assemblage is already registered with identifier '${a.identifier.name}'.`;
+            c.log('error', 'Duplicate registration', {
+                identifier: a.identifier.name,
                 error: e
             });
             throw new Error(e);
         }
-        const f = injectable.Injectable.of(c, this.privateContext, this.publicContext);
-        a.logRegistration(f);
+        const f = injectable.Injectable.of(a, this.privateContext, this.publicContext);
+        c.logRegistration(f);
         this.injectables.set(f.identifier, f);
         if (f.concrete) {
             hookManager.HookManager.callHook(f.concrete, 'onRegister', this.publicContext, f.configuration);
@@ -83,44 +83,49 @@ class InjectableManager {
         return this.injectables.has(e);
     }
     require(e, t, n) {
+        const r = debugLogger.DebugLogger.getInstance();
+        const i = formatIdentifier(e);
+        const o = n ? formatIdentifier(n) : undefined;
+        r.logDependencyStart(i, o);
         if (!this.injectables.has(e)) {
-            const r = this.resolvingStack.has(e);
-            const i = r ? 'Circular dependency detected' : 'Dependency not registered';
-            const o = formatIdentifier(e);
-            const a = c(e);
+            const o = this.resolvingStack.has(e);
+            const s = o ? 'Circular dependency detected' : 'Dependency not registered';
+            const c = a(e);
             const f = t?.__paramIndex;
             const u = t?.__paramCount;
             const l = t?.__expectedType;
-            const g = r ? `Circular dependency detected: '${o}' is already being resolved.` : `Dependency '${o}' has not been registered (Class/Service not found in current assemblages).`;
-            const d = {
-                identifier: o,
+            const d = o ? `Circular dependency detected: '${i}' is already being resolved.` : `Dependency '${i}' has not been registered (Class/Service not found in current assemblages).`;
+            const g = {
+                identifier: i,
                 caller: n ? formatIdentifier(n) : 'unknown',
-                type: a,
-                error: g
+                type: c,
+                error: d
             };
             if (f !== undefined) {
-                d.paramIndex = f;
+                g.paramIndex = f;
             }
             if (u !== undefined) {
-                d.paramCount = u;
+                g.paramCount = u;
             }
             if (l !== undefined) {
                 const e = l?.name || formatIdentifier(l);
-                d.expectedType = e;
+                g.expectedType = e;
             }
-            debugLogger.DebugLogger.getInstance().log('error', i, d);
-            throw new Error(g);
+            r.log('error', s, g);
+            r.logDependencyEnd(i);
+            throw new Error(d);
         }
-        const r = this.injectables.get(e);
-        this.resolvingStack.add(r.identifier);
+        const c = this.injectables.get(e);
+        this.resolvingStack.add(c.identifier);
         try {
-            if (r.isSingleton) {
-                return this.singletonStrategy.resolve(r, t);
+            if (c.isSingleton) {
+                return this.singletonStrategy.resolve(c, t);
             } else {
-                return this.transientStrategy.resolve(r, t);
+                return this.transientStrategy.resolve(c, t);
             }
         } finally{
-            this.resolvingStack.delete(r.identifier);
+            this.resolvingStack.delete(c.identifier);
+            r.logDependencyEnd(i);
         }
     }
     concrete(e) {

package/dist/index32.mjs

@@ -40,7 +40,7 @@ function formatIdentifier(e) {
     }
     return String(e);
 }
-function c(e) {
+function a(e) {
     if (isClass(e)) {
         const t = e.prototype && Object.getOwnPropertyNames(e.prototype).length > 1;
         return t ? 'class' : 'class';
@@ -57,18 +57,18 @@ class InjectableManager {
         this.publicContext = t;
     }
     register(i, o = false) {
-        const a = DebugLogger.getInstance();
-        const c = o === true ? resolveInstanceInjectionTuple(i) : resolveInjectionTuple(i);
-        if (this.has(c.identifier)) {
-            const e = `An assemblage is already registered with identifier '${c.identifier.name}'.`;
-            a.log('error', 'Duplicate registration', {
-                identifier: c.identifier.name,
+        const c = DebugLogger.getInstance();
+        const a = o === true ? resolveInstanceInjectionTuple(i) : resolveInjectionTuple(i);
+        if (this.has(a.identifier)) {
+            const e = `An assemblage is already registered with identifier '${a.identifier.name}'.`;
+            c.log('error', 'Duplicate registration', {
+                identifier: a.identifier.name,
                 error: e
             });
             throw new Error(e);
         }
-        const f = Injectable.of(c, this.privateContext, this.publicContext);
-        a.logRegistration(f);
+        const f = Injectable.of(a, this.privateContext, this.publicContext);
+        c.logRegistration(f);
         this.injectables.set(f.identifier, f);
         if (f.concrete) {
             HookManager.callHook(f.concrete, 'onRegister', this.publicContext, f.configuration);
@@ -79,44 +79,49 @@ class InjectableManager {
         return this.injectables.has(e);
     }
     require(e, t, n) {
+        const r = DebugLogger.getInstance();
+        const i = formatIdentifier(e);
+        const o = n ? formatIdentifier(n) : undefined;
+        r.logDependencyStart(i, o);
         if (!this.injectables.has(e)) {
-            const r = this.resolvingStack.has(e);
-            const i = r ? 'Circular dependency detected' : 'Dependency not registered';
-            const o = formatIdentifier(e);
-            const a = c(e);
+            const o = this.resolvingStack.has(e);
+            const s = o ? 'Circular dependency detected' : 'Dependency not registered';
+            const c = a(e);
             const f = t?.__paramIndex;
             const u = t?.__paramCount;
             const l = t?.__expectedType;
-            const g = r ? `Circular dependency detected: '${o}' is already being resolved.` : `Dependency '${o}' has not been registered (Class/Service not found in current assemblages).`;
-            const d = {
-                identifier: o,
+            const d = o ? `Circular dependency detected: '${i}' is already being resolved.` : `Dependency '${i}' has not been registered (Class/Service not found in current assemblages).`;
+            const g = {
+                identifier: i,
                 caller: n ? formatIdentifier(n) : 'unknown',
-                type: a,
-                error: g
+                type: c,
+                error: d
             };
             if (f !== undefined) {
-                d.paramIndex = f;
+                g.paramIndex = f;
             }
             if (u !== undefined) {
-                d.paramCount = u;
+                g.paramCount = u;
             }
             if (l !== undefined) {
                 const e = l?.name || formatIdentifier(l);
-                d.expectedType = e;
+                g.expectedType = e;
             }
-            DebugLogger.getInstance().log('error', i, d);
-            throw new Error(g);
+            r.log('error', s, g);
+            r.logDependencyEnd(i);
+            throw new Error(d);
         }
-        const r = this.injectables.get(e);
-        this.resolvingStack.add(r.identifier);
+        const c = this.injectables.get(e);
+        this.resolvingStack.add(c.identifier);
         try {
-            if (r.isSingleton) {
-                return this.singletonStrategy.resolve(r, t);
+            if (c.isSingleton) {
+                return this.singletonStrategy.resolve(c, t);
             } else {
-                return this.transientStrategy.resolve(r, t);
+                return this.transientStrategy.resolve(c, t);
             }
         } finally{
-            this.resolvingStack.delete(r.identifier);
+            this.resolvingStack.delete(c.identifier);
+            r.logDependencyEnd(i);
         }
     }
     concrete(e) {

package/dist/index37.js

@@ -13,9 +13,9 @@ function e(e) {
         return 'AnonymousFunction';
     }
     if (typeof e === 'object') {
-        const o = e.constructor?.name;
-        if (o && o !== 'Object') {
-            return o;
+        const t = e.constructor?.name;
+        if (t && t !== 'Object') {
+            return t;
         }
         if (e.name && typeof e.name === 'string') {
             return e.name;
@@ -26,16 +26,18 @@ function e(e) {
 }
 let NoOpDebugLogger = class NoOpDebugLogger {
     configure(e) {}
-    log(e, o, t) {}
+    log(e, t, n) {}
     logBuildStart(e) {}
-    logBuildEnd(e, o) {}
+    logBuildEnd(e, t) {}
     logRegistration(e) {}
-    logHook(e, o, t) {}
-    logPhaseStart(e, o) {}
-    logPhaseEnd(e, o, t) {}
-    logResolution(e, o, t) {}
+    logHook(e, t, n) {}
+    logPhaseStart(e, t) {}
+    logPhaseEnd(e, t, n) {}
+    logResolution(e, t, n) {}
     logConstruction(e) {}
-    logInjection(e, o) {}
+    logInjection(e, t) {}
+    logDependencyStart(e, t) {}
+    logDependencyEnd(e) {}
 };
 let ActiveDebugLogger = class ActiveDebugLogger {
     configure(e) {
@@ -53,90 +55,124 @@ let ActiveDebugLogger = class ActiveDebugLogger {
             entry: e.name
         });
     }
-    logBuildEnd(e, o) {
-        const t = {
+    logBuildEnd(e, t) {
+        const n = {
             entry: e.name
         };
-        if (o !== undefined) t.duration = `${o.toFixed(2)}ms`;
-        this.log('info', 'Build completed', t);
+        if (t !== undefined) n.duration = `${t.toFixed(2)}ms`;
+        this.log('info', 'Build completed', n);
     }
-    logRegistration(o) {
+    logRegistration(t) {
         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
+            identifier: e(t.identifier),
+            isSingleton: t.isSingleton,
+            dependencies: t.dependencies.map((t)=>e(t)),
+            tags: t.tags
         });
     }
-    logHook(o, t, n) {
+    logHook(t, n, o) {
         if (!this.shouldLog('hooks')) return;
         const i = this.options.logTimings ? performance.now() : 0;
-        this.log('info', `Hook: ${o}`, {
-            target: e(t),
-            config: n
+        this.log('info', `Hook: ${t}`, {
+            target: e(n),
+            config: o
         });
         if (this.options.logTimings) {
             return ()=>{
                 const e = performance.now() - i;
-                this.log('info', `Hook: ${o} completed`, {
+                this.log('info', `Hook: ${t} completed`, {
                     duration: `${e.toFixed(2)}ms`
                 });
             };
         }
     }
-    logPhaseStart(e, o) {
-        this.log('info', `Phase: ${e} started`, o);
+    logPhaseStart(e, t) {
+        this.log('info', `Phase: ${e} started`, t);
     }
-    logPhaseEnd(e, o, t) {
-        const n = o !== undefined ? {
-            duration: `${o.toFixed(2)}ms`
+    logPhaseEnd(e, t, n) {
+        const o = t !== undefined ? {
+            duration: `${t.toFixed(2)}ms`
         } : {};
-        if (t) {
-            Object.assign(n, t);
+        if (n) {
+            Object.assign(o, n);
         }
-        this.log('info', `Phase: ${e} ended`, Object.keys(n).length > 0 ? n : undefined);
+        this.log('info', `Phase: ${e} ended`, Object.keys(o).length > 0 ? o : undefined);
     }
-    logResolution(e, o, t) {
+    logResolution(e, t, n) {
         if (!this.shouldLog('resolution')) return;
         this.log('info', `Resolving: ${e}`, {
-            strategy: `${o} strategy`,
-            cache: t ? 'hit' : 'miss'
+            strategy: `${t} strategy`,
+            cache: n ? 'hit' : 'miss'
         });
     }
     logConstruction(e) {
         if (!this.shouldLog('construction')) return;
         this.log('info', `Constructing: ${e}`);
     }
-    logInjection(e, o) {
+    logInjection(e, t) {
         if (!this.shouldLog(e === 'use' ? 'injectionUse' : 'injectionGlobal')) return;
-        this.log('info', `Injecting: @${e === 'use' ? 'Use' : 'Global'}`, o);
+        this.log('info', `Injecting: @${e === 'use' ? 'Use' : 'Global'}`, t);
     }
     shouldLog(e) {
         return !this.options.logPhases || this.options.logPhases[e] !== false;
     }
-    log(e, o, t) {
+    log(e, t, n) {
         if (this.options.logger) {
-            this.options.logger(e, o, t);
+            this.options.logger(e, t, n);
         } else {
-            const n = `[Assembler:${e}]`;
-            const i = this.options.useColors !== false ? this.colorize(e, n) : n;
-            if (t) {
-                console.log(`${i} ${o}`, t);
+            const o = `[Assembler:${e}]`;
+            const i = this.options.useColors !== false ? this.colorize(e, o) : o;
+            if (n) {
+                console.log(`${i} ${t}`, n);
             } else {
-                console.log(`${i} ${o}`);
+                console.log(`${i} ${t}`);
             }
         }
     }
-    colorize(e, o) {
-        const t = {
+    colorize(e, t) {
+        const n = {
             info: '\x1b[36m',
             warn: '\x1b[33m',
             error: '\x1b[31m',
             reset: '\x1b[0m'
         };
-        const n = t[e] || t.info;
-        return `${n}${o}${t.reset}`;
+        const o = n[e] || n.info;
+        return `${o}${t}${n.reset}`;
+    }
+    logDependencyStart(e, t) {
+        if (!this.options.logDependencyTree) return;
+        const n = this.dependencyStack.length;
+        const o = '  '.repeat(n);
+        const i = this.visitedDependencies.has(e);
+        this.dependencyStack.push({
+            identifier: e,
+            caller: t
+        });
+        if (i) {
+            this.log('warn', `${o}🔄 ${e} (CYCLE DETECTED)`, t ? {
+                caller: t
+            } : undefined);
+        } else {
+            this.visitedDependencies.add(e);
+            this.log('info', `${o}📦 ${e}`, t ? {
+                caller: t
+            } : undefined);
+        }
+    }
+    logDependencyEnd(e) {
+        if (!this.options.logDependencyTree) return;
+        const t = this.dependencyStack.pop();
+        if (t?.identifier !== e) {
+            this.log('error', 'Dependency stack corruption', {
+                expected: e,
+                actual: t?.identifier,
+                stackDepth: this.dependencyStack.length
+            });
+        }
+        if (this.dependencyStack.length === 0) {
+            this.visitedDependencies.clear();
+        }
     }
     constructor(){
         this.options = {
@@ -156,6 +192,8 @@ let ActiveDebugLogger = class ActiveDebugLogger {
             logDependencyTree: true,
             useColors: true
         };
+        this.dependencyStack = [];
+        this.visitedDependencies = new Set();
     }
 };
 class DebugLogger {

package/dist/index37.mjs

@@ -9,9 +9,9 @@ function e(e) {
         return 'AnonymousFunction';
     }
     if (typeof e === 'object') {
-        const o = e.constructor?.name;
-        if (o && o !== 'Object') {
-            return o;
+        const t = e.constructor?.name;
+        if (t && t !== 'Object') {
+            return t;
         }
         if (e.name && typeof e.name === 'string') {
             return e.name;
@@ -22,16 +22,18 @@ function e(e) {
 }
 let NoOpDebugLogger = class NoOpDebugLogger {
     configure(e) {}
-    log(e, o, t) {}
+    log(e, t, n) {}
     logBuildStart(e) {}
-    logBuildEnd(e, o) {}
+    logBuildEnd(e, t) {}
     logRegistration(e) {}
-    logHook(e, o, t) {}
-    logPhaseStart(e, o) {}
-    logPhaseEnd(e, o, t) {}
-    logResolution(e, o, t) {}
+    logHook(e, t, n) {}
+    logPhaseStart(e, t) {}
+    logPhaseEnd(e, t, n) {}
+    logResolution(e, t, n) {}
     logConstruction(e) {}
-    logInjection(e, o) {}
+    logInjection(e, t) {}
+    logDependencyStart(e, t) {}
+    logDependencyEnd(e) {}
 };
 let ActiveDebugLogger = class ActiveDebugLogger {
     configure(e) {
@@ -49,90 +51,124 @@ let ActiveDebugLogger = class ActiveDebugLogger {
             entry: e.name
         });
     }
-    logBuildEnd(e, o) {
-        const t = {
+    logBuildEnd(e, t) {
+        const n = {
             entry: e.name
         };
-        if (o !== undefined) t.duration = `${o.toFixed(2)}ms`;
-        this.log('info', 'Build completed', t);
+        if (t !== undefined) n.duration = `${t.toFixed(2)}ms`;
+        this.log('info', 'Build completed', n);
     }
-    logRegistration(o) {
+    logRegistration(t) {
         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
+            identifier: e(t.identifier),
+            isSingleton: t.isSingleton,
+            dependencies: t.dependencies.map((t)=>e(t)),
+            tags: t.tags
         });
     }
-    logHook(o, t, n) {
+    logHook(t, n, o) {
         if (!this.shouldLog('hooks')) return;
         const i = this.options.logTimings ? performance.now() : 0;
-        this.log('info', `Hook: ${o}`, {
-            target: e(t),
-            config: n
+        this.log('info', `Hook: ${t}`, {
+            target: e(n),
+            config: o
         });
         if (this.options.logTimings) {
             return ()=>{
                 const e = performance.now() - i;
-                this.log('info', `Hook: ${o} completed`, {
+                this.log('info', `Hook: ${t} completed`, {
                     duration: `${e.toFixed(2)}ms`
                 });
             };
         }
     }
-    logPhaseStart(e, o) {
-        this.log('info', `Phase: ${e} started`, o);
+    logPhaseStart(e, t) {
+        this.log('info', `Phase: ${e} started`, t);
     }
-    logPhaseEnd(e, o, t) {
-        const n = o !== undefined ? {
-            duration: `${o.toFixed(2)}ms`
+    logPhaseEnd(e, t, n) {
+        const o = t !== undefined ? {
+            duration: `${t.toFixed(2)}ms`
         } : {};
-        if (t) {
-            Object.assign(n, t);
+        if (n) {
+            Object.assign(o, n);
         }
-        this.log('info', `Phase: ${e} ended`, Object.keys(n).length > 0 ? n : undefined);
+        this.log('info', `Phase: ${e} ended`, Object.keys(o).length > 0 ? o : undefined);
     }
-    logResolution(e, o, t) {
+    logResolution(e, t, n) {
         if (!this.shouldLog('resolution')) return;
         this.log('info', `Resolving: ${e}`, {
-            strategy: `${o} strategy`,
-            cache: t ? 'hit' : 'miss'
+            strategy: `${t} strategy`,
+            cache: n ? 'hit' : 'miss'
         });
     }
     logConstruction(e) {
         if (!this.shouldLog('construction')) return;
         this.log('info', `Constructing: ${e}`);
     }
-    logInjection(e, o) {
+    logInjection(e, t) {
         if (!this.shouldLog(e === 'use' ? 'injectionUse' : 'injectionGlobal')) return;
-        this.log('info', `Injecting: @${e === 'use' ? 'Use' : 'Global'}`, o);
+        this.log('info', `Injecting: @${e === 'use' ? 'Use' : 'Global'}`, t);
     }
     shouldLog(e) {
         return !this.options.logPhases || this.options.logPhases[e] !== false;
     }
-    log(e, o, t) {
+    log(e, t, n) {
         if (this.options.logger) {
-            this.options.logger(e, o, t);
+            this.options.logger(e, t, n);
         } else {
-            const n = `[Assembler:${e}]`;
-            const i = this.options.useColors !== false ? this.colorize(e, n) : n;
-            if (t) {
-                console.log(`${i} ${o}`, t);
+            const o = `[Assembler:${e}]`;
+            const i = this.options.useColors !== false ? this.colorize(e, o) : o;
+            if (n) {
+                console.log(`${i} ${t}`, n);
             } else {
-                console.log(`${i} ${o}`);
+                console.log(`${i} ${t}`);
             }
         }
     }
-    colorize(e, o) {
-        const t = {
+    colorize(e, t) {
+        const n = {
             info: '\x1b[36m',
             warn: '\x1b[33m',
             error: '\x1b[31m',
             reset: '\x1b[0m'
         };
-        const n = t[e] || t.info;
-        return `${n}${o}${t.reset}`;
+        const o = n[e] || n.info;
+        return `${o}${t}${n.reset}`;
+    }
+    logDependencyStart(e, t) {
+        if (!this.options.logDependencyTree) return;
+        const n = this.dependencyStack.length;
+        const o = '  '.repeat(n);
+        const i = this.visitedDependencies.has(e);
+        this.dependencyStack.push({
+            identifier: e,
+            caller: t
+        });
+        if (i) {
+            this.log('warn', `${o}🔄 ${e} (CYCLE DETECTED)`, t ? {
+                caller: t
+            } : undefined);
+        } else {
+            this.visitedDependencies.add(e);
+            this.log('info', `${o}📦 ${e}`, t ? {
+                caller: t
+            } : undefined);
+        }
+    }
+    logDependencyEnd(e) {
+        if (!this.options.logDependencyTree) return;
+        const t = this.dependencyStack.pop();
+        if (t?.identifier !== e) {
+            this.log('error', 'Dependency stack corruption', {
+                expected: e,
+                actual: t?.identifier,
+                stackDepth: this.dependencyStack.length
+            });
+        }
+        if (this.dependencyStack.length === 0) {
+            this.visitedDependencies.clear();
+        }
     }
     constructor(){
         this.options = {
@@ -152,6 +188,8 @@ let ActiveDebugLogger = class ActiveDebugLogger {
             logDependencyTree: true,
             useColors: true
         };
+        this.dependencyStack = [];
+        this.visitedDependencies = new Set();
     }
 };
 class DebugLogger {

package/dist/index39.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/index39.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/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/index45.js

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

package/dist/index45.mjs

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

package/dist/index50.js

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

package/dist/index50.mjs

@@ -1,6 +1,6 @@
 import { resolveInjectableParameters } from './index51.mjs';
 import { TransversalWeaver } from './index14.mjs';
-import { registerEvents } from './index39.mjs';
+import { registerEvents } from './index41.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.26",
+  "version": "1.1.27",
   "author": "Benoît LAHOZ <info@benoitlahoz.io>",
   "bugs": "https://github.com/benoitlahoz/assemblerjs/issues",
   "homepage": "https://github.com/benoitlahoz/assemblerjs#README",