assemblerjs 1.1.18 → 1.1.19

package/dist/index30.js

@@ -2,163 +2,112 @@
 
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
-const hookManager = require('./index32.js');
-const resolutionStrategies = require('./index42.js');
-const debugLogger = require('./index35.js');
-const core = require('@assemblerjs/core');
-const use = require('./index43.js');
-const inject = require('./index44.js');
-const injectable = require('./index45.js');
+const constants = require('./index28.js');
+const reflection = require('./index29.js');
+const helpers = require('./index3.js');
 
-function formatIdentifier(e) {
-    if (e === undefined) return 'undefined';
-    if (e === null) return 'null';
-    if (typeof e === 'function') {
-        if (e.name) return e.name;
-        if (e.constructor?.name && e.constructor.name !== 'Function') {
-            return e.constructor.name;
+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 'AnonymousFunction';
+    },
+    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
     }
-    if (typeof e === 'string') return e;
-    if (typeof e === 'symbol') return e.toString();
-    if (typeof e === 'number') return String(e);
-    if (typeof e === 'boolean') return String(e);
-    if (typeof e === 'object') {
-        if (e.name && typeof e.name === 'string') {
-            return e.name;
+};
+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.`);
         }
-        const t = e.constructor?.name;
-        if (t && t !== 'Object') {
-            return t;
-        }
-        try {
-            const t = JSON.stringify(e);
-            if (t.length > 100) {
-                return t.substring(0, 100) + '...';
-            }
-            return t;
-        } catch  {
-            return '[UnknownObject]';
-        }
-    }
-    return String(e);
-}
-function c(e) {
-    if (core.isClass(e)) {
-        const t = e.prototype && Object.getOwnPropertyNames(e.prototype).length > 1;
-        return t ? 'class' : 'class';
     }
-    if (typeof e === 'function') return 'function';
-    if (typeof e === 'string') return 'string';
-    if (typeof e === 'symbol') return 'symbol';
-    if (typeof e === 'object' && e !== null) return 'object';
-    return 'unknown';
-}
-class InjectableManager {
-    setContexts(e, t) {
-        this.privateContext = e;
-        this.publicContext = t;
-    }
-    register(i, o = false) {
-        const a = debugLogger.DebugLogger.getInstance();
-        const c = o === true ? use.resolveInstanceInjectionTuple(i) : inject.resolveInjectionTuple(i);
-        if (this.has(c.identifier)) {
-            const e = `An assemblage is already registered with identifier '${c.identifier.name}'.`;
-            a.log('error', 'Duplicate registration', {
-                identifier: c.identifier.name,
-                error: e
-            });
-            throw new Error(e);
-        }
-        const f = injectable.Injectable.of(c, this.privateContext, this.publicContext);
-        a.logRegistration(f);
-        this.injectables.set(f.identifier, f);
-        if (f.concrete) {
-            hookManager.HookManager.callHook(f.concrete, 'onRegister', this.publicContext, f.configuration);
-        }
-        return f;
-    }
-    has(e) {
-        return this.injectables.has(e);
-    }
-    require(e, t, n) {
-        if (!this.injectables.has(e)) {
-            const r = this.resolvingStack.has(e);
-            const i = r ? 'Circular dependency detected' : 'Dependency not registered';
-            const o = formatIdentifier(e);
-            const a = c(e);
-            const f = t?.__paramIndex;
-            const u = t?.__paramCount;
-            const l = t?.__expectedType;
-            const g = r ? `Circular dependency detected: '${o}' is already being resolved.` : `Dependency '${o}' has not been registered (Class/Service not found in current assemblages).`;
-            const d = {
-                identifier: o,
-                caller: n ? formatIdentifier(n) : 'unknown',
-                type: a,
-                error: g
-            };
-            if (f !== undefined) {
-                d.paramIndex = f;
-            }
-            if (u !== undefined) {
-                d.paramCount = u;
-            }
-            if (l !== undefined) {
-                const e = l?.name || formatIdentifier(l);
-                d.expectedType = e;
-            }
-            debugLogger.DebugLogger.getInstance().log('error', i, d);
-            throw new Error(g);
-        }
-        const r = this.injectables.get(e);
-        this.resolvingStack.add(r.identifier);
-        try {
-            if (r.isSingleton) {
-                return this.singletonStrategy.resolve(r, t);
-            } else {
-                return this.transientStrategy.resolve(r, t);
-            }
-        } finally{
-            this.resolvingStack.delete(r.identifier);
+    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]);
     }
-    concrete(e) {
-        const t = this.injectables.get(e);
-        if (t) return t.concrete;
-        return;
-    }
-    tagged(...e) {
-        const t = [];
-        for (const n of e){
-            for (const [e, r] of this.injectables){
-                if (r.tags.includes(n)) t.push(r.build());
-            }
-        }
-        return t;
-    }
-    dispose() {
-        for (const [e, t] of this.injectables){
-            t.dispose();
-        }
-        this.resolvingStack.clear();
-    }
-    get size() {
-        return this.injectables.size;
-    }
-    getRegisteredIdentifiers() {
-        return Array.from(this.injectables.keys()).map((e)=>e?.name || String(e));
-    }
-    getInjectables() {
-        return this.injectables;
-    }
-    constructor(){
-        this.injectables = new Map();
-        this.resolvingStack = new Set();
-        this.singletonStrategy = new resolutionStrategies.SingletonStrategy();
-        this.transientStrategy = new resolutionStrategies.TransientStrategy();
+    return e;
+};
+const getDefinition = (e)=>{
+    if (!helpers.isAssemblage(e)) {
+        throw new Error(`Class '${e.name}' is not an assemblage or transversal.`);
     }
-}
+    return reflection.getOwnCustomMetadata(constants.ReflectValue.AssemblageDefinition, e);
+};
+const setDefinitionValue = (t, o, n)=>{
+    const s = getDefinition(n);
+    s[t] = o;
+    const a = validateDefinition(s);
+    reflection.defineCustomMetadata(constants.ReflectValue.AssemblageDefinition, a, n);
+    return a;
+};
 
-exports.InjectableManager = InjectableManager;
-exports.formatIdentifier = formatIdentifier;
+exports.getDefinition = getDefinition;
+exports.setDefinitionValue = setDefinitionValue;
+exports.validateDefinition = validateDefinition;

package/dist/index30.mjs

@@ -1,159 +1,107 @@
-import { HookManager } from './index32.mjs';
-import { SingletonStrategy, TransientStrategy } from './index42.mjs';
-import { DebugLogger } from './index35.mjs';
-import { isClass } from '@assemblerjs/core';
-import { resolveInstanceInjectionTuple } from './index43.mjs';
-import { resolveInjectionTuple } from './index44.mjs';
-import { Injectable } from './index45.mjs';
+import { ReflectValue } from './index28.mjs';
+import { getOwnCustomMetadata, defineCustomMetadata } from './index29.mjs';
+import { isAssemblage } from './index3.mjs';
 
-function formatIdentifier(e) {
-    if (e === undefined) return 'undefined';
-    if (e === null) return 'null';
-    if (typeof e === 'function') {
-        if (e.name) return e.name;
-        if (e.constructor?.name && e.constructor.name !== 'Function') {
-            return e.constructor.name;
+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 'AnonymousFunction';
+    },
+    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
     }
-    if (typeof e === 'string') return e;
-    if (typeof e === 'symbol') return e.toString();
-    if (typeof e === 'number') return String(e);
-    if (typeof e === 'boolean') return String(e);
-    if (typeof e === 'object') {
-        if (e.name && typeof e.name === 'string') {
-            return e.name;
+};
+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.`);
         }
