refactor(@angular/cli): support hidden commands and options

Author: Charles Lyding

packages/@angular/cli/commands/completion.ts

@@ -38,12 +38,6 @@ export interface CompletionCommandOptions {
   zsh?: boolean;
 }
 
-const commandsToIgnore = [
-  'destroy',
-  'easter-egg',
-  'init'
-];
-
 const optsNg: string[] = [];
 
 const CompletionCommand = Command.extend({
@@ -80,9 +74,6 @@ const CompletionCommand = Command.extend({
     const commandFiles = fs.readdirSync(__dirname)
       .filter(file => file.match(/\.(j|t)s$/) && !file.match(/\.d.ts$/))
       .map(file => path.parse(file).name)
-      .filter(file => {
-        return commandsToIgnore.indexOf(file) < 0;
-      })
       .map(file => file.toLowerCase());
 
     const commandMap = commandFiles.reduce((acc: any, curr: string) => {
@@ -107,6 +98,10 @@ const CompletionCommand = Command.extend({
         tasks: this.tasks
       });
 
+      if (command.hidden || command.unknown) {
+        return;
+      }
+
       optsNg.push(command.name);
       com.push(command.name);
 

packages/@angular/cli/commands/destroy.ts

@@ -6,6 +6,7 @@ const DestroyCommand = Command.extend({
   name: 'destroy',
   aliases: ['d'],
   works: 'insideProject',
+  hidden: true,
 
   anonymousOptions: [
     '<blueprint>'

packages/@angular/cli/commands/easter-egg.ts

@@ -11,6 +11,7 @@ function pickOne(of: string[]): string {
 const MakeThisAwesomeCommand = Command.extend({
   name: 'make-this-awesome',
   works: 'insideProject',
+  hidden: true,
 
   run: function (commandOptions: any, rawArgs: string[]): Promise<void> {
     (this as any)[stringUtils.camelize(this.name)](commandOptions, rawArgs);

packages/@angular/cli/commands/help.ts

@@ -5,12 +5,6 @@ const Command = require('../ember-cli/lib/models/command');
 const stringUtils = require('ember-cli-string-utils');
 const lookupCommand = require('../ember-cli/lib/cli/lookup-command');
 
-const commandsToIgnore = [
-  'easter-egg',
-  'init',
-  'destroy'
-];
-
 const HelpCommand = Command.extend({
   name: 'help',
   description: 'Shows help for the CLI.',
@@ -27,10 +21,6 @@ const HelpCommand = Command.extend({
       .map(file => path.parse(file).name)
       .map(file => file.toLowerCase());
 
-    commandFiles = commandFiles.filter(file => {
-      return commandsToIgnore.indexOf(file) < 0;
-    });
-
     let commandMap = commandFiles.reduce((acc: any, curr: string) => {
       let classifiedName = stringUtils.classify(curr);
       let defaultImport = require(`./${curr}`).default;
@@ -45,15 +35,19 @@ const HelpCommand = Command.extend({
     }
 
     commandFiles.forEach(cmd => {
-      let Command = lookupCommand(commandMap, cmd);
+      const Command = lookupCommand(commandMap, cmd);
 
-      let command = new Command({
+      const command = new Command({
         ui: this.ui,
         project: this.project,
         commands: this.commands,
         tasks: this.tasks
       });
 
+      if (command.hidden || command.unknown) {
+        return;
+      }
+
       if (rawArgs.length > 0) {
         let commandInput = rawArgs[0];
         const aliases = Command.prototype.aliases;

packages/@angular/cli/commands/init.ts

@@ -4,6 +4,7 @@ const InitCommand: any = Command.extend({
   name: 'init',
   description: 'Creates a new Angular CLI project in the current folder.',
   works: 'everywhere',
+  hidden: true,
 
   availableOptions: [
     { name: 'dry-run', type: Boolean, default: false, aliases: ['d'] },

packages/@angular/cli/ember-cli/lib/utilities/print-command.js

@@ -22,7 +22,8 @@ module.exports = function(initialMargin, shouldDescriptionBeGrey) {
     }).join(' '));
   }
 
-  options = this.availableOptions;
+  options = this.availableOptions
+    .filter(function(option) { return !option.hidden; });
 
   // <options...>
   if (options.length) {

tests/e2e/tests/commands/help/help-hidden.ts

@@ -0,0 +1,17 @@
+import { oneLine } from 'common-tags';
+
+import { silentNg } from '../../../utils/process';
+
+
+export default function() {
+  return Promise.resolve()
+    .then(() => silentNg('--help'))
+    .then(({ stdout }) => {
+      if (stdout.match(/(easter-egg)|(ng make-this-awesome)|(ng init)/)) {
+        throw new Error(oneLine`
+          Expected to not match "(easter-egg)|(ng make-this-awesome)|(ng init)"
+          in help output.
+        `);
+      }
+    });
+}