floppy-disk 2.0.0 → 2.0.1-beta.2

package/esm/preact/create-mutation.d.ts

@@ -1,4 +1,5 @@
 import { InitStoreOptions } from '../vanilla';
+import { UseStore } from './create-store';
 export type MutationState<TVar, TResponse = any, TError = unknown> = {
     /**
      * Network fetching status.
@@ -13,16 +14,21 @@ export type MutationState<TVar, TResponse = any, TError = unknown> = {
     /**
      * Mutate function is a promise that will always resolve.
      */
-    mutate: (variables?: TVar) => Promise<{
+    mutate: TVar extends undefined ? () => Promise<{
+        response?: TResponse;
+        error?: TError;
+        variables?: TVar;
+    }> : (variables: TVar) => Promise<{
         response?: TResponse;
         error?: TError;
         variables?: TVar;
     }>;
 };
+export type UseMutation<TVar, TResponse = any, TError = unknown> = UseStore<MutationState<TVar, TResponse, TError>>;
 export type CreateMutationOptions<TVar, TResponse = any, TError = unknown> = InitStoreOptions<MutationState<TVar, TResponse, TError>> & {
-    onMutate?: (variables: TVar | undefined, stateBeforeMutate: MutationState<TVar, TResponse, TError>) => void;
-    onSuccess?: (response: TResponse, variables: TVar | undefined, stateBeforeMutate: MutationState<TVar, TResponse, TError>) => void;
-    onError?: (error: TError, variables: TVar | undefined, stateBeforeMutate: MutationState<TVar, TResponse, TError>) => void;
-    onSettled?: (variables: TVar | undefined, stateBeforeMutate: MutationState<TVar, TResponse, TError>) => void;
+    onMutate?: (variables: TVar, stateBeforeMutate: MutationState<TVar, TResponse, TError>) => void;
+    onSuccess?: (response: TResponse, variables: TVar, stateBeforeMutate: MutationState<TVar, TResponse, TError>) => void;
+    onError?: (error: TError, variables: TVar, stateBeforeMutate: MutationState<TVar, TResponse, TError>) => void;
+    onSettled?: (variables: TVar, stateBeforeMutate: MutationState<TVar, TResponse, TError>) => void;
 };
-export declare const createMutation: <TVar, TResponse = any, TError = unknown>(mutationFn: (variables: TVar | undefined, state: MutationState<TVar, TResponse, TError>) => Promise<TResponse>, options?: CreateMutationOptions<TVar, TResponse, TError>) => import("./create-store").UseStore<MutationState<TVar, TResponse, TError>>;
+export declare const createMutation: <TVar, TResponse = any, TError = unknown>(mutationFn: (variables: TVar, state: MutationState<TVar, TResponse, TError>) => Promise<TResponse>, options?: CreateMutationOptions<TVar, TResponse, TError>) => UseMutation<TVar, TResponse, TError>;

package/esm/preact/create-mutation.js

@@ -10,7 +10,7 @@ export const createMutation = (mutationFn, options = {}) => {
         responseUpdatedAt: null,
         error: null,
         errorUpdatedAt: null,
-        mutate: (variables) => {
+        mutate: ((variables) => {
             set({ isWaiting: true });
             const stateBeforeMutate = get();
             onMutate(variables, stateBeforeMutate);
@@ -44,7 +44,7 @@ export const createMutation = (mutationFn, options = {}) => {
                     onSettled(variables, stateBeforeMutate);
                 });
             });
-        },
+        }),
     }), createStoreOptions);
     return useMutation;
 };

package/esm/preact/create-query.d.ts

@@ -1,5 +1,4 @@
 import { CreateStoresOptions, StoreKey, UseStores } from './create-stores';
