appwrite-utils-cli 1.8.9 → 1.9.2

package/src/utilsController.ts

@@ -247,8 +247,8 @@ export class UtilsController {
     }
   }
 
-  async init(options: { validate?: boolean; strictMode?: boolean; useSession?: boolean; sessionCookie?: string } = {}) {
-    const { validate = false, strictMode = false } = options;
+  async init(options: { validate?: boolean; strictMode?: boolean; useSession?: boolean; sessionCookie?: string; preferJson?: boolean } = {}) {
+    const { validate = false, strictMode = false, preferJson = false } = options;
     const configManager = ConfigManager.getInstance();
 
     // Load config if not already loaded
@@ -257,6 +257,7 @@ export class UtilsController {
         configDir: this.currentUserDir,
         validate,
         strictMode,
+        preferJson,
       });
     }
 
@@ -610,14 +611,14 @@ export class UtilsController {
     }
   }
 
-  async createOrUpdateCollections(
-    database: Models.Database,
-    deletedCollections?: { collectionId: string; collectionName: string }[],
-    collections: Models.Collection[] = []
-  ) {
-    await this.init();
-    if (!this.database || !this.config)
-      throw new Error("Database or config not initialized");
+  async createOrUpdateCollections(
+    database: Models.Database,
+    deletedCollections?: { collectionId: string; collectionName: string }[],
+    collections: Models.Collection[] = []
+  ) {
+    await this.init();
+    if (!this.database || !this.config)
+      throw new Error("Database or config not initialized");
 
     // Ensure apiMode is properly set from adapter
     if (this.adapter && (!this.config.apiMode || this.config.apiMode === 'auto')) {
@@ -625,38 +626,38 @@ export class UtilsController {
       logger.debug(`Updated config.apiMode from adapter: ${this.config.apiMode}`, { prefix: "UtilsController" });
     }
 
-    // Ensure we don't carry state between databases in a multi-db push
-    // This resets processed sets and name->id mapping per database
-    try {
-      const { clearProcessingState } = await import('./shared/operationQueue.js');
-      clearProcessingState();
-    } catch {}
-
-    // Always prefer adapter path for unified behavior. LegacyAdapter internally translates when needed.
-    if (this.adapter) {
-      logger.debug("Using adapter for createOrUpdateCollections (unified path)", {
-        prefix: "UtilsController",
-        apiMode: this.adapter.getApiMode()
-      });
-      await createOrUpdateCollectionsViaAdapter(
-        this.adapter,
-        database.$id,
-        this.config,
-        deletedCollections,
-        collections
-      );
-    } else {
-      // Fallback if adapter is unavailable for some reason
-      logger.debug("Adapter unavailable, falling back to legacy Databases path", { prefix: "UtilsController" });
-      await createOrUpdateCollections(
-        this.database,
-        database.$id,
-        this.config,
-        deletedCollections,
-        collections
-      );
-    }
-  }
+    // Ensure we don't carry state between databases in a multi-db push
+    // This resets processed sets and name->id mapping per database
+    try {
+      const { clearProcessingState } = await import('./shared/operationQueue.js');
+      clearProcessingState();
+    } catch {}
+
+    // Always prefer adapter path for unified behavior. LegacyAdapter internally translates when needed.
+    if (this.adapter) {
+      logger.debug("Using adapter for createOrUpdateCollections (unified path)", {
+        prefix: "UtilsController",
+        apiMode: this.adapter.getApiMode()
+      });
+      await createOrUpdateCollectionsViaAdapter(
+        this.adapter,
+        database.$id,
+        this.config,
+        deletedCollections,
+        collections
+      );
+    } else {
+      // Fallback if adapter is unavailable for some reason
+      logger.debug("Adapter unavailable, falling back to legacy Databases path", { prefix: "UtilsController" });
+      await createOrUpdateCollections(
+        this.database,
+        database.$id,
+        this.config,
+        deletedCollections,
+        collections
+      );
+    }
+  }
 
   async generateSchemas() {
     // Schema generation doesn't need Appwrite connection, just config
@@ -855,24 +856,24 @@ export class UtilsController {
     MessageFormatter.success("Selective pull completed successfully! Remote config pulled to local.", { prefix: "Controller" });
   }
 
-  async selectivePush(
-    databaseSelections: DatabaseSelection[],
-    bucketSelections: BucketSelection[]
-  ): Promise<void> {
-    await this.init();
-    if (!this.database) {
-      MessageFormatter.error("Database not initialized", undefined, { prefix: "Controller" });
-      return;
-    }
-
-    // Always reload config from disk so pushes use current local YAML/Ts definitions
-    try {
-      await this.reloadConfig();
-      MessageFormatter.info("Reloaded config from disk for push", { prefix: "Controller" });
-    } catch (e) {
-      // Non-fatal; continue with existing config
-      MessageFormatter.warning("Could not reload config; continuing with current in-memory config", { prefix: "Controller" });
-    }
+  async selectivePush(
+    databaseSelections: DatabaseSelection[],
+    bucketSelections: BucketSelection[]
+  ): Promise<void> {
+    await this.init();
+    if (!this.database) {
+      MessageFormatter.error("Database not initialized", undefined, { prefix: "Controller" });
+      return;
+    }
+
+    // Always reload config from disk so pushes use current local YAML/Ts definitions
+    try {
+      await this.reloadConfig();
+      MessageFormatter.info("Reloaded config from disk for push", { prefix: "Controller" });
+    } catch (e) {
+      // Non-fatal; continue with existing config
+      MessageFormatter.warning("Could not reload config; continuing with current in-memory config", { prefix: "Controller" });
+    }
 
     MessageFormatter.progress("Starting selective push (local config → Appwrite)...", { prefix: "Controller" });
 
@@ -916,7 +917,7 @@ export class UtilsController {
     const databaseCollectionsMap = new Map<string, any[]>();
 
     // Get all collections/tables from config (they're at the root level, not nested in databases)
-    const allCollections = this.config?.collections || this.config?.tables || [];
+    const allCollections = this.config?.collections || this.config?.tables || [];
 
     // Create database-specific collection mapping to preserve relationships
     for (const dbSelection of databaseSelections) {
@@ -924,17 +925,17 @@ export class UtilsController {
 
       MessageFormatter.info(`Processing collections for database: ${dbSelection.databaseId}`, { prefix: "Controller" });
 
-      // Filter collections that were selected for THIS specific database
-      for (const collection of allCollections) {
-        const collectionId = collection.$id || (collection as any).id;
-
-        // Check if this collection was selected for THIS database
-        if (dbSelection.tableIds.includes(collectionId)) {
-          collectionsForDatabase.push(collection);
-          const source = (collection as any)._isFromTablesDir ? 'tables/' : 'collections/';
-          MessageFormatter.info(`  - Selected collection: ${collection.name || collectionId} for database ${dbSelection.databaseId} [source: ${source}]`, { prefix: "Controller" });
-        }
-      }
+      // Filter collections that were selected for THIS specific database
+      for (const collection of allCollections) {
+        const collectionId = collection.$id || (collection as any).id;
+
+        // Check if this collection was selected for THIS database
+        if (dbSelection.tableIds.includes(collectionId)) {
+          collectionsForDatabase.push(collection);
+          const source = (collection as any)._isFromTablesDir ? 'tables/' : 'collections/';
+          MessageFormatter.info(`  - Selected collection: ${collection.name || collectionId} for database ${dbSelection.databaseId} [source: ${source}]`, { prefix: "Controller" });
+        }
+      }
 
       databaseCollectionsMap.set(dbSelection.databaseId, collectionsForDatabase);
       MessageFormatter.info(`Database ${dbSelection.databaseId}: ${collectionsForDatabase.length} collections selected`, { prefix: "Controller" });