@hyper-fetch/react 8.1.1 → 8.2.2

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.
Files changed (131) hide show
  1. package/README.md +202 -52
  2. package/__tests__/features/helpers/use-request-events/use-request-events.base.spec.ts +1 -1
  3. package/__tests__/features/helpers/use-request-events/use-request-events.utils.spec.ts +1 -1
  4. package/__tests__/features/helpers/use-socket-state/use-socket-state.base.spec.ts +3 -3
  5. package/__tests__/features/helpers/use-tracked-state/use-tacked-state.actions.spec.ts +1 -1
  6. package/__tests__/features/helpers/use-tracked-state/use-tracked-state.base.spec.ts +55 -55
  7. package/__tests__/features/helpers/use-tracked-state/use-tracked-state.utils.spec.ts +8 -9
  8. package/__tests__/features/provider/provider.hydration.spec.tsx +3 -4
  9. package/__tests__/features/provider/use-config-provider.base.spec.tsx +1 -2
  10. package/__tests__/features/use-app-manager/use-app-manager.base.spec.ts +1 -1
  11. package/__tests__/features/use-cache/use-cache.base.spec.ts +6 -6
  12. package/__tests__/features/use-cache/use-cache.typescript.spec.ts +1 -2
  13. package/__tests__/features/use-emitter/use-emitter.base.spec.ts +1 -1
  14. package/__tests__/features/use-fetch/use-fetch.base.spec.ts +13 -9
  15. package/__tests__/features/use-fetch/use-fetch.cancel.spec.ts +1 -1
  16. package/__tests__/features/use-fetch/use-fetch.clear-state.spec.ts +1 -1
  17. package/__tests__/features/use-fetch/use-fetch.concurrency.spec.ts +1 -1
  18. package/__tests__/features/use-fetch/use-fetch.debounce.spec.ts +1 -1
  19. package/__tests__/features/use-fetch/use-fetch.integration.spec.tsx +2 -2
  20. package/__tests__/features/use-fetch/use-fetch.keep-previous-data.spec.ts +1 -1
  21. package/__tests__/features/use-fetch/use-fetch.methods.spec.ts +1 -1
  22. package/__tests__/features/use-fetch/use-fetch.offline.spec.ts +1 -1
  23. package/__tests__/features/use-fetch/use-fetch.prefetch.spec.tsx +2 -2
  24. package/__tests__/features/use-fetch/use-fetch.refresh.spec.ts +3 -2
  25. package/__tests__/features/use-fetch/use-fetch.rerender.spec.tsx +3 -3
  26. package/__tests__/features/use-fetch/use-fetch.revalidate.spec.ts +47 -17
  27. package/__tests__/features/use-fetch/use-fetch.suspense.spec.tsx +4 -4
  28. package/__tests__/features/use-fetch/use-fetch.typescript.spec.ts +1 -2
  29. package/__tests__/features/use-fetch/use-fetch.utils.spec.ts +2 -2
  30. package/__tests__/features/use-fetch/use-fetch.window.spec.ts +1 -1
  31. package/__tests__/features/use-listener/use-listener.base.spec.ts +1 -1
  32. package/__tests__/features/use-queue/use-queue.actions.spec.ts +3 -3
  33. package/__tests__/features/use-queue/use-queue.base.spec.ts +13 -13
  34. package/__tests__/features/use-queue/use-queue.resolve.spec.ts +6 -6
  35. package/__tests__/features/use-stream/use-stream.base.spec.ts +1 -1
  36. package/__tests__/features/use-submit/use-submit.base.spec.ts +2 -2
  37. package/__tests__/features/use-submit/use-submit.cancel.spec.ts +1 -1
  38. package/__tests__/features/use-submit/use-submit.concurrency.spec.ts +1 -1
  39. package/__tests__/features/use-submit/use-submit.debounce.spec.ts +15 -15
  40. package/__tests__/features/use-submit/use-submit.methods.spec.ts +1 -1
  41. package/__tests__/features/use-submit/use-submit.optimistic.spec.ts +1 -1
  42. package/__tests__/features/use-submit/use-submit.queue.spec.ts +1 -1
  43. package/__tests__/features/use-submit/use-submit.retry.spec.ts +2 -2
  44. package/__tests__/features/use-submit/use-submit.revalidate.spec.ts +1 -1
  45. package/__tests__/features/use-submit/use-submit.submit.spec.ts +1 -1
  46. package/__tests__/features/use-submit/use-submit.typescript.spec.ts +2 -3
  47. package/__tests__/shared/isolation.tests.ts +1 -1
  48. package/__tests__/shared/response.tests.ts +2 -2
  49. package/__tests__/tsconfig.json +11 -17
  50. package/__tests__/utils/cache.utils.ts +6 -6
  51. package/__tests__/utils/use-app-manager.utils.ts +0 -1
  52. package/__tests__/utils/use-cache.utils.ts +0 -1
  53. package/__tests__/utils/use-emitter.utils.ts +1 -2
  54. package/__tests__/utils/use-fetch.utils.ts +0 -1
  55. package/__tests__/utils/use-listener.utils.ts +1 -2
  56. package/__tests__/utils/use-queue.utils.ts +4 -5
  57. package/__tests__/utils/use-request-events.utils.ts +0 -1
  58. package/__tests__/utils/use-socket-state.utils.ts +1 -2
  59. package/__tests__/utils/use-submit.utils.ts +0 -1
  60. package/__tests__/utils/use-tracked-state.utils.ts +0 -1
  61. package/dist/helpers/use-request-events/use-request-events.hooks.d.ts.map +1 -1
  62. package/dist/helpers/use-request-events/use-request-events.types.d.ts.map +1 -1
  63. package/dist/helpers/use-socket-state/use-socket-state.hooks.d.ts.map +1 -1
  64. package/dist/helpers/use-tracked-state/use-tracked-state.types.d.ts.map +1 -1
  65. package/dist/helpers/use-tracked-state/use-tracked-state.utils.d.ts.map +1 -1
  66. package/dist/hooks/use-app-manager/use-app-manager.hooks.d.ts +1 -0
  67. package/dist/hooks/use-app-manager/use-app-manager.hooks.d.ts.map +1 -1
  68. package/dist/hooks/use-cache/use-cache.hooks.d.ts +1 -0
  69. package/dist/hooks/use-cache/use-cache.hooks.d.ts.map +1 -1
  70. package/dist/hooks/use-cache/use-cache.types.d.ts +2 -2
  71. package/dist/hooks/use-cache/use-cache.types.d.ts.map +1 -1
  72. package/dist/hooks/use-emitter/use-emitter.hooks.d.ts +1 -0
  73. package/dist/hooks/use-emitter/use-emitter.hooks.d.ts.map +1 -1
  74. package/dist/hooks/use-emitter/use-emitter.types.d.ts +1 -0
  75. package/dist/hooks/use-emitter/use-emitter.types.d.ts.map +1 -1
  76. package/dist/hooks/use-fetch/use-fetch.constants.d.ts.map +1 -1
  77. package/dist/hooks/use-fetch/use-fetch.hooks.d.ts +2 -1
  78. package/dist/hooks/use-fetch/use-fetch.hooks.d.ts.map +1 -1
  79. package/dist/hooks/use-fetch/use-fetch.types.d.ts.map +1 -1
  80. package/dist/hooks/use-listener/use-listener.hooks.d.ts +1 -0
  81. package/dist/hooks/use-listener/use-listener.hooks.d.ts.map +1 -1
  82. package/dist/hooks/use-listener/use-listener.types.d.ts +1 -0
  83. package/dist/hooks/use-listener/use-listener.types.d.ts.map +1 -1
  84. package/dist/hooks/use-queue/use-queue.constants.d.ts.map +1 -1
  85. package/dist/hooks/use-queue/use-queue.hooks.d.ts +2 -1
  86. package/dist/hooks/use-queue/use-queue.hooks.d.ts.map +1 -1
  87. package/dist/hooks/use-queue/use-queue.types.d.ts +6 -0
  88. package/dist/hooks/use-queue/use-queue.types.d.ts.map +1 -1
  89. package/dist/hooks/use-submit/use-submit.hooks.d.ts +2 -1
  90. package/dist/hooks/use-submit/use-submit.hooks.d.ts.map +1 -1
  91. package/dist/hooks/use-submit/use-submit.types.d.ts +1 -1
  92. package/dist/hooks/use-submit/use-submit.types.d.ts.map +1 -1
  93. package/dist/index.mjs +30 -22
  94. package/dist/index.mjs.map +1 -1
  95. package/dist/provider/provider.types.d.ts +4 -4
  96. package/dist/provider/provider.types.d.ts.map +1 -1
  97. package/dist/utils/bounce.utils.d.ts.map +1 -1
  98. package/dist/utils/deep-equal.utils.d.ts +2 -2
  99. package/dist/utils/deep-equal.utils.d.ts.map +1 -1
  100. package/dist/utils/tracked-proxy.utils.d.ts +1 -1
  101. package/dist/utils/tracked-proxy.utils.d.ts.map +1 -1
  102. package/package.json +8 -13
  103. package/src/helpers/use-request-events/use-request-events.hooks.ts +4 -5
  104. package/src/helpers/use-request-events/use-request-events.types.ts +0 -1
  105. package/src/helpers/use-socket-state/use-socket-state.hooks.ts +5 -6
  106. package/src/helpers/use-tracked-state/use-tracked-state.hooks.ts +11 -11
  107. package/src/helpers/use-tracked-state/use-tracked-state.types.ts +0 -1
  108. package/src/helpers/use-tracked-state/use-tracked-state.utils.ts +12 -13
  109. package/src/hooks/use-app-manager/use-app-manager.hooks.ts +2 -2
  110. package/src/hooks/use-cache/use-cache.hooks.ts +4 -4
  111. package/src/hooks/use-cache/use-cache.types.ts +2 -3
  112. package/src/hooks/use-emitter/use-emitter.hooks.ts +4 -4
  113. package/src/hooks/use-emitter/use-emitter.types.ts +1 -0
  114. package/src/hooks/use-fetch/use-fetch.constants.ts +0 -1
  115. package/src/hooks/use-fetch/use-fetch.hooks.ts +14 -10
  116. package/src/hooks/use-fetch/use-fetch.types.ts +0 -1
  117. package/src/hooks/use-listener/use-listener.hooks.ts +3 -3
  118. package/src/hooks/use-listener/use-listener.types.ts +1 -0
  119. package/src/hooks/use-queue/use-queue.constants.ts +0 -1
  120. package/src/hooks/use-queue/use-queue.hooks.ts +3 -3
  121. package/src/hooks/use-queue/use-queue.types.ts +6 -0
  122. package/src/hooks/use-stream/use-stream.hooks.ts +4 -4
  123. package/src/hooks/use-submit/use-submit.hooks.ts +7 -7
  124. package/src/hooks/use-submit/use-submit.types.ts +1 -2
  125. package/src/provider/provider.types.ts +4 -5
  126. package/src/utils/bounce.utils.ts +1 -0
  127. package/src/utils/deep-equal.utils.ts +28 -12
  128. package/src/utils/tracked-proxy.utils.ts +1 -1
  129. package/tsconfig.json +11 -2
  130. package/vite.config.ts +14 -20
  131. package/.eslintrc.cjs +0 -12
