Merge pull request #14 from suitcss/fix_reporter_options

Fix issue with no options being passed to bemLint and reporter

Author: simonsmith

lib/index.js

@@ -16,6 +16,10 @@ var reporter = require('postcss-reporter');
 
 module.exports = preprocessor;
 
+/**
+ * Default options to PostCSS plugins
+ */
+
 var defaults = {
   minify: undefined,
   use: [
@@ -27,9 +31,6 @@ var defaults = {
     'postcss-reporter'
   ],
   'postcss-import': {
-    transform: function (css, filename) {
-      return postcss([bemLinter, reporter]).process(css, {from: filename}).css;
-    },
     root: undefined,
     onImport: function(imported) {
       // Update the watch task with the list of imported files
@@ -59,7 +60,7 @@ var defaults = {
  * Process CSS
  *
  * @param {String} css
- * @return {String}
+ * @returns {String}
  */
 
 function preprocessor(css, options) {
@@ -85,11 +86,11 @@ function preprocessor(css, options) {
   return processor.process(css);
 }
 
-
 /**
  * Merge options with defaults and set root
  *
  * @param {Object} options
+ * @returns {Object} Merged options object
  */
 
 function mergeOptions(options) {
@@ -98,8 +99,10 @@ function mergeOptions(options) {
 
   var merged = assign({}, defaults, options.config);
 
+  // Set some core options
   merged.minify = options.minify;
   merged['postcss-import'].root = options.root;
+  merged['postcss-import'].transform = lintImportedFiles(merged);
 
   // Ensure postcss-reporter is always the final plugin
   if (last(merged.use) !== 'postcss-reporter') {
@@ -110,3 +113,20 @@ function mergeOptions(options) {
 
   return merged;
 }
+
+/**
+ * Returns a function to be used by postcss-import
+ * Lint each imported component with postcss-bem-linter
+ *
+ * @param {Object} options
+ * @returns {Function} Used by postcss-import transform
+ */
+function lintImportedFiles(options) {
+  return function (css, filename) {
+    return postcss([
+      bemLinter(options['postcss-bem-linter']),
+      reporter(options['postcss-reporter'])
+    ]).process(css, {from: filename}).css;
+  };
+}
+

test/error.config.json

@@ -0,0 +1,6 @@
+{
+  "postcss-reporter": {
+    "throwError": true,
+    "plugins": ["postcss-bem-linter"]
+  }
+}

test/fixtures/error.css

@@ -0,0 +1,3 @@
+/** @define Component **/
+
+.component {}

test/fixtures/import-error.css

@@ -0,0 +1 @@
+@import "./error.css"

test/test.js

@@ -29,12 +29,18 @@ describe('suitcss', function () {
 
     beforeEach(function() {
       mergeOptions = suitcss.__get__('mergeOptions');
-      defaults = suitcss.__get__('defaults');
     });
 
     it('should use default options when nothing is passed', function() {
-      expect(mergeOptions({})).to.eql(defaults);
-      expect(mergeOptions()).to.eql(defaults);
+      var keys = [
+        'minify',
+        'use',
+        'postcss-import',
+        'postcss-reporter',
+        'cssnano'
+      ];
+      expect(mergeOptions({})).to.have.keys(keys);
+      expect(mergeOptions()).to.have.keys(keys);
     });
 
     it('should allow an import root to be set', function() {
@@ -67,7 +73,6 @@ describe('suitcss', function () {
         'postcss-reporter'
       ]);
       expect(opts.autoprefixer).to.eql(autoprefixer);
-      expect(opts['postcss-reporter']).to.eql(defaults['postcss-reporter']);
       expect(opts['postcss-import'].root).to.equal('test/root');
     });
   });
@@ -167,6 +172,15 @@ describe('cli', function () {
     });
   });
 
+  it('should output an error to stderr on conformance failure when throwError is set', function(done) {
+    exec('bin/suitcss -i test/fixtures -c test/error.config.json test/fixtures/import-error.css test/fixtures/cli/output.css', function (err, stdout, stderr) {
+      expect(err).to.be.an('error');
+      expect(err.code).to.equal(1);
+      expect(stderr).to.contain('postcss-reporter: warnings or errors were found');
+      done();
+    });
+  });
+
   it('should log on non-existant file', function (done) {
     exec('bin/suitcss test/fixtures/cli/non-existant.css', function (err, stdout, stderr) {
       expect(err).to.be.an('error');