Merge pull request #40 from C2FO/fix-load-merging

fix: issue where configs were not properly merging multiple locations

Author: doug-martin

.gitignore

@@ -2,3 +2,4 @@ node_modules
 *.iml
 .idea
 coverage
+test/__fixtures__/generated

lib/index.js

@@ -118,7 +118,6 @@ class ConfigLoader extends PatternEventEmitter {
     );
   }
 }
-
 /**
  * Factory method to create a new {@link ConfigLoader}.
  *
@@ -140,12 +139,14 @@ class ConfigLoader extends PatternEventEmitter {
  * @return {ConfigLoader} the Config to use to load configurations.
  */
 function gofigure(options = {}) {
-  const locations = (options.locations || []).map((file) => {
-    if (_.isPlainObject(file)) {
-      return file;
-    }
-    return { file };
-  });
+  const locations = (options.locations || [])
+    .map((file) => {
+      if (_.isPlainObject(file)) {
+        return file;
+      }
+      return { file };
+    })
+    .reverse();
   if (!locations) {
     throw new Error('Please provide locations to load configurations from');
   }

lib/processor/index.js

@@ -1,12 +1,3 @@
-const _ = require('lodash');
-const selector = require('./selector');
-const merger = require('./merger');
-const mixin = require('./mixin');
-const replacer = require('./replacer');
+const processor = require('./processor');
 
-module.exports = (configToMergeInto, sourceConfigs, options) => {
-  const mergedSource = sourceConfigs.reduce((merged, source) => _.merge(merged, mixin(source, options)), {});
-  const mergeEnvConfig = selector(mergedSource, options);
-  const replaced = replacer(mergeEnvConfig, options);
-  return merger(configToMergeInto, replaced, options);
-};
+module.exports = processor;

lib/processor/mixin.js

@@ -23,12 +23,12 @@ const mergeMixin = (originalConfig, env, defaultEnv, nodeType) => {
   return config;
 };
 
-const mixinMerger = (config, opts) => {
+const mixin = (config, opts) => {
   const options = opts || {};
   const defaultEnvironment = options.defaultEnvironment || null;
   const environment = options.environment || null;
   const nodeType = options.nodeType || null;
   return mergeMixin(config, environment, defaultEnvironment, nodeType);
 };
 
-module.exports = mixinMerger;
+module.exports = mixin;

lib/processor/processor.js

@@ -0,0 +1,18 @@
+const _ = require('lodash');
+const replacer = require('./replacer');
+const merger = require('./merger');
+const selector = require('./selector');
+const mixin = require('./mixin');
+
+const processConfig = (config, options) => {
+  const merged = mixin(config, options);
+  const mergeEnvConfig = selector(merged, options);
+  return replacer(mergeEnvConfig, options);
+};
+
+const processor = (configToMergeInto, sourceConfigs, options) => {
+  const mergedSource = sourceConfigs.reduce((merged, source) => _.merge(merged, processConfig(source, options)), {});
+  return merger(configToMergeInto, mergedSource, options);
+};
+
+module.exports = processor;

lib/processor/selector.js

@@ -26,12 +26,12 @@ const selectConfig = (originalConfig, env, defaultEnv, nodeType) => {
   return config;
 };
 
-const configSelector = (config, opts) => {
+const selector = (config, opts) => {
   const options = opts || {};
   const defaultEnvironment = options.defaultEnvironment || null;
   const environment = options.environment || null;
   const nodeType = options.nodeType || null;
   return selectConfig(config, environment, defaultEnvironment, nodeType);
 };
 
-module.exports = configSelector;
+module.exports = selector;