-export type QueryStatus = 'loading' | 'success' | 'error';
 export type QueryState<TKey extends StoreKey = StoreKey, TResponse = any, TData = TResponse, TError = unknown> = {
     /**
      * Query store key, an object that will be hashed into a string as a query store identifier.
@@ -44,6 +43,20 @@ export type QueryState<TKey extends StoreKey = StoreKey, TResponse = any, TData
      * Network fetching status for fetching next page.
      */
     isWaitingNextPage: boolean;
+    isRefetching: boolean;
+    isRefetchError: boolean;
+    isPreviousData: boolean;
+    isOptimisticData: boolean;
+    error: TError | null;
+    errorUpdatedAt: number | null;
+    retryCount: number;
+    isGoingToRetry: boolean;
+    pageParam: any;
+    pageParams: any[];
+    hasNextPage: boolean;
+    retryNextPageCount: number;
+    isGoingToRetryNextPage: boolean;
+} & ({
     /**
      * Status of the data.
      *
@@ -56,39 +69,46 @@ export type QueryState<TKey extends StoreKey = StoreKey, TResponse = any, TData
      * It has no relation with network fetching state.
      * If you're looking for network fetching state, use `isWaiting` instead.
      */
-    status: QueryStatus;
+    status: 'loading';
     /**
      * Data state, will be `true` if the query has no data.
      *
      * It has no relation with network fetching state.
      * If you're looking for network fetching state, use `isWaiting` instead.
      */
-    isLoading: boolean;
+    isLoading: true;
     /**
      * Data state, will be `true` if the query has a data.
      */
-    isSuccess: boolean;
-    /**
-     * Error state, will be `true` after data fetching error.
-     */
-    isError: boolean;
-    isRefetching: boolean;
-    isRefetchError: boolean;
-    isPreviousData: boolean;
-    isOptimisticData: boolean;
-    data: TData | null;
-    response: TResponse | null;
-    responseUpdatedAt: number | null;
-    error: TError | null;
-    errorUpdatedAt: number | null;
-    retryCount: number;
-    isGoingToRetry: boolean;
-    pageParam: any;
-    pageParams: any[];
-    hasNextPage: boolean;
-    retryNextPageCount: number;
-    isGoingToRetryNextPage: boolean;
-};
+    isSuccess: false;
+    /**
+     * Error state, will be `true` if the query has no data but has an error.
+     *
+     * This will only happened if an error occured after first fetch.
+     *
+     * If data fetched successfully but then an error occured, `isError` will be `false` but `isRefetchError` will be `true`.
+     */
+    isError: false;
+    data: null;
+    response: null;
+    responseUpdatedAt: null;
+} | {
+    status: 'success';
+    isLoading: false;
+    isSuccess: true;
+    isError: false;
+    data: TData;
+    response: TResponse;
+    responseUpdatedAt: number;
+} | {
+    status: 'error';
+    isLoading: false;
+    isSuccess: false;
+    isError: true;
+    data: null;
+    response: null;
+    responseUpdatedAt: null;
+});
 export type CreateQueryOptions<TKey extends StoreKey = StoreKey, TResponse = any, TData = TResponse, TError = unknown> = CreateStoresOptions<TKey, QueryState<TKey, TResponse, TData, TError>> & {
     select?: (response: TResponse, state: Pick<QueryState<TKey, TResponse, TData, TError>, 'data' | 'key'>) => TData;
     /**

package/esm/preact/create-query.js

@@ -116,7 +116,7 @@ export const createQuery = (queryFn, options = {}) => {
                     const prevState = get();
                     const errorUpdatedAt = Date.now();
                     const { shouldRetry, delay } = getRetryProps(error, prevState.retryCount);
-                    set(prevState.isSuccess
+                    set(prevState.isSuccess && !prevState.isPreviousData
                         ? {
                             isWaiting: false,
                             isRefetching: false,
@@ -134,7 +134,9 @@ export const createQuery = (queryFn, options = {}) => {
                         }
                         : {
                             isWaiting: false,
+                            status: 'error',
                             isError: true,
+                            data: null,
                             error,
                             errorUpdatedAt,
                             isGoingToRetry: shouldRetry,
@@ -253,9 +255,12 @@ export const createQuery = (queryFn, options = {}) => {
                         const prevData = useQuery.get(prevKey);
                         if (prevData.data) {
                             useQuery.set(nextKey, {
+                                status: 'success',
+                                isLoading: false,
+                                isSuccess: true,
+                                isError: false,
                                 data: prevData.data,
                                 response: prevData.response,
-                                isLoading: false,
                                 isPreviousData: true,
                             }, true);
                         }

package/esm/react/create-mutation.d.ts

@@ -1,4 +1,5 @@
 import { InitStoreOptions } from '../vanilla';
+import { UseStore } from './create-store';
 export type MutationState<TVar, TResponse = any, TError = unknown> = {
     /**
      * Network fetching status.
@@ -13,16 +14,21 @@ export type MutationState<TVar, TResponse = any, TError = unknown> = {
     /**
      * Mutate function is a promise that will always resolve.
      */
-    mutate: (variables?: TVar) => Promise<{
+    mutate: TVar extends undefined ? () => Promise<{
+        response?: TResponse;
+        error?: TError;
+        variables?: TVar;
+    }> : (variables: TVar) => Promise<{
         response?: TResponse;
         error?: TError;
         variables?: TVar;
     }>;
 };
+export type UseMutation<TVar, TResponse = any, TError = unknown> = UseStore<MutationState<TVar, TResponse, TError>>;
 export type CreateMutationOptions<TVar, TResponse = any, TError = unknown> = InitStoreOptions<MutationState<TVar, TResponse, TError>> & {
-    onMutate?: (variables: TVar | undefined, stateBeforeMutate: MutationState<TVar, TResponse, TError>) => void;
-    onSuccess?: (response: TResponse, variables: TVar | undefined, stateBeforeMutate: MutationState<TVar, TResponse, TError>) => void;
-    onError?: (error: TError, variables: TVar | undefined, stateBeforeMutate: MutationState<TVar, TResponse, TError>) => void;
-    onSettled?: (variables: TVar | undefined, stateBeforeMutate: MutationState<TVar, TResponse, TError>) => void;
+    onMutate?: (variables: TVar, stateBeforeMutate: MutationState<TVar, TResponse, TError>) => void;
+    onSuccess?: (response: TResponse, variables: TVar, stateBeforeMutate: MutationState<TVar, TResponse, TError>) => void;
+    onError?: (error: TError, variables: TVar, stateBeforeMutate: MutationState<TVar, TResponse, TError>) => void;
+    onSettled?: (variables: TVar, stateBeforeMutate: MutationState<TVar, TResponse, TError>) => void;
 };
-export declare const createMutation: <TVar, TResponse = any, TError = unknown>(mutationFn: (variables: TVar | undefined, state: MutationState<TVar, TResponse, TError>) => Promise<TResponse>, options?: CreateMutationOptions<TVar, TResponse, TError>) => import("./create-store").UseStore<MutationState<TVar, TResponse, TError>>;
+export declare const createMutation: <TVar, TResponse = any, TError = unknown>(mutationFn: (variables: TVar, state: MutationState<TVar, TResponse, TError>) => Promise<TResponse>, options?: CreateMutationOptions<TVar, TResponse, TError>) => UseMutation<TVar, TResponse, TError>;

package/esm/react/create-mutation.js

@@ -10,7 +10,7 @@ export const createMutation = (mutationFn, options = {}) => {
         responseUpdatedAt: null,
         error: null,
         errorUpdatedAt: null,
-        mutate: (variables) => {
+        mutate: ((variables) => {
             set({ isWaiting: true });
             const stateBeforeMutate = get();
             onMutate(variables, stateBeforeMutate);
@@ -44,7 +44,7 @@ export const createMutation = (mutationFn, options = {}) => {
                     onSettled(variables, stateBeforeMutate);
                 });
             });
-        },
+        }),
     }), createStoreOptions);
     return useMutation;
 };

