handling errors properly

src/index.js

@@ -5,59 +5,63 @@ export default function ({ locals = {}, filters = {}, useMetadata = false } = {}
   const opts = arguments[0] || {}
 
   return (files, metalsmith, done) => {
-    setImmediate(done)
-
     // extend with metalsmith global metadata
     if (useMetadata) {
       locals = Object.assign({}, locals, metalsmith.metadata())
     }
 
-    Object.keys(files).forEach((file) => {
-      if (!/\.(pug|jade)/.test(path.extname(file))) {
-        return
-      }
+    try {
+      Object.keys(files).forEach((file) => {
+        if (!/\.(pug|jade)/.test(path.extname(file))) {
+          return
+        }
 
-      let data = files[file]
-      let dir = path.dirname(file)
-      let name = path.basename(file, path.extname(file))
+        let data = files[file]
+        let dir = path.dirname(file)
+        let name = path.basename(file, path.extname(file))
 
-      // do we need to add an extension?
-      if (path.extname(name) === '') {
-        name = path.basename(file, path.extname(file)) + '.html'
-      }
+        // do we need to add an extension?
+        if (path.extname(name) === '') {
+          name = path.basename(file, path.extname(file)) + '.html'
+        }
 
-      if (dir !== '.') {
-        name = `${dir}/${name}`
-      }
+        if (dir !== '.') {
+          name = `${dir}/${name}`
+        }
 
-      const filename = path.join(metalsmith.source(), file)
+        const filename = path.join(metalsmith.source(), file)
 
-      // also use the file's own data
-      if (useMetadata) {
-        locals = Object.assign(locals, data)
-      }
+        // also use the file's own data
+        if (useMetadata) {
+          locals = Object.assign(locals, data)
+        }
 
-      // assign filters
-      if (filters) {
-        Object.keys(filters).forEach((filter) => (pug.filters[filter] = filters[filter]))
-      }
+        // assign filters
+        if (filters) {
+          Object.keys(filters).forEach((filter) => (pug.filters[filter] = filters[filter]))
+        }
 
-      const options = Object.assign(opts, {
-        filename,
-        locals
-      })
+        const options = Object.assign(opts, {
+          filename,
+          locals
+        })
 
-      // render
-      let str = pug.compile(data.contents.toString(), options)(locals)
+        // render
+        let str = pug.compile(data.contents.toString(), options)(locals)
 
-      // convert to a buffer
-      data.contents = new Buffer(str)
+        // convert to a buffer
+        data.contents = new Buffer(str)
 
-      // remove from global files object
-      delete files[file]
+        // remove from global files object
+        delete files[file]
 
-      // assign the newly created file
-      files[name] = data
-    })
+        // assign the newly created file
+        files[name] = data
+      })
+
+      setImmediate(done)
+    } catch (err) {
+      setImmediate(done, err)
+    }
   }
 }

test/fixtures/should-throw/should-throw.pug

@@ -0,0 +1 @@
+should*throw

test/index.js

@@ -5,7 +5,7 @@ import rimraf from 'rimraf'
 import { test } from 'tap'
 
 test('metalsmith-jade', (tap) => {
-  tap.plan(9)
+  tap.plan(10)
 
   tap.afterEach((done) => rimraf('test/fixtures/*/build', done))
 
@@ -162,4 +162,15 @@ test('metalsmith-jade', (tap) => {
       })
     })
   })
+
+  tap.test('should catch thrown errors', (assert) => {
+    let smith = new Metalsmith('test/fixtures/should-throw')
+
+    smith.use(pug())
+
+    smith.build((err) => {
+      assert.ok(err)
+      assert.end()
+    })
+  })
 })