appwrite-cli 6.0.0-rc.1 → 6.0.0-rc.3

package/lib/parser.js

@@ -131,7 +131,7 @@ const parseError = (err) => {
             } catch {
             }
 
-            const version = '6.0.0-rc.1';
+            const version = '6.0.0-rc.3';
             const stepsToReproduce = `Running \`appwrite ${cliConfig.reportData.data.args.join(' ')}\``;
             const yourEnvironment = `CLI version: ${version}\nOperation System: ${os.type()}\nAppwrite version: ${appwriteVersion}\nIs Cloud: ${isCloud}`;
 
@@ -189,15 +189,23 @@ const parseBool = (value) => {
 }
 
 const log = (message) => {
-    console.log(`${chalk.cyan.bold("ℹ Info")} ${chalk.cyan(message ?? "")}`);
+    console.log(`${chalk.cyan.bold("ℹ Info:")} ${chalk.cyan(message ?? "")}`);
+}
+
+const warn = (message) => {
+    console.log(`${chalk.yellow.bold("ℹ Warning:")} ${chalk.yellow(message ?? "")}`);
+}
+
+const hint = (message) => {
+    console.log(`${chalk.cyan.bold("♥ Hint:")} ${chalk.cyan(message ?? "")}`);
 }
 
 const success = (message) => {
-    console.log(`${chalk.green.bold("✓ Success")} ${chalk.green(message ?? "")}`);
+    console.log(`${chalk.green.bold("✓ Success:")} ${chalk.green(message ?? "")}`);
 }
 
 const error = (message) => {
-    console.error(`${chalk.red.bold("✗ Error")} ${chalk.red(message ?? "")}`);
+    console.error(`${chalk.red.bold("✗ Error:")} ${chalk.red(message ?? "")}`);
 }
 
 const logo = "\n    _                            _ _           ___   __   _____\n   \/_\\  _ __  _ ____      ___ __(_) |_ ___    \/ __\\ \/ \/   \\_   \\\n  \/\/_\\\\| '_ \\| '_ \\ \\ \/\\ \/ \/ '__| | __\/ _ \\  \/ \/   \/ \/     \/ \/\\\/\n \/  _  \\ |_) | |_) \\ V  V \/| |  | | ||  __\/ \/ \/___\/ \/___\/\\\/ \/_\n \\_\/ \\_\/ .__\/| .__\/ \\_\/\\_\/ |_|  |_|\\__\\___| \\____\/\\____\/\\____\/\n       |_|   |_|\n\n";
@@ -221,8 +229,8 @@ const commandDescriptions = {
     "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 logged in user.`,
-    "register": `Outputs the link to create an Appwrite account..`,
+    "whoami": `The whoami command gives information about the currently signed 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.`,
     "assistant": `The assistant command allows you to interact with the Appwrite Assistant AI`,
     "messaging": `The messaging command allows you to send messages.`,
@@ -240,6 +248,8 @@ module.exports = {
     parseInteger,
     parseBool,
     log,
+    warn,
+    hint,
     success,
     error,
     commandDescriptions,

package/lib/questions.js

@@ -46,7 +46,7 @@ const getIgnores = (runtime) => {
             return ['.build', '.swiftpm'];
     }
 
-    return undefined;
+    return [];
 };
 
 const getEntrypoint = (runtime) => {
@@ -80,6 +80,8 @@ const getEntrypoint = (runtime) => {
             return 'src/Main.java';
         case 'kotlin':
             return 'src/Main.kt';
+        case 'go':
+            return 'main.go';
     }
 
     return undefined;
@@ -209,18 +211,26 @@ const questionsInitProject = [
         when: (answer) => answer.start === 'existing'
     }
 ];
+const questionsInitProjectAutopull = [
+    {
+        type: "confirm",
+        name: "autopull",
+        message:
+            `Would you like to pull all resources from project you just linked?`
+    },
+];
 const questionsPullResources = [
     {
         type: "list",
         name: "resource",
         message: "Which resources would you like to pull?",
         choices: [
-            { name: 'Project', value: 'project' },
-            { name: 'Functions', value: 'functions' },
-            { name: 'Collections', value: 'collections' },
-            { name: 'Buckets', value: 'buckets' },
-            { name: 'Teams', value: 'teams' },
-            { name: 'Topics', value: 'messages' }
+            { name: `Settings ${chalk.blackBright(`(Project)`)}`, value: 'settings' },
+            { name: `Functions ${chalk.blackBright(`(Deployment)`)}`, value: 'functions' },
+            { name: `Collections ${chalk.blackBright(`(Databases)`)}`, value: 'collections' },
+            { name: `Buckets ${chalk.blackBright(`(Storage)`)}`, value: 'buckets' },
+            { name: `Teams ${chalk.blackBright(`(Auth)`)}`, value: 'teams' },
+            { name: `Topics ${chalk.blackBright(`(Messaging)`)}`, value: 'messages' }
         ]
     }
 ]
@@ -248,6 +258,14 @@ const questionsPullFunctions = [
     }
 ];
 
