appwrite-cli 12.0.1 → 13.0.0-rc.1

package/lib/commands/{generic.js → generic.ts}

@@ -1,16 +1,24 @@
-const inquirer = require("inquirer");
-const { Command } = require("commander");
-const Client = require("../client");
-const { sdkForConsole } = require("../sdks");
-const { globalConfig, localConfig } = require("../config");
-const { actionRunner, success, parseBool, commandDescriptions, error, parse, hint, log, drawTable, cliConfig } = require("../parser");
-const ID = require("../id");
-const { questionsLogin, questionsLogout, questionsListFactors, questionsMFAChallenge } = require("../questions");
-const { accountUpdateMFAChallenge, accountCreateMFAChallenge, accountGet, accountCreateEmailPasswordSession, accountDeleteSession } = require("./account");
+import inquirer from 'inquirer';
+import { Command } from 'commander';
+import Client from '../client';
+import { sdkForConsole } from '../sdks';
+import { globalConfig, localConfig } from '../config';
+import { actionRunner, success, parseBool, commandDescriptions, error, parse, hint, log, drawTable, cliConfig } from '../parser';
+import ID from '../id';
+import { questionsLogin, questionsLogout, questionsListFactors, questionsMFAChallenge } from '../questions';
+import { accountUpdateMFAChallenge, accountCreateMFAChallenge, accountGet, accountCreateEmailPasswordSession, accountDeleteSession } from './account';
 
 const DEFAULT_ENDPOINT = 'https://cloud.appwrite.io/v1';
 
