@tanstack/solid-router 2.0.0-alpha.5 → 2.0.0-alpha.7

package/dist/source/Transitioner.jsx.map

@@ -1 +1 @@
-{"version":3,"file":"Transitioner.jsx","sourceRoot":"","sources":["../../src/Transitioner.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"Transitioner.jsx","sourceRoot":"","sources":["../../src/Transitioner.tsx"],"names":[],"mappings":"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"}

package/dist/source/headContentUtils.d.ts

@@ -1,7 +1,8 @@
+import * as Solid from 'solid-js';
 import type { RouterManagedTag } from '@tanstack/router-core';
 /**
  * Build the list of head/link/meta/script tags to render for active matches.
  * Used internally by `HeadContent`.
  */
-export declare const useTags: () => () => RouterManagedTag[];
+export declare const useTags: () => Solid.Accessor<RouterManagedTag[]>;
 export declare function uniqBy<T>(arr: Array<T>, fn: (item: T) => string): T[];

package/dist/source/headContentUtils.jsx

@@ -1,7 +1,6 @@
 import * as Solid from 'solid-js';
 import { escapeHtml } from '@tanstack/router-core';
 import { useRouter } from './useRouter';
-import { useRouterState } from './useRouterState';
 /**
  * Build the list of head/link/meta/script tags to render for active matches.
  * Used internally by `HeadContent`.
@@ -9,11 +8,11 @@ import { useRouterState } from './useRouterState';
 export const useTags = () => {
     const router = useRouter();
     const nonce = router.options.ssr?.nonce;
-    const routeMeta = useRouterState({
-        select: (state) => {
-            return state.matches.map((match) => match.meta).filter(Boolean);
-        },
-    });
+    const getTagKey = (tag) => JSON.stringify(tag);
+    const activeMatches = Solid.createMemo(() => router.stores.activeMatchesSnapshot.state);
+    const routeMeta = Solid.createMemo(() => activeMatches()
+        .map((match) => match.meta)
+        .filter(Boolean));
     const meta = Solid.createMemo(() => {
         const resultMeta = [];
         const metaByAttribute = {};
@@ -85,86 +84,86 @@ export const useTags = () => {
         resultMeta.reverse();
         return resultMeta;
     });
-    const links = useRouterState({
-        select: (state) => {
-            const constructed = state.matches
-                .map((match) => match.links)
-                .filter(Boolean)
-                .flat(1)
-                .map((link) => ({
-                tag: 'link',
-                attrs: {
-                    ...link,
-                    nonce,
-                },
-            }));
-            const manifest = router.ssr?.manifest;
-            const assets = state.matches
-                .map((match) => manifest?.routes[match.routeId]?.assets ?? [])
-                .filter(Boolean)
-                .flat(1)
-                .filter((asset) => asset.tag === 'link')
-                .map((asset) => ({
-                tag: 'link',
-                attrs: { ...asset.attrs, nonce },
-            }));
-            return [...constructed, ...assets];
-        },
-    });
-    const preloadLinks = useRouterState({
-        select: (state) => {
-            const preloadLinks = [];
-            state.matches
-                .map((match) => router.looseRoutesById[match.routeId])
-                .forEach((route) => router.ssr?.manifest?.routes[route.id]?.preloads
-                ?.filter(Boolean)
-                .forEach((preload) => {
-                preloadLinks.push({
-                    tag: 'link',
-                    attrs: {
-                        rel: 'modulepreload',
-                        href: preload,
-                        nonce,
-                    },
-                });
-            }));
-            return preloadLinks;
-        },
-    });
-    const styles = useRouterState({
-        select: (state) => state.matches
-            .map((match) => match.styles)
+    const links = Solid.createMemo(() => {
+        const matches = activeMatches();
+        const constructed = matches
+            .map((match) => match.links)
+            .filter(Boolean)
             .flat(1)
-            .filter(Boolean).map(({ children, ...style }) => ({
-            tag: 'style',
+            .map((link) => ({
+            tag: 'link',
             attrs: {
-                ...style,
+                ...link,
                 nonce,
             },
-            children,
-        })),
-    });
-    const headScripts = useRouterState({
-        select: (state) => state.matches
-            .map((match) => match.headScripts)
+        }));
+        const manifest = router.ssr?.manifest;
+        const assets = matches
+            .map((match) => manifest?.routes[match.routeId]?.assets ?? [])
+            .filter(Boolean)
             .flat(1)
-            .filter(Boolean).map(({ children, ...script }) => ({
-            tag: 'script',
-            attrs: {
-                ...script,
-                nonce,
-            },
-            children,
-        })),
+            .filter((asset) => asset.tag === 'link')
+            .map((asset) => ({
+            tag: 'link',
+            attrs: { ...asset.attrs, nonce },
+        }));
+        return [...constructed, ...assets];
+    });
+    const preloadLinks = Solid.createMemo(() => {
+        const matches = activeMatches();
+        const preloadLinks = [];
+        matches
+            .map((match) => router.looseRoutesById[match.routeId])
+            .forEach((route) => router.ssr?.manifest?.routes[route.id]?.preloads
+            ?.filter(Boolean)
+            .forEach((preload) => {
+            preloadLinks.push({
+                tag: 'link',
+                attrs: {
+                    rel: 'modulepreload',
+                    href: preload,
+                    nonce,
+                },
+            });
+        }));
+        return preloadLinks;
     });
-    return () => uniqBy([
-        ...meta(),
-        ...preloadLinks(),
-        ...links(),
-        ...styles(),
-        ...headScripts(),
-    ], (d) => {
-        return JSON.stringify(d);
+    const styles = Solid.createMemo(() => activeMatches()
+        .map((match) => match.styles)
+        .flat(1)
+        .filter(Boolean).map(({ children, ...style }) => ({
+        tag: 'style',
+        attrs: {
+            ...style,
+            nonce,
+        },
+        children,
+    })));
+    const headScripts = Solid.createMemo(() => activeMatches()
+        .map((match) => match.headScripts)
+        .flat(1)
+        .filter(Boolean).map(({ children, ...script }) => ({
+        tag: 'script',
+        attrs: {
+            ...script,
+            nonce,
+        },
+        children,
+    })));
+    return Solid.createMemo((prev) => {
+        const next = uniqBy([
+            ...meta(),
+            ...preloadLinks(),
+            ...links(),
+            ...styles(),
+            ...headScripts(),
+        ], getTagKey);
+        if (prev &&
+            prev.length === next.length &&
+            prev.every((tag, index) => getTagKey(tag) === getTagKey(next[index]))) {
+            return prev;
+        }
+        return next;
     });
 };
 export function uniqBy(arr, fn) {

package/dist/source/headContentUtils.jsx.map

@@ -1 +1 @@
-{"version":3,"file":"headContentUtils.jsx","sourceRoot":"","sources":["../../src/headContentUtils.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"headContentUtils.jsx","sourceRoot":"","sources":["../../src/headContentUtils.tsx"],"names":[],"mappings":"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"}

package/dist/source/link.jsx

@@ -2,7 +2,6 @@ import * as Solid from 'solid-js';
 import { deepEqual, exactPathTest, functionalUpdate, isDangerousProtocol, preloadWarning, removeTrailingSlash, } from '@tanstack/router-core';
 import { isServer } from '@tanstack/router-core/isServer';
 import { Dynamic } from '@solidjs/web';
-import { useRouterState } from './useRouterState';
 import { useRouter } from './useRouter';
 import { useIntersectionObserver } from './utils';
 import { useHydrated } from './ClientOnly';
@@ -32,8 +31,8 @@ export function useLinkProps(options) {
     const hasHydrated = useHydrated();
     let hasRenderFetched = false;
     const [local, rest] = splitProps(Solid.merge({
-        activeProps: () => ({ class: 'active' }),
-        inactiveProps: () => ({}),
+        activeProps: STATIC_ACTIVE_PROPS_GET,
+        inactiveProps: STATIC_INACTIVE_PROPS_GET,
     }, options), [
         'activeProps',
         'inactiveProps',
@@ -69,30 +68,14 @@ export function useLinkProps(options) {
         'reloadDocument',
         'unsafeRelative',
     ]);
-    const currentLocation = useRouterState({
-        select: (s) => s.location,
-    });
-    const buildLocationKey = useRouterState({
-        select: (s) => {
-            const leaf = s.matches[s.matches.length - 1];
-            return {
-                search: leaf?.search,
-                hash: s.location.hash,
-                path: leaf?.pathname, // path + params
-            };
-        },
-    });
-    const from = options.from;
-    const _options = () => {
-        const result = {
-            ...options,
-            from,
-        };
-        return result;
-    };
+    const currentLocation = Solid.createMemo(() => router.stores.location.state, undefined, { equals: (prev, next) => prev?.href === next?.href });
+    const _options = () => options;
     const next = Solid.createMemo(() => {
-        buildLocationKey();
-        return router.buildLocation(_options());
+        // Rebuild when inherited search/hash or the current route context changes.
+        const _fromLocation = currentLocation();
+        const options = { _fromLocation, ..._options() };
+        // untrack because router-core will also access stores, which are signals in solid
+        return Solid.untrack(() => router.buildLocation(options));
     });
     const hrefOption = Solid.createMemo(() => {
         if (_options().disabled)
@@ -125,10 +108,10 @@ export function useLinkProps(options) {
             return _href.href;
         }
         const to = _options().to;
-        const isSafeInternal = typeof to === 'string' &&
-            to.charCodeAt(0) === 47 && // '/'
-            to.charCodeAt(1) !== 47; // but not '//'
-        if (isSafeInternal)
+        const safeInternal = isSafeInternal(to);
+        if (safeInternal)
+            return undefined;
+        if (typeof to !== 'string' || to.indexOf(':') === -1)
             return undefined;
         try {
             new URL(to);
@@ -154,36 +137,43 @@ export function useLinkProps(options) {
     const isActive = Solid.createMemo(() => {
         if (externalLink())
             return false;
-        if (local.activeOptions?.exact) {
-            const testExact = exactPathTest(currentLocation().pathname, next().pathname, router.basepath);
+        const activeOptions = local.activeOptions;
+        const current = currentLocation();
+        const nextLocation = next();
+        if (activeOptions?.exact) {
+            const testExact = exactPathTest(current.pathname, nextLocation.pathname, router.basepath);
             if (!testExact) {
                 return false;
             }
         }
         else {
-            const currentPathSplit = removeTrailingSlash(currentLocation().pathname, router.basepath).split('/');
-            const nextPathSplit = removeTrailingSlash(next()?.pathname, router.basepath)?.split('/');
-            const pathIsFuzzyEqual = nextPathSplit?.every((d, i) => d === currentPathSplit[i]);
+            const currentPath = removeTrailingSlash(current.pathname, router.basepath);
+            const nextPath = removeTrailingSlash(nextLocation.pathname, router.basepath);
+            const pathIsFuzzyEqual = currentPath.startsWith(nextPath) &&
+                (currentPath.length === nextPath.length ||
+                    currentPath[nextPath.length] === '/');
             if (!pathIsFuzzyEqual) {
                 return false;
             }
         }
-        if (local.activeOptions?.includeSearch ?? true) {
-            const searchTest = deepEqual(currentLocation().search, next().search, {
-                partial: !local.activeOptions?.exact,
-                ignoreUndefined: !local.activeOptions?.explicitUndefined,
+        if (activeOptions?.includeSearch ?? true) {
+            const searchTest = deepEqual(current.search, nextLocation.search, {
+                partial: !activeOptions?.exact,
+                ignoreUndefined: !activeOptions?.explicitUndefined,
             });
             if (!searchTest) {
                 return false;
             }
         }
-        if (local.activeOptions?.includeHash) {
-            const currentHash = shouldHydrateHash && !hasHydrated() ? '' : currentLocation().hash;
-            return currentHash === next().hash;
+        if (activeOptions?.includeHash) {
+            const currentHash = shouldHydrateHash && !hasHydrated() ? '' : current.hash;
+            return currentHash === nextLocation.hash;
         }
         return true;
     });
-    const doPreload = () => router.preloadRoute(_options()).catch((err) => {
+    const doPreload = () => router
+        .preloadRoute({ ..._options(), _builtLocation: next() })
+        .catch((err) => {
         console.warn(err);
         console.warn(preloadWarning);
     });
@@ -204,14 +194,15 @@ export function useLinkProps(options) {
             return;
         }
         if (!local.disabled && preloadValue === 'render') {
-            doPreload();
+            Solid.untrack(() => doPreload());
             hasRenderFetched = true;
         }
     });
     if (Solid.untrack(externalLink)) {
+        const externalHref = Solid.untrack(externalLink);
         return Solid.merge(propsSafeToSpread, {
             // ref: mergeRefs(setRef, _options().ref),
-            href: externalLink(),
+            href: externalHref,
         }, splitProps(local, [
             'target',
             'disabled',
@@ -238,10 +229,14 @@ export function useLinkProps(options) {
             (!effectiveTarget || effectiveTarget === '_self') &&
             e.button === 0) {
             e.preventDefault();
-            setIsTransitioning(true);
+            Solid.runWithOwner(null, () => {
+                setIsTransitioning(true);
+            });
             const unsub = router.subscribe('onResolved', () => {
                 unsub();
-                setIsTransitioning(false);
+                Solid.runWithOwner(null, () => {
+                    setIsTransitioning(false);
+                });
             });
             // All is well? Navigate!
             // N.B. we don't call `router.commitLocation(next) here because we want to run `validateSearch` before committing
@@ -286,76 +281,103 @@ export function useLinkProps(options) {
             timeoutMap.delete(eventTarget);
         }
     };
-    /** Call a JSX.EventHandlerUnion with the event. */
-    function callHandler(event, handler) {
-        if (handler) {
-            if (typeof handler === 'function') {
-                handler(event);
-            }
-            else {
-                handler[0](handler[1], event);
-            }
-        }
-        return event.defaultPrevented;
-    }
-    function composeEventHandlers(handlers) {
-        return (event) => {
-            for (const handler of handlers) {
-                callHandler(event, handler);
-            }
-        };
-    }
-    // Get the active props
-    const resolvedActiveProps = () => isActive() ? (functionalUpdate(local.activeProps, {}) ?? {}) : {};
-    // Get the inactive props
-    const resolvedInactiveProps = () => isActive() ? {} : functionalUpdate(local.inactiveProps, {});
-    const resolvedClassName = () => [local.class, resolvedActiveProps().class, resolvedInactiveProps().class]
-        .filter(Boolean)
-        .join(' ');
-    const resolvedStyle = () => ({
-        ...local.style,
-        ...resolvedActiveProps().style,
-        ...resolvedInactiveProps().style,
-    });
-    return Solid.merge(propsSafeToSpread, resolvedActiveProps, resolvedInactiveProps, () => {
-        return {
+    const simpleStyling = Solid.createMemo(() => local.activeProps === STATIC_ACTIVE_PROPS_GET &&
+        local.inactiveProps === STATIC_INACTIVE_PROPS_GET &&
+        local.class === undefined &&
+        local.style === undefined);
+    const onClick = createComposedHandler(() => local.onClick, handleClick);
+    const onBlur = createComposedHandler(() => local.onBlur, handleLeave);
+    const onFocus = createComposedHandler(() => local.onFocus, enqueueIntentPreload);
+    const onMouseEnter = createComposedHandler(() => local.onMouseEnter, enqueueIntentPreload);
+    const onMouseOver = createComposedHandler(() => local.onMouseOver, enqueueIntentPreload);
+    const onMouseLeave = createComposedHandler(() => local.onMouseLeave, handleLeave);
+    const onMouseOut = createComposedHandler(() => local.onMouseOut, handleLeave);
+    const onTouchStart = createComposedHandler(() => local.onTouchStart, handleTouchStart);
+    const resolvedProps = Solid.createMemo(() => {
+        const active = isActive();
+        const base = {
             href: hrefOption()?.href,
             ref: mergeRefs(setRef, _options().ref),
-            onClick: composeEventHandlers([local.onClick, handleClick]),
-            onBlur: composeEventHandlers([local.onBlur, handleLeave]),
-            onFocus: composeEventHandlers([local.onFocus, enqueueIntentPreload]),
-            onMouseEnter: composeEventHandlers([
-                local.onMouseEnter,
-                enqueueIntentPreload,
-            ]),
-            onMouseOver: composeEventHandlers([
-                local.onMouseOver,
-                enqueueIntentPreload,
-            ]),
-            onMouseLeave: composeEventHandlers([local.onMouseLeave, handleLeave]),
-            onMouseOut: composeEventHandlers([local.onMouseOut, handleLeave]),
-            onTouchStart: composeEventHandlers([
-                local.onTouchStart,
-                handleTouchStart,
-            ]),
+            onClick,
+            onBlur,
+            onFocus,
+            onMouseEnter,
+            onMouseOver,
+            onMouseLeave,
+            onMouseOut,
+            onTouchStart,
             disabled: !!local.disabled,
             target: local.target,
-            ...(() => {
-                const s = resolvedStyle();
-                return Object.keys(s).length ? { style: s } : {};
-            })(),
-            ...(() => {
-                const c = resolvedClassName();
-                return c ? { class: c } : {};
-            })(),
-            ...(local.disabled && {
-                role: 'link',
-                'aria-disabled': 'true',
-            }),
-            ...(isActive() && { 'data-status': 'active', 'aria-current': 'page' }),
-            ...(isTransitioning() && { 'data-transitioning': 'transitioning' }),
+            ...(local.disabled && STATIC_DISABLED_PROPS),
+            ...(isTransitioning() && STATIC_TRANSITIONING_ATTRIBUTES),
+        };
+        if (simpleStyling()) {
+            return {
+                ...base,
+                ...(active && STATIC_DEFAULT_ACTIVE_ATTRIBUTES),
+            };
+        }
+        const activeProps = active
+            ? (functionalUpdate(local.activeProps, {}) ?? EMPTY_OBJECT)
+            : EMPTY_OBJECT;
+        const inactiveProps = active
+            ? EMPTY_OBJECT
+            : functionalUpdate(local.inactiveProps, {});
+        const style = {
+            ...local.style,
+            ...activeProps.style,
+            ...inactiveProps.style,
+        };
+        const className = [local.class, activeProps.class, inactiveProps.class]
+            .filter(Boolean)
+            .join(' ');
+        return {
+            ...activeProps,
+            ...inactiveProps,
+            ...base,
+            ...(Object.keys(style).length ? { style } : undefined),
+            ...(className ? { class: className } : undefined),
+            ...(active && STATIC_ACTIVE_ATTRIBUTES),
         };
     });
+    return Solid.merge(propsSafeToSpread, resolvedProps);
+}
+const STATIC_ACTIVE_PROPS = { class: 'active' };
+const STATIC_ACTIVE_PROPS_GET = () => STATIC_ACTIVE_PROPS;
+const EMPTY_OBJECT = {};
+const STATIC_INACTIVE_PROPS_GET = () => EMPTY_OBJECT;
+const STATIC_DEFAULT_ACTIVE_ATTRIBUTES = {
+    class: 'active',
+    'data-status': 'active',
+    'aria-current': 'page',
+};
+const STATIC_DISABLED_PROPS = {
+    role: 'link',
+    'aria-disabled': 'true',
+};
+const STATIC_ACTIVE_ATTRIBUTES = {
+    'data-status': 'active',
+    'aria-current': 'page',
+};
+const STATIC_TRANSITIONING_ATTRIBUTES = {
+    'data-transitioning': 'transitioning',
+};
+/** Call a JSX.EventHandlerUnion with the event. */
+function callHandler(event, handler) {
+    if (typeof handler === 'function') {
+        handler(event);
+    }
+    else {
+        handler[0](handler[1], event);
+    }
+    return event.defaultPrevented;
+}
+function createComposedHandler(getHandler, fallback) {
+    return (event) => {
+        const handler = getHandler();
+        if (!handler || !callHandler(event, handler))
+            fallback(event);
+    };
 }
 export function createLink(Comp) {
     return (props) => <Link {...props} _asChild={Comp}/>;
@@ -392,13 +414,24 @@ export const Link = (props) => {
         <a {...svgLinkProps}>{children()}</a>
       </svg>);
     }
-    return (<Dynamic component={local._asChild ? local._asChild : 'a'} {...linkProps}>
+    if (!local._asChild) {
+        return <a {...linkProps}>{children()}</a>;
+    }
+    return (<Dynamic component={local._asChild} {...linkProps}>
       {children()}
     </Dynamic>);
 };
 function isCtrlEvent(e) {
     return !!(e.metaKey || e.altKey || e.ctrlKey || e.shiftKey);
 }
+function isSafeInternal(to) {
+    if (typeof to !== 'string')
+        return false;
+    const zero = to.charCodeAt(0);
+    if (zero === 47)
+        return to.charCodeAt(1) !== 47; // '/' but not '//'
+    return zero === 46; // '.', '..', './', '../'
+}
 export const linkOptions = (options) => {
     return options;
 };