fix flag prompt

Author: harshithad0703

README.md

@@ -75,7 +75,7 @@ Create a new app in Developer Hub and optionally clone a boilerplate locally.
 
 ```
 USAGE
-  $ csdx app:create [-n <value>] [--app-type stack|organization] [-c <value>] [-d <value>] [--boilerplates
+  $ csdx app:create [-n <value>] [--app-type stack|organization] [-c <value>] [-d <value>] [--boilerplate
     <value>]
 
 FLAGS
@@ -84,7 +84,7 @@ FLAGS
   -n, --name=<value>      [default: app-boilerplate] Name of the app to be created
   --app-type=<option>     [default: stack] Type of app
                           <options: stack|organization>
-  --boilerplates=<value>  Choose a boilerplate from search list
+  --boilerplate=<value>   Choose a boilerplate from search list
 
 DESCRIPTION
   Create a new app in Developer Hub and optionally clone a boilerplate locally.

src/commands/app/create.ts

@@ -34,6 +34,7 @@ import {
   getOrgAppUiLocation,
   sanitizePath,
   selectedBoilerplate,
+  validateBoilerplate,
 } from "../../util";
 
 export default class Create extends BaseCommand<typeof Create> {
@@ -74,14 +75,15 @@ export default class Create extends BaseCommand<typeof Create> {
       char: "d",
       description: commonMsg.CURRENT_WORKING_DIR,
     }),
-    "boilerplates": flags.string({
+    "boilerplate": flags.string({
       description: appCreate.BOILERPLATE_TEMPLATES,
     }),
   };
 
   async run(): Promise<void> {
     this.sharedConfig.org = this.flags.org;
     this.sharedConfig.appName = this.flags.name;
+    this.sharedConfig.boilerplateName = this.flags.boilerplate;
 
     await this.flagsPromptQueue();
 
@@ -93,34 +95,15 @@ export default class Create extends BaseCommand<typeof Create> {
     }
 
     try {
-      if (this.flags.boilerplates) {
-        this.sharedConfig.boilerplateName = this.flags.boilerplates
-          .toLowerCase()
-          .replace(/ /g, "-");
-        this.sharedConfig.appName = await getAppName(
-          this.sharedConfig.boilerplateName
-        );
-        await this.boilerplateFlow();
-      } else if (
+      if (
         this.flags.yes ||
         (await cliux.inquire({
           type: "confirm",
           name: "cloneBoilerplate",
           message: this.messages.CONFIRM_CLONE_BOILERPLATE,
         }))
       ) {
-        const boilerplate: BoilerplateAppType = await selectedBoilerplate();
-
-        if (boilerplate) {
-          this.sharedConfig.boilerplateName = boilerplate.name
-            .toLowerCase()
-            .replace(/ /g, "-");
-          this.sharedConfig.appBoilerplateGithubUrl = boilerplate.link;
-          this.sharedConfig.appName = await getAppName(
-            this.sharedConfig.boilerplateName
-          );
-          await this.boilerplateFlow();
-        }
+        await this.boilerplateFlow();
       } else {
         this.manageManifestToggeling();
         await this.registerTheAppOnDeveloperHub(false);
@@ -172,6 +155,22 @@ export default class Create extends BaseCommand<typeof Create> {
         this.sharedConfig.defaultAppName
       );
     }
+    if (isEmpty(this.sharedConfig.boilerplateName)) {
+      const boilerplate: BoilerplateAppType = await selectedBoilerplate();
+
+      if (boilerplate) {
+        this.sharedConfig.boilerplateName = boilerplate.name
+          .toLowerCase()
+          .replace(/ /g, "-");
+        this.sharedConfig.appBoilerplateGithubUrl = boilerplate.link;
+        this.sharedConfig.appName = await getAppName(
+          this.sharedConfig.boilerplateName
+        );
+      }
+    } else {
+      await validateBoilerplate(this.sharedConfig.boilerplateName);
+    }
+    this.sharedConfig.appName = this.sharedConfig.boilerplateName;
 
     //Auto select org in case of oauth
     this.sharedConfig.org =
@@ -326,10 +325,7 @@ export default class Create extends BaseCommand<typeof Create> {
         this.appData = merge(this.appData, pick(response, validKeys));
         if (saveManifest) {
           writeFileSync(
-            resolve(
-              this.sharedConfig.folderPath,
-              "manifest.json"
-            ),
+            resolve(this.sharedConfig.folderPath, "manifest.json"),
             JSON.stringify(this.appData),
             {
               encoding: "utf8",

src/config/index.ts

@@ -3,7 +3,6 @@ import { resolve } from "path";
 const config = {
   defaultAppName: "app-boilerplate",
   manifestPath: resolve(__dirname, "manifest.json"),
-  boilerplateName: "marketplace-app-boilerplate-main",
   developerHubBaseUrl: "",
   appBoilerplateGithubUrl:
     "https://codeload.github.com/contentstack/marketplace-app-boilerplate/zip/refs/heads/main",

src/util/common-utils.ts

@@ -21,6 +21,7 @@ import {
 import { askProjectName } from "./inquirer";
 import { deployAppMsg } from "../messages";
 import config from "../config";
+import { find } from "lodash";
 
 export type CommonOptions = {
   log: LogFn;
@@ -406,6 +407,17 @@ async function fetchBoilerplateDetails(): Promise<Record<string, any>[]> {
     throw error;
   }
 }
+async function validateBoilerplate(boilerplateName: string): Promise<void> {
+  const boilerplates = await fetchBoilerplateDetails();
+  const isValid = find(
+    boilerplates,
+    (boilerplate) => boilerplate.name.toLowerCase()
+    .replace(/ /g, "-") === boilerplateName
+  );
+  if (!isValid) {
+    throw new Error("Invalid boilerplate. Please enter a valid boilerplate.");
+  }
+}
 
 export {
   getOrganizations,
@@ -428,5 +440,6 @@ export {
   disconnectApp,
   formatUrl,
   handleProjectNameConflict,
-  fetchBoilerplateDetails
+  fetchBoilerplateDetails,
+  validateBoilerplate,
 };