Adds helper methods to query information in DI, allows DI to have map…

package.json

@@ -1,6 +1,6 @@
 {
-  "name": "tramway-core-dependency-injector",
-  "version": "1.3.1",
+  "name": "@tramwayjs/dependency-injector",
+  "version": "2.0.0-beta.0",
   "description": "",
   "author": "Julian Wolfe",
   "license": "MIT",

src/core/DependencyResolver.js

@@ -6,17 +6,22 @@ import {
 } from './dependencies';
 import {ClassBuilder} from './util';
 
-var manager = null;
+var manager = new Map();
 
 class DependencyResolver {
-    constructor() {
-        if (manager) {
-            return manager;
+    constructor(name) {
+        this.name = name;
+        const instance = manager.get(name);
+
+        if (instance) {
+            return instance;
         }
+
         this.dependencyManager = new DependencyManager();
         this.dependencyInjector = new DependencyInjector(this.dependencyManager);
         this.created = false;
-        manager = this;
+
+        manager.set(this.name, this);
     }
 
     create(servicesManager, parametersManager) {
@@ -27,6 +32,9 @@ class DependencyResolver {
 
         this.dependencyManager = this.dependencyManager.create(servicesManager, parametersManager);
         this.created = true;
+
+
+        manager.set(this.name, this);
         return this;
     }
 
@@ -38,6 +46,8 @@ class DependencyResolver {
         this.dependencyManager = this.dependencyManager.initializeParameters(parameters);
         services = this.dependencyInjector.injectParameters(services);
         this.dependencyManager = this.dependencyManager.initializeServices(services);
+
+        manager.set(this.name, this);
         return this;
     }
 
@@ -49,6 +59,31 @@ class DependencyResolver {
     getParameter(key) {
         return this.dependencyManager.getParameter(key);
     }
+
+    terminate() {
+        this.dependencyManager.terminate();
+        return this;
+    }
+
+    getDependencyManager() {
+        return this.dependencyManager;
+    }
+
+    isCreated() {
+        return this.created;
+    }
+
+    getName() {
+        return this.name;
+    }
 }
 
-export default new DependencyResolver();
+export default new DependencyResolver();
+
+export function createDependencyResolver(name) {
+    if (manager.get(name)) {
+        return manager.get(name);
+    }
+
+    return new DependencyResolver(name)
+};

src/core/container/Container.js

@@ -61,4 +61,18 @@ export default class Container {
 
         return this.items.get(key);
     }
+
+    getAll() {
+        return Object.fromEntries(this.items.entries());
+    }
+
+    forEach(fn) {
+        this.items.forEach((value, key) => fn(value, key));
+        return this;
+    }
+
+    remove(key) {
+        this.items.delete(key);
+        return this;
+    }
 }

src/core/dependencies/DependencyManager.js

@@ -70,4 +70,24 @@ export default class DependencyManager extends ContainerManager {
         }
         return null;
     }
+
+    terminate() {
+        this.servicesManager.terminate();
+        this.parametersManager.terminate();
+        return this;
+    }
+
+    /**
+     * @returns {ServicesManager}
+     */
+    getServicesManager() {
+        return this.servicesManager;
+    }
+
+    /**
+     * @returns {ParametersManager}
+     */
+    getParametersManager() {
+        return this.parametersManager;
+    }
 }

src/core/dependencies/ParametersManager.js

@@ -100,4 +100,12 @@ export default class ParametersManager extends ContainerManager {
 
         return globalConfig;
     }
+
+    getParameters() {
+        return MapFactory.convertToObject(this.parameters.items, true);
+    }
+
+    terminate() {
+        return this;
+    }
 }

src/core/dependencies/ServicesManager.js

@@ -55,7 +55,7 @@ export default class ServicesManager extends ContainerManager {
      * @memberOf ServicesManager
      */
     get(key) {
-        let instance = this.instances.get(key);
+        let instance = this.getInstance(key);
         if (null !== instance) {
             return instance;
         }
@@ -82,6 +82,29 @@ export default class ServicesManager extends ContainerManager {
         return service;
     }
 
+    terminate() {
+        this.instances.forEach((instance, key) => this.instances.remove(key));
+        return this;
+    }
+
+    /**
+     * @returns {} {[string]: {}}
+     */
+    getServices() {
+        return this.services.getAll();
+    }
+
+    /**
+     * @returns {[]} Instance[]
+     */
+    getInstanceKeys() {
+        return Object.keys(this.instances.getAll());
+    }
+
+    getInstance(key) {
+        return this.instances.get(key);
+    }
+
     setClassBuilder(classBuilder) {
         this.classBuilder = classBuilder;
         return this;

src/index.js

@@ -3,6 +3,7 @@ import * as dependencies from './core/dependencies';
 import * as entities from './core/entities';
 import * as errors from './core/errors';
 import * as util from './core/util';
-import DependencyResolver from './core/DependencyResolver';
+import DependencyResolver, {createDependencyResolver} from './core/DependencyResolver';
 
-export {DependencyResolver, container, dependencies, entities, errors, util};
+export default DependencyResolver;
+export {DependencyResolver, createDependencyResolver, container, dependencies, entities, errors, util};