appwrite-utils-cli 0.9.68 → 0.9.70

package/README.md

@@ -124,6 +124,7 @@ This updated CLI ensures that developers have robust tools at their fingertips t
 
 ## Changelog
 
+- 0.9.70: I think I stopped it from deleting attributes, my bad on that
 - 0.9.68: Temporarily disabled updating Attributes until `updateStringAttribute` is fixed -- it just deletes them now
 - 0.9.65: Temporary fix for Appwrite's `updateStringAttribute` bug
 - 0.9.64: Fixed string attribute requiring xdefault

package/dist/migrations/attributes.js

@@ -4,7 +4,53 @@ import { nameToIdMapping, enqueueOperation } from "./queue.js";
 import _ from "lodash";
 import { tryAwaitWithRetry } from "../utils/helperFunctions.js";
 const attributesSame = (databaseAttribute, configAttribute) => {
-    return databaseAttribute.key === configAttribute.key;
+    const attributesToCheck = [
+        'key',
+        'type',
+        'array',
+        'encrypted',
+        'required',
+        'size',
+        'min',
+        'max',
+        'xdefault',
+        'elements',
+        'relationType',
+        'twoWay',
+        'twoWayKey',
+        'onDelete',
+        'relatedCollection'
+    ];
+    return attributesToCheck.every(attr => {
+        // Check if both objects have the attribute
+        const dbHasAttr = attr in databaseAttribute;
+        const configHasAttr = attr in configAttribute;
+        // If both have the attribute, compare values
+        if (dbHasAttr && configHasAttr) {
+            const dbValue = databaseAttribute[attr];
+            const configValue = configAttribute[attr];
+            // Consider undefined and null as equivalent
+            if ((dbValue === undefined || dbValue === null) && (configValue === undefined || configValue === null)) {
+                return true;
+            }
+            return dbValue === configValue;
+        }
+        // If neither has the attribute, consider it the same
+        if (!dbHasAttr && !configHasAttr) {
+            return true;
+        }
+        // If one has the attribute and the other doesn't, check if it's undefined or null
+        if (dbHasAttr && !configHasAttr) {
+            const dbValue = databaseAttribute[attr];
+            return dbValue === undefined || dbValue === null;
+        }
+        if (!dbHasAttr && configHasAttr) {
+            const configValue = configAttribute[attr];
+            return configValue === undefined || configValue === null;
+        }
+        // If we reach here, the attributes are different
+        return false;
+    });
 };
 export const createOrUpdateAttribute = async (db, dbId, collection, attribute) => {
     let action = "create";
@@ -32,12 +78,12 @@ export const createOrUpdateAttribute = async (db, dbId, collection, attribute) =
         finalAttribute = attribute;
         action = "update";
     }
-    else if (!updateEnabled && foundAttribute) {
+    else if (!updateEnabled && foundAttribute && !attributesSame(foundAttribute, attribute)) {
         await db.deleteAttribute(dbId, collection.$id, attribute.key);
-        console.log(`Deleted attribute: ${attribute.key} to recreate it (update disabled temporarily)`);
+        console.log(`Deleted attribute: ${attribute.key} to recreate it because they diff (update disabled temporarily)`);
         return;
     }
-    console.log(`${action}-ing attribute: ${finalAttribute.key}`);
+    // console.log(`${action}-ing attribute: ${finalAttribute.key}`);
     // Relationship attribute logic with adjustments
     let collectionFoundViaRelatedCollection;
     let relatedCollectionId;

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

package/src/migrations/attributes.ts

@@ -12,7 +12,61 @@ const attributesSame = (
   databaseAttribute: Attribute,
   configAttribute: Attribute
 ): boolean => {
-  return databaseAttribute.key === configAttribute.key;
+  const attributesToCheck = [
+    'key',
+    'type',
+    'array',
+    'encrypted',
+    'required',
+    'size',
+    'min',
+    'max',
+    'xdefault',
+    'elements',
+    'relationType',
+    'twoWay',
+    'twoWayKey',
+    'onDelete',
+    'relatedCollection'
+  ];
+
+  return attributesToCheck.every(attr => {
+    // Check if both objects have the attribute
+    const dbHasAttr = attr in databaseAttribute;
+    const configHasAttr = attr in configAttribute;
+
+    // If both have the attribute, compare values
+    if (dbHasAttr && configHasAttr) {
+      const dbValue = databaseAttribute[attr as keyof typeof databaseAttribute];
+      const configValue = configAttribute[attr as keyof typeof configAttribute];
+
+      // Consider undefined and null as equivalent
+      if ((dbValue === undefined || dbValue === null) && (configValue === undefined || configValue === null)) {
+        return true;
+      }
+
+      return dbValue === configValue;
+    }
+
+    // If neither has the attribute, consider it the same
+    if (!dbHasAttr && !configHasAttr) {
+      return true;
+    }
+
+    // If one has the attribute and the other doesn't, check if it's undefined or null
+    if (dbHasAttr && !configHasAttr) {
+      const dbValue = databaseAttribute[attr as keyof typeof databaseAttribute];
+      return dbValue === undefined || dbValue === null;
+    }
+
+    if (!dbHasAttr && configHasAttr) {
+      const configValue = configAttribute[attr as keyof typeof configAttribute];
+      return configValue === undefined || configValue === null;
+    }
+
+    // If we reach here, the attributes are different
+    return false;
+  });
 };
 
 export const createOrUpdateAttribute = async (
@@ -47,13 +101,13 @@ export const createOrUpdateAttribute = async (
     );
     finalAttribute = attribute;
     action = "update";
-  } else if (!updateEnabled && foundAttribute) {
+  } else if (!updateEnabled && foundAttribute && !attributesSame(foundAttribute, attribute)) {
     await db.deleteAttribute(dbId, collection.$id, attribute.key);
-    console.log(`Deleted attribute: ${attribute.key} to recreate it (update disabled temporarily)`);
+    console.log(`Deleted attribute: ${attribute.key} to recreate it because they diff (update disabled temporarily)`);
     return;
   }
 
-  console.log(`${action}-ing attribute: ${finalAttribute.key}`);
+  // console.log(`${action}-ing attribute: ${finalAttribute.key}`);
 
   // Relationship attribute logic with adjustments
   let collectionFoundViaRelatedCollection: Models.Collection | undefined;