assemblerjs 1.1.27 → 1.2.0

package/README.md

@@ -83,7 +83,7 @@ class Logger implements AbstractAssemblage {
 
 // Define an application that depends on Logger
 @Assemblage({
-  inject: [[Logger]], // Declare dependencies
+  provide: [[Logger]], // Declare dependencies
 })
 class App implements AbstractAssemblage {
   constructor(private logger: Logger) {}

package/dist/index.d.ts

@@ -299,7 +299,11 @@ export declare const Assemblage: <T>(definition?: AssemblageDefinition) => Class
 export declare interface AssemblageDefinition {
     singleton?: boolean;
     events?: string[];
+    /**
+     * @deprecated Use 'provide' instead. This option will be removed in a future version.
+     */
     inject?: Injection<unknown>[];
+    provide?: Injection<unknown>[];
     use?: InstanceInjection<unknown>[];
     engage?: TransversalInjection<unknown>[];
     tags?: string | string[];

package/dist/index13.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const core = require('@assemblerjs/core');
-const pointcutMatcher = require('./index39.js');
+const pointcutMatcher = require('./index41.js');
 const affect = require('./index12.js');
 const schema = require('./index31.js');
 

package/dist/index13.mjs

@@ -1,5 +1,5 @@
 import { isClass } from '@assemblerjs/core';
-import { PointcutMatcher } from './index39.mjs';
+import { PointcutMatcher } from './index41.mjs';
 import { getAffectedMethods } from './index12.mjs';
 import { getDefinition } from './index31.mjs';
 

package/dist/index23.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const reflection = require('./index30.js');
-const debugLogger = require('./index37.js');
+const debugLogger = require('./index38.js');
 const parameterDecoratorFactory = require('./index18.js');
 const helpers = require('./index26.js');
 const resolverStore = require('./index40.js');

package/dist/index23.mjs

@@ -1,5 +1,5 @@
 import { getOwnCustomMetadata } from './index30.mjs';
-import { DebugLogger } from './index37.mjs';
+import { DebugLogger } from './index38.mjs';
 import { ParameterDecoratorFactory } from './index18.mjs';
 import { getParamValueKey } from './index26.mjs';
 import { ResolverStore } from './index40.mjs';

package/dist/index24.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const reflection = require('./index30.js');
-const debugLogger = require('./index37.js');
+const debugLogger = require('./index38.js');
 const parameterDecoratorFactory = require('./index18.js');
 const helpers = require('./index26.js');
 const resolverStore = require('./index40.js');

package/dist/index24.mjs

@@ -1,5 +1,5 @@
 import { getOwnCustomMetadata } from './index30.mjs';
-import { DebugLogger } from './index37.mjs';
+import { DebugLogger } from './index38.mjs';
 import { ParameterDecoratorFactory } from './index18.mjs';
 import { getParamValueKey } from './index26.mjs';
 import { ResolverStore } from './index40.mjs';

package/dist/index31.js

@@ -6,106 +6,119 @@ const constants = require('./index29.js');
 const reflection = require('./index30.js');
 const helpers = require('./index3.js');
 
-const n = {
+const o = {
     singleton: {
-        test: (r)=>typeof r === 'boolean' || typeof r === 'undefined',
+        test: (e)=>typeof e === 'boolean' || typeof e === 'undefined',
         throw: ()=>{
             throw new Error(`'singleton' property must be of type 'boolean' or 'undefined'.`);
         },
-        transform: (r)=>{
-            return typeof r === 'undefined' ? true : r ? true : false;
+        transform: (e)=>{
+            return typeof e === 'undefined' ? true : e ? true : false;
         }
     },
     events: {
-        test: (r)=>typeof r === 'undefined' || Array.isArray(r) && r.every((r)=>typeof r === 'string'),
+        test: (e)=>typeof e === 'undefined' || Array.isArray(e) && e.every((e)=>typeof e === 'string'),
         throw: ()=>{
             throw new Error(`'events' property must be an array of strings or 'undefined'.`);
         },
-        transform: (r)=>r
+        transform: (e)=>e
     },
     inject: {
-        test: (r)=>typeof r === 'undefined' || Array.isArray(r) && r.every((r)=>Array.isArray(r) && r.length >= 1 && r.length <= 3),
+        test: (e)=>typeof e === 'undefined' || Array.isArray(e) && e.every((e)=>Array.isArray(e) && e.length >= 1 && e.length <= 3),
         throw: ()=>{
             throw new Error(`'inject' property must be an array of tuples of length 1, 2 or 3.`);
         },
-        transform: (r)=>r
+        transform: (e)=>e
+    },
+    provide: {
+        test: (e)=>typeof e === 'undefined' || Array.isArray(e) && e.every((e)=>Array.isArray(e) && e.length >= 1 && e.length <= 3),
+        throw: ()=>{
+            throw new Error(`'provide' property must be an array of tuples of length 1, 2 or 3.`);
+        },
+        transform: (e)=>e
     },
     use: {
-        test: (r)=>typeof r === 'undefined' || Array.isArray(r) && r.every((r)=>{
-                if (!Array.isArray(r) || r.length !== 2) {
+        test: (e)=>typeof e === 'undefined' || Array.isArray(e) && e.every((e)=>{
+                if (!Array.isArray(e) || e.length !== 2) {
                     return false;
                 }
-                const e = r[1];
-                return typeof e !== 'undefined';
+                const r = e[1];
+                return typeof r !== 'undefined';
             }),
         throw: ()=>{
             throw new Error(`'use' property must be an array of tuples of length 2 with [identifier, instance | factory].`);
         },
-        transform: (r)=>r
+        transform: (e)=>e
     },
     engage: {
-        test: (r)=>typeof r === 'undefined' || Array.isArray(r) && r.every((r)=>Array.isArray(r) && r.length >= 1 && r.length <= 3),
+        test: (e)=>typeof e === 'undefined' || Array.isArray(e) && e.every((e)=>Array.isArray(e) && e.length >= 1 && e.length <= 3),
         throw: ()=>{
             throw new Error(`'engage' property must be an array of tuples of length 1, 2 or 3.`);
         },
-        transform: (r)=>r
+        transform: (e)=>e
     },
     tags: {
-        test: (r)=>typeof r === 'undefined' || typeof r === 'string' || Array.isArray(r) && r.every((r)=>typeof r === 'string'),
+        test: (e)=>typeof e === 'undefined' || typeof e === 'string' || Array.isArray(e) && e.every((e)=>typeof e === 'string'),
         throw: ()=>{
             throw new Error(`'tags' property must be a string or an array of strings.`);
         },
-        transform: (r)=>typeof r === 'string' ? [
-                r
-            ] : r
+        transform: (e)=>typeof e === 'string' ? [
+                e
+            ] : e
     },
     metadata: {
-        test: (r)=>(typeof r === 'object' || typeof r === 'undefined') && !Array.isArray(r),
+        test: (e)=>(typeof e === 'object' || typeof e === 'undefined') && !Array.isArray(e),
         throw: ()=>{
             throw new Error(`'metadata' property must be of type 'object' or 'undefined'.`);
         },
-        transform: (r)=>r
+        transform: (e)=>e
     },
     global: {
-        test: (r)=>(typeof r === 'object' || typeof r === 'undefined') && !Array.isArray(r),
+        test: (e)=>(typeof e === 'object' || typeof e === 'undefined') && !Array.isArray(e),
         throw: ()=>{
             throw new Error(`'global' property must be of type 'object' or 'undefined'.`);
         },
-        transform: (r)=>r
+        transform: (e)=>e
     }
 };
-const validateDefinition = (r)=>{
-    const e = {
-        ...r
+const validateDefinition = (e)=>{
+    const r = {
+        ...e
     };
-    for(const r in e){
-        if (!Object.keys(n).includes(r)) {
-            throw new Error(`Property '${r}' is not a valid assemblage definition property.`);
+    for(const e in r){
+        if (!Object.keys(o).includes(e)) {
+            throw new Error(`Property '${e}' is not a valid assemblage definition property.`);
         }
     }
-    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 (r.inject !== undefined && r.provide === undefined) {
+        console.warn(`⚠️  Deprecation Warning: The 'inject' option is deprecated and will be removed in a future version. Please use 'provide' instead.`);
+    }
+    if (r.inject !== undefined && r.provide !== undefined) {
+        console.warn(`⚠️  Warning: Both 'inject' and 'provide' options found. Using 'provide' (inject is deprecated).`);
+    }
+    for(const e in o){
+        const t = o[e].test;
+        const n = o[e].throw;
+        const i = o[e].transform;
+        if (!t(r[e])) {
+            n();
         }
-        e[r] = s(e[r]);
+        r[e] = i(r[e]);
     }
-    return e;
+    return r;
 };
-const getDefinition = (e)=>{
-    if (!helpers.isAssemblage(e)) {
-        throw new Error(`Class '${e.name}' is not an assemblage or transversal.`);
+const getDefinition = (r)=>{
+    if (!helpers.isAssemblage(r)) {
+        throw new Error(`Class '${r.name}' is not an assemblage or transversal.`);
     }
-    return reflection.getOwnCustomMetadata(constants.ReflectValue.AssemblageDefinition, e);
+    return reflection.getOwnCustomMetadata(constants.ReflectValue.AssemblageDefinition, r);
 };
-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;
+const setDefinitionValue = (t, n, o)=>{
+    const i = getDefinition(o);
+    i[t] = n;
+    const s = validateDefinition(i);
+    reflection.defineCustomMetadata(constants.ReflectValue.AssemblageDefinition, s, o);
+    return s;
 };
 
 exports.getDefinition = getDefinition;

package/dist/index31.mjs

@@ -2,106 +2,119 @@ import { ReflectValue } from './index29.mjs';
 import { getOwnCustomMetadata, defineCustomMetadata } from './index30.mjs';
 import { isAssemblage } from './index3.mjs';
 
-const n = {
+const o = {
     singleton: {
-        test: (r)=>typeof r === 'boolean' || typeof r === 'undefined',
+        test: (e)=>typeof e === 'boolean' || typeof e === 'undefined',
         throw: ()=>{
             throw new Error(`'singleton' property must be of type 'boolean' or 'undefined'.`);
         },
-        transform: (r)=>{
-            return typeof r === 'undefined' ? true : r ? true : false;
+        transform: (e)=>{
+            return typeof e === 'undefined' ? true : e ? true : false;
         }
     },
     events: {
-        test: (r)=>typeof r === 'undefined' || Array.isArray(r) && r.every((r)=>typeof r === 'string'),
+        test: (e)=>typeof e === 'undefined' || Array.isArray(e) && e.every((e)=>typeof e === 'string'),
         throw: ()=>{
             throw new Error(`'events' property must be an array of strings or 'undefined'.`);
         },
-        transform: (r)=>r
+        transform: (e)=>e
     },
     inject: {
-        test: (r)=>typeof r === 'undefined' || Array.isArray(r) && r.every((r)=>Array.isArray(r) && r.length >= 1 && r.length <= 3),
+        test: (e)=>typeof e === 'undefined' || Array.isArray(e) && e.every((e)=>Array.isArray(e) && e.length >= 1 && e.length <= 3),
         throw: ()=>{
             throw new Error(`'inject' property must be an array of tuples of length 1, 2 or 3.`);
         },
-        transform: (r)=>r
+        transform: (e)=>e
+    },
+    provide: {
+        test: (e)=>typeof e === 'undefined' || Array.isArray(e) && e.every((e)=>Array.isArray(e) && e.length >= 1 && e.length <= 3),
+        throw: ()=>{
+            throw new Error(`'provide' property must be an array of tuples of length 1, 2 or 3.`);
+        },
+        transform: (e)=>e
     },
     use: {
-        test: (r)=>typeof r === 'undefined' || Array.isArray(r) && r.every((r)=>{
-                if (!Array.isArray(r) || r.length !== 2) {
+        test: (e)=>typeof e === 'undefined' || Array.isArray(e) && e.every((e)=>{
+                if (!Array.isArray(e) || e.length !== 2) {
                     return false;
                 }
-                const e = r[1];
-                return typeof e !== 'undefined';
+                const r = e[1];
+                return typeof r !== 'undefined';
             }),
         throw: ()=>{
             throw new Error(`'use' property must be an array of tuples of length 2 with [identifier, instance | factory].`);
         },
-        transform: (r)=>r
+        transform: (e)=>e
     },
     engage: {
-        test: (r)=>typeof r === 'undefined' || Array.isArray(r) && r.every((r)=>Array.isArray(r) && r.length >= 1 && r.length <= 3),
+        test: (e)=>typeof e === 'undefined' || Array.isArray(e) && e.every((e)=>Array.isArray(e) && e.length >= 1 && e.length <= 3),
         throw: ()=>{
             throw new Error(`'engage' property must be an array of tuples of length 1, 2 or 3.`);
         },
-        transform: (r)=>r
+        transform: (e)=>e
     },
     tags: {
-        test: (r)=>typeof r === 'undefined' || typeof r === 'string' || Array.isArray(r) && r.every((r)=>typeof r === 'string'),
+        test: (e)=>typeof e === 'undefined' || typeof e === 'string' || Array.isArray(e) && e.every((e)=>typeof e === 'string'),
         throw: ()=>{
             throw new Error(`'tags' property must be a string or an array of strings.`);
         },
-        transform: (r)=>typeof r === 'string' ? [
-                r
-            ] : r
+        transform: (e)=>typeof e === 'string' ? [
+                e
+            ] : e
     },
     metadata: {
-        test: (r)=>(typeof r === 'object' || typeof r === 'undefined') && !Array.isArray(r),
+        test: (e)=>(typeof e === 'object' || typeof e === 'undefined') && !Array.isArray(e),
         throw: ()=>{
             throw new Error(`'metadata' property must be of type 'object' or 'undefined'.`);
         },
-        transform: (r)=>r
+        transform: (e)=>e
     },
     global: {
-        test: (r)=>(typeof r === 'object' || typeof r === 'undefined') && !Array.isArray(r),
+        test: (e)=>(typeof e === 'object' || typeof e === 'undefined') && !Array.isArray(e),
         throw: ()=>{
             throw new Error(`'global' property must be of type 'object' or 'undefined'.`);
         },
-        transform: (r)=>r
+        transform: (e)=>e
     }
 };
-const validateDefinition = (r)=>{
-    const e = {
-        ...r
+const validateDefinition = (e)=>{
+    const r = {
+        ...e
     };
-    for(const r in e){
-        if (!Object.keys(n).includes(r)) {
-            throw new Error(`Property '${r}' is not a valid assemblage definition property.`);
+    for(const e in r){
+        if (!Object.keys(o).includes(e)) {
+            throw new Error(`Property '${e}' is not a valid assemblage definition property.`);
         }
     }
-    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 (r.inject !== undefined && r.provide === undefined) {
+        console.warn(`⚠️  Deprecation Warning: The 'inject' option is deprecated and will be removed in a future version. Please use 'provide' instead.`);
+    }
+    if (r.inject !== undefined && r.provide !== undefined) {
+        console.warn(`⚠️  Warning: Both 'inject' and 'provide' options found. Using 'provide' (inject is deprecated).`);
+    }
+    for(const e in o){
+        const t = o[e].test;
+        const n = o[e].throw;
+        const i = o[e].transform;
+        if (!t(r[e])) {
+            n();
         }
-        e[r] = s(e[r]);
+        r[e] = i(r[e]);
     }
-    return e;
+    return r;
 };
-const getDefinition = (e)=>{
-    if (!isAssemblage(e)) {
-        throw new Error(`Class '${e.name}' is not an assemblage or transversal.`);
+const getDefinition = (r)=>{
+    if (!isAssemblage(r)) {
+        throw new Error(`Class '${r.name}' is not an assemblage or transversal.`);
     }
-    return getOwnCustomMetadata(ReflectValue.AssemblageDefinition, e);
+    return getOwnCustomMetadata(ReflectValue.AssemblageDefinition, r);
 };
-const setDefinitionValue = (t, o, n)=>{
-    const s = getDefinition(n);
-    s[t] = o;
-    const a = validateDefinition(s);
-    defineCustomMetadata(ReflectValue.AssemblageDefinition, a, n);
-    return a;
+const setDefinitionValue = (t, n, o)=>{
+    const i = getDefinition(o);
+    i[t] = n;
+    const s = validateDefinition(i);
+    defineCustomMetadata(ReflectValue.AssemblageDefinition, s, o);
+    return s;
 };
 
 export { getDefinition, setDefinitionValue, validateDefinition };

package/dist/index32.js

@@ -2,168 +2,45 @@
 
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
-const hookManager = require('./index34.js');
-const resolutionStrategies = require('./index44.js');
-const debugLogger = require('./index37.js');
-const core = require('@assemblerjs/core');
-const use = require('./index43.js');
-const inject = require('./index42.js');
-const injectable = require('./index45.js');
+const eventManager = require('./index6.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;
-        }
-        return 'AnonymousFunction';
-    }
-    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 a(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 c = debugLogger.DebugLogger.getInstance();
-        const a = o === true ? use.resolveInstanceInjectionTuple(i) : inject.resolveInjectionTuple(i);
-        if (this.has(a.identifier)) {
-            const e = `An assemblage is already registered with identifier '${a.identifier.name}'.`;
-            c.log('error', 'Duplicate registration', {
-                identifier: a.identifier.name,
-                error: e
+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);
             });
-            throw new Error(e);
-        }
-        const f = injectable.Injectable.of(a, this.privateContext, this.publicContext);
-        c.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) {
-        const r = debugLogger.DebugLogger.getInstance();
-        const i = formatIdentifier(e);
-        const o = n ? formatIdentifier(n) : undefined;
-        r.logDependencyStart(i, o);
-        if (!this.injectables.has(e)) {
-            const o = this.resolvingStack.has(e);
-            const s = o ? 'Circular dependency detected' : 'Dependency not registered';
-            const c = a(e);
-            const f = t?.__paramIndex;
-            const u = t?.__paramCount;
-            const l = t?.__expectedType;
-            const d = o ? `Circular dependency detected: '${i}' is already being resolved.` : `Dependency '${i}' has not been registered (Class/Service not found in current assemblages).`;
-            const g = {
-                identifier: i,
-                caller: n ? formatIdentifier(n) : 'unknown',
-                type: c,
-                error: d
-            };
-            if (f !== undefined) {
-                g.paramIndex = f;
-            }
-            if (u !== undefined) {
-                g.paramCount = u;
-            }
-            if (l !== undefined) {
-                const e = l?.name || formatIdentifier(l);
-                g.expectedType = e;
-            }
-            r.log('error', s, g);
-            r.logDependencyEnd(i);
-            throw new Error(d);
         }
-        const c = this.injectables.get(e);
-        this.resolvingStack.add(c.identifier);
-        try {
-            if (c.isSingleton) {
-                return this.singletonStrategy.resolve(c, t);
-            } else {
-                return this.transientStrategy.resolve(c, t);
-            }
-        } finally{
-            this.resolvingStack.delete(c.identifier);
-            r.logDependencyEnd(i);
-        }
-    }
-    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());
+    } else {
+        for (const e of t.events){
+            if (!t.privateContext.events.has(e)) t.privateContext.addChannels(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);
             }
         }
-        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();
     }
-}
+};
 
-exports.InjectableManager = InjectableManager;
-exports.formatIdentifier = formatIdentifier;
+exports.registerEvents = registerEvents;
+exports.unregisterEvents = unregisterEvents;