-        const t = e.constructor?.name;
-        if (t && t !== 'Object') {
-            return t;
-        }
-        try {
-            const t = JSON.stringify(e);
-            if (t.length > 100) {
-                return t.substring(0, 100) + '...';
-            }
-            return t;
-        } catch  {
-            return '[UnknownObject]';
-        }
-    }
-    return String(e);
-}
-function c(e) {
-    if (isClass(e)) {
-        const t = e.prototype && Object.getOwnPropertyNames(e.prototype).length > 1;
-        return t ? 'class' : 'class';
     }
-    if (typeof e === 'function') return 'function';
-    if (typeof e === 'string') return 'string';
-    if (typeof e === 'symbol') return 'symbol';
-    if (typeof e === 'object' && e !== null) return 'object';
-    return 'unknown';
-}
-class InjectableManager {
-    setContexts(e, t) {
-        this.privateContext = e;
-        this.publicContext = t;
-    }
-    register(i, o = false) {
-        const a = DebugLogger.getInstance();
-        const c = o === true ? resolveInstanceInjectionTuple(i) : resolveInjectionTuple(i);
-        if (this.has(c.identifier)) {
-            const e = `An assemblage is already registered with identifier '${c.identifier.name}'.`;
-            a.log('error', 'Duplicate registration', {
-                identifier: c.identifier.name,
-                error: e
-            });
-            throw new Error(e);
-        }
-        const f = Injectable.of(c, this.privateContext, this.publicContext);
-        a.logRegistration(f);
-        this.injectables.set(f.identifier, f);
-        if (f.concrete) {
-            HookManager.callHook(f.concrete, 'onRegister', this.publicContext, f.configuration);
-        }
-        return f;
-    }
-    has(e) {
-        return this.injectables.has(e);
-    }
-    require(e, t, n) {
-        if (!this.injectables.has(e)) {
-            const r = this.resolvingStack.has(e);
-            const i = r ? 'Circular dependency detected' : 'Dependency not registered';
-            const o = formatIdentifier(e);
-            const a = c(e);
-            const f = t?.__paramIndex;
-            const u = t?.__paramCount;
-            const l = t?.__expectedType;
-            const g = r ? `Circular dependency detected: '${o}' is already being resolved.` : `Dependency '${o}' has not been registered (Class/Service not found in current assemblages).`;
-            const d = {
-                identifier: o,
-                caller: n ? formatIdentifier(n) : 'unknown',
-                type: a,
-                error: g
-            };
-            if (f !== undefined) {
-                d.paramIndex = f;
-            }
-            if (u !== undefined) {
-                d.paramCount = u;
-            }
-            if (l !== undefined) {
-                const e = l?.name || formatIdentifier(l);
-                d.expectedType = e;
-            }
-            DebugLogger.getInstance().log('error', i, d);
-            throw new Error(g);
-        }
-        const r = this.injectables.get(e);
-        this.resolvingStack.add(r.identifier);
-        try {
-            if (r.isSingleton) {
-                return this.singletonStrategy.resolve(r, t);
-            } else {
-                return this.transientStrategy.resolve(r, t);
-            }
-        } finally{
-            this.resolvingStack.delete(r.identifier);
+    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]);
     }
