Skip to content

fix(render-schema): generate correct paths #35

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 2 commits into from
Jul 10, 2019
Merged

fix(render-schema): generate correct paths #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
29b89e9
fix(render-schema): generate proper paths for arrays
P0lip Jul 10, 2019
a9ee7b5
fix(render-schema): generate proper paths for combiners
P0lip Jul 10, 2019
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
56 changes: 45 additions & 11 deletions src/utils/__tests__/__snapshots__/renderSchema.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ Array [
"properties",
"propertyIsArrayOfObjects",
"items",
"properties",
"ArrayObjectProperty",
],
"required": false,
Expand Down Expand Up @@ -175,7 +176,7 @@ Array [
"enum": undefined,
"id": "random-id",
"path": Array [
"properties",
"allOf",
0,
],
"patternProperties": undefined,
Expand All @@ -198,7 +199,7 @@ Array [
"id": "random-id",
"name": "test",
"path": Array [
"properties",
"allOf",
0,
"properties",
"test",
Expand All @@ -220,7 +221,7 @@ Array [
"enum": undefined,
"id": "random-id",
"path": Array [
"properties",
"allOf",
1,
],
"patternProperties": undefined,
Expand Down Expand Up @@ -260,7 +261,7 @@ Array [
"id": "random-id",
"name": "id",
"path": Array [
"properties",
"allOf",
1,
"properties",
"id",
Expand All @@ -280,7 +281,7 @@ Array [
"id": "random-id",
"name": "completed_at",
"path": Array [
"properties",
"allOf",
1,
"properties",
"completed_at",
Expand All @@ -305,7 +306,7 @@ Array [
"id": "random-id",
"name": "created_at",
"path": Array [
"properties",
"allOf",
1,
"properties",
"created_at",
Expand All @@ -327,7 +328,7 @@ Array [
"id": "random-id",
"name": "updated_at",
"path": Array [
"properties",
"allOf",
1,
"properties",
"updated_at",
Expand Down Expand Up @@ -616,7 +617,7 @@ Array [
"path": Array [
"properties",
"plan",
"properties",
"anyOf",
0,
],
"patternProperties": undefined,
Expand Down Expand Up @@ -644,7 +645,7 @@ Array [
"path": Array [
"properties",
"plan",
"properties",
"anyOf",
0,
"properties",
"foo",
Expand All @@ -666,7 +667,7 @@ Array [
"path": Array [
"properties",
"plan",
"properties",
"anyOf",
0,
"properties",
"bar",
Expand All @@ -692,7 +693,7 @@ Array [
"path": Array [
"properties",
"plan",
"properties",
"anyOf",
1,
],
"subtype": "integer",
Expand Down Expand Up @@ -1214,6 +1215,7 @@ Array [
"properties",
"ticketingOptionChoice",
"items",
"properties",
"state",
],
"required": false,
Expand Down Expand Up @@ -1322,6 +1324,7 @@ Array [
"properties",
"ticketingOptionChoice",
"items",
"properties",
"orderItemBreakdown",
],
"required": false,
Expand All @@ -1343,8 +1346,10 @@ Array [
"properties",
"ticketingOptionChoice",
"items",
"properties",
"orderItemBreakdown",
"items",
"properties",
"orderItemId",
],
"required": false,
Expand Down Expand Up @@ -1437,8 +1442,10 @@ Array [
"properties",
"ticketingOptionChoice",
"items",
"properties",
"orderItemBreakdown",
"items",
"properties",
"options",
],
"required": false,
Expand Down Expand Up @@ -1467,10 +1474,13 @@ Array [
"properties",
"ticketingOptionChoice",
"items",
"properties",
"orderItemBreakdown",
"items",
"properties",
"options",
"items",
"properties",
"title",
],
"required": false,
Expand Down Expand Up @@ -1500,10 +1510,13 @@ Array [
"properties",
"ticketingOptionChoice",
"items",
"properties",
"orderItemBreakdown",
"items",
"properties",
"options",
"items",
"properties",
"selected",
],
"required": false,
Expand All @@ -1526,10 +1539,13 @@ Array [
"properties",
"ticketingOptionChoice",
"items",
"properties",
"orderItemBreakdown",
"items",
"properties",
"options",
"items",
"properties",
"additionalRequiredInfo",
],
"required": false,
Expand All @@ -1554,10 +1570,13 @@ Array [
"properties",
"ticketingOptionChoice",
"items",
"properties",
"orderItemBreakdown",
"items",
"properties",
"options",
"items",
"properties",
"deliveryInfo",
],
"patternProperties": undefined,
Expand Down Expand Up @@ -1626,10 +1645,13 @@ Array [
"properties",
"ticketingOptionChoice",
"items",
"properties",
"orderItemBreakdown",
"items",
"properties",
"options",
"items",
"properties",
"deliveryInfo",
"properties",
"availableDeliveryTypes",
Expand Down Expand Up @@ -1663,10 +1685,13 @@ Array [
"properties",
"ticketingOptionChoice",
"items",
"properties",
"orderItemBreakdown",
"items",
"properties",
"options",
"items",
"properties",
"deliveryInfo",
"properties",
"ticketRecipients",
Expand All @@ -1690,10 +1715,13 @@ Array [
"properties",
"ticketingOptionChoice",
"items",
"properties",
"orderItemBreakdown",
"items",
"properties",
"options",
"items",
"properties",
"deliveryInfo",
"properties",
"ccEmail",
Expand All @@ -1717,10 +1745,13 @@ Array [
"properties",
"ticketingOptionChoice",
"items",
"properties",
"orderItemBreakdown",
"items",
"properties",
"options",
"items",
"properties",
"deliveryInfo",
"properties",
"postalAddress",
Expand All @@ -1743,10 +1774,13 @@ Array [
"properties",
"ticketingOptionChoice",
"items",
"properties",
"orderItemBreakdown",
"items",
"properties",
"options",
"items",
"properties",
"deliveryInfo",
"properties",
"pickUpAtStation",
Expand Down
7 changes: 4 additions & 3 deletions src/utils/renderSchema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ export const renderSchema: Walker = function*(schema, level = 0, meta = { path:

yield* renderSchema(property, level + 1, {
...(i !== 0 && { divider: DIVIDERS[node.combiner] }),
path: [...path, 'properties', i],
path: [...path, node.combiner, i],
});
}
}
Expand Down Expand Up @@ -149,12 +149,13 @@ export const renderSchema: Walker = function*(schema, level = 0, meta = { path:
case SchemaKind.Object:
yield* getProperties(parsedSchema.items, level, {
...meta,
path: [...path, 'items'],
path: [...path, 'items', 'properties'],
});
break;
case SchemaKind.Array:
yield* renderSchema(parsedSchema.items, level, {
path,
...meta,
path: [...path, 'items'],
});
break;
}
Expand Down