@@ -470,7 +470,8 @@ export function createQuery<
470470 } as FindOptions < TCollection , TCollectionDefaults , TSchema > as any , fetchMeta ) . then ( async ( backgroundResult ) => {
471471 const { valid } = await setPageResult ( page , savedPageRequestId , backgroundResult )
472472 if ( valid ) {
473- meta . value = fetchMeta
473+ updateQueryMeta ( page , fetchMeta )
474+
474475 if ( queryTracking && newQueryTracking2 ) {
475476 queryTracking . handleQueryTracking ( page . id , newQueryTracking2 , undefined , finalOptions . include , page . main )
476477 }
@@ -502,11 +503,7 @@ export function createQuery<
502503
503504 const { valid } = await setPageResult ( page , savedPageRequestId , pageResult )
504505 if ( valid ) {
505- if ( page . main ) {
506- cache . _private . state . queryMeta [ queryId . value ] = pickNonSpecialProps ( fetchMeta )
507- }
508-
509- meta . value = fetchMeta
506+ updateQueryMeta ( page , fetchMeta )
510507
511508 if ( queryTrackingEnabled && shouldHandleQueryTracking && queryTracking && newQueryTracking ) {
512509 queryTracking . handleQueryTracking ( page . id , newQueryTracking , undefined , finalOptions . include , page . main )
@@ -530,6 +527,14 @@ export function createQuery<
530527 }
531528 }
532529
530+ function updateQueryMeta ( page : VueQueryPage < TCollection , TCollectionDefaults , TSchema , TOptions , TResult > , newMeta : CustomHookMeta ) {
531+ if ( page . main ) {
532+ cache . _private . state . queryMeta [ queryId . value ] = pickNonSpecialProps ( newMeta )
533+ }
534+
535+ meta . value = newMeta
536+ }
537+
533538 // Auto load on options change
534539 let previousOptions = klona ( toValue ( options ) )
535540 watch ( ( ) => toValue ( options ) , ( value ) => {
0 commit comments