-const loginCommand = async ({ email, password, endpoint, mfa, code }) => {
+interface LoginCommandOptions {
+    email?: string;
+    password?: string;
+    endpoint?: string;
+    mfa?: string;
+    code?: string;
+}
+
+export const loginCommand = async ({ email, password, endpoint, mfa, code }: LoginCommandOptions): Promise<void> => {
     const oldCurrent = globalConfig.getCurrentSession();
 
     const configEndpoint = (endpoint ?? globalConfig.getEndpoint()) || DEFAULT_ENDPOINT;
@@ -67,8 +75,8 @@ const loginCommand = async ({ email, password, endpoint, mfa, code }) => {
             sdk: client,
             parseOutput: false
         });
-    } catch (error) {
-        if (error.response === 'user_more_factors_required') {
+    } catch (err: any) {
+        if (err.response === 'user_more_factors_required') {
             const { factor } = mfa ? { factor: mfa } : await inquirer.prompt(questionsListFactors);
 
             const challenge = await accountCreateMFAChallenge({
@@ -93,10 +101,10 @@ const loginCommand = async ({ email, password, endpoint, mfa, code }) => {
         } else {
             globalConfig.removeSession(id);
             globalConfig.setCurrentSession(oldCurrent);
-            if (endpoint !== DEFAULT_ENDPOINT && error.response === 'user_invalid_credentials') {
+            if (endpoint !== DEFAULT_ENDPOINT && err.response === 'user_invalid_credentials') {
                 log('Use the --endpoint option for self-hosted instances')
             }
-            throw error;
+            throw err;
         }
     }
 
@@ -104,7 +112,7 @@ const loginCommand = async ({ email, password, endpoint, mfa, code }) => {
     hint("Next you can create or link to your project using 'appwrite init project'");
 };
 
-const whoami = new Command("whoami")
+export const whoami = new Command("whoami")
     .description(commandDescriptions['whoami'])
     .action(actionRunner(async () => {
         if (globalConfig.getEndpoint() === '' || globalConfig.getCookie() === '') {
@@ -144,13 +152,13 @@ const whoami = new Command("whoami")
         drawTable(data)
     }));
 
-const register = new Command("register")
+export const register = new Command("register")
     .description(commandDescriptions['register'])
     .action(actionRunner(async () => {
         log('Visit https://cloud.appwrite.io/register to create an account')
     }));
 
-const login = new Command("login")
+export const login = new Command("login")
     .description(commandDescriptions['login'])
     .option(`--email [email]`, `User email`)
     .option(`--password [password]`, `User password`)
@@ -162,7 +170,7 @@ const login = new Command("login")
     })
     .action(actionRunner(loginCommand));
 
-const deleteSession = async (accountId) => {
+const deleteSession = async (accountId: string): Promise<void> => {
     try {
         let client = await sdkForConsole();
 
@@ -178,7 +186,7 @@ const deleteSession = async (accountId) => {
     }
 }
 
-const logout = new Command("logout")
+export const logout = new Command("logout")
     .description(commandDescriptions['logout'])
     .configureHelp({
         helpWidth: process.stdout.columns || 80
@@ -210,8 +218,8 @@ const logout = new Command("logout")
 
         const remainingSessions = globalConfig.getSessions();
 
-        if (remainingSessions.length > 0 && remainingSessions.filter(session => session.id === current).length !== 1) {
-            const accountId = remainingSessions [0].id;
+        if (remainingSessions.length > 0 && remainingSessions.filter((session: any) => session.id === current).length !== 1) {
+            const accountId = remainingSessions[0].id;
             globalConfig.setCurrentSession(accountId);
 
             success(`Current account is ${accountId}`);
@@ -222,7 +230,16 @@ const logout = new Command("logout")
         success("Logging out");
     }));
 
-const client = new Command("client")
+interface ClientCommandOptions {
+    selfSigned?: boolean;
+    endpoint?: string;
+    projectId?: string;
+    key?: string;
+    debug?: boolean;
+    reset?: boolean;
+}
+
+export const client = new Command("client")
     .description(commandDescriptions['client'])
     .configureHelp({
         helpWidth: process.stdout.columns || 80
@@ -233,7 +250,7 @@ const client = new Command("client")
     .option("-k, --key <key>", "Set your Appwrite server's API key")
     .option("-d, --debug", "Print CLI debug information")
     .option("-r, --reset", "Reset the CLI configuration")
-    .action(actionRunner(async ({ selfSigned, endpoint, projectId, key, debug, reset }, command) => {
+    .action(actionRunner(async ({ selfSigned, endpoint, projectId, key, debug, reset }: ClientCommandOptions, command: Command) => {
         if (selfSigned == undefined && endpoint == undefined && projectId == undefined && key == undefined && debug == undefined && reset == undefined) {
             command.help()
         }
@@ -257,12 +274,12 @@ const client = new Command("client")
                     throw new Error();
                 }
 
-                let client = new Client().setEndpoint(endpoint);
-                client.setProject('console');
+                let clientInstance = new Client().setEndpoint(endpoint);
+                clientInstance.setProject('console');
                 if (selfSigned || globalConfig.getSelfSigned()) {
-                    client.setSelfSigned(true);
+                    clientInstance.setSelfSigned(true);
                 }
-                let response = await client.call('GET', '/health/version');
+                let response = await clientInstance.call('GET', '/health/version');
                 if (!response.version) {
                     throw new Error();
                 }
@@ -289,7 +306,7 @@ const client = new Command("client")
         if (reset !== undefined) {
             const sessions = globalConfig.getSessions();
 
-            for (let accountId of sessions.map(session => session.id)) {
+            for (let accountId of sessions.map((session: any) => session.id)) {
                 globalConfig.setCurrentSession(accountId);
                 await deleteSession(accountId);
             }
@@ -298,7 +315,7 @@ const client = new Command("client")
         success("Setting client")
     }));
 
-const migrate = async () => {
+export const migrate = async (): Promise<void> => {
     if (!globalConfig.has('endpoint') || !globalConfig.has('cookie')) {
         return;
     }
@@ -317,14 +334,5 @@ const migrate = async () => {
     globalConfig.setCurrentSession(id);
     globalConfig.delete('endpoint');
     globalConfig.delete('cookie');
-
 }
-module.exports = {
-        loginCommand,
-    whoami,
-    register,
-    login,
-    logout,
-        migrate,
-    client
-};
+

package/lib/commands/graphql.ts

@@ -0,0 +1,110 @@
+import fs = require('fs');
+import pathLib = require('path');
+import tar = require('tar');
+import ignore = require('ignore');
+import { promisify } from 'util';
+import Client from '../client';
+import { getAllFiles, showConsoleLink } from '../utils';
+import { Command } from 'commander';
+import { sdkForProject, sdkForConsole } from '../sdks';
+import { parse, actionRunner, parseInteger, parseBool, commandDescriptions, success, log, warn } from '../parser';
+import { localConfig, globalConfig } from '../config';
+import { File } from 'undici';
+import { ReadableStream } from 'stream/web';
+
+function convertReadStreamToReadableStream(readStream: fs.ReadStream): ReadableStream {
+  return new ReadableStream({
+    start(controller) {
+      readStream.on("data", (chunk: Buffer) => {
+        controller.enqueue(chunk);
+      });
+      readStream.on("end", () => {
+        controller.close();
+      });
+      readStream.on("error", (err: Error) => {
+        controller.error(err);
+      });
+    },
+    cancel() {
+      readStream.destroy();
+    },
+  });
+}
+
+export const graphql = new Command("graphql").description(commandDescriptions['graphql'] ?? '').configureHelp({
+    helpWidth: process.stdout.columns || 80
+})
+
+interface GraphqlQueryRequestParams {
+    query: object;
+    overrideForCli?: boolean;
+    parseOutput?: boolean;
+    sdk?: Client;
+}
+
+export const graphqlQuery = async ({query,parseOutput = true, overrideForCli = false, sdk = undefined}: GraphqlQueryRequestParams): Promise<any> => {
+    let client = !sdk ? await sdkForProject() :
+    sdk;
+    let apiPath = '/graphql';
+    let payload = {};
+    if (typeof query !== 'undefined') {
+        payload['query'] = JSON.parse(query);
+    }
+
+    let response = undefined;
+
+    response = await client.call('post', apiPath, {
+        'x-sdk-graphql': 'true',
+        'content-type': 'application/json',
+    }, payload);
+
+    if (parseOutput) {
+        parse(response)
+    }
+
+    return response;
+
+}
+interface GraphqlMutationRequestParams {
+    query: object;
+    overrideForCli?: boolean;
+    parseOutput?: boolean;
+    sdk?: Client;
+}
+
+export const graphqlMutation = async ({query,parseOutput = true, overrideForCli = false, sdk = undefined}: GraphqlMutationRequestParams): Promise<any> => {
+    let client = !sdk ? await sdkForProject() :
+    sdk;
+    let apiPath = '/graphql/mutation';
+    let payload = {};
+    if (typeof query !== 'undefined') {
+        payload['query'] = JSON.parse(query);
+    }
+
+    let response = undefined;
+
+    response = await client.call('post', apiPath, {
+        'x-sdk-graphql': 'true',
+        'content-type': 'application/json',
+    }, payload);
+
+    if (parseOutput) {
+        parse(response)
+    }
+
+    return response;
+
+}
+graphql
+    .command(`query`)
+    .description(`Execute a GraphQL mutation.`)
+    .requiredOption(`--query <query>`, `The query or queries to execute.`)
+    .action(actionRunner(graphqlQuery))
+
+graphql
+    .command(`mutation`)
+    .description(`Execute a GraphQL mutation.`)
+    .requiredOption(`--query <query>`, `The query or queries to execute.`)
+    .action(actionRunner(graphqlMutation))
+
+