-    concrete(e) {
-        const t = this.injectables.get(e);
-        if (t) return t.concrete;
-        return;
-    }
-    tagged(...e) {
-        const t = [];
-        for (const n of e){
-            for (const [e, r] of this.injectables){
-                if (r.tags.includes(n)) t.push(r.build());
-            }
-        }
-        return t;
-    }
-    dispose() {
-        for (const [e, t] of this.injectables){
-            t.dispose();
-        }
-        this.resolvingStack.clear();
-    }
-    get size() {
-        return this.injectables.size;
-    }
-    getRegisteredIdentifiers() {
-        return Array.from(this.injectables.keys()).map((e)=>e?.name || String(e));
-    }
-    getInjectables() {
-        return this.injectables;
-    }
-    constructor(){
-        this.injectables = new Map();
-        this.resolvingStack = new Set();
-        this.singletonStrategy = new SingletonStrategy();
-        this.transientStrategy = new TransientStrategy();
+    return e;
+};
+const getDefinition = (e)=>{
+    if (!isAssemblage(e)) {
+        throw new Error(`Class '${e.name}' is not an assemblage or transversal.`);
     }
-}
+    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 { InjectableManager, formatIdentifier };
+export { getDefinition, setDefinitionValue, validateDefinition };

package/dist/index31.js

@@ -2,55 +2,110 @@
 
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
-const debugLogger = require('./index35.js');
+const transversalManager = require('./index13.js');
+const affect = require('./index12.js');
 
-function t(e) {
-    return typeof e === 'symbol' ? 'symbol' : 'string';
-}
-class ObjectManager {
-    use(r, o) {
-        if (this.has(r)) {
-            const o = typeof r === 'symbol' ? r.toString() : String(r);
-            const s = `Object/value '${o}' is already registered (cannot register twice).`;
-            debugLogger.DebugLogger.getInstance().log('error', 'Duplicate object/value registration', {
-                identifier: o,
-                type: t(r),
-                error: s
-            });
-            throw new Error(s);
+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;
         }
-        this.objects.set(r, o);
-        return o;
-    }
-    has(e) {
-        return this.objects.has(e);
+        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);
+                };
+            }
+        });
     }
-    require(r) {
-        if (!this.objects.has(r)) {
-            const o = typeof r === 'symbol' ? r.toString() : String(r);
-            const s = `Object/value '${o}' has not been registered in the object store.`;
-            debugLogger.DebugLogger.getInstance().log('error', 'Object/value not found', {
-                identifier: o,
-                type: t(r),
-                error: s
-            });
-            throw new Error(s);
+    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;
         }
-        return this.objects.get(r);
-    }
-    addGlobal(e, t) {
-        if (this.globals.has(e)) {
-            throw new Error(`Global value with key '${e}' has already been registered.`);
-        }
-        this.globals.set(e, t);
-    }
-    global(e) {
-        return this.globals.get(e);
     }
-    constructor(){
-        this.objects = new Map();
-        this.globals = new Map();
+    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.ObjectManager = ObjectManager;
+exports.TransversalWeaver = TransversalWeaver;