Merge remote-tracking branch 'origin/feat-cli-sudo' into feat-cli-sudo

# Conflicts:
#	templates/cli/lib/commands/push.js.twig
#	templates/cli/lib/questions.js.twig

Author: byawitz

templates/cli/index.js.twig

@@ -30,21 +30,26 @@ program
   .option("--json", "Output in JSON format")
   .option("-f,--force", "Flag to confirm all warnings")
   .option("-a,--all", "Flag to push all resources")
-  .option("--ids [id...]", "Flag to pass list of ids for a giving action")
+  .option("--id [id...]", "Flag to pass list of ids for a giving action")
+  .option("--report", "Enable reporting when cli is crashing")
   .on("option:json", () => {
     cliConfig.json = true;
   })
   .on("option:verbose", () => {
     cliConfig.verbose = true;
   })
+  .on("option:report", () => {
+    cliConfig.report = true;
+    cliConfig.reportData = { data: this };
+  })
   .on("option:force", () => {
     cliConfig.force = true;
   })
   .on("option:all", () => {
     cliConfig.all = true;
   })
-  .on("option:ids", function() {
-    cliConfig.ids = this.opts().ids;
+  .on("option:id", function() {
+    cliConfig.ids = this.opts().id;
   })
   .showSuggestionAfterError()
 {% if sdk.test != "true" %}

templates/cli/lib/commands/pull.js.twig

@@ -11,7 +11,7 @@ const { databasesGet, databasesListCollections, databasesList } = require("./dat
 const { storageListBuckets } = require("./storage");
 const { sdkForConsole } = require("../sdks");
 const { localConfig } = require("../config");
-const ID  = require("../id");
+const ID = require("../id");
 const { paginate } = require("../paginate");
 const { questionsPullProject, questionsPullFunction, questionsPullCollection } = require("../questions");
 const { cliConfig, success, log, actionRunner, commandDescriptions } = require("../parser");
@@ -164,26 +164,12 @@ const pullFunction = async () => {
     success();
 }
 
-const pullCollection = async ({ databaseId } = {}) => {
-    const databaseIds = [];
+const pullCollection = async () => {
+    const databasesIds = (await inquirer.prompt(questionsPullCollection)).databases;
 
-    if (databaseId) {
-        databaseIds.push(databaseId);
-    } else if (cliConfig.all) {
-        let allDatabases = await databasesList({
-            parseOutput: false
-        })
-
-        databaseIds.push(...allDatabases.databases.map((d) => d.$id));
-    }
+    for (let id of databasesIds) {
+        const databaseId = id.value ? id.value : id;
 
-    if (databaseIds.length <= 0) {
-        let answers = await inquirer.prompt(questionsPullCollection)
-        if (!answers.databases) process.exit(1)
-        databaseIds.push(...answers.databases);
-    }
-
-    for (const databaseId of databaseIds) {
         const database = await databasesGet({
             databaseId,
             parseOutput: false
@@ -198,14 +184,15 @@ const pullCollection = async ({ databaseId } = {}) => {
 
         log(`Found ${total} collections`);
 
-        collections.forEach(async collection => {
+        collections.map(async collection => {
             log(`Fetching ${collection.name} ...`);
             localConfig.addCollection({
                 ...collection,
                 '$createdAt': undefined,
-                '$updatedAt': undefined,
+                '$updatedAt': undefined
             });
         });
+
     }
 
     success();
@@ -264,7 +251,6 @@ pull
 pull
     .command("collection")
     .description("Pulling your {{ spec.title|caseUcfirst }} collections")
-    .option(`--databaseId <databaseId>`, `Database ID`)
     .action(actionRunner(pullCollection))
 
 pull

templates/cli/lib/paginate.js.twig

@@ -5,11 +5,15 @@ const paginate = async (action, args = {}, limit = 100, wrapper = '') => {
 
     while (true) {
         const offset = pageNumber * limit;
-
+        const additionalQueries = [];
+        if (args.queries) {
+            additionalQueries.push(...args.queries);
+        }
         // Merge the limit and offset into the args
         const response = await action({
             ...args,
             queries: [
+                ...additionalQueries,
                 JSON.stringify({ method: 'limit', values: [limit] }),
                 JSON.stringify({ method: 'offset', values: [offset] })
             ]
@@ -48,4 +52,4 @@ const paginate = async (action, args = {}, limit = 100, wrapper = '') => {
 
 module.exports = {
     paginate
-};
+};

templates/cli/lib/parser.js.twig

@@ -2,13 +2,17 @@ const chalk = require('chalk');
 const commander = require('commander');
 const Table = require('cli-table3');
 const { description } = require('../package.json');
+const { globalConfig } = require("./config.js");
+const os = require('os');
 
 const cliConfig = {
-  verbose: false,
-  json: false,
-  force: false,
-  all: false,
-  ids: []
+    verbose: false,
+    json: false,
+    force: false,
+    all: false,
+    ids: [],
+    report: false,
+    reportData: {}
 };
 
 const parse = (data) => {
@@ -113,17 +117,50 @@ const drawJSON = (data) => {
 }
 
 const parseError = (err) => {
-    if(cliConfig.verbose) {
-        console.error(err);
-    }
+    if (cliConfig.report) {
+        (async () => {
+            let appwriteVersion = 'unknown';
+            const isCloud = globalConfig.getEndpoint().includes('cloud.appwrite.io') ? 'Yes' : 'No';
+
+            try {
+                const res = await fetch(`${globalConfig.getEndpoint()}/health/version`);
+                const json = await res.json();
+                appwriteVersion = json.version;
+            } catch {
+            }
+
+            const version = '0.16.0';
+            const stepsToReproduce = encodeURIComponent(`Running \`appwrite ${cliConfig.reportData.data.args}\``);
+            const yourEnvironment = encodeURI(`CLI version: ${version}\nOperation System: ${os.type()}\nAppwrite version: ${appwriteVersion}\nIs Cloud: ${isCloud}`)
 
-    error(err.message);
+            const stack = encodeURIComponent('```\n' + err.stack + '\n```').replaceAll('(', '').replaceAll(')', '');
+
+            const githubIssueUrl = `https://github.com/appwrite/appwrite/issues/new?labels=bug&template=bug.yaml&title=%F0%9F%90%9B+Bug+Report%3A+CLI+error:+${encodeURI(err.message)}&actual-behavior=CLI%20Error:%0A${stack}&steps-to-reproduce=${stepsToReproduce}&environment=${yourEnvironment}`;
+
+            log(`To report this error you can:\n - Create a support ticket in our Discord server https://appwrite.io/discord \n - Create an issue in our Github\n   ${githubIssueUrl}\n`);
+
+            process.exit(1);
+        })()
+    }
+    else {
+        if (cliConfig.verbose) {
+            console.error(err);
+        } else {
+            error(err.message);
+        }
+        process.exit(1);
+    }
 
-    process.exit(1)
 }
 
 const actionRunner = (fn) => {
-    return (...args) => fn(...args).catch(parseError);
+    return (...args) => {
+        if (cliConfig.all && (Array.isArray(cliConfig.ids) && cliConfig.ids.length !== 0)) {
+            error(`The '--all' and '--id' flags cannot be used together.`);
+            process.exit(1);
+        }
+        return fn(...args).catch(parseError)
+    };
 }
 
 const parseInteger = (value) => {