appwrite-cli 13.4.0 → 13.6.0

package/lib/commands/utils/attributes.ts

@@ -4,6 +4,7 @@ import { KeysAttributes } from "../../config.js";
 import { log, success, error, cliConfig, drawTable } from "../../parser.js";
 import { Pools } from "./pools.js";
 import inquirer from "inquirer";
+import type { Client } from "@appwrite.io/console";
 
 const changeableKeys = [
   "status",
@@ -53,9 +54,11 @@ const questionPushChangesConfirmation = [
 export class Attributes {
   private pools: Pools;
   private skipConfirmation: boolean;
+  private client?: Client;
 
-  constructor(pools?: Pools, skipConfirmation = false) {
-    this.pools = pools || new Pools();
+  constructor(pools?: Pools, skipConfirmation = false, client?: Client) {
+    this.client = client;
+    this.pools = pools || new Pools(undefined, client);
     this.skipConfirmation = skipConfirmation;
   }
 
@@ -197,7 +200,7 @@ export class Attributes {
     collectionId: string,
     attribute: any,
   ): Promise<any> => {
-    const databasesService = await getDatabasesService();
+    const databasesService = await getDatabasesService(this.client);
     switch (attribute.type) {
       case "string":
         switch (attribute.format) {
@@ -373,7 +376,7 @@ export class Attributes {
     collectionId: string,
     attribute: any,
   ): Promise<any> => {
-    const databasesService = await getDatabasesService();
+    const databasesService = await getDatabasesService(this.client);
     switch (attribute.type) {
       case "string":
         switch (attribute.format) {
@@ -533,7 +536,7 @@ export class Attributes {
       `Deleting ${isIndex ? "index" : "attribute"} ${attribute.key} of ${collection.name} ( ${collection["$id"]} )`,
     );
 
-    const databasesService = await getDatabasesService();
+    const databasesService = await getDatabasesService(this.client);
     if (isIndex) {
       await databasesService.deleteIndex(
         collection["databaseId"],
@@ -733,7 +736,7 @@ export class Attributes {
   ): Promise<void> => {
     log(`Creating indexes ...`);
 
-    const databasesService = await getDatabasesService();
+    const databasesService = await getDatabasesService(this.client);
     for (let index of indexes) {
       await databasesService.createIndex({
         databaseId: collection["databaseId"],

package/lib/commands/utils/pools.ts

@@ -1,14 +1,17 @@
 import { getDatabasesService } from "../../services.js";
 import { paginate } from "../../paginate.js";
 import { log } from "../../parser.js";
+import type { Client } from "@appwrite.io/console";
 
 export class Pools {
   private STEP_SIZE = 100; // Resources
   private POLL_DEBOUNCE = 2000; // Milliseconds
   private pollMaxDebounces = 30;
   private POLL_DEFAULT_VALUE = 30;
+  private client?: Client;
 
-  constructor(pollMaxDebounces?: number) {
+  constructor(pollMaxDebounces?: number, client?: Client) {
+    this.client = client;
     if (pollMaxDebounces) {
       this.pollMaxDebounces = pollMaxDebounces;
     }
@@ -23,7 +26,7 @@ export class Pools {
       return false;
     }
 
-    const databasesService = await getDatabasesService();
+    const databasesService = await getDatabasesService(this.client);
     const response = await databasesService.listAttributes(
       databaseId,
       collectionId,
@@ -62,7 +65,7 @@ export class Pools {
       return false;
     }
 
-    const databasesService = await getDatabasesService();
+    const databasesService = await getDatabasesService(this.client);
     const response = await databasesService.listIndexes(
       databaseId,
       collectionId,
@@ -117,7 +120,7 @@ export class Pools {
 
     const { attributes } = await paginate(
       async (args: any) => {
-        const databasesService = await getDatabasesService();
+        const databasesService = await getDatabasesService(this.client);
         return await databasesService.listAttributes({
           databaseId: args.databaseId,
           collectionId: args.collectionId,
@@ -175,7 +178,7 @@ export class Pools {
 
     const { attributes } = await paginate(
       async (args: any) => {
-        const databasesService = await getDatabasesService();
+        const databasesService = await getDatabasesService(this.client);
         return await databasesService.listAttributes(
           args.databaseId,
           args.collectionId,
@@ -243,7 +246,7 @@ export class Pools {
 
     const { indexes } = await paginate(
       async (args: any) => {
-        const databasesService = await getDatabasesService();
+        const databasesService = await getDatabasesService(this.client);
         return await databasesService.listIndexes(
           args.databaseId,
           args.collectionId,

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

package/lib/json.ts

@@ -5,14 +5,18 @@ const JSONbigSerializer = JSONbigModule({ useNativeBigInt: true });
 
 const MAX_SAFE = BigInt(Number.MAX_SAFE_INTEGER);
 const MIN_SAFE = BigInt(Number.MIN_SAFE_INTEGER);
+const MAX_INT64 = BigInt("9223372036854775807");
+const MIN_INT64 = BigInt("-9223372036854775808");
 
 function isBigNumber(value: any): boolean {
-  return value !== null
-    && typeof value === 'object'
-    && value._isBigNumber === true
-    && typeof value.isInteger === 'function'
-    && typeof value.toFixed === 'function'
-    && typeof value.toNumber === 'function';
+  return (
+    value !== null &&
+    typeof value === "object" &&
+    value._isBigNumber === true &&
+    typeof value.isInteger === "function" &&
+    typeof value.toFixed === "function" &&
+    typeof value.toNumber === "function"
+  );
 }
 
 function reviver(_key: string, value: any): any {
@@ -23,7 +27,10 @@ function reviver(_key: string, value: any): any {
       if (bi >= MIN_SAFE && bi <= MAX_SAFE) {
         return Number(str);
       }
-      return bi;
+      if (bi >= MIN_INT64 && bi <= MAX_INT64) {
+        return bi;
+      }
+      return value.toNumber();
     }
     return value.toNumber();
   }

package/lib/utils.ts

@@ -160,6 +160,21 @@ export function isCloud(): boolean {
   return hostname.endsWith("appwrite.io");
 }
 
+export function arrayEqualsUnordered(left: unknown, right: unknown): boolean {
+  const a = Array.isArray(left)
+    ? [...left].map((item) => String(item)).sort()
+    : [];
+  const b = Array.isArray(right)
+    ? [...right].map((item) => String(item)).sort()
+    : [];
+
+  if (a.length !== b.length) {
+    return false;
+  }
+
+  return a.every((value, index) => value === b[index]);
+}
+
 /**
  * Filters an object to only include fields defined in a Zod object schema.
  * Uses the schema's shape to determine allowed keys.

package/package.json

@@ -3,10 +3,23 @@
   "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.4.0",
+  "version": "13.6.0",
   "license": "BSD-3-Clause",
-  "main": "dist/index.js",
+  "main": "dist/index.cjs",
+  "module": "dist/index.js",
   "types": "dist/index.d.ts",
+  "exports": {
+    ".": {
+      "import": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
+      },
+      "require": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.cjs"
+      }
+    }
+  },
   "bin": {
     "appwrite": "dist/cli.cjs"
   },
@@ -17,8 +30,9 @@
   "scripts": {
     "build": "npm run build:types && npm run build:runtime",
     "build:types": "tsc -p tsconfig.json --emitDeclarationOnly",
-    "build:runtime": "npm run build:lib:runtime && npm run build:cli",
-    "build:lib:runtime": "esbuild index.ts --bundle --platform=node --target=node18 --format=esm --loader:.hbs=text --outfile=dist/index.js",
+    "build:runtime": "npm run build:lib:esm && npm run build:lib:cjs && npm run build:cli",
+    "build:lib:esm": "esbuild index.ts --bundle --platform=node --target=node18 --format=esm --loader:.hbs=text --outfile=dist/index.js",
+    "build:lib:cjs": "esbuild index.ts --bundle --platform=node --target=node18 --format=cjs --loader:.hbs=text --outfile=dist/index.cjs",
     "build:cli": "esbuild cli.ts --bundle --platform=node --target=node18 --format=cjs --loader:.hbs=text --external:fsevents --outfile=dist/cli.cjs",
     "format": "prettier --write \"**/*.{js,ts,json,md}\"",
     "generate": "tsx scripts/generate-commands.ts",
@@ -32,7 +46,7 @@
     "windows-arm64": "esbuild cli.ts --bundle --loader:.hbs=text --platform=node --target=node18 --format=esm --external:fsevents --outfile=dist/bundle-win-arm64.mjs && pkg dist/bundle-win-arm64.mjs -t node18-win-arm64 -o build/appwrite-cli-win-arm64.exe"
   },
   "dependencies": {
-    "@appwrite.io/console": "^2.3.1",
+    "@appwrite.io/console": "^3.1.0",
     "chalk": "4.1.2",
     "chokidar": "^3.6.0",
     "cli-progress": "^3.12.0",

package/scoop/appwrite.config.json

@@ -1,12 +1,12 @@
 {
 	"$schema": "https://raw.githubusercontent.com/ScoopInstaller/Scoop/master/schema.json",
-	"version": "13.4.0",
+	"version": "13.6.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.4.0/appwrite-cli-win-x64.exe",
+			"url": "https://github.com/appwrite/sdk-for-cli/releases/download/13.6.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.4.0/appwrite-cli-win-arm64.exe",
+			"url": "https://github.com/appwrite/sdk-for-cli/releases/download/13.6.0/appwrite-cli-win-arm64.exe",
 			"bin": [
 				[
 					"appwrite-cli-win-arm64.exe",

package/dist/lib/commands/services/console.d.ts

@@ -1,3 +0,0 @@
-import { Command } from "commander";
-export declare const console: Command;
-//# sourceMappingURL=console.d.ts.map

package/dist/lib/commands/services/console.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"console.d.ts","sourceRoot":"","sources":["../../../../lib/commands/services/console.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAsBpC,eAAO,MAAM,OAAO,SAIhB,CAAC"}

package/docs/examples/console/get-resource.md

@@ -1,5 +0,0 @@
-```bash
-appwrite console get-resource \
-    --value <VALUE> \
-    --type rules
-```

package/docs/examples/console/variables.md

@@ -1,3 +0,0 @@
-```bash
-appwrite console variables
-```

package/lib/commands/services/console.ts

@@ -1,49 +0,0 @@
-import { Command } from "commander";
-import { sdkForProject } from "../../sdks.js";
-import {
-  actionRunner,
-  commandDescriptions,
-  success,
-  parse,
-  parseBool,
-  parseInteger,
-} from "../../parser.js";
-import { Console } from "@appwrite.io/console";
-
-let consoleClient: Console | null = null;
-
-const getConsoleClient = async (): Promise<Console> => {
-  if (!consoleClient) {
-    const sdkClient = await sdkForProject();
-    consoleClient = new Console(sdkClient);
-  }
-  return consoleClient;
-};
-
-export const console = new Command("console")
-  .description(commandDescriptions["console"] ?? "")
-  .configureHelp({
-    helpWidth: process.stdout.columns || 80,
-  });
-
-console
-  .command(`get-resource`)
-  .description(`Check if a resource ID is available.`)
-  .requiredOption(`--value <value>`, `Resource value.`)
-  .requiredOption(`--type <type>`, `Resource type.`)
-  .action(
-    actionRunner(
-      async ({ value, type }) =>
-        parse(await (await getConsoleClient()).getResource(value, type)),
-    ),
-  );
-
-console
-  .command(`variables`)
-  .description(`Get all Environment Variables that are relevant for the console.`)
-  .action(
-    actionRunner(
-      async () => parse(await (await getConsoleClient()).variables()),
-    ),
-  );
-