fix(@angular/cli): Show detailed help for ng new --help

Author: Brocco

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

@@ -67,7 +67,9 @@ const HelpCommand = Command.extend({
  if (commandOptions.short) {
  this.ui.writeLine(command.printShortHelp(commandOptions));
  } else if (command.printDetailedHelp(commandOptions, rawArgs)) {
+ this.ui.writeLine('cool');
  const result = command.printDetailedHelp(commandOptions, rawArgs);
+ this.ui.writeLine('not cool', result);
  if (result instanceof Promise) {
  result.then(r => this.ui.writeLine(r));
  } else {

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

@@ -3,9 +3,13 @@ import * as path from 'path';
 import chalk from 'chalk';
 
 import { CliConfig } from '../models/config';
+import { getCollection, getEngineHost } from '../utilities/schematics';
 import { validateProjectName } from '../utilities/validate-project-name';
 import { oneLine } from 'common-tags';
 import { SchematicAvailableOptions } from '../tasks/schematic-get-options';
+import { outputFile } from 'fs-extra';
+
+const { cyan, yellow } = chalk;
 
 const Command = require('../ember-cli/lib/models/command');
 const SilentError = require('silent-error');
@@ -153,6 +157,28 @@ const NewCommand = Command.extend({
  commandOptions.skipGit = commandOptions.skipGit === undefined ? false : commandOptions.skipGit;
 
  return initTask.run(commandOptions, rawArgs);
+ },
+
+ printDetailedHelp: function (): string | Promise<string> {
+ const collectionName = this.getCollectionName();
+ const schematicName = CliConfig.getValue('defaults.schematics.newApp');
+ const SchematicGetHelpOutputTask = require('../tasks/schematic-get-help-output').default;
+ const getHelpOutputTask = new SchematicGetHelpOutputTask({
+ ui: this.ui,
+ project: this.project
+ });
+ return getHelpOutputTask.run({
+ schematicName,
+ collectionName,
+ nonSchematicOptions: this.availableOptions.filter((o: any) => !o.hidden)
+ })
+ .then((output: string[]) => {
+ const outputLines = [
+ cyan(`ng new ${cyan('[name]')} ${cyan('<options...>')}`),
+ ...output
+ ];
+ return outputLines.join('\n');
+ });
  }
 });
 

packages/@angular/cli/tasks/schematic-get-help-output.ts

@@ -6,6 +6,7 @@ const { cyan, grey } = chalk;
 export interface SchematicGetHelpOptions {
  collectionName: string;
  schematicName: string;
+ nonSchematicOptions: any[];
 }
 
 export interface SchematicAvailableOptions {
@@ -18,21 +19,21 @@ export interface SchematicAvailableOptions {
 }
 
 export default Task.extend({
- run: function ({schematicName, collectionName}: SchematicGetHelpOptions):
- Promise<SchematicAvailableOptions[]> {
+ run: function ({schematicName, collectionName, nonSchematicOptions}: SchematicGetHelpOptions):
+ Promise<string[]> {
 
  const SchematicGetOptionsTask = require('./schematic-get-options').default;
  const getOptionsTask = new SchematicGetOptionsTask({
  ui: this.ui,
  project: this.project
  });
- return getOptionsTask.run({
+ return Promise.all([getOptionsTask.run({
  schematicName: schematicName,
  collectionName: collectionName,
- })
- .then((availableOptions: SchematicAvailableOptions[]) => {
+ }), nonSchematicOptions])
+ .then(([availableOptions, nonSchematicOptions]: [SchematicAvailableOptions[], any[]]) => {
  const output: string[] = [];
- availableOptions
+ [...(nonSchematicOptions || []), ...availableOptions]
  .filter(opt => opt.name !== 'name')
  .forEach(opt => {
  let text = cyan(` --${opt.name}`);
@@ -48,7 +49,7 @@ export default Task.extend({
  output.push(text);
  if (opt.aliases && opt.aliases.length > 0) {
  const aliasText = opt.aliases.reduce(
- (acc, curr) => {
+ (acc: string, curr: string) => {
  return acc + ` -${curr}`;
  },
  '');