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

package/dist/data/action.d.ts

@@ -1,5 +1,6 @@
+import { JSX } from "solid-js";
 import { Submission } from "../types";
-export type Action<T, U> = (vars: T) => Promise<U>;
+export type Action<T, U> = ((vars: T) => Promise<U>) & JSX.SerializableAttributeValue;
 export declare function useSubmissions<T, U>(fn: Action<T, U>, filter?: (arg: T) => boolean): Submission<T, U>[] & {
     pending: boolean;
 };

package/dist/data/cache.js

@@ -50,13 +50,11 @@ export 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)
-                        : handleResponse(cached[1]);
-                cached[2] = intent;
             }
             if (!isServer && intent === "navigate") {
+                "then" in cached[1]
+                    ? cached[1].then(handleResponse(false), handleResponse(true))
+                    : handleResponse(false)(cached[1]);
                 startTransition(() => revalidateSignals(cached[3], cached[0])); // update version
             }
             return cached[1];
@@ -69,10 +67,9 @@ export function cache(fn, name, options) {
             sharedConfig.context && sharedConfig.context.serialize(key, res);
         }
         if (intent !== "preload") {
-            res =
-                "then" in res
-                    ? res.then(handleResponse, handleResponse)
-                    : handleResponse(res);
+            "then" in res
+                ? res.then(handleResponse(false), handleResponse(true))
+                : handleResponse(false)(res);
         }
         if (cached) {
             cached[0] = now;
@@ -86,29 +83,31 @@ export function cache(fn, name, options) {
         else
             cache.set(key, (cached = [now, res, intent, new Set(version ? [version] : [])]));
         return res;
-        function handleResponse(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;
-                        }
-                    });
+        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;
                 }
-                return;
-            }
-            if (v instanceof Error)
-                throw v;
-            if (isServer)
-                return v;
-            setStore(key, reconcile(v, options));
-            return store[key];
+                if (error)
+                    throw error;
+                if (isServer)
+                    return v;
+                setStore(key, reconcile(v, options));
+                return store[key];
+            };
         }
     });
 }

package/dist/data/index.d.ts

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

package/dist/data/index.js

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

package/dist/index.js

@@ -847,7 +847,7 @@ function createRouteContext(router, parent, outlet, match, params) {
   return route;
 }
 
-const _tmpl$ = /*#__PURE__*/template(`<a></a>`, 2);
+const _tmpl$ = /*#__PURE__*/template(`<a>`);
 const Router = props => {
   let e;
   const {
@@ -970,7 +970,7 @@ function A(props) {
     return props.end ? path === loc : loc.startsWith(path);
   });
   return (() => {
-    const _el$ = _tmpl$.cloneNode(true);
+    const _el$ = _tmpl$();
     spread(_el$, mergeProps$1(rest, {
       get href() {
         return href() || props.href;
@@ -1112,10 +1112,9 @@ 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) : handleResponse(cached[1]);
-        cached[2] = intent;
       }
       if (!isServer && intent === "navigate") {
+        "then" in cached[1] ? cached[1].then(handleResponse(false), handleResponse(true)) : handleResponse(false)(cached[1]);
         startTransition(() => revalidateSignals(cached[3], cached[0])); // update version
       }
 
@@ -1129,7 +1128,7 @@ function cache(fn, name, options) {
       sharedConfig.context && sharedConfig.context.serialize(key, res);
     }
     if (intent !== "preload") {
-      res = "then" in res ? res.then(handleResponse, handleResponse) : handleResponse(res);
+      "then" in res ? res.then(handleResponse(false), handleResponse(true)) : handleResponse(false)(res);
     }
     if (cached) {
       cached[0] = now;
@@ -1141,26 +1140,28 @@ function cache(fn, name, options) {
       }
     } else cache.set(key, cached = [now, res, intent, new Set(version ? [version] : [])]);
     return res;
-    function handleResponse(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;
-            }
-          });
+    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;
         }
-        return;
-      }
-      if (v instanceof Error) throw v;
-      if (isServer) return v;
-      setStore(key, reconcile(v, options));
-      return store[key];
+        if (error) throw error;
+        if (isServer) return v;
+        setStore(key, reconcile(v, options));
+        return store[key];
+      };
     }
   };
 }
@@ -1199,6 +1200,10 @@ function useSubmission(fn, filter) {
     }
   };
 }
+function useAction(action) {
+  const router = useRouter();
+  return action.bind(router);
+}
 function action(fn, name) {
   function mutate(variables) {
     const p = fn(variables);
@@ -1275,4 +1280,4 @@ function redirect(url, init = 302) {
   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, redirect, 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, useAction, useBeforeLeave, useHref, useIsRouting, useLocation, useMatch, useNavigate, useParams, useResolvedPath, useSearchParams, useSubmission, useSubmissions };

package/package.json

@@ -6,7 +6,7 @@
     "Ryan Turnquist"
   ],
   "license": "MIT",
-  "version": "0.10.0-beta.2",
+  "version": "0.10.0-beta.3",
   "homepage": "https://github.com/solidjs/solid-router#readme",
   "repository": {
     "type": "git",
@@ -37,17 +37,17 @@
     "@types/jest": "^29.0.0",
     "@types/node": "^20.9.0",
     "babel-jest": "^29.0.1",
-    "babel-preset-solid": "^1.6.6",
+    "babel-preset-solid": "^1.8.6",
     "jest": "^29.0.1",
     "jest-environment-jsdom": "^29.2.1",
     "prettier": "^2.7.1",
     "rollup": "^3.7.5",
     "solid-jest": "^0.2.0",
-    "solid-js": "^1.8.4",
+    "solid-js": "^1.8.6",
     "typescript": "^5.2.2"
   },
   "peerDependencies": {
-    "solid-js": "^1.8.4"
+    "solid-js": "^1.8.6"
   },
   "jest": {
     "preset": "solid-jest/preset/browser"