From 17d1b5ce326c9e96fb4444a24124dc33d860709e Mon Sep 17 00:00:00 2001
From: Aman Kumar <aman.kumar@contentstack.com>
Date: Wed, 24 Jul 2024 15:33:12 +0530
Subject: [PATCH] refactor: default app name

---
 README.md                  |  2 +-
 src/commands/app/create.ts | 25 +++++++++++++------------
 src/util/inquirer.ts       | 10 +++++++---
 3 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index 4d0f2fa..21e60b2 100644
--- a/README.md
+++ b/README.md
@@ -81,7 +81,7 @@ USAGE
 FLAGS
   -c, --config=<value>    Path of the external config
   -d, --data-dir=<value>  Current working directory.
-  -n, --name=<value>      [default: app-boilerplate] Name of the app to be created
+  -n, --name=<value>      Name of the app to be created
   --app-type=<option>     [default: stack] Type of app
                           <options: stack|organization>
   --boilerplate=<value>   Provide a boilerplate from the following options: App Boilerplate, DAM App Boilerplate or
diff --git a/src/commands/app/create.ts b/src/commands/app/create.ts
index 1223767..048ae66 100644
--- a/src/commands/app/create.ts
+++ b/src/commands/app/create.ts
@@ -35,6 +35,7 @@ import {
   sanitizePath,
   selectedBoilerplate,
   validateBoilerplate,
+  validateAppName,
 } from "../../util";
 
 export default class Create extends BaseCommand<typeof Create> {
@@ -61,7 +62,6 @@ export default class Create extends BaseCommand<typeof Create> {
   static flags: FlagInput = {
     name: flags.string({
       char: "n",
-      default: "app-boilerplate",
       description: appCreate.NAME_DESCRIPTION,
     }),
     "app-type": flags.string({
@@ -152,13 +152,11 @@ export default class Create extends BaseCommand<typeof Create> {
    * @memberof Create
    */
   async flagsPromptQueue() {
-    if (isEmpty(this.sharedConfig.appName)) {
-      this.sharedConfig.appName = await getAppName(
-        this.sharedConfig.defaultAppName
-      );
+    if (this.sharedConfig.appName) {
+      validateAppName(this.sharedConfig.appName);
     }
-    let boilerplate: BoilerplateAppType | null = null;
 
+    let boilerplate: BoilerplateAppType | null = null;
     if (isEmpty(this.sharedConfig.boilerplateName)) {
       boilerplate = await selectedBoilerplate();
     } else {
@@ -168,14 +166,17 @@ export default class Create extends BaseCommand<typeof Create> {
     }
 
     if (boilerplate) {
-      const transformedName = boilerplate.name
-        .toLowerCase()
-        .replace(/ /g, "-")
-        .substring(0, 20);
+      let boilerplateName = this.sharedConfig.appName || boilerplate.name;
+      if (isEmpty(this.sharedConfig.appName)) {
+        boilerplateName = boilerplateName
+          .toLowerCase()
+          .replace(/ /g, "-")
+          .substring(0, 20);
+      }
 
-      this.sharedConfig.boilerplateName = transformedName;
+      this.sharedConfig.boilerplateName = boilerplateName;
       this.sharedConfig.appBoilerplateGithubUrl = boilerplate.link;
-      this.sharedConfig.appName = transformedName;
+      this.sharedConfig.appName = boilerplateName;
     }
 
     //Auto select org in case of oauth
diff --git a/src/util/inquirer.ts b/src/util/inquirer.ts
index ab5f0cd..3a0a9e3 100644
--- a/src/util/inquirer.ts
+++ b/src/util/inquirer.ts
@@ -368,9 +368,7 @@ async function askConfirmation(): Promise<boolean> {
   });
 }
 
-const askProjectName = async (
-  projectName: string,
-): Promise<string> => {
+const askProjectName = async (projectName: string): Promise<string> => {
   return await cliux.inquire({
     type: "input",
     name: "name",
@@ -402,6 +400,11 @@ const selectedBoilerplate = async (): Promise<any> => {
     });
 };
 
+const validateAppName = (name: string) => {
+  if (name.length < 3 || name.length > 20) {
+    throw new Error($t(errors.INVALID_NAME, { min: "3", max: "20" }));
+  }
+};
 export {
   getOrg,
   getAppName,
@@ -418,4 +421,5 @@ export {
   selectProject,
   askProjectName,
   selectedBoilerplate,
+  validateAppName,
 };