Commit a6c15f3

committed

fix: allow async errors to bubble to AsyncIterable list items

1 parent f7e937c commit a6c15f3Copy full SHA for a6c15f3

File tree

+23

-3

lines changed

+23

-3

lines changed

Lines changed: 16 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1213,8 +1213,23 @@ async def complete_async_iterator_value(`
`1213`	`1213`	`async_payload_record,`
`1214`	`1214`	`)`
`1215`	`1215`	`if is_awaitable(completed_item):`
	`1216`	`+ # noinspection PyShadowingNames`
	`1217`	`+ async def catch_error(`
	`1218`	`+ completed_item: Awaitable[Any], field_path: Path`
	`1219`	`+ ) -> Any:`
	`1220`	`+ try:`
	`1221`	`+ return await completed_item`
	`1222`	`+ except Exception as raw_error:`
	`1223`	`+ error = located_error(`
	`1224`	`+ raw_error, field_nodes, field_path.as_list()`
	`1225`	`+ )`
	`1226`	`+ handle_field_error(error, item_type, errors)`
	`1227`	`+ return None`
	`1228`	`+`
	`1229`	`+ append_result(catch_error(completed_item, field_path))`
`1216`	`1230`	`append_awaitable(index)`
`1217`		`- append_result(completed_item)`
	`1231`	`+ else:`
	`1232`	`+ append_result(completed_item)`
`1218`	`1233`	`except Exception as raw_error:`
`1219`	`1234`	`append_result(None)`
`1220`	`1235`	`error = located_error(raw_error, field_nodes, field_path.as_list())`

Lines changed: 7 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`	`GraphQLField,`
`10`	`10`	`GraphQLFieldResolver,`
`11`	`11`	`GraphQLList,`
	`12`	`+ GraphQLNonNull,`
`12`	`13`	`GraphQLObjectType,`
`13`	`14`	`GraphQLResolveInfo,`
`14`	`15`	`GraphQLSchema,`
`@@ -155,7 +156,11 @@ async def _list_field(`
`155`	`156`	`GraphQLList(`
`156`	`157`	`GraphQLObjectType(`
`157`	`158`	`"ObjectWrapper",`
`158`		`- {"index": GraphQLField(GraphQLString, resolve=resolve)},`
	`159`	`+ {`
	`160`	`+ "index": GraphQLField(`
	`161`	`+ GraphQLNonNull(GraphQLString), resolve=resolve`
	`162`	`+ )`
	`163`	`+ },`
`159`	`164`	`)`
`160`	`165`	`),`
`161`	`166`	`resolve=_list_field,`
`@@ -274,7 +279,7 @@ async def resolve(data: _IndexData, info_: GraphQLResolveInfo) -> int:`
`274`	`279`	`return index`
`275`	`280`
`276`	`281`	`assert await _complete_object_lists(resolve) == (`
`277`		`- {"listField": [{"index": "0"}, {"index": "1"}, {"index": None}]},`
	`282`	`+ {"listField": [{"index": "0"}, {"index": "1"}, None]},`
`278`	`283`	`[`
`279`	`284`	`{`
`280`	`285`	`"message": "bad",`

Comments

(0)