@karmaniverous/get-dotenv 2.2.2 → 2.3.0

package/README.md

@@ -78,17 +78,10 @@ dotenv files. You can:
 * Specify a default environment, override the default with an existing
   environment variable, and override both with a direct setting.
 * Exclude public, private, global, environment-specific, or dynamic variables.
-* Execute a &&-delimited series of shell commands after loading variables.
+* Execute a &&-delimited series of shell commands after loading variables,
+  optionally ignoring errors.
 * Place the shell commands inside the invocation to support npm script
   arguments for other options.
-* Specify the token that identifies dotenv files (e.g. '.env').
-* Specify the token that identifies private vatiables (e.g. '.local').
-
-Options:
-  -p, --paths <strings...>           space-delimited paths to dotenv directory (default './')
-  -y, --dynamic-path <string>        dynamic variables path
-  -o, --output-path <string>         consolidated output file (follows dotenv-expand rules using loaded env vars)
-  -d, --defaultEnvironment <string>  default environment (prefix with $ to use environment variable)
   -e, --environment <string>         designated environment (prefix with $ to use environment variable)
   -n, --exclude-env                  exclude environment-specific variables (default: false)
   -g, --exclude-global               exclude global & dynamic variables (default: false)
@@ -99,6 +92,7 @@ Options:
   -l, --log                          log extracted variables (default: false)
   -t, --dotenv-token <string>        token indicating a dotenv file (default: '.env')
   -i, --private-token <string>       token indicating private variables (default: 'local')
