assemblerjs 1.1.24 → 1.1.26

package/dist/index38.mjs

@@ -1,107 +1,65 @@
-import { ReflectValue } from './index28.mjs';
-import { getOwnCustomMetadata, defineCustomMetadata } from './index36.mjs';
-import { isAssemblage } from './index3.mjs';
-
-const n = {
-    singleton: {
-        test: (r)=>typeof r === 'boolean' || typeof r === 'undefined',
-        throw: ()=>{
-            throw new Error(`'singleton' property must be of type 'boolean' or 'undefined'.`);
-        },
-        transform: (r)=>{
-            return typeof r === 'undefined' ? true : r ? true : false;
-        }
-    },
-    events: {
-        test: (r)=>typeof r === 'undefined' || Array.isArray(r) && r.every((r)=>typeof r === 'string'),
-        throw: ()=>{
-            throw new Error(`'events' property must be an array of strings or 'undefined'.`);
-        },
-        transform: (r)=>r
-    },
-    inject: {
-        test: (r)=>typeof r === 'undefined' || Array.isArray(r) && r.every((r)=>Array.isArray(r) && r.length >= 1 && r.length <= 3),
-        throw: ()=>{
-            throw new Error(`'inject' property must be an array of tuples of length 1, 2 or 3.`);
-        },
-        transform: (r)=>r
-    },
-    use: {
-        test: (r)=>typeof r === 'undefined' || Array.isArray(r) && r.every((r)=>{
-                if (!Array.isArray(r) || r.length !== 2) {
-                    return false;
-                }
-                const e = r[1];
-                return typeof e !== 'undefined';
-            }),
-        throw: ()=>{
-            throw new Error(`'use' property must be an array of tuples of length 2 with [identifier, instance | factory].`);
-        },
-        transform: (r)=>r
-    },
-    engage: {
-        test: (r)=>typeof r === 'undefined' || Array.isArray(r) && r.every((r)=>Array.isArray(r) && r.length >= 1 && r.length <= 3),
-        throw: ()=>{
-            throw new Error(`'engage' property must be an array of tuples of length 1, 2 or 3.`);
-        },
-        transform: (r)=>r
-    },
-    tags: {
-        test: (r)=>typeof r === 'undefined' || typeof r === 'string' || Array.isArray(r) && r.every((r)=>typeof r === 'string'),
-        throw: ()=>{
-            throw new Error(`'tags' property must be a string or an array of strings.`);
-        },
-        transform: (r)=>typeof r === 'string' ? [
-                r
-            ] : r
-    },
-    metadata: {
-        test: (r)=>(typeof r === 'object' || typeof r === 'undefined') && !Array.isArray(r),
-        throw: ()=>{
-            throw new Error(`'metadata' property must be of type 'object' or 'undefined'.`);
-        },
-        transform: (r)=>r
-    },
-    global: {
-        test: (r)=>(typeof r === 'object' || typeof r === 'undefined') && !Array.isArray(r),
-        throw: ()=>{
-            throw new Error(`'global' property must be of type 'object' or 'undefined'.`);
-        },
-        transform: (r)=>r
+let AbstractCycleDetector = class AbstractCycleDetector {
+};
+let NoOpCycleDetector = class NoOpCycleDetector extends AbstractCycleDetector {
+    detect() {
+        return [];
     }
 };
-const validateDefinition = (r)=>{
-    const e = {
-        ...r
-    };
-    for(const r in e){
-        if (!Object.keys(n).includes(r)) {
-            throw new Error(`Property '${r}' is not a valid assemblage definition property.`);
+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(' → ')
+                    });
+                }
+            }
         }
+        return c;
     }
