Skip to content

Commit 06b2a4b

Browse files
Merge pull request #870 from appwrite/feat-improve-report
refactor: Improve command line to use `rawArgs`
2 parents f64000e + c393058 commit 06b2a4b

File tree

4 files changed

+10
-6
lines changed

4 files changed

+10
-6
lines changed

templates/cli/index.js.twig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ const chalk = require("chalk");
1010
const { version } = require("./package.json");
1111
const { commandDescriptions, cliConfig } = require("./lib/parser");
1212
const { client } = require("./lib/commands/generic");
13+
const inquirer = require("inquirer");
1314
{% if sdk.test != "true" %}
1415
const { login, logout, whoami, migrate } = require("./lib/commands/generic");
1516
const { init } = require("./lib/commands/init");
@@ -22,6 +23,8 @@ const { migrate } = require("./lib/commands/generic");
2223
const { {{ service.name | caseLower }} } = require("./lib/commands/{{ service.name | caseLower }}");
2324
{% endfor %}
2425

26+
inquirer.registerPrompt('search-list', require('inquirer-search-list'));
27+
2528
program
2629
.description(commandDescriptions['main'])
2730
.configureHelp({

templates/cli/lib/parser.js.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ const parseError = (err) => {
130130
}
131131

132132
const version = '{{ sdk.version }}';
133-
const stepsToReproduce = `Running \`appwrite ${cliConfig.reportData.data.args}\``;
133+
const stepsToReproduce = `Running \`appwrite ${cliConfig.reportData.data.args.join(' ')}\``;
134134
const yourEnvironment = `CLI version: ${version}\nOperation System: ${os.type()}\nAppwrite version: ${appwriteVersion}\nIs Cloud: ${isCloud}`;
135135

136136
const stack = '```\n' + err.stack + '\n```';

templates/cli/lib/questions.js.twig

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ const questionsInitProject = [
141141
]
142142
},
143143
{
144-
type: "list",
144+
type: "search-list",
145145
name: "organization",
146146
message: "Choose the project organization",
147147
choices: async () => {
@@ -181,7 +181,7 @@ const questionsInitProject = [
181181
when: (answer) => answer.start !== 'existing'
182182
},
183183
{
184-
type: "list",
184+
type: "search-list",
185185
name: "project",
186186
message: "Choose your {{ spec.title|caseUcfirst }} project.",
187187
choices: async (answers) => {
@@ -292,7 +292,7 @@ const questionsCreateFunction = [
292292
const questionsCreateFunctionSelectTemplate = (templates) => {
293293
return [
294294
{
295-
type: "list",
295+
type: "search-list",
296296
name: "template",
297297
message: "What template would you like to use?",
298298
choices: templates.map((template) => {
@@ -339,7 +339,7 @@ const questionsCreateCollection = [
339339
}
340340
},
341341
{
342-
type: "list",
342+
type: "search-list",
343343
name: "database",
344344
message: "Choose the collection database",
345345
choices: async () => {
@@ -472,7 +472,7 @@ const questionsLogin = [
472472
when: (answers) => answers.method !== 'select'
473473
},
474474
{
475-
type: "list",
475+
type: "search-list",
476476
name: "accountId",
477477
message: "Select an account to use",
478478
choices() {

templates/cli/package.json.twig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
"form-data": "^4.0.0",
3131
"json-bigint": "^1.0.0",
3232
"inquirer": "^8.2.4",
33+
"inquirer-search-list": "^1.2.6",
3334
"tar": "^6.1.11",
3435
"ignore": "^5.2.0"
3536
},

0 commit comments

Comments
 (0)