floppy-disk 2.11.1-experimental.2 → 2.12.0-beta.1

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

@@ -297,3 +297,14 @@ export type UseQuery<TKey extends StoreKey = StoreKey, TResponse = any, TData =
  * @see https://floppy-disk.vercel.app/docs/api#createquery
  */
 export declare const createQuery: <TKey extends StoreKey = StoreKey, TResponse = any, TData = TResponse, TError = unknown, TPageParam = any>(queryFn: (key: TKey, state: QueryState<TKey, TResponse, TData, TError, TPageParam>) => Promise<TResponse>, options?: CreateQueryOptions<TKey, TResponse, TData, TError, TPageParam>) => UseQuery<TKey, TResponse, TData, TError, TPageParam>;
+export type ExtractQueryState<T extends UseQuery<any, any, any, any, any>> = {
+    loading: Extract<ReturnType<T['get']>, {
+        status: 'loading';
+    }>;
+    success: Extract<ReturnType<T['get']>, {
+        status: 'success';
+    }>;
+    error: Extract<ReturnType<T['get']>, {
+        status: 'error';
+    }>;
+};

package/esm/react/create-query.js

@@ -176,7 +176,7 @@ export const createQuery = (queryFn, options = {}) => {
         });
         const fetch = () => {
             const { responseUpdatedAt } = get();
-            const isStale = Date.now() > (responseUpdatedAt || 0) + staleTime;
+            const isStale = !responseUpdatedAt || Date.now() > responseUpdatedAt + staleTime;
             if (!isStale)
                 return;
             forceFetch();

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

@@ -297,3 +297,14 @@ export type UseQuery<TKey extends StoreKey = StoreKey, TResponse = any, TData =
  * @see https://floppy-disk.vercel.app/docs/api#createquery
  */
 export declare const createQuery: <TKey extends StoreKey = StoreKey, TResponse = any, TData = TResponse, TError = unknown, TPageParam = any>(queryFn: (key: TKey, state: QueryState<TKey, TResponse, TData, TError, TPageParam>) => Promise<TResponse>, options?: CreateQueryOptions<TKey, TResponse, TData, TError, TPageParam>) => UseQuery<TKey, TResponse, TData, TError, TPageParam>;
+export type ExtractQueryState<T extends UseQuery<any, any, any, any, any>> = {
+    loading: Extract<ReturnType<T['get']>, {
+        status: 'loading';
+    }>;
+    success: Extract<ReturnType<T['get']>, {
+        status: 'success';
+    }>;
+    error: Extract<ReturnType<T['get']>, {
+        status: 'error';
+    }>;
+};

package/lib/react/create-query.js

@@ -179,7 +179,7 @@ const createQuery = (queryFn, options = {}) => {
         });
         const fetch = () => {
             const { responseUpdatedAt } = get();
-            const isStale = Date.now() > (responseUpdatedAt || 0) + staleTime;
+            const isStale = !responseUpdatedAt || Date.now() > responseUpdatedAt + staleTime;
             if (!isStale)
                 return;
             forceFetch();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "floppy-disk",
-  "version": "2.11.1-experimental.2",
+  "version": "2.12.0-beta.1",
   "description": "FloppyDisk - lightweight, simple, and powerful state management library",
   "keywords": [
     "state",
@@ -41,15 +41,6 @@
       },
       "module": "./esm/index.js",
       "default": "./lib/index.js"
-    },
-    "./preact": {
-      "types": "./lib/preact/index.d.ts",
-      "import": {
-        "types": "./esm/preact/index.d.ts",
-        "default": "./esm/preact/index.js"
-      },
-      "module": "./esm/preact/index.js",
-      "default": "./lib/preact/index.js"
     }
   },
   "scripts": {

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

@@ -1,167 +0,0 @@
-import { Maybe } from '../utils';
-import { SelectDeps } from '../vanilla';
-import { CreateQueryOptions, QueryState } from './create-query';
-import { StoreKey } from './create-stores';
-export declare const createBiDirectionQuery: <TKey extends StoreKey = StoreKey, TResponse = any, TData extends any[] = any[], TError = unknown, TPageParam = any>(queryFn: (key: TKey, state: QueryState<TKey, TResponse, TData, TError, TPageParam>, direction: 'prev' | 'next') => Promise<TResponse>, options: Omit<CreateQueryOptions<TKey, TResponse, TData, TError, TPageParam>, "select" | "getNextPageParam"> & {
-    getPrevPageParam: (lastPage: TResponse, index: number, stateBeforeCallQuery: QueryState<TKey, TResponse, TData, TError, TPageParam>) => Maybe<TPageParam>;
-    getNextPageParam: (lastPage: TResponse, index: number, stateBeforeCallQuery: QueryState<TKey, TResponse, TData, TError, TPageParam>) => Maybe<TPageParam>;
-    select: (response: TResponse, state: Pick<QueryState<TKey, TResponse, TData, TError, TPageParam>, "data" | "key">, direction: 'prev' | 'next') => TData;
-}) => {
-    (...args: [Maybe<TKey>, SelectDeps<QueryState<TKey, TResponse, TData, TError, TPageParam>>?] | [SelectDeps<QueryState<TKey, TResponse, TData, TError, TPageParam>>?]): {
-        data: (never[] | TData)[number][];
-        fetchPrevPage: () => Promise<QueryState<TKey, TResponse, TData, TError, TPageParam>>;
-        hasPrevPage: boolean;
-        isWaitingPrevPage: boolean;
-        key: TKey;
-        keyHash: string;
-        fetch: () => void;
-        forceFetch: () => Promise<QueryState<TKey, TResponse, TData, TError, TPageParam>>;
-        fetchNextPage: () => Promise<QueryState<TKey, TResponse, TData, TError, TPageParam>>;
-        reset: () => void;
-        optimisticUpdate: (response: TResponse | ((prevState: QueryState<TKey, TResponse, TData, TError, TPageParam>) => TResponse)) => {
-            revert: () => void;
-            invalidate: () => void;
-        };
-        isWaiting: boolean;
-        isWaitingNextPage: boolean;
-        isRefetching: boolean;
-        isRefetchError: boolean;
-        isPreviousData: boolean;
-        isOptimisticData: boolean;
-        error: TError | undefined;
-        errorUpdatedAt: number | undefined;
-        retryCount: number;
-        isGoingToRetry: boolean;
-        pageParam: Maybe<TPageParam>;
-        pageParams: Maybe<TPageParam>[];
-        hasNextPage: boolean;
-        retryNextPageCount: number;
-        isGoingToRetryNextPage: boolean;
-        status: "loading";
-        isLoading: true;
-        isSuccess: false;
-        isError: false;
-        response: undefined;
-        responseUpdatedAt: undefined;
-    } | {
-        data: (never[] | TData)[number][];
-        fetchPrevPage: () => Promise<QueryState<TKey, TResponse, TData, TError, TPageParam>>;
-        hasPrevPage: boolean;
-        isWaitingPrevPage: boolean;
-        key: TKey;
-        keyHash: string;
-        fetch: () => void;
-        forceFetch: () => Promise<QueryState<TKey, TResponse, TData, TError, TPageParam>>;
-        fetchNextPage: () => Promise<QueryState<TKey, TResponse, TData, TError, TPageParam>>;
-        reset: () => void;
-        optimisticUpdate: (response: TResponse | ((prevState: QueryState<TKey, TResponse, TData, TError, TPageParam>) => TResponse)) => {
-            revert: () => void;
-            invalidate: () => void;
-        };
-        isWaiting: boolean;
-        isWaitingNextPage: boolean;
-        isRefetching: boolean;
-        isRefetchError: boolean;
-        isPreviousData: boolean;
-        isOptimisticData: boolean;
-        error: TError | undefined;
-        errorUpdatedAt: number | undefined;
-        retryCount: number;
-        isGoingToRetry: boolean;
-        pageParam: Maybe<TPageParam>;
-        pageParams: Maybe<TPageParam>[];
-        hasNextPage: boolean;
-        retryNextPageCount: number;
-        isGoingToRetryNextPage: boolean;
-        status: "error";
-        isLoading: false;
-        isSuccess: false;
-        isError: true;
-        response: undefined;
-        responseUpdatedAt: undefined;
-    } | {
-        data: (never[] | TData)[number][];
-        fetchPrevPage: () => Promise<QueryState<TKey, TResponse, TData, TError, TPageParam>>;
-        hasPrevPage: boolean;
-        isWaitingPrevPage: boolean;
-        key: TKey;
-        keyHash: string;
-        fetch: () => void;
-        forceFetch: () => Promise<QueryState<TKey, TResponse, TData, TError, TPageParam>>;
-        fetchNextPage: () => Promise<QueryState<TKey, TResponse, TData, TError, TPageParam>>;
-        reset: () => void;
-        optimisticUpdate: (response: TResponse | ((prevState: QueryState<TKey, TResponse, TData, TError, TPageParam>) => TResponse)) => {
-            revert: () => void;
-            invalidate: () => void;
-        };
-        isWaiting: boolean;
-        isWaitingNextPage: boolean;
-        isRefetching: boolean;
-        isRefetchError: boolean;
-        isPreviousData: boolean;
-        isOptimisticData: boolean;
-        error: TError | undefined;
-        errorUpdatedAt: number | undefined;
-        retryCount: number;
-        isGoingToRetry: boolean;
-        pageParam: Maybe<TPageParam>;
-        pageParams: Maybe<TPageParam>[];
-        hasNextPage: boolean;
-        retryNextPageCount: number;
-        isGoingToRetryNextPage: boolean;
-        status: "success";
-        isLoading: false;
-        isSuccess: true;
-        isError: false;
-        response: TResponse;
-        responseUpdatedAt: number | undefined;
-    };
-    get(): {
-        prev: QueryState<TKey, TResponse, TData, TError, TPageParam>;
-        next: QueryState<TKey, TResponse, TData, TError, TPageParam>;
-    };
-    setInitialResponse: (options: {
-        key?: Maybe<TKey>;
-        response: TResponse;
-        skipRevalidation?: boolean | undefined;
-    }) => void;
-    reset(): void;
-    resetSpecificKey(key: Maybe<TKey>): void;
-    invalidate: () => void;
-    invalidateSpecificKey: (key?: Maybe<TKey>) => void;
-    suspend: (key?: Maybe<TKey>) => {
-        key: TKey;
-        keyHash: string;
-        fetch: () => void;
-        forceFetch: () => Promise<QueryState<TKey, TResponse, TData, TError, TPageParam>>;
-        fetchNextPage: () => Promise<QueryState<TKey, TResponse, TData, TError, TPageParam>>;
-        reset: () => void;
-        optimisticUpdate: (response: TResponse | ((prevState: QueryState<TKey, TResponse, TData, TError, TPageParam>) => TResponse)) => {
-            revert: () => void;
-            invalidate: () => void;
-        };
-        isWaiting: boolean;
-        isWaitingNextPage: boolean;
-        isRefetching: boolean;
-        isRefetchError: boolean;
-        isPreviousData: boolean;
-        isOptimisticData: boolean;
-        error: TError | undefined;
-        errorUpdatedAt: number | undefined;
-        retryCount: number;
-        isGoingToRetry: boolean;
-        pageParam: Maybe<TPageParam>;
-        pageParams: Maybe<TPageParam>[];
-        hasNextPage: boolean;
-        retryNextPageCount: number;
-        isGoingToRetryNextPage: boolean;
-    } & {
-        status: "success";
-        isLoading: false;
-        isSuccess: true;
-        isError: false;
-        data: TData;
-        response: TResponse;
-        responseUpdatedAt: number | undefined;
-    };
-};

package/esm/preact/create-bi-direction-query.js

@@ -1,74 +0,0 @@
-import { hasValue } from '../utils';
-import { createQuery } from './create-query';
-export const createBiDirectionQuery = (queryFn, options) => {
-    const { getPrevPageParam, getNextPageParam, select, ...restOptions } = options;
-    const usePrevPagesQuery = createQuery((key, state) => queryFn(key, state, 'prev'), {
-        defaultDeps: (state) => [
-            state.isWaiting,
-            state.data,
-            state.error,
-            state.isWaitingNextPage,
-            state.hasNextPage,
-        ],
-        fetchOnMount: false,
-        getNextPageParam: getPrevPageParam,
-        select: (response, state) => select(response, state, 'prev'),
-        ...restOptions,
-    });
-    const useNextPagesQuery = createQuery(async (key, state) => {
-        const isInitialPage = state.pageParam === undefined;
-        const pQuery = usePrevPagesQuery.get(key);
-        try {
-            const response = await queryFn(key, state, 'next');
-            if (isInitialPage) {
-                const prevPageParam = getPrevPageParam(response, 1, pQuery);
-                usePrevPagesQuery.set(key, (prev) => ({
-                    pageParams: [prevPageParam, ...prev.pageParams.slice(1)],
-                    hasNextPage: prev.isLoading ? hasValue(prevPageParam) : prev.hasNextPage,
-                }));
-                if (!pQuery.isLoading)
-                    pQuery.forceFetch();
-            }
-            return response;
-        }
-        catch (error) {
-            if (isInitialPage && !pQuery.isLoading)
-                pQuery.reset();
-            throw error;
-        }
-    }, {
-        getNextPageParam: getNextPageParam,
-        select: (response, state) => select(response, state, 'next'),
-        ...restOptions,
-    });
-    const useBiDirectionQuery = (...args) => {
-        const pQuery = usePrevPagesQuery(...args);
-        const nQuery = useNextPagesQuery(...args);
-        return {
-            ...nQuery,
-            data: [...(pQuery.data || []), ...(nQuery.data || [])],
-            fetchPrevPage: pQuery.fetchNextPage,
-            hasPrevPage: pQuery.hasNextPage,
-            isWaitingPrevPage: pQuery.isWaitingNextPage || (pQuery.isLoading && pQuery.isWaiting),
-        };
-    };
-    useBiDirectionQuery.get = () => {
-        return {
-            prev: usePrevPagesQuery.get(),
-            next: useNextPagesQuery.get(),
-        };
-    };
-    useBiDirectionQuery.setInitialResponse = useNextPagesQuery.setInitialResponse;
-    useBiDirectionQuery.reset = () => {
-        usePrevPagesQuery.reset();
-        useNextPagesQuery.reset();
-    };
-    useBiDirectionQuery.resetSpecificKey = (key) => {
-        usePrevPagesQuery.resetSpecificKey(key);
-        useNextPagesQuery.resetSpecificKey(key);
-    };
-    useBiDirectionQuery.invalidate = useNextPagesQuery.invalidate;
-    useBiDirectionQuery.invalidateSpecificKey = useNextPagesQuery.invalidateSpecificKey;
-    useBiDirectionQuery.suspend = useNextPagesQuery.suspend;
-    return useBiDirectionQuery;
-};

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

@@ -1,39 +0,0 @@
-import { InitStoreOptions } from '../vanilla';
-import { UseStore } from './create-store';
-export type MutationState<TVar, TResponse = any, TError = unknown> = {
-    /**
-     * Network fetching status.
-     */
-    isWaiting: boolean;
-    isSuccess: boolean;
-    isError: boolean;
-    response: TResponse | undefined;
-    responseUpdatedAt: number | undefined;
-    error: TError | undefined;
-    errorUpdatedAt: number | undefined;
-    /**
-     * Mutate function.
-     *
-     * @returns Promise that will always get resolved.
-     */
-    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, 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;
-};
-/**
- * @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,53 +0,0 @@
-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 }) => ({
-        isWaiting: false,
-        isSuccess: false,
-        isError: false,
-        response: undefined,
-        responseUpdatedAt: undefined,
-        error: undefined,
-        errorUpdatedAt: undefined,
-        mutate: ((variables) => {
-            set({ isWaiting: true });
-            const stateBeforeMutate = get();
-            onMutate(variables, stateBeforeMutate);
-            return new Promise((resolve) => {
-                mutationFn(variables, stateBeforeMutate)
-                    .then((response) => {
-                    set({
-                        isWaiting: false,
-                        isSuccess: true,
-                        isError: false,
-                        response,
-                        responseUpdatedAt: Date.now(),
-                        error: undefined,
-                        errorUpdatedAt: undefined,
-                    });
-                    onSuccess(response, variables, stateBeforeMutate);
-                    resolve({ response, variables });
-                })
-                    .catch((error) => {
-                    set({
-                        isWaiting: false,
-                        isSuccess: false,
-                        isError: true,
-                        error,
-                        errorUpdatedAt: Date.now(),
-                    });
-                    onError(error, variables, stateBeforeMutate);
-                    resolve({ error, variables });
-                })
-                    .finally(() => {
-                    onSettled(variables, stateBeforeMutate);
-                });
-            });
-        }),
-    }), createStoreOptions);
-    return useMutation;
-};