feat(cli): Split project creation and pulling

Author: byawitz

src/SDK/Language/CLI.php

@@ -167,6 +167,11 @@ public function getFiles(): array
                 'destination'   => 'lib/utils.js',
                 'template'      => 'cli/lib/utils.js.twig',
             ],
+            [
+                'scope'         => 'default',
+                'destination'   => 'lib/commands/create.js',
+                'template'      => 'cli/lib/commands/create.js.twig',
+            ],
             [
                 'scope'         => 'default',
                 'destination'   => 'lib/commands/pull.js',

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 } = require("./lib/commands/generic");
+const { create } = require("./lib/commands/create");
 const { pull } = require("./lib/commands/pull");
 const { push } = require("./lib/commands/push");
 {% endif %}
@@ -37,6 +38,7 @@ program
   .showSuggestionAfterError()
 {% if sdk.test != "true" %}
   .addCommand(login)
+  .addCommand(create)
   .addCommand(pull)
   .addCommand(push)
   .addCommand(logout)

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

@@ -0,0 +1,41 @@
+const { Command } = require("commander");
+const inquirer = require("inquirer");
+const { projectsCreate } = require("./projects");
+const { sdkForConsole } = require("../sdks");
+const { localConfig } = require("../config");
+const { questionsCreateProject } = require("../questions");
+const { success, actionRunner, commandDescriptions } = require("../parser");
+
+const create = new Command("create")
+    .description(commandDescriptions['create'])
+    .configureHelp({
+        helpWidth: process.stdout.columns || 80
+    })
+    .action(actionRunner(async (_options, command) => {
+        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();
+}
+
+create
+    .command("project")
+    .description("Create a new {{ spec.title|caseUcfirst }} project")
+    .action(actionRunner(createProject));
+
+module.exports = {
+    create,
+};

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

@@ -10,7 +10,7 @@ const { databasesGet, databasesListCollections, databasesList } = require("./dat
 const { storageListBuckets } = require("./storage");
 const { sdkForConsole } = require("../sdks");
 const { localConfig } = require("../config");
-const ID  = require("../id");
+const ID = require("../id");
 const { paginate } = require("../paginate");
 const { questionsPullProject, questionsPullFunction, questionsPullCollection } = require("../questions");
 const { success, log, actionRunner, commandDescriptions } = require("../parser");
@@ -25,31 +25,10 @@ const pull = new Command("pull")
     }));
 
 const pullProject = async () => {
-    let response = {}
     const answers = await inquirer.prompt(questionsPullProject)
     if (!answers.project) process.exit(1)
 
-    let sdk = await sdkForConsole();
-    if (answers.start === "new") {
-        response = await teamsCreate({
-            teamId: 'unique()',
-            name: answers.project,
-            sdk,
-            parseOutput: false
-        })
-
-        let teamId = response['$id'];
-        response = await projectsCreate({
-            projectId: answers.id,
-            name: answers.project,
-            teamId,
-            parseOutput: false
-        })
-
-        localConfig.setProject(response['$id'], response.name);
-    } else {
-        localConfig.setProject(answers.project.id, answers.project.name);
-    }
+    localConfig.setProject(answers.project.id, answers.project.name);
     success();
 }
 

templates/cli/lib/parser.js.twig

@@ -156,6 +156,7 @@ 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.`,
     "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.`,

templates/cli/lib/questions.js.twig

@@ -110,7 +110,7 @@ const getInstallCommand = (runtime) => {
     return undefined;
 };
 
-const questionsPullProject = [
+const questionsProject = [
     {
         type: "confirm",
         name: "override",
@@ -126,7 +126,7 @@ const questionsPullProject = [
         message: "Choose the project organization",
         choices: async () => {
             let client = await sdkForConsole(true);
-            const { teams } = await paginate(teamsList, { parseOutput: false , sdk: client}, 100, 'teams');
+            const { teams } = await paginate(teamsList, { parseOutput: false, sdk: client }, 100, 'teams');
 
             let choices = teams.map((team, idx) => {
                 return {
@@ -145,56 +145,33 @@ const questionsPullProject = [
             return choices;
         }
     },
-    {
-        type: "list",
-        name: "start",
-        when(answers) {
-            if (answers.override == undefined) {
-                return true
-            }
-            return answers.override;
-        },
-        message: "How would you like to start?",
-        choices: [
-            {
-                name: "Create a new {{ spec.title|caseUcfirst }} project",
-                value: "new",
-            },
-            {
-                name: "Link this directory to an existing {{ spec.title|caseUcfirst }} project",
-                value: "existing",
-            },
-        ],
-    },
+];
+
+const questionsCreateProject = [
+    ...questionsProject,
     {
         type: "input",
         name: "project",
         message: "What would you like to name your project?",
-        default: "My Awesome Project",
-        when(answers) {
-            return answers.start == "new";
-        },
+        default: "My Awesome Project"
     },
     {
         type: "input",
         name: "id",
         message: "What ID would you like to have for your project?",
-        default: "unique()",
-        when(answers) {
-            return answers.start == "new";
-        },
-    },
+        default: "unique()"
+    }
+];
+const questionsPullProject = [
+    ...questionsProject,
     {
         type: "list",
         name: "project",
         message: "Choose your {{ spec.title|caseUcfirst }} project.",
-        when(answers) {
-            return answers.start == "existing";
-        },
         choices: async (answers) => {
             let response = await projectsList({
                 parseOutput: false,
-                queries: [JSON.stringify({ method: 'equal', attribute:'teamId', values: [answers.organization.id] })],
+                queries: [JSON.stringify({ method: 'equal', attribute: 'teamId', values: [answers.organization.id] })],
             })
             let projects = response["projects"]
             let choices = projects.map((project, idx) => {
@@ -476,6 +453,7 @@ const questionsMfaChallenge = [
 ];
 
 module.exports = {
+    questionsCreateProject,
     questionsPullProject,
     questionsLogin,
     questionsPullFunction,