appwrite-utils-cli 0.0.58 → 0.0.59

package/dist/migrations/dataLoader.js

@@ -577,9 +577,22 @@ export class DataLoader {
     prepareUserData(item, attributeMappings, primaryKeyField, newId) {
         let transformedItem = this.transformData(item, attributeMappings);
         const userData = AuthUserCreateSchema.safeParse(transformedItem);
-        if (!userData.success) {
-            logger.error(`Invalid user data: ${JSON.stringify(userData.error.errors, undefined, 2)}`);
-            return transformedItem;
+        if (!userData.success || !(userData.data.email && userData.data.phone)) {
+            logger.error(`Invalid user data: ${JSON.stringify(userData.error?.errors, undefined, 2)} or missing email/phone`);
+            const userKeys = ["email", "phone", "name", "labels", "prefs"];
+            userKeys.forEach((key) => {
+                if (transformedItem.hasOwnProperty(key)) {
+                    delete transformedItem[key];
+                }
+            });
+            return {
+                transformedItem,
+                existingId: undefined,
+                userData: {
+                    rawData: item,
+                    finalData: transformedItem,
+                },
+            };
         }
         const email = userData.data.email;
         const phone = userData.data.phone;
@@ -718,7 +731,11 @@ export class DataLoader {
             if (!existingId) {
                 // No existing user ID, generate a new unique ID
                 existingId = this.getTrueUniqueId(this.getCollectionKey("users"));
-                transformedItem.docId = existingId; // Assign the new ID to the transformed data's docId field
+                transformedItem = {
+                    ...transformedItem,
+                    userId: existingId,
+                    docId: existingId,
+                };
             }
             // Create a context object for the item, including the new ID
             let context = this.createContext(db, collection, item, existingId);

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

package/src/migrations/dataLoader.ts

@@ -754,15 +754,29 @@ export class DataLoader {
   } {
     let transformedItem = this.transformData(item, attributeMappings);
     const userData = AuthUserCreateSchema.safeParse(transformedItem);
-    if (!userData.success) {
+    if (!userData.success || !(userData.data.email && userData.data.phone)) {
       logger.error(
         `Invalid user data: ${JSON.stringify(
-          userData.error.errors,
+          userData.error?.errors,
           undefined,
           2
-        )}`
+        )} or missing email/phone`
       );
-      return transformedItem;
+
+      const userKeys = ["email", "phone", "name", "labels", "prefs"];
+      userKeys.forEach((key) => {
+        if (transformedItem.hasOwnProperty(key)) {
+          delete transformedItem[key];
+        }
+      });
+      return {
+        transformedItem,
+        existingId: undefined,
+        userData: {
+          rawData: item,
+          finalData: transformedItem,
+        },
+      };
     }
     const email = userData.data.email;
     const phone = userData.data.phone;
@@ -929,7 +943,11 @@ export class DataLoader {
       if (!existingId) {
         // No existing user ID, generate a new unique ID
         existingId = this.getTrueUniqueId(this.getCollectionKey("users"));
-        transformedItem.docId = existingId; // Assign the new ID to the transformed data's docId field
+        transformedItem = {
+          ...transformedItem,
+          userId: existingId,
+          docId: existingId,
+        };
       }
 
       // Create a context object for the item, including the new ID