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

# Conflicts:
#	templates/cli/base/params.twig

Author: byawitz

src/SDK/Language/CLI.php

@@ -132,6 +132,11 @@ public function getFiles(): array
                 'destination'   => 'lib/validations.js',
                 'template'      => 'cli/lib/validations.js.twig',
             ],
+            [
+                'scope'         => 'default',
+                'destination'   => 'lib/spinner.js',
+                'template'      => 'cli/lib/spinner.js.twig',
+            ],
             [
                 'scope'         => 'default',
                 'destination'   => 'lib/parser.js',

templates/cli/base/params.twig

@@ -18,10 +18,8 @@
 
     if (func.ignore) {
         ignorer.add(func.ignore);
-        log('Ignoring files using configuration from appwrite.json');
     } else if (fs.existsSync(pathLib.join({{ parameter.name | caseCamel | escapeKeyword }}, '.gitignore'))) {
         ignorer.add(fs.readFileSync(pathLib.join({{ parameter.name | caseCamel | escapeKeyword }}, '.gitignore')).toString());
-        log('Ignoring files in .gitignore');
     }
 
     const files = getAllFiles({{ parameter.name | caseCamel | escapeKeyword }}).map((file) => pathLib.relative({{ parameter.name | caseCamel | escapeKeyword }}, file)).filter((file) => !ignorer.ignores(file));

templates/cli/base/requests/file.twig

@@ -1,7 +1,7 @@
 {% for parameter in method.parameters.all %}
 {% if parameter.type == 'file' %}
     const size = {{ parameter.name | caseCamel | escapeKeyword }}.size;
-    
+
     const apiHeaders = {
 {% for parameter in method.parameters.header %}
         '{{ parameter.name }}': ${{ parameter.name | caseCamel | escapeKeyword }},
@@ -45,7 +45,7 @@
         }
 
         let uploadableChunkTrimmed;
-        
+
         if(currentPosition + 1 >= client.CHUNK_SIZE) {
             uploadableChunkTrimmed = uploadableChunk;
         } else {
@@ -99,17 +99,17 @@
     }
 
 {% if method.packaging %}
-    fs.unlinkSync(filePath);
+    await fs.unlink(filePath,()=>{});
 {% endif %}
 {% if method.type == 'location' %}
     fs.writeFileSync(destination, response);
 {% endif %}
-            
+
     if (parseOutput) {
         parse(response)
         success()
     }
 
     return response;
 {% endif %}
-{% endfor %}
+{% endfor %}

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

@@ -100,8 +100,7 @@ const createTopic = async () => {
             parseOutput: false
         })
 
-        // TODO: after https://github.com/appwrite/sdk-generator/pull/839
-        // localConfig.addMessagingTopic(response);
+        localConfig.addMessagingTopic(response);
         success();
     } catch (e) {
         error(e.getMessage ?? 'Unknown error occurred. Please try again');

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

@@ -2,6 +2,7 @@ const fs = require("fs");
 const tar = require("tar");
 const { Command } = require("commander");
 const inquirer = require("inquirer");
+const { messagingCreateTopic, messagingListTopics } = require("./messaging");
 const { teamsCreate, teamsList } = require("./teams");
 const { projectsCreate } = require("./projects");
 const { functionsList, functionsDownloadDeployment } = require("./functions");
@@ -162,6 +163,19 @@ const pullTeam = async () => {
     success();
 }
 
+const pullMessagingTopic = async () => {
+    const { topics } = await paginate(messagingListTopics, { parseOutput: false }, 100, 'topics');
+
+    log(`Found ${topics.length} topics`);
+
+    topics.forEach(async topic => {
+        log(`Pulling ${topic.name} ...`);
+        localConfig.addMessagingTopic(topic);
+    });
+
+    success();
+}
+
 pull
     .command("project")
     .description("Pulling your Appwrite project")
@@ -191,6 +205,11 @@ pull
     .description("Pulling your Appwrite teams")
     .action(actionRunner(pullTeam))
 
+pull
+    .command("topic")
+    .description("Initialise your Appwrite messaging topics")
+    .action(actionRunner(pullMessagingTopic))
+
 module.exports = {
     pull,
 };