fix: enhance mergePageMetaData to handle sub-package pages and update tests

Author: hairyf

packages/core/src/context.ts

@@ -250,18 +250,14 @@ export class PageContext {
   }
 
   async mergePageMetaData() {
-    const subPages = [...this.subPages.keys()].map(v => v.replace('src/', ''))
+    // 收集所有子包中的页面绝对路径
+    const subPageAbsolutePaths = [...this.subPages.values().flatMap(v => Array.from(v.keys()))]
 
-    // 过滤掉属于子包的页面，创建新的 pages Map
-    const filteredPages = new Map<string, Page>()
-    for (const [path, page] of this.pages) {
-      if (subPages.some(v => page.uri.startsWith(v))) {
-        continue
-      }
-      filteredPages.set(path, page)
-    }
+    // 过滤掉属于子包的页面
+    for (const subPageAbsolutePath of subPageAbsolutePaths)
+      this.pages.delete(subPageAbsolutePath)
 
-    const pageMetaData = await this.parsePages(filteredPages, 'main', this.pagesGlobConfig?.pages)
+    const pageMetaData = await this.parsePages(this.pages, 'main', this.pagesGlobConfig?.pages)
 
     this.pageMetaData = pageMetaData
     debug.pages(this.pageMetaData)

test/files.spec.ts

@@ -24,6 +24,7 @@ describe('get files', () => {
         "i18n.vue",
         "index.nvue",
         "index.vue",
+        "pages-internal-sub/index.vue",
         "test-json.vue",
         "test-jsonc-with-comment.vue",
         "test-yaml.vue",

test/generate.spec.ts

@@ -23,9 +23,12 @@ const pagesGlobConfig: UserPagesConfig = {
 
 describe('generate routes', () => {
   it('vue - pages snapshot', async () => {
-    const ctx = new PageContext({ dir: 'packages/playground/src/pages', homePage: 'pages/index' })
+    const ctx = new PageContext({ dir: 'packages/playground/src/pages', homePage: 'pages/index', subPackages: ['packages/playground/src/pages/pages-internal-sub'] })
     await ctx.scanPages()
+    await ctx.scanSubPages()
     await ctx.mergePageMetaData()
+
+    // console.log(ctx.pages)
     const routes = ctx.resolveRoutes()
 
     expect(routes).toMatchInlineSnapshot(`
@@ -173,9 +176,10 @@ describe('generate routes', () => {
   })
 
   it('vue - not merge pages snapshot', async () => {
-    const ctx = new PageContext({ dir: 'packages/playground/src/pages', mergePages: false })
+    const ctx = new PageContext({ dir: 'packages/playground/src/pages', mergePages: false, subPackages: ['packages/playground/src/pages/pages-internal-sub'] })
     await ctx.scanPages()
     ctx.pagesGlobConfig = pagesGlobConfig
+    await ctx.scanSubPages()
     await ctx.mergePageMetaData()
     const routes = ctx.resolveRoutes()