Merge branch 'refs/heads/feat-cli-g2' into feat-deploy-init-everything

# Conflicts:
#	templates/cli/lib/commands/push.js.twig
#	templates/cli/lib/questions.js.twig

Author: byawitz

src/SDK/Language/CLI.php

@@ -127,6 +127,11 @@ public function getFiles(): array
                 'destination'   => 'lib/questions.js',
                 'template'      => 'cli/lib/questions.js.twig',
             ],
+            [
+                'scope'         => 'default',
+                'destination'   => 'lib/validations.js',
+                'template'      => 'cli/lib/validations.js.twig',
+            ],
             [
                 'scope'         => 'default',
                 'destination'   => 'lib/parser.js',
@@ -152,20 +157,25 @@ public function getFiles(): array
                 'destination'   => 'lib/client.js',
                 'template'      => 'cli/lib/client.js.twig',
             ],
+            [
+                'scope'         => 'default',
+                'destination'   => 'lib/id.js',
+                'template'      => 'cli/lib/id.js.twig',
+            ],
             [
                 'scope'         => 'default',
                 'destination'   => 'lib/utils.js',
                 'template'      => 'cli/lib/utils.js.twig',
             ],
             [
                 'scope'         => 'default',
-                'destination'   => 'lib/commands/init.js',
-                'template'      => 'cli/lib/commands/init.js.twig',
+                'destination'   => 'lib/commands/pull.js',
+                'template'      => 'cli/lib/commands/pull.js.twig',
             ],
             [
                 'scope'         => 'default',
-                'destination'   => 'lib/commands/deploy.js',
-                'template'      => 'cli/lib/commands/deploy.js.twig',
+                'destination'   => 'lib/commands/push.js',
+                'template'      => 'cli/lib/commands/push.js.twig',
             ],
             [
                 'scope'         => 'service',

templates/cli/index.js.twig

@@ -12,8 +12,8 @@ const { commandDescriptions, cliConfig } = require("./lib/parser");
 const { client } = require("./lib/commands/generic");
 {% if sdk.test != "true" %}
 const { login, logout } = require("./lib/commands/generic");
-const { init } = require("./lib/commands/init");
-const { deploy } = require("./lib/commands/deploy");
+const { pull } = require("./lib/commands/pull");
+const { push } = require("./lib/commands/push");
 {% endif %}
 {% for service in spec.services %}
 const { {{ service.name | caseLower }} } = require("./lib/commands/{{ service.name | caseLower }}");
@@ -37,14 +37,14 @@ program
   .showSuggestionAfterError()
 {% if sdk.test != "true" %}
   .addCommand(login)
-  .addCommand(init)
-  .addCommand(deploy)
+  .addCommand(pull)
+  .addCommand(push)
   .addCommand(logout)
 {% endif %}
 {% for service in spec.services %}
   .addCommand({{ service.name | caseLower }})
 {% endfor %}
   .addCommand(client)
   .parse(process.argv);
-  
-process.stdout.columns = oldWidth;
+
+process.stdout.columns = oldWidth;

templates/cli/lib/commands/init.js.twig renamed to templates/cli/lib/commands/pull.js.twig

@@ -10,22 +10,23 @@ const { databasesGet, databasesListCollections, databasesList } = require("./dat
 const { storageListBuckets } = require("./storage");
 const { sdkForConsole } = require("../sdks");
 const { localConfig } = require("../config");
+const ID  = require("../id");
 const { paginate } = require("../paginate");
-const { questionsInitProject, questionsInitFunction, questionsInitCollection } = require("../questions");
+const { questionsPullProject, questionsPullFunction, questionsPullCollection } = require("../questions");
 const { success, log, actionRunner, commandDescriptions } = require("../parser");
 
-const init = new Command("init")
-    .description(commandDescriptions['init'])
+const pull = new Command("pull")
+    .description(commandDescriptions['pull'])
     .configureHelp({
         helpWidth: process.stdout.columns || 80
     })
     .action(actionRunner(async (_options, command) => {
         command.help();
     }));
 
-const initProject = async () => {
+const pullProject = async () => {
     let response = {}
-    const answers = await inquirer.prompt(questionsInitProject)
+    const answers = await inquirer.prompt(questionsPullProject)
     if (!answers.project) process.exit(1)
 
     let sdk = await sdkForConsole();
@@ -52,9 +53,9 @@ const initProject = async () => {
     success();
 }
 
-const initFunction = async () => {
+const pullFunction = async () => {
     // TODO: Add CI/CD support (ID, name, runtime)
-    const answers = await inquirer.prompt(questionsInitFunction)
+    const answers = await inquirer.prompt(questionsPullFunction)
     const functionFolder = path.join(process.cwd(), 'functions');
 
     if (!fs.existsSync(functionFolder)) {
@@ -63,22 +64,23 @@ const initFunction = async () => {
         });
     }
 
-    const functionDir = path.join(functionFolder, answers.name);
+    const functionId = answers.id === 'unique()' ? ID.unique() : answers.id;
+    const functionDir = path.join(functionFolder, functionId);
 
     if (fs.existsSync(functionDir)) {
-        throw new Error(`( ${answers.name} ) already exists in the current directory. Please choose another name.`);
+        throw new Error(`( ${functionId} ) already exists in the current directory. Please choose another name.`);
     }
 
     if (!answers.runtime.entrypoint) {
-        log(`Entrypoint for this runtime not found. You will be asked to configure entrypoint when you first deploy the function.`);
+        log(`Entrypoint for this runtime not found. You will be asked to configure entrypoint when you first push the function.`);
     }
 
     if (!answers.runtime.commands) {
-        log(`Installation command for this runtime not found. You will be asked to configure the install command when you first deploy the function.`);
+        log(`Installation command for this runtime not found. You will be asked to configure the install command when you first push the function.`);
     }
 
     let response = await functionsCreate({
-        functionId: answers.id,
+        functionId,
         name: answers.name,
         runtime: answers.runtime.id,
         entrypoint: answers.runtime.entrypoint || '',
@@ -134,7 +136,7 @@ const initFunction = async () => {
 
     fs.rmSync(`${functionDir}/${answers.runtime.id}`, { recursive: true, force: true });
 
-    const readmePath = path.join(process.cwd(), 'functions', answers.name, 'README.md');
+    const readmePath = path.join(process.cwd(), 'functions', functionId, 'README.md');
     const readmeFile = fs.readFileSync(readmePath).toString();
     const newReadmeFile = readmeFile.split('\n');
     newReadmeFile[0] = `# ${answers.name}`;
@@ -154,14 +156,14 @@ const initFunction = async () => {
         entrypoint: response.entrypoint,
         commands: response.commands,
         ignore: answers.runtime.ignore || null,
-        path: `functions/${answers.name}`,
+        path: `functions/${functionId}`,
     };
 
     localConfig.addFunction(data);
     success();
 }
 
-const initCollection = async ({ all, databaseId } = {}) => {
+const pullCollection = async ({ all, databaseId } = {}) => {
     const databaseIds = [];
 
     if (databaseId) {
@@ -175,7 +177,7 @@ const initCollection = async ({ all, databaseId } = {}) => {
     }
 
     if (databaseIds.length <= 0) {
-        let answers = await inquirer.prompt(questionsInitCollection)
+        let answers = await inquirer.prompt(questionsPullCollection)
         if (!answers.databases) process.exit(1)
         databaseIds.push(...answers.databases);
     }
@@ -208,7 +210,7 @@ const initCollection = async ({ all, databaseId } = {}) => {
     success();
 }
 
-const initBucket = async () => {
+const pullBucket = async () => {
     const { buckets } = await paginate(storageListBuckets, { parseOutput: false }, 100, 'buckets');
 
     log(`Found ${buckets.length} buckets`);
@@ -221,7 +223,7 @@ const initBucket = async () => {
     success();
 }
 
-const initTeam = async () => {
+const pullTeam = async () => {
     const { teams } = await paginate(teamsList, { parseOutput: false }, 100, 'teams');
 
     log(`Found ${teams.length} teams`);
@@ -235,33 +237,33 @@ const initTeam = async () => {
     success();
 }
 
-init
+pull
     .command("project")
-    .description("Initialise your {{ spec.title|caseUcfirst }} project")
-    .action(actionRunner(initProject));
+    .description("Pulling your {{ spec.title|caseUcfirst }} project")
+    .action(actionRunner(pullProject));
 
-init
+pull
     .command("function")
-    .description("Initialise your {{ spec.title|caseUcfirst }} cloud function")
-    .action(actionRunner(initFunction))
+    .description("Pulling your {{ spec.title|caseUcfirst }} cloud function")
+    .action(actionRunner(pullFunction))
 
-init
+pull
     .command("collection")
-    .description("Initialise your {{ spec.title|caseUcfirst }} collections")
+    .description("Pulling your {{ spec.title|caseUcfirst }} collections")
     .option(`--databaseId <databaseId>`, `Database ID`)
-    .option(`--all`, `Flag to initialize all databases`)
-    .action(actionRunner(initCollection))
+    .option(`--all`, `Flag to pullialize all databases`)
+    .action(actionRunner(pullCollection))
 
-init
+pull
     .command("bucket")
-    .description("Initialise your Appwrite buckets")
-    .action(actionRunner(initBucket))
+    .description("Pulling your Appwrite buckets")
+    .action(actionRunner(pullBucket))
 
-init
+pull
     .command("team")
-    .description("Initialise your Appwrite teams")
-    .action(actionRunner(initTeam))
+    .description("Pulling your Appwrite teams")
+    .action(actionRunner(pullTeam))
 
 module.exports = {
-    init,
+    pull,
 };