assemblerjs 1.1.20 → 1.1.21

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

@@ -5,11 +5,11 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 const core = require('@assemblerjs/core');
 const constants = require('./index28.js');
 const reflection = require('./index29.js');
-const debugLogger = require('./index36.js');
+const debugLogger = require('./index37.js');
 const injectableBuilder = require('./index50.js');
 const dependencies = require('./index51.js');
-const helpers = require('./index38.js');
-const hookManager = require('./index33.js');
+const helpers = require('./index31.js');
+const hookManager = require('./index34.js');
 const helpers$1 = require('./index3.js');
 const use = require('./index43.js');
 const schema = require('./index30.js');
@@ -152,9 +152,15 @@ class Injectable {
                 }
             }
             if (this.objects.length > 0) {
-                t.logPhaseStart('registration:use', {
+                const e = this.objects.map(([t])=>{
+                    if (typeof t === 'symbol') return t.toString();
+                    if (typeof t === 'function') return t.name || t.toString();
+                    return String(t);
+                });
+                t.logPhaseStart('registrationUse', {
                     target: this.concrete?.name ?? String(this.identifier),
-                    count: this.objects.length
+                    count: this.objects.length,
+                    keys: e
                 });
             }
             for (const t of this.objects){
@@ -176,7 +182,7 @@ class Injectable {
                 }
             }
             if (this.objects.length > 0) {
-                t.logPhaseEnd('registration:use', undefined, {
+                t.logPhaseEnd('registrationUse', undefined, {
                     target: this.concrete?.name ?? String(this.identifier)
                 });
             }
@@ -197,16 +203,17 @@ class Injectable {
             if (this.globals) {
                 const e = Object.keys(this.globals);
                 if (e.length > 0) {
-                    t.logPhaseStart('registration:globals', {
+                    t.logPhaseStart('registrationGlobals', {
                         target: this.concrete?.name ?? String(this.identifier),
-                        count: e.length
+                        count: e.length,
+                        keys: e
                     });
                 }
                 for(const t in this.globals){
                     this.privateContext.addGlobal(t, this.globals[t]);
                 }
                 if (e.length > 0) {
-                    t.logPhaseEnd('registration:globals', undefined, {
+                    t.logPhaseEnd('registrationGlobals', undefined, {
                         target: this.concrete?.name ?? String(this.identifier)
                     });
                 }

package/dist/index45.mjs

@@ -1,11 +1,11 @@
 import { isClass, clearInstance } from '@assemblerjs/core';
 import { ReflectValue } from './index28.mjs';
 import { defineCustomMetadata } from './index29.mjs';
-import { DebugLogger } from './index36.mjs';
+import { DebugLogger } from './index37.mjs';
 import { InjectableBuilder } from './index50.mjs';
 import { resolveDependencies } from './index51.mjs';
-import { unregisterEvents } from './index38.mjs';
-import { HookManager } from './index33.mjs';
+import { unregisterEvents } from './index31.mjs';
+import { HookManager } from './index34.mjs';
 import { isAssemblage } from './index3.mjs';
 import { isFactory } from './index43.mjs';
 import { getDefinition } from './index30.mjs';
@@ -148,9 +148,15 @@ class Injectable {
                 }
             }
             if (this.objects.length > 0) {
-                t.logPhaseStart('registration:use', {
+                const e = this.objects.map(([t])=>{
+                    if (typeof t === 'symbol') return t.toString();
+                    if (typeof t === 'function') return t.name || t.toString();
+                    return String(t);
+                });
+                t.logPhaseStart('registrationUse', {
                     target: this.concrete?.name ?? String(this.identifier),
-                    count: this.objects.length
+                    count: this.objects.length,
+                    keys: e
                 });
             }
             for (const t of this.objects){
@@ -172,7 +178,7 @@ class Injectable {
                 }
             }
             if (this.objects.length > 0) {
-                t.logPhaseEnd('registration:use', undefined, {
+                t.logPhaseEnd('registrationUse', undefined, {
                     target: this.concrete?.name ?? String(this.identifier)
                 });
             }
@@ -193,16 +199,17 @@ class Injectable {
             if (this.globals) {
                 const e = Object.keys(this.globals);
                 if (e.length > 0) {
-                    t.logPhaseStart('registration:globals', {
+                    t.logPhaseStart('registrationGlobals', {
                         target: this.concrete?.name ?? String(this.identifier),
-                        count: e.length
+                        count: e.length,
+                        keys: e
                     });
                 }
                 for(const t in this.globals){
                     this.privateContext.addGlobal(t, this.globals[t]);
                 }
                 if (e.length > 0) {
-                    t.logPhaseEnd('registration:globals', undefined, {
+                    t.logPhaseEnd('registrationGlobals', undefined, {
                         target: this.concrete?.name ?? String(this.identifier)
                     });
                 }

package/dist/index49.js

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

package/dist/index49.mjs

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

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('./index38.js');
+const transversalWeaver = require('./index40.js');
+const helpers = require('./index31.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 './index38.mjs';
+import { TransversalWeaver } from './index40.mjs';
+import { registerEvents } from './index31.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.20",
+  "version": "1.1.21",
   "author": "Benoît LAHOZ <info@benoitlahoz.io>",
   "bugs": "https://github.com/benoitlahoz/assemblerjs/issues",
   "homepage": "https://github.com/benoitlahoz/assemblerjs#README",