appwrite-cli 13.0.0-rc.4 → 13.0.0

package/install.sh

@@ -96,7 +96,7 @@ printSuccess() {
 downloadBinary() {
     echo "[2/4] Downloading executable for $OS ($ARCH) ..."
 
-    GITHUB_LATEST_VERSION="13.0.0-rc.4"
+    GITHUB_LATEST_VERSION="13.0.0"
     GITHUB_FILE="appwrite-cli-${OS}-${ARCH}"
     GITHUB_URL="https://github.com/$GITHUB_REPOSITORY_NAME/releases/download/$GITHUB_LATEST_VERSION/$GITHUB_FILE"
 

package/lib/client.ts

@@ -19,7 +19,7 @@ import {
   SDK_TITLE,
 } from "./constants.js";
 
-const JSONBigInt = JSONbig({ storeAsString: false });
+const JSONBigInt = JSONbig({ useNativeBigInt: true });
 
 class Client {
   private endpoint: string;

package/lib/commands/config.ts

@@ -127,10 +127,10 @@ const SettingsSchema = z
           .optional(),
         security: z
           .object({
-            duration: z.number().optional(),
-            limit: z.number().optional(),
-            sessionsLimit: z.number().optional(),
-            passwordHistory: z.number().optional(),
+            duration: z.union([z.number(), z.bigint()]).optional(),
+            limit: z.union([z.number(), z.bigint()]).optional(),
+            sessionsLimit: z.union([z.number(), z.bigint()]).optional(),
+            passwordHistory: z.union([z.number(), z.bigint()]).optional(),
             passwordDictionary: z.boolean().optional(),
             personalDataCheck: z.boolean().optional(),
             sessionAlerts: z.boolean().optional(),
@@ -155,7 +155,7 @@ const SiteSchema = z
     name: z.string(),
     enabled: z.boolean().optional(),
     logging: z.boolean().optional(),
-    timeout: z.number().optional(),
+    timeout: z.union([z.number(), z.bigint()]).optional(),
     framework: z.string().optional(),
     buildRuntime: z.string().optional(),
     adapter: z.string().optional(),
@@ -182,7 +182,7 @@ const FunctionSchema = z
     scopes: z.array(z.string()).optional(),
     events: z.array(z.string()).optional(),
     schedule: z.string().optional(),
-    timeout: z.number().optional(),
+    timeout: z.union([z.number(), z.bigint()]).optional(),
     entrypoint: z.string().optional(),
     commands: z.string().optional(),
     vars: z.record(z.string(), z.string()).optional(),
@@ -256,6 +256,20 @@ const AttributeSchema = AttributeSchemaBase.refine(
     message: "When 'required' is true, 'default' must be null",
     path: ["default"],
   },
+).refine(
+  (data) => {
+    if (
+      data.type === "string" &&
+      (data.size === undefined || data.size === null)
+    ) {
+      return false;
+    }
+    return true;
+  },
+  {
+    message: "When 'type' is 'string', 'size' must be defined",
+    path: ["size"],
+  },
 );
 
 const IndexSchema = z

package/lib/commands/pull.ts

@@ -41,6 +41,7 @@ import { createSettingsObject } from "../utils.js";
 import { ProjectNotInitializedError } from "./errors.js";
 import type { SettingsType, FunctionType, SiteType } from "./config.js";
 import { downloadDeploymentCode } from "./utils/deployment.js";
+import { getConfirmation } from "./utils/change-approval.js";
 
 export interface PullOptions {
   all?: boolean;
@@ -804,53 +805,117 @@ const pullCollection = async (): Promise<void> => {
   const pullInstance = await createPullInstance();
   const { databases, collections } = await pullInstance.pullCollections();
 
-  for (const database of databases) {
-    localConfig.addDatabase(database);
-  }
+  const localCollections = localConfig.getCollections();
+  const remoteCollectionIds = new Set(collections.map((c: any) => c.$id));
+  const collectionsToRemove = localCollections.filter(
+    (c: any) => !remoteCollectionIds.has(c.$id),
+  );
 
-  for (const collection of collections) {
-    localConfig.addCollection(collection);
+  if (collectionsToRemove.length > 0) {
+    warn(
+      `The following collections exist locally but not remotely and will be removed: ${collectionsToRemove.map((c: any) => c.name || c.$id).join(", ")}`,
+    );
+    if ((await getConfirmation()) !== true) {
+      log("Pull cancelled.");
+      return;
+    }
   }
+
+  localConfig.set("databases", databases);
+  localConfig.set("collections", collections);
 };
 
 const pullTable = async (): Promise<void> => {
   const pullInstance = await createPullInstance();
   const { databases, tables } = await pullInstance.pullTables();
 
-  for (const database of databases) {
-    localConfig.addTablesDB(database);
-  }
+  const localTables = localConfig.getTables();
+  const remoteTableIds = new Set(tables.map((t: any) => t.$id));
+  const tablesToRemove = localTables.filter(
+    (t: any) => !remoteTableIds.has(t.$id),
+  );
 
-  for (const table of tables) {
-    localConfig.addTable(table);
+  if (tablesToRemove.length > 0) {
+    warn(
+      `The following tables exist locally but not remotely and will be removed: ${tablesToRemove.map((t: any) => t.name || t.$id).join(", ")}`,
+    );
+    if ((await getConfirmation()) !== true) {
+      log("Pull cancelled.");
+      return;
+    }
   }
+
+  localConfig.set("tablesDB", databases);
+  localConfig.set("tables", tables);
 };
 
 const pullBucket = async (): Promise<void> => {
   const pullInstance = await createPullInstance();
   const buckets = await pullInstance.pullBuckets();
 
-  for (const bucket of buckets) {
-    localConfig.addBucket(bucket);
+  const localBuckets = localConfig.getBuckets();
+  const remoteBucketIds = new Set(buckets.map((b: any) => b.$id));
+  const bucketsToRemove = localBuckets.filter(
+    (b: any) => !remoteBucketIds.has(b.$id),
+  );
+
+  if (bucketsToRemove.length > 0) {
+    warn(
+      `The following buckets exist locally but not remotely and will be removed: ${bucketsToRemove.map((b: any) => b.name || b.$id).join(", ")}`,
+    );
+    if ((await getConfirmation()) !== true) {
+      log("Pull cancelled.");
+      return;
+    }
   }
+
+  localConfig.set("buckets", buckets);
 };
 
 const pullTeam = async (): Promise<void> => {
   const pullInstance = await createPullInstance();
   const teams = await pullInstance.pullTeams();
 
-  for (const team of teams) {
-    localConfig.addTeam(team);
+  const localTeams = localConfig.getTeams();
+  const remoteTeamIds = new Set(teams.map((t: any) => t.$id));
+  const teamsToRemove = localTeams.filter(
+    (t: any) => !remoteTeamIds.has(t.$id),
+  );
+
+  if (teamsToRemove.length > 0) {
+    warn(
+      `The following teams exist locally but not remotely and will be removed: ${teamsToRemove.map((t: any) => t.name || t.$id).join(", ")}`,
+    );
+    if ((await getConfirmation()) !== true) {
+      log("Pull cancelled.");
+      return;
+    }
   }
+
+  localConfig.set("teams", teams);
 };
 
 const pullMessagingTopic = async (): Promise<void> => {
   const pullInstance = await createPullInstance();
   const topics = await pullInstance.pullMessagingTopics();
 
-  for (const topic of topics) {
-    localConfig.addMessagingTopic(topic);
+  const localTopics = localConfig.getMessagingTopics();
+  const remoteTopicIds = new Set(topics.map((t: any) => t.$id));
+  const topicsToRemove = localTopics.filter(
+    (t: any) => !remoteTopicIds.has(t.$id),
+  );
+
+  if (topicsToRemove.length > 0) {
+    warn(
+      `The following topics exist locally but not remotely and will be removed: ${topicsToRemove.map((t: any) => t.name || t.$id).join(", ")}`,
+    );
+    if ((await getConfirmation()) !== true) {
+      log("Pull cancelled.");
+      return;
+    }
   }
+
+  localConfig.set("topics", topics);
 };
 
 /** Commander.js exports */

package/lib/commands/push.ts

@@ -1,4 +1,5 @@
 import fs from "fs";
+import path from "path";
 import { parse as parseDotenv } from "dotenv";
 import chalk from "chalk";
 import inquirer from "inquirer";
@@ -16,7 +17,8 @@ import {
   KeysCollection,
   KeysTable,
 } from "../config.js";
-import type { SettingsType, ConfigType } from "./config.js";
+import { ConfigSchema, type SettingsType, type ConfigType } from "./config.js";
+import { parseWithBetterErrors } from "./utils/error-formatter.js";
 import { createSettingsObject } from "../utils.js";
 import { Spinner, SPINNER_DOTS } from "../spinner.js";
 import { paginate } from "../paginate.js";
@@ -25,7 +27,9 @@ import {
   questionsPushBuckets,
   questionsPushTeams,
   questionsPushFunctions,
+  questionsPushFunctionsCode,
   questionsPushSites,
+  questionsPushSitesCode,
   questionsGetEntrypoint,
   questionsPushCollections,
   questionsPushTables,
@@ -414,15 +418,15 @@ export class Push {
         this.log("Applying auth security settings ...");
         await projectsService.updateAuthDuration({
           projectId,
-          duration: settings.auth.security.duration,
+          duration: Number(settings.auth.security.duration),
         });
         await projectsService.updateAuthLimit({
           projectId,
-          limit: settings.auth.security.limit,
+          limit: Number(settings.auth.security.limit),
         });
         await projectsService.updateAuthSessionsLimit({
           projectId,
-          limit: settings.auth.security.sessionsLimit,
+          limit: Number(settings.auth.security.sessionsLimit),
         });
         await projectsService.updateAuthPasswordDictionary({
           projectId,
@@ -430,7 +434,7 @@ export class Push {
         });
         await projectsService.updateAuthPasswordHistory({
           projectId,
-          limit: settings.auth.security.passwordHistory,
+          limit: Number(settings.auth.security.passwordHistory),
         });
         await projectsService.updatePersonalDataCheck({
           projectId,
@@ -807,6 +811,29 @@ export class Push {
           return;
         }
 
+        if (!func.path) {
+          errors.push(
+            new Error(`Function '${func.name}' has no path configured`),
+          );
+          updaterRow.fail({
+            errorMessage: `No path configured for function`,
+          });
+          return;
+        }
+
+        if (
+          !fs.existsSync(func.path) ||
+          fs.readdirSync(func.path).length === 0
+        ) {
+          errors.push(
+            new Error(`Deployment not found or empty at path: ${func.path}`),
+          );
+          updaterRow.fail({
+            errorMessage: `path not found or empty: ${path.relative(process.cwd(), path.resolve(func.path))}`,
+          });
+          return;
+        }
+
         try {
           updaterRow.update({ status: "Pushing" }).replaceSpinner(SPINNER_DOTS);
           const functionsServiceDeploy = await getFunctionsService(
@@ -838,7 +865,7 @@ export class Push {
           switch (e.code) {
             case "ENOENT":
               updaterRow.fail({
-                errorMessage: "Not found in the current directory. Skipping...",
+                errorMessage: `Deployment not found at path: ${path.resolve(func.path)}`,
               });
               break;
             default:
@@ -1145,6 +1172,27 @@ export class Push {
           return;
         }
 
+        if (!site.path) {
+          errors.push(new Error(`Site '${site.name}' has no path configured`));
+          updaterRow.fail({
+            errorMessage: `No path configured for site`,
+          });
+          return;
+        }
+
+        if (
+          !fs.existsSync(site.path) ||
+          fs.readdirSync(site.path).length === 0
+        ) {
+          errors.push(
+            new Error(`Deployment not found or empty at path: ${site.path}`),
+          );
+          updaterRow.fail({
+            errorMessage: `path not found or empty: ${path.relative(process.cwd(), path.resolve(site.path))}`,
+          });
+          return;
+        }
+
         try {
           updaterRow.update({ status: "Pushing" }).replaceSpinner(SPINNER_DOTS);
           const sitesServiceDeploy = await getSitesService(this.projectClient);
@@ -1174,7 +1222,7 @@ export class Push {
           switch (e.code) {
             case "ENOENT":
               updaterRow.fail({
-                errorMessage: "Not found in the current directory. Skipping...",
+                errorMessage: `Deployment not found at path: ${path.resolve(site.path)}`,
               });
               break;
             default:
@@ -1593,13 +1641,54 @@ const pushResources = async ({
   if (cliConfig.all) {
     checkDeployConditions(localConfig);
 
+    const functions = localConfig.getFunctions();
+    let allowFunctionsCodePush: boolean | null =
+      cliConfig.force === true ? true : null;
+    if (functions.length > 0 && allowFunctionsCodePush === null) {
+      const codeAnswer = await inquirer.prompt(questionsPushFunctionsCode);
+      allowFunctionsCodePush = codeAnswer.override;
+    }
+
+    const sites = localConfig.getSites();
+    let allowSitesCodePush: boolean | null =
+      cliConfig.force === true ? true : null;
+    if (sites.length > 0 && allowSitesCodePush === null) {
+      const codeAnswer = await inquirer.prompt(questionsPushSitesCode);
+      allowSitesCodePush = codeAnswer.override;
+    }
+
     const pushInstance = await createPushInstance();
-    const config = localConfig.getProject() as ConfigType;
+    const project = localConfig.getProject();
+    const config: ConfigType = {
+      projectId: project.projectId ?? "",
+      projectName: project.projectName,
+      settings: project.projectSettings,
+      functions,
+      sites,
+      collections: localConfig.getCollections(),
+      databases: localConfig.getDatabases(),
+      tables: localConfig.getTables(),
+      tablesDB: localConfig.getTablesDBs(),
+      buckets: localConfig.getBuckets(),
+      teams: localConfig.getTeams(),
+      topics: localConfig.getMessagingTopics(),
+    };
+
+    parseWithBetterErrors<ConfigType>(
+      ConfigSchema,
+      config,
+      "Configuration validation failed",
+      config,
+    );
 
     await pushInstance.pushResources(config, {
+      all: cliConfig.all,
       skipDeprecated,
-      functionOptions: { code: true, withVariables: false },
-      siteOptions: { code: true, withVariables: false },
+      functionOptions: {
+        code: allowFunctionsCodePush === true,
+        withVariables: false,
+      },
+      siteOptions: { code: allowSitesCodePush === true, withVariables: false },
     });
   } else {
     const actions: Record<string, (options?: any) => Promise<void>> = {
@@ -1763,12 +1852,20 @@ const pushSite = async ({
     return;
   }
 
+  let allowCodePush: boolean | null = cliConfig.force === true ? true : null;
+  if (code !== false && allowCodePush === null) {
+    const codeAnswer = await inquirer.prompt(questionsPushSitesCode);
+    allowCodePush = codeAnswer.override;
+  }
+
+  const shouldPushCode = code !== false && allowCodePush === true;
+
   log("Pushing sites ...");
 
   const pushInstance = await createPushInstance();
   const result = await pushInstance.pushSites(sites, {
     async: asyncDeploy,
-    code,
+    code: shouldPushCode,
     withVariables,
   });
 
@@ -1883,12 +1980,20 @@ const pushFunction = async ({
     return;
   }
 
+  let allowCodePush: boolean | null = cliConfig.force === true ? true : null;
+  if (code !== false && allowCodePush === null) {
+    const codeAnswer = await inquirer.prompt(questionsPushFunctionsCode);
+    allowCodePush = codeAnswer.override;
+  }
+
+  const shouldPushCode = code !== false && allowCodePush === true;
+
   log("Pushing functions ...");
 
   const pushInstance = await createPushInstance();
   const result = await pushInstance.pushFunctions(functions, {
     async: asyncDeploy,
-    code,
+    code: shouldPushCode,
     withVariables,
   });
 

package/lib/commands/schema.ts

@@ -9,7 +9,7 @@ import * as fs from "fs";
 import * as path from "path";
 import { Db } from "./db.js";
 
-const JSONBig = JSONbig({ storeAsString: false });
+const JSONBig = JSONbig({ useNativeBigInt: true });
 
 export class Schema {
   private pullCommand: Pull;

package/lib/commands/utils/attributes.ts

@@ -1,7 +1,7 @@
 import chalk from "chalk";
 import { getDatabasesService } from "../../services.js";
 import { KeysAttributes } from "../../config.js";
-import { log, success, cliConfig, drawTable } from "../../parser.js";
+import { log, success, error, cliConfig, drawTable } from "../../parser.js";
 import { Pools } from "./pools.js";
 import inquirer from "inquirer";
 
@@ -591,15 +591,21 @@ export class Attributes {
 
     if (changes.length > 0) {
       changedAttributes = changes.map((change) => change.attribute);
-      await Promise.all(
-        changedAttributes.map((changed) =>
-          this.updateAttribute(
-            collection["databaseId"],
-            collection["$id"],
-            changed,
+      try {
+        await Promise.all(
+          changedAttributes.map((changed) =>
+            this.updateAttribute(
+              collection["databaseId"],
+              collection["$id"],
+              changed,
+            ),
           ),
-        ),
-      );
+        );
+      } catch (err) {
+        error(
+          `Error updating attribute for ${collection["$id"]}: ${String(err)}`,
+        );
+      }
     }
 
     const deletingAttributes = deleting.map((change) => change.attribute);

package/lib/commands/utils/pools.ts

@@ -44,7 +44,7 @@ export class Pools {
     }
 
     if (this.pollMaxDebounces === this.POLL_DEFAULT_VALUE) {
-      let steps = Math.max(1, Math.ceil(total / this.STEP_SIZE));
+      let steps = Math.max(1, Math.ceil(Number(total) / this.STEP_SIZE));
       if (steps > 1 && iteration === 1) {
         this.pollMaxDebounces *= steps;
 
@@ -83,7 +83,7 @@ export class Pools {
     }
 
     if (this.pollMaxDebounces === this.POLL_DEFAULT_VALUE) {
-      let steps = Math.max(1, Math.ceil(total / this.STEP_SIZE));
+      let steps = Math.max(1, Math.ceil(Number(total) / this.STEP_SIZE));
       if (steps > 1 && iteration === 1) {
         this.pollMaxDebounces *= steps;
 

package/lib/config.ts

@@ -24,7 +24,7 @@ import type {
 import { createSettingsObject } from "./utils.js";
 import { SDK_TITLE_LOWER } from "./constants.js";
 
-const JSONBigInt = JSONbig({ storeAsString: false });
+const JSONBigInt = JSONbig({ useNativeBigInt: true });
 
 const KeysVars = new Set(["key", "value"]);
 const KeysSite = new Set([
@@ -159,6 +159,41 @@ const KeyIndexesColumns = new Set([
   "orders",
 ]);
 
+const CONFIG_KEY_ORDER = [
+  "projectId",
+  "projectName",
+  "endpoint",
+  "settings",
+  "functions",
+  "sites",
+  "databases",
+  "collections",
+  "tablesDB",
+  "tables",
+  "buckets",
+  "teams",
+  "topics",
+  "messages",
+];
+
+function orderConfigKeys<T extends Record<string, any>>(data: T): T {
+  const ordered: Record<string, any> = {};
+
+  for (const key of CONFIG_KEY_ORDER) {
+    if (key in data) {
+      ordered[key] = data[key];
+    }
+  }
+
+  for (const key of Object.keys(data)) {
+    if (!(key in ordered)) {
+      ordered[key] = data[key];
+    }
+  }
+
+  return ordered as T;
+}
+
 function whitelistKeys<T = any>(
   value: T,
   keys: Set<string>,
@@ -326,6 +361,17 @@ class Local extends Config<ConfigType> {
     this.configDirectoryPath = _path.dirname(absolutePath);
   }
 
+  write(): void {
+    const dir = _path.dirname(this.path);
+    if (!fs.existsSync(dir)) {
+      fs.mkdirSync(dir, { recursive: true });
+    }
+    const orderedData = orderConfigKeys(this.data);
+    fs.writeFileSync(this.path, JSONBigInt.stringify(orderedData, null, 4), {
+      mode: 0o600,
+    });
+  }
+
   static findConfigFile(filename: string): string | null {
     let currentPath = process.cwd();
 

package/lib/constants.ts

@@ -1,7 +1,7 @@
 // SDK
 export const SDK_TITLE = 'Appwrite';
 export const SDK_TITLE_LOWER = 'appwrite';
-export const SDK_VERSION = '13.0.0-rc.4';
+export const SDK_VERSION = '13.0.0';
 export const SDK_NAME = 'Command Line';
 export const SDK_PLATFORM = 'console';
 export const SDK_LANGUAGE = 'cli';

package/lib/questions.ts

@@ -368,6 +368,14 @@ export const questionsPullFunctionsCode: Question[] = [
   },
 ];
 
+export const questionsPushFunctionsCode: Question[] = [
+  {
+    type: "confirm",
+    name: "override",
+    message: "Do you want to create a deployment for your functions?",
+  },
+];
+
 export const questionsPullSites: Question[] = [
   {
     type: "checkbox",
@@ -403,6 +411,14 @@ export const questionsPullSitesCode: Question[] = [
   },
 ];
 
+export const questionsPushSitesCode: Question[] = [
+  {
+    type: "confirm",
+    name: "override",
+    message: "Do you want to create a deployment for your sites?",
+  },
+];
+
 export const questionsCreateFunction: Question[] = [
   {
     type: "input",

package/package.json

@@ -3,7 +3,7 @@
   "type": "module",
   "homepage": "https://appwrite.io/support",
   "description": "Appwrite is an open-source self-hosted backend server that abstracts and simplifies complex and repetitive development tasks behind a very simple REST API",
-  "version": "13.0.0-rc.4",
+  "version": "13.0.0",
   "license": "BSD-3-Clause",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/scoop/appwrite.config.json

@@ -1,12 +1,12 @@
 {
 	"$schema": "https://raw.githubusercontent.com/ScoopInstaller/Scoop/master/schema.json",
-	"version": "13.0.0-rc.4",
+	"version": "13.0.0",
 	"description": "The Appwrite CLI is a command-line application that allows you to interact with Appwrite and perform server-side tasks using your terminal.",
 	"homepage": "https://github.com/appwrite/sdk-for-cli",
 	"license": "BSD-3-Clause",
 	"architecture": {
 		"64bit": {
-			"url": "https://github.com/appwrite/sdk-for-cli/releases/download/13.0.0-rc.4/appwrite-cli-win-x64.exe",
+			"url": "https://github.com/appwrite/sdk-for-cli/releases/download/13.0.0/appwrite-cli-win-x64.exe",
 			"bin": [
 				[
 					"appwrite-cli-win-x64.exe",
@@ -15,7 +15,7 @@
 			]
 		},
 		"arm64": {
-			"url": "https://github.com/appwrite/sdk-for-cli/releases/download/13.0.0-rc.4/appwrite-cli-win-arm64.exe",
+			"url": "https://github.com/appwrite/sdk-for-cli/releases/download/13.0.0/appwrite-cli-win-arm64.exe",
 			"bin": [
 				[
 					"appwrite-cli-win-arm64.exe",