assemblerjs 1.1.22 → 1.1.24

package/dist/index38.mjs

@@ -1,24 +1,107 @@
-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}`);
+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;
         }
-        return new r();
+    },
+    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
     }
-    static hasResolver(e) {
-        return this.resolvers.has(e);
+};
+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.`);
+        }
     }
-    static getRegisteredTypes() {
-        return Array.from(this.resolvers.keys());
+    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();
+        }
+        e[r] = s(e[r]);
     }
-    static clear() {
-        this.resolvers.clear();
+    return e;
+};
+const getDefinition = (e)=>{
+    if (!isAssemblage(e)) {
+        throw new Error(`Class '${e.name}' is not an assemblage or transversal.`);
     }
-}
-ResolverStore.resolvers = new Map();
+    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;
+};
 
-export { ResolverStore };
+export { getDefinition, setDefinitionValue, validateDefinition };

package/dist/index40.js

@@ -6,106 +6,124 @@ 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;
+    static registerCaller(e, t, r) {
+        this.callerRegistry.set(e, {
+            className: t,
+            identifier: r
         });
-        if (s.length === 0 && !f) {
-            return n;
+    }
+    static getCallerMetadata(e) {
+        return this.callerRegistry.get(e);
+    }
+    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;
         }
-        return new Proxy(n, {
-            get (t, e, n) {
-                const r = Reflect.get(t, e, n);
-                if (typeof r !== 'function') {
-                    return r;
+        const l = new Proxy(r, {
+            get (e, t, r) {
+                const n = Reflect.get(e, t, r);
+                if (typeof n !== 'function') {
+                    return n;
                 }
-                return function(...n) {
-                    const o = String(e);
-                    const a = {
-                        target: t,
-                        methodName: o,
-                        args: 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 f = c.getAdvicesForJoinPoint(a, s, t, e);
-                    return TransversalWeaver.executeAdviceChain(f, r, t, n, a);
+                    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;
     }
-    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');
+    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 t of c){
-                const e = {
-                    ...o,
-                    config: t.config
+            for (const e of a){
+                const t = {
+                    ...s,
+                    config: e.config
                 };
-                t.method.call(t.transversalInstance, e);
+                e.method.call(e.transversalInstance, t);
             }
-            let t;
-            if (s.length > 0) {
-                t = this.buildAroundChain(s, e, n, r, o);
+            let e;
+            if (c.length > 0) {
+                e = this.buildAroundChain(c, t, r, n, s);
             } else {
-                t = e.apply(n, r);
+                e = t.apply(r, n);
             }
-            if (t instanceof Promise) {
-                return t.then((t)=>{
-                    for (const e of a){
-                        const n = {
-                            ...o,
-                            result: t
+            if (e instanceof Promise) {
+                return e.then((e)=>{
+                    for (const t of o){
+                        const r = {
+                            ...s,
+                            result: e
                         };
-                        e.method.call(e.transversalInstance, n);
+                        t.method.call(t.transversalInstance, r);
                     }
-                    return t;
-                }).catch((t)=>{
-                    o.error = t;
-                    throw t;
+                    return e;
+                }).catch((e)=>{
+                    s.error = e;
+                    throw e;
                 });
             }
-            for (const e of a){
-                const n = {
-                    ...o,
-                    result: t,
-                    config: e.config
+            for (const t of o){
+                const r = {
+                    ...s,
+                    result: e,
+                    config: t.config
                 };
-                e.method.call(e.transversalInstance, n);
+                t.method.call(t.transversalInstance, r);
             }
-            return t;
-        } catch (t) {
-            o.error = t;
-            throw t;
+            return e;
+        } catch (e) {
+            s.error = e;
+            throw 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
+    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 e.method.call(e.transversalInstance, n);
+                return t.method.call(t.transversalInstance, r);
             } else {
-                return e.apply(n, r);
+                return t.apply(r, n);
             }
         };
-        return s();
+        return c();
     }
 }
+TransversalWeaver.callerRegistry = new WeakMap();
 
 exports.TransversalWeaver = TransversalWeaver;

package/dist/index40.mjs

@@ -2,106 +2,124 @@ 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;
+    static registerCaller(e, t, r) {
+        this.callerRegistry.set(e, {
+            className: t,
+            identifier: r
         });
-        if (s.length === 0 && !f) {
-            return n;
+    }
+    static getCallerMetadata(e) {
+        return this.callerRegistry.get(e);
+    }
+    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;
         }
-        return new Proxy(n, {
-            get (t, e, n) {
-                const r = Reflect.get(t, e, n);
-                if (typeof r !== 'function') {
-                    return r;
+        const l = new Proxy(r, {
+            get (e, t, r) {
+                const n = Reflect.get(e, t, r);
+                if (typeof n !== 'function') {
+                    return n;
                 }
-                return function(...n) {
-                    const o = String(e);
-                    const a = {
-                        target: t,
-                        methodName: o,
-                        args: 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 f = c.getAdvicesForJoinPoint(a, s, t, e);
-                    return TransversalWeaver.executeAdviceChain(f, r, t, n, a);
+                    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;
     }
-    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');
+    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 t of c){
-                const e = {
-                    ...o,
-                    config: t.config
+            for (const e of a){
+                const t = {
+                    ...s,
+                    config: e.config
                 };
-                t.method.call(t.transversalInstance, e);
+                e.method.call(e.transversalInstance, t);
             }
-            let t;
-            if (s.length > 0) {
-                t = this.buildAroundChain(s, e, n, r, o);
+            let e;
+            if (c.length > 0) {
+                e = this.buildAroundChain(c, t, r, n, s);
             } else {
-                t = e.apply(n, r);
+                e = t.apply(r, n);
             }
-            if (t instanceof Promise) {
-                return t.then((t)=>{
-                    for (const e of a){
-                        const n = {
-                            ...o,
-                            result: t
+            if (e instanceof Promise) {
+                return e.then((e)=>{
+                    for (const t of o){
+                        const r = {
+                            ...s,
+                            result: e
                         };
-                        e.method.call(e.transversalInstance, n);
+                        t.method.call(t.transversalInstance, r);
                     }
-                    return t;
-                }).catch((t)=>{
-                    o.error = t;
-                    throw t;
+                    return e;
+                }).catch((e)=>{
+                    s.error = e;
+                    throw e;
                 });
             }
-            for (const e of a){
-                const n = {
-                    ...o,
-                    result: t,
-                    config: e.config
+            for (const t of o){
+                const r = {
+                    ...s,
+                    result: e,
+                    config: t.config
                 };
-                e.method.call(e.transversalInstance, n);
+                t.method.call(t.transversalInstance, r);
             }
-            return t;
-        } catch (t) {
-            o.error = t;
-            throw t;
+            return e;
+        } catch (e) {
+            s.error = e;
+            throw 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
+    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 e.method.call(e.transversalInstance, n);
+                return t.method.call(t.transversalInstance, r);
             } else {
-                return e.apply(n, r);
+                return t.apply(r, n);
             }
         };
-        return s();
+        return c();
     }
 }
+TransversalWeaver.callerRegistry = new WeakMap();
 
 export { TransversalWeaver };

package/dist/index45.js

@@ -12,7 +12,7 @@ const helpers = require('./index39.js');
 const hookManager = require('./index31.js');
 const helpers$1 = require('./index3.js');
 const use = require('./index43.js');
-const schema = require('./index37.js');
+const schema = require('./index38.js');
 const decorators = require('./index11.js');
 const transversalManager = require('./index13.js');
 
@@ -135,6 +135,32 @@ class Injectable {
         if (this.concrete) {
             const t = debugLogger.DebugLogger.getInstance();
             reflection.defineCustomMetadata(constants.ReflectValue.AssemblageContext, this.publicContext, this.concrete);
+            if (this.globals) {
+                const e = Object.keys(this.globals);
+                const i = e.map((t)=>{
+                    const e = this.globals[t];
+                    return {
+                        key: t,
+                        value: e
+                    };
+                });
+                if (e.length > 0) {
+                    t.logPhaseStart('registrationGlobals', {
+                        target: this.concrete?.name ?? String(this.identifier),
+                        count: e.length,
+                        keys: e,
+                        values: i
+                    });
+                }
+                for(const t in this.globals){
+                    this.privateContext.addGlobal(t, this.globals[t]);
+                }
+                if (e.length > 0) {
+                    t.logPhaseEnd('registrationGlobals', undefined, {
+                        target: this.concrete?.name ?? String(this.identifier)
+                    });
+                }
+            }
             for (const t of this.transversals){
                 const e = this.resolveTransversalToInjection(t);
                 this.privateContext.register(e);
@@ -208,32 +234,6 @@ class Injectable {
                 }
             }
             this.dependenciesIds = this.concrete ? dependencies.resolveDependencies(this.concrete) : [];
-            if (this.globals) {
-                const e = Object.keys(this.globals);
-                const i = e.map((t)=>{
-                    const e = this.globals[t];
-                    return {
-                        key: t,
-                        value: e
-                    };
-                });
-                if (e.length > 0) {
-                    t.logPhaseStart('registrationGlobals', {
-                        target: this.concrete?.name ?? String(this.identifier),
-                        count: e.length,
-                        keys: e,
-                        values: i
-                    });
-                }
-                for(const t in this.globals){
-                    this.privateContext.addGlobal(t, this.globals[t]);
-                }
-                if (e.length > 0) {
-                    t.logPhaseEnd('registrationGlobals', undefined, {
-                        target: this.concrete?.name ?? String(this.identifier)
-                    });
-                }
-            }
         }
         if (t.instance) {
             this.singletonInstance = t.instance;