appwrite-utils-cli 0.0.63 → 0.0.65

package/dist/migrations/dataLoader.d.ts

@@ -623,6 +623,16 @@ export declare const CollectionImportDataSchema: z.ZodObject<{
             relatedCollection: string;
             relationType: "oneToMany" | "manyToOne" | "oneToOne" | "manyToMany";
             twoWay: boolean;
+            /**
+             * Generates attribute mappings with post-import actions based on the provided attribute mappings.
+             * This method checks each mapping for a fileData attribute and adds a post-import action to create a file
+             * and update the field with the file's ID if necessary.
+             *
+             * @param attributeMappings - The attribute mappings from the import definition.
+             * @param context - The context object containing information about the database, collection, and document.
+             * @param item - The item being imported, used for resolving template paths in fileData mappings.
+             * @returns The attribute mappings updated with any necessary post-import actions.
+             */
             twoWayKey: string;
             onDelete: "setNull" | "cascade" | "restrict";
             side: "parent" | "child";
@@ -1235,6 +1245,16 @@ export declare const CollectionImportDataSchema: z.ZodObject<{
             relatedCollection: string;
             relationType: "oneToMany" | "manyToOne" | "oneToOne" | "manyToMany";
             twoWay: boolean;
+            /**
+             * Generates attribute mappings with post-import actions based on the provided attribute mappings.
+             * This method checks each mapping for a fileData attribute and adds a post-import action to create a file
+             * and update the field with the file's ID if necessary.
+             *
+             * @param attributeMappings - The attribute mappings from the import definition.
+             * @param context - The context object containing information about the database, collection, and document.
+             * @param item - The item being imported, used for resolving template paths in fileData mappings.
+             * @returns The attribute mappings updated with any necessary post-import actions.
+             */
             twoWayKey: string;
             onDelete: "setNull" | "cascade" | "restrict";
             side: "parent" | "child";
@@ -1635,6 +1655,16 @@ export declare class DataLoader {
                 relatedCollection: string;
                 relationType: "oneToMany" | "manyToOne" | "oneToOne" | "manyToMany";
                 twoWay: boolean;
+                /**
+                 * Generates attribute mappings with post-import actions based on the provided attribute mappings.
+                 * This method checks each mapping for a fileData attribute and adds a post-import action to create a file
+                 * and update the field with the file's ID if necessary.
+                 *
+                 * @param attributeMappings - The attribute mappings from the import definition.
+                 * @param context - The context object containing information about the database, collection, and document.
+                 * @param item - The item being imported, used for resolving template paths in fileData mappings.
+                 * @returns The attribute mappings updated with any necessary post-import actions.
+                 */
                 twoWayKey: string;
                 onDelete: "setNull" | "cascade" | "restrict";
                 side: "parent" | "child";

package/dist/migrations/dataLoader.js

@@ -278,6 +278,11 @@ export class DataLoader {
                     userId: user.$id,
                     docId: user.$id,
                 },
+                context: {
+                    ...user,
+                    userId: user.$id,
+                    docId: user.$id,
+                },
                 rawData: user,
             });
             this.importMap.set(this.getCollectionKey("users"), importData);
@@ -449,13 +454,6 @@ export class DataLoader {
                                         targetValue !== undefined &&
                                         targetValue !== null);
                                 });
