@solidjs/router 0.14.2 → 0.14.4

package/dist/data/createAsync.js

@@ -33,13 +33,13 @@ export function createAsyncStore(fn, options = {}) {
 }
 function createDeepSignal(value, options) {
     const [store, setStore] = createStore({
-        value
+        value: structuredClone(value)
     });
     return [
         () => store.value,
         (v) => {
             typeof v === "function" && (v = v());
-            setStore("value", reconcile(v, options));
+            setStore("value", reconcile(structuredClone(v), options));
             return store.value;
         }
     ];

package/dist/index.js

@@ -263,7 +263,7 @@ const useSearchParams = () => {
   const location = useLocation();
   const navigate = useNavigate();
   const setSearchParams = (params, options) => {
-    const searchString = untrack(() => location.pathname + mergeSearchString(location.search, params) + location.hash);
+    const searchString = untrack(() => mergeSearchString(location.search, params) + location.hash);
     navigate(searchString, {
       scroll: false,
       resolve: false,
@@ -520,6 +520,7 @@ function createRouterContext(integration, branches, getContext, options = {}) {
         }
         return;
       }
+      const queryOnly = !to || to[0] === "?";
       const {
         replace,
         resolve,
@@ -527,11 +528,11 @@ function createRouterContext(integration, branches, getContext, options = {}) {
         state: nextState
       } = {
         replace: false,
-        resolve: true,
+        resolve: !queryOnly,
         scroll: true,
         ...options
       };
-      const resolvedTo = resolve ? route.resolvePath(to) : resolvePath("", to);
+      const resolvedTo = resolve ? route.resolvePath(to) : resolvePath(queryOnly && location.pathname || "", to);
       if (resolvedTo === undefined) {
         throw new Error(`Path '${to}' is not a routable path`);
       } else if (referrers.length >= MAX_REDIRECTS) {
@@ -873,9 +874,8 @@ function getPath(url) {
 }
 function StaticRouter(props) {
   let e;
-  const url = props.url || (e = getRequestEvent()) && getPath(e.request.url) || "";
   const obj = {
-    value: props.transformUrl ? props.transformUrl(url) : url
+    value: props.url || (e = getRequestEvent()) && getPath(e.request.url) || ""
   };
   return createRouterComponent({
     signal: [() => obj, next => Object.assign(obj, next)]
@@ -1315,9 +1315,10 @@ function Router(props) {
   if (isServer) return StaticRouter(props);
   const getSource = () => {
     const url = window.location.pathname.replace(/^\/+/, "/") + window.location.search;
+    const state = window.history.state && window.history.state._depth && Object.keys(window.history.state).length === 1 ? undefined : window.history.state;
     return {
-      value: props.transformUrl ? props.transformUrl(url) + window.location.hash : url + window.location.hash,
-      state: window.history.state
+      value: url + window.location.hash,
+      state
     };
   };
   const beforeLeave = createBeforeLeave();
@@ -1558,11 +1559,11 @@ function createAsyncStore(fn, options = {}) {
 }
 function createDeepSignal(value, options) {
   const [store, setStore] = createStore({
-    value
+    value: structuredClone(value)
   });
   return [() => store.value, v => {
     typeof v === "function" && (v = v());
-    setStore("value", reconcile(v, options));
+    setStore("value", reconcile(structuredClone(v), options));
     return store.value;
   }];
 }

package/dist/routers/Router.js

@@ -8,9 +8,10 @@ export function Router(props) {
         return StaticRouter(props);
     const getSource = () => {
         const url = window.location.pathname.replace(/^\/+/, "/") + window.location.search;
+        const state = window.history.state && window.history.state._depth && Object.keys(window.history.state).length === 1 ? undefined : window.history.state;
         return {
-            value: props.transformUrl ? props.transformUrl(url) + window.location.hash : url + window.location.hash,
-            state: window.history.state
+            value: url + window.location.hash,
+            state
         };
     };
     const beforeLeave = createBeforeLeave();

package/dist/routers/StaticRouter.js

@@ -6,9 +6,8 @@ function getPath(url) {
 }
 export function StaticRouter(props) {
     let e;
-    const url = props.url || ((e = getRequestEvent()) && getPath(e.request.url)) || "";
     const obj = {
-        value: props.transformUrl ? props.transformUrl(url) : url,
+        value: props.url || ((e = getRequestEvent()) && getPath(e.request.url)) || "",
     };
     return createRouterComponent({
         signal: [() => obj, next => Object.assign(obj, next)]

package/dist/routing.js

@@ -41,7 +41,7 @@ export const useSearchParams = () => {
     const location = useLocation();
     const navigate = useNavigate();
     const setSearchParams = (params, options) => {
-        const searchString = untrack(() => location.pathname + mergeSearchString(location.search, params) + location.hash);
+        const searchString = untrack(() => mergeSearchString(location.search, params) + location.hash);
         navigate(searchString, {
             scroll: false,
             resolve: false,
@@ -295,13 +295,17 @@ export function createRouterContext(integration, branches, getContext, options =
                 }
                 return;
             }
+            const queryOnly = !to || to[0] === "?";
             const { replace, resolve, scroll, state: nextState } = {
                 replace: false,
-                resolve: true,
+                resolve: !queryOnly,
                 scroll: true,
                 ...options
             };
-            const resolvedTo = resolve ? route.resolvePath(to) : resolvePath("", to);
+            let s;
+            const resolvedTo = resolve
+                ? route.resolvePath(to)
+                : resolvePath((queryOnly && location.pathname) || "", to);
             if (resolvedTo === undefined) {
                 throw new Error(`Path '${to}' is not a routable path`);
             }

package/dist/types.d.ts

@@ -49,6 +49,7 @@ export interface LocationChange<S = unknown> {
     replace?: boolean;
     scroll?: boolean;
     state?: S;
+    rawPath?: string;
 }
 export interface RouterIntegration {
     signal: Signal<LocationChange>;

package/package.json

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