chore: tweaks

Author: meteorlxy

packages/client/src/router/resolveRoute.ts

@@ -1,4 +1,4 @@
-import { resolvePathInfo } from '@vuepress/shared'
+import { splitPath } 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> => {
   // get only the pathname from the path
-  const [pathname, hashAndQueries] = resolvePathInfo(path)
+  const { pathname, hashAndQueries } = splitPath(path)
 
   // resolve the route path
   const routePath = resolveRoutePath(pathname, currentPath)

packages/client/src/router/resolveRouteFullPath.ts

@@ -1,4 +1,4 @@
-import { resolvePathInfo } from '@vuepress/shared'
+import { splitPath } from '@vuepress/shared'
 import { resolveRoutePath } from './resolveRoutePath.js'
 
 /**
@@ -8,7 +8,6 @@ export const resolveRouteFullPath = (
   path: string,
   currentPath?: string,
 ): string => {
-  const [pathname, hashAndQueries] = resolvePathInfo(path)
-
+  const { pathname, hashAndQueries } = splitPath(path)
   return resolveRoutePath(pathname, currentPath) + hashAndQueries
 }

packages/shared/src/utils/routes/index.ts

@@ -2,4 +2,4 @@ export * from './inferRoutePath'
 export * from './normalizeRoutePath.js'
 export * from './resolveLocalePath.js'
 export * from './resolveRoutePathFromUrl.js'
-export * from './resolvePathInfo.js'
+export * from './splitPath.js'

packages/shared/src/utils/routes/resolvePathInfo.ts

@@ -0,0 +1,17 @@
+const SPLIT_CHAR_REGEXP = /(#|\?)/
+
+/**
+ * Split a path into pathname and hashAndQueries
+ */
+export const splitPath = (
+  path: string,
+): {
+  pathname: string
+  hashAndQueries: string
+} => {
+  const [pathname, ...hashAndQueries] = path.split(SPLIT_CHAR_REGEXP)
+  return {
+    pathname,
+    hashAndQueries: hashAndQueries.join(''),
+  }
+}

packages/shared/src/utils/routes/splitPath.ts

@@ -0,0 +1,22 @@
+import { expect, it } from 'vitest'
+import { splitPath } from '../../src/index.js'
+
+const testCases: [string, ReturnType<typeof splitPath>][] = [
+  ['/a/b/c/', { pathname: '/a/b/c/', hashAndQueries: '' }],
+  ['/a/b/c/?a=1', { pathname: '/a/b/c/', hashAndQueries: '?a=1' }],
+  ['/a/b/c/#b', { pathname: '/a/b/c/', hashAndQueries: '#b' }],
+  ['/a/b/c/?a=1#b', { pathname: '/a/b/c/', hashAndQueries: '?a=1#b' }],
+  ['a/index.html', { pathname: 'a/index.html', hashAndQueries: '' }],
+  ['/a/index.html?a=1', { pathname: '/a/index.html', hashAndQueries: '?a=1' }],
+  ['/a/index.html#a', { pathname: '/a/index.html', hashAndQueries: '#a' }],
+  [
+    '/a/index.html?a=1#b',
+    { pathname: '/a/index.html', hashAndQueries: '?a=1#b' },
+  ],
+]
+
+testCases.forEach(([source, expected]) => {
+  it(`${source} -> ${expected}`, () => {
+    expect(splitPath(source)).toEqual(expected)
+  })
+})