appwrite-utils-cli 0.10.84 → 0.10.86

package/README.md

@@ -150,6 +150,8 @@ This updated CLI ensures that developers have robust tools at their fingertips t
 
 ## Changelog
 
+- 0.10.86: Fixed `selectCollections` not always filtering by `databaseId`
+- 0.10.85: Added logging to `wipeCollection`
 - 0.10.83: Actually fixed the import oops
 - 0.10.82: Fixed the `lodash` import, replaced with `es-toolkit`
 - 0.10.81: Fixed `wipeCollection` -- it wasn't properly deleting all files in a loop

package/dist/collections/methods.js

@@ -3,7 +3,7 @@ import { nameToIdMapping, processQueue } from "../migrations/queue.js";
 import { createUpdateCollectionAttributes } from "./attributes.js";
 import { createOrUpdateIndexes } from "./indexes.js";
 import { SchemaGenerator } from "../migrations/schemaStrings.js";
-import { isNull, isUndefined, isNil, isPlainObject, isString, isJSONValue, } from "es-toolkit";
+import { isNull, isUndefined, isNil, isPlainObject, isString, isJSONValue, chunk, } from "es-toolkit";
 import { delay, tryAwaitWithRetry } from "../utils/helperFunctions.js";
 export const documentExists = async (db, dbId, targetCollectionId, toCreateObject) => {
     const collection = await db.getCollection(dbId, targetCollectionId);
@@ -102,11 +102,16 @@ async function wipeDocumentsFromCollection(database, databaseId, collectionId) {
                 docsResponse.documents.length >= 1000
                     ? docsResponse.documents[docsResponse.documents.length - 1].$id
                     : undefined;
+            if (totalDocuments % 10000 === 0) {
+                console.log(`Found ${totalDocuments} documents...`);
+            }
         }
         console.log(`Found ${totalDocuments} documents to delete`);
         const maxStackSize = 50; // Reduced batch size
-        for (let i = 0; i < documents.length; i += maxStackSize) {
-            const batch = documents.slice(i, i + maxStackSize);
+        const docBatches = chunk(documents, maxStackSize);
+        const quarterBatchSize = Math.ceil(docBatches.length / 4);
+        for (let i = 0; i < docBatches.length; i++) {
+            const batch = docBatches[i];
             const deletePromises = batch.map(async (doc) => {
                 try {
                     await tryAwaitWithRetry(async () => database.deleteDocument(databaseId, collectionId, doc.$id));
@@ -119,8 +124,13 @@ async function wipeDocumentsFromCollection(database, databaseId, collectionId) {
                 }
             });
             await Promise.all(deletePromises);
-            await delay(100); // Increased delay between batches
-            console.log(`Deleted batch of ${batch.length} documents (${i + batch.length}/${totalDocuments})`);
+            await delay(50); // Increased delay between batches
+            // Log at 25%, 50%, 75% and 100% completion
+            if ((i + 1) % quarterBatchSize === 0 || i === docBatches.length - 1) {
+                const percentComplete = Math.round(((i + 1) / docBatches.length) * 100);
+                const documentsProcessed = Math.min((i + 1) * maxStackSize, totalDocuments);
+                console.log(`Deleted ${documentsProcessed} documents (${percentComplete}% complete)`);
+            }
         }
         console.log(`Completed deletion of ${totalDocuments} documents from collection ${collectionId}`);
     }

package/dist/interactiveCLI.js

@@ -172,11 +172,10 @@ export class InteractiveCLI {
         ]);
         return selectedDatabases;
     }
-    async selectCollections(database, databasesClient, message, multiSelect = true, preferLocal = false) {
+    async selectCollections(database, databasesClient, message, multiSelect = true, preferLocal = false, shouldFilterByDatabase = false) {
         await this.initControllerIfNeeded();
         const configCollections = this.getLocalCollections();
         let remoteCollections = [];
-        let shouldFilterByDatabase = true;
         const dbExists = await databasesClient.list([
             Query.equal("name", database.name),
         ]);
@@ -1053,7 +1052,7 @@ export class InteractiveCLI {
         const databases = await fetchAllDatabases(this.controller.database);
         const selectedDatabases = await this.selectDatabases(databases, "Select the database(s) containing the collections to wipe:", true);
         for (const database of selectedDatabases) {
-            const collections = await this.selectCollections(database, this.controller.database, `Select collections to wipe from ${database.name}:`, true);
+            const collections = await this.selectCollections(database, this.controller.database, `Select collections to wipe from ${database.name}:`, true, undefined, true);
             const { confirm } = await inquirer.prompt([
                 {
                     type: "confirm",

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

package/src/collections/methods.ts

@@ -18,6 +18,7 @@ import {
   isPlainObject,
   isString,
   isJSONValue,
+  chunk,
 } from "es-toolkit";
 import { delay, tryAwaitWithRetry } from "../utils/helperFunctions.js";
 
@@ -165,13 +166,19 @@ async function wipeDocumentsFromCollection(
         docsResponse.documents.length >= 1000
           ? docsResponse.documents[docsResponse.documents.length - 1].$id
           : undefined;
+      if (totalDocuments % 10000 === 0) {
+        console.log(`Found ${totalDocuments} documents...`);
+      }
     }
 
     console.log(`Found ${totalDocuments} documents to delete`);
 
     const maxStackSize = 50; // Reduced batch size
-    for (let i = 0; i < documents.length; i += maxStackSize) {
-      const batch = documents.slice(i, i + maxStackSize);
+    const docBatches = chunk(documents, maxStackSize);
+    const quarterBatchSize = Math.ceil(docBatches.length / 4);
+
+    for (let i = 0; i < docBatches.length; i++) {
+      const batch = docBatches[i];
       const deletePromises = batch.map(async (doc) => {
         try {
           await tryAwaitWithRetry(async () =>
@@ -193,13 +200,19 @@ async function wipeDocumentsFromCollection(
       });
 
       await Promise.all(deletePromises);
-      await delay(100); // Increased delay between batches
-
-      console.log(
-        `Deleted batch of ${batch.length} documents (${
-          i + batch.length
-        }/${totalDocuments})`
-      );
+      await delay(50); // Increased delay between batches
+
+      // Log at 25%, 50%, 75% and 100% completion
+      if ((i + 1) % quarterBatchSize === 0 || i === docBatches.length - 1) {
+        const percentComplete = Math.round(((i + 1) / docBatches.length) * 100);
+        const documentsProcessed = Math.min(
+          (i + 1) * maxStackSize,
+          totalDocuments
+        );
+        console.log(
+          `Deleted ${documentsProcessed} documents (${percentComplete}% complete)`
+        );
+      }
     }
 
     console.log(

package/src/interactiveCLI.ts

@@ -233,13 +233,13 @@ export class InteractiveCLI {
     databasesClient: Databases,
     message: string,
     multiSelect = true,
-    preferLocal = false
+    preferLocal = false,
+    shouldFilterByDatabase = false
   ): Promise<Models.Collection[]> {
     await this.initControllerIfNeeded();
 
     const configCollections = this.getLocalCollections();
     let remoteCollections: Models.Collection[] = [];
-    let shouldFilterByDatabase = true;
 
     const dbExists = await databasesClient.list([
       Query.equal("name", database.name),
@@ -1454,6 +1454,8 @@ export class InteractiveCLI {
         database,
         this.controller!.database,
         `Select collections to wipe from ${database.name}:`,
+        true,
+        undefined,
         true
       );