remove awful things from useOptions

package.json

@@ -1,7 +1,7 @@
 {
     "name": "solid-swr",
     "description": "The beloved swr package ported over to solid",
-    "version": "4.0.5",
+    "version": "4.0.6",
     "type": "module",
     "main": "./dist/index.js",
     "types": "./dist/index.d.ts",

src/lib/hooks/useOptions.ts

@@ -1,11 +1,9 @@
-import { createEffect, mergeProps, useContext } from "solid-js";
-import { createStore } from "solid-js/store";
+import { mergeProps, useContext } from "solid-js";
 
 import LRU from "~/classes/lru";
 import { OptionsContext } from "~/context/options";
 import { CacheImplements, CacheItem, Fetcher, Options } from "~/types";
 import noop from "~/utils/noop";
-import uFn from "~/utils/uFn";
 
 const defaultFetcher: Fetcher<unknown> = async (key, { signal }) => {
     const response = await fetch(key, { signal });
@@ -43,50 +41,5 @@ export default function useOptions<Res, Err>(
         options
     );
 
-    type Untracked = Pick<typeof merged, "cache" | "fetcher" | "onSuccess" | "onError">;
-
-    const untrackedCache = () => {
-        const oldCache = merged.cache;
-
-        return {
-            cache: {
-                get: uFn(oldCache.get.bind(oldCache)),
-                set: uFn(oldCache.set.bind(oldCache)),
-                keys: uFn(oldCache.keys.bind(oldCache)),
-            },
-        };
-    };
-
-    const untrackedOnSuccess = () => ({
-        onSuccess: uFn(merged.onSuccess.bind(merged.onSuccess)),
-    });
-    const untrackedOnError = () => ({
-        onError: uFn(merged.onError.bind(merged.onError)),
-    });
-    const untrackedFetcher = () => ({
-        fetcher: uFn(merged.fetcher.bind(merged.fetcher)),
-    });
-
-    const [untracked, setUntracked] = createStore<Untracked>({
-        // eslint-disable-next-line solid/reactivity
-        ...untrackedCache(),
-        // eslint-disable-next-line solid/reactivity
-        ...untrackedOnSuccess(),
-        // eslint-disable-next-line solid/reactivity
-        ...untrackedOnError(),
-        // eslint-disable-next-line solid/reactivity
-        ...untrackedFetcher(),
-    });
-
-    [untrackedCache, untrackedOnSuccess, untrackedOnError, untrackedFetcher].forEach(
-        accessor => {
-            createEffect(() => {
-                setUntracked(accessor());
-            });
-        }
-    );
-
-    const mergedUntracked = mergeProps(merged, untracked);
-
-    return mergedUntracked;
+    return merged;
 }

src/lib/index.ts

@@ -4,8 +4,8 @@ import {
     batch,
     createEffect,
     createSignal,
+    on,
     onCleanup,
-    untrack,
     useContext,
 } from "solid-js";
 import { createStore, reconcile } from "solid-js/store";
@@ -81,11 +81,11 @@ export default function useSWR<Res = unknown, Err = unknown>(
     });
 
     const setData = (latest: Res | undefined) => {
-        if (untrack(() => dequal(data.v, latest))) return;
+        if (dequal(data.v, latest)) return;
         setDataRaw(reconcile({ v: latest }));
     };
     const setError = (latest: Err | undefined) => {
-        if (untrack(() => dequal(error.v, latest))) return;
+        if (dequal(error.v, latest)) return;
         setErrorRaw(reconcile({ v: latest }));
     };
 
@@ -118,16 +118,8 @@ export default function useSWR<Res = unknown, Err = unknown>(
         options.onError(ev.detail.data);
     });
 
-    useWinEvent(triggerEffectEvent, async (ev: CustomEvent<CustomEventPayload<undefined>>) => {
-        if (ev.detail.key !== key() || !options.isEnabled) return;
-        await effect();
-    });
-    useWinEvent(setIsLoadingEvent, (ev: CustomEvent<CustomEventPayload<boolean>>) => {
-        if (ev.detail.key !== key() || !options.isEnabled) return;
-        setIsLoading(ev.detail.data);
-    });
-
-    const effect = async () => {
+    // eslint-disable-next-line solid/reactivity
+    const effect = uFn(async () => {
         const k = key();
 
         if (!options.isEnabled || k === undefined) {
@@ -213,7 +205,16 @@ export default function useSWR<Res = unknown, Err = unknown>(
             data: false,
             key: k,
         });
-    };
+    });
+
+    useWinEvent(triggerEffectEvent, async (ev: CustomEvent<CustomEventPayload<undefined>>) => {
+        if (ev.detail.key !== key() || !options.isEnabled) return;
+        await effect();
+    });
+    useWinEvent(setIsLoadingEvent, (ev: CustomEvent<CustomEventPayload<boolean>>) => {
+        if (ev.detail.key !== key() || !options.isEnabled) return;
+        setIsLoading(ev.detail.data);
+    });
 
     const mutate = uFn(
         (
@@ -233,12 +234,11 @@ export default function useSWR<Res = unknown, Err = unknown>(
         }
     );
 
-    const fetcher = (abortController: AbortController = new AbortController()) =>
-        untrack(() => {
-            const k = key();
-            if (k === undefined) return;
-            return options.fetcher(k, { signal: abortController.signal });
-        });
+    const fetcher = uFn((abortController: AbortController = new AbortController()) => {
+        const k = key();
+        if (k === undefined) return;
+        return options.fetcher(k, { signal: abortController.signal });
+    });
 
     // automatic revalidation
     createEffect(() => {
@@ -262,7 +262,7 @@ export default function useSWR<Res = unknown, Err = unknown>(
     });
 
     // core functionality
-    createEffect(effect);
+    createEffect(on([key, () => options.isEnabled], effect));
 
     useExponential(() => !!error.v, effect, 5);