package/esm/react/create-query.d.ts

@@ -1,5 +1,4 @@
 import { CreateStoresOptions, StoreKey, UseStores } from './create-stores';
-export type QueryStatus = 'loading' | 'success' | 'error';
 export type QueryState<TKey extends StoreKey = StoreKey, TResponse = any, TData = TResponse, TError = unknown> = {
     /**
      * Query store key, an object that will be hashed into a string as a query store identifier.
@@ -44,6 +43,20 @@ export type QueryState<TKey extends StoreKey = StoreKey, TResponse = any, TData
      * Network fetching status for fetching next page.
      */
     isWaitingNextPage: boolean;
+    isRefetching: boolean;
+    isRefetchError: boolean;
+    isPreviousData: boolean;
+    isOptimisticData: boolean;
+    error: TError | null;
+    errorUpdatedAt: number | null;
+    retryCount: number;
+    isGoingToRetry: boolean;
+    pageParam: any;
+    pageParams: any[];
+    hasNextPage: boolean;
+    retryNextPageCount: number;
+    isGoingToRetryNextPage: boolean;
+} & ({
     /**
      * Status of the data.
      *
@@ -56,39 +69,46 @@ export type QueryState<TKey extends StoreKey = StoreKey, TResponse = any, TData
      * It has no relation with network fetching state.
      * If you're looking for network fetching state, use `isWaiting` instead.
      */
-    status: QueryStatus;
+    status: 'loading';
     /**
      * Data state, will be `true` if the query has no data.
      *
      * It has no relation with network fetching state.
      * If you're looking for network fetching state, use `isWaiting` instead.
      */
-    isLoading: boolean;
+    isLoading: true;
     /**
      * Data state, will be `true` if the query has a data.
      */
-    isSuccess: boolean;
-    /**
-     * Error state, will be `true` after data fetching error.
-     */
-    isError: boolean;
-    isRefetching: boolean;
-    isRefetchError: boolean;
-    isPreviousData: boolean;
-    isOptimisticData: boolean;
-    data: TData | null;
-    response: TResponse | null;
-    responseUpdatedAt: number | null;
-    error: TError | null;
-    errorUpdatedAt: number | null;
-    retryCount: number;
-    isGoingToRetry: boolean;
-    pageParam: any;
-    pageParams: any[];
-    hasNextPage: boolean;
-    retryNextPageCount: number;
-    isGoingToRetryNextPage: boolean;
-};
+    isSuccess: false;
+    /**
+     * Error state, will be `true` if the query has no data but has an error.
+     *
+     * This will only happened if an error occured after first fetch.
+     *
+     * If data fetched successfully but then an error occured, `isError` will be `false` but `isRefetchError` will be `true`.
+     */
+    isError: false;
+    data: null;
+    response: null;
+    responseUpdatedAt: null;
+} | {
+    status: 'success';
+    isLoading: false;
+    isSuccess: true;
+    isError: false;
+    data: TData;
+    response: TResponse;
+    responseUpdatedAt: number;
+} | {
+    status: 'error';
+    isLoading: false;
+    isSuccess: false;
+    isError: true;
+    data: null;
+    response: null;
+    responseUpdatedAt: null;
+});
 export type CreateQueryOptions<TKey extends StoreKey = StoreKey, TResponse = any, TData = TResponse, TError = unknown> = CreateStoresOptions<TKey, QueryState<TKey, TResponse, TData, TError>> & {
     select?: (response: TResponse, state: Pick<QueryState<TKey, TResponse, TData, TError>, 'data' | 'key'>) => TData;
     /**

package/esm/react/create-query.js

@@ -116,7 +116,7 @@ export const createQuery = (queryFn, options = {}) => {
                     const prevState = get();
                     const errorUpdatedAt = Date.now();
                     const { shouldRetry, delay } = getRetryProps(error, prevState.retryCount);
-                    set(prevState.isSuccess
+                    set(prevState.isSuccess && !prevState.isPreviousData
                         ? {
                             isWaiting: false,
                             isRefetching: false,
@@ -134,7 +134,9 @@ export const createQuery = (queryFn, options = {}) => {
                         }
                         : {
                             isWaiting: false,
+                            status: 'error',
                             isError: true,
+                            data: null,
                             error,
                             errorUpdatedAt,
                             isGoingToRetry: shouldRetry,
@@ -253,9 +255,12 @@ export const createQuery = (queryFn, options = {}) => {
                         const prevData = useQuery.get(prevKey);
                         if (prevData.data) {
                             useQuery.set(nextKey, {
+                                status: 'success',
+                                isLoading: false,
+                                isSuccess: true,
+                                isError: false,
                                 data: prevData.data,
                                 response: prevData.response,
-                                isLoading: false,
                                 isPreviousData: true,
                             }, true);
                         }

package/lib/preact/create-mutation.d.ts

@@ -1,4 +1,5 @@
 import { InitStoreOptions } from '../vanilla';
+import { UseStore } from './create-store';
 export type MutationState<TVar, TResponse = any, TError = unknown> = {
     /**
      * Network fetching status.
@@ -13,16 +14,21 @@ export type MutationState<TVar, TResponse = any, TError = unknown> = {
     /**
      * Mutate function is a promise that will always resolve.
      */
-    mutate: (variables?: TVar) => Promise<{
+    mutate: TVar extends undefined ? () => Promise<{
+        response?: TResponse;
+        error?: TError;
+        variables?: TVar;
+    }> : (variables: TVar) => Promise<{
         response?: TResponse;
         error?: TError;
         variables?: TVar;
     }>;
 };
+export type UseMutation<TVar, TResponse = any, TError = unknown> = UseStore<MutationState<TVar, TResponse, TError>>;
 export type CreateMutationOptions<TVar, TResponse = any, TError = unknown> = InitStoreOptions<MutationState<TVar, TResponse, TError>> & {
-    onMutate?: (variables: TVar | undefined, stateBeforeMutate: MutationState<TVar, TResponse, TError>) => void;
-    onSuccess?: (response: TResponse, variables: TVar | undefined, stateBeforeMutate: MutationState<TVar, TResponse, TError>) => void;
-    onError?: (error: TError, variables: TVar | undefined, stateBeforeMutate: MutationState<TVar, TResponse, TError>) => void;
-    onSettled?: (variables: TVar | undefined, stateBeforeMutate: MutationState<TVar, TResponse, TError>) => void;
+    onMutate?: (variables: TVar, stateBeforeMutate: MutationState<TVar, TResponse, TError>) => void;
+    onSuccess?: (response: TResponse, variables: TVar, stateBeforeMutate: MutationState<TVar, TResponse, TError>) => void;
+    onError?: (error: TError, variables: TVar, stateBeforeMutate: MutationState<TVar, TResponse, TError>) => void;
+    onSettled?: (variables: TVar, stateBeforeMutate: MutationState<TVar, TResponse, TError>) => void;
 };
-export declare const createMutation: <TVar, TResponse = any, TError = unknown>(mutationFn: (variables: TVar | undefined, state: MutationState<TVar, TResponse, TError>) => Promise<TResponse>, options?: CreateMutationOptions<TVar, TResponse, TError>) => import("./create-store").UseStore<MutationState<TVar, TResponse, TError>>;
+export declare const createMutation: <TVar, TResponse = any, TError = unknown>(mutationFn: (variables: TVar, state: MutationState<TVar, TResponse, TError>) => Promise<TResponse>, options?: CreateMutationOptions<TVar, TResponse, TError>) => UseMutation<TVar, TResponse, TError>;

package/lib/preact/create-mutation.js

@@ -13,7 +13,7 @@ const createMutation = (mutationFn, options = {}) => {
         responseUpdatedAt: null,
         error: null,
         errorUpdatedAt: null,
-        mutate: (variables) => {
+        mutate: ((variables) => {
             set({ isWaiting: true });
             const stateBeforeMutate = get();
             onMutate(variables, stateBeforeMutate);
@@ -47,7 +47,7 @@ const createMutation = (mutationFn, options = {}) => {
                     onSettled(variables, stateBeforeMutate);
                 });
             });
-        },
+        }),
     }), createStoreOptions);
     return useMutation;
 };

