Avoid promise chaining when possible (#1902)

tj · Jul 24, 2023 · 62700a3 · 62700a3
1 parent 96b9fc2
commit 62700a3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/command.js b/lib/command.js
@@ -474,7 +474,8 @@ Expecting one of '${allowedValues.join("', '")}'`);
   _awaitHookPreSubcommand() {
     this.hook('preSubcommand', () => {
       if (this._shouldAwait()) {
-        return Promise.all(this._getOptionPromises());
+        const toAwait = this._getOptionPromises();
+        if (toAwait.length) return Promise.all(toAwait);
       }
     });
   }
@@ -499,7 +500,7 @@ Expecting one of '${allowedValues.join("', '")}'`);
           }
         });
 
-        return Promise.all(toAwait);
+        if (toAwait.length) return Promise.all(toAwait);
       }
     });
   }

diff --git a/tests/command.hook.test.js b/tests/command.hook.test.js
@@ -243,7 +243,6 @@ describe('action hooks async', () => {
     const calls = [];
     const program = new commander.Command();
     program
-      .awaitHook(false)
       .hook('postAction', async() => {
         await 0;
         calls.push('after');