Skip to content

fix(@angular/cli): handle oneOf when converting schema to yargs options #32554

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
terencehonles wants to merge 1 commit into
base: main
Choose a base branch
from
+23 −1
Open

fix(@angular/cli): handle oneOf when converting schema to yargs options #32554

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion packages/angular/cli/src/command-builder/utilities/json-schema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,10 @@ function isSupportedArrayItemSchema(schema: json.JsonObject): boolean {
return true;
}

if (isJsonObject(schema.items)) {
return isSupportedArrayItemSchema(schema.items);
}

if (json.isJsonArray(schema.items)) {
return schema.items.some((item) => isJsonObject(item) && isSupportedArrayItemSchema(item));
}
Expand Down Expand Up @@ -198,7 +202,7 @@ function getSupportedTypes(
case 'string':
return true;
case 'array':
return isJsonObject(current.items) && isSupportedArrayItemSchema(current.items);
return isSupportedArrayItemSchema(current);
case 'object':
return isStringMap(current);
default:
Expand Down
18 changes: 18 additions & 0 deletions packages/angular/cli/src/command-builder/utilities/json-schema_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,9 @@ describe('parseJsonSchemaToOptions', () => {
],
},
},
'oneOfAtRoot': {
'oneOf': [{ 'type': 'array', 'items': { 'type': 'string' } }, { 'type': 'boolean' }],
},
},
};
const registry = new schema.CoreSchemaRegistry();
Expand Down Expand Up @@ -199,6 +202,21 @@ describe('parseJsonSchemaToOptions', () => {
});
});

describe('type=array, oneOf at root', () => {
it('parses valid option value', async () => {
expect(
await parse([
'--oneOfAtRoot',
'first',
'--oneOfAtRoot',
'second',
'--oneOfAtRoot',
'third',
]),
).toEqual(jasmine.objectContaining({ 'oneOfAtRoot': ['first', 'second', 'third'] }));
});
});

describe('type=string, enum', () => {
it('parses valid option value', async () => {
expect(await parse(['--ssr', 'never'])).toEqual(
Expand Down