appwrite-cli 6.0.0-rc.5 → 6.0.0-rc.7

package/lib/parser.js

@@ -120,7 +120,7 @@ const parseError = (err) => {
             } catch {
             }
 
-            const version = '6.0.0-rc.5';
+            const version = '6.0.0-rc.7';
             const stepsToReproduce = `Running \`appwrite ${cliConfig.reportData.data.args.join(' ')}\``;
             const yourEnvironment = `CLI version: ${version}\nOperation System: ${os.type()}\nAppwrite version: ${appwriteVersion}\nIs Cloud: ${isCloud}`;
 
@@ -203,29 +203,26 @@ 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.`,
-    "init": `The init command provides a convenient wrapper for creating and initializing project, functions, collections, buckets, teams and messaging in Appwrite.`,
-    "push": `The push command provides a convenient wrapper for pushing your functions, collections, buckets, teams and messaging.`,
-    "run": `The run command allows you to run project locally to allow easy development and quick debugging.`,
-    "functions": `The functions command allows you view, create and manage your Cloud Functions.`,
+    "databases": `The databases command allows you to create structured collections of documents and query and filter lists of documents.`,
+    "init": `The init command provides a convenient wrapper for creating and initializing projects, functions, collections, buckets, teams, and messaging-topics in  Appwrite.`,
+    "push": `The push command provides a convenient wrapper for pushing your functions, collections, buckets, teams, and messaging-topics.`,
+    "run": `The run command allows you to run the project locally to allow easy development and quick debugging.`,
+    "functions": `The functions command allows you to view, create, and manage your Cloud Functions.`,
     "health": `The health command allows you to both validate and monitor your Appwrite server's health.`,
-    "pull": `The pull command helps you pull your Appwrite project, functions, collections, buckets, teams and messaging`,
+    "pull": `The pull command helps you pull your Appwrite project, functions, collections, buckets, teams, and messaging-topics`,
     "locale": `The locale command allows you to customize your app based on your users' location.`,
-    "projects": `The projects command allows you to view, create and manage your Appwrite projects.`,
     "storage": `The storage command allows you to manage your project files.`,
-    "teams": `The teams command allows you to group users of your project and to enable them to share read and write access to your project resources`,
+    "teams": `The teams command allows you to group users of your project to enable them to share read and write access to your project resources.`,
     "users": `The users command allows you to manage your project users.`,
     "client": `The client command allows you to configure your CLI`,
     "login": `The login command allows you to authenticate and manage a user account.`,
-    "logout": `The logout command allows you to logout of your Appwrite account.`,
-    "whoami": `The whoami command gives information about the currently signed in user.`,
+    "logout": `The logout command allows you to log out of your Appwrite account.`,
+    "whoami": `The whomai command gives information about the currently logged-in user.`,
     "register": `Outputs the link to create an Appwrite account.`,
-    "console" : `The console command allows gives you access to the APIs used by the Appwrite console.`,
+    "console" : `The console command gives you access to the APIs used by the Appwrite Console.`,
     "assistant": `The assistant command allows you to interact with the Appwrite Assistant AI`,
-    "messaging": `The messaging command allows you to send messages.`,
+    "messaging": `The messaging command allows you to manage topics and targets and send messages.`,
     "migrations": `The migrations command allows you to migrate data between services.`,
-    "project": `The project command is for overall project administration.`,
-    "proxy": `The proxy command allows you to configure behavior for your attached domains.`,
     "vcs": `The vcs command allows you to interact with VCS providers and manage your code repositories.`,
     "main": chalk.redBright(`${logo}${description}`),
 }

package/lib/questions.js

@@ -189,11 +189,11 @@ const questionsInitProject = [
         message: "Choose your Appwrite project.",
         choices: async (answers) => {
             const queries = [
-                JSON.stringify({ method: 'equal', attribute: 'teamId', values: [answers.organization.id] }),
-                JSON.stringify({ method: 'orderDesc', attribute: 'Id' })
+                JSON.stringify({ method: 'equal', attribute: 'teamId', values: [answers.organization] }),
+                JSON.stringify({ method: 'orderDesc', attribute: '$id' })
             ]
 
-            const { projects } = await paginate(projectsList, { parseOutput: false, queries, }, 100, 'projects');
+            const { projects } = await paginate(projectsList, { parseOutput: false }, 100, 'projects', queries);
 
             let choices = projects.map((project) => {
                 return {
@@ -301,22 +301,7 @@ const questionsCreateFunction = [
             })
             return choices;
         },
-    },
-    {
-        type: "list",
-        name: "template",
-        message: "How would you like to start your function code?",
-        choices: [
-            {
-                name: `Start from scratch ${chalk.blackBright(`(starter)`)}`,
-                value: "starter"
-            },
-            {
-                name: "Pick a template",
-                value: "custom"
-            }
-        ]
-    },
+    }
 ];
 
 const questionsCreateFunctionSelectTemplate = (templates) => {
@@ -646,11 +631,6 @@ const questionsPushFunctions = [
             return choices;
         }
     },
