make url transform consistent

Author: ryansolid

.changeset/grumpy-chairs-remain.md

@@ -0,0 +1,5 @@
+---
+"@solidjs/router": patch
+---
+
+make url transform consistent

src/routers/Router.ts

@@ -13,8 +13,7 @@ export function Router(props: RouterProps): JSX.Element {
   const getSource = () => {
     const url = window.location.pathname.replace(/^\/+/, "/") + window.location.search;
     return {
-      value: props.transformUrl ? props.transformUrl(url) + window.location.hash : url + window.location.hash,
-      rawPath: url,
+      value: url + window.location.hash,
       state: window.history.state
     }
   };

src/routers/StaticRouter.ts

@@ -11,10 +11,8 @@ export type StaticRouterProps = BaseRouterProps & { url?: string };
 
 export function StaticRouter(props: StaticRouterProps): JSX.Element {
   let e;
-  const url = props.url || ((e = getRequestEvent()) && getPath(e.request.url)) || ""
   const obj = {
-    value: props.transformUrl ? props.transformUrl(url) : url,
-    rawPath: url,
+    value: props.url || ((e = getRequestEvent()) && getPath(e.request.url)) || "",
   };
   return createRouterComponent({
     signal: [() => obj, next => Object.assign(obj, next)]

src/routing.ts

@@ -401,7 +401,7 @@ export function createRouterContext(
         return;
       }
 
-      const queryOnly = to[0] === "?";
+      const queryOnly = !to || to[0] === "?";
       const {
         replace,
         resolve,
@@ -414,9 +414,10 @@ export function createRouterContext(
         ...options
       };
 
+      let s: string;
       const resolvedTo = resolve
         ? route.resolvePath(to)
-        : resolvePath((queryOnly && source().rawPath) || "", to);
+        : resolvePath((queryOnly && (s = source().value) && s.split("?")[0]) || "", to);
 
       if (resolvedTo === undefined) {
         throw new Error(`Path '${to}' is not a routable path`);