@solidjs/router 0.10.0-beta.0 → 0.10.0-beta.2

package/README.md

@@ -372,14 +372,12 @@ This cache can be defined anywhere and then used inside your components with:
 
 ### `createAsync`
 
-This is light wrapper over `createResource` that aims to serve as stand-in for a future primitive we intend to bring to Solid core in 2.0. It is a simpler async primitive where the function tracks like `createMemo` and it expects a promise back that it turns into a Signal. Reading it before it ready causes Suspense/Transitions to trigger.
+This is light wrapper over `createResource` that aims to serve as stand-in for a future primitive we intend to bring to Solid core in 2.0. It is a simpler async primitive where the function tracks like `createMemo` and it expects a promise back that it turns into a Signal. Reading it before it is ready causes Suspense/Transitions to trigger.
 
 ```jsx
 const user = createAsync(() => getUser(params.id))
 ```
 
-`createAsync` is designed to only work with cached functions otherwise it will over fetch. If not using `cache`, continue using `createResource` instead.
-
 ### `action`
 
 Actions are data mutations that can trigger invalidations and further routing. A list of prebuilt response builders can be found below(TODO).

package/dist/components.jsx

@@ -9,20 +9,19 @@ export const Router = (props) => {
     const { source, url, base } = props;
     const integration = source ||
         (isServer
-            ? staticIntegration({ value: url || ((e = getRequestEvent()) && e.request.url) || "" })
+            ? staticIntegration({ value: url || ((e = getRequestEvent()) && getPath(e.request.url)) || "" })
             : pathIntegration());
-    const routeDefs = children(() => props.root
-        ? {
-            component: props.root,
-            children: props.children
-        }
-        : props.children);
-    const branches = createMemo(() => createBranches(routeDefs(), props.base || ""));
+    const routeDefs = children(() => props.children);
+    const branches = createMemo(() => createBranches(props.root ? { component: props.root, children: routeDefs() } : routeDefs(), props.base || ""));
     const routerState = createRouterContext(integration, branches, base);
     return (<RouterContextObj.Provider value={routerState}>
       <Routes routerState={routerState} branches={branches()}/>
     </RouterContextObj.Provider>);
 };
