appwrite-cli 6.0.0-rc.6 → 6.0.0-rc.9

package/lib/commands/health.js

@@ -35,7 +35,7 @@ function convertReadStreamToReadableStream(readStream) {
   });
 }
 
-const health = new Command("health").description(commandDescriptions['health']).configureHelp({
+const health = new Command("health").description(commandDescriptions['health'] ?? '').configureHelp({
     helpWidth: process.stdout.columns || 80
 })
 
@@ -63,7 +63,6 @@ const healthGet = async ({parseOutput = true, overrideForCli = false, sdk = unde
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -94,7 +93,6 @@ const healthGetAntivirus = async ({parseOutput = true, overrideForCli = false, s
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -125,7 +123,6 @@ const healthGetCache = async ({parseOutput = true, overrideForCli = false, sdk =
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -160,7 +157,6 @@ const healthGetCertificate = async ({domain,parseOutput = true, overrideForCli =
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -191,7 +187,6 @@ const healthGetDB = async ({parseOutput = true, overrideForCli = false, sdk = un
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -222,7 +217,6 @@ const healthGetPubSub = async ({parseOutput = true, overrideForCli = false, sdk
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -253,7 +247,6 @@ const healthGetQueue = async ({parseOutput = true, overrideForCli = false, sdk =
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -288,7 +281,6 @@ const healthGetQueueBuilds = async ({threshold,parseOutput = true, overrideForCl
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -323,7 +315,6 @@ const healthGetQueueCertificates = async ({threshold,parseOutput = true, overrid
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -362,7 +353,6 @@ const healthGetQueueDatabases = async ({name,threshold,parseOutput = true, overr
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -397,7 +387,6 @@ const healthGetQueueDeletes = async ({threshold,parseOutput = true, overrideForC
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -433,7 +422,6 @@ const healthGetFailedJobs = async ({name,threshold,parseOutput = true, overrideF
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -468,7 +456,6 @@ const healthGetQueueFunctions = async ({threshold,parseOutput = true, overrideFo
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -503,7 +490,6 @@ const healthGetQueueLogs = async ({threshold,parseOutput = true, overrideForCli
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -538,7 +524,6 @@ const healthGetQueueMails = async ({threshold,parseOutput = true, overrideForCli
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -573,7 +558,6 @@ const healthGetQueueMessaging = async ({threshold,parseOutput = true, overrideFo
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -608,7 +592,6 @@ const healthGetQueueMigrations = async ({threshold,parseOutput = true, overrideF
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -643,7 +626,6 @@ const healthGetQueueUsage = async ({threshold,parseOutput = true, overrideForCli
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -678,7 +660,6 @@ const healthGetQueueUsageDump = async ({threshold,parseOutput = true, overrideFo
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -713,7 +694,6 @@ const healthGetQueueWebhooks = async ({threshold,parseOutput = true, overrideFor
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -744,7 +724,6 @@ const healthGetStorage = async ({parseOutput = true, overrideForCli = false, sdk
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -775,7 +754,6 @@ const healthGetStorageLocal = async ({parseOutput = true, overrideForCli = false
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -806,7 +784,6 @@ const healthGetTime = async ({parseOutput = true, overrideForCli = false, sdk =
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;

package/lib/commands/init.js

@@ -129,7 +129,7 @@ const initBucket = async () => {
         fileSecurity: answers.fileSecurity.toLowerCase() === 'yes',
         enabled: true,
     });
-    success();
+    success("Initialing bucket");
     log("Next you can use 'appwrite push bucket' to deploy the changes.");
 };
 
@@ -141,7 +141,7 @@ const initTeam = async () => {
         name: answers.bucket,
     });
 
-    success();
+    success("Initialing team");
     log("Next you can use 'appwrite push team' to deploy the changes.");
 };
 
@@ -174,7 +174,7 @@ const initCollection = async () => {
         enabled: true,
     });
 
-    success();
+    success("Initialing collection");
     log("Next you can use 'appwrite push collection' to deploy the changes.");
 };
 
@@ -187,11 +187,13 @@ const initTopic = async () => {
 
     });
 
-    success();
+    success("Initialing topic");
     log("Next you can use 'appwrite push topic' to deploy the changes.");
 };
 
 const initFunction = async () => {
+    process.chdir(localConfig.configDirectoryPath)
+
     // TODO: Add CI/CD support (ID, name, runtime)
     const answers = await inquirer.prompt(questionsCreateFunction)
     const functionFolder = path.join(process.cwd(), 'functions');
@@ -203,12 +205,13 @@ const initFunction = async () => {
     }
 
     const functionId = answers.id === 'unique()' ? ID.unique() : answers.id;
-    const functionDir = path.join(functionFolder, functionId);
+    const functionName = answers.name;
+    const functionDir = path.join(functionFolder, functionName);
     const templatesDir = path.join(functionFolder, `${functionId}-templates`);
     const runtimeDir = path.join(templatesDir, answers.runtime.name);
 
     if (fs.existsSync(functionDir)) {
-        throw new Error(`( ${functionId} ) already exists in the current directory. Please choose another name.`);
+        throw new Error(`( ${functionName} ) already exists in the current directory. Please choose another name.`);
     }
 
     if (!answers.runtime.entrypoint) {
@@ -223,21 +226,7 @@ const initFunction = async () => {
     fs.mkdirSync(templatesDir, "777");
     const repo = "https://github.com/appwrite/templates";
     const api = `https://api.github.com/repos/appwrite/templates/contents/${answers.runtime.name}`
-    let selected = undefined;
-
-    if(answers.template === 'starter') {
-        selected = { template: 'starter' };
-    } else {
-        try {
-            const res = await fetch(api);
-            const templates = [];
-            templates.push(...(await res.json()).map((template) => template.name));
-            selected = await inquirer.prompt(questionsCreateFunctionSelectTemplate(templates));
-        } catch {
-            // Not a problem will go with directory pulling
-            log('Loading templates...');
-        }
-    }
+    let selected = { template: 'starter' };
 
     const sparse = (selected ? `${answers.runtime.name}/${selected.template}` : answers.runtime.name).toLowerCase();
 
@@ -299,7 +288,7 @@ const initFunction = async () => {
 
     fs.rmSync(templatesDir, { recursive: true, force: true });
 
-    const readmePath = path.join(process.cwd(), 'functions', functionId, 'README.md');
+    const readmePath = path.join(process.cwd(), 'functions', functionName, 'README.md');
     const readmeFile = fs.readFileSync(readmePath).toString();
     const newReadmeFile = readmeFile.split('\n');
     newReadmeFile[0] = `# ${answers.name}`;
@@ -312,6 +301,7 @@ const initFunction = async () => {
         runtime: answers.runtime.id,
         execute: [],
         events: [],
+        scopes: [],
         schedule: "",
         timeout: 15,
         enabled: true,
@@ -319,11 +309,11 @@ const initFunction = async () => {
         entrypoint: answers.runtime.entrypoint || '',
         commands: answers.runtime.commands || '',
         ignore: answers.runtime.ignore || null,
-        path: `functions/${functionId}`,
+        path: `functions/${functionName}`,
     };
 
     localConfig.addFunction(data);
-    success();
+    success("Initialing function");
     log("Next you can use 'appwrite run function' to develop a function locally. To deploy the function, use 'appwrite push function'");
 }
 

package/lib/commands/locale.js

@@ -35,7 +35,7 @@ function convertReadStreamToReadableStream(readStream) {
   });
 }
 
-const locale = new Command("locale").description(commandDescriptions['locale']).configureHelp({
+const locale = new Command("locale").description(commandDescriptions['locale'] ?? '').configureHelp({
     helpWidth: process.stdout.columns || 80
 })
 
@@ -63,7 +63,6 @@ const localeGet = async ({parseOutput = true, overrideForCli = false, sdk = unde
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -94,7 +93,6 @@ const localeListCodes = async ({parseOutput = true, overrideForCli = false, sdk
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -125,7 +123,6 @@ const localeListContinents = async ({parseOutput = true, overrideForCli = false,
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -156,7 +153,6 @@ const localeListCountries = async ({parseOutput = true, overrideForCli = false,
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -187,7 +183,6 @@ const localeListCountriesEU = async ({parseOutput = true, overrideForCli = false
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -218,7 +213,6 @@ const localeListCountriesPhones = async ({parseOutput = true, overrideForCli = f
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -249,7 +243,6 @@ const localeListCurrencies = async ({parseOutput = true, overrideForCli = false,
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -280,7 +273,6 @@ const localeListLanguages = async ({parseOutput = true, overrideForCli = false,
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;