@@ -1,10 +1,10 @@
1
- import { act } from "@testing-library/react";
2
1
  import type { CacheValueType } from "@hyper-fetch/core";
3
2
  import { createHttpMockingServer } from "@hyper-fetch/testing";
3
+ import { act } from "@testing-library/react";
4
4
 
5
+ import { testInitialState, testSuccessState } from "../../shared";
5
6
  import { client, createRequest } from "../../utils";
6
7
  import { renderUseCache } from "../../utils/use-cache.utils";
7
- import { testInitialState, testSuccessState } from "../../shared";
8
8
 
9
9
  const { resetMocks, startServer, stopServer } = createHttpMockingServer();
10
10
 
@@ -21,10 +21,10 @@ describe("useCache [ Base ]", () => {
21
21
  },
22
22
  },
23
23
  retries: 0,
24
- requestTimestamp: +new Date(),
25
- responseTimestamp: +new Date(),
26
- addedTimestamp: +new Date(),
27
- triggerTimestamp: +new Date(),
24
+ requestTimestamp: Date.now(),
25
+ responseTimestamp: Date.now(),
26
+ addedTimestamp: Date.now(),
27
+ triggerTimestamp: Date.now(),
28
28
  cacheKey: request.cacheKey,
29
29
  scope: request.scope,