-    {
-        type: "input",
-        name: "override",
-        message: 'Are you sure you want to override this function\'s variables? This can lead to loss of secrets! Type "YES" to confirm.'
-    },
 ]
 
 const questionsPushCollections = [
@@ -678,7 +658,15 @@ const questionPushChanges = [
     {
         type: "input",
         name: "changes",
-        message: `Would you like to apply these changes? Type "YES" to confirm.`
+        message: `Are you sure you want to apply these changes? (YES/NO)`
+    }
+];
+
+const questionPushChangesConfirmation = [
+    {
+        type: "input",
+        name: "changes",
+        message: `Please type 'YES' or 'NO':`
     }
 ];
 
@@ -708,6 +696,7 @@ const questionsPushMessagingTopics = [
         type: "checkbox",
         name: "topics",
         message: "Which messaging topic would you like to push?",
+        validate: (value) => validateRequired('topics', value),
         when: () => localConfig.getMessagingTopics().length > 0,
         choices: () => {
             let topics = localConfig.getMessagingTopics();
@@ -719,11 +708,6 @@ const questionsPushMessagingTopics = [
                 }
             });
         }
-    },
-    {
-        type: "input",
-        name: "override",
-        message: 'Would you like to override existing topics? This can lead to loss of data! Type "YES" to confirm.'
     }
 ]
 
@@ -862,5 +846,6 @@ module.exports = {
     questionGetEndpoint,
     questionsInitResources,
     questionsCreateTeam,
-    questionPushChanges
+    questionPushChanges,
+    questionPushChangesConfirmation
 };

package/package.json

@@ -2,7 +2,7 @@
   "name": "appwrite-cli",
   "homepage": "https://appwrite.io/support",
   "description": "Appwrite is an open-source self-hosted backend server that abstract and simplify complex and repetitive development tasks behind a very simple REST API",
-  "version": "6.0.0-rc.5",
+  "version": "6.0.0-rc.7",
   "license": "BSD-3-Clause",
   "main": "index.js",
   "bin": {
@@ -34,7 +34,8 @@
     "tar": "^6.1.11",
     "ignore": "^5.2.0",
     "chokidar": "^3.6.0",
-    "tail": "^2.2.6"
+    "tail": "^2.2.6",
+    "dotenv": "^16.4.5"
   },
   "devDependencies": {
     "pkg": "5.8.1"

package/scoop/appwrite.json

@@ -1,12 +1,12 @@
 {
 	"$schema": "https://raw.githubusercontent.com/ScoopInstaller/Scoop/master/schema.json",
-	"version": "6.0.0-rc.5",
+	"version": "6.0.0-rc.7",
 	"description": "The Appwrite CLI is a command-line application that allows you to interact with Appwrite and perform server-side tasks using your terminal.",
 	"homepage": "https://github.com/appwrite/sdk-for-cli",
 	"license": "BSD-3-Clause",
 	"architecture": {
 		"64bit": {
-			"url": "https://github.com/appwrite/sdk-for-cli/releases/download/6.0.0-rc.5/appwrite-cli-win-x64.exe",
+			"url": "https://github.com/appwrite/sdk-for-cli/releases/download/6.0.0-rc.7/appwrite-cli-win-x64.exe",
 			"bin": [
 				[
 					"appwrite-cli-win-x64.exe",
@@ -15,7 +15,7 @@
 			]
 		},
 		"arm64": {
-			"url": "https://github.com/appwrite/sdk-for-cli/releases/download/6.0.0-rc.5/appwrite-cli-win-arm64.exe",
+			"url": "https://github.com/appwrite/sdk-for-cli/releases/download/6.0.0-rc.7/appwrite-cli-win-arm64.exe",
 			"bin": [
 				[
 					"appwrite-cli-win-arm64.exe",