fix(@angular/cli): Show non-schematic options with help

angular · Oct 31, 2017 · f5e7af1 · f5e7af1
1 parent 9864e8a
commit f5e7af1
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/packages/@angular/cli/commands/generate.ts b/packages/@angular/cli/commands/generate.ts
@@ -17,7 +17,7 @@ import { SchematicAvailableOptions } from '../tasks/schematic-get-options';
 const Command = require('../ember-cli/lib/models/command');
 const SilentError = require('silent-error');
 
-const { cyan, grey, yellow } = chalk;
+const { cyan, yellow } = chalk;
 const separatorRegEx = /[\/\\]/g;
 
 
@@ -199,7 +199,8 @@ export default Command.extend({
       });
       return getHelpOutputTask.run({
         schematicName,
-        collectionName
+        collectionName,
+        nonSchematicOptions: this.availableOptions.filter((o: any) => !o.hidden)
       })
       .then((output: string[]) => {
         return [

diff --git a/packages/@angular/cli/commands/new.ts b/packages/@angular/cli/commands/new.ts
@@ -3,13 +3,11 @@ 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 { cyan } = chalk;
 
 const Command = require('../ember-cli/lib/models/command');
 const SilentError = require('silent-error');

diff --git a/packages/@angular/cli/tasks/schematic-get-help-output.ts b/packages/@angular/cli/tasks/schematic-get-help-output.ts
@@ -18,6 +18,13 @@ export interface SchematicAvailableOptions {
   schematicDefault: any;
 }
 
+const hiddenOptions = [
+  'name',
+  'path',
+  'source-dir',
+  'app-root'
+];
+
 export default Task.extend({
   run: function ({schematicName, collectionName, nonSchematicOptions}: SchematicGetHelpOptions):
     Promise<string[]> {
@@ -34,7 +41,7 @@ export default Task.extend({
     .then(([availableOptions, nonSchematicOptions]: [SchematicAvailableOptions[], any[]]) => {
       const output: string[] = [];
       [...(nonSchematicOptions || []), ...availableOptions]
-        .filter(opt => opt.name !== 'name')
+        .filter(opt => hiddenOptions.indexOf(opt.name) === -1)
         .forEach(opt => {
           let text = cyan(`    --${opt.name}`);
           if (opt.schematicType) {