@solidjs/router 0.17.0-next.1 → 0.17.0-next.3

package/dist/data/query.js

@@ -113,7 +113,7 @@ export function query(fn, name) {
             !isServer && intent === "navigate" && cached[4][1](cached[0]); // update version
         }
         else {
-            cache.set(key, (cached = [now, res, , intent, createSignal(now)]));
+            cache.set(key, (cached = [now, res, , intent, createSignal(now, { ownedWrite: true })]));
             cached[4].count = 0;
         }
         if (tracking) {
@@ -193,7 +193,7 @@ query.set = (key, value) => {
         cached[3] = "preload";
     }
     else {
-        cache.set(key, (cached = [now, Promise.resolve(value), value, "preload", createSignal(now)]));
+        cache.set(key, (cached = [now, Promise.resolve(value), value, "preload", createSignal(now, { ownedWrite: true })]));
         cached[4].count = 0;
     }
 };

package/dist/index.js

@@ -380,7 +380,7 @@ const useCurrentMatches = () => useRouter().matches;
  * const params = useParams();
  * 
  * // fetch user based on the id path parameter
- * const [user] = createResource(() => params.id, fetchUser);
+ * const getUser = query(() => fetchUser(params.id), "user");
  * ```
  */
 const useParams = () => useRouter().params;
@@ -551,7 +551,7 @@ function getRouteMatches(branches, location) {
 }
 function createLocation(path, state, queryWrapper) {
   const origin = new URL(mockBase);
-  const url = createMemo(prev => {
+  const url = createMemo((prev = origin) => {
     const path_ = path();
     try {
       return new URL(path_, origin);
@@ -559,11 +559,11 @@ function createLocation(path, state, queryWrapper) {
       console.error(`Invalid path ${path_}`);
       return prev;
     }
-  }, origin, {
+  }, {
     equals: (a, b) => a.href === b.href
   });
   const pathname = createMemo(() => url().pathname);
-  const search = createMemo(() => url().search, true);
+  const search = createMemo(() => url().search);
   const hash = createMemo(() => url().hash);
   const key = () => "";
   const queryFn = createMemo(() => extractSearchParams(url()));
@@ -617,12 +617,12 @@ function createRouterContext(integration, branches, getContext, options = {}) {
     });
   }
   const [isRouting, setIsRouting] = createSignal(false, {
-    pureWrite: true
+    ownedWrite: true
   });
 
   // Navigate override written from event handlers.
   const [navigateTarget, setNavigateTarget] = createSignal(undefined, {
-    pureWrite: true
+    ownedWrite: true
   });
 
   // Keep track of last target, so that last call to navigate wins
@@ -630,20 +630,11 @@ function createRouterContext(integration, branches, getContext, options = {}) {
 
   // source() remains canonical for native history changes; navigateTarget()
   // temporarily overrides it for in-flight programmatic navigation.
-  const reference = createMemo(() => {
-    const nav = navigateTarget();
-    if (nav !== undefined) return nav.value;
-    return source().value;
-  });
-  const state = createMemo(() => {
-    const nav = navigateTarget();
-    if (nav !== undefined) return nav.state;
-    return source().state;
-  });
-  const location = createLocation(reference, state, utils.queryWrapper);
+  const effective = createMemo(() => navigateTarget() ?? source());
+  const location = createLocation(() => effective().value, () => effective().state, utils.queryWrapper);
   const referrers = [];
   const submissions = createSignal(isServer ? initFromFlash() : [], {
-    pureWrite: true
+    ownedWrite: true
   });
   const matches = createMemo(() => {
     if (typeof options.transformUrl === "function") {
@@ -711,8 +702,8 @@ function createRouterContext(integration, branches, getContext, options = {}) {
       } else if (referrers.length >= MAX_REDIRECTS) {
         throw new Error("Too many redirects");
       }
-      const current = reference();
-      if (resolvedTo !== current || nextState !== state()) {
+      const current = effective();
+      if (resolvedTo !== current.value || nextState !== current.state) {
         if (isServer) {
           const e = getRequestEvent();
           e && (e.response = {
@@ -729,10 +720,10 @@ function createRouterContext(integration, branches, getContext, options = {}) {
           });
         } else if (beforeLeave.confirm(resolvedTo, options)) {
           referrers.push({
-            value: current,
+            value: current.value,
             replace,
             scroll,
-            state: state()
+            state: current.state
           });
           const newTarget = {
             value: resolvedTo,
@@ -981,7 +972,7 @@ function Routes(props) {
     root = next[0];
     prevMatches = nextMatches;
     return next;
-  }, undefined);
+  });
   const outlet = createOutlet(() => routeStates() && root);
   return memo(outlet);
 }
@@ -1027,21 +1018,20 @@ function dataOnly(event, routerState, branches) {
   }
 }
 
-function intercept([value, setValue], get, set) {
-  return [value, set ? v => setValue(set(v)) : setValue];
-}
 function createRouter(config) {
   let ignore = false;
   const wrap = value => typeof value === "string" ? {
     value
   } : value;
-  const signal = intercept(createSignal(wrap(config.get()), {
-    equals: (a, b) => a.value === b.value && a.state === b.state
-  }), undefined, next => {
+  const [read, write] = createSignal(wrap(config.get()), {
+    equals: (a, b) => a.value === b.value && a.state === b.state,
+    ownedWrite: true
+  });
+  const signal = [read, next => {
     !ignore && config.set(next);
     if (sharedConfig.registry && !sharedConfig.done) sharedConfig.done = true;
-    return next;
-  });
+    write(next);
+  }];
   config.init && onCleanup(config.init((value = config.get()) => {
     ignore = true;
     signal[1](wrap(value));
@@ -1178,7 +1168,9 @@ function query(fn, name) {
       cached[3] = intent;
       !isServer && intent === "navigate" && cached[4][1](cached[0]); // update version
     } else {
-      cache.set(key, cached = [now, res,, intent, createSignal(now)]);
+      cache.set(key, cached = [now, res,, intent, createSignal(now, {
+        ownedWrite: true
+      })]);
       cached[4].count = 0;
     }
     if (tracking) {
@@ -1242,7 +1234,9 @@ query.set = (key, value) => {
     cached[2] = value;
     cached[3] = "preload";
   } else {
-    cache.set(key, cached = [now, Promise.resolve(value), value, "preload", createSignal(now)]);
+    cache.set(key, cached = [now, Promise.resolve(value), value, "preload", createSignal(now, {
+      ownedWrite: true
+    })]);
     cached[4].count = 0;
   }
 };
@@ -1762,7 +1756,7 @@ function A(props) {
       get ["aria-current"]() {
         return isActive()[1] ? "page" : undefined;
       }
-    }), false, false);
+    }), false);
     return _el$;
   })();
 }

package/dist/routers/components.jsx

@@ -97,7 +97,7 @@ function Routes(props) {
         root = next[0];
         prevMatches = nextMatches;
         return next;
-    }, undefined);
+    });
     const outlet = createOutlet(() => routeStates() && root);
     return <>{outlet()}</>;
 }

package/dist/routers/createRouter.js

@@ -1,19 +1,18 @@
 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];
-}
 export function createRouter(config) {
     let ignore = false;
     const wrap = (value) => (typeof value === "string" ? { value } : value);
-    const signal = intercept(createSignal(wrap(config.get()), {
-        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;
+    const [read, write] = createSignal(wrap(config.get()), {
+        equals: (a, b) => a.value === b.value && a.state === b.state,
+        ownedWrite: true
     });
+    const signal = [read, (next) => {
+            !ignore && config.set(next);
+            if (sharedConfig.registry && !sharedConfig.done)
+                sharedConfig.done = true;
+            write(next);
+        }];
     config.init &&
         onCleanup(config.init((value = config.get()) => {
             ignore = true;

package/dist/routing.d.ts

@@ -100,7 +100,7 @@ export declare const useCurrentMatches: () => () => RouteMatch[];
  * const params = useParams();
  *
  * // fetch user based on the id path parameter
- * const [user] = createResource(() => params.id, fetchUser);
+ * const getUser = query(() => fetchUser(params.id), "user");
  * ```
  */
 export declare const useParams: <T extends Params>() => T;

