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

package/dist/components.d.ts

@@ -12,6 +12,7 @@ declare module "solid-js" {
 }
 export type RouterProps = {
     base?: string;
+    actionBase?: string;
     root?: Component<RouteSectionProps>;
     children: JSX.Element;
 } & ({

package/dist/components.jsx

@@ -6,14 +6,16 @@ import { createBranches, createRouteContext, createRouterContext, getRouteMatche
 import { normalizePath, createMemoObject } from "./utils";
 export const Router = (props) => {
     let e;
-    const { source, url, base } = props;
+    const { source, url, base, actionBase } = props;
     const integration = source ||
         (isServer
-            ? staticIntegration({ value: url || ((e = getRequestEvent()) && getPath(e.request.url)) || "" })
+            ? staticIntegration({
+                value: url || ((e = getRequestEvent()) && getPath(e.request.url)) || ""
+            })
             : pathIntegration());
     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);
+    const routerState = createRouterContext(integration, branches, { base, actionBase });
     return (<RouterContextObj.Provider value={routerState}>
       <Routes routerState={routerState} branches={branches()}/>
     </RouterContextObj.Provider>);

package/dist/data/action.js

@@ -20,22 +20,22 @@ export function useSubmission(fn, filter) {
     const submissions = useSubmissions(fn, filter);
     return {
         get clear() {
-            return submissions[0]?.clear;
+            return submissions[submissions.length - 1]?.clear;
         },
         get retry() {
-            return submissions[0]?.retry;
+            return submissions[submissions.length - 1]?.retry;
         },
         get url() {
-            return submissions[0]?.url;
+            return submissions[submissions.length - 1]?.url;
         },
         get input() {
-            return submissions[0]?.input;
+            return submissions[submissions.length - 1]?.input;
         },
         get result() {
-            return submissions[0]?.result;
+            return submissions[submissions.length - 1]?.result;
         },
         get pending() {
-            return submissions[0]?.pending;
+            return submissions[submissions.length - 1]?.pending;
         }
     };
 }

package/dist/data/cache.js

@@ -51,13 +51,14 @@ export function cache(fn, name, options) {
             if (cached[2] === "preload" && intent !== "preload") {
                 cached[0] = now;
             }
+            let res = cached[1];
             if (!isServer && intent === "navigate") {
-                "then" in cached[1]
+                res = "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];
+            return res;
         }
         let res = !isServer && sharedConfig.context && sharedConfig.load
             ? sharedConfig.load(key) // hydrating
@@ -66,11 +67,6 @@ export function cache(fn, name, options) {
         if (isServer && sharedConfig.context && !sharedConfig.context.noHydrate) {
             sharedConfig.context && sharedConfig.context.serialize(key, res);
         }
-        if (intent !== "preload") {
-            "then" in res
-                ? res.then(handleResponse(false), handleResponse(true))
-                : handleResponse(false)(res);
-        }
         if (cached) {
             cached[0] = now;
             cached[1] = res;
@@ -82,6 +78,11 @@ export function cache(fn, name, options) {
         }
         else
             cache.set(key, (cached = [now, res, intent, new Set(version ? [version] : [])]));
+        if (intent !== "preload") {
+            res = "then" in res
+                ? res.then(handleResponse(false), handleResponse(true))
+                : handleResponse(false)(res);
+        }
         return res;
         function handleResponse(error) {
             return (v) => {

package/dist/index.js

@@ -529,7 +529,7 @@ let intent;
 function getIntent() {
   return intent;
 }
-function createRouterContext(integration, getBranches, base = "") {
+function createRouterContext(integration, getBranches, options = {}) {
   const {
     signal: [source, setSource],
     utils = {}
@@ -537,8 +537,8 @@ function createRouterContext(integration, getBranches, base = "") {
   const parsePath = utils.parsePath || (p => p);
   const renderPath = utils.renderPath || (p => p);
   const beforeLeave = utils.beforeLeave || createBeforeLeave();
-  let submissions = [];
-  const basePath = resolvePath("", base);
+  const basePath = resolvePath("", options.base || "");
+  const actionBase = options.actionBase || "/_server";
   if (basePath === undefined) {
     throw new Error(`${basePath} is not a valid base path`);
   } else if (basePath && !source().value) {
@@ -578,7 +578,7 @@ function createRouterContext(integration, getBranches, base = "") {
     parsePath,
     navigatorFactory,
     beforeLeave,
-    submissions: createSignal(submissions)
+    submissions: createSignal(initFromFlash(location.query))
   };
   function navigateFromRoute(route, to, options) {
     // Untrack in case someone navigates in an effect - don't want to track `reference` or route paths
@@ -667,6 +667,16 @@ function createRouterContext(integration, getBranches, base = "") {
       referrers.length = 0;
     }
   }
+  function initFromFlash(params) {
+    let param = params.form ? JSON.parse(params.form) : null;
+    if (!param || !param.result) return [];
+    const input = new Map(param.entries);
+    return [{
+      url: param.url,
+      result: param.error ? new Error(param.result.message) : param.result,
+      input: input
+    }];
+  }
   createRenderEffect(() => {
     const {
       value,
@@ -771,10 +781,17 @@ function createRouterContext(integration, getBranches, base = "") {
     }
     function handleFormSubmit(evt) {
       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).call(router, data);
+      if (!actionRef) return;
+      if (!actionRef.startsWith("action:")) {
+        const url = new URL(actionRef);
+        actionRef = parsePath(url.pathname + url.search);
+        if (!actionRef.startsWith(actionBase)) return;
+      }
+      const handler = actions.get(actionRef);
+      if (handler) {
         evt.preventDefault();
+        const data = new FormData(evt.target);
+        handler.call(router, data);
       }
     }
 
@@ -794,20 +811,6 @@ function createRouterContext(integration, getBranches, base = "") {
       document.removeEventListener("touchstart", handleAnchorPreload);
       document.removeEventListener("submit", handleFormSubmit);
     });
-  } else {
-    function initFromFlash(params) {
-      let param = params.form ? JSON.parse(params.form) : null;
-      if (!param || !param.result) {
-        return [];
-      }
-      const input = new Map(param.entries);
-      return [{
-        url: param.url,
-        result: param.error ? new Error(param.result.message) : param.result,
-        input: input
-      }];
-    }
-    submissions = initFromFlash(location.query);
   }
   return router;
 }
@@ -853,7 +856,8 @@ const Router = props => {
   const {
     source,
     url,
-    base
+    base,
+    actionBase
   } = props;
   const integration = source || (isServer ? staticIntegration({
     value: url || (e = getRequestEvent()) && getPath(e.request.url) || ""
@@ -863,7 +867,10 @@ const Router = props => {
     component: props.root,
     children: routeDefs()
   } : routeDefs(), props.base || ""));
-  const routerState = createRouterContext(integration, branches, base);
+  const routerState = createRouterContext(integration, branches, {
+    base,
+    actionBase
+  });
   return createComponent$1(RouterContextObj.Provider, {
     value: routerState,
     get children() {
@@ -1113,12 +1120,13 @@ function cache(fn, name, options) {
       if (cached[2] === "preload" && intent !== "preload") {
         cached[0] = now;
       }
+      let res = cached[1];
       if (!isServer && intent === "navigate") {
-        "then" in cached[1] ? cached[1].then(handleResponse(false), handleResponse(true)) : handleResponse(false)(cached[1]);
+        res = "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];
+      return res;
     }
     let res = !isServer && sharedConfig.context && sharedConfig.load ? sharedConfig.load(key) // hydrating
     : fn(...args);
@@ -1127,9 +1135,6 @@ function cache(fn, name, options) {
     if (isServer && sharedConfig.context && !sharedConfig.context.noHydrate) {
       sharedConfig.context && sharedConfig.context.serialize(key, res);
     }
-    if (intent !== "preload") {
-      "then" in res ? res.then(handleResponse(false), handleResponse(true)) : handleResponse(false)(res);
-    }
     if (cached) {
       cached[0] = now;
       cached[1] = res;
@@ -1139,6 +1144,9 @@ function cache(fn, name, options) {
         startTransition(() => revalidateSignals(cached[3], cached[0])); // update version
       }
     } else cache.set(key, cached = [now, res, intent, new Set(version ? [version] : [])]);
+    if (intent !== "preload") {
+      res = "then" in res ? res.then(handleResponse(false), handleResponse(true)) : handleResponse(false)(res);
+    }
     return res;
     function handleResponse(error) {
       return v => {
@@ -1181,22 +1189,22 @@ function useSubmission(fn, filter) {
   const submissions = useSubmissions(fn, filter);
   return {
     get clear() {
-      return submissions[0]?.clear;
+      return submissions[submissions.length - 1]?.clear;
     },
     get retry() {
-      return submissions[0]?.retry;
+      return submissions[submissions.length - 1]?.retry;
     },
     get url() {
-      return submissions[0]?.url;
+      return submissions[submissions.length - 1]?.url;
     },
     get input() {
-      return submissions[0]?.input;
+      return submissions[submissions.length - 1]?.input;
     },
     get result() {
-      return submissions[0]?.result;
+      return submissions[submissions.length - 1]?.result;
     },
     get pending() {
-      return submissions[0]?.pending;
+      return submissions[submissions.length - 1]?.pending;
     }
   };
 }

package/dist/routing.d.ts

@@ -20,5 +20,8 @@ export declare function getRouteMatches(branches: Branch[], location: string): R
 export declare function createLocation(path: Accessor<string>, state: Accessor<any>): Location;
 export declare function registerAction(url: string, fn: Function): void;
 export declare function getIntent(): Intent | undefined;
-export declare function createRouterContext(integration?: RouterIntegration | LocationChangeSignal, getBranches?: () => Branch[], base?: string): RouterContext;
+export declare function createRouterContext(integration?: RouterIntegration | LocationChangeSignal, getBranches?: () => Branch[], options?: {
+    base?: string;
+    actionBase?: string;
+}): RouterContext;
 export declare function createRouteContext(router: RouterContext, parent: RouteContext, outlet: () => JSX.Element, match: () => RouteMatch, params: Params): RouteContext;

package/dist/routing.js

@@ -181,13 +181,13 @@ let intent;
 export function getIntent() {
     return intent;
 }
-export function createRouterContext(integration, getBranches, base = "") {
+export function createRouterContext(integration, getBranches, options = {}) {
     const { signal: [source, setSource], utils = {} } = normalizeIntegration(integration);
     const parsePath = utils.parsePath || (p => p);
     const renderPath = utils.renderPath || (p => p);
     const beforeLeave = utils.beforeLeave || createBeforeLeave();
-    let submissions = [];
-    const basePath = resolvePath("", base);
+    const basePath = resolvePath("", options.base || "");
+    const actionBase = options.actionBase || "/_server";
     if (basePath === undefined) {
         throw new Error(`${basePath} is not a valid base path`);
     }
@@ -225,7 +225,7 @@ export function createRouterContext(integration, getBranches, base = "") {
         parsePath,
         navigatorFactory,
         beforeLeave,
-        submissions: createSignal(submissions)
+        submissions: createSignal(initFromFlash(location.query))
     };
     function navigateFromRoute(route, to, options) {
         // Untrack in case someone navigates in an effect - don't want to track `reference` or route paths
@@ -301,6 +301,19 @@ export function createRouterContext(integration, getBranches, base = "") {
             referrers.length = 0;
         }
     }
+    function initFromFlash(params) {
+        let param = params.form ? JSON.parse(params.form) : null;
+        if (!param || !param.result)
+            return [];
+        const input = new Map(param.entries);
+        return [
+            {
+                url: param.url,
+                result: param.error ? new Error(param.result.message) : param.result,
+                input: input
+            }
+        ];
+    }
     createRenderEffect(() => {
         const { value, state } = source();
         // Untrack this whole block so `start` doesn't cause Solid's Listener to be preserved
@@ -422,10 +435,19 @@ export function createRouterContext(integration, getBranches, base = "") {
         }
         function handleFormSubmit(evt) {
             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).call(router, data);
+            if (!actionRef)
+                return;
+            if (!actionRef.startsWith("action:")) {
+                const url = new URL(actionRef);
+                actionRef = parsePath(url.pathname + url.search);
+                if (!actionRef.startsWith(actionBase))
+                    return;
+            }
+            const handler = actions.get(actionRef);
+            if (handler) {
                 evt.preventDefault();
+                const data = new FormData(evt.target);
+                handler.call(router, data);
             }
         }
         // ensure delegated event run first
@@ -445,23 +467,6 @@ export function createRouterContext(integration, getBranches, base = "") {
             document.removeEventListener("submit", handleFormSubmit);
         });
     }
-    else {
-        function initFromFlash(params) {
-            let param = params.form ? JSON.parse(params.form) : null;
-            if (!param || !param.result) {
-                return [];
-            }
-            const input = new Map(param.entries);
-            return [
-                {
-                    url: param.url,
-                    result: param.error ? new Error(param.result.message) : param.result,
-                    input: input
-                }
-            ];
-        }
-        submissions = initFromFlash(location.query);
-    }
     return router;
 }
 export function createRouteContext(router, parent, outlet, match, params) {

package/package.json

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