+const questionsPullFunctionsCode = [
+    {
+        type: "confirm",
+        name: "override",
+        message: "Do you want to pull source code of active deployment?"
+    },
+];
+
 const questionsCreateFunction = [
     {
         type: "input",
@@ -283,8 +301,23 @@ 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) => {
@@ -451,12 +484,12 @@ const questionsLogin = [
     {
         type: "list",
         name: "method",
-        message: "You're already logged in, what you like to do?",
+        message: "What you like to do?",
         choices: [
-            { name: 'Login to a different account', value: 'login' },
-            { name: 'Change to a different existed account', value: 'select' }
+            { name: 'Login to an account', value: 'login' },
+            { name: 'Switch to an account', value: 'select' }
         ],
-        when: () => globalConfig.getCurrentSession() !== ''
+        when: () => globalConfig.getSessions().length >= 2
     },
     {
         type: "input",
@@ -570,12 +603,12 @@ const questionsPushResources = [
         name: "resource",
         message: "Which resources would you like to push?",
         choices: [
-            { name: 'Project', value: 'project' },
-            { name: 'Functions', value: 'functions' },
-            { name: 'Collections', value: 'collections' },
-            { name: 'Buckets', value: 'buckets' },
-            { name: 'Teams', value: 'teams' },
-            { name: 'Topics', value: 'messages' }
+            { name: `Settings ${chalk.blackBright(`(Project)`)}`, value: 'settings' },
+            { name: `Functions ${chalk.blackBright(`(Deployment)`)}`, value: 'functions' },
+            { name: `Collections ${chalk.blackBright(`(Databases)`)}`, value: 'collections' },
+            { name: `Buckets ${chalk.blackBright(`(Storage)`)}`, value: 'buckets' },
+            { name: `Teams ${chalk.blackBright(`(Auth)`)}`, value: 'teams' },
+            { name: `Topics ${chalk.blackBright(`(Messaging)`)}`, value: 'messages' }
         ]
     }
 ];
@@ -605,7 +638,7 @@ const questionsPushFunctions = [
             let functions = localConfig.getFunctions();
             checkDeployConditions(localConfig)
             if (functions.length === 0) {
-                throw new Error("No functions found in the current directory Use 'appwrite pull functions' to synchronize existing one, or use 'appwrite init function' to create a new one.");
+                throw new Error("No functions found Use 'appwrite pull functions' to synchronize existing one, or use 'appwrite init function' to create a new one.");
             }
             let choices = functions.map((func, idx) => {
                 return {
@@ -794,7 +827,7 @@ const questionsRunFunctions = [
         choices: () => {
             let functions = localConfig.getFunctions();
             if (functions.length === 0) {
-                throw new Error("No functions found in the current directory. Use 'appwrite pull functions' to synchronize existing one, or use 'appwrite init function' to create a new one.");
+                throw new Error("No functions found. Use 'appwrite pull functions' to synchronize existing one, or use 'appwrite init function' to create a new one.");
             }
             let choices = functions.map((func, idx) => {
                 return {
@@ -809,12 +842,14 @@ const questionsRunFunctions = [
 
 module.exports = {
     questionsInitProject,
+    questionsInitProjectAutopull,
     questionsCreateFunction,
     questionsCreateFunctionSelectTemplate,
     questionsCreateBucket,
     questionsCreateCollection,
     questionsCreateMessagingTopic,
     questionsPullFunctions,
+    questionsPullFunctionsCode,
     questionsLogin,
     questionsPullResources,
     questionsLogout,

package/lib/sdks.js

@@ -1,44 +1,12 @@
-const inquirer = require("inquirer");
 const Client = require("./client");
 const { globalConfig, localConfig } = require("./config");
 
-const questionGetEndpoint = [
-  {
-    type: "input",
-    name: "endpoint",
-    message: "Enter the endpoint of your Appwrite server",
-    default: "http://localhost/v1",
-    async validate(value) {
-      if (!value) {
-        return "Please enter a valid endpoint.";
-      }
-      let client = new Client().setEndpoint(value);
-      try {
-        let response = await client.call('get', '/health/version');
-        if (response.version) {
-          return true;
-        } else {
-          throw new Error();
-        }
-      } catch (error) {
-        return "Invalid endpoint or your Appwrite server is not running as expected.";
-      }
-    }
-  }
-]
-
 const sdkForConsole = async (requiresAuth = true) => {
   let client = new Client();
   let endpoint = globalConfig.getEndpoint();
   let cookie = globalConfig.getCookie()
   let selfSigned = globalConfig.getSelfSigned()
 
-  if (!endpoint) {
-    const answers = await inquirer.prompt(questionGetEndpoint)
-    endpoint = answers.endpoint;
-    globalConfig.setEndpoint(endpoint);
-  }
-
   if (requiresAuth && cookie === "") {
     throw new Error("Session not found. Please run `appwrite login` to create a session");
   }
@@ -61,14 +29,8 @@ const sdkForProject = async () => {
   let cookie = globalConfig.getCookie()
   let selfSigned = globalConfig.getSelfSigned()
 
-  if (!endpoint) {
-    const answers = await inquirer.prompt(questionGetEndpoint)
-    endpoint = answers.endpoint;
-    globalConfig.setEndpoint(endpoint);
-  }
-
   if (!project) {
-    throw new Error("Project is not set. Please run `appwrite init` to initialize the current directory with an Appwrite project.");
+    throw new Error("Project is not set. Please run `appwrite init project` to initialize the current directory with an Appwrite project.");
   }
 
   client

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.1",
+  "version": "6.0.0-rc.3",
   "license": "BSD-3-Clause",
   "main": "index.js",
   "bin": {

package/scoop/appwrite.json

@@ -1,12 +1,12 @@
 {
 	"$schema": "https://raw.githubusercontent.com/ScoopInstaller/Scoop/master/schema.json",
-	"version": "6.0.0-rc.1",
+	"version": "6.0.0-rc.3",
 	"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.1/appwrite-cli-win-x64.exe",
+			"url": "https://github.com/appwrite/sdk-for-cli/releases/download/6.0.0-rc.3/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.1/appwrite-cli-win-arm64.exe",
+			"url": "https://github.com/appwrite/sdk-for-cli/releases/download/6.0.0-rc.3/appwrite-cli-win-arm64.exe",
 			"bin": [
 				[
 					"appwrite-cli-win-arm64.exe",