refactor: refactor the DI container: replace methods bindAs{Class|Fun…

…ction} with bind

Replace methods bindAsClass, bindAsFunction with a single bind method in the DI Container. Add new
methods 'instance' and 'value' for binding class instances and arbitrary values respectively

src/app.js

@@ -69,7 +69,7 @@ module.exports = function createApp({ webRouter, apiRouter }) {
    *   - req.app.bindWithFunction(dependencyKey, implementationFunction, params)
    *   - const value = req.app.resolve(dependencyKey)
    */
-  for(const prop of ["bindWithClass", "bindWithFunction", "resolve"]) {
+  for(const prop of ["bind", "instance", "value", "resolve"]) {
     if(!(prop in app)) {
       app[prop] = container[prop].bind(container);
     }

src/app.spec.js

@@ -226,7 +226,7 @@ module.exports = {
         const app = createApp({ webRouter: function() {} });
 
         const expressAppMethods = ["get", "listen", "set", "use"];
-        const diContainerMethods = ["bindWithClass", "bindWithFunction", "resolve"];
+        const diContainerMethods = ["bind", "instance", "value", "resolve"];
 
         for(const method of expressAppMethods) {
           expect(app).to.have.property(method).to.be.a("function");

src/framework/component/container.js

@@ -5,6 +5,7 @@
  */
 
 const awilix = require("awilix");
+const { asValue, asFunction } = awilix;
 
 const container = awilix.createContainer({
   injectionMode: awilix.InjectionMode.PROXY,
@@ -13,31 +14,48 @@ const container = awilix.createContainer({
 
 
 module.exports = {
-  bindWithClass(key, value, params) {
-    let resolver = awilix.asClass(value);
-
-    if(params) {
-      resolver = resolver.inject(() => params);
-    }
-
-    container.register({
-      [key]: resolver
-    });
+  bind(name, resolver) {
+    return container.register(name, asFunction(function bind() {
+      return resolver(container);
+    }));
   },
 
-  bindWithFunction(key, value, params) {
-    let resolver = awilix.asFunction(value);
-
-    if(params) {
-      resolver = resolver.inject(() => params);
-    }
+  instance(name, object) {
+    return container.register(name, asValue(object));
+  },
 
-    container.register({
-      [key]: resolver,
-    });
+  value(name, val) {
+    return container.register(name, asValue(val));
   },
 
   resolve(key) {
     return container.resolve(key);
   },
 };
+
+
+/*
+function bindWithClass(key, value, params) {
+  let resolver = awilix.asClass(value);
+
+  if(params) {
+    resolver = resolver.inject(() => params);
+  }
+
+  container.register({
+    [key]: resolver
+  });
+}
+
+function bindWithFunction(key, value, params) {
+  let resolver = awilix.asFunction(value);
+
+  if(params) {
+    resolver = resolver.inject(() => params);
+  }
+
+  container.register({
+    [key]: resolver,
+  });
+}
+*/

src/service-providers/app-service-provider.js

@@ -18,7 +18,7 @@ class AppServiceProvider extends ServiceProvider {
     const container = this.container();
     const config = this.config();
 
-    container.bindWithFunction("config", function configGetter() {
+    container.bind("config", function configGetter() {
       return config;
     });
 
@@ -43,7 +43,7 @@ class AppServiceProvider extends ServiceProvider {
      * value will be that object, otherwise, value will be whatever is passed as
      * defaultValue.
      */
-    container.bindWithFunction("registry", function createRegistry() {
+    container.bind("registry", function createRegistry() {
       return createObjectStore();
     });
   }

src/service-providers/app-service-provider.spec.js

@@ -29,7 +29,7 @@ module.exports = {
           expect(sp).to.be.an("object");
           expect(sp).to.have.property("container").to.be.a("function");
 
-          for(const method of ["bindWithClass", "bindWithFunction", "resolve"]) {
+          for(const method of ["bind", "instance", "value", "resolve"]) {
             expect(sp.container()).to.have.property(method).to.be.a("function");
           }
         });

src/service-providers/cache-service-provider.js

@@ -32,7 +32,7 @@ module.exports = class CacheServiceProvider extends ServiceProvider {
     /*
      * Bind the default cache to the container
      */
-    container.bindWithFunction("cache", function createCache() {
+    container.bind("cache", function createCache() {
       return cache;
     });
   }

src/service-providers/cache-service-provider.spec.js

@@ -51,7 +51,7 @@ module.exports = {
           expect(sp).to.be.an("object");
           expect(sp).to.have.property("container").to.be.a("function");
 
-          for(const method of ["bindWithClass", "bindWithFunction", "resolve"]) {
+          for(const method of ["bind", "instance", "value", "resolve"]) {
             expect(sp.container()).to.have.property(method).to.be.a("function");
           }
         });

src/service-providers/service-provider.spec.js

@@ -30,7 +30,7 @@ module.exports = {
           expect(sp).to.be.an("object");
           expect(sp).to.have.property("container").to.be.a("function");
 
-          for(const method of ["bindWithClass", "bindWithFunction", "resolve"]) {
+          for(const method of ["bind", "instance", "value", "resolve"]) {
             expect(sp.container()).to.have.property(method).to.be.a("function");
           }
         });