fix(router-core): Non-nested paths

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

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

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

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

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

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

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

@@ -0,0 +1,38 @@
+import { Link, Outlet, createFileRoute } from '@tanstack/react-router'
+
+export const Route = createFileRoute('/non-nested')({
+  component: RouteComponent,
+})
+
+function RouteComponent() {
+  return (
+    <div>
+      <h3 className="pb-2" data-testid="non-nested-path-heading">
+        Non-nested paths
+      </h3>
+      <ul className="grid mb-2">
+        <li>
+          <Link
+            from={Route.fullPath}
+            data-testid="l-to-non-nested-bazid"
+            to="./baz/$bazid"
+            params={{ bazid: '123' }}
+          >
+            /non-nested/baz/123
+          </Link>
+        </li>
+        <li>
+          <Link
+            from={Route.fullPath}
+            data-testid="l-to-non-nested-bazid-edit"
+            to="./baz/$bazid/edit"
+            params={{ bazid: '456' }}
+          >
+            /non-nested/baz/456/edit
+          </Link>
+        </li>
+      </ul>
+      <Outlet />
+    </div>
+  )
+}

e2e/react-router/basic-file-based/tests/app.spec.ts

@@ -308,3 +308,38 @@ test('Should remount deps when remountDeps does change ', async ({ page }) => {
     'Page component mounts: 2',
   )
 })
+
+test('Should not nest non-nested paths', async ({ page }) => {
+  await page.goto('/non-nested')
+  await page.waitForURL('/non-nested')
+  const nonNestedPathHeading = page.getByTestId('non-nested-path-heading')
+  const bazIdLink = page.getByTestId('l-to-non-nested-bazid')
+  const bazIdEditLink = page.getByTestId('l-to-non-nested-bazid-edit')
+
+  await expect(nonNestedPathHeading).toBeInViewport()
+  await expect(bazIdLink).toHaveAttribute('href', '/non-nested/baz/123')
+  await expect(bazIdEditLink).toHaveAttribute(
+    'href',
+    '/non-nested/baz/456/edit',
+  )
+
+  await bazIdLink.click()
+  await page.waitForURL('/non-nested/baz/123')
+  const bazHeading = page.getByTestId('non-nested-baz-heading')
+  const bazIdHeading = page.getByTestId('non-nested-bazid-heading')
+  const bazIdParam = page.getByTestId('non-nested-bazid-param')
+  await expect(nonNestedPathHeading).toBeInViewport()
+  await expect(bazHeading).toBeInViewport()
+  await expect(bazIdHeading).toBeInViewport()
+  await expect(bazIdParam).toContainText(JSON.stringify({ bazid: '123' }))
+
+  await bazIdEditLink.click()
+  await page.waitForURL('/non-nested/baz/456/edit')
+  const bazIdEditHeading = page.getByTestId('non-nested-bazid-edit-heading')
+  const bazIdEditParam = page.getByTestId('non-nested-bazid-edit-param')
+  await expect(nonNestedPathHeading).toBeInViewport()
+  await expect(bazHeading).toBeHidden()
+  await expect(bazIdHeading).toBeHidden()
+  await expect(bazIdEditHeading).toBeInViewport()
+  await expect(bazIdEditParam).toContainText(JSON.stringify({ bazid: '456' }))
+})