Merge branch 'development' into feat/CS-39677

Author: abhinav-from-contentstack

README.md

@@ -39,32 +39,31 @@ USAGE
 
 ## `csdx app:create`
 
-Create new app in developer hub
+Create a new app in Developer Hub and optionally clone a boilerplate locally.
 
 ```
 USAGE
-  $ csdx app:create [--org <value>] [-y] [-n <value>] [--app-type stack|organization] [-c <value>] [-d <value>]
+  $ csdx app:create [--org <value>] [-n <value>] [--app-type stack|organization] [-c <value>] [-d <value>]
 
 FLAGS
   -c, --config=<value>    Path of the external config
   -d, --data-dir=<value>  Current working directory.
   -n, --name=<value>      Name of the app to be created
-  -y, --yes               Use this flag to skip the confirmation.
   --app-type=<option>     [default: stack] Type of App
                           <options: stack|organization>
   --org=<value>           Provide the organization UID
 
 DESCRIPTION
-  Create new app in developer hub
+  Create a new app in Developer Hub and optionally clone a boilerplate locally.
 
 EXAMPLES
   $ csdx app:create
 
-  $ csdx app:create --name App-1 --app-type stack --yes
+  $ csdx app:create --name App-1 --app-type stack
 
-  $ csdx app:create --name App-2 --app-type stack -d ./boilerplate --yes
+  $ csdx app:create --name App-2 --app-type stack -d ./boilerplate
 
-  $ csdx app:create --name App-3 --app-type organization --org <UID> -d ./boilerplate -c ./external-config.json --yes
+  $ csdx app:create --name App-3 --app-type organization --org <UID> -d ./boilerplate -c ./external-config.json
 ```
 
 _See code: [src/commands/app/create.ts](https://github.com/contentstack/apps-cli/blob/v1.0.0/src/commands/app/create.ts)_
@@ -75,10 +74,9 @@ Delete app from marketplace
 
 ```
 USAGE
-  $ csdx app:delete [--org <value>] [-y] [--app-uid <value>]
+  $ csdx app:delete [--org <value>] [--app-uid <value>]
 
 FLAGS
-  -y, --yes          Use this flag to skip the confirmation.
   --app-uid=<value>  Provide the app UID
   --org=<value>      Provide the organization UID
 
@@ -101,11 +99,10 @@ Get details of an app in developer hub
 
 ```
 USAGE
-  $ csdx app:get [--org <value>] [-y] [--app-uid <value>] [--app-type stack|organization] [-d <value>]
+  $ csdx app:get [--org <value>] [--app-uid <value>] [--app-type stack|organization] [-d <value>]
 
 FLAGS
   -d, --data-dir=<value>  Current working directory.
-  -y, --yes               Use this flag to skip the confirmation.
   --app-type=<option>     [default: stack] Type of App
                           <options: stack|organization>
   --app-uid=<value>       Provide the app UID
@@ -132,10 +129,9 @@ Install an app from the marketplace
 
 ```
 USAGE
-  $ csdx app:install [--org <value>] [-y] [--app-uid <value>] [--stack-api-key <value>]
+  $ csdx app:install [--org <value>] [--app-uid <value>] [--stack-api-key <value>]
 
 FLAGS
-  -y, --yes                Use this flag to skip the confirmation.
   --app-uid=<value>        Provide the app UID
   --org=<value>            Provide the organization UID
   --stack-api-key=<value>  API key of the stack where the app is to be installed.
@@ -159,10 +155,9 @@ Uninstall an app
 
 ```
 USAGE
-  $ csdx app:uninstall [--org <value>] [-y] [--app-uid <value>] [--installation-uid <value>]
+  $ csdx app:uninstall [--org <value>] [--app-uid <value>] [--installation-uid <value>]
 
 FLAGS
-  -y, --yes                   Use this flag to skip the confirmation.
   --app-uid=<value>           Provide the app UID
   --installation-uid=<value>  Provide the installation ID of the app that needs to be uninstalled.
   --org=<value>               Provide the organization UID
@@ -186,14 +181,10 @@ Update the existing app in developer hub
 
 ```
 USAGE
-  $ csdx app:update [--org <value>] [-y] [--app-uid <value>] [--app-manifest <value>] [-c <value>] [-d <value>]
+  $ csdx app:update [--org <value>] [--app-manifest <value>]
 
 FLAGS
-  -c, --config=<value>    Path of the external config
-  -d, --data-dir=<value>  Current working directory.
-  -y, --yes               Use this flag to skip the confirmation.
   --app-manifest=<value>  Path to the app manifest.json file:
-  --app-uid=<value>       Provide the app UID
   --org=<value>           Provide the organization UID
 
 DESCRIPTION
@@ -202,11 +193,7 @@ DESCRIPTION
 EXAMPLES
   $ csdx app:update
 
-  $ csdx app:update --org <value> --app-uid <value> --app-manifest <value>
-
-  $ csdx app:update --org <value> --app-uid <value> --app-manifest ./boilerplate/manifest.json
-
-  $ csdx app:update --org <value> --app-uid <value> -d ./boilerplate -c ./external-config.json --yes
+  $ csdx app:update --app-manifest ./boilerplate/manifest.json
 ```
 
 _See code: [src/commands/app/update.ts](https://github.com/contentstack/apps-cli/blob/v1.0.0/src/commands/app/update.ts)_

src/commands/app/base-command.ts

@@ -51,6 +51,7 @@ export abstract class BaseCommand<T extends typeof Command> extends Command {
     }),
     yes: Flags.boolean({
       char: "y",
+      hidden: true,
       description: commonMsg.SKIP_CONFIRMATION,
     }),
   };
