assemblerjs 1.1.27 → 1.2.0

package/dist/index39.mjs

@@ -1,30 +1,63 @@
-class PointcutMatcher {
-    static parse(t) {
-        const e = t.match(/^execution\(([^.]+)\.([^)]+)\)$/);
-        if (!e) {
-            throw new Error(`Invalid pointcut expression: ${t}`);
-        }
-        const [, c, r] = e;
-        return new ExecutionPointcutMatcher(c, r);
-    }
-}
-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);
+let AbstractCycleDetector = class AbstractCycleDetector {
+};
+let NoOpCycleDetector = class NoOpCycleDetector extends AbstractCycleDetector {
+    detect() {
+        return [];
     }
-    patternToRegex(t) {
-        if (t === '*') {
-            return /.*/;
+};
+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 o = [];
+            const r = new Set();
+            if (this.hasCycleDFS(n, o, r, e)) {
+                const e = o.findIndex((e)=>e === n);
+                if (e >= 0) {
+                    const s = o.slice(e).map((e)=>t(e));
+                    c.push({
+                        cycle: s,
+                        path: s.join(' → ')
+                    });
+                }
+            }
+            s.add(n);
         }
-        const e = t.replace(/[.+?^${}()|[\]\\]/g, '\\$&').replace(/\*/g, '.*');
-        return new RegExp(`^${e}$`);
+        return c;
     }
