@tanstack/solid-router 1.111.3 → 1.111.4

package/dist/source/Asset.d.ts

@@ -0,0 +1,2 @@
+import type { RouterManagedTag } from '@tanstack/router-core';
+export declare function Asset({ tag, attrs, children }: RouterManagedTag): any;

package/dist/source/Asset.jsx

@@ -0,0 +1,22 @@
+export function Asset({ tag, attrs, children }) {
+    switch (tag) {
+        case 'title':
+            return <title {...attrs}>{children}</title>;
+        case 'meta':
+            return <meta {...attrs}/>;
+        case 'link':
+            return <link {...attrs}/>;
+        case 'style':
+            return <style {...attrs} innerHTML={children}/>;
+        case 'script':
+            if (attrs && attrs.src) {
+                return <script {...attrs}/>;
+            }
+            if (typeof children === 'string')
+                return <script {...attrs} innerHTML={children}/>;
+            return null;
+        default:
+            return null;
+    }
+}
+//# sourceMappingURL=Asset.jsx.map

package/dist/source/Asset.jsx.map

@@ -0,0 +1 @@
+{"version":3,"file":"Asset.jsx","sourceRoot":"","sources":["../../src/Asset.tsx"],"names":[],"mappings":"AAEA,MAAM,UAAU,KAAK,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,QAAQ,EAAoB;IAC9D,QAAQ,GAAG,EAAE,CAAC;QACZ,KAAK,OAAO;YACV,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,KAAK,CAAC,CAAA;QAC7C,KAAK,MAAM;YACT,OAAO,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,EAAG,CAAA;QAC5B,KAAK,MAAM;YACT,OAAO,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,EAAG,CAAA;QAC5B,KAAK,OAAO;YACV,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,EAAG,CAAA;QAClD,KAAK,QAAQ;YACX,IAAK,KAAa,IAAK,KAAa,CAAC,GAAG,EAAE,CAAC;gBACzC,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,EAAG,CAAA;YAC9B,CAAC;YACD,IAAI,OAAO,QAAQ,KAAK,QAAQ;gBAC9B,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,EAAG,CAAA;YACnD,OAAO,IAAI,CAAA;QACb;YACE,OAAO,IAAI,CAAA;IACf,CAAC;AACH,CAAC"}

package/dist/source/CatchBoundary.d.ts

@@ -0,0 +1,11 @@
+import * as Solid from 'solid-js';
+import type { ErrorRouteComponent } from './route';
+export declare function CatchBoundary(props: {
+    getResetKey: () => number | string;
+    children: Solid.JSX.Element;
+    errorComponent?: ErrorRouteComponent;
+    onCatch?: (error: Error) => void;
+} & Solid.ParentProps): Solid.JSX.Element;
+export declare function ErrorComponent({ error }: {
+    error: any;
+}): Solid.JSX.Element;

package/dist/source/CatchBoundary.jsx

@@ -0,0 +1,43 @@
+import * as Solid from 'solid-js';
+import { Dynamic } from 'solid-js/web';
+export function CatchBoundary(props) {
+    return (<Solid.ErrorBoundary fallback={(error, reset) => {
+            props.onCatch?.(error);
+            Solid.createEffect(Solid.on([props.getResetKey], () => reset(), { defer: true }));
+            return (<Dynamic component={props.errorComponent ?? ErrorComponent} error={error} reset={reset}/>);
+        }}>
+      {props.children}
+    </Solid.ErrorBoundary>);
+}
+export function ErrorComponent({ error }) {
+    const [show, setShow] = Solid.createSignal(process.env.NODE_ENV !== 'production');
+    return (<div style={{ padding: '.5rem', 'max-width': '100%' }}>
+      <div style={{ display: 'flex', 'align-items': 'center', gap: '.5rem' }}>
+        <strong style={{ 'font-size': '1rem' }}>Something went wrong!</strong>
+        <button style={{
+            appearance: 'none',
+            'font-size': '.6em',
+            border: '1px solid currentColor',
+            padding: '.1rem .2rem',
+            'font-weight': 'bold',
+            'border-radius': '.25rem',
+        }} onClick={() => setShow((d) => !d)}>
+          {show() ? 'Hide Error' : 'Show Error'}
+        </button>
+      </div>
+      <div style={{ height: '.25rem' }}/>
+      {show() ? (<div>
+          <pre style={{
+                'font-size': '.7em',
+                border: '1px solid red',
+                'border-radius': '.25rem',
+                padding: '.3rem',
+                color: 'red',
+                overflow: 'auto',
+            }}>
+            {error.message ? <code>{error.message}</code> : null}
+          </pre>
+        </div>) : null}
+    </div>);
+}
+//# sourceMappingURL=CatchBoundary.jsx.map

