assemblerjs 1.1.21 → 1.1.23

package/dist/index44.mjs

@@ -1,29 +1,50 @@
-class SingletonStrategy {
-    resolve(t, e) {
-        const n = t.identifier;
-        if (this.cache.has(n)) {
-            return this.cache.get(n);
-        }
-        const o = t.build(e);
-        const r = e ? {
-            ...t.configuration,
-            ...e
-        } : t.configuration;
-        t.setSingletonInstance(o, r);
-        this.cache.set(n, o);
-        t.privateContext.prepareInitHook(o, t.configuration);
-        return o;
-    }
-    constructor(){
-        this.cache = new Map();
-    }
-}
-class TransientStrategy {
-    resolve(t, e) {
-        const n = t.build(e);
-        t.privateContext.prepareInitHook(n, t.configuration);
-        return n;
-    }
-}
+import { switchCase, pipe, conditionally, isClass, isObject } from '@assemblerjs/core';
 
-export { SingletonStrategy, TransientStrategy };
+const i = (e)=>{
+    return {
+        identifier: e[0],
+        concrete: e[0],
+        configuration: {}
+    };
+};
+const c = (o)=>{
+    const i = ()=>isClass(o[0]) && isClass(o[1]);
+    const c = ()=>isClass(o[0]) && isObject(o[1]);
+    const s = ()=>pipe(conditionally({
+            if: ()=>i(),
+            then: ()=>{
+                return {
+                    identifier: o[0],
+                    concrete: o[1],
+                    configuration: {}
+                };
+            }
+        }), conditionally({
+            if: ()=>c(),
+            then: ()=>{
+                return {
+                    identifier: o[0],
+                    concrete: o[0],
+                    configuration: o[1]
+                };
+            },
+            else: (e)=>e
+        }))();
+    return s();
+};
+const s = (e)=>{
+    return {
+        identifier: e[0],
+        concrete: e[1],
+        configuration: e[2]
+    };
+};
+const resolveInjectionTuple = (e)=>switchCase({
+        1: ()=>i(e),
+        2: ()=>c(e),
+        3: ()=>s(e)
+    }, ()=>{
+        throw new Error(`Injection tuple must be of length 1, 2 or 3.`);
+    })(e.length);
+
+export { resolveInjectionTuple };

package/dist/index45.js

@@ -4,15 +4,15 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const core = require('@assemblerjs/core');
 const constants = require('./index28.js');
-const reflection = require('./index29.js');
-const debugLogger = require('./index37.js');
+const reflection = require('./index36.js');
+const debugLogger = require('./index34.js');
 const injectableBuilder = require('./index50.js');
 const dependencies = require('./index51.js');
-const helpers = require('./index31.js');
-const hookManager = require('./index34.js');
+const helpers = require('./index41.js');
+const hookManager = require('./index31.js');
 const helpers$1 = require('./index3.js');
 const use = require('./index43.js');
-const schema = require('./index30.js');
+const schema = require('./index38.js');
 const decorators = require('./index11.js');
 const transversalManager = require('./index13.js');
 
@@ -120,9 +120,9 @@ class Injectable {
         }
         return this.cachedEvents;
     }
