@tanstack/react-router 0.0.1-beta.25 → 0.0.1-beta.27

package/build/esm/index.js

@@ -1054,7 +1054,7 @@ function parsePathname(pathname) {
       };
     }
 
-    if (part.charAt(0) === ':') {
+    if (part.charAt(0) === '$') {
       return {
         type: 'param',
         value: part
@@ -1151,7 +1151,7 @@ function matchByPath(from, matchLocation) {
             return false;
           }
 
-          if (!baseSegment.value.startsWith(':')) {
+          if (baseSegment.value.charAt(0) !== '$') {
             params[routeSegment.value.substring(1)] = baseSegment.value;
           }
         }
@@ -1413,9 +1413,11 @@ const createRouteConfig = function createRouteConfig(options, children, isRoot,
     fullPath: fullPath,
     options: options,
     children,
-    createChildren: cb => createRouteConfig(options, cb(childOptions => createRouteConfig(childOptions, undefined, false, id, fullPath)), false, parentId, parentPath),
     addChildren: children => createRouteConfig(options, children, false, parentId, parentPath),
-    createRoute: childOptions => createRouteConfig(childOptions, undefined, false, id, fullPath)
+    createRoute: childOptions => createRouteConfig(childOptions, undefined, false, id, fullPath),
+    generate: () => {
+      invariant(false, "routeConfig.generate() is used by TanStack Router's file-based routing code generation and should not actually be called during runtime. ");
+    }
   };
 };
 
@@ -2812,7 +2814,8 @@ function Outlet() {
   }, /*#__PURE__*/React.createElement(React.Suspense, {
     fallback: /*#__PURE__*/React.createElement(PendingComponent, null)
   }, /*#__PURE__*/React.createElement(CatchBoundary, {
-    errorComponent: errorComponent
+    errorComponent: errorComponent,
+    key: match.routeId
   }, (() => {
     if (match.status === 'error') {
       throw match.error;
@@ -2832,7 +2835,8 @@ class CatchBoundary extends React.Component {
   constructor() {
     super(...arguments);
     this.state = {
-      error: false
+      error: false,
+      info: undefined
     };
   }
 
@@ -2845,17 +2849,49 @@ class CatchBoundary extends React.Component {
   }
 
   render() {
-    var _this$props$errorComp;
+    return /*#__PURE__*/React.createElement(CatchBoundaryInner, _extends$2({}, this.props, {
+      errorState: this.state,
+      reset: () => this.setState({})
+    }));
+  }
+
+} // This is the messiest thing ever... I'm either seriously tired (likely) or
+// there has to be a better way to reset error boundaries when the
+// router's location key changes.
 
-    const errorComponent = (_this$props$errorComp = this.props.errorComponent) != null ? _this$props$errorComp : DefaultErrorBoundary;
 
-    if (this.state.error) {
-      return /*#__PURE__*/React.createElement(errorComponent, this.state);
+function CatchBoundaryInner(props) {
+  var _props$errorComponent;
+
+  const [activeErrorState, setActiveErrorState] = React.useState(props.errorState);
+  const router = useRouter();
+  const errorComponent = (_props$errorComponent = props.errorComponent) != null ? _props$errorComponent : DefaultErrorBoundary;
+  React.useEffect(() => {
+    if (activeErrorState) {
+      let prevKey = router.state.location.key;
+      return router.subscribe(() => {
+        if (router.state.location.key !== prevKey) {
+          prevKey = router.state.location.key;
+          setActiveErrorState({});
+        }
+      });
+    }
+
+    return;
+  }, [activeErrorState]);
+  React.useEffect(() => {
+    if (props.errorState.error) {
+      setActiveErrorState(props.errorState);
     }
 
-    return this.props.children;
+    props.reset();
+  }, [props.errorState.error]);
+
+  if (activeErrorState.error) {
+    return /*#__PURE__*/React.createElement(errorComponent, activeErrorState);
   }
 
+  return props.children;
 }
 
 function DefaultErrorBoundary(_ref6) {