appwrite-cli 13.0.0-rc.1 → 13.0.0-rc.3

package/lib/emulation/utils.ts

@@ -1,193 +1,207 @@
-import { EventEmitter } from 'node:events';
-import { projectsCreateJWT } from '../commands/projects';
-import { localConfig } from '../config';
-import { usersGet, usersCreateJWT } from '../commands/users';
-import { log } from '../parser';
+import { EventEmitter } from "node:events";
+import { localConfig } from "../config.js";
+import { log } from "../parser.js";
+import { sdkForConsole } from "../sdks.js";
+import { Projects, Users } from "@appwrite.io/console";
 
-export const openRuntimesVersion = 'v4';
+export const openRuntimesVersion = "v4";
 
 export const runtimeNames: Record<string, string> = {
-    node: 'Node.js',
-    php: 'PHP',
-    ruby: 'Ruby',
-    python: 'Python',
-    'python-ml': 'Python (ML)',
-    deno: 'Deno',
-    dart: 'Dart',
-    dotnet: '.NET',
-    java: 'Java',
-    swift: 'Swift',
-    kotlin: 'Kotlin',
-    bun: 'Bun',
-    go: 'Go',
+  node: "Node.js",
+  php: "PHP",
+  ruby: "Ruby",
+  python: "Python",
+  "python-ml": "Python (ML)",
+  deno: "Deno",
+  dart: "Dart",
+  dotnet: ".NET",
+  java: "Java",
+  swift: "Swift",
+  kotlin: "Kotlin",
+  bun: "Bun",
+  go: "Go",
 };
 
 interface SystemTool {
-    isCompiled: boolean;
-    startCommand: string;
-    dependencyFiles: string[];
+  isCompiled: boolean;
+  startCommand: string;
+  dependencyFiles: string[];
 }
 
 export const systemTools: Record<string, SystemTool> = {
-    node: {
-        isCompiled: false,
-        startCommand: 'sh helpers/server.sh',
-        dependencyFiles: ['package.json', 'package-lock.json'],
-    },
-    php: {
-        isCompiled: false,
-        startCommand: 'sh helpers/server.sh',
-        dependencyFiles: ['composer.json', 'composer.lock'],
-    },
-    ruby: {
-        isCompiled: false,
-        startCommand: 'sh helpers/server.sh',
-        dependencyFiles: ['Gemfile', 'Gemfile.lock'],
-    },
-    python: {
-        isCompiled: false,
-        startCommand: 'sh helpers/server.sh',
-        dependencyFiles: ['requirements.txt', 'requirements.lock'],
-    },
-    'python-ml': {
-        isCompiled: false,
-        startCommand: 'sh helpers/server.sh',
-        dependencyFiles: ['requirements.txt', 'requirements.lock'],
-    },
-    deno: {
-        isCompiled: false,
-        startCommand: 'sh helpers/server.sh',
-        dependencyFiles: [],
-    },
-    dart: {
-        isCompiled: true,
-        startCommand: 'sh helpers/server.sh',
-        dependencyFiles: [],
-    },
-    dotnet: {
-        isCompiled: true,
-        startCommand: 'sh helpers/server.sh',
-        dependencyFiles: [],
-    },
-    java: {
-        isCompiled: true,
-        startCommand: 'sh helpers/server.sh',
-        dependencyFiles: [],
-    },
-    swift: {
-        isCompiled: true,
-        startCommand: 'sh helpers/server.sh',
-        dependencyFiles: [],
-    },
-    kotlin: {
-        isCompiled: true,
-        startCommand: 'sh helpers/server.sh',
-        dependencyFiles: [],
-    },
-    bun: {
-        isCompiled: false,
-        startCommand: 'sh helpers/server.sh',
-        dependencyFiles: ['package.json', 'package-lock.json', 'bun.lockb'],
-    },
-    go: {
-        isCompiled: true,
-        startCommand: 'sh helpers/server.sh',
-        dependencyFiles: [],
-    },
+  node: {
+    isCompiled: false,
+    startCommand: "sh helpers/server.sh",
+    dependencyFiles: ["package.json", "package-lock.json"],
+  },
+  php: {
+    isCompiled: false,
+    startCommand: "sh helpers/server.sh",
+    dependencyFiles: ["composer.json", "composer.lock"],
+  },
+  ruby: {
+    isCompiled: false,
+    startCommand: "sh helpers/server.sh",
+    dependencyFiles: ["Gemfile", "Gemfile.lock"],
+  },
+  python: {
+    isCompiled: false,
+    startCommand: "sh helpers/server.sh",
+    dependencyFiles: ["requirements.txt", "requirements.lock"],
+  },
+  "python-ml": {
+    isCompiled: false,
+    startCommand: "sh helpers/server.sh",
+    dependencyFiles: ["requirements.txt", "requirements.lock"],
+  },
+  deno: {
+    isCompiled: false,
+    startCommand: "sh helpers/server.sh",
+    dependencyFiles: [],
+  },
+  dart: {
+    isCompiled: true,
+    startCommand: "sh helpers/server.sh",
+    dependencyFiles: [],
+  },
+  dotnet: {
+    isCompiled: true,
+    startCommand: "sh helpers/server.sh",
+    dependencyFiles: [],
+  },
+  java: {
+    isCompiled: true,
+    startCommand: "sh helpers/server.sh",
+    dependencyFiles: [],
+  },
+  swift: {
+    isCompiled: true,
+    startCommand: "sh helpers/server.sh",
+    dependencyFiles: [],
+  },
+  kotlin: {
+    isCompiled: true,
+    startCommand: "sh helpers/server.sh",
+    dependencyFiles: [],
+  },
+  bun: {
+    isCompiled: false,
+    startCommand: "sh helpers/server.sh",
+    dependencyFiles: ["package.json", "package-lock.json", "bun.lockb"],
+  },
+  go: {
+    isCompiled: true,
+    startCommand: "sh helpers/server.sh",
+    dependencyFiles: [],
+  },
 };
 
 export const JwtManager = {
-    userJwt: null as string | null,
-    functionJwt: null as string | null,
-
-    timerWarn: null as NodeJS.Timeout | null,
-    timerError: null as NodeJS.Timeout | null,
-
-    async setup(userId: string | null = null, projectScopes: string[] = []): Promise<void> {
-        if (this.timerWarn) {
-            clearTimeout(this.timerWarn);
-        }
-
-        if (this.timerError) {
-            clearTimeout(this.timerError);
-        }
-
-        this.timerWarn = setTimeout(() => {
-            log('Warning: Authorized JWT will expire in 5 minutes. Please stop and re-run the command to refresh tokens for 1 hour.');
-        }, 1000 * 60 * 55); // 55 mins
-
-        this.timerError = setTimeout(() => {
-            log('Warning: Authorized JWT just expired. Please stop and re-run the command to obtain new tokens with 1 hour validity.');
-            log('Some Appwrite API communication is not authorized now.');
-        }, 1000 * 60 * 60); // 60 mins
-
-        if (userId) {
-            await usersGet({
-                userId,
-                parseOutput: false,
-            });
-            const userResponse: any = await usersCreateJWT({
-                userId,
-                duration: 60 * 60,
-                parseOutput: false,
-            });
-            this.userJwt = userResponse.jwt;
-        }
-
-        const functionResponse: any = await projectsCreateJWT({
-            projectId: localConfig.getProject().projectId!,
-            scopes: projectScopes,
-            duration: 60 * 60,
-            parseOutput: false,
-        });
-        this.functionJwt = functionResponse.jwt;
-    },
+  userJwt: null as string | null,
+  functionJwt: null as string | null,
+
+  timerWarn: null as NodeJS.Timeout | null,
+  timerError: null as NodeJS.Timeout | null,
+
+  async setup(
+    userId: string | null = null,
+    projectScopes: string[] = [],
+  ): Promise<void> {
+    const consoleClient = await sdkForConsole();
+    const usersClient = new Users(consoleClient);
+    const projectsClient = new Projects(consoleClient);
+
+    if (this.timerWarn) {
+      clearTimeout(this.timerWarn);
+    }
+
+    if (this.timerError) {
+      clearTimeout(this.timerError);
+    }
+
+    this.timerWarn = setTimeout(
+      () => {
+        log(
+          "Warning: Authorized JWT will expire in 5 minutes. Please stop and re-run the command to refresh tokens for 1 hour.",
+        );
+      },
+      1000 * 60 * 55,
+    ); // 55 mins
+
+    this.timerError = setTimeout(
+      () => {
+        log(
+          "Warning: Authorized JWT just expired. Please stop and re-run the command to obtain new tokens with 1 hour validity.",
+        );
+        log("Some Appwrite API communication is not authorized now.");
+      },
+      1000 * 60 * 60,
+    ); // 60 mins
+
+    if (userId) {
+      await usersClient.get({
+        userId,
+      });
+      const userResponse: any = await usersClient.createJWT({
+        userId,
+        duration: 60 * 60,
+      });
+      this.userJwt = userResponse.jwt;
+    }
+
+    const functionResponse: any = await projectsClient.createJWT({
+      projectId: localConfig.getProject().projectId!,
+      scopes: projectScopes,
+      duration: 60 * 60,
+    });
+    this.functionJwt = functionResponse.jwt;
+  },
 };
 
 interface QueueReloadEvent {
-    files: string[];
+  files: string[];
 }
 
 export const Queue = {
-    files: [] as string[],
-    locked: false,
-    events: new EventEmitter(),
-    debounce: null as NodeJS.Timeout | null,
-
-    push(file: string): void {
-        if (!this.files.includes(file)) {
-            this.files.push(file);
-        }
-
-        if (!this.locked) {
-            this._trigger();
-        }
-    },
-
-    lock(): void {
-        this.files = [];
-        this.locked = true;
-    },
-
-    isEmpty(): boolean {
-        return this.files.length === 0;
-    },
-
-    unlock(): void {
-        this.locked = false;
-        if (this.files.length > 0) {
-            this._trigger();
-        }
-    },
-
-    _trigger(): void {
-        if (this.debounce) {
-            return;
-        }
-
-        this.debounce = setTimeout(() => {
-            this.events.emit('reload', { files: this.files } as QueueReloadEvent);
-            this.debounce = null;
-        }, 300);
-    },
+  files: [] as string[],
+  locked: false,
+  events: new EventEmitter(),
+  debounce: null as NodeJS.Timeout | null,
+
+  push(file: string): void {
+    if (!this.files.includes(file)) {
+      this.files.push(file);
+    }
+
+    if (!this.locked) {
+      this._trigger();
+    }
+  },
+
+  lock(): void {
+    this.files = [];
+    this.locked = true;
+  },
+
+  isEmpty(): boolean {
+    return this.files.length === 0;
+  },
+
+  unlock(): void {
+    this.locked = false;
+    if (this.files.length > 0) {
+      this._trigger();
+    }
+  },
+
+  _trigger(): void {
+    if (this.debounce) {
+      return;
+    }
+
+    this.debounce = setTimeout(() => {
+      this.events.emit("reload", { files: this.files } as QueueReloadEvent);
+      this.debounce = null;
+    }, 300);
+  },
 };

