Skip to content

fix: use items validation for flattened arrays #129

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

Merged
merged 3 commits into from
Apr 9, 2021
Merged

fix: use items validation for flattened arrays #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0ff8995
fix: use items validation for flattened arrays
P0lip Apr 7, 2021
28048bb
style: const name
P0lip Apr 8, 2021
718bb71
Merge branch 'master' into fix/enum-array
P0lip Apr 8, 2021
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
12 changes: 10 additions & 2 deletions src/__tests__/__snapshots__/index.spec.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2658,7 +2658,11 @@ exports[`HTML Output should match tickets.schema.json 1`] = `
<div>availableDeliveryTypes</div>
<span class=\\"text-green-6 dark:text-green-4\\">array[string]</span>
</div>
<div></div>
<span class=\\"bp3-popover-wrapper\\">
<span class=\\"bp3-popover-target\\">
<div><span class=\\"text-darken-7 dark:text-lighten-6\\">+1</span></div>
</span>
</span>
</div>
</div>
</div>
Expand All @@ -2669,7 +2673,11 @@ exports[`HTML Output should match tickets.schema.json 1`] = `
<div>ticketRecipients</div>
<span class=\\"text-green-6 dark:text-green-4\\">array[string]</span>
</div>
<div></div>
<span class=\\"bp3-popover-wrapper\\">
<span class=\\"bp3-popover-target\\">
<div><span class=\\"text-darken-7 dark:text-lighten-6\\">+1</span></div>
</span>
</span>
</div>
</div>
</div>
Expand Down
16 changes: 15 additions & 1 deletion src/tree/utils/walk.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,24 @@ export function* processNode(node: JSONSchema4): IterableIterator<SchemaNode> {
yield combinerNode;
}
} else if (type) {
const primaryType = getPrimaryType(node);
let validationNode: JSONSchema4 = node;
if (
primaryType === SchemaKind.Array &&
_isObject(node.items) &&
!Array.isArray(node.items) &&
getCombiners(node.items) === void 0
) {
const validationNodePrimaryType = getPrimaryType(node.items);
if (validationNodePrimaryType !== SchemaKind.Array && validationNodePrimaryType !== SchemaKind.Object) {
validationNode = node.items;
}
}

const base: IBaseNode = {
id: generateId(),
type: flattenTypes(type),
validations: getValidations(node),
validations: getValidations(validationNode),
annotations: getAnnotations(node),
...('required' in node && { required: normalizeRequired(node.required) }),
enum: node.enum,
Expand Down