fix: update meta with fetch-and-cache

Author: Akryum

packages/vue/src/query.ts

@@ -458,13 +458,17 @@ export function createQuery<
         if (!forceFetch && fetchPolicy === 'cache-and-fetch') {
           shouldHandleQueryTracking = false
           const newQueryTracking2 = queryTracking?.createTrackingObject()
+
+          const fetchMeta: CustomHookMeta = {
+            ...meta.value,
+            $queryTracking: queryTrackingEnabled ? newQueryTracking2 : undefined,
+          }
+
           fetchMethod({
             ...finalOptions,
             fetchPolicy: 'fetch-only',
-          } as FindOptions<TCollection, TCollectionDefaults, TSchema> as any, {
-            ...meta.value,
-            $queryTracking: queryTrackingEnabled ? newQueryTracking2 : undefined,
-          }).then(async (backgroundResult) => {
+          } as FindOptions<TCollection, TCollectionDefaults, TSchema> as any, fetchMeta).then(async (backgroundResult) => {
+            meta.value = fetchMeta
             const { valid } = await setPageResult(page, savedPageRequestId, backgroundResult)
             if (valid && queryTracking && newQueryTracking2) {
               queryTracking.handleQueryTracking(page.id, newQueryTracking2, undefined, finalOptions.include, page.main)

packages/vue/test/query.spec.ts

@@ -226,6 +226,34 @@ describe('query', () => {
     })
   })
 
+  describe('cache-and-fetch', () => {
+    it('should update the query meta', async () => {
+      const store = await createStore({
+        schema: [
+          {
+            name: 'messages',
+          },
+        ],
+        plugins: [],
+      })
+
+      store.$hooks.hook('fetchMany', ({ meta, setResult }) => {
+        const anyMeta = meta as any
+        anyMeta.meow = 'waf'
+        setResult([{ id: '1', text: 'hello' }])
+      })
+
+      const query = await store.messages.query(q => q.many({
+        fetchPolicy: 'cache-and-fetch',
+        meta: { meow: 'meow' } as any,
+      }))
+
+      await until(() => query.data.value.length).toBe(1)
+
+      expect((query.meta.value as any).meow).toBe('waf')
+    })
+  })
+
   it('should handle fetch errors', async () => {
     const store = await createStore({
       schema: [