@solidjs/router 0.10.8 → 0.10.10

package/dist/data/action.js

@@ -1,7 +1,7 @@
 import { $TRACK, createMemo, createSignal, onCleanup, getOwner } from "solid-js";
 import { isServer } from "solid-js/web";
 import { useRouter } from "../routing";
-import { redirectStatusCodes } from "../utils";
+import { redirectStatusCodes, mockBase } from "../utils";
 import { cacheKeyOp, hashKey, revalidate } from "./cache";
 export const actions = /* #__PURE__ */ new Map();
 export function useSubmissions(fn, filter) {
@@ -80,7 +80,7 @@ function toAction(fn, url) {
         const newFn = function (...passedArgs) {
             return fn.call(this, ...args, ...passedArgs);
         };
-        const uri = new URL(url, "http://sar");
+        const uri = new URL(url, mockBase);
         uri.searchParams.set("args", hashKey(args));
         return toAction(newFn, (uri.origin === "https://action" ? uri.origin : "") + uri.pathname + uri.search);
     };

package/dist/data/cache.js

@@ -48,6 +48,9 @@ function revalidateSignals(set, time) {
 }
 export function cache(fn, name, options) {
     const [store, setStore] = createStore({});
+    // prioritize GET for server functions
+    if (fn.GET)
+        fn = fn.GET;
     const cachedFn = ((...args) => {
         const cache = getCache();
         const intent = getIntent();
@@ -75,7 +78,9 @@ export function cache(fn, name, options) {
                     "then" in cached[1]
                         ? cached[1].then(handleResponse(false), handleResponse(true))
                         : handleResponse(false)(cached[1]);
-                !isServer && intent === "navigate" && startTransition(() => revalidateSignals(cached[3], cached[0])); // update version
+                !isServer &&
+                    intent === "navigate" &&
+                    startTransition(() => revalidateSignals(cached[3], cached[0])); // update version
             }
             return res;
         }
@@ -106,22 +111,26 @@ export function cache(fn, name, options) {
         }
         return res;
         function handleResponse(error) {
-            return (v) => {
-                if (v instanceof Response && redirectStatusCodes.has(v.status)) {
-                    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 async (v) => {
+                if (v instanceof Response) {
+                    if (redirectStatusCodes.has(v.status)) {
+                        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;
                     }
-                    return;
+                    if (v.customBody)
+                        v = await v.customBody();
                 }
                 if (error)
                     throw v;

package/dist/data/events.js

@@ -1,6 +1,7 @@
 import { delegateEvents } from "solid-js/web";
 import { onCleanup } from "solid-js";
 import { actions } from "./action";
+import { mockBase } from "../utils";
 export function setupNativeEvents(preload = true, explicitLinks = false, actionBase = "/_server") {
     return (router) => {
         const basePath = router.base.path();
@@ -20,7 +21,7 @@ export function setupNativeEvents(preload = true, explicitLinks = false, actionB
             const a = evt
                 .composedPath()
                 .find(el => el instanceof Node && el.nodeName.toUpperCase() === "A");
-            if (!a || (explicitLinks && !a.getAttribute("link")))
+            if (!a || (explicitLinks && !a.hasAttribute("link")))
                 return;
             const svg = isSvg(a);
             const href = svg ? a.href.baseVal : a.href;
@@ -83,12 +84,13 @@ export function setupNativeEvents(preload = true, explicitLinks = false, actionB
         }
         function handleFormSubmit(evt) {
             let actionRef = evt.submitter && evt.submitter.hasAttribute("formaction")
-                ? evt.submitter.formAction
-                : evt.target.action;
+                ? evt.submitter.getAttribute("formaction")
+                : evt.target.getAttribute("action");
             if (!actionRef)
                 return;
             if (!actionRef.startsWith("https://action/")) {
-                const url = new URL(actionRef);
+                // normalize server actions
+                const url = new URL(actionRef, mockBase);
                 actionRef = router.parsePath(url.pathname + url.search);
                 if (!actionRef.startsWith(actionBase))
                     return;

package/dist/data/index.d.ts

@@ -1,4 +1,4 @@
 export { createAsync } from "./createAsync";
 export { action, useSubmission, useSubmissions, useAction, type Action } from "./action";
 export { cache, revalidate, type CachedFunction } from "./cache";
-export { redirect, reload } from "./response";
+export { redirect, reload, json } from "./response";

package/dist/data/index.js

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

package/dist/data/response.d.ts

@@ -1,5 +1,6 @@
 export type RouterResponseInit = ResponseInit & {
     revalidate?: string | string[];
 };
-export declare function redirect(url: string, init?: number | RouterResponseInit): Response;
-export declare function reload(init: RouterResponseInit): Response;
+export declare function redirect(url: string, init?: number | RouterResponseInit): never;
+export declare function reload(init: RouterResponseInit): never;
+export declare function json<T>(data: T, init?: Omit<ResponseInit, "body">): T;

package/dist/data/response.js

@@ -23,6 +23,18 @@ export function reload(init) {
     const { revalidate, ...responseInit } = init;
     return new Response(null, {
         ...responseInit,
-        ...(revalidate ? { headers: new Headers(responseInit.headers).set("X-Revalidate", revalidate.toString()) } : {})
+        ...(revalidate
+            ? { headers: new Headers(responseInit.headers).set("X-Revalidate", revalidate.toString()) }
+            : {})
     });
 }
+export function json(data, init) {
+    const headers = new Headers((init || {}).headers);
+    headers.set("Content-Type", "application/json");
+    const response = new Response(JSON.stringify(data), {
+        ...init,
+        headers
+    });
+    response.customBody = () => data;
+    return response;
+}

package/dist/index.js

@@ -38,6 +38,7 @@ function createBeforeLeave() {
 
 const hasSchemeRegex = /^(?:[a-z0-9]+:)?\/\//i;
 const trimPathRegex = /^\/+|(\/)\/+$/g;
+const mockBase = "http://sr";
 const redirectStatusCodes = new Set([204, 301, 302, 303, 307, 308]);
 function normalizePath(path, omitSlash = false) {
   const s = path.replace(trimPathRegex, "$1");
@@ -255,7 +256,10 @@ function createRoutes(routeDef, base = "") {
   return asArray(routeDef.path).reduce((acc, path) => {
     for (const originalPath of expandOptionals(path)) {
       const path = joinPaths(base, originalPath);
-      const pattern = isLeaf ? path : path.split("/*", 1)[0];
+      let pattern = isLeaf ? path : path.split("/*", 1)[0];
+      pattern = pattern.split("/").map(s => {
+        return s.startsWith(':') || s.startsWith('*') ? s : encodeURIComponent(s);
+      }).join("/");
       acc.push({
         ...shared,
         originalPath,
@@ -324,7 +328,7 @@ function getRouteMatches(branches, location) {
   return [];
 }
 function createLocation(path, state) {
-  const origin = new URL("http://sar");
+  const origin = new URL(mockBase);
   const url = createMemo(prev => {
     const path_ = path();
     try {
@@ -809,6 +813,8 @@ function revalidateSignals(set, time) {
 }
 function cache(fn, name, options) {
   const [store, setStore] = createStore({});
+  // prioritize GET for server functions
+  if (fn.GET) fn = fn.GET;
   const cachedFn = (...args) => {
     const cache = getCache();
     const intent = getIntent();
@@ -862,21 +868,24 @@ function cache(fn, name, options) {
     }
     return res;
     function handleResponse(error) {
-      return v => {
-        if (v instanceof Response && redirectStatusCodes.has(v.status)) {
-          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 async v => {
+        if (v instanceof Response) {
+          if (redirectStatusCodes.has(v.status)) {
+            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;
           }
-          return;
+          if (v.customBody) v = await v.customBody();
         }
         if (error) throw v;
         if (isServer) return v;
@@ -1000,7 +1009,7 @@ function toAction(fn, url) {
     const newFn = function (...passedArgs) {
       return fn.call(this, ...args, ...passedArgs);
     };
-    const uri = new URL(url, "http://sar");
+    const uri = new URL(url, mockBase);
     uri.searchParams.set("args", hashKey(args));
     return toAction(newFn, (uri.origin === "https://action" ? uri.origin : "") + uri.pathname + uri.search);
   };
@@ -1045,7 +1054,7 @@ function setupNativeEvents(preload = true, explicitLinks = false, actionBase = "
     function handleAnchor(evt) {
       if (evt.defaultPrevented || evt.button !== 0 || evt.metaKey || evt.altKey || evt.ctrlKey || evt.shiftKey) return;
       const a = evt.composedPath().find(el => el instanceof Node && el.nodeName.toUpperCase() === "A");
-      if (!a || explicitLinks && !a.getAttribute("link")) return;
+      if (!a || explicitLinks && !a.hasAttribute("link")) return;
       const svg = isSvg(a);
       const href = svg ? a.href.baseVal : a.href;
       const target = svg ? a.target.baseVal : a.target;
@@ -1096,10 +1105,11 @@ function setupNativeEvents(preload = true, explicitLinks = false, actionBase = "
       }
     }
     function handleFormSubmit(evt) {
-      let actionRef = evt.submitter && evt.submitter.hasAttribute("formaction") ? evt.submitter.formAction : evt.target.action;
+      let actionRef = evt.submitter && evt.submitter.hasAttribute("formaction") ? evt.submitter.getAttribute("formaction") : evt.target.getAttribute("action");
       if (!actionRef) return;
       if (!actionRef.startsWith("https://action/")) {
-        const url = new URL(actionRef);
+        // normalize server actions
+        const url = new URL(actionRef, mockBase);
         actionRef = router.parsePath(url.pathname + url.search);
         if (!actionRef.startsWith(actionBase)) return;
       }
@@ -1409,5 +1419,15 @@ function reload(init) {
     } : {})
   });
 }
+function json(data, init) {
+  const headers = new Headers((init || {}).headers);
+  headers.set("Content-Type", "application/json");
+  const response = new Response(JSON.stringify(data), {
+    ...init,
+    headers
+  });
+  response.customBody = () => data;
+  return response;
+}
 
-export { A, HashRouter, MemoryRouter, Navigate, Route, Router, StaticRouter, mergeSearchString as _mergeSearchString, action, cache, createAsync, createBeforeLeave, createMemoryHistory, createRouter, redirect, reload, revalidate, useAction, useBeforeLeave, useHref, useIsRouting, useLocation, useMatch, useNavigate, useParams, useResolvedPath, useSearchParams, useSubmission, useSubmissions };
+export { A, HashRouter, MemoryRouter, Navigate, Route, Router, StaticRouter, mergeSearchString as _mergeSearchString, action, cache, createAsync, createBeforeLeave, createMemoryHistory, createRouter, json, redirect, reload, revalidate, useAction, useBeforeLeave, useHref, useIsRouting, useLocation, useMatch, useNavigate, useParams, useResolvedPath, useSearchParams, useSubmission, useSubmissions };

package/dist/routing.js

@@ -1,7 +1,7 @@
 import { createComponent, createContext, createMemo, createRenderEffect, createSignal, on, onCleanup, untrack, useContext, startTransition, resetErrorBoundaries } from "solid-js";
 import { isServer, getRequestEvent } from "solid-js/web";
 import { createBeforeLeave } from "./lifecycle";
-import { createMemoObject, extractSearchParams, invariant, resolvePath, createMatcher, joinPaths, scoreRoute, mergeSearchString, expandOptionals } from "./utils";
+import { mockBase, createMemoObject, extractSearchParams, invariant, resolvePath, createMatcher, joinPaths, scoreRoute, mergeSearchString, expandOptionals } from "./utils";
 const MAX_REDIRECTS = 100;
 export const RouterContextObj = createContext();
 export const RouteContextObj = createContext();
@@ -67,7 +67,10 @@ export function createRoutes(routeDef, base = "") {
     return asArray(routeDef.path).reduce((acc, path) => {
         for (const originalPath of expandOptionals(path)) {
             const path = joinPaths(base, originalPath);
-            const pattern = isLeaf ? path : path.split("/*", 1)[0];
+            let pattern = isLeaf ? path : path.split("/*", 1)[0];
+            pattern = pattern.split("/").map((s) => {
+                return (s.startsWith(':') || s.startsWith('*')) ? s : encodeURIComponent(s);
+            }).join("/");
             acc.push({
                 ...shared,
                 originalPath,
@@ -137,7 +140,7 @@ export function getRouteMatches(branches, location) {
     return [];
 }
 export function createLocation(path, state) {
-    const origin = new URL("http://sar");
+    const origin = new URL(mockBase);
     const url = createMemo(prev => {
         const path_ = path();
         try {

package/dist/utils.d.ts

@@ -1,4 +1,5 @@
 import type { MatchFilters, Params, PathMatch, Route, SetParams } from "./types";
+export declare const mockBase = "http://sr";
 export declare const redirectStatusCodes: Set<number>;
 export declare function normalizePath(path: string, omitSlash?: boolean): string;
 export declare function resolvePath(base: string, path: string, from?: string): string | undefined;

package/dist/utils.js

@@ -1,6 +1,7 @@
 import { createMemo, getOwner, runWithOwner } from "solid-js";
 const hasSchemeRegex = /^(?:[a-z0-9]+:)?\/\//i;
 const trimPathRegex = /^\/+|(\/)\/+$/g;
+export const mockBase = "http://sr";
 export const redirectStatusCodes = new Set([204, 301, 302, 303, 307, 308]);
 export function normalizePath(path, omitSlash = false) {
     const s = path.replace(trimPathRegex, "$1");

package/package.json

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