Ensure liveQueryCollections are not ready until all it's source collections are ready

.changeset/clever-ducks-strive.md

@@ -0,0 +1,9 @@
+---
+"@tanstack/svelte-db": patch
+"@tanstack/react-db": patch
+"@tanstack/solid-db": patch
+"@tanstack/vue-db": patch
+"@tanstack/db": patch
+---
+
+Ensure that the ready status is correctly returned from a live query

packages/db/src/collection.ts

@@ -957,6 +957,12 @@ export class CollectionImpl<
     for (const listener of this.changeListeners) {
       listener([])
     }
+    // Emit to key-specific listeners
+    for (const [_key, keyListeners] of this.changeKeyListeners) {
+      for (const listener of keyListeners) {
+        listener([])
+      }
+    }
   }
 
   /**

packages/db/src/query/live-query-collection.ts

@@ -163,6 +163,12 @@ export function liveQueryCollectionOptions<
   const collections = extractCollectionsFromQuery(query)
 
   const allCollectionsReady = () => {
+    return Object.values(collections).every(
+      (collection) => collection.status === `ready`
+    )
+  }
+
+  const allCollectionsReadyOrInitialCommit = () => {
     return Object.values(collections).every(
       (collection) =>
         collection.status === `ready` || collection.status === `initialCommit`
@@ -294,7 +300,7 @@ export function liveQueryCollectionOptions<
 
       const maybeRunGraph = () => {
         // We only run the graph if all the collections are ready
-        if (allCollectionsReady()) {
+        if (allCollectionsReadyOrInitialCommit()) {
           graph.run()
           // On the initial run, we may need to do an empty commit to ensure that
           // the collection is initialized
@@ -303,7 +309,9 @@ export function liveQueryCollectionOptions<
             commit()
           }
           // Mark the collection as ready after the first successful run
-          markReady()
+          if (allCollectionsReady()) {
+            markReady()
+          }
         }
       }
 

packages/db/tests/query/indexes.test.ts

@@ -237,7 +237,7 @@ describe(`Query Index Optimization`, () => {
       getKey: (item) => item.id,
       startSync: true,
       sync: {
-        sync: ({ begin, write, commit }) => {
+        sync: ({ begin, write, commit, markReady }) => {
           // Provide initial data through sync
           begin()
           for (const item of testData) {
@@ -247,6 +247,7 @@ describe(`Query Index Optimization`, () => {
             })
           }
           commit()
+          markReady()
 
           // Listen for mutations and sync them back (only register once)
           if (!emitter.all.has(`sync`)) {
@@ -534,7 +535,7 @@ describe(`Query Index Optimization`, () => {
           getKey: (item) => item.id,
           startSync: true,
           sync: {
-            sync: ({ begin, write, commit }) => {
+            sync: ({ begin, write, commit, markReady }) => {
               begin()
               write({
                 type: `insert`,
@@ -547,6 +548,7 @@ describe(`Query Index Optimization`, () => {
                 },
               })
               commit()
+              markReady()
             },
           },
         })
@@ -622,7 +624,7 @@ describe(`Query Index Optimization`, () => {
         getKey: (item) => item.id,
         startSync: true,
         sync: {
-          sync: ({ begin, write, commit }) => {
+          sync: ({ begin, write, commit, markReady }) => {
             begin()
             write({
               type: `insert`,
@@ -645,6 +647,7 @@ describe(`Query Index Optimization`, () => {
               },
             })
             commit()
+            markReady()
           },
         },
       })

packages/db/tests/query/live-query-collection.test.ts

@@ -170,4 +170,23 @@ describe(`createLiveQueryCollection`, () => {
     expect(liveQuery.status).toBe(`ready`)
     expect(liveQuery.size).toBe(0)
   })
+
+  it(`shouldn't call markReady when source collection sync doesn't call markReady`, () => {
+    const collection = createCollection<{ id: string }>({
+      sync: {
+        sync({ begin, commit }) {
+          begin()
+          commit()
+        },
+      },
+      getKey: (item) => item.id,
+      startSync: true,
+    })
+
+    const liveQuery = createLiveQueryCollection({
+      query: (q) => q.from({ collection }),
+      startSync: true,
+    })
+    expect(liveQuery.isReady()).toBe(false)
+  })
 })

packages/react-db/tests/useLiveQuery.test.tsx

@@ -1077,15 +1077,17 @@ describe(`Query Collections`, () => {
     it(`should update isLoading when collection status changes`, async () => {
       let beginFn: (() => void) | undefined
       let commitFn: (() => void) | undefined
+      let markReadyFn: (() => void) | undefined
 
       const collection = createCollection<Person>({
         id: `status-change-has-loaded-test`,
         getKey: (person: Person) => person.id,
         startSync: false,
         sync: {
-          sync: ({ begin, commit }) => {
+          sync: ({ begin, commit, markReady }) => {
             beginFn = begin
             commitFn = commit
+            markReadyFn = markReady
             // Don't sync immediately
           },
         },
@@ -1116,9 +1118,10 @@ describe(`Query Collections`, () => {
 
       // Trigger the first commit to make collection ready
       act(() => {
-        if (beginFn && commitFn) {
+        if (beginFn && commitFn && markReadyFn) {
           beginFn()
           commitFn()
+          markReadyFn()
         }
       })
 
@@ -1202,8 +1205,10 @@ describe(`Query Collections`, () => {
     it(`should handle isLoading with complex queries including joins`, async () => {
       let personBeginFn: (() => void) | undefined
       let personCommitFn: (() => void) | undefined
+      let personMarkReadyFn: (() => void) | undefined
       let issueBeginFn: (() => void) | undefined
       let issueCommitFn: (() => void) | undefined
+      let issueMarkReadyFn: (() => void) | undefined
 
       const personCollection = createCollection<Person>({
         id: `join-has-loaded-persons`,
@@ -1212,10 +1217,8 @@ describe(`Query Collections`, () => {
         sync: {
           sync: ({ begin, commit, markReady }) => {
             personBeginFn = begin
-            personCommitFn = () => {
-              commit()
-              markReady()
-            }
+            personCommitFn = commit
+            personMarkReadyFn = markReady
             // Don't sync immediately
           },
         },
@@ -1231,10 +1234,8 @@ describe(`Query Collections`, () => {
         sync: {
           sync: ({ begin, commit, markReady }) => {
             issueBeginFn = begin
-            issueCommitFn = () => {
-              commit()
-              markReady()
-            }
+            issueCommitFn = commit
+            issueMarkReadyFn = markReady
             // Don't sync immediately
           },
         },
@@ -1269,13 +1270,15 @@ describe(`Query Collections`, () => {
 
       // Trigger the first commit for both collections to make them ready
       act(() => {
-        if (personBeginFn && personCommitFn) {
+        if (personBeginFn && personCommitFn && personMarkReadyFn) {
           personBeginFn()
           personCommitFn()
+          personMarkReadyFn()
         }
-        if (issueBeginFn && issueCommitFn) {
+        if (issueBeginFn && issueCommitFn && issueMarkReadyFn) {
           issueBeginFn()
           issueCommitFn()
+          issueMarkReadyFn()
         }
       })
 

packages/solid-db/tests/useLiveQuery.test.tsx

@@ -1053,15 +1053,17 @@ describe(`Query Collections`, () => {
     it(`should update isLoading when collection status changes`, async () => {
       let beginFn: (() => void) | undefined
       let commitFn: (() => void) | undefined
+      let markReadyFn: (() => void) | undefined
 
       const collection = createCollection<Person>({
         id: `status-change-has-loaded-test`,
         getKey: (person: Person) => person.id,
         startSync: false,
         sync: {
-          sync: ({ begin, commit }) => {
+          sync: ({ begin, commit, markReady }) => {
             beginFn = begin
             commitFn = commit
+            markReadyFn = markReady
             // Don't sync immediately
           },
         },
@@ -1089,9 +1091,10 @@ describe(`Query Collections`, () => {
       collection.preload()
 
       // Trigger the first commit to make collection ready
-      if (beginFn && commitFn) {
+      if (beginFn && commitFn && markReadyFn) {
         beginFn()
         commitFn()
+        markReadyFn()
       }
 
       // Insert data
@@ -1172,8 +1175,10 @@ describe(`Query Collections`, () => {
     it(`should handle isLoading with complex queries including joins`, async () => {
       let personBeginFn: (() => void) | undefined
       let personCommitFn: (() => void) | undefined
+      let personMarkReadyFn: (() => void) | undefined
       let issueBeginFn: (() => void) | undefined
       let issueCommitFn: (() => void) | undefined
+      let issueMarkReadyFn: (() => void) | undefined
 
       const personCollection = createCollection<Person>({
         id: `join-has-loaded-persons`,
@@ -1182,10 +1187,8 @@ describe(`Query Collections`, () => {
         sync: {
           sync: ({ begin, commit, markReady }) => {
             personBeginFn = begin
-            personCommitFn = () => {
-              commit()
-              markReady()
-            }
+            personCommitFn = commit
+            personMarkReadyFn = markReady
             // Don't sync immediately
           },
         },
@@ -1201,10 +1204,8 @@ describe(`Query Collections`, () => {
         sync: {
           sync: ({ begin, commit, markReady }) => {
             issueBeginFn = begin
-            issueCommitFn = () => {
-              commit()
-              markReady()
-            }
+            issueCommitFn = commit
+            issueMarkReadyFn = markReady
             // Don't sync immediately
           },
         },
@@ -1236,13 +1237,15 @@ describe(`Query Collections`, () => {
       issueCollection.preload()
 
       // Trigger the first commit for both collections to make them ready
-      if (personBeginFn && personCommitFn) {
+      if (personBeginFn && personCommitFn && personMarkReadyFn) {
         personBeginFn()
         personCommitFn()
+        personMarkReadyFn()
       }
-      if (issueBeginFn && issueCommitFn) {
+      if (issueBeginFn && issueCommitFn && issueMarkReadyFn) {
         issueBeginFn()
         issueCommitFn()
+        issueMarkReadyFn()
       }
 
       // Insert data into both collections

packages/svelte-db/src/useLiveQuery.svelte.ts

@@ -1,4 +1,4 @@
-import { untrack } from "svelte"
+import { flushSync, untrack } from "svelte"
 import { createLiveQueryCollection } from "@tanstack/db"
 import { SvelteMap } from "svelte/reactivity"
 import type {
@@ -246,7 +246,10 @@ export function useLiveQuery(
 
     if (isCollection) {
       // It's already a collection, ensure sync is started for Svelte helpers
-      unwrappedParam.startSyncImmediate()
+      // Only start sync if the collection is in idle state
+      if (unwrappedParam.status === `idle`) {
+        unwrappedParam.startSyncImmediate()
+      }
       return unwrappedParam
     }
 
@@ -312,6 +315,15 @@ export function useLiveQuery(
     // Initialize data array in correct order
     syncDataFromCollection(currentCollection)
 
+    // Listen for the first ready event to catch status transitions
+    // that might not trigger change events (fixes async status transition bug)
+    currentCollection.onFirstReady(() => {
+      // Use flushSync to ensure Svelte reactivity updates properly
+      flushSync(() => {
+        status = currentCollection.status
+      })
+    })
+
     // Subscribe to collection changes with granular updates
     currentUnsubscribe = currentCollection.subscribeChanges(
       (changes: Array<ChangeMessage<any>>) => {