@hyper-fetch/react 9.5.0 → 9.5.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -312,6 +312,7 @@ describe("useSubmit [ Optimistic ]", () => {
312
312
  it("should not call rollback when retry succeeds after initial failure", async () => {
313
313
  const rollbackSpy = vi.fn();
314
314
  const successSpy = vi.fn();
315
+ const errorSpy = vi.fn();
315
316
 
316
317
  const optimisticRequest = request
317
318
  .setOptimistic(() => ({
@@ -321,18 +322,25 @@ describe("useSubmit [ Optimistic ]", () => {
321
322
  .setRetry(1)
322
323
  .setRetryTime(50);
323
324
 
324
- const errorMock = mockRequest(optimisticRequest, { status: 400 });
325
+ let successMock = mockRequest(optimisticRequest, { status: 400 });
326
+ // Swapped on the response event, polling for the error state can lose the race with the retry timer
327
+ const unmountListener = client.requestManager.events.onResponse(() => {
328
+ unmountListener();
329
+ successMock = mockRequest(optimisticRequest);
330
+ });
325
331
  const response = renderUseSubmit(optimisticRequest);
326
332
 
327
333
  act(() => {
328
334
  response.result.current.onSubmitSuccess(successSpy);
335
+ response.result.current.onSubmitError(errorSpy);
329
336
  response.result.current.submit();
330
337
  });
331
338
 
332
- await testErrorState(errorMock, response);
333
- const successMock = mockRequest(optimisticRequest);
334
-
339
+ await waitFor(() => {
340
+ expect(successSpy).toHaveBeenCalledTimes(1);
341
+ });
335
342
  await testSuccessState(successMock, response);
343
+ expect(errorSpy).toHaveBeenCalledTimes(1);
336
344
  expect(rollbackSpy).not.toHaveBeenCalled();
337
345
  expect(successSpy).toHaveBeenCalledTimes(1);
338
346
  expect(successSpy.mock.calls[0][0].mutationContext).toStrictEqual({ snapshot: "v1" });
@@ -1 +1 @@
1
- {"version":3,"file":"use-request-events.hooks.d.ts","sourceRoot":"","sources":["../../../src/helpers/use-request-events/use-request-events.hooks.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAGV,eAAe,EAQhB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,KAAK,EAOV,0BAA0B,EAC1B,yBAAyB,EAE1B,MAAM,SAAS,CAAC;AAIjB;;;;;GAKG;AACH,eAAO,MAAM,gBAAgB,GAAI,CAAC,SAAS,eAAe,EAAE,8EAOzD,yBAAyB,CAAC,CAAC,CAAC,KAAG,0BAA0B,CAAC,CAAC,CAuU7D,CAAC"}
1
+ {"version":3,"file":"use-request-events.hooks.d.ts","sourceRoot":"","sources":["../../../src/helpers/use-request-events/use-request-events.hooks.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAGV,eAAe,EAQhB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,KAAK,EAOV,0BAA0B,EAC1B,yBAAyB,EAE1B,MAAM,SAAS,CAAC;AAIjB;;;;;GAKG;AACH,eAAO,MAAM,gBAAgB,GAAI,CAAC,SAAS,eAAe,EAAE,8EAOzD,yBAAyB,CAAC,CAAC,CAAC,KAAG,0BAA0B,CAAC,CAAC,CAqT7D,CAAC"}
package/dist/index.mjs CHANGED
@@ -169,7 +169,8 @@ var useRequestEvents = ({ request, dispatcher, logger, actions, setCacheData, ge
169
169
  ...values,
170
170
  mutationContext: opt?.context
171
171
  };
172
- if (request.offline && isOffline && !success) {
172
+ const isOfflineError = request.offline && isOffline && !success;
173
+ if (isOfflineError) {
173
174
  logger.debug({
174
175
  title: "Performing offline error callback",
175
176
  type: "system",
@@ -182,9 +183,6 @@ var useRequestEvents = ({ request, dispatcher, logger, actions, setCacheData, ge
182
183
  type: "system",
183
184
  extra: values
184
185
  });
185
- try {
186
- opt?.rollback?.();
187
- } catch {}
188
186
  onAbortCallback.current?.(paramsWithContext);
189
187
  } else if (success) {
190
188
  logger.debug({
@@ -192,7 +190,6 @@ var useRequestEvents = ({ request, dispatcher, logger, actions, setCacheData, ge
192
190
  type: "system",
193
191
  extra: values
194
192
  });
195
- if (opt?.invalidate) opt.invalidate.forEach((req) => cache.invalidate(req));
196
193
  onSuccessCallback.current?.(paramsWithContext);
197
194
  } else {
198
195
  logger.debug({
@@ -200,13 +197,10 @@ var useRequestEvents = ({ request, dispatcher, logger, actions, setCacheData, ge
200
197
  type: "system",
201
198
  extra: values
202
199
  });
203
- if (!willRetry) try {
204
- opt?.rollback?.();
205
- } catch {}
206
200
  onErrorCallback.current?.(paramsWithContext);
207
201
  }
208
202
  onFinishedCallback.current?.(paramsWithContext);
209
- if (!willRetry) optimisticResultsRef.current.delete(values.requestId);
203
+ if (!willRetry && (!isOfflineError || isCanceled)) optimisticResultsRef.current.delete(values.requestId);
210
204
  };
211
205
  const handleGetLoadingEvent = (req) => {
212
206
  return ({ loading, request: eventRequest }) => {
@@ -245,13 +239,7 @@ var useRequestEvents = ({ request, dispatcher, logger, actions, setCacheData, ge
245
239
  };
246
240
  };
247
241
  const handleRemove = ({ requestId }) => {
248
- const opt = optimisticResultsRef.current.get(requestId);
249
- if (opt) {
250
- try {
251
- opt.rollback?.();
252
- } catch {}
253
- optimisticResultsRef.current.delete(requestId);
254
- }
242
+ optimisticResultsRef.current.delete(requestId);
255
243
  removeLifecycleListener(requestId);
256
244
  };
257
245
  const clearCacheDataListener = () => {