assemblerjs 1.1.16 → 1.1.18

package/dist/index20.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const parameterDecoratorFactory = require('./index17.js');
-const resolverStore = require('./index32.js');
+const resolverStore = require('./index39.js');
 
 let DefinitionResolver = class DefinitionResolver {
     resolve(e, r) {

package/dist/index20.mjs

@@ -1,5 +1,5 @@
 import { ParameterDecoratorFactory } from './index17.mjs';
-import { ResolverStore } from './index32.mjs';
+import { ResolverStore } from './index39.mjs';
 
 let DefinitionResolver = class DefinitionResolver {
     resolve(e, r) {

package/dist/index21.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const parameterDecoratorFactory = require('./index17.js');
-const resolverStore = require('./index32.js');
+const resolverStore = require('./index39.js');
 
 let DisposeResolver = class DisposeResolver {
     resolve(e, r, s) {

package/dist/index21.mjs

@@ -1,5 +1,5 @@
 import { ParameterDecoratorFactory } from './index17.mjs';
-import { ResolverStore } from './index32.mjs';
+import { ResolverStore } from './index39.mjs';
 
 let DisposeResolver = class DisposeResolver {
     resolve(e, r, s) {

package/dist/index22.js

@@ -2,10 +2,10 @@
 
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
-const reflection = require('./index29.js');
+const reflection = require('./index37.js');
 const parameterDecoratorFactory = require('./index17.js');
 const helpers = require('./index25.js');
-const resolverStore = require('./index32.js');
+const resolverStore = require('./index39.js');
 
 let UseResolver = class UseResolver {
     resolve(r, o, t) {

package/dist/index22.mjs

@@ -1,7 +1,7 @@
-import { getOwnCustomMetadata } from './index29.mjs';
+import { getOwnCustomMetadata } from './index37.mjs';
 import { ParameterDecoratorFactory } from './index17.mjs';
 import { getParamValueKey } from './index25.mjs';
-import { ResolverStore } from './index32.mjs';
+import { ResolverStore } from './index39.mjs';
 
 let UseResolver = class UseResolver {
     resolve(r, o, t) {

package/dist/index23.js

@@ -2,10 +2,10 @@
 
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
-const reflection = require('./index29.js');
+const reflection = require('./index37.js');
 const parameterDecoratorFactory = require('./index17.js');
 const helpers = require('./index25.js');
-const resolverStore = require('./index32.js');
+const resolverStore = require('./index39.js');
 
 let GlobalResolver = class GlobalResolver {
     resolve(e, r, a) {

package/dist/index23.mjs

@@ -1,7 +1,7 @@
-import { getOwnCustomMetadata } from './index29.mjs';
+import { getOwnCustomMetadata } from './index37.mjs';
 import { ParameterDecoratorFactory } from './index17.mjs';
 import { getParamValueKey } from './index25.mjs';
-import { ResolverStore } from './index32.mjs';
+import { ResolverStore } from './index39.mjs';
 
 let GlobalResolver = class GlobalResolver {
     resolve(e, r, a) {

package/dist/index24.js

@@ -2,10 +2,10 @@
 
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
-const reflection = require('./index29.js');
+const reflection = require('./index37.js');
 const parameterDecoratorFactory = require('./index17.js');
 const helpers = require('./index25.js');
-const resolverStore = require('./index32.js');
+const resolverStore = require('./index39.js');
 
 let OptionalResolver = class OptionalResolver {
     resolve(o, t, n) {

package/dist/index24.mjs

@@ -1,7 +1,7 @@
-import { getParamTypes, getOwnCustomMetadata } from './index29.mjs';
+import { getParamTypes, getOwnCustomMetadata } from './index37.mjs';
 import { ParameterDecoratorFactory } from './index17.mjs';
 import { getParamValueKey } from './index25.mjs';
-import { ResolverStore } from './index32.mjs';
+import { ResolverStore } from './index39.mjs';
 
 let OptionalResolver = class OptionalResolver {
     resolve(o, t, n) {

package/dist/index25.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
-const reflection = require('./index29.js');
+const reflection = require('./index37.js');
 const parameterDecoratorFactory = require('./index17.js');
 
 const getParamIndexKey = (e)=>{

package/dist/index25.mjs

@@ -1,4 +1,4 @@
-import { getOwnCustomMetadata } from './index29.mjs';
+import { getOwnCustomMetadata } from './index37.mjs';
 import { ParameterDecoratorFactory } from './index17.mjs';
 
 const getParamIndexKey = (e)=>{

package/dist/index26.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const constants = require('./index28.js');
-const reflection = require('./index29.js');
+const reflection = require('./index37.js');
 const helpers = require('./index25.js');
 const parameterDecoratorFactory = require('./index17.js');
 const decorator = require('./index2.js');

package/dist/index26.mjs

@@ -1,5 +1,5 @@
 import { ReflectParamTypes, ReflectValue } from './index28.mjs';
-import { getOwnCustomMetadata, defineCustomMetadata } from './index29.mjs';
+import { getOwnCustomMetadata, defineCustomMetadata } from './index37.mjs';
 import { getDecoratedParametersIndexes, getParamValueKey, getParamIndexKey } from './index25.mjs';
 import { ParameterDecoratorFactory } from './index17.mjs';
 import { decorateAssemblage } from './index2.mjs';

package/dist/index27.js

@@ -1,5 +1,5 @@
 'use strict';
 
-const Reflect = require('./index44.js');
+const Reflect = require('./index46.js');
 
 Reflect.__require();

package/dist/index27.mjs

@@ -1,3 +1,3 @@
-import { __require as require_Reflect } from './index44.mjs';
+import { __require as require_Reflect } from './index46.mjs';
 
 require_Reflect();

package/dist/index29.js

@@ -2,22 +2,45 @@
 
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
-const constants = require('./index28.js');
+const eventManager = require('./index6.js');
 
-const defineCustomMetadata = (t, o, n)=>{
-    Reflect.defineMetadata(`${constants.ReflectPrefix}${t}${constants.ReflectSuffix}`, o, n);
+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);
+        }
+    }
 };
-const getCustomMetadata = (t, o)=>{
-    return Reflect.getMetadata(`${constants.ReflectPrefix}${t}${constants.ReflectSuffix}`, o);
-};
-const getOwnCustomMetadata = (t, o)=>{
-    return Reflect.getOwnMetadata(`${constants.ReflectPrefix}${t}${constants.ReflectSuffix}`, o);
-};
-const getParamTypes = (e)=>{
-    return Reflect.getMetadata(constants.ReflectParamTypes, e) || [];
+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);
+            }
+        }
+    }
 };
 
-exports.defineCustomMetadata = defineCustomMetadata;
-exports.getCustomMetadata = getCustomMetadata;
-exports.getOwnCustomMetadata = getOwnCustomMetadata;
-exports.getParamTypes = getParamTypes;
+exports.registerEvents = registerEvents;
+exports.unregisterEvents = unregisterEvents;

package/dist/index29.mjs

@@ -1,16 +1,41 @@
-import { ReflectPrefix, ReflectSuffix, ReflectParamTypes } from './index28.mjs';
+import { EventManager } from './index6.mjs';
 
-const defineCustomMetadata = (t, o, n)=>{
-    Reflect.defineMetadata(`${ReflectPrefix}${t}${ReflectSuffix}`, o, n);
+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);
+        }
+    }
 };
-const getCustomMetadata = (t, o)=>{
-    return Reflect.getMetadata(`${ReflectPrefix}${t}${ReflectSuffix}`, o);
-};
-const getOwnCustomMetadata = (t, o)=>{
-    return Reflect.getOwnMetadata(`${ReflectPrefix}${t}${ReflectSuffix}`, o);
-};
-const getParamTypes = (e)=>{
-    return Reflect.getMetadata(ReflectParamTypes, e) || [];
+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);
+            }
+        }
+    }
 };
 
-export { defineCustomMetadata, getCustomMetadata, getOwnCustomMetadata, getParamTypes };
+export { registerEvents, unregisterEvents };

package/dist/index3.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const constants = require('./index28.js');
-const reflection = require('./index29.js');
+const reflection = require('./index37.js');
 
 const isAssemblage = (s)=>{
     return reflection.getOwnCustomMetadata(constants.ReflectFlags.IsAssemblage, s) || false;

package/dist/index3.mjs

@@ -1,5 +1,5 @@
 import { ReflectFlags, ReflectValue } from './index28.mjs';
-import { getOwnCustomMetadata } from './index29.mjs';
+import { getOwnCustomMetadata } from './index37.mjs';
 
 const isAssemblage = (s)=>{
     return getOwnCustomMetadata(ReflectFlags.IsAssemblage, s) || false;

package/dist/index30.js

@@ -2,112 +2,163 @@
 
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
-const constants = require('./index28.js');
-const reflection = require('./index29.js');
-const helpers = require('./index3.js');
+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 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;
+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;
         }
-    },
-    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
+        return 'AnonymousFunction';
     }
-};
-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.`);
+    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 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';
     }
-    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();
+    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);
         }
-        e[r] = s(e[r]);
     }
-    return e;
-};
-const getDefinition = (e)=>{
-    if (!helpers.isAssemblage(e)) {
-        throw new Error(`Class '${e.name}' is not an assemblage or transversal.`);
+    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 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.getDefinition = getDefinition;
-exports.setDefinitionValue = setDefinitionValue;
-exports.validateDefinition = validateDefinition;
+exports.InjectableManager = InjectableManager;
+exports.formatIdentifier = formatIdentifier;