assemblerjs 1.1.20 → 1.1.21

package/dist/index38.js

@@ -2,45 +2,68 @@
 
 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);
-        }
+let AbstractCycleDetector = class AbstractCycleDetector {
+};
+let NoOpCycleDetector = class NoOpCycleDetector extends AbstractCycleDetector {
+    detect() {
+        return [];
     }
 };
-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);
+let ActiveCycleDetector = class ActiveCycleDetector extends AbstractCycleDetector {
+    detect(e, t) {
+        const c = [];
+        const s = new Set();
+        for (const [n] of e){
+            if (s.has(n)) continue;
+            const r = [];
+            const o = new Set();
+            if (this.hasCycleDFS(n, r, o, s, e)) {
+                const e = r.findIndex((e)=>e === n);
+                if (e >= 0) {
+                    const s = r.slice(e).map((e)=>t(e));
+                    c.push({
+                        cycle: s,
+                        path: s.join(' → ')
+                    });
+                }
+            }
         }
-        e.removeChannels(...t.events);
-        t.privateContext.removeChannels(...t.events);
-    } else {
-        for (const e of t.events){
-            if (t.privateContext.events.has(e)) {
-                t.privateContext.removeChannels(e);
+        return c;
+    }
+    hasCycleDFS(e, t, c, s, n) {
+        if (c.has(e)) {
+            t.push(e);
+            return true;
+        }
+        if (s.has(e)) {
+            return false;
+        }
+        t.push(e);
+        c.add(e);
+        const r = n.get(e);
+        if (r?.dependencies && r.dependencies.length > 0) {
+            for (const e of r.dependencies){
+                if (this.hasCycleDFS(e, t, c, s, n)) {
+                    return true;
+                }
             }
         }
+        c.delete(e);
+        s.add(e);
+        return false;
     }
 };
+class CycleDetector {
+    static getInstance() {
+        return CycleDetector.instance;
+    }
+    static enable() {
+        CycleDetector.instance = new ActiveCycleDetector();
+    }
+    static disable() {
+        CycleDetector.instance = new NoOpCycleDetector();
+    }
+}
+CycleDetector.instance = new NoOpCycleDetector();
 
-exports.registerEvents = registerEvents;
-exports.unregisterEvents = unregisterEvents;
+exports.CycleDetector = CycleDetector;

package/dist/index38.mjs

@@ -1,41 +1,65 @@
-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);
-        }
+let AbstractCycleDetector = class AbstractCycleDetector {
+};
+let NoOpCycleDetector = class NoOpCycleDetector extends AbstractCycleDetector {
+    detect() {
+        return [];
     }
 };
-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);
+let ActiveCycleDetector = class ActiveCycleDetector extends AbstractCycleDetector {
+    detect(e, t) {
+        const c = [];
+        const s = new Set();
+        for (const [n] of e){
+            if (s.has(n)) continue;
+            const r = [];
+            const o = new Set();
+            if (this.hasCycleDFS(n, r, o, s, e)) {
+                const e = r.findIndex((e)=>e === n);
+                if (e >= 0) {
+                    const s = r.slice(e).map((e)=>t(e));
+                    c.push({
+                        cycle: s,
+                        path: s.join(' → ')
+                    });
+                }
+            }
         }
-        e.removeChannels(...t.events);
-        t.privateContext.removeChannels(...t.events);
-    } else {
-        for (const e of t.events){
-            if (t.privateContext.events.has(e)) {
-                t.privateContext.removeChannels(e);
+        return c;
+    }
+    hasCycleDFS(e, t, c, s, n) {
+        if (c.has(e)) {
+            t.push(e);
+            return true;
+        }
+        if (s.has(e)) {
+            return false;
+        }
+        t.push(e);
+        c.add(e);
+        const r = n.get(e);
+        if (r?.dependencies && r.dependencies.length > 0) {
+            for (const e of r.dependencies){
+                if (this.hasCycleDFS(e, t, c, s, n)) {
+                    return true;
+                }
             }
         }
+        c.delete(e);
+        s.add(e);
+        return false;
     }
 };
+class CycleDetector {
+    static getInstance() {
+        return CycleDetector.instance;
+    }
+    static enable() {
+        CycleDetector.instance = new ActiveCycleDetector();
+    }
+    static disable() {
+        CycleDetector.instance = new NoOpCycleDetector();
+    }
+}
+CycleDetector.instance = new NoOpCycleDetector();
 
-export { registerEvents, unregisterEvents };
+export { CycleDetector };

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

@@ -3,13 +3,13 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const core = require('@assemblerjs/core');
-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 cycleDetector = require('./index37.js');
+const injectableManager = require('./index32.js');
+const objectManager = require('./index33.js');
+const hookManager = require('./index34.js');
+const assemblerBuilder = require('./index35.js');
+const contextProvider = require('./index36.js');
+const debugLogger = require('./index37.js');
+const cycleDetector = require('./index38.js');
 const eventManager = require('./index6.js');
 
 class Assembler extends eventManager.EventManager {

package/dist/index4.mjs

@@ -1,11 +1,11 @@
 import { clearInstance } from '@assemblerjs/core';
-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 { CycleDetector } from './index37.mjs';
+import { InjectableManager } from './index32.mjs';
+import { ObjectManager } from './index33.mjs';
+import { HookManager } from './index34.mjs';
+import { AssemblerBuilder } from './index35.mjs';
+import { ContextProvider } from './index36.mjs';
+import { DebugLogger } from './index37.mjs';
+import { CycleDetector } from './index38.mjs';
 import { EventManager } from './index6.mjs';
 
 class Assembler extends EventManager {

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