appwrite-utils-cli 0.9.53 → 0.9.55

package/README.md

@@ -124,6 +124,8 @@ This updated CLI ensures that developers have robust tools at their fingertips t
 
 ## Changelog
 
+- 0.9.55: Updated to use `node-appwrite@14` for appwrite 1.6.0
+- 0.9.54: Added small delay (`100ms`) between collection deletions, reduced other delays from `1000` to `500/250ms`
 - 0.9.53: Reduced delay, went too far
 - 0.9.52: Add delay after creating indexes, attributes, and others to prevent `fetch failed` errors during large-scale collection creation
 - 0.9.51: Fix transfer databases, remove "ensure duplicates" check

package/dist/collections/attributes.js

@@ -11,61 +11,48 @@ const attributesSame = (databaseAttribute, configAttribute) => {
 export const createOrUpdateAttribute = async (db, dbId, collection, attribute) => {
     let action = "create";
     let foundAttribute;
-    const updateEnabled = false;
     let finalAttribute = attribute;
     try {
         const collectionAttr = collection.attributes.find(
-        // @ts-expect-error
+        // @ts-ignore
         (attr) => attr.key === attribute.key);
         foundAttribute = parseAttribute(collectionAttr);
     }
     catch (error) {
         foundAttribute = undefined;
     }
-    if (foundAttribute &&
-        attributesSame(foundAttribute, attribute) &&
-        updateEnabled) {
-        // Check if mutable properties have changed and set action to "update" if necessary
+    if (foundAttribute) {
+        // Check if any properties have changed
         const requiredChanged = "required" in foundAttribute && "required" in attribute
             ? foundAttribute.required !== attribute.required
             : false;
-        // const xdefaultChanged =
-        //   "xdefault" in foundAttribute && "xdefault" in attribute
-        //     ? foundAttribute.xdefault !== attribute.xdefault
-        //     : false;
+        const xdefaultChanged = "xdefault" in foundAttribute && "xdefault" in attribute
+            ? foundAttribute.xdefault !== attribute.xdefault
+            : false;
         const onDeleteChanged = foundAttribute.type === "relationship" &&
             attribute.type === "relationship" &&
             "onDelete" in foundAttribute &&
             "onDelete" in attribute
             ? foundAttribute.onDelete !== attribute.onDelete
             : false;
-        if (requiredChanged || onDeleteChanged) {
-            console.log(`Required changed: ${requiredChanged}\nOnDelete changed: ${onDeleteChanged}`);
+        if (requiredChanged ||
+            xdefaultChanged ||
+            onDeleteChanged ||
+            !attributesSame(foundAttribute, attribute)) {
+            console.log(`Updating attribute: ${attribute.key}\nRequired changed: ${requiredChanged}\nDefault changed: ${xdefaultChanged}\nOnDelete changed: ${onDeleteChanged}`);
             console.log(`Found attribute: ${JSON.stringify(foundAttribute, null, 2)}`);
-            console.log(`Attribute: ${JSON.stringify(attribute, null, 2)}`);
+            console.log(`New attribute: ${JSON.stringify(attribute, null, 2)}`);
             finalAttribute = {
-                ...attribute,
                 ...foundAttribute,
+                ...attribute,
             };
             action = "update";
         }
         else {
-            // If no properties that can be updated have changed, return early
+            // If no properties have changed, return early
             return;
         }
     }
-    else if (foundAttribute &&
-        !attributesSame(foundAttribute, attribute) &&
-        updateEnabled) {
-        console.log(`Deleting attribute with same key ${attribute.key} -- but different values -- ${JSON.stringify(attribute, null, 2)} -- ${JSON.stringify(foundAttribute, null, 2)}`);
-        await db.deleteAttribute(dbId, collection.$id, attribute.key);
-        // After deletion, you might want to create the attribute anew
-        finalAttribute = attribute;
-        action = "create";
-    }
-    else if (!updateEnabled && foundAttribute) {
-        return;
-    }
     // Relationship attribute logic with adjustments
     let collectionFoundViaRelatedCollection;
     let relatedCollectionId;

package/dist/collections/indexes.js

@@ -8,10 +8,10 @@ export const createOrUpdateIndex = async (dbId, db, collectionId, index) => {
     let createIndex = false;
     let newIndex = null;
     if (existingIndex.total > 0 &&
-        existingIndex.indexes.some((index) => (index.key === index.key &&
-            index.type === index.type &&
-            index.attributes === index.attributes) ||
-            JSON.stringify(index) === JSON.stringify(index))) {
+        !existingIndex.indexes.some((existingIndex) => (existingIndex.key === index.key &&
+            existingIndex.type === index.type &&
+            existingIndex.attributes === index.attributes) ||
+            JSON.stringify(existingIndex) === JSON.stringify(index))) {
         await db.deleteIndex(dbId, collectionId, existingIndex.indexes[0].key);
         createIndex = true;
     }
@@ -24,6 +24,6 @@ export const createOrUpdateIndexes = async (dbId, db, collectionId, indexes) =>
     for (const index of indexes) {
         await tryAwaitWithRetry(async () => await createOrUpdateIndex(dbId, db, collectionId, index));
         // Add delay after each index creation/update
-        await delay(1000);
+        await delay(500);
     }
 };

package/dist/collections/methods.js

@@ -97,6 +97,7 @@ export const wipeDatabase = async (database, databaseId) => {
             collectionName: name,
         });
         tryAwaitWithRetry(async () => await database.deleteCollection(databaseId, collectionId)); // Try to delete the collection and ignore errors if it doesn't exist or if it's already being deleted
+        await delay(100);
     }
     return collectionsDeleted;
 };
@@ -174,16 +175,16 @@ export const createOrUpdateCollections = async (database, databaseId, config, de
             await tryAwaitWithRetry(async () => await database.updateCollection(databaseId, collectionToUse.$id, collection.name, permissions, collection.documentSecurity ?? false, collection.enabled ?? true));
         }
         // Add delay after creating/updating collection
-        await delay(1000);
+        await delay(250);
         // Update attributes and indexes for the collection
         console.log("Creating Attributes");
         await createUpdateCollectionAttributes(database, databaseId, collectionToUse, attributes);
         // Add delay after creating attributes
-        await delay(1000);
+        await delay(250);
         console.log("Creating Indexes");
         await createOrUpdateIndexes(databaseId, database, collectionToUse.$id, indexes ?? []);
         // Add delay after creating indexes
-        await delay(1000);
+        await delay(250);
     }
     // Process any remaining tasks in the queue
     await processQueue(database, databaseId);

