Merge branch 'master' of https://github.com/appwrite/sdk-generator into fix-php

Author: christyjacob4

templates/apple/Package.swift.twig

@@ -22,8 +22,8 @@ let package = Package(
         ),
     ],
     dependencies: [
-        .package(url: "https://github.com/swift-server/async-http-client.git", from: "1.17.0"),
-        .package(url: "https://github.com/apple/swift-nio.git", from: "2.32.0"),
+        .package(url: "https://github.com/swift-server/async-http-client.git", from: "1.19.0"),
+        .package(url: "https://github.com/apple/swift-nio.git", from: "2.58.0"),
     ],
     targets: [
         .target(

templates/cli/base/params.twig

@@ -26,15 +26,17 @@
 
     const files = getAllFiles({{ parameter.name | caseCamel | escapeKeyword }}).map((file) => pathLib.relative({{ parameter.name | caseCamel | escapeKeyword }}, file)).filter((file) => !ignorer.ignores(file));
 
+    const archiveFileName = `${functionId}-code.tar.gz`;
+
     await tar
         .create({
             gzip: true,
             sync: true,
             cwd: folderPath,
-            file: 'code.tar.gz'
+            file: archiveFileName
         }, files);
 
-    let archivePath = fs.realpathSync('code.tar.gz')
+    let archivePath = fs.realpathSync(archiveFileName)
     if (typeof archivePath !== 'undefined') {
         payload['{{ parameter.name }}'] = archivePath;
        {{ parameter.name | caseCamel | escapeKeyword }} = archivePath;

templates/cli/lib/commands/init.js.twig

@@ -192,6 +192,8 @@ const initTopic = async () => {
 };
 
 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) {
@@ -285,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}`;
@@ -306,7 +309,7 @@ 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);

templates/cli/lib/commands/pull.js.twig

@@ -6,7 +6,7 @@ const inquirer = require("inquirer");
 const { messagingListTopics } = require("./messaging");
 const { teamsList } = require("./teams");
 const { projectsGet } = require("./projects");
-const { functionsList, functionsDownloadDeployment } = require("./functions");
+const { functionsList, functionsGetDeploymentDownload, functionsListDeployments } = require("./functions");
 const { databasesGet, databasesListCollections, databasesList } = require("./databases");
 const { storageListBuckets } = require("./storage");
 const { localConfig } = require("../config");
@@ -57,6 +57,8 @@ const pullSettings = async () => {
 }
 
 const pullFunctions = async ({ code, withVariables }) => {
+    process.chdir(localConfig.configDirectoryPath)
+
     log("Fetching functions ...");
     let total = 0;
 
@@ -84,7 +86,7 @@ const pullFunctions = async ({ code, withVariables }) => {
 
         func['path'] = localFunction['path'];
         if (!localFunction['path']) {
-            func['path'] = `functions/${func.$id}`;
+            func['path'] = `functions/${func.name}`;
         }
         if (!withVariables) {
             delete func['vars'];
@@ -97,45 +99,70 @@ const pullFunctions = async ({ code, withVariables }) => {
 
         if (code === false) {
             warn("Source code download skipped.");
-        } else if (!func['deployment']) {
-            warn("Source code download skipped because function doesn't have active deployment.");
-        } else {
-            if (allowCodePull === null) {
-                const codeAnswer = await inquirer.prompt(questionsPullFunctionsCode);
-                allowCodePull = codeAnswer.override;
+            continue;
+        }
+
+        if (allowCodePull === null) {
+            const codeAnswer = await inquirer.prompt(questionsPullFunctionsCode);
+            allowCodePull = codeAnswer.override;
+        }
+
+        if (!allowCodePull) {
+            continue;
+        }
+
+        let deploymentId = null;
+
+        try {
+            const fetchResponse = await functionsListDeployments({
+                functionId: func['$id'],
+                queries: [
+                    JSON.stringify({ method: 'limit', values: [1] }),
+                    JSON.stringify({ method: 'orderDesc', values: ['$id'] })
+                ],
+                parseOutput: false
+            });
+
+            if (fetchResponse['total'] > 0) {
+                deploymentId = fetchResponse['deployments'][0]['$id'];
             }
 
-            if (allowCodePull) {
-                log("Pulling active deployment's code ...");
-
-                const compressedFileName = `${func['$id']}-${+new Date()}.tar.gz`
-                await functionsDownloadDeployment({
-                    functionId: func['$id'],
-                    deploymentId: func['deployment'],
-                    destination: compressedFileName,
-                    overrideForCli: true,
-                    parseOutput: false
-                });
-
-                tar.extract({
-                    sync: true,
-                    cwd: func['path'],
-                    file: compressedFileName,
-                    strict: false,
-                });
-
-                fs.rmSync(compressedFileName);
-
-                if (withVariables) {
-                    const envFileLocation = `${func['path']}/.env`
-                    try {
-                        fs.rmSync(envFileLocation);
-                    } catch {
-                    }
-
-                    fs.writeFileSync(envFileLocation, func['vars'].map(r => `${r.key}=${r.value}\n`).join(''))
-                }
+        } catch {
+        }
+
+        if (deploymentId === null) {
+            log("Source code download skipped because function doesn't have any available deployment");
+            continue;
+        }
+
+        log("Pulling latest deployment code ...");
+
+        const compressedFileName = `${func['$id']}-${+new Date()}.tar.gz`
+        await functionsGetDeploymentDownload({
+            functionId: func['$id'],
+            deploymentId,
+            destination: compressedFileName,
+            overrideForCli: true,
+            parseOutput: false
+        });
+
+        tar.extract({
+            sync: true,
+            cwd: func['path'],
+            file: compressedFileName,
+            strict: false,
+        });
+
+        fs.rmSync(compressedFileName);
+
+        if (withVariables) {
+            const envFileLocation = `${func['path']}/.env`
+            try {
+                fs.rmSync(envFileLocation);
+            } catch {
             }
+
+            fs.writeFileSync(envFileLocation, func['vars'].map(r => `${r.key}=${r.value}\n`).join(''))
         }
     }
 
@@ -289,33 +316,33 @@ pull
 pull
     .command("function")
     .alias("functions")
-    .description("Pulling your {{ spec.title|caseUcfirst }} cloud function")
+    .description("Pull your {{ spec.title|caseUcfirst }} cloud function")
     .option("--no-code", "Don't pull the function's code")
     .option("--with-variables", `Pull function variables. ${chalk.red('recommend for testing purposes only')}`)
     .action(actionRunner(pullFunctions))
 
 pull
     .command("collection")
     .alias("collections")
-    .description("Pulling your {{ spec.title|caseUcfirst }} collections")
+    .description("Pull your {{ spec.title|caseUcfirst }} collections")
     .action(actionRunner(pullCollection))
 
 pull
     .command("bucket")
     .alias("buckets")
-    .description("Pulling your Appwrite buckets")
+    .description("Pull your Appwrite buckets")
     .action(actionRunner(pullBucket))
 
 pull
     .command("team")
     .alias("teams")
-    .description("Pulling your Appwrite teams")
+    .description("Pull your Appwrite teams")
     .action(actionRunner(pullTeam))
 
 pull
     .command("topic")
     .alias("topics")
-    .description("Initialise your Appwrite messaging topics")
+    .description("Pull your Appwrite messaging topics")
     .action(actionRunner(pullMessagingTopic))
 
 module.exports = {