appwrite-utils-cli 1.7.8 → 1.8.1

package/src/cli/commands/databaseCommands.ts

@@ -26,15 +26,14 @@ export const databaseCommands = {
       // Get local collections for selection
       const localCollections = (cli as any).getLocalCollections();
 
-      // Prompt about existing configuration
-      const { syncExisting, modifyConfiguration } = await SelectionDialogs.promptForExistingConfig(configuredDatabases);
+      // Push operations always use local configuration as source of truth
 
       // Select databases
-      const selectedDatabaseIds = await SelectionDialogs.selectDatabases(
-        availableDatabases,
-        configuredDatabases,
-        { showSelectAll: true, allowNewOnly: !syncExisting }
-      );
+      const selectedDatabaseIds = await SelectionDialogs.selectDatabases(
+        availableDatabases,
+        configuredDatabases,
+        { showSelectAll: false, allowNewOnly: false, defaultSelected: [] }
+      );
 
       if (selectedDatabaseIds.length === 0) {
         MessageFormatter.warning("No databases selected. Skipping database sync.", { prefix: "Database" });
@@ -54,7 +53,8 @@ export const databaseCommands = {
           (cli as any).controller!.database!,
           chalk.blue(`Select collections/tables to push to "${database.name}":`),
           true,  // multiSelect
-          true   // prefer local
+          true,  // prefer local
+          true   // shouldFilterByDatabase
         );
 
         // Map selected collections to table IDs
@@ -93,12 +93,12 @@ export const databaseCommands = {
             MessageFormatter.warning("No storage buckets available in remote instance.", { prefix: "Database" });
           } else {
             // Select buckets using SelectionDialogs
-            const selectedBucketIds = await SelectionDialogs.selectBucketsForDatabases(
-              selectedDatabaseIds,
-              availableBuckets,
-              configuredBuckets,
-              { showSelectAll: true, groupByDatabase: true }
-            );
+            const selectedBucketIds = await SelectionDialogs.selectBucketsForDatabases(
+              selectedDatabaseIds,
+              availableBuckets,
+              configuredBuckets,
+              { showSelectAll: false, groupByDatabase: true, defaultSelected: [] }
+            );
 
             if (selectedBucketIds.length > 0) {
               // Create BucketSelection objects
@@ -133,16 +133,16 @@ export const databaseCommands = {
         bucketSelections
       );
 
-      const confirmed = await SelectionDialogs.confirmSyncSelection(selectionSummary);
+      const confirmed = await SelectionDialogs.confirmSyncSelection(selectionSummary, 'push');
 
       if (!confirmed) {
-        MessageFormatter.info("Sync operation cancelled by user", { prefix: "Database" });
+        MessageFormatter.info("Push operation cancelled by user", { prefix: "Database" });
         return;
       }
 
-      // Perform selective sync using the controller
-      MessageFormatter.progress("Starting selective sync...", { prefix: "Database" });
-      await (cli as any).controller!.selectiveSync(databaseSelections, bucketSelections);
+      // Perform selective push using the controller
+      MessageFormatter.progress("Starting selective push...", { prefix: "Database" });
+      await (cli as any).controller!.selectivePush(databaseSelections, bucketSelections);
 
       MessageFormatter.success("\n✅ All database configurations pushed successfully!", { prefix: "Database" });
 

package/src/cli/commands/functionCommands.ts

@@ -13,7 +13,8 @@ import {
   listFunctions,
   listSpecifications,
 } from "../../functions/methods.js";
-import { deployLocalFunction } from "../../functions/deployments.js";
+import { deployLocalFunction } from "../../functions/deployments.js";
+import { discoverFnConfigs, mergeDiscoveredFunctions } from "../../functions/fnConfigDiscovery.js";
 import { addFunctionToYamlConfig, findYamlConfig } from "../../config/yamlConfig.js";
 import { RuntimeSchema, type AppwriteFunction, type Runtime, type Specification } from "appwrite-utils";
 import type { InteractiveCLI } from "../../interactiveCLI.js";
@@ -137,11 +138,18 @@ export const functionCommands = {
       return;
     }
 
-    const functions = await (cli as any).selectFunctions(
-      "Select function(s) to deploy:",
-      true,
-      true
-    );
+    // Discover local .fnconfig.yaml functions and merge into controller config
+    try {
+      const discovered = discoverFnConfigs((cli as any).currentDir);
+      const merged = mergeDiscoveredFunctions((cli as any).controller!.config!.functions || [], discovered);
+      (cli as any).controller!.config!.functions = merged as any;
+    } catch {}
+
+    const functions = await (cli as any).selectFunctions(
+      "Select function(s) to deploy:",
+      true,
+      true
+    );
 
     if (!functions?.length) {
       MessageFormatter.error("No function selected", undefined, { prefix: "Functions" });
@@ -177,18 +185,19 @@ export const functionCommands = {
       MessageFormatter.info(`  Appwrite folder: ${(cli as any).controller.getAppwriteFolderPath()}`, { prefix: "Functions" });
       MessageFormatter.info(`  Current working dir: ${process.cwd()}`, { prefix: "Functions" });
 
-      // Helper function to expand tilde in paths
-      const expandTildePath = (path: string): string => {
-        if (path.startsWith('~/')) {
-          return path.replace('~', os.homedir());
-        }
-        return path;
-      };
+      // Resolve config dirPath relative to central YAML if it's relative
+      const yamlConfigPath = findYamlConfig((cli as any).currentDir);
+      const yamlBaseDir = yamlConfigPath ? require('node:path').dirname(yamlConfigPath) : process.cwd();
+      const expandTildePath = (p: string): string => (p?.startsWith('~/') ? p.replace('~', os.homedir()) : p);
 
       // Check locations in priority order:
       const priorityLocations = [
         // 1. Config dirPath if specified (with tilde expansion)
-        functionConfig.dirPath ? expandTildePath(functionConfig.dirPath) : undefined,
+        functionConfig.dirPath
+          ? (require('node:path').isAbsolute(expandTildePath(functionConfig.dirPath))
+              ? expandTildePath(functionConfig.dirPath)
+              : require('node:path').resolve(yamlBaseDir, expandTildePath(functionConfig.dirPath)))
+          : undefined,
         // 2. Appwrite config folder/functions/name
         join(
           (cli as any).controller.getAppwriteFolderPath()!,