Merge pull request #5730 from trufflesuite/subCMDHelp

fix `truffle help db <subCommand>`
trufflesuite · Nov 23, 2022 · 2c68fb1 · 2c68fb1
2 parents ee9165c + 28f3d26
commit 2c68fb1
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/packages/core/lib/commands/db/meta.js b/packages/core/lib/commands/db/meta.js
@@ -7,7 +7,9 @@ const usage =
   OS.EOL +
   "  Available sub-commands: " +
   OS.EOL +
-  "                serve \tStart the GraphQL server";
+  "                serve \tStart the GraphQL server" +
+  OS.EOL +
+  "                query \tQuery @truffle/db";
 
 module.exports = {
   command: "db",
@@ -18,18 +20,16 @@ module.exports = {
         ...serveCommand.run,
         ...serveCommand.meta
       })
+      .command({
+        ...queryCommand.run,
+        ...queryCommand.meta
+      })
       .demandCommand();
   },
 
   subCommands: {
-    serve: {
-      help: serveCommand.help,
-      description: serveCommand.meta
-    },
-    query: {
-      help: queryCommand.help,
-      description: queryCommand.meta
-    }
+    serve: serveCommand.meta,
+    query: queryCommand.meta
   },
 
   help: {

diff --git a/packages/core/lib/commands/help/displayCommandHelp.js b/packages/core/lib/commands/help/displayCommandHelp.js
@@ -4,14 +4,14 @@ module.exports = async function (selectedCommand, subCommand, options) {
 
   let commandHelp, commandDescription;
 
-  const chosenCommand = commands[selectedCommand];
+  const chosenCommand = commands[selectedCommand].meta;
 
   if (subCommand && chosenCommand.subCommands[subCommand]) {
-    commandHelp = chosenCommand.subCommands[subCommand].meta.help;
-    commandDescription = chosenCommand.subCommands[subCommand].meta.description;
+    commandHelp = chosenCommand.subCommands[subCommand].help;
+    commandDescription = chosenCommand.subCommands[subCommand].description;
   } else {
-    commandHelp = chosenCommand.meta.help;
-    commandDescription = chosenCommand.meta.description;
+    commandHelp = chosenCommand.help;
+    commandDescription = chosenCommand.description;
   }
 
   if (typeof commandHelp === "function") {