fix: cannot filter correct pages for frontmatter classifier

Author: ulivz

src/client/pagination.ts

@@ -35,7 +35,9 @@ class Pagination {
 
     this._paginationPages = paginationPages
     this._currentPage = paginationPages[this.paginationIndex]
-    this._matchedPages = pages.filter(pagination.filter).sort(pagination.sorter)
+    this._matchedPages = pages
+      .filter(page => pagination.filter(page, pagination.id, pagination.pid))
+      .sort(pagination.sorter)
   }
 
   setIndexPage(path) {

src/node/handleOptions.ts

@@ -98,8 +98,6 @@ export function handleOptions(
         ClassifierTypeEnum.Directory,
         pagination,
         indexPath,
-        id,
-        id,
         ctx,
       ),
       pid: id,

src/node/index.ts

@@ -113,8 +113,6 @@ module.exports = (options: BlogPluginOptions, ctx: VuePressContext) => {
                   ClassifierTypeEnum.Frontmatter,
                   pagination,
                   indexPath,
-                  scope,
-                  key,
                   ctx,
                   keys,
                 ),

src/node/interface/Pagination.ts

@@ -4,11 +4,17 @@
 import { VuePressPage } from './VuePress'
 import { ClassifierTypeEnum } from './Classifier'
 
-export type PageFilter = (page: VuePressPage) => boolean
+export type PageFilter = (
+  page: VuePressPage,
+  id: string,
+  pid: string,
+) => boolean
+
 export type PageSorter = (
   prev: VuePressPage,
   next: VuePressPage,
 ) => boolean | number
+
 export type GetPaginationPageUrl = (index: number) => string
 export type getPaginationPageTitle = (index: number) => string
 

src/node/pagination.ts

@@ -58,7 +58,7 @@ export async function registerPaginations(
     getPaginationPageTitle,
   } of paginations) {
     const { pages: sourcePages } = ctx
-    const pages = sourcePages.filter(filter as PageFilter)
+    const pages = sourcePages.filter(page => (filter as PageFilter)(page, id, pid))
 
     const intervallers = getIntervallers(pages.length, lengthPerPage)
     const pagination: SerializedPagination = {

src/node/util.ts

@@ -56,8 +56,6 @@ export function resolvePaginationConfig(
   classifierType: ClassifierTypeEnum,
   pagination = {} as PaginationConfig,
   indexPath,
-  pid, // post / tag
-  id, // post / js
   ctx: VuePressContext,
   keys: string[] = [''], // ['js']
 ) {
@@ -76,8 +74,10 @@ export function resolvePaginationConfig(
 
       filter:
         classifierType === ClassifierTypeEnum.Directory
-          ? getIdentityFilter(pid, id)
-          : getFrontmatterClassifierPageFilter(keys, id),
+          ? function(page, id, pid) {
+            return page.pid === pid && page.id === id
+          }
+          : getFrontmatterClassifierPageFilter(keys),
 
       sorter: (prev: VuePressPage, next: VuePressPage) => {
         const prevTime = new Date(prev.frontmatter.date).getTime()
@@ -89,22 +89,13 @@ export function resolvePaginationConfig(
   )
 }
 
-function getIdentityFilter(pid, id) {
-  return new Function(
-    'page',
-    `return page.pid === ${JSON.stringify(pid)} && page.id === ${JSON.stringify(
-      id,
-    )}`,
-  )
-}
-
-function getFrontmatterClassifierPageFilter(keys, value) {
+function getFrontmatterClassifierPageFilter(keys) {
   return new Function(
     // @ts-ignore
-    'page',
+    'page', 'id', 'pid',
     `
 const keys = ${JSON.stringify(keys)};
-const value = ${JSON.stringify(value)};
+const value = id;
 return keys.some(key => {
   const _value = page.frontmatter[key]
   if (Array.isArray(_value)) {