@solidjs/router 0.13.1 → 0.13.2

package/dist/data/cache.d.ts

@@ -1,7 +1,9 @@
 import { CacheEntry } from "../types.js";
 export declare function revalidate(key?: string | string[] | void, force?: boolean): Promise<void>;
 export declare function cacheKeyOp(key: string | string[] | void, fn: (cacheEntry: CacheEntry) => void): void;
-export type CachedFunction<T extends (...args: any) => any> = T extends (...args: infer A) => infer R ? ([] extends A ? (...args: never[]) => R : T) & {
+export type CachedFunction<T extends (...args: any) => any> = T extends (...args: infer A) => infer R ? ([] extends {
+    [K in keyof A]-?: A[K];
+} ? (...args: never[]) => R : T) & {
     keyFor: (...args: A) => string;
     key: string;
 } : never;

package/dist/data/events.js

@@ -83,6 +83,8 @@ export function setupNativeEvents(preload = true, explicitLinks = false, actionB
             }
         }
         function handleFormSubmit(evt) {
+            if (evt.defaultPrevented)
+                return;
             let actionRef = evt.submitter && evt.submitter.hasAttribute("formaction")
                 ? evt.submitter.getAttribute("formaction")
                 : evt.target.getAttribute("action");

package/dist/index.js

@@ -292,9 +292,9 @@ function createRoutes(routeDef, base = "") {
     load,
     info
   };
-  return asArray(routeDef.path).reduce((acc, path) => {
-    for (const originalPath of expandOptionals(path)) {
-      const path = joinPaths(base, originalPath);
+  return asArray(routeDef.path).reduce((acc, originalPath) => {
+    for (const expandedPath of expandOptionals(originalPath)) {
+      const path = joinPaths(base, expandedPath);
       let pattern = isLeaf ? path : path.split("/*", 1)[0];
       pattern = pattern.split("/").map(s => {
         return s.startsWith(":") || s.startsWith("*") ? s : encodeURIComponent(s);
@@ -1231,6 +1231,7 @@ function setupNativeEvents(preload = true, explicitLinks = false, actionBase = "
       }
     }
     function handleFormSubmit(evt) {
+      if (evt.defaultPrevented) return;
       let actionRef = evt.submitter && evt.submitter.hasAttribute("formaction") ? evt.submitter.getAttribute("formaction") : evt.target.getAttribute("action");
       if (!actionRef) return;
       if (!actionRef.startsWith("https://action/")) {
@@ -1382,9 +1383,12 @@ function createMemoryHistory() {
         entries.splice(index + 1, entries.length - index, value);
         index++;
       }
-      if (scroll) {
-        scrollToHash(value.split("#")[1] || "", true);
-      }
+      listeners.forEach(listener => listener(value));
+      setTimeout(() => {
+        if (scroll) {
+          scrollToHash(value.split("#")[1] || "", true);
+        }
+      }, 0);
     },
     back: () => {
       go(-1);

package/dist/routers/MemoryRouter.js

@@ -20,9 +20,12 @@ export function createMemoryHistory() {
                 entries.splice(index + 1, entries.length - index, value);
                 index++;
             }
-            if (scroll) {
-                scrollToHash(value.split("#")[1] || "", true);
-            }
+            listeners.forEach(listener => listener(value));
+            setTimeout(() => {
+                if (scroll) {
+                    scrollToHash(value.split("#")[1] || "", true);
+                }
+            }, 0);
         },
         back: () => {
             go(-1);

package/dist/routing.js

@@ -65,9 +65,9 @@ export function createRoutes(routeDef, base = "") {
         load,
         info
     };
-    return asArray(routeDef.path).reduce((acc, path) => {
-        for (const originalPath of expandOptionals(path)) {
-            const path = joinPaths(base, originalPath);
+    return asArray(routeDef.path).reduce((acc, originalPath) => {
+        for (const expandedPath of expandOptionals(originalPath)) {
+            const path = joinPaths(base, expandedPath);
             let pattern = isLeaf ? path : path.split("/*", 1)[0];
             pattern = pattern
                 .split("/")

package/package.json

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