floppy-disk 2.5.0-beta.1 → 2.5.0-beta.3

package/lib/react/create-query.js

@@ -15,11 +15,11 @@ const INITIAL_QUERY_STATE = {
     isRefetchError: false,
     isPreviousData: false,
     isOptimisticData: false,
-    data: null,
-    response: null,
-    responseUpdatedAt: null,
-    error: null,
-    errorUpdatedAt: null,
+    data: undefined,
+    response: undefined,
+    responseUpdatedAt: undefined,
+    error: undefined,
+    errorUpdatedAt: undefined,
     retryCount: 0,
     isGoingToRetry: false,
     pageParam: undefined,
@@ -56,11 +56,11 @@ const createQuery = (queryFn, options = {}) => {
             return { shouldRetry: retryCount < maxRetryCount, delay };
         };
         const forceFetch = () => new Promise((resolve) => {
+            const state = get();
             const responseAllPages = [];
-            const newPageParams = [undefined];
-            let pageParam = undefined;
+            const newPageParams = [state.pageParams[0]];
+            let pageParam = state.pageParams[0];
             clearTimeout(refetchIntervalTimeoutId.get(keyHash));
-            const state = get();
             const { isWaiting, isLoading, pageParams } = state;
             if (isWaiting || !(0, utils_1.getValueOrComputedValue)(enabled, key))
                 return resolve(state);
@@ -111,11 +111,11 @@ const createQuery = (queryFn, options = {}) => {
                         isOptimisticData: false,
                         data: responseAllPages.reduce((prev, responseCurrentPage) => {
                             return select(responseCurrentPage, { key, data: prev });
-                        }, null),
+                        }, undefined),
                         response,
                         responseUpdatedAt: Date.now(),
-                        error: null,
-                        errorUpdatedAt: null,
+                        error: undefined,
+                        errorUpdatedAt: undefined,
                         retryCount: 0,
                         pageParam: newPageParam,
                         pageParams: newPageParams,
@@ -130,7 +130,6 @@ const createQuery = (queryFn, options = {}) => {
                     }
                     set(nextState);
                     onSuccess(response, stateBeforeCallQuery);
-                    resolve(get());
                 })
                     .catch((error) => {
                     const prevState = get();
@@ -144,7 +143,7 @@ const createQuery = (queryFn, options = {}) => {
                             data: responseAllPages.length
                                 ? responseAllPages.reduce((prev, response) => {
                                     return select(response, { key, data: prev });
-                                }, null)
+                                }, undefined)
                                 : prevState.data,
                             error,
                             errorUpdatedAt,
@@ -157,7 +156,7 @@ const createQuery = (queryFn, options = {}) => {
                             status: 'error',
                             isLoading: false,
                             isError: true,
-                            data: null,
+                            data: undefined,
                             error,
                             errorUpdatedAt,
                             isGoingToRetry: shouldRetry,
@@ -171,17 +170,17 @@ const createQuery = (queryFn, options = {}) => {
                         }, delay));
                     }
                     onError(error, stateBeforeCallQuery);
-                    resolve(get());
                 })
                     .finally(() => {
                     onSettled(stateBeforeCallQuery);
+                    resolve(get());
                 });
             };
             callQuery();
         });
         const fetch = () => {
             const { responseUpdatedAt } = get();
-            const isStale = Date.now() > Number(responseUpdatedAt) + staleTime;
+            const isStale = Date.now() > (responseUpdatedAt || 0) + staleTime;
             if (!isStale)
                 return;
             forceFetch();
@@ -220,7 +219,6 @@ const createQuery = (queryFn, options = {}) => {
                     hasNextPage: (0, utils_1.hasValue)(newPageParam),
                 });
                 onSuccess(response, stateBeforeCallQuery);
-                resolve(get());
             })
                 .catch((error) => {
                 const prevState = get();
@@ -239,10 +237,10 @@ const createQuery = (queryFn, options = {}) => {
                     }, delay));
                 }
                 onError(error, stateBeforeCallQuery);
-                resolve(get());
             })
                 .finally(() => {
                 onSettled(stateBeforeCallQuery);
+                resolve(get());
             });
         });
         return {
@@ -340,8 +338,8 @@ const createQuery = (queryFn, options = {}) => {
                 isSuccess: true,
                 isError: false,
                 response,
-                responseUpdatedAt: skipRevalidation ? Date.now() : null,
-                data: select(response, { key: key, data: null }),
+                responseUpdatedAt: skipRevalidation ? Date.now() : undefined,
+                data: select(response, { key: key, data: undefined }),
                 pageParam: newPageParam,
                 pageParams: [undefined, newPageParam],
                 hasNextPage: (0, utils_1.hasValue)(newPageParam),
@@ -360,14 +358,14 @@ const createQuery = (queryFn, options = {}) => {
     useQuery.invalidate = () => {
         useQuery.getStores().forEach((store) => {
             const { get, set, getSubscribers } = store;
-            set({ responseUpdatedAt: null });
+            set({ responseUpdatedAt: undefined });
             if (getSubscribers().size > 0)
                 get().forceFetch();
         });
     };
     useQuery.invalidateSpecificKey = (key) => {
         const { get, set, getSubscribers } = useQuery.getStore(key);
-        set({ responseUpdatedAt: null });
+        set({ responseUpdatedAt: undefined });
         if (getSubscribers().size > 0)
             get().forceFetch();
     };
@@ -379,7 +377,7 @@ const createQuery = (queryFn, options = {}) => {
         useQuery.set(key, {
             isOptimisticData: true,
             response: optimisticResponse,
-            data: select(optimisticResponse, { key: key, data: null }),
+            data: select(optimisticResponse, { key: key, data: undefined }),
         });
         preventReplaceResponse.set(prevState.keyHash, true);
         const revert = () => {

package/lib/react/create-stores.d.ts

@@ -1,6 +1,6 @@
+import { Maybe } from '../utils';
 import { InitStoreOptions, InitStoreReturn, SelectDeps, SetStoreData, StoreData, Subscribers } from '../vanilla';
 import { WatchProps } from './create-store';
-type Maybe<T> = T | null | undefined;
 export type StoreKey = Record<string, any> | undefined;
 export type StoresInitializer<TKey extends StoreKey = StoreKey, T extends StoreData = StoreData> = (api: {
     get: () => T;
@@ -50,4 +50,3 @@ export type CreateStoresOptions<TKey extends StoreKey = StoreKey, T extends Stor
  * @see https://floppy-disk.vercel.app/docs/api#createstores
  */
 export declare const createStores: <TKey extends StoreKey = StoreKey, T extends StoreData = StoreData>(initializer: StoresInitializer<TKey, T>, options?: CreateStoresOptions<TKey, T>) => UseStores<TKey, T>;
-export {};

package/lib/utils/index.d.ts

@@ -3,3 +3,4 @@ export declare const identityFn: <T>(value: T) => T;
 export declare const hasValue: (value: any) => boolean;
 export declare const hashStoreKey: (obj?: any) => string;
 export declare const getValueOrComputedValue: <T, P extends any[]>(valueOrComputeValueFn: T | ((...params: P) => T), ...params: P) => T;
+export type Maybe<T> = T | null | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "floppy-disk",
-  "version": "2.5.0-beta.1",
+  "version": "2.5.0-beta.3",
   "description": "FloppyDisk - lightweight, simple, and powerful state management library",
   "keywords": [
     "state",