appwrite-utils-cli 0.0.68 → 0.0.69

package/README.md

@@ -132,6 +132,7 @@ This setup ensures that developers have robust tools at their fingertips to mana
 
 ### Changelog
 
+- 0.0.69: Fixed single ID not getting replaced due to the below change =D also, `nice`
 - 0.0.68: Fixed the occasional case where, when mapping ID's from old data to new, there would be an array of ID's to match against. `idMappings` now supports arrays.
 - 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

package/dist/migrations/afterImportActions.js

@@ -229,6 +229,10 @@ export const afterImportActions = {
             // console.log(
             //   `Processing field ${fieldName} in collection ${collId} for document ${docId} in database ${dbId} in bucket ${bucketId} with path ${filePath} and name ${fileName}...`
             // );
+            if (filePath.length === 0 || fileName.length === 0) {
+                console.error(`File path or name is empty for field ${fieldName} in collection ${collId}, skipping...`);
+                return;
+            }
             let isArray = false;
             if (!attribute) {
                 console.log(`Field ${fieldName} not found in collection ${collId}, weird, skipping...`);

package/dist/migrations/dataLoader.d.ts

@@ -74,6 +74,15 @@ export declare const CollectionImportDataSchema: z.ZodObject<{
             error?: string | undefined;
             xdefault?: number | null | undefined;
             min?: number | undefined;
+            /**
+             * Prepares the data for creating user collection documents.
+             * This involves loading the data, transforming it according to the import definition,
+             * and handling the creation of new unique IDs for each item.
+             *
+             * @param db - The database configuration.
+             * @param collection - The collection configuration.
+             * @param importDef - The import definition containing the attribute mappings and other relevant info.
+             */
             max?: number | undefined;
         }, {
             key: string;
@@ -666,16 +675,7 @@ export declare const CollectionImportDataSchema: z.ZodObject<{
                 converters?: string[] | undefined;
                 validationActions?: {
                     params: string[];
-                    action: string; /**
-                     * 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.
-                     */
+                    action: string;
                 }[] | undefined;
                 postImportActions?: {
                     params: (string | Record<string, any>)[];
@@ -1295,16 +1295,7 @@ export declare const CollectionImportDataSchema: z.ZodObject<{
                 converters?: string[] | undefined;
                 validationActions?: {
                     params: string[];
-                    action: string; /**
-                     * 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.
-                     */
+                    action: string;
                 }[] | undefined;
                 postImportActions?: {
                     params: (string | Record<string, any>)[];
@@ -1708,16 +1699,7 @@ export declare class DataLoader {
                     converters?: string[] | undefined;
                     validationActions?: {
                         params: string[];
-                        action: string; /**
-                         * 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.
-                         */
+                        action: string;
                     }[] | undefined;
                     postImportActions?: {
                         params: (string | Record<string, any>)[];

package/dist/migrations/dataLoader.js

@@ -453,9 +453,9 @@ export class DataLoader {
                                     continue;
                                 // Handle cases where sourceValue is an array
                                 const sourceValues = Array.isArray(sourceValue)
-                                    ? sourceValue
-                                    : [sourceValue];
-                                const newData = [];
+                                    ? sourceValue.map((sourceValue) => `${sourceValue}`)
+                                    : [`${sourceValue}`];
+                                let newData = [];
                                 for (const valueToMatch of sourceValues) {
                                     // Find matching data in the target collection
                                     const foundData = targetCollectionData.data.filter(({ context, finalData }) => {
@@ -468,12 +468,14 @@ export class DataLoader {
                                     });
                                     if (foundData.length) {
                                         newData.push(...foundData.map((data) => {
-                                            return this.getValueFromData(data.finalData, data.context, idMapping.targetField);
+                                            const newValue = this.getValueFromData(data.finalData, data.context, idMapping.targetField);
+                                            return newValue;
                                         }));
                                     }
                                     else {
                                         logger.info(`No data found for collection: ${targetCollectionKey} with value: ${valueToMatch} for field: ${fieldToSetKey} -- idMapping: ${JSON.stringify(idMapping, null, 2)}`);
                                     }
+                                    continue;
                                 }
                                 const getCurrentDataFiltered = (currentData) => {
                                     if (Array.isArray(currentData.finalData[fieldToSetKey])) {
@@ -511,7 +513,8 @@ export class DataLoader {
                                                         ...newData,
                                                     ].filter((value) => value !== null &&
                                                         value !== undefined &&
-                                                        value !== "")),
+                                                        value !== "" &&
+                                                        !sourceValues.includes(`${value}`))),
                                                 ];
                                             }
                                         }
@@ -528,7 +531,8 @@ export class DataLoader {
                                             collectionData.data[i].finalData[fieldToSetKey] = [
                                                 ...new Set([currentDataFiltered, ...newData].filter((value) => value !== null &&
                                                     value !== undefined &&
-                                                    value !== "")),
+                                                    value !== "" &&
+                                                    !sourceValues.includes(`${value}`))),
                                             ].slice(0, 1)[0];
                                         }
                                         else if (!Array.isArray(newData) &&

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

package/src/migrations/afterImportActions.ts

@@ -433,6 +433,13 @@ export const afterImportActions = {
       // console.log(
       //   `Processing field ${fieldName} in collection ${collId} for document ${docId} in database ${dbId} in bucket ${bucketId} with path ${filePath} and name ${fileName}...`
       // );
+      if (filePath.length === 0 || fileName.length === 0) {
+        console.error(
+          `File path or name is empty for field ${fieldName} in collection ${collId}, skipping...`
+        );
+        return;
+      }
+
       let isArray = false;
       if (!attribute) {
         console.log(

package/src/migrations/dataLoader.ts

@@ -567,9 +567,9 @@ export class DataLoader {
 
                 // Handle cases where sourceValue is an array
                 const sourceValues = Array.isArray(sourceValue)
-                  ? sourceValue
-                  : [sourceValue];
-                const newData = [];
+                  ? sourceValue.map((sourceValue) => `${sourceValue}`)
+                  : [`${sourceValue}`];
+                let newData = [];
 
                 for (const valueToMatch of sourceValues) {
                   // Find matching data in the target collection
@@ -593,11 +593,12 @@ export class DataLoader {
                   if (foundData.length) {
                     newData.push(
                       ...foundData.map((data) => {
-                        return this.getValueFromData(
+                        const newValue = this.getValueFromData(
                           data.finalData,
                           data.context,
                           idMapping.targetField
                         );
+                        return newValue;
                       })
                     );
                   } else {
@@ -609,6 +610,7 @@ export class DataLoader {
                       )}`
                     );
                   }
+                  continue;
                 }
 
                 const getCurrentDataFiltered = (currentData: any) => {
@@ -660,7 +662,8 @@ export class DataLoader {
                               (value: any) =>
                                 value !== null &&
                                 value !== undefined &&
-                                value !== ""
+                                value !== "" &&
+                                !sourceValues.includes(`${value}`)
                             )
                           ),
                         ];
@@ -680,7 +683,8 @@ export class DataLoader {
                             (value: any) =>
                               value !== null &&
                               value !== undefined &&
-                              value !== ""
+                              value !== "" &&
+                              !sourceValues.includes(`${value}`)
                           )
                         ),
                       ].slice(0, 1)[0];