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

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

@@ -132,7 +132,10 @@ export type CreateQueryOptions<TKey extends StoreKey = StoreKey, TResponse = any
      */
     fetchOnMount?: boolean | 'always' | ((key: TKey) => boolean | 'always');
     /**
-     * Defaults to `true`.
+     * Defaults to follow the value of `fetchOnMount`.
+     *
+     * `fetchOnMount` and `fetchOnWindowFocus` can be set to different values.
+     * However, if `fetchOnWindowFocus` is not explicitly set, it will mimic the value of `fetchOnMount`.
      *
      * - If set to `true`, the query will be called on window focus **if the data is stale**.
      * - If set to `false`, the query won't be called on window focus.
@@ -152,13 +155,13 @@ export type CreateQueryOptions<TKey extends StoreKey = StoreKey, TResponse = any
      *
      * Defaults to `1`.
      */
-    retry?: number | ((error: TError, key: TKey) => number);
+    retry?: number | ((error: TError, prevState: QueryState<TKey, TResponse, TData, TError>) => number);
     /**
      * Error retry delay in miliseconds.
      *
      * Defaults to `2000` (2 seconds).
      */
-    retryDelay?: number | ((error: TError, key: TKey) => number);
+    retryDelay?: number | ((error: TError, prevState: QueryState<TKey, TResponse, TData, TError>) => number);
     /**
      * If set to `true`, previous `data` will be kept when fetching new data because the query key changed.
      *

package/esm/preact/create-query.js

@@ -40,7 +40,7 @@ const useQueryDefaultDeps = (state) => [
     state.hasNextPage,
 ];
 export const createQuery = (queryFn, options = {}) => {
-    const defaultFetchOnWindowFocus = options.fetchOnMount !== false;
+    const defaultFetchOnWindowFocus = options.fetchOnMount ?? true;
     const { onFirstSubscribe = noop, onSubscribe = noop, onLastUnsubscribe = noop, onBeforeChangeKey = noop, defaultDeps = useQueryDefaultDeps, select = identityFn, staleTime = 3000, // 3 seconds
     fetchOnMount = true, fetchOnWindowFocus = defaultFetchOnWindowFocus, enabled = true, retry = 1, retryDelay = 2000, // 2 seconds
     keepPreviousData, getNextPageParam = () => undefined, onSuccess = noop, onError = noop, onSettled = noop, ...createStoresOptions } = options;
@@ -50,9 +50,10 @@ export const createQuery = (queryFn, options = {}) => {
     const useQuery = createStores(({ get, set, key: _key, keyHash }) => {
         const key = _key;
         const getRetryProps = (error, retryCount) => {
-            const maxRetryCount = (typeof retry === 'function' ? retry(error, key) : retry) || 0;
+            const prevState = get();
+            const maxRetryCount = (typeof retry === 'function' ? retry(error, prevState) : retry) || 0;
             const shouldRetry = retryCount < maxRetryCount;
-            const delay = (typeof retryDelay === 'function' ? retryDelay(error, key) : retryDelay) || 0;
+            const delay = (typeof retryDelay === 'function' ? retryDelay(error, prevState) : retryDelay) || 0;
             return { shouldRetry, delay };
         };
         const forceFetch = () => {

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

@@ -132,7 +132,10 @@ export type CreateQueryOptions<TKey extends StoreKey = StoreKey, TResponse = any
      */
     fetchOnMount?: boolean | 'always' | ((key: TKey) => boolean | 'always');
     /**
-     * Defaults to `true`.
+     * Defaults to follow the value of `fetchOnMount`.
+     *
+     * `fetchOnMount` and `fetchOnWindowFocus` can be set to different values.
+     * However, if `fetchOnWindowFocus` is not explicitly set, it will mimic the value of `fetchOnMount`.
      *
      * - If set to `true`, the query will be called on window focus **if the data is stale**.
      * - If set to `false`, the query won't be called on window focus.
@@ -152,13 +155,13 @@ export type CreateQueryOptions<TKey extends StoreKey = StoreKey, TResponse = any
      *
      * Defaults to `1`.
      */