package/lib/preact/create-query.d.ts

@@ -1,5 +1,4 @@
 import { CreateStoresOptions, StoreKey, UseStores } from './create-stores';
-export type QueryStatus = 'loading' | 'success' | 'error';
 export type QueryState<TKey extends StoreKey = StoreKey, TResponse = any, TData = TResponse, TError = unknown> = {
     /**
      * Query store key, an object that will be hashed into a string as a query store identifier.
@@ -44,6 +43,20 @@ export type QueryState<TKey extends StoreKey = StoreKey, TResponse = any, TData
      * Network fetching status for fetching next page.
      */
     isWaitingNextPage: boolean;
+    isRefetching: boolean;
+    isRefetchError: boolean;
+    isPreviousData: boolean;
+    isOptimisticData: boolean;
+    error: TError | null;
+    errorUpdatedAt: number | null;
+    retryCount: number;
+    isGoingToRetry: boolean;
+    pageParam: any;
+    pageParams: any[];
+    hasNextPage: boolean;
+    retryNextPageCount: number;
+    isGoingToRetryNextPage: boolean;
+} & ({
     /**
      * Status of the data.
      *
@@ -56,39 +69,46 @@ export type QueryState<TKey extends StoreKey = StoreKey, TResponse = any, TData
      * It has no relation with network fetching state.
      * If you're looking for network fetching state, use `isWaiting` instead.
      */
-    status: QueryStatus;
+    status: 'loading';
     /**
      * Data state, will be `true` if the query has no data.
      *
      * It has no relation with network fetching state.
      * If you're looking for network fetching state, use `isWaiting` instead.
      */
-    isLoading: boolean;
+    isLoading: true;
     /**
      * Data state, will be `true` if the query has a data.
      */
-    isSuccess: boolean;
-    /**
-     * Error state, will be `true` after data fetching error.
-     */
-    isError: boolean;
-    isRefetching: boolean;
-    isRefetchError: boolean;
-    isPreviousData: boolean;
-    isOptimisticData: boolean;
-    data: TData | null;
-    response: TResponse | null;
-    responseUpdatedAt: number | null;
-    error: TError | null;
-    errorUpdatedAt: number | null;
-    retryCount: number;
-    isGoingToRetry: boolean;
-    pageParam: any;
-    pageParams: any[];
-    hasNextPage: boolean;
-    retryNextPageCount: number;
-    isGoingToRetryNextPage: boolean;
-};
+    isSuccess: false;
+    /**
+     * Error state, will be `true` if the query has no data but has an error.
+     *
+     * This will only happened if an error occured after first fetch.
+     *
+     * If data fetched successfully but then an error occured, `isError` will be `false` but `isRefetchError` will be `true`.
+     */
+    isError: false;
+    data: null;
+    response: null;
+    responseUpdatedAt: null;
+} | {
+    status: 'success';
+    isLoading: false;
+    isSuccess: true;
+    isError: false;
+    data: TData;
+    response: TResponse;
+    responseUpdatedAt: number;
+} | {
+    status: 'error';
+    isLoading: false;
+    isSuccess: false;
+    isError: true;
+    data: null;
+    response: null;
+    responseUpdatedAt: null;
+});
 export type CreateQueryOptions<TKey extends StoreKey = StoreKey, TResponse = any, TData = TResponse, TError = unknown> = CreateStoresOptions<TKey, QueryState<TKey, TResponse, TData, TError>> & {
     select?: (response: TResponse, state: Pick<QueryState<TKey, TResponse, TData, TError>, 'data' | 'key'>) => TData;
     /**

package/lib/preact/create-query.js

@@ -119,7 +119,7 @@ const createQuery = (queryFn, options = {}) => {
                     const prevState = get();
                     const errorUpdatedAt = Date.now();
                     const { shouldRetry, delay } = getRetryProps(error, prevState.retryCount);
-                    set(prevState.isSuccess
+                    set(prevState.isSuccess && !prevState.isPreviousData
                         ? {
                             isWaiting: false,
                             isRefetching: false,
@@ -137,7 +137,9 @@ const createQuery = (queryFn, options = {}) => {
                         }
                         : {
                             isWaiting: false,
+                            status: 'error',
                             isError: true,
+                            data: null,
                             error,
                             errorUpdatedAt,
                             isGoingToRetry: shouldRetry,
@@ -256,9 +258,12 @@ const createQuery = (queryFn, options = {}) => {
                         const prevData = useQuery.get(prevKey);
                         if (prevData.data) {
                             useQuery.set(nextKey, {
+                                status: 'success',
+                                isLoading: false,
+                                isSuccess: true,
+                                isError: false,
                                 data: prevData.data,
                                 response: prevData.response,
-                                isLoading: false,
                                 isPreviousData: true,
                             }, true);
                         }

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

@@ -1,4 +1,5 @@
 import { InitStoreOptions } from '../vanilla';
+import { UseStore } from './create-store';
 export type MutationState<TVar, TResponse = any, TError = unknown> = {
     /**
      * Network fetching status.
@@ -13,16 +14,21 @@ export type MutationState<TVar, TResponse = any, TError = unknown> = {
     /**
      * Mutate function is a promise that will always resolve.
      */
-    mutate: (variables?: TVar) => Promise<{
+    mutate: TVar extends undefined ? () => Promise<{
+        response?: TResponse;
+        error?: TError;
+        variables?: TVar;
+    }> : (variables: TVar) => Promise<{
         response?: TResponse;
         error?: TError;
         variables?: TVar;
     }>;
 };
+export type UseMutation<TVar, TResponse = any, TError = unknown> = UseStore<MutationState<TVar, TResponse, TError>>;
 export type CreateMutationOptions<TVar, TResponse = any, TError = unknown> = InitStoreOptions<MutationState<TVar, TResponse, TError>> & {
-    onMutate?: (variables: TVar | undefined, stateBeforeMutate: MutationState<TVar, TResponse, TError>) => void;
-    onSuccess?: (response: TResponse, variables: TVar | undefined, stateBeforeMutate: MutationState<TVar, TResponse, TError>) => void;
-    onError?: (error: TError, variables: TVar | undefined, stateBeforeMutate: MutationState<TVar, TResponse, TError>) => void;
-    onSettled?: (variables: TVar | undefined, stateBeforeMutate: MutationState<TVar, TResponse, TError>) => void;
+    onMutate?: (variables: TVar, stateBeforeMutate: MutationState<TVar, TResponse, TError>) => void;
+    onSuccess?: (response: TResponse, variables: TVar, stateBeforeMutate: MutationState<TVar, TResponse, TError>) => void;
+    onError?: (error: TError, variables: TVar, stateBeforeMutate: MutationState<TVar, TResponse, TError>) => void;
+    onSettled?: (variables: TVar, stateBeforeMutate: MutationState<TVar, TResponse, TError>) => void;
 };
-export declare const createMutation: <TVar, TResponse = any, TError = unknown>(mutationFn: (variables: TVar | undefined, state: MutationState<TVar, TResponse, TError>) => Promise<TResponse>, options?: CreateMutationOptions<TVar, TResponse, TError>) => import("./create-store").UseStore<MutationState<TVar, TResponse, TError>>;
+export declare const createMutation: <TVar, TResponse = any, TError = unknown>(mutationFn: (variables: TVar, state: MutationState<TVar, TResponse, TError>) => Promise<TResponse>, options?: CreateMutationOptions<TVar, TResponse, TError>) => UseMutation<TVar, TResponse, TError>;

package/lib/react/create-mutation.js

@@ -13,7 +13,7 @@ const createMutation = (mutationFn, options = {}) => {
         responseUpdatedAt: null,
         error: null,
         errorUpdatedAt: null,
-        mutate: (variables) => {
+        mutate: ((variables) => {
             set({ isWaiting: true });
             const stateBeforeMutate = get();
             onMutate(variables, stateBeforeMutate);
@@ -47,7 +47,7 @@ const createMutation = (mutationFn, options = {}) => {
                     onSettled(variables, stateBeforeMutate);
                 });
             });
-        },
+        }),
     }), createStoreOptions);
     return useMutation;
 };

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

