Merge branch 'refs/heads/feat-create-resources' into feat-pull-function

byawitz · byawitz · commit 06cecf19deeb · 2024-05-22T08:56:11.000-04:00
# Conflicts:
#	templates/cli/lib/questions.js.twig
diff --git a/src/SDK/Language/CLI.php b/src/SDK/Language/CLI.php
@@ -172,6 +172,11 @@ public function getFiles(): array
                 'destination'   => 'lib/utils.js',
                 'template'      => 'cli/lib/utils.js.twig',
             ],
+            [
+                'scope'         => 'default',
+                'destination'   => 'lib/commands/init.js',
+                'template'      => 'cli/lib/commands/init.js.twig',
+            ],
             [
                 'scope'         => 'default',
                 'destination'   => 'lib/commands/create.js',
diff --git a/templates/cli/index.js.twig b/templates/cli/index.js.twig
@@ -13,6 +13,7 @@ const { client } = require("./lib/commands/generic");
 {% if sdk.test != "true" %}
 const { login, logout } = require("./lib/commands/generic");
 const { create } = require("./lib/commands/create");
+const { init } = require("./lib/commands/init");
 const { pull } = require("./lib/commands/pull");
 const { push } = require("./lib/commands/push");
 {% endif %}
@@ -39,6 +40,7 @@ program
 {% if sdk.test != "true" %}
   .addCommand(login)
   .addCommand(create)
+  .addCommand(init)
   .addCommand(pull)
   .addCommand(push)
   .addCommand(logout)
diff --git a/templates/cli/lib/commands/create.js.twig b/templates/cli/lib/commands/create.js.twig
@@ -3,16 +3,13 @@ const path = require("path");
 const childProcess = require('child_process');
 const { Command } = require("commander");
 const inquirer = require("inquirer");
-const { projectsCreate } = require("./projects");
 const { storageCreateBucket } = require("./storage");
 const { messagingCreateTopic } = require("./messaging");
 const { functionsCreate } = require("./functions");
 const { databasesCreateCollection } = require("./databases");
-const { sdkForConsole } = require("../sdks");
 const ID = require("../id");
 const { localConfig } = require("../config");
 const {
-    questionsCreateProject,
     questionsCreateFunction,
     questionsCreateBucket,
     questionsCreateMessagingTopic,
@@ -29,21 +26,6 @@ const create = new Command("create")
         command.help();
     }));
 
