appwrite-utils-cli 0.9.78 → 0.9.80

package/README.md

@@ -61,6 +61,7 @@ Available options:
 - `--collectionIds`: Comma-separated list of collection IDs to operate on
 - `--bucketIds`: Comma-separated list of bucket IDs to operate on
 - `--wipe`: Wipe data (all: everything, docs: only documents, users: only user data)
+- `--wipeCollections`: Wipe collections (wipes specified collections from collectionIds -- does this non-destructively, deletes all documents)
 - `--generate`: Generate TypeScript schemas from database schemas
 - `--import`: Import data into your databases
 - `--backup`: Perform a backup of your databases
@@ -124,6 +125,8 @@ This updated CLI ensures that developers have robust tools at their fingertips t
 
 ## Changelog
 
+- 0.9.80: Fixed collections not being unique between local and remote
+- 0.9.79: Fixed local collections not being considered for the synchronization unless all de-selected
 - 0.9.78: Added colored text! And also added a lot more customization options as to what to wipe, update, etc.
 - 0.9.75: Fixed attribute bug
 - 0.9.72: Fixed my own null bug

package/dist/interactiveCLI.d.ts

@@ -18,5 +18,7 @@ export declare class InteractiveCLI {
     private generateSchemas;
     private importData;
     private transferData;
+    private getLocalCollections;
+    private getLocalDatabases;
     private reloadConfig;
 }

package/dist/interactiveCLI.js

@@ -6,8 +6,10 @@ import { fetchAllCollections } from "./collections/methods.js";
 import { listBuckets, createBucket } from "./storage/methods.js";
 import { Databases, Storage, Client, Compression, } from "node-appwrite";
 import { getClient } from "./utils/getClientFromConfig.js";
+import { parseAttribute, PermissionToAppwritePermission } from "appwrite-utils";
 import { ulid } from "ulidx";
 import chalk from "chalk";
