Skip to content

Commit d10c9e3

Browse files
committed
fix(@angular/cli): fix support for default values in options
1 parent b5fc50f commit d10c9e3

File tree

2 files changed

+8
-11
lines changed

2 files changed

+8
-11
lines changed

packages/angular/cli/utilities/json-schema.ts

+7-10
Original file line numberDiff line numberDiff line change
@@ -151,26 +151,23 @@ export async function parseJsonSchemaToOptions(
151151
}
152152

153153
let defaultValue: string | number | boolean | undefined = undefined;
154-
if (schema.default !== undefined) {
154+
if (current.default !== undefined) {
155155
switch (types[0]) {
156156
case 'string':
157-
if (typeof schema.default == 'string') {
158-
defaultValue = schema.default;
157+
if (typeof current.default == 'string') {
158+
defaultValue = current.default;
159159
}
160160
break;
161161
case 'number':
162-
if (typeof schema.default == 'number') {
163-
defaultValue = schema.default;
162+
if (typeof current.default == 'number') {
163+
defaultValue = current.default;
164164
}
165165
break;
166166
case 'boolean':
167-
if (typeof schema.default == 'boolean') {
168-
defaultValue = schema.default;
167+
if (typeof current.default == 'boolean') {
168+
defaultValue = current.default;
169169
}
170170
break;
171-
172-
default:
173-
console.log(types[0], schema);
174171
}
175172
}
176173

tests/legacy-cli/e2e/tests/generate/help-output.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ export default function() {
8888
.then(() => ng('generate', 'fake', '--help'))
8989
// verify same output
9090
.then(({stdout}) => {
91-
if (!/ng generate fake-schematics:fake <a> <b> \[options\]/.test(stdout)) {
91+
if (!/ng generate fake <a> <b> \[options\]/.test(stdout)) {
9292
throw new Error('Help signature is wrong (2).');
9393
}
9494
if (!/opt-a[\s\S]*opt-b[\s\S]*opt-c/.test(stdout)) {

0 commit comments

Comments
 (0)