-const createProject = async () => {
-    let response = {}
-    const answers = await inquirer.prompt(questionsCreateProject)
-    if (!answers.project || !answers.organization) process.exit(1)
-
-    response = await projectsCreate({
-        projectId: answers.id,
-        name: answers.project,
-        teamId: answers.organization.id,
-        parseOutput: false
-    })
-
-    localConfig.setProject(response['$id'], response.name);
-    success();
-}
 
 const createBucket = async () => {
     let response = {}
@@ -217,13 +199,6 @@ const createFunction = async () => {
     success();
 }
 
-
-
-create
-    .command("project")
-    .description("Create a new {{ spec.title|caseUcfirst }} project")
-    .action(actionRunner(createProject));
-
 create
     .command("function")
     .description("Create a new {{ spec.title|caseUcfirst }} function")
diff --git a/templates/cli/lib/commands/generic.js.twig b/templates/cli/lib/commands/generic.js.twig
@@ -8,62 +8,64 @@ const { actionRunner, success, parseBool, commandDescriptions, log, parse } = re
 const { questionsLogin, questionsListFactors, questionsMfaChallenge } = require("../questions");
 const { accountUpdateMfaChallenge, accountCreateMfaChallenge, accountGet, accountCreateEmailPasswordSession, accountDeleteSession } = require("./account");
 
-const login = new Command("login")
-    .description(commandDescriptions['login'])
-    .configureHelp({
-        helpWidth: process.stdout.columns || 80
+const loginCommand = async () => {
+    const answers = await inquirer.prompt(questionsLogin)
+
+    let client = await sdkForConsole(false);
+
+    await accountCreateEmailPasswordSession({
+        email: answers.email,
+        password: answers.password,
+        parseOutput: false,
+        sdk: client
     })
-    .action(actionRunner(async () => {
-        const answers = await inquirer.prompt(questionsLogin)
 
-        let client = await sdkForConsole(false);
+    client.setCookie(globalConfig.getCookie());
 
-        await accountCreateEmailPasswordSession({
-            email: answers.email,
-            password: answers.password,
-            parseOutput: false,
-            sdk: client
-        })
+    let account;
+
+    try {
+        account = await accountGet({
+            sdk: client,
+            parseOutput: false
+        });
+    } catch(error) {
+        if (error.response === 'user_more_factors_required') {
+            const { factor } = await inquirer.prompt(questionsListFactors);
 
-        client.setCookie(globalConfig.getCookie());
+            const challenge = await accountCreateMfaChallenge({
+                factor,
+                parseOutput: false,
+                sdk: client
+            });
 
-        let account;
+            const { otp } = await inquirer.prompt(questionsMfaChallenge);
+
+            await accountUpdateMfaChallenge({
+                challengeId: challenge.$id,
+                otp,
+                parseOutput: false,
+                sdk: client
+            });
 
-        try {
             account = await accountGet({
                 sdk: client,
                 parseOutput: false
             });
-        } catch(error) {
-            if (error.response === 'user_more_factors_required') {
-                const { factor } = await inquirer.prompt(questionsListFactors);
-
-                const challenge = await accountCreateMfaChallenge({
-                    factor,
-                    parseOutput: false,
-                    sdk: client
-                });
-
-                const { otp } = await inquirer.prompt(questionsMfaChallenge);
-
-                await accountUpdateMfaChallenge({
-                    challengeId: challenge.$id,
-                    otp,
-                    parseOutput: false,
-                    sdk: client
-                });
-
-                account = await accountGet({
-                    sdk: client,
-                    parseOutput: false
-                });
-            } else {
-                throw error;
-            }
+        } else {
+            throw error;
         }
+    }
 
-        success("Signed in as user with ID: " + account.$id);
-    }));
+    success("Signed in as user with ID: " + account.$id);
+};
+
+const login = new Command("login")
+    .description(commandDescriptions['login'])
+    .configureHelp({
+        helpWidth: process.stdout.columns || 80
+    })
+    .action(actionRunner(loginCommand));
 
 const logout = new Command("logout")
     .description(commandDescriptions['logout'])
@@ -159,6 +161,7 @@ const client = new Command("client")
 
 module.exports = {
 {% if sdk.test != "true" %}
+    loginCommand,
     login,
     logout,
 {% endif %}
diff --git a/templates/cli/lib/commands/init.js.twig b/templates/cli/lib/commands/init.js.twig
@@ -0,0 +1,56 @@
+const { Command } = require("commander");
+const inquirer = require("inquirer");
+const { projectsCreate } = require("./projects");
+const { localConfig, globalConfig } = require("../config");
+const { questionsCreateProject, } = require("../questions");
+const { success, error, actionRunner, commandDescriptions } = require("../parser");
+const { accountGet } = require("./account");
+const { loginCommand } = require("./generic");
+
+const init = new Command("init")
+    .description(commandDescriptions['init'])
+    .configureHelp({
+        helpWidth: process.stdout.columns || 80
+    })
+    .action(actionRunner(async (_options, command) => {
+        command.help();
+    }));
+
+const initProject = async () => {
+    let response = {};
+
+    try {
+        if (globalConfig.getEndpoint() === '' || globalConfig.getCookie() === '') {
+            throw '';
+        }
+        await accountGet({
+            parseOutput: false
+        });
+    } catch (e) {
+        error('You must login first')
+        await loginCommand()
+    }
+
+    const answers = await inquirer.prompt(questionsCreateProject)
+    if (!answers.project || !answers.organization) process.exit(1)
+
+    response = await projectsCreate({
+        projectId: answers.id,
+        name: answers.project,
+        teamId: answers.organization.id,
+        parseOutput: false
+    })
+
+    localConfig.setProject(response['$id'], response.name);
+    success();
+}
+
+
+init
+    .command("project")
+    .description("Init and create a new {{ spec.title|caseUcfirst }} project")
+    .action(actionRunner(initProject));
+
+module.exports = {
+    init,
+};
diff --git a/templates/cli/lib/parser.js.twig b/templates/cli/lib/parser.js.twig
@@ -156,7 +156,8 @@ const commandDescriptions = {
     "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.`,
-    "create": `The create command provides a convenient wrapper for creating projects functions, collections, buckets, teams and messaging.`,
+    "init": `The init command provides a convenient wrapper for creating and initializing project in Appwrite.`,
+    "create": `The create command provides a convenient wrapper for creating functions, collections, buckets, teams and messaging.`,
     "push": `The push command provides a convenient wrapper for pushing your functions, collections, buckets, teams and messaging.`,
     "functions": `The functions command allows you view, create and manage your Cloud Functions.`,
     "health": `The health command allows you to both validate and monitor your {{ spec.title|caseUcfirst }} server's health.`,
diff --git a/templates/cli/lib/questions.js.twig b/templates/cli/lib/questions.js.twig
@@ -10,6 +10,8 @@ const chalk = require('chalk');
 const { databasesList } = require('./commands/databases');
 const JSONbig = require("json-bigint")({ storeAsString: false });
 
+const whenOverride = (answers)=> answers.override === undefined ? true : answers.override;
+
 const getIgnores = (runtime) => {
     const languge = runtime.split('-')[0];
 
@@ -143,7 +145,8 @@ const questionsProject = [
             }
 
             return choices;
-        }
+        },
+        when: whenOverride
     },
 ];
 
@@ -153,13 +156,70 @@ const questionsCreateProject = [
         type: "input",
         name: "project",
         message: "What would you like to name your project?",
-        default: "My Awesome Project"
+        default: "My Awesome Project",
+        when: whenOverride
     },
     {
         type: "input",
         name: "id",
         message: "What ID would you like to have for your project?",
-        default: "unique()"
+        default: "unique()",
+        when: whenOverride
+    }
+];
+
+const questionsPullProject = [
+    ...questionsProject,
+    {
+        type: "list",
+        name: "project",
+        message: "Choose your {{ spec.title|caseUcfirst }} project.",
+        choices: async (answers) => {
+            let response = await projectsList({
+                parseOutput: false,
+                queries: [JSON.stringify({ method: 'equal', attribute: 'teamId', values: [answers.organization.id] })],
+            })
+            let projects = response["projects"]
+            let choices = projects.map((project, idx) => {
+                return {
+                    name: `${project.name} (${project['$id']})`,
+                    value: {
+                        name: project.name,
+                        id: project['$id']
+                    }
+                }
+            })
+
+            if (choices.length == 0) {
+                throw new Error("No projects found. Please create a new project.")
+            }
+
+            return choices;
+        },
+        when: whenOverride
+    }
+];
+
+const questionsPullFunctions = [
+    {
+        type: "checkbox",
+        name: "functions",
+        message: "Which functions would you like to pull?",
+        choices: async () => {
+            const { functions } = await paginate(functionsList, { parseOutput: false }, 100, 'functions');
+
+            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.`
     }
 ];
 
@@ -311,30 +371,6 @@ const questionsPullProject = [
     }
 ];
 
-
-const questionsPullFunctions = [
-    {
-        type: "checkbox",
-        name: "functions",
-        message: "Which functions would you like to pull?",
-        choices: async () => {
-            const { functions } = await paginate(functionsList, { parseOutput: false }, 100, 'functions');
-
-            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.`
-    }
-];
-
 const questionsPullCollection = [
     {
         type: "checkbox",
