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

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

@@ -33,4 +33,7 @@ export type CreateMutationOptions<TVar, TResponse = any, TError = unknown> = Ini
     onError?: (error: TError, variables: TVar, stateBeforeMutate: MutationState<TVar, TResponse, TError>) => void;
     onSettled?: (variables: TVar, stateBeforeMutate: MutationState<TVar, TResponse, TError>) => void;
 };
+/**
+ * @see https://floppy-disk.vercel.app/docs/api#createmutation
+ */
 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

@@ -1,5 +1,8 @@
 import { noop } from '../utils';
 import { createStore } from './create-store';
+/**
+ * @see https://floppy-disk.vercel.app/docs/api#createmutation
+ */
 export const createMutation = (mutationFn, options = {}) => {
     const { onMutate = noop, onSuccess = noop, onError = noop, onSettled = noop, ...createStoreOptions } = options;
     const useMutation = createStore(({ set, get }) => ({

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

@@ -26,8 +26,10 @@ export type QueryState<TKey extends StoreKey = StoreKey, TResponse = any, TData
      * If the data is empty, it will just fetch the first page.
      *
      * You can ignore this if your query is not paginated.
+     *
+     * @returns Promise that will always get resolved.
      */
-    fetchNextPage: () => void;
+    fetchNextPage: () => Promise<QueryState<TKey, TResponse, TData, TError>>;
     /**
      * Set query state (data, error, etc) to initial state.
      */
@@ -198,7 +200,9 @@ export type CreateQueryOptions<TKey extends StoreKey = StoreKey, TResponse = any
      *
      * Disabled by default.
      *
-     * If the query is on error state, the polling interval will be disabled, and it will use `retry` instead.
+     * If last data fetching is failed, the polling interval will be disabled, and it will use `retry` mechanism instead.
+     *
+     * @see https://floppy-disk.vercel.app/docs/query/polling
      */
     refetchInterval?: number | false | ((state: QueryState<TKey, TResponse, TData, TError>) => number | false);
 };
@@ -258,4 +262,7 @@ export type UseQuery<TKey extends StoreKey = StoreKey, TResponse = any, TData =
         error?: FunctionComponent<TKey>;
     }) => JSX.Element;
 };
+/**
+ * @see https://floppy-disk.vercel.app/docs/api#createquery
+ */
 export declare const createQuery: <TKey extends StoreKey = StoreKey, TResponse = any, TData = TResponse, TError = unknown>(queryFn: (key: TKey, state: QueryState<TKey, TResponse, TData, TError>) => Promise<TResponse>, options?: CreateQueryOptions<TKey, TResponse, TData, TError>) => UseQuery<TKey, TResponse, TData, TError>;

package/esm/preact/create-query.js

@@ -32,6 +32,9 @@ const useQueryDefaultDeps = (state) => [
     state.isWaitingNextPage,
     state.hasNextPage,
 ];
