Improve CLI after 0.15

Author: Meldiron

composer.lock

@@ -183,7 +183,7 @@ function getSSLPage($url) {
         ->setTwitter('appwrite_io')
         ->setDiscord('564160730845151244', 'https://appwrite.io/discord')
         ->setDefaultHeaders([
-            'X-Appwrite-Response-Format' => '0.13.0',
+            'X-Appwrite-Response-Format' => '0.15.0',
         ])
     ;
 

example.php

@@ -6,22 +6,24 @@ const { questionsDeployFunctions, questionsGetEntrypoint, questionsDeployCollect
 const { actionRunner, success, log, error, commandDescriptions } = require("../parser");
 const { functionsGet, functionsCreate, functionsUpdate, functionsCreateDeployment, functionsUpdateDeployment } = require('./functions');
 const {
-    databaseCreateBooleanAttribute,
-    databaseGetCollection,
-    databaseCreateCollection,
-    databaseCreateStringAttribute,
-    databaseCreateIntegerAttribute,
-    databaseCreateFloatAttribute,
-    databaseCreateEmailAttribute,
-    databaseCreateIndex,
-    databaseCreateUrlAttribute,
-    databaseCreateIpAttribute,
-    databaseCreateEnumAttribute,
-    databaseDeleteAttribute,
-    databaseListAttributes,
-    databaseListIndexes,
-    databaseDeleteIndex
-} = require("./database");
+    databasesCreateBooleanAttribute,
+    databasesGetCollection,
+    databasesCreateCollection,
+    databasesCreateStringAttribute,
+    databasesCreateIntegerAttribute,
+    databasesCreateFloatAttribute,
+    databasesCreateEmailAttribute,
+    databasesCreateIndex,
+    databasesCreateUrlAttribute,
+    databasesCreateIpAttribute,
+    databasesCreateEnumAttribute,
+    databasesDeleteAttribute,
+    databasesListAttributes,
+    databasesListIndexes,
+    databasesDeleteIndex
+} = require("./databases");
+
+// TODO: Add databaseId everywhere
 
 const POOL_DEBOUNCE = 2000; // in milliseconds
 const POOL_MAX_DEBOUNCES = 30;
@@ -145,12 +147,34 @@ const deploy = new Command("deploy")
         await deployCollection()
     }));
 
