Merge pull request #832 from appwrite/fix-cli-func-folder-name

Fix: CLI folder name (functions)

Author: christyjacob4

src/SDK/Language/CLI.php

@@ -152,6 +152,11 @@ public function getFiles(): array
                 'destination'   => 'lib/client.js',
                 'template'      => 'cli/lib/client.js.twig',
             ],
+            [
+                'scope'         => 'default',
+                'destination'   => 'lib/id.js',
+                'template'      => 'cli/lib/id.js.twig',
+            ],
             [
                 'scope'         => 'default',
                 'destination'   => 'lib/utils.js',

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

@@ -10,6 +10,7 @@ const { databasesGet, databasesListCollections, databasesList } = require("./dat
 const { storageListBuckets } = require("./storage");
 const { sdkForConsole } = require("../sdks");
 const { localConfig } = require("../config");
+const ID  = require("../id");
 const { paginate } = require("../paginate");
 const { questionsInitProject, questionsInitFunction, questionsInitCollection } = require("../questions");
 const { success, log, actionRunner, commandDescriptions } = require("../parser");
@@ -63,10 +64,11 @@ const initFunction = async () => {
         });
     }
 
-    const functionDir = path.join(functionFolder, answers.name);
+    const functionId = answers.id === 'unique()' ? ID.unique() : answers.id;
+    const functionDir = path.join(functionFolder, functionId);
 
     if (fs.existsSync(functionDir)) {
-        throw new Error(`( ${answers.name} ) already exists in the current directory. Please choose another name.`);
+        throw new Error(`( ${functionId} ) already exists in the current directory. Please choose another name.`);
     }
 
     if (!answers.runtime.entrypoint) {
@@ -78,7 +80,7 @@ const initFunction = async () => {
     }
 
     let response = await functionsCreate({
-        functionId: answers.id,
+        functionId,
         name: answers.name,
         runtime: answers.runtime.id,
         entrypoint: answers.runtime.entrypoint || '',
@@ -134,7 +136,7 @@ const initFunction = async () => {
 
     fs.rmSync(`${functionDir}/${answers.runtime.id}`, { recursive: true, force: true });
 
-    const readmePath = path.join(process.cwd(), 'functions', answers.name, 'README.md');
+    const readmePath = path.join(process.cwd(), 'functions', functionId, 'README.md');
     const readmeFile = fs.readFileSync(readmePath).toString();
     const newReadmeFile = readmeFile.split('\n');
     newReadmeFile[0] = `# ${answers.name}`;
@@ -154,7 +156,7 @@ const initFunction = async () => {
         entrypoint: response.entrypoint,
         commands: response.commands,
         ignore: answers.runtime.ignore || null,
-        path: `functions/${answers.name}`,
+        path: `functions/${functionId}`,
     };
 
     localConfig.addFunction(data);

templates/cli/lib/id.js.twig

@@ -0,0 +1,30 @@
+class ID {
+    // Generate an hex ID based on timestamp
+    // Recreated from https://www.php.net/manual/en/function.uniqid.php
+    static #hexTimestamp() {
+        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;
+    }
+
+    static custom(id) {
+        return id
+    }
+
+    static unique(padding = 7) {
+        // 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;
+    }
+}
+
+module.exports = ID;