@solidjs/router 0.15.2 → 0.15.3

package/dist/data/query.js

@@ -100,9 +100,14 @@ export function query(fn, name) {
             inPreloadFn && "then" in res && res.catch(() => { });
             return res;
         }
-        let res = !isServer && sharedConfig.context && sharedConfig.has(key)
-            ? sharedConfig.load(key) // hydrating
-            : fn(...args);
+        let res;
+        if (!isServer && sharedConfig.has && sharedConfig.has(key)) {
+            res = sharedConfig.load(key); // hydrating
+            // @ts-ignore at least until we add a delete method to sharedConfig
+            delete globalThis._$HY.r[key];
+        }
+        else
+            res = fn(...args);
         if (cached) {
             cached[0] = now;
             cached[1] = res;

package/dist/index.js

@@ -1123,8 +1123,12 @@ function query(fn, name) {
       inPreloadFn && "then" in res && res.catch(() => {});
       return res;
     }
-    let res = !isServer && sharedConfig.context && sharedConfig.has(key) ? sharedConfig.load(key) // hydrating
-    : fn(...args);
+    let res;
+    if (!isServer && sharedConfig.has && sharedConfig.has(key)) {
+      res = sharedConfig.load(key); // hydrating
+      // @ts-ignore at least until we add a delete method to sharedConfig
+      delete globalThis._$HY.r[key];
+    } else res = fn(...args);
     if (cached) {
       cached[0] = now;
       cached[1] = res;

package/package.json

@@ -6,7 +6,7 @@
     "Ryan Turnquist"
   ],
   "license": "MIT",
-  "version": "0.15.2",
+  "version": "0.15.3",
   "homepage": "https://github.com/solidjs/solid-router#readme",
   "repository": {
     "type": "git",

package/dist/data/cache.d.ts

@@ -1,15 +0,0 @@
-import type { CacheEntry, NarrowResponse } from "../types.js";
-export declare function revalidate(key?: string | string[] | void, force?: boolean): Promise<void>;
-export declare function cacheKeyOp(key: string | string[] | void, fn: (cacheEntry: CacheEntry) => void): void;
-export type CachedFunction<T extends (...args: any) => any> = T extends (...args: infer A) => infer R ? ([] extends {
-    [K in keyof A]-?: A[K];
-} ? (...args: never[]) => R extends Promise<infer P> ? Promise<NarrowResponse<P>> : NarrowResponse<R> : (...args: A) => R extends Promise<infer P> ? Promise<NarrowResponse<P>> : NarrowResponse<R>) & {
-    keyFor: (...args: A) => string;
-    key: string;
-} : never;
-export declare function cache<T extends (...args: any) => any>(fn: T, name: string): CachedFunction<T>;
-export declare namespace cache {
-    var set: (key: string, value: any) => void;
-    var clear: () => void;
-}
-export declare function hashKey<T extends Array<any>>(args: T): string;

package/dist/data/cache.js

@@ -1,209 +0,0 @@
-import { createSignal, getListener, getOwner, onCleanup, sharedConfig, startTransition } from "solid-js";
-import { getRequestEvent, isServer } from "solid-js/web";
-import { useNavigate, getIntent, getInPreloadFn } from "../routing.js";
-const LocationHeader = "Location";
-const PRELOAD_TIMEOUT = 5000;
-const CACHE_TIMEOUT = 180000;
-let cacheMap = new Map();
-// cleanup forward/back cache
-if (!isServer) {
-    setInterval(() => {
-        const now = Date.now();
-        for (let [k, v] of cacheMap.entries()) {
-            if (!v[3].count && now - v[0] > CACHE_TIMEOUT) {
-                cacheMap.delete(k);
-            }
-        }
-    }, 300000);
-}
-function getCache() {
-    if (!isServer)
-        return cacheMap;
-    const req = getRequestEvent();
-    if (!req)
-        throw new Error("Cannot find cache context");
-    return (req.router || (req.router = {})).cache || (req.router.cache = new Map());
-}
-export function revalidate(key, force = true) {
-    return startTransition(() => {
-        const now = Date.now();
-        cacheKeyOp(key, entry => {
-            force && (entry[0] = 0); //force cache miss
-            entry[3][1](now); // retrigger live signals
-        });
-    });
-}
-export function cacheKeyOp(key, fn) {
-    key && !Array.isArray(key) && (key = [key]);
-    for (let k of cacheMap.keys()) {
-        if (key === undefined || matchKey(k, key))
-            fn(cacheMap.get(k));
-    }
-}
-export function cache(fn, name) {
-    // prioritize GET for server functions
-    if (fn.GET)
-        fn = fn.GET;
-    const cachedFn = ((...args) => {
-        const cache = getCache();
-        const intent = getIntent();
-        const inPreloadFn = getInPreloadFn();
-        const owner = getOwner();
-        const navigate = owner ? useNavigate() : undefined;
-        const now = Date.now();
-        const key = name + hashKey(args);
-        let cached = cache.get(key);
-        let tracking;
-        if (isServer) {
-            const e = getRequestEvent();
-            if (e) {
-                const dataOnly = (e.router || (e.router = {})).dataOnly;
-                if (dataOnly) {
-                    const data = e && (e.router.data || (e.router.data = {}));
-                    if (data && key in data)
-                        return data[key];
-                    if (Array.isArray(dataOnly) && !matchKey(key, dataOnly)) {
-                        data[key] = undefined;
-                        return Promise.resolve();
-                    }
-                }
-            }
-        }
-        if (getListener() && !isServer) {
-            tracking = true;
-            onCleanup(() => cached[3].count--);
-        }
-        if (cached &&
-            cached[0] &&
-            (isServer ||
-                intent === "native" ||
-                cached[3].count ||
-                Date.now() - cached[0] < PRELOAD_TIMEOUT)) {
-            if (tracking) {
-                cached[3].count++;
-                cached[3][0](); // track
-            }
-            if (cached[2] === "preload" && intent !== "preload") {
-                cached[0] = now;
-            }
-            let res = cached[1];
-            if (intent !== "preload") {
-                res =
-                    "then" in cached[1]
-                        ? cached[1].then(handleResponse(false), handleResponse(true))
-                        : handleResponse(false)(cached[1]);
-                !isServer && intent === "navigate" && startTransition(() => cached[3][1](cached[0])); // update version
-            }
-            inPreloadFn && "then" in res && res.catch(() => { });
-            return res;
-        }
-        let res = !isServer && sharedConfig.context && sharedConfig.has(key)
-            ? sharedConfig.load(key) // hydrating
-            : fn(...args);
-        if (cached) {
-            cached[0] = now;
-            cached[1] = res;
-            cached[2] = intent;
-            !isServer && intent === "navigate" && startTransition(() => cached[3][1](cached[0])); // update version
-        }
-        else {
-            cache.set(key, (cached = [now, res, intent, createSignal(now)]));
-            cached[3].count = 0;
-        }
-        if (tracking) {
-            cached[3].count++;
-            cached[3][0](); // track
-        }
-        if (isServer) {
-            const e = getRequestEvent();
-            if (e && e.router.dataOnly)
-                return (e.router.data[key] = res);
-        }
-        if (intent !== "preload") {
-            res =
-                "then" in res
-                    ? res.then(handleResponse(false), handleResponse(true))
-                    : handleResponse(false)(res);
-        }
-        inPreloadFn && "then" in res && res.catch(() => { });
-        // serialize on server
-        if (isServer &&
-            sharedConfig.context &&
-            sharedConfig.context.async &&
-            !sharedConfig.context.noHydrate) {
-            const e = getRequestEvent();
-            (!e || !e.serverOnly) && sharedConfig.context.serialize(key, res);
-        }
-        return res;
-        function handleResponse(error) {
-            return async (v) => {
-                if (v instanceof Response) {
-                    const url = v.headers.get(LocationHeader);
-                    if (url !== null) {
-                        // client + server relative redirect
-                        if (navigate && url.startsWith("/"))
-                            startTransition(() => {
-                                navigate(url, { replace: true });
-                            });
-                        else if (!isServer)
-                            window.location.href = url;
-                        else if (isServer) {
-                            const e = getRequestEvent();
-                            if (e)
-                                e.response = { status: 302, headers: new Headers({ Location: url }) };
-                        }
-                        return;
-                    }
-                    if (v.customBody)
-                        v = await v.customBody();
-                }
-                if (error)
-                    throw v;
-                return v;
-            };
-        }
-    });
-    cachedFn.keyFor = (...args) => name + hashKey(args);
-    cachedFn.key = name;
-    return cachedFn;
-}
-cache.set = (key, value) => {
-    const cache = getCache();
-    const now = Date.now();
-    let cached = cache.get(key);
-    if (cached) {
-        cached[0] = now;
-        cached[1] = value;
-        cached[2] = "preload";
-    }
-    else {
-        cache.set(key, (cached = [now, value, , createSignal(now)]));
-        cached[3].count = 0;
-    }
-};
-cache.clear = () => getCache().clear();
-function matchKey(key, keys) {
-    for (let k of keys) {
-        if (k && key.startsWith(k))
-            return true;
-    }
-    return false;
-}
-// Modified from the amazing Tanstack Query library (MIT)
-// https://github.com/TanStack/query/blob/main/packages/query-core/src/utils.ts#L168
-export function hashKey(args) {
-    return JSON.stringify(args, (_, val) => isPlainObject(val)
-        ? Object.keys(val)
-            .sort()
-            .reduce((result, key) => {
-            result[key] = val[key];
-            return result;
-        }, {})
-        : val);
-}
-function isPlainObject(obj) {
-    let proto;
-    return (obj != null &&
-        typeof obj === "object" &&
-        (!(proto = Object.getPrototypeOf(obj)) || proto === Object.prototype));
-}

package/dist/routers/createIntegration.d.ts

@@ -1,4 +0,0 @@
-import type { LocationChange, RouterContext, RouterUtils } from "../types";
-export declare function createIntegration(get: () => string | LocationChange, set: (next: LocationChange) => void, init?: (notify: (value?: string | LocationChange) => void) => () => void, create?: (router: RouterContext) => void, utils?: Partial<RouterUtils>): (props: import("./components").RouterProps) => import("solid-js").JSX.Element;
-export declare function bindEvent(target: EventTarget, type: string, handler: EventListener): () => void;
-export declare function scrollToHash(hash: string, fallbackTop?: boolean): void;

package/dist/routers/createIntegration.js

@@ -1,49 +0,0 @@
-import { createSignal, onCleanup } from "solid-js";
-import { createRouter } from "./components";
-function intercept([value, setValue], get, set) {
-    return [get ? () => get(value()) : value, set ? (v) => setValue(set(v)) : setValue];
-}
-function querySelector(selector) {
-    if (selector === "#") {
-        return null;
-    }
-    // Guard against selector being an invalid CSS selector
-    try {
-        return document.querySelector(selector);
-    }
-    catch (e) {
-        return null;
-    }
-}
-export function createIntegration(get, set, init, create, utils) {
-    let ignore = false;
-    const wrap = (value) => (typeof value === "string" ? { value } : value);
-    const signal = intercept(createSignal(wrap(get()), { equals: (a, b) => a.value === b.value }), undefined, next => {
-        !ignore && set(next);
-        return next;
-    });
-    init &&
-        onCleanup(init((value = get()) => {
-            ignore = true;
-            signal[1](wrap(value));
-            ignore = false;
-        }));
-    return createRouter({
-        signal,
-        create,
-        utils
-    });
-}
-export function bindEvent(target, type, handler) {
-    target.addEventListener(type, handler);
-    return () => target.removeEventListener(type, handler);
-}
-export function scrollToHash(hash, fallbackTop) {
-    const el = querySelector(`#${hash}`);
-    if (el) {
-        el.scrollIntoView();
-    }
-    else if (fallbackTop) {
-        window.scrollTo(0, 0);
-    }
-}

package/dist/routers/createIntegration.jsx

@@ -1,48 +0,0 @@
-import { createSignal, onCleanup } from "solid-js";
-function intercept([value, setValue], get, set) {
-    return [get ? () => get(value()) : value, set ? (v) => setValue(set(v)) : setValue];
-}
-function querySelector(selector) {
-    if (selector === "#") {
-        return null;
-    }
-    // Guard against selector being an invalid CSS selector
-    try {
-        return document.querySelector(selector);
-    }
-    catch (e) {
-        return null;
-    }
-}
-export function createIntegration(get, set, init, create, utils) {
-    let ignore = false;
-    const wrap = (value) => (typeof value === "string" ? { value } : value);
-    const signal = intercept(createSignal(wrap(get()), { equals: (a, b) => a.value === b.value }), undefined, next => {
-        !ignore && set(next);
-        return next;
-    });
-    init &&
-        onCleanup(init((value = get()) => {
-            ignore = true;
-            signal[1](wrap(value));
-            ignore = false;
-        }));
-    return {
-        signal,
-        create,
-        utils
-    };
-}
-export function bindEvent(target, type, handler) {
-    target.addEventListener(type, handler);
-    return () => target.removeEventListener(type, handler);
-}
-export function scrollToHash(hash, fallbackTop) {
-    const el = querySelector(`#${hash}`);
-    if (el) {
-        el.scrollIntoView();
-    }
-    else if (fallbackTop) {
-        window.scrollTo(0, 0);
-    }
-}