@dotenvx/dotenvx 0.43.1 → 0.44.0

package/README.md

@@ -45,10 +45,10 @@ $ echo "HELLO=World" > .env
 $ echo "console.log('Hello ' + process.env.HELLO)" > index.js
 
 $ node index.js
-Hello undefined
+Hello undefined # without dotenvx
 
 $ dotenvx run -- node index.js
-Hello World
+Hello World # with dotenvx
 > :-D
 ```
 

package/package.json

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

package/src/cli/actions/convert.js

@@ -1,5 +1,5 @@
 const fs = require('fs')
-const logger = require('./../../shared/logger')
+const { logger } = require('./../../shared/logger')
 
 const main = require('./../../lib/main')
 

package/src/cli/actions/genexample.js

@@ -1,6 +1,6 @@
 const fs = require('fs')
 const main = require('./../../lib/main')
-const logger = require('./../../shared/logger')
+const { logger } = require('./../../shared/logger')
 const createSpinner = require('./../../shared/createSpinner')
 
 const sleep = require('./../../lib/helpers/sleep')

package/src/cli/actions/get.js

@@ -1,4 +1,4 @@
-const logger = require('./../../shared/logger')
+const { logger } = require('./../../shared/logger')
 
 const conventions = require('./../../lib/helpers/conventions')
 

package/src/cli/actions/gitignore.js

@@ -1,7 +1,7 @@
 const fs = require('fs')
 
 const FORMATS = ['.env*', '!.env.vault']
-const logger = require('./../../shared/logger')
+const { logger } = require('./../../shared/logger')
 
 class Generic {
   constructor (filename, touchFile = false) {

package/src/cli/actions/hub/login.js

@@ -5,7 +5,7 @@ const confirm = require('@inquirer/confirm').default
 
 const createSpinner = require('./../../../shared/createSpinner')
 const store = require('./../../../shared/store')
-const logger = require('./../../../shared/logger')
+const { logger } = require('./../../../shared/logger')
 
 const OAUTH_CLIENT_ID = 'oac_dotenvxcli'
 

package/src/cli/actions/hub/logout.js

@@ -3,7 +3,7 @@ const confirm = require('@inquirer/confirm').default
 
 const createSpinner = require('./../../../shared/createSpinner')
 const store = require('./../../../shared/store')
-const logger = require('./../../../shared/logger')
+const { logger } = require('./../../../shared/logger')
 const sleep = require('./../../../lib/helpers/sleep')
 
 const username = store.getUsername()

package/src/cli/actions/hub/open.js

@@ -2,7 +2,7 @@ const openBrowser = require('open')
 const confirm = require('@inquirer/confirm').default
 
 const createSpinner = require('./../../../shared/createSpinner')
-const logger = require('./../../../shared/logger')
+const { logger } = require('./../../../shared/logger')
 
 const isGitRepo = require('./../../../lib/helpers/isGitRepo')
 const isGithub = require('./../../../lib/helpers/isGithub')

package/src/cli/actions/hub/pull.js

@@ -3,7 +3,7 @@ const path = require('path')
 const { request } = require('undici')
 
 const store = require('./../../../shared/store')
-const logger = require('./../../../shared/logger')
+const { logger } = require('./../../../shared/logger')
 const createSpinner = require('./../../../shared/createSpinner')
 
 const isGitRepo = require('./../../../lib/helpers/isGitRepo')

package/src/cli/actions/hub/push.js

@@ -3,7 +3,7 @@ const path = require('path')
 const { request } = require('undici')
 
 const store = require('./../../../shared/store')
-const logger = require('./../../../shared/logger')
+const { logger } = require('./../../../shared/logger')
 const createSpinner = require('./../../../shared/createSpinner')
 
 const isGitRepo = require('./../../../lib/helpers/isGitRepo')

package/src/cli/actions/hub/status.js

@@ -1,5 +1,5 @@
 const store = require('./../../../shared/store')
-const logger = require('./../../../shared/logger')
+const { logger } = require('./../../../shared/logger')
 
 async function status () {
   logger.info(`logged in to ${store.getHostname()} as ${store.getUsername()}`)

package/src/cli/actions/hub/token.js

@@ -1,5 +1,5 @@
 const store = require('./../../../shared/store')
-const logger = require('./../../../shared/logger')
+const { logger } = require('./../../../shared/logger')
 
 async function token () {
   logger.debug(store.configPath())

package/src/cli/actions/ls.js

@@ -1,6 +1,6 @@
 const treeify = require('object-treeify')
 
-const logger = require('./../../shared/logger')
+const { logger } = require('./../../shared/logger')
 
 const main = require('./../../lib/main')
 const ArrayToTree = require('./../../lib/helpers/arrayToTree')

package/src/cli/actions/prebuild.js

@@ -2,7 +2,7 @@ const fs = require('fs')
 
 const ignore = require('ignore')
 
-const logger = require('./../../shared/logger')
+const { logger } = require('./../../shared/logger')
 const pluralize = require('./../../lib/helpers/pluralize')
 
 function prebuild () {

package/src/cli/actions/precommit.js

@@ -1,4 +1,4 @@
-const logger = require('./../../shared/logger')
+const { logger } = require('./../../shared/logger')
 
 const Precommit = require('./../../lib/services/precommit')
 

package/src/cli/actions/run.js

@@ -1,7 +1,7 @@
 const path = require('path')
 const execa = require('execa')
 const which = require('which')
-const logger = require('./../../shared/logger')
+const { logger } = require('./../../shared/logger')
 
 const Run = require('./../../lib/services/run')
 

package/src/cli/actions/scan.js

@@ -1,6 +1,6 @@
 const execa = require('execa')
 
-const logger = require('./../../shared/logger')
+const { logger } = require('./../../shared/logger')
 
 async function scan () {
   const options = this.opts()

package/src/cli/actions/set.js

@@ -1,5 +1,5 @@
 const fs = require('fs')
-const logger = require('./../../shared/logger')
+const { logger } = require('./../../shared/logger')
 
 const main = require('./../../lib/main')
 

package/src/cli/actions/settings.js

@@ -1,4 +1,4 @@
-const logger = require('./../../shared/logger')
+const { logger } = require('./../../shared/logger')
 
 const main = require('./../../lib/main')
 

package/src/cli/actions/vault/convert.js

@@ -1,4 +1,4 @@
-const logger = require('./../../../shared/logger')
+const { logger } = require('./../../../shared/logger')
 
 function convert (directory) {
   // debug args

package/src/cli/actions/vault/decrypt.js

@@ -1,6 +1,6 @@
 const fs = require('fs')
 
-const logger = require('./../../../shared/logger')
+const { logger } = require('./../../../shared/logger')
 const createSpinner = require('./../../../shared/createSpinner')
 const sleep = require('./../../../lib/helpers/sleep')
 

package/src/cli/actions/vault/encrypt.js

@@ -2,7 +2,7 @@ const fs = require('fs')
 const path = require('path')
 
 const main = require('./../../../lib/main')
-const logger = require('./../../../shared/logger')
+const { logger } = require('./../../../shared/logger')
 const createSpinner = require('./../../../shared/createSpinner')
 const sleep = require('./../../../lib/helpers/sleep')
 const pluralize = require('./../../../lib/helpers/pluralize')

package/src/cli/actions/vault/status.js

@@ -1,4 +1,4 @@
-const logger = require('./../../../shared/logger')
+const { logger } = require('./../../../shared/logger')
 
 const main = require('./../../../lib/main')
 

package/src/cli/commands/hub.js

@@ -1,7 +1,7 @@
 const { Command } = require('commander')
 
 const store = require('./../../shared/store')
-const logger = require('./../../shared/logger')
+const { logger } = require('./../../shared/logger')
 
 const hub = new Command('hub')
 

package/src/cli/dotenvx.js

@@ -4,7 +4,7 @@ const UpdateNotice = require('./../lib/helpers/updateNotice')
 const { Command } = require('commander')
 const program = new Command()
 
-const logger = require('./../shared/logger')
+const { setLogLevel, logger } = require('../shared/logger')
 const examples = require('./examples')
 const packageJson = require('./../lib/helpers/packageJson')
 
@@ -33,25 +33,7 @@ program
   .hook('preAction', (thisCommand, actionCommand) => {
     const options = thisCommand.opts()
 
-    if (options.logLevel) {
-      logger.level = options.logLevel
-      logger.debug(`setting log level to ${options.logLevel}`)
-    }
-
-    // --quiet overides --log-level. only errors will be shown
-    if (options.quiet) {
-      logger.level = 'error'
-    }
-
-    // --verbose overrides --quiet
-    if (options.verbose) {
-      logger.level = 'verbose'
-    }
-
-    // --debug overrides --verbose
-    if (options.debug) {
-      logger.level = 'debug'
-    }
+    setLogLevel(options)
   })
 
 // cli

package/src/lib/helpers/replace.js

@@ -7,19 +7,21 @@ function replace (src, key, value) {
   const parsed = dotenv.parse(src)
   if (Object.prototype.hasOwnProperty.call(parsed, key)) {
     const regex = new RegExp(
-      `^${key}=` + // start of line with key
-      '(?:' + // begin non-capturing group for handling both quoted and unquoted values
-        '(["\'`])' + // capture opening quote (' or " or `)
-        '[^\\1]*' + // match any character except the quote captured initially
-        '\\1' + // match the same closing quote as captured at the start
-      '|' + // OR
-        '[^#\\n]*' + // match any characters until a # (comment) or newline
-      ')' + // end non-capturing group
-      '(\\n[^A-Z0-9_].*)*', // match subsequent lines that don't start with a letter, number, or underscore (continuation lines)
-      'm' // apply multiline mode, so ^ and $ match start and end of lines, not just the whole string
+      // Match the key at the start of a line or following a newline
+      `(^|\\n)${key}\\s*=\\s*` +
+      // Non-capturing group to handle different types of quotations and unquoted values
+      '(?:' +
+        '(["\'`])' + // Match an opening quote
+        '.*?' + // Non-greedy match for any characters within quotes
+        '\\2' + // Match the corresponding closing quote
+      '|' +
+        // Match unquoted values; account for escaped newlines
+        '(?:[^#\\n\\\\]|\\\\.)*' + // Use non-capturing group for any character except #, newline, or backslash, or any escaped character
+      ')',
+      'gs' // Global and dotAll mode to treat string as single line
     )
 