-    constructor(t, e){
-        this.classRegex = this.patternToRegex(t);
-        this.methodRegex = this.patternToRegex(e);
+    hasCycleDFS(e, t, c, s) {
+        if (c.has(e)) {
+            t.push(e);
+            return true;
+        }
+        t.push(e);
+        c.add(e);
+        const n = s.get(e);
+        if (n?.dependencies && n.dependencies.length > 0) {
+            for (const e of n.dependencies){
+                if (this.hasCycleDFS(e, t, c, s)) {
+                    return true;
+                }
+            }
+        }
+        c.delete(e);
+        t.pop();
+        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 { PointcutMatcher };
+export { CycleDetector };

package/dist/index4.js

@@ -3,13 +3,13 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const core = require('@assemblerjs/core');
-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 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 cycleDetector = require('./index39.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 './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 { 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 { CycleDetector } from './index39.mjs';
 import { EventManager } from './index6.mjs';
 
 class Assembler extends EventManager {

package/dist/index41.js

@@ -2,45 +2,33 @@
 
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
-const eventManager = require('./index6.js');
-
-const registerEvents = (t, n)=>{
-    const o = t.concrete !== undefined && t.concrete.prototype instanceof eventManager.EventManager;
-    if (o) {
-        const e = n;
-        const o = e.channels;
-        for (const n of t.events){
-            if (!o.has(n)) e.addChannels(n);
-            if (!t.privateContext.events.has(n)) t.privateContext.addChannels(n);
-        }
-        for (const e of t.events){
-            n.on(e, (...n)=>{
-                t.privateContext.emit(e, ...n);
-            });
-        }
-    } else {
-        for (const e of t.events){
-            if (!t.privateContext.events.has(e)) t.privateContext.addChannels(e);
+class PointcutMatcher {
+    static parse(t) {
+        const e = t.match(/^execution\(([^.]+)\.([^)]+)\)$/);
+        if (!e) {
+            throw new Error(`Invalid pointcut expression: ${t}`);
         }
+        const [, c, r] = e;
+        return new ExecutionPointcutMatcher(c, r);
     }
-};
-const unregisterEvents = (t, n)=>{
-    const o = t.concrete !== undefined && t.concrete.prototype instanceof eventManager.EventManager;
-    if (o) {
-        const e = n;
-        for (const n of t.events){
-            e.off(n);
-        }
-        e.removeChannels(...t.events);
-        t.privateContext.removeChannels(...t.events);
-    } else {
-        for (const e of t.events){
-            if (t.privateContext.events.has(e)) {
-                t.privateContext.removeChannels(e);
-            }
+}
+let ExecutionPointcutMatcher = class ExecutionPointcutMatcher {
+    matches(t) {
+        const e = t.target.constructor.name;
+        const c = t.methodName;
+        return this.classRegex.test(e) && this.methodRegex.test(c);
+    }
+    patternToRegex(t) {
+        if (t === '*') {
+            return /.*/;
         }
+        const e = t.replace(/[.+?^${}()|[\]\\]/g, '\\$&').replace(/\*/g, '.*');
+        return new RegExp(`^${e}$`);
+    }
+    constructor(t, e){
+        this.classRegex = this.patternToRegex(t);
+        this.methodRegex = this.patternToRegex(e);
     }
 };
 
-exports.registerEvents = registerEvents;
-exports.unregisterEvents = unregisterEvents;
+exports.PointcutMatcher = PointcutMatcher;

package/dist/index41.mjs

@@ -1,41 +1,30 @@
-import { EventManager } from './index6.mjs';
-
-const registerEvents = (t, n)=>{
-    const o = t.concrete !== undefined && t.concrete.prototype instanceof EventManager;
-    if (o) {
-        const e = n;
-        const o = e.channels;
-        for (const n of t.events){
-            if (!o.has(n)) e.addChannels(n);
-            if (!t.privateContext.events.has(n)) t.privateContext.addChannels(n);
-        }
-        for (const e of t.events){
-            n.on(e, (...n)=>{
-                t.privateContext.emit(e, ...n);
-            });
-        }
-    } else {
-        for (const e of t.events){
-            if (!t.privateContext.events.has(e)) t.privateContext.addChannels(e);
+class PointcutMatcher {
+    static parse(t) {
+        const e = t.match(/^execution\(([^.]+)\.([^)]+)\)$/);
+        if (!e) {
+            throw new Error(`Invalid pointcut expression: ${t}`);
         }
+        const [, c, r] = e;
+        return new ExecutionPointcutMatcher(c, r);
     }
-};
-const unregisterEvents = (t, n)=>{
-    const o = t.concrete !== undefined && t.concrete.prototype instanceof EventManager;
-    if (o) {
-        const e = n;
-        for (const n of t.events){
-            e.off(n);
-        }
-        e.removeChannels(...t.events);
-        t.privateContext.removeChannels(...t.events);
-    } else {
-        for (const e of t.events){
-            if (t.privateContext.events.has(e)) {
-                t.privateContext.removeChannels(e);
-            }
+}
+let ExecutionPointcutMatcher = class ExecutionPointcutMatcher {
+    matches(t) {
+        const e = t.target.constructor.name;
+        const c = t.methodName;
+        return this.classRegex.test(e) && this.methodRegex.test(c);
+    }
+    patternToRegex(t) {
+        if (t === '*') {
+            return /.*/;
         }
+        const e = t.replace(/[.+?^${}()|[\]\\]/g, '\\$&').replace(/\*/g, '.*');
+        return new RegExp(`^${e}$`);
+    }
+    constructor(t, e){
+        this.classRegex = this.patternToRegex(t);
+        this.methodRegex = this.patternToRegex(e);
     }
 };
 
-export { registerEvents, unregisterEvents };
+export { PointcutMatcher };

package/dist/index45.js

@@ -5,11 +5,11 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 const core = require('@assemblerjs/core');
 const constants = require('./index29.js');
 const reflection = require('./index30.js');
-const debugLogger = require('./index37.js');
+const debugLogger = require('./index38.js');
 const injectableBuilder = require('./index50.js');
 const dependencies = require('./index51.js');
-const helpers = require('./index41.js');
-const hookManager = require('./index34.js');
+const helpers = require('./index32.js');
+const hookManager = require('./index35.js');
 const helpers$1 = require('./index3.js');
 const use = require('./index43.js');
 const schema = require('./index31.js');
@@ -84,7 +84,7 @@ class Injectable {
     }
     get injections() {
         if (this.cachedInjections === undefined) {
-            this.cachedInjections = this.definition.inject || [];
+            this.cachedInjections = this.definition.provide || this.definition.inject || [];
         }
         return this.cachedInjections;
     }

package/dist/index45.mjs

@@ -1,11 +1,11 @@
 import { isClass, clearInstance } from '@assemblerjs/core';
 import { ReflectValue } from './index29.mjs';
 import { defineCustomMetadata } from './index30.mjs';
-import { DebugLogger } from './index37.mjs';
+import { DebugLogger } from './index38.mjs';
 import { InjectableBuilder } from './index50.mjs';
 import { resolveDependencies } from './index51.mjs';
-import { unregisterEvents } from './index41.mjs';
-import { HookManager } from './index34.mjs';
+import { unregisterEvents } from './index32.mjs';
+import { HookManager } from './index35.mjs';
 import { isAssemblage } from './index3.mjs';
 import { isFactory } from './index43.mjs';
 import { getDefinition } from './index31.mjs';
@@ -80,7 +80,7 @@ class Injectable {
     }
     get injections() {
         if (this.cachedInjections === undefined) {
-            this.cachedInjections = this.definition.inject || [];
+            this.cachedInjections = this.definition.provide || this.definition.inject || [];
         }
         return this.cachedInjections;
     }

package/dist/index50.js

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

package/dist/index50.mjs

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