package/dist/source/CatchBoundary.jsx.map

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

package/dist/source/HeadContent.d.ts

@@ -0,0 +1,8 @@
+import * as Solid from 'solid-js';
+import type { RouterManagedTag } from '@tanstack/router-core';
+export declare const useTags: () => RouterManagedTag[];
+/**
+ * @description The `HeadContent` component is used to render meta tags, links, and scripts for the current route.
+ * It should be rendered in the `<head>` of your document.
+ */
+export declare function HeadContent(): Solid.JSX.Element[];

package/dist/source/HeadContent.jsx

@@ -0,0 +1,125 @@
+import * as Solid from 'solid-js';
+import { Asset } from './Asset';
+import { useRouter } from './useRouter';
+import { useRouterState } from './useRouterState';
+export const useTags = () => {
+    const router = useRouter();
+    const routeMeta = useRouterState({
+        select: (state) => {
+            return state.matches.map((match) => match.meta).filter(Boolean);
+        },
+    });
+    const meta = Solid.createMemo(() => {
+        const resultMeta = [];
+        const metaByAttribute = {};
+        let title;
+        [...routeMeta()].reverse().forEach((metas) => {
+            ;
+            [...metas].reverse().forEach((m) => {
+                if (!m)
+                    return;
+                if (m.title) {
+                    if (!title) {
+                        title = {
+                            tag: 'title',
+                            children: m.title,
+                        };
+                    }
+                }
+                else {
+                    const attribute = m.name ?? m.property;
+                    if (attribute) {
+                        if (metaByAttribute[attribute]) {
+                            return;
+                        }
+                        else {
+                            metaByAttribute[attribute] = true;
+                        }
+                    }
+                    resultMeta.push({
+                        tag: 'meta',
+                        attrs: {
+                            ...m,
+                        },
+                    });
+                }
+            });
+        });
+        if (title) {
+            resultMeta.push(title);
+        }
+        resultMeta.reverse();
+        return resultMeta;
+    }, [routeMeta]);
+    const links = useRouterState({
+        select: (state) => state.matches
+            .map((match) => match.links)
+            .filter(Boolean)
+            .flat(1)
+            .map((link) => ({
+            tag: 'link',
+            attrs: {
+                ...link,
+            },
+        })),
+    });
+    const preloadMeta = useRouterState({
+        select: (state) => {
+            const preloadMeta = [];
+            state.matches
+                .map((match) => router.looseRoutesById[match.routeId])
+                .forEach((route) => router.ssr?.manifest?.routes[route.id]?.preloads
+                ?.filter(Boolean)
+                .forEach((preload) => {
+                preloadMeta.push({
+                    tag: 'link',
+                    attrs: {
+                        rel: 'modulepreload',
+                        href: preload,
+                    },
+                });
+            }));
+            return preloadMeta;
+        },
+    });
+    const headScripts = useRouterState({
+        select: (state) => state.matches
+            .map((match) => match.headScripts)
+            .flat(1)
+            .filter(Boolean).map(({ children, ...script }) => ({
+            tag: 'script',
+            attrs: {
+                ...script,
+            },
+            children,
+        })),
+    });
+    return uniqBy([
+        ...meta(),
+        ...preloadMeta(),
+        ...links(),
+        ...headScripts(),
+    ], (d) => {
+        return JSON.stringify(d);
+    });
+};
+/**
+ * @description The `HeadContent` component is used to render meta tags, links, and scripts for the current route.
+ * It should be rendered in the `<head>` of your document.
+ */
+export function HeadContent() {
+    const tags = useTags();
+    return tags.map((tag) => <Asset {...tag}/>);
+}
+function uniqBy(arr, fn) {
+    const seen = new Set();
+    return arr.filter((item) => {
+        const key = fn(item);
+        if (seen.has(key)) {
+            return false;
+        }
+        seen.add(key);
+        return true;
+    });
+}
+//# sourceMappingURL=HeadContent.jsx.map

