@tanstack/solid-router 1.114.23 → 1.114.25

package/dist/source/route.js

@@ -1,5 +1,4 @@
-import invariant from 'tiny-invariant';
-import { joinPaths, notFound, rootRouteId, trimPathLeft, } from '@tanstack/router-core';
+import { BaseRootRoute, BaseRoute, BaseRouteApi, notFound, } from '@tanstack/router-core';
 import { useLoaderData } from './useLoaderData';
 import { useLoaderDeps } from './useLoaderDeps';
 import { useParams } from './useParams';
@@ -10,11 +9,12 @@ import { useRouter } from './useRouter';
 export function getRouteApi(id) {
     return new RouteApi({ id });
 }
-export class RouteApi {
+export class RouteApi extends BaseRouteApi {
     /**
      * @deprecated Use the `getRouteApi` function instead.
      */
     constructor({ id }) {
+        super({ id });
         this.useMatch = (opts) => {
             return useMatch({
                 select: opts?.select,
@@ -52,111 +52,14 @@ export class RouteApi {
         this.notFound = (opts) => {
             return notFound({ routeId: this.id, ...opts });
         };
-        this.id = id;
     }
 }
-export class Route {
-    get to() {
-        /* invariant(
-          this._to,
-          `trying to access property 'to' on a route which is not initialized yet. Route properties are only available after 'createRouter' completed.`,
-        )*/
-        return this._to;
-    }
-    get id() {
-        /* invariant(
-          this._id,
-          `trying to access property 'id' on a route which is not initialized yet. Route properties are only available after 'createRouter' completed.`,
-        )*/
-        return this._id;
-    }
-    get path() {
-        /* invariant(
-          // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-          this.isRoot || this._id || this._path,
-          `trying to access property 'path' on a route which is not initialized yet. Route properties are only available after 'createRouter' completed.`,
-        )*/
-        return this._path;
-    }
-    get fullPath() {
-        /* invariant(
-          this._fullPath,
-          `trying to access property 'fullPath' on a route which is not initialized yet. Route properties are only available after 'createRouter' completed.`,
-        )*/
-        return this._fullPath;
-    }
-    get ssr() {
-        return this._ssr;
-    }
+export class Route extends BaseRoute {
     /**
      * @deprecated Use the `createRoute` function instead.
      */
     constructor(options) {
-        this.init = (opts) => {
-            this.originalIndex = opts.originalIndex;
-            const options = this.options;
-            const isRoot = !options?.path && !options?.id;
-            this.parentRoute = this.options.getParentRoute?.();
-            if (isRoot) {
-                this._path = rootRouteId;
-            }
-            else {
-                invariant(this.parentRoute, `Child Route instances must pass a 'getParentRoute: () => ParentRoute' option that returns a Route instance.`);
-            }
-            let path = isRoot ? rootRouteId : options.path;
-            // If the path is anything other than an index path, trim it up
-            if (path && path !== '/') {
-                path = trimPathLeft(path);
-            }
-            const customId = options?.id || path;
-            // Strip the parentId prefix from the first level of children
-            let id = isRoot
-                ? rootRouteId
-                : joinPaths([
-                    this.parentRoute.id === rootRouteId ? '' : this.parentRoute.id,
-                    customId,
-                ]);
-            if (path === rootRouteId) {
-                path = '/';
-            }
-            if (id !== rootRouteId) {
-                id = joinPaths(['/', id]);
-            }
-            const fullPath = id === rootRouteId ? '/' : joinPaths([this.parentRoute.fullPath, path]);
-            this._path = path;
-            this._id = id;
-            // this.customId = customId as TCustomId
-            this._fullPath = fullPath;
-            this._to = fullPath;
-            this._ssr = options?.ssr ?? opts.defaultSsr ?? true;
-        };
-        this.addChildren = (children) => {
-            return this._addFileChildren(children);
-        };
-        this._addFileChildren = (children) => {
-            if (Array.isArray(children)) {
-                this.children = children;
-            }
-            if (typeof children === 'object' && children !== null) {
-                this.children = Object.values(children);
-            }
-            return this;
-        };
-        this._addFileTypes = () => {
-            return this;
-        };
-        this.updateLoader = (options) => {
-            Object.assign(this.options, options);
-            return this;
-        };
-        this.update = (options) => {
-            Object.assign(this.options, options);
-            return this;
-        };
-        this.lazy = (lazyFn) => {
-            this.lazyFn = lazyFn;
-            return this;
-        };
+        super(options);
         this.useMatch = (opts) => {
             return useMatch({
                 select: opts?.select,
@@ -191,9 +94,6 @@ export class Route {
         this.useNavigate = () => {
             return useNavigate({ from: this.fullPath });
         };
-        this.options = options || {};
-        this.isRoot = !options?.getParentRoute;
-        invariant(!(options?.id && options?.path), `Route cannot have both an 'id' and a 'path' option.`);
     }
 }
 export function createRoute(options) {
@@ -208,17 +108,48 @@ export function createRootRouteWithContext() {
  * @deprecated Use the `createRootRouteWithContext` function instead.
  */
 export const rootRouteWithContext = createRootRouteWithContext;
-export class RootRoute extends Route {
+export class RootRoute extends BaseRootRoute {
     /**
      * @deprecated `RootRoute` is now an internal implementation detail. Use `createRootRoute()` instead.
      */
     constructor(options) {
         super(options);
+        this.useMatch = (opts) => {
+            return useMatch({
+                select: opts?.select,
+                from: this.id,
+            });
+        };
+        this.useRouteContext = (opts) => {
+            return useMatch({
+                ...opts,
+                from: this.id,
+                select: (d) => (opts?.select ? opts.select(d.context) : d.context),
+            });
+        };
+        this.useSearch = (opts) => {
+            return useSearch({
+                select: opts?.select,
+                from: this.id,
+            });
+        };
+        this.useParams = (opts) => {
+            return useParams({
+                select: opts?.select,
+                from: this.id,
+            });
+        };
+        this.useLoaderDeps = (opts) => {
+            return useLoaderDeps({ ...opts, from: this.id });
+        };
+        this.useLoaderData = (opts) => {
+            return useLoaderData({ ...opts, from: this.id });
+        };
+        this.useNavigate = () => {
+            return useNavigate({ from: this.fullPath });
+        };
     }
 }
-export function createRootRoute(options) {
-    return new RootRoute(options);
-}
 export function createRouteMask(opts) {
     return opts;
 }
@@ -230,4 +161,7 @@ export class NotFoundRoute extends Route {
         });
     }
 }
+export function createRootRoute(options) {
+    return new RootRoute(options);
+}
 //# sourceMappingURL=route.js.map

package/dist/source/route.js.map

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

package/dist/source/router.d.ts

@@ -1,64 +1,60 @@
-import { Store } from '@tanstack/solid-store';
-import type * as Solid from 'solid-js';
+import { RouterCore } from '@tanstack/router-core';
 import type { RouterHistory } from '@tanstack/history';
-import type { AnyRedirect, AnyRoute, AnyRouteMatch, AnyRouter, BuildLocationFn, BuildNextOptions, ClearCacheFn, CommitLocationFn, CommitLocationOptions, ControlledPromise, Router as CoreRouter, EmitFn, FullSearchSchema, GetMatchFn, GetMatchRoutesFn, InjectedHtmlEntry, InvalidateFn, LoadFn, MakeRouteMatch, Manifest, MatchRouteFn, MatchRoutesFn, NavigateFn, NotFoundError, ParseLocationFn, ParsedLocation, PickAsRequired, PreloadRouteFn, ResolvedRedirect, RouterConstructorOptions, RouterEvent, RouterListener, RouterOptions, RouterState, RoutesById, RoutesByPath, StartSerializer, StartTransitionFn, SubscribeFn, TrailingSlashOption, UpdateFn, UpdateMatchFn, ViewTransitionOptions } from '@tanstack/router-core';
+import type { AnyRoute, CreateRouterFn, RouterConstructorOptions, TrailingSlashOption } from '@tanstack/router-core';
 import type { ErrorRouteComponent, NotFoundRouteComponent, RouteComponent } from './route';
+import type { JSX } from 'solid-js';
 declare module '@tanstack/router-core' {
     interface RouterOptionsExtensions {
-        /**
-         * A component that will be used to wrap the entire router.
-         *
-         * This is useful for providing a context to the entire router.
-         *
-         * Only non-DOM-rendering components like providers should be used, anything else will cause a hydration error.
-         *
-         * @link [API Docs](https://tanstack.com/router/latest/docs/framework/react/api/router/RouterOptionsType#wrap-property)
-         */
-        Wrap?: (props: {
-            children: any;
-        }) => Solid.JSX.Element;
-        /**
-         * A component that will be used to wrap the inner contents of the router.
-         *
-         * This is useful for providing a context to the inner contents of the router where you also need access to the router context and hooks.
-         *
-         * Only non-DOM-rendering components like providers should be used, anything else will cause a hydration error.
-         *
-         * @link [API Docs](https://tanstack.com/router/latest/docs/framework/react/api/router/RouterOptionsType#innerwrap-property)
-         */
-        InnerWrap?: (props: {
-            children: any;
-        }) => Solid.JSX.Element;
         /**
          * The default `component` a route should use if no component is provided.
          *
          * @default Outlet
-         * @link [API Docs](https://tanstack.com/router/latest/docs/framework/react/api/router/RouterOptionsType#defaultcomponent-property)
+         * @link [API Docs](https://tanstack.com/router/latest/docs/framework/solid/api/router/RouterOptionsType#defaultcomponent-property)
          */
         defaultComponent?: RouteComponent;
         /**
          * The default `errorComponent` a route should use if no error component is provided.
          *
          * @default ErrorComponent
-         * @link [API Docs](https://tanstack.com/router/latest/docs/framework/react/api/router/RouterOptionsType#defaulterrorcomponent-property)
-         * @link [Guide](https://tanstack.com/router/latest/docs/framework/react/guide/data-loading#handling-errors-with-routeoptionserrorcomponent)
+         * @link [API Docs](https://tanstack.com/router/latest/docs/framework/solid/api/router/RouterOptionsType#defaulterrorcomponent-property)
+         * @link [Guide](https://tanstack.com/router/latest/docs/framework/solid/guide/data-loading#handling-errors-with-routeoptionserrorcomponent)
          */
         defaultErrorComponent?: ErrorRouteComponent;
         /**
          * The default `pendingComponent` a route should use if no pending component is provided.
          *
-         * @link [API Docs](https://tanstack.com/router/latest/docs/framework/react/api/router/RouterOptionsType#defaultpendingcomponent-property)
-         * @link [Guide](https://tanstack.com/router/latest/docs/framework/react/guide/data-loading#showing-a-pending-component)
+         * @link [API Docs](https://tanstack.com/router/latest/docs/framework/solid/api/router/RouterOptionsType#defaultpendingcomponent-property)
+         * @link [Guide](https://tanstack.com/router/latest/docs/framework/solid/guide/data-loading#showing-a-pending-component)
          */
         defaultPendingComponent?: RouteComponent;
         /**
          * The default `notFoundComponent` a route should use if no notFound component is provided.
          *
          * @default NotFound
-         * @link [API Docs](https://tanstack.com/router/latest/docs/framework/react/api/router/RouterOptionsType#defaultnotfoundcomponent-property)
-         * @link [Guide](https://tanstack.com/router/latest/docs/framework/react/guide/not-found-errors#default-router-wide-not-found-handling)
+         * @link [API Docs](https://tanstack.com/router/latest/docs/framework/solid/api/router/RouterOptionsType#defaultnotfoundcomponent-property)
+         * @link [Guide](https://tanstack.com/router/latest/docs/framework/solid/guide/not-found-errors#default-router-wide-not-found-handling)
          */
         defaultNotFoundComponent?: NotFoundRouteComponent;
+        /**
+         * A component that will be used to wrap the entire router.
+         *
+         * This is useful for providing a context to the entire router.
+         *
+         * @link [API Docs](https://tanstack.com/router/latest/docs/framework/solid/api/router/RouterOptionsType#wrap-property)
+         */
+        Wrap?: (props: {
+            children: any;
+        }) => JSX.Element;
+        /**
+         * A component that will be used to wrap the inner contents of the router.
+         *
+         * This is useful for providing a context to the inner contents of the router where you also need access to the router context and hooks.
+         *
+         * @link [API Docs](https://tanstack.com/router/latest/docs/framework/solid/api/router/RouterOptionsType#innerwrap-property)
+         */
+        InnerWrap?: (props: {
+            children: any;
+        }) => JSX.Element;
         /**
          * The default `onCatch` handler for errors caught by the Router ErrorBoundary
          *
@@ -68,109 +64,7 @@ declare module '@tanstack/router-core' {
         defaultOnCatch?: (error: Error) => void;
     }
 }
-export declare const componentTypes: readonly ["component", "errorComponent", "pendingComponent", "notFoundComponent"];
-export declare function createRouter<TRouteTree extends AnyRoute, TTrailingSlashOption extends TrailingSlashOption, TRouterHistory extends RouterHistory = RouterHistory, TDehydrated extends Record<string, any> = Record<string, any>>(options: undefined extends number ? 'strictNullChecks must be enabled in tsconfig.json' : RouterConstructorOptions<TRouteTree, TTrailingSlashOption, false, TRouterHistory, TDehydrated>): CoreRouter<TRouteTree, TTrailingSlashOption, false, TRouterHistory, TDehydrated>;
-export declare class Router<in out TRouteTree extends AnyRoute, in out TTrailingSlashOption extends TrailingSlashOption, in out TRouterHistory extends RouterHistory = RouterHistory, in out TDehydrated extends Record<string, any> = Record<string, any>> implements CoreRouter<TRouteTree, TTrailingSlashOption, false, TRouterHistory, TDehydrated> {
-    tempLocationKey: string | undefined;
-    resetNextScroll: boolean;
-    shouldViewTransition?: boolean | ViewTransitionOptions;
-    isViewTransitionTypesSupported?: boolean;
-    subscribers: Set<RouterListener<RouterEvent>>;
-    viewTransitionPromise?: ControlledPromise<true>;
-    isScrollRestoring: boolean;
-    isScrollRestorationSetup: boolean;
-    __store: Store<RouterState<TRouteTree>>;
-    options: PickAsRequired<RouterOptions<TRouteTree, TTrailingSlashOption, false, TRouterHistory, TDehydrated>, 'stringifySearch' | 'parseSearch' | 'context'>;
-    history: TRouterHistory;
-    latestLocation: ParsedLocation<FullSearchSchema<TRouteTree>>;
-    basepath: string;
-    routeTree: TRouteTree;
-    routesById: RoutesById<TRouteTree>;
-    routesByPath: RoutesByPath<TRouteTree>;
-    flatRoutes: Array<AnyRoute>;
-    isServer: boolean;
-    pathParamsDecodeCharMap?: Map<string, string>;
-    /**
-     * @deprecated Use the `createRouter` function instead
-     */
-    constructor(options: RouterConstructorOptions<TRouteTree, TTrailingSlashOption, false, TRouterHistory, TDehydrated>);
-    startTransition: StartTransitionFn;
-    update: UpdateFn<TRouteTree, TTrailingSlashOption, false, TRouterHistory, TDehydrated>;
-    get state(): RouterState<TRouteTree, import("@tanstack/router-core").RouteMatch<any, any, any, any, any, any, any>>;
-    buildRouteTree: () => void;
-    subscribe: SubscribeFn;
-    emit: EmitFn;
-    parseLocation: ParseLocationFn<TRouteTree>;
-    resolvePathWithBase: (from: string, path: string) => string;
-    get looseRoutesById(): Record<string, AnyRoute>;
-    /**
-    @deprecated use the following signature instead
-    ```ts
-    matchRoutes (
-      next: ParsedLocation,
-      opts?: { preload?: boolean; throwOnError?: boolean },
-    ): Array<AnyRouteMatch>;
-    ```
-  */
-    matchRoutes: MatchRoutesFn;
-    private matchRoutesInternal;
-    getMatchedRoutes: GetMatchRoutesFn;
-    cancelMatch: (id: string) => void;
-    cancelMatches: () => void;
-    buildLocation: BuildLocationFn;
-    commitLocationPromise: undefined | ControlledPromise<void>;
-    commitLocation: CommitLocationFn;
-    buildAndCommitLocation: ({ replace, resetScroll, hashScrollIntoView, viewTransition, ignoreBlocker, href, ...rest }?: BuildNextOptions & CommitLocationOptions) => Promise<void>;
-    navigate: NavigateFn;
-    latestLoadPromise: undefined | Promise<void>;
-    load: LoadFn;
-    startViewTransition: (fn: () => Promise<void>) => void;
-    updateMatch: UpdateMatchFn;
-    getMatch: GetMatchFn;
-    loadMatches: ({ location, matches, preload: allPreload, onReady, updateMatch, sync, }: {
-        location: ParsedLocation;
-        matches: Array<AnyRouteMatch>;
-        preload?: boolean;
-        onReady?: () => Promise<void>;
-        updateMatch?: (id: string, updater: (match: AnyRouteMatch) => AnyRouteMatch) => void;
-        getMatch?: (matchId: string) => AnyRouteMatch | undefined;
-        sync?: boolean;
-    }) => Promise<Array<MakeRouteMatch>>;
-    invalidate: InvalidateFn<this>;
-    resolveRedirect: (err: AnyRedirect) => ResolvedRedirect;
-    clearCache: ClearCacheFn<this>;
-    clearExpiredCache: () => void;
-    loadRouteChunk: (route: AnyRoute) => Promise<void[]>;
-    preloadRoute: PreloadRouteFn<TRouteTree, TTrailingSlashOption, false, TRouterHistory>;
-    matchRoute: MatchRouteFn<TRouteTree, TTrailingSlashOption, false, TRouterHistory>;
-    ssr?: {
-        manifest: Manifest | undefined;
-        serializer: StartSerializer;
-    };
-    serverSsr?: {
-        injectedHtml: Array<InjectedHtmlEntry>;
-        injectHtml: (getHtml: () => string | Promise<string>) => Promise<void>;
-        injectScript: (getScript: () => string | Promise<string>, opts?: {
-            logScript?: boolean;
-        }) => Promise<void>;
-        streamValue: (key: string, value: any) => void;
-        streamedKeys: Set<string>;
-        onMatchSettled: (opts: {
-            router: AnyRouter;
-            match: AnyRouteMatch;
-        }) => any;
-    };
-    clientSsr?: {
-        getStreamedValue: <T>(key: string) => T | undefined;
-    };
-    _handleNotFound: (matches: Array<AnyRouteMatch>, err: NotFoundError, { updateMatch, }?: {
-        updateMatch?: (id: string, updater: (match: AnyRouteMatch) => AnyRouteMatch) => void;
-    }) => void;
-    hasNotFoundMatch: () => boolean;
-}
-export declare function lazyFn<T extends Record<string, (...args: Array<any>) => any>, TKey extends keyof T = 'default'>(fn: () => Promise<T>, key?: TKey): (...args: Parameters<T[TKey]>) => Promise<Awaited<ReturnType<T[TKey]>>>;
-export declare class SearchParamError extends Error {
-}
-export declare class PathParamError extends Error {
+export declare const createRouter: CreateRouterFn;
+export declare class Router<in out TRouteTree extends AnyRoute, in out TTrailingSlashOption extends TrailingSlashOption = 'never', in out TDefaultStructuralSharingOption extends boolean = false, in out TRouterHistory extends RouterHistory = RouterHistory, in out TDehydrated extends Record<string, any> = Record<string, any>> extends RouterCore<TRouteTree, TTrailingSlashOption, TDefaultStructuralSharingOption, TRouterHistory, TDehydrated> {
+    constructor(options: RouterConstructorOptions<TRouteTree, TTrailingSlashOption, TDefaultStructuralSharingOption, TRouterHistory, TDehydrated>);
 }
-export declare function getInitialRouterState(location: ParsedLocation): RouterState<any>;