@@ -139,9 +140,9 @@ export abstract class BaseCommand<T extends typeof Command> extends Command {
    */
   getValPrompt(
     options: Partial<InquirePayload> & Record<string, any> = {
-      message: 'Enter value',
+      message: "Enter value",
       validate: (val) => {
-        if (!val) return this.$t(this.messages.NOT_EMPTY, { value: 'Value' });
+        if (!val) return this.$t(this.messages.NOT_EMPTY, { value: "Value" });
         return true;
       },
     }

src/commands/app/create.ts

@@ -4,7 +4,7 @@ import pick from "lodash/pick";
 import * as shell from "shelljs";
 import merge from "lodash/merge";
 import isEmpty from "lodash/isEmpty";
-import { dirname, join } from "path";
+import { dirname, resolve } from "path";
 import { AppData } from "@contentstack/management/types/app";
 import {
   rmSync,
@@ -16,9 +16,9 @@ import {
 } from "fs";
 import { ux, cliux, flags, HttpClient } from "@contentstack/cli-utilities";
 
-import { appCreate, commonMsg } from "../../messages";
 import { BaseCommand } from "./base-command";
 import { AppManifest, AppType } from "../../types";
+import { appCreate, commonMsg } from "../../messages";
 import {
   getOrg,
   getAppName,
@@ -30,13 +30,14 @@ export default class Create extends BaseCommand<typeof Create> {
   private appData!: AppManifest;
   static hidden: boolean = false;
 
-  static description = "Create new app in developer hub";
+  static description =
+    "Create a new app in Developer Hub and optionally clone a boilerplate locally.";
 
   static examples = [
     "$ <%= config.bin %> <%= command.id %>",
-    "$ <%= config.bin %> <%= command.id %> --name App-1 --app-type stack --yes",
-    "$ <%= config.bin %> <%= command.id %> --name App-2 --app-type stack -d ./boilerplate --yes",
-    "$ <%= config.bin %> <%= command.id %> --name App-3 --app-type organization --org <UID> -d ./boilerplate -c ./external-config.json --yes",
+    "$ <%= config.bin %> <%= command.id %> --name App-1 --app-type stack",
+    "$ <%= config.bin %> <%= command.id %> --name App-2 --app-type stack -d ./boilerplate",
+    "$ <%= config.bin %> <%= command.id %> --name App-3 --app-type organization --org <UID> -d ./boilerplate -c ./external-config.json",
   ];
 
   static flags = {
@@ -86,8 +87,11 @@ export default class Create extends BaseCommand<typeof Create> {
       } else {
         await this.registerTheAppOnDeveloperHub(false);
       }
-    } catch (error) {
-      this.log(error, "error");
+    } catch (error: Error | any) {
+      if (error?.errorMessage || error?.message || !isEmpty(error)) {
+        this.log(error?.errorMessage || error?.message || error, "error");
+      }
+
       this.exit(1);
     }
   }
@@ -173,9 +177,9 @@ export default class Create extends BaseCommand<typeof Create> {
    */
   async unZipBoilerplate(filepath: string) {
     const zip = new AdmZip(filepath);
-    const dataDir = this.flags["data-dir"] || process.cwd();
-    let targetPath = join(dataDir, this.sharedConfig.appName);
-    const sourcePath = join(dataDir, this.sharedConfig.boilerplateName);
+    const dataDir = this.flags["data-dir"] ?? process.cwd();
+    let targetPath = resolve(dataDir, this.sharedConfig.appName);
+    const sourcePath = resolve(dataDir, this.sharedConfig.boilerplateName);
 
     if (this.flags["data-dir"] && !existsSync(this.flags["data-dir"])) {
       mkdirSync(this.flags["data-dir"], { recursive: true });
@@ -250,7 +254,7 @@ export default class Create extends BaseCommand<typeof Create> {
         this.appData = merge(this.appData, pick(response, validKeys));
         if (saveManifest) {
           writeFileSync(
-            join(this.sharedConfig.folderPath, "manifest.json"),
+            resolve(this.sharedConfig.folderPath, "manifest.json"),
             JSON.stringify(this.appData),
             {
               encoding: "utf8",
@@ -335,7 +339,7 @@ export default class Create extends BaseCommand<typeof Create> {
       this.sharedConfig.oldFolderPath = this.sharedConfig.folderPath;
     }
 
-    this.sharedConfig.folderPath = join(
+    this.sharedConfig.folderPath = resolve(
       dirname(this.sharedConfig.folderPath),
       this.appData.name
     );

src/commands/app/index.ts

@@ -1,8 +1,8 @@
+import { resolve } from "path";
+import { exec } from "child_process";
 import { Command } from "@contentstack/cli-utilities";
 
 import { print } from "../../util/log";
-import { exec } from "child_process";
-import { join } from "path";
 
 export default class App extends Command {
   static description = "Apps CLI plugin";
@@ -20,7 +20,7 @@ export default class App extends Command {
 
   async run(): Promise<void> {
     exec(
-      `${join(process.cwd(), "bin", "run")} app --help`,
+      `${resolve(process.cwd(), "bin", "run")} app --help`,
       (_er, stdout, _stderr) => {
         if (stdout) {
           this.log(`\n${stdout}`);