appwrite-cli 13.0.0-rc.5 → 13.0.0

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

@@ -17,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";
@@ -811,7 +812,9 @@ export class Push {
         }
 
         if (!func.path) {
-          errors.push(new Error(`Function '${func.name}' has no path configured`));
+          errors.push(
+            new Error(`Function '${func.name}' has no path configured`),
+          );
           updaterRow.fail({
             errorMessage: `No path configured for function`,
           });
@@ -1671,6 +1674,13 @@ const pushResources = async ({
       topics: localConfig.getMessagingTopics(),
     };
 
+    parseWithBetterErrors<ConfigType>(
+      ConfigSchema,
+      config,
+      "Configuration validation failed",
+      config,
+    );
+
     await pushInstance.pushResources(config, {
       all: cliConfig.all,
       skipDeprecated,

package/lib/config.ts

@@ -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.5';
+export const SDK_VERSION = '13.0.0';
 export const SDK_NAME = 'Command Line';
 export const SDK_PLATFORM = 'console';
 export const SDK_LANGUAGE = 'cli';

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.5",
+  "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.5",
+	"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.5/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.5/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",