-    retry?: number | ((error: TError, key: TKey) => number);
+    retry?: number | ((error: TError, prevState: QueryState<TKey, TResponse, TData, TError>) => number);
     /**
      * Error retry delay in miliseconds.
      *
      * Defaults to `2000` (2 seconds).
      */
-    retryDelay?: number | ((error: TError, key: TKey) => number);
+    retryDelay?: number | ((error: TError, prevState: QueryState<TKey, TResponse, TData, TError>) => number);
     /**
      * If set to `true`, previous `data` will be kept when fetching new data because the query key changed.
      *

package/esm/react/create-query.js

@@ -40,7 +40,7 @@ const useQueryDefaultDeps = (state) => [
     state.hasNextPage,
 ];
 export const createQuery = (queryFn, options = {}) => {
-    const defaultFetchOnWindowFocus = options.fetchOnMount !== false;
+    const defaultFetchOnWindowFocus = options.fetchOnMount ?? true;
     const { onFirstSubscribe = noop, onSubscribe = noop, onLastUnsubscribe = noop, onBeforeChangeKey = noop, defaultDeps = useQueryDefaultDeps, select = identityFn, staleTime = 3000, // 3 seconds
     fetchOnMount = true, fetchOnWindowFocus = defaultFetchOnWindowFocus, enabled = true, retry = 1, retryDelay = 2000, // 2 seconds
     keepPreviousData, getNextPageParam = () => undefined, onSuccess = noop, onError = noop, onSettled = noop, ...createStoresOptions } = options;
@@ -50,9 +50,10 @@ export const createQuery = (queryFn, options = {}) => {
     const useQuery = createStores(({ get, set, key: _key, keyHash }) => {
         const key = _key;
         const getRetryProps = (error, retryCount) => {
-            const maxRetryCount = (typeof retry === 'function' ? retry(error, key) : retry) || 0;
+            const prevState = get();
+            const maxRetryCount = (typeof retry === 'function' ? retry(error, prevState) : retry) || 0;
             const shouldRetry = retryCount < maxRetryCount;
-            const delay = (typeof retryDelay === 'function' ? retryDelay(error, key) : retryDelay) || 0;
+            const delay = (typeof retryDelay === 'function' ? retryDelay(error, prevState) : retryDelay) || 0;
             return { shouldRetry, delay };
         };
         const forceFetch = () => {

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

@@ -132,7 +132,10 @@ export type CreateQueryOptions<TKey extends StoreKey = StoreKey, TResponse = any
      */
     fetchOnMount?: boolean | 'always' | ((key: TKey) => boolean | 'always');
     /**
-     * Defaults to `true`.
+     * Defaults to follow the value of `fetchOnMount`.
+     *
+     * `fetchOnMount` and `fetchOnWindowFocus` can be set to different values.
+     * However, if `fetchOnWindowFocus` is not explicitly set, it will mimic the value of `fetchOnMount`.
      *
      * - If set to `true`, the query will be called on window focus **if the data is stale**.
      * - If set to `false`, the query won't be called on window focus.
@@ -152,13 +155,13 @@ export type CreateQueryOptions<TKey extends StoreKey = StoreKey, TResponse = any
      *
      * Defaults to `1`.
      */
-    retry?: number | ((error: TError, key: TKey) => number);
+    retry?: number | ((error: TError, prevState: QueryState<TKey, TResponse, TData, TError>) => number);
     /**
      * Error retry delay in miliseconds.
      *
      * Defaults to `2000` (2 seconds).
      */
