appwrite-utils-cli 0.0.48 → 0.0.49

package/README.md

@@ -132,6 +132,7 @@ This setup ensures that developers have robust tools at their fingertips to mana
 
 ### Changelog
 
+- 0.0.49: Fixed a slight bug with `dataLoader` not mapping updates correctly with `updateMapping`
 - 0.0.48: Added `--transfer`, `--fromdb <targetDatabaseId>`, `--targetdb <targetDatabaseId>`, `--transferendpoint <transferEndpoint>`, `--transferproject <transferProjectId>`, `--transferkey <transferApiKey>`. Additionally, I've added `--fromcoll <collectionId>` and `--targetcoll <collectionId>`. These allow you to do a few things. First, you can now transfer databases in the same project, and from local to a remote project. Second, you can now specify specific collections to transfer from one place to another, with all of their data. If `--fromcoll` and `--targetcoll` are ommitted, it will transfer the databases. During the database transfer, it will create any missing collections, attributes, and indices.
 - 0.0.47: 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.

package/dist/migrations/dataLoader.js

@@ -878,7 +878,10 @@ export class DataLoader {
             let itemDataToUpdate;
             // Try to find itemDataToUpdate using updateMapping
             if (importDef.updateMapping) {
-                oldId = item[importDef.updateMapping.originalIdField];
+                console.log(importDef.updateMapping);
+                oldId =
+                    item[importDef.updateMapping.originalIdField] ||
+                        transformedData[importDef.updateMapping.originalIdField];
                 if (oldId) {
                     itemDataToUpdate = currentData?.data.find(({ context, rawData, finalData }) => {
                         const targetField = importDef.updateMapping.targetField ??
@@ -896,7 +899,9 @@ export class DataLoader {
             }
             // If updateMapping is not defined or did not find the item, use primaryKeyField
             if (!itemDataToUpdate && importDef.primaryKeyField) {
-                oldId = item[importDef.primaryKeyField];
+                oldId =
+                    item[importDef.primaryKeyField] ||
+                        transformedData[importDef.primaryKeyField];
                 if (oldId) {
                     newId = oldIdToNewIdMap?.get(`${oldId}`);
                     if (!newId &&
@@ -919,13 +924,14 @@ export class DataLoader {
                 continue;
             }
             if (!newId && !itemDataToUpdate) {
-                logger.error(`No new id found for collection ${collection.name} for updateDef ${JSON.stringify(item, null, 2)} but it says it's supposed to have one...`);
+                logger.error(`No new id && no data found for collection ${collection.name} for updateDef ${JSON.stringify(item, null, 2)} but it says it's supposed to have one...`);
                 continue;
             }
             else if (itemDataToUpdate) {
-                newId = itemDataToUpdate.finalData.docId;
+                newId =
+                    itemDataToUpdate.finalData.docId || itemDataToUpdate.context.docId;
                 if (!newId) {
-                    logger.error(`No new id found for collection ${collection.name} for updateDef ${JSON.stringify(item, null, 2)} but it says it's supposed to have one...`);
+                    logger.error(`No new id found for collection ${collection.name} for updateDef ${JSON.stringify(item, null, 2)} but has itemDataToUpdate ${JSON.stringify(itemDataToUpdate, null, 2)} but it says it's supposed to have one...`);
                     continue;
                 }
             }

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

package/src/migrations/dataLoader.ts

@@ -1207,13 +1207,17 @@ export class DataLoader {
 
       // Try to find itemDataToUpdate using updateMapping
       if (importDef.updateMapping) {
-        oldId = item[importDef.updateMapping.originalIdField];
+        console.log(importDef.updateMapping);
+        oldId =
+          item[importDef.updateMapping.originalIdField] ||
+          transformedData[importDef.updateMapping.originalIdField];
         if (oldId) {
           itemDataToUpdate = currentData?.data.find(
             ({ context, rawData, finalData }) => {
               const targetField =
                 importDef.updateMapping!.targetField ??
                 importDef.updateMapping!.originalIdField;
+
               return (
                 `${context[targetField]}` === `${oldId}` ||
                 `${rawData[targetField]}` === `${oldId}` ||
@@ -1232,7 +1236,9 @@ export class DataLoader {
 
       // If updateMapping is not defined or did not find the item, use primaryKeyField
       if (!itemDataToUpdate && importDef.primaryKeyField) {
-        oldId = item[importDef.primaryKeyField];
+        oldId =
+          item[importDef.primaryKeyField] ||
+          transformedData[importDef.primaryKeyField];
         if (oldId) {
           newId = oldIdToNewIdMap?.get(`${oldId}`);
           if (
@@ -1268,7 +1274,7 @@ export class DataLoader {
 
       if (!newId && !itemDataToUpdate) {
         logger.error(
-          `No new id found for collection ${
+          `No new id && no data found for collection ${
             collection.name
           } for updateDef ${JSON.stringify(
             item,
@@ -1278,7 +1284,8 @@ export class DataLoader {
         );
         continue;
       } else if (itemDataToUpdate) {
-        newId = itemDataToUpdate.finalData.docId;
+        newId =
+          itemDataToUpdate.finalData.docId || itemDataToUpdate.context.docId;
         if (!newId) {
           logger.error(
             `No new id found for collection ${
@@ -1287,6 +1294,10 @@ export class DataLoader {
               item,
               null,
               2
+            )} but has itemDataToUpdate ${JSON.stringify(
+              itemDataToUpdate,
+              null,
+              2
             )} but it says it's supposed to have one...`
           );
           continue;