appwrite-utils-cli 0.9.95 → 0.9.97

package/dist/main.js

@@ -148,13 +148,27 @@ async function main() {
             shouldWriteFile: parsedArgv.writeData,
             wipeCollections: parsedArgv.wipeCollections,
         };
+        // Add default databases if not specified
+        if (!options.databases || options.databases.length === 0) {
+            const allDatabases = await fetchAllDatabases(controller.database);
+            options.databases = allDatabases.filter((db) => db.name.toLowerCase() !== "migrations");
+        }
+        // Add default collections if not specified
+        if (!options.collections || options.collections.length === 0) {
+            if (controller.config && controller.config.collections) {
+                options.collections = controller.config.collections.map((c) => c.name);
+            }
+            else {
+                options.collections = [];
+            }
+        }
         if (parsedArgv.push || parsedArgv.sync) {
-            const databases = options.databases || await fetchAllDatabases(controller.database);
+            const databases = options.databases || (await fetchAllDatabases(controller.database));
             let collections = [];
             if (options.collections) {
                 for (const db of databases) {
                     const dbCollections = await fetchAllCollections(db.$id, controller.database);
-                    collections = collections.concat(dbCollections.filter(c => options.collections.includes(c.$id)));
+                    collections = collections.concat(dbCollections.filter((c) => options.collections.includes(c.$id)));
                 }
             }
             if (parsedArgv.push) {
@@ -184,7 +198,7 @@ async function main() {
             if (options.wipeCollections && options.databases) {
                 for (const db of options.databases) {
                     const dbCollections = await fetchAllCollections(db.$id, controller.database);
-                    const collectionsToWipe = dbCollections.filter(c => options.collections.includes(c.$id));
+                    const collectionsToWipe = dbCollections.filter((c) => options.collections.includes(c.$id));
                     for (const collection of collectionsToWipe) {
                         await controller.wipeCollection(db, collection);
                     }

package/dist/migrations/importController.js

@@ -80,11 +80,11 @@ export class ImportController {
         const collectionsToImport = specificCollections || (this.config.collections ? this.config.collections.map(c => c.name) : []);
         for (const collection of this.config.collections || []) {
             if (collectionsToImport.includes(collection.name)) {
-                let isUsersCollection = dataLoader.getCollectionKey(this.config.usersCollectionName) ===
-                    dataLoader.getCollectionKey(collection.name);
+                let isUsersCollection = this.config.usersCollectionName && (dataLoader.getCollectionKey(this.config.usersCollectionName) ===
+                    dataLoader.getCollectionKey(collection.name));
                 const importOperationId = dataLoader.collectionImportOperations.get(dataLoader.getCollectionKey(collection.name));
                 const createBatches = (finalData) => {
-                    let maxBatchLength = 100;
+                    let maxBatchLength = 50;
                     const finalBatches = [];
                     for (let i = 0; i < finalData.length; i++) {
                         if (i % maxBatchLength === 0) {

package/dist/migrations/users.js

@@ -33,15 +33,20 @@ export class UsersController {
             return finalBatches;
         };
         let usersDeleted = 0;
-        const batchedUserPromises = createBatches(allUsers, 50); // Batch size of 10
-        for (const batch of batchedUserPromises) {
-            console.log(`Deleting ${batch.length} users...`);
-            await Promise.all(batch.map((user) => tryAwaitWithRetry(async () => await this.users.delete(user.$id))));
-            usersDeleted += batch.length;
-            if (usersDeleted % 100 === 0) {
-                console.log(`Deleted ${usersDeleted} users...`);
+        if (allUsers.length > 0) {
+            const batchedUserPromises = createBatches(allUsers, 25); // Batch size of 25
+            for (const batch of batchedUserPromises) {
+                console.log(`Deleting ${batch.length} users...`);
+                await Promise.all(batch.map((user) => tryAwaitWithRetry(async () => await this.users.delete(user.$id))));
+                usersDeleted += batch.length;
+                if (usersDeleted % 100 === 0) {
+                    console.log(`Deleted ${usersDeleted} users...`);
+                }
             }
         }
+        else {
+            console.log("No users to delete");
+        }
     }
     async getAllUsers() {
         const allUsers = [];

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

package/src/main.ts

@@ -68,7 +68,8 @@ const argv = yargs(hideBin(process.argv))
   })
   .option("wipeCollections", {
     type: "boolean",
-    description: "Wipe collections, uses collectionIds option to get the collections to wipe",
+    description:
+      "Wipe collections, uses collectionIds option to get the collections to wipe",
   })
   .option("generate", {
     type: "boolean",
@@ -159,7 +160,6 @@ const argv = yargs(hideBin(process.argv))
   .parse() as ParsedArgv;
 
 async function main() {
-  
   if (argv.it) {
     const cli = new InteractiveCLI(process.cwd());
     await cli.run();
@@ -189,14 +189,37 @@ async function main() {
       wipeCollections: parsedArgv.wipeCollections,
     };
 
+    // Add default databases if not specified
+    if (!options.databases || options.databases.length === 0) {
+      const allDatabases = await fetchAllDatabases(controller.database!);
+      options.databases = allDatabases.filter(
+        (db) => db.name.toLowerCase() !== "migrations"
+      );
+    }
+
+    // Add default collections if not specified
+    if (!options.collections || options.collections.length === 0) {
+      if (controller.config && controller.config.collections) {
+        options.collections = controller.config.collections.map((c) => c.name);
+      } else {
+        options.collections = [];
+      }
+    }
+
     if (parsedArgv.push || parsedArgv.sync) {
-      const databases = options.databases || await fetchAllDatabases(controller.database!);
+      const databases =
+        options.databases || (await fetchAllDatabases(controller.database!));
       let collections: Models.Collection[] = [];
-      
+
       if (options.collections) {
         for (const db of databases) {
-          const dbCollections = await fetchAllCollections(db.$id, controller.database!);
-          collections = collections.concat(dbCollections.filter(c => options.collections!.includes(c.$id)));
+          const dbCollections = await fetchAllCollections(
+            db.$id,
+            controller.database!
+          );
+          collections = collections.concat(
+            dbCollections.filter((c) => options.collections!.includes(c.$id))
+          );
         }
       }
 
@@ -228,8 +251,13 @@ async function main() {
       }
       if (options.wipeCollections && options.databases) {
         for (const db of options.databases) {
-          const dbCollections = await fetchAllCollections(db.$id, controller.database!);
-          const collectionsToWipe = dbCollections.filter(c => options.collections!.includes(c.$id));
+          const dbCollections = await fetchAllCollections(
+            db.$id,
+            controller.database!
+          );
+          const collectionsToWipe = dbCollections.filter((c) =>
+            options.collections!.includes(c.$id)
+          );
           for (const collection of collectionsToWipe) {
             await controller.wipeCollection(db, collection);
           }
@@ -318,4 +346,4 @@ async function main() {
 main().catch((error) => {
   console.error("An error occurred:", error);
   process.exit(1);
-});
+});

package/src/migrations/importController.ts

@@ -147,14 +147,13 @@ export class ImportController {
 
     for (const collection of this.config.collections || []) {
       if (collectionsToImport.includes(collection.name)) {
-        let isUsersCollection =
-          dataLoader.getCollectionKey(this.config.usersCollectionName) ===
-          dataLoader.getCollectionKey(collection.name);
+        let isUsersCollection = this.config.usersCollectionName && (dataLoader.getCollectionKey(this.config.usersCollectionName) ===
+            dataLoader.getCollectionKey(collection.name));
         const importOperationId = dataLoader.collectionImportOperations.get(
           dataLoader.getCollectionKey(collection.name)
         );
         const createBatches = (finalData: CollectionImportData["data"]) => {
-          let maxBatchLength = 100;
+          let maxBatchLength = 50;
           const finalBatches: CollectionImportData["data"][] = [];
           for (let i = 0; i < finalData.length; i++) {
             if (i % maxBatchLength === 0) {

package/src/migrations/users.ts

@@ -53,19 +53,23 @@ export class UsersController {
     };
 
     let usersDeleted = 0;
-    const batchedUserPromises = createBatches(allUsers, 50); // Batch size of 10
+    if (allUsers.length > 0) {
+      const batchedUserPromises = createBatches(allUsers, 25); // Batch size of 25
 
-    for (const batch of batchedUserPromises) {
-      console.log(`Deleting ${batch.length} users...`);
-      await Promise.all(
-        batch.map((user) =>
-          tryAwaitWithRetry(async () => await this.users.delete(user.$id))
-        )
-      );
-      usersDeleted += batch.length;
-      if (usersDeleted % 100 === 0) {
-        console.log(`Deleted ${usersDeleted} users...`);
+      for (const batch of batchedUserPromises) {
+        console.log(`Deleting ${batch.length} users...`);
+        await Promise.all(
+          batch.map((user) =>
+            tryAwaitWithRetry(async () => await this.users.delete(user.$id))
+          )
+        );
+        usersDeleted += batch.length;
+        if (usersDeleted % 100 === 0) {
+          console.log(`Deleted ${usersDeleted} users...`);
+        }
       }
+    } else {
+      console.log("No users to delete");
     }
   }
 

package/zlogs/album.json

@@ -0,0 +1,4 @@
+{
+  "collection": "album",
+  "data": []
+}

package/zlogs/artist.json

@@ -0,0 +1,4 @@
+{
+  "collection": "artist",
+  "data": []
+}

package/zlogs/genre.json

@@ -0,0 +1,4 @@
+{
+  "collection": "genre",
+  "data": []
+}

package/zlogs/mergedUserMap.json

@@ -1,56 +1 @@
-[
-  [
-    "6658d6be001df3bc11b5",
-    [
-      "6540"
-    ]
-  ],
-  [
-    "6658d6bf000497b9bc75",
-    [
-      "6755"
-    ]
-  ],
-  [
-    "6658d6bf0000ea9e02f1",
-    [
-      "6830"
-    ]
-  ],
-  [
-    "6658d6bf001ac437c7f5",
-    [
-      "6885"
-    ]
-  ],
-  [
-    "6658d6bf0022564fd7d9",
-    [
-      "6918"
-    ]
-  ],
-  [
-    "6658d6c0002898b5a5bb",
-    [
-      "7338"
-    ]
-  ],
-  [
-    "6658d6bf0033c8dd5630",
-    [
-      "7350"
-    ]
-  ],
-  [
-    "6658d6c1001a721332f7",
-    [
-      "7751"
-    ]
-  ],
-  [
-    "6658d6c2003bf5fa3b2e",
-    [
-      "8550"
-    ]
-  ]
-]
+[]