fix #374, fix #399 - suppress cache errors in load function

ryansolid · ryansolid · commit 884b8be6b9f3 · 2024-04-30T16:17:46.000-07:00
diff --git a/.changeset/funny-waves-wave.md b/.changeset/funny-waves-wave.md
@@ -0,0 +1,5 @@
+---
+"@solidjs/router": patch
+---
+
+fix #374, fix #399 - suppress cache errors in load function
diff --git a/src/data/cache.ts b/src/data/cache.ts
@@ -8,7 +8,7 @@ import {
   startTransition
 } from "solid-js";
 import { getRequestEvent, isServer } from "solid-js/web";
-import { useNavigate, getIntent } from "../routing.js";
+import { useNavigate, getIntent, getInLoadFn } from "../routing.js";
 import { CacheEntry } from "../types.js";
 
 const LocationHeader = "Location";
@@ -69,6 +69,7 @@ export function cache<T extends (...args: any) => any>(fn: T, name: string): Cac
   const cachedFn = ((...args: Parameters<T>) => {
     const cache = getCache();
     const intent = getIntent();
+    const inLoadFn = getInLoadFn();
     const owner = getOwner();
     const navigate = owner ? useNavigate() : undefined;
     const now = Date.now();
@@ -110,13 +111,13 @@ export function cache<T extends (...args: any) => any>(fn: T, name: string): Cac
         cached[0] = now;
       }
       let res = cached[1];
-      if (intent !== "preload") {
+      if (!inLoadFn) {
         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
-      }
+      } else "then" in res && res.catch(() => {});
       return res;
     }
     let res =
@@ -144,12 +145,12 @@ export function cache<T extends (...args: any) => any>(fn: T, name: string): Cac
       const e = getRequestEvent();
       if (e && e.router!.dataOnly) return (e.router!.data![key] = res);
     }
-    if (intent !== "preload") {
+    if (!inLoadFn) {
       res =
         "then" in res
           ? res.then(handleResponse(false), handleResponse(true))
           : handleResponse(false)(res);
-    }
+    } else "then" in res && res.catch(() => {});
     // serialize on server
     if (
       isServer &&
diff --git a/src/routers/components.tsx b/src/routers/components.tsx
@@ -16,21 +16,21 @@ import {
   createBranches,
   createRouteContext,
   createRouterContext,
+  getIntent,
   getRouteMatches,
   RouteContextObj,
-  RouterContextObj
+  RouterContextObj,
+  setInLoadFn
 } from "../routing.js";
 import type {
   MatchFilters,
-  Params,
   RouteContext,
   RouteLoadFunc,
   RouteDefinition,
   RouterIntegration,
   RouterContext,
   Branch,
-  RouteSectionProps,
-  Location
+  RouteSectionProps
 } from "../types.js";
 
 export type BaseRouterProps = {
@@ -76,7 +76,13 @@ function Root(props: {
   const location = props.routerState.location;
   const params = props.routerState.params;
   const data = createMemo(
-    () => props.load && untrack(() => props.load!({ params, location, intent: "preload" }))
+    () =>
+      props.load &&
+      untrack(() => {
+        setInLoadFn(true);
+        props.load!({ params, location, intent: getIntent() || "initial" });
+        setInLoadFn(false);
+      })
   );
   return (
     <Show when={props.root} keyed fallback={props.children}>
diff --git a/src/routing.ts b/src/routing.ts
@@ -268,6 +268,13 @@ let intent: Intent | undefined;
 export function getIntent() {
   return intent;
 }
+let inLoadFn = false;
+export function getInLoadFn() {
+  return inLoadFn;
+}
+export function setInLoadFn(value: boolean) {
+  inLoadFn = value;
+}
 
 export function createRouterContext(
   integration: RouterIntegration,
@@ -457,6 +464,7 @@ export function createRouterContext(
         (route.component as MaybePreloadableComponent).preload &&
         (route.component as MaybePreloadableComponent).preload!();
       const { load } = route;
+      inLoadFn = true;
       preloadData &&
         load &&
         runWithOwner(getContext!(), () =>
@@ -473,6 +481,7 @@ export function createRouterContext(
             intent: "preload"
           })
         );
+      inLoadFn = false;
     }
     intent = prevIntent;
   }
@@ -498,7 +507,9 @@ export function createRouteContext(
   component &&
     (component as MaybePreloadableComponent).preload &&
     (component as MaybePreloadableComponent).preload!();
+  inLoadFn = true;
   const data = load ? load({ params, location, intent: intent || "initial" }) : undefined;
+  inLoadFn = false;
 
   const route: RouteContext = {
     parent,

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +"@solidjs/router": patch
 +---
++
 +fix #374, fix #399 - suppress cache errors in load function