package/lib/id.ts

@@ -1,30 +1,30 @@
 class ID {
-    // Generate an hex ID based on timestamp
-    // Recreated from https://www.php.net/manual/en/function.uniqid.php
-    static #hexTimestamp(): string {
-        const now = new Date();
-        const sec = Math.floor(now.getTime() / 1000);
-        const msec = now.getMilliseconds();
+  // Generate an hex ID based on timestamp
+  // Recreated from https://www.php.net/manual/en/function.uniqid.php
+  static #hexTimestamp(): string {
+    const now = new Date();
+    const sec = Math.floor(now.getTime() / 1000);
+    const msec = now.getMilliseconds();
 
-        // Convert to hexadecimal
-        const hexTimestamp = sec.toString(16) + msec.toString(16).padStart(5, '0');
-        return hexTimestamp;
-    }
+    // Convert to hexadecimal
+    const hexTimestamp = sec.toString(16) + msec.toString(16).padStart(5, "0");
+    return hexTimestamp;
+  }
 
-    static custom(id: string): string {
-        return id;
-    }
+  static custom(id: string): string {
+    return id;
+  }
 
-    static unique(padding: number = 7): string {
-        // Generate a unique ID with padding to have a longer ID
-        const baseId = ID.#hexTimestamp();
-        let randomPadding = '';
-        for (let i = 0; i < padding; i++) {
-            const randomHexDigit = Math.floor(Math.random() * 16).toString(16);
-            randomPadding += randomHexDigit;
-        }
-        return baseId + randomPadding;
+  static unique(padding: number = 7): string {
+    // Generate a unique ID with padding to have a longer ID
+    const baseId = ID.#hexTimestamp();
+    let randomPadding = "";
+    for (let i = 0; i < padding; i++) {
+      const randomHexDigit = Math.floor(Math.random() * 16).toString(16);
+      randomPadding += randomHexDigit;
     }
+    return baseId + randomPadding;
+  }
 }
 
