fix: Fix null merging

livingdocsIO · Jul 11, 2023 · 5d0dcf5 · 5d0dcf5
1 parent 0f32689
commit 5d0dcf5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/index.js b/index.js
@@ -41,7 +41,11 @@ module.exports = class Conf {
   merge (obj) {
     return _.mergeWith(this.config, obj, (configValue, overrideValue) => {
       // Do not apply merge on non-plain objects
-      if (typeof overrideValue === 'object' && overrideValue.constructor !== Object) {
+      if (
+        overrideValue &&
+        typeof overrideValue === 'object' &&
+        overrideValue.constructor !== Object
+      ) {
         return overrideValue
       }
 

diff --git a/test/unit/conf_tests.js b/test/unit/conf_tests.js
@@ -162,6 +162,13 @@ describe('The Conf', () => {
       expect(config.get('foo')).to.deep.equal(['quz'])
     })
 
+    it('merges null', function () {
+      const config = new Conf({foo: ['foo', 'bar']})
+
+      config.merge({foo: null})
+      expect(config.config.foo).to.deep.equal(null)
+    })
+
     it('does not merge class instances, keeps the original object', function () {
       class Foo {
         constructor () {