+import { DateTime } from "luxon";
 var CHOICES;
 (function (CHOICES) {
     CHOICES["CREATE_COLLECTION_CONFIG"] = "Create collection config file";
@@ -103,6 +105,8 @@ export class InteractiveCLI {
     }
     async selectDatabases(databases, message, multiSelect = true) {
         const choices = databases.map((db) => ({ name: db.name, value: db })).filter((db) => db.name.toLowerCase() !== "migrations");
+        const configDatabases = this.getLocalDatabases();
+        const allDatabases = Array.from(new Set([...databases, ...configDatabases]));
         const { selectedDatabases } = await inquirer.prompt([
             {
                 type: multiSelect ? "checkbox" : "list",
@@ -117,7 +121,11 @@ export class InteractiveCLI {
     }
     async selectCollections(database, databasesClient, message, multiSelect = true) {
         const collections = await fetchAllCollections(database.$id, databasesClient);
-        const choices = collections.map((collection) => ({
+        const configCollections = this.getLocalCollections();
+        const collectionNames = collections.map((c) => c.name).concat(configCollections.map((c) => c.name));
+        const allCollectionNamesUnique = Array.from(new Set(collectionNames));
+        const allCollections = allCollectionNamesUnique.map((name) => configCollections.find((c) => c.name === name) ?? collections.find((c) => c.name === name)).filter((v) => v !== undefined);
+        const choices = allCollections.map((collection) => ({
             name: collection.name,
             value: collection,
         }));
@@ -581,6 +589,32 @@ export class InteractiveCLI {
         await this.controller.transferData(transferOptions);
         console.log(chalk.green("Data transfer completed."));
     }
+    getLocalCollections() {
+        const configCollections = this.controller.config.collections || [];
+        // @ts-expect-error - appwrite invalid types
+        return configCollections.map(c => ({
+            $id: c.$id || ulid(),
+            $createdAt: DateTime.now().toISO(),
+            $updatedAt: DateTime.now().toISO(),
+            name: c.name,
+            enabled: c.enabled || true,
+            documentSecurity: c.documentSecurity || false,
+            attributes: c.attributes || [],
+            indexes: c.indexes || [],
+            $permissions: PermissionToAppwritePermission(c.$permissions) || [],
+            databaseId: c.databaseId,
+        }));
+    }
+    getLocalDatabases() {
+        const configDatabases = this.controller.config.databases || [];
+        return configDatabases.map(db => ({
+            $id: db.$id || ulid(),
+            $createdAt: DateTime.now().toISO(),
+            $updatedAt: DateTime.now().toISO(),
+            name: db.name,
+            enabled: true,
+        }));
+    }
     async reloadConfig() {
         console.log(chalk.yellow("Reloading configuration files..."));
         try {

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.78",
+  "version": "0.9.80",
   "main": "src/main.ts",
   "type": "module",
   "repository": {
@@ -31,7 +31,7 @@
   },
   "dependencies": {
     "@types/inquirer": "^9.0.7",
-    "appwrite-utils": "^0.3.9",
+    "appwrite-utils": "^0.3.94",
     "chalk": "^5.3.0",
     "commander": "^12.1.0",
     "inquirer": "^9.3.6",

package/src/interactiveCLI.ts

@@ -13,9 +13,10 @@ import {
 } from "node-appwrite";
 import { getClient } from "./utils/getClientFromConfig.js";
 import type { TransferOptions } from "./migrations/transfer.js";
-import type { AppwriteConfig, ConfigDatabases } from "appwrite-utils";
+import { parseAttribute, PermissionToAppwritePermission, type AppwriteConfig, type ConfigDatabases } from "appwrite-utils";
 import { ulid } from "ulidx";
 import chalk from "chalk";
+import { DateTime } from "luxon";
 
 enum CHOICES {
   CREATE_COLLECTION_CONFIG = "Create collection config file",
@@ -122,6 +123,9 @@ export class InteractiveCLI {
     multiSelect = true
   ): Promise<Models.Database[]> {
     const choices = databases.map((db) => ({ name: db.name, value: db })).filter((db) => db.name.toLowerCase() !== "migrations");
+    const configDatabases = this.getLocalDatabases();
+    const allDatabases = Array.from(new Set([...databases, ...configDatabases]));
+
 
     const { selectedDatabases } = await inquirer.prompt([
       {
@@ -147,7 +151,11 @@ export class InteractiveCLI {
       database.$id,
       databasesClient
     );
-    const choices = collections.map((collection) => ({
+    const configCollections = this.getLocalCollections();
+    const collectionNames = collections.map((c) => c.name).concat(configCollections.map((c) => c.name));
+    const allCollectionNamesUnique = Array.from(new Set(collectionNames));
+    const allCollections = allCollectionNamesUnique.map((name) => configCollections.find((c) => c.name === name) ?? collections.find((c) => c.name === name)).filter((v) => v !== undefined);
+    const choices = allCollections.map((collection) => ({
       name: collection.name,
       value: collection,
     }));
@@ -805,6 +813,35 @@ export class InteractiveCLI {
     console.log(chalk.green("Data transfer completed."));
   }
 
+
+  private getLocalCollections(): Models.Collection[] {
+    const configCollections = this.controller!.config!.collections || [];
+    // @ts-expect-error - appwrite invalid types
+    return configCollections.map(c => ({
+      $id: c.$id || ulid(),
+      $createdAt: DateTime.now().toISO(),
+      $updatedAt: DateTime.now().toISO(),
+      name: c.name,
+      enabled: c.enabled || true,
+      documentSecurity: c.documentSecurity || false,
+      attributes: c.attributes || [],
+      indexes: c.indexes || [],
+      $permissions: PermissionToAppwritePermission(c.$permissions) || [],
+      databaseId: c.databaseId!,
+    }));
+  }
+
+  private getLocalDatabases(): Models.Database[] {
+    const configDatabases = this.controller!.config!.databases || [];
+    return configDatabases.map(db => ({
+      $id: db.$id || ulid(),
+      $createdAt: DateTime.now().toISO(),
+      $updatedAt: DateTime.now().toISO(),
+      name: db.name,
+      enabled: true,
+    }));
+  }
+
   private async reloadConfig(): Promise<void> {
     console.log(chalk.yellow("Reloading configuration files..."));
     try {