appwrite-utils-cli 0.9.86 → 0.9.89

package/dist/interactiveCLI.js

@@ -104,11 +104,18 @@ export class InteractiveCLI {
         }
     }
     async selectDatabases(databases, message, multiSelect = true) {
+        await this.initControllerIfNeeded();
         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",
@@ -122,6 +129,7 @@ export class InteractiveCLI {
         return selectedDatabases;
     }
     async selectCollections(database, databasesClient, message, multiSelect = true) {
+        await this.initControllerIfNeeded();
         const collections = await fetchAllCollections(database.$id, databasesClient);
         const configCollections = this.getLocalCollections();
         const collectionNames = collections.map((c) => c.name).concat(configCollections.map((c) => c.name));

package/dist/utils/loadConfigs.js

@@ -43,7 +43,6 @@ export const loadConfig = async (configDir) => {
         for (const file of collectionFiles) {
             const filePath = path.join(collectionsDir, file);
             const fileUrl = pathToFileURL(filePath).href;
-            console.log(`Loading collection from: ${fileUrl}`);
             const collectionModule = (await import(fileUrl)).default;
             config.collections.push(collectionModule);
         }

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;
@@ -169,6 +172,7 @@ export class SchemaGenerator {
             return;
         }
         this.config.collections.forEach((collection) => {
+            console.log(`Generating schema for ${JSON.stringify(collection, null, 4)}`);
             const schemaString = this.createSchemaString(collection.name, collection.attributes);
             const camelCaseName = toCamelCase(collection.name);
             const schemaPath = path.join(this.appwriteFolderPath, "schemas", `${camelCaseName}.ts`);

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.86",
+  "version": "0.9.89",
   "main": "src/main.ts",
   "type": "module",
   "repository": {

package/src/interactiveCLI.ts

@@ -121,12 +121,20 @@ export class InteractiveCLI {
     message: string,
     multiSelect = true
   ): Promise<Models.Database[]> {
+    await this.initControllerIfNeeded();
     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 +145,7 @@ export class InteractiveCLI {
         pageSize: 10,
       },
     ]);
-
+  
     return selectedDatabases;
   }
 
@@ -145,8 +153,9 @@ export class InteractiveCLI {
     database: Models.Database,
     databasesClient: Databases,
     message: string,
-    multiSelect = true
+    multiSelect = true 
   ): Promise<Models.Collection[]> {
+    await this.initControllerIfNeeded();
     const collections = await fetchAllCollections(
       database.$id,
       databasesClient

package/src/utils/loadConfigs.ts

@@ -51,7 +51,6 @@ export const loadConfig = async (
     for (const file of collectionFiles) {
       const filePath = path.join(collectionsDir, file);
       const fileUrl = pathToFileURL(filePath).href;
-      console.log(`Loading collection from: ${fileUrl}`);
       const collectionModule = (await import(fileUrl)).default as Collection;
       config.collections.push(collectionModule);
     }

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;
@@ -223,6 +226,7 @@ export class SchemaGenerator {
       return;
     }
     this.config.collections.forEach((collection) => {
+      console.log(`Generating schema for ${JSON.stringify(collection, null, 4)}`);
       const schemaString = this.createSchemaString(
         collection.name,
         collection.attributes