From 0215b626811e115d8eca530226ad59f9fcb0ac55 Mon Sep 17 00:00:00 2001
From: Devansu <devansuyadav@gmail.com>
Date: Mon, 25 Apr 2022 08:26:27 +0000
Subject: [PATCH 1/6] feat(cli): add alias for swa cli global options

---
 src/cli/index.ts               |  4 ++--
 src/core/utils/options.spec.ts | 22 +++++++++++++++++++++-
 src/core/utils/options.ts      |  2 +-
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/cli/index.ts b/src/cli/index.ts
index 372e9f054..83e1b1ab2 100755
--- a/src/cli/index.ts
+++ b/src/cli/index.ts
@@ -59,7 +59,7 @@ export async function run(argv?: string[]) {
 
     // SWA CLI common configuration options
     .addOption(
-      new Option("--verbose [prefix]", "enable verbose output. Values are: silly,info,log,silent")
+      new Option("-V, --verbose [prefix]", "enable verbose output. Values are: silly,info,log,silent")
         .preset(DEFAULT_CONFIG.verbose)
         .default(DEFAULT_CONFIG.verbose)
     )
@@ -74,7 +74,7 @@ export async function run(argv?: string[]) {
       "after",
       `
   Type "swa" to get started and deploy your project.
-  
+
   Documentation:
     https://aka.ms/swa/cli-local-development
   `
diff --git a/src/core/utils/options.spec.ts b/src/core/utils/options.spec.ts
index 8633cf470..44281fe98 100644
--- a/src/core/utils/options.spec.ts
+++ b/src/core/utils/options.spec.ts
@@ -2,7 +2,8 @@ import { Command } from "commander";
 import mockFs from "mock-fs";
 import { swaCliConfigFilename } from "./cli-config";
 import { parsePort } from "./net";
-import { configureOptions } from "./options";
+import { configureOptions, getUserOptions } from "./options";
+import { DEFAULT_CONFIG } from "../../config";
 
 describe("configureOptions()", () => {
   afterEach(() => {
@@ -91,3 +92,22 @@ describe("configureOptions()", () => {
     });
   });
 });
+
+describe("Testing aliases for each of the commands and their options", () => {
+  it("should return appropriate user cli options for the alias commands for global options", async () => {
+    const command = await new Command()
+      .name("swa")
+      .option("-V, --verbose [prefix]", "", DEFAULT_CONFIG.verbose)
+      .option("-c, --config <path>", "")
+      .option("-g, --print-config", "", false)
+      .option("-w, --swa-config-location <swaConfigLocation>", "")
+      .parseAsync(["node", "swa", "-V", "log", "-c", `../${swaCliConfigFilename}`, "-g", "-w", `${DEFAULT_CONFIG.swaConfigLocation}`]);
+
+    expect(getUserOptions(command)).toStrictEqual({
+      verbose: "log",
+      config: `../${swaCliConfigFilename}`,
+      printConfig: true,
+      swaConfigLocation: DEFAULT_CONFIG.swaConfigLocation,
+    });
+  });
+});
diff --git a/src/core/utils/options.ts b/src/core/utils/options.ts
index 69e443287..673c62381 100644
--- a/src/core/utils/options.ts
+++ b/src/core/utils/options.ts
@@ -57,7 +57,7 @@ function setLogLevel(verbosity: string | undefined) {
   }
 }
 
-function getUserOptions(command: Command) {
+export function getUserOptions(command: Command) {
   const userOptions: OptionValues = {};
   const options = command.optsWithGlobals();
 

From dd402552007cf294b2376ee534b2da36c7ce219b Mon Sep 17 00:00:00 2001
From: Devansu <devansuyadav@gmail.com>
Date: Wed, 27 Apr 2022 15:30:35 +0000
Subject: [PATCH 2/6] feat(cli): add alias for swa cli start options

---
 src/cli/commands/start.ts      |  8 ++---
 src/core/utils/options.spec.ts | 65 ++++++++++++++++++++++++++++++++--
 2 files changed, 66 insertions(+), 7 deletions(-)

diff --git a/src/cli/commands/start.ts b/src/cli/commands/start.ts
index 4e3f9eb77..dfff858fc 100644
--- a/src/cli/commands/start.ts
+++ b/src/cli/commands/start.ts
@@ -41,10 +41,10 @@ export default function registerCommand(program: Command) {
     .option("--host <host>", "the host address to use for the CLI dev server", DEFAULT_CONFIG.host)
     .option<number>("--port <port>", "the port value to use for the CLI dev server", parsePort, DEFAULT_CONFIG.port)
 
-    .option("--ssl", "serve the front-end application and API over HTTPS", DEFAULT_CONFIG.ssl)
-    .option("--ssl-cert <sslCertLocation>", "the SSL certificate (.crt) to use when enabling HTTPS", DEFAULT_CONFIG.sslCert)
-    .option("--ssl-key <sslKeyLocation>", "the SSL key (.key) to use when enabling HTTPS", DEFAULT_CONFIG.sslKey)
-    .option("--run <startupScript>", "run a custom shell command or script file at startup", DEFAULT_CONFIG.run)
+    .option("-s, --ssl", "serve the front-end application and API over HTTPS", DEFAULT_CONFIG.ssl)
+    .option("-e, --ssl-cert <sslCertLocation>", "the SSL certificate (.crt) to use when enabling HTTPS", DEFAULT_CONFIG.sslCert)
+    .option("-k, --ssl-key <sslKeyLocation>", "the SSL key (.key) to use when enabling HTTPS", DEFAULT_CONFIG.sslKey)
+    .option("-r, --run <startupScript>", "run a custom shell command or script file at startup", DEFAULT_CONFIG.run)
     .option<number>(
       "--devserver-timeout <time>",
       "the time to wait (in seconds) when connecting to a front-end application's dev server or api server",
diff --git a/src/core/utils/options.spec.ts b/src/core/utils/options.spec.ts
index 44281fe98..c8c4bce72 100644
--- a/src/core/utils/options.spec.ts
+++ b/src/core/utils/options.spec.ts
@@ -2,6 +2,7 @@ import { Command } from "commander";
 import mockFs from "mock-fs";
 import { swaCliConfigFilename } from "./cli-config";
 import { parsePort } from "./net";
+import { parseDevserverTimeout } from "./cli";
 import { configureOptions, getUserOptions } from "./options";
 import { DEFAULT_CONFIG } from "../../config";
 
@@ -94,13 +95,13 @@ describe("configureOptions()", () => {
 });
 
 describe("Testing aliases for each of the commands and their options", () => {
-  it("should return appropriate user cli options for the alias commands for global options", async () => {
+  it("should return appropriate user cli options for the alias commands for swa global options", async () => {
     const command = await new Command()
       .name("swa")
       .option("-V, --verbose [prefix]", "", DEFAULT_CONFIG.verbose)
-      .option("-c, --config <path>", "")
+      .option("-c, --config <path>")
       .option("-g, --print-config", "", false)
-      .option("-w, --swa-config-location <swaConfigLocation>", "")
+      .option("-w, --swa-config-location <swaConfigLocation>")
       .parseAsync(["node", "swa", "-V", "log", "-c", `../${swaCliConfigFilename}`, "-g", "-w", `${DEFAULT_CONFIG.swaConfigLocation}`]);
 
     expect(getUserOptions(command)).toStrictEqual({
@@ -110,4 +111,62 @@ describe("Testing aliases for each of the commands and their options", () => {
       swaConfigLocation: DEFAULT_CONFIG.swaConfigLocation,
     });
   });
+
+  it("should return appropriate user cli options for the alias commands for swa start options", async () => {
+    const command = await new Command()
+      .name("swa")
+      .option("-a, --app-location <appLocation>")
+      .option("-i, --api-location <apiLocation>")
+      .option<number>("-j, --api-port <apiPort>", "", parsePort, DEFAULT_CONFIG.apiPort)
+      .option("-q, --host <host>")
+      .option<number>("-p, --port <port>", "", parsePort, DEFAULT_CONFIG.port)
+      .option("-s, --ssl")
+      .option("-e, --ssl-cert <sslCertLocation>")
+      .option("-k, --ssl-key <sslKeyLocation>")
+      .option("-r, --run <startupScript>")
+      .option<number>("-t, --devserver-timeout <devserverTimeout>", "", parseDevserverTimeout, DEFAULT_CONFIG.devserverTimeout)
+      .option("-o, --open")
+      .option("-f, --func-args <funcArgs>")
+      .parseAsync([
+        "node",
+        "swa",
+        "-a",
+        `${DEFAULT_CONFIG.appLocation}`,
+        "-i",
+        "./api",
+        "-j",
+        "7071",
+        "-q",
+        `${DEFAULT_CONFIG.host}`,
+        "-p",
+        "4567",
+        "-s",
+        "-e",
+        "./ssl/sslCert.crt",
+        "-k",
+        "./ssl/sslKey.key",
+        "-r",
+        "run.sh",
+        "-t",
+        "1000",
+        "-o",
+        "-f",
+        "--arg",
+      ]);
+
+    expect(getUserOptions(command)).toStrictEqual({
+      appLocation: DEFAULT_CONFIG.appLocation,
+      apiLocation: "./api",
+      apiPort: 7071,
+      host: DEFAULT_CONFIG.host,
+      port: 4567,
+      ssl: true,
+      sslCert: "./ssl/sslCert.crt",
+      sslKey: "./ssl/sslKey.key",
+      run: "run.sh",
+      devserverTimeout: 1000,
+      open: true,
+      funcArgs: "--arg",
+    });
+  });
 });

From afb3f324229d19fabaa39393c6033791a314c20b Mon Sep 17 00:00:00 2001
From: Devansu <devansuyadav@gmail.com>
Date: Sat, 30 Apr 2022 16:44:32 +0000
Subject: [PATCH 3/6] feat(cli): add alias for swa deploy & init options

---
 src/core/utils/options.spec.ts | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/src/core/utils/options.spec.ts b/src/core/utils/options.spec.ts
index c8c4bce72..11d4758a1 100644
--- a/src/core/utils/options.spec.ts
+++ b/src/core/utils/options.spec.ts
@@ -120,6 +120,7 @@ describe("Testing aliases for each of the commands and their options", () => {
       .option<number>("-j, --api-port <apiPort>", "", parsePort, DEFAULT_CONFIG.apiPort)
       .option("-q, --host <host>")
       .option<number>("-p, --port <port>", "", parsePort, DEFAULT_CONFIG.port)
+      .option("-b, --run-build")
       .option("-s, --ssl")
       .option("-e, --ssl-cert <sslCertLocation>")
       .option("-k, --ssl-key <sslKeyLocation>")
@@ -140,6 +141,7 @@ describe("Testing aliases for each of the commands and their options", () => {
         `${DEFAULT_CONFIG.host}`,
         "-p",
         "4567",
+        "-b",
         "-s",
         "-e",
         "./ssl/sslCert.crt",
@@ -160,6 +162,7 @@ describe("Testing aliases for each of the commands and their options", () => {
       apiPort: 7071,
       host: DEFAULT_CONFIG.host,
       port: 4567,
+      runBuild: true,
       ssl: true,
       sslCert: "./ssl/sslCert.crt",
       sslKey: "./ssl/sslKey.key",
@@ -169,4 +172,27 @@ describe("Testing aliases for each of the commands and their options", () => {
       funcArgs: "--arg",
     });
   });
+
+  it("should return appropriate user cli options for the alias commands for swa deploy options", async () => {
+    const command = await new Command()
+      .name("swa")
+      .option("-d, --deployment-token <secret>")
+      .option("-dr, --dry-run")
+      .option("-pt, --print-token")
+      .parseAsync(["node", "swa", "-d", "1234abcd", "-dr", "-pt"]);
+
+    expect(getUserOptions(command)).toStrictEqual({
+      deploymentToken: "1234abcd",
+      dryRun: true,
+      printToken: true,
+    });
+  });
+
+  it("should return appropriate user cli options for the alias commands for swa init options", async () => {
+    const command = await new Command().name("swa").option("-y, --yes").parseAsync(["node", "swa", "-y"]);
+
+    expect(getUserOptions(command)).toStrictEqual({
+      yes: true,
+    });
+  });
 });

From f4afddb0acc8b45f730a5cc746a61120712b7bbb Mon Sep 17 00:00:00 2001
From: Devansu <devansuyadav@gmail.com>
Date: Sun, 1 May 2022 16:37:52 +0000
Subject: [PATCH 4/6] feat(cli): add alias for swa login & build options

---
 src/core/utils/options.spec.ts | 55 ++++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)

diff --git a/src/core/utils/options.spec.ts b/src/core/utils/options.spec.ts
index 11d4758a1..ff0dccd16 100644
--- a/src/core/utils/options.spec.ts
+++ b/src/core/utils/options.spec.ts
@@ -195,4 +195,59 @@ describe("Testing aliases for each of the commands and their options", () => {
       yes: true,
     });
   });
+
+  it("should return appropriate user cli options for the alias commands for swa build options", async () => {
+    const command = await new Command()
+      .name("swa")
+      .option("-O, --output-location <outputLocation>")
+      .option("-A, --app-build-command <command>")
+      .option("-I, --api-build-command <command>")
+      .parseAsync(["node", "swa", "-O", `./build`, "-A", "build-app", "-I", "build-api"]);
+
+    expect(getUserOptions(command)).toStrictEqual({
+      outputLocation: "./build",
+      appBuildCommand: "build-app",
+      apiBuildCommand: "build-api",
+    });
+  });
+
+  it("should return appropriate user cli options for the alias commands for swa login options", async () => {
+    const command = await new Command()
+      .name("swa")
+      .option("-S, --subscription-id [subscriptionId]")
+      .option("-R, --resource-group [resourceGroupName]")
+      .option("-T, --tenant-id [tenantId]")
+      .option("-C, --client-id [clientId]")
+      .option("-CS, --client-secret [clientSecret]")
+      .option("-n, --app-name [appName]")
+      .option("-u, --use-keychain")
+      .option("-nu, --no-use-keychain")
+      .parseAsync([
+        "node",
+        "swa",
+        "-S",
+        "subscriptionId",
+        "-R",
+        "resourceGroup",
+        "-T",
+        "tenantId",
+        "-C",
+        "clientId",
+        "-CS",
+        "clientSecret",
+        "-n",
+        "appName",
+        "-nu",
+      ]);
+
+    expect(getUserOptions(command)).toStrictEqual({
+      subscriptionId: "subscriptionId",
+      resourceGroup: "resourceGroup",
+      tenantId: "tenantId",
+      clientId: "clientId",
+      clientSecret: "clientSecret",
+      appName: "appName",
+      useKeychain: false,
+    });
+  });
 });

From 6d67beacd10ec704ec2cc8f136321d440c364bd9 Mon Sep 17 00:00:00 2001
From: Devansu <devansuyadav@gmail.com>
Date: Mon, 16 May 2022 16:13:32 +0000
Subject: [PATCH 5/6] feat(cli): add more alias flags & update README

---
 readme.md                      | 56 +++++++++++++++++-----------------
 src/cli/commands/build.ts      | 10 +++---
 src/cli/commands/deploy.ts     | 14 ++++-----
 src/cli/commands/init.ts       |  2 +-
 src/cli/commands/login.ts      | 20 ++++++------
 src/cli/commands/start.ts      | 24 +++++++--------
 src/cli/index.ts               |  6 ++--
 src/core/utils/options.spec.ts | 36 +++++++++++++++-------
 8 files changed, 91 insertions(+), 77 deletions(-)

diff --git a/readme.md b/readme.md
index 1f3c230e0..dbd99b99b 100644
--- a/readme.md
+++ b/readme.md
@@ -327,12 +327,12 @@ swa start http://localhost:3000 --swa-config-location ./my-app-source
 
 If you need to override the default values for the `swa` command, you can provide the following options:
 
-| Option                  | Description                                                        | Default                 | Example                                   |
-| ----------------------- | ------------------------------------------------------------------ | ----------------------- | ----------------------------------------- |
-| `--verbose`             | Enable verbose output. Values are: `silly, info, log, silent`      | `log`                   | `--verbose=silly`                         |
-| `--config`              | Path to [`swa-cli.config.json`](#swa-cli.config.json) file to use  | `./swa-cli.config.json` | `--config=./path/to/swa-cli.config.json`  |
-| `--print-config`        | Print all resolved options                                         | `false`                 | `--print-config` or `--print-config=true` |
-| `--swa-config-location` | The directory where the `staticwebapp.config.json` file is located | `./`                    | `--swa-config-location=./app`             |
+| Option                        | Description                                                        | Default                 | Example                                   |
+| ----------------------------- | ------------------------------------------------------------------ | ----------------------- | ----------------------------------------- |
+| `-V`, `--verbose`             | Enable verbose output. Values are: `silly, info, log, silent`      | `log`                   | `--verbose=silly`                         |
+| `-c`, `--config`              | Path to [`swa-cli.config.json`](#swa-cli.config.json) file to use  | `./swa-cli.config.json` | `--config=./path/to/swa-cli.config.json`  |
+| `-g`, `--print-config`        | Print all resolved options                                         | `false`                 | `--print-config` or `--print-config=true` |
+| `-w`, `--swa-config-location` | The directory where the `staticwebapp.config.json` file is located | `./`                    | `--swa-config-location=./app`             |
 
 ### Subcommand `swa login` options
 
@@ -342,33 +342,33 @@ TODO
 
 If you need to override the default values for the `swa start` subcommand, you can provide the following options:
 
-| Option                | Description                                                                                                    | Default   | Example                                                            |
-| --------------------- | -------------------------------------------------------------------------------------------------------------- | --------- | ------------------------------------------------------------------ |
-| `--app-location`      | The folder containing the source code of the front-end application                                             | `./`      | `--app-location="./app"`                                           |
-| `--api-location`      | The folder containing the source code of the API application. This could also be an URL to a `func` dev server | `./api`   | `--api-location="./api"` or `--api-location=http://localhost:8083` |
-| `--api-port`          | The API server port passed to `func start`                                                                     | `7071`    | `--api-port=8082`                                                  |
-| `--host`              | The host address to use for the CLI dev server                                                                 | `0.0.0.0` | `--host=192.168.68.80`                                             |
-| `--port`              | The port value to use for the CLI dev server                                                                   | `4280`    | `--port=8080`                                                      |
-| `--ssl`               | Serve the front-end application and API over HTTPS                                                             | `false`   | `--ssl` or `--ssl=true`                                            |
-| `--ssl-cert`          | The SSL certificate (.crt) to use when enabling HTTPS                                                          |           | `--ssl-cert="/home/user/ssl/example.crt"`                          |
-| `--ssl-key`           | The SSL key (.key) to use when enabling HTTPS                                                                  |           | `--ssl-key="/home/user/ssl/example.key"`                           |
-| `--run`               | Run a custon shell command or file at startup                                                                  |           | `--run="cd app & npm start"`                                       |
-| `--devserver-timeout` | The time (in seconds) to wait when connecting to a front-end application's dev server or api server            | `60`      | `--devserver-timeout=100`                                          |
-| `--func-args`         | Pass additional arguments to the `func start` command                                                          |           | `--func-args="--javascript"`                                       |
-| `--open`              | Automatically open the CLI dev server in the default browser.                                                  | `false`   | `--open` or `--open=true`                                          |
+| Option                      | Description                                                                                                    | Default   | Example                                                            |
+| --------------------------- | -------------------------------------------------------------------------------------------------------------- | --------- | ------------------------------------------------------------------ |
+| `-a`, `--app-location`      | The folder containing the source code of the front-end application                                             | `./`      | `--app-location="./app"`                                           |
+| `-i`, `--api-location`      | The folder containing the source code of the API application. This could also be an URL to a `func` dev server | `./api`   | `--api-location="./api"` or `--api-location=http://localhost:8083` |
+| `-j`, `--api-port`          | The API server port passed to `func start`                                                                     | `7071`    | `--api-port=8082`                                                  |
+| `-q`, `--host`              | The host address to use for the CLI dev server                                                                 | `0.0.0.0` | `--host=192.168.68.80`                                             |
+| `-p`, `--port`              | The port value to use for the CLI dev server                                                                   | `4280`    | `--port=8080`                                                      |
+| `-s`, `--ssl`               | Serve the front-end application and API over HTTPS                                                             | `false`   | `--ssl` or `--ssl=true`                                            |
+| `-e`, `--ssl-cert`          | The SSL certificate (.crt) to use when enabling HTTPS                                                          |           | `--ssl-cert="/home/user/ssl/example.crt"`                          |
+| `-k`, `--ssl-key`           | The SSL key (.key) to use when enabling HTTPS                                                                  |           | `--ssl-key="/home/user/ssl/example.key"`                           |
+| `-r`, `--run`               | Run a custon shell command or file at startup                                                                  |           | `--run="cd app & npm start"`                                       |
+| `-t`, `--devserver-timeout` | The time (in seconds) to wait when connecting to a front-end application's dev server or api server            | `60`      | `--devserver-timeout=100`                                          |
+| `-f`, `--func-args`         | Pass additional arguments to the `func start` command                                                          |           | `--func-args="--javascript"`                                       |
+| `-o`, `--open`              | Automatically open the CLI dev server in the default browser.                                                  | `false`   | `--open` or `--open=true`                                          |
 
 ### Subcommand `swa deploy` options
 
 If you need to override the default values for the `swa deploy` subcommand, you can provide the following options:
 
-| Option               | Description                                                                                                                               | Default   | Example                                   |
-| -------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | --------- | ----------------------------------------- |
-| `--api-location`     | The folder containing the source code of the API application                                                                              | `./api`   | `--api-location="./api"`                  |
-| `--deployment-token` | The secret toekn used to authenticate with the Static Web Apps                                                                            |           | `--deployment-token="123"`                |
-| `--dry-run`          | Simulate a deploy process without actually running it                                                                                     | `false`   | `--dry-run`                               |
-| `--print-token`      | print the deployment token                                                                                                                | `false`   | `--print-token`                           |
-| `--env`              | the type of deployment environment where to deploy the project                                                                            | `preview` | `--env="production"` or `--env="preview"` |
-| `--print-token`      | Print the deployment token. Usefull when using `--deployment-token` on CI/CD <br> Note: this command does not run the deployment process. | `false`   | `--print-token`                           |
+| Option                     | Description                                                                                                                               | Default   | Example                                   |
+| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | --------- | ----------------------------------------- |
+| `-i`, `--api-location`     | The folder containing the source code of the API application                                                                              | `./api`   | `--api-location="./api"`                  |
+| `-d`, `--deployment-token` | The secret toekn used to authenticate with the Static Web Apps                                                                            |           | `--deployment-token="123"`                |
+| `-dr`, `--dry-run`         | Simulate a deploy process without actually running it                                                                                     | `false`   | `--dry-run`                               |
+| `-pt`, `--print-token`     | print the deployment token                                                                                                                | `false`   | `--print-token`                           |
+| `--env`                    | the type of deployment environment where to deploy the project                                                                            | `preview` | `--env="production"` or `--env="preview"` |
+| `-pt`, `--print-token`     | Print the deployment token. Usefull when using `--deployment-token` on CI/CD <br> Note: this command does not run the deployment process. | `false`   | `--print-token`                           |
 
 The deploy command does also support the same options as the `swa login` command.
 
diff --git a/src/cli/commands/build.ts b/src/cli/commands/build.ts
index 9bfa00e78..6a59834c6 100644
--- a/src/cli/commands/build.ts
+++ b/src/cli/commands/build.ts
@@ -21,11 +21,11 @@ export default function registerCommand(program: Command) {
     .command("build [configName|appLocation]")
     .usage("[configName|appLocation] [options]")
     .description("build your project")
-    .option("--app-location <path>", "the folder containing the source code of the front-end application", DEFAULT_CONFIG.appLocation)
-    .option("--api-location <path>", "the folder containing the source code of the API application", DEFAULT_CONFIG.apiLocation)
-    .option("--output-location <path>", "the folder containing the built source of the front-end application", DEFAULT_CONFIG.outputLocation)
-    .option("--app-build-command <command>", "the command used to build your app", DEFAULT_CONFIG.appBuildCommand)
-    .option("--api-build-command <command>", "the command used to build your api", DEFAULT_CONFIG.apiBuildCommand)
+    .option("-a, --app-location <path>", "the folder containing the source code of the front-end application", DEFAULT_CONFIG.appLocation)
+    .option("-i, --api-location <path>", "the folder containing the source code of the API application", DEFAULT_CONFIG.apiLocation)
+    .option("-O, --output-location <path>", "the folder containing the built source of the front-end application", DEFAULT_CONFIG.outputLocation)
+    .option("-A, --app-build-command <command>", "the command used to build your app", DEFAULT_CONFIG.appBuildCommand)
+    .option("-I, --api-build-command <command>", "the command used to build your api", DEFAULT_CONFIG.apiBuildCommand)
     .option("--auto", "automatically detect how to build your app and api", false)
     .action(async (positionalArg: string | undefined, _options: SWACLIConfig, command: Command) => {
       const options = await configureOptions(positionalArg, command.optsWithGlobals(), command, "build");
diff --git a/src/cli/commands/deploy.ts b/src/cli/commands/deploy.ts
index 2df03caa2..c9d8c4763 100644
--- a/src/cli/commands/deploy.ts
+++ b/src/cli/commands/deploy.ts
@@ -28,17 +28,17 @@ export default function registerCommand(program: Command) {
     .command("deploy [configName|outputLocation]")
     .usage("[configName|outputLocation] [options]")
     .description("deploy the current project to Azure Static Web Apps")
-    .option("--app-location <path>", "the folder containing the source code of the front-end application", DEFAULT_CONFIG.appLocation)
-    .option("--api-location <path>", "the folder containing the source code of the API application", DEFAULT_CONFIG.apiLocation)
-    .option("--output-location <path>", "the folder containing the built source of the front-end application", DEFAULT_CONFIG.outputLocation)
+    .option("-a, --app-location <path>", "the folder containing the source code of the front-end application", DEFAULT_CONFIG.appLocation)
+    .option("-i, --api-location <path>", "the folder containing the source code of the API application", DEFAULT_CONFIG.apiLocation)
+    .option("-O, --output-location <path>", "the folder containing the built source of the front-end application", DEFAULT_CONFIG.outputLocation)
     .option(
-      "--swa-config-location <swaConfigLocation>",
+      "-w, --swa-config-location <swaConfigLocation>",
       "the directory where the staticwebapp.config.json file is located",
       DEFAULT_CONFIG.swaConfigLocation
     )
-    .option("--deployment-token <secret>", "the secret token used to authenticate with the Static Web Apps")
-    .option("--dry-run", "simulate a deploy process without actually running it", DEFAULT_CONFIG.dryRun)
-    .option("--print-token", "print the deployment token", false)
+    .option("-d, --deployment-token <secret>", "the secret token used to authenticate with the Static Web Apps")
+    .option("-dr, --dry-run", "simulate a deploy process without actually running it", DEFAULT_CONFIG.dryRun)
+    .option("-pt, --print-token", "print the deployment token", false)
     .option("--env [environment]", "the type of deployment environment where to deploy the project", DEFAULT_CONFIG.env)
     .action(async (positionalArg: string | undefined, _options: SWACLIConfig, command: Command) => {
       const options = await configureOptions(positionalArg, command.optsWithGlobals(), command, "deploy");
diff --git a/src/cli/commands/init.ts b/src/cli/commands/init.ts
index feae37fb3..be33efda8 100644
--- a/src/cli/commands/init.ts
+++ b/src/cli/commands/init.ts
@@ -20,7 +20,7 @@ export default function registerCommand(program: Command) {
     .command("init [configName]")
     .usage("[configName] [options]")
     .description("initialize a new static web app project")
-    .option("--yes", "answer yes to all prompts (disable interactive mode)", false)
+    .option("-y, --yes", "answer yes to all prompts (disable interactive mode)", false)
     .action(async (configName: string | undefined, _options: SWACLIConfig, command: Command) => {
       const options = await configureOptions(undefined, command.optsWithGlobals(), command, "init", false);
       if (configName) {
diff --git a/src/cli/commands/login.ts b/src/cli/commands/login.ts
index 2991d2ef5..87f5b8f66 100644
--- a/src/cli/commands/login.ts
+++ b/src/cli/commands/login.ts
@@ -14,17 +14,17 @@ const { readFile, writeFile } = fsPromises;
 
 export function addSharedLoginOptionsToCommand(command: Command) {
   command
-    .option("--subscription-id <subscriptionId>", "Azure subscription ID used by this project", DEFAULT_CONFIG.subscriptionId)
-    .option("--resource-group <resourceGroupName>", "Azure resource group used by this project", DEFAULT_CONFIG.resourceGroupName)
-    .option("--tenant-id <tenantId>", "Azure tenant ID", DEFAULT_CONFIG.tenantId)
-    .option("--client-id <clientId>", "Azure client ID", DEFAULT_CONFIG.clientId)
-    .option("--client-secret <clientSecret>", "Azure client secret", DEFAULT_CONFIG.clientSecret)
-    .option("--app-name <appName>", "Azure Static Web App application name", DEFAULT_CONFIG.appName)
-    .option("--clear-credentials", "clear persisted credentials before login", DEFAULT_CONFIG.clearCredentials)
-
-    .option("--use-keychain", "enable using the operating system native keychain for persistent credentials", DEFAULT_CONFIG.useKeychain)
+    .option("-S, --subscription-id <subscriptionId>", "Azure subscription ID used by this project", DEFAULT_CONFIG.subscriptionId)
+    .option("-R, --resource-group <resourceGroupName>", "Azure resource group used by this project", DEFAULT_CONFIG.resourceGroupName)
+    .option("-T, --tenant-id <tenantId>", "Azure tenant ID", DEFAULT_CONFIG.tenantId)
+    .option("-C, --client-id <clientId>", "Azure client ID", DEFAULT_CONFIG.clientId)
+    .option("-CS, --client-secret <clientSecret>", "Azure client secret", DEFAULT_CONFIG.clientSecret)
+    .option("-n, --app-name <appName>", "Azure Static Web App application name", DEFAULT_CONFIG.appName)
+    .option("-cc, --clear-credentials", "clear persisted credentials before login", DEFAULT_CONFIG.clearCredentials)
+
+    .option("-u, --use-keychain", "enable using the operating system native keychain for persistent credentials", DEFAULT_CONFIG.useKeychain)
     // Note: Commander does not automatically recognize the --no-* option, so we have to explicitly use --no-use-keychain- instead
-    .option("--no-use-keychain", "disable using the operating system native keychain", !DEFAULT_CONFIG.useKeychain);
+    .option("-nu, --no-use-keychain", "disable using the operating system native keychain", !DEFAULT_CONFIG.useKeychain);
 }
 
 export default function registerCommand(program: Command) {
diff --git a/src/cli/commands/start.ts b/src/cli/commands/start.ts
index dfff858fc..74aaa02c9 100644
--- a/src/cli/commands/start.ts
+++ b/src/cli/commands/start.ts
@@ -32,32 +32,32 @@ export default function registerCommand(program: Command) {
     .command("start [configName|outputLocation|appDevserverUrl]")
     .usage("[configName|outputLocation|appDevserverUrl] [options]")
     .description("start the emulator from a directory or bind to a dev server")
-    .option("--app-location <path>", "the folder containing the source code of the front-end application", DEFAULT_CONFIG.appLocation)
-    .option("--api-location <path>", "the folder containing the source code of the API application", DEFAULT_CONFIG.apiLocation)
-    .option("--output-location <path>", "the folder containing the built source of the front-end application", DEFAULT_CONFIG.outputLocation)
-    .option("--app-devserver-url <url>", "connect to the dev server at this URL instead of using output location", DEFAULT_CONFIG.appDevserverUrl)
-    .option("--api-devserver-url <url>", "connect to the api server at this URL instead of using output location", DEFAULT_CONFIG.apiDevserverUrl)
-    .option<number>("--api-port <apiPort>", "the API server port passed to `func start`", parsePort, DEFAULT_CONFIG.apiPort)
-    .option("--host <host>", "the host address to use for the CLI dev server", DEFAULT_CONFIG.host)
-    .option<number>("--port <port>", "the port value to use for the CLI dev server", parsePort, DEFAULT_CONFIG.port)
+    .option("-a, --app-location <path>", "the folder containing the source code of the front-end application", DEFAULT_CONFIG.appLocation)
+    .option("-i, --api-location <path>", "the folder containing the source code of the API application", DEFAULT_CONFIG.apiLocation)
+    .option("-O, --output-location <path>", "the folder containing the built source of the front-end application", DEFAULT_CONFIG.outputLocation)
+    .option("-D, --dev-server-url <url>", "connect to the dev server at this URL instead of using output location", DEFAULT_CONFIG.appDevserverUrl)
+    .option("-au, --api-server-url <url>", "connect to the api server at this URL instead of using output location", DEFAULT_CONFIG.apiDevserverUrl)
+    .option<number>("-j, --api-port <apiPort>", "the API server port passed to `func start`", parsePort, DEFAULT_CONFIG.apiPort)
+    .option("-q, --host <host>", "the host address to use for the CLI dev server", DEFAULT_CONFIG.host)
+    .option<number>("-p, --port <port>", "the port value to use for the CLI dev server", parsePort, DEFAULT_CONFIG.port)
 
     .option("-s, --ssl", "serve the front-end application and API over HTTPS", DEFAULT_CONFIG.ssl)
     .option("-e, --ssl-cert <sslCertLocation>", "the SSL certificate (.crt) to use when enabling HTTPS", DEFAULT_CONFIG.sslCert)
     .option("-k, --ssl-key <sslKeyLocation>", "the SSL key (.key) to use when enabling HTTPS", DEFAULT_CONFIG.sslKey)
     .option("-r, --run <startupScript>", "run a custom shell command or script file at startup", DEFAULT_CONFIG.run)
     .option<number>(
-      "--devserver-timeout <time>",
+      "-t, --devserver-timeout <time>",
       "the time to wait (in seconds) when connecting to a front-end application's dev server or api server",
       parseServerTimeout,
       DEFAULT_CONFIG.devserverTimeout
     )
     .option(
-      "--swa-config-location <swaConfigLocation>",
+      "-w, --swa-config-location <swaConfigLocation>",
       "the directory where the staticwebapp.config.json file is located",
       DEFAULT_CONFIG.swaConfigLocation
     )
-    .option("--open", "open the browser to the dev server", DEFAULT_CONFIG.open)
-    .option("--func-args <funcArgs>", "pass additional arguments to the func start command")
+    .option("-o, --open", "open the browser to the dev server", DEFAULT_CONFIG.open)
+    .option("-f, --func-args <funcArgs>", "pass additional arguments to the func start command")
     .action(async (positionalArg: string | undefined, _options: SWACLIConfig, command: Command) => {
       const options = await configureOptions(positionalArg, command.optsWithGlobals(), command, "start");
       if (positionalArg && !matchLoadedConfigName(positionalArg)) {
diff --git a/src/cli/index.ts b/src/cli/index.ts
index 83e1b1ab2..67bc02c82 100755
--- a/src/cli/index.ts
+++ b/src/cli/index.ts
@@ -63,9 +63,9 @@ export async function run(argv?: string[]) {
         .preset(DEFAULT_CONFIG.verbose)
         .default(DEFAULT_CONFIG.verbose)
     )
-    .option("--config <path>", "path to swa-cli.config.json file to use", path.relative(process.cwd(), swaCliConfigFilename))
-    .option("--config-name <name>", "name of the configuration to use", undefined)
-    .option("--print-config", "print all resolved options", false)
+    .option("-c, --config <path>", "path to swa-cli.config.json file to use", path.relative(process.cwd(), swaCliConfigFilename))
+    .option("-cn, --config-name <name>", "name of the configuration to use", undefined)
+    .option("-g, --print-config", "print all resolved options", false)
     .action(async (_options: SWACLIConfig, command: Command) => {
       const options = await configureOptions(undefined, command.optsWithGlobals(), command, "init");
       swaMagic(options);
diff --git a/src/core/utils/options.spec.ts b/src/core/utils/options.spec.ts
index ff0dccd16..3efccc0c7 100644
--- a/src/core/utils/options.spec.ts
+++ b/src/core/utils/options.spec.ts
@@ -2,7 +2,7 @@ import { Command } from "commander";
 import mockFs from "mock-fs";
 import { swaCliConfigFilename } from "./cli-config";
 import { parsePort } from "./net";
-import { parseDevserverTimeout } from "./cli";
+import { parseServerTimeout } from "./cli";
 import { configureOptions, getUserOptions } from "./options";
 import { DEFAULT_CONFIG } from "../../config";
 
@@ -100,15 +100,15 @@ describe("Testing aliases for each of the commands and their options", () => {
       .name("swa")
       .option("-V, --verbose [prefix]", "", DEFAULT_CONFIG.verbose)
       .option("-c, --config <path>")
+      .option("-cn, --config-name <name>")
       .option("-g, --print-config", "", false)
-      .option("-w, --swa-config-location <swaConfigLocation>")
-      .parseAsync(["node", "swa", "-V", "log", "-c", `../${swaCliConfigFilename}`, "-g", "-w", `${DEFAULT_CONFIG.swaConfigLocation}`]);
+      .parseAsync(["node", "swa", "-V", "log", "-c", `../${swaCliConfigFilename}`, "-cn", `${swaCliConfigFilename}`, "-g"]);
 
     expect(getUserOptions(command)).toStrictEqual({
       verbose: "log",
       config: `../${swaCliConfigFilename}`,
+      configName: `${swaCliConfigFilename}`,
       printConfig: true,
-      swaConfigLocation: DEFAULT_CONFIG.swaConfigLocation,
     });
   });
 
@@ -117,15 +117,18 @@ describe("Testing aliases for each of the commands and their options", () => {
       .name("swa")
       .option("-a, --app-location <appLocation>")
       .option("-i, --api-location <apiLocation>")
+      .option("-O, --output-location <outputLocation>")
+      .option("-D, --dev-server-url <url>")
+      .option("-au, --api-server-url <url>")
       .option<number>("-j, --api-port <apiPort>", "", parsePort, DEFAULT_CONFIG.apiPort)
       .option("-q, --host <host>")
       .option<number>("-p, --port <port>", "", parsePort, DEFAULT_CONFIG.port)
-      .option("-b, --run-build")
       .option("-s, --ssl")
       .option("-e, --ssl-cert <sslCertLocation>")
       .option("-k, --ssl-key <sslKeyLocation>")
       .option("-r, --run <startupScript>")
-      .option<number>("-t, --devserver-timeout <devserverTimeout>", "", parseDevserverTimeout, DEFAULT_CONFIG.devserverTimeout)
+      .option<number>("-t, --devserver-timeout <time>", "", parseServerTimeout, DEFAULT_CONFIG.devserverTimeout)
+      .option("-w, --swa-config-location <swaConfigLocation>")
       .option("-o, --open")
       .option("-f, --func-args <funcArgs>")
       .parseAsync([
@@ -135,13 +138,18 @@ describe("Testing aliases for each of the commands and their options", () => {
         `${DEFAULT_CONFIG.appLocation}`,
         "-i",
         "./api",
+        "-O",
+        `./build`,
+        "-D",
+        "https://swa-dev-server.com",
+        "-au",
+        "https://swa-dev-server.com/api/v2",
         "-j",
         "7071",
         "-q",
         `${DEFAULT_CONFIG.host}`,
         "-p",
         "4567",
-        "-b",
         "-s",
         "-e",
         "./ssl/sslCert.crt",
@@ -151,6 +159,8 @@ describe("Testing aliases for each of the commands and their options", () => {
         "run.sh",
         "-t",
         "1000",
+        "-w",
+        "./config",
         "-o",
         "-f",
         "--arg",
@@ -159,15 +169,18 @@ describe("Testing aliases for each of the commands and their options", () => {
     expect(getUserOptions(command)).toStrictEqual({
       appLocation: DEFAULT_CONFIG.appLocation,
       apiLocation: "./api",
+      outputLocation: "./build",
+      devServerUrl: "https://swa-dev-server.com",
+      apiServerUrl: "https://swa-dev-server.com/api/v2",
       apiPort: 7071,
       host: DEFAULT_CONFIG.host,
       port: 4567,
-      runBuild: true,
       ssl: true,
       sslCert: "./ssl/sslCert.crt",
       sslKey: "./ssl/sslKey.key",
       run: "run.sh",
       devserverTimeout: 1000,
+      swaConfigLocation: "./config",
       open: true,
       funcArgs: "--arg",
     });
@@ -199,13 +212,11 @@ describe("Testing aliases for each of the commands and their options", () => {
   it("should return appropriate user cli options for the alias commands for swa build options", async () => {
     const command = await new Command()
       .name("swa")
-      .option("-O, --output-location <outputLocation>")
       .option("-A, --app-build-command <command>")
       .option("-I, --api-build-command <command>")
-      .parseAsync(["node", "swa", "-O", `./build`, "-A", "build-app", "-I", "build-api"]);
+      .parseAsync(["node", "swa", "-A", "build-app", "-I", "build-api"]);
 
     expect(getUserOptions(command)).toStrictEqual({
-      outputLocation: "./build",
       appBuildCommand: "build-app",
       apiBuildCommand: "build-api",
     });
@@ -220,6 +231,7 @@ describe("Testing aliases for each of the commands and their options", () => {
       .option("-C, --client-id [clientId]")
       .option("-CS, --client-secret [clientSecret]")
       .option("-n, --app-name [appName]")
+      .option("-cc, --clear-credentials")
       .option("-u, --use-keychain")
       .option("-nu, --no-use-keychain")
       .parseAsync([
@@ -237,6 +249,7 @@ describe("Testing aliases for each of the commands and their options", () => {
         "clientSecret",
         "-n",
         "appName",
+        "-cc",
         "-nu",
       ]);
 
@@ -248,6 +261,7 @@ describe("Testing aliases for each of the commands and their options", () => {
       clientSecret: "clientSecret",
       appName: "appName",
       useKeychain: false,
+      clearCredentials: true,
     });
   });
 });

From 9e1c7a65de0185a6c11a3ad53a63cde5343d8639 Mon Sep 17 00:00:00 2001
From: Yohan Lasorsa <noda@free.fr>
Date: Tue, 17 May 2022 11:36:18 +0200
Subject: [PATCH 6/6] chore: code review

---
 src/cli/commands/start.ts      | 4 ++--
 src/core/utils/options.spec.ts | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/cli/commands/start.ts b/src/cli/commands/start.ts
index 74aaa02c9..69e0be878 100644
--- a/src/cli/commands/start.ts
+++ b/src/cli/commands/start.ts
@@ -35,8 +35,8 @@ export default function registerCommand(program: Command) {
     .option("-a, --app-location <path>", "the folder containing the source code of the front-end application", DEFAULT_CONFIG.appLocation)
     .option("-i, --api-location <path>", "the folder containing the source code of the API application", DEFAULT_CONFIG.apiLocation)
     .option("-O, --output-location <path>", "the folder containing the built source of the front-end application", DEFAULT_CONFIG.outputLocation)
-    .option("-D, --dev-server-url <url>", "connect to the dev server at this URL instead of using output location", DEFAULT_CONFIG.appDevserverUrl)
-    .option("-au, --api-server-url <url>", "connect to the api server at this URL instead of using output location", DEFAULT_CONFIG.apiDevserverUrl)
+    .option("-D, --app-devserver-url <url>", "connect to the app dev server at this URL instead of using output location", DEFAULT_CONFIG.appDevserverUrl)
+    .option("-is, --api-devserver-url <url>", "connect to the api server at this URL instead of using output location", DEFAULT_CONFIG.apiDevserverUrl)
     .option<number>("-j, --api-port <apiPort>", "the API server port passed to `func start`", parsePort, DEFAULT_CONFIG.apiPort)
     .option("-q, --host <host>", "the host address to use for the CLI dev server", DEFAULT_CONFIG.host)
     .option<number>("-p, --port <port>", "the port value to use for the CLI dev server", parsePort, DEFAULT_CONFIG.port)
diff --git a/src/core/utils/options.spec.ts b/src/core/utils/options.spec.ts
index 3efccc0c7..730a5d86c 100644
--- a/src/core/utils/options.spec.ts
+++ b/src/core/utils/options.spec.ts
@@ -118,8 +118,8 @@ describe("Testing aliases for each of the commands and their options", () => {
       .option("-a, --app-location <appLocation>")
       .option("-i, --api-location <apiLocation>")
       .option("-O, --output-location <outputLocation>")
-      .option("-D, --dev-server-url <url>")
-      .option("-au, --api-server-url <url>")
+      .option("-D, --app-devserver-url <url>")
+      .option("-is, --api-devserver-url <url>")
       .option<number>("-j, --api-port <apiPort>", "", parsePort, DEFAULT_CONFIG.apiPort)
       .option("-q, --host <host>")
       .option<number>("-p, --port <port>", "", parsePort, DEFAULT_CONFIG.port)