Fix to only merge settings for plain objects

unifiedjs · Feb 24, 2017 · 03650ff · 03650ff
1 parent 6e4e5bf
commit 03650ff
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 11 deletions.
diff --git a/index.js b/index.js
@@ -9,6 +9,7 @@ var trough = require('trough');
 var string = require('x-is-string');
 var func = require('x-is-function');
 var array = require('isarray');
+var plain = require('is-plain-obj');
 
 /* Expose a frozen processor. */
 module.exports = unified().freeze();
@@ -234,7 +235,7 @@ function unified() {
       var entry = find(plugin);
 
       if (entry) {
-        if (value !== false && entry[1] !== false && !array(value)) {
+        if (plain(entry[1]) && plain(value)) {
           value = extend(entry[1], value);
         }
 

diff --git a/package.json b/package.json
@@ -27,6 +27,7 @@
     "bail": "^1.0.0",
     "extend": "^3.0.0",
     "has": "^1.0.1",
+    "is-plain-obj": "^1.1.0",
     "isarray": "^2.0.1",
     "trough": "^1.0.0",
     "vfile": "^2.0.0",

diff --git a/test/use.js b/test/use.js
@@ -132,20 +132,49 @@ test('use(plugin[, options])', function (t) {
     st.end();
   });
 
-  t.test('should reconfigure', function (st) {
-    var p = unified();
+  t.test('should reconfigure objects', function (st) {
+    var a = {foo: true, bar: true};
+    var b = {foo: false, qux: true};
 
-    st.plan(1);
+    st.plan(4);
 
-    p
-      .use([
-        [plugin, {foo: true, bar: true}],
-        [plugin, {foo: false, qux: true}]
-      ])
-      .freeze();
+    unified().use(change, 'this').use(change, b).freeze();
+    unified().use(change).use(change, b).freeze();
+    unified().use(change, [1, 2, 3]).use(change, b).freeze();
+    unified().use(merge, a).use(merge, b).freeze();
+
+    function change(options) {
+      st.deepEqual(options, {foo: false, qux: true}, 'should reconfigure (set)');
+    }
+
+    function merge(options) {
+      st.deepEqual(options, {foo: false, bar: true, qux: true}, 'should reconfigure (merge)');
+    }
+  });
+
+  t.test('should reconfigure strings', function (st) {
+    st.plan(4);
+
+    unified().use(plugin, 'this').use(plugin, 'that').freeze();
+    unified().use(plugin).use(plugin, 'that').freeze();
+    unified().use(plugin, [1, 2, 3]).use(plugin, 'that').freeze();
+    unified().use(plugin, {foo: 'bar'}).use(plugin, 'that').freeze();
+
+    function plugin(options) {
+      st.equal(options, 'that', 'should reconfigure');
+    }
+  });
+
+  t.test('should reconfigure arrays', function (st) {
+    st.plan(4);
+
+    unified().use(plugin, [1, 2, 3]).use(plugin, [4, 5, 6]).freeze();
+    unified().use(plugin).use(plugin, [4, 5, 6]).freeze();
+    unified().use(plugin, {foo: 'true'}).use(plugin, [4, 5, 6]).freeze();
+    unified().use(plugin, 'foo').use(plugin, [4, 5, 6]).freeze();
 
     function plugin(options) {
-      st.deepEqual(options, {foo: false, bar: true, qux: true}, 'should reconfigure');
+      st.deepEqual(options, [4, 5, 6], 'should reconfigure');
     }
   });