@hyper-fetch/react 5.7.6-beta.1 → 6.0.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.
- package/dist/index.cjs.js +47 -11
- package/dist/index.cjs.js.map +2 -2
- package/dist/index.d.ts +24 -3
- package/dist/index.esm.js +47 -11
- package/dist/index.esm.js.map +2 -2
- package/package.json +1 -1
- package/src/helpers/use-tracked-state/use-tracked-state.hooks.ts +28 -3
- package/src/helpers/use-tracked-state/use-tracked-state.types.ts +2 -0
- package/src/helpers/use-tracked-state/use-tracked-state.utils.ts +51 -7
- package/src/hooks/use-fetch/use-fetch.hooks.ts +2 -5
package/dist/index.d.ts
CHANGED
|
@@ -130,6 +130,8 @@ type UseTrackedStateProps<T extends RequestInstance> = {
|
|
|
130
130
|
dependencyTracking: boolean;
|
|
131
131
|
defaultCacheEmitting?: boolean;
|
|
132
132
|
deepCompare: boolean | typeof isEqual;
|
|
133
|
+
disabled?: boolean;
|
|
134
|
+
revalidate?: boolean;
|
|
133
135
|
};
|
|
134
136
|
type UseTrackedStateReturn<T extends RequestInstance> = [
|
|
135
137
|
UseTrackedStateType<T>,
|
|
@@ -220,13 +222,32 @@ declare const initialState: UseTrackedStateType;
|
|
|
220
222
|
* @param dependencies
|
|
221
223
|
* @internal
|
|
222
224
|
*/
|
|
223
|
-
declare const useTrackedState: <T extends RequestInstance>({ request, dispatcher, initialData, deepCompare, dependencyTracking, defaultCacheEmitting, }: UseTrackedStateProps<T>) => UseTrackedStateReturn<T>;
|
|
225
|
+
declare const useTrackedState: <T extends RequestInstance>({ request, dispatcher, initialData, deepCompare, dependencyTracking, defaultCacheEmitting, disabled, revalidate, }: UseTrackedStateProps<T>) => UseTrackedStateReturn<T>;
|
|
224
226
|
|
|
225
227
|
declare const getDetailsState: (state?: UseTrackedStateType<RequestInstance>, details?: Partial<ResponseDetailsType>) => ResponseDetailsType;
|
|
226
228
|
declare const isStaleCacheData: (cacheTime: number, cacheTimestamp: NullableType<Date | number>) => boolean;
|
|
227
229
|
declare const getValidCacheData: <T extends RequestInstance>(request: T, initialData: Partial<ExtractAdapterReturnType<T>>, cacheData: CacheValueType<ExtractResponseType<T>, ExtractErrorType<T>, _hyper_fetch_core.AdapterInstance>) => CacheValueType<ExtractResponseType<T>, ExtractErrorType<T>, _hyper_fetch_core.AdapterInstance>;
|
|
228
230
|
declare const getTimestamp: (timestamp?: NullableType<number | Date>) => Date;
|
|
229
|
-
declare const
|
|
231
|
+
declare const getIsInitiallyLoading: ({ queryKey, dispatcher, hasState, revalidate, disabled, }: {
|
|
232
|
+
queryKey: string;
|
|
233
|
+
dispatcher: Dispatcher;
|
|
234
|
+
hasState: boolean;
|
|
235
|
+
revalidate?: boolean;
|
|
236
|
+
disabled?: boolean;
|
|
237
|
+
}) => boolean;
|
|
238
|
+
declare const getInitialState: <T extends RequestInstance>({ initialResponse, dispatcher, request, disabled, revalidate, }: {
|
|
239
|
+
initialResponse: Partial<ExtractAdapterReturnType<T>>;
|
|
240
|
+
dispatcher: Dispatcher;
|
|
241
|
+
request: T;
|
|
242
|
+
/**
|
|
243
|
+
* useFetch only
|
|
244
|
+
*/
|
|
245
|
+
disabled?: boolean;
|
|
246
|
+
/**
|
|
247
|
+
* useFetch only
|
|
248
|
+
*/
|
|
249
|
+
revalidate?: boolean;
|
|
250
|
+
}) => UseTrackedStateType<T>;
|
|
230
251
|
|
|
231
252
|
declare const useSocketState: <DataType>(socket: SocketInstance, { dependencyTracking }: UseSocketStateProps) => readonly [UseSocketStateType<DataType>, {
|
|
232
253
|
setData: (data: DataType) => void;
|
|
@@ -713,4 +734,4 @@ declare const ConfigProvider: ({ children, config }: ConfigProviderProps) => JSX
|
|
|
713
734
|
*/
|
|
714
735
|
declare const useConfigProvider: () => ConfigProviderValueType;
|
|
715
736
|
|
|
716
|
-
export { CallbackParameters, ConfigProvider, ConfigProviderOptionsType, ConfigProviderProps, ConfigProviderValueType, InvalidationKeyType, OnErrorCallbackType, OnFinishedCallbackType, OnProgressCallbackType, OnStartCallbackType, OnSuccessCallbackType, QueueRequest, UseAppManagerReturnType, UseCacheOptionsType, UseCacheReturnType, UseEmitterOptionsType, UseEventMessagesOptionsType, UseFetchOptionsType, UseFetchReturnType, UseListenerOptionsType, UseQueueOptionsType, UseQueueReturnType, UseRequestEventsActionsType, UseRequestEventsDataMap, UseRequestEventsLifecycleMap, UseRequestEventsPropsType, UseRequestEventsReturnType, UseSocketStateProps, UseSocketStateType, UseSubmitOptionsType, UseSubmitReturnType, UseTrackedStateActions, UseTrackedStateProps, UseTrackedStateReturn, UseTrackedStateType, getBounceData, getDetailsState, getInitialState, getRefreshTime, getTimestamp, getValidCacheData, initialSocketState, initialState, isEmpty, isEqual, isStaleCacheData, useAppManager, useCache, useCacheDefaultOptions, useConfigProvider, useEmitter, useEventMessages, useFetch, useFetchDefaultOptions, useListener, useQueue, useQueueDefaultOptions, useRequestEvents, useSocketState, useSubmit, useSubmitDefaultOptions, useTrackedState };
|
|
737
|
+
export { CallbackParameters, ConfigProvider, ConfigProviderOptionsType, ConfigProviderProps, ConfigProviderValueType, InvalidationKeyType, OnErrorCallbackType, OnFinishedCallbackType, OnProgressCallbackType, OnStartCallbackType, OnSuccessCallbackType, QueueRequest, UseAppManagerReturnType, UseCacheOptionsType, UseCacheReturnType, UseEmitterOptionsType, UseEventMessagesOptionsType, UseFetchOptionsType, UseFetchReturnType, UseListenerOptionsType, UseQueueOptionsType, UseQueueReturnType, UseRequestEventsActionsType, UseRequestEventsDataMap, UseRequestEventsLifecycleMap, UseRequestEventsPropsType, UseRequestEventsReturnType, UseSocketStateProps, UseSocketStateType, UseSubmitOptionsType, UseSubmitReturnType, UseTrackedStateActions, UseTrackedStateProps, UseTrackedStateReturn, UseTrackedStateType, getBounceData, getDetailsState, getInitialState, getIsInitiallyLoading, getRefreshTime, getTimestamp, getValidCacheData, initialSocketState, initialState, isEmpty, isEqual, isStaleCacheData, useAppManager, useCache, useCacheDefaultOptions, useConfigProvider, useEmitter, useEventMessages, useFetch, useFetchDefaultOptions, useListener, useQueue, useQueueDefaultOptions, useRequestEvents, useSocketState, useSubmit, useSubmitDefaultOptions, useTrackedState };
|
package/dist/index.esm.js
CHANGED
|
@@ -362,12 +362,38 @@ var getValidCacheData = (request, initialData, cacheData) => {
|
|
|
362
362
|
var getTimestamp = (timestamp) => {
|
|
363
363
|
return timestamp ? new Date(timestamp) : null;
|
|
364
364
|
};
|
|
365
|
-
var
|
|
365
|
+
var getIsInitiallyLoading = ({
|
|
366
|
+
queryKey,
|
|
367
|
+
dispatcher,
|
|
368
|
+
hasState,
|
|
369
|
+
revalidate,
|
|
370
|
+
disabled
|
|
371
|
+
}) => {
|
|
372
|
+
if (!revalidate && hasState) {
|
|
373
|
+
return false;
|
|
374
|
+
}
|
|
375
|
+
const queue = dispatcher.getQueue(queryKey);
|
|
376
|
+
const isInitiallyLoading = dispatcher.hasRunningRequests(queryKey) || !queue.stopped && disabled === false;
|
|
377
|
+
return isInitiallyLoading;
|
|
378
|
+
};
|
|
379
|
+
var getInitialState = ({
|
|
380
|
+
initialResponse,
|
|
381
|
+
dispatcher,
|
|
382
|
+
request,
|
|
383
|
+
disabled,
|
|
384
|
+
revalidate
|
|
385
|
+
}) => {
|
|
366
386
|
const { client, cacheKey, responseMapper } = request;
|
|
367
387
|
const { cache } = client;
|
|
368
388
|
const cacheData = cache.get(cacheKey);
|
|
369
|
-
const cacheState = getValidCacheData(request,
|
|
370
|
-
const initialLoading =
|
|
389
|
+
const cacheState = getValidCacheData(request, initialResponse, cacheData);
|
|
390
|
+
const initialLoading = getIsInitiallyLoading({
|
|
391
|
+
queryKey: request.queueKey,
|
|
392
|
+
dispatcher,
|
|
393
|
+
disabled,
|
|
394
|
+
revalidate,
|
|
395
|
+
hasState: !!cacheState
|
|
396
|
+
});
|
|
371
397
|
if (cacheState) {
|
|
372
398
|
const mappedData = responseMapper ? responseMapper(cacheState) : cacheState;
|
|
373
399
|
if (mappedData instanceof Promise) {
|
|
@@ -403,12 +429,16 @@ var useTrackedState = ({
|
|
|
403
429
|
initialData,
|
|
404
430
|
deepCompare,
|
|
405
431
|
dependencyTracking,
|
|
406
|
-
defaultCacheEmitting = true
|
|
432
|
+
defaultCacheEmitting = true,
|
|
433
|
+
disabled,
|
|
434
|
+
revalidate
|
|
407
435
|
}) => {
|
|
408
436
|
const { client, cacheKey, queueKey, cacheTime, responseMapper } = request;
|
|
409
437
|
const { cache, requestManager } = client;
|
|
410
438
|
const forceUpdate = useForceUpdate();
|
|
411
|
-
const state = useRef2(
|
|
439
|
+
const state = useRef2(
|
|
440
|
+
getInitialState({ initialResponse: initialData, dispatcher, request, disabled })
|
|
441
|
+
);
|
|
412
442
|
const renderKeys = useRef2([]);
|
|
413
443
|
const isProcessingData = useRef2("");
|
|
414
444
|
const getStaleStatus = () => {
|
|
@@ -430,6 +460,13 @@ var useTrackedState = ({
|
|
|
430
460
|
state.current.loading = dispatcher.hasRunningRequests(queueKey);
|
|
431
461
|
const cacheData = cache.get(cacheKey);
|
|
432
462
|
const cacheState = getValidCacheData(request, initialData, cacheData);
|
|
463
|
+
state.current.loading = getIsInitiallyLoading({
|
|
464
|
+
queryKey: request.queueKey,
|
|
465
|
+
dispatcher,
|
|
466
|
+
disabled,
|
|
467
|
+
revalidate,
|
|
468
|
+
hasState: !!cacheState
|
|
469
|
+
});
|
|
433
470
|
const hasInitialState = isEqual(initialData == null ? void 0 : initialData.data, state.current.data);
|
|
434
471
|
const hasState = !!(state.current.data || state.current.error) && !hasInitialState;
|
|
435
472
|
const shouldLoadInitialCache = !hasState && !!state.current.data;
|
|
@@ -536,7 +573,7 @@ var useTrackedState = ({
|
|
|
536
573
|
isRetry: false,
|
|
537
574
|
isOffline: false
|
|
538
575
|
});
|
|
539
|
-
} else {
|
|
576
|
+
} else if (loading !== state.current.loading) {
|
|
540
577
|
state.current.loading = loading;
|
|
541
578
|
renderKeyTrigger(["loading"]);
|
|
542
579
|
}
|
|
@@ -765,7 +802,9 @@ var useFetch = (request, options = useFetchDefaultOptions) => {
|
|
|
765
802
|
dispatcher,
|
|
766
803
|
initialData,
|
|
767
804
|
deepCompare,
|
|
768
|
-
dependencyTracking
|
|
805
|
+
dependencyTracking,
|
|
806
|
+
disabled,
|
|
807
|
+
revalidate
|
|
769
808
|
});
|
|
770
809
|
const [callbacks, listeners] = useRequestEvents({
|
|
771
810
|
logger,
|
|
@@ -780,10 +819,6 @@ var useFetch = (request, options = useFetchDefaultOptions) => {
|
|
|
780
819
|
if (!disabled) {
|
|
781
820
|
logger.debug(`Fetching data`);
|
|
782
821
|
dispatcher.add(request);
|
|
783
|
-
const queue = dispatcher.getQueue(request.queueKey);
|
|
784
|
-
if (!queue.stopped && queue.requests.length) {
|
|
785
|
-
actions.setLoading(true);
|
|
786
|
-
}
|
|
787
822
|
} else {
|
|
788
823
|
logger.debug(`Cannot add to fetch queue`, { disabled });
|
|
789
824
|
}
|
|
@@ -1465,6 +1500,7 @@ export {
|
|
|
1465
1500
|
getBounceData,
|
|
1466
1501
|
getDetailsState,
|
|
1467
1502
|
getInitialState,
|
|
1503
|
+
getIsInitiallyLoading,
|
|
1468
1504
|
getRefreshTime,
|
|
1469
1505
|
getTimestamp,
|
|
1470
1506
|
getValidCacheData,
|