+  -q, --throw-error                  throw error to shell & terminate sequential process (default: false)
   -h, --help                         display help for command
 ```
 

package/bin/getdotenv/index.js

@@ -33,7 +33,8 @@ program
       `* Specify a default environment, override the default with an existing`,
       `  environment variable, and override both with a direct setting.`,
       `* Exclude public, private, global, environment-specific, or dynamic variables.`,
-      `* Execute a &&-delimited series of shell commands after loading variables.`,
+      `* Execute a &&-delimited series of shell commands after loading variables,`,
+      `  optionally ignoring errors.`,
       `* Place the shell commands inside the invocation to support npm script`,
       `  arguments for other options.`,
       `* Specify the token that identifies dotenv files (e.g. '.env').`,
@@ -82,6 +83,10 @@ program
   .option(
     '-i, --private-token <string>',
     "token indicating private variables (default: 'local')"
+  )
+  .option(
+    '-q, --throw-error',
+    'throw error to shell & terminate sequential process (default: false)'
   );
 
 // Parse CLI options from command line.
@@ -100,6 +105,7 @@ const {
   outputPath,
   paths,
   privateToken,
+  throwError,
 } = program.opts();
 
 if (command && program.args.length) program.error('command specified twice');
@@ -129,6 +135,8 @@ if (command || program.args.length) {
     .split('&&')
     .map((c) => parseArgsStringToArgv(c));
 
-  for (const argv of argvs)
-    spawn.sync(argv[0], argv.slice(1), { stdio: 'inherit' });
+  for (const argv of argvs) {
+    const { error } = spawn.sync(argv[0], argv.slice(1), { stdio: 'inherit' });
+    if (error && throwError) throw error;
+  }
 }

package/dist/default/lib/getDotenv/getDotenv.js

@@ -89,17 +89,9 @@ const getDotenv = async function () {
   if (dynamicPath && !excludeDynamic) {
     const dynamic = new Function(`return ${(await _fsExtra.default.readFile(dynamicPath)).toString()}`)()(dotenv);
     Object.keys(dynamic).forEach(key => {
-      try {
-        Object.assign(dotenv, {
-          [key]: dynamic[key](dotenv)
-        });
-      } catch ({
-        message
-      }) {
-        Object.assign(dotenv, {
-          [key]: `ERROR: ${message}`
-        });
-      }
+      Object.assign(dotenv, {
+        [key]: typeof dynamic[key] === 'function' ? dynamic[key](dotenv) : dynamic[key]
+      });
     });
   }
 
@@ -119,7 +111,23 @@ const getDotenv = async function () {
   if (log) console.log(dotenv);
 
   // Load process.env.
-  if (loadProcess) Object.assign(process.env, dotenv);
+  if (loadProcess) Object.assign(process.env, dotenv, {
+    getdotenvOptions: JSON.stringify({
+      dotenvToken,
+      dynamicPath,
+      env,
+      excludeDynamic,
+      excludeEnv,
+      excludeGlobal,
+      excludePrivate,
+      excludePublic,
+      loadProcess,
+      log,
+      outputPath,
+      paths,
+      privateToken
+    })
+  });
   return dotenv;
 };
 
@@ -201,7 +209,7 @@ const getDotenvSync = function () {
 
   // Load process.env.
   if (loadProcess) Object.assign(process.env, dotenv, {
-    __getdotenvOptions: JSON.stringify({
+    getdotenvOptions: JSON.stringify({
       dotenvToken,
       dynamicPath,
       env,

package/lib/getDotenv/getDotenv.js

@@ -99,11 +99,12 @@ export const getDotenv = async ({
       `return ${(await fs.readFile(dynamicPath)).toString()}`
     )()(dotenv);
     Object.keys(dynamic).forEach((key) => {
-      try {
-        Object.assign(dotenv, { [key]: dynamic[key](dotenv) });
-      } catch ({ message }) {
-        Object.assign(dotenv, { [key]: `ERROR: ${message}` });
-      }
+      Object.assign(dotenv, {
+        [key]:
+          typeof dynamic[key] === 'function'
+            ? dynamic[key](dotenv)
+            : dynamic[key],
+      });
     });
   }
 
@@ -128,7 +129,24 @@ export const getDotenv = async ({
   if (log) console.log(dotenv);
 
   // Load process.env.
-  if (loadProcess) Object.assign(process.env, dotenv);
+  if (loadProcess)
+    Object.assign(process.env, dotenv, {
+      getdotenvOptions: JSON.stringify({
+        dotenvToken,
+        dynamicPath,
+        env,
+        excludeDynamic,
+        excludeEnv,
+        excludeGlobal,
+        excludePrivate,
+        excludePublic,
+        loadProcess,
+        log,
+        outputPath,
+        paths,
+        privateToken,
+      }),
+    });
 
   return dotenv;
 };
@@ -236,7 +254,7 @@ export const getDotenvSync = ({
   // Load process.env.
   if (loadProcess)
     Object.assign(process.env, dotenv, {
-      __getdotenvOptions: JSON.stringify({
+      getdotenvOptions: JSON.stringify({
         dotenvToken,
         dynamicPath,
         env,

package/package.json

@@ -3,7 +3,7 @@
   "bin": {
     "getdotenv": "bin/getdotenv/index.js"
   },
-  "version": "2.2.2",
+  "version": "2.3.0",
   "publishConfig": {
     "access": "public"
   },
@@ -31,31 +31,31 @@
   ],
   "license": "BSD-3-Clause",
   "dependencies": {
-    "commander": "^10.0.0",
+    "commander": "^10.0.1",
     "cross-spawn": "^7.0.3",
     "dotenv": "^16.0.3",
     "dotenv-expand": "^10.0.0",
-    "fs-extra": "^11.1.0",
-    "string-argv": "^0.3.1",
+    "fs-extra": "^11.1.1",
+    "string-argv": "^0.3.2",
     "uuid": "^9.0.0"
   },
   "devDependencies": {
-    "@babel/cli": "^7.21.0",
-    "@babel/core": "^7.21.0",
-    "@babel/eslint-parser": "^7.19.1",
+    "@babel/cli": "^7.21.5",
+    "@babel/core": "^7.21.8",
+    "@babel/eslint-parser": "^7.21.8",
     "@babel/plugin-syntax-import-assertions": "^7.20.0",
-    "@babel/preset-env": "^7.20.2",
+    "@babel/preset-env": "^7.21.5",
     "@babel/register": "^7.21.0",
-    "@types/node": "^18.15.3",
+    "@types/node": "^20.1.1",
     "chai": "^4.3.7",
     "concat-md": "^0.5.1",
-    "eslint": "^8.36.0",
+    "eslint": "^8.40.0",
     "eslint-config-standard": "^17.0.0",
     "eslint-plugin-mocha": "^10.1.0",
     "jsdoc-to-markdown": "^8.0.0",
     "mocha": "^10.2.0",
-    "prettier": "^2.8.4",
-    "release-it": "^15.8.0"
+    "prettier": "^2.8.8",
+    "release-it": "^15.10.3"
   },
   "exports": {
     ".": {