Override

.gitignore

@@ -35,3 +35,9 @@ jspm_packages
 
 # Optional REPL history
 .node_repl_history
+
+# mac files
+.DS_Store
+
+# vim swap files
+*.swp

README.md

@@ -242,6 +242,20 @@ app.use(function first (s1, opts, cb) {
 })
 ```
 
+You can also force the ovverride of the instance by passing the `override` option to *avvio*.
+```js
+const boot = require('avvio')
+const assert = require('assert')
+const server = { count: 0 }
+const app = boot(server, { override: true })
+
+app.use(function first (s, opts, cb) {
+  assert.notEqual(s, server)
+  assert(server.isPrototypeOf(s))
+  cb()
+})
+```
+
 -------------------------------------------------------
 
 ## Acknowledgements

boot.js

@@ -66,6 +66,7 @@ function Boot (server, opts, done) {
 
   this._server = server
   this._current = []
+  this._forceOverride = !!opts.override
 
   if (done) {
     this.once('start', done)
@@ -105,6 +106,9 @@ Boot.prototype._init = function () {
 
 // allows to override the instance of a server, given a plugin
 Boot.prototype.override = function (server) {
+  if (this._forceOverride) {
+    return Object.create(server)
+  }
   return server
 }
 
@@ -201,12 +205,11 @@ function loadPlugin (toLoad, cb) {
   const last = this._current[0]
   // place the plugin at the top of _current
   this._current.unshift(toLoad)
-  toLoad.exec(last && last.server || this._server, (err) => {
+  toLoad.exec((last && last.server) || this._server, (err) => {
     if (err || !(toLoad.q.length() > 0 || toLoad.q.running() > 0)) {
       // finish now, because there is nothing left to do
       this._current.shift()
       toLoad.finish(err, cb)
-      return
     } else {
       // finish when the queue of nested plugins to load is empty
       toLoad.q.drain = () => {

package.json

@@ -24,12 +24,12 @@
   },
   "homepage": "https://github.com/mcollina/avvio#readme",
   "devDependencies": {
-    "express": "^4.14.0",
-    "pre-commit": "^1.1.3",
-    "standard": "^8.6.0",
-    "tap": "^9.0.0"
+    "express": "^4.15.2",
+    "pre-commit": "^1.2.2",
+    "standard": "^9.0.2",
+    "tap": "^10.3.0"
   },
   "dependencies": {
-    "fastq": "^1.4.1"
+    "fastq": "^1.5.0"
   }
 }

test/override.js

@@ -98,3 +98,17 @@ test('custom inheritance multiple levels with multiple heads', (t) => {
     t.equal(server.count, 0)
   })
 })
+
+test('force override', (t) => {
+  t.plan(3)
+
+  const server = { my: 'server' }
+  const app = boot(server, { override: true })
+  t.ok(app._forceOverride)
+
+  app.use(function first (s, opts, cb) {
+    t.notEqual(s, server)
+    t.ok(server.isPrototypeOf(s))
+    cb()
+  })
+})