@@ -1055,7 +1055,7 @@ async function completeAsyncIteratorValue(
10551055 fieldGroup : FieldGroup ,
10561056 info : GraphQLResolveInfo ,
10571057 path : Path ,
1058- iterator : AsyncIterator < unknown > ,
1058+ asyncIterator : AsyncIterator < unknown > ,
10591059 incrementalDataRecord : IncrementalDataRecord | undefined ,
10601060) : Promise < ReadonlyArray < unknown > > {
10611061 const stream = getStreamValues ( exeContext , fieldGroup , path ) ;
@@ -1072,7 +1072,7 @@ async function completeAsyncIteratorValue(
10721072 // eslint-disable-next-line @typescript-eslint/no-floating-promises
10731073 executeStreamAsyncIterator (
10741074 index ,
1075- iterator ,
1075+ asyncIterator ,
10761076 exeContext ,
10771077 fieldGroup ,
10781078 info ,
@@ -1088,7 +1088,7 @@ async function completeAsyncIteratorValue(
10881088 let iteration ;
10891089 try {
10901090 // eslint-disable-next-line no-await-in-loop
1091- iteration = await iterator . next ( ) ;
1091+ iteration = await asyncIterator . next ( ) ;
10921092 if ( iteration . done ) {
10931093 break ;
10941094 }
@@ -1140,15 +1140,15 @@ function completeListValue(
11401140 const itemType = returnType . ofType ;
11411141
11421142 if ( isAsyncIterable ( result ) ) {
1143- const iterator = result [ Symbol . asyncIterator ] ( ) ;
1143+ const asyncIterator = result [ Symbol . asyncIterator ] ( ) ;
11441144
11451145 return completeAsyncIteratorValue (
11461146 exeContext ,
11471147 itemType ,
11481148 fieldGroup ,
11491149 info ,
11501150 path ,
1151- iterator ,
1151+ asyncIterator ,
11521152 incrementalDataRecord ,
11531153 ) ;
11541154 }
@@ -1948,7 +1948,7 @@ function executeStreamField(
19481948}
19491949
19501950async function executeStreamAsyncIteratorItem (
1951- iterator : AsyncIterator < unknown > ,
1951+ asyncIterator : AsyncIterator < unknown > ,
19521952 exeContext : ExecutionContext ,
19531953 fieldGroup : FieldGroup ,
19541954 info : GraphQLResolveInfo ,
@@ -1958,7 +1958,7 @@ async function executeStreamAsyncIteratorItem(
19581958) : Promise < IteratorResult < unknown > > {
19591959 let item ;
19601960 try {
1961- const { value, done } = await iterator . next ( ) ;
1961+ const { value, done } = await asyncIterator . next ( ) ;
19621962 if ( done ) {
19631963 incrementalDataRecord . setIsCompletedIterator ( ) ;
19641964 return { done, value : undefined } ;
@@ -1973,7 +1973,7 @@ async function executeStreamAsyncIteratorItem(
19731973 itemPath ,
19741974 incrementalDataRecord ,
19751975 ) ;
1976- // don't continue if iterator throws
1976+ // don't continue if async iterator throws
19771977 return { done : true , value : null } ;
19781978 }
19791979 let completedItem ;
@@ -2019,7 +2019,7 @@ async function executeStreamAsyncIteratorItem(
20192019
20202020async function executeStreamAsyncIterator (
20212021 initialIndex : number ,
2022- iterator : AsyncIterator < unknown > ,
2022+ asyncIterator : AsyncIterator < unknown > ,
20232023 exeContext : ExecutionContext ,
20242024 fieldGroup : FieldGroup ,
20252025 info : GraphQLResolveInfo ,
@@ -2037,15 +2037,15 @@ async function executeStreamAsyncIterator(
20372037 label,
20382038 path : itemPath ,
20392039 parentContext : previousIncrementalDataRecord ,
2040- iterator ,
2040+ asyncIterator ,
20412041 exeContext,
20422042 } ) ;
20432043
20442044 let iteration ;
20452045 try {
20462046 // eslint-disable-next-line no-await-in-loop
20472047 iteration = await executeStreamAsyncIteratorItem (
2048- iterator ,
2048+ asyncIterator ,
20492049 exeContext ,
20502050 fieldGroup ,
20512051 info ,
@@ -2058,8 +2058,8 @@ async function executeStreamAsyncIterator(
20582058 filterSubsequentPayloads ( exeContext , path , incrementalDataRecord ) ;
20592059 incrementalDataRecord . addItems ( null ) ;
20602060 // entire stream has errored and bubbled upwards
2061- if ( iterator ?. return ) {
2062- iterator . return ( ) . catch ( ( ) => {
2061+ if ( asyncIterator ?. return ) {
2062+ asyncIterator . return ( ) . catch ( ( ) => {
20632063 // ignore errors
20642064 } ) ;
20652065 }
@@ -2112,9 +2112,9 @@ function filterSubsequentPayloads(
21122112 // incrementalDataRecord path points to nulled error field
21132113 if (
21142114 isStreamItemsRecord ( incrementalDataRecord ) &&
2115- incrementalDataRecord . iterator ?. return
2115+ incrementalDataRecord . asyncIterator ?. return
21162116 ) {
2117- incrementalDataRecord . iterator . return ( ) . catch ( ( ) => {
2117+ incrementalDataRecord . asyncIterator . return ( ) . catch ( ( ) => {
21182118 // ignore error
21192119 } ) ;
21202120 }
@@ -2199,9 +2199,9 @@ function yieldSubsequentPayloads(
21992199 exeContext . subsequentResults . forEach ( ( incrementalDataRecord ) => {
22002200 if (
22012201 isStreamItemsRecord ( incrementalDataRecord ) &&
2202- incrementalDataRecord . iterator ?. return
2202+ incrementalDataRecord . asyncIterator ?. return
22032203 ) {
2204- promises . push ( incrementalDataRecord . iterator . return ( ) ) ;
2204+ promises . push ( incrementalDataRecord . asyncIterator . return ( ) ) ;
22052205 }
22062206 } ) ;
22072207 return Promise . all ( promises ) ;
@@ -2283,15 +2283,15 @@ class StreamItemsRecord {
22832283 items : Array < unknown > | null ;
22842284 promise : Promise < void > ;
22852285 parentContext : IncrementalDataRecord | undefined ;
2286- iterator : AsyncIterator < unknown > | undefined ;
2286+ asyncIterator : AsyncIterator < unknown > | undefined ;
22872287 isCompletedIterator ?: boolean ;
22882288 isCompleted : boolean ;
22892289 _exeContext : ExecutionContext ;
22902290 _resolve ?: ( arg : PromiseOrValue < Array < unknown > | null > ) => void ;
22912291 constructor ( opts : {
22922292 label : string | undefined ;
22932293 path : Path | undefined ;
2294- iterator ?: AsyncIterator < unknown > ;
2294+ asyncIterator ?: AsyncIterator < unknown > ;
22952295 parentContext : IncrementalDataRecord | undefined ;
22962296 exeContext : ExecutionContext ;
22972297 } ) {
@@ -2300,7 +2300,7 @@ class StreamItemsRecord {
23002300 this . label = opts . label ;
23012301 this . path = pathToArray ( opts . path ) ;
23022302 this . parentContext = opts . parentContext ;
2303- this . iterator = opts . iterator ;
2303+ this . asyncIterator = opts . asyncIterator ;
23042304 this . errors = [ ] ;
23052305 this . _exeContext = opts . exeContext ;
23062306 this . _exeContext . subsequentResults . add ( this ) ;
0 commit comments