Flatten options object

Previously relied on some options being with a `config` object and some
not. This goes against typical options APIs and was not necessary. This
flattens the config object so all properties are at the same level.

Author: simonsmith

bin/suitcss

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 
 var fs = require('fs-extra');
+var assign = require('object-assign-deep');
 var exists = fs.existsSync;
 var logger = require('./logger');
 var suitcss = require('..');
@@ -101,17 +102,13 @@ if (regen) {
 /**
  * Run for the given input and output.
  */
-
 function run () {
   read(input, function (err, buffer) {
     if (err) logger.throw(err);
     var css = buffer.toString();
+    var opts = assign({}, {minify: program.minify, root: program.importRoot}, config);
 
-    suitcss(css, {
-      minify: program.minify,
-      root: program.importRoot,
-      config: config
-    }).then(function(result) {
+    suitcss(css, opts).then(function(result) {
       if (output) {
         writeFileSync(output, result.css + '\n');
       } else {

lib/index.js

@@ -86,16 +86,14 @@ function preprocessor(css, options) {
 
 function mergeOptions(options) {
   options = options || {};
-  options.config = options.config || {};
 
-  var merged = assign({}, defaults, options.config);
+  var merged = assign({}, defaults, options);
 
   // Set some core options
-  merged.minify = options.minify;
-  merged['postcss-import'].root = options.root;
+  merged['postcss-import'].root = merged.root;
 
   // Call beforeLint function and pass processed css to bem-linter
-  var beforeLint = options.beforeLint;
+  var beforeLint = merged.beforeLint;
   merged['postcss-import'].transform = function(css, filename) {
     if (typeof beforeLint === 'function') {
       css = beforeLint(css, filename, merged);
@@ -105,9 +103,9 @@ function mergeOptions(options) {
 
   // Allow additional plugins to be merged with the defaults
   // but remove any duplicates so that it respects the new order
-  if (!isEmpty(options.config.use)) {
-    var dedupedPlugins = difference(merged.use, options.config.use);
-    merged.use = dedupedPlugins.concat(options.config.use);
+  if (!isEmpty(options.use)) {
+    var dedupedPlugins = difference(merged.use, options.use);
+    merged.use = dedupedPlugins.concat(options.use);
   }
 
   return merged;

package.json

@@ -19,6 +19,7 @@
     "fs-extra": "^0.26.2",
     "lodash.difference": "^3.2.2",
     "lodash.isempty": "^3.0.4",
+    "object-assign": "^4.0.1",
     "object-assign-deep": "0.0.4",
     "pad-component": "0.0.1",
     "postcss": "^5.0.12",

test/test.config.js

@@ -1,4 +1,8 @@
 module.exports = {
+  beforeLint: function (css) {
+    console.log('beforeLint ran');
+    return css;
+  },
   use: [
     "postcss-property-lookup"
   ]

test/test.js

@@ -60,9 +60,7 @@ describe('suitcss', function () {
       var autoprefixer = {browsers: ['> 1%', 'IE 7'], cascade: false};
       var opts = mergeOptions({
         root: 'test/root',
-        config: {
-          autoprefixer: autoprefixer
-        }
+        autoprefixer: autoprefixer
       });
 
       expect(opts.use).to.eql([
@@ -80,9 +78,7 @@ describe('suitcss', function () {
     describe('re-ordering plugins', function() {
       it('should allow reordering of use array and remove duplicates', function() {
         var opts = mergeOptions({
-          config: {
-            use: ['autoprefixer', 'postcss-at2x', 'postcss-calc', 'postcss-reporter']
-          }
+          use: ['autoprefixer', 'postcss-at2x', 'postcss-calc', 'postcss-reporter']
         });
 
         expect(opts.use).to.eql([
@@ -98,9 +94,7 @@ describe('suitcss', function () {
 
       it('should just append plugins if no duplicates are used', function() {
         var opts = mergeOptions({
-          config: {
-            use: ['postcss-at2x', 'postcss-property-lookup']
-          }
+          use: ['postcss-at2x', 'postcss-property-lookup']
         });
 
         expect(opts.use).to.eql([
@@ -208,6 +202,7 @@ describe('cli', function () {
     var child = exec('bin/suitcss', function (err, stdout) {
       if (err) return done(err);
       expect(stdout).to.equal(output);
+      expect(stdout).to.not.contain('beforeLint ran');
       done();
     });
 
@@ -219,6 +214,7 @@ describe('cli', function () {
     exec('bin/suitcss -v test/fixtures/cli/input.css test/fixtures/cli/output.css', function (err, stdout) {
       if (err) return done(err);
       expect(stdout).to.contain('write');
+      expect(stdout).to.not.contain('beforeLint ran');
       done();
     });
   });
@@ -229,6 +225,7 @@ describe('cli', function () {
       var res = read('fixtures/cli/output');
       var expected = read('fixtures/component.out');
       expect(res).to.equal(expected);
+      expect(stdout).to.not.contain('beforeLint ran');
       done();
     });
   });
@@ -238,6 +235,7 @@ describe('cli', function () {
       if (err) return done(err);
       var res = read('fixtures/cli/output');
       var expected = read('fixtures/minify.out');
+      expect(stdout).to.not.contain('beforeLint ran');
       expect(res).to.equal(expected);
       done();
     });
@@ -248,6 +246,7 @@ describe('cli', function () {
       if (err) return done(err);
       var res = read('fixtures/cli/output');
       var expected = read('fixtures/config.out');
+      expect(stdout).to.contain('beforeLint ran');
       expect(res).to.equal(expected);
       done();
     });