appwrite-utils-cli 0.10.6 → 0.10.62

package/README.md

@@ -147,6 +147,8 @@ This updated CLI ensures that developers have robust tools at their fingertips t
 
 ## Changelog
 
+- 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
 - 0.10.051: Added `node_modules` and a few others to the ignore
 - 0.10.05: Made deploy function into deploy function(s) -- so you can do more than one at a time
 - 0.10.04: Fixed stupid progress bar not updating -- also fixed double text

package/dist/functions/deployments.d.ts

@@ -1,4 +1,4 @@
-import { Client } from "node-appwrite";
+import { Client, type Models } from "node-appwrite";
 import { type AppwriteFunction } from "appwrite-utils";
-export declare const deployFunction: (client: Client, functionId: string, codePath: string, activate?: boolean, entrypoint?: string, commands?: string) => Promise<import("node-appwrite").Models.Deployment>;
-export declare const deployLocalFunction: (client: Client, functionName: string, functionConfig: AppwriteFunction, functionPath?: string) => Promise<import("node-appwrite").Models.Deployment>;
+export declare const deployFunction: (client: Client, functionId: string, codePath: string, activate?: boolean, entrypoint?: string, commands?: string, ignored?: string[]) => Promise<Models.Deployment>;
+export declare const deployLocalFunction: (client: Client, functionName: string, functionConfig: AppwriteFunction, functionPath?: string) => Promise<Models.Deployment>;

package/dist/functions/deployments.js

@@ -1,14 +1,14 @@
 import { Client, Functions, Runtime } from "node-appwrite";
 import { InputFile } from "node-appwrite/file";
 import { create as createTarball } from "tar";
-import { join } from "node:path";
+import { join, relative } from "node:path";
 import fs from "node:fs";
 import { platform } from "node:os";
 import {} from "appwrite-utils";
 import chalk from "chalk";
 import cliProgress from "cli-progress";
 import { execSync } from "child_process";
-import { createFunction, getFunction, updateFunctionSpecifications, } from "./methods.js";
+import { createFunction, getFunction, updateFunction, updateFunctionSpecifications, } from "./methods.js";
 import ignore from "ignore";
 const findFunctionDirectory = (basePath, functionName) => {
     const normalizedName = functionName.toLowerCase().replace(/\s+/g, "-");
@@ -27,18 +27,12 @@ const findFunctionDirectory = (basePath, functionName) => {
     }
     return undefined;
 };
