fix(ContentRenderer): render contents only with excerpt

nuxt · Aug 24, 2023 · faacf2f · faacf2f
1 parent 5002a37
commit faacf2f
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 3 deletions.
diff --git a/src/runtime/components/ContentRenderer.vue b/src/runtime/components/ContentRenderer.vue
@@ -60,7 +60,9 @@ export default defineComponent({
 
     const { value, excerpt, tag } = ctx
 
-    if (!value?.body?.children?.length && slots?.empty) {
+    const markdownAST = excerpt ? value?.excerpt : value?.body
+
+    if (!markdownAST?.children?.length && slots?.empty) {
       // Fallback on `empty` slot.
       return slots.empty({ value, excerpt, tag, ...this.$attrs })
     }
@@ -70,7 +72,7 @@ export default defineComponent({
     }
 
     // Use built-in ContentRendererMarkdown
-    if (value?._type === 'markdown' && value?.body?.children?.length) {
+    if (markdownAST?.type === 'root' && markdownAST?.children?.length) {
       return h(
         ContentRendererMarkdown,
         {

diff --git a/src/runtime/query/query.ts b/src/runtime/query/query.ts
@@ -43,7 +43,7 @@ export function createQuery <T = ParsedContent> (fetcher: ContentQueryFetcher<T>
         }
       }
 
-      return result?._path || Array.isArray(result) ? result : result?.result
+      return result?._path || Array.isArray(result) || !Object.prototype.hasOwnProperty.call(result, 'result') ? result : result?.result
     }
 
     return result

diff --git a/test/basic.test.ts b/test/basic.test.ts
@@ -49,6 +49,12 @@ describe('Basic usage', async () => {
     expect(html).contains('<p><!--[-->p1<!--]--></p>')
   })
 
+  test('Fetch only title and excerpt', async () => {
+    const html = await $fetch('/excerpt-only')
+    expect(html).contains('Excerpt paragraph')
+    expect(html).not.contains('Rest of the content')
+  })
+
   // test('Warning for invalid file name', () => {
   //   expect(spyConsoleWarn).toHaveBeenCalled()
   //   expect(spyConsoleWarn).toHaveBeenCalledWith('Ignoring [content:with-\'invalid\'-char.md]. File name should not contain any of the following characters: \', ", ?, #, /')

diff --git a/test/fixtures/basic/content/excerpt.md b/test/fixtures/basic/content/excerpt.md
@@ -0,0 +1,8 @@
+# Index
+
+
+Excerpt paragraph
+
+<!-- more -->
+
+Rest of the content
diff --git a/test/fixtures/basic/pages/excerpt-only.vue b/test/fixtures/basic/pages/excerpt-only.vue
@@ -0,0 +1,11 @@
+<template>
+  <div>
+    <ContentRenderer :value="data!" :excerpt="true" />
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { queryContent, useAsyncData } from '#imports'
+
+const { data } = await useAsyncData('excerpt', () => queryContent('/excerpt').only(['title', 'excerpt']).findOne())
+</script>