appwrite-utils-cli 0.0.272 → 0.0.273

package/README.md

@@ -118,6 +118,7 @@ This setup ensures that developers have robust tools at their fingertips to mana
 
 ### Changelog
 
+- 0.0.273: Small fix for relationship attribute comparisons
 - 0.0.272: That's what I get for not testing lmao, also updated logic for checking for existing attributes to take the `format` into consideration from the database (URL's are not of `type: "url"`, they are of `format: "url"`)
 - 0.0.271: Small change to update attributes that are different from each other by deleting the attribute and recreating, as we cannot update most things
 - 0.0.270: Fixed enums in `--sync`, added optional OpenAPI generation (in progress, almost done, but wanted to push other changes), added `--endpoint`, `--project`, `--key` as optional parameters to change the target destination (shoutout to [pingu24k](https://github.com/pingu2k4) for pointing out these bugs and suggesting those changes for endpoint customization)

package/dist/migrations/attributes.js

@@ -4,8 +4,17 @@ import { nameToIdMapping, enqueueOperation } from "./queue.js";
 import _ from "lodash";
 const attributesSame = (a, b) => {
     // Direct type comparison for non-string types
+    // Also check if the type IS string and has a format for either
+    // That means the format is the type of the attribute
     if (a.type === b.type &&
         !((a.type === "string" && a.format) || (b.type === "string" && b.format))) {
+        if (a.type === "relationship" && b.type === "relationship") {
+            return (a.key === b.key &&
+                a.relationType === b.relationType &&
+                a.twoWay === b.twoWay &&
+                a.twoWayKey === b.twoWayKey &&
+                a.required === b.required);
+        }
         return a.key === b.key && a.array === b.array && a.required === b.required;
     }
     if (a.type === "string" && a.format) {
@@ -42,7 +51,7 @@ export const createOrUpdateAttribute = async (db, dbId, collection, attribute) =
         return;
     }
     else if (foundAttribute && !attributesSame(foundAttribute, attribute)) {
-        console.log(`Deleting attribute with same key ${attribute.key} -- ${foundAttribute.key} but different values, assuming update...`);
+        console.log(`Deleting attribute with same key ${attribute.key} -- ${foundAttribute.key} but different values -- ${JSON.stringify(attribute, null, 2)} -- ${JSON.stringify(foundAttribute, null, 2)}`);
         await db.deleteAttribute(dbId, collection.$id, attribute.key);
     }
     // Relationship attribute logic with adjustments

package/dist/migrations/schema.js

@@ -335,8 +335,9 @@ export const parseAttribute = (attribute) => {
     if (attribute.type === "string" &&
         attribute.format &&
         attribute.format.length > 0) {
+        console.log(`Parsing attribute ${attribute.key} with format ${attribute.format}, setting type to ${attribute.format.toLowerCase()}`);
         // @ts-expect-error
-        attribute.type = attribute.format;
+        attribute.type = attribute.format.toLowerCase();
         delete attribute.format;
     }
     if (attribute.type === "string") {

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

package/src/migrations/attributes.ts

@@ -5,10 +5,21 @@ import _ from "lodash";
 
 const attributesSame = (a: Attribute, b: Attribute) => {
   // Direct type comparison for non-string types
+  // Also check if the type IS string and has a format for either
+  // That means the format is the type of the attribute
   if (
     a.type === b.type &&
     !((a.type === "string" && a.format) || (b.type === "string" && b.format))
   ) {
+    if (a.type === "relationship" && b.type === "relationship") {
+      return (
+        a.key === b.key &&
+        a.relationType === b.relationType &&
+        a.twoWay === b.twoWay &&
+        a.twoWayKey === b.twoWayKey &&
+        a.required === b.required
+      );
+    }
     return a.key === b.key && a.array === b.array && a.required === b.required;
   }
 
@@ -55,7 +66,13 @@ export const createOrUpdateAttribute = async (
     return;
   } else if (foundAttribute && !attributesSame(foundAttribute, attribute)) {
     console.log(
-      `Deleting attribute with same key ${attribute.key} -- ${foundAttribute.key} but different values, assuming update...`
+      `Deleting attribute with same key ${attribute.key} -- ${
+        foundAttribute.key
+      } but different values -- ${JSON.stringify(
+        attribute,
+        null,
+        2
+      )} -- ${JSON.stringify(foundAttribute, null, 2)}`
     );
     await db.deleteAttribute(dbId, collection.$id, attribute.key);
   }

package/src/migrations/schema.ts

@@ -415,8 +415,13 @@ export const parseAttribute = (
     attribute.format &&
     attribute.format.length > 0
   ) {
+    console.log(
+      `Parsing attribute ${attribute.key} with format ${
+        attribute.format
+      }, setting type to ${attribute.format.toLowerCase()}`
+    );
     // @ts-expect-error
-    attribute.type = attribute.format;
+    attribute.type = attribute.format.toLowerCase();
     delete attribute.format;
   }
   if (attribute.type === "string") {