-    constructor(t, e, r){
+    constructor(t, e, o){
         this.privateContext = e;
-        this.publicContext = r;
+        this.publicContext = o;
         this.dependenciesIds = [];
         this.identifier = t.identifier;
         this.concrete = t.concrete;
@@ -135,6 +135,32 @@ class Injectable {
         if (this.concrete) {
             const t = debugLogger.DebugLogger.getInstance();
             reflection.defineCustomMetadata(constants.ReflectValue.AssemblageContext, this.publicContext, this.concrete);
+            if (this.globals) {
+                const e = Object.keys(this.globals);
+                const i = e.map((t)=>{
+                    const e = this.globals[t];
+                    return {
+                        key: t,
+                        value: e
+                    };
+                });
+                if (e.length > 0) {
+                    t.logPhaseStart('registrationGlobals', {
+                        target: this.concrete?.name ?? String(this.identifier),
+                        count: e.length,
+                        keys: e,
+                        values: i
+                    });
+                }
+                for(const t in this.globals){
+                    this.privateContext.addGlobal(t, this.globals[t]);
+                }
+                if (e.length > 0) {
+                    t.logPhaseEnd('registrationGlobals', undefined, {
+                        target: this.concrete?.name ?? String(this.identifier)
+                    });
+                }
+            }
             for (const t of this.transversals){
                 const e = this.resolveTransversalToInjection(t);
                 this.privateContext.register(e);
@@ -157,10 +183,18 @@ class Injectable {
                     if (typeof t === 'function') return t.name || t.toString();
                     return String(t);
                 });
+                const i = this.objects.map(([t, e])=>{
+                    const i = typeof t === 'symbol' ? t.toString() : typeof t === 'function' ? t.name || t.toString() : String(t);
+                    return {
+                        key: i,
+                        value: e
+                    };
+                });
                 t.logPhaseStart('registrationUse', {
                     target: this.concrete?.name ?? String(this.identifier),
                     count: this.objects.length,
-                    keys: e
+                    keys: e,
+                    values: i
                 });
             }
             for (const t of this.objects){
@@ -200,24 +234,6 @@ class Injectable {
                 }
             }
             this.dependenciesIds = this.concrete ? dependencies.resolveDependencies(this.concrete) : [];
-            if (this.globals) {
-                const e = Object.keys(this.globals);
-                if (e.length > 0) {
-                    t.logPhaseStart('registrationGlobals', {
-                        target: this.concrete?.name ?? String(this.identifier),
-                        count: e.length,
-                        keys: e
-                    });
-                }
-                for(const t in this.globals){
-                    this.privateContext.addGlobal(t, this.globals[t]);
-                }
-                if (e.length > 0) {
-                    t.logPhaseEnd('registrationGlobals', undefined, {
-                        target: this.concrete?.name ?? String(this.identifier)
-                    });
-                }
-            }
         }
         if (t.instance) {
             this.singletonInstance = t.instance;

package/dist/index45.mjs

@@ -1,14 +1,14 @@
 import { isClass, clearInstance } from '@assemblerjs/core';
 import { ReflectValue } from './index28.mjs';
-import { defineCustomMetadata } from './index29.mjs';
-import { DebugLogger } from './index37.mjs';
+import { defineCustomMetadata } from './index36.mjs';
+import { DebugLogger } from './index34.mjs';
 import { InjectableBuilder } from './index50.mjs';
 import { resolveDependencies } from './index51.mjs';
-import { unregisterEvents } from './index31.mjs';
-import { HookManager } from './index34.mjs';
+import { unregisterEvents } from './index41.mjs';
+import { HookManager } from './index31.mjs';
 import { isAssemblage } from './index3.mjs';
 import { isFactory } from './index43.mjs';
-import { getDefinition } from './index30.mjs';
+import { getDefinition } from './index38.mjs';
 import { isTransversal } from './index11.mjs';
 import { TransversalManager } from './index13.mjs';
 
@@ -116,9 +116,9 @@ class Injectable {
         }
         return this.cachedEvents;
     }
-    constructor(t, e, r){
+    constructor(t, e, o){
         this.privateContext = e;
-        this.publicContext = r;
+        this.publicContext = o;
         this.dependenciesIds = [];
         this.identifier = t.identifier;
         this.concrete = t.concrete;
@@ -131,6 +131,32 @@ class Injectable {
         if (this.concrete) {
             const t = DebugLogger.getInstance();
             defineCustomMetadata(ReflectValue.AssemblageContext, this.publicContext, this.concrete);
+            if (this.globals) {
+                const e = Object.keys(this.globals);
+                const i = e.map((t)=>{
+                    const e = this.globals[t];
+                    return {
+                        key: t,
+                        value: e
+                    };
+                });
+                if (e.length > 0) {
+                    t.logPhaseStart('registrationGlobals', {
+                        target: this.concrete?.name ?? String(this.identifier),
+                        count: e.length,
+                        keys: e,
+                        values: i
+                    });
+                }
+                for(const t in this.globals){
+                    this.privateContext.addGlobal(t, this.globals[t]);
+                }
+                if (e.length > 0) {
+                    t.logPhaseEnd('registrationGlobals', undefined, {
+                        target: this.concrete?.name ?? String(this.identifier)
+                    });
+                }
+            }
             for (const t of this.transversals){
                 const e = this.resolveTransversalToInjection(t);
                 this.privateContext.register(e);
@@ -153,10 +179,18 @@ class Injectable {
                     if (typeof t === 'function') return t.name || t.toString();
                     return String(t);
                 });
+                const i = this.objects.map(([t, e])=>{
+                    const i = typeof t === 'symbol' ? t.toString() : typeof t === 'function' ? t.name || t.toString() : String(t);
+                    return {
+                        key: i,
+                        value: e
+                    };
+                });
                 t.logPhaseStart('registrationUse', {
                     target: this.concrete?.name ?? String(this.identifier),
                     count: this.objects.length,
-                    keys: e
+                    keys: e,
+                    values: i
                 });
             }
             for (const t of this.objects){
@@ -196,24 +230,6 @@ class Injectable {
                 }
             }
             this.dependenciesIds = this.concrete ? resolveDependencies(this.concrete) : [];
-            if (this.globals) {
-                const e = Object.keys(this.globals);
-                if (e.length > 0) {
-                    t.logPhaseStart('registrationGlobals', {
-                        target: this.concrete?.name ?? String(this.identifier),
-                        count: e.length,
-                        keys: e
-                    });
-                }
-                for(const t in this.globals){
-                    this.privateContext.addGlobal(t, this.globals[t]);
-                }
-                if (e.length > 0) {
-                    t.logPhaseEnd('registrationGlobals', undefined, {
-                        target: this.concrete?.name ?? String(this.identifier)
-                    });
-                }
-            }
         }
         if (t.instance) {
             this.singletonInstance = t.instance;

package/dist/index49.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
-const resolverStore = require('./index39.js');
+const resolverStore = require('./index37.js');
 
 class ParameterResolverFactory {
     static getResolver(r) {

package/dist/index49.mjs

@@ -1,4 +1,4 @@
-import { ResolverStore } from './index39.mjs';
+import { ResolverStore } from './index37.mjs';
 
 class ParameterResolverFactory {
     static getResolver(r) {

package/dist/index50.js

@@ -3,8 +3,8 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const dependencies = require('./index51.js');
-const transversalWeaver = require('./index40.js');
-const helpers = require('./index31.js');
+const transversalWeaver = require('./index39.js');
+const helpers = require('./index41.js');
 
 class InjectableBuilder {
     build(i) {

package/dist/index50.mjs

@@ -1,6 +1,6 @@
 import { resolveInjectableParameters } from './index51.mjs';
-import { TransversalWeaver } from './index40.mjs';
-import { registerEvents } from './index31.mjs';
+import { TransversalWeaver } from './index39.mjs';
+import { registerEvents } from './index41.mjs';
 
 class InjectableBuilder {
     build(i) {

package/dist/index51.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
-const reflection = require('./index29.js');
+const reflection = require('./index36.js');
 const helpers = require('./index25.js');
 const parameterResolver_factory = require('./index49.js');
 const decorators = require('./index11.js');

package/dist/index51.mjs

@@ -1,4 +1,4 @@
-import { getParamTypes } from './index29.mjs';
+import { getParamTypes } from './index36.mjs';
 import { getDecoratedParametersIndexes } from './index25.mjs';
 import { ParameterResolverFactory } from './index49.mjs';
 import { isTransversal } from './index11.mjs';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "assemblerjs",
   "description": "A general purpose Dependency Injection library for node and browser.",
-  "version": "1.1.21",
+  "version": "1.1.23",
   "author": "Benoît LAHOZ <info@benoitlahoz.io>",
   "bugs": "https://github.com/benoitlahoz/assemblerjs/issues",
   "homepage": "https://github.com/benoitlahoz/assemblerjs#README",