refactor: rename `resolvePath` to more readable one

pull/49/head
Kia Ishii 5 years ago
parent de1dfe2b06
commit 4236877b48

@ -1,7 +1,7 @@
import { useSiteData, usePageData, useRoute } from 'vitepress' import { useSiteData, usePageData, useRoute } from 'vitepress'
import { computed, h, FunctionalComponent, VNode } from 'vue' import { computed, h, FunctionalComponent, VNode } from 'vue'
import { Header } from '../../../../types/shared' import { Header } from '../../../../types/shared'
import { isActive, resolvePath } from '../utils' import { isActive, getPathDirName } from '../utils'
import { DefaultTheme } from '../config' import { DefaultTheme } from '../config'
import { useActiveSidebarLinks } from '../composables/activeSidebarLink' import { useActiveSidebarLinks } from '../composables/activeSidebarLink'
@ -91,6 +91,10 @@ interface ResolvedSidebarItem {
function resolveAutoSidebar(headers: Header[], depth: number): ResolvedSidebar { function resolveAutoSidebar(headers: Header[], depth: number): ResolvedSidebar {
const ret: ResolvedSidebar = [] const ret: ResolvedSidebar = []
if (headers === undefined) {
return []
}
let lastH2: ResolvedSidebarItem | undefined = undefined let lastH2: ResolvedSidebarItem | undefined = undefined
headers.forEach(({ level, title, slug }) => { headers.forEach(({ level, title, slug }) => {
if (level - 1 > depth) { if (level - 1 > depth) {
@ -125,7 +129,7 @@ function resolveMultiSidebar(
headers: Header[], headers: Header[],
depth: number depth: number
): ResolvedSidebar { ): ResolvedSidebar {
const item = config[resolvePath(path)] const item = config[getPathDirName(path)]
if (Array.isArray(item)) { if (Array.isArray(item)) {
return resolveArraySidebar(item, depth) return resolveArraySidebar(item, depth)

@ -27,7 +27,7 @@ export function normalize(path: string): string {
* path is `/guide/getting-started.html`, this method will return `/guide/`. * path is `/guide/getting-started.html`, this method will return `/guide/`.
* Always with a trailing slash. * Always with a trailing slash.
*/ */
export function resolvePath(path: string): string { export function getPathDirName(path: string): string {
const segments = path.split('/') const segments = path.split('/')
if (segments[segments.length - 1]) { if (segments[segments.length - 1]) {

Loading…
Cancel
Save