-const deployFunction = async () => {
+const deployFunction = async ({ functionId, all } = {}) => {
     let response = {};
 
-    let answers = await inquirer.prompt(questionsDeployFunctions)
-    let functions = answers.functions.map((func) => JSONbig.parse(func))
+    const functionIds = [];
 
+    if(functionId) {
+        functionIds.push(functionId);
+    } else if(all) {
+        const functions = localConfig.getFunctions();
+        if (functions.length === 0) {
+            throw new Error("No functions found in the current directory.");
+        }
+        functionIds.push(...functions.map((func, idx) => {
+            return func.$id;
+        }));
+    }
+
+    if(functionIds.length <= 0) {
+        const answers = await inquirer.prompt(questionsDeployFunctions);
+        functionIds.push(...answers.functions);
+    }
+
+    let functions = functionIds.map((id) => {
+      const functions = localConfig.getFunctions();
+      const func = functions.find((f) => f.$id === id);
+      return JSONbig.stringify(func);
+    });
+    
     for (let func of functions) {
         log(`Deploying function ${func.name} ( ${func['$id']} )`)
 
@@ -466,6 +490,8 @@ const deployCollection = async () => {
 deploy
     .command("function")
     .description("Deploy functions in the current directory.")
+    .option(`--functionId <functionId>`, `Function ID`)
+    .option(`--all`, `Flag to deploy all functions`)
     .action(actionRunner(deployFunction));
 
 deploy

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

@@ -6,7 +6,7 @@ const { globalConfig, localConfig } = require("../config");
 const { actionRunner, success, parseBool, commandDescriptions, log, parse } = require("../parser");
 {% if sdk.test != "true" %}
 const { questionsLogin } = require("../questions");
-const { accountCreateSession, accountDeleteSession } = require("./account");
+const { accountCreateEmailSession, accountDeleteSession } = require("./account");
 
 const login = new Command("login")
     .description(commandDescriptions['login'])
@@ -15,7 +15,7 @@ const login = new Command("login")
 
         let client = await sdkForConsole(false);
 
-        await accountCreateSession({
+        await accountCreateEmailSession({
             email: answers.email,
             password: answers.password,
             parseOutput: false,

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

@@ -6,10 +6,10 @@ const inquirer = require("inquirer");
 const { teamsCreate } = require("./teams");
 const { projectsCreate } = require("./projects");
 const { functionsCreate } = require("./functions");
-const { databaseListCollections } = require("./database");
+const { databasesListCollections, databasesList } = require("./databases");
 const { sdkForConsole } = require("../sdks");
 const { localConfig } = require("../config");
-const { questionsInitProject, questionsInitFunction } = require("../questions");
+const { questionsInitProject, questionsInitFunction, questionsInitCollection } = require("../questions");
 const { success, log, actionRunner, commandDescriptions } = require("../parser");
 
 const init = new Command("init")
@@ -40,7 +40,7 @@ const initProject = async () => {
 
     let teamId = response['$id'];
     response = await projectsCreate({
-      projectId: 'unique()',
+      projectId: answers.id,
       name: answers.project,
       teamId,
       parseOutput: false
@@ -54,6 +54,7 @@ const initProject = async () => {
 }
 
 const initFunction = async () => {
+  // TODO: Add CI/CD support (ID, name, runtime)
   let answers = await inquirer.prompt(questionsInitFunction)
 
   if (fs.existsSync(path.join(process.cwd(), 'functions', answers.name))) {
@@ -65,7 +66,7 @@ const initFunction = async () => {
   }
 
   let response = await functionsCreate({
-    functionId: 'unique()',
+    functionId: answers.id,
     name: answers.name,
     runtime: answers.runtime.id,
     parseOutput: false
@@ -110,20 +111,43 @@ const initFunction = async () => {
   success();
 }
 
-const initCollection = async () => {
-  // TODO: Pagination?
-  let response = await databaseListCollections({
-    limit: 100,
-    parseOutput: false
-  })
+const initCollection = async ({ all, databaseId } = {}) => {
+  const databaseIds = [];
+
+  console.log(all);
 
-  let collections = response.collections;
-  log(`Found ${collections.length} collections`);
+  if(databaseId) {
+    databaseIds.push(databaseId);
+  } else if(all) {
+      let allDatabases = await databasesList({
+        parseOutput: false
+      })
+      console.log(allDatabases);
+      databaseIds.push(...allDatabases.databases);
+  }
+
+  if(databaseIds.length <= 0) {
+      let answers = await inquirer.prompt(questionsInitCollection)
+      if (!answers.databases) process.exit(1)
+      databaseIds.push(...answers.databases);
+  }
 
-  collections.forEach(async collection => {
-    log(`Fetching ${collection.name} ...`);
-    localConfig.addCollection(collection);
-  });
+  for(const databaseId of databaseIds) {
+    // TODO: Pagination?
+    let response = await databasesListCollections({
+      databaseId,
+      limit: 100,
+      parseOutput: false
+    })
+
+    let collections = response.collections;
+    log(`Found ${collections.length} collections`);
+
+    collections.forEach(async collection => {
+      log(`Fetching ${collection.name} ...`);
+      localConfig.addCollection(collection);
+    });
+  }
 
   success();
 }
@@ -141,6 +165,8 @@ init
 init
   .command("collection")
   .description("Initialise your {{ spec.title|caseUcfirst }} collections")
+  .option(`--databaseId <databaseId>`, `Database ID`)
+  .option(`--all`, `Flag to initialize all databases`)
   .action(actionRunner(initCollection))
 
 module.exports = {