-    retryDelay?: number | ((error: TError, key: TKey) => number);
+    retryDelay?: number | ((error: TError, prevState: QueryState<TKey, TResponse, TData, TError>) => number);
     /**
      * If set to `true`, previous `data` will be kept when fetching new data because the query key changed.
      *

package/lib/preact/create-query.js

@@ -43,7 +43,7 @@ const useQueryDefaultDeps = (state) => [
     state.hasNextPage,
 ];
 const createQuery = (queryFn, options = {}) => {
-    const defaultFetchOnWindowFocus = options.fetchOnMount !== false;
+    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
     fetchOnMount = true, fetchOnWindowFocus = defaultFetchOnWindowFocus, enabled = true, retry = 1, retryDelay = 2000, // 2 seconds
     keepPreviousData, getNextPageParam = () => undefined, onSuccess = utils_1.noop, onError = utils_1.noop, onSettled = utils_1.noop, ...createStoresOptions } = options;
@@ -53,9 +53,10 @@ const createQuery = (queryFn, options = {}) => {
     const useQuery = (0, create_stores_1.createStores)(({ get, set, key: _key, keyHash }) => {
         const key = _key;
         const getRetryProps = (error, retryCount) => {
-            const maxRetryCount = (typeof retry === 'function' ? retry(error, key) : retry) || 0;
+            const prevState = get();
+            const maxRetryCount = (typeof retry === 'function' ? retry(error, prevState) : retry) || 0;
             const shouldRetry = retryCount < maxRetryCount;
-            const delay = (typeof retryDelay === 'function' ? retryDelay(error, key) : retryDelay) || 0;
+            const delay = (typeof retryDelay === 'function' ? retryDelay(error, prevState) : retryDelay) || 0;
             return { shouldRetry, delay };
         };
         const forceFetch = () => {

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

@@ -132,7 +132,10 @@ export type CreateQueryOptions<TKey extends StoreKey = StoreKey, TResponse = any
      */
     fetchOnMount?: boolean | 'always' | ((key: TKey) => boolean | 'always');
     /**
-     * Defaults to `true`.
+     * Defaults to follow the value of `fetchOnMount`.
+     *
+     * `fetchOnMount` and `fetchOnWindowFocus` can be set to different values.
+     * However, if `fetchOnWindowFocus` is not explicitly set, it will mimic the value of `fetchOnMount`.
      *
      * - If set to `true`, the query will be called on window focus **if the data is stale**.
      * - If set to `false`, the query won't be called on window focus.
@@ -152,13 +155,13 @@ export type CreateQueryOptions<TKey extends StoreKey = StoreKey, TResponse = any
      *
      * Defaults to `1`.
      */
-    retry?: number | ((error: TError, key: TKey) => number);
+    retry?: number | ((error: TError, prevState: QueryState<TKey, TResponse, TData, TError>) => number);
     /**
      * Error retry delay in miliseconds.
      *
      * Defaults to `2000` (2 seconds).
      */
-    retryDelay?: number | ((error: TError, key: TKey) => number);
+    retryDelay?: number | ((error: TError, prevState: QueryState<TKey, TResponse, TData, TError>) => number);
     /**
      * If set to `true`, previous `data` will be kept when fetching new data because the query key changed.
      *

package/lib/react/create-query.js

@@ -43,7 +43,7 @@ const useQueryDefaultDeps = (state) => [
     state.hasNextPage,
 ];
 const createQuery = (queryFn, options = {}) => {
-    const defaultFetchOnWindowFocus = options.fetchOnMount !== false;
+    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
     fetchOnMount = true, fetchOnWindowFocus = defaultFetchOnWindowFocus, enabled = true, retry = 1, retryDelay = 2000, // 2 seconds
     keepPreviousData, getNextPageParam = () => undefined, onSuccess = utils_1.noop, onError = utils_1.noop, onSettled = utils_1.noop, ...createStoresOptions } = options;
@@ -53,9 +53,10 @@ const createQuery = (queryFn, options = {}) => {
     const useQuery = (0, create_stores_1.createStores)(({ get, set, key: _key, keyHash }) => {
         const key = _key;
         const getRetryProps = (error, retryCount) => {
-            const maxRetryCount = (typeof retry === 'function' ? retry(error, key) : retry) || 0;
+            const prevState = get();
+            const maxRetryCount = (typeof retry === 'function' ? retry(error, prevState) : retry) || 0;
             const shouldRetry = retryCount < maxRetryCount;
-            const delay = (typeof retryDelay === 'function' ? retryDelay(error, key) : retryDelay) || 0;
+            const delay = (typeof retryDelay === 'function' ? retryDelay(error, prevState) : retryDelay) || 0;
             return { shouldRetry, delay };
         };
         const forceFetch = () => {

package/package.json

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