fix(@angular/cli): fix support for default values in options

hansl · hansl · commit d10c9e31048e · 2018-09-14T21:29:31.000-07:00
diff --git a/packages/angular/cli/utilities/json-schema.ts b/packages/angular/cli/utilities/json-schema.ts
@@ -151,26 +151,23 @@ export async function parseJsonSchemaToOptions(
     }
 
     let defaultValue: string | number | boolean | undefined = undefined;
-    if (schema.default !== undefined) {
+    if (current.default !== undefined) {
       switch (types[0]) {
         case 'string':
-          if (typeof schema.default == 'string') {
-            defaultValue = schema.default;
+          if (typeof current.default == 'string') {
+            defaultValue = current.default;
           }
           break;
         case 'number':
-          if (typeof schema.default == 'number') {
-            defaultValue = schema.default;
+          if (typeof current.default == 'number') {
+            defaultValue = current.default;
           }
           break;
         case 'boolean':
-          if (typeof schema.default == 'boolean') {
-            defaultValue = schema.default;
+          if (typeof current.default == 'boolean') {
+            defaultValue = current.default;
           }
           break;
-
-        default:
-          console.log(types[0], schema);
       }
     }
 
diff --git a/tests/legacy-cli/e2e/tests/generate/help-output.ts b/tests/legacy-cli/e2e/tests/generate/help-output.ts
@@ -88,7 +88,7 @@ export default function() {
     .then(() => ng('generate', 'fake', '--help'))
     // verify same output
     .then(({stdout}) => {
-      if (!/ng generate fake-schematics:fake <a> <b> \[options\]/.test(stdout)) {
+      if (!/ng generate fake <a> <b> \[options\]/.test(stdout)) {
         throw new Error('Help signature is wrong (2).');
       }
       if (!/opt-a[\s\S]*opt-b[\s\S]*opt-c/.test(stdout)) {

Original file line number	Diff line number	Diff line change
`@@ -151,26 +151,23 @@ export async function parseJsonSchemaToOptions(`
`151`	`151`	`}`
`152`	`152`
`153`	`153`	`let defaultValue: string \| number \| boolean \| undefined = undefined;`
`154`		`- if (schema.default !== undefined) {`
	`154`	`+ if (current.default !== undefined) {`
`155`	`155`	`switch (types[0]) {`
`156`	`156`	`case 'string':`
`157`		`- if (typeof schema.default == 'string') {`
`158`		`- defaultValue = schema.default;`
	`157`	`+ if (typeof current.default == 'string') {`
	`158`	`+ defaultValue = current.default;`
`159`	`159`	`}`
`160`	`160`	`break;`
`161`	`161`	`case 'number':`
`162`		`- if (typeof schema.default == 'number') {`
`163`		`- defaultValue = schema.default;`
	`162`	`+ if (typeof current.default == 'number') {`
	`163`	`+ defaultValue = current.default;`
`164`	`164`	`}`
`165`	`165`	`break;`
`166`	`166`	`case 'boolean':`
`167`		`- if (typeof schema.default == 'boolean') {`
`168`		`- defaultValue = schema.default;`
	`167`	`+ if (typeof current.default == 'boolean') {`
	`168`	`+ defaultValue = current.default;`
`169`	`169`	`}`
`170`	`170`	`break;`
`171`		`-`
`172`		`- default:`
`173`		`- console.log(types[0], schema);`
`174`	`171`	`}`
`175`	`172`	`}`
`176`	`173`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ export default function() {`
`88`	`88`	`.then(() => ng('generate', 'fake', '--help'))`
`89`	`89`	`// verify same output`
`90`	`90`	`.then(({stdout}) => {`
`91`		`- if (!/ng generate fake-schematics:fake <a> <b> \[options\]/.test(stdout)) {`
	`91`	`+ if (!/ng generate fake <a> <b> \[options\]/.test(stdout)) {`
`92`	`92`	`throw new Error('Help signature is wrong (2).');`
`93`	`93`	`}`
`94`	`94`	`if (!/opt-a[\s\S]opt-b[\s\S]opt-c/.test(stdout)) {`