use compose-emitter

index.js

@@ -8,7 +8,7 @@
 'use strict'
 
 var utils = require('./utils')
-var AppBase = require('app-base').AppBase
+var AppBase = require('compose-emitter').ComposeEmitter
 
 /**
  * > Initialize `AsyncSimpleIterator` with `options`.
@@ -54,8 +54,11 @@ function AsyncSimpleIterator (options) {
     return new AsyncSimpleIterator(options)
   }
   this.defaultOptions(options)
-  utils.Emitter(this)
-  AppBase.call(this)
+  AppBase.call(this, this.options)
+  this.on = this.compose('on')
+  this.off = this.compose('off')
+  this.once = this.compose('once')
+  this.emit = this.compose('emit')
 }
 
 AppBase.extend(AsyncSimpleIterator)
@@ -69,7 +72,10 @@ AppBase.extend(AsyncSimpleIterator)
  */
 
 AppBase.define(AsyncSimpleIterator.prototype, 'defaultOptions', function defaultOptions (options) {
-  options = utils.extend({settle: false}, this.options, options)
+  options = utils.extend({
+    emitter: new utils.Emitter(),
+    settle: false
+  }, this.options, options)
   options.settle = typeof options.settle === 'boolean' ? !!options.settle : false
   this.options = options
   return this
@@ -137,7 +143,10 @@ AppBase.define(AsyncSimpleIterator.prototype, 'wrapIterator', function wrapItera
   if (typeof iterator !== 'function') {
     throw new TypeError('async-simple-iterator: expect `iterator` to be function')
   }
-  this.options = options ? utils.extend(this.options, options) : this.options
+  var opts = this.options
+  var ctx = options ? utils.extend({}, opts.context, options.context) : opts.context
+  this.options = options ? utils.extend({}, opts, options) : opts
+  this.options.context = ctx
 
   var hooks = ['beforeEach', 'afterEach', 'error']
   var len = hooks.length

package.json

@@ -11,8 +11,8 @@
     "test": "standard && node test.js"
   },
   "dependencies": {
-    "app-base": "github:tunnckocore/app-base",
-    "component-emitter": "^1.2.0",
+    "compose-emitter": "^1.0.1",
+    "eventemitter3": "^1.2.0",
     "extend-shallow": "^2.0.1",
     "is-typeof-error": "^1.1.0",
     "lazy-cache": "^1.0.3",

test.js

@@ -131,3 +131,27 @@ test('should be able to pass hooks through `options`', function (done) {
     done()
   })
 })
+
+test('should bind correct context (passed from constructor)', function (done) {
+  var app = new Ctor({
+    context: {a: 'b'},
+    beforeEach: function (val) {
+      test.deepEqual(this, {a: 'b', c: 'd'})
+    }
+  })
+  // @todo
+  // app.on('afterEach', function (val) {
+  //     test.deepEqual(this, {a: 'b', c: 'd'})
+  //     console.log('after')
+  //   })
+  var itarator = app.wrapIterator(function (val, next) {
+    next(null, val)
+  }, {context: {c: 'd'}})
+
+  ctrl.mapSeries(['a', 'b', 'c'], itarator, function (err) {
+    test.ifError(err)
+    test.deepEqual(values, ['a', 'b', 'c'])
+    test.deepEqual(results, values)
+    done()
+  })
+})

utils.js

@@ -24,7 +24,7 @@ require = utils // eslint-disable-line no-undef, no-native-reassign
  * Lazily required module dependencies
  */
 
-require('component-emitter', 'Emitter')
+require('eventemitter3', 'Emitter')
 require('extend-shallow', 'extend')
 require('is-typeof-error', 'isError')
 require('sliced', 'slice')