commit 5b6449e62d8c3eb7f0f863ae98b3994871c2da38 · kitten.sh/urql

.changeset/seven-toys-applaud.md

···

       1
       1
       +
       ---

     

       2
       2
       +
       '@urql/svelte': minor

     

       3
       3
       +
       ---

     

       4
       4
       +
       

     

       5
       5
       +
       Add back the `reexecute` function

+1 -3

docs/basics/svelte.md

···

       362
       362
        
         });

     

       363
       363
        
       

     

       364
       364
        
         function refresh() {

     

       365
       365
       -
           queryStore({

     

       366
       366
       -
             client,

     

       367
       367
       -
             query,

     

       365
       365
       +
           todos.reexecute({

     

       368
       366
        
             requestPolicy: 'network-only'

     

       369
       367
        
           });

     

       370
       368
        
         }

examples/with-svelte/src/PokemonList.svelte

···

       19
       19
        
         function nextPage() {

     

       20
       20
        
           skip = skip + 10;

     

       21
       21
        
         }

     

       22
       22
       +
       

     

       23
       23
       +
         function reexcute() {

     

       24
       24
       +
           pokemons.reexecute({ requestPolicy: 'network-only' })

     

       25
       25
       +
         }

     

       22
       26
        
       </script>

     

       23
       27
        
       

     

       24
       28
        
       <div>

     
···

       34
       38
        
           </ul>

     

       35
       39
        
         {/if}

     

       36
       40
        
         <button on:click={nextPage}>Next Page</button>

     

       41
       41
       +
         <button on:click={reexcute}>Reexec</button>

     

       37
       42
        
       </div>

+37 -16

packages/svelte-urql/src/queryStore.ts

···

       119
       119
        
         Variables extends AnyVariables = AnyVariables,

     

       120
       120
        
       >(

     

       121
       121
        
         args: QueryArgs<Data, Variables>

     

       122
       122
       -
       ): OperationResultStore<Data, Variables> & Pausable {

     

       122
       122
       +
       ): OperationResultStore<Data, Variables> &

     

       123
       123
       +
         Pausable & { reexecute: (context: Partial<OperationContext>) => void } {

     

       123
       124
        
         const request = createRequest(args.query, args.variables as Variables);

     

       124
       125
        
       

     

       125
       126
        
         const context: Partial<OperationContext> = {

     
···

       132
       133
        
           request,

     

       133
       134
        
           context

     

       134
       135
        
         );

     

       136
       136
       +
       

     

       137
       137
       +
         const operation$ = writable(operation);

     

       138
       138
       +
       

     

       135
       139
        
         const initialState: OperationResultState<Data, Variables> = {

     

       136
       140
        
           ...initialResult,

     

       137
       141
        
           operation,

     
···

       148
       152
        
                   return never as any;

     

       149
       153
        
                 }

     

       150
       154
        
       

     

       151
       151
       -
                 return concat<Partial<OperationResultState<Data, Variables>>>([

     

       152
       152
       -
                   fromValue({ fetching: true, stale: false }),

     

       153
       153
       -
                   pipe(

     

       154
       154
       -
                     args.client.executeRequestOperation(operation),

     

       155
       155
       -
                     map(({ stale, data, error, extensions, operation }) => ({

     

       156
       156
       -
                       fetching: false,

     

       157
       157
       -
                       stale: !!stale,

     

       158
       158
       -
                       data,

     

       159
       159
       -
                       error,

     

       160
       160
       -
                       operation,

     

       161
       161
       -
                       extensions,

     

       162
       162
       -
                     }))

     

       163
       163
       -
                   ),

     

       164
       164
       -
                   fromValue({ fetching: false }),

     

       165
       165
       -
                 ]);

     

       155
       155
       +
                 return pipe(

     

       156
       156
       +
                   fromStore(operation$),

     

       157
       157
       +
                   switchMap(operation => {

     

       158
       158
       +
                     return concat<Partial<OperationResultState<Data, Variables>>>([

     

       159
       159
       +
                       fromValue({ fetching: true, stale: false }),

     

       160
       160
       +
                       pipe(

     

       161
       161
       +
                         args.client.executeRequestOperation(operation),

     

       162
       162
       +
                         map(({ stale, data, error, extensions, operation }) => ({

     

       163
       163
       +
                           fetching: false,

     

       164
       164
       +
                           stale: !!stale,

     

       165
       165
       +
                           data,

     

       166
       166
       +
                           error,

     

       167
       167
       +
                           operation,

     

       168
       168
       +
                           extensions,

     

       169
       169
       +
                         }))

     

       170
       170
       +
                       ),

     

       171
       171
       +
                       fromValue({ fetching: false }),

     

       172
       172
       +
                     ]);

     

       173
       173
       +
                   })

     

       174
       174
       +
                 );

     

       166
       175
        
               }

     

       167
       176
        
             ),

     

       168
       177
        
             scan(

     
···

       178
       187
        
           ).unsubscribe;

     

       179
       188
        
         });

     

       180
       189
        
       

     

       190
       190
       +
         const reexecute = (context: Partial<OperationContext>) => {

     

       191
       191
       +
           const newContext = { ...context, ...args.context };

     

       192
       192
       +
           const operation = args.client.createRequestOperation(

     

       193
       193
       +
             'query',

     

       194
       194
       +
             request,

     

       195
       195
       +
             newContext

     

       196
       196
       +
           );

     

       197
       197
       +
           isPaused$.set(false);

     

       198
       198
       +
           operation$.set(operation);

     

       199
       199
       +
         };

     

       200
       200
       +
       

     

       181
       201
        
         return {

     

       182
       202
        
           ...derived(result$, (result, set) => {

     

       183
       203
        
             set(result);

     

       184
       204
        
           }),

     

       185
       205
        
           ...createPausable(isPaused$),

     

       206
       206
       +
           reexecute,

     

       186
       207
        
         };

     

       187
       208
        
       }