appwrite-utils-cli 0.10.63 → 0.10.65

package/README.md

@@ -147,6 +147,8 @@ This updated CLI ensures that developers have robust tools at their fingertips t
 
 ## Changelog
 
+- 0.10.65: Fixed the stupid local functions not caring about the ignore string, and added `__pycache__` and `.venv` to default ignores
+- 0.10.64: Fixed `Deploy Function(s)` not ignoring things properly
 - 0.10.63: My `collectLocalFunctions` function was failing to add the `scopes` and a few others to the function, accidentally, fixed now
 - 0.10.62: Made `Deploy Function(s)` also update the functions, as not all things (timeout, specification, etc.) are updated via deploy
 - 0.10.61: Fixed ignore haha, also added `ignore` to the `Functions` config, to specify what to ignore when creating the `.tar.gz` file

package/dist/functions/deployments.js

@@ -27,12 +27,28 @@ const findFunctionDirectory = (basePath, functionName) => {
     }
     return undefined;
 };
-export const deployFunction = async (client, functionId, codePath, activate = true, entrypoint = "index.js", commands = "npm install", ignored = ["node_modules", ".git", ".vscode", ".DS_Store"]) => {
+export const deployFunction = async (client, functionId, codePath, activate = true, entrypoint = "index.js", commands = "npm install", ignored = [
+    "node_modules",
+    ".git",
+    ".vscode",
+    ".DS_Store",
+    "__pycache__",
+    ".venv",
+]) => {
     const functions = new Functions(client);
     console.log(chalk.blue("Preparing function deployment..."));
     // Convert ignored patterns to lowercase for case-insensitive comparison
     const ignoredLower = ignored.map((pattern) => pattern.toLowerCase());
     const tarPath = join(process.cwd(), `function-${functionId}.tar.gz`);
+    // Verify codePath exists and is a directory
+    if (!fs.existsSync(codePath)) {
+        throw new Error(`Function directory not found at ${codePath}`);
+    }
+    const stats = await fs.promises.stat(codePath);
+    if (!stats.isDirectory()) {
+        throw new Error(`${codePath} is not a directory`);
+    }
+    console.log(chalk.blue(`Creating tarball from ${codePath}`));
     const progressBar = new cliProgress.SingleBar({
         format: "Uploading |" +
             chalk.cyan("{bar}") +
@@ -47,10 +63,17 @@ export const deployFunction = async (client, functionId, codePath, activate = tr
         cwd: codePath,
         filter: (path, stat) => {
             const relativePath = relative(codePath, join(codePath, path)).toLowerCase();
-            return !ignoredLower.some((pattern) => relativePath.startsWith(pattern) ||
-                relativePath.includes(`/${pattern}`));
+            // Skip if path matches any ignored pattern
+            if (ignoredLower.some((pattern) => relativePath.startsWith(pattern) ||
+                relativePath.includes(`/${pattern}`) ||
+                relativePath.includes(`\\${pattern}`))) {
+                console.log(chalk.gray(`Ignoring ${path}`));
+                return false;
+            }
+            return true;
         },
-    }, ["."]);
+    }, ["."] // This now only includes contents of codePath since we set cwd to codePath
+    );
     const fileBuffer = await fs.promises.readFile(tarPath);
     const fileObject = InputFile.fromBuffer(new Uint8Array(fileBuffer), `function-${functionId}.tar.gz`);
     try {

package/dist/interactiveCLI.js

@@ -514,6 +514,7 @@ export class InteractiveCLI {
             events: f.events || [],
             schedule: f.schedule || "",
             timeout: f.timeout || 15,
+            ignore: f.ignore || [],
             enabled: f.enabled !== false,
             logging: f.logging !== false,
             entrypoint: f.entrypoint || "src/index.ts",

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

package/src/functions/deployments.ts

@@ -47,7 +47,14 @@ export const deployFunction = async (
   activate: boolean = true,
   entrypoint: string = "index.js",
   commands: string = "npm install",
-  ignored: string[] = ["node_modules", ".git", ".vscode", ".DS_Store"]
+  ignored: string[] = [
+    "node_modules",
+    ".git",
+    ".vscode",
+    ".DS_Store",
+    "__pycache__",
+    ".venv",
+  ]
 ) => {
   const functions = new Functions(client);
   console.log(chalk.blue("Preparing function deployment..."));
@@ -57,6 +64,18 @@ export const deployFunction = async (
 
   const tarPath = join(process.cwd(), `function-${functionId}.tar.gz`);
 
+  // Verify codePath exists and is a directory
+  if (!fs.existsSync(codePath)) {
+    throw new Error(`Function directory not found at ${codePath}`);
+  }
+
+  const stats = await fs.promises.stat(codePath);
+  if (!stats.isDirectory()) {
+    throw new Error(`${codePath} is not a directory`);
+  }
+
+  console.log(chalk.blue(`Creating tarball from ${codePath}`));
+
   const progressBar = new cliProgress.SingleBar({
     format:
       "Uploading |" +
@@ -77,14 +96,22 @@ export const deployFunction = async (
           codePath,
           join(codePath, path)
         ).toLowerCase();
-        return !ignoredLower.some(
-          (pattern) =>
-            relativePath.startsWith(pattern) ||
-            relativePath.includes(`/${pattern}`)
-        );
+        // Skip if path matches any ignored pattern
+        if (
+          ignoredLower.some(
+            (pattern) =>
+              relativePath.startsWith(pattern) ||
+              relativePath.includes(`/${pattern}`) ||
+              relativePath.includes(`\\${pattern}`)
+          )
+        ) {
+          console.log(chalk.gray(`Ignoring ${path}`));
+          return false;
+        }
+        return true;
       },
     },
-    ["."]
+    ["."] // This now only includes contents of codePath since we set cwd to codePath
   );
 
   const fileBuffer = await fs.promises.readFile(tarPath);

package/src/interactiveCLI.ts

@@ -712,6 +712,7 @@ export class InteractiveCLI {
       events: f.events || [],
       schedule: f.schedule || "",
       timeout: f.timeout || 15,
+      ignore: f.ignore || [],
       enabled: f.enabled !== false,
       logging: f.logging !== false,
       entrypoint: f.entrypoint || "src/index.ts",