appwrite-utils-cli 0.9.85 → 0.9.88

package/dist/interactiveCLI.js

@@ -105,10 +105,16 @@ export class InteractiveCLI {
     }
     async selectDatabases(databases, message, multiSelect = true) {
         const configDatabases = this.getLocalDatabases();
-        const dbNames = databases.map((db) => db.name).concat(configDatabases.map((db) => db.name));
-        const allDbNamesUnique = Array.from(new Set(dbNames));
-        const allDatabases = allDbNamesUnique.map((name) => configDatabases.find((db) => db.name === name) ?? databases.find((db) => db.name === name)).filter((v) => v !== undefined).sort((a, b) => a.name.localeCompare(b.name));
-        const choices = allDatabases.map((db) => ({ name: db.name, value: db })).filter((db) => db.name.toLowerCase() !== "migrations");
+        const allDatabases = [...databases, ...configDatabases].reduce((acc, db) => {
+            if (!acc.find(d => d.name === db.name)) {
+                acc.push(db);
+            }
+            return acc;
+        }, []);
+        const choices = allDatabases
+            .sort((a, b) => a.name.localeCompare(b.name))
+            .map((db) => ({ name: db.name, value: db }))
+            .filter((db) => db.name.toLowerCase() !== "migrations");
         const { selectedDatabases } = await inquirer.prompt([
             {
                 type: multiSelect ? "checkbox" : "list",

package/dist/utils/schemaStrings.js

@@ -111,6 +111,9 @@ export class SchemaGenerator {
             return;
         }
         this.config.collections.forEach((collection) => {
+            if (!collection.attributes) {
+                return;
+            }
             collection.attributes.forEach((attr) => {
                 if (attr.type === "relationship" && attr.twoWay && attr.twoWayKey) {
                     const relationshipAttr = attr;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "appwrite-utils-cli",
   "description": "Appwrite Utility Functions to help with database management, data conversion, data import, migrations, and much more. Meant to be used as a CLI tool, I do not recommend installing this in frontend environments.",
-  "version": "0.9.85",
+  "version": "0.9.88",
   "main": "src/main.ts",
   "type": "module",
   "repository": {

package/src/interactiveCLI.ts

@@ -122,11 +122,18 @@ export class InteractiveCLI {
     multiSelect = true
   ): Promise<Models.Database[]> {
     const configDatabases = this.getLocalDatabases();
-    const dbNames = databases.map((db) => db.name).concat(configDatabases.map((db) => db.name));
-    const allDbNamesUnique = Array.from(new Set(dbNames));
-    const allDatabases = allDbNamesUnique.map((name) => configDatabases.find((db) => db.name === name) ?? databases.find((db) => db.name === name)).filter((v) => v !== undefined).sort((a, b) => a.name.localeCompare(b.name));
-    const choices = allDatabases.map((db) => ({ name: db.name, value: db })).filter((db) => db.name.toLowerCase() !== "migrations");
-
+    const allDatabases = [...databases, ...configDatabases].reduce((acc, db) => {
+      if (!acc.find(d => d.name === db.name)) {
+        acc.push(db);
+      }
+      return acc;
+    }, [] as Models.Database[]);
+  
+    const choices = allDatabases
+      .sort((a, b) => a.name.localeCompare(b.name))
+      .map((db) => ({ name: db.name, value: db }))
+      .filter((db) => db.name.toLowerCase() !== "migrations");
+  
     const { selectedDatabases } = await inquirer.prompt([
       {
         type: multiSelect ? "checkbox" : "list",
@@ -137,7 +144,7 @@ export class InteractiveCLI {
         pageSize: 10,
       },
     ]);
-
+  
     return selectedDatabases;
   }
 

package/src/utils/schemaStrings.ts

@@ -146,6 +146,9 @@ export class SchemaGenerator {
       return;
     }
     this.config.collections.forEach((collection) => {
+      if (!collection.attributes) {
+        return;
+      }
       collection.attributes.forEach((attr) => {
         if (attr.type === "relationship" && attr.twoWay && attr.twoWayKey) {
           const relationshipAttr = attr as RelationshipAttribute;