Merge branch 'release-4.0.4'

CHANGELOG.md

@@ -1,3 +1,13 @@
+<a name="4.0.4"></a>
+## [4.0.4](https://github.com/poppinss/adonis-fold/compare/v4.0.3...v4.0.4) (2017-09-12)
+
+
+### Bug Fixes
+
+* **ioc:** fix execution cycle of extend calls ([bc2c084](https://github.com/poppinss/adonis-fold/commit/bc2c084))
+
+
+
 <a name="4.0.3"></a>
 ## [4.0.3](https://github.com/poppinss/adonis-fold/compare/v4.0.2...v4.0.3) (2017-09-06)
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adonisjs/fold",
-  "version": "4.0.3",
+  "version": "4.0.4",
   "description": "Dependency manager and ioc container for your next NodeJs application",
   "main": "index.js",
   "directories": {

src/Ioc/index.js

@@ -85,6 +85,15 @@ class Ioc {
      * @type {Map}
      */
     this._fakes = new Map()
+
+    /**
+     * Reference to all extend calls. Extend calls
+     * are executed right after all providers
+     * have been booted
+     *
+     * @type {Object}
+     */
+    this._extendCalls = []
   }
 
   /**
@@ -562,19 +571,35 @@ class Ioc {
    * })
    * ```
    */
-  extend (namespace, key, closure, ...options) {
-    if (!this._hasManager(namespace)) {
-      const message = `${namespace} cannot be extended, since their is no public interface to extend`
-      throw GE.InvalidArgumentException.invoke(message, 500, 'E_CANNOT_EXTEND_BINDING')
-    }
+  extend (...args) {
+    this._extendCalls.push(args)
+  }
 
-    if (typeof (closure) !== 'function') {
-      throw GE.InvalidArgumentException.invalidParameter('Ioc.extend expects 3rd parameter to be a closure', closure)
-    }
+  /**
+   * Executes all extend calls in sequence. Successfully
+   * executed extend calls will be removed from the
+   * array, so that they are not executed again.
+   *
+   * @method executeExtendCalls
+   *
+   * @return {void}
+   */
+  executeExtendCalls () {
+    _.remove(this._extendCalls, ([ namespace, key, closure, ...options ]) => {
+      if (!this._hasManager(namespace)) {
+        const message = `${namespace} cannot be extended, since their is no public interface to extend`
+        throw GE.InvalidArgumentException.invoke(message, 500, 'E_CANNOT_EXTEND_BINDING')
+      }
+
+      if (typeof (closure) !== 'function') {
+        throw GE.InvalidArgumentException.invalidParameter('Ioc.extend expects 3rd parameter to be a closure', closure)
+      }
 
-    const resolvedValue = closure(this)
-    debug('extending %s namespace %j', namespace, { key, options: [...options] })
-    this._managers[namespace].extend(key, resolvedValue, ...options)
+      const resolvedValue = closure(this)
+      debug('extending %s namespace %j', namespace, { key, options: [...options] })
+      this._managers[namespace].extend(key, resolvedValue, ...options)
+      return true
+    })
   }
 
   /**

src/Registrar/index.js

@@ -191,6 +191,7 @@ class Registrar {
    */
   async boot () {
     await Promise.all(this._bootProviders(this._providers))
+    this.Ioc.executeExtendCalls()
     emitter.emit(this.PROVIDERS_BOOTED)
   }
 

test/unit/ioc.spec.js

@@ -188,7 +188,8 @@ test.group('Ioc', function () {
 
   test('should throw an exception when trying to extend a binding which does not have a manager', function () {
     const ioc = new Ioc()
-    const fn = () => ioc.extend('App/Foo')
+    ioc.extend('App/Foo')
+    const fn = () => ioc.executeExtendCalls()
     assert.throw(fn, 'E_CANNOT_EXTEND_BINDING: App/Foo cannot be extended, since their is no public interface to extend')
   })
 
@@ -197,7 +198,8 @@ test.group('Ioc', function () {
     ioc.manager('App/Foo', class Foo {
       static extend () {}
     })
-    const fn = () => ioc.extend('App/Foo', 'redis')
+    ioc.extend('App/Foo', 'redis')
+    const fn = () => ioc.executeExtendCalls()
     assert.throw(fn, 'E_INVALID_PARAMETER: Ioc.extend expects 3rd parameter to be a closure')
   })
 
@@ -216,6 +218,7 @@ test.group('Ioc', function () {
       return 'I am redis'
     })
 
+    ioc.executeExtendCalls()
     assert.deepEqual(extendedValues, {redis: 'I am redis'})
   })
 
@@ -234,6 +237,7 @@ test.group('Ioc', function () {
       return 'I am redis'
     }, 'boom')
 
+    ioc.executeExtendCalls()
     assert.deepEqual(extendedValues, {options: 'boom'})
   })