assemblerjs 1.1.3 → 1.1.5

package/dist/index39.mjs

@@ -1,107 +1,30 @@
-import { TransversalManager } from './index13.mjs';
-import { getAffectedMethods } from './index12.mjs';
-
-class TransversalWeaver {
-    static weave(n, r, o) {
-        const c = TransversalManager.getInstance(o);
-        const s = c.getAspectsForTarget(r);
-        const a = Object.getPrototypeOf(n);
-        const f = Object.getOwnPropertyNames(a).some((t)=>{
-            if (t === 'constructor') return false;
-            const n = Object.getOwnPropertyDescriptor(a, t);
-            if (!n) return false;
-            const r = n.value && typeof n.value === 'function';
-            const o = n.get && typeof n.get === 'function';
-            if (!r && !o) return false;
-            const c = getAffectedMethods(a, t);
-            return c.length > 0;
-        });
-        if (s.length === 0 && !f) {
-            return n;
+class PointcutMatcher {
+    static parse(t) {
+        const e = t.match(/^execution\(([^.]+)\.([^)]+)\)$/);
+        if (!e) {
+            throw new Error(`Invalid pointcut expression: ${t}`);
         }
-        return new Proxy(n, {
-            get (t, e, n) {
-                const r = Reflect.get(t, e, n);
-                if (typeof r !== 'function') {
-                    return r;
-                }
-                return function(...n) {
-                    const o = String(e);
-                    const a = {
-                        target: t,
-                        methodName: o,
-                        args: n
-                    };
-                    const f = c.getAdvicesForJoinPoint(a, s, t, e);
-                    return TransversalWeaver.executeAdviceChain(f, r, t, n, a);
-                };
-            }
-        });
+        const [, c, r] = e;
+        return new ExecutionPointcutMatcher(c, r);
+    }
+}
+let ExecutionPointcutMatcher = class ExecutionPointcutMatcher {
+    matches(t) {
+        const e = t.target.constructor.name;
+        const c = t.methodName;
+        return this.classRegex.test(e) && this.methodRegex.test(c);
     }
-    static executeAdviceChain(t, e, n, r, o) {
-        const c = t.filter((t)=>t.type === 'before');
-        const s = t.filter((t)=>t.type === 'around');
-        const a = t.filter((t)=>t.type === 'after');
-        try {
-            for (const t of c){
-                const e = {
-                    ...o,
-                    config: t.config
-                };
-                t.method.call(t.transversalInstance, e);
-            }
-            let t;
-            if (s.length > 0) {
-                t = this.buildAroundChain(s, e, n, r, o);
-            } else {
-                t = e.apply(n, r);
-            }
-            if (t instanceof Promise) {
-                return t.then((t)=>{
-                    for (const e of a){
-                        const n = {
-                            ...o,
-                            result: t
-                        };
-                        e.method.call(e.transversalInstance, n);
-                    }
-                    return t;
-                }).catch((t)=>{
-                    o.error = t;
-                    throw t;
-                });
-            }
-            for (const e of a){
-                const n = {
-                    ...o,
-                    result: t,
-                    config: e.config
-                };
-                e.method.call(e.transversalInstance, n);
-            }
-            return t;
-        } catch (t) {
-            o.error = t;
-            throw t;
+    patternToRegex(t) {
+        if (t === '*') {
+            return /.*/;
         }
+        const e = t.replace(/[.+?^${}()|[\]\\]/g, '\\$&').replace(/\*/g, '.*');
+        return new RegExp(`^${e}$`);
     }
-    static buildAroundChain(t, e, n, r, o) {
-        let c = 0;
-        const s = ()=>{
-            if (c < t.length) {
-                const e = t[c++];
-                const n = {
-                    ...o,
-                    proceed: s,
-                    config: e.config
-                };
-                return e.method.call(e.transversalInstance, n);
-            } else {
-                return e.apply(n, r);
-            }
-        };
-        return s();
+    constructor(t, e){
+        this.classRegex = this.patternToRegex(t);
+        this.methodRegex = this.patternToRegex(e);
     }
-}
+};
 
-export { TransversalWeaver };
+export { PointcutMatcher };

package/dist/index4.js

@@ -3,12 +3,12 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const core = require('@assemblerjs/core');
-const injectableManager = require('./index33.js');
-const objectManager = require('./index34.js');
-const hookManager = require('./index35.js');
-const assemblerBuilder = require('./index36.js');
-const contextProvider = require('./index37.js');
-const debugLogger = require('./index38.js');
+const injectableManager = require('./index31.js');
+const objectManager = require('./index32.js');
+const hookManager = require('./index33.js');
+const assemblerBuilder = require('./index34.js');
+const contextProvider = require('./index35.js');
+const debugLogger = require('./index36.js');
 const eventManager = require('./index6.js');
 
 class Assembler extends eventManager.EventManager {
@@ -51,7 +51,7 @@ class Assembler extends eventManager.EventManager {
         }
         return this.injectableManager.has(e);
     }
-    require(e, t) {
+    require(e, t, r) {
         switch(typeof e){
             case 'string':
             case 'symbol':
@@ -60,7 +60,7 @@ class Assembler extends eventManager.EventManager {
                 }
             default:
                 {
-                    return this.injectableManager.require(e, t);
+                    return this.injectableManager.require(e, t, r);
                 }
         }
     }

package/dist/index4.mjs

@@ -1,10 +1,10 @@
 import { clearInstance } from '@assemblerjs/core';
-import { InjectableManager } from './index33.mjs';
-import { ObjectManager } from './index34.mjs';
-import { HookManager } from './index35.mjs';
-import { AssemblerBuilder } from './index36.mjs';
-import { ContextProvider } from './index37.mjs';
-import { DebugLogger } from './index38.mjs';
+import { InjectableManager } from './index31.mjs';
+import { ObjectManager } from './index32.mjs';
+import { HookManager } from './index33.mjs';
+import { AssemblerBuilder } from './index34.mjs';
+import { ContextProvider } from './index35.mjs';
+import { DebugLogger } from './index36.mjs';
 import { EventManager } from './index6.mjs';
 
 class Assembler extends EventManager {
@@ -47,7 +47,7 @@ class Assembler extends EventManager {
         }
         return this.injectableManager.has(e);
     }
-    require(e, t) {
+    require(e, t, r) {
         switch(typeof e){
             case 'string':
             case 'symbol':
@@ -56,7 +56,7 @@ class Assembler extends EventManager {
                 }
             default:
                 {
-                    return this.injectableManager.require(e, t);
+                    return this.injectableManager.require(e, t, r);
                 }
         }
     }

package/dist/index40.js

@@ -2,33 +2,27 @@
 
 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}`);
+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}`);
         }
-        const [, c, r] = e;
-        return new ExecutionPointcutMatcher(c, r);
+        return new 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 hasResolver(e) {
+        return this.resolvers.has(e);
     }
-    patternToRegex(t) {
-        if (t === '*') {
-            return /.*/;
-        }
-        const e = t.replace(/[.+?^${}()|[\]\\]/g, '\\$&').replace(/\*/g, '.*');
-        return new RegExp(`^${e}$`);
+    static getRegisteredTypes() {
+        return Array.from(this.resolvers.keys());
     }
-    constructor(t, e){
-        this.classRegex = this.patternToRegex(t);
-        this.methodRegex = this.patternToRegex(e);
+    static clear() {
+        this.resolvers.clear();
     }
-};
+}
+ResolverStore.resolvers = new Map();
 
-exports.PointcutMatcher = PointcutMatcher;
+exports.ResolverStore = ResolverStore;

package/dist/index40.mjs

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

package/dist/index44.js

@@ -7,8 +7,8 @@ const constants = require('./index28.js');
 const reflection = require('./index29.js');
 const injectableBuilder = require('./index49.js');
 const dependencies = require('./index50.js');
-const helpers = require('./index31.js');
-const hookManager = require('./index35.js');
+const helpers = require('./index37.js');
+const hookManager = require('./index33.js');
 const helpers$1 = require('./index3.js');
 const use = require('./index42.js');
 const schema = require('./index30.js');

package/dist/index44.mjs

@@ -3,8 +3,8 @@ import { ReflectValue } from './index28.mjs';
 import { defineCustomMetadata } from './index29.mjs';
 import { InjectableBuilder } from './index49.mjs';
 import { resolveDependencies } from './index50.mjs';
-import { unregisterEvents } from './index31.mjs';
-import { HookManager } from './index35.mjs';
+import { unregisterEvents } from './index37.mjs';
+import { HookManager } from './index33.mjs';
 import { isAssemblage } from './index3.mjs';
 import { isFactory } from './index42.mjs';
 import { getDefinition } from './index30.mjs';

package/dist/index48.js

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

package/dist/index48.mjs

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

package/dist/index49.js

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

package/dist/index49.mjs

@@ -1,6 +1,6 @@
 import { resolveInjectableParameters } from './index50.mjs';
-import { TransversalWeaver } from './index39.mjs';
-import { registerEvents } from './index31.mjs';
+import { TransversalWeaver } from './index38.mjs';
+import { registerEvents } from './index37.mjs';
 
 class InjectableBuilder {
     build(i) {

package/dist/index50.js

@@ -8,7 +8,7 @@ const parameterResolver_factory = require('./index48.js');
 const decorators = require('./index11.js');
 const transversalManager = require('./index13.js');
 
-const n = new WeakMap();
+const o = new WeakMap();
 const c = (e, t)=>{
     for (const [r, s] of Object.entries(e)){
         if (s.includes(t)) {
@@ -17,40 +17,40 @@ const c = (e, t)=>{
     }
     return null;
 };
-const resolveInjectableParameters = (n, a)=>{
+const resolveInjectableParameters = (o, a)=>{
     const i = [];
-    const l = reflection.getParamTypes(n.concrete);
-    const u = helpers.getDecoratedParametersIndexes(n.concrete);
+    const l = reflection.getParamTypes(o.concrete);
+    const u = helpers.getDecoratedParametersIndexes(o.concrete);
     for(let e = 0; e < l.length; e++){
         const t = c(u, e);
         if (t) {
             const s = parameterResolver_factory.ParameterResolverFactory.getResolver(t);
-            i.push(s.resolve(e, n, n.concrete, a));
+            i.push(s.resolve(e, o, o.concrete, a));
         } else {
             const t = l[e];
             if (decorators.isTransversal(t)) {
-                const e = transversalManager.TransversalManager.getInstance(n.publicContext);
+                const e = transversalManager.TransversalManager.getInstance(o.publicContext);
                 const r = e.getTransversalInstance(t.name);
                 if (!r) {
                     throw new Error(`Transversal ${t.name} is injected in constructor but not registered in transversals[]. ` + `Add it to transversals[] in @Assemblage decorator.`);
                 }
                 i.push(r);
             } else {
-                i.push(n.privateContext.require(t));
+                i.push(o.privateContext.require(t, undefined, o.identifier));
             }
         }
     }
     return i;
 };
 const resolveDependencies = (r)=>{
-    if (n.has(r)) {
-        return n.get(r);
+    if (o.has(r)) {
+        return o.get(r);
     }
     const s = [];
-    const o = reflection.getParamTypes(r);
+    const n = reflection.getParamTypes(r);
     const c = helpers.getDecoratedParametersIndexes(r);
     let a = 0;
-    for (const e of o){
+    for (const e of n){
         const t = Object.values(c).some((e)=>e.includes(a));
         if (t) {
             a++;
@@ -59,7 +59,7 @@ const resolveDependencies = (r)=>{
         s.push(e);
         a++;
     }
-    n.set(r, s);
+    o.set(r, s);
     return s;
 };
 

package/dist/index50.mjs

@@ -4,7 +4,7 @@ import { ParameterResolverFactory } from './index48.mjs';
 import { isTransversal } from './index11.mjs';
 import { TransversalManager } from './index13.mjs';
 
-const n = new WeakMap();
+const o = new WeakMap();
 const c = (e, t)=>{
     for (const [r, s] of Object.entries(e)){
         if (s.includes(t)) {
@@ -13,40 +13,40 @@ const c = (e, t)=>{
     }
     return null;
 };
-const resolveInjectableParameters = (n, a)=>{
+const resolveInjectableParameters = (o, a)=>{
     const i = [];
-    const l = getParamTypes(n.concrete);
-    const u = getDecoratedParametersIndexes(n.concrete);
+    const l = getParamTypes(o.concrete);
+    const u = getDecoratedParametersIndexes(o.concrete);
     for(let e = 0; e < l.length; e++){
         const t = c(u, e);
         if (t) {
             const s = ParameterResolverFactory.getResolver(t);
-            i.push(s.resolve(e, n, n.concrete, a));
+            i.push(s.resolve(e, o, o.concrete, a));
         } else {
             const t = l[e];
             if (isTransversal(t)) {
-                const e = TransversalManager.getInstance(n.publicContext);
+                const e = TransversalManager.getInstance(o.publicContext);
                 const r = e.getTransversalInstance(t.name);
                 if (!r) {
                     throw new Error(`Transversal ${t.name} is injected in constructor but not registered in transversals[]. ` + `Add it to transversals[] in @Assemblage decorator.`);
                 }
                 i.push(r);
             } else {
-                i.push(n.privateContext.require(t));
+                i.push(o.privateContext.require(t, undefined, o.identifier));
             }
         }
     }
     return i;
 };
 const resolveDependencies = (r)=>{
-    if (n.has(r)) {
-        return n.get(r);
+    if (o.has(r)) {
+        return o.get(r);
     }
     const s = [];
-    const o = getParamTypes(r);
+    const n = getParamTypes(r);
     const c = getDecoratedParametersIndexes(r);
     let a = 0;
-    for (const e of o){
+    for (const e of n){
         const t = Object.values(c).some((e)=>e.includes(a));
         if (t) {
             a++;
@@ -55,7 +55,7 @@ const resolveDependencies = (r)=>{
         s.push(e);
         a++;
     }
-    n.set(r, s);
+    o.set(r, s);
     return s;
 };
 

package/package.json

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