chore: tweak

Author: pengzhanbo

packages/client/src/router/resolveRoute.ts

@@ -1,3 +1,4 @@
+import { resolveRoutePathname } from '@vuepress/shared'
 import { routes } from '../internal/routes.js'
 import type { Route, RouteMeta } from '../types/index.js'
 import { resolveRoutePath } from './resolveRoutePath.js'
@@ -16,7 +17,7 @@ export const resolveRoute = <T extends RouteMeta = RouteMeta>(
   currentPath?: string,
 ): ResolvedRoute<T> => {
   const routePath = resolveRoutePath(path, currentPath)
-  const pathname = routePath.split(/#|\?/)[0]
+  const pathname = resolveRoutePathname(routePath)
   const route = routes.value[pathname] ?? {
     ...routes.value['/404.html'],
     notFound: true,

packages/client/src/router/resolveRoutePath.ts

@@ -1,4 +1,4 @@
-import { normalizeRoutePath } from '@vuepress/shared'
+import { normalizeRoutePath, resolveRoutePathname } from '@vuepress/shared'
 import { redirects, routes } from '../internal/routes.js'
 
 /**
@@ -10,16 +10,16 @@ export const resolveRoutePath = (
 ): string => {
   // normalized path
   const normalizedPath = normalizeRoutePath(path, currentPath)
-  if (routes.value[normalizedPath]) return normalizedPath
-
+  const normalizedPathname = resolveRoutePathname(normalizedPath)
+  if (routes.value[normalizedPathname]) return normalizedPath
   // encoded path
-  const encodedPath = encodeURI(normalizedPath)
-  if (routes.value[encodedPath]) return encodedPath
+  const encodedPathname = encodeURI(normalizedPathname)
+  if (routes.value[encodedPathname]) return encodeURI(normalizedPath)
 
   // redirected path or fallback to the normalized path
   return (
-    redirects.value[normalizedPath] ||
-    redirects.value[encodedPath] ||
+    redirects.value[normalizedPathname] ||
+    redirects.value[encodedPathname] ||
     normalizedPath
   )
 }

packages/shared/src/utils/index.ts

@@ -15,4 +15,5 @@ export * from './removeLeadingSlash.js'
 export * from './resolveHeadIdentifier.js'
 export * from './resolveLocalePath.js'
 export * from './resolveRoutePathFromUrl.js'
+export * from './resolveRoutePathname.js'
 export * from './typeGuards.js'

packages/shared/src/utils/resolveRoutePathname.ts

@@ -0,0 +1,8 @@
+const SPLIT_CHAR_RE = /#|\?/
+
+/**
+ * Resolve the route pathname
+ */
+export const resolveRoutePathname = (path: string): string => {
+  return path.split(SPLIT_CHAR_RE)[0]
+}

packages/shared/tests/resolveRoutePathname.spec.ts

@@ -0,0 +1,21 @@
+import { describe, expect, it } from 'vitest'
+import { resolveRoutePathname } from '../src/index.js'
+
+const testCases = [
+  ['/a/b/c/', '/a/b/c/'],
+  ['/a/b/c/?a=1', '/a/b/c/'],
+  ['/a/b/c/#b', '/a/b/c/'],
+  ['/a/b/c/?a=1#b', '/a/b/c/'],
+  ['a/index.html', 'a/index.html'],
+  ['/a/index.html?a=1', '/a/index.html'],
+  ['/a/index.html#a', '/a/index.html'],
+  ['/a/index.html?a=1#b', '/a/index.html'],
+]
+
+describe('should resolve route pathname correctly', () => {
+  testCases.forEach(([source, expected]) => {
+    it(`${source} -> ${expected}`, () => {
+      expect(resolveRoutePathname(source)).toBe(expected)
+    })
+  })
+})