fix(plugin-serverless): remove default from aliases (#274)

The recent introduction of alias support in the `plugin-serverless` was causing issues if there was
a default value as the default value of the alias would override the value explicitly passed into
the original command. This change removes default and required arguments from aliases and also
explicitly updates the description.

fix #272

Author: dkundel

Diff for: packages/plugin-serverless/jest.config.js

@@ -0,0 +1,10 @@
+const base = require('../../jest.config.base.js');
+const { join } = require('path');
+
+module.exports = {
+  ...base,
+  preset: null,
+  name: 'plugin-serverless',
+  displayName: 'plugin-serverless',
+  globalTeardown: join(__dirname, 'jest.teardown.js'),
+};

Diff for: packages/plugin-serverless/jest.teardown.js

@@ -0,0 +1,7 @@
+const { join } = require('path');
+const { tmpdir } = require('os');
+const rimraf = require('rimraf');
+
+module.exports = () => {
+  rimraf.sync(join(tmpdir(), 'scratch'));
+};

Diff for: packages/plugin-serverless/src/commands/serverless/deploy.js

@@ -19,7 +19,7 @@ class FunctionsDeploy extends TwilioClientCommand {
     await super.run();
 
     let { flags, args } = this.parse(FunctionsDeploy);
-    flags = normalizeFlags(flags, aliasMap);
+    flags = normalizeFlags(flags, aliasMap, process.argv);
 
     const externalOptions = createExternalCliOptions(flags, this.twilioClient);
 

Diff for: packages/plugin-serverless/src/commands/serverless/init.js

@@ -17,7 +17,7 @@ class FunctionsInit extends TwilioClientCommand {
     await super.run();
 
     let { flags, args } = this.parse(FunctionsInit);
-    flags = normalizeFlags(flags, aliasMap);
+    flags = normalizeFlags(flags, aliasMap, process.argv);
 
     const opts = Object.assign({}, flags, args);
     opts.accountSid = flags.accountSid || this.twilioClient.accountSid;

Diff for: packages/plugin-serverless/src/commands/serverless/list-templates.js

@@ -15,7 +15,7 @@ const { flags, aliasMap } = convertYargsOptionsToOclifFlags(cliInfo.options);
 class FunctionsListTemplates extends Command {
   async run() {
     let { flags, args } = this.parse(FunctionsListTemplates);
-    flags = normalizeFlags(flags, aliasMap);
+    flags = normalizeFlags(flags, aliasMap, process.argv);
 
     const opts = Object.assign({}, flags, args);
     return handler(opts, undefined);

Diff for: packages/plugin-serverless/src/commands/serverless/list.js

@@ -15,7 +15,7 @@ class FunctionsList extends TwilioClientCommand {
     await super.run();
 
     let { flags, args } = this.parse(FunctionsList);
-    flags = normalizeFlags(flags, aliasMap);
+    flags = normalizeFlags(flags, aliasMap, process.argv);
 
     const externalOptions = createExternalCliOptions(flags, this.twilioClient);
 

Diff for: packages/plugin-serverless/src/commands/serverless/logs.js

@@ -16,7 +16,7 @@ class LogsList extends TwilioClientCommand {
     await super.run();
 
     let { flags, args } = this.parse(LogsList);
-    flags = normalizeFlags(flags, aliasMap);
+    flags = normalizeFlags(flags, aliasMap, process.argv);
 
     const externalOptions = createExternalCliOptions(flags, this.twilioClient);
 

Diff for: packages/plugin-serverless/src/commands/serverless/new.js

@@ -11,7 +11,7 @@ const { flags, aliasMap } = convertYargsOptionsToOclifFlags(cliInfo.options);
 class FunctionsNew extends Command {
   async run() {
     let { flags, args } = this.parse(FunctionsNew);
-    flags = normalizeFlags(flags, aliasMap);
+    flags = normalizeFlags(flags, aliasMap, process.argv);
 
     const opts = Object.assign({}, flags, args);
     return handler(opts, undefined);

Diff for: packages/plugin-serverless/src/commands/serverless/promote.js

@@ -19,7 +19,7 @@ class FunctionsPromote extends TwilioClientCommand {
     await super.run();
 
     let { flags, args } = this.parse(FunctionsPromote);
-    flags = normalizeFlags(flags, aliasMap);
+    flags = normalizeFlags(flags, aliasMap, process.argv);
 
     const externalOptions = createExternalCliOptions(flags, this.twilioClient);
 

Diff for: packages/plugin-serverless/src/commands/serverless/start.js

@@ -16,7 +16,7 @@ class FunctionsStart extends Command {
   async run() {
     let { flags, args } = this.parse(FunctionsStart);
 
-    flags = normalizeFlags(flags, aliasMap);
+    flags = normalizeFlags(flags, aliasMap, process.argv);
 
     const opts = Object.assign({}, flags, args);
     return handler(opts, undefined);

Diff for: packages/plugin-serverless/src/utils.js

@@ -38,7 +38,12 @@ function convertYargsOptionsToOclifFlags(options) {
     result[name] = flags[opt.type](flag);
 
     if (opt.alias && opt.alias.length > 1) {
-      result[opt.alias] = flags[opt.type](flag);
+      result[opt.alias] = flags[opt.type]({
+        ...flag,
+        default: undefined,
+        description: `[Alias for "${name}"]`,
+        required: undefined,
+      });
       aliasMap.set(opt.alias, name);
     }
 
@@ -47,7 +52,7 @@ function convertYargsOptionsToOclifFlags(options) {
   return { flags: flagsResult, aliasMap };
 }
 
-function normalizeFlags(flags, aliasMap) {
+function normalizeFlags(flags, aliasMap, argv) {
   const result = Object.keys(flags).reduce((current, name) => {
     const normalizedName = name.includes('-') ? camelCase(name) : name;
 
@@ -59,7 +64,7 @@ function normalizeFlags(flags, aliasMap) {
     }
     return current;
   }, flags);
-  const [, command, ...args] = process.argv;
+  const [, command, ...args] = argv;
   result.$0 = path.basename(command);
   result._ = args;