fix(router-core): Non nested paths - only strip trailing underscore on route segments - alpha (#5183)

PR to merge #5182 with alpha

Author: nlynzaad

e2e/react-router/basic-file-based/src/routeTree.gen.ts

@@ -0,0 +1,20 @@
+import { createFileRoute } from '@tanstack/react-router'
+
+export const Route = createFileRoute('/non-nested/named/$baz/foo')({
+  component: RouteComponent,
+})
+
+function RouteComponent() {
+  const params = Route.useParams()
+
+  return (
+    <div>
+      <div data-testid="non-nested-named-baz-foo-heading">
+        Hello nested named baz foo page
+      </div>
+      <div data-testid="non-nested-named-baz-foo-param">
+        {JSON.stringify(params)}
+      </div>
+    </div>
+  )
+}

e2e/react-router/basic-file-based/src/routes/non-nested/baz.$bazid.tsx

@@ -0,0 +1,19 @@
+import { createFileRoute } from '@tanstack/react-router'
+
+export const Route = createFileRoute('/non-nested/named/$baz/')({
+  component: RouteComponent,
+})
+
+function RouteComponent() {
+  const params = Route.useParams()
+  return (
+    <div>
+      <div data-testid="non-nested-named-baz-index-heading">
+        Hello nested named baz index
+      </div>
+      <div data-testid="non-nested-named-baz-index-param">
+        {JSON.stringify(params)}
+      </div>
+    </div>
+  )
+}

e2e/react-router/basic-file-based/src/routes/non-nested/baz.tsx

@@ -0,0 +1,16 @@
+import { Outlet, createFileRoute } from '@tanstack/react-router'
+
+export const Route = createFileRoute('/non-nested/named/$baz')({
+  component: RouteComponent,
+})
+
+function RouteComponent() {
+  return (
+    <div>
+      <div data-testid="non-nested-named-baz-route-heading">
+        Hello non-nested named baz route layout
+      </div>
+      <Outlet />
+    </div>
+  )
+}

e2e/react-router/basic-file-based/src/routes/non-nested/baz_.$bazid.edit.tsx

@@ -0,0 +1,19 @@
+import { createFileRoute } from '@tanstack/react-router'
+
+export const Route = createFileRoute('/non-nested/named/$baz_/bar')({
+  component: RouteComponent,
+})
+
+function RouteComponent() {
+  const params = Route.useParams()
+  return (
+    <div>
+      <div data-testid="non-nested-named-baz-bar-heading">
+        Hello non-nested named bar
+      </div>
+      <div data-testid="non-nested-named-baz-bar-param">
+        {JSON.stringify(params)}
+      </div>
+    </div>
+  )
+}

e2e/react-router/basic-file-based/src/routes/non-nested/named/$baz.foo.tsx

@@ -0,0 +1,58 @@
+import { Link, Outlet, createFileRoute } from '@tanstack/react-router'
+
+export const Route = createFileRoute('/non-nested/named')({
+  component: RouteComponent,
+})
+
+function RouteComponent() {
+  return (
+    <div>
+      <div data-testid="non-nested-named-root-route-heading">
+        Hello non-nested named layout
+      </div>
+      <div>
+        <Link
+          from={Route.fullPath}
+          to="./$baz"
+          params={{ baz: 'baz' }}
+          data-testid="to-named-index"
+        >
+          To named index
+        </Link>
+        <Link
+          from={Route.fullPath}
+          to="./$baz/foo"
+          params={{ baz: 'baz' }}
+          data-testid="to-named-foo"
+        >
+          To named foo
+        </Link>
+        <Link
+          from={Route.fullPath}
+          to="./$baz/foo"
+          params={{ baz: 'baz_' }}
+          data-testid="to-named-foo-2"
+        >
+          To named foo 2
+        </Link>
+        <Link
+          from={Route.fullPath}
+          to="./$baz/bar"
+          params={{ baz: 'baz' }}
+          data-testid="to-named-bar"
+        >
+          To named bar
+        </Link>
+        <Link
+          from={Route.fullPath}
+          to="./$baz/bar"
+          params={{ baz: 'baz_' }}
+          data-testid="to-named-bar-2"
+        >
+          To named bar 2
+        </Link>
+      </div>
+      <Outlet />
+    </div>
+  )
+}

e2e/react-router/basic-file-based/src/routes/non-nested/named/$baz.index.tsx

@@ -0,0 +1,20 @@
+import { createFileRoute } from '@tanstack/react-router'
+
+export const Route = createFileRoute('/non-nested/path/baz/foo')({
+  component: RouteComponent,
+})
+
+function RouteComponent() {
+  const params = Route.useParams()
+
+  return (
+    <div>
+      <div data-testid="non-nested-path-baz-foo-heading">
+        Hello nested path baz foo page
+      </div>
+      <div data-testid="non-nested-path-baz-foo-param">
+        {JSON.stringify(params)}
+      </div>
+    </div>
+  )
+}