@solidjs/router 0.14.1 → 0.14.3

package/README.md

@@ -495,11 +495,19 @@ This is light wrapper over `createResource` that aims to serve as stand-in for a
 const user = createAsync((currentValue) => getUser(params.id))
 ```
 
+It also preserves `latest` field from `createResource`. Note that it will be removed in the future.
+
+```jsx
+const user = createAsync((currentValue) => getUser(params.id))
+return <h1>{user.latest.name}</h1>;
+```
+
 Using `cache` in `createResource` directly won't work properly as the fetcher is not reactive and it won't invalidate properly.
 
 ### `createAsyncStore`
 
 Similar to `createAsync` except it uses a deeply reactive store. Perfect for applying fine-grained changes to large model data that updates.
+It also supports `latest` field which will be removed in the future.
 
 ```jsx
 const todos = createAsyncStore(() => getTodos());
@@ -727,7 +735,7 @@ This is the main Router component for the browser.
 | base | string | Base url to use for matching routes |
 | actionBase | string | Root url for server actions, default: `/_server` |
 | preload | boolean | Enables/disables preloads globally, default: `true` |
-| explicitLinks | boolean | Disables all anchors being intercepted and instead requires `<A>`. default: `false` |
+| explicitLinks | boolean | Disables all anchors being intercepted and instead requires `<A>`. Default: `false`. (To disable interception for a specific link, set `target` to any value, e.g. `<a target="_self">`.) |
 
 ### `<A>`
 

package/dist/data/createAsync.d.ts

@@ -1,27 +1,32 @@
+import { type ReconcileOptions } from "solid-js/store";
 /**
- * This is mock of the eventual Solid 2.0 primitive. It is not fully featured.
+ * As `createAsync` and `createAsyncStore` are wrappers for `createResource`,
+ * this type allows to support `latest` field for these primitives.
+ * It will be removed in the future.
  */
-import { type Accessor } from "solid-js";
-import { type ReconcileOptions } from "solid-js/store";
+export type AccessorWithLatest<T> = {
+    (): T;
+    latest: T;
+};
 export declare function createAsync<T>(fn: (prev: T) => Promise<T>, options: {
     name?: string;
     initialValue: T;
     deferStream?: boolean;
-}): Accessor<T>;
+}): AccessorWithLatest<T>;
 export declare function createAsync<T>(fn: (prev: T | undefined) => Promise<T>, options?: {
     name?: string;
     initialValue?: T;
     deferStream?: boolean;
-}): Accessor<T | undefined>;
+}): AccessorWithLatest<T | undefined>;
 export declare function createAsyncStore<T>(fn: (prev: T) => Promise<T>, options: {
     name?: string;
     initialValue: T;
     deferStream?: boolean;
     reconcile?: ReconcileOptions;
-}): Accessor<T>;
+}): AccessorWithLatest<T>;
 export declare function createAsyncStore<T>(fn: (prev: T | undefined) => Promise<T>, options?: {
     name?: string;
     initialValue?: T;
     deferStream?: boolean;
     reconcile?: ReconcileOptions;
-}): Accessor<T | undefined>;
+}): AccessorWithLatest<T | undefined>;

package/dist/data/createAsync.js

@@ -8,7 +8,13 @@ export function createAsync(fn, options) {
     let resource;
     let prev = () => !resource || resource.state === "unresolved" ? undefined : resource.latest;
     [resource] = createResource(() => subFetch(fn, untrack(prev)), v => v, options);
-    return () => resource();
+    const resultAccessor = (() => resource());
+    Object.defineProperty(resultAccessor, 'latest', {
+        get() {
+            return resource.latest;
+        }
+    });
+    return resultAccessor;
 }
 export function createAsyncStore(fn, options = {}) {
     let resource;
@@ -17,17 +23,23 @@ export function createAsyncStore(fn, options = {}) {
         ...options,
         storage: (init) => createDeepSignal(init, options.reconcile)
     });
-    return () => resource();
+    const resultAccessor = (() => resource());
+    Object.defineProperty(resultAccessor, 'latest', {
+        get() {
+            return resource.latest;
+        }
+    });
+    return resultAccessor;
 }
 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/data/index.d.ts

@@ -1,4 +1,4 @@
-export { createAsync, createAsyncStore } from "./createAsync.js";
+export { createAsync, createAsyncStore, type AccessorWithLatest } from "./createAsync.js";
 export { action, useSubmission, useSubmissions, useAction, type Action } from "./action.js";
 export { cache, revalidate, type CachedFunction } from "./cache.js";
 export { redirect, reload, json } from "./response.js";

