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

package/README.md

@@ -29,7 +29,7 @@ Once the installation is complete, you can verify the install using
 
 ```sh
 $ appwrite -v
-6.0.0-rc.1
+6.0.0-rc.2
 ```
 
 ### Install using prebuilt binaries
@@ -60,7 +60,7 @@ $ scoop install https://raw.githubusercontent.com/appwrite/sdk-for-cli/master/sc
 Once the installation completes, you can verify your install using
 ```
 $ appwrite -v
-6.0.0-rc.1
+6.0.0-rc.2
 ```
 
 ## Getting Started 

package/index.js

@@ -15,7 +15,7 @@ const { login, logout, whoami, migrate, register } = require("./lib/commands/gen
 const { init } = require("./lib/commands/init");
 const { pull } = require("./lib/commands/pull");
 const { run } = require("./lib/commands/run");
-const { push } = require("./lib/commands/push");
+const { push, deploy } = require("./lib/commands/push");
 const { account } = require("./lib/commands/account");
 const { avatars } = require("./lib/commands/avatars");
 const { assistant } = require("./lib/commands/assistant");
@@ -77,6 +77,7 @@ program
   .addCommand(init)
   .addCommand(pull)
   .addCommand(push)
+  .addCommand(deploy)
   .addCommand(run)
   .addCommand(logout)
   .addCommand(account)

package/install.ps1

@@ -13,8 +13,8 @@
 # You can use "View source" of this page to see the full script.
 
 # REPO
-$GITHUB_x64_URL = "https://github.com/appwrite/sdk-for-cli/releases/download/6.0.0-rc.1/appwrite-cli-win-x64.exe"
-$GITHUB_arm64_URL = "https://github.com/appwrite/sdk-for-cli/releases/download/6.0.0-rc.1/appwrite-cli-win-arm64.exe"
+$GITHUB_x64_URL = "https://github.com/appwrite/sdk-for-cli/releases/download/6.0.0-rc.2/appwrite-cli-win-x64.exe"
+$GITHUB_arm64_URL = "https://github.com/appwrite/sdk-for-cli/releases/download/6.0.0-rc.2/appwrite-cli-win-arm64.exe"
 
 $APPWRITE_BINARY_NAME = "appwrite.exe"
 

package/install.sh

@@ -97,7 +97,7 @@ printSuccess() {
 downloadBinary() {
     echo "[2/4] Downloading executable for $OS ($ARCH) ..."
 
-    GITHUB_LATEST_VERSION="6.0.0-rc.1"
+    GITHUB_LATEST_VERSION="6.0.0-rc.2"
     GITHUB_FILE="appwrite-cli-${OS}-${ARCH}"
     GITHUB_URL="https://github.com/$GITHUB_REPOSITORY_NAME/releases/download/$GITHUB_LATEST_VERSION/$GITHUB_FILE"
 

package/lib/client.js

@@ -16,8 +16,8 @@ class Client {
       'x-sdk-name': 'Command Line',
       'x-sdk-platform': 'console',
       'x-sdk-language': 'cli',
-      'x-sdk-version': '6.0.0-rc.1',
-      'user-agent' : `AppwriteCLI/6.0.0-rc.1 (${os.type()} ${os.version()}; ${os.arch()})`,
+      'x-sdk-version': '6.0.0-rc.2',
+      'user-agent' : `AppwriteCLI/6.0.0-rc.2 (${os.type()} ${os.version()}; ${os.arch()})`,
       'X-Appwrite-Response-Format' : '1.5.0',
     };
   }

package/lib/commands/generic.js

@@ -3,7 +3,7 @@ const { Command } = require("commander");
 const Client = require("../client");
 const { sdkForConsole } = require("../sdks");
 const { globalConfig, localConfig } = require("../config");
-const { actionRunner, success, parseBool, commandDescriptions, error, parse, log, drawTable, cliConfig } = require("../parser");
+const { actionRunner, success, parseBool, commandDescriptions, error, parse, hint, log, drawTable, cliConfig } = require("../parser");
 const ID = require("../id");
 const { questionsLogin, questionsLogout, questionsListFactors, questionsMfaChallenge } = require("../questions");
 const {  accountUpdateMfaChallenge, accountCreateMfaChallenge, accountGet, accountCreateEmailPasswordSession, accountDeleteSession } = require("./account");
@@ -14,8 +14,20 @@ const loginCommand = async ({ email, password, endpoint, mfa, code }) => {
     const oldCurrent = globalConfig.getCurrentSession();
     let configEndpoint = endpoint ?? DEFAULT_ENDPOINT;
 
+    if(globalConfig.getCurrentSession() !== '') {
+        log('You are currently signed in as ' + globalConfig.getEmail());
+
+        if(globalConfig.getSessions().length === 1) {
+            hint('You can sign in and manage multiple accounts with Appwrite CLI');
+        }
+    }
+
     const answers = email && password ? { email, password } : await inquirer.prompt(questionsLogin);
 
+    if(!answers.method) {
+        answers.method = 'login';
+    }
+
     if (answers.method === 'select') {
         const accountId = answers.accountId;
 
@@ -87,15 +99,15 @@ const loginCommand = async ({ email, password, endpoint, mfa, code }) => {
         }
     }
 
-    success("Signed in as user with ID: " + account.$id);
-    log("Next you can create or link to your project using 'appwrite init project'");
+    success("Successfully signed in as " + account.email);
+    hint("Next you can create or link to your project using 'appwrite init project'");
 };
 
 const whoami = new Command("whoami")
     .description(commandDescriptions['whoami'])
     .action(actionRunner(async () => {
         if (globalConfig.getEndpoint() === '' || globalConfig.getCookie() === '') {
-            error("No user is signed in. To sign in, run: appwrite login ");
+            error("No user is signed in. To sign in, run 'appwrite login'");
             return;
         }
 
@@ -109,7 +121,7 @@ const whoami = new Command("whoami")
                 parseOutput: false
             });
         } catch (error) {
-            error("No user is signed in. To sign in, run: appwrite login");
+            error("No user is signed in. To sign in, run 'appwrite login'");
             return;
         }
 

package/lib/commands/init.js

@@ -9,6 +9,7 @@ const { storageCreateBucket } = require("./storage");
 const { messagingCreateTopic } = require("./messaging");
 const { functionsCreate } = require("./functions");
 const { databasesCreateCollection } = require("./databases");
+const { pullResources } = require("./pull");
 const ID = require("../id");
 const { localConfig, globalConfig } = require("../config");
 const {
@@ -18,10 +19,11 @@ const {
     questionsCreateMessagingTopic,
     questionsCreateCollection,
     questionsInitProject,
+    questionsInitProjectAutopull,
     questionsInitResources,
     questionsCreateTeam
 } = require("../questions");
-const { success, log, error, actionRunner, commandDescriptions } = require("../parser");
+const { cliConfig, success, log, hint, error, actionRunner, commandDescriptions } = require("../parser");
 const { accountGet } = require("./account");
 const { sdkForConsole } = require("../sdks");
 
@@ -56,7 +58,7 @@ const initProject = async ({ organizationId, projectId, projectName } = {}) => {
             sdk: client
         });
     } catch (e) {
-        error('Error Session not found. Please run `appwrite login` to create a session');
+        error("Error Session not found. Please run 'appwrite login' to create a session");
         process.exit(1);
     }
 
@@ -104,11 +106,17 @@ const initProject = async ({ organizationId, projectId, projectName } = {}) => {
 
     success(`Project successfully ${answers.start === 'existing' ? 'linked' : 'created'}. Details are now stored in appwrite.json file.`);
 
-    log("Next you can use 'appwrite init' to create resources in your project, or use 'appwrite pull' and 'appwite push' to synchronize your project.")
-
     if(answers.start === 'existing') {
-        log("Since you connected to an existing project, we highly recommend to run 'appwrite pull all' to synchronize all of your existing resources.");
+        answers = await inquirer.prompt(questionsInitProjectAutopull);
+        if(answers.autopull) {
+            cliConfig.all = true;
+            await pullResources();
+        } else {
+            log("You can run 'appwrite pull all' to synchronize all of your existing resources.");
+        }
     }
+
+    hint("Next you can use 'appwrite init' to create resources in your project, or use 'appwrite pull' and 'appwrite push' to synchronize your project.")
 }
 
 const initBucket = async () => {
@@ -210,22 +218,24 @@ const initFunction = async () => {
         log(`Installation command for this runtime not found. You will be asked to configure the install command when you first push the function.`);
     }
 
-
     fs.mkdirSync(functionDir, "777");
     fs.mkdirSync(templatesDir, "777");
     const repo = "https://github.com/appwrite/templates";
     const api = `https://api.github.com/repos/appwrite/templates/contents/${answers.runtime.name}`
-    const templates = ['starter'];
     let selected = undefined;
 
-    try {
-        const res = await fetch(api);
-        templates.push(...(await res.json()).map((template) => template.name));
-
-        selected = await inquirer.prompt(questionsCreateFunctionSelectTemplate(templates))
-    } catch {
-        // Not a problem will go with directory pulling
-        log('Loading templates...');
+    if(answers.template === 'starter') {
+        selected = { template: 'starter' };
+    } else {
+        try {
+            const res = await fetch(api);
+            const templates = [];
+            templates.push(...(await res.json()).map((template) => template.name));
+            selected = await inquirer.prompt(questionsCreateFunctionSelectTemplate(templates));
+        } catch {
+            // Not a problem will go with directory pulling
+            log('Loading templates...');
+        }
     }
 
     const sparse = (selected ? `${answers.runtime.name}/${selected.template}` : answers.runtime.name).toLowerCase();
@@ -257,6 +267,7 @@ const initFunction = async () => {
 
     fs.rmSync(path.join(templatesDir, ".git"), { recursive: true });
     if (!selected) {
+        const templates = [];
         templates.push(...fs.readdirSync(runtimeDir, { withFileTypes: true })
             .filter(item => item.isDirectory() && item.name !== 'starter')
             .map(dirent => dirent.name));

package/lib/commands/pull.js

@@ -1,4 +1,5 @@
 const fs = require("fs");
+const chalk = require('chalk');
 const tar = require("tar");
 const { Command } = require("commander");
 const inquirer = require("inquirer");
@@ -11,11 +12,11 @@ const { storageListBuckets } = require("./storage");
 const { localConfig } = require("../config");
 const { paginate } = require("../paginate");
 const { questionsPullCollection, questionsPullFunctions, questionsPullResources } = require("../questions");
-const { cliConfig, success, log, actionRunner, commandDescriptions } = require("../parser");
+const { cliConfig, success, log, warn, actionRunner, commandDescriptions } = require("../parser");
 
 const pullResources = async () => {
     const actions = {
-        project: pullProject,
+        settings: pullSettings,
         functions: pullFunctions,
         collections: pullCollection,
         buckets: pullBucket,
@@ -25,6 +26,7 @@ const pullResources = async () => {
 
     if (cliConfig.all) {
         for (let action of Object.values(actions)) {
+            cliConfig.all = true;
             await action();
         }
     } else {
@@ -37,75 +39,94 @@ const pullResources = async () => {
     }
 };
 
-const pullProject = async () => {
+const pullSettings = async () => {
+    log("Pulling project settings ...");
+
     try {
         let response = await projectsGet({
             parseOutput: false,
             projectId: localConfig.getProject().projectId
-
-        })
+        });
 
         localConfig.setProject(response.$id, response.name, response);
 
-        success();
+        success(`Successfully pulled ${chalk.bold('all')} project settings.`);
     } catch (e) {
         throw e;
     }
 }
 
 const pullFunctions = async () => {
-    const localFunctions = localConfig.getFunctions();
+    log("Fetching functions ...");
+    let total = 0;
+
+    const fetchResponse = await functionsList({
+        queries: [JSON.stringify({ method: 'limit', values: [1] })],
+        parseOutput: false
+    });
+    if (fetchResponse["functions"].length <= 0) {
+        log("No functions found.");
+        success(`Successfully pulled ${chalk.bold(total)} functions.`);
+        return;
+    }
 
     const functions = cliConfig.all
         ? (await paginate(functionsList, { parseOutput: false }, 100, 'functions')).functions
         : (await inquirer.prompt(questionsPullFunctions)).functions;
 
-    log(`Pulling ${functions.length} functions`);
-
     for (let func of functions) {
-        const functionExistLocally = localFunctions.find((localFunc) => localFunc['$id'] === func['$id']) !== undefined;
+        total++;
+        log(`Pulling function ${chalk.bold(func['name'])} ...`);
 
-        if (functionExistLocally) {
-            localConfig.updateFunction(func['$id'], func);
-        } else {
-            func['path'] = `functions/${func['$id']}`;
-            localConfig.addFunction(func);
-            localFunctions.push(func);
+        const localFunction = localConfig.getFunction(func.$id);
+        if(!localFunction['path']) {
+            func['path'] = `functions/${func.$id}`;
         }
 
-        const localFunction = localFunctions.find((localFunc) => localFunc['$id'] === func['$id']);
+        localConfig.addFunction(func);
 
-        if (localFunction['deployment'] === '') {
-            continue
+        if (!fs.existsSync(func['path'])) {
+            fs.mkdirSync(func['path'], { recursive: true });
         }
 
-        const compressedFileName = `${func['$id']}-${+new Date()}.tar.gz`
+        if(func['deployment']) {
+            const compressedFileName = `${func['$id']}-${+new Date()}.tar.gz`
+            await functionsDownloadDeployment({
+                functionId: func['$id'],
+                deploymentId: func['deployment'],
+                destination: compressedFileName,
+                overrideForCli: true,
+                parseOutput: false
+            });
 
-        await functionsDownloadDeployment({
-            functionId: func['$id'],
-            deploymentId: func['deployment'],
-            destination: compressedFileName,
-            overrideForCli: true,
-            parseOutput: false
-        })
+            tar.extract({
+                sync: true,
+                cwd: func['path'],
+                file: compressedFileName,
+                strict: false,
+            });
 
-        if (!fs.existsSync(localFunction['path'])) {
-            fs.mkdirSync(localFunction['path'], { recursive: true });
+            fs.rmSync(compressedFileName);
         }
-
-        tar.extract({
-            sync: true,
-            cwd: localFunction['path'],
-            file: compressedFileName,
-            strict: false,
-        });
-
-        fs.rmSync(compressedFileName);
-        success(`Pulled ${func['name']} code and settings`)
     }
+    
+    success(`Successfully pulled ${chalk.bold(total)} functions.`);
 }
 
 const pullCollection = async () => {
+    log("Fetching collections ...");
+    let total = 0;
+
+    const fetchResponse = await databasesList({
+        queries: [JSON.stringify({ method: 'limit', values: [1] })],
+        parseOutput: false
+    });
+    if (fetchResponse["databases"].length <= 0) {
+        log("No collections found.");
+        success(`Successfully pulled ${chalk.bold(total)} collections.`);
+        return;
+    }
+
     let databases = cliConfig.ids;
 
     if (databases.length === 0) {
@@ -122,61 +143,101 @@ const pullCollection = async () => {
             parseOutput: false
         });
 
+        total++;
+        log(`Pulling all collections from ${chalk.bold(database['name'])} database ...`);
+
         localConfig.addDatabase(database);
 
-        const { collections, total } = await paginate(databasesListCollections, {
+        const { collections } = await paginate(databasesListCollections, {
             databaseId,
             parseOutput: false
         }, 100, 'collections');
 
-        log(`Found ${total} collections`);
-
-        collections.map(async collection => {
-            log(`Fetching ${collection.name} ...`);
+        for(const collection of collections) {
             localConfig.addCollection({
                 ...collection,
                 '$createdAt': undefined,
                 '$updatedAt': undefined
             });
-        });
+        }
     }
 
-    success();
+    success(`Successfully pulled ${chalk.bold(total)} collections.`);
 }
 
 const pullBucket = async () => {
-    const { buckets } = await paginate(storageListBuckets, { parseOutput: false }, 100, 'buckets');
+    log("Fetching buckets ...");
+    let total = 0;
 
-    log(`Found ${buckets.length} buckets`);
+    const fetchResponse = await storageListBuckets({
+        queries: [JSON.stringify({ method: 'limit', values: [1] })],
+        parseOutput: false
+    });
+    if (fetchResponse["buckets"].length <= 0) {
+        log("No buckets found.");
+        success(`Successfully pulled ${chalk.bold(total)} buckets.`);
+        return;
+    }
 
-    buckets.forEach(bucket => localConfig.addBucket(bucket));
+    const { buckets } = await paginate(storageListBuckets, { parseOutput: false }, 100, 'buckets');
 
-    success();
+    for(const bucket of buckets) {
+        total++;
+        log(`Pulling bucket ${chalk.bold(bucket['name'])} ...`);
+        localConfig.addBucket(bucket);
+    }
+
+    success(`Successfully pulled ${chalk.bold(total)} buckets.`);
 }
 
 const pullTeam = async () => {
-    const { teams } = await paginate(teamsList, { parseOutput: false }, 100, 'teams');
-
-    log(`Found ${teams.length} teams`);
+    log("Fetching teams ...");
+    let total = 0;
 
-    teams.forEach(team => {
-        const { total, $updatedAt, $createdAt, prefs, ...rest } = team;
-        localConfig.addTeam(rest);
+    const fetchResponse = await teamsList({
+        queries: [JSON.stringify({ method: 'limit', values: [1] })],
+        parseOutput: false
     });
+    if (fetchResponse["teams"].length <= 0) {
+        log("No teams found.");
+        success(`Successfully pulled ${chalk.bold(total)} teams.`);
+        return;
+    }
 
-    success();
+    const { teams } = await paginate(teamsList, { parseOutput: false }, 100, 'teams');
+
+    for(const team of teams) {
+        total++;
+        log(`Pulling team ${chalk.bold(team['name'])} ...`);
+        localConfig.addTeam(team);
+    }
+
+    success(`Successfully pulled ${chalk.bold(total)} teams.`);
 }
 
 const pullMessagingTopic = async () => {
-    const { topics } = await paginate(messagingListTopics, { parseOutput: false }, 100, 'topics');
+    log("Fetching topics ...");
+    let total = 0;
+
+    const fetchResponse = await messagingListTopics({
+        queries: [JSON.stringify({ method: 'limit', values: [1] })],
+        parseOutput: false
+    });
+    if (fetchResponse["topics"].length <= 0) {
+        log("No topics found.");
+        success(`Successfully pulled ${chalk.bold(total)} topics.`);
+        return;
+    }
 
-    log(`Found ${topics.length} topics`);
+    const { topics } = await paginate(messagingListTopics, { parseOutput: false }, 100, 'topics');
 
-    topics.forEach(topic => {
+    for(const topic of topics) {
+        total++;
+        log(`Pulling topic ${chalk.bold(topic['name'])} ...`);
         localConfig.addMessagingTopic(topic);
-    });
+    }
 
-    success();
+    success(`Successfully pulled ${chalk.bold(total)} topics.`);
 }
 
 const pull = new Command("pull")
@@ -192,9 +253,9 @@ pull
     }));
 
 pull
-    .command("project")
+    .command("settings")
     .description("Pull your Appwrite project name, services and auth settings")
-    .action(actionRunner(pullProject));
+    .action(actionRunner(pullSettings));
 
 pull
     .command("function")
@@ -228,4 +289,5 @@ pull
 
 module.exports = {
     pull,
+    pullResources
 };