@karmaniverous/get-dotenv 3.1.5 → 3.1.6

package/dist/default/lib/getDotenvCli.js

@@ -116,7 +116,7 @@ const getDotenvCli = function () {
     isDefault: true
   }).hook('preSubcommand', async thisCommand => {
     const rawOptions = thisCommand.opts();
-    if (rawOptions.debug) logger('\n*** raw options ***\n', {
+    if (rawOptions.debug) logger('\n*** raw cli options ***\n', {
       rawOptions
     });
 
@@ -146,14 +146,14 @@ const getDotenvCli = function () {
     cliOptions.excludePublic = resolveExclusionAll(cliOptions.excludePublic, excludePublicOff, excludePublic);
     cliOptions.log = resolveExclusion(cliOptions.log, logOff, log);
     cliOptions.loadProcess = resolveExclusion(cliOptions.loadProcess, loadProcessOff, loadProcess);
-    if (cliOptions.debug) logger('\n*** after default resolution ***\n', {
+    if (cliOptions.debug) logger('\n*** cli options after default resolution ***\n', {
       cliOptions
     });
 
     // Execute pre-hook.
     if (preHook) {
       cliOptions = (await preHook(cliOptions)) ?? cliOptions;
-      if (cliOptions.debug) logger('\n*** after pre-hook ***\n', cliOptions);
+      if (cliOptions.debug) logger('\n*** cli options after pre-hook ***\n', cliOptions);
     }
 
     // Get getdotenv options from parent command.
@@ -163,23 +163,24 @@ const getDotenvCli = function () {
       ...parentGetdotenvOptions,
       ...cliGetdotenvOptions
     };
-    if (cliOptions.debug) logger('\n*** after getdotenv option resolution ***\n', {
+    if (cliOptions.debug) logger('\n*** getdotenv option resolution ***\n', {
       parentGetdotenvOptions,
       cliGetdotenvOptions,
       getdotenvOptions
     });
 
     // Execute getdotenv.
-    const dotenv = await (0, _getDotenv.getDotenv)({
+    thisCommand.getdotenvOptions = {
       ...getdotenvOptions,
       logger
-    });
-    if (cliOptions.debug) console.log('\n*** after getdotenv execution ***\n', {
-      dotenv
+    };
+    thisCommand.dotenv = await (0, _getDotenv.getDotenv)(thisCommand.getdotenvOptions);
+    if (cliOptions.debug) console.log('\n*** resulting dotenv values ***\n', {
+      dotenv: thisCommand.dotenv
     });
 
     // Execute post-hook.
-    if (postHook) await postHook(dotenv);
+    if (postHook) await postHook(thisCommand.dotenv);
 
     // Execute shell command.
     if (command) await (0, _execa.execaCommand)(command.replace(/ /g, '\\ '), {

package/lib/getDotenvCli.js

@@ -338,7 +338,8 @@ export const getDotenvCli = ({
     .hook('preSubcommand', async (thisCommand) => {
       const rawOptions = thisCommand.opts();
 
-      if (rawOptions.debug) logger('\n*** raw options ***\n', { rawOptions });
+      if (rawOptions.debug)
+        logger('\n*** raw cli options ***\n', { rawOptions });
 
       // Load options.
       let {
@@ -407,12 +408,15 @@ export const getDotenvCli = ({
       );
 
       if (cliOptions.debug)
-        logger('\n*** after default resolution ***\n', { cliOptions });
+        logger('\n*** cli options after default resolution ***\n', {
+          cliOptions,
+        });
 
       // Execute pre-hook.
       if (preHook) {
         cliOptions = (await preHook(cliOptions)) ?? cliOptions;
-        if (cliOptions.debug) logger('\n*** after pre-hook ***\n', cliOptions);
+        if (cliOptions.debug)
+          logger('\n*** cli options after pre-hook ***\n', cliOptions);
       }
 
       // Get getdotenv options from parent command.
@@ -428,20 +432,26 @@ export const getDotenvCli = ({
       };
 
       if (cliOptions.debug)
-        logger('\n*** after getdotenv option resolution ***\n', {
+        logger('\n*** getdotenv option resolution ***\n', {
           parentGetdotenvOptions,
           cliGetdotenvOptions,
           getdotenvOptions,
         });
 
       // Execute getdotenv.
-      const dotenv = await getDotenv({ ...getdotenvOptions, logger });
+      thisCommand.getdotenvOptions = {
+        ...getdotenvOptions,
+        logger,
+      };
+      thisCommand.dotenv = await getDotenv(thisCommand.getdotenvOptions);
 
       if (cliOptions.debug)
-        console.log('\n*** after getdotenv execution ***\n', { dotenv });
+        console.log('\n*** resulting dotenv values ***\n', {
+          dotenv: thisCommand.dotenv,
+        });
 
       // Execute post-hook.
-      if (postHook) await postHook(dotenv);
+      if (postHook) await postHook(thisCommand.dotenv);
 
       // Execute shell command.
       if (command)

package/package.json

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