@dotenvx/dotenvx 1.22.0 → 1.22.2

package/CHANGELOG.md

@@ -2,7 +2,19 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
-## [Unreleased](https://github.com/dotenvx/dotenvx/compare/v1.22.0...main)
+## [Unreleased](https://github.com/dotenvx/dotenvx/compare/v1.22.2...main)
+
+## 1.22.2
+
+### Changed
+
+* more lenient handling of `--` separator and better error messaging when flags are ambiguous ([#438](https://github.com/dotenvx/dotenvx/pull/438))
+
+## 1.22.1
+
+### Changed
+
+* 🐞 patch loading order issue with single quotes ([#436](https://github.com/dotenvx/dotenvx/pull/436))
 
 ## 1.22.0
 

package/README.md

@@ -867,7 +867,7 @@ More examples
 
   ```sh
   $ touch .env.ci
-  $ dotenvx set HELLO "ci encrypted" -f .env.production
+  $ dotenvx set HELLO "ci encrypted" -f .env.ci
   $ echo "console.log('Hello ' + process.env.HELLO)" > index.js
 
   # check .env.keys for your privateKey

package/package.json

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

package/src/cli/actions/run.js

@@ -13,6 +13,19 @@ async function run () {
   const options = this.opts()
   logger.debug(`options: ${JSON.stringify(options)}`)
 
+  if (commandArgs.length < 1) {
+    const hasSeparator = process.argv.indexOf('--') !== -1
+
+    if (hasSeparator) {
+      console.error('missing command after [dotenvx run --]. try [dotenvx run -- yourcommand]')
+    } else {
+      const realExample = options.envFile[0] || '.env'
+      console.error(`ambiguous command due to missing '--' separator. try [dotenvx run -f ${realExample} -- yourcommand]`)
+    }
+
+    process.exit(1)
+  }
+
   try {
     let envs = []
     // handle shorthand conventions - like --convention=nextjs
@@ -106,17 +119,7 @@ async function run () {
     }
   }
 
-  // Extract command and arguments after '--'
-  const commandIndex = process.argv.indexOf('--')
-  if (commandIndex === -1 || commandIndex === process.argv.length - 1) {
-    logger.error('missing command after [dotenvx run --]')
-    logger.error('')
-    logger.error('  get help: [dotenvx help run]')
-    logger.error('  or try:   [dotenvx run -- npm run dev]')
-    process.exit(1)
-  } else {
-    await executeCommand(commandArgs, process.env)
-  }
+  await executeCommand(commandArgs, process.env)
 }
 
 module.exports = run

package/src/cli/examples.js

@@ -15,7 +15,7 @@ Try it:
   $ echo "HELLO=World" > .env
   $ echo "console.log('Hello ' + process.env.HELLO)" > index.js
 
-  $ dotenvx run -- node index.js
+  $ dotenvx run -f .env -- node index.js
   [dotenvx] injecting env (1) from .env
   Hello World
   \`\`\`

package/src/lib/helpers/parseDecryptEvalExpand.js

@@ -20,6 +20,7 @@ function parseDecryptEvalExpand (src, privateKey = null, processEnv = process.en
   const parsed = dotenv.parse(src)
   const _quotes = quotes(src)
   const originalParsed = { ...parsed }
+  const originalProcessEnv = { ...processEnv }
   for (const key in parsed) {
     try {
       const decryptedValue = decryptValue(parsed[key], privateKey)
@@ -56,10 +57,11 @@ function parseDecryptEvalExpand (src, privateKey = null, processEnv = process.en
       warnings.push(warning(e, key, privateKey))
     }
   }
+
   for (const key in processEnv) {
     // unset eval and expansion for single quotes
     if (_quotes[key] === "'") {
-      processEnv[key] = originalParsed[key] // reset to original
+      processEnv[key] = originalProcessEnv[key] || originalParsed[key] // reset to original
     }
 
     try {