+/**
+ * @see https://floppy-disk.vercel.app/docs/api#createquery
+ */
 export const createQuery = (queryFn, options = {}) => {
     const defaultFetchOnWindowFocus = options.fetchOnMount ?? true;
     const { onFirstSubscribe = noop, onSubscribe = noop, onLastUnsubscribe = noop, onBeforeChangeKey = noop, defaultDeps = useQueryDefaultDeps, select = identityFn, staleTime = 3000, // 3 seconds
@@ -84,7 +87,7 @@ export const createQuery = (queryFn, options = {}) => {
                     .then((response) => {
                     if (preventReplaceResponse.get(keyHash)) {
                         set({ isWaiting: false });
-                        return;
+                        return resolve(get());
                     }
                     responseAllPages.push(response);
                     const newPageParam = getNextPageParam(response, responseAllPages.length);
@@ -181,18 +184,27 @@ export const createQuery = (queryFn, options = {}) => {
                 return;
             forceFetch();
         };
-        const fetchNextPage = () => {
+        const fetchNextPage = () => new Promise((resolve) => {
+            const state = get();
             if (typeof options.getNextPageParam !== 'function') {
-                return console.warn('fetchNextPage with invalid getNextPageParam option');
+                console.warn('fetchNextPage with invalid getNextPageParam option');
+                return resolve(state);
             }
-            const state = get();
             const { isLoading, isWaitingNextPage, data, hasNextPage, pageParam, pageParams } = state;
             if (isLoading)
-                return forceFetch();
+                return resolve(forceFetch());
             if (isWaitingNextPage || !hasNextPage)
-                return;
+                return resolve(state);
+            let shouldcancel = false;
+            const cancel = () => {
+                shouldcancel = true;
+            };
+            onBeforeFetch(cancel, state);
+            if (shouldcancel)
+                return resolve(state);
             set({ isWaitingNextPage: true, isGoingToRetryNextPage: false });
             clearTimeout(retryNextPageTimeoutId.get(keyHash));
+            const stateBeforeCallQuery = get();
             queryFn(key, { ...state, pageParam })
                 .then((response) => {
                 const newPageParam = getNextPageParam(response, pageParams.length);
@@ -205,6 +217,8 @@ export const createQuery = (queryFn, options = {}) => {
                     pageParams: pageParams.concat(newPageParam),
                     hasNextPage: hasValue(newPageParam),
                 });
+                onSuccess(response, stateBeforeCallQuery);
+                resolve(get());
             })
                 .catch((error) => {
                 const prevState = get();
@@ -222,8 +236,13 @@ export const createQuery = (queryFn, options = {}) => {
                         fetchNextPage();
                     }, delay));
                 }
+                onError(error, stateBeforeCallQuery);
+                resolve(get());
+            })
+                .finally(() => {
+                onSettled(stateBeforeCallQuery);
             });
-        };
+        });
         return {
             ...INITIAL_QUERY_STATE,
             key,

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

@@ -23,6 +23,9 @@ export type UseStore<T extends StoreData> = {
     setDefaultValues: (values: SetStoreData<T>) => void;
     Watch: (props: WatchProps<T>) => any;
 };
+/**
+ * @see https://floppy-disk.vercel.app/docs/api#createstore
+ */
 export declare const createStore: <T extends StoreData>(initializer: StoreInitializer<T>, options?: InitStoreOptions<T> & {
     defaultDeps?: SelectDeps<T>;
 }) => UseStore<T>;

package/esm/preact/create-store.js

@@ -1,5 +1,8 @@
 import { useEffect, useState } from 'preact/hooks';
 import { initStore, } from '../vanilla';
+/**
+ * @see https://floppy-disk.vercel.app/docs/api#createstore
+ */
 export const createStore = (initializer, options = {}) => {
     const { get, set, subscribe, getSubscribers } = initStore(initializer, options);
     const { defaultDeps } = options;

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

@@ -46,5 +46,8 @@ export type CreateStoresOptions<TKey extends StoreKey = StoreKey, T extends Stor
     defaultDeps?: SelectDeps<T>;
     hashKeyFn?: (obj: TKey) => string;
 };
+/**
+ * @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/esm/preact/create-stores.js

@@ -1,6 +1,9 @@
 import { useEffect, useMemo, useRef, useState } from 'preact/hooks';
 import { hashStoreKey, noop } from '../utils';
 import { initStore, } from '../vanilla';
+/**
+ * @see https://floppy-disk.vercel.app/docs/api#createstores
+ */
 export const createStores = (initializer, options = {}) => {
     const { onBeforeChangeKey = noop, onStoreInitialized = noop, defaultDeps, hashKeyFn = hashStoreKey, } = options;
     const stores = new Map();

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

@@ -33,4 +33,7 @@ export type CreateMutationOptions<TVar, TResponse = any, TError = unknown> = Ini
     onError?: (error: TError, variables: TVar, stateBeforeMutate: MutationState<TVar, TResponse, TError>) => void;
     onSettled?: (variables: TVar, stateBeforeMutate: MutationState<TVar, TResponse, TError>) => void;
 };
+/**
+ * @see https://floppy-disk.vercel.app/docs/api#createmutation
+ */
 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

@@ -1,5 +1,8 @@
 import { noop } from '../utils';
 import { createStore } from './create-store';
+/**
+ * @see https://floppy-disk.vercel.app/docs/api#createmutation
+ */
 export const createMutation = (mutationFn, options = {}) => {
     const { onMutate = noop, onSuccess = noop, onError = noop, onSettled = noop, ...createStoreOptions } = options;
     const useMutation = createStore(({ set, get }) => ({

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

@@ -25,8 +25,10 @@ export type QueryState<TKey extends StoreKey = StoreKey, TResponse = any, TData
      * If the data is empty, it will just fetch the first page.
      *
      * You can ignore this if your query is not paginated.
+     *
+     * @returns Promise that will always get resolved.
      */
-    fetchNextPage: () => void;
+    fetchNextPage: () => Promise<QueryState<TKey, TResponse, TData, TError>>;
     /**
      * Set query state (data, error, etc) to initial state.
      */
@@ -197,7 +199,9 @@ export type CreateQueryOptions<TKey extends StoreKey = StoreKey, TResponse = any
      *
      * Disabled by default.
      *
-     * If the query is on error state, the polling interval will be disabled, and it will use `retry` instead.
+     * If last data fetching is failed, the polling interval will be disabled, and it will use `retry` mechanism instead.
+     *
+     * @see https://floppy-disk.vercel.app/docs/query/polling
      */
     refetchInterval?: number | false | ((state: QueryState<TKey, TResponse, TData, TError>) => number | false);
 };
@@ -257,4 +261,7 @@ export type UseQuery<TKey extends StoreKey = StoreKey, TResponse = any, TData =
         error?: FunctionComponent<TKey>;
     }) => JSX.Element;
 };
+/**
+ * @see https://floppy-disk.vercel.app/docs/api#createquery
+ */
 export declare const createQuery: <TKey extends StoreKey = StoreKey, TResponse = any, TData = TResponse, TError = unknown>(queryFn: (key: TKey, state: QueryState<TKey, TResponse, TData, TError>) => Promise<TResponse>, options?: CreateQueryOptions<TKey, TResponse, TData, TError>) => UseQuery<TKey, TResponse, TData, TError>;

package/esm/react/create-query.js

@@ -31,6 +31,9 @@ const useQueryDefaultDeps = (state) => [
     state.isWaitingNextPage,
     state.hasNextPage,
 ];
+/**
+ * @see https://floppy-disk.vercel.app/docs/api#createquery
+ */
 export const createQuery = (queryFn, options = {}) => {
     const defaultFetchOnWindowFocus = options.fetchOnMount ?? true;
     const { onFirstSubscribe = noop, onSubscribe = noop, onLastUnsubscribe = noop, onBeforeChangeKey = noop, defaultDeps = useQueryDefaultDeps, select = identityFn, staleTime = 3000, // 3 seconds
@@ -83,7 +86,7 @@ export const createQuery = (queryFn, options = {}) => {
                     .then((response) => {
                     if (preventReplaceResponse.get(keyHash)) {
                         set({ isWaiting: false });
-                        return;
+                        return resolve(get());
                     }
                     responseAllPages.push(response);
                     const newPageParam = getNextPageParam(response, responseAllPages.length);
@@ -180,18 +183,27 @@ export const createQuery = (queryFn, options = {}) => {
                 return;
             forceFetch();
         };
-        const fetchNextPage = () => {
+        const fetchNextPage = () => new Promise((resolve) => {
+            const state = get();
             if (typeof options.getNextPageParam !== 'function') {
-                return console.warn('fetchNextPage with invalid getNextPageParam option');
+                console.warn('fetchNextPage with invalid getNextPageParam option');
+                return resolve(state);
             }
-            const state = get();
             const { isLoading, isWaitingNextPage, data, hasNextPage, pageParam, pageParams } = state;
             if (isLoading)
-                return forceFetch();
+                return resolve(forceFetch());
             if (isWaitingNextPage || !hasNextPage)
-                return;
+                return resolve(state);
+            let shouldcancel = false;
+            const cancel = () => {
+                shouldcancel = true;
+            };
+            onBeforeFetch(cancel, state);
+            if (shouldcancel)
+                return resolve(state);
             set({ isWaitingNextPage: true, isGoingToRetryNextPage: false });
             clearTimeout(retryNextPageTimeoutId.get(keyHash));
+            const stateBeforeCallQuery = get();
             queryFn(key, { ...state, pageParam })
                 .then((response) => {
                 const newPageParam = getNextPageParam(response, pageParams.length);
@@ -204,6 +216,8 @@ export const createQuery = (queryFn, options = {}) => {
                     pageParams: pageParams.concat(newPageParam),
                     hasNextPage: hasValue(newPageParam),
                 });
+                onSuccess(response, stateBeforeCallQuery);
+                resolve(get());
             })
                 .catch((error) => {
                 const prevState = get();
@@ -221,8 +235,13 @@ export const createQuery = (queryFn, options = {}) => {
                         fetchNextPage();
                     }, delay));
                 }
+                onError(error, stateBeforeCallQuery);
+                resolve(get());
+            })
+                .finally(() => {
+                onSettled(stateBeforeCallQuery);
             });
-        };
+        });
         return {
             ...INITIAL_QUERY_STATE,
             key,

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

@@ -23,6 +23,9 @@ export type UseStore<T extends StoreData> = {
     setDefaultValues: (values: SetStoreData<T>) => void;
     Watch: (props: WatchProps<T>) => any;
 };
+/**
+ * @see https://floppy-disk.vercel.app/docs/api#createstore
+ */
 export declare const createStore: <T extends StoreData>(initializer: StoreInitializer<T>, options?: InitStoreOptions<T> & {
     defaultDeps?: SelectDeps<T>;
 }) => UseStore<T>;

package/esm/react/create-store.js

@@ -1,5 +1,8 @@
 import { useEffect, useState } from 'react';
 import { initStore, } from '../vanilla';
+/**
+ * @see https://floppy-disk.vercel.app/docs/api#createstore
+ */
 export const createStore = (initializer, options = {}) => {
     const { get, set, subscribe, getSubscribers } = initStore(initializer, options);
     const { defaultDeps } = options;

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

@@ -46,5 +46,8 @@ export type CreateStoresOptions<TKey extends StoreKey = StoreKey, T extends Stor
     defaultDeps?: SelectDeps<T>;
     hashKeyFn?: (obj: TKey) => string;
 };
+/**
+ * @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/esm/react/create-stores.js

@@ -1,6 +1,9 @@
 import { useEffect, useMemo, useRef, useState } from 'react';
 import { hashStoreKey, noop } from '../utils';
 import { initStore, } from '../vanilla';
+/**
+ * @see https://floppy-disk.vercel.app/docs/api#createstores
+ */
 export const createStores = (initializer, options = {}) => {
     const { onBeforeChangeKey = noop, onStoreInitialized = noop, defaultDeps, hashKeyFn = hashStoreKey, } = options;
     const stores = new Map();

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

@@ -33,4 +33,7 @@ export type CreateMutationOptions<TVar, TResponse = any, TError = unknown> = Ini
     onError?: (error: TError, variables: TVar, stateBeforeMutate: MutationState<TVar, TResponse, TError>) => void;
     onSettled?: (variables: TVar, stateBeforeMutate: MutationState<TVar, TResponse, TError>) => void;
 };
+/**
+ * @see https://floppy-disk.vercel.app/docs/api#createmutation
+ */
 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

@@ -3,6 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createMutation = void 0;
 const utils_1 = require("../utils");
 const create_store_1 = require("./create-store");
+/**
+ * @see https://floppy-disk.vercel.app/docs/api#createmutation
+ */
 const createMutation = (mutationFn, options = {}) => {
     const { onMutate = utils_1.noop, onSuccess = utils_1.noop, onError = utils_1.noop, onSettled = utils_1.noop, ...createStoreOptions } = options;
     const useMutation = (0, create_store_1.createStore)(({ set, get }) => ({

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

@@ -26,8 +26,10 @@ export type QueryState<TKey extends StoreKey = StoreKey, TResponse = any, TData
      * If the data is empty, it will just fetch the first page.
      *
      * You can ignore this if your query is not paginated.
+     *
+     * @returns Promise that will always get resolved.
      */
-    fetchNextPage: () => void;
+    fetchNextPage: () => Promise<QueryState<TKey, TResponse, TData, TError>>;
     /**
      * Set query state (data, error, etc) to initial state.
      */
@@ -198,7 +200,9 @@ export type CreateQueryOptions<TKey extends StoreKey = StoreKey, TResponse = any
      *
      * Disabled by default.
      *
-     * If the query is on error state, the polling interval will be disabled, and it will use `retry` instead.
+     * If last data fetching is failed, the polling interval will be disabled, and it will use `retry` mechanism instead.
+     *
+     * @see https://floppy-disk.vercel.app/docs/query/polling
      */
     refetchInterval?: number | false | ((state: QueryState<TKey, TResponse, TData, TError>) => number | false);
 };
@@ -258,4 +262,7 @@ export type UseQuery<TKey extends StoreKey = StoreKey, TResponse = any, TData =
         error?: FunctionComponent<TKey>;
     }) => JSX.Element;
 };
+/**
+ * @see https://floppy-disk.vercel.app/docs/api#createquery
+ */
 export declare const createQuery: <TKey extends StoreKey = StoreKey, TResponse = any, TData = TResponse, TError = unknown>(queryFn: (key: TKey, state: QueryState<TKey, TResponse, TData, TError>) => Promise<TResponse>, options?: CreateQueryOptions<TKey, TResponse, TData, TError>) => UseQuery<TKey, TResponse, TData, TError>;

package/lib/preact/create-query.js

@@ -35,6 +35,9 @@ const useQueryDefaultDeps = (state) => [
     state.isWaitingNextPage,
     state.hasNextPage,
 ];
+/**
+ * @see https://floppy-disk.vercel.app/docs/api#createquery
+ */
 const createQuery = (queryFn, options = {}) => {
     const defaultFetchOnWindowFocus = options.fetchOnMount ?? true;
     const { onFirstSubscribe = utils_1.noop, onSubscribe = utils_1.noop, onLastUnsubscribe = utils_1.noop, onBeforeChangeKey = utils_1.noop, defaultDeps = useQueryDefaultDeps, select = utils_1.identityFn, staleTime = 3000, // 3 seconds
@@ -87,7 +90,7 @@ const createQuery = (queryFn, options = {}) => {
                     .then((response) => {
                     if (preventReplaceResponse.get(keyHash)) {
                         set({ isWaiting: false });
-                        return;
+                        return resolve(get());
                     }
                     responseAllPages.push(response);
                     const newPageParam = getNextPageParam(response, responseAllPages.length);
@@ -184,18 +187,27 @@ const createQuery = (queryFn, options = {}) => {
                 return;
             forceFetch();
         };
-        const fetchNextPage = () => {
+        const fetchNextPage = () => new Promise((resolve) => {
+            const state = get();
             if (typeof options.getNextPageParam !== 'function') {
-                return console.warn('fetchNextPage with invalid getNextPageParam option');
+                console.warn('fetchNextPage with invalid getNextPageParam option');
+                return resolve(state);
             }
-            const state = get();
             const { isLoading, isWaitingNextPage, data, hasNextPage, pageParam, pageParams } = state;
             if (isLoading)
-                return forceFetch();
+                return resolve(forceFetch());
             if (isWaitingNextPage || !hasNextPage)
-                return;
+                return resolve(state);
+            let shouldcancel = false;
+            const cancel = () => {
+                shouldcancel = true;
+            };
+            onBeforeFetch(cancel, state);
+            if (shouldcancel)
+                return resolve(state);
             set({ isWaitingNextPage: true, isGoingToRetryNextPage: false });
             clearTimeout(retryNextPageTimeoutId.get(keyHash));
+            const stateBeforeCallQuery = get();
             queryFn(key, { ...state, pageParam })
                 .then((response) => {
                 const newPageParam = getNextPageParam(response, pageParams.length);
@@ -208,6 +220,8 @@ const createQuery = (queryFn, options = {}) => {
                     pageParams: pageParams.concat(newPageParam),
                     hasNextPage: (0, utils_1.hasValue)(newPageParam),
                 });
+                onSuccess(response, stateBeforeCallQuery);
+                resolve(get());
             })
                 .catch((error) => {
                 const prevState = get();
@@ -225,8 +239,13 @@ const createQuery = (queryFn, options = {}) => {
                         fetchNextPage();
                     }, delay));
                 }
+                onError(error, stateBeforeCallQuery);
+                resolve(get());
+            })
+                .finally(() => {
+                onSettled(stateBeforeCallQuery);
             });
-        };
+        });
         return {
             ...INITIAL_QUERY_STATE,
             key,

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

@@ -23,6 +23,9 @@ export type UseStore<T extends StoreData> = {
     setDefaultValues: (values: SetStoreData<T>) => void;
     Watch: (props: WatchProps<T>) => any;
 };
+/**
+ * @see https://floppy-disk.vercel.app/docs/api#createstore
+ */
 export declare const createStore: <T extends StoreData>(initializer: StoreInitializer<T>, options?: InitStoreOptions<T> & {
     defaultDeps?: SelectDeps<T>;
 }) => UseStore<T>;

package/lib/preact/create-store.js

@@ -3,6 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createStore = void 0;
 const hooks_1 = require("preact/hooks");
 const vanilla_1 = require("../vanilla");
+/**
+ * @see https://floppy-disk.vercel.app/docs/api#createstore
+ */
 const createStore = (initializer, options = {}) => {
     const { get, set, subscribe, getSubscribers } = (0, vanilla_1.initStore)(initializer, options);
     const { defaultDeps } = options;

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

@@ -46,5 +46,8 @@ export type CreateStoresOptions<TKey extends StoreKey = StoreKey, T extends Stor
     defaultDeps?: SelectDeps<T>;
     hashKeyFn?: (obj: TKey) => string;
 };
+/**
+ * @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/preact/create-stores.js

@@ -4,6 +4,9 @@ exports.createStores = void 0;
 const hooks_1 = require("preact/hooks");
 const utils_1 = require("../utils");
 const vanilla_1 = require("../vanilla");
+/**
+ * @see https://floppy-disk.vercel.app/docs/api#createstores
+ */
 const createStores = (initializer, options = {}) => {
     const { onBeforeChangeKey = utils_1.noop, onStoreInitialized = utils_1.noop, defaultDeps, hashKeyFn = utils_1.hashStoreKey, } = options;
     const stores = new Map();

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

@@ -33,4 +33,7 @@ export type CreateMutationOptions<TVar, TResponse = any, TError = unknown> = Ini
     onError?: (error: TError, variables: TVar, stateBeforeMutate: MutationState<TVar, TResponse, TError>) => void;
     onSettled?: (variables: TVar, stateBeforeMutate: MutationState<TVar, TResponse, TError>) => void;
 };
+/**
+ * @see https://floppy-disk.vercel.app/docs/api#createmutation
+ */
 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

@@ -3,6 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createMutation = void 0;
 const utils_1 = require("../utils");
 const create_store_1 = require("./create-store");
+/**
+ * @see https://floppy-disk.vercel.app/docs/api#createmutation
+ */
 const createMutation = (mutationFn, options = {}) => {
     const { onMutate = utils_1.noop, onSuccess = utils_1.noop, onError = utils_1.noop, onSettled = utils_1.noop, ...createStoreOptions } = options;
     const useMutation = (0, create_store_1.createStore)(({ set, get }) => ({

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

@@ -25,8 +25,10 @@ export type QueryState<TKey extends StoreKey = StoreKey, TResponse = any, TData
      * If the data is empty, it will just fetch the first page.
      *
      * You can ignore this if your query is not paginated.
+     *
+     * @returns Promise that will always get resolved.
      */
-    fetchNextPage: () => void;
+    fetchNextPage: () => Promise<QueryState<TKey, TResponse, TData, TError>>;
     /**
      * Set query state (data, error, etc) to initial state.
      */
@@ -197,7 +199,9 @@ export type CreateQueryOptions<TKey extends StoreKey = StoreKey, TResponse = any
      *
      * Disabled by default.
      *
-     * If the query is on error state, the polling interval will be disabled, and it will use `retry` instead.
+     * If last data fetching is failed, the polling interval will be disabled, and it will use `retry` mechanism instead.
+     *
+     * @see https://floppy-disk.vercel.app/docs/query/polling
      */
     refetchInterval?: number | false | ((state: QueryState<TKey, TResponse, TData, TError>) => number | false);
 };
@@ -257,4 +261,7 @@ export type UseQuery<TKey extends StoreKey = StoreKey, TResponse = any, TData =
         error?: FunctionComponent<TKey>;
     }) => JSX.Element;
 };
+/**
+ * @see https://floppy-disk.vercel.app/docs/api#createquery
+ */
 export declare const createQuery: <TKey extends StoreKey = StoreKey, TResponse = any, TData = TResponse, TError = unknown>(queryFn: (key: TKey, state: QueryState<TKey, TResponse, TData, TError>) => Promise<TResponse>, options?: CreateQueryOptions<TKey, TResponse, TData, TError>) => UseQuery<TKey, TResponse, TData, TError>;

package/lib/react/create-query.js

@@ -34,6 +34,9 @@ const useQueryDefaultDeps = (state) => [
     state.isWaitingNextPage,
     state.hasNextPage,
 ];
+/**
+ * @see https://floppy-disk.vercel.app/docs/api#createquery
+ */
 const createQuery = (queryFn, options = {}) => {
     const defaultFetchOnWindowFocus = options.fetchOnMount ?? true;
     const { onFirstSubscribe = utils_1.noop, onSubscribe = utils_1.noop, onLastUnsubscribe = utils_1.noop, onBeforeChangeKey = utils_1.noop, defaultDeps = useQueryDefaultDeps, select = utils_1.identityFn, staleTime = 3000, // 3 seconds
@@ -86,7 +89,7 @@ const createQuery = (queryFn, options = {}) => {
                     .then((response) => {
                     if (preventReplaceResponse.get(keyHash)) {
                         set({ isWaiting: false });
-                        return;
+                        return resolve(get());
                     }
                     responseAllPages.push(response);
                     const newPageParam = getNextPageParam(response, responseAllPages.length);
@@ -183,18 +186,27 @@ const createQuery = (queryFn, options = {}) => {
                 return;
             forceFetch();
         };
-        const fetchNextPage = () => {
+        const fetchNextPage = () => new Promise((resolve) => {
+            const state = get();
             if (typeof options.getNextPageParam !== 'function') {
-                return console.warn('fetchNextPage with invalid getNextPageParam option');
+                console.warn('fetchNextPage with invalid getNextPageParam option');
+                return resolve(state);
             }
-            const state = get();
             const { isLoading, isWaitingNextPage, data, hasNextPage, pageParam, pageParams } = state;
             if (isLoading)
-                return forceFetch();
+                return resolve(forceFetch());
             if (isWaitingNextPage || !hasNextPage)
-                return;
+                return resolve(state);
+            let shouldcancel = false;
+            const cancel = () => {
+                shouldcancel = true;
+            };
+            onBeforeFetch(cancel, state);
+            if (shouldcancel)
+                return resolve(state);
             set({ isWaitingNextPage: true, isGoingToRetryNextPage: false });
             clearTimeout(retryNextPageTimeoutId.get(keyHash));
+            const stateBeforeCallQuery = get();
             queryFn(key, { ...state, pageParam })
                 .then((response) => {
                 const newPageParam = getNextPageParam(response, pageParams.length);
@@ -207,6 +219,8 @@ const createQuery = (queryFn, options = {}) => {
                     pageParams: pageParams.concat(newPageParam),
                     hasNextPage: (0, utils_1.hasValue)(newPageParam),
                 });
+                onSuccess(response, stateBeforeCallQuery);
+                resolve(get());
             })
                 .catch((error) => {
                 const prevState = get();
@@ -224,8 +238,13 @@ const createQuery = (queryFn, options = {}) => {
                         fetchNextPage();
                     }, delay));
                 }
+                onError(error, stateBeforeCallQuery);
+                resolve(get());
+            })
+                .finally(() => {
+                onSettled(stateBeforeCallQuery);
             });
-        };
+        });
         return {
             ...INITIAL_QUERY_STATE,
             key,

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

@@ -23,6 +23,9 @@ export type UseStore<T extends StoreData> = {
     setDefaultValues: (values: SetStoreData<T>) => void;
     Watch: (props: WatchProps<T>) => any;
 };
+/**
+ * @see https://floppy-disk.vercel.app/docs/api#createstore
+ */
 export declare const createStore: <T extends StoreData>(initializer: StoreInitializer<T>, options?: InitStoreOptions<T> & {
     defaultDeps?: SelectDeps<T>;
 }) => UseStore<T>;

package/lib/react/create-store.js

@@ -3,6 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createStore = void 0;
 const react_1 = require("react");
 const vanilla_1 = require("../vanilla");
+/**
+ * @see https://floppy-disk.vercel.app/docs/api#createstore
+ */
 const createStore = (initializer, options = {}) => {
     const { get, set, subscribe, getSubscribers } = (0, vanilla_1.initStore)(initializer, options);
     const { defaultDeps } = options;

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

@@ -46,5 +46,8 @@ export type CreateStoresOptions<TKey extends StoreKey = StoreKey, T extends Stor
     defaultDeps?: SelectDeps<T>;
     hashKeyFn?: (obj: TKey) => string;
 };
+/**
+ * @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/react/create-stores.js

@@ -4,6 +4,9 @@ exports.createStores = void 0;
 const react_1 = require("react");
 const utils_1 = require("../utils");
 const vanilla_1 = require("../vanilla");
+/**
+ * @see https://floppy-disk.vercel.app/docs/api#createstores
+ */
 const createStores = (initializer, options = {}) => {
     const { onBeforeChangeKey = utils_1.noop, onStoreInitialized = utils_1.noop, defaultDeps, hashKeyFn = utils_1.hashStoreKey, } = options;
     const stores = new Map();

package/package.json

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