assemblerjs 1.1.0 → 1.1.2

package/dist/index.d.ts

@@ -79,7 +79,8 @@ declare abstract class AbstractInjectable<T> {
     abstract readonly privateContext: AssemblerPrivateContext;
     abstract readonly publicContext: AssemblerContext;
     abstract readonly identifier: Identifier<T> | string | symbol;
-    abstract readonly concrete: Concrete<T>;
+    abstract readonly concrete?: Concrete<T>;
+    abstract readonly factory?: Factory<T>;
     abstract readonly configuration: Record<string, any>;
     abstract dependencies: (Identifier<unknown> | any)[];
     abstract definition: AssemblageDefinition;
@@ -429,8 +430,9 @@ export declare function Before(pointcut: string, priority?: number): (target: an
  */
 declare interface Buildable<T> {
     identifier: Identifier<T>;
-    concrete: Concrete<T>;
+    concrete?: Concrete<T>;
     instance?: T;
+    factory?: () => T;
     configuration: Record<string, any>;
 }
 
@@ -557,7 +559,7 @@ export declare const decorateGlobal: (identifier: string | symbol, target: any,
  * @param target The target class
  * @param index The parameter index
  */
-export declare const decorateUse: (identifier: string | symbol, target: any, index: number) => void;
+export declare const decorateUse: (identifier: UseIdentifier, target: any, index: number) => void;
 
 /**
  * Type for a function that creates a decorator.
@@ -621,6 +623,11 @@ export declare class EventManager implements AbstractEventManager {
     private cleanChannel;
 }
 
+/**
+ * Factory function that returns an instance of type T.
+ */
+declare type Factory<T> = () => T;
+
 export declare const getAssemblageContext: <T>(target: Concrete<T> | Function) => AssemblerContext;
 
 export declare const getAssemblageDefinition: <T>(target: Concrete<T>) => AssemblageDefinition;
@@ -698,7 +705,7 @@ declare class Injectable<T> implements AbstractInjectable<T> {
     /** Unique identifier for this injectable. */
     readonly identifier: Identifier<T> | string | symbol;
     /** The concrete class to instantiate. */
-    readonly concrete: Concrete<T>;
+    readonly concrete: Concrete<T> | undefined;
     /** Base configuration for this injectable. */
     readonly configuration: Record<string, any>;
     /** Merged configuration used during build (base + runtime). */
@@ -720,6 +727,7 @@ declare class Injectable<T> implements AbstractInjectable<T> {
     private dependenciesIds;
     protected singletonInstance: T | undefined;
     private builder;
+    readonly factory?: () => T;
     static of<TNew>(buildable: Buildable<TNew>, privateContext: AssemblerPrivateContext, publicContext: AssemblerContext): Injectable<TNew>;
     private constructor();
     /**
@@ -834,9 +842,10 @@ declare interface InjectableResolver {
 declare type Injection<T> = BaseInjection<T> | ConfiguredInjection<T> | ConcreteInjection<T> | ConcreteConfiguredInjection<T>;
 
 /**
- * Injectable binds an instance of a class to an identifier (abstract or concrete).
+ * Injectable binds an instance or factory of a class to an identifier (abstract or concrete).
+ * The second element can be either an instance or a factory function that returns an instance.
  */
-declare type InstanceInjection<T> = Tuple<[Identifier<T> | string | symbol, T]>;
+declare type InstanceInjection<T> = Tuple<[Identifier<T> | string | symbol, T | Factory<T>]>;
 
 /**
  * Check if a given class is an `Assemblage`.
@@ -1307,10 +1316,20 @@ export declare interface TransversalMetadata {
 }
 
 /**
- * Injects an object passed with `string` or `symbol` identifier.
+ * Injects an object passed with `string`, `symbol` or abstract class identifier.
+ * The identifier can be:
+ * - A string: @Use('logger')
+ * - A symbol: @Use(Symbol.for('logger'))
+ * - An abstract class: @Use(ILogger)
+ *
  * @param identifier The identifier of the object to inject
  * @returns A parameter decorator
  */
-export declare const Use: (param?: string | symbol | undefined) => ParameterDecorator;
+export declare const Use: (param?: UseIdentifier | undefined) => ParameterDecorator;
+
+/**
+ * Identifier can be a string, symbol, or an abstract class/interface.
+ */
+export declare type UseIdentifier = string | symbol | Function;
 
 export { }

package/dist/index11.js

@@ -3,9 +3,9 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const constants = require('./index28.js');
-const reflection = require('./index34.js');
+const reflection = require('./index35.js');
 const decorator = require('./index2.js');
-const schema = require('./index37.js');
+const schema = require('./index36.js');
 
 function isTransversal(e) {
     try {

package/dist/index11.mjs

@@ -1,7 +1,7 @@
 import { ReflectValue } from './index28.mjs';
-import { getCustomMetadata, defineCustomMetadata } from './index34.mjs';
+import { getCustomMetadata, defineCustomMetadata } from './index35.mjs';
 import { Assemblage } from './index2.mjs';
-import { getDefinition } from './index37.mjs';
+import { getDefinition } from './index36.mjs';
 
 function isTransversal(e) {
     try {

package/dist/index13.js

@@ -3,9 +3,9 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const core = require('@assemblerjs/core');
-const pointcutMatcher = require('./index39.js');
+const pointcutMatcher = require('./index38.js');
 const affect = require('./index12.js');
-const schema = require('./index37.js');
+const schema = require('./index36.js');
 
 class TransversalManager {
     static getInstance(e) {

package/dist/index13.mjs

@@ -1,7 +1,7 @@
 import { isClass } from '@assemblerjs/core';
-import { PointcutMatcher } from './index39.mjs';
+import { PointcutMatcher } from './index38.mjs';
 import { getAffectedMethods } from './index12.mjs';
-import { getDefinition } from './index37.mjs';
+import { getDefinition } from './index36.mjs';
 
 class TransversalManager {
     static getInstance(e) {

package/dist/index16.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
-const reflection = require('./index34.js');
+const reflection = require('./index35.js');
 
 const t = (t)=>()=>{
         return (e, c, n)=>{

package/dist/index16.mjs

@@ -1,4 +1,4 @@
-import { getOwnCustomMetadata, defineCustomMetadata } from './index34.mjs';
+import { getOwnCustomMetadata, defineCustomMetadata } from './index35.mjs';
 
 const t = (t)=>()=>{
         return (e, c, n)=>{

package/dist/index17.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
-const reflection = require('./index34.js');
+const reflection = require('./index35.js');
 
 class ParameterDecoratorFactory {
     static create(e) {

package/dist/index17.mjs

@@ -1,4 +1,4 @@
-import { getOwnCustomMetadata, defineCustomMetadata } from './index34.mjs';
+import { getOwnCustomMetadata, defineCustomMetadata } from './index35.mjs';
 
 class ParameterDecoratorFactory {
     static create(e) {

package/dist/index18.js

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

package/dist/index18.mjs

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

package/dist/index19.js

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

package/dist/index19.mjs

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

package/dist/index2.js

@@ -3,8 +3,8 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const constants = require('./index28.js');
-const reflection = require('./index34.js');
-const schema = require('./index37.js');
+const reflection = require('./index35.js');
+const schema = require('./index36.js');
 
 const Assemblage = (e)=>{
     return (r)=>{

package/dist/index2.mjs

@@ -1,6 +1,6 @@
 import { ReflectFlags, ReflectValue } from './index28.mjs';
-import { defineCustomMetadata } from './index34.mjs';
-import { validateDefinition } from './index37.mjs';
+import { defineCustomMetadata } from './index35.mjs';
+import { validateDefinition } from './index36.mjs';
 
 const Assemblage = (e)=>{
     return (r)=>{

package/dist/index20.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const parameterDecoratorFactory = require('./index17.js');
-const resolverStore = require('./index35.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 './index35.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('./index35.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 './index35.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('./index34.js');
+const reflection = require('./index35.js');
 const parameterDecoratorFactory = require('./index17.js');
 const helpers = require('./index25.js');
-const resolverStore = require('./index35.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 './index34.mjs';
+import { getOwnCustomMetadata } from './index35.mjs';
 import { ParameterDecoratorFactory } from './index17.mjs';
 import { getParamValueKey } from './index25.mjs';
-import { ResolverStore } from './index35.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('./index34.js');
+const reflection = require('./index35.js');
 const parameterDecoratorFactory = require('./index17.js');
 const helpers = require('./index25.js');
-const resolverStore = require('./index35.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 './index34.mjs';
+import { getOwnCustomMetadata } from './index35.mjs';
 import { ParameterDecoratorFactory } from './index17.mjs';
 import { getParamValueKey } from './index25.mjs';
-import { ResolverStore } from './index35.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('./index34.js');
+const reflection = require('./index35.js');
 const parameterDecoratorFactory = require('./index17.js');
 const helpers = require('./index25.js');
-const resolverStore = require('./index35.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 './index34.mjs';
+import { getParamTypes, getOwnCustomMetadata } from './index35.mjs';
 import { ParameterDecoratorFactory } from './index17.mjs';
 import { getParamValueKey } from './index25.mjs';
-import { ResolverStore } from './index35.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('./index34.js');
+const reflection = require('./index35.js');
 const parameterDecoratorFactory = require('./index17.js');
 
 const getParamIndexKey = (e)=>{

package/dist/index25.mjs

@@ -1,4 +1,4 @@
-import { getOwnCustomMetadata } from './index34.mjs';
+import { getOwnCustomMetadata } from './index35.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('./index34.js');
+const reflection = require('./index35.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 './index34.mjs';
+import { getOwnCustomMetadata, defineCustomMetadata } from './index35.mjs';
 import { getDecoratedParametersIndexes, getParamValueKey, getParamIndexKey } from './index25.mjs';
 import { ParameterDecoratorFactory } from './index17.mjs';
 import { decorateAssemblage } from './index2.mjs';

package/dist/index29.js

@@ -2,68 +2,45 @@
 
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
-const hookManager = require('./index31.js');
-const resolutionStrategies = require('./index40.js');
-const use = require('./index41.js');
-const inject = require('./index42.js');
-const injectable = require('./index43.js');
+const eventManager = require('./index6.js');
 
-class InjectableManager {
-    setContexts(e, t) {
-        this.privateContext = e;
-        this.publicContext = t;
-    }
-    register(r, n = false) {
-        const o = n === true ? use.resolveInstanceInjectionTuple(r) : inject.resolveInjectionTuple(r);
-        if (this.has(o.identifier)) {
-            throw new Error(`An assemblage is already registered with identifier '${o.identifier.name}'.`);
+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);
         }
-        const a = injectable.Injectable.of(o, this.privateContext, this.publicContext);
-        this.injectables.set(a.identifier, a);
-        hookManager.HookManager.callHook(a.concrete, 'onRegister', this.publicContext, a.configuration);
-        return a;
-    }
-    has(e) {
-        return this.injectables.has(e);
-    }
-    require(e, t) {
-        if (!this.injectables.has(e)) {
-            throw new Error(`Class with identifier '${e.name}' has not been registered or is a circular dependency.`);
+        for (const e of t.events){
+            n.on(e, (...n)=>{
+                t.privateContext.emit(e, ...n);
+            });
         }
-        const i = this.injectables.get(e);
-        if (i.isSingleton) {
-            return this.singletonStrategy.resolve(i, t);
-        } else {
-            return this.transientStrategy.resolve(i, t);
+    } else {
+        for (const e of t.events){
+            if (!t.privateContext.events.has(e)) t.privateContext.addChannels(e);
         }
     }
-    concrete(e) {
-        const t = this.injectables.get(e);
-        if (t) return t.concrete;
-        return;
-    }
-    tagged(...e) {
-        const t = [];
-        for (const i of e){
-            for (const [e, s] of this.injectables){
-                if (s.tags.includes(i)) t.push(s.build());
-            }
+};
+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);
         }
-        return t;
-    }
-    dispose() {
-        for (const [e, t] of this.injectables){
-            t.dispose();
+        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);
+            }
         }
     }
-    get size() {
-        return this.injectables.size;
-    }
-    constructor(){
-        this.injectables = new Map();
-        this.singletonStrategy = new resolutionStrategies.SingletonStrategy();
-        this.transientStrategy = new resolutionStrategies.TransientStrategy();
-    }
-}
+};
 
-exports.InjectableManager = InjectableManager;
+exports.registerEvents = registerEvents;
+exports.unregisterEvents = unregisterEvents;

package/dist/index29.mjs

@@ -1,65 +1,41 @@
-import { HookManager } from './index31.mjs';
-import { SingletonStrategy, TransientStrategy } from './index40.mjs';
-import { resolveInstanceInjectionTuple } from './index41.mjs';
-import { resolveInjectionTuple } from './index42.mjs';
-import { Injectable } from './index43.mjs';
+import { EventManager } from './index6.mjs';
 
-class InjectableManager {
-    setContexts(e, t) {
-        this.privateContext = e;
-        this.publicContext = t;
-    }
-    register(r, n = false) {
-        const o = n === true ? resolveInstanceInjectionTuple(r) : resolveInjectionTuple(r);
-        if (this.has(o.identifier)) {
-            throw new Error(`An assemblage is already registered with identifier '${o.identifier.name}'.`);
+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);
         }
-        const a = Injectable.of(o, this.privateContext, this.publicContext);
-        this.injectables.set(a.identifier, a);
-        HookManager.callHook(a.concrete, 'onRegister', this.publicContext, a.configuration);
-        return a;
-    }
-    has(e) {
-        return this.injectables.has(e);
-    }
-    require(e, t) {
-        if (!this.injectables.has(e)) {
-            throw new Error(`Class with identifier '${e.name}' has not been registered or is a circular dependency.`);
+        for (const e of t.events){
+            n.on(e, (...n)=>{
+                t.privateContext.emit(e, ...n);
+            });
         }
-        const i = this.injectables.get(e);
-        if (i.isSingleton) {
-            return this.singletonStrategy.resolve(i, t);
-        } else {
-            return this.transientStrategy.resolve(i, t);
+    } else {
+        for (const e of t.events){
+            if (!t.privateContext.events.has(e)) t.privateContext.addChannels(e);
         }
     }
-    concrete(e) {
-        const t = this.injectables.get(e);
-        if (t) return t.concrete;
-        return;
-    }
-    tagged(...e) {
-        const t = [];
-        for (const i of e){
-            for (const [e, s] of this.injectables){
-                if (s.tags.includes(i)) t.push(s.build());
-            }
+};
+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);
         }
-        return t;
-    }
-    dispose() {
-        for (const [e, t] of this.injectables){
-            t.dispose();
+        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);
+            }
         }
     }
-    get size() {
-        return this.injectables.size;
-    }
-    constructor(){
-        this.injectables = new Map();
-        this.singletonStrategy = new SingletonStrategy();
-        this.transientStrategy = new TransientStrategy();
-    }
-}
+};
 
-export { InjectableManager };
+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('./index34.js');
+const reflection = require('./index35.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 './index34.mjs';
+import { getOwnCustomMetadata } from './index35.mjs';
 
 const isAssemblage = (s)=>{
     return getOwnCustomMetadata(ReflectFlags.IsAssemblage, s) || false;