feat(config): allow customizer for config.merge

adonisjs · May 26, 2017 · c7ebade · c7ebade
1 parent feb4e40
commit c7ebade
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/Config/index.js b/src/Config/index.js
@@ -66,12 +66,13 @@ class Config {
    *
    * @param  {String} key
    * @param  {Object} defaultValues
+   * @param  {Function} [customizer]
    *
    * @return {Object}
    */
-  merge (key, defaultValues) {
+  merge (key, defaultValues, customizer) {
     const value = _.get(this._config, key, {})
-    return _.mergeWith(defaultValues, value, (base, value) => typeof (value) === 'undefined' ? base : value)
+    return _.mergeWith(defaultValues, value, customizer)
   }
 
   /**

diff --git a/test/config.spec.js b/test/config.spec.js
@@ -107,7 +107,12 @@ test.group('Config', () => {
         host: '127.0.0.1',
         port: 3306
       }
+    }, (obj, src, key) => {
+      if (key === 'connection') {
+        return src
+      }
     })
+
     assert.deepEqual(database, {
       client: 'mysql',
       connection: {}