30
30
  isCanceled: false,
@@ -1,6 +1,5 @@
1
- import { expectType, expectNotType, expectFunctionParametersType } from "@hyper-fetch/testing";
2
1
  import { Client } from "@hyper-fetch/core";
3
-
2
+ import { expectType, expectNotType, expectFunctionParametersType } from "@hyper-fetch/testing";
4
3
  import type { UseCacheReturnType } from "hooks/use-cache";
5
4
 
6
5
  const client = new Client({
@@ -1,6 +1,6 @@
1
1
  import { Socket } from "@hyper-fetch/sockets";
2
- import { act, waitFor } from "@testing-library/react";
3
2
  import { createWebsocketMockingServer, sleep, waitForConnection } from "@hyper-fetch/testing";
3
+ import { act, waitFor } from "@testing-library/react";
4
4
 
5
5
  import { renderUseEmitter } from "../../utils/use-emitter.utils";
6
6
 
@@ -1,10 +1,10 @@
1
- import { act, waitFor } from "@testing-library/react";
2
1
  import type { AdapterInstance, ResponseType } from "@hyper-fetch/core";
3
2
  import { xhrExtra } from "@hyper-fetch/core";
4
3
  import { createHttpMockingServer, sleep } from "@hyper-fetch/testing";
4
+ import { act, waitFor } from "@testing-library/react";
5
5
 
6
- import { createRequest, renderUseFetch, createCacheData, client } from "../../utils";
7
6
  import { testSuccessState, testErrorState, testInitialState, testCacheState, testClientIsolation } from "../../shared";
7
+ import { createRequest, renderUseFetch, createCacheData, client } from "../../utils";
8
8
 
9
9
  const { resetMocks, startServer, stopServer, mockRequest } = createHttpMockingServer();
10
10
 
@@ -47,8 +47,8 @@ describe("useFetch [ Base ]", () => {
47
47
  status: 200,
48
48
  success: true,
49
49
  extra: xhrExtra,
50
- responseTimestamp: +new Date(),
51
- requestTimestamp: +new Date(),
50
+ responseTimestamp: Date.now(),
51
+ requestTimestamp: Date.now(),
52
52
  },
53
53
  details: {
54
54
  retries: 2,
@@ -59,7 +59,7 @@ describe("useFetch [ Base ]", () => {
59
59
  });
60
60
  it("should show stale cache data while revalidating", async () => {
61
61
  await testClientIsolation(client);
62
- const timestamp = +new Date() - 11;
62
+ const timestamp = Date.now() - 11;
63
63
  const mock = mockRequest(request, { delay: 50 });
64
64
  act(() => {
65
65
  createCacheData(request, {
@@ -104,8 +104,8 @@ describe("useFetch [ Base ]", () => {
104
104
  status: 200,
105
105
  success: true,
106
106
  extra: { headers: { "content-type": "application/json" } },
107
- responseTimestamp: +new Date(),
108
- requestTimestamp: +new Date(),
107
+ responseTimestamp: Date.now(),
108
+ requestTimestamp: Date.now(),
109
109
  };
110
110
  const view = renderUseFetch(request, { disabled: true, initialResponse });
111
111
 
@@ -121,8 +121,8 @@ describe("useFetch [ Base ]", () => {
121
121
  status: 200,
122
122
  success: true,
123
123
  extra: { headers: { "content-type": "application/json" } },
124
- responseTimestamp: +new Date(),
125
- requestTimestamp: +new Date(),
124
+ responseTimestamp: Date.now(),
125
+ requestTimestamp: Date.now(),
126
126
  };
127
127
  const view = renderUseFetch(request, { initialResponse });
128
128
  expect(view.result.current.data).toEqual(initialResponse.data);
@@ -153,11 +153,15 @@ describe("useFetch [ Base ]", () => {
153
153
  });
154
154
  it("should map the data on deps change", async () => {
155
155
  mockRequest(request);
156
+ // Distinct queries need distinct queryKeys: deduplication joins concurrent
157
+ // requests within one queryKey queue, regardless of their cacheKey.
156
158
  const request1 = request
157
159
  .setCacheKey("request1")
160
+ .setQueryKey("request1")
158
161
  .setResponseMapper((response) => ({ ...response, data: 1 }) as typeof response);
159
162
  const request2 = request
160
163
  .setCacheKey("request2")
164
+ .setQueryKey("request2")
161
165
  .setResponseMapper((response) => ({ ...response, data: 2 }) as typeof response);
162
166
 
163
167
  const { result, rerender } = renderUseFetch(request1);
@@ -1,6 +1,6 @@
1
1
  import { getErrorMessage } from "@hyper-fetch/core";
2
- import { act, waitFor } from "@testing-library/react";
3
2
  import { createHttpMockingServer } from "@hyper-fetch/testing";
3
+ import { act, waitFor } from "@testing-library/react";
4
4
 
5
5
  import { testErrorState } from "../../shared";
6
6
  import { client, createRequest, renderUseFetch, waitForRender } from "../../utils";
@@ -1,5 +1,5 @@
1
- import { act, waitFor } from "@testing-library/react";
2
1
  import { createHttpMockingServer } from "@hyper-fetch/testing";
2
+ import { act, waitFor } from "@testing-library/react";
3
3
 
4
4
  import { client, createRequest, renderUseFetch } from "../../utils";
5
5
 
@@ -1,5 +1,5 @@
1
- import { act } from "@testing-library/react";
2
1
  import { createHttpMockingServer } from "@hyper-fetch/testing";
2
+ import { act } from "@testing-library/react";
3
3
 
4
4
  import { testSuccessState } from "../../shared";
5
5
  import { client, createRequest, renderUseFetch, waitForRender } from "../../utils";
@@ -1,5 +1,5 @@
1
- import { waitFor, act } from "@testing-library/react";
2
1
  import { createHttpMockingServer } from "@hyper-fetch/testing";
2
+ import { waitFor, act } from "@testing-library/react";
3
3
 
4
4
  import { client, createRequest, renderUseFetch, waitForRender } from "../../utils";
5
5
 
@@ -1,8 +1,8 @@
1
- import { useState, StrictMode } from "react";
2
1
  import { createHttpMockingServer } from "@hyper-fetch/testing";
3
2
  import { fireEvent, render, screen, waitFor } from "@testing-library/react";
4
-
5
3
  import { useFetch } from "hooks/use-fetch";
4
+ import { useState, StrictMode } from "react";
5
+
6
6
  import { createRequest, waitForRender } from "../../utils";
7
7
 
8
8
  const { resetMocks, startServer, stopServer, mockRequest } = createHttpMockingServer();
@@ -1,5 +1,5 @@
1
- import { waitFor } from "@testing-library/react";
2
1
  import { createHttpMockingServer } from "@hyper-fetch/testing";
2
+ import { waitFor } from "@testing-library/react";
3
3
 
4
4
  import { createRequest, renderUseFetch, client } from "../../utils";
5
5
 
@@ -1,5 +1,5 @@
1
- import { act, waitFor } from "@testing-library/react";
2
1
  import { createHttpMockingServer } from "@hyper-fetch/testing";
2
+ import { act, waitFor } from "@testing-library/react";
3
3
 
4
4
  import { testErrorState, testSuccessState } from "../../shared";
5
5
  import { client, createRequest, renderUseFetch } from "../../utils";
@@ -1,5 +1,5 @@
1
- import { waitFor, act } from "@testing-library/react";
2
1
  import { createHttpMockingServer } from "@hyper-fetch/testing";
2
+ import { waitFor, act } from "@testing-library/react";
3
3
 
4
4
  import { testErrorState, testSuccessState } from "../../shared";
5
5
  import { client, createRequest, renderUseFetch, waitForRender } from "../../utils";
@@ -1,7 +1,7 @@
1
- import { render, screen, waitFor } from "@testing-library/react";
2
1
  import { createHttpMockingServer } from "@hyper-fetch/testing";
3
-
2
+ import { render, screen, waitFor } from "@testing-library/react";
4
3
  import { useFetch } from "hooks/use-fetch";
4
+
5
5
  import { client, createRequest } from "../../utils";
6
6
 
7
7
  const { resetMocks, startServer, stopServer, mockRequest } = createHttpMockingServer();
@@ -1,5 +1,5 @@
1
- import { act } from "@testing-library/react";
2
1
  import { createHttpMockingServer } from "@hyper-fetch/testing";
2
+ import { act } from "@testing-library/react";
3
3
 
4
4
  import { client, createRequest, renderUseFetch, waitForRender } from "../../utils";
5
5
 
@@ -110,7 +110,8 @@ describe("useFetch [ Refreshing ]", () => {
110
110
  it("should refetch when tab is focused and refetchOnFocus is true", async () => {
111
111
  const spy = vi.fn();
112
112
  mockRequest(request);
113
- const { result } = renderUseFetch(request, { ...hookOptions });
113
+ // Deduplication would collapse the focus refetch into the still-running initial fetch
114
+ const { result } = renderUseFetch(request.setDeduplicate(false), { ...hookOptions });
114
115
 
115
116
  act(() => {
116
117
  result.current.onRequestStart(spy);
@@ -1,9 +1,9 @@
1
- import { useRef } from "react";
2
1
  import { useDidMount, useDidUpdate } from "@better-hooks/lifecycle";
3
- import { render } from "@testing-library/react";
4
2
  import { createHttpMockingServer, sleep } from "@hyper-fetch/testing";
5
-
3
+ import { render } from "@testing-library/react";
6
4
  import { useFetch } from "hooks/use-fetch";
5
+ import { useRef } from "react";
6
+
7
7
  import { client, createRequest, waitForRender } from "../../utils";
8
8
 
9
9
  const { resetMocks, startServer, stopServer, mockRequest } = createHttpMockingServer();
@@ -1,6 +1,6 @@
1
1
  import { xhrExtra } from "@hyper-fetch/core";
2
- import { act, waitFor } from "@testing-library/react";
3
2
  import { createHttpMockingServer, sleep } from "@hyper-fetch/testing";
3
+ import { act, waitFor } from "@testing-library/react";
4
4
 
5
5
  import { testSuccessState } from "../../shared";
6
6
  import { client, createRequest, renderUseFetch, waitForRender } from "../../utils";
@@ -10,7 +10,7 @@ const { resetMocks, startServer, stopServer, mockRequest } = createHttpMockingSe
10
10
  describe("useFetch [ refetch ]", () => {
11
11
  let request = createRequest();
12
12
  let mock = mockRequest(request, {
13
- data: { someData: 12345 },
13
+ data: { someData: 12_345 },
14
14
  });
15
15
 
16
16
  beforeAll(() => {
@@ -30,7 +30,7 @@ describe("useFetch [ refetch ]", () => {
30
30
  request = createRequest();
31
31
  client.clear();
32
32
  mock = mockRequest(request, {
33
- data: { someData: 12345 },
33
+ data: { someData: 12_345 },
34
34
  });
35
35
  });
36
36
 
@@ -44,10 +44,10 @@ describe("useFetch [ refetch ]", () => {
44
44
  success: true,
45
45
  extra: { headers: { "content-type": "application/json" } },
46
46
  retries: 0,
47
- addedTimestamp: +new Date(),
48
- triggerTimestamp: +new Date(),
49
- requestTimestamp: +new Date(),
50
- responseTimestamp: +new Date(),
47
+ addedTimestamp: Date.now(),
48
+ triggerTimestamp: Date.now(),
49
+ requestTimestamp: Date.now(),
50
+ responseTimestamp: Date.now(),
51
51
  isCanceled: false,
52
52
  isOffline: false,
53
53
  willRetry: false,
@@ -86,10 +86,10 @@ describe("useFetch [ refetch ]", () => {
86
86
  success: true,
87
87
  extra: xhrExtra,
88
88
  retries: 0,
89
- addedTimestamp: +new Date(),
90
- triggerTimestamp: +new Date(),
91
- requestTimestamp: +new Date(),
92
- responseTimestamp: +new Date(),
89
+ addedTimestamp: Date.now(),
90
+ triggerTimestamp: Date.now(),
91
+ requestTimestamp: Date.now(),
92
+ responseTimestamp: Date.now(),
93
93
  isCanceled: false,
94
94
  isOffline: false,
95
95
  willRetry: false,
@@ -117,10 +117,36 @@ describe("useFetch [ refetch ]", () => {
117
117
  await testSuccessState(customMock, response);
118
118
  });
119
119
  });
120
+ it("should not get swallowed by deduplication when refetching over an in-flight request", async () => {
121
+ // The initial fetch is slow and matched the old mock the moment it started. A manual
122
+ // refetch must bypass deduplication: joining that stale in-flight request would resolve
123
+ // with data older than the refetch call itself.
124
+ resetMocks();
125
+ mockRequest(request, { data: { someData: 12_345 }, delay: 50 });
126
+ const response = renderUseFetch(request);
127
+
128
+ await waitFor(() => {
129
+ expect(client.fetchDispatcher.hasRunningRequests(request.queryKey)).toBe(true);
130
+ });
131
+
132
+ // Registered after the initial fetch started; lands after it too, so the fresh
133
+ // data deterministically overwrites the stale response in cache.
134
+ const freshMock = mockRequest(request, { data: { fresh: true }, delay: 80 });
135
+
136
+ act(() => {
137
+ response.result.current.refetch();
138
+ });
139
+
140
+ await waitFor(async () => {
141
+ await testSuccessState(freshMock, response);
142
+ });
143
+ });
120
144
  it("should allow to refetch hook by RegExp", async () => {
121
145
  const regexp = /(Maciej|Kacper)/;
122
- const responseOne = renderUseFetch(request.setCacheKey("Maciej"));
123
- const responseTwo = renderUseFetch(request.setCacheKey("Kacper"));
146
+ // Distinct queries need distinct queryKeys: deduplication joins concurrent
147
+ // requests within one queryKey queue, regardless of their cacheKey.
148
+ const responseOne = renderUseFetch(request.setCacheKey("Maciej").setQueryKey("Maciej"));
149
+ const responseTwo = renderUseFetch(request.setCacheKey("Kacper").setQueryKey("Kacper"));
124
150
 
125
151
  await waitFor(async () => {
126
152
  await testSuccessState(mock, responseOne);
@@ -138,8 +164,10 @@ describe("useFetch [ refetch ]", () => {
138
164
  });
139
165
  });
140
166
  it("should allow to refetch hook by keys array", async () => {
141
- const responseOne = renderUseFetch(request.setCacheKey("Maciej"));
142
- const responseTwo = renderUseFetch(request.setCacheKey("Kacper"));
167
+ // Distinct queries need distinct queryKeys: deduplication joins concurrent
168
+ // requests within one queryKey queue, regardless of their cacheKey.
169
+ const responseOne = renderUseFetch(request.setCacheKey("Maciej").setQueryKey("Maciej"));
170
+ const responseTwo = renderUseFetch(request.setCacheKey("Kacper").setQueryKey("Kacper"));
143
171
 
144
172
  await waitFor(async () => {
145
173
  await testSuccessState(mock, responseOne);
@@ -157,8 +185,10 @@ describe("useFetch [ refetch ]", () => {
157
185
  });
158
186
  });
159
187
  it("should allow to refetch hook by key", async () => {
160
- const responseOne = renderUseFetch(request.setCacheKey("Maciej"));
161
- const responseTwo = renderUseFetch(request.setCacheKey("Kacper"));
188
+ // Distinct queries need distinct queryKeys: deduplication joins concurrent
189
+ // requests within one queryKey queue, regardless of their cacheKey.
190
+ const responseOne = renderUseFetch(request.setCacheKey("Maciej").setQueryKey("Maciej"));
191
+ const responseTwo = renderUseFetch(request.setCacheKey("Kacper").setQueryKey("Kacper"));
162
192
 
163
193
  await waitFor(async () => {
164
194
  await testSuccessState(mock, responseOne);
@@ -1,10 +1,10 @@
1
+ import { createHttpMockingServer } from "@hyper-fetch/testing";
2
+ import { act, fireEvent, render, screen, waitFor } from "@testing-library/react";
3
+ import { useFetch } from "hooks/use-fetch";
1
4
  /// <reference types="vitest/globals" />
2
5
  import type { ReactNode } from "react";
3
6
  import { Suspense, StrictMode, Component, useState } from "react";
4
- import { act, fireEvent, render, screen, waitFor } from "@testing-library/react";
5
- import { createHttpMockingServer } from "@hyper-fetch/testing";
6
7
 
7
- import { useFetch } from "hooks/use-fetch";
8
8
  import { client, createRequest } from "../../utils";
9
9
 
10
10
  const { resetMocks, startServer, stopServer, mockRequest } = createHttpMockingServer();
@@ -483,7 +483,7 @@ describe("useFetch [ Suspense ]", () => {
483
483
 
484
484
  function NormalView() {
485
485
  const { data, loading } = useFetch(request, { dependencyTracking: false });
486
- if (loading) return <div data-testid="normal-loading">Loading...</div>;
486
+ if (loading) {return <div data-testid="normal-loading">Loading...</div>;}
487
487
  return <div data-testid="normal-data">{JSON.stringify(data)}</div>;
488
488
  }
489
489
 
@@ -1,6 +1,5 @@
1
- import { expectType, expectNotType, expectFunctionParametersType } from "@hyper-fetch/testing";
2
1
  import { Client } from "@hyper-fetch/core";
3
-
2
+ import { expectType, expectNotType, expectFunctionParametersType } from "@hyper-fetch/testing";
4
3
  import type { UseFetchReturnType } from "hooks/use-fetch";
5
4
 
6
5
  const client = new Client({
@@ -5,13 +5,13 @@ describe("useFetch [ Utils ]", () => {
5
5
  describe("given using getRefreshTime util", () => {
6
6
  describe("when state is available", () => {
7
7
  it("should give the reduced refresh time based on timestamp", async () => {
8
- const timestamp = new Date(+new Date() - 500);
8
+ const timestamp = new Date(Date.now() - 500);
9
9
  const time = getRefreshTime(refreshTime, timestamp);
10
10
  expect(time).toBeLessThanOrEqual(500);
11
11
  expect(time).toBeGreaterThanOrEqual(490);
12
12
  });
13
13
  it("should give refreshTime on old timestamp", async () => {
14
- const timestamp = new Date(+new Date() - refreshTime);
14
+ const timestamp = new Date(Date.now() - refreshTime);
15
15
  const time = getRefreshTime(refreshTime, timestamp);
16
16
  expect(time).toBe(refreshTime);
17
17
  });
@@ -1,5 +1,5 @@
1
- import { act, waitFor } from "@testing-library/react";
2
1
  import { createHttpMockingServer } from "@hyper-fetch/testing";
2
+ import { act, waitFor } from "@testing-library/react";
3
3
 
4
4
  import { client, createRequest, renderUseFetch, waitForRender } from "../../utils";
5
5
 
@@ -1,5 +1,5 @@
1
- import { act, waitFor } from "@testing-library/react";
2
1
  import { createWebsocketMockingServer, waitForConnection } from "@hyper-fetch/testing";
2
+ import { act, waitFor } from "@testing-library/react";
3
3
 
4
4
  import { createListener } from "../../utils/listener.utils";
5
5
  import { renderUseListener } from "../../utils/use-listener.utils";
@@ -1,5 +1,5 @@
1
- import { act, waitFor } from "@testing-library/react";
2
1
  import { createHttpMockingServer, sleep } from "@hyper-fetch/testing";
2
+ import { act, waitFor } from "@testing-library/react";
3
3
 
4
4
  import {
5
5
  addQueueElement,
@@ -149,7 +149,7 @@ describe("useQueue [ Actions ]", () => {
149
149
  progress: 50,
150
150
  sizeLeft: 25,
151
151
  startTimestamp: +timestamp,
152
- timeLeft: 20000,
152
+ timeLeft: 20_000,
153
153
  total: 50,
154
154
  });
155
155
  });
@@ -203,7 +203,7 @@ describe("useQueue [ Actions ]", () => {
203
203
  progress: 50,
204
204
  sizeLeft: 25,
205
205
  startTimestamp: +timestamp,
206
- timeLeft: 20000,
206
+ timeLeft: 20_000,
207
207
  total: 50,
208
208
  });
209
209
  });
@@ -1,5 +1,5 @@
1
- import { act, waitFor } from "@testing-library/react";
2
1
  import { createHttpMockingServer } from "@hyper-fetch/testing";
2
+ import { act, waitFor } from "@testing-library/react";
3
3
 
4
4
  import { addQueueElement, client, createRequest, renderUseQueue } from "../../utils";
5
5
 
@@ -55,7 +55,7 @@ describe("useQueue [ Base ]", () => {
55
55
  progress: 0.5,
56
56
  timeLeft: 2000,
57
57
  sizeLeft: 100,
58
- startTimestamp: +new Date(),
58
+ startTimestamp: Date.now(),
59
59
  };
60
60
  const { result } = renderUseQueue(request);
61
61
  act(() => {
@@ -84,7 +84,7 @@ describe("useQueue [ Base ]", () => {
84
84
  progress: 0.5,
85
85
  timeLeft: 2000,
86
86
  sizeLeft: 100,
87
- startTimestamp: +new Date(),
87
+ startTimestamp: Date.now(),
88
88
  };
89
89
  const { result } = renderUseQueue(request);
90
90
  act(() => {
@@ -147,8 +147,8 @@ describe("useQueue [ Base ]", () => {
147
147
  status: 200,
148
148
  success: true,
149
149
  extra: {},
150
- responseTimestamp: +new Date(),
151
- requestTimestamp: +new Date(),
150
+ responseTimestamp: Date.now(),
151
+ requestTimestamp: Date.now(),
152
152
  },
153
153
  request,
154
154
  } as any);
@@ -183,8 +183,8 @@ describe("useQueue [ Base ]", () => {
183
183
  status: 500,
184
184
  success: false,
185
185
  extra: {},
186
- responseTimestamp: +new Date(),
187
- requestTimestamp: +new Date(),
186
+ responseTimestamp: Date.now(),
187
+ requestTimestamp: Date.now(),
188
188
  },
189
189
  request,
190
190
  } as any);
@@ -266,8 +266,8 @@ describe("useQueue [ Base ]", () => {
266
266
  status: 500,
267
267
  success: false,
268
268
  extra: {},
269
- responseTimestamp: +new Date(),
270
- requestTimestamp: +new Date(),
269
+ responseTimestamp: Date.now(),
270
+ requestTimestamp: Date.now(),
271
271
  },
272
272
  request,
273
273
  } as any);
@@ -288,8 +288,8 @@ describe("useQueue [ Base ]", () => {
288
288
  status: 200,
289
289
  success: true,
290
290
  extra: {},
291
- responseTimestamp: +new Date(),
292
- requestTimestamp: +new Date(),
291
+ responseTimestamp: Date.now(),
292
+ requestTimestamp: Date.now(),
293
293
  },
294
294
  request,
295
295
  } as any);
@@ -341,8 +341,8 @@ describe("useQueue [ Base ]", () => {
341
341
  status: 200,
342
342
  success: true,
343
343
  extra: {},
344
- responseTimestamp: +new Date(),
345
- requestTimestamp: +new Date(),
344
+ responseTimestamp: Date.now(),
345
+ requestTimestamp: Date.now(),
346
346
  },
347
347
  request,
348
348
  } as any);
@@ -1,6 +1,6 @@
1
- import { act, waitFor } from "@testing-library/react";
2
- import { createHttpMockingServer } from "@hyper-fetch/testing";
3
1
  import { getRequestDispatcher, scopeKey } from "@hyper-fetch/core";
2
+ import { createHttpMockingServer } from "@hyper-fetch/testing";
3
+ import { act, waitFor } from "@testing-library/react";
4
4
 
5
5
  import { addQueueElement, client, createRequest, renderUseQueue } from "../../utils";
6
6
 
@@ -66,7 +66,7 @@ describe("useQueue [ Resolve Queue Items ]", () => {
66
66
  requestId: "json-request-1",
67
67
  request: json as any,
68
68
  retries: 0,
69
- timestamp: +new Date(),
69
+ timestamp: Date.now(),
70
70
  stopped: false,
71
71
  resolved: false,
72
72
  },
@@ -102,7 +102,7 @@ describe("useQueue [ Resolve Queue Items ]", () => {
102
102
  requestId: "json-status-1",
103
103
  request: json as any,
104
104
  retries: 0,
105
- timestamp: +new Date(),
105
+ timestamp: Date.now(),
106
106
  stopped: false,
107
107
  resolved: false,
108
108
  },
@@ -140,7 +140,7 @@ describe("useQueue [ Resolve Queue Items ]", () => {
140
140
  requestId: "class-instance-1",
141
141
  request,
142
142
  retries: 0,
143
- timestamp: +new Date(),
143
+ timestamp: Date.now(),
144
144
  stopped: false,
145
145
  resolved: false,
146
146
  },
@@ -148,7 +148,7 @@ describe("useQueue [ Resolve Queue Items ]", () => {
148
148
  requestId: "json-item-1",
149
149
  request: json as any,
150
150
  retries: 0,
151
- timestamp: +new Date(),
151
+ timestamp: Date.now(),
152
152
  stopped: false,
153
153
  resolved: false,
154
154
  },
@@ -1,6 +1,6 @@
1
1
  import { renderHook, act, waitFor } from "@testing-library/react";
2
-
3
2
  import { useStream } from "hooks/use-stream";
3
+
4
4
  import { client } from "../../utils";
5
5
 
6
6
  const createStreamRequest = () => {
@@ -1,8 +1,8 @@
1
- import { act, waitFor } from "@testing-library/react";
2
1
  import { createHttpMockingServer } from "@hyper-fetch/testing";
2
+ import { act, waitFor } from "@testing-library/react";
3
3
 
4
- import { client, createRequest, renderUseSubmit, waitForRender } from "../../utils";
5
4
  import { testInitialState, testSuccessState } from "../../shared";
5
+ import { client, createRequest, renderUseSubmit, waitForRender } from "../../utils";
6
6
 
7
7
  const { resetMocks, startServer, stopServer, mockRequest } = createHttpMockingServer();
8
8
 
@@ -1,6 +1,6 @@
1
1
  import { getErrorMessage } from "@hyper-fetch/core";
2
- import { act } from "@testing-library/react";
3
2
  import { createHttpMockingServer } from "@hyper-fetch/testing";
3
+ import { act } from "@testing-library/react";
4
4
 
5
5
  import { testErrorState } from "../../shared";
6
6
  import { client, createRequest, renderUseSubmit } from "../../utils";
@@ -1,6 +1,6 @@
1
- import { act } from "@testing-library/react";
2
1
  import { createClient } from "@hyper-fetch/core";
3
2
  import { createHttpMockingServer } from "@hyper-fetch/testing";
3
+ import { act } from "@testing-library/react";
4
4
 
5
5
  import { testSuccessState } from "../../shared";
6
6
  import { renderUseSubmit, waitForRender } from "../../utils";