feat(cli): Pulling function without questions, and review refactoring

Author: byawitz

templates/cli/index.js.twig

@@ -12,6 +12,7 @@ const { commandDescriptions, cliConfig } = require("./lib/parser");
 const { client } = require("./lib/commands/generic");
 {% if sdk.test != "true" %}
 const { login, logout, whoami } = require("./lib/commands/generic");
+const { init } = require("./lib/commands/init");
 const { pull } = require("./lib/commands/pull");
 const { push } = require("./lib/commands/push");
 {% endif %}

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

@@ -20,6 +20,7 @@ const {
 const { success, log, error, actionRunner, commandDescriptions } = require("../parser");
 const { accountGet } = require("./account");
 const { loginCommand } = require("./generic");
+const { sdkForConsole } = require("../sdks");
 
 const initProject = async () => {
     let response = {};
@@ -28,16 +29,19 @@ const initProject = async () => {
         if (globalConfig.getEndpoint() === '' || globalConfig.getCookie() === '') {
             throw '';
         }
+        const client = await sdkForConsole();
+
         await accountGet({
-            parseOutput: false
+            parseOutput: false,
+            sdk: client
         });
     } catch (e) {
         log('You must login first')
-        await loginCommand()
+        await loginCommand();
     }
 
     const answers = await inquirer.prompt(questionsInitProject)
-    if (!answers.project || !answers.organization) {
+    if (answers.override === false) {
         process.exit(1)
     }
 
@@ -60,7 +64,6 @@ const initProject = async () => {
 const initBucket = async () => {
     let response = {}
     const answers = await inquirer.prompt(questionsCreateBucket)
-    if (!answers.bucket || !answers.id || !answers.fileSecurity) process.exit(1)
 
     try {
         response = await storageCreateBucket({
@@ -81,7 +84,6 @@ const initBucket = async () => {
 const initCollection = async () => {
     let response = {}
     const answers = await inquirer.prompt(questionsCreateCollection)
-    if (!answers.database || !answers.collection || !answers.id || !answers.documentSecurity) process.exit(1)
 
     try {
         response = await databasesCreateCollection({
@@ -103,7 +105,6 @@ const initCollection = async () => {
 const initTopic = async () => {
     let response = {}
     const answers = await inquirer.prompt(questionsCreateMessagingTopic)
-    if (!answers.topic || !answers.id) process.exit(1)
 
     try {
         response = await messagingCreateTopic({
@@ -115,7 +116,7 @@ const initTopic = async () => {
         localConfig.addMessagingTopic(response);
         success();
     } catch (e) {
-        error(e.getMessage ?? 'Unknown error occurred. Please try again');
+        error(e.message ?? 'Unknown error occurred. Please try again');
     }
 };
 

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

@@ -4,7 +4,7 @@ const { Command } = require("commander");
 const inquirer = require("inquirer");
 const { messagingListTopics } = require("./messaging");
 const { teamsList } = require("./teams");
-const { projectsList } = require("./projects");
+const { projectsGet } = require("./projects");
 const { functionsList, functionsDownloadDeployment } = require("./functions");
 const { databasesGet, databasesListCollections, databasesList } = require("./databases");
 const { storageListBuckets } = require("./storage");
@@ -24,43 +24,31 @@ const pull = new Command("pull")
 
 const pullProject = async () => {
     try {
-        let response = await projectsList({
+        let response = await projectsGet({
             parseOutput: false,
-            queries: [JSON.stringify({ method: 'equal', attribute: '$id', values: [localConfig.getProject().projectId] })]
+            projectId: localConfig.getProject().projectId
 
         })
-        if(response.total === 1){
-            localConfig.setProject(response.projects[0].$id, response.projects[0].name);
-        }
+
+        localConfig.setProject(response.$id, response.name);
         success();
     } catch (e) {
         throw e;
     }
 }
 
-const pullFunctions = async ({ all, yes } = {}) => {
-    let functions = [];
-    let questions = questionsPullFunctions;
-
+const pullFunctions = async ({ all } = {}) => {
     const localFunctions = localConfig.getFunctions();
 
-    if (all) {
-        questions = yes ? [] : questionsPullFunctions[1];
-        functions = (await paginate(functionsList, { parseOutput: false }, 100, 'functions')).functions;
-    }
-
-    const answers = await inquirer.prompt(questions);
+    const functions = all
+        ? (await paginate(functionsList, { parseOutput: false }, 100, 'functions')).functions
+        : (await inquirer.prompt(questionsPullFunctions)).functions;
 
-    const overridingLocalChanges = yes ?? answers.override.toLowerCase() === "yes";
-    const selectedFunctions = functions.length === 0 ? answers.functions : functions;
+    log(`Pulling ${functions.length} functions`);
 
-    for (let func of selectedFunctions) {
+    for (let func of functions) {
         const functionExistLocally = localFunctions.find((localFunc) => localFunc['$id'] === func['$id']) !== undefined;
 
-        if (!overridingLocalChanges && functionExistLocally) {
-            log(`Skipping locally found implementation of ${func['name']}`)
-            continue;
-        }
         if (functionExistLocally) {
             localConfig.updateFunction(func['$id'], func);
         } else {
@@ -74,7 +62,7 @@ const pullFunctions = async ({ all, yes } = {}) => {
             continue
         }
 
-        const compressedFileName = `${+new Date()}.tar.gz`
+        const compressedFileName = `${func['$id']}-${+new Date()}.tar.gz`
 
         await functionsDownloadDeployment({
             functionId: func['$id'],
@@ -92,7 +80,7 @@ const pullFunctions = async ({ all, yes } = {}) => {
         });
 
         fs.rmSync(compressedFileName);
-        success(`Pulled ${func['name']} code and definition`)
+        success(`Pulled ${func['name']} code and settings`)
     }
 }
 
@@ -111,7 +99,6 @@ const pullCollection = async ({ all, databaseId } = {}) => {
 
     if (databaseIds.length <= 0) {
         let answers = await inquirer.prompt(questionsPullCollection)
-        if (!answers.databases) process.exit(1)
         databaseIds.push(...answers.databases);
     }
 
@@ -185,31 +172,30 @@ const pullMessagingTopic = async () => {
 
 pull
     .command("project")
-    .description("Pulling your Appwrite project name")
+    .description("Pulling your {{ spec.title|caseUcfirst }} project name")
     .action(actionRunner(pullProject));
 
 pull
     .command("function")
-    .description(`Pulling your Appwrite functions`)
-    .option(`--yes`, `Flag to confirm all warnings`)
+    .description(`Pulling your {{ spec.title|caseUcfirst }} functions`)
     .option(`--all`, `Flag to pull all functions`)
     .action(actionRunner(pullFunctions));
 
 pull
     .command("collection")
-    .description("Pulling your Appwrite collections")
+    .description("Pulling your {{ spec.title|caseUcfirst }} collections")
     .option(`--databaseId <databaseId>`, `Database ID`)
     .option(`--all`, `Flag to pull all databases`)
     .action(actionRunner(pullCollection))
 
 pull
     .command("bucket")
-    .description("Pulling your Appwrite buckets")
+    .description("Pulling your {{ spec.title|caseUcfirst }} buckets")
     .action(actionRunner(pullBucket))
 
 pull
     .command("team")
-    .description("Pulling your Appwrite teams")
+    .description("Pulling your {{ spec.title|caseUcfirst }} teams")
     .action(actionRunner(pullTeam))
 
 pull

templates/cli/lib/questions.js.twig

@@ -218,21 +218,21 @@ const questionsPullFunctions = [
         type: "checkbox",
         name: "functions",
         message: "Which functions would you like to pull?",
+        validate: (value) => validateRequired('function', value),
         choices: async () => {
             const { functions } = await paginate(functionsList, { parseOutput: false }, 100, 'functions');
 
+            if(functions.length === 0){
+                throw "We couldn't find any functions in your {{ spec.title|caseUcfirst }} project";
+            }
+
             return functions.map(func => {
                 return {
                     name: `${func.name} (${func.$id})`,
                     value: func
                 }
             });
         }
-    },
-    {
-        type: "input",
-        name: "override",
-        message: `Are you sure you want to override local functions code and definition? ${chalk.red('All local changes will be lost!')} Type "YES" to confirm.`
     }
 ];
 
@@ -357,6 +357,7 @@ const questionsPullCollection = [
         type: "checkbox",
         name: "databases",
         message: "From which database would you like to pull collections?",
+        validate: (value) => validateRequired('collection', value),
         choices: async () => {
             let response = await databasesList({
                 parseOutput: false