assemblerjs 0.3.0 → 0.3.2

package/README.md

@@ -4,7 +4,7 @@
 
 [![npm version](https://badge.fury.io/js/assemblerjs.svg)](https://badge.fury.io/js/assemblerjs)
 
-![Statements](https://img.shields.io/badge/statements-84.3%25-yellow.svg?style=flat) ![Branches](https://img.shields.io/badge/branches-74.58%25-red.svg?style=flat) ![Functions](https://img.shields.io/badge/functions-81.48%25-yellow.svg?style=flat) ![Lines](https://img.shields.io/badge/lines-83.9%25-yellow.svg?style=flat)
+![Statements](https://img.shields.io/badge/statements-88.61%25-yellow.svg?style=flat) ![Branches](https://img.shields.io/badge/branches-77.32%25-red.svg?style=flat) ![Functions](https://img.shields.io/badge/functions-85.86%25-yellow.svg?style=flat) ![Lines](https://img.shields.io/badge/lines-88.69%25-yellow.svg?style=flat)
 
 <br />
 
@@ -24,8 +24,71 @@ npm install assemblerjs
 
 ### Order of execution
 
-- `onRegister` Static hook called when registering the assemblage.
-- `constructor` Build the instance.
-- `onInit` Called on every dependency when all dependencies have been built.
+Dependencies are registered and built recursively from the entry assemblage resolved by `Assembler.build`.
 
-- `onDispose` Called when disposing the assembler via `dispose` method injected by the `@Context` decorator.
+`onRegister`
+
+Static hook called when registering the assemblage.
+Other dependencies may or may not have been registered at this point, and dependency tree is not built yet.
+
+##### `constructor`
+
+Build the instance and requires an instance of each dependency passed to the constructor.
+If the dependency is not a singleton a new instance is returned, meaning the same dependency required in another assemblage will be another object, as when using the `require` method of the `AssemblerContext` passed to hooks or injected by the `@Context` decorator.
+
+##### `onInit`
+
+Called on every dependency when the dependency tree is ready.
+Except for the entry assemblage (i.e. the one built on bootstrap by `Assembler.build`) the hook is called according to the latter.
+The entry point assemblage is called last.
+
+##### `onDispose`
+
+Called when disposing the assembler via the `dispose` method injected by the `@Dispose` decorator.
+This will be called like the `onInit` method, walking through the dependency tree, except for the entry point assemblage, called last.
+
+### Events
+
+`assembler.js` provides an `EventManager` that can be subclassed by any assemblage.
+An `AbstractEventAssemblage` abstraction helper class can also be imported to keep assemblages typesafe.
+
+Because all events **are forwarded by `AssemblerContext`** the `EventManager` is quite strict on which events can be broadcasted and they must be registered explicitly using the `events` property of the `AssemblageDefinition`. To avoid collision between events channels, user is strongly encouraged to create _strong_ channels names, e.g.: `com.domain.app.assemblage-name:init`.
+
+```typescript
+const prefix = 'com.domain.app.emitter-assemblage';
+
+export enum EmitterAssemblageEvents {
+  Init = `${prefix}:init`,
+}
+
+@Assemblage({
+  events: Object.values(EmitterAssemblageEvents),
+})
+export class EmitterAssemblage
+  extends EventManager
+  implements AbstractEventAssemblage
+{
+  constructor() {
+    super();
+  }
+
+  public async onInit(): Promise<void> {
+    this.emit(EmitterAssemblageEvents.Init, true);
+  }
+}
+
+@Assemblage()
+export class SubcriberAssemblage implements AbstractAssemblage {
+  constructor(@Context() private context: AssemblerContext) {
+    context.on(EmitterAssemblageEvents.Init, (value: boolean) => {
+      console.log(value); // true.
+    });
+
+    context.on('*', (value: boolean) => {
+      console.log(value); // true.
+    });
+  }
+}
+
+Assembler.build(SubcriberAssemblage);
+```

package/dist/index.d.ts

@@ -17,7 +17,7 @@ export declare abstract class AbstractAssemblage {
      */
     static onRegister(context: AssemblerContext): void;
     /**
-     * Called when class is instantiated.
+     * Called on instantiated class after the dependency tree is fully resolved.
      *
      * @param { AssemblerContext } context The assembler's context.
      */
@@ -40,8 +40,11 @@ export declare abstract class AbstractAssemblage {
 
 export declare abstract class AbstractAssembler extends AbstractEventManager {
     abstract privateContext: AssemblerContext;
+    abstract publicContext: AssemblerContext;
     abstract size: number;
-    abstract register<T>(injection: Injection<T>): Injectable<T>;
+    abstract register<T>(injection: Injection<T>, instance?: boolean): Injectable<T>;
+    abstract use<T>(identifier: string | Symbol, object: T): T;
+    abstract prepareInit<T = AbstractAssemblage>(instance: T): unknown[];
     abstract has<T>(identifier: Identifier<T>): boolean;
     abstract require<T>(identifier: Identifier<T>): T;
     abstract tagged(...tags: string[]): any[];
@@ -75,6 +78,7 @@ declare interface AssemblageDefinition {
     singleton?: false;
     events?: string[];
     inject?: Injection<unknown>[];
+    use?: InstanceInjection<unknown>[];
     tags?: string | string[];
     controller?: true;
     path?: string;
@@ -83,6 +87,8 @@ declare interface AssemblageDefinition {
 
 export declare class Assembler extends EventManager implements AbstractAssembler {
     protected injectables: Map<Identifier<unknown>, Injectable<unknown>>;
+    protected objects: Map<string | Symbol, unknown>;
+    private initCache;
     /**
      * Context passed to internal classes.
      */
@@ -98,22 +104,34 @@ export declare class Assembler extends EventManager implements AbstractAssembler
      * Recursively register an `Injection` tuple and its inner injected dependencies.
      *
      * @param { Injection<T> } injection The injection tuple to register.
+     * @param { boolean | undefined } instance The injection binds an instance to an identifier.
+     * @returns { Injectable<T> } An injectable of type `T`.
      */
-    register<T>(injection: Injection<T>): Injectable<T>;
+    register<T>(injection: Injection<T>, instance?: boolean): Injectable<T>;
+    /**
+     * Register a string or symbol identifier with an object.
+     *
+     * @param { string | symbol } identifier The identifier to register.
+     * @param { T } object The object to use with the identifier.
+     * @returns { T } The object.
+     */
+    use<T>(identifier: string | Symbol, object: T): T;
+    prepareInit<T = AbstractAssemblage>(instance: T): unknown[];
     /**
      * Check if `Assembler` has given identifier registered.
      *
-     * @param { Identifier<T> } identifier An identifier (abstract or concrete class).
+     * @param { Identifier<T> | string | symbol } identifier An abstract or concrete class
+     * identifier or a string or Symbol one.
      * @returns { boolean } `true` if dependency has been registered.
      */
-    has<T>(identifier: Identifier<T>): boolean;
+    has<T>(identifier: Identifier<T> | string | Symbol): boolean;
     /**
      * Get or instantiate an assemblage for given identifier.
      *
-     * @param { Identifier<T> } identifier The identifier to get instance from.
+     * @param { Identifier<T> | string | symbol } identifier The identifier to get instance from.
      * @returns { T } An instance of Concrete<T>.
      */
-    require<T>(identifier: Identifier<T>): T;
+    require<T>(identifier: Identifier<T> | string | Symbol): T;
     /**
      * Require dependencies by tag passed in assemblage's definition.
      *
@@ -129,7 +147,6 @@ export declare class Assembler extends EventManager implements AbstractAssembler
 }
 
 export declare interface AssemblerContext {
-    register: AbstractAssembler['register'];
     has: AbstractAssembler['has'];
     require: AbstractAssembler['require'];
     tagged: AbstractAssembler['tagged'];
@@ -142,13 +159,23 @@ export declare interface AssemblerContext {
 export declare type AssemblerDispose = AbstractAssembler['dispose'];
 
 declare interface AssemblerPrivateContext extends AssemblerContext {
+    register: AbstractAssembler['register'];
+    use: AbstractAssembler['use'];
+    prepareInit: AbstractAssembler['prepareInit'];
     dispose: AssemblerDispose;
     emit: AbstractAssembler['emit'];
     addChannels: AbstractAssembler['addChannels'];
     removeChannels: AbstractAssembler['removeChannels'];
 }
 
-export declare const Awaitable: (property: string, millis?: number) => (_target: any, _propertyKey: string, descriptor: TypedPropertyDescriptor<(...params: any[]) => Promise<any>>) => void;
+/**
+ * Recursively check if a property is defined and truthy to call an async method.
+ *
+ * @param { string } property The name of the class proprty to wait for.
+ * @param { number | undefined } interval The interval in milliseconds at which the value is checked (defaults to 25 milliseconds).
+ * @returns { Promise<void> } A promise that calls the original method when resolving.
+ */
+export declare const Await: (property: string, interval?: number) => (_target: any, _propertyKey: string, descriptor: TypedPropertyDescriptor<(...params: any[]) => Promise<any>>) => void;
 
 /**
  * Injectable binds a concrete class to an abstract class as identifier without configuration.
@@ -161,6 +188,7 @@ declare type BaseInjection<T> = Tuple<[Abstract<T>, Concrete<T>]>;
 declare interface Buildable<T> {
     identifier: Identifier<T>;
     concrete: Concrete<T>;
+    instance?: T;
     configuration: Record<string, any>;
 }
 
@@ -185,6 +213,9 @@ Record<string, any>
  */
 declare type ConcreteInjection<T> = Tuple<[Concrete<T>]>;
 
+/**
+ * Injects the assemblage's configuration object.
+ */
 export declare const Configuration: () => ParameterDecorator;
 
 /**
@@ -197,10 +228,19 @@ Concrete<T>,
 Record<string, any>
 ]>;
 
+/**
+ * Injects the Assembler's context.
+ */
 export declare const Context: () => ParameterDecorator;
 
+/**
+ * Injects the assemblage's definition object.
+ */
 export declare const Definition: () => ParameterDecorator;
 
+/**
+ * Injects the Assembler's 'dispose' method.
+ */
 export declare const Dispose: () => ParameterDecorator;
 
 export declare class EventManager implements AbstractEventManager {
@@ -227,7 +267,7 @@ declare type Identifier<T> = Concrete<T> | Abstract<T>;
 declare class Injectable<T> {
     readonly privateContext: AssemblerPrivateContext;
     readonly publicContext: AssemblerContext;
-    readonly identifier: Identifier<T>;
+    readonly identifier: Identifier<T> | string | Symbol;
     readonly concrete: Concrete<T>;
     readonly configuration: Record<string, any>;
     private dependenciesIds;
@@ -265,6 +305,10 @@ declare class Injectable<T> {
      * Injectable assemblage's own injections defined in its decorator's definition.
      */
     get injections(): Injection<unknown>[];
+    /**
+     * Injectable assemblage's own objects (e.g. instances) injections defined in its decorator's definition.
+     */
+    get objects(): InstanceInjection<unknown>[];
     /**
      * Tags passed in assemblage's definition.
      */
@@ -280,6 +324,11 @@ declare class Injectable<T> {
  */
 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).
+ */
+declare type InstanceInjection<T> = Tuple<[Identifier<T> | string | Symbol, T]>;
+
 /**
  * Describes a listener type as a function taking any number of arguments and returning `void`.
  */
@@ -294,4 +343,9 @@ declare type Tuple<T extends any[]> = Pick<T, Exclude<keyof T, ArrayLengthMutati
     [Symbol.iterator]: () => IterableIterator<ArrayItems<T>>;
 };
 
+/**
+ * Injects an object passed with `string` or `Symbol` identifier.
+ */
+export declare const Use: (identifier: string | Symbol) => ParameterDecorator;
+
 export { }

package/dist/index.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=(...e)=>{},t=(...e)=>t=>{if(e.includes(typeof t))return typeof t},n=e=>!(e=>void 0===e)(e)&&!(e=>null===e)(e),s=e=>e&&"function"==typeof e&&void 0!==e.constructor,i=e=>"function"==typeof e&&"AsyncFunction"===e.constructor.name,r=(e,...t)=>{t.map(((e,n)=>{const s=/\S/.test(e);return s&&(t[n]=t[n].trim()),s?-1:n})).filter((e=>e>=0)).every((e=>{t[e]=" ",((e,t,n)=>{const s=e[t];e.splice(t,1),e.splice(n,0,s)})(t,e,t.length-1)})),t=(e=>Array.from(new Set(e)))(t);const n=new RegExp(`[^A-Za-zÀ-ÖØ-öø-ÿ0-9${t.join("")}]`,"gi");return e.replace(n,"")},o=(...e)=>t=>e.reduce(((e,t)=>t(e)),t),c=e=>t=>e.if(t)?e.then(t):e.else?e.else(t):void 0,a=t=>n=>{const s=Array.isArray(t)?e=>parseInt(e):e;for(const[e,i]of Object.entries(t))n(i,s(e))},l=(e,t)=>{const n=new Proxy(e,{get:function(n,s){return s===Symbol.iterator?n[Symbol.iterator].bind(n):((e,t)=>[...Object.getOwnPropertyNames(t.prototype),...Object.getOwnPropertyNames(Object.getPrototypeOf(e)),...Object.getOwnPropertyNames(e)])(e,t).includes(s)?n[s]:n.collection[s]},set:function(e,t,n){return Reflect.set(e,t,n)}});return n},h=(e,t)=>{const n=e;for(const s of((e,t)=>[...Object.getOwnPropertyNames(t.prototype),...Object.getOwnPropertyNames(Object.getPrototypeOf(e)),...Object.getOwnPropertyNames(e)])(e,t))delete n[s]};let d=Symbol.iterator;class u{dispose(){h(this,u)}add(...e){const t=e=>this.collection[e.channel].push(e.listener),s=c({if:()=>2===e.length,then:()=>({channel:e[0],listener:e[1]}),else:()=>{const t=e[0];return{channel:t[0],listener:t[1]}}}),i=c({if:e=>!n(this.collection[e.channel]),then:e=>{this.collection[e.channel]=[],t(e)},else:e=>{t(e)}});return o(s,i)(),this}remove(e,t){const s=t=>this.collection[e].splice(t,1),i=c({if:()=>this.collection[e]&&0===this.collection[e].length,then:()=>delete this.collection[e]}),r=c({if:()=>n(t),then:()=>s(this.collection[e].indexOf(t)),else:()=>delete this.collection[e]}),a=c({if:e=>this.has(e),then:e=>this.collection[e]});return o(a,r,i)(),this}has(...e){return t("string")(e[0])?Object.keys(this.collection).includes(e[0]):!!t("function")(e[0])&&Object.values(this.collection).flat().includes(e[0])}get(...e){return t("string")(e[0])?this.collection[e[0]]:t("function")(e[0])?Object.values(this.collection).flat().filter((t=>t===e[0])):[]}clear(){const e=(e=>t=>{const n=Array.isArray(e)?e=>parseInt(e):e=>e;for(const s in e)t(n(s))})(this.collection),t=e=>a(this.collection[e])((t=>this.remove(e,t)));return e((e=>t(e))),this}get listeners(){return Object.values(this.collection).flat()}get channels(){return Object.keys(this.collection)}get length(){return Object.values(this.collection).flat().length}[d](){let e=-1;const t=this.collection?Object.keys(this.collection):[];return{next:()=>({value:t[++e],done:!(e in t)})}}constructor(){!function(e,t,n){t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n}(this,"collection",{});return l(this,u)}}function f(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}class p{dispose(){this.listeners.dispose(),this.channels.clear(),h(this,p)}addChannels(...e){return a(e)((e=>{const t=this.cleanChannel(e);if(this.channels.has(t))throw new Error(`Channel '${t}' already exists.`);this.channels.add(t)})),this}removeChannels(...e){return a(e)((e=>{const t=this.cleanChannel(e);"*"!==t&&this.channels.has(t)&&(this.channels.delete(t),this.listeners.remove(t),this.onceListeners.remove(t))})),this}on(e,t){const n=this.cleanChannel(e);if(!this.channels.has(n))throw new Error(`Channel '${n}' was not registered.`);return this.listeners.add(n,t),this}once(e,t){const n=this.cleanChannel(e);if(!this.channels.has(n))throw new Error(`Channel '${n}' was not registered.`);return this.onceListeners.add(n,t),this}off(e,t){const n=this.cleanChannel(e);return this.listeners.remove(n,t),this}emit(e,...t){const n=this.cleanChannel(e);if(this.channels.has(n)){const e=this.onceListeners.get("*")||[],s=this.listeners.get("*")||[],i=this.onceListeners.get(n)||[],r=this.listeners.get(n)||[],o=a(e),c=a(s),l=a(i),h=a(r);o((e=>{this.run(e,...t),this.onceListeners.remove("*",e)})),c((e=>{this.run(e,...t)})),l((e=>{this.run(e,...t),this.onceListeners.remove(n,e)})),h((e=>{this.run(e,...t)}))}return this}run(e,...t){if(i(e)){return e(...t).then((()=>Promise.resolve()))}e(...t)}cleanChannel(e){return r(e,"*")}constructor(...e){f(this,"listeners",new u),f(this,"onceListeners",new u),f(this,"channels",new Set(["*"])),this.addChannels(...e)}}const g="is_assemblage",b="assemblage_definition",y="context_param_index",v="config_param_index",m="definition_param_index",w="dispose_param_index",x=(e,t,n)=>{Reflect.defineMetadata(`__${e}__`,t,n)},C=(e,t)=>Reflect.getOwnMetadata(`__${e}__`,t),j=e=>Reflect.getMetadata("design:paramtypes",e)||[],O={singleton:{test:e=>"boolean"==typeof e||void 0===e,throw:()=>{throw new Error("'singleton' property must be of type 'boolean' or 'undefined'.")},transform:e=>void 0===e},events:{test:e=>void 0===e||Array.isArray(e)&&e.every((e=>"string"==typeof e)),throw:()=>{throw new Error("'events' property must be an array of strings or 'undefined'.")},transform:e=>e},inject:{test:e=>void 0===e||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:e=>e},tags:{test:e=>void 0===e||"string"==typeof e||Array.isArray(e)&&e.every((e=>"string"==typeof e)),throw:()=>{throw new Error("'tags' property must be a string or an array of strings.")},transform:e=>"string"==typeof e?[e]:e},controller:{test:e=>"boolean"==typeof e||void 0===e,throw:()=>{throw new Error("'controller' property must be of type 'boolean' or 'undefined'.")},transform:e=>e},path:{test:e=>"string"==typeof e||void 0===e,throw:()=>{throw new Error("'path' property must be of type 'string' or 'undefined'.")},transform:e=>{if(e){let t=e.replace(/\/+/g,"/").replace(/\s/g,"");if(t.startsWith("/")||(t=`/${t}`),t.endsWith("/")){const e=t.length-1;t=t.split("").splice(0,e).join("")}return t}return e}},metadata:{test:e=>("object"==typeof e||void 0===e)&&!Array.isArray(e),throw:()=>{throw new Error("'metadata' property must be of type 'object' or 'undefined'.")},transform:e=>e}},A=e=>{const t={...e};for(const n in t){if(!Object.keys(O).includes(n))throw new Error(`Property '${n}' is not a valid assemblage definition property.`);const e=O[n].test,s=O[n].throw,i=O[n].transform;if(e(t[n])||s(),"controller"===n&&!Object.keys(t).includes("path"))throw new Error("Assemblage marked as 'controller' must define a 'path'.");if("path"===n&&!Object.keys(t).includes("controller"))throw new Error("Assemblage that defines a 'path' must be marked as 'controller'.");t[n]=i(t[n])}return t},E=e=>C(b,e),I=(e,t)=>E(t)[e],P=(e,t,n)=>new Promise((s=>{const r=e[t];if(r){if(i(r))return void r.bind(e)(n).then((()=>{s()}));s(r.bind(e)(n))}})),_=e=>{const t=(e=>C(y,e)||[])(e),n=(e=>C(m,e)||[])(e),s=(e=>C(v,e)||[])(e),i=(e=>C(w,e)||[])(e);return{context:t,definition:n,configuration:s,dispose:i}};function S(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}class ${static of(e,t,n){return new $(e,t,n)}dispose(){this.singletonInstance&&(((e,t)=>{if(e.concrete.prototype instanceof p){const n=t;for(const t of e.events)n.off(t);n.removeChannels(...e.events),e.privateContext.removeChannels(...e.events)}})(this,this.singletonInstance),P(this.singletonInstance,"onDispose",this.publicContext),h(this.singletonInstance,this.concrete)),h(this,$)}build(){if(this.singletonInstance)return this.singletonInstance;if(!(e=>C(g,e)||!1)(this.concrete))throw new Error(`Class '${this.concrete}' is not an Assemblage.`);const e=(e=>{const t=[],n=j(e.concrete),s=_(e.concrete);let i=0;for(const r of n)s.context.includes(i)?(t.push(e.publicContext),i++):s.configuration.includes(i)?(t.push(e.configuration),i++):s.definition.includes(i)?(t.push(e.definition),i++):s.dispose.includes(i)?(t.push(e.privateContext.dispose),i++):(t.push(e.privateContext.require(r)),i++);return t})(this),t=new this.concrete(...e);return((e,t)=>{if(e.concrete.prototype instanceof p){const n=t,s=n.channels;for(const t of e.events)s.has(t)||n.addChannels(t),e.privateContext.events.has(t)||e.privateContext.addChannels(t);for(const i of e.events)t.on(i,((...t)=>{e.privateContext.emit(i,...t)}))}})(this,t),P(t,"onInit",this.publicContext),this.isSingleton&&(this.singletonInstance=t),t}get dependencies(){return this.dependenciesIds}get definition(){return E(this.concrete)||{}}get isSingleton(){return I("singleton",this.concrete)||!0}get singleton(){return this.singletonInstance}get injections(){return I("inject",this.concrete)||[]}get tags(){return I("tags",this.concrete)||[]}get events(){return I("events",this.concrete)||[]}constructor(e,t,n){S(this,"privateContext",void 0),S(this,"publicContext",void 0),S(this,"identifier",void 0),S(this,"concrete",void 0),S(this,"configuration",void 0),S(this,"dependenciesIds",void 0),S(this,"singletonInstance",void 0),this.privateContext=t,this.publicContext=n,this.dependenciesIds=[],this.identifier=e.identifier,this.concrete=e.concrete,this.configuration=e.configuration;a(this.injections)((e=>this.privateContext.register(e))),this.dependenciesIds=(e=>{const t=[],n=j(e),s=_(e);let i=0;for(const r of n)s.context.includes(i)||s.configuration.includes(i)||s.definition.includes(i)||s.dispose.includes(i)||t.push(r),i++;return t})(this.concrete),this.isSingleton&&this.build()}}const k=e=>{const t=()=>s(e[0])&&(e=>"object"==typeof e&&!Array.isArray(e)&&!s(e))(e[1]);return o(c({if:()=>s(e[0])&&s(e[1]),then:()=>({identifier:e[0],concrete:e[1],configuration:{}})}),c({if:()=>t(),then:()=>({identifier:e[0],concrete:e[0],configuration:e[1]}),else:e=>e}))()};function L(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}class M extends p{static build(e){const t=new M;((e,t,n)=>{const s=E(n);s[e]=t,A(s)})("singleton",!0,e);const n=t.register([e]);return t.require(n.identifier)}dispose(){for(const[e,t]of this.injectables)t.dispose();h(this,M)}register(e){const t=(n=e,((e,t)=>(n,...s)=>e[n]?e[n](...s):t?t(n,...s):void 0)({1:()=>(e=>({identifier:e[0],concrete:e[0],configuration:{}}))(n),2:()=>k(n),3:()=>(e=>({identifier:e[0],concrete:e[1],configuration:e[2]}))(n)},(()=>{throw new Error("Injection tuple must be of length 1, 2 or 3.")}))(n.length));var n;if(this.has(t.identifier))throw new Error(`An assemblage is already registered with identifier '${t.identifier.name}'.`);const s=$.of(t,this.privateContext,this.publicContext);return this.injectables.set(s.identifier,s),P(s.concrete,"onRegister",this.publicContext),s}has(e){return this.injectables.has(e)}require(e){if(!this.injectables.has(e))throw new Error(`Assemblage with identifier '${e.name}' has not been registered.`);return this.injectables.get(e).build()}tagged(...e){const t=[];for(const n of e)for(const[e,s]of this.injectables)s.tags.includes(n)&&t.push(s.build());return t}get size(){return this.injectables.size}constructor(){super(),L(this,"injectables",new Map),L(this,"privateContext",void 0),L(this,"publicContext",void 0),this.publicContext={register:this.register.bind(this),has:this.has.bind(this),require:this.require.bind(this),tagged:this.tagged.bind(this),on:this.on.bind(this),once:this.once.bind(this),off:this.off.bind(this),events:this.channels},this.privateContext={...this.publicContext,emit:this.emit.bind(this),addChannels:this.addChannels.bind(this),removeChannels:this.removeChannels.bind(this),dispose:this.dispose.bind(this)}}}const R=e=>()=>(t,n,s)=>{const i=C(e,t)||[];i.push(s),x(e,i,t)},N=R(y),q=R(v),z=R(m),D=R(w);class W{}exports.AbstractAssemblage=class{static onRegister(e){}},exports.AbstractAssembler=class extends W{},exports.AbstractEventManager=W,exports.Assemblage=e=>{const t=e?A(e):{};return e=>(x(g,!0,e),x(b,t,e),e)},exports.Assembler=M,exports.Awaitable=(e,t=25)=>(n,s,i)=>{let r=i.value;i.value=async function(){return new Promise((n=>{if(this[e])r.apply(this),n();else{const s=setInterval((()=>{this[e]&&(clearInterval(s),r.apply(this),n())}),t)}}))}},exports.Configuration=q,exports.Context=N,exports.Definition=z,exports.Dispose=D,exports.EventManager=p;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=(...e)=>{},t=(...e)=>t=>{if(e.includes(typeof t))return typeof t},n=e=>!(e=>void 0===e)(e)&&!(e=>null===e)(e),s=e=>e&&"function"==typeof e&&void 0!==e.constructor,i=e=>"function"==typeof e&&"AsyncFunction"===e.constructor.name,r=(e,...t)=>{t.map(((e,n)=>{const s=/\S/.test(e);return s&&(t[n]=t[n].trim()),s?-1:n})).filter((e=>e>=0)).every((e=>{t[e]=" ",((e,t,n)=>{const s=e[t];e.splice(t,1),e.splice(n,0,s)})(t,e,t.length-1)})),t=(e=>Array.from(new Set(e)))(t);const n=new RegExp(`[^A-Za-zÀ-ÖØ-öø-ÿ0-9${t.join("")}]`,"gi");return e.replace(n,"")},o=(...e)=>t=>e.reduce(((e,t)=>t(e)),t),c=e=>t=>e.if(t)?e.then(t):e.else?e.else(t):void 0,a=t=>n=>{const s=Array.isArray(t)?e=>parseInt(e):e;for(const[e,i]of Object.entries(t))n(i,s(e))},h=(e,t)=>{const n=new Proxy(e,{get:function(n,s){return s===Symbol.iterator?n[Symbol.iterator].bind(n):((e,t)=>[...Object.getOwnPropertyNames(t.prototype),...Object.getOwnPropertyNames(Object.getPrototypeOf(e)),...Object.getOwnPropertyNames(e)])(e,t).includes(s)?n[s]:n.collection[s]},set:function(e,t,n){return Reflect.set(e,t,n)}});return n},l=(e,t)=>{const n=e;for(const s of((e,t)=>[...Object.getOwnPropertyNames(t.prototype),...Object.getOwnPropertyNames(Object.getPrototypeOf(e)),...Object.getOwnPropertyNames(e)])(e,t))delete n[s]};let u=Symbol.iterator;class f{dispose(){l(this,f)}add(...e){const t=e=>this.collection[e.channel].push(e.listener),s=c({if:()=>2===e.length,then:()=>({channel:e[0],listener:e[1]}),else:()=>{const t=e[0];return{channel:t[0],listener:t[1]}}}),i=c({if:e=>!n(this.collection[e.channel]),then:e=>{this.collection[e.channel]=[],t(e)},else:e=>{t(e)}});return o(s,i)(),this}remove(e,t){const s=t=>this.collection[e].splice(t,1),i=c({if:()=>this.collection[e]&&0===this.collection[e].length,then:()=>delete this.collection[e]}),r=c({if:()=>n(t),then:()=>s(this.collection[e].indexOf(t)),else:()=>delete this.collection[e]}),a=c({if:e=>this.has(e),then:e=>this.collection[e]});return o(a,r,i)(),this}has(...e){return t("string")(e[0])?Object.keys(this.collection).includes(e[0]):!!t("function")(e[0])&&Object.values(this.collection).flat().includes(e[0])}get(...e){return t("string")(e[0])?this.collection[e[0]]:t("function")(e[0])?Object.values(this.collection).flat().filter((t=>t===e[0])):[]}clear(){const e=(e=>t=>{const n=Array.isArray(e)?e=>parseInt(e):e=>e;for(const s in e)t(n(s))})(this.collection),t=e=>a(this.collection[e])((t=>this.remove(e,t)));return e((e=>t(e))),this}get listeners(){return Object.values(this.collection).flat()}get channels(){return Object.keys(this.collection)}get length(){return Object.values(this.collection).flat().length}[u](){let e=-1;const t=this.collection?Object.keys(this.collection):[];return{next:()=>({value:t[++e],done:!(e in t)})}}constructor(){!function(e,t,n){t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n}(this,"collection",{});return h(this,f)}}function d(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}class p{dispose(){this.listeners.dispose(),this.channels.clear(),l(this,p)}addChannels(...e){return a(e)((e=>{const t=this.cleanChannel(e);if(this.channels.has(t))throw new Error(`Channel '${t}' already exists.`);this.channels.add(t)})),this}removeChannels(...e){return a(e)((e=>{const t=this.cleanChannel(e);"*"!==t&&this.channels.has(t)&&(this.channels.delete(t),this.listeners.remove(t),this.onceListeners.remove(t))})),this}on(e,t){const n=this.cleanChannel(e);if(!this.channels.has(n))throw new Error(`Channel '${n}' was not registered.`);return this.listeners.add(n,t),this}once(e,t){const n=this.cleanChannel(e);if(!this.channels.has(n))throw new Error(`Channel '${n}' was not registered.`);return this.onceListeners.add(n,t),this}off(e,t){const n=this.cleanChannel(e);return this.listeners.remove(n,t),this}emit(e,...t){const n=this.cleanChannel(e);if(this.channels.has(n)){const e=this.onceListeners.get("*")||[],s=this.listeners.get("*")||[],i=this.onceListeners.get(n)||[],r=this.listeners.get(n)||[],o=a(e),c=a(s),h=a(i),l=a(r);o((e=>{this.run(e,...t),this.onceListeners.remove("*",e)})),c((e=>{this.run(e,...t)})),h((e=>{this.run(e,...t),this.onceListeners.remove(n,e)})),l((e=>{this.run(e,...t)}))}return this}run(e,...t){if(i(e)){return e(...t).then((()=>Promise.resolve()))}e(...t)}cleanChannel(e){return r(e,"*")}constructor(...e){d(this,"listeners",new f),d(this,"onceListeners",new f),d(this,"channels",new Set(["*"])),this.addChannels(...e)}}const g="is_assemblage",b="assemblage_definition",y="context_param_index",v="config_param_index",m="definition_param_index",w="dispose_param_index",x="use_param_index",C="use_token",j=(e,t,n)=>{Reflect.defineMetadata(`__${e}__`,t,n)},O=(e,t)=>Reflect.getOwnMetadata(`__${e}__`,t),A=e=>Reflect.getMetadata("design:paramtypes",e)||[],I={singleton:{test:e=>"boolean"==typeof e||void 0===e,throw:()=>{throw new Error("'singleton' property must be of type 'boolean' or 'undefined'.")},transform:e=>void 0===e},events:{test:e=>void 0===e||Array.isArray(e)&&e.every((e=>"string"==typeof e)),throw:()=>{throw new Error("'events' property must be an array of strings or 'undefined'.")},transform:e=>e},inject:{test:e=>void 0===e||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:e=>e},use:{test:e=>void 0===e||Array.isArray(e)&&e.every((e=>Array.isArray(e)&&2==e.length)),throw:()=>{throw new Error("'use' property must be an array of tuples of length 2.")},transform:e=>e},tags:{test:e=>void 0===e||"string"==typeof e||Array.isArray(e)&&e.every((e=>"string"==typeof e)),throw:()=>{throw new Error("'tags' property must be a string or an array of strings.")},transform:e=>"string"==typeof e?[e]:e},controller:{test:e=>"boolean"==typeof e||void 0===e,throw:()=>{throw new Error("'controller' property must be of type 'boolean' or 'undefined'.")},transform:e=>e},path:{test:e=>"string"==typeof e||void 0===e,throw:()=>{throw new Error("'path' property must be of type 'string' or 'undefined'.")},transform:e=>{if(e){let t=e.replace(/\/+/g,"/").replace(/\s/g,"");if(t.startsWith("/")||(t=`/${t}`),t.endsWith("/")){const e=t.length-1;t=t.split("").splice(0,e).join("")}return t}return e}},metadata:{test:e=>("object"==typeof e||void 0===e)&&!Array.isArray(e),throw:()=>{throw new Error("'metadata' property must be of type 'object' or 'undefined'.")},transform:e=>e}},E=e=>{const t={...e};for(const n in t){if(!Object.keys(I).includes(n))throw new Error(`Property '${n}' is not a valid assemblage definition property.`);const e=I[n].test,s=I[n].throw,i=I[n].transform;if(e(t[n])||s(),"controller"===n&&!Object.keys(t).includes("path"))throw new Error("Assemblage marked as 'controller' must define a 'path'.");if("path"===n&&!Object.keys(t).includes("controller"))throw new Error("Assemblage that defines a 'path' must be marked as 'controller'.");t[n]=i(t[n])}return t},_=e=>O(b,e),P=(e,t)=>_(t)[e];const $=e=>{const t=e?E(e):{};return e=>(j(g,!0,e),j(b,t,e),e)};class S{}S=function(e,t,n,s){var i,r=arguments.length,o=r<3?t:null===s?s=Object.getOwnPropertyDescriptor(t,n):s;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)o=Reflect.decorate(e,t,n,s);else for(var c=e.length-1;c>=0;c--)(i=e[c])&&(o=(r<3?i(o):r>3?i(t,n,o):i(t,n))||o);return r>3&&o&&Object.defineProperty(t,n,o),o}([$()],S);const R=(e,t,n)=>new Promise((s=>{const r=e[t];if(r){if(i(r))return void r.bind(e)(n).then((()=>{s()}));s(r.bind(e)(n))}})),k=e=>{const t=(e=>O(y,e)||[])(e),n=(e=>O(m,e)||[])(e),s=(e=>O(v,e)||[])(e),i=(e=>O(w,e)||[])(e),r=(e=>O(x,e)||[])(e);return{context:t,definition:n,configuration:s,dispose:i,use:r}};function M(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}class L{static of(e,t,n){return new L(e,t,n)}dispose(){this.singletonInstance&&(((e,t)=>{if(e.concrete.prototype instanceof p){const n=t;for(const t of e.events)n.off(t);n.removeChannels(...e.events),e.privateContext.removeChannels(...e.events)}})(this,this.singletonInstance),R(this.singletonInstance,"onDispose",this.publicContext),l(this.singletonInstance,this.concrete)),l(this,L)}build(){if(this.singletonInstance)return this.singletonInstance;const e=(e=>{const t=[],n=A(e.concrete),s=k(e.concrete);let i=0;for(const r of n)if(s.context.includes(i))t.push(e.publicContext),i++;else if(s.configuration.includes(i))t.push(e.configuration),i++;else if(s.definition.includes(i))t.push(e.definition),i++;else if(s.dispose.includes(i))t.push(e.privateContext.dispose),i++;else if(s.use.includes(i)){const n=O(C,e.concrete)[i];t.push(e.privateContext.require(n)),i++}else t.push(e.privateContext.require(r)),i++;return t})(this),t=new this.concrete(...e);return((e,t)=>{if(e.concrete.prototype instanceof p){const n=t,s=n.channels;for(const t of e.events)s.has(t)||n.addChannels(t),e.privateContext.events.has(t)||e.privateContext.addChannels(t);for(const i of e.events)t.on(i,((...t)=>{e.privateContext.emit(i,...t)}))}})(this,t),this.isSingleton?(this.singletonInstance=t,this.privateContext.prepareInit(t),this.singletonInstance):(R(t,"onInit",this.publicContext),t)}get dependencies(){return this.dependenciesIds}get definition(){return _(this.concrete)||{}}get isSingleton(){return P("singleton",this.concrete)||!0}get singleton(){return this.singletonInstance}get injections(){return P("inject",this.concrete)||[]}get objects(){return P("use",this.concrete)||[]}get tags(){return P("tags",this.concrete)||[]}get events(){return P("events",this.concrete)||[]}constructor(e,t,n){if(M(this,"privateContext",void 0),M(this,"publicContext",void 0),M(this,"identifier",void 0),M(this,"concrete",void 0),M(this,"configuration",void 0),M(this,"dependenciesIds",void 0),M(this,"singletonInstance",void 0),this.privateContext=t,this.publicContext=n,this.dependenciesIds=[],this.identifier=e.identifier,this.concrete=e.concrete,this.configuration=e.configuration,!(e=>O(g,e)||!1)(this.concrete))throw new Error(`Class '${this.concrete.name}' is not an Assemblage.`);a(this.injections)((e=>this.privateContext.register(e)));a(this.objects)((e=>{"string"==typeof e[0]||"symbol"==typeof e[0]?this.privateContext.use(e[0],e[1]):this.privateContext.register(e,!0)})),this.dependenciesIds=(e=>{const t=[],n=A(e),s=k(e);let i=0;for(const r of n)s.context.includes(i)||s.configuration.includes(i)||s.definition.includes(i)||s.dispose.includes(i)||s.use.includes(i)||t.push(r),i++;return t})(this.concrete),e.instance&&(this.singletonInstance=e.instance)}}const q=e=>{const t=()=>s(e[0])&&(e=>"object"==typeof e&&!Array.isArray(e)&&!s(e))(e[1]);return o(c({if:()=>s(e[0])&&s(e[1]),then:()=>({identifier:e[0],concrete:e[1],configuration:{}})}),c({if:()=>t(),then:()=>({identifier:e[0],concrete:e[0],configuration:e[1]}),else:e=>e}))()},N=e=>((e,t)=>(n,...s)=>e[n]?e[n](...s):t?t(n,...s):void 0)({1:()=>(e=>({identifier:e[0],concrete:e[0],configuration:{}}))(e),2:()=>q(e),3:()=>(e=>({identifier:e[0],concrete:e[1],configuration:e[2]}))(e)},(()=>{throw new Error("Injection tuple must be of length 1, 2 or 3.")}))(e.length);function D(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}class z extends p{static build(e){const t=new z;((e,t,n)=>{const s=_(n);s[e]=t,E(s)})("singleton",!0,e);const n=t.register([e]),s=t.require(n.identifier),i=t.initCache.indexOf(s);t.initCache.splice(i,1);for(const r of t.initCache)R(r,"onInit",t.publicContext);return R(s,"onInit",t.publicContext),t.initCache.length=0,s}dispose(){for(const[e,t]of this.injectables)t.dispose();l(this,z)}register(e,t=!1){const n=!0===t?{identifier:(s=e)[0],concrete:s[0],instance:s[1],configuration:{}}:N(e);var s;if(this.has(n.identifier))throw new Error(`An assemblage is already registered with identifier '${n.identifier.name}'.`);const i=L.of(n,this.privateContext,this.publicContext);return this.injectables.set(i.identifier,i),R(i.concrete,"onRegister",this.publicContext),i}use(e,t){if(this.has(e))throw new Error(`A valu is already registered for identifier '${String(e)}'.`);return this.objects.set(e,t),t}prepareInit(e){return this.initCache.push(e),this.initCache}has(e){return"string"==typeof e||"symbol"==typeof e?this.objects.has(e):this.injectables.has(e)}require(e){switch(typeof e){case"string":case"symbol":if(!this.objects.has(e))throw new Error(`Injected object with identifier '${String(e)}' has not been registered.`);return this.objects.get(e);default:if(!this.injectables.has(e))throw new Error(`Assemblage with identifier '${e.name}' has not been registered.`);return this.injectables.get(e).build()}}tagged(...e){const t=[];for(const n of e)for(const[e,s]of this.injectables)s.tags.includes(n)&&t.push(s.build());return t}get size(){return this.injectables.size}constructor(){super(),D(this,"injectables",new Map),D(this,"objects",new Map),D(this,"initCache",[]),D(this,"privateContext",void 0),D(this,"publicContext",void 0),this.publicContext={has:this.has.bind(this),require:this.require.bind(this),tagged:this.tagged.bind(this),on:this.on.bind(this),once:this.once.bind(this),off:this.off.bind(this),events:this.channels},this.privateContext={...this.publicContext,register:this.register.bind(this),use:this.use.bind(this),prepareInit:this.prepareInit.bind(this),emit:this.emit.bind(this),addChannels:this.addChannels.bind(this),removeChannels:this.removeChannels.bind(this),dispose:this.dispose.bind(this)}}}const W=e=>()=>(t,n,s)=>{const i=O(e,t)||[];i.push(s),j(e,i,t)},F=W(y),T=W(v),U=W(m),Z=W(w);class B{}exports.AbstractAssemblage=class{static onRegister(e){}},exports.AbstractAssembler=class extends B{},exports.AbstractEventManager=B,exports.Assemblage=$,exports.Assembler=z,exports.Await=(e,t=25)=>(n,s,i)=>{const r=i.value;i.value=async function(){return new Promise((n=>{if(this[e])r.apply(this),n();else{const s=setInterval((()=>{this[e]&&(clearInterval(s),r.apply(this),n())}),t)}}))}},exports.Configuration=T,exports.Context=F,exports.Definition=U,exports.Dispose=Z,exports.EventManager=p,exports.Use=e=>(t,n,s)=>{const i=O(x,t)||[];i.push(s),j(x,i,t);const r=O(C,t)||{};r[s]=e,j(C,r,t)};

package/dist/index.mjs

@@ -48,7 +48,7 @@ const forIn = (e)=>(t)=>{
             t(r(o));
         }
     };
-const e$4 = (e, t)=>{
+const e$5 = (e, t)=>{
     return [
         ...Object.getOwnPropertyNames(t.prototype),
         ...Object.getOwnPropertyNames(Object.getPrototypeOf(e)),
@@ -60,7 +60,7 @@ const proxifyIterable = (t, r)=>{
         get: function(o, n) {
             if (n === Symbol.iterator) {
                 return o[Symbol.iterator].bind(o);
-            } else if (!e$4(t, r).includes(n)) {
+            } else if (!e$5(t, r).includes(n)) {
                 return o.collection[n];
             }
             return o[n];
@@ -85,7 +85,7 @@ const clearInstance = (e, t)=>{
     }
 };
 
-function e$3(e, t, n) {
+function e$4(e, t, n) {
     if (t in e) {
         Object.defineProperty(e, t, {
             value: n,
@@ -98,7 +98,7 @@ function e$3(e, t, n) {
     }
     return e;
 }
-let h = Symbol.iterator;
+let h$1 = Symbol.iterator;
 class ListenerCollection {
     dispose() {
         clearInstance(this, ListenerCollection);
@@ -183,7 +183,7 @@ class ListenerCollection {
     get length() {
         return Object.values(this.collection).flat().length;
     }
-    [h]() {
+    [h$1]() {
         let e = -1;
         const t = this.collection ? Object.keys(this.collection) : [];
         return {
@@ -194,13 +194,13 @@ class ListenerCollection {
         };
     }
     constructor(){
-        e$3(this, "collection", {});
+        e$4(this, "collection", {});
         const t = proxifyIterable(this, ListenerCollection);
         return t;
     }
 }
 
-function e$2(e, n, s) {
+function e$3(e, n, s) {
     if (n in e) {
         Object.defineProperty(e, n, {
             value: s,
@@ -302,9 +302,9 @@ class EventManager {
         return onlyAlphanumeric(e, '*');
     }
     constructor(...n){
-        e$2(this, "listeners", new ListenerCollection());
-        e$2(this, "onceListeners", new ListenerCollection());
-        e$2(this, "channels", new Set([
+        e$3(this, "listeners", new ListenerCollection());
+        e$3(this, "onceListeners", new ListenerCollection());
+        e$3(this, "channels", new Set([
             '*'
         ]));
         this.addChannels(...n);
@@ -320,6 +320,8 @@ const ReflectContextParamIndex = `context_param_index`;
 const ReflectConfigurationParamIndex = `config_param_index`;
 const ReflectDefinitionParamIndex = `definition_param_index`;
 const ReflectDisposeParamIndex = `dispose_param_index`;
+const ReflectUseParamIndex = `use_param_index`;
+const ReflectUseToken = 'use_token';
 
 const defineCustomMetadata = (t, o, n)=>{
     Reflect.defineMetadata(`${ReflectPrefix}${t}${ReflectSuffix}`, o, n);
@@ -331,121 +333,139 @@ const getParamTypes = (e)=>{
     return Reflect.getMetadata(ReflectParamTypes, e) || [];
 };
 
-const r = {
+const t = {
     singleton: {
-        test: (t)=>typeof t === 'boolean' || typeof t === 'undefined',
+        test: (e)=>typeof e === 'boolean' || typeof e === 'undefined',
         throw: ()=>{
             throw new Error(`'singleton' property must be of type 'boolean' or 'undefined'.`);
         },
-        transform: (t)=>typeof t === 'undefined' ? true : false
+        transform: (e)=>typeof e === 'undefined' ? true : false
     },
     events: {
-        test: (t)=>typeof t === 'undefined' || Array.isArray(t) && t.every((t)=>typeof t === '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: (t)=>t
+        transform: (e)=>e
     },
     inject: {
-        test: (t)=>typeof t === 'undefined' || Array.isArray(t) && t.every((t)=>Array.isArray(t) && t.length >= 1 && t.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: (t)=>t
+        transform: (e)=>e
+    },
+    use: {
+        test: (e)=>typeof e === 'undefined' || Array.isArray(e) && e.every((e)=>Array.isArray(e) && e.length == 2),
+        throw: ()=>{
+            throw new Error(`'use' property must be an array of tuples of length 2.`);
+        },
+        transform: (e)=>e
     },
     tags: {
-        test: (t)=>typeof t === 'undefined' || typeof t === 'string' || Array.isArray(t) && t.every((t)=>typeof t === '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: (t)=>typeof t === 'string' ? [
-                t
-            ] : t
+        transform: (e)=>typeof e === 'string' ? [
+                e
+            ] : e
     },
     controller: {
-        test: (t)=>typeof t === 'boolean' || typeof t === 'undefined',
+        test: (e)=>typeof e === 'boolean' || typeof e === 'undefined',
         throw: ()=>{
             throw new Error(`'controller' property must be of type 'boolean' or 'undefined'.`);
         },
-        transform: (t)=>t
+        transform: (e)=>e
     },
     path: {
-        test: (t)=>typeof t === 'string' || typeof t === 'undefined',
+        test: (e)=>typeof e === 'string' || typeof e === 'undefined',
         throw: ()=>{
             throw new Error(`'path' property must be of type 'string' or 'undefined'.`);
         },
-        transform: (t)=>{
-            if (t) {
-                let e = t.replace(/\/+/g, '/').replace(/\s/g, '');
-                if (!e.startsWith('/')) {
-                    e = `/${e}`;
+        transform: (e)=>{
+            if (e) {
+                let r = e.replace(/\/+/g, '/').replace(/\s/g, '');
+                if (!r.startsWith('/')) {
+                    r = `/${r}`;
                 }
-                if (e.endsWith('/')) {
-                    const t = e.length - 1;
-                    e = e.split('').splice(0, t).join('');
+                if (r.endsWith('/')) {
+                    const e = r.length - 1;
+                    r = r.split('').splice(0, e).join('');
                 }
-                return e;
+                return r;
             }
-            return t;
+            return e;
         }
     },
     metadata: {
-        test: (t)=>(typeof t === 'object' || typeof t === 'undefined') && !Array.isArray(t),
+        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: (t)=>t
+        transform: (e)=>e
     }
 };
-const validateDefinition = (t)=>{
-    const e = {
-        ...t
+const validateDefinition = (e)=>{
+    const r = {
+        ...e
     };
-    for(const t in e){
-        if (!Object.keys(r).includes(t)) {
-            throw new Error(`Property '${t}' is not a valid assemblage definition property.`);
-        }
-        const o = r[t].test;
-        const n = r[t].throw;
-        const s = r[t].transform;
-        if (!o(e[t])) {
+    for(const e in r){
+        if (!Object.keys(t).includes(e)) {
+            throw new Error(`Property '${e}' is not a valid assemblage definition property.`);
+        }
+        const o = t[e].test;
+        const n = t[e].throw;
+        const s = t[e].transform;
+        if (!o(r[e])) {
             n();
         }
-        if (t === 'controller' && !Object.keys(e).includes('path')) {
+        if (e === 'controller' && !Object.keys(r).includes('path')) {
             throw new Error(`Assemblage marked as 'controller' must define a 'path'.`);
         }
-        if (t === 'path' && !Object.keys(e).includes('controller')) {
+        if (e === 'path' && !Object.keys(r).includes('controller')) {
             throw new Error(`Assemblage that defines a 'path' must be marked as 'controller'.`);
         }
-        e[t] = s(e[t]);
+        r[e] = s(r[e]);
     }
-    return e;
+    return r;
 };
-const getDefinition = (r)=>{
-    return getOwnCustomMetadata(ReflectDefinition, r);
+const getDefinition = (t)=>{
+    return getOwnCustomMetadata(ReflectDefinition, t);
 };
-const getDefinitionValue = (t, e)=>{
-    const r = getDefinition(e);
-    return r[t];
+const getDefinitionValue = (e, r)=>{
+    const t = getDefinition(r);
+    return t[e];
 };
-const setDefinitionValue = (t, e, r)=>{
-    const o = getDefinition(r);
-    o[t] = e;
+const setDefinitionValue = (e, r, t)=>{
+    const o = getDefinition(t);
+    o[e] = r;
     const n = validateDefinition(o);
     return n;
 };
 
-const Assemblage = (r)=>{
-    const n = r ? validateDefinition(r) : {};
-    return (r)=>{
-        defineCustomMetadata(ReflectIsAssemblageFlag, true, r);
-        defineCustomMetadata(ReflectDefinition, n, r);
-        return r;
+function e$2(e, t, r, o) {
+    var s = arguments.length, n = s < 3 ? t : o === null ? o = Object.getOwnPropertyDescriptor(t, r) : o, l;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") n = Reflect.decorate(e, t, r, o);
+    else for(var c = e.length - 1; c >= 0; c--)if (l = e[c]) n = (s < 3 ? l(n) : s > 3 ? l(t, r, n) : l(t, r)) || n;
+    return s > 3 && n && Object.defineProperty(t, r, n), n;
+}
+const Assemblage = (e)=>{
+    const r = e ? validateDefinition(e) : {};
+    return (e)=>{
+        defineCustomMetadata(ReflectIsAssemblageFlag, true, e);
+        defineCustomMetadata(ReflectDefinition, r, e);
+        return e;
     };
 };
 const isAssemblage = (e)=>{
     return getOwnCustomMetadata(ReflectIsAssemblageFlag, e) || false;
 };
+class NoOpAssemblage {
+}
+NoOpAssemblage = e$2([
+    Assemblage()
+], NoOpAssemblage);
 
 const callHook = (o, r, t)=>{
     return new Promise((i)=>{
@@ -474,57 +494,69 @@ const getDefinitionIndex = (e)=>{
 const getDisposeIndex = (e)=>{
     return getOwnCustomMetadata(ReflectDisposeParamIndex, e) || [];
 };
+const getUseIndex = (e)=>{
+    return getOwnCustomMetadata(ReflectUseParamIndex, e) || [];
+};
 const getDecoratedParametersIndexes = (e)=>{
     const t = getContextIndex(e);
     const n = getDefinitionIndex(e);
     const o = getConfigurationIndex(e);
     const r = getDisposeIndex(e);
+    const s = getUseIndex(e);
     return {
         context: t,
         definition: n,
         configuration: o,
-        dispose: r
+        dispose: r,
+        use: s
     };
 };
 
-const resolveParameters = (o)=>{
-    const t = [];
-    const i = getParamTypes(o.concrete);
-    const s = getDecoratedParametersIndexes(o.concrete);
-    let c = 0;
-    for (const e of i){
-        if (s.context.includes(c)) {
-            t.push(o.publicContext);
-            c++;
+const resolveParameters = (i)=>{
+    const s = [];
+    const c = getParamTypes(i.concrete);
+    const r = getDecoratedParametersIndexes(i.concrete);
+    let u = 0;
+    for (const e of c){
+        if (r.context.includes(u)) {
+            s.push(i.publicContext);
+            u++;
             continue;
         }
-        if (s.configuration.includes(c)) {
-            t.push(o.configuration);
-            c++;
+        if (r.configuration.includes(u)) {
+            s.push(i.configuration);
+            u++;
             continue;
         }
-        if (s.definition.includes(c)) {
-            t.push(o.definition);
-            c++;
+        if (r.definition.includes(u)) {
+            s.push(i.definition);
+            u++;
             continue;
         }
-        if (s.dispose.includes(c)) {
-            t.push(o.privateContext.dispose);
-            c++;
+        if (r.dispose.includes(u)) {
+            s.push(i.privateContext.dispose);
+            u++;
             continue;
         }
-        t.push(o.privateContext.require(e));
-        c++;
+        if (r.use.includes(u)) {
+            const e = getOwnCustomMetadata(ReflectUseToken, i.concrete);
+            const o = e[u];
+            s.push(i.privateContext.require(o));
+            u++;
+            continue;
+        }
+        s.push(i.privateContext.require(e));
+        u++;
     }
-    return t;
+    return s;
 };
-const resolveDependencies = (o)=>{
+const resolveDependencies = (n)=>{
     const t = [];
-    const i = getParamTypes(o);
-    const s = getDecoratedParametersIndexes(o);
+    const i = getParamTypes(n);
+    const s = getDecoratedParametersIndexes(n);
     let c = 0;
     for (const e of i){
-        if (s.context.includes(c) || s.configuration.includes(c) || s.definition.includes(c) || s.dispose.includes(c)) {
+        if (s.context.includes(c) || s.configuration.includes(c) || s.definition.includes(c) || s.dispose.includes(c) || s.use.includes(c)) {
             c++;
             continue;
         }
@@ -562,22 +594,22 @@ const unregisterEvents = (t, n)=>{
     }
 };
 
-function e$1(e, t, i) {
+function e$1(e, t, n) {
     if (t in e) {
         Object.defineProperty(e, t, {
-            value: i,
+            value: n,
             enumerable: true,
             configurable: true,
             writable: true
         });
     } else {
-        e[t] = i;
+        e[t] = n;
     }
     return e;
 }
 class Injectable {
-    static of(e, t, i) {
-        return new Injectable(e, t, i);
+    static of(e, t, n) {
+        return new Injectable(e, t, n);
     }
     dispose() {
         if (this.singletonInstance) {
@@ -589,16 +621,15 @@ class Injectable {
     }
     build() {
         if (this.singletonInstance) return this.singletonInstance;
-        if (!isAssemblage(this.concrete)) {
-            throw new Error(`Class '${this.concrete}' is not an Assemblage.`);
-        }
         const e = resolveParameters(this);
         const t = new this.concrete(...e);
         registerEvents(this, t);
-        callHook(t, 'onInit', this.publicContext);
         if (this.isSingleton) {
             this.singletonInstance = t;
+            this.privateContext.prepareInit(t);
+            return this.singletonInstance;
         }
+        callHook(t, 'onInit', this.publicContext);
         return t;
     }
     get dependencies() {
@@ -616,13 +647,16 @@ class Injectable {
     get injections() {
         return getDefinitionValue('inject', this.concrete) || [];
     }
+    get objects() {
+        return getDefinitionValue('use', this.concrete) || [];
+    }
     get tags() {
         return getDefinitionValue('tags', this.concrete) || [];
     }
     get events() {
         return getDefinitionValue('events', this.concrete) || [];
     }
-    constructor(t, n, s){
+    constructor(t, s, o){
         e$1(this, "privateContext", undefined);
         e$1(this, "publicContext", undefined);
         e$1(this, "identifier", undefined);
@@ -630,29 +664,40 @@ class Injectable {
         e$1(this, "configuration", undefined);
         e$1(this, "dependenciesIds", undefined);
         e$1(this, "singletonInstance", undefined);
-        this.privateContext = n;
-        this.publicContext = s;
+        this.privateContext = s;
+        this.publicContext = o;
         this.dependenciesIds = [];
         this.identifier = t.identifier;
         this.concrete = t.concrete;
         this.configuration = t.configuration;
-        const o = forOf(this.injections);
-        o((e)=>this.privateContext.register(e));
+        if (!isAssemblage(this.concrete)) {
+            throw new Error(`Class '${this.concrete.name}' is not an Assemblage.`);
+        }
+        const r = forOf(this.injections);
+        r((e)=>this.privateContext.register(e));
+        const h = forOf(this.objects);
+        h((e)=>{
+            if (typeof e[0] === 'string' || typeof e[0] === 'symbol') {
+                this.privateContext.use(e[0], e[1]);
+            } else {
+                this.privateContext.register(e, true);
+            }
+        });
         this.dependenciesIds = resolveDependencies(this.concrete);
-        if (this.isSingleton) {
-            this.build();
+        if (t.instance) {
+            this.singletonInstance = t.instance;
         }
     }
 }
 
-const i$1 = (n)=>{
+const i = (n)=>{
     return {
         identifier: n[0],
         concrete: n[0],
         configuration: {}
     };
 };
-const c$1 = (o)=>{
+const c = (o)=>{
     const i = ()=>isClass(o[0]) && isClass(o[1]);
     const c = ()=>isClass(o[0]) && isObject(o[1]);
     const u = ()=>pipe(conditionally({
@@ -677,7 +722,7 @@ const c$1 = (o)=>{
         }))();
     return u();
 };
-const u = (n)=>{
+const u$1 = (n)=>{
     return {
         identifier: n[0],
         concrete: n[1],
@@ -685,12 +730,20 @@ const u = (n)=>{
     };
 };
 const resolveInjectionTuple = (n)=>switchCase({
-        1: ()=>i$1(n),
-        2: ()=>c$1(n),
-        3: ()=>u(n)
+        1: ()=>i(n),
+        2: ()=>c(n),
+        3: ()=>u$1(n)
     }, ()=>{
         throw new Error(`Injection tuple must be of length 1, 2 or 3.`);
     })(n.length);
+const resolveInstanceInjectionTuple = (n)=>{
+    return {
+        identifier: n[0],
+        concrete: n[0],
+        instance: n[1],
+        configuration: {}
+    };
+};
 
 function e(e, t, i) {
     if (t in e) {
@@ -712,7 +765,15 @@ class Assembler extends EventManager {
         const i = t.register([
             e
         ]);
-        return t.require(i.identifier);
+        const s = t.require(i.identifier);
+        const o = t.initCache.indexOf(s);
+        t.initCache.splice(o, 1);
+        for (const e of t.initCache){
+            callHook(e, 'onInit', t.publicContext);
+        }
+        callHook(s, 'onInit', t.publicContext);
+        t.initCache.length = 0;
+        return s;
     }
     dispose() {
         for (const [e, t] of this.injectables){
@@ -720,25 +781,52 @@ class Assembler extends EventManager {
         }
         clearInstance(this, Assembler);
     }
-    register(e) {
-        const t = resolveInjectionTuple(e);
-        if (this.has(t.identifier)) {
-            throw new Error(`An assemblage is already registered with identifier '${t.identifier.name}'.`);
+    register(e, t = false) {
+        const i = t === true ? resolveInstanceInjectionTuple(e) : resolveInjectionTuple(e);
+        if (this.has(i.identifier)) {
+            throw new Error(`An assemblage is already registered with identifier '${i.identifier.name}'.`);
         }
-        const i = Injectable.of(t, this.privateContext, this.publicContext);
-        this.injectables.set(i.identifier, i);
-        callHook(i.concrete, 'onRegister', this.publicContext);
-        return i;
+        const r = Injectable.of(i, this.privateContext, this.publicContext);
+        this.injectables.set(r.identifier, r);
+        callHook(r.concrete, 'onRegister', this.publicContext);
+        return r;
+    }
+    use(e, t) {
+        if (this.has(e)) {
+            throw new Error(`A valu is already registered for identifier '${String(e)}'.`);
+        }
+        this.objects.set(e, t);
+        return t;
+    }
+    prepareInit(e) {
+        this.initCache.push(e);
+        return this.initCache;
     }
     has(e) {
+        if (typeof e === 'string' || typeof e === 'symbol') {
+            return this.objects.has(e);
+        }
         return this.injectables.has(e);
     }
     require(e) {
-        if (!this.injectables.has(e)) {
-            throw new Error(`Assemblage with identifier '${e.name}' has not been registered.`);
+        switch(typeof e){
+            case 'string':
+            case 'symbol':
+                {
+                    if (!this.objects.has(e)) {
+                        throw new Error(`Injected object with identifier '${String(e)}' has not been registered.`);
+                    }
+                    return this.objects.get(e);
+                }
+            default:
+                {
+                    if (!this.injectables.has(e)) {
+                        throw new Error(`Assemblage with identifier '${e.name}' has not been registered.`);
+                    }
+                    const t = this.injectables.get(e);
+                    return t.build();
+                }
         }
-        const t = this.injectables.get(e);
-        return t.build();
     }
     tagged(...e) {
         const t = [];
@@ -753,9 +841,8 @@ class Assembler extends EventManager {
         return this.injectables.size;
     }
     constructor(){
-        super(), e(this, "injectables", new Map()), e(this, "privateContext", undefined), e(this, "publicContext", undefined);
+        super(), e(this, "injectables", new Map()), e(this, "objects", new Map()), e(this, "initCache", []), e(this, "privateContext", undefined), e(this, "publicContext", undefined);
         this.publicContext = {
-            register: this.register.bind(this),
             has: this.has.bind(this),
             require: this.require.bind(this),
             tagged: this.tagged.bind(this),
@@ -766,6 +853,9 @@ class Assembler extends EventManager {
         };
         this.privateContext = {
             ...this.publicContext,
+            register: this.register.bind(this),
+            use: this.use.bind(this),
+            prepareInit: this.prepareInit.bind(this),
             emit: this.emit.bind(this),
             addChannels: this.addChannels.bind(this),
             removeChannels: this.removeChannels.bind(this),
@@ -774,34 +864,44 @@ class Assembler extends EventManager {
     }
 }
 
-const c = (o)=>()=>{
-        return (t, n, e)=>{
-            const c = getOwnCustomMetadata(o, t) || [];
-            c.push(e);
-            defineCustomMetadata(o, c, t);
+const p = (o)=>()=>{
+        return (t, n, s)=>{
+            const e = getOwnCustomMetadata(o, t) || [];
+            e.push(s);
+            defineCustomMetadata(o, e, t);
         };
     };
-const i = c(ReflectContextParamIndex);
-const f = c(ReflectConfigurationParamIndex);
-const p = c(ReflectDefinitionParamIndex);
-const m = c(ReflectDisposeParamIndex);
+const f = p(ReflectContextParamIndex);
+const u = p(ReflectConfigurationParamIndex);
+const m = p(ReflectDefinitionParamIndex);
+const h = p(ReflectDisposeParamIndex);
+const l = (o)=>{
+    return (t, n, s)=>{
+        const p = getOwnCustomMetadata(ReflectUseParamIndex, t) || [];
+        p.push(s);
+        defineCustomMetadata(ReflectUseParamIndex, p, t);
+        const f = getOwnCustomMetadata(ReflectUseToken, t) || {};
+        f[s] = o;
+        defineCustomMetadata(ReflectUseToken, f, t);
+    };
+};
 
-const Awaitable = (e, t = 25)=>{
-    return (a, l, n)=>{
-        let s = n.value;
-        n.value = async function() {
-            return new Promise((a)=>{
-                if (this[e]) {
-                    s.apply(this);
-                    a();
+const Await = (t, e = 25)=>{
+    return (n, s, a)=>{
+        const i = a.value;
+        a.value = async function() {
+            return new Promise((n)=>{
+                if (this[t]) {
+                    i.apply(this);
+                    n();
                 } else {
-                    const l = setInterval(()=>{
-                        if (this[e]) {
-                            clearInterval(l);
-                            s.apply(this);
-                            a();
+                    const s = setInterval(()=>{
+                        if (this[t]) {
+                            clearInterval(s);
+                            i.apply(this);
+                            n();
                         }
-                    }, t);
+                    }, e);
                 }
             });
         };
@@ -818,4 +918,4 @@ class AbstractEventManager {
 class AbstractAssembler extends AbstractEventManager {
 }
 
-export { AbstractAssemblage, AbstractAssembler, AbstractEventManager, Assemblage, Assembler, Awaitable, f as Configuration, i as Context, p as Definition, m as Dispose, EventManager };
+export { AbstractAssemblage, AbstractAssembler, AbstractEventManager, Assemblage, Assembler, Await, u as Configuration, f as Context, m as Definition, h as Dispose, EventManager, l as Use };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "assemblerjs",
   "description": "A simple and zero-dependency DI package written in typescript.",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "author": "Benoît LAHOZ <info@benoitlahoz.io>",
   "bugs": "https://github.com/benoitlahoz/assemblerjs/issues",
   "devDependencies": {