package/dist/source/HeadContent.jsx.map

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

package/dist/source/Match.d.ts

@@ -0,0 +1,8 @@
+import * as Solid from 'solid-js';
+export declare const Match: (props: {
+    matchId: string;
+}) => Solid.JSX.Element;
+export declare const MatchInner: (props: {
+    matchId: string;
+}) => any;
+export declare const Outlet: () => Solid.JSX.Element;

package/dist/source/Match.jsx

@@ -0,0 +1,256 @@
+import * as Solid from 'solid-js';
+import invariant from 'tiny-invariant';
+import warning from 'tiny-warning';
+import { createControlledPromise, getLocationChangeInfo, pick, rootRouteId, } from '@tanstack/router-core';
+import { Dynamic } from 'solid-js/web';
+import { CatchBoundary, ErrorComponent } from './CatchBoundary';
+import { useRouterState } from './useRouterState';
+import { useRouter } from './useRouter';
+import { CatchNotFound, isNotFound } from './not-found';
+import { isRedirect } from './redirects';
+import { matchContext } from './matchContext';
+import { SafeFragment } from './SafeFragment';
+import { renderRouteNotFound } from './renderRouteNotFound';
+import { ScrollRestoration } from './scroll-restoration';
+export const Match = (props) => {
+    const router = useRouter();
+    const routeId = useRouterState({
+        select: (s) => {
+            return s.matches.find((d) => d.id === props.matchId)?.routeId;
+        },
+    });
+    invariant(routeId, `Could not find routeId for matchId "${props.matchId}". Please file an issue!`);
+    const route = () => router.routesById[routeId()];
+    const PendingComponent = () => route().options.pendingComponent ?? router.options.defaultPendingComponent;
+    const routeErrorComponent = () => route().options.errorComponent ?? router.options.defaultErrorComponent;
+    const routeOnCatch = () => route().options.onCatch ?? router.options.defaultOnCatch;
+    const routeNotFoundComponent = () => route().isRoot
+        ? // If it's the root route, use the globalNotFound option, with fallback to the notFoundRoute's component
+            (route().options.notFoundComponent ??
+                router.options.notFoundRoute?.options.component)
+        : route().options.notFoundComponent;
+    const ResolvedSuspenseBoundary = () => 
+    // If we're on the root route, allow forcefully wrapping in suspense
+    (!route().isRoot || route().options.wrapInSuspense) &&
+        (route().options.wrapInSuspense ??
+            PendingComponent() ??
+            route().options.errorComponent?.preload)
+        ? Solid.Suspense
+        : SafeFragment;
+    const ResolvedCatchBoundary = () => routeErrorComponent() ? CatchBoundary : SafeFragment;
+    const ResolvedNotFoundBoundary = () => routeNotFoundComponent() ? CatchNotFound : SafeFragment;
+    const resetKey = useRouterState({
+        select: (s) => s.loadedAt,
+    });
+    const parentRouteId = useRouterState({
+        select: (s) => {
+            const index = s.matches.findIndex((d) => d.id === props.matchId);
+            return s.matches[index - 1]?.routeId;
+        },
+    });
+    return (<>
+      <matchContext.Provider value={() => props.matchId}>
+        <Dynamic component={ResolvedSuspenseBoundary()} fallback={<Dynamic component={PendingComponent()}/>}>
+          <Dynamic component={ResolvedCatchBoundary()} getResetKey={() => resetKey()} errorComponent={routeErrorComponent() || ErrorComponent} onCatch={(error) => {
+            // Forward not found errors (we don't want to show the error component for these)
+            if (isNotFound(error))
+                throw error;
+            warning(false, `Error in route match: ${props.matchId}`);
+            routeOnCatch()?.(error);
+        }}>
+            <Dynamic component={ResolvedNotFoundBoundary()} fallback={(error) => {
+            // If the current not found handler doesn't exist or it has a
+            // route ID which doesn't match the current route, rethrow the error
+            if (!routeNotFoundComponent() ||
+                (error.routeId && error.routeId !== routeId) ||
+                (!error.routeId && !route().isRoot))
+                throw error;
+            return (<Dynamic component={routeNotFoundComponent()} {...error}/>);
+        }}>
+              <MatchInner matchId={props.matchId}/>
+            </Dynamic>
+          </Dynamic>
+        </Dynamic>
+      </matchContext.Provider>
+
+      {parentRouteId() === rootRouteId ? (<>
+          <OnRendered />
+          <ScrollRestoration />
+        </>) : null}
+    </>);
+};
+// On Rendered can't happen above the root layout because it actually
+// renders a dummy dom element to track the rendered state of the app.
+// We render a script tag with a key that changes based on the current
+// location state.key. Also, because it's below the root layout, it
+// allows us to fire onRendered events even after a hydration mismatch
+// error that occurred above the root layout (like bad head/link tags,
+// which is common).
+function OnRendered() {
+    const router = useRouter();
+    const location = useRouterState({
+        select: (s) => {
+            return s.resolvedLocation?.state.key;
+        },
+    });
+    Solid.createEffect(Solid.on([location], () => {
+        router.emit({
+            type: 'onRendered',
+            ...getLocationChangeInfo(router.state),
+        });
+    }));
+    return null;
+}
+export const MatchInner = (props) => {
+    const router = useRouter();
+    // { match, key, routeId } =
+    const matchState = useRouterState({
+        select: (s) => {
+            const matchIndex = s.matches.findIndex((d) => d.id === props.matchId);
+            const match = s.matches[matchIndex];
+            const routeId = match.routeId;
+            const remountFn = router.routesById[routeId].options.remountDeps ??
+                router.options.defaultRemountDeps;
+            const remountDeps = remountFn?.({
+                routeId,
+                loaderDeps: match.loaderDeps,
+                params: match._strictParams,
+                search: match._strictSearch,
+            });
+            const key = remountDeps ? JSON.stringify(remountDeps) : undefined;
+            return {
+                key,
+                routeId,
+                match: pick(match, ['id', 'status', 'error']),
+            };
+        },
+    });
+    const route = () => router.routesById[matchState().routeId];
+    // function useChangedDiff(value: any) {
+    //   const ref = Solid.useRef(value)
+    //   const changed = ref.current !== value
+    //   if (changed) {
+    //     console.log(
+    //       'Changed:',
+    //       value,
+    //       Object.fromEntries(
+    //         Object.entries(value).filter(
+    //           ([key, val]) => val !== ref.current[key],
+    //         ),
+    //       ),
+    //     )
+    //   }
+    //   ref.current = value
+    // }
+    // useChangedDiff(match)
+    const match = () => matchState().match;
+    const out = () => {
+        const Comp = route().options.component ?? router.options.defaultComponent;
+        if (Comp) {
+            return <Comp />;
+        }
+        return <Outlet />;
+    };
+    return (<Solid.Switch>
+      <Solid.Match when={match().status === 'notFound'}>
+        {(_) => {
+            invariant(isNotFound(match().error), 'Expected a notFound error');
+            return renderRouteNotFound(router, route(), match().error);
+        }}
+      </Solid.Match>
+      <Solid.Match when={match().status === 'redirected'}>
+        {(_) => {
+            invariant(isRedirect(match().error), 'Expected a redirect error');
+            const [loaderResult] = Solid.createResource(async () => {
+                await new Promise((r) => setTimeout(r, 0));
+                return router.getMatch(match().id)?.loadPromise;
+            });
+            return <>{loaderResult()}</>;
+        }}
+      </Solid.Match>
+      <Solid.Match when={match().status === 'error'}>
+        {(_) => {
+            if (router.isServer) {
+                const RouteErrorComponent = (route().options.errorComponent ??
+                    router.options.defaultErrorComponent) ||
+                    ErrorComponent;
+                return (<RouteErrorComponent error={match().error} info={{
+                        componentStack: '',
+                    }}/>);
+            }
+            throw match().error;
+        }}
+      </Solid.Match>
+      <Solid.Match when={match().status === 'pending'}>
+        {(_) => {
+            const pendingMinMs = route().options.pendingMinMs ?? router.options.defaultPendingMinMs;
+            if (pendingMinMs && !router.getMatch(match().id)?.minPendingPromise) {
+                // Create a promise that will resolve after the minPendingMs
+                if (!router.isServer) {
+                    const minPendingPromise = createControlledPromise();
+                    Promise.resolve().then(() => {
+                        router.updateMatch(match().id, (prev) => ({
+                            ...prev,
+                            minPendingPromise,
+                        }));
+                    });
+                    setTimeout(() => {
+                        minPendingPromise.resolve();
+                        // We've handled the minPendingPromise, so we can delete it
+                        router.updateMatch(match().id, (prev) => ({
+                            ...prev,
+                            minPendingPromise: undefined,
+                        }));
+                    }, pendingMinMs);
+                }
+            }
+            const [loaderResult] = Solid.createResource(async () => {
+                await new Promise((r) => setTimeout(r, 0));
+                return router.getMatch(match().id)?.loadPromise;
+            });
+            return <>{loaderResult()}</>;
+        }}
+      </Solid.Match>
+      <Solid.Match when={match().status === 'success'}>{out()}</Solid.Match>
+    </Solid.Switch>);
+};
+export const Outlet = () => {
+    const router = useRouter();
+    const matchId = Solid.useContext(matchContext);
+    const routeId = useRouterState({
+        select: (s) => s.matches.find((d) => d.id === matchId())?.routeId,
+    });
+    const route = () => router.routesById[routeId()];
+    const parentGlobalNotFound = useRouterState({
+        select: (s) => {
+            const matches = s.matches;
+            const parentMatch = matches.find((d) => d.id === matchId());
+            invariant(parentMatch, `Could not find parent match for matchId "${matchId()}"`);
+            return parentMatch.globalNotFound;
+        },
+    });
+    const childMatchId = useRouterState({
+        select: (s) => {
+            const matches = s.matches;
+            const index = matches.findIndex((d) => d.id === matchId());
+            const v = matches[index + 1]?.id;
+            return v;
+        },
+    });
+    return (<Solid.Switch>
+      <Solid.Match when={parentGlobalNotFound()}>
+        {renderRouteNotFound(router, route(), undefined)}
+      </Solid.Match>
+      <Solid.Match when={childMatchId()}>
+        {(matchId) => {
+            // const nextMatch = <Match matchId={matchId()} />
+            return (<Solid.Show when={matchId() === rootRouteId} fallback={<Match matchId={matchId()}/>}>
+              <Solid.Suspense fallback={<Dynamic component={router.options.defaultPendingComponent}/>}>
+                <Match matchId={matchId()}/>
+              </Solid.Suspense>
+            </Solid.Show>);
+        }}
+      </Solid.Match>
+    </Solid.Switch>);
+};
+//# sourceMappingURL=Match.jsx.map

