appwrite-cli 13.0.0-rc.5 → 13.0.1

package/dist/lib/utils.js

@@ -2,9 +2,8 @@ import fs from "fs";
 import path from "path";
 import net from "net";
 import childProcess from "child_process";
-import chalk from "chalk";
 import { fetch } from "undici";
-import { localConfig, globalConfig } from "./config.js";
+import { globalConfig } from "./config.js";
 import { NPM_REGISTRY_URL, DEFAULT_ENDPOINT } from "./constants.js";
 export const createSettingsObject = (project) => {
     return {
@@ -141,184 +140,27 @@ export const checkDeployConditions = (localConfig) => {
         throw new Error("No appwrite.config.json file found in the current directory. Please run this command again in the folder containing your appwrite.config.json file, or run 'appwrite init project' to link current directory to an Appwrite project.");
     }
 };
-export function showConsoleLink(serviceName, action, ...ids) {
-    const projectId = localConfig.getProject().projectId;
-    const url = new URL(globalConfig.getEndpoint().replace("/v1", "/console"));
-    url.pathname += `/project-${projectId}`;
-    action = action.toLowerCase();
-    switch (serviceName) {
-        case "account":
-            url.pathname = url.pathname.replace(`/project-${projectId}`, "");
-            url.pathname += getAccountPath(action);
-            break;
-        case "databases":
-            url.pathname += getDatabasePath(action, ids);
-            break;
-        case "functions":
-            url.pathname += getFunctionsPath(action, ids);
-            break;
-        case "messaging":
-            url.pathname += getMessagingPath(action, ids);
-            break;
-        case "projects":
-            url.pathname = url.pathname.replace(`/project-${projectId}`, "");
-            url.pathname += getProjectsPath(action, ids);
-            break;
-        case "storage":
-            url.pathname += getBucketsPath(action, ids);
-            break;
-        case "teams":
-            url.pathname += getTeamsPath(action, ids);
-            break;
-        case "organizations":
-            url.pathname += getOrganizationsPath(action, ids);
-            break;
-        case "users":
-            url.pathname += getUsersPath(action, ids);
-            break;
-        default:
-            return;
-    }
-    console.log(`${chalk.green.bold("✓ Success:")} ${chalk.green(url.toString())}`);
-}
-function getAccountPath(action) {
-    let path = "/account";
-    if (action === "listsessions") {
-        path += "/sessions";
-    }
-    return path;
-}
-function getDatabasePath(action, ids) {
-    let path = "/databases";
-    if ([
-        "get",
-        "listcollections",
-        "getcollection",
-        "listattributes",
-        "listdocuments",
-        "getdocument",
-        "listindexes",
-        "getdatabaseusage",
-    ].includes(action)) {
-        path += `/database-${ids[0]}`;
-    }
-    if (action === "getdatabaseusage") {
-        path += `/usage`;
-    }
-    if ([
-        "getcollection",
-        "listattributes",
-        "listdocuments",
-        "getdocument",
-        "listindexes",
-    ].includes(action)) {
-        path += `/collection-${ids[1]}`;
-    }
-    if (action === "listattributes") {
-        path += "/attributes";
-    }
-    if (action === "listindexes") {
-        path += "/indexes";
-    }
-    if (action === "getdocument") {
-        path += `/document-${ids[2]}`;
-    }
-    return path;
-}
-function getFunctionsPath(action, ids) {
-    let path = "/functions";
-    if (action !== "list") {
-        path += `/function-${ids[0]}`;
-    }
-    if (action === "getdeployment") {
-        path += `/deployment-${ids[1]}`;
-    }
-    if (action === "getexecution" || action === "listexecution") {
-        path += `/executions`;
-    }
-    if (action === "getfunctionusage") {
-        path += `/usage`;
-    }
-    return path;
-}
-function getMessagingPath(action, ids) {
-    let path = "/messaging";
-    if (["getmessage", "listmessagelogs"].includes(action)) {
-        path += `/message-${ids[0]}`;
-    }
-    if (["listproviders", "getprovider"].includes(action)) {
-        path += `/providers`;
-    }
-    if (action === "getprovider") {
-        path += `/provider-${ids[0]}`;
-    }
-    if (["listtopics", "gettopic"].includes(action)) {
-        path += `/topics`;
-    }
-    if (action === "gettopic") {
-        path += `/topic-${ids[0]}`;
-    }
-    return path;
-}
-function getProjectsPath(action, ids) {
-    let path = "";
-    if (action !== "list") {
-        path += `/project-${ids[0]}`;
-    }
-    if (["listkeys", "getkey"].includes(action)) {
-        path += "/overview/keys";
-    }
-    if (["listplatforms", "getplatform"].includes(action)) {
-        path += "/overview/platforms";
-    }
-    if (["listwebhooks", "getwebhook"].includes(action)) {
-        path += "/settings/webhooks";
-    }
-    if (["getplatform", "getkey", "getwebhook"].includes(action)) {
-        path += `/${ids[1]}`;
-    }
-    return path;
-}
-function getBucketsPath(action, ids) {
-    let path = "/storage";
-    if (action !== "listbuckets") {
-        path += `/bucket-${ids[0]}`;
-    }
-    if (action === "getbucketusage") {
-        path += `/usage`;
-    }
-    if (action === "getfile") {
-        path += `/file-${ids[1]}`;
-    }
-    return path;
-}
-function getTeamsPath(action, ids) {
-    let path = "/auth/teams";
-    if (action !== "list") {
-        path += `/team-${ids[0]}`;
-    }
-    return path;
-}
-function getOrganizationsPath(action, ids) {
-    let path = `/organization-${ids[0]}`;
-    if (action === "list") {
-        path = "/account/organizations";
-    }
-    return path;
-}
-function getUsersPath(action, ids) {
-    let path = "/auth";
-    if (action !== "list") {
-        path += `/user-${ids[0]}`;
-    }
-    if (action === "listsessions") {
-        path += "sessions";
-    }
-    return path;
-}
 export function isCloud() {
     const endpoint = globalConfig.getEndpoint() || DEFAULT_ENDPOINT;
     const hostname = new URL(endpoint).hostname;
     return hostname.endsWith("appwrite.io");
 }
+/**
+ * Filters an object to only include fields defined in a Zod object schema.
+ * Uses the schema's shape to determine allowed keys.
+ *
+ * @param data - The data to filter
+ * @param schema - A Zod object schema with a shape property
+ * @returns The filtered data with only schema-defined fields
+ */
+export function filterBySchema(data, schema) {
+    const allowedKeys = Object.keys(schema.shape);
+    const result = {};
+    for (const key of allowedKeys) {
+        if (key in data) {
+            result[key] = data[key];
+        }
+    }
+    return result;
+}
 //# sourceMappingURL=utils.js.map

package/dist/lib/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../lib/utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../lib/utils.ts"],"names":[],"mappings":"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"}

package/dist/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.1",
     "license": "BSD-3-Clause",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
@@ -28,7 +28,8 @@
         "windows-arm64": "bun run build && esbuild dist/cli.js --bundle --platform=node --format=cjs --outfile=dist/bundle.cjs --external:@appwrite.io/console --external:fsevents && pkg dist/bundle.cjs -t node18-win-arm64 -o build/appwrite-cli-win-arm64.exe"
     },
     "dependencies": {
-        "@appwrite.io/console": "^2.1.0",
+        "@appwrite.io/console": "^2.1.3",
+        "bignumber.js": "^9.0.0",
         "chalk": "4.1.2",
         "chokidar": "^3.6.0",
         "cli-progress": "^3.12.0",

package/docs/examples/projects/update-labels.md

@@ -0,0 +1,3 @@
+appwrite projects update-labels \
+    --project-id <PROJECT_ID> \
+    --labels one two three

package/install.ps1

@@ -13,8 +13,8 @@
 # You can use "View source" of this page to see the full script.
 
 # REPO
-$GITHUB_x64_URL = "https://github.com/appwrite/sdk-for-cli/releases/download/13.0.0-rc.5/appwrite-cli-win-x64.exe"
-$GITHUB_arm64_URL = "https://github.com/appwrite/sdk-for-cli/releases/download/13.0.0-rc.5/appwrite-cli-win-arm64.exe"
+$GITHUB_x64_URL = "https://github.com/appwrite/sdk-for-cli/releases/download/13.0.1/appwrite-cli-win-x64.exe"
+$GITHUB_arm64_URL = "https://github.com/appwrite/sdk-for-cli/releases/download/13.0.1/appwrite-cli-win-arm64.exe"
 
 $APPWRITE_BINARY_NAME = "appwrite.exe"
 

package/install.sh

@@ -96,7 +96,7 @@ printSuccess() {
 downloadBinary() {
     echo "[2/4] Downloading executable for $OS ($ARCH) ..."
 
-    GITHUB_LATEST_VERSION="13.0.0-rc.5"
+    GITHUB_LATEST_VERSION="13.0.1"
     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

@@ -1,8 +1,8 @@
 import os from "os";
 import { fetch, FormData, Agent } from "undici";
-import JSONbig from "json-bigint";
 import { AppwriteException } from "@appwrite.io/console";
 import { globalConfig } from "./config.js";
+import { JSONBig } from "./json.js";
 import chalk from "chalk";
 import type {
   Headers,
@@ -19,8 +19,6 @@ import {
   SDK_TITLE,
 } from "./constants.js";
 
-const JSONBigInt = JSONbig({ useNativeBigInt: true });
-
 class Client {
   private endpoint: string;
   private headers: Headers;
@@ -199,7 +197,7 @@ class Client {
 
       body = formData;
     } else {
-      body = JSONBigInt.stringify(params);
+      body = JSONBig.stringify(params);
     }
 
     let response: Awaited<ReturnType<typeof fetch>> | undefined = undefined;
@@ -266,7 +264,7 @@ class Client {
     const text = await response.text();
     let json: T | undefined = undefined;
     try {
-      json = JSONBigInt.parse(text);
+      json = JSONBig.parse(text);
     } catch (error) {
       return text as T;
     }

package/lib/commands/config.ts

@@ -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
@@ -319,6 +333,7 @@ const CollectionSchema = z
 // ============================================================================
 
 const ColumnSchema = AttributeSchema;
+const ColumnSchemaBase = AttributeSchemaBase;
 
 const IndexTableSchema = z
   .object({
@@ -330,7 +345,7 @@ const IndexTableSchema = z
   })
   .strict();
 
-const TablesDBSchema = z
+const TablesDBSchemaBase = z
   .object({
     $id: z.string(),
     $permissions: z.array(z.string()).optional(),
@@ -341,40 +356,41 @@ const TablesDBSchema = z
     columns: z.array(ColumnSchema).optional(),
     indexes: z.array(IndexTableSchema).optional(),
   })
-  .strict()
-  .superRefine((data, ctx) => {
-    if (data.columns && data.columns.length > 0) {
-      const seenKeys = new Set<string>();
+  .strict();
 
-      data.columns.forEach((col, index) => {
-        if (seenKeys.has(col.key)) {
-          ctx.addIssue({
-            code: z.ZodIssueCode.custom,
-            message: `Column with the key '${col.key}' already exists. Column keys must be unique, try again with a different key.`,
-            path: ["columns", index, "key"],
-          });
-        } else {
-          seenKeys.add(col.key);
-        }
-      });
-    }
+const TablesDBSchema = TablesDBSchemaBase.superRefine((data, ctx) => {
+  if (data.columns && data.columns.length > 0) {
+    const seenKeys = new Set<string>();
 
-    if (data.indexes && data.indexes.length > 0) {
-      const seenKeys = new Set<string>();
+    data.columns.forEach((col, index) => {
+      if (seenKeys.has(col.key)) {
+        ctx.addIssue({
+          code: z.ZodIssueCode.custom,
+          message: `Column with the key '${col.key}' already exists. Column keys must be unique, try again with a different key.`,
+          path: ["columns", index, "key"],
+        });
+      } else {
+        seenKeys.add(col.key);
+      }
+    });
+  }
 
-      data.indexes.forEach((index, indexPos) => {
-        if (seenKeys.has(index.key)) {
-          ctx.addIssue({
-            code: z.ZodIssueCode.custom,
-            message: `Index with the key '${index.key}' already exists. Index keys must be unique, try again with a different key.`,
-            path: ["indexes", indexPos, "key"],
-          });
-        } else {
-          seenKeys.add(index.key);
-        }
-      });
-    }
-  });
+  if (data.indexes && data.indexes.length > 0) {
+    const seenKeys = new Set<string>();
+
+    data.indexes.forEach((index, indexPos) => {
+      if (seenKeys.has(index.key)) {
+        ctx.addIssue({
+          code: z.ZodIssueCode.custom,
+          message: `Index with the key '${index.key}' already exists. Index keys must be unique, try again with a different key.`,
+          path: ["indexes", indexPos, "key"],
+        });
+      } else {
+        seenKeys.add(index.key);
+      }
+    });
+  }
+});
 
 // ============================================================================
 // Topics
@@ -477,7 +493,9 @@ export {
 
   /** Tables */
   TablesDBSchema,
+  TablesDBSchemaBase,
   ColumnSchema,
+  ColumnSchemaBase,
   IndexTableSchema,
 
   /** Topics */

package/lib/commands/pull.ts

@@ -37,10 +37,18 @@ import {
   commandDescriptions,
 } from "../parser.js";
 import type { ConfigType } from "./config.js";
-import { createSettingsObject } from "../utils.js";
+import {
+  DatabaseSchema,
+  TablesDBSchemaBase,
+  ColumnSchemaBase,
+  BucketSchema,
+  TopicSchema,
+} from "./config.js";
+import { createSettingsObject, filterBySchema } 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;
@@ -522,7 +530,7 @@ export class Pull {
       this.log(
         `Pulling all tables from ${chalk.bold(database.name)} database ...`,
       );
-      allDatabases.push(database);
+      allDatabases.push(filterBySchema(database, DatabaseSchema));
 
       const { tables } = await paginate(
         async () => new TablesDB(this.projectClient).listTables(database.$id),
@@ -532,10 +540,14 @@ export class Pull {
       );
 
       for (const table of tables) {
+        // Filter columns to only include schema-defined fields
+        const filteredColumns = table.columns?.map((col: any) =>
+          filterBySchema(col, ColumnSchemaBase),
+        );
+
         allTables.push({
-          ...table,
-          $createdAt: undefined,
-          $updatedAt: undefined,
+          ...filterBySchema(table, TablesDBSchemaBase),
+          columns: filteredColumns || [],
         });
       }
     }
@@ -575,13 +587,18 @@ export class Pull {
       "buckets",
     );
 
+    const filteredBuckets: any[] = [];
+
     for (const bucket of buckets) {
       this.log(`Pulling bucket ${chalk.bold(bucket.name)} ...`);
+      filteredBuckets.push(filterBySchema(bucket, BucketSchema));
     }
 
-    this.success(`Successfully pulled ${chalk.bold(buckets.length)} buckets.`);
+    this.success(
+      `Successfully pulled ${chalk.bold(filteredBuckets.length)} buckets.`,
+    );
 
-    return buckets;
+    return filteredBuckets;
   }
 
   /**
@@ -643,13 +660,18 @@ export class Pull {
       "topics",
     );
 
+    const filteredTopics: any[] = [];
+
     for (const topic of topics) {
       this.log(`Pulling topic ${chalk.bold(topic.name)} ...`);
+      filteredTopics.push(filterBySchema(topic, TopicSchema));
     }
 
-    this.success(`Successfully pulled ${chalk.bold(topics.length)} topics.`);
+    this.success(
+      `Successfully pulled ${chalk.bold(filteredTopics.length)} topics.`,
+    );
 
-    return topics;
+    return filteredTopics;
   }
 }
 
@@ -804,53 +826,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 */