package/dist/routing.js

@@ -133,7 +133,7 @@ export const useCurrentMatches = () => useRouter().matches;
  * const params = useParams();
  *
  * // fetch user based on the id path parameter
- * const [user] = createResource(() => params.id, fetchUser);
+ * const getUser = query(() => fetchUser(params.id), "user");
  * ```
  */
 export const useParams = () => useRouter().params;
@@ -301,7 +301,7 @@ export function getRouteMatches(branches, location) {
 }
 function createLocation(path, state, queryWrapper) {
     const origin = new URL(mockBase);
-    const url = createMemo(prev => {
+    const url = createMemo((prev = origin) => {
         const path_ = path();
         try {
             return new URL(path_, origin);
@@ -310,11 +310,11 @@ function createLocation(path, state, queryWrapper) {
             console.error(`Invalid path ${path_}`);
             return prev;
         }
-    }, origin, {
+    }, {
         equals: (a, b) => a.href === b.href
     });
     const pathname = createMemo(() => url().pathname);
-    const search = createMemo(() => url().search, true);
+    const search = createMemo(() => url().search);
     const hash = createMemo(() => url().hash);
     const key = () => "";
     const queryFn = createMemo(() => extractSearchParams(url()));
@@ -361,31 +361,20 @@ export function createRouterContext(integration, branches, getContext, options =
     else if (basePath && !initialSource.value) {
         setSource({ value: basePath, replace: true, scroll: false });
     }
-    const [isRouting, setIsRouting] = createSignal(false, { pureWrite: true });
+    const [isRouting, setIsRouting] = createSignal(false, { ownedWrite: true });
     // Navigate override written from event handlers.
     const [navigateTarget, setNavigateTarget] = createSignal(undefined, {
-        pureWrite: true
+        ownedWrite: true
     });
     // Keep track of last target, so that last call to navigate wins
     let lastTransitionTarget;
     // source() remains canonical for native history changes; navigateTarget()
     // temporarily overrides it for in-flight programmatic navigation.
-    const reference = createMemo(() => {
-        const nav = navigateTarget();
-        if (nav !== undefined)
-            return nav.value;
-        return source().value;
-    });
-    const state = createMemo(() => {
-        const nav = navigateTarget();
-        if (nav !== undefined)
-            return nav.state;
-        return source().state;
-    });
-    const location = createLocation(reference, state, utils.queryWrapper);
+    const effective = createMemo(() => navigateTarget() ?? source());
+    const location = createLocation(() => effective().value, () => effective().state, utils.queryWrapper);
     const referrers = [];
     const submissions = createSignal(isServer ? initFromFlash() : [], {
-        pureWrite: true
+        ownedWrite: true
     });
     const matches = createMemo(() => {
         if (typeof options.transformUrl === "function") {
@@ -457,15 +446,15 @@ export function createRouterContext(integration, branches, getContext, options =
             else if (referrers.length >= MAX_REDIRECTS) {
                 throw new Error("Too many redirects");
             }
-            const current = reference();
-            if (resolvedTo !== current || nextState !== state()) {
+            const current = effective();
+            if (resolvedTo !== current.value || nextState !== current.state) {
                 if (isServer) {
                     const e = getRequestEvent();
                     e && (e.response = { status: 302, headers: new Headers({ Location: resolvedTo }) });
                     setSource({ value: resolvedTo, replace, scroll, state: nextState });
                 }
                 else if (beforeLeave.confirm(resolvedTo, options)) {
-                    referrers.push({ value: current, replace, scroll, state: state() });
+                    referrers.push({ value: current.value, replace, scroll, state: current.state });
                     const newTarget = {
                         value: resolvedTo,
                         state: nextState

package/package.json

@@ -6,7 +6,7 @@
     "Ryan Turnquist"
   ],
   "license": "MIT",
-  "version": "0.17.0-next.1",
+  "version": "0.17.0-next.3",
   "homepage": "https://github.com/solidjs/solid-router#readme",
   "repository": {
     "type": "git",
@@ -29,7 +29,7 @@
   ],
   "sideEffects": false,
   "devDependencies": {
-    "@solidjs/web": "2.0.0-beta.3",
+    "@solidjs/web": "2.0.0-beta.7",
     "@babel/core": "^7.26.0",
     "@babel/preset-typescript": "^7.26.0",
     "@changesets/cli": "^2.27.10",
@@ -38,19 +38,19 @@
     "@rollup/plugin-terser": "0.4.4",
     "@types/jest": "^29.5.14",
     "@types/node": "^22.10.0",
-    "babel-preset-solid": "2.0.0-beta.3",
+    "babel-preset-solid": "2.0.0-beta.7",
     "jsdom": "^25.0.1",
     "prettier": "^3.4.1",
     "rollup": "^4.27.4",
-    "solid-js": "2.0.0-beta.3",
+    "solid-js": "2.0.0-beta.7",
     "typescript": "^5.7.2",
     "vite": "^6.0.0",
-    "vite-plugin-solid": "3.0.0-next.2",
+    "vite-plugin-solid": "3.0.0-next.4",
     "vitest": "^2.1.6"
   },
   "peerDependencies": {
-    "@solidjs/web": "^2.0.0-beta.3",
-    "solid-js": "^2.0.0-beta.3"
+    "@solidjs/web": ">=2.0.0-beta.7 <2.0.0-experimental.0",
+    "solid-js": ">=2.0.0-beta.7 <2.0.0-experimental.0"
   },
   "scripts": {
     "build": "rm -rf dist && tsc && rollup -c",