-                                // 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}`);
-                                    logger.info(`No data found for collection: ${targetCollectionKey} with value: ${valueToMatch} for field: ${fieldToSetKey} -- idMapping: ${JSON.stringify(idMapping, null, 2)}`);
-                                    continue;
-                                }
-                                needsUpdate = true;
                                 const getCurrentDataFiltered = (currentData) => {
                                     if (Array.isArray(currentData.finalData[fieldToSetKey])) {
                                         return currentData.finalData[fieldToSetKey].filter((data) => `${data}` !== `${valueToMatch}`);
@@ -464,6 +462,13 @@ export class DataLoader {
                                 };
                                 // Get the current data to be updated
                                 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}`);
+                                    logger.info(`No data found for collection: ${targetCollectionKey} with value: ${valueToMatch} for field: ${fieldToSetKey} -- idMapping: ${JSON.stringify(idMapping, null, 2)}`);
+                                    continue;
+                                }
+                                needsUpdate = true;
                                 // Extract the new data to set
                                 const newData = foundData.map((data) => {
                                     const valueFound = this.getValueFromData(data.finalData, data.context, idMapping.targetField);
@@ -576,6 +581,11 @@ export class DataLoader {
      * @returns The transformed item with user-specific keys removed.
      */
     prepareUserData(item, attributeMappings, primaryKeyField, newId) {
+        if (this.userExistsMap.has(newId) ||
+            Array.from(this.emailToUserIdMap.values()).includes(newId) ||
+            Array.from(this.phoneToUserIdMap.values()).includes(newId)) {
+            newId = this.getTrueUniqueId(this.getCollectionKey("users"));
+        }
         let transformedItem = this.transformData(item, attributeMappings);
         const userData = AuthUserCreateSchema.safeParse(transformedItem);
         if (!userData.success || !(userData.data.email && userData.data.phone)) {
@@ -808,7 +818,18 @@ export class DataLoader {
                     updatedData.data[i].context.userId === existingId) {
                     updatedData.data[i].finalData = this.mergeObjects(updatedData.data[i].finalData, transformedItem);
                     updatedData.data[i].context = this.mergeObjects(updatedData.data[i].context, context);
-                    updatedData.data[i].importDef = this.mergeObjects(updatedData.data[i].importDef, newImportDef);
+                    const mergedImportDef = {
+                        ...updatedData.data[i].importDef,
+                        idMappings: [
+                            ...(updatedData.data[i].importDef?.idMappings || []),
+                            ...(newImportDef.idMappings || []),
+                        ],
+                        attributeMappings: [
+                            ...(updatedData.data[i].importDef?.attributeMappings || []),
+                            ...(newImportDef.attributeMappings || []),
+                        ],
+                    };
+                    updatedData.data[i].importDef = mergedImportDef;
                     this.importMap.set(this.getCollectionKey(collection.name), updatedData);
                     this.oldIdToNewIdPerCollectionMap.set(this.getCollectionKey(collection.name), collectionOldIdToNewIdMap);
                     foundData = true;

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.63",
+  "version": "0.0.65",
   "main": "src/main.ts",
   "type": "module",
   "repository": {
@@ -33,7 +33,7 @@
   },
   "dependencies": {
     "@types/inquirer": "^9.0.7",
-    "appwrite-utils": "^0.3.1",
+    "appwrite-utils": "^0.3.2",
     "commander": "^12.0.0",
     "inquirer": "^9.2.20",
     "js-yaml": "^4.1.0",

package/src/migrations/dataLoader.ts

@@ -348,6 +348,11 @@ export class DataLoader {
           userId: user.$id,
           docId: user.$id,
         },
+        context: {
+          ...user,
+          userId: user.$id,
+          docId: user.$id,
+        },
         rawData: user,
       });
       this.importMap.set(this.getCollectionKey("users"), importData);
@@ -571,6 +576,20 @@ export class DataLoader {
                     );
                   }
                 );
+
+                const getCurrentDataFiltered = (currentData: any) => {
+                  if (Array.isArray(currentData.finalData[fieldToSetKey])) {
+                    return currentData.finalData[fieldToSetKey].filter(
+                      (data: any) => `${data}` !== `${valueToMatch}`
+                    );
+                  }
+                  return currentData.finalData[fieldToSetKey];
+                };
+
+                // Get the current data to be updated
+                const currentDataFiltered = getCurrentDataFiltered(
+                  collectionData.data[i]
+                );
                 // Log and skip if no matching data found
                 if (!foundData.length) {
                   console.log(
@@ -588,20 +607,6 @@ export class DataLoader {
 
                 needsUpdate = true;
 
-                const getCurrentDataFiltered = (currentData: any) => {
-                  if (Array.isArray(currentData.finalData[fieldToSetKey])) {
-                    return currentData.finalData[fieldToSetKey].filter(
-                      (data: any) => `${data}` !== `${valueToMatch}`
-                    );
-                  }
-                  return currentData.finalData[fieldToSetKey];
-                };
-
-                // Get the current data to be updated
-                const currentDataFiltered = getCurrentDataFiltered(
-                  collectionData.data[i]
-                );
-
                 // Extract the new data to set
                 const newData = foundData.map((data) => {
                   const valueFound = this.getValueFromData(
@@ -755,6 +760,13 @@ export class DataLoader {
       finalData: z.infer<typeof AuthUserCreateSchema>;
     };
   } {
+    if (
+      this.userExistsMap.has(newId) ||
+      Array.from(this.emailToUserIdMap.values()).includes(newId) ||
+      Array.from(this.phoneToUserIdMap.values()).includes(newId)
+    ) {
+      newId = this.getTrueUniqueId(this.getCollectionKey("users"));
+    }
     let transformedItem = this.transformData(item, attributeMappings);
     const userData = AuthUserCreateSchema.safeParse(transformedItem);
     if (!userData.success || !(userData.data.email && userData.data.phone)) {
@@ -1057,10 +1069,18 @@ export class DataLoader {
             updatedData.data[i].context,
             context
           );
-          updatedData.data[i].importDef = this.mergeObjects(
-            updatedData.data[i].importDef,
-            newImportDef
-          );
+          const mergedImportDef = {
+            ...updatedData.data[i].importDef,
+            idMappings: [
+              ...(updatedData.data[i].importDef?.idMappings || []),
+              ...(newImportDef.idMappings || []),
+            ],
+            attributeMappings: [
+              ...(updatedData.data[i].importDef?.attributeMappings || []),
+              ...(newImportDef.attributeMappings || []),
+            ],
+          };
+          updatedData.data[i].importDef = mergedImportDef as ImportDef;
           this.importMap.set(
             this.getCollectionKey(collection.name),
             updatedData