appwrite-utils-cli 0.9.91 → 0.9.92

package/README.md

@@ -125,6 +125,7 @@ This updated CLI ensures that developers have robust tools at their fingertips t
 
 ## Changelog
 
+- 0.9.92: Fixed `createOrUpdateAttributes` so it deletes attributes that don't exist in local config when you are running `syncDb`. Also updated the database and collection selection, so it won't try and fetch the collections and databases that don't exist (ones you picked from local config) and error
 - 0.9.91: Fixed another webpack error, screw you react (but you're supported now so I guess not-screw-you)
 - 0.9.90: Fixed Webpack errors (why tf does webpack add an extra `default`...???)
 - 0.9.80: Fixed collections not being unique between local and remote

package/dist/collections/attributes.js

@@ -232,10 +232,28 @@ export const createOrUpdateAttribute = async (db, dbId, collection, attribute) =
 };
 export const createUpdateCollectionAttributes = async (db, dbId, collection, attributes) => {
     console.log(chalk.green(`Creating/Updating attributes for collection: ${collection.name}`));
+    // @ts-expect-error
+    const existingAttributes = collection.attributes.map((attr) => parseAttribute(attr)) || [];
+    const attributesToRemove = existingAttributes.filter((attr) => !attributes.some((a) => a.key === attr.key));
+    const indexesToRemove = collection.indexes.filter((index) => attributesToRemove.some((attr) => index.attributes.includes(attr.key)));
+    if (attributesToRemove.length > 0) {
+        if (indexesToRemove.length > 0) {
+            console.log(chalk.red(`Removing indexes as they rely on an attribute that is being removed: ${indexesToRemove.map((index) => index.key).join(", ")}`));
+            for (const index of indexesToRemove) {
+                await tryAwaitWithRetry(async () => await db.deleteIndex(dbId, collection.$id, index.key));
+                await delay(100);
+            }
+        }
+        for (const attr of attributesToRemove) {
+            console.log(chalk.red(`Removing attribute: ${attr.key} as it is no longer in the collection`));
+            await tryAwaitWithRetry(async () => await db.deleteAttribute(dbId, collection.$id, attr.key));
+            await delay(50);
+        }
+    }
     const batchSize = 3;
     for (let i = 0; i < attributes.length; i += batchSize) {
         const batch = attributes.slice(i, i + batchSize);
-        const attributePromises = batch.map((attribute) => createOrUpdateAttribute(db, dbId, collection, attribute));
+        const attributePromises = batch.map((attribute) => tryAwaitWithRetry(async () => await createOrUpdateAttribute(db, dbId, collection, attribute)));
         const results = await Promise.allSettled(attributePromises);
         results.forEach((result) => {
             if (result.status === "rejected") {
@@ -243,7 +261,7 @@ export const createUpdateCollectionAttributes = async (db, dbId, collection, att
             }
         });
         // Add delay after each batch
-        await delay(500);
+        await delay(200);
     }
     console.log(`Finished creating/updating attributes for collection: ${collection.name}`);
 };

package/dist/interactiveCLI.js

@@ -4,7 +4,7 @@ import { createEmptyCollection, setupDirsFiles } from "./utils/setupFiles.js";
 import { fetchAllDatabases } from "./databases/methods.js";
 import { fetchAllCollections } from "./collections/methods.js";
 import { listBuckets, createBucket } from "./storage/methods.js";
-import { Databases, Storage, Client, Compression, } from "node-appwrite";
+import { Databases, Storage, Client, Compression, Query, } from "node-appwrite";
 import { getClient } from "./utils/getClientFromConfig.js";
 import { parseAttribute, PermissionToAppwritePermission } from "appwrite-utils";
 import { ulid } from "ulidx";
@@ -130,7 +130,14 @@ export class InteractiveCLI {
     }
     async selectCollections(database, databasesClient, message, multiSelect = true) {
         await this.initControllerIfNeeded();
-        const collections = await fetchAllCollections(database.$id, databasesClient);
+        const dbExists = await databasesClient.list([Query.equal("name", database.name)]);
+        let collections = [];
+        if (dbExists.total === 0) {
+            console.log(chalk.red(`Database "${database.name}" does not exist, using only local collection options`));
+        }
+        else {
+            collections = await fetchAllCollections(database.$id, databasesClient);
+        }
         const configCollections = this.getLocalCollections();
         const collectionNames = collections.map((c) => c.name).concat(configCollections.map((c) => c.name));
         const allCollectionNamesUnique = Array.from(new Set(collectionNames));

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

package/src/collections/attributes.ts

@@ -471,11 +471,32 @@ export const createUpdateCollectionAttributes = async (
     chalk.green(`Creating/Updating attributes for collection: ${collection.name}`)
   );
 
+  // @ts-expect-error
+  const existingAttributes: Attribute[] = collection.attributes.map((attr) => parseAttribute(attr)) || [];
+
+  const attributesToRemove = existingAttributes.filter((attr) => !attributes.some((a) => a.key === attr.key));
+  const indexesToRemove = collection.indexes.filter((index) => attributesToRemove.some((attr) => index.attributes.includes(attr.key)));
+
+  if (attributesToRemove.length > 0) {
+    if (indexesToRemove.length > 0) {
+      console.log(chalk.red(`Removing indexes as they rely on an attribute that is being removed: ${indexesToRemove.map((index) => index.key).join(", ")}`));
+      for (const index of indexesToRemove) {
+        await tryAwaitWithRetry(async () => await db.deleteIndex(dbId, collection.$id, index.key));
+        await delay(100);
+      }
+    }
+    for (const attr of attributesToRemove) {
+      console.log(chalk.red(`Removing attribute: ${attr.key} as it is no longer in the collection`));
+      await tryAwaitWithRetry(async () => await db.deleteAttribute(dbId, collection.$id, attr.key));
+      await delay(50);
+    }
+  }
+
   const batchSize = 3;
   for (let i = 0; i < attributes.length; i += batchSize) {
     const batch = attributes.slice(i, i + batchSize);
     const attributePromises = batch.map((attribute) =>
-      createOrUpdateAttribute(db, dbId, collection, attribute)
+      tryAwaitWithRetry(async () => await createOrUpdateAttribute(db, dbId, collection, attribute))
     );
 
     const results = await Promise.allSettled(attributePromises);
@@ -486,7 +507,7 @@ export const createUpdateCollectionAttributes = async (
     });
 
     // Add delay after each batch
-    await delay(500);
+    await delay(200);
   }
   console.log(
     `Finished creating/updating attributes for collection: ${collection.name}`

package/src/interactiveCLI.ts

@@ -10,6 +10,7 @@ import {
   Client,
   type Models,
   Compression,
+  Query,
 } from "node-appwrite";
 import { getClient } from "./utils/getClientFromConfig.js";
 import type { TransferOptions } from "./migrations/transfer.js";
@@ -37,7 +38,7 @@ enum CHOICES {
 export class InteractiveCLI {
   private controller: UtilsController | undefined;
 
-  constructor(private currentDir: string) {}
+  constructor(private currentDir: string) { }
 
   async run(): Promise<void> {
     console.log(chalk.green("Welcome to Appwrite Utils CLI Tool by Zach Handley"));
@@ -129,12 +130,12 @@ export class InteractiveCLI {
       }
       return acc;
     }, [] as Models.Database[]);
-  
+
     const choices = allDatabases
       .sort((a, b) => a.name.localeCompare(b.name))
       .map((db) => ({ name: db.name, value: db }))
       .filter((db) => db.name.toLowerCase() !== "migrations");
-  
+
     const { selectedDatabases } = await inquirer.prompt([
       {
         type: multiSelect ? "checkbox" : "list",
@@ -145,7 +146,7 @@ export class InteractiveCLI {
         pageSize: 10,
       },
     ]);
-  
+
     return selectedDatabases;
   }
 
@@ -153,13 +154,19 @@ export class InteractiveCLI {
     database: Models.Database,
     databasesClient: Databases,
     message: string,
-    multiSelect = true 
+    multiSelect = true
   ): Promise<Models.Collection[]> {
     await this.initControllerIfNeeded();
-    const collections = await fetchAllCollections(
-      database.$id,
-      databasesClient
-    );
+    const dbExists = await databasesClient.list([Query.equal("name", database.name)]);
+    let collections: Models.Collection[] = [];
+    if (dbExists.total === 0) {
+      console.log(chalk.red(`Database "${database.name}" does not exist, using only local collection options`));
+    } else {
+      collections = await fetchAllCollections(
+        database.$id,
+        databasesClient
+      );
+    }
     const configCollections = this.getLocalCollections();
     const collectionNames = collections.map((c) => c.name).concat(configCollections.map((c) => c.name));
     const allCollectionNamesUnique = Array.from(new Set(collectionNames));
@@ -690,10 +697,10 @@ export class InteractiveCLI {
     let targetDatabases: Models.Database[];
     let remoteOptions:
       | {
-          transferEndpoint: string;
-          transferProject: string;
-          transferKey: string;
-        }
+        transferEndpoint: string;
+        transferProject: string;
+        transferKey: string;
+      }
       | undefined;
 
     if (isRemote) {
@@ -771,12 +778,12 @@ export class InteractiveCLI {
       const sourceStorage = new Storage(this.controller!.appwriteServer!);
       const targetStorage = isRemote
         ? new Storage(
-            getClient(
-              remoteOptions!.transferEndpoint,
-              remoteOptions!.transferProject,
-              remoteOptions!.transferKey
-            )
+          getClient(
+            remoteOptions!.transferEndpoint,
+            remoteOptions!.transferProject,
+            remoteOptions!.transferKey
           )
+        )
         : sourceStorage;
 
       const sourceBuckets = await listBuckets(sourceStorage);