appwrite-utils-cli 0.9.998 → 0.9.999

package/README.md

@@ -147,6 +147,7 @@ This updated CLI ensures that developers have robust tools at their fingertips t
 
 ## Changelog
 
+- 0.9.999: Fixed Functions, looks for `./functions` in addition to `appwriteConfigFolder/functions`
 - 0.9.998: Fixed transfer finally, added `--targetDbId` and `--sourceDbId` as aliases
 - 0.9.994: Added function deployment management, in BETA, and fixed document transfer between databases
 - 0.9.993: Fixed `updateFunctionSpecifications` resetting functions to default with undefined values (oops)

package/dist/interactiveCLI.js

@@ -292,27 +292,55 @@ export class InteractiveCLI {
         console.log(chalk.green("✨ Function created successfully!"));
     }
     async findFunctionInSubdirectories(basePath, functionName) {
-        const queue = [basePath];
+        // Common locations to check first
+        const commonPaths = [
+            join(process.cwd(), "functions", functionName), // ./functions/functionName
+            join(process.cwd(), functionName), // ./functionName
+            join(basePath, "functions", functionName), // appwriteFolder/functions/functionName
+            join(basePath, functionName), // appwriteFolder/functionName
+        ];
+        // Check common locations first
+        for (const path of commonPaths) {
+            try {
+                const stats = await fs.promises.stat(path);
+                if (stats.isDirectory()) {
+                    console.log(chalk.green(`Found function at common location: ${path}`));
+                    return path;
+                }
+            }
+            catch (error) {
+                // Path doesn't exist, continue to next
+            }
+        }
+        // If not found in common locations, do recursive search
+        console.log(chalk.yellow("Function not found in common locations, searching subdirectories..."));
+        const queue = [process.cwd(), basePath];
+        const searched = new Set();
         while (queue.length > 0) {
             const currentPath = queue.shift();
+            if (searched.has(currentPath))
+                continue;
+            searched.add(currentPath);
             try {
                 const entries = await fs.promises.readdir(currentPath, {
                     withFileTypes: true,
                 });
-                // Check if function exists in current directory
-                const functionPath = join(currentPath, functionName);
-                if (fs.existsSync(functionPath)) {
-                    return functionPath;
-                }
-                // Add subdirectories to queue
                 for (const entry of entries) {
-                    if (entry.isDirectory()) {
-                        queue.push(join(currentPath, entry.name));
+                    const fullPath = join(currentPath, entry.name);
+                    // Skip node_modules and hidden directories
+                    if (entry.isDirectory() &&
+                        !entry.name.startsWith(".") &&
+                        entry.name !== "node_modules") {
+                        if (entry.name === functionName) {
+                            console.log(chalk.green(`Found function at: ${fullPath}`));
+                            return fullPath;
+                        }
+                        queue.push(fullPath);
                     }
                 }
             }
             catch (error) {
-                console.log(chalk.yellow(`Skipping inaccessible directory: ${currentPath}`));
+                console.log(chalk.yellow(`Error reading directory ${currentPath}:`, error));
             }
         }
         return null;

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

package/src/interactiveCLI.ts

@@ -391,31 +391,70 @@ export class InteractiveCLI {
     basePath: string,
     functionName: string
   ): Promise<string | null> {
-    const queue = [basePath];
+    // Common locations to check first
+    const commonPaths = [
+      join(process.cwd(), "functions", functionName), // ./functions/functionName
+      join(process.cwd(), functionName), // ./functionName
+      join(basePath, "functions", functionName), // appwriteFolder/functions/functionName
+      join(basePath, functionName), // appwriteFolder/functionName
+    ];
+
+    // Check common locations first
+    for (const path of commonPaths) {
+      try {
+        const stats = await fs.promises.stat(path);
+        if (stats.isDirectory()) {
+          console.log(
+            chalk.green(`Found function at common location: ${path}`)
+          );
+          return path;
+        }
+      } catch (error) {
+        // Path doesn't exist, continue to next
+      }
+    }
+
+    // If not found in common locations, do recursive search
+    console.log(
+      chalk.yellow(
+        "Function not found in common locations, searching subdirectories..."
+      )
+    );
+
+    const queue = [process.cwd(), basePath];
+    const searched = new Set<string>();
 
     while (queue.length > 0) {
       const currentPath = queue.shift()!;
 
+      if (searched.has(currentPath)) continue;
+      searched.add(currentPath);
+
       try {
         const entries = await fs.promises.readdir(currentPath, {
           withFileTypes: true,
         });
 
-        // Check if function exists in current directory
-        const functionPath = join(currentPath, functionName);
-        if (fs.existsSync(functionPath)) {
-          return functionPath;
-        }
-
-        // Add subdirectories to queue
         for (const entry of entries) {
-          if (entry.isDirectory()) {
-            queue.push(join(currentPath, entry.name));
+          const fullPath = join(currentPath, entry.name);
+
+          // Skip node_modules and hidden directories
+          if (
+            entry.isDirectory() &&
+            !entry.name.startsWith(".") &&
+            entry.name !== "node_modules"
+          ) {
+            if (entry.name === functionName) {
+              console.log(chalk.green(`Found function at: ${fullPath}`));
+              return fullPath;
+            }
+
+            queue.push(fullPath);
           }
         }
       } catch (error) {
         console.log(
-          chalk.yellow(`Skipping inaccessible directory: ${currentPath}`)
+          chalk.yellow(`Error reading directory ${currentPath}:`, error)
         );
       }
     }