@dotenvx/dotenvx 0.3.8 → 0.3.9

package/README.md

@@ -94,7 +94,7 @@ More examples
   ```sh
   FROM node:latest
   RUN echo "HELLO=World" > .env && echo "console.log('Hello ' + process.env.HELLO)" > index.js
-  RUN curl -sfS https://dotenvx.sh/! | bash
+  RUN curl -fsS https://dotenvx.sh/ | sh
   CMD ["dotenvx", "run", "--", "echo", "Hello $HELLO"]
   ```
 
@@ -273,14 +273,12 @@ npm i @dotenvx/dotenvx --save
 3. Or download it directly as a standalone binary:
 
 ```sh
-curl -sfS https://dotenvx.sh/! | sh
+curl -fsS https://dotenvx.sh/ | sh
 ```
 
-Remove the `!` to install where you prefer. (the `!` downloads directly into `/usr/local/bin/`)
-
 ```sh
 # download it to `./dotenvx`
-curl -sfS https://dotenvx.sh/ | sh
+curl -fsS https://dotenvx.sh/ | sh
 
 # check it works
 ./dotenvx help

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.3.8",
+  "version": "0.3.9",
   "name": "@dotenvx/dotenvx",
   "description": "a better dotenv–from the creator of `dotenv`",
   "author": "@motdotla",

package/src/cli/dotenvx.js

@@ -65,6 +65,8 @@ program.command('run')
     }
 
     const env = {}
+    const readableFilepaths = new Set()
+    const populated = new Set()
 
     for (const envFilepath of optionEnvFile) {
       const filepath = helpers.resolvePath(envFilepath)
@@ -79,13 +81,18 @@ program.command('run')
         const parsed = main.parse(src)
 
         logger.debug(`Populating env from ${filepath}`)
-        main.populate(process.env, parsed, { debug: (logger.level === 'debug'), override: options.overload })
+        const result = main.populate(process.env, parsed, options.overload)
+
+        readableFilepaths.add(envFilepath)
+        result.populated.forEach(key => populated.add(key))
       } catch (e) {
         logger.warn(e)
       }
     }
 
-    logger.info('Injecting X environment variables into your application process')
+    if (readableFilepaths.size > 0) {
+      logger.info(`Injecting ${populated.size} environment variables from ${[...readableFilepaths]}`)
+    }
 
     // Extract command and arguments after '--'
     const commandIndex = process.argv.indexOf('--')

package/src/lib/main.js

@@ -13,12 +13,42 @@ const parse = function (src) {
   return result
 }
 
-const populate = function (processEnv, parsed, options = {}) {
-  const result = dotenv.populate(processEnv, parsed, options = {})
-
-  logger.debug(process.env)
-
-  return result
+const populate = function (processEnv = {}, parsed = {}, overload = false) {
+  if (typeof parsed !== 'object') {
+    throw new Error('OBJECT_REQUIRED: Please check the parsed argument being passed to populate')
+  }
+
+  const populated = new Set()
+  const preExisting = new Set()
+
+  // set processEnv
+  for (const key of Object.keys(parsed)) {
+    if (Object.prototype.hasOwnProperty.call(processEnv, key)) {
+      if (overload === true) {
+        processEnv[key] = parsed[key]
+        populated.add(key)
+
+        logger.verbose(`${key} set`)
+        logger.debug(`${key} set to ${parsed[key]}`)
+      } else {
+        preExisting.add(key)
+
+        logger.verbose(`${key} pre-exists`)
+        logger.debug(`${key} pre-exists as ${processEnv[key]}`)
+      }
+    } else {
+      processEnv[key] = parsed[key]
+      populated.add(key)
+
+      logger.verbose(`${key} set`)
+      logger.debug(`${key} set to ${parsed[key]}`)
+    }
+  }
+
+  return {
+    populated,
+    preExisting
+  }
 }
 
 module.exports = {