@tanstack/solid-router 2.0.0-alpha.1 → 2.0.0-alpha.3

package/dist/cjs/Match.cjs

@@ -1,449 +1,374 @@
-"use strict";
-Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const Solid$1 = require("@solidjs/web");
-const Solid = require("solid-js");
-const invariant = require("tiny-invariant");
-const warning = require("tiny-warning");
-const routerCore = require("@tanstack/router-core");
-const isServer = require("@tanstack/router-core/isServer");
-const CatchBoundary = require("./CatchBoundary.cjs");
-const useRouterState = require("./useRouterState.cjs");
-const useRouter = require("./useRouter.cjs");
-const notFound = require("./not-found.cjs");
-const matchContext = require("./matchContext.cjs");
-const SafeFragment = require("./SafeFragment.cjs");
-const renderRouteNotFound = require("./renderRouteNotFound.cjs");
-const scrollRestoration = require("./scroll-restoration.cjs");
-function _interopNamespaceDefault(e) {
-  const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });
-  if (e) {
-    for (const k in e) {
-      if (k !== "default") {
-        const d = Object.getOwnPropertyDescriptor(e, k);
-        Object.defineProperty(n, k, d.get ? d : {
-          enumerable: true,
-          get: () => e[k]
-        });
-      }
-    }
-  }
-  n.default = e;
-  return Object.freeze(n);
-}
-const Solid__namespace = /* @__PURE__ */ _interopNamespaceDefault(Solid);
-const MatchContext = matchContext.matchContext;
-const Match = (props) => {
-  const router = useRouter.useRouter();
-  const matchState = useRouterState.useRouterState({
-    select: (s) => {
-      const match = s.matches.find((d) => d.id === props.matchId);
-      if (!match) {
-        return null;
-      }
-      return {
-        routeId: match.routeId,
-        ssr: match.ssr,
-        _displayPending: match._displayPending
-      };
-    }
-  });
-  if (!Solid__namespace.untrack(matchState)) return null;
-  const route = () => router.routesById[matchState().routeId];
-  const resolvePendingComponent = () => 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 resolvedNoSsr = Solid__namespace.createMemo(() => matchState().ssr === false || matchState().ssr === "data-only");
-  const ResolvedSuspenseBoundary = () => resolvedNoSsr() ? SafeFragment.SafeFragment : Solid__namespace.Loading;
-  const ResolvedCatchBoundary = () => routeErrorComponent() ? CatchBoundary.CatchBoundary : SafeFragment.SafeFragment;
-  const ResolvedNotFoundBoundary = () => routeNotFoundComponent() ? notFound.CatchNotFound : SafeFragment.SafeFragment;
-  const resetKey = useRouterState.useRouterState({
-    select: (s) => s.loadedAt
-  });
-  const parentRouteId = useRouterState.useRouterState({
-    select: (s) => {
-      const index = s.matches.findIndex((d) => d.id === props.matchId);
-      return s.matches[index - 1]?.routeId;
-    }
-  });
-  const ShellComponent = Solid__namespace.createMemo(() => route().isRoot ? route().options.shellComponent ?? SafeFragment.SafeFragment : SafeFragment.SafeFragment);
-  return Solid$1.createComponent(Solid$1.Dynamic, {
-    get component() {
-      return ShellComponent();
-    },
-    get children() {
-      return [Solid$1.createComponent(MatchContext, {
-        value: () => props.matchId,
-        get children() {
-          return Solid$1.createComponent(Solid$1.Dynamic, {
-            get component() {
-              return ResolvedSuspenseBoundary();
-            },
-            get fallback() {
-              return (
-                // Don't show fallback on server when using no-ssr mode to avoid hydration mismatch
-                Solid$1.memo(() => !!((isServer.isServer ?? router.isServer) || resolvedNoSsr()))() ? void 0 : Solid$1.createComponent(Solid$1.Dynamic, {
-                  get component() {
-                    return resolvePendingComponent();
-                  }
-                })
-              );
-            },
-            get children() {
-              return Solid$1.createComponent(Solid$1.Dynamic, {
-                get component() {
-                  return ResolvedCatchBoundary();
-                },
-                getResetKey: () => resetKey(),
-                get errorComponent() {
-                  return routeErrorComponent() || CatchBoundary.ErrorComponent;
-                },
-                onCatch: (error) => {
-                  if (routerCore.isNotFound(error)) throw error;
-                  warning(false, `Error in route match: ${Solid__namespace.untrack(matchState).routeId}`);
-                  routeOnCatch()?.(error);
-                },
-                get children() {
-                  return Solid$1.createComponent(Solid$1.Dynamic, {
-                    get component() {
-                      return ResolvedNotFoundBoundary();
-                    },
-                    fallback: (error) => {
-                      if (!routeNotFoundComponent() || error.routeId && error.routeId !== matchState().routeId || !error.routeId && !route().isRoot) throw error;
-                      return Solid$1.createComponent(Solid$1.Dynamic, Solid$1.mergeProps({
-                        get component() {
-                          return routeNotFoundComponent();
-                        }
-                      }, error));
-                    },
-                    get children() {
-                      return Solid$1.createComponent(Solid__namespace.Switch, {
-                        get children() {
-                          return [Solid$1.createComponent(Solid__namespace.Match, {
-                            get when() {
-                              return resolvedNoSsr();
-                            },
-                            get children() {
-                              return Solid$1.createComponent(Solid__namespace.Show, {
-                                get when() {
-                                  return !(isServer.isServer ?? router.isServer);
-                                },
-                                get fallback() {
-                                  return Solid$1.createComponent(Solid$1.Dynamic, {
-                                    get component() {
-                                      return resolvePendingComponent();
-                                    }
-                                  });
-                                },
-                                get children() {
-                                  return Solid$1.createComponent(MatchInner, {
-                                    get matchId() {
-                                      return props.matchId;
-                                    }
-                                  });
-                                }
-                              });
-                            }
-                          }), Solid$1.createComponent(Solid__namespace.Match, {
-                            get when() {
-                              return !resolvedNoSsr();
-                            },
-                            get children() {
-                              return Solid$1.createComponent(MatchInner, {
-                                get matchId() {
-                                  return props.matchId;
-                                }
-                              });
-                            }
-                          })];
-                        }
-                      });
-                    }
-                  });
-                }
-              });
-            }
-          });
-        }
-      }), Solid$1.memo(() => Solid$1.memo(() => parentRouteId() === routerCore.rootRouteId)() ? [Solid$1.createComponent(OnRendered, {}), Solid$1.createComponent(scrollRestoration.ScrollRestoration, {})] : null)];
-    }
-  });
+const require_runtime = require("./_virtual/_rolldown/runtime.cjs");
+const require_CatchBoundary = require("./CatchBoundary.cjs");
+const require_useRouter = require("./useRouter.cjs");
+const require_useRouterState = require("./useRouterState.cjs");
+const require_matchContext = require("./matchContext.cjs");
+const require_SafeFragment = require("./SafeFragment.cjs");
+const require_not_found = require("./not-found.cjs");
+const require_renderRouteNotFound = require("./renderRouteNotFound.cjs");
+const require_scroll_restoration = require("./scroll-restoration.cjs");
+let _tanstack_router_core = require("@tanstack/router-core");
+let _solidjs_web = require("@solidjs/web");
+let solid_js = require("solid-js");
+solid_js = require_runtime.__toESM(solid_js);
+let tiny_warning = require("tiny-warning");
+tiny_warning = require_runtime.__toESM(tiny_warning);
+let _tanstack_router_core_isServer = require("@tanstack/router-core/isServer");
+let tiny_invariant = require("tiny-invariant");
+tiny_invariant = require_runtime.__toESM(tiny_invariant);
+//#region src/Match.tsx
+var MatchContext = require_matchContext.matchContext;
+var Match = (props) => {
+	const router = require_useRouter.useRouter();
+	const matchState = require_useRouterState.useRouterState({ select: (s) => {
+		const match = s.matches.find((d) => d.id === props.matchId);
+		if (!match) return null;
+		return {
+			routeId: match.routeId,
+			ssr: match.ssr,
+			_displayPending: match._displayPending
+		};
+	} });
+	if (!solid_js.untrack(matchState)) return null;
+	const route = () => router.routesById[matchState().routeId];
+	const resolvePendingComponent = () => 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 ? route().options.notFoundComponent ?? router.options.notFoundRoute?.options.component : route().options.notFoundComponent;
+	const resolvedNoSsr = solid_js.createMemo(() => matchState().ssr === false || matchState().ssr === "data-only");
+	const ResolvedSuspenseBoundary = () => resolvedNoSsr() ? require_SafeFragment.SafeFragment : solid_js.Loading;
+	const ResolvedCatchBoundary = () => routeErrorComponent() ? require_CatchBoundary.CatchBoundary : require_SafeFragment.SafeFragment;
+	const ResolvedNotFoundBoundary = () => routeNotFoundComponent() ? require_not_found.CatchNotFound : require_SafeFragment.SafeFragment;
+	const resetKey = require_useRouterState.useRouterState({ select: (s) => s.loadedAt });
+	const parentRouteId = require_useRouterState.useRouterState({ select: (s) => {
+		const index = s.matches.findIndex((d) => d.id === props.matchId);
+		return s.matches[index - 1]?.routeId;
+	} });
+	const ShellComponent = solid_js.createMemo(() => route().isRoot ? route().options.shellComponent ?? require_SafeFragment.SafeFragment : require_SafeFragment.SafeFragment);
+	return (0, _solidjs_web.createComponent)(_solidjs_web.Dynamic, {
+		get component() {
+			return ShellComponent();
+		},
+		get children() {
+			return [(0, _solidjs_web.createComponent)(MatchContext, {
+				value: () => props.matchId,
+				get children() {
+					return (0, _solidjs_web.createComponent)(_solidjs_web.Dynamic, {
+						get component() {
+							return ResolvedSuspenseBoundary();
+						},
+						get fallback() {
+							return (0, _solidjs_web.memo)(() => !!((_tanstack_router_core_isServer.isServer ?? router.isServer) || resolvedNoSsr()))() ? void 0 : (0, _solidjs_web.createComponent)(_solidjs_web.Dynamic, { get component() {
+								return resolvePendingComponent();
+							} });
+						},
+						get children() {
+							return (0, _solidjs_web.createComponent)(_solidjs_web.Dynamic, {
+								get component() {
+									return ResolvedCatchBoundary();
+								},
+								getResetKey: () => resetKey(),
+								get errorComponent() {
+									return routeErrorComponent() || require_CatchBoundary.ErrorComponent;
+								},
+								onCatch: (error) => {
+									if ((0, _tanstack_router_core.isNotFound)(error)) throw error;
+									(0, tiny_warning.default)(false, `Error in route match: ${solid_js.untrack(matchState).routeId}`);
+									routeOnCatch()?.(error);
+								},
+								get children() {
+									return (0, _solidjs_web.createComponent)(_solidjs_web.Dynamic, {
+										get component() {
+											return ResolvedNotFoundBoundary();
+										},
+										fallback: (error) => {
+											if (!routeNotFoundComponent() || error.routeId && error.routeId !== matchState().routeId || !error.routeId && !route().isRoot) throw error;
+											return (0, _solidjs_web.createComponent)(_solidjs_web.Dynamic, (0, _solidjs_web.mergeProps)({ get component() {
+												return routeNotFoundComponent();
+											} }, error));
+										},
+										get children() {
+											return (0, _solidjs_web.createComponent)(solid_js.Switch, { get children() {
+												return [(0, _solidjs_web.createComponent)(solid_js.Match, {
+													get when() {
+														return resolvedNoSsr();
+													},
+													get children() {
+														return (0, _solidjs_web.createComponent)(solid_js.Show, {
+															get when() {
+																return !(_tanstack_router_core_isServer.isServer ?? router.isServer);
+															},
+															get fallback() {
+																return (0, _solidjs_web.createComponent)(_solidjs_web.Dynamic, { get component() {
+																	return resolvePendingComponent();
+																} });
+															},
+															get children() {
+																return (0, _solidjs_web.createComponent)(MatchInner, { get matchId() {
+																	return props.matchId;
+																} });
+															}
+														});
+													}
+												}), (0, _solidjs_web.createComponent)(solid_js.Match, {
+													get when() {
+														return !resolvedNoSsr();
+													},
+													get children() {
+														return (0, _solidjs_web.createComponent)(MatchInner, { get matchId() {
+															return props.matchId;
+														} });
+													}
+												})];
+											} });
+										}
+									});
+								}
+							});
+						}
+					});
+				}
+			}), (0, _solidjs_web.memo)(() => (0, _solidjs_web.memo)(() => parentRouteId() === _tanstack_router_core.rootRouteId)() ? [(0, _solidjs_web.createComponent)(OnRendered, {}), (0, _solidjs_web.createComponent)(require_scroll_restoration.ScrollRestoration, {})] : null)];
+		}
+	});
 };
-const lastOnRenderedKey = /* @__PURE__ */ new WeakMap();
+var lastOnRenderedKey = /* @__PURE__ */ new WeakMap();
 function OnRendered() {
-  const router = useRouter.useRouter();
-  const location = useRouterState.useRouterState({
-    select: (s) => {
-      return s.resolvedLocation?.state.__TSR_key;
-    }
-  });
-  Solid__namespace.createEffect(() => [location()], ([location2]) => {
-    if (!location2) return;
-    if (lastOnRenderedKey.get(router) === location2) return;
-    lastOnRenderedKey.set(router, location2);
-    router.emit({
-      type: "onRendered",
-      ...routerCore.getLocationChangeInfo(router.state)
-    });
-  });
-  return null;
+	const router = require_useRouter.useRouter();
+	const location = require_useRouterState.useRouterState({ select: (s) => {
+		return s.resolvedLocation?.state.__TSR_key;
+	} });
+	solid_js.createEffect(() => [location()], ([location]) => {
+		if (!location) return;
+		if (lastOnRenderedKey.get(router) === location) return;
+		lastOnRenderedKey.set(router, location);
+		router.emit({
+			type: "onRendered",
+			...(0, _tanstack_router_core.getLocationChangeInfo)(router.state)
+		});
+	});
+	return null;
 }
-const MatchInner = (props) => {
-  const router = useRouter.useRouter();
-  const matchState = useRouterState.useRouterState({
-    select: (s) => {
-      const match2 = s.matches.find((d) => d.id === props.matchId);
-      if (!match2) {
-        return null;
-      }
-      const routeId = match2.routeId;
-      const remountFn = router.routesById[routeId].options.remountDeps ?? router.options.defaultRemountDeps;
-      const remountDeps = remountFn?.({
-        routeId,
-        loaderDeps: match2.loaderDeps,
-        params: match2._strictParams,
-        search: match2._strictSearch
-      });
-      const key = remountDeps ? JSON.stringify(remountDeps) : void 0;
-      return {
-        key,
-        routeId,
-        match: {
-          id: match2.id,
-          status: match2.status,
-          error: match2.error,
-          _forcePending: match2._forcePending,
-          _displayPending: match2._displayPending
-        }
-      };
-    }
-  });
-  if (!Solid__namespace.untrack(matchState)) return null;
-  const route = () => router.routesById[matchState().routeId];
-  const match = () => matchState().match;
-  const componentKey = () => matchState().key ?? matchState().match.id;
-  const out = () => {
-    const currentRoute = Solid__namespace.untrack(route);
-    const Comp = currentRoute.options.component ?? router.options.defaultComponent;
-    if (Comp) {
-      return Solid$1.createComponent(Comp, {});
-    }
-    return Solid$1.createComponent(Outlet, {});
-  };
-  const keyedOut = () => Solid$1.createComponent(Solid__namespace.Show, {
-    get when() {
-      return componentKey();
-    },
-    keyed: true,
-    children: (_key) => out()
-  });
-  return Solid$1.createComponent(Solid__namespace.Switch, {
-    get children() {
-      return [Solid$1.createComponent(Solid__namespace.Match, {
-        get when() {
-          return match()._displayPending;
-        },
-        children: (_) => {
-          const matchId = Solid__namespace.untrack(() => match().id);
-          const displayPendingResult = Solid__namespace.createMemo(() => router.getMatch(matchId)?._nonReactive.displayPendingPromise);
-          return Solid$1.memo(displayPendingResult);
-        }
-      }), Solid$1.createComponent(Solid__namespace.Match, {
-        get when() {
-          return match()._forcePending;
-        },
-        children: (_) => {
-          const matchId = Solid__namespace.untrack(() => match().id);
-          const minPendingResult = Solid__namespace.createMemo(() => router.getMatch(matchId)?._nonReactive.minPendingPromise);
-          return Solid$1.memo(minPendingResult);
-        }
-      }), Solid$1.createComponent(Solid__namespace.Match, {
-        get when() {
-          return match().status === "pending";
-        },
-        children: (_) => {
-          const currentMatch = Solid__namespace.untrack(match);
-          const currentRoute = Solid__namespace.untrack(route);
-          const pendingMinMs = currentRoute.options.pendingMinMs ?? router.options.defaultPendingMinMs;
-          if (pendingMinMs) {
-            const routerMatch = router.getMatch(currentMatch.id);
-            if (routerMatch && !routerMatch._nonReactive.minPendingPromise) {
-              if (!(isServer.isServer ?? router.isServer)) {
-                const minPendingPromise = routerCore.createControlledPromise();
-                routerMatch._nonReactive.minPendingPromise = minPendingPromise;
-                setTimeout(() => {
-                  minPendingPromise.resolve();
-                  routerMatch._nonReactive.minPendingPromise = void 0;
-                }, pendingMinMs);
-              }
-            }
-          }
-          const loaderResult = Solid__namespace.createMemo(async () => {
-            await new Promise((r) => setTimeout(r, 0));
-            return router.getMatch(currentMatch.id)?._nonReactive.loadPromise;
-          });
-          const FallbackComponent = currentRoute.options.pendingComponent ?? router.options.defaultPendingComponent;
-          return [FallbackComponent && pendingMinMs > 0 ? Solid$1.createComponent(Solid$1.Dynamic, {
-            component: FallbackComponent
-          }) : null, Solid$1.memo(loaderResult)];
-        }
-      }), Solid$1.createComponent(Solid__namespace.Match, {
-        get when() {
-          return match().status === "notFound";
-        },
-        children: (_) => {
-          const currentMatch = Solid__namespace.untrack(match);
-          const currentRoute = Solid__namespace.untrack(route);
-          const currentRouteId = Solid__namespace.untrack(() => matchState().routeId);
-          invariant(routerCore.isNotFound(currentMatch.error), "Expected a notFound error");
-          return Solid$1.createComponent(Solid__namespace.Show, {
-            when: currentRouteId,
-            keyed: true,
-            children: (_routeId) => renderRouteNotFound.renderRouteNotFound(router, currentRoute, currentMatch.error)
-          });
-        }
-      }), Solid$1.createComponent(Solid__namespace.Match, {
-        get when() {
-          return match().status === "redirected";
-        },
-        children: (_) => {
-          const matchId = Solid__namespace.untrack(() => match().id);
-          invariant(routerCore.isRedirect(Solid__namespace.untrack(match).error), "Expected a redirect error");
-          const loaderResult = Solid__namespace.createMemo(async () => {
-            await new Promise((r) => setTimeout(r, 0));
-            return router.getMatch(matchId)?._nonReactive.loadPromise;
-          });
-          return Solid$1.memo(loaderResult);
-        }
-      }), Solid$1.createComponent(Solid__namespace.Match, {
-        get when() {
-          return match().status === "error";
-        },
-        children: (_) => {
-          if (isServer.isServer ?? router.isServer) {
-            const currentMatch = Solid__namespace.untrack(match);
-            const RouteErrorComponent = (Solid__namespace.untrack(route).options.errorComponent ?? router.options.defaultErrorComponent) || CatchBoundary.ErrorComponent;
-            return Solid$1.createComponent(RouteErrorComponent, {
-              get error() {
-                return currentMatch.error;
-              },
-              info: {
-                componentStack: ""
-              }
-            });
-          }
-          throw Solid__namespace.untrack(match).error;
-        }
-      }), Solid$1.createComponent(Solid__namespace.Match, {
-        get when() {
-          return match().status === "success";
-        },
-        get children() {
-          return keyedOut();
-        }
-      })];
-    }
-  });
+var MatchInner = (props) => {
+	const router = require_useRouter.useRouter();
+	const matchState = require_useRouterState.useRouterState({ select: (s) => {
+		const match = s.matches.find((d) => d.id === props.matchId);
+		if (!match) return null;
+		const routeId = match.routeId;
+		const remountDeps = (router.routesById[routeId].options.remountDeps ?? router.options.defaultRemountDeps)?.({
+			routeId,
+			loaderDeps: match.loaderDeps,
+			params: match._strictParams,
+			search: match._strictSearch
+		});
+		return {
+			key: remountDeps ? JSON.stringify(remountDeps) : void 0,
+			routeId,
+			match: {
+				id: match.id,
+				status: match.status,
+				error: match.error,
+				_forcePending: match._forcePending,
+				_displayPending: match._displayPending
+			}
+		};
+	} });
+	if (!solid_js.untrack(matchState)) return null;
+	const route = () => router.routesById[matchState().routeId];
+	const match = () => matchState().match;
+	const componentKey = () => matchState().key ?? matchState().match.id;
+	const out = () => {
+		const Comp = solid_js.untrack(route).options.component ?? router.options.defaultComponent;
+		if (Comp) return (0, _solidjs_web.createComponent)(Comp, {});
+		return (0, _solidjs_web.createComponent)(Outlet, {});
+	};
+	const keyedOut = () => (0, _solidjs_web.createComponent)(solid_js.Show, {
+		get when() {
+			return componentKey();
+		},
+		keyed: true,
+		children: (_key) => out()
+	});
+	return (0, _solidjs_web.createComponent)(solid_js.Switch, { get children() {
+		return [
+			(0, _solidjs_web.createComponent)(solid_js.Match, {
+				get when() {
+					return match()._displayPending;
+				},
+				children: (_) => {
+					const matchId = solid_js.untrack(() => match().id);
+					return (0, _solidjs_web.memo)(solid_js.createMemo(() => router.getMatch(matchId)?._nonReactive.displayPendingPromise));
+				}
+			}),
+			(0, _solidjs_web.createComponent)(solid_js.Match, {
+				get when() {
+					return match()._forcePending;
+				},
+				children: (_) => {
+					const matchId = solid_js.untrack(() => match().id);
+					return (0, _solidjs_web.memo)(solid_js.createMemo(() => router.getMatch(matchId)?._nonReactive.minPendingPromise));
+				}
+			}),
+			(0, _solidjs_web.createComponent)(solid_js.Match, {
+				get when() {
+					return match().status === "pending";
+				},
+				children: (_) => {
+					const currentMatch = solid_js.untrack(match);
+					const currentRoute = solid_js.untrack(route);
+					const pendingMinMs = currentRoute.options.pendingMinMs ?? router.options.defaultPendingMinMs;
+					if (pendingMinMs) {
+						const routerMatch = router.getMatch(currentMatch.id);
+						if (routerMatch && !routerMatch._nonReactive.minPendingPromise) {
+							if (!(_tanstack_router_core_isServer.isServer ?? router.isServer)) {
+								const minPendingPromise = (0, _tanstack_router_core.createControlledPromise)();
+								routerMatch._nonReactive.minPendingPromise = minPendingPromise;
+								setTimeout(() => {
+									minPendingPromise.resolve();
+									routerMatch._nonReactive.minPendingPromise = void 0;
+								}, pendingMinMs);
+							}
+						}
+					}
+					const loaderResult = solid_js.createMemo(async () => {
+						await new Promise((r) => setTimeout(r, 0));
+						return router.getMatch(currentMatch.id)?._nonReactive.loadPromise;
+					});
+					const FallbackComponent = currentRoute.options.pendingComponent ?? router.options.defaultPendingComponent;
+					return [FallbackComponent && pendingMinMs > 0 ? (0, _solidjs_web.createComponent)(_solidjs_web.Dynamic, { component: FallbackComponent }) : null, (0, _solidjs_web.memo)(loaderResult)];
+				}
+			}),
+			(0, _solidjs_web.createComponent)(solid_js.Match, {
+				get when() {
+					return match().status === "notFound";
+				},
+				children: (_) => {
+					const currentMatch = solid_js.untrack(match);
+					const currentRoute = solid_js.untrack(route);
+					const currentRouteId = solid_js.untrack(() => matchState().routeId);
+					(0, tiny_invariant.default)((0, _tanstack_router_core.isNotFound)(currentMatch.error), "Expected a notFound error");
+					return (0, _solidjs_web.createComponent)(solid_js.Show, {
+						when: currentRouteId,
+						keyed: true,
+						children: (_routeId) => require_renderRouteNotFound.renderRouteNotFound(router, currentRoute, currentMatch.error)
+					});
+				}
+			}),
+			(0, _solidjs_web.createComponent)(solid_js.Match, {
+				get when() {
+					return match().status === "redirected";
+				},
+				children: (_) => {
+					const matchId = solid_js.untrack(() => match().id);
+					(0, tiny_invariant.default)((0, _tanstack_router_core.isRedirect)(solid_js.untrack(match).error), "Expected a redirect error");
+					return (0, _solidjs_web.memo)(solid_js.createMemo(async () => {
+						await new Promise((r) => setTimeout(r, 0));
+						return router.getMatch(matchId)?._nonReactive.loadPromise;
+					}));
+				}
+			}),
+			(0, _solidjs_web.createComponent)(solid_js.Match, {
+				get when() {
+					return match().status === "error";
+				},
+				children: (_) => {
+					if (_tanstack_router_core_isServer.isServer ?? router.isServer) {
+						const currentMatch = solid_js.untrack(match);
+						return (0, _solidjs_web.createComponent)((solid_js.untrack(route).options.errorComponent ?? router.options.defaultErrorComponent) || require_CatchBoundary.ErrorComponent, {
+							get error() {
+								return currentMatch.error;
+							},
+							info: { componentStack: "" }
+						});
+					}
+					throw solid_js.untrack(match).error;
+				}
+			}),
+			(0, _solidjs_web.createComponent)(solid_js.Match, {
+				get when() {
+					return match().status === "success";
+				},
+				get children() {
+					return keyedOut();
+				}
+			})
+		];
+	} });
 };
-const Outlet = () => {
-  const router = useRouter.useRouter();
-  const matchId = Solid__namespace.useContext(matchContext.matchContext);
-  const routeId = useRouterState.useRouterState({
-    select: (s) => s.matches.find((d) => d.id === matchId())?.routeId
-  });
-  const route = () => router.routesById[routeId()];
-  const parentGlobalNotFound = useRouterState.useRouterState({
-    select: (s) => {
-      const matches = s.matches;
-      const parentMatch = matches.find((d) => d.id === matchId());
-      if (!parentMatch) {
-        return false;
-      }
-      return parentMatch.globalNotFound;
-    }
-  });
-  const childMatchId = useRouterState.useRouterState({
-    select: (s) => {
-      const matches = s.matches;
-      const index = matches.findIndex((d) => d.id === matchId());
-      const v = matches[index + 1]?.id;
-      return v;
-    }
-  });
-  const childRouteId = useRouterState.useRouterState({
-    select: (s) => {
-      const matches = s.matches;
-      const index = matches.findIndex((d) => d.id === matchId());
-      return matches[index + 1]?.routeId;
-    }
-  });
-  const childMatchStatus = useRouterState.useRouterState({
-    select: (s) => {
-      const matches = s.matches;
-      const index = matches.findIndex((d) => d.id === matchId());
-      return matches[index + 1]?.status;
-    }
-  });
-  const shouldShowNotFound = () => childMatchStatus() !== "redirected" && parentGlobalNotFound();
-  return Solid$1.createComponent(Solid__namespace.Show, {
-    get when() {
-      return Solid$1.memo(() => !!!shouldShowNotFound())() && childMatchId();
-    },
-    get fallback() {
-      return Solid$1.createComponent(Solid__namespace.Show, {
-        get when() {
-          return shouldShowNotFound();
-        },
-        get children() {
-          return renderRouteNotFound.renderRouteNotFound(router, route(), void 0);
-        }
-      });
-    },
-    children: (matchIdAccessor) => {
-      const currentMatchId = Solid__namespace.createMemo(() => matchIdAccessor());
-      return Solid$1.createComponent(Solid__namespace.Show, {
-        get when() {
-          return routeId() === routerCore.rootRouteId;
-        },
-        get fallback() {
-          return Solid$1.createComponent(Match, {
-            get matchId() {
-              return currentMatchId();
-            }
-          });
-        },
-        get children() {
-          return Solid$1.createComponent(Solid__namespace.Show, {
-            get when() {
-              return childRouteId();
-            },
-            keyed: true,
-            children: (_routeId) => Solid$1.createComponent(Solid__namespace.Loading, {
-              get fallback() {
-                return Solid$1.createComponent(Solid$1.Dynamic, {
-                  get component() {
-                    return router.options.defaultPendingComponent;
-                  }
-                });
-              },
-              get children() {
-                return Solid$1.createComponent(Match, {
-                  get matchId() {
-                    return currentMatchId();
-                  }
-                });
-              }
-            })
-          });
-        }
-      });
-    }
-  });
+var Outlet = () => {
+	const router = require_useRouter.useRouter();
+	const matchId = solid_js.useContext(require_matchContext.matchContext);
+	const routeId = require_useRouterState.useRouterState({ select: (s) => s.matches.find((d) => d.id === matchId())?.routeId });
+	const route = () => router.routesById[routeId()];
+	const parentGlobalNotFound = require_useRouterState.useRouterState({ select: (s) => {
+		const parentMatch = s.matches.find((d) => d.id === matchId());
+		if (!parentMatch) return false;
+		return parentMatch.globalNotFound;
+	} });
+	const childMatchId = require_useRouterState.useRouterState({ select: (s) => {
+		const matches = s.matches;
+		return matches[matches.findIndex((d) => d.id === matchId()) + 1]?.id;
+	} });
+	const childRouteId = require_useRouterState.useRouterState({ select: (s) => {
+		const matches = s.matches;
+		return matches[matches.findIndex((d) => d.id === matchId()) + 1]?.routeId;
+	} });
+	const childMatchStatus = require_useRouterState.useRouterState({ select: (s) => {
+		const matches = s.matches;
+		return matches[matches.findIndex((d) => d.id === matchId()) + 1]?.status;
+	} });
+	const shouldShowNotFound = () => childMatchStatus() !== "redirected" && parentGlobalNotFound();
+	return (0, _solidjs_web.createComponent)(solid_js.Show, {
+		get when() {
+			return (0, _solidjs_web.memo)(() => !!!shouldShowNotFound())() && childMatchId();
+		},
+		get fallback() {
+			return (0, _solidjs_web.createComponent)(solid_js.Show, {
+				get when() {
+					return shouldShowNotFound();
+				},
+				get children() {
+					return require_renderRouteNotFound.renderRouteNotFound(router, route(), void 0);
+				}
+			});
+		},
+		children: (matchIdAccessor) => {
+			const currentMatchId = solid_js.createMemo(() => matchIdAccessor());
+			return (0, _solidjs_web.createComponent)(solid_js.Show, {
+				get when() {
+					return routeId() === _tanstack_router_core.rootRouteId;
+				},
+				get fallback() {
+					return (0, _solidjs_web.createComponent)(Match, { get matchId() {
+						return currentMatchId();
+					} });
+				},
+				get children() {
+					return (0, _solidjs_web.createComponent)(solid_js.Show, {
+						get when() {
+							return childRouteId();
+						},
+						keyed: true,
+						children: (_routeId) => (0, _solidjs_web.createComponent)(solid_js.Loading, {
+							get fallback() {
+								return (0, _solidjs_web.createComponent)(_solidjs_web.Dynamic, { get component() {
+									return router.options.defaultPendingComponent;
+								} });
+							},
+							get children() {
+								return (0, _solidjs_web.createComponent)(Match, { get matchId() {
+									return currentMatchId();
+								} });
+							}
+						})
+					});
+				}
+			});
+		}
+	});
 };
+//#endregion
 exports.Match = Match;
-exports.MatchInner = MatchInner;
 exports.Outlet = Outlet;
-//# sourceMappingURL=Match.cjs.map
+
+//# sourceMappingURL=Match.cjs.map