package/dist/source/Match.jsx.map

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

package/dist/source/Matches.d.ts

@@ -0,0 +1,67 @@
+import * as Solid from 'solid-js';
+import type { AnyRoute } from './route';
+import type { AllContext, AllLoaderData, AllParams, ControlledPromise, DeepPartial, FullSearchSchema, MakeOptionalPathParams, MakeOptionalSearchParams, MaskOptions, NoInfer, ParseRoute, ResolveRelativePath, ResolveRoute, RouteById, RouteByPath, RouteIds, StaticDataRouteOption, ToSubOptionsProps } from '@tanstack/router-core';
+import type { AnyRouter, RegisteredRouter } from './router';
+export type MakeRouteMatchFromRoute<TRoute extends AnyRoute> = RouteMatch<TRoute['types']['id'], TRoute['types']['fullPath'], TRoute['types']['allParams'], TRoute['types']['fullSearchSchema'], TRoute['types']['loaderData'], TRoute['types']['allContext'], TRoute['types']['loaderDeps']>;
+export interface RouteMatch<out TRouteId, out TFullPath, out TAllParams, out TFullSearchSchema, out TLoaderData, out TAllContext, out TLoaderDeps> {
+    id: string;
+    routeId: TRouteId;
+    fullPath: TFullPath;
+    index: number;
+    pathname: string;
+    params: TAllParams;
+    _strictParams: TAllParams;
+    status: 'pending' | 'success' | 'error' | 'redirected' | 'notFound';
+    isFetching: false | 'beforeLoad' | 'loader';
+    error: unknown;
+    paramsError: unknown;
+    searchError: unknown;
+    updatedAt: number;
+    loadPromise?: ControlledPromise<void>;
+    beforeLoadPromise?: ControlledPromise<void>;
+    loaderPromise?: ControlledPromise<void>;
+    loaderData?: TLoaderData;
+    __routeContext: Record<string, unknown>;
+    __beforeLoadContext: Record<string, unknown>;
+    context: TAllContext;
+    search: TFullSearchSchema;
+    _strictSearch: TFullSearchSchema;
+    fetchCount: number;
+    abortController: AbortController;
+    cause: 'preload' | 'enter' | 'stay';
+    loaderDeps: TLoaderDeps;
+    preload: boolean;
+    invalid: boolean;
+    meta?: Array<Solid.JSX.IntrinsicElements['meta'] | undefined>;
+    links?: Array<Solid.JSX.IntrinsicElements['link'] | undefined>;
+    scripts?: Array<Solid.JSX.IntrinsicElements['script'] | undefined>;
+    headScripts?: Array<Solid.JSX.IntrinsicElements['script'] | undefined>;
+    headers?: Record<string, string>;
+    globalNotFound?: boolean;
+    staticData: StaticDataRouteOption;
+    minPendingPromise?: ControlledPromise<void>;
+    pendingTimeout?: ReturnType<typeof setTimeout>;
+}
+export type MakeRouteMatch<TRouteTree extends AnyRoute = RegisteredRouter['routeTree'], TRouteId = RouteIds<TRouteTree>, TStrict extends boolean = true> = RouteMatch<TRouteId, RouteById<TRouteTree, TRouteId>['types']['fullPath'], TStrict extends false ? AllParams<TRouteTree> : RouteById<TRouteTree, TRouteId>['types']['allParams'], TStrict extends false ? FullSearchSchema<TRouteTree> : RouteById<TRouteTree, TRouteId>['types']['fullSearchSchema'], TStrict extends false ? AllLoaderData<TRouteTree> : RouteById<TRouteTree, TRouteId>['types']['loaderData'], TStrict extends false ? AllContext<TRouteTree> : RouteById<TRouteTree, TRouteId>['types']['allContext'], RouteById<TRouteTree, TRouteId>['types']['loaderDeps']>;
+export type AnyRouteMatch = RouteMatch<any, any, any, any, any, any, any>;
+export declare function Matches(): Solid.JSX.Element;
+export interface MatchRouteOptions {
+    pending?: boolean;
+    caseSensitive?: boolean;
+    includeSearch?: boolean;
+    fuzzy?: boolean;
+}
+export type UseMatchRouteOptions<TRouter extends AnyRouter = RegisteredRouter, TFrom extends string = string, TTo extends string | undefined = undefined, TMaskFrom extends string = TFrom, TMaskTo extends string = ''> = ToSubOptionsProps<TRouter, TFrom, TTo> & DeepPartial<MakeOptionalSearchParams<TRouter, TFrom, TTo>> & DeepPartial<MakeOptionalPathParams<TRouter, TFrom, TTo>> & MaskOptions<TRouter, TMaskFrom, TMaskTo> & MatchRouteOptions;
+export declare function useMatchRoute<TRouter extends AnyRouter = RegisteredRouter>(): <const TFrom extends string = string, const TTo extends string | undefined = undefined, const TMaskFrom extends string = TFrom, const TMaskTo extends string = "">(opts: UseMatchRouteOptions<TRouter, TFrom, TTo, TMaskFrom, TMaskTo>) => Solid.Accessor<false | ResolveRoute<TRouter, TFrom, TTo>["types"]["allParams"]>;
+export type MakeMatchRouteOptions<TRouter extends AnyRouter = RegisteredRouter, TFrom extends string = string, TTo extends string | undefined = undefined, TMaskFrom extends string = TFrom, TMaskTo extends string = ''> = UseMatchRouteOptions<TRouter, TFrom, TTo, TMaskFrom, TMaskTo> & {
+    children?: ((params?: RouteByPath<TRouter['routeTree'], ResolveRelativePath<TFrom, NoInfer<TTo>>>['types']['allParams']) => Solid.JSX.Element) | Solid.JSX.Element;
+};
+export declare function MatchRoute<TRouter extends AnyRouter = RegisteredRouter, const TFrom extends string = string, const TTo extends string | undefined = undefined, const TMaskFrom extends string = TFrom, const TMaskTo extends string = ''>(props: MakeMatchRouteOptions<TRouter, TFrom, TTo, TMaskFrom, TMaskTo>): any;
+export type MakeRouteMatchUnion<TRouter extends AnyRouter = RegisteredRouter, TRoute extends AnyRoute = ParseRoute<TRouter['routeTree']>> = TRoute extends any ? RouteMatch<TRoute['id'], TRoute['fullPath'], TRoute['types']['allParams'], TRoute['types']['fullSearchSchema'], TRoute['types']['loaderData'], TRoute['types']['allContext'], TRoute['types']['loaderDeps']> : never;
+export interface UseMatchesBaseOptions<TRouter extends AnyRouter, TSelected> {
+    select?: (matches: Array<MakeRouteMatchUnion<TRouter>>) => TSelected;
+}
+export type UseMatchesResult<TRouter extends AnyRouter, TSelected> = unknown extends TSelected ? Array<MakeRouteMatchUnion<TRouter>> : TSelected;
+export declare function useMatches<TRouter extends AnyRouter = RegisteredRouter, TSelected = unknown>(opts?: UseMatchesBaseOptions<TRouter, TSelected>): Solid.Accessor<UseMatchesResult<TRouter, TSelected>>;
+export declare function useParentMatches<TRouter extends AnyRouter = RegisteredRouter, TSelected = unknown>(opts?: UseMatchesBaseOptions<TRouter, TSelected>): Solid.Accessor<UseMatchesResult<TRouter, TSelected>>;
+export declare function useChildMatches<TRouter extends AnyRouter = RegisteredRouter, TSelected = unknown>(opts?: UseMatchesBaseOptions<TRouter, TSelected>): Solid.Accessor<UseMatchesResult<TRouter, TSelected>>;