package/dist/migrations/setupDatabase.js

@@ -1,7 +1,7 @@
 import { Databases, Query } from "node-appwrite";
 import { createOrUpdateAttribute } from "./attributes.js";
 import { getMigrationCollectionSchemas } from "./backup.js";
-import { areCollectionNamesSame, toCamelCase, tryAwaitWithRetry, } from "../utils/index.js";
+import { areCollectionNamesSame, delay, toCamelCase, tryAwaitWithRetry, } from "../utils/index.js";
 import {} from "appwrite-utils";
 import { ulid } from "ulidx";
 export const setupMigrationDatabase = async (config) => {
@@ -48,6 +48,7 @@ export const setupMigrationDatabase = async (config) => {
         for (const attribute of attributes) {
             try {
                 await createOrUpdateAttribute(database, db.$id, collectionFound, attribute);
+                await delay(100);
                 console.log(`Attribute created/updated: ${attribute.key}`);
             }
             catch (attrError) {

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.53",
+  "version": "0.9.55",
   "main": "src/main.ts",
   "type": "module",
   "repository": {
@@ -38,7 +38,7 @@
     "lodash": "^4.17.21",
     "luxon": "^3.5.0",
     "nanostores": "^0.10.3",
-    "node-appwrite": "^13.0.0",
+    "node-appwrite": "^14.1.0",
     "tsx": "^4.17.0",
     "ulidx": "^2.4.0",
     "winston": "^3.14.2",

package/src/collections/attributes.ts

@@ -27,11 +27,10 @@ export const createOrUpdateAttribute = async (
 ): Promise<void> => {
   let action = "create";
   let foundAttribute: Attribute | undefined;
-  const updateEnabled = false;
   let finalAttribute: any = attribute;
   try {
     const collectionAttr = collection.attributes.find(
-      // @ts-expect-error
+      // @ts-ignore
       (attr) => attr.key === attribute.key
     ) as unknown as any;
     foundAttribute = parseAttribute(collectionAttr);
@@ -39,21 +38,17 @@ export const createOrUpdateAttribute = async (
     foundAttribute = undefined;
   }
 
-  if (
-    foundAttribute &&
-    attributesSame(foundAttribute, attribute) &&
-    updateEnabled
-  ) {
-    // Check if mutable properties have changed and set action to "update" if necessary
+  if (foundAttribute) {
+    // Check if any properties have changed
     const requiredChanged =
       "required" in foundAttribute && "required" in attribute
         ? foundAttribute.required !== attribute.required
         : false;
 
-    // const xdefaultChanged =
-    //   "xdefault" in foundAttribute && "xdefault" in attribute
-    //     ? foundAttribute.xdefault !== attribute.xdefault
-    //     : false;
+    const xdefaultChanged =
+      "xdefault" in foundAttribute && "xdefault" in attribute
+        ? foundAttribute.xdefault !== attribute.xdefault
+        : false;
 
     const onDeleteChanged =
       foundAttribute.type === "relationship" &&
@@ -63,43 +58,28 @@ export const createOrUpdateAttribute = async (
         ? foundAttribute.onDelete !== attribute.onDelete
         : false;
 
-    if (requiredChanged || onDeleteChanged) {
+    if (
+      requiredChanged ||
+      xdefaultChanged ||
+      onDeleteChanged ||
+      !attributesSame(foundAttribute, attribute)
+    ) {
       console.log(
-        `Required changed: ${requiredChanged}\nOnDelete changed: ${onDeleteChanged}`
+        `Updating attribute: ${attribute.key}\nRequired changed: ${requiredChanged}\nDefault changed: ${xdefaultChanged}\nOnDelete changed: ${onDeleteChanged}`
       );
       console.log(
         `Found attribute: ${JSON.stringify(foundAttribute, null, 2)}`
       );
-      console.log(`Attribute: ${JSON.stringify(attribute, null, 2)}`);
+      console.log(`New attribute: ${JSON.stringify(attribute, null, 2)}`);
       finalAttribute = {
-        ...attribute,
         ...foundAttribute,
+        ...attribute,
       };
       action = "update";
     } else {
-      // If no properties that can be updated have changed, return early
+      // If no properties have changed, return early
       return;
     }
-  } else if (
-    foundAttribute &&
-    !attributesSame(foundAttribute, attribute) &&
-    updateEnabled
-  ) {
-    console.log(
-      `Deleting attribute with same key ${
-        attribute.key
-      } -- but different values -- ${JSON.stringify(
-        attribute,
-        null,
-        2
-      )} -- ${JSON.stringify(foundAttribute, null, 2)}`
-    );
-    await db.deleteAttribute(dbId, collection.$id, attribute.key);
-    // After deletion, you might want to create the attribute anew
-    finalAttribute = attribute;
-    action = "create";
-  } else if (!updateEnabled && foundAttribute) {
-    return;
   }
 
   // Relationship attribute logic with adjustments

package/src/collections/indexes.ts

@@ -15,12 +15,12 @@ export const createOrUpdateIndex = async (
   let newIndex: Models.Index | null = null;
   if (
     existingIndex.total > 0 &&
-    existingIndex.indexes.some(
-      (index) =>
-        (index.key === index.key &&
-          index.type === index.type &&
-          index.attributes === index.attributes) ||
-        JSON.stringify(index) === JSON.stringify(index)
+    !existingIndex.indexes.some(
+      (existingIndex) =>
+        (existingIndex.key === index.key &&
+          existingIndex.type === index.type &&
+          existingIndex.attributes === index.attributes) ||
+        JSON.stringify(existingIndex) === JSON.stringify(index)
     )
   ) {
     await db.deleteIndex(dbId, collectionId, existingIndex.indexes[0].key);
@@ -50,6 +50,6 @@ export const createOrUpdateIndexes = async (
       async () => await createOrUpdateIndex(dbId, db, collectionId, index)
     );
     // Add delay after each index creation/update
-    await delay(1000);
+    await delay(500);
   }
 };

package/src/collections/methods.ts

@@ -141,6 +141,7 @@ export const wipeDatabase = async (
     tryAwaitWithRetry(
       async () => await database.deleteCollection(databaseId, collectionId)
     ); // Try to delete the collection and ignore errors if it doesn't exist or if it's already being deleted
+    await delay(100);
   }
   return collectionsDeleted;
 };
@@ -261,7 +262,7 @@ export const createOrUpdateCollections = async (
     }
 
     // Add delay after creating/updating collection
-    await delay(1000);
+    await delay(250);
 
     // Update attributes and indexes for the collection
     console.log("Creating Attributes");
@@ -273,7 +274,7 @@ export const createOrUpdateCollections = async (
     );
 
     // Add delay after creating attributes
-    await delay(1000);
+    await delay(250);
 
     console.log("Creating Indexes");
     await createOrUpdateIndexes(
@@ -284,7 +285,7 @@ export const createOrUpdateCollections = async (
     );
 
     // Add delay after creating indexes
-    await delay(1000);
+    await delay(250);
   }
   // Process any remaining tasks in the queue
   await processQueue(database, databaseId);

package/src/migrations/setupDatabase.ts

@@ -3,6 +3,7 @@ import { createOrUpdateAttribute } from "./attributes.js";
 import { getMigrationCollectionSchemas } from "./backup.js";
 import {
   areCollectionNamesSame,
+  delay,
   toCamelCase,
   tryAwaitWithRetry,
 } from "../utils/index.js";
@@ -87,6 +88,7 @@ export const setupMigrationDatabase = async (config: AppwriteConfig) => {
           collectionFound,
           attribute
         );
+        await delay(100);
         console.log(`Attribute created/updated: ${attribute.key}`);
       } catch (attrError) {
         console.error(