fix: permalink redirect error

Author: pengzhanbo

packages/client/src/router/resolveRoute.ts

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

packages/client/src/router/resolveRoutePath.ts

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

packages/shared/src/utils/index.ts

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

packages/shared/src/utils/normalizeRoutePath.ts

@@ -1,4 +1,5 @@
 import { inferRoutePath } from './inferRoutePath.js'
+import { resolveRouteFullPath } from './resolveRouteFullPath.js'
 
 const FAKE_HOST = 'http://.'
 
@@ -15,7 +16,7 @@ export const normalizeRoutePath = (path: string, current?: string): string => {
     return inferRoutePath(pathname) + search + hash
   }
 
-  const [pathname, ...queryAndHash] = path.split(/(\?|#)/)
+  const [pathname, queryAndHash] = resolveRouteFullPath(path)
 
-  return inferRoutePath(pathname) + queryAndHash.join('')
+  return inferRoutePath(pathname) + queryAndHash
 }

packages/shared/src/utils/resolveRouteFullPath.ts

@@ -0,0 +1,10 @@
+const SPLIT_CHAR_RE = /(#|\?)/
+
+/**
+ * Resolve the route.fullPath to  [pathname, queryAndHash]
+ */
+export const resolveRouteFullPath = (path: string): [string, string] => {
+  const [pathname, ...queryAndHash] = path.split(SPLIT_CHAR_RE)
+
+  return [pathname, queryAndHash.join('')]
+}

packages/shared/src/utils/resolveRoutePathname.ts

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