@dotenvx/dotenvx 1.6.1 → 1.6.3

package/CHANGELOG.md

@@ -2,21 +2,33 @@
 
 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.1...main)
+## [Unreleased](https://github.com/dotenvx/dotenvx/compare/v1.6.3...main)
+
+## 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
+
+### Added
+
+* add more detailed type definitions ([#313](https://github.com/dotenvx/dotenvx/pull/313)) 
 
 ## 1.6.1
 
 ### Added
 
-* added support for `.env1` (`.env*`) file format. (private key expands to `DOTENV_PRIVATE_KEY_DEVELOPMENT1`) ([#312](https://github.com/dotenvx/dotenvx/pull/312))
+* add support for `.env1` (`.env*`) file format. (private key expands to `DOTENV_PRIVATE_KEY_DEVELOPMENT1`) ([#312](https://github.com/dotenvx/dotenvx/pull/312))
 
 ## 1.6.0
 
 ### 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.1",
+  "version": "1.6.3",
   "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')
+
+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'))
 

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

package/src/lib/main.d.ts

@@ -35,14 +35,6 @@ export interface DotenvConfigOptions {
    */
   encoding?: string;
 
-  /**
-   * Turn on logging to help debug why certain keys or values are not being set as you expect.
-   *
-   * @default false
-   * @example require('@dotenvx/dotenvx').config({ debug: process.env.DEBUG })
-   */
-  debug?: boolean;
-
   /**
    * Override any environment variables that have already been set on your machine with values from your .env file.
    * @default false
@@ -77,6 +69,40 @@ export interface DotenvConfigOptions {
    * Do not warn for missing .env files
    */
   convention?: string;
+
+  /**
+   * Turn on logging to help debug why certain keys or values are not being set as you expect.
+   *
+   * @default false
+   * @example require('@dotenvx/dotenvx').config({ debug: process.env.DEBUG })
+   */
+  debug?: boolean;
+
+  verbose?: boolean;
+
+  quiet?: boolean;
+
+  logLevel?:
+    | 'error'
+    | 'errorv'
+    | 'errorvp'
+    | 'errorvpb'
+    | 'errornocolor'
+    | 'warn'
+    | 'warnv'
+    | 'warnvp'
+    | 'warnvpb'
+    | 'success'
+    | 'successv'
+    | 'successvp'
+    | 'successvpb'
+    | 'info'
+    | 'help'
+    | 'help2'
+    | 'http'
+    | 'verbose'
+    | 'debug'
+    | 'blank';
 }
 
 export interface DotenvConfigOutput {
@@ -115,10 +141,13 @@ export function configDotenv(options?: DotenvConfigOptions): DotenvConfigOutput;
  *
  * @see https://dotenvx.com/docs
  *
- * @param encrypted - the encrypted ciphertext string
- * @param keyStr - the decryption key string
+ * @param envFile - the encrypted ciphertext string
+ * @param key - the decryption key(s)
  */
-export function decrypt(encrypted: string, keyStr: string): string;
+export function decrypt(
+  envFile?: string | string[],
+  key?: string | string[]
+): string;
 
 export type EncryptRowOutput = {
   keys: string[];
@@ -143,10 +172,13 @@ export type EncryptOutput = {
  * Encrypt plaintext
  *
  * @see https://dotenvx.com/docs
- * @param envFile - path to the .env file
- * @param key - keys(s) to encrypt (default: all keys in .env file)
+ * @param envFile - path to the .env file(s)
+ * @param key - keys(s) to encrypt env file(s) (default: all keys in .env file)
  */
-export function encrypt(envFile: string, key: string): EncryptOutput;
+export function encrypt(
+  envFile?: string | string[],
+  key?: string | string[]
+): EncryptOutput;
 
 export type VaultEncryptOutput = {
   dotenvKeys: Record<string, string>;
@@ -158,21 +190,8 @@ export type VaultEncryptOutput = {
   existingVaults: string[];
   addedDotenvFilenames: string[];
   envFile: string | string[];
-  key: string | string[];
 };
 
-/**
- * Encrypt plaintext
- *
- * @see https://dotenvx.com/docs
- * @param directory - current working directory
- * @param envFile - path to the .env file(s)
- */
-export function vaultEncrypt(
-  directory: string,
-  envFile: string | string[]
-): VaultEncryptOutput;
-
 /**
  * List all env files in the current working directory
  *
@@ -284,3 +303,22 @@ type KeyOfSettings = Extract<keyof Settings, string>;
 export function settings(
   key: KeyOfSettings | undefined | null = null
 ): Settings;
+
+/**
+ * Decrypt ciphertext
+ * @param encrypted - the encrypted ciphertext string
+ * @param keyStr - the decryption key string
+ */
+export function vaultDecrypt(encrypted: string, keyStr: string): string;
+
+/**
+ * Encrypt plaintext
+ *
+ * @see https://dotenvx.com/docs
+ * @param directory - current working directory
+ * @param envFile - path to the .env file(s)
+ */
+export function vaultEncrypt(
+  directory?: string,
+  envFile?: string | string[]
+): VaultEncryptOutput;

package/src/lib/services/decrypt.js

@@ -11,6 +11,10 @@ const replace = require('./../helpers/replace')
 const ENCODING = 'utf8'
 
 class Decrypt {
+  /**
+   * @param {string|string[]} [envFile]
+   * @param {string|string[]} [key]
+   **/
   constructor (envFile = '.env', key = []) {
     this.envFile = envFile
     this.key = key

package/src/lib/services/encrypt.js

@@ -12,6 +12,10 @@ const replace = require('./../helpers/replace')
 const ENCODING = 'utf8'
 
 class Encrypt {
+  /**
+   * @param {string|string[]} [envFile]
+   * @param {string|string[]} [key]
+   **/
   constructor (envFile = '.env', key = []) {
     this.envFile = envFile
     this.key = key
@@ -59,8 +63,10 @@ class Encrypt {
         // iterate over all non-encrypted values and encrypt them
         const parsed = dotenv.parse(src)
         for (const [key, value] of Object.entries(parsed)) {
-          if (keys.length < 1 || keys.includes(key)) { // optionally control which key to encrypt
-            const encrypted = isEncrypted(key, value) || isPublicKey(key, value)
+          if (keys.length < 1 || keys.includes(key)) {
+            // optionally control which key to encrypt
+            const encrypted =
+              isEncrypted(key, value) || isPublicKey(key, value)
             if (!encrypted) {
               row.keys.push(key) // track key(s)