package/dist/index.js

@@ -1,5 +1,5 @@
 import { isServer, getRequestEvent, createComponent as createComponent$1, memo, delegateEvents, spread, mergeProps as mergeProps$1, template } from 'solid-js/web';
-import { getOwner, runWithOwner, createMemo, createContext, onCleanup, useContext, untrack, createSignal, createRenderEffect, on, startTransition, resetErrorBoundaries, batch, createComponent, children, mergeProps, Show, createRoot, getListener, sharedConfig, $TRACK, splitProps, createResource } from 'solid-js';
+import { getOwner, runWithOwner, createMemo, createContext, onCleanup, useContext, untrack, createSignal, createRenderEffect, on, startTransition, resetErrorBoundaries, batch, createComponent, children, mergeProps, Show, createRoot, sharedConfig, getListener, $TRACK, splitProps, createResource } from 'solid-js';
 import { createStore, reconcile, unwrap } from 'solid-js/store';
 
 function createBeforeLeave() {
@@ -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,12 @@ 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);
+      let s;
+      const resolvedTo = resolve ? route.resolvePath(to) : resolvePath(queryOnly && (s = source().value) && s.split("?")[0] || "", to);
       if (resolvedTo === undefined) {
         throw new Error(`Path '${to}' is not a routable path`);
       } else if (referrers.length >= MAX_REDIRECTS) {
@@ -840,6 +842,7 @@ function createRouter(config) {
     equals: (a, b) => a.value === b.value && a.state === b.state
   }), undefined, next => {
     !ignore && config.set(next);
+    if (sharedConfig.registry && !sharedConfig.done) sharedConfig.done = true;
     return next;
   });
   config.init && onCleanup(config.init((value = config.get()) => {
@@ -872,9 +875,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,7 +1317,7 @@ function Router(props) {
   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,
+      value: url + window.location.hash,
       state: window.history.state
     };
   };
@@ -1521,11 +1523,24 @@ function Navigate(props) {
 /**
  * This is mock of the eventual Solid 2.0 primitive. It is not fully featured.
  */
+
+/**
+ * As `createAsync` and `createAsyncStore` are wrappers for `createResource`,
+ * this type allows to support `latest` field for these primitives.
+ * It will be removed in the future.
+ */
+
 function createAsync(fn, options) {
   let resource;
   let prev = () => !resource || resource.state === "unresolved" ? undefined : resource.latest;
   [resource] = createResource(() => subFetch(fn, untrack(prev)), v => v, options);
-  return () => resource();
+  const resultAccessor = () => resource();
+  Object.defineProperty(resultAccessor, 'latest', {
+    get() {
+      return resource.latest;
+    }
+  });
+  return resultAccessor;
 }
 function createAsyncStore(fn, options = {}) {
   let resource;
@@ -1534,15 +1549,21 @@ function createAsyncStore(fn, options = {}) {
     ...options,
     storage: init => createDeepSignal(init, options.reconcile)
   });
-  return () => resource();
+  const resultAccessor = () => resource();
+  Object.defineProperty(resultAccessor, 'latest', {
+    get() {
+      return resource.latest;
+    }
+  });
+  return resultAccessor;
 }
 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

@@ -9,7 +9,7 @@ export function Router(props) {
     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,
+            value: url + window.location.hash,
             state: window.history.state
         };
     };

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/routers/createRouter.js

@@ -1,4 +1,4 @@
-import { createSignal, onCleanup } from "solid-js";
+import { createSignal, onCleanup, sharedConfig } from "solid-js";
 import { createRouterComponent } from "./components.jsx";
 function intercept([value, setValue], get, set) {
     return [get ? () => get(value()) : value, set ? (v) => setValue(set(v)) : setValue];
@@ -22,6 +22,8 @@ export function createRouter(config) {
         equals: (a, b) => a.value === b.value && a.state === b.state
     }), undefined, next => {
         !ignore && config.set(next);
+        if (sharedConfig.registry && !sharedConfig.done)
+            sharedConfig.done = true;
         return next;
     });
     config.init &&

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 && (s = source().value) && s.split("?")[0]) || "", 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.1",
+  "version": "0.14.3",
   "homepage": "https://github.com/solidjs/solid-router#readme",
   "repository": {
     "type": "git",