Merge pull request #127 from Medium/nathan-deferredErr

Don't try to handle quiet errors

lib/Builder.js

@@ -2224,10 +2224,10 @@ Builder.prototype._genResolver = function (nodeName, resolveNodeFn) {
   var validateArgumentInputs = this._getArgumentInputValidator(nodeName)
 
   return function resolve(data) {
-    var err
+    var err, quietErr
     var args = []
 
-    if (validateQuietInputs) err = validateQuietInputs(data)
+    if (validateQuietInputs) quietErr = err = validateQuietInputs(data)
     if (validateArgumentInputs && !err) err = validateArgumentInputs(data, args)
 
     if (!err && data._shouldProfile) data._startTimes[nodeName] = Date.now()
@@ -2241,7 +2241,7 @@ Builder.prototype._genResolver = function (nodeName, resolveNodeFn) {
       }
     }
 
-    if (err && node.errorFn) {
+    if (err && !quietErr && node.errorFn) {
       try {
         node.errorFn(err, args)
       } catch (recursiveErr) {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "shepherd",
   "description": "asynchronous dependency injection for node.js",
-  "version": "2.3.3-alpha.2",
+  "version": "2.3.3-alpha.3",
   "homepage": "https://github.com/Obvious/shepherd",
   "authors": [
     "Jeremy Stanley <[email protected]> (https://github.com/azulus)",

test/importantDeps.js

@@ -430,6 +430,81 @@ builder.add(function testImportantDescendant2(test) {
     })
 })
 
+
+builder.add(function testImportantLazyInner(test) {
+  var warned = false
+  console.warn = function () { warned = true }
+
+  graph.add('important', function () {
+    throw new Error('Sadness')
+  })
+
+  var eagerRan = false
+  graph.add('eager', function () {
+    eagerRan = true
+    return 'eager'
+  })
+
+  graph.addLazy('addLazy')
+    .builds('eager')
+    .builds('!important')
+
+  var lazyGetsEvaluated = false
+  return graph.newBuilder('descendant')
+    .builds('addLazy')
+    .run()
+    .then(function (data) {
+      lazyGetsEvaluated = true
+
+      test.equal(false, eagerRan)
+      test.equal('function', typeof data['addLazy'])
+      return data['addLazy']()
+    })
+    .fail(function (err) {
+      test.equal(false, eagerRan)
+      test.equal(false, warned)
+      test.equal(true, lazyGetsEvaluated)
+      test.equal('Sadness', err.message)
+    })
+})
+
+builder.add(function testImportantLazyOuter(test) {
+  var warned = false
+  console.warn = function () { warned = true }
+
+  graph.add('important', function () {
+    throw new Error('Sadness')
+  })
+
+  var eagerRan = false
+  graph.add('eager', function () {
+    eagerRan = true
+    return 'eager'
+  })
+
+  graph.addLazy('addLazy')
+    .builds('eager')
+
+  var lazyGetsEvaluated = false
+  return graph.newBuilder('descendant')
+    .builds('addLazy')
+    .builds('!important')
+    .run()
+    .then(function (data) {
+      lazyGetsEvaluated = true
+
+      test.equal(false, eagerRan)
+      test.equal('function', typeof data['addLazy'])
+      return data['addLazy']()
+    })
+    .fail(function (err) {
+      test.equal(false, eagerRan)
+      test.equal(false, warned)
+      test.equal(false, lazyGetsEvaluated)
+      test.equal('Sadness', err.message)
+    })
+})
+
 builder.add(function testImportantCycle(test) {
   // Try to create a cycle between one and two
   var log = ''