-    for(const r in n){
-        const t = n[r].test;
-        const o = n[r].throw;
-        const s = n[r].transform;
-        if (!t(e[r])) {
-            o();
+    hasCycleDFS(e, t, c, s, n) {
+        if (c.has(e)) {
+            t.push(e);
+            return true;
+        }
+        if (s.has(e)) {
+            return false;
         }
-        e[r] = s(e[r]);
+        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;
     }
-    return e;
 };
-const getDefinition = (e)=>{
-    if (!isAssemblage(e)) {
-        throw new Error(`Class '${e.name}' is not an assemblage or transversal.`);
+class CycleDetector {
+    static getInstance() {
+        return CycleDetector.instance;
     }
-    return getOwnCustomMetadata(ReflectValue.AssemblageDefinition, e);
-};
-const setDefinitionValue = (t, o, n)=>{
-    const s = getDefinition(n);
-    s[t] = o;
-    const a = validateDefinition(s);
-    defineCustomMetadata(ReflectValue.AssemblageDefinition, a, n);
-    return a;
-};
+    static enable() {
+        CycleDetector.instance = new ActiveCycleDetector();
+    }
+    static disable() {
+        CycleDetector.instance = new NoOpCycleDetector();
+    }
+}
+CycleDetector.instance = new NoOpCycleDetector();
 
-export { getDefinition, setDefinitionValue, validateDefinition };
+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('./index29.js');
-const objectManager = require('./index30.js');
-const hookManager = require('./index31.js');
-const assemblerBuilder = require('./index32.js');
-const contextProvider = require('./index33.js');
-const debugLogger = require('./index34.js');
-const cycleDetector = require('./index35.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 './index29.mjs';
-import { ObjectManager } from './index30.mjs';
-import { HookManager } from './index31.mjs';
-import { AssemblerBuilder } from './index32.mjs';
-import { ContextProvider } from './index33.mjs';
-import { DebugLogger } from './index34.mjs';
-import { CycleDetector } from './index35.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,128 +2,27 @@
 
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
-const transversalManager = require('./index13.js');
-const affect = require('./index12.js');
-
-class TransversalWeaver {
-    static registerCaller(e, t, r) {
-        this.callerRegistry.set(e, {
-            className: t,
-            identifier: r
-        });
-    }
-    static getCallerMetadata(e) {
-        return this.callerRegistry.get(e);
+class ResolverStore {
+    static register(e, r) {
+        this.resolvers.set(e, r);
     }
-    static weave(r, n, s) {
-        const a = transversalManager.TransversalManager.getInstance(s);
-        const c = a.getAspectsForTarget(n);
-        const o = Object.getPrototypeOf(r);
-        const i = Object.getOwnPropertyNames(o).some((e)=>{
-            if (e === 'constructor') return false;
-            const r = Object.getOwnPropertyDescriptor(o, e);
-            if (!r) return false;
-            const n = r.value && typeof r.value === 'function';
-            const s = r.get && typeof r.get === 'function';
-            if (!n && !s) return false;
-            const a = affect.getAffectedMethods(o, e);
-            return a.length > 0;
-        });
-        if (c.length === 0 && !i) {
-            return r;
+    static getResolver(e) {
+        const r = this.resolvers.get(e);
+        if (!r) {
+            throw new Error(`No resolver found for decorator type: ${e}`);
         }
-        const l = new Proxy(r, {
-            get (e, t, r) {
-                const n = Reflect.get(e, t, r);
-                if (typeof n !== 'function') {
-                    return n;
-                }
-                return function(...r) {
-                    const s = String(t);
-                    const o = TransversalWeaver.callerRegistry.get(this);
-                    const i = {
-                        target: e,
-                        methodName: s,
-                        args: r,
-                        caller: o?.className,
-                        callerIdentifier: o?.identifier
-                    };
-                    const l = a.getAdvicesForJoinPoint(i, c, e, t);
-                    return TransversalWeaver.executeAdviceChain(l, n, e, r, i);
-                };
-            }
-        });
-        TransversalWeaver.callerRegistry.set(l, {
-            className: n.name,
-            identifier: n.name
-        });
-        return l;
+        return new r();
     }
-    static executeAdviceChain(e, t, r, n, s) {
-        const a = e.filter((e)=>e.type === 'before');
-        const c = e.filter((e)=>e.type === 'around');
-        const o = e.filter((e)=>e.type === 'after');
-        try {
-            for (const e of a){
-                const t = {
-                    ...s,
-                    config: e.config
-                };
-                e.method.call(e.transversalInstance, t);
-            }
-            let e;
-            if (c.length > 0) {
-                e = this.buildAroundChain(c, t, r, n, s);
-            } else {
-                e = t.apply(r, n);
-            }
-            if (e instanceof Promise) {
-                return e.then((e)=>{
-                    for (const t of o){
-                        const r = {
-                            ...s,
-                            result: e
-                        };
-                        t.method.call(t.transversalInstance, r);
-                    }
-                    return e;
-                }).catch((e)=>{
-                    s.error = e;
-                    throw e;
-                });
-            }
-            for (const t of o){
-                const r = {
-                    ...s,
-                    result: e,
-                    config: t.config
-                };
-                t.method.call(t.transversalInstance, r);
-            }
-            return e;
-        } catch (e) {
-            s.error = e;
-            throw e;
-        }
+    static hasResolver(e) {
+        return this.resolvers.has(e);
+    }
+    static getRegisteredTypes() {
+        return Array.from(this.resolvers.keys());
     }
-    static buildAroundChain(e, t, r, n, s) {
-        let a = 0;
-        const c = ()=>{
-            if (a < e.length) {
-                const t = e[a++];
-                const r = {
-                    ...s,
-                    proceed: c,
-                    config: t.config
-                };
-                return t.method.call(t.transversalInstance, r);
-            } else {
-                return t.apply(r, n);
-            }
-        };
-        return c();
+    static clear() {
+        this.resolvers.clear();
     }
 }
-TransversalWeaver.callerRegistry = new WeakMap();
+ResolverStore.resolvers = new Map();
 
-exports.TransversalWeaver = TransversalWeaver;
+exports.ResolverStore = ResolverStore;

package/dist/index40.mjs

@@ -1,125 +1,24 @@
-import { TransversalManager } from './index13.mjs';
-import { getAffectedMethods } from './index12.mjs';
-
-class TransversalWeaver {
-    static registerCaller(e, t, r) {
-        this.callerRegistry.set(e, {
-            className: t,
-            identifier: r
-        });
-    }
-    static getCallerMetadata(e) {
-        return this.callerRegistry.get(e);
+class ResolverStore {
+    static register(e, r) {
+        this.resolvers.set(e, r);
     }
-    static weave(r, n, s) {
-        const a = TransversalManager.getInstance(s);
-        const c = a.getAspectsForTarget(n);
-        const o = Object.getPrototypeOf(r);
-        const i = Object.getOwnPropertyNames(o).some((e)=>{
-            if (e === 'constructor') return false;
-            const r = Object.getOwnPropertyDescriptor(o, e);
-            if (!r) return false;
-            const n = r.value && typeof r.value === 'function';
-            const s = r.get && typeof r.get === 'function';
-            if (!n && !s) return false;
-            const a = getAffectedMethods(o, e);
-            return a.length > 0;
-        });
-        if (c.length === 0 && !i) {
-            return r;
+    static getResolver(e) {
+        const r = this.resolvers.get(e);
+        if (!r) {
+            throw new Error(`No resolver found for decorator type: ${e}`);
         }
-        const l = new Proxy(r, {
-            get (e, t, r) {
-                const n = Reflect.get(e, t, r);
-                if (typeof n !== 'function') {
-                    return n;
-                }
-                return function(...r) {
-                    const s = String(t);
-                    const o = TransversalWeaver.callerRegistry.get(this);
-                    const i = {
-                        target: e,
-                        methodName: s,
-                        args: r,
-                        caller: o?.className,
-                        callerIdentifier: o?.identifier
-                    };
-                    const l = a.getAdvicesForJoinPoint(i, c, e, t);
-                    return TransversalWeaver.executeAdviceChain(l, n, e, r, i);
-                };
-            }
-        });
-        TransversalWeaver.callerRegistry.set(l, {
-            className: n.name,
-            identifier: n.name
-        });
-        return l;
+        return new r();
     }
-    static executeAdviceChain(e, t, r, n, s) {
-        const a = e.filter((e)=>e.type === 'before');
-        const c = e.filter((e)=>e.type === 'around');
-        const o = e.filter((e)=>e.type === 'after');
-        try {
-            for (const e of a){
-                const t = {
-                    ...s,
-                    config: e.config
-                };
-                e.method.call(e.transversalInstance, t);
-            }
-            let e;
-            if (c.length > 0) {
-                e = this.buildAroundChain(c, t, r, n, s);
-            } else {
-                e = t.apply(r, n);
-            }
-            if (e instanceof Promise) {
-                return e.then((e)=>{
-                    for (const t of o){
-                        const r = {
-                            ...s,
-                            result: e
-                        };
-                        t.method.call(t.transversalInstance, r);
-                    }
-                    return e;
-                }).catch((e)=>{
-                    s.error = e;
-                    throw e;
-                });
-            }
-            for (const t of o){
-                const r = {
-                    ...s,
-                    result: e,
-                    config: t.config
-                };
-                t.method.call(t.transversalInstance, r);
-            }
-            return e;
-        } catch (e) {
-            s.error = e;
-            throw e;
-        }
+    static hasResolver(e) {
+        return this.resolvers.has(e);
+    }
+    static getRegisteredTypes() {
+        return Array.from(this.resolvers.keys());
     }
-    static buildAroundChain(e, t, r, n, s) {
-        let a = 0;
-        const c = ()=>{
-            if (a < e.length) {
-                const t = e[a++];
-                const r = {
-                    ...s,
-                    proceed: c,
-                    config: t.config
-                };
-                return t.method.call(t.transversalInstance, r);
-            } else {
-                return t.apply(r, n);
-            }
-        };
-        return c();
+    static clear() {
+        this.resolvers.clear();
     }
 }
-TransversalWeaver.callerRegistry = new WeakMap();
+ResolverStore.resolvers = new Map();
 
-export { TransversalWeaver };
+export { ResolverStore };

package/dist/index42.js

@@ -2,33 +2,53 @@
 
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
-class SingletonStrategy {
-    resolve(t, e) {
-        const n = t.identifier;
-        if (this.cache.has(n)) {
-            return this.cache.get(n);
-        }
-        const o = t.build(e);
-        const r = e ? {
-            ...t.configuration,
-            ...e
-        } : t.configuration;
-        t.setSingletonInstance(o, r);
-        this.cache.set(n, o);
-        t.privateContext.prepareInitHook(o, t.configuration);
-        return o;
-    }
-    constructor(){
-        this.cache = new Map();
-    }
-}
-class TransientStrategy {
-    resolve(t, e) {
-        const n = t.build(e);
-        t.privateContext.prepareInitHook(n, t.configuration);
-        return n;
-    }
-}
+const core = require('@assemblerjs/core');
 
-exports.SingletonStrategy = SingletonStrategy;
-exports.TransientStrategy = TransientStrategy;
+const i = (e)=>{
+    return {
+        identifier: e[0],
+        concrete: e[0],
+        configuration: {}
+    };
+};
+const c = (o)=>{
+    const i = ()=>core.isClass(o[0]) && core.isClass(o[1]);
+    const c = ()=>core.isClass(o[0]) && core.isObject(o[1]);
+    const s = ()=>core.pipe(core.conditionally({
+            if: ()=>i(),
+            then: ()=>{
+                return {
+                    identifier: o[0],
+                    concrete: o[1],
+                    configuration: {}
+                };
+            }
+        }), core.conditionally({
+            if: ()=>c(),
+            then: ()=>{
+                return {
+                    identifier: o[0],
+                    concrete: o[0],
+                    configuration: o[1]
+                };
+            },
+            else: (e)=>e
+        }))();
+    return s();
+};
+const s = (e)=>{
+    return {
+        identifier: e[0],
+        concrete: e[1],
+        configuration: e[2]
+    };
+};
+const resolveInjectionTuple = (e)=>core.switchCase({
+        1: ()=>i(e),
+        2: ()=>c(e),
+        3: ()=>s(e)
+    }, ()=>{
+        throw new Error(`Injection tuple must be of length 1, 2 or 3.`);
+    })(e.length);
+
+exports.resolveInjectionTuple = resolveInjectionTuple;

package/dist/index42.mjs

@@ -1,29 +1,50 @@
-class SingletonStrategy {
-    resolve(t, e) {
-        const n = t.identifier;
-        if (this.cache.has(n)) {
-            return this.cache.get(n);
-        }
-        const o = t.build(e);
-        const r = e ? {
-            ...t.configuration,
-            ...e
-        } : t.configuration;
-        t.setSingletonInstance(o, r);
-        this.cache.set(n, o);
-        t.privateContext.prepareInitHook(o, t.configuration);
-        return o;
-    }
-    constructor(){
-        this.cache = new Map();
-    }
-}
-class TransientStrategy {
-    resolve(t, e) {
-        const n = t.build(e);
-        t.privateContext.prepareInitHook(n, t.configuration);
-        return n;
-    }
-}
+import { switchCase, pipe, conditionally, isClass, isObject } from '@assemblerjs/core';
 
-export { SingletonStrategy, TransientStrategy };
+const i = (e)=>{
+    return {
+        identifier: e[0],
+        concrete: e[0],
+        configuration: {}
+    };
+};
+const c = (o)=>{
+    const i = ()=>isClass(o[0]) && isClass(o[1]);
+    const c = ()=>isClass(o[0]) && isObject(o[1]);
+    const s = ()=>pipe(conditionally({
+            if: ()=>i(),
+            then: ()=>{
+                return {
+                    identifier: o[0],
+                    concrete: o[1],
+                    configuration: {}
+                };
+            }
+        }), conditionally({
+            if: ()=>c(),
+            then: ()=>{
+                return {
+                    identifier: o[0],
+                    concrete: o[0],
+                    configuration: o[1]
+                };
+            },
+            else: (e)=>e
+        }))();
+    return s();
+};
+const s = (e)=>{
+    return {
+        identifier: e[0],
+        concrete: e[1],
+        configuration: e[2]
+    };
+};
+const resolveInjectionTuple = (e)=>switchCase({
+        1: ()=>i(e),
+        2: ()=>c(e),
+        3: ()=>s(e)
+    }, ()=>{
+        throw new Error(`Injection tuple must be of length 1, 2 or 3.`);
+    })(e.length);
+
+export { resolveInjectionTuple };