@karmaniverous/get-dotenv 3.1.1 → 3.1.3

package/dist/default/lib/getDotenvCli.js

@@ -69,9 +69,9 @@ const getDotenvCli = function () {
     logger = console.log,
     preHook,
     postHook,
-    ...cliOptions
+    ...cliOptionsCustom
   } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  let {
+  const {
     alias,
     command,
     debug,
@@ -92,16 +92,17 @@ const getDotenvCli = function () {
     pathsDelimiter,
     pathsDelimiterPattern,
     privateToken,
-    vars,
     varsAssignor,
     varsAssignorPattern,
     varsDelimiter,
     varsDelimiterPattern
   } = {
-    ..._options.cliDefaultOptions,
-    ...cliOptions
+    ..._options.cliDefaultOptionsGlobal,
+    ...cliOptionsCustom,
+    ..._options.cliDefaultOptionsLocal
   };
   const excludeAll = excludeDynamic && (excludeEnv && excludeGlobal || excludePrivate && excludePublic);
+  const vars = [cliOptionsCustom.vars ?? _options.cliDefaultOptionsGlobal.vars, _options.cliDefaultOptionsLocal.vars].filter(v => v?.length).join(varsDelimiter);
   return new _commander.Command().name(alias).description(description).enablePositionalOptions().passThroughOptions().option('-e, --env <string>', 'target environment', _dotenvExpand.dotenvExpand, env).option('-v, --vars <string>', `dotenv-expanded delimited key-value pairs: ${[['KEY1', 'VAL1'], ['KEY2', 'VAL2']].map(v => v.join(varsAssignor)).join(varsDelimiter)}`, _dotenvExpand.dotenvExpand, vars).option('-c, --command <string>', 'dotenv-expanded shell command string', _dotenvExpand.dotenvExpand, command).option('-o, --output-path <string>', 'consolidated output file, follows dotenv-expand rules using loaded env vars', _dotenvExpand.dotenvExpand, outputPath).addOption(new _commander.Option('-p, --load-process', `load variables to process.env ON${loadProcess ? ' (default)' : ''}`).conflicts('loadProcessOff')).addOption(new _commander.Option('-P, --load-process-off', `load variables to process.env OFF${!loadProcess ? ' (default)' : ''}`).conflicts('loadProcess')).addOption(new _commander.Option('-a, --exclude-all', `exclude all dotenv variables from loading ON${excludeAll ? ' (default)' : ''}`).conflicts('excludeAllOff')).addOption(new _commander.Option('-A, --exclude-all-off', `exclude all dotenv variables from loading OFF${!excludeAll ? ' (default)' : ''}`).conflicts('excludeAll')).addOption(new _commander.Option('-z, --exclude-dynamic', `exclude dynamic dotenv variables from loading ON${excludeDynamic ? ' (default)' : ''}`).conflicts('excludeDynamicOff')).addOption(new _commander.Option('-Z, --exclude-dynamic-off', `exclude dynamic dotenv variables from loading OFF${!excludeDynamic ? ' (default)' : ''}`).conflicts('excludeDynamic')).addOption(new _commander.Option('-n, --exclude-env', `exclude environment-specific dotenv variables from loading${excludeEnv ? ' (default)' : ''}`).conflicts('excludeEnvOff')).addOption(new _commander.Option('-N, --exclude-env-off', `exclude environment-specific dotenv variables from loading OFF${!excludeEnv ? ' (default)' : ''}`).conflicts('excludeEnv')).addOption(new _commander.Option('-g, --exclude-global', `exclude global dotenv variables from loading ON${excludeGlobal ? ' (default)' : ''}`).conflicts('excludeGlobalOff')).addOption(new _commander.Option('-G, --exclude-global-off', `exclude global dotenv variables from loading OFF${!excludeGlobal ? ' (default)' : ''}`).conflicts('excludeGlobal')).addOption(new _commander.Option('-r, --exclude-private', `exclude private dotenv variables from loading ON${excludePrivate ? ' (default)' : ''}`).conflicts('excludePrivateOff')).addOption(new _commander.Option('-R, --exclude-private-off', `exclude private dotenv variables from loading OFF${!excludePrivate ? ' (default)' : ''}`).conflicts('excludePrivate')).addOption(new _commander.Option('-u, --exclude-public', `exclude public dotenv variables from loading ON${excludePublic ? ' (default)' : ''}`).conflicts('excludePublicOff')).addOption(new _commander.Option('-U, --exclude-public-off', `exclude public dotenv variables from loading OFF${!excludePublic ? ' (default)' : ''}`).conflicts('excludePublic')).addOption(new _commander.Option('-l, --log', `console log loaded variables ON${log ? ' (default)' : ''}`).conflicts('logOff')).addOption(new _commander.Option('-L, --log-off', `console log loaded variables OFF${!log ? ' (default)' : ''}`).conflicts('log')).addOption(new _commander.Option('-d, --debug', `debug mode ON${debug ? ' (default)' : ''}`).conflicts('debugOff')).addOption(new _commander.Option('-D, --debug-off', `debug mode OFF${!debug ? ' (default)' : ''}`).conflicts('debug')).option('--default-env <string>', 'default target environment', _dotenvExpand.dotenvExpand, defaultEnv).option('--dotenv-token <string>', 'dotenv-expanded token indicating a dotenv file', _dotenvExpand.dotenvExpand, dotenvToken).option('--dynamic-path <string>', 'dynamic variables path', _dotenvExpand.dotenvExpand, dynamicPath).option('--paths <string>', 'dotenv-expanded delimited list of paths to dotenv directory', _dotenvExpand.dotenvExpand, paths).option('--paths-delimiter <string>', 'paths delimiter string', pathsDelimiter).option('--paths-delimiter-pattern <string>', 'paths delimiter regex pattern', pathsDelimiterPattern).option('--private-token <string>', 'dotenv-expanded token indicating private variables', _dotenvExpand.dotenvExpand, privateToken).option('--vars-delimiter <string>', 'vars delimiter string', varsDelimiter).option('--vars-delimiter-pattern <string>', 'vars delimiter regex pattern', varsDelimiterPattern).option('--vars-assignor <string>', 'vars assignment operator string', varsAssignor).option('--vars-assignor-pattern <string>', 'vars assignment operator regex pattern', varsAssignorPattern).addCommand(new _commander.Command().name('cmd').description('execute shell command string (default command)').configureHelp({
     showGlobalOptions: true
   }).enablePositionalOptions().passThroughOptions().action(async (options, _ref) => {

package/dist/default/lib/options.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getdotenvDefaultOptions = exports.cliDefaultOptions = exports.cli2getdotenvOptions = void 0;
+exports.getdotenvDefaultOptions = exports.cliDefaultOptionsLocal = exports.cliDefaultOptionsGlobal = exports.cli2getdotenvOptions = void 0;
 var _fsExtra = _interopRequireDefault(require("fs-extra"));
 var _lodash = _interopRequireDefault(require("lodash.frompairs"));
 var _lodash2 = _interopRequireDefault(require("lodash.pick"));
@@ -18,13 +18,10 @@ const _dirname = (0, _path.dirname)((0, _url.fileURLToPath)(import.meta.url));
 // Load default options.
 const cliDefaultOptionsGlobalPath = (0, _path.resolve)(_dirname, '../getdotenv.config.json');
 const cliDefaultOptionsGlobal = (await _fsExtra.default.exists(cliDefaultOptionsGlobalPath)) ? JSON.parse(await _fsExtra.default.readFile(cliDefaultOptionsGlobalPath)) : {};
+exports.cliDefaultOptionsGlobal = cliDefaultOptionsGlobal;
 const cliDefaultOptionsLocalPath = (0, _path.resolve)(await (0, _pkgDir.packageDirectory)(), 'getdotenv.config.json');
 const cliDefaultOptionsLocal = (await _fsExtra.default.exists(cliDefaultOptionsLocalPath)) ? JSON.parse(await _fsExtra.default.readFile(cliDefaultOptionsLocalPath)) : {};
-const cliDefaultOptions = {
-  ...cliDefaultOptionsGlobal,
-  ...cliDefaultOptionsLocal
-};
-exports.cliDefaultOptions = cliDefaultOptions;
+exports.cliDefaultOptionsLocal = cliDefaultOptionsLocal;
 const cli2getdotenvOptions = function () {
   let {
     env,
@@ -47,5 +44,8 @@ const cli2getdotenvOptions = function () {
   };
 };
 exports.cli2getdotenvOptions = cli2getdotenvOptions;
-const getdotenvDefaultOptions = cli2getdotenvOptions(cliDefaultOptions);
+const getdotenvDefaultOptions = cli2getdotenvOptions({
+  ...cliDefaultOptionsGlobal,
+  ...cliDefaultOptionsLocal
+});
 exports.getdotenvDefaultOptions = getdotenvDefaultOptions;

package/lib/getDotenvCli.js

@@ -5,7 +5,11 @@ import { execaCommand } from 'execa';
 // lib imports
 import { dotenvExpand } from './dotenvExpand.js';
 import { getDotenv } from './getDotenv.js';
-import { cli2getdotenvOptions, cliDefaultOptions } from './options.js';
+import {
+  cli2getdotenvOptions,
+  cliDefaultOptionsGlobal,
+  cliDefaultOptionsLocal,
+} from './options.js';
 
 /**
  * GetDotenv CLI Pre-hook Callback type. Transforms inbound options & executes side effects.
@@ -62,9 +66,9 @@ export const getDotenvCli = ({
   logger = console.log,
   preHook,
   postHook,
-  ...cliOptions
+  ...cliOptionsCustom
 } = {}) => {
-  let {
+  const {
     alias,
     command,
     debug,
@@ -85,20 +89,27 @@ export const getDotenvCli = ({
     pathsDelimiter,
     pathsDelimiterPattern,
     privateToken,
-    vars,
     varsAssignor,
     varsAssignorPattern,
     varsDelimiter,
     varsDelimiterPattern,
   } = {
-    ...cliDefaultOptions,
-    ...cliOptions,
+    ...cliDefaultOptionsGlobal,
+    ...cliOptionsCustom,
+    ...cliDefaultOptionsLocal,
   };
 
   const excludeAll =
     excludeDynamic &&
     ((excludeEnv && excludeGlobal) || (excludePrivate && excludePublic));
 
+  const vars = [
+    cliOptionsCustom.vars ?? cliDefaultOptionsGlobal.vars,
+    cliDefaultOptionsLocal.vars,
+  ]
+    .filter((v) => v?.length)
+    .join(varsDelimiter);
+
   return new Command()
     .name(alias)
     .description(description)

package/lib/options.js

@@ -14,7 +14,9 @@ const cliDefaultOptionsGlobalPath = resolve(
   '../getdotenv.config.json'
 );
 
-const cliDefaultOptionsGlobal = (await fs.exists(cliDefaultOptionsGlobalPath))
+export const cliDefaultOptionsGlobal = (await fs.exists(
+  cliDefaultOptionsGlobalPath
+))
   ? JSON.parse(await fs.readFile(cliDefaultOptionsGlobalPath))
   : {};
 
@@ -23,15 +25,12 @@ const cliDefaultOptionsLocalPath = resolve(
   'getdotenv.config.json'
 );
 
-const cliDefaultOptionsLocal = (await fs.exists(cliDefaultOptionsLocalPath))
+export const cliDefaultOptionsLocal = (await fs.exists(
+  cliDefaultOptionsLocalPath
+))
   ? JSON.parse(await fs.readFile(cliDefaultOptionsLocalPath))
   : {};
 
-export const cliDefaultOptions = {
-  ...cliDefaultOptionsGlobal,
-  ...cliDefaultOptionsLocal,
-};
-
 export const cli2getdotenvOptions = ({
   env,
   defaultEnv,
@@ -76,4 +75,7 @@ export const cli2getdotenvOptions = ({
   ),
 });
 
-export const getdotenvDefaultOptions = cli2getdotenvOptions(cliDefaultOptions);
+export const getdotenvDefaultOptions = cli2getdotenvOptions({
+  ...cliDefaultOptionsGlobal,
+  ...cliDefaultOptionsLocal,
+});

package/package.json

@@ -3,7 +3,7 @@
   "bin": {
     "getdotenv": "bin/getdotenv/index.js"
   },
-  "version": "3.1.1",
+  "version": "3.1.3",
   "publishConfig": {
     "access": "public"
   },