@dotenvx/dotenvx 1.6.2 → 1.6.4

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.6.2...main)
+## [Unreleased](https://github.com/dotenvx/dotenvx/compare/v1.6.4...main)
+
+## 1.6.4
+
+### Changed
+
+* fix `dotenvx help` (command was missing)
+
+## 1.6.3
+
+### Changed
+
+* adjust `dotenvx pro` to be dynamic if [dotenvx-pro](https://github.com/dotenvx/dotenvx-pro) is installed user's machine
 
 ## 1.6.2
 
@@ -21,8 +33,8 @@ All notable changes to this project will be documented in this file. See [standa
 ### Added
 
 * add `dotenvx decrypt` command. works inversely to `dotenvx encrypt`. same flags. ([#294](https://github.com/dotenvx/dotenvx/pull/294))
-* add `--stdout` option to `dotenvx decrypt`. example: `dotenvx decrypt -f .env.production > somefile.txt` ([#298](https://github.com/dotenvx/dotenvx/pull/298))
-* add `--stdout` option to `dotenvx encrypt`. example: `dotenvx encrypt -f .env.production > somefile.txt` ([#298](https://github.com/dotenvx/dotenvx/pull/298))
+* add `--stdout` option to `dotenvx decrypt`. example: `dotenvx decrypt -f .env.production --stdout > somefile.txt` ([#298](https://github.com/dotenvx/dotenvx/pull/298))
+* add `--stdout` option to `dotenvx encrypt`. example: `dotenvx encrypt -f .env.production --stdout > somefile.txt` ([#298](https://github.com/dotenvx/dotenvx/pull/298))
 
 ### Changed
 

package/package.json

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

package/src/cli/dotenvx.js

@@ -1,15 +1,13 @@
 #!/usr/bin/env node
 
 /* c8 ignore start */
-const fs = require('fs')
-const path = require('path')
-const { execSync } = require('child_process')
 const { Command } = require('commander')
 const program = new Command()
 
 const { setLogLevel, logger } = require('../shared/logger')
 const examples = require('./examples')
 const packageJson = require('./../lib/helpers/packageJson')
+const executeDynamic = require('./../lib/helpers/executeDynamic')
 
 // for use with run
 const envs = []
@@ -32,11 +30,22 @@ program
     setLogLevel(options)
   })
 
+program.addHelpText('after', '  pro                               🏆 pro\n')
+
+program
+  .argument('[command]', 'dynamic command')
+  .argument('[args...]', 'dynamic command arguments')
+  .action((command, args, cmdObj) => {
+    const rawArgs = process.argv.slice(3) // adjust the index based on where actual args start
+    executeDynamic(program, command, rawArgs)
+  })
+
 // cli
 program
   .name(packageJson.name)
   .description(packageJson.description)
   .version(packageJson.version)
+  .allowUnknownOption()
 
 // dotenvx run -- node index.js
 const runAction = require('./actions/run')
@@ -103,27 +112,6 @@ program.command('decrypt')
   .option('--stdout', 'send to stdout')
   .action(decryptAction)
 
-// dotenvx pro
-program.command('pro')
-  .description('🏆 pro')
-  .action(function (...args) {
-    try {
-      // execute `dotenvx-pro` if available
-      execSync('dotenvx-pro', { stdio: ['inherit', 'inherit', 'ignore'] })
-    } catch (_error) {
-      const pro = fs.readFileSync(path.join(__dirname, './pro.txt'), 'utf8')
-
-      console.log(pro)
-    }
-  })
-
-// // dotenvx ent
-// program.command('ent')
-//   .description('🏢 enterprise')
-//   .action(function (...args) {
-//     console.log('coming soon (med-large companies)')
-//   })
-
 // dotenvx ext
 program.addCommand(require('./commands/ext'))
 
@@ -193,6 +181,21 @@ program.command('scan')
     scanAction.apply(this, args)
   })
 
+program.command('help [command]')
+  .description('display help for command')
+  .action((command) => {
+    if (command) {
+      const subCommand = program.commands.find(c => c.name() === command)
+      if (subCommand) {
+        subCommand.outputHelp()
+      } else {
+        program.outputHelp()
+      }
+    } else {
+      program.outputHelp()
+    }
+  })
+
 // overide helpInformation to hide DEPRECATED commands
 program.helpInformation = function () {
   const originalHelp = Command.prototype.helpInformation.call(this)

package/src/lib/helpers/executeDynamic.js

@@ -0,0 +1,42 @@
+const fs = require('fs')
+const path = require('path')
+const childProcess = require('child_process')
+const { logger } = require('../../shared/logger')
+
+function executeDynamic (program, command, rawArgs) {
+  if (!command) {
+    program.outputHelp()
+    process.exit(1)
+    return
+  }
+
+  // construct the full command line manually including flags
+  const commandIndex = rawArgs.indexOf(command)
+  const forwardedArgs = rawArgs.slice(commandIndex + 1)
+
+  logger.debug(`command: ${command}`)
+  logger.debug(`args: ${JSON.stringify(forwardedArgs)}`)
+
+  const binPath = path.join(process.cwd(), 'node_modules', '.bin')
+  const newPath = `${binPath}:${process.env.PATH}`
+  const env = { ...process.env, PATH: newPath }
+
+  const result = childProcess.spawnSync(`dotenvx-${command}`, forwardedArgs, { stdio: 'inherit', env })
+  if (result.error) {
+    if (command === 'pro') {
+      // logger.warn(`[INSTALLATION_NEEDED] install dotenvx-${command} to use [dotenvx ${command}] commands 🏆`)
+      // logger.help('? see installation instructions [https://github.com/dotenvx/dotenvx-pro]')
+
+      const pro = fs.readFileSync(path.join(__dirname, './../../cli/pro.txt'), 'utf8')
+      console.log(pro)
+    } else {
+      logger.info(`error: unknown command '${command}'`)
+    }
+  }
+
+  if (result.status !== 0) {
+    process.exit(result.status)
+  }
+}
+
+module.exports = executeDynamic