+function getPath(url) {
+    const u = new URL(url);
+    return u.pathname + u.search;
+}
 function Routes(props) {
     const matches = createMemo(() => getRouteMatches(props.branches, props.routerState.location.pathname));
     const params = createMemoObject(() => {

package/dist/data/action.js

@@ -49,6 +49,11 @@ export function action(fn, name) {
         const [result, setResult] = createSignal();
         let submission;
         const router = this;
+        async function handler(res) {
+            const data = await handleResponse(res, router.navigatorFactory());
+            data ? setResult({ data }) : submission.clear();
+            return data;
+        }
         router.submissions[1](s => [
             ...s,
             (submission = {
@@ -66,29 +71,15 @@ export function action(fn, name) {
                 retry() {
                     setResult(undefined);
                     const p = fn(variables);
-                    p.then(async (data) => {
-                        const keys = handleResponse(data, router.navigatorFactory());
-                        await revalidate(keys);
-                        data ? setResult({ data }) : submission.clear();
-                        return data;
-                    }).catch(error => {
-                        setResult({ data: error });
-                    });
+                    p.then(handler, handler);
                     return p;
                 }
             })
         ]);
-        p.then(async (data) => {
-            const keys = handleResponse(data, router.navigatorFactory());
-            await revalidate(keys);
-            data ? setResult({ data }) : submission.clear();
-            return data;
-        }).catch(error => {
-            setResult({ data: error });
-        });
+        p.then(handler, handler);
         return p;
     }
-    const url = fn.url || `action:${name}` || !isServer ? `action:${fn.name}` : "";
+    const url = fn.url || (name && `action:${name}`) || (!isServer ? `action:${fn.name}` : "");
     mutate.toString = () => {
         if (!url)
             throw new Error("Client Actions need explicit names if server rendered");
@@ -98,7 +89,8 @@ export function action(fn, name) {
         registerAction(url, mutate);
     return mutate;
 }
-function handleResponse(response, navigate) {
+async function handleResponse(response, navigate) {
+    let data;
     if (response instanceof Response && redirectStatusCodes.has(response.status)) {
         const locationUrl = response.headers.get("Location") || "/";
         if (locationUrl.startsWith("http")) {
@@ -108,6 +100,9 @@ function handleResponse(response, navigate) {
             navigate(locationUrl);
         }
     }
-    // return keys
-    return;
+    else
+        data = response;
+    // TODO: handle keys
+    await revalidate();
+    return data;
 }

package/dist/data/cache.d.ts

@@ -1,3 +1,3 @@
 import { type ReconcileOptions } from "solid-js/store";
 export declare function revalidate(key?: string | any[] | void): Promise<void>;
-export declare function cache<T extends (...args: any) => U | Response, U>(fn: T, name: string, options: ReconcileOptions): T;
+export declare function cache<T extends (...args: any) => U | Response, U>(fn: T, name: string, options?: ReconcileOptions): T;

package/dist/data/cache.js

@@ -52,7 +52,7 @@ export function cache(fn, name, options) {
                 cached[0] = now;
                 cached[1] =
                     "then" in cached[1]
-                        ? cached[1].then(handleResponse)
+                        ? cached[1].then(handleResponse, handleResponse)
                         : handleResponse(cached[1]);
                 cached[2] = intent;
             }
@@ -61,11 +61,17 @@ export function cache(fn, name, options) {
             }
             return cached[1];
         }
-        let res = fn(...args);
+        let res = !isServer && sharedConfig.context && sharedConfig.load
+            ? sharedConfig.load(key) // hydrating
+            : fn(...args);
+        // serialize on server
+        if (isServer && sharedConfig.context && !sharedConfig.context.noHydrate) {
+            sharedConfig.context && sharedConfig.context.serialize(key, res);
+        }
         if (intent !== "preload") {
             res =
                 "then" in res
-                    ? res.then(handleResponse)
+                    ? res.then(handleResponse, handleResponse)
                     : handleResponse(res);
         }
         if (cached) {
@@ -80,25 +86,27 @@ export function cache(fn, name, options) {
         else
             cache.set(key, (cached = [now, res, intent, new Set(version ? [version] : [])]));
         return res;
-        function handleRedirect(response) {
-            startTransition(() => {
-                let url = response.headers.get(LocationHeader);
-                if (url && url.startsWith("/")) {
-                    navigate(url, {
-                        replace: true
-                    });
-                }
-                else if (!isServer && url) {
-                    window.location.href = url;
-                }
-            });
-        }
         function handleResponse(v) {
             if (v instanceof Response && redirectStatusCodes.has(v.status)) {
-                if (navigate)
-                    isServer ? handleRedirect(v) : setTimeout(() => handleRedirect(v), 0);
+                if (navigate) {
+                    startTransition(() => {
+                        let url = v.headers.get(LocationHeader);
+                        if (url && url.startsWith("/")) {
+                            navigate(url, {
+                                replace: true
+                            });
+                        }
+                        else if (!isServer && url) {
+                            window.location.href = url;
+                        }
+                    });
+                }
                 return;
             }
+            if (v instanceof Error)
+                throw v;
+            if (isServer)
+                return v;
             setStore(key, reconcile(v, options));
             return store[key];
         }

package/dist/data/createAsync.d.ts

@@ -1,5 +1,14 @@
 /**
  * This is mock of the eventual Solid 2.0 primitive. It is not fully featured.
  */
-import { Accessor } from "solid-js";
-export declare function createAsync<T>(fn: () => Promise<T>): Accessor<T>;
+import { type Accessor } from "solid-js";
+export declare function createAsync<T>(fn: () => Promise<T>, options: {
+    name?: string;
+    initialValue: T;
+    deferStream?: boolean;
+}): Accessor<T>;
+export declare function createAsync<T>(fn: () => Promise<T>, options?: {
+    name?: string;
+    initialValue?: T;
+    deferStream?: boolean;
+}): Accessor<T | undefined>;

package/dist/data/createAsync.js

@@ -1,8 +1,54 @@
 /**
  * This is mock of the eventual Solid 2.0 primitive. It is not fully featured.
  */
-import { createResource } from "solid-js";
-export function createAsync(fn) {
-    const [resource] = createResource(() => fn(), v => v);
+import { createResource, sharedConfig } from "solid-js";
+import { isServer } from "solid-js/web";
+export function createAsync(fn, options) {
+    const [resource] = createResource(() => subFetch(fn), v => v, options);
     return () => resource();
 }
+// mock promise while hydrating to prevent fetching
+class MockPromise {
+    static all() {
+        return new MockPromise();
+    }
+    static allSettled() {
+        return new MockPromise();
+    }
+    static any() {
+        return new MockPromise();
+    }
+    static race() {
+        return new MockPromise();
+    }
+    static reject() {
+        return new MockPromise();
+    }
+    static resolve() {
+        return new MockPromise();
+    }
+    catch() {
+        return new MockPromise();
+    }
+    then() {
+        return new MockPromise();
+    }
+    finally() {
+        return new MockPromise();
+    }
+}
+function subFetch(fn) {
+    if (isServer || !sharedConfig.context)
+        return fn();
+    const ogFetch = fetch;
+    const ogPromise = Promise;
+    try {
+        window.fetch = () => new MockPromise();
+        Promise = MockPromise;
+        return fn();
+    }
+    finally {
+        window.fetch = ogFetch;
+        Promise = ogPromise;
+    }
+}

package/dist/data/index.d.ts

@@ -1,3 +1,4 @@
 export { createAsync } from "./createAsync";
 export { action, useSubmission, useSubmissions } from "./action";
 export { cache, revalidate } from "./cache";
+export { redirect } from "./response";

package/dist/data/index.js

@@ -1,3 +1,4 @@
 export { createAsync } from "./createAsync";
 export { action, useSubmission, useSubmissions } from "./action";
 export { cache, revalidate } from "./cache";
+export { redirect } from "./response";

package/dist/data/response.d.ts

@@ -0,0 +1 @@
+export declare function redirect(url: string, init?: number | ResponseInit): Response;

package/dist/data/response.js

@@ -0,0 +1,16 @@
+export function redirect(url, init = 302) {
+    let responseInit = init;
+    if (typeof responseInit === "number") {
+        responseInit = { status: responseInit };
+    }
+    else if (typeof responseInit.status === "undefined") {
+        responseInit.status = 302;
+    }
+    const headers = new Headers(responseInit.headers);
+    headers.set("Location", url);
+    const response = new Response(null, {
+        ...responseInit,
+        headers: headers
+    });
+    return response;
+}

package/dist/index.d.ts

@@ -4,4 +4,4 @@ export * from "./lifecycle";
 export { useHref, useIsRouting, useLocation, useMatch, useNavigate, useParams, useResolvedPath, useSearchParams, useBeforeLeave, } from "./routing";
 export { mergeSearchString as _mergeSearchString } from "./utils";
 export * from "./data";
-export type { Location, LocationChange, LocationChangeSignal, NavigateOptions, Navigator, OutputMatch, Params, RouteLoadFunc, RouteLoadFuncArgs, RouteDefinition, RouterIntegration, RouterOutput, RouterUtils, SetParams, BeforeLeaveEventArgs } from "./types";
+export type { Location, LocationChange, LocationChangeSignal, NavigateOptions, Navigator, OutputMatch, Params, RouteSectionProps, RouteLoadFunc, RouteLoadFuncArgs, RouteDefinition, RouterIntegration, RouterOutput, RouterUtils, SetParams, BeforeLeaveEventArgs } from "./types";

package/dist/index.js

@@ -1,5 +1,5 @@
 import { isServer, delegateEvents, getRequestEvent, createComponent as createComponent$1, spread, mergeProps as mergeProps$1, template } from 'solid-js/web';
-import { createSignal, onCleanup, getOwner, runWithOwner, createMemo, createContext, useContext, untrack, createRenderEffect, on, startTransition, createComponent, resetErrorBoundaries, children, createRoot, Show, mergeProps, splitProps, createResource, sharedConfig, $TRACK } from 'solid-js';
+import { createSignal, onCleanup, getOwner, runWithOwner, createMemo, createContext, useContext, untrack, createRenderEffect, on, startTransition, resetErrorBoundaries, createComponent, children, createRoot, Show, mergeProps, splitProps, createResource, sharedConfig, $TRACK } from 'solid-js';
 import { createStore, reconcile } from 'solid-js/store';
 
 function bindEvent(target, type, handler) {
@@ -501,7 +501,7 @@ function createLocation(path, state) {
   const pathname = createMemo(() => url().pathname);
   const search = createMemo(() => url().search, true);
   const hash = createMemo(() => url().hash);
-  const key = createMemo(() => "");
+  const key = () => "";
   return {
     get pathname() {
       return pathname();
@@ -570,6 +570,16 @@ function createRouterContext(integration, getBranches, base = "") {
       return resolvePath(basePath, to);
     }
   };
+  const router = {
+    base: baseRoute,
+    location,
+    isRouting,
+    renderPath,
+    parsePath,
+    navigatorFactory,
+    beforeLeave,
+    submissions: createSignal(submissions)
+  };
   function navigateFromRoute(route, to, options) {
     // Untrack in case someone navigates in an effect - don't want to track `reference` or route paths
     untrack(() => {
@@ -602,7 +612,12 @@ function createRouterContext(integration, getBranches, base = "") {
       if (resolvedTo !== current || nextState !== state()) {
         if (isServer) {
           const e = getRequestEvent();
-          e && (e.response = Response.redirect(resolvedTo, 302));
+          e && (e.response = new Response(null, {
+            status: 302,
+            headers: {
+              Location: resolvedTo
+            }
+          }));
           setSource({
             value: resolvedTo,
             replace,
@@ -703,9 +718,9 @@ function createRouterContext(integration, getBranches, base = "") {
         state: state && JSON.parse(state)
       });
     }
-    function doPreload(a, path) {
+    function doPreload(a, url) {
       const preload = a.getAttribute("preload") !== "false";
-      const matches = getRouteMatches(getBranches(), path);
+      const matches = getRouteMatches(getBranches(), url.pathname);
       const prevIntent = intent;
       intent = "preload";
       for (let match in matches) {
@@ -716,7 +731,15 @@ function createRouterContext(integration, getBranches, base = "") {
         route.component && route.component.preload && route.component.preload();
         preload && route.load && route.load({
           params,
-          location
+          location: {
+            pathname: url.pathname,
+            search: url.search,
+            hash: url.hash,
+            query: extractSearchParams(url),
+            state: null,
+            key: ""
+          },
+          intent
         });
       }
       intent = prevIntent;
@@ -725,7 +748,7 @@ function createRouterContext(integration, getBranches, base = "") {
       const res = handleAnchor(evt);
       if (!res) return;
       const [a, url] = res;
-      if (!preloadTimeout[url.pathname]) doPreload(a, url.pathname);
+      if (!preloadTimeout[url.pathname]) doPreload(a, url);
     }
     function handleAnchorIn(evt) {
       const res = handleAnchor(evt);
@@ -733,9 +756,9 @@ function createRouterContext(integration, getBranches, base = "") {
       const [a, url] = res;
       if (preloadTimeout[url.pathname]) return;
       preloadTimeout[url.pathname] = setTimeout(() => {
-        doPreload(a, url.pathname);
+        doPreload(a, url);
         delete preloadTimeout[url.pathname];
-      }, 50);
+      }, 200);
     }
     function handleAnchorOut(evt) {
       const res = handleAnchor(evt);
@@ -750,7 +773,7 @@ function createRouterContext(integration, getBranches, base = "") {
       let actionRef = evt.submitter && evt.submitter.getAttribute("formaction") || evt.target.action;
       if (actionRef && actionRef.startsWith("action:")) {
         const data = new FormData(evt.target);
-        actions.get(actionRef.slice(7))(data);
+        actions.get(actionRef).call(router, data);
         evt.preventDefault();
       }
     }
@@ -786,16 +809,7 @@ function createRouterContext(integration, getBranches, base = "") {
     }
     submissions = initFromFlash(location.query);
   }
-  return {
-    base: baseRoute,
-    location,
-    isRouting,
-    renderPath,
-    parsePath,
-    navigatorFactory,
-    beforeLeave,
-    submissions: createSignal(submissions)
-  };
+  return router;
 }
 function createRouteContext(router, parent, outlet, match, params) {
   const {
@@ -827,7 +841,8 @@ function createRouteContext(router, parent, outlet, match, params) {
   component && component.preload && component.preload();
   load && load({
     params,
-    location
+    location,
+    intent: intent || "navigate"
   });
   return route;
 }
@@ -841,13 +856,13 @@ const Router = props => {
     base
   } = props;
   const integration = source || (isServer ? staticIntegration({
-    value: url || (e = getRequestEvent()) && e.request.url || ""
+    value: url || (e = getRequestEvent()) && getPath(e.request.url) || ""
   }) : pathIntegration());
-  const routeDefs = children(() => props.root ? {
+  const routeDefs = children(() => props.children);
+  const branches = createMemo(() => createBranches(props.root ? {
     component: props.root,
-    children: props.children
-  } : props.children);
-  const branches = createMemo(() => createBranches(routeDefs(), props.base || ""));
+    children: routeDefs()
+  } : routeDefs(), props.base || ""));
   const routerState = createRouterContext(integration, branches, base);
   return createComponent$1(RouterContextObj.Provider, {
     value: routerState,
@@ -861,6 +876,10 @@ const Router = props => {
     }
   });
 };
+function getPath(url) {
+  const u = new URL(url);
+  return u.pathname + u.search;
+}
 function Routes(props) {
   const matches = createMemo(() => getRouteMatches(props.branches, props.routerState.location.pathname));
   const params = createMemoObject(() => {
@@ -997,11 +1016,55 @@ function Navigate(props) {
 /**
  * This is mock of the eventual Solid 2.0 primitive. It is not fully featured.
  */
-function createAsync(fn) {
-  const [resource] = createResource(() => fn(), v => v);
+function createAsync(fn, options) {
+  const [resource] = createResource(() => subFetch(fn), v => v, options);
   return () => resource();
 }
 
+// mock promise while hydrating to prevent fetching
+class MockPromise {
+  static all() {
+    return new MockPromise();
+  }
+  static allSettled() {
+    return new MockPromise();
+  }
+  static any() {
+    return new MockPromise();
+  }
+  static race() {
+    return new MockPromise();
+  }
+  static reject() {
+    return new MockPromise();
+  }
+  static resolve() {
+    return new MockPromise();
+  }
+  catch() {
+    return new MockPromise();
+  }
+  then() {
+    return new MockPromise();
+  }
+  finally() {
+    return new MockPromise();
+  }
+}
+function subFetch(fn) {
+  if (isServer || !sharedConfig.context) return fn();
+  const ogFetch = fetch;
+  const ogPromise = Promise;
+  try {
+    window.fetch = () => new MockPromise();
+    Promise = MockPromise;
+    return fn();
+  } finally {
+    window.fetch = ogFetch;
+    Promise = ogPromise;
+  }
+}
+
 const LocationHeader = "Location";
 const PRELOAD_TIMEOUT = 5000;
 let cacheMap = new Map();
@@ -1049,7 +1112,7 @@ function cache(fn, name, options) {
       version && cached[3].add(version);
       if (cached[2] === "preload" && intent !== "preload") {
         cached[0] = now;
-        cached[1] = "then" in cached[1] ? cached[1].then(handleResponse) : handleResponse(cached[1]);
+        cached[1] = "then" in cached[1] ? cached[1].then(handleResponse, handleResponse) : handleResponse(cached[1]);
         cached[2] = intent;
       }
       if (!isServer && intent === "navigate") {
@@ -1058,9 +1121,15 @@ function cache(fn, name, options) {
 
       return cached[1];
     }
-    let res = fn(...args);
+    let res = !isServer && sharedConfig.context && sharedConfig.load ? sharedConfig.load(key) // hydrating
+    : fn(...args);
+
+    // serialize on server
+    if (isServer && sharedConfig.context && !sharedConfig.context.noHydrate) {
+      sharedConfig.context && sharedConfig.context.serialize(key, res);
+    }
     if (intent !== "preload") {
-      res = "then" in res ? res.then(handleResponse) : handleResponse(res);
+      res = "then" in res ? res.then(handleResponse, handleResponse) : handleResponse(res);
     }
     if (cached) {
       cached[0] = now;
@@ -1072,23 +1141,24 @@ function cache(fn, name, options) {
       }
     } else cache.set(key, cached = [now, res, intent, new Set(version ? [version] : [])]);
     return res;
-    function handleRedirect(response) {
-      startTransition(() => {
-        let url = response.headers.get(LocationHeader);
-        if (url && url.startsWith("/")) {
-          navigate(url, {
-            replace: true
-          });
-        } else if (!isServer && url) {
-          window.location.href = url;
-        }
-      });
-    }
     function handleResponse(v) {
       if (v instanceof Response && redirectStatusCodes.has(v.status)) {
-        if (navigate) isServer ? handleRedirect(v) : setTimeout(() => handleRedirect(v), 0);
+        if (navigate) {
+          startTransition(() => {
+            let url = v.headers.get(LocationHeader);
+            if (url && url.startsWith("/")) {
+              navigate(url, {
+                replace: true
+              });
+            } else if (!isServer && url) {
+              window.location.href = url;
+            }
+          });
+        }
         return;
       }
+      if (v instanceof Error) throw v;
+      if (isServer) return v;
       setStore(key, reconcile(v, options));
       return store[key];
     }
@@ -1135,6 +1205,13 @@ function action(fn, name) {
     const [result, setResult] = createSignal();
     let submission;
     const router = this;
+    async function handler(res) {
+      const data = await handleResponse(res, router.navigatorFactory());
+      data ? setResult({
+        data
+      }) : submission.clear();
+      return data;
+    }
     router.submissions[1](s => [...s, submission = {
       input: variables,
       url,
@@ -1150,36 +1227,14 @@ function action(fn, name) {
       retry() {
         setResult(undefined);
         const p = fn(variables);
-        p.then(async data => {
-          const keys = handleResponse(data, router.navigatorFactory());
-          await revalidate(keys);
-          data ? setResult({
-            data
-          }) : submission.clear();
-          return data;
-        }).catch(error => {
-          setResult({
-            data: error
-          });
-        });
+        p.then(handler, handler);
         return p;
       }
     }]);
-    p.then(async data => {
-      const keys = handleResponse(data, router.navigatorFactory());
-      await revalidate(keys);
-      data ? setResult({
-        data
-      }) : submission.clear();
-      return data;
-    }).catch(error => {
-      setResult({
-        data: error
-      });
-    });
+    p.then(handler, handler);
     return p;
   }
-  const url = fn.url || `action:${name}` || !isServer ? `action:${fn.name}` : "";
+  const url = fn.url || name && `action:${name}` || (!isServer ? `action:${fn.name}` : "");
   mutate.toString = () => {
     if (!url) throw new Error("Client Actions need explicit names if server rendered");
     return url;
@@ -1187,7 +1242,8 @@ function action(fn, name) {
   if (!isServer) registerAction(url, mutate);
   return mutate;
 }
-function handleResponse(response, navigate) {
+async function handleResponse(response, navigate) {
+  let data;
   if (response instanceof Response && redirectStatusCodes.has(response.status)) {
     const locationUrl = response.headers.get("Location") || "/";
     if (locationUrl.startsWith("http")) {
@@ -1195,9 +1251,28 @@ function handleResponse(response, navigate) {
     } else {
       navigate(locationUrl);
     }
+  } else data = response;
+  // TODO: handle keys
+  await revalidate();
+  return data;
+}
+
+function redirect(url, init = 302) {
+  let responseInit = init;
+  if (typeof responseInit === "number") {
+    responseInit = {
+      status: responseInit
+    };
+  } else if (typeof responseInit.status === "undefined") {
+    responseInit.status = 302;
   }
-  // return keys
-  return;
+  const headers = new Headers(responseInit.headers);
+  headers.set("Location", url);
+  const response = new Response(null, {
+    ...responseInit,
+    headers: headers
+  });
+  return response;
 }
 
-export { A, A as Link, A as NavLink, Navigate, Route, Router, mergeSearchString as _mergeSearchString, action, cache, createAsync, createBeforeLeave, createIntegration, createMemoryHistory, hashIntegration, memoryIntegration, normalizeIntegration, pathIntegration, revalidate, staticIntegration, useBeforeLeave, useHref, useIsRouting, useLocation, useMatch, useNavigate, useParams, useResolvedPath, useSearchParams, useSubmission, useSubmissions };
+export { A, A as Link, A as NavLink, Navigate, Route, Router, mergeSearchString as _mergeSearchString, action, cache, createAsync, createBeforeLeave, createIntegration, createMemoryHistory, hashIntegration, memoryIntegration, normalizeIntegration, pathIntegration, redirect, revalidate, staticIntegration, useBeforeLeave, useHref, useIsRouting, useLocation, useMatch, useNavigate, useParams, useResolvedPath, useSearchParams, useSubmission, useSubmissions };

package/dist/routing.d.ts

@@ -1,5 +1,5 @@
-import type { JSX, Accessor } from "solid-js";
-import type { BeforeLeaveEventArgs, Branch, Location, LocationChangeSignal, MatchFilters, NavigateOptions, Navigator, Params, Route, RouteContext, RouteDefinition, RouteMatch, RouterContext, RouterIntegration, SetParams } from "./types";
+import { JSX, Accessor } from "solid-js";
+import type { BeforeLeaveEventArgs, Branch, Intent, Location, LocationChangeSignal, MatchFilters, NavigateOptions, Navigator, Params, Route, RouteContext, RouteDefinition, RouteMatch, RouterContext, RouterIntegration, SetParams } from "./types";
 export declare const RouterContextObj: import("solid-js").Context<RouterContext | undefined>;
 export declare const RouteContextObj: import("solid-js").Context<RouteContext | undefined>;
 export declare const useRouter: () => RouterContext;
@@ -19,6 +19,6 @@ export declare function createBranches(routeDef: RouteDefinition | RouteDefiniti
 export declare function getRouteMatches(branches: Branch[], location: string): RouteMatch[];
 export declare function createLocation(path: Accessor<string>, state: Accessor<any>): Location;
 export declare function registerAction(url: string, fn: Function): void;
-export declare function getIntent(): "native" | "navigate" | "preload" | undefined;
+export declare function getIntent(): Intent | undefined;
 export declare function createRouterContext(integration?: RouterIntegration | LocationChangeSignal, getBranches?: () => Branch[], base?: string): RouterContext;
 export declare function createRouteContext(router: RouterContext, parent: RouteContext, outlet: () => JSX.Element, match: () => RouteMatch, params: Params): RouteContext;

package/dist/routing.js

@@ -153,7 +153,7 @@ export function createLocation(path, state) {
     const pathname = createMemo(() => url().pathname);
     const search = createMemo(() => url().search, true);
     const hash = createMemo(() => url().hash);
-    const key = createMemo(() => "");
+    const key = () => "";
     return {
         get pathname() {
             return pathname();
@@ -217,6 +217,16 @@ export function createRouterContext(integration, getBranches, base = "") {
             return resolvePath(basePath, to);
         }
     };
+    const router = {
+        base: baseRoute,
+        location,
+        isRouting,
+        renderPath,
+        parsePath,
+        navigatorFactory,
+        beforeLeave,
+        submissions: createSignal(submissions)
+    };
     function navigateFromRoute(route, to, options) {
         // Untrack in case someone navigates in an effect - don't want to track `reference` or route paths
         untrack(() => {
@@ -249,7 +259,8 @@ export function createRouterContext(integration, getBranches, base = "") {
             if (resolvedTo !== current || nextState !== state()) {
                 if (isServer) {
                     const e = getRequestEvent();
-                    e && (e.response = Response.redirect(resolvedTo, 302));
+                    e &&
+                        (e.response = new Response(null, { status: 302, headers: { Location: resolvedTo } }));
                     setSource({ value: resolvedTo, replace, scroll, state: nextState });
                 }
                 else if (beforeLeave.confirm(resolvedTo, options)) {
@@ -352,9 +363,9 @@ export function createRouterContext(integration, getBranches, base = "") {
                 state: state && JSON.parse(state)
             });
         }
-        function doPreload(a, path) {
+        function doPreload(a, url) {
             const preload = a.getAttribute("preload") !== "false";
-            const matches = getRouteMatches(getBranches(), path);
+            const matches = getRouteMatches(getBranches(), url.pathname);
             const prevIntent = intent;
             intent = "preload";
             for (let match in matches) {
@@ -362,7 +373,20 @@ export function createRouterContext(integration, getBranches, base = "") {
                 route.component &&
                     route.component.preload &&
                     route.component.preload();
-                preload && route.load && route.load({ params, location });
+                preload &&
+                    route.load &&
+                    route.load({
+                        params,
+                        location: {
+                            pathname: url.pathname,
+                            search: url.search,
+                            hash: url.hash,
+                            query: extractSearchParams(url),
+                            state: null,
+                            key: ""
+                        },
+                        intent
+                    });
             }
             intent = prevIntent;
         }
@@ -372,7 +396,7 @@ export function createRouterContext(integration, getBranches, base = "") {
                 return;
             const [a, url] = res;
             if (!preloadTimeout[url.pathname])
-                doPreload(a, url.pathname);
+                doPreload(a, url);
         }
         function handleAnchorIn(evt) {
             const res = handleAnchor(evt);
@@ -382,9 +406,9 @@ export function createRouterContext(integration, getBranches, base = "") {
             if (preloadTimeout[url.pathname])
                 return;
             preloadTimeout[url.pathname] = setTimeout(() => {
-                doPreload(a, url.pathname);
+                doPreload(a, url);
                 delete preloadTimeout[url.pathname];
-            }, 50);
+            }, 200);
         }
         function handleAnchorOut(evt) {
             const res = handleAnchor(evt);
@@ -397,14 +421,13 @@ export function createRouterContext(integration, getBranches, base = "") {
             }
         }
         function handleFormSubmit(evt) {
-            let actionRef = evt.submitter && evt.submitter.getAttribute("formaction") || evt.target.action;
+            let actionRef = (evt.submitter && evt.submitter.getAttribute("formaction")) || evt.target.action;
             if (actionRef && actionRef.startsWith("action:")) {
                 const data = new FormData(evt.target);
-                actions.get(actionRef.slice(7))(data);
+                actions.get(actionRef).call(router, data);
                 evt.preventDefault();
             }
         }
-        ;
         // ensure delegated event run first
         delegateEvents(["click", "submit"]);
         document.addEventListener("click", handleAnchorClick);
@@ -429,24 +452,17 @@ export function createRouterContext(integration, getBranches, base = "") {
                 return [];
             }
             const input = new Map(param.entries);
-            return [{
+            return [
+                {
                     url: param.url,
                     result: param.error ? new Error(param.result.message) : param.result,
                     input: input
-                }];
+                }
+            ];
         }
         submissions = initFromFlash(location.query);
     }
-    return {
-        base: baseRoute,
-        location,
-        isRouting,
-        renderPath,
-        parsePath,
-        navigatorFactory,
-        beforeLeave,
-        submissions: createSignal(submissions)
-    };
+    return router;
 }
 export function createRouteContext(router, parent, outlet, match, params) {
     const { base, location } = router;
@@ -473,6 +489,6 @@ export function createRouteContext(router, parent, outlet, match, params) {
     component &&
         component.preload &&
         component.preload();
-    load && load({ params, location });
+    load && load({ params, location, intent: intent || "navigate" });
     return route;
 }

package/dist/types.d.ts

@@ -39,16 +39,20 @@ export interface RouterIntegration {
     signal: LocationChangeSignal;
     utils?: Partial<RouterUtils>;
 }
+export type Intent = "native" | "navigate" | "preload";
 export interface RouteLoadFuncArgs {
     params: Params;
     location: Location;
+    intent: Intent;
 }
 export type RouteLoadFunc = (args: RouteLoadFuncArgs) => void;
-export interface RouteSectionProps extends RouteLoadFuncArgs {
+export interface RouteSectionProps {
+    params: Params;
+    location: Location;
     children?: JSX.Element;
 }
 export type RouteDefinition<S extends string | string[] = any> = {
-    path: S;
+    path?: S;
     matchFilters?: MatchFilters<S>;
     load?: RouteLoadFunc;
     children?: RouteDefinition | RouteDefinition[];

package/package.json

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