configorama 0.6.3 → 0.6.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "configorama",
-  "version": "0.6.3",
+  "version": "0.6.4",
   "description": "Variable support for configuration files",
   "main": "src/index.js",
   "files": [

package/src/index.js

@@ -1,6 +1,5 @@
 const Configorama = require('./main')
 const parsers = require('./parsers')
-const forceSync = require('sync-rpc')
 
 module.exports.Configorama = Configorama
 
@@ -23,12 +22,18 @@ module.exports = async (configPathOrObject, settings = {}) => {
 }
 
 module.exports.sync = (configPathOrObject, settings = {}) => {
-  if (settings.dynamicArgs && typeof settings.dynamicArgs === 'function') {
+  const _settings = settings || {}
+  if (_settings.dynamicArgs && typeof _settings.dynamicArgs === 'function') {
     throw new Error('Dynamic args must be serializable value for sync usage. Use Async instead')
   }
-  return forceSync(require.resolve('./sync'), settings.variableSources)({
+  if (!_settings.options) {
+    const cliArgs = require('minimist')(process.argv.slice(2))
+    _settings.options = cliArgs
+  }
+  const forceSync = require('sync-rpc')
+  return forceSync(require.resolve('./sync'), _settings.variableSources)({
     filePath: configPathOrObject,
-    settings: settings
+    settings: _settings
   })
 }
 

package/src/main.js

@@ -164,26 +164,6 @@ class Configorama {
       this.originalString = fileContents
       // Keep a copy
       this.originalConfig = cloneDeep(configObject)
-
-      const useDotEnv = this.originalConfig.useDotenv || this.originalConfig.useDotEnv
-      if ((useDotEnv && useDotEnv === true) || this.opts.useDotEnvFiles) {
-        const loadStageEnv = require('env-stage-loader')
-        let providerStage
-        if (this.originalConfig && this.originalConfig.provider && this.originalConfig.provider.stage) {
-          providerStage = this.originalConfig.provider.stage
-          // @TODO check value to see if variable and needs pre-resolving to resolve stage vars
-        }
-        const stage = this.opts.stage || providerStage || 'dev'
-        /* Load env variables into process.env */
-        const values = loadStageEnv({
-          // silent: true,
-          // debug: true,
-          env: stage,
-          // defaultEnv: 'prod',
-          // ignoreFiles: ['.env']
-        })
-      }
-
       // Set configPath for file references
       this.configPath = fileDirectory
     }
@@ -697,6 +677,27 @@ class Configorama {
       return Promise.resolve(originalConfig)
     }
 
+    const useDotEnv = this.originalConfig.useDotenv || this.originalConfig.useDotEnv
+    if ((useDotEnv && useDotEnv === true) || this.opts.useDotEnvFiles) {
+      let providerStage
+      /* has hardcoded stage */
+      if (
+        this.originalConfig && this.originalConfig.provider && 
+        this.originalConfig.provider.stage && !this.originalConfig.provider.stage.match(this.variableSyntax)
+      ) {
+        providerStage = this.originalConfig.provider.stage
+      }
+      const stage = cliOpts.stage || providerStage || process.env.NODE_ENV || 'dev'
+      /* Load env variables into process.env */
+      const values = require('env-stage-loader')({
+        // silent: true,
+        // debug: true,
+        env: stage,
+        // defaultEnv: 'prod',
+        // ignoreFiles: ['.env']
+      })
+    }
+
     /* Parse variables */
     return this.initialCall(() => {
       return Promise.resolve()