commit e7697fb7e558e936e03e884cd976468a963a386c · kitten.sh/urql

.changeset/healthy-hornets-warn.md

···

       1
       1
       +
       ---

     

       2
       2
       +
       '@urql/exchange-execute': patch

     

       3
       3
       +
       ---

     

       4
       4
       +
       

     

       5
       5
       +
       End iterator when teardown functions runs, previously it waited for one extra call to next, then ended the iterator

+3 -7

exchanges/execute/src/execute.ts

···

       49
       49
        
         args: ExecuteParams

     

       50
       50
        
       ): Source<OperationResult> => {

     

       51
       51
        
         return make<OperationResult>(observer => {

     

       52
       52
       +
           let iterator: AsyncIterator<ExecutionResult>;

     

       52
       53
        
           let ended = false;

     

       53
       54
        
       

     

       54
       55
        
           Promise.resolve()

     
···

       66
       67
        
                 observer.next(makeResult(operation, result as ExecutionResult));

     

       67
       68
        
                 return;

     

       68
       69
        
               }

     

       69
       69
       -
       

     

       70
       70
       -
               const iterator: AsyncIterator<ExecutionResult> = result[

     

       71
       71
       -
                 asyncIterator!

     

       72
       72
       -
               ]();

     

       70
       70
       +
               iterator = result[asyncIterator!]();

     

       73
       71
        
               let prevResult: OperationResult | null = null;

     

       74
       72
        
       

     

       75
       73
        
               function next({

     
···

       90
       88
        
                 if (!done && !ended) {

     

       91
       89
        
                   return iterator.next().then(next);

     

       92
       90
        
                 }

     

       93
       93
       -
                 if (ended) {

     

       94
       94
       -
                   iterator.return && iterator.return();

     

       95
       95
       -
                 }

     

       96
       91
        
               }

     

       97
       92
        
       

     

       98
       93
        
               return iterator.next().then(next);

     
···

       106
       101
        
             });

     

       107
       102
        
       

     

       108
       103
        
           return () => {

     

       104
       104
       +
             if (iterator && iterator.return) iterator.return();

     

       109
       105
        
             ended = true;

     

       110
       106
        
           };

     

       111
       107
        
         });