improve tests and fix behavior

Co-authored-by: Baptiste Leproux <leproux.baptiste@gmail.com>

Author: farnabaz

playground/docus/ahad/index.md

@@ -0,0 +1,13 @@
+<script setup lang="ts">
+const { data: page } = await useAsyncData('prefixed-page', () => queryCollection('prefixed').path(useRoute().path).first())
+</script>
+
+<template>
+  <UContainer>
+    Hello
+    <ContentRenderer
+      v-if="page"
+      :value="page"
+    />
+  </UContainer>
+</template>

playground/docus/app/pages/route-prefix/[...slug].vue

@@ -46,16 +46,15 @@ const collections: Record<string, DefinedCollection> = {
     type: 'page',
     source: {
       include: '**',
-      exclude: ['index.md', '3.pages/**/*.md', 'authors/**/*'],
+      exclude: ['index.md', '3.pages/**/*.md', 'authors/**/*', 'fs-prefix/**'],
     },
     schema: createDocsSchema(),
   }),
-  ahad: defineCollection({
+  prefixed: defineCollection({
     type: 'page',
     source: {
-      cwd: '~~/ahad',
-      include: '**',
-      prefix: '/ahad-prefix',
+      include: 'fs-prefix/**',
+      prefix: '/route-prefix',
     },
     schema: createDocsSchema(),
   }),

playground/docus/content.config.ts

@@ -0,0 +1,8 @@
+---
+title: Prefixed File
+description: Hello
+---
+
+# Prefixed File
+
+Hello Baptiste 🎉

playground/docus/content/a2/hello.md

@@ -70,10 +70,6 @@ export function getCollectionByFilePath(path: string, collections: Record<string
     const paths = path === '/' ? ['index.yml', 'index.yaml', 'index.md', 'index.json'] : [path]
     return paths.some((p) => {
       matchedSource = collection.source.find((source) => {
-        const prefix = withoutTrailingSlash(withoutLeadingSlash(source.prefix || ''))
-        if (prefix && prefix !== '/' && !p.startsWith(prefix + '/')) {
-          return false
-        }
         const include = minimatch(p, source.include, { dot: true })
         const exclude = source.exclude?.some(exclude => minimatch(p, exclude))
 

playground/docus/content/fs-prefix/hello.md

@@ -41,6 +41,18 @@ describe('getCollectionByFilePath', () => {
 
     expect(result).toBeUndefined()
   })
+
+  it('Custom include pattern with different prefix', () => {
+    const id = 'prefixed/route-prefix/hello.md'
+    const source: ResolvedCollectionSource = {
+      include: 'fs-prefix/**',
+      prefix: '/route-prefix',
+      cwd: '',
+      _resolved: true,
+    }
+    const result = generateFsPathFromId(id, source)
+    expect(result).toBe('fs-prefix/hello.md')
+  })
 })
 
 describe('generateFsPathFromId', () => {
@@ -168,4 +180,32 @@ describe('generateIdFromFsPath', () => {
     const result = generateIdFromFsPath(path, customCollection)
     expect(result).toBe('pages/about.md')
   })
+
+  it.only('should handle collection with route prefix different from the fixed part of the include pattern', () => {
+    const customCollection: CollectionInfo = {
+      name: 'prefixed',
+      pascalName: 'Prefixed',
+      tableName: '_content_prefixed',
+      source: [
+        {
+          _resolved: true,
+          include: 'fs-prefix/**',
+          prefix: '/route-prefix',
+          cwd: '',
+        },
+      ],
+      type: 'page',
+      fields: {},
+      schema: {
+        $schema: 'http://json-schema.org/draft-07/schema#',
+        $ref: '#/definitions/prefixed',
+        definitions: {},
+      },
+      tableDefinition: '',
+    }
+
+    const path = 'fs-prefix/hello.md'
+    const result = generateIdFromFsPath(path, customCollection)
+    expect(result).toBe('prefixed/route-prefix/hello.md')
+  })
 })