appwrite-utils-cli 1.2.9 → 1.2.11

package/dist/config/yamlConfig.js

@@ -236,10 +236,10 @@ export const loadYamlConfig = async (configPath) => {
 export const findYamlConfig = (startDir) => {
     // First check current directory for YAML configs
     const possiblePaths = [
-        path.join(startDir, ".appwrite", "appwriteConfig.yaml"),
-        path.join(startDir, ".appwrite", "appwriteConfig.yml"),
         path.join(startDir, ".appwrite", "config.yaml"),
         path.join(startDir, ".appwrite", "config.yml"),
+        path.join(startDir, ".appwrite", "appwriteConfig.yaml"),
+        path.join(startDir, ".appwrite", "appwriteConfig.yml"),
         path.join(startDir, "appwrite.yaml"),
         path.join(startDir, "appwrite.yml"),
     ];
@@ -257,6 +257,8 @@ export const findYamlConfig = (startDir) => {
     const parentDir = path.dirname(startDir);
     if (parentDir !== startDir && path.basename(parentDir) !== 'node_modules') {
         const parentPossiblePaths = [
+            path.join(parentDir, ".appwrite", "config.yaml"),
+            path.join(parentDir, ".appwrite", "config.yml"),
             path.join(parentDir, ".appwrite", "appwriteConfig.yaml"),
             path.join(parentDir, ".appwrite", "appwriteConfig.yml"),
             path.join(parentDir, "appwrite.yaml"),
@@ -325,10 +327,10 @@ const findYamlConfigRecursive = (dir, depth = 0) => {
                 // Check if this is an .appwrite directory
                 if (entry.name === ".appwrite") {
                     const configPaths = [
-                        path.join(fullPath, "appwriteConfig.yaml"),
-                        path.join(fullPath, "appwriteConfig.yml"),
                         path.join(fullPath, "config.yaml"),
                         path.join(fullPath, "config.yml"),
+                        path.join(fullPath, "appwriteConfig.yaml"),
+                        path.join(fullPath, "appwriteConfig.yml"),
                     ];
                     for (const configPath of configPaths) {
                         if (fs.existsSync(configPath)) {

package/dist/interactiveCLI.js

@@ -879,19 +879,22 @@ export class InteractiveCLI {
     async synchronizeConfigurations() {
         console.log(chalk.blue("Synchronizing configurations..."));
         await this.controller.init();
-        // Sync databases and buckets first
+        // Sync databases, collections, and buckets
         const { syncDatabases } = await inquirer.prompt([
             {
                 type: "confirm",
                 name: "syncDatabases",
-                message: "Do you want to synchronize databases and their buckets?",
+                message: "Do you want to synchronize databases, collections, and their buckets?",
                 default: true,
             },
         ]);
         if (syncDatabases) {
             const remoteDatabases = await fetchAllDatabases(this.controller.database);
+            // Use the controller's synchronizeConfigurations method which handles collections properly
+            console.log(chalk.blue("Pulling collections and generating collection files..."));
+            await this.controller.synchronizeConfigurations(remoteDatabases);
+            // Also configure buckets for any new databases
             const localDatabases = this.controller.config?.databases || [];
-            // Update config with remote databases that don't exist locally
             const updatedConfig = await this.configureBuckets({
                 ...this.controller.config,
                 databases: [
@@ -1065,9 +1068,7 @@ export class InteractiveCLI {
                     }
                 }
             }
-            // Update schemas after all changes
-            const schemaGenerator = new SchemaGenerator(this.controller.config, this.controller.getAppwriteFolderPath());
-            await schemaGenerator.updateConfig(this.controller.config);
+            // Schema generation and collection file writing is handled by controller.synchronizeConfigurations()
         }
         console.log(chalk.green("✨ Configurations synchronized successfully!"));
     }

package/dist/shared/schemaGenerator.d.ts

@@ -6,7 +6,7 @@ export declare class SchemaGenerator {
     constructor(config: AppwriteConfig, appwriteFolderPath: string);
     updateYamlCollections(): void;
     updateTsSchemas(): void;
-    updateConfig(config: AppwriteConfig): Promise<void>;
+    updateConfig(config: AppwriteConfig, isYamlConfig?: boolean): Promise<void>;
     private updateYamlConfig;
     private updateTypeScriptConfig;
     private extractRelationships;

package/dist/shared/schemaGenerator.js

@@ -154,13 +154,18 @@ export class SchemaGenerator {
             console.log(`Collection schema written to ${collectionFilePath}`);
         });
     }
-    async updateConfig(config) {
-        // Check if user is using YAML config
-        const { findYamlConfig } = await import("../config/yamlConfig.js");
-        const yamlConfigPath = findYamlConfig(this.appwriteFolderPath);
-        if (yamlConfigPath) {
-            // User has YAML config - update it and generate individual collection files
-            await this.updateYamlConfig(config, yamlConfigPath);
+    async updateConfig(config, isYamlConfig = false) {
+        if (isYamlConfig) {
+            // User has YAML config - find the config file and update it + generate individual collection files
+            const { findYamlConfig } = await import("../config/yamlConfig.js");
+            const yamlConfigPath = findYamlConfig(this.appwriteFolderPath);
+            if (yamlConfigPath) {
+                await this.updateYamlConfig(config, yamlConfigPath);
+            }
+            else {
+                console.warn("⚠️ YAML config expected but not found, falling back to TypeScript");
+                this.updateTypeScriptConfig(config);
+            }
         }
         else {
             // User has TypeScript config - update the TS file

package/dist/utilsController.js

@@ -396,6 +396,8 @@ export class UtilsController {
         }
         const appwriteToX = new AppwriteToX(configToUse, this.appwriteFolderPath, this.storage);
         await appwriteToX.toSchemas(databases);
+        // Update the controller's config with the synchronized collections
+        this.config = appwriteToX.updatedConfig;
     }
     async syncDb(databases = [], collections = []) {
         await this.init();

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

package/src/config/yamlConfig.ts

@@ -248,10 +248,10 @@ export const loadYamlConfig = async (configPath: string): Promise<AppwriteConfig
 export const findYamlConfig = (startDir: string): string | null => {
   // First check current directory for YAML configs
   const possiblePaths = [
-    path.join(startDir, ".appwrite", "appwriteConfig.yaml"),
-    path.join(startDir, ".appwrite", "appwriteConfig.yml"),
     path.join(startDir, ".appwrite", "config.yaml"),
     path.join(startDir, ".appwrite", "config.yml"),
+    path.join(startDir, ".appwrite", "appwriteConfig.yaml"),
+    path.join(startDir, ".appwrite", "appwriteConfig.yml"),
     path.join(startDir, "appwrite.yaml"),
     path.join(startDir, "appwrite.yml"),
   ];
@@ -272,6 +272,8 @@ export const findYamlConfig = (startDir: string): string | null => {
   const parentDir = path.dirname(startDir);
   if (parentDir !== startDir && path.basename(parentDir) !== 'node_modules') {
     const parentPossiblePaths = [
+      path.join(parentDir, ".appwrite", "config.yaml"),
+      path.join(parentDir, ".appwrite", "config.yml"),
       path.join(parentDir, ".appwrite", "appwriteConfig.yaml"),
       path.join(parentDir, ".appwrite", "appwriteConfig.yml"),
       path.join(parentDir, "appwrite.yaml"),
@@ -349,10 +351,10 @@ const findYamlConfigRecursive = (dir: string, depth: number = 0): string | null
         // Check if this is an .appwrite directory
         if (entry.name === ".appwrite") {
           const configPaths = [
-            path.join(fullPath, "appwriteConfig.yaml"),
-            path.join(fullPath, "appwriteConfig.yml"),
             path.join(fullPath, "config.yaml"),
             path.join(fullPath, "config.yml"),
+            path.join(fullPath, "appwriteConfig.yaml"),
+            path.join(fullPath, "appwriteConfig.yml"),
           ];
           
           for (const configPath of configPaths) {

package/src/interactiveCLI.ts

@@ -1186,12 +1186,13 @@ export class InteractiveCLI {
   private async synchronizeConfigurations(): Promise<void> {
     console.log(chalk.blue("Synchronizing configurations..."));
     await this.controller!.init();
-    // Sync databases and buckets first
+    
+    // Sync databases, collections, and buckets
     const { syncDatabases } = await inquirer.prompt([
       {
         type: "confirm",
         name: "syncDatabases",
-        message: "Do you want to synchronize databases and their buckets?",
+        message: "Do you want to synchronize databases, collections, and their buckets?",
         default: true,
       },
     ]);
@@ -1200,9 +1201,13 @@ export class InteractiveCLI {
       const remoteDatabases = await fetchAllDatabases(
         this.controller!.database!
       );
+      
+      // Use the controller's synchronizeConfigurations method which handles collections properly
+      console.log(chalk.blue("Pulling collections and generating collection files..."));
+      await this.controller!.synchronizeConfigurations(remoteDatabases);
+      
+      // Also configure buckets for any new databases
       const localDatabases = this.controller!.config?.databases || [];
-
-      // Update config with remote databases that don't exist locally
       const updatedConfig = await this.configureBuckets({
         ...this.controller!.config!,
         databases: [
@@ -1437,12 +1442,7 @@ export class InteractiveCLI {
         }
       }
 
-      // Update schemas after all changes
-      const schemaGenerator = new SchemaGenerator(
-        this.controller!.config!,
-        this.controller!.getAppwriteFolderPath()!
-      );
-      await schemaGenerator.updateConfig(this.controller!.config!);
+      // Schema generation and collection file writing is handled by controller.synchronizeConfigurations()
     }
 
     console.log(chalk.green("✨ Configurations synchronized successfully!"));

package/src/shared/schemaGenerator.ts

@@ -197,14 +197,18 @@ export class SchemaGenerator {
     });
   }
 
-  public async updateConfig(config: AppwriteConfig): Promise<void> {
-    // Check if user is using YAML config
-    const { findYamlConfig } = await import("../config/yamlConfig.js");
-    const yamlConfigPath = findYamlConfig(this.appwriteFolderPath);
-    
-    if (yamlConfigPath) {
-      // User has YAML config - update it and generate individual collection files
-      await this.updateYamlConfig(config, yamlConfigPath);
+  public async updateConfig(config: AppwriteConfig, isYamlConfig: boolean = false): Promise<void> {
+    if (isYamlConfig) {
+      // User has YAML config - find the config file and update it + generate individual collection files
+      const { findYamlConfig } = await import("../config/yamlConfig.js");
+      const yamlConfigPath = findYamlConfig(this.appwriteFolderPath);
+      
+      if (yamlConfigPath) {
+        await this.updateYamlConfig(config, yamlConfigPath);
+      } else {
+        console.warn("⚠️ YAML config expected but not found, falling back to TypeScript");
+        this.updateTypeScriptConfig(config);
+      }
     } else {
       // User has TypeScript config - update the TS file
       this.updateTypeScriptConfig(config);

package/src/utilsController.ts

@@ -566,6 +566,9 @@ export class UtilsController {
       this.storage
     );
     await appwriteToX.toSchemas(databases);
+    
+    // Update the controller's config with the synchronized collections
+    this.config = appwriteToX.updatedConfig;
   }
 
   async syncDb(