-export const deployFunction = async (client, functionId, codePath, activate = true, entrypoint = "index.js", commands) => {
+export const deployFunction = async (client, functionId, codePath, activate = true, entrypoint = "index.js", commands = "npm install", ignored = ["node_modules", ".git", ".vscode", ".DS_Store"]) => {
     const functions = new Functions(client);
     console.log(chalk.blue("Preparing function deployment..."));
-    // Setup ignore rules
-    const ig = ignore.default();
-    ig.add(["node_modules", ".git", ".vscode", ".DS_Store"]); // Common directories to ignore
-    // Read .gitignore if it exists
-    const gitignorePath = join(codePath, ".gitignore");
-    if (fs.existsSync(gitignorePath)) {
-        const gitignoreContent = fs.readFileSync(gitignorePath, "utf8");
-        ig.add(gitignoreContent);
-    }
+    // 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`);
     const progressBar = new cliProgress.SingleBar({
         format: "Uploading |" +
             chalk.cyan("{bar}") +
@@ -47,12 +41,15 @@ export const deployFunction = async (client, functionId, codePath, activate = tr
         barIncompleteChar: "░",
         hideCursor: true,
     });
-    const tarPath = join(process.cwd(), `function-${functionId}.tar.gz`);
     await createTarball({
         gzip: true,
         file: tarPath,
         cwd: codePath,
-        filter: (path) => !ig.ignores(path), // Use ignore to filter files
+        filter: (path, stat) => {
+            const relativePath = relative(codePath, join(codePath, path)).toLowerCase();
+            return !ignoredLower.some((pattern) => relativePath.startsWith(pattern) ||
+                relativePath.includes(`/${pattern}`));
+        },
     }, ["."]);
     const fileBuffer = await fs.promises.readFile(tarPath);
     const fileObject = InputFile.fromBuffer(new Uint8Array(fileBuffer), `function-${functionId}.tar.gz`);
@@ -95,8 +92,9 @@ export const deployFunction = async (client, functionId, codePath, activate = tr
 };
 export const deployLocalFunction = async (client, functionName, functionConfig, functionPath) => {
     let functionExists = true;
+    let functionThatExists;
     try {
-        await getFunction(client, functionConfig.$id);
+        functionThatExists = await getFunction(client, functionConfig.$id);
     }
     catch (error) {
         functionExists = false;
@@ -129,13 +127,14 @@ export const deployLocalFunction = async (client, functionName, functionConfig,
     }
     // Only create function if it doesn't exist
     if (!functionExists) {
-        await createFunction(client, functionConfig.$id, functionConfig.name, functionConfig.runtime, functionConfig.execute, functionConfig.events, functionConfig.schedule, functionConfig.timeout, functionConfig.enabled, functionConfig.logging, functionConfig.entrypoint, functionConfig.commands);
+        await createFunction(client, functionConfig.$id, functionConfig.name, functionConfig.runtime, functionConfig.execute, functionConfig.events, functionConfig.schedule, functionConfig.timeout, functionConfig.enabled, functionConfig.logging, functionConfig.entrypoint, functionConfig.commands, functionConfig.scopes, functionConfig.installationId, functionConfig.providerRepositoryId, functionConfig.providerBranch, functionConfig.providerSilentMode, functionConfig.providerRootDirectory, functionConfig.templateRepository, functionConfig.templateOwner, functionConfig.templateRootDirectory, functionConfig.templateVersion, functionConfig.specification);
     }
-    if (functionConfig.specification) {
-        await updateFunctionSpecifications(client, functionConfig.$id, functionConfig.specification);
+    else {
+        console.log(chalk.blue("Updating function..."));
+        await updateFunction(client, functionConfig.$id, functionConfig.name, functionConfig.runtime, functionConfig.execute, functionConfig.events, functionConfig.schedule, functionConfig.timeout, functionConfig.enabled, functionConfig.logging, functionConfig.entrypoint, functionConfig.commands, functionConfig.scopes, functionConfig.installationId, functionConfig.providerRepositoryId, functionConfig.providerBranch, functionConfig.providerSilentMode, functionConfig.providerRootDirectory, functionConfig.specification);
     }
     const deployPath = functionConfig.deployDir
         ? join(resolvedPath, functionConfig.deployDir)
         : resolvedPath;
-    return deployFunction(client, functionConfig.$id, deployPath, true, functionConfig.entrypoint, functionConfig.commands);
+    return deployFunction(client, functionConfig.$id, deployPath, true, functionConfig.entrypoint, functionConfig.commands, functionConfig.ignore);
 };

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.06",
+  "version": "0.10.62",
   "main": "src/main.ts",
   "type": "module",
   "repository": {
@@ -31,7 +31,7 @@
   },
   "dependencies": {
     "@types/inquirer": "^9.0.7",
-    "appwrite-utils": "^0.3.97",
+    "appwrite-utils": "^0.3.98",
     "chalk": "^5.3.0",
     "cli-progress": "^3.12.0",
     "commander": "^12.1.0",

package/src/functions/deployments.ts

@@ -1,7 +1,7 @@
-import { Client, Functions, Runtime } from "node-appwrite";
+import { Client, Functions, Runtime, type Models } from "node-appwrite";
 import { InputFile } from "node-appwrite/file";
 import { create as createTarball } from "tar";
-import { join } from "node:path";
+import { join, relative } from "node:path";
 import fs from "node:fs";
 import { platform } from "node:os";
 import { type AppwriteFunction, type Specification } from "appwrite-utils";
@@ -11,6 +11,7 @@ import { execSync } from "child_process";
 import {
   createFunction,
   getFunction,
+  updateFunction,
   updateFunctionSpecifications,
 } from "./methods.js";
 import ignore from "ignore";
@@ -45,21 +46,16 @@ export const deployFunction = async (
   codePath: string,
   activate: boolean = true,
   entrypoint: string = "index.js",
-  commands?: string
+  commands: string = "npm install",
+  ignored: string[] = ["node_modules", ".git", ".vscode", ".DS_Store"]
 ) => {
   const functions = new Functions(client);
   console.log(chalk.blue("Preparing function deployment..."));
 
-  // Setup ignore rules
-  const ig = ignore.default();
-  ig.add(["node_modules", ".git", ".vscode", ".DS_Store"]); // Common directories to ignore
+  // Convert ignored patterns to lowercase for case-insensitive comparison
+  const ignoredLower = ignored.map((pattern) => pattern.toLowerCase());
 
-  // Read .gitignore if it exists
-  const gitignorePath = join(codePath, ".gitignore");
-  if (fs.existsSync(gitignorePath)) {
-    const gitignoreContent = fs.readFileSync(gitignorePath, "utf8");
-    ig.add(gitignoreContent);
-  }
+  const tarPath = join(process.cwd(), `function-${functionId}.tar.gz`);
 
   const progressBar = new cliProgress.SingleBar({
     format:
@@ -71,14 +67,22 @@ export const deployFunction = async (
     hideCursor: true,
   });
 
-  const tarPath = join(process.cwd(), `function-${functionId}.tar.gz`);
-
   await createTarball(
     {
       gzip: true,
       file: tarPath,
       cwd: codePath,
-      filter: (path) => !ig.ignores(path), // Use ignore to filter files
+      filter: (path, stat) => {
+        const relativePath = relative(
+          codePath,
+          join(codePath, path)
+        ).toLowerCase();
+        return !ignoredLower.some(
+          (pattern) =>
+            relativePath.startsWith(pattern) ||
+            relativePath.includes(`/${pattern}`)
+        );
+      },
     },
     ["."]
   );
@@ -144,8 +148,9 @@ export const deployLocalFunction = async (
   functionPath?: string
 ) => {
   let functionExists = true;
+  let functionThatExists: Models.Function;
   try {
-    await getFunction(client, functionConfig.$id);
+    functionThatExists = await getFunction(client, functionConfig.$id);
   } catch (error) {
     functionExists = false;
   }
@@ -201,14 +206,40 @@ export const deployLocalFunction = async (
       functionConfig.enabled,
       functionConfig.logging,
       functionConfig.entrypoint,
-      functionConfig.commands
+      functionConfig.commands,
+      functionConfig.scopes,
+      functionConfig.installationId,
+      functionConfig.providerRepositoryId,
+      functionConfig.providerBranch,
+      functionConfig.providerSilentMode,
+      functionConfig.providerRootDirectory,
+      functionConfig.templateRepository,
+      functionConfig.templateOwner,
+      functionConfig.templateRootDirectory,
+      functionConfig.templateVersion,
+      functionConfig.specification
     );
-  }
-
-  if (functionConfig.specification) {
-    await updateFunctionSpecifications(
+  } else {
+    console.log(chalk.blue("Updating function..."));
+    await updateFunction(
       client,
       functionConfig.$id,
+      functionConfig.name,
+      functionConfig.runtime as Runtime,
+      functionConfig.execute,
+      functionConfig.events,
+      functionConfig.schedule,
+      functionConfig.timeout,
+      functionConfig.enabled,
+      functionConfig.logging,
+      functionConfig.entrypoint,
+      functionConfig.commands,
+      functionConfig.scopes,
+      functionConfig.installationId,
+      functionConfig.providerRepositoryId,
+      functionConfig.providerBranch,
+      functionConfig.providerSilentMode,
+      functionConfig.providerRootDirectory,
       functionConfig.specification
     );
   }
@@ -223,6 +254,7 @@ export const deployLocalFunction = async (
     deployPath,
     true,
     functionConfig.entrypoint,
-    functionConfig.commands
+    functionConfig.commands,
+    functionConfig.ignore
   );
 };