fix(findSurround): use filtered contents to find surround (#2291)

nuxt · Sep 6, 2023 · 6d70135 · 6d70135
1 parent faff26b
commit 6d70135
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/runtime/query/match/pipeline.ts b/src/runtime/query/match/pipeline.ts
@@ -40,7 +40,7 @@ export function createPipelineFetcher<T> (getContentsList: () => Promise<T[]>) {
     function fetchSurround (state, params, db) {
       if (params.surround) {
         // @ts-ignore
-        state.surround = surround(db, params.surround)
+        state.surround = surround(state.result?.length === 1 ? db : state.result, params.surround)
       }
       return state
     }

diff --git a/src/runtime/query/query.ts b/src/runtime/query/query.ts
@@ -78,7 +78,7 @@ export function createQuery <T = ParsedContent> (fetcher: ContentQueryFetcher<T>
   if (opts.legacy) {
     // @ts-ignore
     query.findSurround = (surroundQuery, options) => {
-      return query.withSurround(surroundQuery, options).findOne().then(resolveResult)
+      return query.withSurround(surroundQuery, options).find().then(resolveResult)
     }
 
     return query as QueryBuilder<T>