fix config fn context error, error handling with invalid options

Author: Jeff Escalante

lib/index.js

@@ -6,8 +6,13 @@ module.exports = function (source) {
 
   // configure options
   const qs = loaderUtils.parseQuery(this.query)
-  const config = parseOptions(this.options.posthtml, qs)
   const cb = this.async()
+  let config
+  try {
+    config = parseOptions.call(this, this.options.posthtml, qs)
+  } catch (err) {
+    return cb(err)
+  }
 
   // configure custom parser argument if necessary
   const processArgs = [source.toString()]
@@ -16,7 +21,7 @@ module.exports = function (source) {
   // run posthtml
   const ph = posthtml(config.plugins)
   ph.process.apply(ph, processArgs)
-    .then((result) => cb(null, result.html), (err) => console.error(err))
+    .then((result) => cb(null, result.html), cb)
 }
 
 function parseOptions (config = [], qs) {

package.json

@@ -22,6 +22,7 @@
     "coveralls": "^2.11.9",
     "nyc": "^7.0.0",
     "posthtml-custom-elements": "^1.0.3",
+    "posthtml-exp": "^0.9.0",
     "source-loader": "^0.2.0",
     "standard": "^7.1.2",
     "sugarml": "0.0.1",

test/fixtures/locals/app.js

@@ -0,0 +1 @@
+require('./index.html')

test/fixtures/locals/index.html

@@ -0,0 +1 @@
+<p>{{ foo }}</p>

test/index.js

@@ -4,6 +4,7 @@ const path = require('path')
 const fs = require('fs')
 const node = require('when/node')
 const customElements = require('posthtml-custom-elements')
+const exp = require('posthtml-exp')
 const sugarml = require('sugarml')
 const fixtures = path.join(__dirname, 'fixtures')
 
@@ -51,11 +52,22 @@ test('custom parser', (t) => {
 
 test('invalid config', (t) => {
   return webpackCompile('custom_parser', 5)
-    .catch((err) => {
+    .then(() => t.fail('invalid config, no error'))
+    .catch(({outputPath, err}) => {
       t.truthy(err.toString().match(/Error: Configuration must return an array or object/))
+      fs.unlinkSync(outputPath)
     })
 })
 
+test('function called with correct context', (t) => {
+  return webpackCompile('locals', (ctx) => {
+    return [exp({ locals: { foo: ctx.resourcePath } })]
+  }).then(({outputPath, src}) => {
+    t.truthy(src.match(/test\/fixtures\/locals\/index\.html/))
+    fs.unlinkSync(outputPath)
+  })
+})
+
 // Utility: compile a fixture with webpack, return results
 function webpackCompile (name, config, qs = '') {
   const testPath = path.join(fixtures, name)
@@ -73,5 +85,5 @@ function webpackCompile (name, config, qs = '') {
     if (stats.compilation.errors.length) throw stats.compilation.errors
     const src = fs.readFileSync(outputPath, 'utf8')
     return {outputPath, src}
-  })
+  }).catch((err) => { throw {outputPath, err} }) // eslint-disable-line
 }