assemblerjs 1.1.5 → 1.1.7

package/dist/index.d.ts

@@ -835,6 +835,7 @@ declare class Injectable<T> implements AbstractInjectable<T> {
 
 declare class InjectableManager {
     private injectables;
+    private resolvingStack;
     private privateContext;
     private publicContext;
     private singletonStrategy;

package/dist/index13.js

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

package/dist/index13.mjs

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

package/dist/index18.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const parameterDecoratorFactory = require('./index17.js');
-const resolverStore = require('./index40.js');
+const resolverStore = require('./index38.js');
 
 let ContextResolver = class ContextResolver {
     resolve(e, r, t) {

package/dist/index18.mjs

@@ -1,5 +1,5 @@
 import { ParameterDecoratorFactory } from './index17.mjs';
-import { ResolverStore } from './index40.mjs';
+import { ResolverStore } from './index38.mjs';
 
 let ContextResolver = class ContextResolver {
     resolve(e, r, t) {

package/dist/index19.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const parameterDecoratorFactory = require('./index17.js');
-const resolverStore = require('./index40.js');
+const resolverStore = require('./index38.js');
 
 let ConfigurationResolver = class ConfigurationResolver {
     resolve(r, o, e, n) {

package/dist/index19.mjs

@@ -1,5 +1,5 @@
 import { ParameterDecoratorFactory } from './index17.mjs';
-import { ResolverStore } from './index40.mjs';
+import { ResolverStore } from './index38.mjs';
 
 let ConfigurationResolver = class ConfigurationResolver {
     resolve(r, o, e, n) {

package/dist/index20.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const parameterDecoratorFactory = require('./index17.js');
-const resolverStore = require('./index40.js');
+const resolverStore = require('./index38.js');
 
 let DefinitionResolver = class DefinitionResolver {
     resolve(e, r) {

package/dist/index20.mjs

@@ -1,5 +1,5 @@
 import { ParameterDecoratorFactory } from './index17.mjs';
-import { ResolverStore } from './index40.mjs';
+import { ResolverStore } from './index38.mjs';
 
 let DefinitionResolver = class DefinitionResolver {
     resolve(e, r) {

package/dist/index21.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const parameterDecoratorFactory = require('./index17.js');
-const resolverStore = require('./index40.js');
+const resolverStore = require('./index38.js');
 
 let DisposeResolver = class DisposeResolver {
     resolve(e, r, s) {

package/dist/index21.mjs

@@ -1,5 +1,5 @@
 import { ParameterDecoratorFactory } from './index17.mjs';
-import { ResolverStore } from './index40.mjs';
+import { ResolverStore } from './index38.mjs';
 
 let DisposeResolver = class DisposeResolver {
     resolve(e, r, s) {

package/dist/index22.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 const reflection = require('./index29.js');
 const parameterDecoratorFactory = require('./index17.js');
 const helpers = require('./index25.js');
-const resolverStore = require('./index40.js');
+const resolverStore = require('./index38.js');
 
 let UseResolver = class UseResolver {
     resolve(r, o, t) {

package/dist/index22.mjs

@@ -1,7 +1,7 @@
 import { getOwnCustomMetadata } from './index29.mjs';
 import { ParameterDecoratorFactory } from './index17.mjs';
 import { getParamValueKey } from './index25.mjs';
-import { ResolverStore } from './index40.mjs';
+import { ResolverStore } from './index38.mjs';
 
 let UseResolver = class UseResolver {
     resolve(r, o, t) {

package/dist/index23.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 const reflection = require('./index29.js');
 const parameterDecoratorFactory = require('./index17.js');
 const helpers = require('./index25.js');
-const resolverStore = require('./index40.js');
+const resolverStore = require('./index38.js');
 
 let GlobalResolver = class GlobalResolver {
     resolve(e, r, a) {

package/dist/index23.mjs

@@ -1,7 +1,7 @@
 import { getOwnCustomMetadata } from './index29.mjs';
 import { ParameterDecoratorFactory } from './index17.mjs';
 import { getParamValueKey } from './index25.mjs';
-import { ResolverStore } from './index40.mjs';
+import { ResolverStore } from './index38.mjs';
 
 let GlobalResolver = class GlobalResolver {
     resolve(e, r, a) {

package/dist/index24.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 const reflection = require('./index29.js');
 const parameterDecoratorFactory = require('./index17.js');
 const helpers = require('./index25.js');
-const resolverStore = require('./index40.js');
+const resolverStore = require('./index38.js');
 
 let OptionalResolver = class OptionalResolver {
     resolve(o, t, n) {

package/dist/index24.mjs

@@ -1,7 +1,7 @@
 import { getParamTypes, getOwnCustomMetadata } from './index29.mjs';
 import { ParameterDecoratorFactory } from './index17.mjs';
 import { getParamValueKey } from './index25.mjs';
-import { ResolverStore } from './index40.mjs';
+import { ResolverStore } from './index38.mjs';
 
 let OptionalResolver = class OptionalResolver {
     resolve(o, t, n) {

package/dist/index31.js

@@ -5,18 +5,44 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 const hookManager = require('./index33.js');
 const resolutionStrategies = require('./index43.js');
 const debugLogger = require('./index36.js');
+const core = require('@assemblerjs/core');
 const use = require('./index42.js');
 const inject = require('./index41.js');
 const injectable = require('./index44.js');
 
+function c(e) {
+    if (e?.name) return e.name;
+    if (typeof e === 'string') return e;
+    if (typeof e === 'symbol') return e.toString();
+    if (typeof e === 'number') return String(e);
+    if (typeof e === 'boolean') return String(e);
+    if (typeof e === 'object' && e !== null) {
+        try {
+            const t = JSON.stringify(e);
+            if (t.length > 100) {
+                return t.substring(0, 100) + '...';
+            }
+            return t;
+        } catch  {
+            return `[${e.constructor?.name || 'Object'}]`;
+        }
+    }
+    return String(e);
+}
+function l(e) {
+    if (core.isClass(e)) return 'class';
+    if (typeof e === 'string') return 'string';
+    if (typeof e === 'symbol') return 'symbol';
+    return 'unknown';
+}
 class InjectableManager {
     setContexts(e, t) {
         this.privateContext = e;
         this.publicContext = t;
     }
-    register(n, s = false) {
+    register(i, s = false) {
         const a = debugLogger.DebugLogger.getInstance();
-        const c = s === true ? use.resolveInstanceInjectionTuple(n) : inject.resolveInjectionTuple(n);
+        const c = s === 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', {
@@ -36,21 +62,31 @@ class InjectableManager {
     has(e) {
         return this.injectables.has(e);
     }
-    require(e, t, i) {
+    require(e, t, r) {
         if (!this.injectables.has(e)) {
-            const t = `Class with identifier '${e.name}' has not been registered or is a circular dependency.`;
-            debugLogger.DebugLogger.getInstance().log('error', 'Resolution failed', {
-                identifier: e.name,
-                caller: i ? i?.name || String(i) : 'unknown',
-                error: t
+            const t = this.resolvingStack.has(e);
+            const n = t ? 'Circular dependency detected' : 'Dependency not registered';
+            const i = c(e);
+            const s = l(e);
+            const a = t ? `Circular dependency detected: '${i}' is already being resolved.` : `Dependency '${i}' has not been registered (Class/Service not found in current assemblies).`;
+            debugLogger.DebugLogger.getInstance().log('error', n, {
+                identifier: i,
+                caller: r ? c(r) : 'unknown',
+                type: s,
+                error: a
             });
-            throw new Error(t);
+            throw new Error(a);
         }
-        const r = this.injectables.get(e);
-        if (r.isSingleton) {
-            return this.singletonStrategy.resolve(r, t);
-        } else {
-            return this.transientStrategy.resolve(r, t);
+        const n = this.injectables.get(e);
+        this.resolvingStack.add(n.identifier);
+        try {
+            if (n.isSingleton) {
+                return this.singletonStrategy.resolve(n, t);
+            } else {
+                return this.transientStrategy.resolve(n, t);
+            }
+        } finally{
+            this.resolvingStack.delete(n.identifier);
         }
     }
     concrete(e) {
@@ -60,9 +96,9 @@ class InjectableManager {
     }
     tagged(...e) {
         const t = [];
-        for (const i of e){
-            for (const [e, r] of this.injectables){
-                if (r.tags.includes(i)) t.push(r.build());
+        for (const r of e){
+            for (const [e, n] of this.injectables){
+                if (n.tags.includes(r)) t.push(n.build());
             }
         }
         return t;
@@ -71,12 +107,14 @@ class InjectableManager {
         for (const [e, t] of this.injectables){
             t.dispose();
         }
+        this.resolvingStack.clear();
     }
     get size() {
         return this.injectables.size;
     }
     constructor(){
         this.injectables = new Map();
+        this.resolvingStack = new Set();
         this.singletonStrategy = new resolutionStrategies.SingletonStrategy();
         this.transientStrategy = new resolutionStrategies.TransientStrategy();
     }

package/dist/index31.mjs

@@ -1,18 +1,44 @@
 import { HookManager } from './index33.mjs';
 import { SingletonStrategy, TransientStrategy } from './index43.mjs';
 import { DebugLogger } from './index36.mjs';
+import { isClass } from '@assemblerjs/core';
 import { resolveInstanceInjectionTuple } from './index42.mjs';
 import { resolveInjectionTuple } from './index41.mjs';
 import { Injectable } from './index44.mjs';
 
+function c(e) {
+    if (e?.name) return e.name;
+    if (typeof e === 'string') return e;
+    if (typeof e === 'symbol') return e.toString();
+    if (typeof e === 'number') return String(e);
+    if (typeof e === 'boolean') return String(e);
+    if (typeof e === 'object' && e !== null) {
+        try {
+            const t = JSON.stringify(e);
+            if (t.length > 100) {
+                return t.substring(0, 100) + '...';
+            }
+            return t;
+        } catch  {
+            return `[${e.constructor?.name || 'Object'}]`;
+        }
+    }
+    return String(e);
+}
+function l(e) {
+    if (isClass(e)) return 'class';
+    if (typeof e === 'string') return 'string';
+    if (typeof e === 'symbol') return 'symbol';
+    return 'unknown';
+}
 class InjectableManager {
     setContexts(e, t) {
         this.privateContext = e;
         this.publicContext = t;
     }
-    register(n, s = false) {
+    register(i, s = false) {
         const a = DebugLogger.getInstance();
-        const c = s === true ? resolveInstanceInjectionTuple(n) : resolveInjectionTuple(n);
+        const c = s === 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', {
@@ -32,21 +58,31 @@ class InjectableManager {
     has(e) {
         return this.injectables.has(e);
     }
-    require(e, t, i) {
+    require(e, t, r) {
         if (!this.injectables.has(e)) {
-            const t = `Class with identifier '${e.name}' has not been registered or is a circular dependency.`;
-            DebugLogger.getInstance().log('error', 'Resolution failed', {
-                identifier: e.name,
-                caller: i ? i?.name || String(i) : 'unknown',
-                error: t
+            const t = this.resolvingStack.has(e);
+            const n = t ? 'Circular dependency detected' : 'Dependency not registered';
+            const i = c(e);
+            const s = l(e);
+            const a = t ? `Circular dependency detected: '${i}' is already being resolved.` : `Dependency '${i}' has not been registered (Class/Service not found in current assemblies).`;
+            DebugLogger.getInstance().log('error', n, {
+                identifier: i,
+                caller: r ? c(r) : 'unknown',
+                type: s,
+                error: a
             });
-            throw new Error(t);
+            throw new Error(a);
         }
-        const r = this.injectables.get(e);
-        if (r.isSingleton) {
-            return this.singletonStrategy.resolve(r, t);
-        } else {
-            return this.transientStrategy.resolve(r, t);
+        const n = this.injectables.get(e);
+        this.resolvingStack.add(n.identifier);
+        try {
+            if (n.isSingleton) {
+                return this.singletonStrategy.resolve(n, t);
+            } else {
+                return this.transientStrategy.resolve(n, t);
+            }
+        } finally{
+            this.resolvingStack.delete(n.identifier);
         }
     }
     concrete(e) {
@@ -56,9 +92,9 @@ class InjectableManager {
     }
     tagged(...e) {
         const t = [];
-        for (const i of e){
-            for (const [e, r] of this.injectables){
-                if (r.tags.includes(i)) t.push(r.build());
+        for (const r of e){
+            for (const [e, n] of this.injectables){
+                if (n.tags.includes(r)) t.push(n.build());
             }
         }
         return t;
@@ -67,12 +103,14 @@ class InjectableManager {
         for (const [e, t] of this.injectables){
             t.dispose();
         }
+        this.resolvingStack.clear();
     }
     get size() {
         return this.injectables.size;
     }
     constructor(){
         this.injectables = new Map();
+        this.resolvingStack = new Set();
         this.singletonStrategy = new SingletonStrategy();
         this.transientStrategy = new TransientStrategy();
     }

package/dist/index32.js

@@ -4,32 +4,39 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const debugLogger = require('./index36.js');
 
+function t(e) {
+    return typeof e === 'symbol' ? 'symbol' : 'string';
+}
 class ObjectManager {
-    use(t, r) {
-        if (this.has(t)) {
-            const r = `A value is already registered with identifier '${String(t)}'.`;
-            debugLogger.DebugLogger.getInstance().log('error', 'Duplicate object registration', {
-                identifier: String(t),
-                error: r
+    use(r, o) {
+        if (this.has(r)) {
+            const o = typeof r === 'symbol' ? r.toString() : String(r);
+            const s = `Object/value '${o}' is already registered (cannot register twice).`;
+            debugLogger.DebugLogger.getInstance().log('error', 'Duplicate object/value registration', {
+                identifier: o,
+                type: t(r),
+                error: s
             });
-            throw new Error(r);
+            throw new Error(s);
         }
-        this.objects.set(t, r);
-        return r;
+        this.objects.set(r, o);
+        return o;
     }
     has(e) {
         return this.objects.has(e);
     }
-    require(t) {
-        if (!this.objects.has(t)) {
-            const r = `Injected object with identifier '${String(t)}' has not been registered.`;
-            debugLogger.DebugLogger.getInstance().log('error', 'Object not found', {
-                identifier: String(t),
-                error: r
+    require(r) {
+        if (!this.objects.has(r)) {
+            const o = typeof r === 'symbol' ? r.toString() : String(r);
+            const s = `Object/value '${o}' has not been registered in the object store.`;
+            debugLogger.DebugLogger.getInstance().log('error', 'Object/value not found', {
+                identifier: o,
+                type: t(r),
+                error: s
             });
-            throw new Error(r);
+            throw new Error(s);
         }
-        return this.objects.get(t);
+        return this.objects.get(r);
     }
     addGlobal(e, t) {
         if (this.globals.has(e)) {

package/dist/index32.mjs

@@ -1,31 +1,38 @@
 import { DebugLogger } from './index36.mjs';
 
+function t(e) {
+    return typeof e === 'symbol' ? 'symbol' : 'string';
+}
 class ObjectManager {
-    use(t, r) {
-        if (this.has(t)) {
-            const r = `A value is already registered with identifier '${String(t)}'.`;
-            DebugLogger.getInstance().log('error', 'Duplicate object registration', {
-                identifier: String(t),
-                error: r
+    use(r, o) {
+        if (this.has(r)) {
+            const o = typeof r === 'symbol' ? r.toString() : String(r);
+            const s = `Object/value '${o}' is already registered (cannot register twice).`;
+            DebugLogger.getInstance().log('error', 'Duplicate object/value registration', {
+                identifier: o,
+                type: t(r),
+                error: s
             });
-            throw new Error(r);
+            throw new Error(s);
         }
-        this.objects.set(t, r);
-        return r;
+        this.objects.set(r, o);
+        return o;
     }
     has(e) {
         return this.objects.has(e);
     }
-    require(t) {
-        if (!this.objects.has(t)) {
-            const r = `Injected object with identifier '${String(t)}' has not been registered.`;
-            DebugLogger.getInstance().log('error', 'Object not found', {
-                identifier: String(t),
-                error: r
+    require(r) {
+        if (!this.objects.has(r)) {
+            const o = typeof r === 'symbol' ? r.toString() : String(r);
+            const s = `Object/value '${o}' has not been registered in the object store.`;
+            DebugLogger.getInstance().log('error', 'Object/value not found', {
+                identifier: o,
+                type: t(r),
+                error: s
             });
-            throw new Error(r);
+            throw new Error(s);
         }
-        return this.objects.get(t);
+        return this.objects.get(r);
     }
     addGlobal(e, t) {
         if (this.globals.has(e)) {

package/dist/index38.js

@@ -2,110 +2,27 @@
 
 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;
-        }
-        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);
-                };
-            }
-        });
+class ResolverStore {
+    static register(e, r) {
+        this.resolvers.set(e, r);
     }
-    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;
+    static getResolver(e) {
+        const r = this.resolvers.get(e);
+        if (!r) {
+            throw new Error(`No resolver found for decorator type: ${e}`);
         }
+        return new r();
+    }
+    static hasResolver(e) {
+        return this.resolvers.has(e);
+    }
+    static getRegisteredTypes() {
+        return Array.from(this.resolvers.keys());
     }
-    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();
+    static clear() {
+        this.resolvers.clear();
     }
 }
+ResolverStore.resolvers = new Map();
 
-exports.TransversalWeaver = TransversalWeaver;
+exports.ResolverStore = ResolverStore;

package/dist/index38.mjs

@@ -1,107 +1,24 @@
-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);
-                };
-            }
-        });
+class ResolverStore {
+    static register(e, r) {
+        this.resolvers.set(e, r);
     }
-    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;
+    static getResolver(e) {
+        const r = this.resolvers.get(e);
+        if (!r) {
+            throw new Error(`No resolver found for decorator type: ${e}`);
         }
+        return new r();
+    }
+    static hasResolver(e) {
+        return this.resolvers.has(e);
+    }
+    static getRegisteredTypes() {
+        return Array.from(this.resolvers.keys());
     }
-    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();
+    static clear() {
+        this.resolvers.clear();
     }
 }
+ResolverStore.resolvers = new Map();
 
-export { TransversalWeaver };
+export { ResolverStore };

package/dist/index39.js

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

package/dist/index39.mjs

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

package/dist/index40.js

@@ -2,27 +2,33 @@
 
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
-class ResolverStore {
-    static register(e, r) {
-        this.resolvers.set(e, r);
-    }
-    static getResolver(e) {
-        const r = this.resolvers.get(e);
-        if (!r) {
-            throw new Error(`No resolver found for decorator type: ${e}`);
+class PointcutMatcher {
+    static parse(t) {
+        const e = t.match(/^execution\(([^.]+)\.([^)]+)\)$/);
+        if (!e) {
+            throw new Error(`Invalid pointcut expression: ${t}`);
         }
-        return new r();
+        const [, c, r] = e;
+        return new ExecutionPointcutMatcher(c, r);
     }
-    static hasResolver(e) {
-        return this.resolvers.has(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);
     }
-    static getRegisteredTypes() {
-        return Array.from(this.resolvers.keys());
+    patternToRegex(t) {
+        if (t === '*') {
+            return /.*/;
+        }
+        const e = t.replace(/[.+?^${}()|[\]\\]/g, '\\$&').replace(/\*/g, '.*');
+        return new RegExp(`^${e}$`);
     }
-    static clear() {
-        this.resolvers.clear();
+    constructor(t, e){
+        this.classRegex = this.patternToRegex(t);
+        this.methodRegex = this.patternToRegex(e);
     }
-}
-ResolverStore.resolvers = new Map();
+};
 
-exports.ResolverStore = ResolverStore;
+exports.PointcutMatcher = PointcutMatcher;

package/dist/index40.mjs

@@ -1,24 +1,30 @@
-class ResolverStore {
-    static register(e, r) {
-        this.resolvers.set(e, r);
-    }
-    static getResolver(e) {
-        const r = this.resolvers.get(e);
-        if (!r) {
-            throw new Error(`No resolver found for decorator type: ${e}`);
+class PointcutMatcher {
+    static parse(t) {
+        const e = t.match(/^execution\(([^.]+)\.([^)]+)\)$/);
+        if (!e) {
+            throw new Error(`Invalid pointcut expression: ${t}`);
         }
-        return new r();
+        const [, c, r] = e;
+        return new ExecutionPointcutMatcher(c, r);
     }
-    static hasResolver(e) {
-        return this.resolvers.has(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);
     }
-    static getRegisteredTypes() {
-        return Array.from(this.resolvers.keys());
+    patternToRegex(t) {
+        if (t === '*') {
+            return /.*/;
+        }
+        const e = t.replace(/[.+?^${}()|[\]\\]/g, '\\$&').replace(/\*/g, '.*');
+        return new RegExp(`^${e}$`);
     }
-    static clear() {
-        this.resolvers.clear();
+    constructor(t, e){
+        this.classRegex = this.patternToRegex(t);
+        this.methodRegex = this.patternToRegex(e);
     }
-}
-ResolverStore.resolvers = new Map();
+};
 
-export { ResolverStore };
+export { PointcutMatcher };

package/dist/index48.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
-const resolverStore = require('./index40.js');
+const resolverStore = require('./index38.js');
 
 class ParameterResolverFactory {
     static getResolver(r) {

package/dist/index48.mjs

@@ -1,4 +1,4 @@
-import { ResolverStore } from './index40.mjs';
+import { ResolverStore } from './index38.mjs';
 
 class ParameterResolverFactory {
     static getResolver(r) {

package/dist/index49.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const dependencies = require('./index50.js');
-const transversalWeaver = require('./index38.js');
+const transversalWeaver = require('./index39.js');
 const helpers = require('./index37.js');
 
 class InjectableBuilder {

package/dist/index49.mjs

@@ -1,5 +1,5 @@
 import { resolveInjectableParameters } from './index50.mjs';
-import { TransversalWeaver } from './index38.mjs';
+import { TransversalWeaver } from './index39.mjs';
 import { registerEvents } from './index37.mjs';
 
 class InjectableBuilder {

package/package.json

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