appwrite-utils-cli 0.9.79 → 0.9.81

package/README.md

@@ -125,6 +125,7 @@ This updated CLI ensures that developers have robust tools at their fingertips t
 
 ## Changelog
 
+- 0.9.80: Fixed collections not being unique between local and remote
 - 0.9.79: Fixed local collections not being considered for the synchronization unless all de-selected
 - 0.9.78: Added colored text! And also added a lot more customization options as to what to wipe, update, etc.
 - 0.9.75: Fixed attribute bug

package/dist/interactiveCLI.js

@@ -44,9 +44,9 @@ export class InteractiveCLI {
                     choices: Object.values(CHOICES),
                 },
             ]);
-            await this.initControllerIfNeeded();
             switch (action) {
                 case CHOICES.CREATE_COLLECTION_CONFIG:
+                    await this.initControllerIfNeeded();
                     await this.createCollectionConfig();
                     break;
                 case CHOICES.SETUP_DIRS_FILES:
@@ -106,13 +106,15 @@ export class InteractiveCLI {
     async selectDatabases(databases, message, multiSelect = true) {
         const choices = databases.map((db) => ({ name: db.name, value: db })).filter((db) => db.name.toLowerCase() !== "migrations");
         const configDatabases = this.getLocalDatabases();
-        const allDatabases = Array.from(new Set([...databases, ...configDatabases]));
+        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 { selectedDatabases } = await inquirer.prompt([
             {
                 type: multiSelect ? "checkbox" : "list",
                 name: "selectedDatabases",
                 message: chalk.blue(message),
-                choices,
+                choices: allDatabases,
                 loop: false,
                 pageSize: 10,
             },
@@ -122,7 +124,9 @@ export class InteractiveCLI {
     async selectCollections(database, databasesClient, message, multiSelect = true) {
         const collections = await fetchAllCollections(database.$id, databasesClient);
         const configCollections = this.getLocalCollections();
-        const allCollections = Array.from(new Set([...collections, ...configCollections]));
+        const collectionNames = collections.map((c) => c.name).concat(configCollections.map((c) => c.name));
+        const allCollectionNamesUnique = Array.from(new Set(collectionNames));
+        const allCollections = allCollectionNamesUnique.map((name) => configCollections.find((c) => c.name === name) ?? collections.find((c) => c.name === name)).filter((v) => v !== undefined);
         const choices = allCollections.map((collection) => ({
             name: collection.name,
             value: collection,

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.79",
+  "version": "0.9.81",
   "main": "src/main.ts",
   "type": "module",
   "repository": {
@@ -31,7 +31,7 @@
   },
   "dependencies": {
     "@types/inquirer": "^9.0.7",
-    "appwrite-utils": "^0.3.91",
+    "appwrite-utils": "^0.3.94",
     "chalk": "^5.3.0",
     "commander": "^12.1.0",
     "inquirer": "^9.3.6",

package/src/interactiveCLI.ts

@@ -55,10 +55,9 @@ export class InteractiveCLI {
         },
       ]);
 
-      await this.initControllerIfNeeded();
-
       switch (action) {
         case CHOICES.CREATE_COLLECTION_CONFIG:
+          await this.initControllerIfNeeded();
           await this.createCollectionConfig();
           break;
         case CHOICES.SETUP_DIRS_FILES:
@@ -124,7 +123,9 @@ export class InteractiveCLI {
   ): Promise<Models.Database[]> {
     const choices = databases.map((db) => ({ name: db.name, value: db })).filter((db) => db.name.toLowerCase() !== "migrations");
     const configDatabases = this.getLocalDatabases();
-    const allDatabases = Array.from(new Set([...databases, ...configDatabases]));
+    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 { selectedDatabases } = await inquirer.prompt([
@@ -132,7 +133,7 @@ export class InteractiveCLI {
         type: multiSelect ? "checkbox" : "list",
         name: "selectedDatabases",
         message: chalk.blue(message),
-        choices,
+        choices: allDatabases,
         loop: false,
         pageSize: 10,
       },
@@ -152,7 +153,9 @@ export class InteractiveCLI {
       databasesClient
     );
     const configCollections = this.getLocalCollections();
-    const allCollections = Array.from(new Set([...collections, ...configCollections]));
+    const collectionNames = collections.map((c) => c.name).concat(configCollections.map((c) => c.name));
+    const allCollectionNamesUnique = Array.from(new Set(collectionNames));
+    const allCollections = allCollectionNamesUnique.map((name) => configCollections.find((c) => c.name === name) ?? collections.find((c) => c.name === name)).filter((v) => v !== undefined);
     const choices = allCollections.map((collection) => ({
       name: collection.name,
       value: collection,