@tanstack/solid-router 1.168.8 → 1.168.10

package/dist/cjs/Match.cjs

@@ -78,7 +78,11 @@ var Match = (props) => {
 										return routeErrorComponent() || require_CatchBoundary.ErrorComponent;
 									},
 									onCatch: (error) => {
-										if ((0, _tanstack_router_core.isNotFound)(error)) throw error;
+										const notFoundError = require_not_found.getNotFound(error);
+										if (notFoundError) {
+											notFoundError.routeId ??= currentMatchState().routeId;
+											throw notFoundError;
+										}
 										if (process.env.NODE_ENV !== "production") console.warn(`Warning: Error in route match: ${currentMatchState().routeId}`);
 										routeOnCatch()?.(error);
 									},
@@ -88,10 +92,12 @@ var Match = (props) => {
 												return ResolvedNotFoundBoundary();
 											},
 											fallback: (error) => {
-												if (!routeNotFoundComponent() || error.routeId && error.routeId !== currentMatchState().routeId || !error.routeId && !route().isRoot) throw error;
+												const notFoundError = require_not_found.getNotFound(error) ?? error;
+												notFoundError.routeId ??= currentMatchState().routeId;
+												if (!routeNotFoundComponent() || notFoundError.routeId && notFoundError.routeId !== currentMatchState().routeId || !notFoundError.routeId && !route().isRoot) throw notFoundError;
 												return (0, solid_js_web.createComponent)(solid_js_web.Dynamic, (0, solid_js_web.mergeProps)({ get component() {
 													return routeNotFoundComponent();
-												} }, error));
+												} }, notFoundError));
 											},
 											get children() {
 												return (0, solid_js_web.createComponent)(solid_js.Switch, { get children() {

package/dist/cjs/Match.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"Match.cjs","names":["Solid","createControlledPromise","getLocationChangeInfo","invariant","isNotFound","isRedirect","rootRouteId","isServer","Dynamic","CatchBoundary","ErrorComponent","useRouter","CatchNotFound","nearestMatchContext","SafeFragment","renderRouteNotFound","ScrollRestoration","AnyRoute","RootRouteOptions","Match","props","matchId","router","match","createMemo","id","undefined","stores","activeMatchStoresById","get","state","rawMatchState","currentMatch","routeId","parentRouteId","routesById","parentRoute","ssr","_displayPending","hasPendingMatch","currentRouteId","Boolean","pendingRouteIds","nearestMatch","hasPending","_$createComponent","Show","when","children","currentMatchState","route","resolvePendingComponent","options","pendingComponent","defaultPendingComponent","routeErrorComponent","errorComponent","defaultErrorComponent","routeOnCatch","onCatch","defaultOnCatch","routeNotFoundComponent","isRoot","notFoundComponent","notFoundRoute","component","resolvedNoSsr","ResolvedSuspenseBoundary","Suspense","ResolvedCatchBoundary","ResolvedNotFoundBoundary","ShellComponent","shellComponent","Provider","value","fallback","_$memo","getResetKey","loadedAt","error","Error","process","env","NODE_ENV","console","warn","_$mergeProps","Switch","MatchInner","OnRendered","scrollRestoration","location","resolvedLocation","__TSR_key","createEffect","on","emit","type","useContext","remountFn","remountDeps","defaultRemountDeps","loaderDeps","params","_strictParams","search","_strictSearch","key","JSON","stringify","status","_forcePending","componentKey","out","Comp","defaultComponent","Outlet","keyedOut","keyed","_key","_","displayPendingResult","createResource","getMatch","_nonReactive","displayPendingPromise","minPendingResult","minPendingPromise","pendingMinMs","defaultPendingMinMs","routerMatch","setTimeout","resolve","loaderResult","Promise","r","loadPromise","FallbackComponent","_routeId","RouteErrorComponent","info","componentStack","nearestParentMatch","parentMatch","parentGlobalNotFound","globalNotFound","childMatchId","childMatchIdByRouteId","childMatchStatus","shouldShowNotFound","resolvedRoute","childMatchIdAccessor","currentMatchId"],"sources":["../../src/Match.tsx"],"sourcesContent":["import * as Solid from 'solid-js'\nimport {\n  createControlledPromise,\n  getLocationChangeInfo,\n  invariant,\n  isNotFound,\n  isRedirect,\n  rootRouteId,\n} from '@tanstack/router-core'\nimport { isServer } from '@tanstack/router-core/isServer'\nimport { Dynamic } from 'solid-js/web'\nimport { CatchBoundary, ErrorComponent } from './CatchBoundary'\nimport { useRouter } from './useRouter'\nimport { CatchNotFound } from './not-found'\nimport { nearestMatchContext } from './matchContext'\nimport { SafeFragment } from './SafeFragment'\nimport { renderRouteNotFound } from './renderRouteNotFound'\nimport { ScrollRestoration } from './scroll-restoration'\nimport type { AnyRoute, RootRouteOptions } from '@tanstack/router-core'\n\nexport const Match = (props: { matchId: string }) => {\n  const router = useRouter()\n\n  const match = Solid.createMemo(() => {\n    const id = props.matchId\n    if (!id) return undefined\n    return router.stores.activeMatchStoresById.get(id)?.state\n  })\n\n  const rawMatchState = Solid.createMemo(() => {\n    const currentMatch = match()\n    if (!currentMatch) {\n      return null\n    }\n\n    const routeId = currentMatch.routeId as string\n    const parentRouteId = (router.routesById[routeId] as AnyRoute)?.parentRoute\n      ?.id\n\n    return {\n      matchId: currentMatch.id,\n      routeId,\n      ssr: currentMatch.ssr,\n      _displayPending: currentMatch._displayPending,\n      parentRouteId: parentRouteId as string | undefined,\n    }\n  })\n\n  const hasPendingMatch = Solid.createMemo(() => {\n    const currentRouteId = rawMatchState()?.routeId\n    return currentRouteId\n      ? Boolean(router.stores.pendingRouteIds.state[currentRouteId])\n      : false\n  })\n  const nearestMatch = {\n    matchId: () => rawMatchState()?.matchId,\n    routeId: () => rawMatchState()?.routeId,\n    match,\n    hasPending: hasPendingMatch,\n  }\n\n  return (\n    <Solid.Show when={rawMatchState()}>\n      {(currentMatchState) => {\n        const route: () => AnyRoute = () =>\n          router.routesById[currentMatchState().routeId]\n\n        const resolvePendingComponent = () =>\n          route().options.pendingComponent ??\n          router.options.defaultPendingComponent\n\n        const routeErrorComponent = () =>\n          route().options.errorComponent ?? router.options.defaultErrorComponent\n\n        const routeOnCatch = () =>\n          route().options.onCatch ?? router.options.defaultOnCatch\n\n        const routeNotFoundComponent = () =>\n          route().isRoot\n            ? // If it's the root route, use the globalNotFound option, with fallback to the notFoundRoute's component\n              (route().options.notFoundComponent ??\n              router.options.notFoundRoute?.options.component)\n            : route().options.notFoundComponent\n\n        const resolvedNoSsr =\n          currentMatchState().ssr === false ||\n          currentMatchState().ssr === 'data-only'\n\n        const ResolvedSuspenseBoundary = () => Solid.Suspense\n\n        const ResolvedCatchBoundary = () =>\n          routeErrorComponent() ? CatchBoundary : SafeFragment\n\n        const ResolvedNotFoundBoundary = () =>\n          routeNotFoundComponent() ? CatchNotFound : SafeFragment\n\n        const ShellComponent = route().isRoot\n          ? ((route().options as RootRouteOptions).shellComponent ??\n            SafeFragment)\n          : SafeFragment\n\n        return (\n          <ShellComponent>\n            <nearestMatchContext.Provider value={nearestMatch}>\n              <Dynamic\n                component={ResolvedSuspenseBoundary()}\n                fallback={\n                  // Don't show fallback on server when using no-ssr mode to avoid hydration mismatch\n                  (isServer ?? router.isServer) && resolvedNoSsr ? undefined : (\n                    <Dynamic component={resolvePendingComponent()} />\n                  )\n                }\n              >\n                <Dynamic\n                  component={ResolvedCatchBoundary()}\n                  getResetKey={() => router.stores.loadedAt.state}\n                  errorComponent={routeErrorComponent() || ErrorComponent}\n                  onCatch={(error: Error) => {\n                    // Forward not found errors (we don't want to show the error component for these)\n                    if (isNotFound(error)) throw error\n                    if (process.env.NODE_ENV !== 'production') {\n                      console.warn(\n                        `Warning: Error in route match: ${currentMatchState().routeId}`,\n                      )\n                    }\n                    routeOnCatch()?.(error)\n                  }}\n                >\n                  <Dynamic\n                    component={ResolvedNotFoundBoundary()}\n                    fallback={(error: any) => {\n                      // If the current not found handler doesn't exist or it has a\n                      // route ID which doesn't match the current route, rethrow the error\n                      if (\n                        !routeNotFoundComponent() ||\n                        (error.routeId &&\n                          error.routeId !== currentMatchState().routeId) ||\n                        (!error.routeId && !route().isRoot)\n                      )\n                        throw error\n\n                      return (\n                        <Dynamic\n                          component={routeNotFoundComponent()}\n                          {...error}\n                        />\n                      )\n                    }}\n                  >\n                    <Solid.Switch>\n                      <Solid.Match when={resolvedNoSsr}>\n                        <Solid.Show\n                          when={!(isServer ?? router.isServer)}\n                          fallback={\n                            <Dynamic component={resolvePendingComponent()} />\n                          }\n                        >\n                          <MatchInner />\n                        </Solid.Show>\n                      </Solid.Match>\n                      <Solid.Match when={!resolvedNoSsr}>\n                        <MatchInner />\n                      </Solid.Match>\n                    </Solid.Switch>\n                  </Dynamic>\n                </Dynamic>\n              </Dynamic>\n            </nearestMatchContext.Provider>\n\n            {currentMatchState().parentRouteId === rootRouteId ? (\n              <>\n                <OnRendered />\n                {router.options.scrollRestoration &&\n                (isServer ?? router.isServer) ? (\n                  <ScrollRestoration />\n                ) : null}\n              </>\n            ) : null}\n          </ShellComponent>\n        )\n      }}\n    </Solid.Show>\n  )\n}\n\n// On Rendered can't happen above the root layout because it needs to run\n// after the app has committed below the root layout. Keeping it here lets us\n// fire onRendered even after a hydration mismatch above the root layout\n// (like bad head/link tags, which is common).\nfunction OnRendered() {\n  const router = useRouter()\n\n  const location = Solid.createMemo(\n    () => router.stores.resolvedLocation.state?.state.__TSR_key,\n  )\n  Solid.createEffect(\n    Solid.on([location], () => {\n      router.emit({\n        type: 'onRendered',\n        ...getLocationChangeInfo(\n          router.stores.location.state,\n          router.stores.resolvedLocation.state,\n        ),\n      })\n    }),\n  )\n  return null\n}\n\nexport const MatchInner = (): any => {\n  const router = useRouter()\n  const match = Solid.useContext(nearestMatchContext).match\n\n  const rawMatchState = Solid.createMemo(() => {\n    const currentMatch = match()\n    if (!currentMatch) {\n      return null\n    }\n\n    const routeId = currentMatch.routeId as string\n\n    const remountFn =\n      (router.routesById[routeId] as AnyRoute).options.remountDeps ??\n      router.options.defaultRemountDeps\n    const remountDeps = remountFn?.({\n      routeId,\n      loaderDeps: currentMatch.loaderDeps,\n      params: currentMatch._strictParams,\n      search: currentMatch._strictSearch,\n    })\n    const key = remountDeps ? JSON.stringify(remountDeps) : undefined\n\n    return {\n      key,\n      routeId,\n      match: {\n        id: currentMatch.id,\n        status: currentMatch.status,\n        error: currentMatch.error,\n        _forcePending: currentMatch._forcePending ?? false,\n        _displayPending: currentMatch._displayPending ?? false,\n      },\n    }\n  })\n\n  return (\n    <Solid.Show when={rawMatchState()}>\n      {(currentMatchState) => {\n        const route = () => router.routesById[currentMatchState().routeId]!\n\n        const currentMatch = () => currentMatchState().match\n\n        const componentKey = () =>\n          currentMatchState().key ?? currentMatchState().match.id\n\n        const out = () => {\n          const Comp =\n            route().options.component ?? router.options.defaultComponent\n          if (Comp) {\n            return <Comp />\n          }\n          return <Outlet />\n        }\n\n        const keyedOut = () => (\n          <Solid.Show when={componentKey()} keyed>\n            {(_key) => out()}\n          </Solid.Show>\n        )\n\n        return (\n          <Solid.Switch>\n            <Solid.Match when={currentMatch()._displayPending}>\n              {(_) => {\n                const [displayPendingResult] = Solid.createResource(\n                  () =>\n                    router.getMatch(currentMatch().id)?._nonReactive\n                      .displayPendingPromise,\n                )\n\n                return <>{displayPendingResult()}</>\n              }}\n            </Solid.Match>\n            <Solid.Match when={currentMatch()._forcePending}>\n              {(_) => {\n                const [minPendingResult] = Solid.createResource(\n                  () =>\n                    router.getMatch(currentMatch().id)?._nonReactive\n                      .minPendingPromise,\n                )\n\n                return <>{minPendingResult()}</>\n              }}\n            </Solid.Match>\n            <Solid.Match when={currentMatch().status === 'pending'}>\n              {(_) => {\n                const pendingMinMs =\n                  route().options.pendingMinMs ??\n                  router.options.defaultPendingMinMs\n\n                if (pendingMinMs) {\n                  const routerMatch = router.getMatch(currentMatch().id)\n                  if (\n                    routerMatch &&\n                    !routerMatch._nonReactive.minPendingPromise\n                  ) {\n                    // Create a promise that will resolve after the minPendingMs\n                    if (!(isServer ?? router.isServer)) {\n                      const minPendingPromise = createControlledPromise<void>()\n\n                      routerMatch._nonReactive.minPendingPromise =\n                        minPendingPromise\n\n                      setTimeout(() => {\n                        minPendingPromise.resolve()\n                        // We've handled the minPendingPromise, so we can delete it\n                        routerMatch._nonReactive.minPendingPromise = undefined\n                      }, pendingMinMs)\n                    }\n                  }\n                }\n\n                const [loaderResult] = Solid.createResource(async () => {\n                  await new Promise((r) => setTimeout(r, 0))\n                  return router.getMatch(currentMatch().id)?._nonReactive\n                    .loadPromise\n                })\n\n                const FallbackComponent =\n                  route().options.pendingComponent ??\n                  router.options.defaultPendingComponent\n\n                return (\n                  <>\n                    {FallbackComponent && pendingMinMs > 0 ? (\n                      <Dynamic component={FallbackComponent} />\n                    ) : null}\n                    {loaderResult()}\n                  </>\n                )\n              }}\n            </Solid.Match>\n            <Solid.Match when={currentMatch().status === 'notFound'}>\n              {(_) => {\n                if (!isNotFound(currentMatch().error)) {\n                  if (process.env.NODE_ENV !== 'production') {\n                    throw new Error(\n                      'Invariant failed: Expected a notFound error',\n                    )\n                  }\n\n                  invariant()\n                }\n\n                // Use Show with keyed to ensure re-render when routeId changes\n                return (\n                  <Solid.Show when={currentMatchState().routeId} keyed>\n                    {(_routeId) =>\n                      renderRouteNotFound(router, route(), currentMatch().error)\n                    }\n                  </Solid.Show>\n                )\n              }}\n            </Solid.Match>\n            <Solid.Match when={currentMatch().status === 'redirected'}>\n              {(_) => {\n                if (!isRedirect(currentMatch().error)) {\n                  if (process.env.NODE_ENV !== 'production') {\n                    throw new Error(\n                      'Invariant failed: Expected a redirect error',\n                    )\n                  }\n\n                  invariant()\n                }\n\n                const [loaderResult] = Solid.createResource(async () => {\n                  await new Promise((r) => setTimeout(r, 0))\n                  return router.getMatch(currentMatch().id)?._nonReactive\n                    .loadPromise\n                })\n\n                return <>{loaderResult()}</>\n              }}\n            </Solid.Match>\n            <Solid.Match when={currentMatch().status === 'error'}>\n              {(_) => {\n                if (isServer ?? router.isServer) {\n                  const RouteErrorComponent =\n                    (route().options.errorComponent ??\n                      router.options.defaultErrorComponent) ||\n                    ErrorComponent\n\n                  return (\n                    <RouteErrorComponent\n                      error={currentMatch().error}\n                      info={{\n                        componentStack: '',\n                      }}\n                    />\n                  )\n                }\n\n                throw currentMatch().error\n              }}\n            </Solid.Match>\n            <Solid.Match when={currentMatch().status === 'success'}>\n              {keyedOut()}\n            </Solid.Match>\n          </Solid.Switch>\n        )\n      }}\n    </Solid.Show>\n  )\n}\n\nexport const Outlet = () => {\n  const router = useRouter()\n  const nearestParentMatch = Solid.useContext(nearestMatchContext)\n  const parentMatch = nearestParentMatch.match\n  const routeId = nearestParentMatch.routeId\n  const route = Solid.createMemo(() =>\n    routeId() ? router.routesById[routeId()!] : undefined,\n  )\n\n  const parentGlobalNotFound = Solid.createMemo(\n    () => parentMatch()?.globalNotFound ?? false,\n  )\n\n  const childMatchId = Solid.createMemo(() => {\n    const currentRouteId = routeId()\n    return currentRouteId\n      ? router.stores.childMatchIdByRouteId.state[currentRouteId]\n      : undefined\n  })\n\n  const childMatchStatus = Solid.createMemo(() => {\n    const id = childMatchId()\n    if (!id) return undefined\n    return router.stores.activeMatchStoresById.get(id)?.state.status\n  })\n\n  // Only show not-found if we're not in a redirected state\n  const shouldShowNotFound = () =>\n    childMatchStatus() !== 'redirected' && parentGlobalNotFound()\n\n  return (\n    <Solid.Show\n      when={!shouldShowNotFound() && childMatchId()}\n      fallback={\n        <Solid.Show when={shouldShowNotFound() && route()}>\n          {(resolvedRoute) =>\n            renderRouteNotFound(router, resolvedRoute(), undefined)\n          }\n        </Solid.Show>\n      }\n    >\n      {(childMatchIdAccessor) => {\n        const currentMatchId = Solid.createMemo(() => childMatchIdAccessor())\n\n        return (\n          <Solid.Show\n            when={routeId() === rootRouteId}\n            fallback={<Match matchId={currentMatchId()} />}\n          >\n            <Solid.Suspense\n              fallback={\n                <Dynamic component={router.options.defaultPendingComponent} />\n              }\n            >\n              <Match matchId={currentMatchId()} />\n            </Solid.Suspense>\n          </Solid.Show>\n        )\n      }}\n    </Solid.Show>\n  )\n}\n"],"mappings":"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"}
+{"version":3,"file":"Match.cjs","names":["Solid","createControlledPromise","getLocationChangeInfo","invariant","isNotFound","isRedirect","rootRouteId","isServer","Dynamic","CatchBoundary","ErrorComponent","useRouter","CatchNotFound","getNotFound","nearestMatchContext","SafeFragment","renderRouteNotFound","ScrollRestoration","AnyRoute","RootRouteOptions","Match","props","matchId","router","match","createMemo","id","undefined","stores","activeMatchStoresById","get","state","rawMatchState","currentMatch","routeId","parentRouteId","routesById","parentRoute","ssr","_displayPending","hasPendingMatch","currentRouteId","Boolean","pendingRouteIds","nearestMatch","hasPending","_$createComponent","Show","when","children","currentMatchState","route","resolvePendingComponent","options","pendingComponent","defaultPendingComponent","routeErrorComponent","errorComponent","defaultErrorComponent","routeOnCatch","onCatch","defaultOnCatch","routeNotFoundComponent","isRoot","notFoundComponent","notFoundRoute","component","resolvedNoSsr","ResolvedSuspenseBoundary","Suspense","ResolvedCatchBoundary","ResolvedNotFoundBoundary","ShellComponent","shellComponent","Provider","value","fallback","_$memo","getResetKey","loadedAt","error","Error","notFoundError","process","env","NODE_ENV","console","warn","_$mergeProps","Switch","MatchInner","OnRendered","scrollRestoration","location","resolvedLocation","__TSR_key","createEffect","on","emit","type","useContext","remountFn","remountDeps","defaultRemountDeps","loaderDeps","params","_strictParams","search","_strictSearch","key","JSON","stringify","status","_forcePending","componentKey","out","Comp","defaultComponent","Outlet","keyedOut","keyed","_key","_","displayPendingResult","createResource","getMatch","_nonReactive","displayPendingPromise","minPendingResult","minPendingPromise","pendingMinMs","defaultPendingMinMs","routerMatch","setTimeout","resolve","loaderResult","Promise","r","loadPromise","FallbackComponent","_routeId","RouteErrorComponent","info","componentStack","nearestParentMatch","parentMatch","parentGlobalNotFound","globalNotFound","childMatchId","childMatchIdByRouteId","childMatchStatus","shouldShowNotFound","resolvedRoute","childMatchIdAccessor","currentMatchId"],"sources":["../../src/Match.tsx"],"sourcesContent":["import * as Solid from 'solid-js'\nimport {\n  createControlledPromise,\n  getLocationChangeInfo,\n  invariant,\n  isNotFound,\n  isRedirect,\n  rootRouteId,\n} from '@tanstack/router-core'\nimport { isServer } from '@tanstack/router-core/isServer'\nimport { Dynamic } from 'solid-js/web'\nimport { CatchBoundary, ErrorComponent } from './CatchBoundary'\nimport { useRouter } from './useRouter'\nimport { CatchNotFound, getNotFound } from './not-found'\nimport { nearestMatchContext } from './matchContext'\nimport { SafeFragment } from './SafeFragment'\nimport { renderRouteNotFound } from './renderRouteNotFound'\nimport { ScrollRestoration } from './scroll-restoration'\nimport type { AnyRoute, RootRouteOptions } from '@tanstack/router-core'\n\nexport const Match = (props: { matchId: string }) => {\n  const router = useRouter()\n\n  const match = Solid.createMemo(() => {\n    const id = props.matchId\n    if (!id) return undefined\n    return router.stores.activeMatchStoresById.get(id)?.state\n  })\n\n  const rawMatchState = Solid.createMemo(() => {\n    const currentMatch = match()\n    if (!currentMatch) {\n      return null\n    }\n\n    const routeId = currentMatch.routeId as string\n    const parentRouteId = (router.routesById[routeId] as AnyRoute)?.parentRoute\n      ?.id\n\n    return {\n      matchId: currentMatch.id,\n      routeId,\n      ssr: currentMatch.ssr,\n      _displayPending: currentMatch._displayPending,\n      parentRouteId: parentRouteId as string | undefined,\n    }\n  })\n\n  const hasPendingMatch = Solid.createMemo(() => {\n    const currentRouteId = rawMatchState()?.routeId\n    return currentRouteId\n      ? Boolean(router.stores.pendingRouteIds.state[currentRouteId])\n      : false\n  })\n  const nearestMatch = {\n    matchId: () => rawMatchState()?.matchId,\n    routeId: () => rawMatchState()?.routeId,\n    match,\n    hasPending: hasPendingMatch,\n  }\n\n  return (\n    <Solid.Show when={rawMatchState()}>\n      {(currentMatchState) => {\n        const route: () => AnyRoute = () =>\n          router.routesById[currentMatchState().routeId]\n\n        const resolvePendingComponent = () =>\n          route().options.pendingComponent ??\n          router.options.defaultPendingComponent\n\n        const routeErrorComponent = () =>\n          route().options.errorComponent ?? router.options.defaultErrorComponent\n\n        const routeOnCatch = () =>\n          route().options.onCatch ?? router.options.defaultOnCatch\n\n        const routeNotFoundComponent = () =>\n          route().isRoot\n            ? // If it's the root route, use the globalNotFound option, with fallback to the notFoundRoute's component\n              (route().options.notFoundComponent ??\n              router.options.notFoundRoute?.options.component)\n            : route().options.notFoundComponent\n\n        const resolvedNoSsr =\n          currentMatchState().ssr === false ||\n          currentMatchState().ssr === 'data-only'\n\n        const ResolvedSuspenseBoundary = () => Solid.Suspense\n\n        const ResolvedCatchBoundary = () =>\n          routeErrorComponent() ? CatchBoundary : SafeFragment\n\n        const ResolvedNotFoundBoundary = () =>\n          routeNotFoundComponent() ? CatchNotFound : SafeFragment\n\n        const ShellComponent = route().isRoot\n          ? ((route().options as RootRouteOptions).shellComponent ??\n            SafeFragment)\n          : SafeFragment\n\n        return (\n          <ShellComponent>\n            <nearestMatchContext.Provider value={nearestMatch}>\n              <Dynamic\n                component={ResolvedSuspenseBoundary()}\n                fallback={\n                  // Don't show fallback on server when using no-ssr mode to avoid hydration mismatch\n                  (isServer ?? router.isServer) && resolvedNoSsr ? undefined : (\n                    <Dynamic component={resolvePendingComponent()} />\n                  )\n                }\n              >\n                <Dynamic\n                  component={ResolvedCatchBoundary()}\n                  getResetKey={() => router.stores.loadedAt.state}\n                  errorComponent={routeErrorComponent() || ErrorComponent}\n                  onCatch={(error: Error) => {\n                    // Forward not found errors (we don't want to show the error component for these)\n                    const notFoundError = getNotFound(error)\n                    if (notFoundError) {\n                      notFoundError.routeId ??= currentMatchState()\n                        .routeId as any\n                      throw notFoundError\n                    }\n                    if (process.env.NODE_ENV !== 'production') {\n                      console.warn(\n                        `Warning: Error in route match: ${currentMatchState().routeId}`,\n                      )\n                    }\n                    routeOnCatch()?.(error)\n                  }}\n                >\n                  <Dynamic\n                    component={ResolvedNotFoundBoundary()}\n                    fallback={(error: any) => {\n                      const notFoundError = getNotFound(error) ?? error\n\n                      notFoundError.routeId ??= currentMatchState()\n                        .routeId as any\n\n                      // If the current not found handler doesn't exist or it has a\n                      // route ID which doesn't match the current route, rethrow the error\n                      if (\n                        !routeNotFoundComponent() ||\n                        (notFoundError.routeId &&\n                          notFoundError.routeId !==\n                            currentMatchState().routeId) ||\n                        (!notFoundError.routeId && !route().isRoot)\n                      )\n                        throw notFoundError\n\n                      return (\n                        <Dynamic\n                          component={routeNotFoundComponent()}\n                          {...notFoundError}\n                        />\n                      )\n                    }}\n                  >\n                    <Solid.Switch>\n                      <Solid.Match when={resolvedNoSsr}>\n                        <Solid.Show\n                          when={!(isServer ?? router.isServer)}\n                          fallback={\n                            <Dynamic component={resolvePendingComponent()} />\n                          }\n                        >\n                          <MatchInner />\n                        </Solid.Show>\n                      </Solid.Match>\n                      <Solid.Match when={!resolvedNoSsr}>\n                        <MatchInner />\n                      </Solid.Match>\n                    </Solid.Switch>\n                  </Dynamic>\n                </Dynamic>\n              </Dynamic>\n            </nearestMatchContext.Provider>\n\n            {currentMatchState().parentRouteId === rootRouteId ? (\n              <>\n                <OnRendered />\n                {router.options.scrollRestoration &&\n                (isServer ?? router.isServer) ? (\n                  <ScrollRestoration />\n                ) : null}\n              </>\n            ) : null}\n          </ShellComponent>\n        )\n      }}\n    </Solid.Show>\n  )\n}\n\n// On Rendered can't happen above the root layout because it needs to run\n// after the app has committed below the root layout. Keeping it here lets us\n// fire onRendered even after a hydration mismatch above the root layout\n// (like bad head/link tags, which is common).\nfunction OnRendered() {\n  const router = useRouter()\n\n  const location = Solid.createMemo(\n    () => router.stores.resolvedLocation.state?.state.__TSR_key,\n  )\n  Solid.createEffect(\n    Solid.on([location], () => {\n      router.emit({\n        type: 'onRendered',\n        ...getLocationChangeInfo(\n          router.stores.location.state,\n          router.stores.resolvedLocation.state,\n        ),\n      })\n    }),\n  )\n  return null\n}\n\nexport const MatchInner = (): any => {\n  const router = useRouter()\n  const match = Solid.useContext(nearestMatchContext).match\n\n  const rawMatchState = Solid.createMemo(() => {\n    const currentMatch = match()\n    if (!currentMatch) {\n      return null\n    }\n\n    const routeId = currentMatch.routeId as string\n\n    const remountFn =\n      (router.routesById[routeId] as AnyRoute).options.remountDeps ??\n      router.options.defaultRemountDeps\n    const remountDeps = remountFn?.({\n      routeId,\n      loaderDeps: currentMatch.loaderDeps,\n      params: currentMatch._strictParams,\n      search: currentMatch._strictSearch,\n    })\n    const key = remountDeps ? JSON.stringify(remountDeps) : undefined\n\n    return {\n      key,\n      routeId,\n      match: {\n        id: currentMatch.id,\n        status: currentMatch.status,\n        error: currentMatch.error,\n        _forcePending: currentMatch._forcePending ?? false,\n        _displayPending: currentMatch._displayPending ?? false,\n      },\n    }\n  })\n\n  return (\n    <Solid.Show when={rawMatchState()}>\n      {(currentMatchState) => {\n        const route = () => router.routesById[currentMatchState().routeId]!\n\n        const currentMatch = () => currentMatchState().match\n\n        const componentKey = () =>\n          currentMatchState().key ?? currentMatchState().match.id\n\n        const out = () => {\n          const Comp =\n            route().options.component ?? router.options.defaultComponent\n          if (Comp) {\n            return <Comp />\n          }\n          return <Outlet />\n        }\n\n        const keyedOut = () => (\n          <Solid.Show when={componentKey()} keyed>\n            {(_key) => out()}\n          </Solid.Show>\n        )\n\n        return (\n          <Solid.Switch>\n            <Solid.Match when={currentMatch()._displayPending}>\n              {(_) => {\n                const [displayPendingResult] = Solid.createResource(\n                  () =>\n                    router.getMatch(currentMatch().id)?._nonReactive\n                      .displayPendingPromise,\n                )\n\n                return <>{displayPendingResult()}</>\n              }}\n            </Solid.Match>\n            <Solid.Match when={currentMatch()._forcePending}>\n              {(_) => {\n                const [minPendingResult] = Solid.createResource(\n                  () =>\n                    router.getMatch(currentMatch().id)?._nonReactive\n                      .minPendingPromise,\n                )\n\n                return <>{minPendingResult()}</>\n              }}\n            </Solid.Match>\n            <Solid.Match when={currentMatch().status === 'pending'}>\n              {(_) => {\n                const pendingMinMs =\n                  route().options.pendingMinMs ??\n                  router.options.defaultPendingMinMs\n\n                if (pendingMinMs) {\n                  const routerMatch = router.getMatch(currentMatch().id)\n                  if (\n                    routerMatch &&\n                    !routerMatch._nonReactive.minPendingPromise\n                  ) {\n                    // Create a promise that will resolve after the minPendingMs\n                    if (!(isServer ?? router.isServer)) {\n                      const minPendingPromise = createControlledPromise<void>()\n\n                      routerMatch._nonReactive.minPendingPromise =\n                        minPendingPromise\n\n                      setTimeout(() => {\n                        minPendingPromise.resolve()\n                        // We've handled the minPendingPromise, so we can delete it\n                        routerMatch._nonReactive.minPendingPromise = undefined\n                      }, pendingMinMs)\n                    }\n                  }\n                }\n\n                const [loaderResult] = Solid.createResource(async () => {\n                  await new Promise((r) => setTimeout(r, 0))\n                  return router.getMatch(currentMatch().id)?._nonReactive\n                    .loadPromise\n                })\n\n                const FallbackComponent =\n                  route().options.pendingComponent ??\n                  router.options.defaultPendingComponent\n\n                return (\n                  <>\n                    {FallbackComponent && pendingMinMs > 0 ? (\n                      <Dynamic component={FallbackComponent} />\n                    ) : null}\n                    {loaderResult()}\n                  </>\n                )\n              }}\n            </Solid.Match>\n            <Solid.Match when={currentMatch().status === 'notFound'}>\n              {(_) => {\n                if (!isNotFound(currentMatch().error)) {\n                  if (process.env.NODE_ENV !== 'production') {\n                    throw new Error(\n                      'Invariant failed: Expected a notFound error',\n                    )\n                  }\n\n                  invariant()\n                }\n\n                // Use Show with keyed to ensure re-render when routeId changes\n                return (\n                  <Solid.Show when={currentMatchState().routeId} keyed>\n                    {(_routeId) =>\n                      renderRouteNotFound(router, route(), currentMatch().error)\n                    }\n                  </Solid.Show>\n                )\n              }}\n            </Solid.Match>\n            <Solid.Match when={currentMatch().status === 'redirected'}>\n              {(_) => {\n                if (!isRedirect(currentMatch().error)) {\n                  if (process.env.NODE_ENV !== 'production') {\n                    throw new Error(\n                      'Invariant failed: Expected a redirect error',\n                    )\n                  }\n\n                  invariant()\n                }\n\n                const [loaderResult] = Solid.createResource(async () => {\n                  await new Promise((r) => setTimeout(r, 0))\n                  return router.getMatch(currentMatch().id)?._nonReactive\n                    .loadPromise\n                })\n\n                return <>{loaderResult()}</>\n              }}\n            </Solid.Match>\n            <Solid.Match when={currentMatch().status === 'error'}>\n              {(_) => {\n                if (isServer ?? router.isServer) {\n                  const RouteErrorComponent =\n                    (route().options.errorComponent ??\n                      router.options.defaultErrorComponent) ||\n                    ErrorComponent\n\n                  return (\n                    <RouteErrorComponent\n                      error={currentMatch().error}\n                      info={{\n                        componentStack: '',\n                      }}\n                    />\n                  )\n                }\n\n                throw currentMatch().error\n              }}\n            </Solid.Match>\n            <Solid.Match when={currentMatch().status === 'success'}>\n              {keyedOut()}\n            </Solid.Match>\n          </Solid.Switch>\n        )\n      }}\n    </Solid.Show>\n  )\n}\n\nexport const Outlet = () => {\n  const router = useRouter()\n  const nearestParentMatch = Solid.useContext(nearestMatchContext)\n  const parentMatch = nearestParentMatch.match\n  const routeId = nearestParentMatch.routeId\n  const route = Solid.createMemo(() =>\n    routeId() ? router.routesById[routeId()!] : undefined,\n  )\n\n  const parentGlobalNotFound = Solid.createMemo(\n    () => parentMatch()?.globalNotFound ?? false,\n  )\n\n  const childMatchId = Solid.createMemo(() => {\n    const currentRouteId = routeId()\n    return currentRouteId\n      ? router.stores.childMatchIdByRouteId.state[currentRouteId]\n      : undefined\n  })\n\n  const childMatchStatus = Solid.createMemo(() => {\n    const id = childMatchId()\n    if (!id) return undefined\n    return router.stores.activeMatchStoresById.get(id)?.state.status\n  })\n\n  // Only show not-found if we're not in a redirected state\n  const shouldShowNotFound = () =>\n    childMatchStatus() !== 'redirected' && parentGlobalNotFound()\n\n  return (\n    <Solid.Show\n      when={!shouldShowNotFound() && childMatchId()}\n      fallback={\n        <Solid.Show when={shouldShowNotFound() && route()}>\n          {(resolvedRoute) =>\n            renderRouteNotFound(router, resolvedRoute(), undefined)\n          }\n        </Solid.Show>\n      }\n    >\n      {(childMatchIdAccessor) => {\n        const currentMatchId = Solid.createMemo(() => childMatchIdAccessor())\n\n        return (\n          <Solid.Show\n            when={routeId() === rootRouteId}\n            fallback={<Match matchId={currentMatchId()} />}\n          >\n            <Solid.Suspense\n              fallback={\n                <Dynamic component={router.options.defaultPendingComponent} />\n              }\n            >\n              <Match matchId={currentMatchId()} />\n            </Solid.Suspense>\n          </Solid.Show>\n        )\n      }}\n    </Solid.Show>\n  )\n}\n"],"mappings":"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"}

package/dist/cjs/link.cjs

@@ -27,6 +27,7 @@ function useLinkProps(options) {
 		"to",
 		"preload",
 		"preloadDelay",
+		"preloadIntentProximity",
 		"hashScrollIntoView",
 		"replace",
 		"startTransition",
@@ -53,7 +54,8 @@ function useLinkProps(options) {
 		"state",
 		"mask",
 		"reloadDocument",
-		"unsafeRelative"
+		"unsafeRelative",
+		"from"
 	]);
 	const currentLocation = solid_js.createMemo(() => router.stores.location.state, void 0, { equals: (prev, next) => prev.href === next.href });
 	const _options = () => options;

package/dist/cjs/link.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"link.cjs","names":["Solid","mergeRefs","deepEqual","exactPathTest","functionalUpdate","isDangerousProtocol","preloadWarning","removeTrailingSlash","isServer","Dynamic","useRouter","useIntersectionObserver","useHydrated","AnyRouter","Constrain","LinkOptions","RegisteredRouter","RoutePaths","ValidateLinkOptions","ValidateLinkOptionsArray","timeoutMap","WeakMap","EventTarget","ReturnType","setTimeout","useLinkProps","TRouter","TFrom","options","UseLinkPropsOptions","TTo","TMaskFrom","TMaskTo","ComponentProps","router","isTransitioning","setIsTransitioning","createSignal","shouldHydrateHash","ssr","hasHydrated","hasRenderFetched","local","rest","splitProps","mergeProps","activeProps","STATIC_ACTIVE_PROPS_GET","inactiveProps","STATIC_INACTIVE_PROPS_GET","_","propsSafeToSpread","currentLocation","createMemo","stores","location","state","undefined","equals","prev","next","href","_options","_fromLocation","untrack","buildLocation","hrefOption","disabled","maskedLocation","publicHref","external","history","createHref","externalLink","_href","protocolAllowlist","process","env","NODE_ENV","console","warn","to","safeInternal","isSafeInternal","indexOf","URL","preload","reloadDocument","defaultPreload","preloadDelay","defaultPreloadDelay","isActive","activeOptions","current","nextLocation","exact","testExact","pathname","basepath","currentPath","nextPath","pathIsFuzzyEqual","startsWith","length","includeSearch","searchTest","search","partial","ignoreUndefined","explicitUndefined","includeHash","currentHash","hash","doPreload","preloadRoute","_builtLocation","catch","err","preloadViewportIoCallback","entry","IntersectionObserverEntry","isIntersecting","ref","setRef","Element","rootMargin","createEffect","handleClick","e","MouseEvent","elementTarget","currentTarget","HTMLAnchorElement","SVGAElement","getAttribute","effectiveTarget","target","isCtrlEvent","defaultPrevented","button","preventDefault","unsub","subscribe","navigate","replace","resetScroll","hashScrollIntoView","startTransition","viewTransition","ignoreBlocker","enqueueIntentPreload","FocusEvent","eventTarget","has","set","delete","handleTouchStart","TouchEvent","handleLeave","id","get","clearTimeout","simpleStyling","class","style","onClick","createComposedHandler","onBlur","onFocus","onMouseEnter","onMouseOver","onMouseLeave","onMouseOut","onTouchStart","ResolvedLinkStateProps","Omit","JSX","CSSProperties","resolvedProps","active","base","STATIC_DISABLED_PROPS","STATIC_TRANSITIONING_ATTRIBUTES","STATIC_DEFAULT_ACTIVE_ATTRIBUTES","EMPTY_OBJECT","className","filter","Boolean","join","Object","keys","STATIC_ACTIVE_ATTRIBUTES","STATIC_ACTIVE_PROPS","role","callHandler","Event","event","TEvent","T","handler","EventHandlerUnion","getHandler","fallback","ActiveLinkOptions","ActiveLinkOptionProps","TComp","ActiveLinkProps","Partial","LinkComponentSolidProps","key","LinkProps","LinkPropsChildren","children","ValidComponent","CreateLinkProps","LinkComponentProps","LinkComponent","TDefaultFrom","props","LinkComponentRoute","defaultFrom","createLink","Comp","_$createComponent","Link","_$mergeProps","_asChild","linkProps","ch","svgLinkProps","_el$","_tmpl$","_el$2","firstChild","_$spread","_$insert","_el$3","_tmpl$2","component","metaKey","altKey","ctrlKey","shiftKey","zero","charCodeAt","LinkOptionsFnOptions","TOptions","ReadonlyArray","LinkOptionsFn","linkOptions"],"sources":["../../src/link.tsx"],"sourcesContent":["import * as Solid from 'solid-js'\n\nimport { mergeRefs } from '@solid-primitives/refs'\n\nimport {\n  deepEqual,\n  exactPathTest,\n  functionalUpdate,\n  isDangerousProtocol,\n  preloadWarning,\n  removeTrailingSlash,\n} from '@tanstack/router-core'\n\nimport { isServer } from '@tanstack/router-core/isServer'\nimport { Dynamic } from 'solid-js/web'\nimport { useRouter } from './useRouter'\n\nimport { useIntersectionObserver } from './utils'\n\nimport { useHydrated } from './ClientOnly'\nimport type {\n  AnyRouter,\n  Constrain,\n  LinkOptions,\n  RegisteredRouter,\n  RoutePaths,\n} from '@tanstack/router-core'\nimport type {\n  ValidateLinkOptions,\n  ValidateLinkOptionsArray,\n} from './typePrimitives'\n\nconst timeoutMap = new WeakMap<EventTarget, ReturnType<typeof setTimeout>>()\n\nexport function useLinkProps<\n  TRouter extends AnyRouter = RegisteredRouter,\n  TFrom extends RoutePaths<TRouter['routeTree']> | string = string,\n  TTo extends string = '',\n  TMaskFrom extends RoutePaths<TRouter['routeTree']> | string = TFrom,\n  TMaskTo extends string = '',\n>(\n  options: UseLinkPropsOptions<TRouter, TFrom, TTo, TMaskFrom, TMaskTo>,\n): Solid.ComponentProps<'a'> {\n  const router = useRouter()\n  const [isTransitioning, setIsTransitioning] = Solid.createSignal(false)\n  const shouldHydrateHash = !isServer && !!router.options.ssr\n  const hasHydrated = useHydrated()\n\n  let hasRenderFetched = false\n\n  const [local, rest] = Solid.splitProps(\n    Solid.mergeProps(\n      {\n        activeProps: STATIC_ACTIVE_PROPS_GET,\n        inactiveProps: STATIC_INACTIVE_PROPS_GET,\n      },\n      options,\n    ),\n    [\n      'activeProps',\n      'inactiveProps',\n      'activeOptions',\n      'to',\n      'preload',\n      'preloadDelay',\n      'hashScrollIntoView',\n      'replace',\n      'startTransition',\n      'resetScroll',\n      'viewTransition',\n      'target',\n      'disabled',\n      'style',\n      'class',\n      'onClick',\n      'onBlur',\n      'onFocus',\n      'onMouseEnter',\n      'onMouseLeave',\n      'onMouseOver',\n      'onMouseOut',\n      'onTouchStart',\n      'ignoreBlocker',\n    ],\n  )\n\n  // const {\n  //   // custom props\n  //   activeProps = () => ({ class: 'active' }),\n  //   inactiveProps = () => ({}),\n  //   activeOptions,\n  //   to,\n  //   preload: userPreload,\n  //   preloadDelay: userPreloadDelay,\n  //   hashScrollIntoView,\n  //   replace,\n  //   startTransition,\n  //   resetScroll,\n  //   viewTransition,\n  //   // element props\n  //   children,\n  //   target,\n  //   disabled,\n  //   style,\n  //   class,\n  //   onClick,\n  //   onFocus,\n  //   onMouseEnter,\n  //   onMouseLeave,\n  //   onTouchStart,\n  //   ignoreBlocker,\n  //   ...rest\n  // } = options\n\n  const [_, propsSafeToSpread] = Solid.splitProps(rest, [\n    'params',\n    'search',\n    'hash',\n    'state',\n    'mask',\n    'reloadDocument',\n    'unsafeRelative',\n  ])\n\n  const currentLocation = Solid.createMemo(\n    () => router.stores.location.state,\n    undefined,\n    { equals: (prev, next) => prev.href === next.href },\n  )\n\n  const _options = () => options\n\n  const next = Solid.createMemo(() => {\n    // Rebuild when inherited search/hash or the current route context changes.\n    const _fromLocation = currentLocation()\n    const options = { _fromLocation, ..._options() } as any\n    // untrack because router-core will also access stores, which are signals in solid\n    return Solid.untrack(() => router.buildLocation(options))\n  })\n\n  const hrefOption = Solid.createMemo(() => {\n    if (_options().disabled) return undefined\n    // Use publicHref - it contains the correct href for display\n    // When a rewrite changes the origin, publicHref is the full URL\n    // Otherwise it's the origin-stripped path\n    // This avoids constructing URL objects in the hot path\n    const location = next().maskedLocation ?? next()\n    const publicHref = location.publicHref\n    const external = location.external\n\n    if (external) {\n      return { href: publicHref, external: true }\n    }\n\n    return {\n      href: router.history.createHref(publicHref) || '/',\n      external: false,\n    }\n  })\n\n  const externalLink = Solid.createMemo(() => {\n    const _href = hrefOption()\n    if (_href?.external) {\n      // Block dangerous protocols for external links\n      if (isDangerousProtocol(_href.href, router.protocolAllowlist)) {\n        if (process.env.NODE_ENV !== 'production') {\n          console.warn(`Blocked Link with dangerous protocol: ${_href.href}`)\n        }\n        return undefined\n      }\n      return _href.href\n    }\n    const to = _options().to\n    const safeInternal = isSafeInternal(to)\n    if (safeInternal) return undefined\n    if (typeof to !== 'string' || to.indexOf(':') === -1) return undefined\n    try {\n      new URL(to as any)\n      // Block dangerous protocols like javascript:, blob:, data:\n      if (isDangerousProtocol(to, router.protocolAllowlist)) {\n        if (process.env.NODE_ENV !== 'production') {\n          console.warn(`Blocked Link with dangerous protocol: ${to}`)\n        }\n        return undefined\n      }\n      return to\n    } catch {}\n    return undefined\n  })\n\n  const preload = Solid.createMemo(() => {\n    if (_options().reloadDocument || externalLink()) {\n      return false\n    }\n    return local.preload ?? router.options.defaultPreload\n  })\n  const preloadDelay = () =>\n    local.preloadDelay ?? router.options.defaultPreloadDelay ?? 0\n\n  const isActive = Solid.createMemo(() => {\n    if (externalLink()) return false\n    const activeOptions = local.activeOptions\n    const current = currentLocation()\n    const nextLocation = next()\n\n    if (activeOptions?.exact) {\n      const testExact = exactPathTest(\n        current.pathname,\n        nextLocation.pathname,\n        router.basepath,\n      )\n      if (!testExact) {\n        return false\n      }\n    } else {\n      const currentPath = removeTrailingSlash(current.pathname, router.basepath)\n      const nextPath = removeTrailingSlash(\n        nextLocation.pathname,\n        router.basepath,\n      )\n\n      const pathIsFuzzyEqual =\n        currentPath.startsWith(nextPath) &&\n        (currentPath.length === nextPath.length ||\n          currentPath[nextPath.length] === '/')\n      if (!pathIsFuzzyEqual) {\n        return false\n      }\n    }\n\n    if (activeOptions?.includeSearch ?? true) {\n      const searchTest = deepEqual(current.search, nextLocation.search, {\n        partial: !activeOptions?.exact,\n        ignoreUndefined: !activeOptions?.explicitUndefined,\n      })\n      if (!searchTest) {\n        return false\n      }\n    }\n\n    if (activeOptions?.includeHash) {\n      const currentHash =\n        shouldHydrateHash && !hasHydrated() ? '' : current.hash\n      return currentHash === nextLocation.hash\n    }\n    return true\n  })\n\n  const doPreload = () =>\n    router\n      .preloadRoute({ ..._options(), _builtLocation: next() } as any)\n      .catch((err: any) => {\n        console.warn(err)\n        console.warn(preloadWarning)\n      })\n\n  const preloadViewportIoCallback = (\n    entry: IntersectionObserverEntry | undefined,\n  ) => {\n    if (entry?.isIntersecting) {\n      doPreload()\n    }\n  }\n\n  const [ref, setRef] = Solid.createSignal<Element | null>(null)\n\n  useIntersectionObserver(\n    ref,\n    preloadViewportIoCallback,\n    { rootMargin: '100px' },\n    { disabled: !!local.disabled || !(preload() === 'viewport') },\n  )\n\n  Solid.createEffect(() => {\n    if (hasRenderFetched) {\n      return\n    }\n    if (!local.disabled && preload() === 'render') {\n      doPreload()\n      hasRenderFetched = true\n    }\n  })\n\n  if (externalLink()) {\n    return Solid.mergeProps(\n      propsSafeToSpread,\n      {\n        ref: mergeRefs(setRef, _options().ref),\n        href: externalLink(),\n      },\n      Solid.splitProps(local, [\n        'target',\n        'disabled',\n        'style',\n        'class',\n        'onClick',\n        'onBlur',\n        'onFocus',\n        'onMouseEnter',\n        'onMouseLeave',\n        'onMouseOut',\n        'onMouseOver',\n        'onTouchStart',\n      ])[0],\n    ) as any\n  }\n\n  // The click handler\n  const handleClick = (e: MouseEvent) => {\n    // Check actual element's target attribute as fallback\n    const elementTarget = (\n      e.currentTarget as HTMLAnchorElement | SVGAElement\n    ).getAttribute('target')\n    const effectiveTarget =\n      local.target !== undefined ? local.target : elementTarget\n\n    if (\n      !local.disabled &&\n      !isCtrlEvent(e) &&\n      !e.defaultPrevented &&\n      (!effectiveTarget || effectiveTarget === '_self') &&\n      e.button === 0\n    ) {\n      e.preventDefault()\n\n      setIsTransitioning(true)\n\n      const unsub = router.subscribe('onResolved', () => {\n        unsub()\n        setIsTransitioning(false)\n      })\n\n      // All is well? Navigate!\n      // N.B. we don't call `router.commitLocation(next) here because we want to run `validateSearch` before committing\n      router.navigate({\n        ..._options(),\n        replace: local.replace,\n        resetScroll: local.resetScroll,\n        hashScrollIntoView: local.hashScrollIntoView,\n        startTransition: local.startTransition,\n        viewTransition: local.viewTransition,\n        ignoreBlocker: local.ignoreBlocker,\n      })\n    }\n  }\n\n  const enqueueIntentPreload = (e: MouseEvent | FocusEvent) => {\n    if (local.disabled || preload() !== 'intent') return\n\n    if (!preloadDelay()) {\n      doPreload()\n      return\n    }\n\n    const eventTarget = e.currentTarget || e.target\n\n    if (!eventTarget || timeoutMap.has(eventTarget)) return\n\n    timeoutMap.set(\n      eventTarget,\n      setTimeout(() => {\n        timeoutMap.delete(eventTarget)\n        doPreload()\n      }, preloadDelay()),\n    )\n  }\n\n  const handleTouchStart = (_: TouchEvent) => {\n    if (local.disabled || preload() !== 'intent') return\n    doPreload()\n  }\n\n  const handleLeave = (e: MouseEvent | FocusEvent) => {\n    if (local.disabled) return\n    const eventTarget = e.currentTarget || e.target\n\n    if (eventTarget) {\n      const id = timeoutMap.get(eventTarget)\n      clearTimeout(id)\n      timeoutMap.delete(eventTarget)\n    }\n  }\n\n  const simpleStyling = Solid.createMemo(\n    () =>\n      local.activeProps === STATIC_ACTIVE_PROPS_GET &&\n      local.inactiveProps === STATIC_INACTIVE_PROPS_GET &&\n      local.class === undefined &&\n      local.style === undefined,\n  )\n\n  const onClick = createComposedHandler(() => local.onClick, handleClick)\n  const onBlur = createComposedHandler(() => local.onBlur, handleLeave)\n  const onFocus = createComposedHandler(\n    () => local.onFocus,\n    enqueueIntentPreload,\n  )\n  const onMouseEnter = createComposedHandler(\n    () => local.onMouseEnter,\n    enqueueIntentPreload,\n  )\n  const onMouseOver = createComposedHandler(\n    () => local.onMouseOver,\n    enqueueIntentPreload,\n  )\n  const onMouseLeave = createComposedHandler(\n    () => local.onMouseLeave,\n    handleLeave,\n  )\n  const onMouseOut = createComposedHandler(() => local.onMouseOut, handleLeave)\n  const onTouchStart = createComposedHandler(\n    () => local.onTouchStart,\n    handleTouchStart,\n  )\n\n  type ResolvedLinkStateProps = Omit<Solid.ComponentProps<'a'>, 'style'> & {\n    style?: Solid.JSX.CSSProperties\n  }\n\n  const resolvedProps = Solid.createMemo(() => {\n    const active = isActive()\n\n    const base = {\n      href: hrefOption()?.href,\n      ref: mergeRefs(setRef, _options().ref),\n      onClick,\n      onBlur,\n      onFocus,\n      onMouseEnter,\n      onMouseOver,\n      onMouseLeave,\n      onMouseOut,\n      onTouchStart,\n      disabled: !!local.disabled,\n      target: local.target,\n      ...(local.disabled && STATIC_DISABLED_PROPS),\n      ...(isTransitioning() && STATIC_TRANSITIONING_ATTRIBUTES),\n    }\n\n    if (simpleStyling()) {\n      return {\n        ...base,\n        ...(active && STATIC_DEFAULT_ACTIVE_ATTRIBUTES),\n      }\n    }\n\n    const activeProps: ResolvedLinkStateProps = active\n      ? (functionalUpdate(local.activeProps as any, {}) ?? EMPTY_OBJECT)\n      : EMPTY_OBJECT\n    const inactiveProps: ResolvedLinkStateProps = active\n      ? EMPTY_OBJECT\n      : functionalUpdate(local.inactiveProps, {})\n    const style = {\n      ...local.style,\n      ...activeProps.style,\n      ...inactiveProps.style,\n    }\n    const className = [local.class, activeProps.class, inactiveProps.class]\n      .filter(Boolean)\n      .join(' ')\n\n    return {\n      ...activeProps,\n      ...inactiveProps,\n      ...base,\n      ...(Object.keys(style).length ? { style } : undefined),\n      ...(className ? { class: className } : undefined),\n      ...(active && STATIC_ACTIVE_ATTRIBUTES),\n    } as ResolvedLinkStateProps\n  })\n\n  return Solid.mergeProps(propsSafeToSpread, resolvedProps) as any\n}\n\nconst STATIC_ACTIVE_PROPS = { class: 'active' }\nconst STATIC_ACTIVE_PROPS_GET = () => STATIC_ACTIVE_PROPS\nconst EMPTY_OBJECT = {}\nconst STATIC_INACTIVE_PROPS_GET = () => EMPTY_OBJECT\nconst STATIC_DEFAULT_ACTIVE_ATTRIBUTES = {\n  class: 'active',\n  'data-status': 'active',\n  'aria-current': 'page',\n}\nconst STATIC_DISABLED_PROPS = {\n  role: 'link',\n  'aria-disabled': true,\n}\nconst STATIC_ACTIVE_ATTRIBUTES = {\n  'data-status': 'active',\n  'aria-current': 'page',\n}\nconst STATIC_TRANSITIONING_ATTRIBUTES = {\n  'data-transitioning': 'transitioning',\n}\n\n/** Call a JSX.EventHandlerUnion with the event. */\nfunction callHandler<T, TEvent extends Event>(\n  event: TEvent & { currentTarget: T; target: Element },\n  handler: Solid.JSX.EventHandlerUnion<T, TEvent>,\n) {\n  if (typeof handler === 'function') {\n    handler(event)\n  } else {\n    handler[0](handler[1], event)\n  }\n  return event.defaultPrevented\n}\n\nfunction createComposedHandler<T, TEvent extends Event>(\n  getHandler: () => Solid.JSX.EventHandlerUnion<T, TEvent> | undefined,\n  fallback: (event: TEvent) => void,\n) {\n  return (event: TEvent & { currentTarget: T; target: Element }) => {\n    const handler = getHandler()\n    if (!handler || !callHandler(event, handler)) fallback(event)\n  }\n}\n\nexport type UseLinkPropsOptions<\n  TRouter extends AnyRouter = RegisteredRouter,\n  TFrom extends RoutePaths<TRouter['routeTree']> | string = string,\n  TTo extends string | undefined = '.',\n  TMaskFrom extends RoutePaths<TRouter['routeTree']> | string = TFrom,\n  TMaskTo extends string = '.',\n> = ActiveLinkOptions<'a', TRouter, TFrom, TTo, TMaskFrom, TMaskTo> &\n  Omit<Solid.ComponentProps<'a'>, 'style'> & { style?: Solid.JSX.CSSProperties }\n\nexport type ActiveLinkOptions<\n  TComp = 'a',\n  TRouter extends AnyRouter = RegisteredRouter,\n  TFrom extends string = string,\n  TTo extends string | undefined = '.',\n  TMaskFrom extends string = TFrom,\n  TMaskTo extends string = '.',\n> = LinkOptions<TRouter, TFrom, TTo, TMaskFrom, TMaskTo> &\n  ActiveLinkOptionProps<TComp>\n\ntype ActiveLinkProps<TComp> = Partial<\n  LinkComponentSolidProps<TComp> & {\n    [key: `data-${string}`]: unknown\n  }\n>\n\nexport interface ActiveLinkOptionProps<TComp = 'a'> {\n  /**\n   * A function that returns additional props for the `active` state of this link.\n   * These props override other props passed to the link (`style`'s are merged, `class`'s are concatenated)\n   */\n  activeProps?: ActiveLinkProps<TComp> | (() => ActiveLinkProps<TComp>)\n  /**\n   * A function that returns additional props for the `inactive` state of this link.\n   * These props override other props passed to the link (`style`'s are merged, `class`'s are concatenated)\n   */\n  inactiveProps?: ActiveLinkProps<TComp> | (() => ActiveLinkProps<TComp>)\n}\n\nexport type LinkProps<\n  TComp = 'a',\n  TRouter extends AnyRouter = RegisteredRouter,\n  TFrom extends string = string,\n  TTo extends string | undefined = '.',\n  TMaskFrom extends string = TFrom,\n  TMaskTo extends string = '.',\n> = ActiveLinkOptions<TComp, TRouter, TFrom, TTo, TMaskFrom, TMaskTo> &\n  LinkPropsChildren\n\nexport interface LinkPropsChildren {\n  // If a function is passed as a child, it will be given the `isActive` boolean to aid in further styling on the element it returns\n  children?:\n    | Solid.JSX.Element\n    | ((state: {\n        isActive: boolean\n        isTransitioning: boolean\n      }) => Solid.JSX.Element)\n}\n\ntype LinkComponentSolidProps<TComp> = TComp extends Solid.ValidComponent\n  ? Omit<Solid.ComponentProps<TComp>, keyof CreateLinkProps>\n  : never\n\nexport type LinkComponentProps<\n  TComp = 'a',\n  TRouter extends AnyRouter = RegisteredRouter,\n  TFrom extends string = string,\n  TTo extends string | undefined = '.',\n  TMaskFrom extends string = TFrom,\n  TMaskTo extends string = '.',\n> = LinkComponentSolidProps<TComp> &\n  LinkProps<TComp, TRouter, TFrom, TTo, TMaskFrom, TMaskTo>\n\nexport type CreateLinkProps = LinkProps<\n  any,\n  any,\n  string,\n  string,\n  string,\n  string\n>\n\nexport type LinkComponent<\n  in out TComp,\n  in out TDefaultFrom extends string = string,\n> = <\n  TRouter extends AnyRouter = RegisteredRouter,\n  const TFrom extends string = TDefaultFrom,\n  const TTo extends string | undefined = undefined,\n  const TMaskFrom extends string = TFrom,\n  const TMaskTo extends string = '',\n>(\n  props: LinkComponentProps<TComp, TRouter, TFrom, TTo, TMaskFrom, TMaskTo>,\n) => Solid.JSX.Element\n\nexport interface LinkComponentRoute<\n  in out TDefaultFrom extends string = string,\n> {\n  defaultFrom: TDefaultFrom;\n  <\n    TRouter extends AnyRouter = RegisteredRouter,\n    const TTo extends string | undefined = undefined,\n    const TMaskTo extends string = '',\n  >(\n    props: LinkComponentProps<\n      'a',\n      TRouter,\n      this['defaultFrom'],\n      TTo,\n      this['defaultFrom'],\n      TMaskTo\n    >,\n  ): Solid.JSX.Element\n}\n\nexport function createLink<const TComp>(\n  Comp: Constrain<TComp, any, (props: CreateLinkProps) => Solid.JSX.Element>,\n): LinkComponent<TComp> {\n  return (props) => <Link {...props} _asChild={Comp} />\n}\n\nexport const Link: LinkComponent<'a'> = (props) => {\n  const [local, rest] = Solid.splitProps(\n    props as typeof props & { _asChild: any },\n    ['_asChild', 'children'],\n  )\n\n  const [_, linkProps] = Solid.splitProps(\n    useLinkProps(rest as unknown as any),\n    ['type'],\n  )\n\n  const children = Solid.createMemo(() => {\n    const ch = local.children\n    if (typeof ch === 'function') {\n      return ch({\n        get isActive() {\n          return (linkProps as any)['data-status'] === 'active'\n        },\n        get isTransitioning() {\n          return (linkProps as any)['data-transitioning'] === 'transitioning'\n        },\n      })\n    }\n\n    return ch satisfies Solid.JSX.Element\n  })\n\n  if (local._asChild === 'svg') {\n    const [_, svgLinkProps] = Solid.splitProps(linkProps, ['class'])\n    return (\n      <svg>\n        <a {...svgLinkProps}>{children()}</a>\n      </svg>\n    )\n  }\n\n  if (!local._asChild) {\n    return <a {...linkProps}>{children()}</a>\n  }\n\n  return (\n    <Dynamic component={local._asChild as Solid.ValidComponent} {...linkProps}>\n      {children()}\n    </Dynamic>\n  )\n}\n\nfunction isCtrlEvent(e: MouseEvent) {\n  return !!(e.metaKey || e.altKey || e.ctrlKey || e.shiftKey)\n}\n\nfunction isSafeInternal(to: unknown) {\n  if (typeof to !== 'string') return false\n  const zero = to.charCodeAt(0)\n  if (zero === 47) return to.charCodeAt(1) !== 47 // '/' but not '//'\n  return zero === 46 // '.', '..', './', '../'\n}\n\nexport type LinkOptionsFnOptions<\n  TOptions,\n  TComp,\n  TRouter extends AnyRouter = RegisteredRouter,\n> =\n  TOptions extends ReadonlyArray<any>\n    ? ValidateLinkOptionsArray<TRouter, TOptions, string, TComp>\n    : ValidateLinkOptions<TRouter, TOptions, string, TComp>\n\nexport type LinkOptionsFn<TComp> = <\n  const TOptions,\n  TRouter extends AnyRouter = RegisteredRouter,\n>(\n  options: LinkOptionsFnOptions<TOptions, TComp, TRouter>,\n) => TOptions\n\nexport const linkOptions: LinkOptionsFn<'a'> = (options) => {\n  return options as any\n}\n"],"mappings":"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"}
+{"version":3,"file":"link.cjs","names":["Solid","mergeRefs","deepEqual","exactPathTest","functionalUpdate","isDangerousProtocol","preloadWarning","removeTrailingSlash","isServer","Dynamic","useRouter","useIntersectionObserver","useHydrated","AnyRouter","Constrain","LinkOptions","RegisteredRouter","RoutePaths","ValidateLinkOptions","ValidateLinkOptionsArray","timeoutMap","WeakMap","EventTarget","ReturnType","setTimeout","useLinkProps","TRouter","TFrom","options","UseLinkPropsOptions","TTo","TMaskFrom","TMaskTo","ComponentProps","router","isTransitioning","setIsTransitioning","createSignal","shouldHydrateHash","ssr","hasHydrated","hasRenderFetched","local","rest","splitProps","mergeProps","activeProps","STATIC_ACTIVE_PROPS_GET","inactiveProps","STATIC_INACTIVE_PROPS_GET","_","propsSafeToSpread","currentLocation","createMemo","stores","location","state","undefined","equals","prev","next","href","_options","_fromLocation","untrack","buildLocation","hrefOption","disabled","maskedLocation","publicHref","external","history","createHref","externalLink","_href","protocolAllowlist","process","env","NODE_ENV","console","warn","to","safeInternal","isSafeInternal","indexOf","URL","preload","reloadDocument","defaultPreload","preloadDelay","defaultPreloadDelay","isActive","activeOptions","current","nextLocation","exact","testExact","pathname","basepath","currentPath","nextPath","pathIsFuzzyEqual","startsWith","length","includeSearch","searchTest","search","partial","ignoreUndefined","explicitUndefined","includeHash","currentHash","hash","doPreload","preloadRoute","_builtLocation","catch","err","preloadViewportIoCallback","entry","IntersectionObserverEntry","isIntersecting","ref","setRef","Element","rootMargin","createEffect","handleClick","e","MouseEvent","elementTarget","currentTarget","HTMLAnchorElement","SVGAElement","getAttribute","effectiveTarget","target","isCtrlEvent","defaultPrevented","button","preventDefault","unsub","subscribe","navigate","replace","resetScroll","hashScrollIntoView","startTransition","viewTransition","ignoreBlocker","enqueueIntentPreload","FocusEvent","eventTarget","has","set","delete","handleTouchStart","TouchEvent","handleLeave","id","get","clearTimeout","simpleStyling","class","style","onClick","createComposedHandler","onBlur","onFocus","onMouseEnter","onMouseOver","onMouseLeave","onMouseOut","onTouchStart","ResolvedLinkStateProps","Omit","JSX","CSSProperties","resolvedProps","active","base","STATIC_DISABLED_PROPS","STATIC_TRANSITIONING_ATTRIBUTES","STATIC_DEFAULT_ACTIVE_ATTRIBUTES","EMPTY_OBJECT","className","filter","Boolean","join","Object","keys","STATIC_ACTIVE_ATTRIBUTES","STATIC_ACTIVE_PROPS","role","callHandler","Event","event","TEvent","T","handler","EventHandlerUnion","getHandler","fallback","ActiveLinkOptions","ActiveLinkOptionProps","TComp","ActiveLinkProps","Partial","LinkComponentSolidProps","key","LinkProps","LinkPropsChildren","children","ValidComponent","CreateLinkProps","LinkComponentProps","LinkComponent","TDefaultFrom","props","LinkComponentRoute","defaultFrom","createLink","Comp","_$createComponent","Link","_$mergeProps","_asChild","linkProps","ch","svgLinkProps","_el$","_tmpl$","_el$2","firstChild","_$spread","_$insert","_el$3","_tmpl$2","component","metaKey","altKey","ctrlKey","shiftKey","zero","charCodeAt","LinkOptionsFnOptions","TOptions","ReadonlyArray","LinkOptionsFn","linkOptions"],"sources":["../../src/link.tsx"],"sourcesContent":["import * as Solid from 'solid-js'\n\nimport { mergeRefs } from '@solid-primitives/refs'\n\nimport {\n  deepEqual,\n  exactPathTest,\n  functionalUpdate,\n  isDangerousProtocol,\n  preloadWarning,\n  removeTrailingSlash,\n} from '@tanstack/router-core'\n\nimport { isServer } from '@tanstack/router-core/isServer'\nimport { Dynamic } from 'solid-js/web'\nimport { useRouter } from './useRouter'\n\nimport { useIntersectionObserver } from './utils'\n\nimport { useHydrated } from './ClientOnly'\nimport type {\n  AnyRouter,\n  Constrain,\n  LinkOptions,\n  RegisteredRouter,\n  RoutePaths,\n} from '@tanstack/router-core'\nimport type {\n  ValidateLinkOptions,\n  ValidateLinkOptionsArray,\n} from './typePrimitives'\n\nconst timeoutMap = new WeakMap<EventTarget, ReturnType<typeof setTimeout>>()\n\nexport function useLinkProps<\n  TRouter extends AnyRouter = RegisteredRouter,\n  TFrom extends RoutePaths<TRouter['routeTree']> | string = string,\n  TTo extends string = '',\n  TMaskFrom extends RoutePaths<TRouter['routeTree']> | string = TFrom,\n  TMaskTo extends string = '',\n>(\n  options: UseLinkPropsOptions<TRouter, TFrom, TTo, TMaskFrom, TMaskTo>,\n): Solid.ComponentProps<'a'> {\n  const router = useRouter()\n  const [isTransitioning, setIsTransitioning] = Solid.createSignal(false)\n  const shouldHydrateHash = !isServer && !!router.options.ssr\n  const hasHydrated = useHydrated()\n\n  let hasRenderFetched = false\n\n  const [local, rest] = Solid.splitProps(\n    Solid.mergeProps(\n      {\n        activeProps: STATIC_ACTIVE_PROPS_GET,\n        inactiveProps: STATIC_INACTIVE_PROPS_GET,\n      },\n      options,\n    ),\n    [\n      'activeProps',\n      'inactiveProps',\n      'activeOptions',\n      'to',\n      'preload',\n      'preloadDelay',\n      'preloadIntentProximity',\n      'hashScrollIntoView',\n      'replace',\n      'startTransition',\n      'resetScroll',\n      'viewTransition',\n      'target',\n      'disabled',\n      'style',\n      'class',\n      'onClick',\n      'onBlur',\n      'onFocus',\n      'onMouseEnter',\n      'onMouseLeave',\n      'onMouseOver',\n      'onMouseOut',\n      'onTouchStart',\n      'ignoreBlocker',\n    ],\n  )\n\n  // const {\n  //   // custom props\n  //   activeProps = () => ({ class: 'active' }),\n  //   inactiveProps = () => ({}),\n  //   activeOptions,\n  //   to,\n  //   preload: userPreload,\n  //   preloadDelay: userPreloadDelay,\n  //   hashScrollIntoView,\n  //   replace,\n  //   startTransition,\n  //   resetScroll,\n  //   viewTransition,\n  //   // element props\n  //   children,\n  //   target,\n  //   disabled,\n  //   style,\n  //   class,\n  //   onClick,\n  //   onFocus,\n  //   onMouseEnter,\n  //   onMouseLeave,\n  //   onTouchStart,\n  //   ignoreBlocker,\n  //   ...rest\n  // } = options\n\n  const [_, propsSafeToSpread] = Solid.splitProps(rest, [\n    'params',\n    'search',\n    'hash',\n    'state',\n    'mask',\n    'reloadDocument',\n    'unsafeRelative',\n    'from',\n  ])\n\n  const currentLocation = Solid.createMemo(\n    () => router.stores.location.state,\n    undefined,\n    { equals: (prev, next) => prev.href === next.href },\n  )\n\n  const _options = () => options\n\n  const next = Solid.createMemo(() => {\n    // Rebuild when inherited search/hash or the current route context changes.\n    const _fromLocation = currentLocation()\n    const options = { _fromLocation, ..._options() } as any\n    // untrack because router-core will also access stores, which are signals in solid\n    return Solid.untrack(() => router.buildLocation(options))\n  })\n\n  const hrefOption = Solid.createMemo(() => {\n    if (_options().disabled) return undefined\n    // Use publicHref - it contains the correct href for display\n    // When a rewrite changes the origin, publicHref is the full URL\n    // Otherwise it's the origin-stripped path\n    // This avoids constructing URL objects in the hot path\n    const location = next().maskedLocation ?? next()\n    const publicHref = location.publicHref\n    const external = location.external\n\n    if (external) {\n      return { href: publicHref, external: true }\n    }\n\n    return {\n      href: router.history.createHref(publicHref) || '/',\n      external: false,\n    }\n  })\n\n  const externalLink = Solid.createMemo(() => {\n    const _href = hrefOption()\n    if (_href?.external) {\n      // Block dangerous protocols for external links\n      if (isDangerousProtocol(_href.href, router.protocolAllowlist)) {\n        if (process.env.NODE_ENV !== 'production') {\n          console.warn(`Blocked Link with dangerous protocol: ${_href.href}`)\n        }\n        return undefined\n      }\n      return _href.href\n    }\n    const to = _options().to\n    const safeInternal = isSafeInternal(to)\n    if (safeInternal) return undefined\n    if (typeof to !== 'string' || to.indexOf(':') === -1) return undefined\n    try {\n      new URL(to as any)\n      // Block dangerous protocols like javascript:, blob:, data:\n      if (isDangerousProtocol(to, router.protocolAllowlist)) {\n        if (process.env.NODE_ENV !== 'production') {\n          console.warn(`Blocked Link with dangerous protocol: ${to}`)\n        }\n        return undefined\n      }\n      return to\n    } catch {}\n    return undefined\n  })\n\n  const preload = Solid.createMemo(() => {\n    if (_options().reloadDocument || externalLink()) {\n      return false\n    }\n    return local.preload ?? router.options.defaultPreload\n  })\n  const preloadDelay = () =>\n    local.preloadDelay ?? router.options.defaultPreloadDelay ?? 0\n\n  const isActive = Solid.createMemo(() => {\n    if (externalLink()) return false\n    const activeOptions = local.activeOptions\n    const current = currentLocation()\n    const nextLocation = next()\n\n    if (activeOptions?.exact) {\n      const testExact = exactPathTest(\n        current.pathname,\n        nextLocation.pathname,\n        router.basepath,\n      )\n      if (!testExact) {\n        return false\n      }\n    } else {\n      const currentPath = removeTrailingSlash(current.pathname, router.basepath)\n      const nextPath = removeTrailingSlash(\n        nextLocation.pathname,\n        router.basepath,\n      )\n\n      const pathIsFuzzyEqual =\n        currentPath.startsWith(nextPath) &&\n        (currentPath.length === nextPath.length ||\n          currentPath[nextPath.length] === '/')\n      if (!pathIsFuzzyEqual) {\n        return false\n      }\n    }\n\n    if (activeOptions?.includeSearch ?? true) {\n      const searchTest = deepEqual(current.search, nextLocation.search, {\n        partial: !activeOptions?.exact,\n        ignoreUndefined: !activeOptions?.explicitUndefined,\n      })\n      if (!searchTest) {\n        return false\n      }\n    }\n\n    if (activeOptions?.includeHash) {\n      const currentHash =\n        shouldHydrateHash && !hasHydrated() ? '' : current.hash\n      return currentHash === nextLocation.hash\n    }\n    return true\n  })\n\n  const doPreload = () =>\n    router\n      .preloadRoute({ ..._options(), _builtLocation: next() } as any)\n      .catch((err: any) => {\n        console.warn(err)\n        console.warn(preloadWarning)\n      })\n\n  const preloadViewportIoCallback = (\n    entry: IntersectionObserverEntry | undefined,\n  ) => {\n    if (entry?.isIntersecting) {\n      doPreload()\n    }\n  }\n\n  const [ref, setRef] = Solid.createSignal<Element | null>(null)\n\n  useIntersectionObserver(\n    ref,\n    preloadViewportIoCallback,\n    { rootMargin: '100px' },\n    { disabled: !!local.disabled || !(preload() === 'viewport') },\n  )\n\n  Solid.createEffect(() => {\n    if (hasRenderFetched) {\n      return\n    }\n    if (!local.disabled && preload() === 'render') {\n      doPreload()\n      hasRenderFetched = true\n    }\n  })\n\n  if (externalLink()) {\n    return Solid.mergeProps(\n      propsSafeToSpread,\n      {\n        ref: mergeRefs(setRef, _options().ref),\n        href: externalLink(),\n      },\n      Solid.splitProps(local, [\n        'target',\n        'disabled',\n        'style',\n        'class',\n        'onClick',\n        'onBlur',\n        'onFocus',\n        'onMouseEnter',\n        'onMouseLeave',\n        'onMouseOut',\n        'onMouseOver',\n        'onTouchStart',\n      ])[0],\n    ) as any\n  }\n\n  // The click handler\n  const handleClick = (e: MouseEvent) => {\n    // Check actual element's target attribute as fallback\n    const elementTarget = (\n      e.currentTarget as HTMLAnchorElement | SVGAElement\n    ).getAttribute('target')\n    const effectiveTarget =\n      local.target !== undefined ? local.target : elementTarget\n\n    if (\n      !local.disabled &&\n      !isCtrlEvent(e) &&\n      !e.defaultPrevented &&\n      (!effectiveTarget || effectiveTarget === '_self') &&\n      e.button === 0\n    ) {\n      e.preventDefault()\n\n      setIsTransitioning(true)\n\n      const unsub = router.subscribe('onResolved', () => {\n        unsub()\n        setIsTransitioning(false)\n      })\n\n      // All is well? Navigate!\n      // N.B. we don't call `router.commitLocation(next) here because we want to run `validateSearch` before committing\n      router.navigate({\n        ..._options(),\n        replace: local.replace,\n        resetScroll: local.resetScroll,\n        hashScrollIntoView: local.hashScrollIntoView,\n        startTransition: local.startTransition,\n        viewTransition: local.viewTransition,\n        ignoreBlocker: local.ignoreBlocker,\n      })\n    }\n  }\n\n  const enqueueIntentPreload = (e: MouseEvent | FocusEvent) => {\n    if (local.disabled || preload() !== 'intent') return\n\n    if (!preloadDelay()) {\n      doPreload()\n      return\n    }\n\n    const eventTarget = e.currentTarget || e.target\n\n    if (!eventTarget || timeoutMap.has(eventTarget)) return\n\n    timeoutMap.set(\n      eventTarget,\n      setTimeout(() => {\n        timeoutMap.delete(eventTarget)\n        doPreload()\n      }, preloadDelay()),\n    )\n  }\n\n  const handleTouchStart = (_: TouchEvent) => {\n    if (local.disabled || preload() !== 'intent') return\n    doPreload()\n  }\n\n  const handleLeave = (e: MouseEvent | FocusEvent) => {\n    if (local.disabled) return\n    const eventTarget = e.currentTarget || e.target\n\n    if (eventTarget) {\n      const id = timeoutMap.get(eventTarget)\n      clearTimeout(id)\n      timeoutMap.delete(eventTarget)\n    }\n  }\n\n  const simpleStyling = Solid.createMemo(\n    () =>\n      local.activeProps === STATIC_ACTIVE_PROPS_GET &&\n      local.inactiveProps === STATIC_INACTIVE_PROPS_GET &&\n      local.class === undefined &&\n      local.style === undefined,\n  )\n\n  const onClick = createComposedHandler(() => local.onClick, handleClick)\n  const onBlur = createComposedHandler(() => local.onBlur, handleLeave)\n  const onFocus = createComposedHandler(\n    () => local.onFocus,\n    enqueueIntentPreload,\n  )\n  const onMouseEnter = createComposedHandler(\n    () => local.onMouseEnter,\n    enqueueIntentPreload,\n  )\n  const onMouseOver = createComposedHandler(\n    () => local.onMouseOver,\n    enqueueIntentPreload,\n  )\n  const onMouseLeave = createComposedHandler(\n    () => local.onMouseLeave,\n    handleLeave,\n  )\n  const onMouseOut = createComposedHandler(() => local.onMouseOut, handleLeave)\n  const onTouchStart = createComposedHandler(\n    () => local.onTouchStart,\n    handleTouchStart,\n  )\n\n  type ResolvedLinkStateProps = Omit<Solid.ComponentProps<'a'>, 'style'> & {\n    style?: Solid.JSX.CSSProperties\n  }\n\n  const resolvedProps = Solid.createMemo(() => {\n    const active = isActive()\n\n    const base = {\n      href: hrefOption()?.href,\n      ref: mergeRefs(setRef, _options().ref),\n      onClick,\n      onBlur,\n      onFocus,\n      onMouseEnter,\n      onMouseOver,\n      onMouseLeave,\n      onMouseOut,\n      onTouchStart,\n      disabled: !!local.disabled,\n      target: local.target,\n      ...(local.disabled && STATIC_DISABLED_PROPS),\n      ...(isTransitioning() && STATIC_TRANSITIONING_ATTRIBUTES),\n    }\n\n    if (simpleStyling()) {\n      return {\n        ...base,\n        ...(active && STATIC_DEFAULT_ACTIVE_ATTRIBUTES),\n      }\n    }\n\n    const activeProps: ResolvedLinkStateProps = active\n      ? (functionalUpdate(local.activeProps as any, {}) ?? EMPTY_OBJECT)\n      : EMPTY_OBJECT\n    const inactiveProps: ResolvedLinkStateProps = active\n      ? EMPTY_OBJECT\n      : functionalUpdate(local.inactiveProps, {})\n    const style = {\n      ...local.style,\n      ...activeProps.style,\n      ...inactiveProps.style,\n    }\n    const className = [local.class, activeProps.class, inactiveProps.class]\n      .filter(Boolean)\n      .join(' ')\n\n    return {\n      ...activeProps,\n      ...inactiveProps,\n      ...base,\n      ...(Object.keys(style).length ? { style } : undefined),\n      ...(className ? { class: className } : undefined),\n      ...(active && STATIC_ACTIVE_ATTRIBUTES),\n    } as ResolvedLinkStateProps\n  })\n\n  return Solid.mergeProps(propsSafeToSpread, resolvedProps) as any\n}\n\nconst STATIC_ACTIVE_PROPS = { class: 'active' }\nconst STATIC_ACTIVE_PROPS_GET = () => STATIC_ACTIVE_PROPS\nconst EMPTY_OBJECT = {}\nconst STATIC_INACTIVE_PROPS_GET = () => EMPTY_OBJECT\nconst STATIC_DEFAULT_ACTIVE_ATTRIBUTES = {\n  class: 'active',\n  'data-status': 'active',\n  'aria-current': 'page',\n}\nconst STATIC_DISABLED_PROPS = {\n  role: 'link',\n  'aria-disabled': true,\n}\nconst STATIC_ACTIVE_ATTRIBUTES = {\n  'data-status': 'active',\n  'aria-current': 'page',\n}\nconst STATIC_TRANSITIONING_ATTRIBUTES = {\n  'data-transitioning': 'transitioning',\n}\n\n/** Call a JSX.EventHandlerUnion with the event. */\nfunction callHandler<T, TEvent extends Event>(\n  event: TEvent & { currentTarget: T; target: Element },\n  handler: Solid.JSX.EventHandlerUnion<T, TEvent>,\n) {\n  if (typeof handler === 'function') {\n    handler(event)\n  } else {\n    handler[0](handler[1], event)\n  }\n  return event.defaultPrevented\n}\n\nfunction createComposedHandler<T, TEvent extends Event>(\n  getHandler: () => Solid.JSX.EventHandlerUnion<T, TEvent> | undefined,\n  fallback: (event: TEvent) => void,\n) {\n  return (event: TEvent & { currentTarget: T; target: Element }) => {\n    const handler = getHandler()\n    if (!handler || !callHandler(event, handler)) fallback(event)\n  }\n}\n\nexport type UseLinkPropsOptions<\n  TRouter extends AnyRouter = RegisteredRouter,\n  TFrom extends RoutePaths<TRouter['routeTree']> | string = string,\n  TTo extends string | undefined = '.',\n  TMaskFrom extends RoutePaths<TRouter['routeTree']> | string = TFrom,\n  TMaskTo extends string = '.',\n> = ActiveLinkOptions<'a', TRouter, TFrom, TTo, TMaskFrom, TMaskTo> &\n  Omit<Solid.ComponentProps<'a'>, 'style'> & { style?: Solid.JSX.CSSProperties }\n\nexport type ActiveLinkOptions<\n  TComp = 'a',\n  TRouter extends AnyRouter = RegisteredRouter,\n  TFrom extends string = string,\n  TTo extends string | undefined = '.',\n  TMaskFrom extends string = TFrom,\n  TMaskTo extends string = '.',\n> = LinkOptions<TRouter, TFrom, TTo, TMaskFrom, TMaskTo> &\n  ActiveLinkOptionProps<TComp>\n\ntype ActiveLinkProps<TComp> = Partial<\n  LinkComponentSolidProps<TComp> & {\n    [key: `data-${string}`]: unknown\n  }\n>\n\nexport interface ActiveLinkOptionProps<TComp = 'a'> {\n  /**\n   * A function that returns additional props for the `active` state of this link.\n   * These props override other props passed to the link (`style`'s are merged, `class`'s are concatenated)\n   */\n  activeProps?: ActiveLinkProps<TComp> | (() => ActiveLinkProps<TComp>)\n  /**\n   * A function that returns additional props for the `inactive` state of this link.\n   * These props override other props passed to the link (`style`'s are merged, `class`'s are concatenated)\n   */\n  inactiveProps?: ActiveLinkProps<TComp> | (() => ActiveLinkProps<TComp>)\n}\n\nexport type LinkProps<\n  TComp = 'a',\n  TRouter extends AnyRouter = RegisteredRouter,\n  TFrom extends string = string,\n  TTo extends string | undefined = '.',\n  TMaskFrom extends string = TFrom,\n  TMaskTo extends string = '.',\n> = ActiveLinkOptions<TComp, TRouter, TFrom, TTo, TMaskFrom, TMaskTo> &\n  LinkPropsChildren\n\nexport interface LinkPropsChildren {\n  // If a function is passed as a child, it will be given the `isActive` boolean to aid in further styling on the element it returns\n  children?:\n    | Solid.JSX.Element\n    | ((state: {\n        isActive: boolean\n        isTransitioning: boolean\n      }) => Solid.JSX.Element)\n}\n\ntype LinkComponentSolidProps<TComp> = TComp extends Solid.ValidComponent\n  ? Omit<Solid.ComponentProps<TComp>, keyof CreateLinkProps>\n  : never\n\nexport type LinkComponentProps<\n  TComp = 'a',\n  TRouter extends AnyRouter = RegisteredRouter,\n  TFrom extends string = string,\n  TTo extends string | undefined = '.',\n  TMaskFrom extends string = TFrom,\n  TMaskTo extends string = '.',\n> = LinkComponentSolidProps<TComp> &\n  LinkProps<TComp, TRouter, TFrom, TTo, TMaskFrom, TMaskTo>\n\nexport type CreateLinkProps = LinkProps<\n  any,\n  any,\n  string,\n  string,\n  string,\n  string\n>\n\nexport type LinkComponent<\n  in out TComp,\n  in out TDefaultFrom extends string = string,\n> = <\n  TRouter extends AnyRouter = RegisteredRouter,\n  const TFrom extends string = TDefaultFrom,\n  const TTo extends string | undefined = undefined,\n  const TMaskFrom extends string = TFrom,\n  const TMaskTo extends string = '',\n>(\n  props: LinkComponentProps<TComp, TRouter, TFrom, TTo, TMaskFrom, TMaskTo>,\n) => Solid.JSX.Element\n\nexport interface LinkComponentRoute<\n  in out TDefaultFrom extends string = string,\n> {\n  defaultFrom: TDefaultFrom;\n  <\n    TRouter extends AnyRouter = RegisteredRouter,\n    const TTo extends string | undefined = undefined,\n    const TMaskTo extends string = '',\n  >(\n    props: LinkComponentProps<\n      'a',\n      TRouter,\n      this['defaultFrom'],\n      TTo,\n      this['defaultFrom'],\n      TMaskTo\n    >,\n  ): Solid.JSX.Element\n}\n\nexport function createLink<const TComp>(\n  Comp: Constrain<TComp, any, (props: CreateLinkProps) => Solid.JSX.Element>,\n): LinkComponent<TComp> {\n  return (props) => <Link {...props} _asChild={Comp} />\n}\n\nexport const Link: LinkComponent<'a'> = (props) => {\n  const [local, rest] = Solid.splitProps(\n    props as typeof props & { _asChild: any },\n    ['_asChild', 'children'],\n  )\n\n  const [_, linkProps] = Solid.splitProps(\n    useLinkProps(rest as unknown as any),\n    ['type'],\n  )\n\n  const children = Solid.createMemo(() => {\n    const ch = local.children\n    if (typeof ch === 'function') {\n      return ch({\n        get isActive() {\n          return (linkProps as any)['data-status'] === 'active'\n        },\n        get isTransitioning() {\n          return (linkProps as any)['data-transitioning'] === 'transitioning'\n        },\n      })\n    }\n\n    return ch satisfies Solid.JSX.Element\n  })\n\n  if (local._asChild === 'svg') {\n    const [_, svgLinkProps] = Solid.splitProps(linkProps, ['class'])\n    return (\n      <svg>\n        <a {...svgLinkProps}>{children()}</a>\n      </svg>\n    )\n  }\n\n  if (!local._asChild) {\n    return <a {...linkProps}>{children()}</a>\n  }\n\n  return (\n    <Dynamic component={local._asChild as Solid.ValidComponent} {...linkProps}>\n      {children()}\n    </Dynamic>\n  )\n}\n\nfunction isCtrlEvent(e: MouseEvent) {\n  return !!(e.metaKey || e.altKey || e.ctrlKey || e.shiftKey)\n}\n\nfunction isSafeInternal(to: unknown) {\n  if (typeof to !== 'string') return false\n  const zero = to.charCodeAt(0)\n  if (zero === 47) return to.charCodeAt(1) !== 47 // '/' but not '//'\n  return zero === 46 // '.', '..', './', '../'\n}\n\nexport type LinkOptionsFnOptions<\n  TOptions,\n  TComp,\n  TRouter extends AnyRouter = RegisteredRouter,\n> =\n  TOptions extends ReadonlyArray<any>\n    ? ValidateLinkOptionsArray<TRouter, TOptions, string, TComp>\n    : ValidateLinkOptions<TRouter, TOptions, string, TComp>\n\nexport type LinkOptionsFn<TComp> = <\n  const TOptions,\n  TRouter extends AnyRouter = RegisteredRouter,\n>(\n  options: LinkOptionsFnOptions<TOptions, TComp, TRouter>,\n) => TOptions\n\nexport const linkOptions: LinkOptionsFn<'a'> = (options) => {\n  return options as any\n}\n"],"mappings":";;;;;;;;;;;;AAgCA,IAAMoB,6BAAa,IAAIC,SAAqD;AAE5E,SAAgBI,aAOdG,SAC2B;CAC3B,MAAMM,SAASxB,kBAAAA,WAAW;CAC1B,MAAM,CAACyB,iBAAiBC,sBAAsBpC,SAAMqC,aAAa,MAAM;CACvE,MAAMC,oBAAoB,CAAC9B,+BAAAA,YAAY,CAAC,CAAC0B,OAAON,QAAQW;CACxD,MAAMC,cAAc5B,mBAAAA,aAAa;CAEjC,IAAI6B,mBAAmB;CAEvB,MAAM,CAACC,OAAOC,QAAQ3C,SAAM4C,WAC1B5C,SAAM6C,WACJ;EACEC,aAAaC;EACbC,eAAeC;EAChB,EACDrB,QACD,EACD;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EAEJ,CAAC;CA8BD,MAAM,CAACsB,GAAGC,qBAAqBnD,SAAM4C,WAAWD,MAAM;EACpD;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACD,CAAC;CAEF,MAAMS,kBAAkBpD,SAAMqD,iBACtBnB,OAAOoB,OAAOC,SAASC,OAC7BC,KAAAA,GACA,EAAEC,SAASC,MAAMC,SAASD,KAAKE,SAASD,KAAKC,MAC/C,CAAC;CAED,MAAMC,iBAAiBlC;CAEvB,MAAMgC,OAAO5D,SAAMqD,iBAAiB;EAGlC,MAAMzB,UAAU;GAAEmC,eADIX,iBAAiB;GACN,GAAGU,UAAS;GAAG;AAEhD,SAAO9D,SAAMgE,cAAc9B,OAAO+B,cAAcrC,QAAQ,CAAC;GACzD;CAEF,MAAMsC,aAAalE,SAAMqD,iBAAiB;AACxC,MAAIS,UAAU,CAACK,SAAU,QAAOV,KAAAA;EAKhC,MAAMF,WAAWK,MAAM,CAACQ,kBAAkBR,MAAM;EAChD,MAAMS,aAAad,SAASc;AAG5B,MAFiBd,SAASe,SAGxB,QAAO;GAAET,MAAMQ;GAAYC,UAAU;GAAM;AAG7C,SAAO;GACLT,MAAM3B,OAAOqC,QAAQC,WAAWH,WAAW,IAAI;GAC/CC,UAAU;GACX;GACD;CAEF,MAAMG,eAAezE,SAAMqD,iBAAiB;EAC1C,MAAMqB,QAAQR,YAAY;AAC1B,MAAIQ,OAAOJ,UAAU;AAEnB,QAAA,GAAA,sBAAA,qBAAwBI,MAAMb,MAAM3B,OAAOyC,kBAAkB,EAAE;AAC7D,QAAA,QAAA,IAAA,aAA6B,aAC3BI,SAAQC,KAAK,yCAAyCN,MAAMb,OAAO;AAErE;;AAEF,UAAOa,MAAMb;;EAEf,MAAMoB,KAAKnB,UAAU,CAACmB;AAEtB,MADqBE,eAAeF,GAAG,CACrB,QAAOxB,KAAAA;AACzB,MAAI,OAAOwB,OAAO,YAAYA,GAAGG,QAAQ,IAAI,KAAK,GAAI,QAAO3B,KAAAA;AAC7D,MAAI;AACF,OAAI4B,IAAIJ,GAAU;AAElB,QAAA,GAAA,sBAAA,qBAAwBA,IAAI/C,OAAOyC,kBAAkB,EAAE;AACrD,QAAA,QAAA,IAAA,aAA6B,aAC3BI,SAAQC,KAAK,yCAAyCC,KAAK;AAE7D;;AAEF,UAAOA;UACD;GAER;CAEF,MAAMK,UAAUtF,SAAMqD,iBAAiB;AACrC,MAAIS,UAAU,CAACyB,kBAAkBd,cAAc,CAC7C,QAAO;AAET,SAAO/B,MAAM4C,WAAWpD,OAAON,QAAQ4D;GACvC;CACF,MAAMC,qBACJ/C,MAAM+C,gBAAgBvD,OAAON,QAAQ8D,uBAAuB;CAE9D,MAAMC,WAAW3F,SAAMqD,iBAAiB;AACtC,MAAIoB,cAAc,CAAE,QAAO;EAC3B,MAAMmB,gBAAgBlD,MAAMkD;EAC5B,MAAMC,UAAUzC,iBAAiB;EACjC,MAAM0C,eAAelC,MAAM;AAE3B,MAAIgC,eAAeG;OAMb,EAAA,GAAA,sBAAA,eAJFF,QAAQI,UACRH,aAAaG,UACb/D,OAAOgE,SACR,CAEC,QAAO;SAEJ;GACL,MAAMC,eAAAA,GAAAA,sBAAAA,qBAAkCN,QAAQI,UAAU/D,OAAOgE,SAAS;GAC1E,MAAME,YAAAA,GAAAA,sBAAAA,qBACJN,aAAaG,UACb/D,OAAOgE,SACR;AAMD,OAAI,EAHFC,YAAYG,WAAWF,SAAS,KAC/BD,YAAYI,WAAWH,SAASG,UAC/BJ,YAAYC,SAASG,YAAY,MAEnC,QAAO;;AAIX,MAAIX,eAAeY,iBAAiB;OAK9B,EAAA,GAAA,sBAAA,WAJyBX,QAAQa,QAAQZ,aAAaY,QAAQ;IAChEC,SAAS,CAACf,eAAeG;IACzBa,iBAAiB,CAAChB,eAAeiB;IAClC,CAAC,CAEA,QAAO;;AAIX,MAAIjB,eAAekB,YAGjB,SADExE,qBAAqB,CAACE,aAAa,GAAG,KAAKqD,QAAQmB,UAC9BlB,aAAakB;AAEtC,SAAO;GACP;CAEF,MAAMC,kBACJ/E,OACGgF,aAAa;EAAE,GAAGpD,UAAU;EAAEqD,gBAAgBvD,MAAK;EAAG,CAAQ,CAC9DwD,OAAOC,QAAa;AACnBtC,UAAQC,KAAKqC,IAAI;AACjBtC,UAAQC,KAAK1E,sBAAAA,eAAe;GAC5B;CAEN,MAAMgH,6BACJC,UACG;AACH,MAAIA,OAAOE,eACTR,YAAW;;CAIf,MAAM,CAACS,KAAKC,UAAU3H,SAAMqC,aAA6B,KAAK;AAE9D1B,eAAAA,wBACE+G,KACAJ,2BACA,EAAEO,YAAY,SAAS,EACvB,EAAE1D,UAAU,CAAC,CAACzB,MAAMyB,YAAY,EAAEmB,SAAS,KAAK,aAClD,CAAC;AAEDtF,UAAM8H,mBAAmB;AACvB,MAAIrF,iBACF;AAEF,MAAI,CAACC,MAAMyB,YAAYmB,SAAS,KAAK,UAAU;AAC7C2B,cAAW;AACXxE,sBAAmB;;GAErB;AAEF,KAAIgC,cAAc,CAChB,QAAOzE,SAAM6C,WACXM,mBACA;EACEuE,MAAAA,GAAAA,uBAAAA,WAAeC,QAAQ7D,UAAU,CAAC4D,IAAI;EACtC7D,MAAMY,cAAa;EACpB,EACDzE,SAAM4C,WAAWF,OAAO;EACtB;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACD,CAAC,CAAC,GACJ;CAIH,MAAMqF,eAAeC,MAAkB;EAErC,MAAME,gBACJF,EAAEG,cACFG,aAAa,SAAS;EACxB,MAAMC,kBACJ7F,MAAM8F,WAAW/E,KAAAA,IAAYf,MAAM8F,SAASN;AAE9C,MACE,CAACxF,MAAMyB,YACP,CAACsE,YAAYT,EAAE,IACf,CAACA,EAAEU,qBACF,CAACH,mBAAmBA,oBAAoB,YACzCP,EAAEW,WAAW,GACb;AACAX,KAAEY,gBAAgB;AAElBxG,sBAAmB,KAAK;GAExB,MAAMyG,QAAQ3G,OAAO4G,UAAU,oBAAoB;AACjDD,WAAO;AACPzG,uBAAmB,MAAM;KACzB;AAIFF,UAAO6G,SAAS;IACd,GAAGjF,UAAU;IACbkF,SAAStG,MAAMsG;IACfC,aAAavG,MAAMuG;IACnBC,oBAAoBxG,MAAMwG;IAC1BC,iBAAiBzG,MAAMyG;IACvBC,gBAAgB1G,MAAM0G;IACtBC,eAAe3G,MAAM2G;IACtB,CAAC;;;CAIN,MAAMC,wBAAwBtB,MAA+B;AAC3D,MAAItF,MAAMyB,YAAYmB,SAAS,KAAK,SAAU;AAE9C,MAAI,CAACG,cAAc,EAAE;AACnBwB,cAAW;AACX;;EAGF,MAAMuC,cAAcxB,EAAEG,iBAAiBH,EAAEQ;AAEzC,MAAI,CAACgB,eAAepI,WAAWqI,IAAID,YAAY,CAAE;AAEjDpI,aAAWsI,IACTF,aACAhI,iBAAiB;AACfJ,cAAWuI,OAAOH,YAAY;AAC9BvC,cAAW;KACVxB,cAAc,CACnB,CAAC;;CAGH,MAAMmE,oBAAoB1G,MAAkB;AAC1C,MAAIR,MAAMyB,YAAYmB,SAAS,KAAK,SAAU;AAC9C2B,aAAW;;CAGb,MAAM6C,eAAe9B,MAA+B;AAClD,MAAItF,MAAMyB,SAAU;EACpB,MAAMqF,cAAcxB,EAAEG,iBAAiBH,EAAEQ;AAEzC,MAAIgB,aAAa;GACf,MAAMO,KAAK3I,WAAW4I,IAAIR,YAAY;AACtCS,gBAAaF,GAAG;AAChB3I,cAAWuI,OAAOH,YAAY;;;CAIlC,MAAMU,gBAAgBlK,SAAMqD,iBAExBX,MAAMI,gBAAgBC,2BACtBL,MAAMM,kBAAkBC,6BACxBP,MAAMyH,UAAU1G,KAAAA,KAChBf,MAAM0H,UAAU3G,KAAAA,EACnB;CAED,MAAM4G,UAAUC,4BAA4B5H,MAAM2H,SAAStC,YAAY;CACvE,MAAMwC,SAASD,4BAA4B5H,MAAM6H,QAAQT,YAAY;CACrE,MAAMU,UAAUF,4BACR5H,MAAM8H,SACZlB,qBACD;CACD,MAAMmB,eAAeH,4BACb5H,MAAM+H,cACZnB,qBACD;CACD,MAAMoB,cAAcJ,4BACZ5H,MAAMgI,aACZpB,qBACD;CACD,MAAMqB,eAAeL,4BACb5H,MAAMiI,cACZb,YACD;CACD,MAAMc,aAAaN,4BAA4B5H,MAAMkI,YAAYd,YAAY;CAC7E,MAAMe,eAAeP,4BACb5H,MAAMmI,cACZjB,iBACD;CAMD,MAAMsB,gBAAgBlL,SAAMqD,iBAAiB;EAC3C,MAAM8H,SAASxF,UAAU;EAEzB,MAAMyF,OAAO;GACXvH,MAAMK,YAAY,EAAEL;GACpB6D,MAAAA,GAAAA,uBAAAA,WAAeC,QAAQ7D,UAAU,CAAC4D,IAAI;GACtC2C;GACAE;GACAC;GACAC;GACAC;GACAC;GACAC;GACAC;GACA1G,UAAU,CAAC,CAACzB,MAAMyB;GAClBqE,QAAQ9F,MAAM8F;GACd,GAAI9F,MAAMyB,YAAYkH;GACtB,GAAIlJ,iBAAiB,IAAImJ;GAC1B;AAED,MAAIpB,eAAe,CACjB,QAAO;GACL,GAAGkB;GACH,GAAID,UAAUI;GACf;EAGH,MAAMzI,cAAsCqI,UAAAA,GAAAA,sBAAAA,kBACtBzI,MAAMI,aAAoB,EAAE,CAAC,IAAI0I,eACnDA;EACJ,MAAMxI,gBAAwCmI,SAC1CK,gBAAAA,GAAAA,sBAAAA,kBACiB9I,MAAMM,eAAe,EAAE,CAAC;EAC7C,MAAMoH,QAAQ;GACZ,GAAG1H,MAAM0H;GACT,GAAGtH,YAAYsH;GACf,GAAGpH,cAAcoH;GAClB;EACD,MAAMqB,YAAY;GAAC/I,MAAMyH;GAAOrH,YAAYqH;GAAOnH,cAAcmH;GAAM,CACpEuB,OAAOC,QAAQ,CACfC,KAAK,IAAI;AAEZ,SAAO;GACL,GAAG9I;GACH,GAAGE;GACH,GAAGoI;GACH,GAAIS,OAAOC,KAAK1B,MAAM,CAAC7D,SAAS,EAAE6D,OAAO,GAAG3G,KAAAA;GAC5C,GAAIgI,YAAY,EAAEtB,OAAOsB,WAAW,GAAGhI,KAAAA;GACvC,GAAI0H,UAAUY;GACf;GACD;AAEF,QAAO/L,SAAM6C,WAAWM,mBAAmB+H,cAAc;;AAG3D,IAAMc,sBAAsB,EAAE7B,OAAO,UAAU;AAC/C,IAAMpH,gCAAgCiJ;AACtC,IAAMR,eAAe,EAAE;AACvB,IAAMvI,kCAAkCuI;AACxC,IAAMD,mCAAmC;CACvCpB,OAAO;CACP,eAAe;CACf,gBAAgB;CACjB;AACD,IAAMkB,wBAAwB;CAC5BY,MAAM;CACN,iBAAiB;CAClB;AACD,IAAMF,2BAA2B;CAC/B,eAAe;CACf,gBAAgB;CACjB;AACD,IAAMT,kCAAkC,EACtC,sBAAsB,iBACvB;;AAGD,SAASY,YACPE,OACAG,SACA;AACA,KAAI,OAAOA,YAAY,WACrBA,SAAQH,MAAM;KAEdG,SAAQ,GAAGA,QAAQ,IAAIH,MAAM;AAE/B,QAAOA,MAAM1D;;AAGf,SAAS4B,sBACPmC,YACAC,UACA;AACA,SAAQN,UAA0D;EAChE,MAAMG,UAAUE,YAAY;AAC5B,MAAI,CAACF,WAAW,CAACL,YAAYE,OAAOG,QAAQ,CAAEG,UAASN,MAAM;;;AAsHjE,SAAgByB,WACdC,MACsB;AACtB,SAAQJ,WAAAA,GAAAA,aAAAA,iBAAWM,OAAAA,GAAAA,aAAAA,YAASN,OAAK,EAAEQ,UAAUJ,MAAI,CAAA,CAAI;;AAGvD,IAAaE,QAA4BN,UAAU;CACjD,MAAM,CAAChL,OAAOC,QAAQ3C,SAAM4C,WAC1B8K,OACA,CAAC,YAAY,WACf,CAAC;CAED,MAAM,CAACxK,GAAGiL,aAAanO,SAAM4C,WAC3BnB,aAAakB,KAAuB,EACpC,CAAC,OACH,CAAC;CAED,MAAMyK,WAAWpN,SAAMqD,iBAAiB;EACtC,MAAM+K,KAAK1L,MAAM0K;AACjB,MAAI,OAAOgB,OAAO,WAChB,QAAOA,GAAG;GACR,IAAIzI,WAAW;AACb,WAAQwI,UAAkB,mBAAmB;;GAE/C,IAAIhM,kBAAkB;AACpB,WAAQgM,UAAkB,0BAA0B;;GAEvD,CAAC;AAGJ,SAAOC;GACP;AAEF,KAAI1L,MAAMwL,aAAa,OAAO;EAC5B,MAAM,CAAChL,GAAGmL,gBAAgBrO,SAAM4C,WAAWuL,WAAW,CAAC,QAAQ,CAAC;AAChE,gBAAA;GAAA,IAAAG,OAAAC,QAAA,EAAAC,QAAAF,KAAAG;AAAAC,IAAAA,GAAAA,aAAAA,QAAAF,OAEWH,cAAY,OAAA,KAAA;AAAAM,IAAAA,GAAAA,aAAAA,QAAAH,OAAGpB,SAAQ;AAAA,UAAAkB;MAAA;;AAKpC,KAAI,CAAC5L,MAAMwL,SACT,eAAA;EAAA,IAAAU,QAAAC,SAAA;AAAAH,GAAAA,GAAAA,aAAAA,QAAAE,OAAcT,WAAS,OAAA,KAAA;AAAAQ,GAAAA,GAAAA,aAAAA,QAAAC,OAAGxB,SAAQ;AAAA,SAAAwB;KAAA;AAGpC,SAAA,GAAA,aAAA,iBACGnO,aAAAA,UAAAA,GAAAA,aAAAA,YAAO,EAAA,IAACqO,YAAS;AAAA,SAAEpM,MAAMwL;IAAgC,EAAMC,WAAS,EAAA,IAAAf,WAAA;AAAA,SACtEA,UAAU;IAAA,CAAA,CAAA;;AAKjB,SAAS3E,YAAYT,GAAe;AAClC,QAAO,CAAC,EAAEA,EAAE+G,WAAW/G,EAAEgH,UAAUhH,EAAEiH,WAAWjH,EAAEkH;;AAGpD,SAAS/J,eAAeF,IAAa;AACnC,KAAI,OAAOA,OAAO,SAAU,QAAO;CACnC,MAAMkK,OAAOlK,GAAGmK,WAAW,EAAE;AAC7B,KAAID,SAAS,GAAI,QAAOlK,GAAGmK,WAAW,EAAE,KAAK;AAC7C,QAAOD,SAAS;;AAmBlB,IAAaM,eAAmC7N,YAAY;AAC1D,QAAOA"}

package/dist/cjs/not-found.cjs

@@ -7,6 +7,10 @@ let solid_js = require("solid-js");
 solid_js = require_runtime.__toESM(solid_js);
 //#region src/not-found.tsx
 var _tmpl$ = /* @__PURE__ */ (0, solid_js_web.template)(`<p>Not Found`);
+function getNotFound(error) {
+	if ((0, _tanstack_router_core.isNotFound)(error)) return error;
+	if ((0, _tanstack_router_core.isNotFound)(error?.cause)) return error.cause;
+}
 function CatchNotFound(props) {
 	const router = require_useRouter.useRouter();
 	const pathname = solid_js.createMemo(() => router.stores.location.state.pathname);
@@ -14,11 +18,13 @@ function CatchNotFound(props) {
 	return (0, solid_js_web.createComponent)(require_CatchBoundary.CatchBoundary, {
 		getResetKey: () => `not-found-${pathname()}-${status()}`,
 		onCatch: (error) => {
-			if ((0, _tanstack_router_core.isNotFound)(error)) props.onCatch?.(error);
+			const notFoundError = getNotFound(error);
+			if (notFoundError) props.onCatch?.(notFoundError);
 			else throw error;
 		},
 		errorComponent: ({ error }) => {
-			if ((0, _tanstack_router_core.isNotFound)(error)) return props.fallback?.(error);
+			const notFoundError = getNotFound(error);
+			if (notFoundError) return props.fallback?.(notFoundError);
 			else throw error;
 		},
 		get children() {
@@ -32,5 +38,6 @@ function DefaultGlobalNotFound() {
 //#endregion
 exports.CatchNotFound = CatchNotFound;
 exports.DefaultGlobalNotFound = DefaultGlobalNotFound;
+exports.getNotFound = getNotFound;
 
 //# sourceMappingURL=not-found.cjs.map

package/dist/cjs/not-found.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"not-found.cjs","names":["isNotFound","Solid","CatchBoundary","useRouter","NotFoundError","CatchNotFound","props","fallback","error","JSX","Element","onCatch","Error","children","router","pathname","createMemo","stores","location","state","status","_$createComponent","getResetKey","errorComponent","DefaultGlobalNotFound","_tmpl$"],"sources":["../../src/not-found.tsx"],"sourcesContent":["import { isNotFound } from '@tanstack/router-core'\nimport * as Solid from 'solid-js'\nimport { CatchBoundary } from './CatchBoundary'\nimport { useRouter } from './useRouter'\nimport type { NotFoundError } from '@tanstack/router-core'\n\nexport function CatchNotFound(props: {\n  fallback?: (error: NotFoundError) => Solid.JSX.Element\n  onCatch?: (error: Error) => void\n  children: Solid.JSX.Element\n}) {\n  const router = useRouter()\n  // TODO: Some way for the user to programmatically reset the not-found boundary?\n  const pathname = Solid.createMemo(() => router.stores.location.state.pathname)\n  const status = Solid.createMemo(() => router.stores.status.state)\n\n  return (\n    <CatchBoundary\n      getResetKey={() => `not-found-${pathname()}-${status()}`}\n      onCatch={(error) => {\n        if (isNotFound(error)) {\n          props.onCatch?.(error)\n        } else {\n          throw error\n        }\n      }}\n      errorComponent={({ error }) => {\n        if (isNotFound(error)) {\n          return props.fallback?.(error)\n        } else {\n          throw error\n        }\n      }}\n    >\n      {props.children}\n    </CatchBoundary>\n  )\n}\n\nexport function DefaultGlobalNotFound() {\n  return <p>Not Found</p>\n}\n"],"mappings":";;;;;;;;;AAMA,SAAgBK,cAAcC,OAI3B;CACD,MAAMQ,SAASX,kBAAAA,WAAW;CAE1B,MAAMY,WAAWd,SAAMe,iBAAiBF,OAAOG,OAAOC,SAASC,MAAMJ,SAAS;CAC9E,MAAMK,SAASnB,SAAMe,iBAAiBF,OAAOG,OAAOG,OAAOD,MAAM;AAEjE,SAAA,GAAA,aAAA,iBACGjB,sBAAAA,eAAa;EACZoB,mBAAmB,aAAaP,UAAU,CAAA,GAAIK,QAAQ;EACtDT,UAAUH,UAAU;AAClB,QAAA,GAAA,sBAAA,YAAeA,MAAM,CACnBF,OAAMK,UAAUH,MAAM;OAEtB,OAAMA;;EAGVe,iBAAiB,EAAEf,YAAY;AAC7B,QAAA,GAAA,sBAAA,YAAeA,MAAM,CACnB,QAAOF,MAAMC,WAAWC,MAAM;OAE9B,OAAMA;;EAET,IAAAK,WAAA;AAAA,UAEAP,MAAMO;;EAAQ,CAAA;;AAKrB,SAAgBW,wBAAwB;AACtC,QAAAC,QAAA"}
+{"version":3,"file":"not-found.cjs","names":["isNotFound","Solid","CatchBoundary","useRouter","NotFoundError","getNotFound","error","cause","undefined","CatchNotFound","props","fallback","JSX","Element","onCatch","children","router","pathname","createMemo","stores","location","state","status","_$createComponent","getResetKey","notFoundError","errorComponent","DefaultGlobalNotFound","_tmpl$"],"sources":["../../src/not-found.tsx"],"sourcesContent":["import { isNotFound } from '@tanstack/router-core'\nimport * as Solid from 'solid-js'\nimport { CatchBoundary } from './CatchBoundary'\nimport { useRouter } from './useRouter'\nimport type { NotFoundError } from '@tanstack/router-core'\n\n// Solid wraps non-Error throws in an Error and stores the original thrown value\n// on `cause`, so component-thrown `notFound()` needs one extra unwrapping step.\nexport function getNotFound(\n  error: unknown,\n): (NotFoundError & { isNotFound: true }) | undefined {\n  if (isNotFound(error)) {\n    return error as NotFoundError & { isNotFound: true }\n  }\n\n  if (isNotFound((error as any)?.cause)) {\n    return (error as any).cause as NotFoundError & { isNotFound: true }\n  }\n\n  return undefined\n}\n\nexport function CatchNotFound(props: {\n  fallback?: (error: NotFoundError) => Solid.JSX.Element\n  onCatch?: (error: NotFoundError) => void\n  children: Solid.JSX.Element\n}) {\n  const router = useRouter()\n  // TODO: Some way for the user to programmatically reset the not-found boundary?\n  const pathname = Solid.createMemo(() => router.stores.location.state.pathname)\n  const status = Solid.createMemo(() => router.stores.status.state)\n\n  return (\n    <CatchBoundary\n      getResetKey={() => `not-found-${pathname()}-${status()}`}\n      onCatch={(error) => {\n        const notFoundError = getNotFound(error)\n\n        if (notFoundError) {\n          props.onCatch?.(notFoundError)\n        } else {\n          throw error\n        }\n      }}\n      errorComponent={({ error }) => {\n        const notFoundError = getNotFound(error)\n\n        if (notFoundError) {\n          return props.fallback?.(notFoundError)\n        } else {\n          throw error\n        }\n      }}\n    >\n      {props.children}\n    </CatchBoundary>\n  )\n}\n\nexport function DefaultGlobalNotFound() {\n  return <p>Not Found</p>\n}\n"],"mappings":";;;;;;;;;AAQA,SAAgBK,YACdC,OACoD;AACpD,MAAA,GAAA,sBAAA,YAAeA,MAAM,CACnB,QAAOA;AAGT,MAAA,GAAA,sBAAA,YAAgBA,OAAeC,MAAM,CACnC,QAAQD,MAAcC;;AAM1B,SAAgBE,cAAcC,OAI3B;CACD,MAAMM,SAASb,kBAAAA,WAAW;CAE1B,MAAMc,WAAWhB,SAAMiB,iBAAiBF,OAAOG,OAAOC,SAASC,MAAMJ,SAAS;CAC9E,MAAMK,SAASrB,SAAMiB,iBAAiBF,OAAOG,OAAOG,OAAOD,MAAM;AAEjE,SAAA,GAAA,aAAA,iBACGnB,sBAAAA,eAAa;EACZsB,mBAAmB,aAAaP,UAAU,CAAA,GAAIK,QAAQ;EACtDR,UAAUR,UAAU;GAClB,MAAMmB,gBAAgBpB,YAAYC,MAAM;AAExC,OAAImB,cACFf,OAAMI,UAAUW,cAAc;OAE9B,OAAMnB;;EAGVoB,iBAAiB,EAAEpB,YAAY;GAC7B,MAAMmB,gBAAgBpB,YAAYC,MAAM;AAExC,OAAImB,cACF,QAAOf,MAAMC,WAAWc,cAAc;OAEtC,OAAMnB;;EAET,IAAAS,WAAA;AAAA,UAEAL,MAAMK;;EAAQ,CAAA;;AAKrB,SAAgBY,wBAAwB;AACtC,QAAAC,QAAA"}

package/dist/cjs/not-found.d.cts

@@ -1,8 +1,11 @@
 import { NotFoundError } from '@tanstack/router-core';
 import * as Solid from 'solid-js';
+export declare function getNotFound(error: unknown): (NotFoundError & {
+    isNotFound: true;
+}) | undefined;
 export declare function CatchNotFound(props: {
     fallback?: (error: NotFoundError) => Solid.JSX.Element;
-    onCatch?: (error: Error) => void;
+    onCatch?: (error: NotFoundError) => void;
     children: Solid.JSX.Element;
 }): Solid.JSX.Element;
 export declare function DefaultGlobalNotFound(): Solid.JSX.Element;

package/dist/esm/Match.js

@@ -2,7 +2,7 @@ import { CatchBoundary, ErrorComponent } from "./CatchBoundary.js";
 import { useRouter } from "./useRouter.js";
 import { nearestMatchContext } from "./matchContext.js";
 import { SafeFragment } from "./SafeFragment.js";
-import { CatchNotFound } from "./not-found.js";
+import { CatchNotFound, getNotFound } from "./not-found.js";
 import { renderRouteNotFound } from "./renderRouteNotFound.js";
 import { ScrollRestoration } from "./scroll-restoration.js";
 import { createControlledPromise, getLocationChangeInfo, invariant, isNotFound, isRedirect, rootRouteId } from "@tanstack/router-core";
@@ -76,7 +76,11 @@ var Match = (props) => {
 										return routeErrorComponent() || ErrorComponent;
 									},
 									onCatch: (error) => {
-										if (isNotFound(error)) throw error;
+										const notFoundError = getNotFound(error);
+										if (notFoundError) {
+											notFoundError.routeId ??= currentMatchState().routeId;
+											throw notFoundError;
+										}
 										if (process.env.NODE_ENV !== "production") console.warn(`Warning: Error in route match: ${currentMatchState().routeId}`);
 										routeOnCatch()?.(error);
 									},
@@ -86,10 +90,12 @@ var Match = (props) => {
 												return ResolvedNotFoundBoundary();
 											},
 											fallback: (error) => {
-												if (!routeNotFoundComponent() || error.routeId && error.routeId !== currentMatchState().routeId || !error.routeId && !route().isRoot) throw error;
+												const notFoundError = getNotFound(error) ?? error;
+												notFoundError.routeId ??= currentMatchState().routeId;
+												if (!routeNotFoundComponent() || notFoundError.routeId && notFoundError.routeId !== currentMatchState().routeId || !notFoundError.routeId && !route().isRoot) throw notFoundError;
 												return createComponent(Dynamic, mergeProps({ get component() {
 													return routeNotFoundComponent();
-												} }, error));
+												} }, notFoundError));
 											},
 											get children() {
 												return createComponent(Solid.Switch, { get children() {