appwrite-utils-cli 0.0.45 → 0.0.47

package/README.md

@@ -86,6 +86,7 @@ This setup ensures that developers have robust tools at their fingertips to mana
 
 ### Changelog
 
+- 0.0.48: Minor bugfixes in many releases, too small to take note of
 - 0.0.38: Lots of optimizations done to the code, added `tryAwaitWithRetry` for `fetch failed` and others like it errors (looking at you `server error`) -- this should prevent things from going sideways.
 - 0.0.37: Added `documentSecurity`, `enabled`, and `$id` to the `init` collection
 - 0.0.36: Made it update collections by default, sometimes you gotta do what you gotta do

package/dist/migrations/collections.js

@@ -146,13 +146,13 @@ export const createOrUpdateCollections = async (database, databaseId, config, de
         let collectionId;
         if (!collectionToUse) {
             console.log(`Creating collection: ${collection.name}`);
-            const foundColl = deletedCollections?.find((coll) => coll.collectionName.toLowerCase().trim().replace(" ", "") ===
+            let foundColl = deletedCollections?.find((coll) => coll.collectionName.toLowerCase().trim().replace(" ", "") ===
                 collection.name.toLowerCase().trim().replace(" ", ""));
-            if (foundColl && !usedIds.has(foundColl.collectionId)) {
-                collectionId = foundColl.collectionId; // Use ID from deleted collection if not already used
+            if (collection.$id) {
+                collectionId = collection.$id; // Always use the provided $id if present
             }
-            else if (collection.$id && !usedIds.has(collection.$id)) {
-                collectionId = collection.$id; // Use the provided $id if not already used
+            else if (foundColl && !usedIds.has(foundColl.collectionId)) {
+                collectionId = foundColl.collectionId; // Use ID from deleted collection if not already used
             }
             else {
                 collectionId = ID.unique(); // Generate a new unique ID

package/dist/migrations/importController.js

@@ -54,13 +54,8 @@ export class ImportController {
             console.log(`Starting import data for database: ${db.name}`);
             console.log(`---------------------------------`);
             // await this.importCollections(db);
-            if (!dataLoader) {
-                dataLoader = new DataLoader(this.appwriteFolderPath, this.importDataActions, this.database, this.config, this.setupOptions.shouldWriteFile);
-                await dataLoader.start(db.$id);
-            }
-            else {
-                console.log(`Using data from previous import run`);
-            }
+            dataLoader = new DataLoader(this.appwriteFolderPath, this.importDataActions, this.database, this.config, this.setupOptions.shouldWriteFile);
+            await dataLoader.start(db.$id);
             await this.importCollections(db, dataLoader);
             await resolveAndUpdateRelationships(db.$id, this.database, this.config);
             await this.executePostImportActions(db.$id, dataLoader);
@@ -78,7 +73,7 @@ export class ImportController {
                 dataLoader.getCollectionKey(collection.name);
             const importOperationId = dataLoader.collectionImportOperations.get(dataLoader.getCollectionKey(collection.name));
             const createBatches = (finalData) => {
-                let maxBatchLength = 25;
+                let maxBatchLength = 100;
                 const finalBatches = [];
                 for (let i = 0; i < finalData.length; i++) {
                     if (i % maxBatchLength === 0) {

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

package/src/migrations/collections.ts

@@ -201,16 +201,16 @@ export const createOrUpdateCollections = async (
     let collectionId: string;
     if (!collectionToUse) {
       console.log(`Creating collection: ${collection.name}`);
-      const foundColl = deletedCollections?.find(
+      let foundColl = deletedCollections?.find(
         (coll) =>
           coll.collectionName.toLowerCase().trim().replace(" ", "") ===
           collection.name.toLowerCase().trim().replace(" ", "")
       );
 
-      if (foundColl && !usedIds.has(foundColl.collectionId)) {
+      if (collection.$id) {
+        collectionId = collection.$id; // Always use the provided $id if present
+      } else if (foundColl && !usedIds.has(foundColl.collectionId)) {
         collectionId = foundColl.collectionId; // Use ID from deleted collection if not already used
-      } else if (collection.$id && !usedIds.has(collection.$id)) {
-        collectionId = collection.$id; // Use the provided $id if not already used
       } else {
         collectionId = ID.unique(); // Generate a new unique ID
       }

package/src/migrations/importController.ts

@@ -92,18 +92,14 @@ export class ImportController {
       console.log(`Starting import data for database: ${db.name}`);
       console.log(`---------------------------------`);
       // await this.importCollections(db);
-      if (!dataLoader) {
-        dataLoader = new DataLoader(
-          this.appwriteFolderPath,
-          this.importDataActions,
-          this.database,
-          this.config,
-          this.setupOptions.shouldWriteFile
-        );
-        await dataLoader.start(db.$id);
-      } else {
-        console.log(`Using data from previous import run`);
-      }
+      dataLoader = new DataLoader(
+        this.appwriteFolderPath,
+        this.importDataActions,
+        this.database,
+        this.config,
+        this.setupOptions.shouldWriteFile
+      );
+      await dataLoader.start(db.$id);
       await this.importCollections(db, dataLoader);
       await resolveAndUpdateRelationships(db.$id, this.database, this.config);
       await this.executePostImportActions(db.$id, dataLoader);
@@ -125,7 +121,7 @@ export class ImportController {
         dataLoader.getCollectionKey(collection.name)
       );
       const createBatches = (finalData: CollectionImportData["data"]) => {
-        let maxBatchLength = 25;
+        let maxBatchLength = 100;
         const finalBatches: CollectionImportData["data"][] = [];
         for (let i = 0; i < finalData.length; i++) {
           if (i % maxBatchLength === 0) {