appwrite-utils-cli 0.0.66 → 0.0.67

package/README.md

@@ -132,6 +132,7 @@ This setup ensures that developers have robust tools at their fingertips to mana
 
 ### Changelog
 
+- 0.0.67: Fixed `updates` in `importDef`'s update mappings overwriting postImportActions from the original
 - 0.0.57: Fixed `dataLoader`'s `idMapping`'s giving me issues
 - 0.0.55: Added `documentExists` check to batch creation functionality to try to prevent duplicates
 - 0.0.54: Various fixes in here

package/dist/migrations/dataLoader.d.ts

@@ -366,16 +366,7 @@ export declare const CollectionImportDataSchema: z.ZodObject<{
                 fieldToSet: z.ZodOptional<z.ZodString>;
                 targetFieldToMatch: z.ZodOptional<z.ZodString>;
                 targetField: z.ZodString;
-                targetCollection: z.ZodString; /**
-                 * Prepares the data for updating documents within a collection.
-                 * This method loads the raw data based on the import definition, transforms it according to the attribute mappings,
-                 * finds the new ID for each item based on the primary key or update mapping, and then validates the transformed data.
-                 * If the data is valid, it updates the import definition with any post-import actions and adds the item to the current collection data.
-                 *
-                 * @param db - The database configuration.
-                 * @param collection - The collection configuration.
-                 * @param importDef - The import definition containing the attribute mappings and other relevant info.
-                 */
+                targetCollection: z.ZodString;
             }, "strip", z.ZodTypeAny, {
                 sourceField: string;
                 targetField: string;

package/dist/migrations/dataLoader.js

@@ -470,7 +470,9 @@ export class DataLoader {
                                 const currentDataFiltered = getCurrentDataFiltered(collectionData.data[i]);
                                 // Log and skip if no matching data found
                                 if (!foundData.length) {
-                                    console.log(`No data found for collection ${collectionConfig.name}:\nTarget collection: ${targetCollectionKey}\nValue to match: ${valueToMatch}\nField to set: ${fieldToSetKey}\nTarget field to match: ${targetFieldKey}\nTarget field value: ${idMapping.targetField}`);
+                                    // console.log(
+                                    //   `No data found for collection ${collectionConfig.name}: - Target collection: ${targetCollectionKey} - Value to match: ${valueToMatch} - Field to set: ${fieldToSetKey} - Target field to match: ${targetFieldKey} - Target field value: ${idMapping.targetField}`
+                                    // );
                                     logger.info(`No data found for collection: ${targetCollectionKey} with value: ${valueToMatch} for field: ${fieldToSetKey} -- idMapping: ${JSON.stringify(idMapping, null, 2)}`);
                                     continue;
                                 }
@@ -978,17 +980,14 @@ export class DataLoader {
                     item[importDef.updateMapping.originalIdField] ||
                         transformedData[importDef.updateMapping.originalIdField];
                 if (oldId) {
-                    itemDataToUpdate = currentData?.data.find(({ context, rawData, finalData }) => {
+                    itemDataToUpdate = currentData?.data.find(({ context, finalData }) => {
                         const targetField = importDef.updateMapping.targetField ??
                             importDef.updateMapping.originalIdField;
                         return (`${context[targetField]}` === `${oldId}` ||
-                            `${rawData[targetField]}` === `${oldId}` ||
                             `${finalData[targetField]}` === `${oldId}`);
                     });
                     if (itemDataToUpdate) {
-                        newId =
-                            itemDataToUpdate.finalData.docId ||
-                                itemDataToUpdate.context.docId;
+                        newId = itemDataToUpdate.context.docId;
                     }
                 }
             }
@@ -1036,10 +1035,10 @@ export class DataLoader {
             }
             transformedData = this.mergeObjects(itemDataToUpdate.finalData, transformedData);
             // Create a context object for the item, including the new ID and transformed data
-            let context = this.createContext(db, collection, item, newId);
+            let context = itemDataToUpdate.context;
             context = this.mergeObjects(context, transformedData);
             // Validate the item before proceeding
-            const isValid = await this.importDataActions.validateItem(item, importDef.attributeMappings, context);
+            const isValid = this.importDataActions.validateItem(item, importDef.attributeMappings, context);
             if (!isValid) {
                 logger.info(`Skipping item: ${JSON.stringify(item, null, 2)} because it's invalid`);
                 continue;
@@ -1049,15 +1048,26 @@ export class DataLoader {
             // Update the import definition with the new attribute mappings
             const newImportDef = {
                 ...importDef,
-                attributeMappings: [
-                    ...importDef.attributeMappings,
-                    ...mappingsWithActions,
-                ],
+                attributeMappings: mappingsWithActions,
             };
             if (itemDataToUpdate) {
                 itemDataToUpdate.finalData = this.mergeObjects(itemDataToUpdate.finalData, transformedData);
                 itemDataToUpdate.context = context;
-                itemDataToUpdate.importDef = newImportDef;
+                // Merge existing importDef with new importDef, focusing only on postImportActions
+                itemDataToUpdate.importDef = {
+                    ...itemDataToUpdate.importDef,
+                    attributeMappings: itemDataToUpdate.importDef?.attributeMappings.map((attrMapping, index) => ({
+                        ...attrMapping,
+                        postImportActions: [
+                            ...(attrMapping.postImportActions || []),
+                            ...(newImportDef.attributeMappings[index]
+                                ?.postImportActions || []),
+                        ],
+                    })) || [],
+                };
+                if (collection.name.toLowerCase() === "councils") {
+                    console.log(`Mappings in update councils: ${JSON.stringify(itemDataToUpdate.importDef.attributeMappings, null, 2)}`);
+                }
             }
             else {
                 currentData.data.push({

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

package/src/migrations/dataLoader.ts

@@ -598,9 +598,9 @@ export class DataLoader {
                 );
                 // Log and skip if no matching data found
                 if (!foundData.length) {
-                  console.log(
-                    `No data found for collection ${collectionConfig.name}:\nTarget collection: ${targetCollectionKey}\nValue to match: ${valueToMatch}\nField to set: ${fieldToSetKey}\nTarget field to match: ${targetFieldKey}\nTarget field value: ${idMapping.targetField}`
-                  );
+                  // console.log(
+                  //   `No data found for collection ${collectionConfig.name}: - Target collection: ${targetCollectionKey} - Value to match: ${valueToMatch} - Field to set: ${fieldToSetKey} - Target field to match: ${targetFieldKey} - Target field value: ${idMapping.targetField}`
+                  // );
                   logger.info(
                     `No data found for collection: ${targetCollectionKey} with value: ${valueToMatch} for field: ${fieldToSetKey} -- idMapping: ${JSON.stringify(
                       idMapping,
@@ -1297,23 +1297,20 @@ export class DataLoader {
           transformedData[importDef.updateMapping.originalIdField];
         if (oldId) {
           itemDataToUpdate = currentData?.data.find(
-            ({ context, rawData, finalData }) => {
+            ({ context, finalData }) => {
               const targetField =
                 importDef.updateMapping!.targetField ??
                 importDef.updateMapping!.originalIdField;
 
               return (
                 `${context[targetField]}` === `${oldId}` ||
-                `${rawData[targetField]}` === `${oldId}` ||
                 `${finalData[targetField]}` === `${oldId}`
               );
             }
           );
 
           if (itemDataToUpdate) {
-            newId =
-              itemDataToUpdate.finalData.docId ||
-              itemDataToUpdate.context.docId;
+            newId = itemDataToUpdate.context.docId;
           }
         }
       }
@@ -1407,11 +1404,11 @@ export class DataLoader {
       );
 
       // Create a context object for the item, including the new ID and transformed data
-      let context = this.createContext(db, collection, item, newId);
+      let context = itemDataToUpdate.context;
       context = this.mergeObjects(context, transformedData);
 
       // Validate the item before proceeding
-      const isValid = await this.importDataActions.validateItem(
+      const isValid = this.importDataActions.validateItem(
         item,
         importDef.attributeMappings,
         context
@@ -1434,10 +1431,7 @@ export class DataLoader {
       // Update the import definition with the new attribute mappings
       const newImportDef = {
         ...importDef,
-        attributeMappings: [
-          ...importDef.attributeMappings,
-          ...mappingsWithActions,
-        ],
+        attributeMappings: mappingsWithActions,
       };
 
       if (itemDataToUpdate) {
@@ -1446,7 +1440,31 @@ export class DataLoader {
           transformedData
         );
         itemDataToUpdate.context = context;
-        itemDataToUpdate.importDef = newImportDef;
+        // Merge existing importDef with new importDef, focusing only on postImportActions
+        itemDataToUpdate.importDef = {
+          ...itemDataToUpdate.importDef,
+          attributeMappings:
+            itemDataToUpdate.importDef?.attributeMappings.map(
+              (attrMapping, index) => ({
+                ...attrMapping,
+                postImportActions: [
+                  ...(attrMapping.postImportActions || []),
+                  ...(newImportDef.attributeMappings[index]
+                    ?.postImportActions || []),
+                ],
+              })
+            ) || [],
+        } as ImportDef;
+
+        if (collection.name.toLowerCase() === "councils") {
+          console.log(
+            `Mappings in update councils: ${JSON.stringify(
+              itemDataToUpdate.importDef.attributeMappings,
+              null,
+              2
+            )}`
+          );
+        }
       } else {
         currentData!.data.push({
           rawData: item,