-export = ID;
+export default ID;

package/lib/paginate.ts

@@ -1,63 +1,77 @@
 interface PaginateArgs {
-    [key: string]: any;
+  [key: string]: any;
 }
 
-interface PaginateResponse<T = any> {
-    [key: string]: T;
-    total: number;
-}
+// Overload for when wrapper is empty string - returns array
+export function paginate<T = any>(
+  action: (args: PaginateArgs) => Promise<any>,
+  args: PaginateArgs,
+  limit: number,
+  wrapper: "",
+  queries?: string[],
+): Promise<T[]>;
+
+// Overload for when wrapper is specified - returns object with that key
+export function paginate<T = any, K extends string = string>(
+  action: (args: PaginateArgs) => Promise<any>,
+  args: PaginateArgs,
+  limit: number,
+  wrapper: K,
+  queries?: string[],
+): Promise<Record<K, T[]> & { total: number }>;
+
+// Implementation
+export async function paginate<T = any>(
+  action: (args: PaginateArgs) => Promise<any>,
+  args: PaginateArgs = {},
+  limit: number = 100,
+  wrapper: string = "",
+  queries: string[] = [],
+): Promise<T[] | (Record<string, T[]> & { total: number })> {
+  let pageNumber = 0;
+  let results: T[] = [];
+  let total = 0;
+
+  while (true) {
+    const offset = pageNumber * limit;
+
+    // Merge the limit and offset into the args
+    const response = await action({
+      ...args,
+      queries: [
+        ...queries,
+        JSON.stringify({ method: "limit", values: [limit] }),
+        JSON.stringify({ method: "offset", values: [offset] }),
+      ],
+    });
 
-export const paginate = async <T = any>(
-    action: (args: PaginateArgs) => Promise<any>,
-    args: PaginateArgs = {},
-    limit: number = 100,
-    wrapper: string = '',
-    queries: string[] = []
-): Promise<T[] | PaginateResponse<T[]>> => {
-    let pageNumber = 0;
-    let results: T[] = [];
-    let total = 0;
-
-    while (true) {
-        const offset = pageNumber * limit;
-
-        // Merge the limit and offset into the args
-        const response = await action({
-            ...args,
-            queries: [
-                ...queries,
-                JSON.stringify({ method: 'limit', values: [limit] }),
-                JSON.stringify({ method: 'offset', values: [offset] }),
-            ],
-        });
-
-        if (wrapper === '') {
-            if (response.length === 0) {
-                break;
-            }
-            results = results.concat(response);
-        } else {
-            if (response[wrapper].length === 0) {
-                break;
-            }
-            results = results.concat(response[wrapper]);
-        }
-
-        total = response.total;
-
-        if (results.length >= total) {
-            break;
-        }
-
-        pageNumber++;
+    if (wrapper === "") {
+      if (response.length === 0) {
+        break;
+      }
+      results = results.concat(response);
+    } else {
+      if (response[wrapper].length === 0) {
+        break;
+      }
+      results = results.concat(response[wrapper]);
     }
 
-    if (wrapper === '') {
-        return results;
+    total = response.total;
+
+    if (results.length >= total) {
+      break;
     }
 
-    return {
-        [wrapper]: results,
-        total,
-    } as PaginateResponse<T[]>;
-};
+    pageNumber++;
+  }
+
+  if (wrapper === "") {
+    return results;
+  }
+
+  return {
+    [wrapper]: results,
+    total,
+  } as Record<string, T[]> & { total: number };
+}