@@ -1,5 +1,4 @@
 import { CreateStoresOptions, StoreKey, UseStores } from './create-stores';
-export type QueryStatus = 'loading' | 'success' | 'error';
 export type QueryState<TKey extends StoreKey = StoreKey, TResponse = any, TData = TResponse, TError = unknown> = {
     /**
      * Query store key, an object that will be hashed into a string as a query store identifier.
@@ -44,6 +43,20 @@ export type QueryState<TKey extends StoreKey = StoreKey, TResponse = any, TData
      * Network fetching status for fetching next page.
      */
     isWaitingNextPage: boolean;
+    isRefetching: boolean;
+    isRefetchError: boolean;
+    isPreviousData: boolean;
+    isOptimisticData: boolean;
+    error: TError | null;
+    errorUpdatedAt: number | null;
+    retryCount: number;
+    isGoingToRetry: boolean;
+    pageParam: any;
+    pageParams: any[];
+    hasNextPage: boolean;
+    retryNextPageCount: number;
+    isGoingToRetryNextPage: boolean;
+} & ({
     /**
      * Status of the data.
      *
@@ -56,39 +69,46 @@ export type QueryState<TKey extends StoreKey = StoreKey, TResponse = any, TData
      * It has no relation with network fetching state.
      * If you're looking for network fetching state, use `isWaiting` instead.
      */
-    status: QueryStatus;
+    status: 'loading';
     /**
      * Data state, will be `true` if the query has no data.
      *
      * It has no relation with network fetching state.
      * If you're looking for network fetching state, use `isWaiting` instead.
      */
-    isLoading: boolean;
+    isLoading: true;
     /**
      * Data state, will be `true` if the query has a data.
      */
-    isSuccess: boolean;
-    /**
-     * Error state, will be `true` after data fetching error.
-     */
-    isError: boolean;
-    isRefetching: boolean;
-    isRefetchError: boolean;
-    isPreviousData: boolean;
-    isOptimisticData: boolean;
-    data: TData | null;
-    response: TResponse | null;
-    responseUpdatedAt: number | null;
-    error: TError | null;
-    errorUpdatedAt: number | null;
-    retryCount: number;
-    isGoingToRetry: boolean;
-    pageParam: any;
-    pageParams: any[];
-    hasNextPage: boolean;
-    retryNextPageCount: number;
-    isGoingToRetryNextPage: boolean;
-};
+    isSuccess: false;
+    /**
+     * Error state, will be `true` if the query has no data but has an error.
+     *
+     * This will only happened if an error occured after first fetch.
+     *
+     * If data fetched successfully but then an error occured, `isError` will be `false` but `isRefetchError` will be `true`.
+     */
+    isError: false;
+    data: null;
+    response: null;
+    responseUpdatedAt: null;
+} | {
+    status: 'success';
+    isLoading: false;
+    isSuccess: true;
+    isError: false;
+    data: TData;
+    response: TResponse;
+    responseUpdatedAt: number;
+} | {
+    status: 'error';
+    isLoading: false;
+    isSuccess: false;
+    isError: true;
+    data: null;
+    response: null;
+    responseUpdatedAt: null;
+});
 export type CreateQueryOptions<TKey extends StoreKey = StoreKey, TResponse = any, TData = TResponse, TError = unknown> = CreateStoresOptions<TKey, QueryState<TKey, TResponse, TData, TError>> & {
     select?: (response: TResponse, state: Pick<QueryState<TKey, TResponse, TData, TError>, 'data' | 'key'>) => TData;
     /**

package/lib/react/create-query.js

@@ -119,7 +119,7 @@ const createQuery = (queryFn, options = {}) => {
                     const prevState = get();
                     const errorUpdatedAt = Date.now();
                     const { shouldRetry, delay } = getRetryProps(error, prevState.retryCount);
-                    set(prevState.isSuccess
+                    set(prevState.isSuccess && !prevState.isPreviousData
                         ? {
                             isWaiting: false,
                             isRefetching: false,
@@ -137,7 +137,9 @@ const createQuery = (queryFn, options = {}) => {
                         }
                         : {
                             isWaiting: false,
+                            status: 'error',
                             isError: true,
+                            data: null,
                             error,
                             errorUpdatedAt,
                             isGoingToRetry: shouldRetry,
@@ -256,9 +258,12 @@ const createQuery = (queryFn, options = {}) => {
                         const prevData = useQuery.get(prevKey);
                         if (prevData.data) {
                             useQuery.set(nextKey, {
+                                status: 'success',
+                                isLoading: false,
+                                isSuccess: true,
+                                isError: false,
                                 data: prevData.data,
                                 response: prevData.response,
-                                isLoading: false,
                                 isPreviousData: true,
                             }, true);
                         }

package/package.json

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