-    output = src.replace(regex, formatted)
+    output = src.replace(regex, `$1${formatted}`)
   } else {
     // append
     if (src.endsWith('\n')) {

package/src/lib/main.js

@@ -1,5 +1,5 @@
 const path = require('path')
-const logger = require('./../shared/logger')
+const { logger } = require('./../shared/logger')
 const dotenv = require('dotenv')
 
 // services
@@ -15,6 +15,7 @@ const VaultEncrypt = require('./services/vaultEncrypt')
 
 // helpers
 const dotenvOptionPaths = require('./helpers/dotenvOptionPaths')
+const { setLogLevel } = require('../shared/logger')
 
 // proxies to dotenv
 const config = function (options = {}) {
@@ -33,11 +34,7 @@ const config = function (options = {}) {
     DOTENV_KEY = options.DOTENV_KEY
   }
 
-  // debug -> log level
-  if (options && options.debug) {
-    logger.level = 'debug'
-    logger.debug('setting log level to debug')
-  }
+  if (options) setLogLevel(options)
 
   // build envs using user set option.path
   const optionPaths = dotenvOptionPaths(options) // [ '.env' ]

package/src/shared/logger.js

@@ -103,4 +103,24 @@ const logger = createLogger({
   ]
 })
 
-module.exports = logger
+const setLogLevel = options => {
+  const logLevel = options.debug
+    ? 'debug'
+    : options.verbose
+      ? 'verbose'
+      : options.quiet
+        ? 'error'
+        : options.logLevel
+
+  if (!logLevel) return
+  logger.level = logLevel
+  // Only log which level it's setting if it's not set to quiet mode
+  if (!options.quiet || (options.quiet && logLevel !== 'error')) {
+    logger.debug(`Setting log level to ${logLevel}`)
+  }
+}
+
+module.exports = {
+  logger,
+  setLogLevel
+}