fix: generate paths of frontmatter scope pages properly (fix #39) (#40)

* feat: Support frontmatters scoped path (#39) * fix: frontmatters scopeLayout path * refactor: clean code
vuepress · Dec 7, 2019 · af32668 · af32668
1 parent 586bf14
commit af32668
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/examples/frontmatter-classifier/.vuepress/config.js b/examples/frontmatter-classifier/.vuepress/config.js
@@ -12,6 +12,7 @@ module.exports = {
           path: '/tag/',
           // Layout of the `entry page`
           layout: 'Tags',
+          scopeLayout: 'FrontmatterClassifier',
         },
       ],
     }],

diff --git a/src/node/handleOptions.ts b/src/node/handleOptions.ts
@@ -163,7 +163,7 @@ export function handleOptions(
       keys,
       map,
       scopeLayout,
-      _handler: curryFrontmatterHandler(id, map),
+      _handler: curryFrontmatterHandler(id, map, indexPath),
     })
   }
 

diff --git a/src/node/index.ts b/src/node/index.ts
@@ -131,8 +131,6 @@ module.exports = (options: BlogPluginOptions, ctx: VuePressContext) => {
               /**
                * Register pagination
                */
-              const indexPath = `/${scope}/${key}/`
-
               paginations.push({
                 classifierType: ClassifierTypeEnum.Frontmatter,
                 getPaginationPageTitle(index, id, scope) {
@@ -142,7 +140,7 @@ module.exports = (options: BlogPluginOptions, ctx: VuePressContext) => {
                   ClassifierTypeEnum.Frontmatter,
                   options.globalPagination,
                   pagination,
-                  indexPath,
+                  path,
                   ctx,
                   keys,
                 ),

diff --git a/src/node/util.ts b/src/node/util.ts
@@ -14,15 +14,16 @@ export interface FrontmatterTempMap {
 export function curryFrontmatterHandler(
   scope: string,
   map: FrontmatterTempMap,
+  path: string,
 ): FrontmatterHandler
-export function curryFrontmatterHandler(scope, map) {
+export function curryFrontmatterHandler(scope, map, path) {
   return (key, pageKey) => {
     if (key) {
       if (!map[key]) {
         map[key] = {}
         map[key].key = key
         map[key].scope = scope
-        map[key].path = `/${scope}/${key}/`
+        map[key].path = `${path}${key}/`
         map[key].pageKeys = []
       }
       map[key].pageKeys.push(pageKey)