Merge pull request #619 from appwrite/fix-cli

fix: cli errors
appwrite · Feb 21, 2023 · 898a066 · 898a066
2 parents 115f6a9 + 91f05bb
commit 898a066
Show file tree

Hide file tree

Showing 8 changed files with 244 additions and 146 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/package-lock.json b/package-lock.json
diff --git a/templates/cli/index.js.twig b/templates/cli/index.js.twig
@@ -1,4 +1,10 @@
 #! /usr/bin/env node
+
+/** Required to set max width of the help commands */
+const oldWidth = process.stdout.columns
+process.stdout.columns = 100
+/** ---------------------------------------------- */
+
 const program = require("commander");
 const chalk = require("chalk");
 const { version } = require("./package.json");
@@ -15,6 +21,10 @@ const { {{ service.name | caseLower }} } = require("./lib/commands/{{ service.na
 
 program
   .description(commandDescriptions['main'])
+  .configureHelp({
+    helpWidth: process.stdout.columns || 80,
+    sortSubcommands: true
+  })
   .version(version, "-v, --version")
   .option("--verbose", "Show complete error log")
   .option("--json", "Output in JSON format")
@@ -36,4 +46,5 @@ program
 {% endfor %}
   .addCommand(client)
   .parse(process.argv);
-
+
+process.stdout.columns = oldWidth;
diff --git a/templates/cli/lib/commands/command.js.twig b/templates/cli/lib/commands/command.js.twig
@@ -10,7 +10,9 @@ const { sdkForProject, sdkForConsole } = require('../sdks')
 const { parse, actionRunner, parseInteger, parseBool, commandDescriptions, success, log } = require('../parser')
 const { localConfig, globalConfig } = require("../config");
 
-const {{ service.name | caseLower }} = new Command("{{ service.name | caseLower }}").description(commandDescriptions['{{ service.name | caseLower }}'])
+const {{ service.name | caseLower }} = new Command("{{ service.name | caseLower }}").description(commandDescriptions['{{ service.name | caseLower }}']).configureHelp({
+    helpWidth: process.stdout.columns || 80
+  })
 
 {% for method in service.methods %}
 const {{ service.name | caseLower }}{{ method.name | caseUcfirst }} = async ({ {% for parameter in method.parameters.all %}{{ parameter.name | caseCamel | escapeKeyword }}, {% endfor %}parseOutput = true, sdk = undefined{% if 'multipart/form-data' in method.consumes %}, onProgress = () => {}{% endif %}{% if method.type == 'location' %}, destination{% endif %}}) => {

diff --git a/templates/cli/lib/commands/deploy.js.twig b/templates/cli/lib/commands/deploy.js.twig
@@ -143,6 +143,9 @@ const awaitPools = {
 
 const deploy = new Command("deploy")
     .description(commandDescriptions['deploy'])
+    .configureHelp({
+        helpWidth: process.stdout.columns || 80
+    })
     .action(actionRunner(async (_options, command) => {
         command.help()
     }));

diff --git a/templates/cli/lib/commands/generic.js.twig b/templates/cli/lib/commands/generic.js.twig
@@ -10,6 +10,9 @@ const { accountCreateEmailSession, accountDeleteSession } = require("./account")
 
 const login = new Command("login")
     .description(commandDescriptions['login'])
+    .configureHelp({
+        helpWidth: process.stdout.columns || 80
+    })
     .action(actionRunner(async () => {
         const answers = await inquirer.prompt(questionsLogin)
 
@@ -27,6 +30,9 @@ const login = new Command("login")
 
 const logout = new Command("logout")
     .description(commandDescriptions['logout'])
+    .configureHelp({
+        helpWidth: process.stdout.columns || 80
+    })
     .action(actionRunner(async () => {
         let client = await sdkForConsole();
 
@@ -43,6 +49,9 @@ const logout = new Command("logout")
 
 const client = new Command("client")
     .description(commandDescriptions['client'])
+    .configureHelp({
+        helpWidth: process.stdout.columns || 80
+    })
     .option("--selfSigned <value>", "Configure the CLI to use a self-signed certificate ( true or false )", parseBool)
     .option("--endpoint <endpoint>", "Set your Appwrite server endpoint")
     .option("--projectId <projectId>", "Set your Appwrite project ID")

diff --git a/templates/cli/lib/commands/init.js.twig b/templates/cli/lib/commands/init.js.twig
@@ -14,6 +14,9 @@ const { success, log, actionRunner, commandDescriptions } = require("../parser")
 
 const init = new Command("init")
   .description(commandDescriptions['init'])
+  .configureHelp({
+        helpWidth: process.stdout.columns || 80
+  })
   .action(actionRunner(async (_options, command) => {
     command.help();
   }));

diff --git a/templates/cli/lib/parser.js.twig b/templates/cli/lib/parser.js.twig
@@ -149,6 +149,7 @@ const logo = {{ language.params.logo | raw }};
 
 const commandDescriptions = {
     "account": `The account command allows you to authenticate and manage a user account.`,
+    "graphql": `The graphql command allows you to query and mutate any resource type on your Appwrite server.`,
     "avatars": `The avatars command aims to help you complete everyday tasks related to your app image, icons, and avatars.`,
     "databases": `The databases command allows you to create structured collections of documents, query and filter lists of documents.`,
     "deploy": `The deploy command provides a convenient wrapper for deploying your functions and collections.`,