Merge remote-tracking branch 'origin/master' into feat-cli-buckets

Author: Meldiron

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

@@ -81,6 +81,10 @@ const {{ service.name | caseLower }}{{ method.name | caseUcfirst }} = async ({ {
     }
 
 {% else %}
+{% if parameter.type == 'array' %}
+    {{ parameter.name | caseCamel | escapeKeyword}} = {{ parameter.name | caseCamel | escapeKeyword}} === true ? [] : {{ parameter.name | caseCamel | escapeKeyword}};
+{% endif %}
+
     if (typeof {{ parameter.name | caseCamel | escapeKeyword }} !== 'undefined') {
         payload['{{ parameter.name }}'] = {{ parameter.name | caseCamel | escapeKeyword}}{% if method.consumes[0] == "multipart/form-data" and ( parameter.type != "string" and parameter.type != "array" ) %}.toString(){% endif %};
     }
@@ -224,7 +228,7 @@ const {{ service.name | caseLower }}{{ method.name | caseUcfirst }} = async ({ {
 {% autoescape false %}
     .description(`{{ method.description | replace({'`':'\''}) | replace({'\n':' '}) | replace({'\n \n':' '}) }}`)
 {% for parameter in method.parameters.all %}
-    .{% if parameter.required %}requiredOption{% else %}option{% endif %}(`--{{ parameter.name | escapeKeyword }} <{{ parameter.name | escapeKeyword }}{% if parameter.array.type|length > 0 %}...{% endif %}>`, `{{ parameter.description | replace({'`':'\''}) | replace({'\n':' '}) | replace({'\n \n':' '}) }}`{% if parameter | typeName == 'boolean' %}, parseBool{% elseif parameter | typeName == 'number' %}, parseInteger{% endif %})
+    .{% if parameter.required %}requiredOption{% else %}option{% endif %}(`--{{ parameter.name | escapeKeyword }} {% if parameter.array.type|length > 0 %}[{% else %}<{% endif %}{{ parameter.name | escapeKeyword }}{% if parameter.array.type|length > 0 %}...{% endif %}{% if parameter.array.type|length > 0 %}]{% else %}>{% endif %}`, `{{ parameter.description | replace({'`':'\''}) | replace({'\n':' '}) | replace({'\n \n':' '}) }}`{% if parameter | typeName == 'boolean' %}, parseBool{% elseif parameter | typeName == 'number' %}, parseInteger{% endif %})
 {% endfor %}
 {% if method.type == 'location' %}
     .requiredOption(`--destination <path>`, `output file path.`)

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

@@ -23,7 +23,8 @@ const {
     databasesDeleteAttribute,
     databasesListAttributes,
     databasesListIndexes,
-    databasesDeleteIndex
+    databasesDeleteIndex,
+    databasesUpdateCollection
 } = require("./databases");
 const {
     storageGetBucket, storageUpdateBucket, storageCreateBucket
@@ -440,17 +441,27 @@ const deployCollection = async ({ all, yes } = {}) => {
 
         let databaseId;
 
+        const localDatabase = localConfig.getDatabase(collection.databaseId);
+
         try {
             const database = await databasesGet({
                 databaseId: collection.databaseId,
                 parseOutput: false,
             });
             databaseId = database.$id;
+
+            await databasesUpdate({
+                databaseId: collection.databaseId,
+                name: localDatabase.name ?? collection.databaseId,
+                parseOutput: false
+            })
+
+            success(`Updated ${localDatabase.name} ( ${collection.databaseId} )`);
         } catch(err) {
             log(`Database ${collection.databaseId} not found. Creating it now...`);
             const database = await databasesCreate({
                 databaseId: collection.databaseId,
-                name: collection.databaseId,
+                name: localDatabase.name ?? collection.databaseId,
                 parseOutput: false,
             });
             databaseId = database.$id;
@@ -550,6 +561,18 @@ const deployCollection = async ({ all, yes } = {}) => {
             }
 
             success(`Created ${collection.indexes.length} indexes`);
+
+            await databasesUpdateCollection({
+                databaseId,
+                collectionId: collection['$id'],
+                name: collection.name,
+                documentSecurity: collection.documentSecurity,
+                permissions: collection['$permissions'],
+                enabled: collection.enabled,
+                parseOutput: false
+            })
+
+            success(`Deployed ${collection.name} ( ${collection['$id']} )`);
         } catch (e) {
             if (e.code == 404) {
                 log(`Collection ${collection.name} does not exist in the project. Creating ... `);

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

@@ -171,6 +171,13 @@ const initCollection = async ({ all, databaseId } = {}) => {
   }
 
   for(const databaseId of databaseIds) {
+    const database = await databasesGet({
+      databaseId,
+      parseOutput: false
+    });
+
+    localConfig.addDatabase(database);
+
     // TODO: Pagination?
     let response = await databasesListCollections({
       databaseId,

templates/cli/lib/config.js.twig

@@ -135,7 +135,7 @@ class Local extends Config {
     }
 
     getCollection($id) {
-        if (!this.has("collection")) {
+        if (!this.has("collections")) {
             return {};
         }
 
@@ -188,6 +188,62 @@ class Local extends Config {
         return {};
     }
 
+    addBucket(props) {
+        if (!this.has("buckets")) {
+            this.set("buckets", []);
+        }
+
+        let buckets = this.get("buckets");
+        for (let i = 0; i < buckets.length; i++) {
+            if (buckets[i]['$id'] == props['$id']) {
+                buckets[i] = props;
+                this.set("buckets", buckets);
+                return;
+            }
+        }
+        buckets.push(props);
+        this.set("buckets", buckets);
+    }
+
+    getDatabases() {
+        if (!this.has("databases")) {
+            return [];
+        }
+        return this.get("databases");
+    }
+
+    getDatabase($id) {
+        if (!this.has("databases")) {
+            return {};
+        }
+
+        let databases = this.get("databases");
+        for (let i = 0; i < databases.length; i++) {
+            if (databases[i]['$id'] == $id) {
+                return databases[i];
+            }
+        }
+
+        return {};
+    }
+
+    addDatabase(props) {
+        if (!this.has("databases")) {
+            this.set("databases", []);
+        }
+
+        let databases = this.get("databases");
+        for (let i = 0; i < databases.length; i++) {
+            if (databases[i]['$id'] == props['$id']) {
+                databases[i] = props;
+                this.set("databases", databases);
+                return;
+            }
+        }
+        databases.push(props);
+        this.set("databases", databases);
+    }
+
     getTeams() {
         if (!this.has("teams")) {
             return [];
@@ -209,23 +265,6 @@ class Local extends Config {
 
         return {};
     }
-
-    addBucket(props) {
-        if (!this.has("buckets")) {
-            this.set("buckets", []);
-        }
-
-        let buckets = this.get("buckets");
-        for (let i = 0; i < buckets.length; i++) {
-            if (buckets[i]['$id'] == props['$id']) {
-                buckets[i] = props;
-                this.set("buckets", buckets);
-                return;
-            }
-        }
-        buckets.push(props);
-        this.set("buckets", buckets);
-    }
 
     addTeam(props) {
         if (!this.has("teams")) {