Fix various bugs

Author: ZachHandley

packages/appwrite-utils-cli/src/cli/commands/databaseCommands.ts

@@ -26,6 +26,11 @@ const EXTREME_MAX_INTEGER = 9223372036854776000;
 const EXTREME_MIN_FLOAT = -1.7976931348623157e308;
 const EXTREME_MAX_FLOAT = 1.7976931348623157e308;
 
+/** Get columns/attributes array, preferring modern 'columns' over legacy 'attributes' */
+function getColumns(obj: any): any[] {
+  return obj.columns || obj.attributes || [];
+}
+
 /**
  * Type guard to check if an attribute has min/max properties
  */
@@ -833,7 +838,7 @@ const waitForAttributeAvailable = async (
       const collection = isDatabaseAdapter(db)
         ? (await db.getTable({ databaseId: dbId, tableId: collectionId })).data
         : await db.getCollection(dbId, collectionId);
-      const attribute = (collection.attributes as any[]).find(
+      const attribute = (getColumns(collection) as any[]).find(
         (attr: AttributeWithStatus) => attr.key === attributeKey
       ) as AttributeWithStatus | undefined;
 
@@ -1449,7 +1454,7 @@ export const createOrUpdateAttribute = async (
   const updateEnabled = true;
   let finalAttribute: any = attribute;
   try {
-    const collectionAttr = collection.attributes.find(
+    const collectionAttr = getColumns(collection).find(
       (attr: any) => attr.key === attribute.key
     ) as unknown as any;
     foundAttribute = parseAttribute(collectionAttr);
@@ -1478,9 +1483,11 @@ export const createOrUpdateAttribute = async (
         await db.deleteAttribute(dbId, collection.$id, attribute.key);
       }
       // Remove from local collection metadata so downstream logic treats it as new
-      collection.attributes = collection.attributes.filter(
+      const filtered = getColumns(collection).filter(
         (attr: any) => attr.key !== attribute.key
       );
+      if ('columns' in collection) (collection as any).columns = filtered;
+      if ('attributes' in collection) (collection as any).attributes = filtered;
       foundAttribute = undefined;
     } catch (deleteError) {
       MessageFormatter.error(
@@ -1715,7 +1722,7 @@ export const createUpdateCollectionAttributesWithStatusCheck = async (
   attributes: Attribute[]
 ): Promise<boolean> => {
   const existingAttributes: Attribute[] =
-    collection.attributes.map((attr) => parseAttribute(attr as any)) || [];
+    getColumns(collection).map((attr) => parseAttribute(attr as any)) || [];
 
   const attributesToRemove = existingAttributes.filter(
     (attr) => !attributes.some((a) => a.key === attr.key)
@@ -1935,7 +1942,7 @@ export const createUpdateCollectionAttributes = async (
   );
 
   const existingAttributes: Attribute[] =
-    collection.attributes.map((attr) => parseAttribute(attr as any)) || [];
+    getColumns(collection).map((attr) => parseAttribute(attr as any)) || [];
 
   const attributesToRemove = existingAttributes.filter(
     (attr) => !attributes.some((a) => a.key === attr.key)

…-utils-cli/src/collections/attributes.ts …ite-utils-cli/src/collections/columns.tspackages/appwrite-utils-cli/src/collections/attributes.ts renamed to packages/appwrite-utils-cli/src/collections/columns.ts packages/appwrite-utils-cli/src/collections/attributes.ts renamed to packages/appwrite-utils-cli/src/collections/columns.ts

@@ -114,19 +114,21 @@ export const checkForCollection = async (
   collection: Partial<CollectionCreate>
 ): Promise<Models.Collection | null> => {
   try {
-    MessageFormatter.progress(`Checking for collection with name: ${collection.name}`, { prefix: "Collections" });
+    const isLegacy = isLegacyDatabases(db);
+    const entityType = isLegacy ? "Collection" : "Table";
+    MessageFormatter.progress(`Checking for ${entityType.toLowerCase()} with name: ${collection.name}`, { prefix: entityType + "s" });
     const response = await tryAwaitWithRetry(
-      async () => isLegacyDatabases(db) ?
+      async () => isLegacy ?
         await db.listCollections(dbId, [Query.equal("name", collection.name!)]) :
         await db.listTables({ databaseId: dbId, queries: [Query.equal("name", collection.name!)] })
     );
-    const items = isLegacyDatabases(db) ? response.collections : ((response as any).tables || response.collections);
+    const items = isLegacy ? response.collections : ((response as any).tables || response.collections);
     if (items && items.length > 0) {
-      MessageFormatter.info(`Collection found: ${items[0].$id}`, { prefix: "Collections" });
+      MessageFormatter.info(`${entityType} found: ${items[0].$id}`, { prefix: entityType + "s" });
       // Return remote collection for update operations (don't merge local config over it)
       return items[0] as Models.Collection;
     } else {
-      MessageFormatter.info(`No collection found with name: ${collection.name}`, { prefix: "Collections" });
+      MessageFormatter.info(`No ${entityType.toLowerCase()} found with name: ${collection.name}`, { prefix: entityType + "s" });
       return null;
     }
   } catch (error) {
@@ -148,29 +150,31 @@ export const fetchAndCacheCollectionByName = async (
   dbId: string,
   collectionName: string
 ): Promise<Models.Collection | undefined> => {
+  const isLegacy = isLegacyDatabases(db);
+  const entityType = isLegacy ? "Collection" : "Table";
   if (nameToIdMapping.has(collectionName)) {
     const collectionId = nameToIdMapping.get(collectionName);
-    MessageFormatter.debug(`Collection found in cache: ${collectionId}`, undefined, { prefix: "Collections" });
+    MessageFormatter.debug(`${entityType} found in cache: ${collectionId}`, undefined, { prefix: entityType + "s" });
     return await tryAwaitWithRetry(
-      async () => isLegacyDatabases(db) ?
+      async () => isLegacy ?
         await db.getCollection(dbId, collectionId!) :
         await db.getTable({ databaseId: dbId, tableId: collectionId! })
     ) as Models.Collection;
   } else {
-    MessageFormatter.progress(`Fetching collection by name: ${collectionName}`, { prefix: "Collections" });
+    MessageFormatter.progress(`Fetching ${entityType.toLowerCase()} by name: ${collectionName}`, { prefix: entityType + "s" });
     const collectionsPulled = await tryAwaitWithRetry(
-      async () => isLegacyDatabases(db) ?
+      async () => isLegacy ?
         await db.listCollections(dbId, [Query.equal("name", collectionName)]) :
         await db.listTables({ databaseId: dbId, queries: [Query.equal("name", collectionName)] })
     );
-    const items = isLegacyDatabases(db) ? collectionsPulled.collections : ((collectionsPulled as any).tables || collectionsPulled.collections);
+    const items = isLegacy ? collectionsPulled.collections : ((collectionsPulled as any).tables || collectionsPulled.collections);
     if ((collectionsPulled.total || items?.length) > 0) {
       const collection = items[0];
-      MessageFormatter.info(`Collection found: ${collection.$id}`, { prefix: "Collections" });
+      MessageFormatter.info(`${entityType} found: ${collection.$id}`, { prefix: entityType + "s" });
       nameToIdMapping.set(collectionName, collection.$id);
       return collection;
     } else {
-      MessageFormatter.warning(`Collection not found by name: ${collectionName}`, { prefix: "Collections" });
+      MessageFormatter.warning(`${entityType} not found by name: ${collectionName}`, { prefix: entityType + "s" });
       return undefined;
     }
   }

packages/appwrite-utils-cli/src/collections/methods.ts

@@ -63,7 +63,7 @@ enum CHOICES {
   COMPREHENSIVE_TRANSFER = "🚀 Comprehensive transfer (users → databases → buckets → functions)",
   BACKUP_DATABASE = "💾 Backup database",
   WIPE_DATABASE = "🧹 Wipe database",
-  WIPE_COLLECTIONS = "🧹 Wipe collections",
+  WIPE_COLLECTIONS = "🧹 Wipe tables",
   GENERATE_SCHEMAS = "🏗️ Generate schemas",
   GENERATE_CONSTANTS = "📋 Generate cross-language constants (TypeScript, Python, PHP, Dart, etc.)",
   IMPORT_DATA = "📥 Import data",
@@ -532,26 +532,26 @@ export class InteractiveCLI {
 
     // Provide context about what's available
     if (collectionsCount > 0 && tablesCount > 0) {
-      MessageFormatter.info(`\n📋 ${totalCount} total items available:`, { prefix: "Collections" });
-      MessageFormatter.info(`   Collections: ${collectionsCount} (from collections/ folder)`, { prefix: "Collections" });
-      MessageFormatter.info(`   Tables: ${tablesCount} (from tables/ folder)`, { prefix: "Collections" });
+      MessageFormatter.info(`\n${totalCount} total tables available:`, { prefix: "Tables" });
+      MessageFormatter.info(`   From collections/ folder: ${collectionsCount}`, { prefix: "Tables" });
+      MessageFormatter.info(`   From tables/ folder: ${tablesCount}`, { prefix: "Tables" });
     } else if (collectionsCount > 0) {
-      MessageFormatter.info(`📁 ${collectionsCount} collections available from collections/ folder`, { prefix: "Collections" });
+      MessageFormatter.info(`${collectionsCount} tables available from collections/ folder`, { prefix: "Tables" });
     } else if (tablesCount > 0) {
-      MessageFormatter.info(`📊 ${tablesCount} tables available from tables/ folder`, { prefix: "Collections" });
+      MessageFormatter.info(`${tablesCount} tables available from tables/ folder`, { prefix: "Tables" });
     }
 
     // Show current database context clearly before view mode selection
-    MessageFormatter.info(`DB: ${database.name}`, { prefix: "Collections" });
+    MessageFormatter.info(`DB: ${database.name}`, { prefix: "Tables" });
 
     // Ask user if they want to filter by database, show all, or reuse previous selection
     const choices: { name: string; value: string }[] = [
       {
-        name: `Show all available collections/tables (${totalCount} total) - You can push any collection to any database`,
+        name: `Show all available tables (${totalCount} total) - You can push any table to any database`,
         value: "all"
       },
       {
-        name: `Filter by database "${database.name}" - Show only related collections/tables`,
+        name: `Filter by database "${database.name}" - Show only related tables`,
         value: "filter"
       }
     ];
@@ -566,7 +566,7 @@ export class InteractiveCLI {
       {
         type: "list",
         name: "filterChoice",
-        message: chalk.blue("How would you like to view collections/tables?"),
+        message: chalk.blue("How would you like to view tables?"),
         choices,
         default: choices[0]?.value || "all"
       }
@@ -589,17 +589,17 @@ export class InteractiveCLI {
 
     // Show appropriate informational message
     if (userWantsFiltering) {
-      MessageFormatter.info(`ℹ️  Showing collections/tables related to database "${database.name}"`, { prefix: "Collections" });
+      MessageFormatter.info(`Showing tables related to database "${database.name}"`, { prefix: "Tables" });
       if (tablesCount > 0) {
         const filteredTables = configCollections.filter(c =>
           c._isFromTablesDir && (!c.databaseId || c.databaseId === database.$id)
         ).length;
         if (filteredTables !== tablesCount) {
-          MessageFormatter.info(`   ${filteredTables}/${tablesCount} tables match this database`, { prefix: "Collections" });
+          MessageFormatter.info(`   ${filteredTables}/${tablesCount} tables match this database`, { prefix: "Tables" });
         }
       }
     } else {
-      MessageFormatter.info(`ℹ️  Showing all available collections/tables - you can push any collection to any database\n`, { prefix: "Collections" });
+      MessageFormatter.info(`Showing all available tables - you can push any table to any database\n`, { prefix: "Tables" });
     }
 
     const result = await this.selectCollections(

packages/appwrite-utils-cli/src/interactiveCLI.ts

@@ -18,7 +18,7 @@ import { convertObjectByAttributeMappings } from "appwrite-utils-helpers";
 import { z } from "zod";
 import { checkForCollection } from "../collections/methods.js";
 import { ID, Users, type Databases } from "node-appwrite";
-import { logger, LegacyAdapter, MessageFormatter } from "appwrite-utils-helpers";
+import { logger, AdapterFactory, type DatabaseAdapter, MessageFormatter } from "appwrite-utils-helpers";
 import { findOrCreateOperation, updateOperation } from "../shared/migrationHelpers.js";
 import { AuthUserCreateSchema } from "../schemas/authUser.js";
 import { UsersController } from "../users/methods.js";
@@ -67,6 +67,15 @@ export class DataLoader {
   private userIdSet = new Set<string>();
   userExistsMap = new Map<string, boolean>();
   private shouldWriteFile = false;
+  private _adapter: DatabaseAdapter | null = null;
+
+  private async getAdapter(): Promise<DatabaseAdapter> {
+    if (!this._adapter) {
+      const { adapter } = await AdapterFactory.createFromConfig(this.config);
+      this._adapter = adapter;
+    }
+    return this._adapter;
+  }
 
   // Constructor to initialize the DataLoader with necessary configurations
   constructor(
@@ -279,7 +288,7 @@ export class DataLoader {
     );
   }
 
-  async setupMaps(dbId: string) {
+  async setupMaps(dbId: string, specificCollections?: string[]) {
     // Initialize the users collection in the import map
     this.importMap.set(this.getCollectionKey("users"), {
       data: [],
@@ -294,6 +303,11 @@ export class DataLoader {
       for (let index = 0; index < this.config.collections.length; index++) {
         const collectionConfig = this.config.collections[index];
         let collection = CollectionCreateSchema.parse(collectionConfig);
+        // Skip collections not in the specific list if one was provided
+        if (specificCollections && specificCollections.length > 0 &&
+            !specificCollections.includes(collection.name)) {
+          continue;
+        }
         // Check if the collection exists in the database
         const collectionExists = await checkForCollection(
           this.database,
@@ -311,19 +325,25 @@ export class DataLoader {
         collectionConfig.$id = collectionExists.$id;
         collection.$id = collectionExists.$id;
         this.config.collections[index] = collectionConfig;
-        // Find or create an import operation for the collection
-        const adapter = new LegacyAdapter(this.database.client);
-        const collectionImportOperation = await findOrCreateOperation(
-          adapter,
-          dbId,
-          "importData",
-          collection.$id!
-        );
-        // Store the operation ID in the map
-        this.collectionImportOperations.set(
-          this.getCollectionKey(collection.name),
-          collectionImportOperation.$id
-        );
+        // Find or create an import operation for the collection (non-fatal)
+        try {
+          const adapter = await this.getAdapter();
+          const collectionImportOperation = await findOrCreateOperation(
+            adapter,
+            dbId,
+            "importData",
+            collection.$id!
+          );
+          this.collectionImportOperations.set(
+            this.getCollectionKey(collection.name),
+            collectionImportOperation.$id
+          );
+        } catch (error) {
+          MessageFormatter.warning(
+            `Operations tracking unavailable for ${collection.name}, import will proceed without it`,
+            { prefix: "Import" }
+          );
+        }
         // Initialize the collection in the import map
         this.importMap.set(this.getCollectionKey(collection.name), {
           collection: collection,
@@ -373,17 +393,22 @@ export class DataLoader {
   }
 
   // Main method to start the data loading process for a given database ID
-  async start(dbId: string) {
+  async start(dbId: string, specificCollections?: string[]) {
     MessageFormatter.divider();
     MessageFormatter.info(`Starting data setup for database: ${dbId}`, { prefix: "Data" });
     MessageFormatter.divider();
-    await this.setupMaps(dbId);
-    const allUsers = await this.getAllUsers();
-    MessageFormatter.info(
-      `Fetched ${allUsers.length} users, waiting a few seconds to let the program catch up...`,
-      { prefix: "Data" }
-    );
-    await new Promise((resolve) => setTimeout(resolve, 5000));
+    // Only fetch users if we're importing users or no specific collections specified
+    const needsUsers = !specificCollections || specificCollections.length === 0 ||
+      specificCollections.some(c =>
+        this.getCollectionKey(c) === this.getCollectionKey(this.config.usersCollectionName)
+      );
+    if (needsUsers) {
+      const allUsers = await this.getAllUsers();
+      MessageFormatter.info(
+        `Fetched ${allUsers.length} users`,
+        { prefix: "Data" }
+      );
+    }
     // Iterate over the configured databases to find the matching one
     for (const db of this.config.databases) {
       if (db.$id !== dbId) {
@@ -395,6 +420,11 @@ export class DataLoader {
       // Iterate over the configured collections to process each
       for (const collectionConfig of this.config.collections) {
         const collection = collectionConfig;
+        // Skip collections not in the specific list
+        if (specificCollections && specificCollections.length > 0 &&
+            !specificCollections.includes(collection.name)) {
+          continue;
+        }
         // Determine if this is the users collection
         let isUsersCollection =
           this.getCollectionKey(this.config.usersCollectionName) ===
@@ -954,7 +984,7 @@ export class DataLoader {
       this.oldIdToNewIdPerCollectionMap
         .set(this.getCollectionKey(collection.name), oldIdToNewIdMap)
         .get(this.getCollectionKey(collection.name));
-    const adapter = new LegacyAdapter(this.database.client);
+    const adapter = await this.getAdapter();
     if (!operationId) {
       const collectionImportOperation = await findOrCreateOperation(
         adapter,
@@ -971,7 +1001,7 @@ export class DataLoader {
     }
     if (operationId) {
       await updateOperation(adapter, db.$id, operationId, {
-        status: "ready",
+        status: "in_progress",
         total: rawData.length,
       });
     }
@@ -1185,7 +1215,7 @@ export class DataLoader {
     let operationId = this.collectionImportOperations.get(
       this.getCollectionKey(collection.name)
     );
-    const adapter = new LegacyAdapter(this.database.client);
+    const adapter = await this.getAdapter();
     if (!operationId) {
       const collectionImportOperation = await findOrCreateOperation(
         adapter,
@@ -1202,7 +1232,7 @@ export class DataLoader {
     }
     if (operationId) {
       await updateOperation(adapter, db.$id, operationId, {
-        status: "ready",
+        status: "in_progress",
         total: rawData.length,
       });
     }