appwrite-utils-cli 0.0.52 → 0.0.53

package/dist/migrations/dataLoader.d.ts

@@ -192,14 +192,7 @@ export declare const CollectionImportDataSchema: z.ZodObject<{
             type: z.ZodLiteral<"ip">;
             error: z.ZodOptional<z.ZodDefault<z.ZodString>>;
             required: z.ZodOptional<z.ZodDefault<z.ZodBoolean>>;
-            array: z.ZodOptional<z.ZodDefault<z.ZodBoolean>>; /**
-             * Prepares the data for creating documents in a collection.
-             * This involves loading the data, transforming it, and handling ID mappings.
-             *
-             * @param db - The database configuration.
-             * @param collection - The collection configuration.
-             * @param importDef - The import definition containing the attribute mappings and other relevant info.
-             */
+            array: z.ZodOptional<z.ZodDefault<z.ZodBoolean>>;
             xdefault: z.ZodOptional<z.ZodNullable<z.ZodString>>;
             description: z.ZodOptional<z.ZodNullable<z.ZodUnion<[z.ZodString, z.ZodRecord<z.ZodString, z.ZodString>]>>>;
         }, "strip", z.ZodTypeAny, {

package/dist/migrations/dataLoader.js

@@ -357,73 +357,6 @@ export class DataLoader {
         }
         let needsUpdate = false;
         let numUpdates = 0;
-        // Collect primary key fields from the users collection definitions
-        this.config.collections.forEach((collection) => {
-            if (this.getCollectionKey(collection.name) === usersCollectionKey) {
-                const collectionImportDefs = collection.importDefs;
-                if (!collectionImportDefs || !collectionImportDefs.length) {
-                    return;
-                }
-                collectionImportDefs.forEach((importDef) => {
-                    if (importDef.primaryKeyField) {
-                        usersCollectionPrimaryKeyFields.add(importDef.primaryKeyField);
-                    }
-                });
-            }
-        });
-        console.log(`Primary key fields collected for users collection: ${[
-            ...usersCollectionPrimaryKeyFields,
-        ]}`);
-        // Iterate over all collections to update references based on merged users
-        this.config.collections.forEach((collection) => {
-            const collectionData = this.importMap.get(this.getCollectionKey(collection.name));
-            if (!collectionData || !collectionData.data) {
-                console.log(`No data found for collection ${collection.name}`);
-                return;
-            }
-            const collectionImportDefs = collection.importDefs;
-            if (!collectionImportDefs || !collectionImportDefs.length) {
-                console.log(`No import definitions found for collection ${collection.name}`);
-                return;
-            }
-            collectionImportDefs.forEach((importDef) => {
-                importDef.idMappings?.forEach((idMapping) => {
-                    if (this.getCollectionKey(idMapping.targetCollection) ===
-                        usersCollectionKey) {
-                        const fieldToSetKey = idMapping.fieldToSet || idMapping.sourceField;
-                        const targetFieldKey = idMapping.targetFieldToMatch || idMapping.targetField;
-                        if (usersCollectionPrimaryKeyFields.has(targetFieldKey)) {
-                            console.log(`Processing collection ${collection.name} with target field ${targetFieldKey}`);
-                            // Process each item in the collection
-                            collectionData.data.forEach((item) => {
-                                const oldId = item.finalData[idMapping.sourceField] ||
-                                    item.context[idMapping.sourceField];
-                                if (oldId === undefined || oldId === null) {
-                                    console.log(`Skipping item with undefined or null oldId in collection ${collection.name}`);
-                                    return;
-                                }
-                                const newId = this.mergedUserMap.get(`${oldId}`);
-                                if (newId) {
-                                    needsUpdate = true;
-                                    numUpdates++;
-                                    console.log(`Updating old ID ${oldId} to new ID ${newId} in collection ${collection.name}`);
-                                    // Update context to use new user ID
-                                    item.finalData[fieldToSetKey] = newId;
-                                    item.context[fieldToSetKey] = newId;
-                                }
-                                else {
-                                    console.log(`No new ID found for old ID ${oldId} in mergedUserMap.`);
-                                }
-                            });
-                        }
-                    }
-                });
-            });
-            if (needsUpdate) {
-                console.log(`Updated ${numUpdates} references for collection ${collection.name}`);
-                this.importMap.set(this.getCollectionKey(collection.name), collectionData);
-            }
-        });
     }
     updateOldReferencesForNew() {
         if (!this.config.collections) {
@@ -491,7 +424,12 @@ export class DataLoader {
                                     else {
                                         // Merge arrays if new data is non-empty array and filter for uniqueness
                                         collectionData.data[i].finalData[fieldToSetKey] = [
-                                            ...new Set([...currentDataFiltered, ...newData].filter((value) => `${value}` !== `${valueToMatch}`)),
+                                            ...new Set([
+                                                ...(Array.isArray(currentDataFiltered)
+                                                    ? currentDataFiltered
+                                                    : [currentDataFiltered]),
+                                                ...newData,
+                                            ].filter((value) => `${value}` !== `${valueToMatch}`)),
                                         ];
                                     }
                                 }

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

package/src/migrations/dataLoader.ts

@@ -441,108 +441,6 @@ export class DataLoader {
 
     let needsUpdate = false;
     let numUpdates = 0;
-
-    // Collect primary key fields from the users collection definitions
-    this.config.collections.forEach((collection) => {
-      if (this.getCollectionKey(collection.name) === usersCollectionKey) {
-        const collectionImportDefs = collection.importDefs;
-        if (!collectionImportDefs || !collectionImportDefs.length) {
-          return;
-        }
-        collectionImportDefs.forEach((importDef) => {
-          if (importDef.primaryKeyField) {
-            usersCollectionPrimaryKeyFields.add(importDef.primaryKeyField);
-          }
-        });
-      }
-    });
-
-    console.log(
-      `Primary key fields collected for users collection: ${[
-        ...usersCollectionPrimaryKeyFields,
-      ]}`
-    );
-
-    // Iterate over all collections to update references based on merged users
-    this.config.collections.forEach((collection) => {
-      const collectionData = this.importMap.get(
-        this.getCollectionKey(collection.name)
-      );
-
-      if (!collectionData || !collectionData.data) {
-        console.log(`No data found for collection ${collection.name}`);
-        return;
-      }
-
-      const collectionImportDefs = collection.importDefs;
-      if (!collectionImportDefs || !collectionImportDefs.length) {
-        console.log(
-          `No import definitions found for collection ${collection.name}`
-        );
-        return;
-      }
-
-      collectionImportDefs.forEach((importDef) => {
-        importDef.idMappings?.forEach((idMapping) => {
-          if (
-            this.getCollectionKey(idMapping.targetCollection) ===
-            usersCollectionKey
-          ) {
-            const fieldToSetKey = idMapping.fieldToSet || idMapping.sourceField;
-            const targetFieldKey =
-              idMapping.targetFieldToMatch || idMapping.targetField;
-
-            if (usersCollectionPrimaryKeyFields.has(targetFieldKey)) {
-              console.log(
-                `Processing collection ${collection.name} with target field ${targetFieldKey}`
-              );
-
-              // Process each item in the collection
-              collectionData.data.forEach((item) => {
-                const oldId =
-                  item.finalData[idMapping.sourceField] ||
-                  item.context[idMapping.sourceField];
-
-                if (oldId === undefined || oldId === null) {
-                  console.log(
-                    `Skipping item with undefined or null oldId in collection ${collection.name}`
-                  );
-                  return;
-                }
-
-                const newId = this.mergedUserMap.get(`${oldId}`);
-
-                if (newId) {
-                  needsUpdate = true;
-                  numUpdates++;
-                  console.log(
-                    `Updating old ID ${oldId} to new ID ${newId} in collection ${collection.name}`
-                  );
-
-                  // Update context to use new user ID
-                  item.finalData[fieldToSetKey] = newId;
-                  item.context[fieldToSetKey] = newId;
-                } else {
-                  console.log(
-                    `No new ID found for old ID ${oldId} in mergedUserMap.`
-                  );
-                }
-              });
-            }
-          }
-        });
-      });
-
-      if (needsUpdate) {
-        console.log(
-          `Updated ${numUpdates} references for collection ${collection.name}`
-        );
-        this.importMap.set(
-          this.getCollectionKey(collection.name),
-          collectionData
-        );
-      }
-    });
   }
 
   updateOldReferencesForNew() {
@@ -655,7 +553,12 @@ export class DataLoader {
                     // Merge arrays if new data is non-empty array and filter for uniqueness
                     collectionData.data[i].finalData[fieldToSetKey] = [
                       ...new Set(
-                        [...currentDataFiltered, ...newData].filter(
+                        [
+                          ...(Array.isArray(currentDataFiltered)
+                            ? currentDataFiltered
+                            : [currentDataFiltered]),
+                          ...newData,
+                        ].filter(
                           (value: any) => `${value}` !== `${valueToMatch}`
                         )
                       ),