@tanstack/solid-db 0.2.31 → 0.2.32

package/README.md

@@ -1,3 +1,20 @@
+<div align="center">
+  <picture>
+    <source
+      media="(prefers-color-scheme: dark)"
+      srcset="https://tanstack.com/api/readme/db.png?framework=solid&theme=dark"
+    />
+    <source
+      media="(prefers-color-scheme: light)"
+      srcset="https://tanstack.com/api/readme/db.png?framework=solid"
+    />
+    <img
+      src="https://tanstack.com/api/readme/db.png?framework=solid"
+      alt="TanStack Solid DB"
+      width="900"
+    />
+  </picture>
+</div>
 # @tanstack/solid-db
 
 Solidjs hooks for TanStack DB. See [TanStack/db](https://github.com/TanStack/db) for more details.

package/dist/esm/useLiveQuery.js

@@ -1,6 +1,6 @@
 import { createMemo, createSignal, createResource, batch, createEffect, onCleanup } from "solid-js";
 import { ReactiveMap } from "@solid-primitives/map";
-import { BaseQueryBuilder, createLiveQueryCollection, isCollection, isSingleResultCollection } from "@tanstack/db";
+import { BaseQueryBuilder, createLiveQueryCollection, isCollection, createLiveQueryObserver, isSingleResultCollection } from "@tanstack/db";
 import { createStore, reconcile } from "solid-js/store";
 function useLiveQuery(configOrQueryOrCollection) {
   const collection = createMemo(
@@ -47,9 +47,11 @@ function useLiveQuery(configOrQueryOrCollection) {
       (prev) => reconcile(Array.from(currentCollection.values()))(prev).filter(Boolean)
     );
   };
+  let resourceGeneration = 0;
   const [getDataResource] = createResource(
     () => ({ currentCollection: collection() }),
     async ({ currentCollection }) => {
+      const generation = ++resourceGeneration;
       if (!currentCollection) {
         return [];
       }
@@ -57,9 +59,12 @@ function useLiveQuery(configOrQueryOrCollection) {
       try {
         await currentCollection.toArrayWhenReady();
       } catch (error) {
-        setStatus(`error`);
+        if (generation === resourceGeneration) setStatus(`error`);
         throw error;
       }
+      if (generation !== resourceGeneration) {
+        return data;
+      }
       batch(() => {
         state.clear();
         for (const [key, value] of currentCollection.entries()) {
@@ -84,31 +89,41 @@ function useLiveQuery(configOrQueryOrCollection) {
       setData([]);
       return;
     }
-    const subscription = currentCollection.subscribeChanges(
+    const observer = createLiveQueryObserver(currentCollection);
+    state.clear();
+    const unsubscribe = observer.subscribe(
       (changes) => {
         batch(() => {
-          for (const change of changes) {
-            switch (change.type) {
-              case `insert`:
-              case `update`:
-                state.set(change.key, change.value);
-                break;
-              case `delete`:
-                state.delete(change.key);
-                break;
+          if (changes) {
+            for (const change of changes) {
+              switch (change.type) {
+                case `insert`:
+                case `update`:
+                  state.set(change.key, change.value);
+                  break;
+                case `delete`:
+                  state.delete(change.key);
+                  break;
+              }
+            }
+          } else {
+            state.clear();
+            for (const [key, value] of observer.getSnapshot().state ?? []) {
+              state.set(key, value);
             }
           }
           syncDataFromCollection(currentCollection);
-          setStatus(currentCollection.status);
+          setStatus(observer.getSnapshot().status);
         });
-      },
-      {
-        // Include initial state to ensure immediate population for pre-created collections
-        includeInitialState: true
       }
     );
+    batch(() => {
+      syncDataFromCollection(currentCollection);
+      setStatus(observer.getSnapshot().status);
+    });
     onCleanup(() => {
-      subscription.unsubscribe();
+      unsubscribe();
+      observer.dispose();
     });
   });
   function getData() {

package/dist/esm/useLiveQuery.js.map

@@ -1 +1 @@
-{"version":3,"file":"useLiveQuery.js","sources":["../../src/useLiveQuery.ts"],"sourcesContent":["import {\n  batch,\n  createEffect,\n  createMemo,\n  createResource,\n  createSignal,\n  onCleanup,\n} from 'solid-js'\nimport { ReactiveMap } from '@solid-primitives/map'\nimport {\n  BaseQueryBuilder,\n  createLiveQueryCollection,\n  isCollection,\n  isSingleResultCollection,\n} from '@tanstack/db'\nimport { createStore, reconcile } from 'solid-js/store'\nimport type { Accessor } from 'solid-js'\nimport type {\n  ChangeMessage,\n  Collection,\n  CollectionStatus,\n  Context,\n  GetResult,\n  InferResultType,\n  InitialQueryBuilder,\n  LiveQueryCollectionConfig,\n  NonSingleResult,\n  QueryBuilder,\n  SingleResult,\n} from '@tanstack/db'\n\n/**\n * Create a live query using a query function\n * @param queryFn - Query function that defines what data to fetch\n * @returns Accessor that returns data with Suspense support, with state and status information as properties\n * @example\n * // Basic query with object syntax\n * const todosQuery = useLiveQuery((q) =>\n *   q.from({ todos: todosCollection })\n *    .where(({ todos }) => eq(todos.completed, false))\n *    .select(({ todos }) => ({ id: todos.id, text: todos.text }))\n * )\n *\n * @example\n * // With dependencies that trigger re-execution\n * const todosQuery = useLiveQuery(\n *   (q) => q.from({ todos: todosCollection })\n *          .where(({ todos }) => gt(todos.priority, minPriority())),\n * )\n *\n * @example\n * // Join pattern\n * const personIssues = useLiveQuery((q) =>\n *   q.from({ issues: issueCollection })\n *    .join({ persons: personCollection }, ({ issues, persons }) =>\n *      eq(issues.userId, persons.id)\n *    )\n *    .select(({ issues, persons }) => ({\n *      id: issues.id,\n *      title: issues.title,\n *      userName: persons.name\n *    }))\n * )\n *\n * @example\n * // Handle loading and error states\n * const todosQuery = useLiveQuery((q) =>\n *   q.from({ todos: todoCollection })\n * )\n *\n * return (\n *   <Switch>\n *     <Match when={todosQuery.isLoading}>\n *       <div>Loading...</div>\n *     </Match>\n *     <Match when={todosQuery.isError}>\n *       <div>Error: {todosQuery.status}</div>\n *     </Match>\n *     <Match when={todosQuery.isReady}>\n *       <For each={todosQuery()}>\n *         {(todo) => <li key={todo.id}>{todo.text}</li>}\n *       </For>\n *     </Match>\n *   </Switch>\n * )\n *\n * @example\n * // Use Suspense boundaries\n * const todosQuery = useLiveQuery((q) =>\n *   q.from({ todos: todoCollection })\n * )\n *\n * return (\n *   <Suspense fallback={<div>Loading...</div>}>\n *     <For each={todosQuery()}>\n *       {(todo) => <li key={todo.id}>{todo.text}</li>}\n *     </For>\n *   </Suspense>\n * )\n */\n// Overload 1: Accept query function that always returns QueryBuilder\nexport function useLiveQuery<TContext extends Context>(\n  queryFn: (q: InitialQueryBuilder) => QueryBuilder<TContext>,\n): Accessor<InferResultType<TContext>> & {\n  /**\n   * @deprecated use function result instead\n   * query.data -> query()\n   */\n  data: InferResultType<TContext>\n  state: ReactiveMap<string | number, GetResult<TContext>>\n  collection: Collection<GetResult<TContext>, string | number, {}>\n  status: CollectionStatus\n  isLoading: boolean\n  isReady: boolean\n  isIdle: boolean\n  isError: boolean\n  isCleanedUp: boolean\n}\n\n// Overload 1b: Accept query function that can return undefined/null\nexport function useLiveQuery<TContext extends Context>(\n  queryFn: (\n    q: InitialQueryBuilder,\n  ) => QueryBuilder<TContext> | undefined | null,\n): Accessor<InferResultType<TContext>> & {\n  /**\n   * @deprecated use function result instead\n   * query.data -> query()\n   */\n  data: InferResultType<TContext>\n  state: ReactiveMap<string | number, GetResult<TContext>>\n  collection: Collection<GetResult<TContext>, string | number, {}> | null\n  status: CollectionStatus | `disabled`\n  isLoading: boolean\n  isReady: boolean\n  isIdle: boolean\n  isError: boolean\n  isCleanedUp: boolean\n}\n\n/**\n * Create a live query using configuration object\n * @param config - Configuration object with query and options\n * @returns Accessor that returns data with Suspense support, with state and status information as properties\n * @example\n * // Basic config object usage\n * const todosQuery = useLiveQuery(() => ({\n *   query: (q) => q.from({ todos: todosCollection }),\n *   gcTime: 60000\n * }))\n *\n * @example\n * // With query builder and options\n * const queryBuilder = new Query()\n *   .from({ persons: collection })\n *   .where(({ persons }) => gt(persons.age, 30))\n *   .select(({ persons }) => ({ id: persons.id, name: persons.name }))\n *\n * const personsQuery = useLiveQuery(() => ({ query: queryBuilder }))\n *\n * @example\n * // Handle all states uniformly\n * const itemsQuery = useLiveQuery(() => ({\n *   query: (q) => q.from({ items: itemCollection })\n * }))\n *\n * return (\n *   <Switch fallback={<div>{itemsQuery().length} items loaded</div>}>\n *     <Match when={itemsQuery.isLoading}>\n *       <div>Loading...</div>\n *     </Match>\n *     <Match when={itemsQuery.isError}>\n *       <div>Something went wrong</div>\n *     </Match>\n *     <Match when={!itemsQuery.isReady}>\n *       <div>Preparing...</div>\n *     </Match>\n *   </Switch>\n * )\n */\n// Overload 2: Accept config object\nexport function useLiveQuery<TContext extends Context>(\n  config: Accessor<LiveQueryCollectionConfig<TContext>>,\n): Accessor<InferResultType<TContext>> & {\n  /**\n   * @deprecated use function result instead\n   * query.data -> query()\n   */\n  data: InferResultType<TContext>\n  state: ReactiveMap<string | number, GetResult<TContext>>\n  collection: Collection<GetResult<TContext>, string | number, {}>\n  status: CollectionStatus\n  isLoading: boolean\n  isReady: boolean\n  isIdle: boolean\n  isError: boolean\n  isCleanedUp: boolean\n}\n\n/**\n * Subscribe to an existing live query collection\n * @param liveQueryCollection - Pre-created live query collection to subscribe to\n * @returns Accessor that returns data with Suspense support, with state and status information as properties\n * @example\n * // Using pre-created live query collection\n * const myLiveQuery = createLiveQueryCollection((q) =>\n *   q.from({ todos: todosCollection }).where(({ todos }) => eq(todos.active, true))\n * )\n * const todosQuery = useLiveQuery(() => myLiveQuery)\n *\n * @example\n * // Access collection methods directly\n * const existingQuery = useLiveQuery(() => existingCollection)\n *\n * // Use collection for mutations\n * const handleToggle = (id) => {\n *   existingQuery.collection.update(id, draft => { draft.completed = !draft.completed })\n * }\n *\n * @example\n * // Handle states consistently\n * const sharedQuery = useLiveQuery(() => sharedCollection)\n *\n * return (\n *  <Switch fallback={<div><For each={sharedQuery()}>{(item) => <Item key={item.id} {...item} />}</For></div>}>\n *    <Match when={sharedQuery.isLoading}>\n *      <div>Loading...</div>\n *    </Match>\n *    <Match when={sharedQuery.isError}>\n *      <div>Error loading data</div>\n *    </Match>\n *  </Switch>\n * )\n */\n// Overload 3: Accept pre-created live query collection (non-single result)\nexport function useLiveQuery<\n  TResult extends object,\n  TKey extends string | number,\n  TUtils extends Record<string, any>,\n>(\n  liveQueryCollection: Accessor<\n    Collection<TResult, TKey, TUtils> & NonSingleResult\n  >,\n): Accessor<Array<TResult>> & {\n  /**\n   * @deprecated use function result instead\n   * query.data -> query()\n   */\n  data: Array<TResult>\n  state: ReactiveMap<TKey, TResult>\n  collection: Collection<TResult, TKey, TUtils>\n  status: CollectionStatus\n  isLoading: boolean\n  isReady: boolean\n  isIdle: boolean\n  isError: boolean\n  isCleanedUp: boolean\n}\n\n// Overload 3b: Accept pre-created live query collection with singleResult: true\nexport function useLiveQuery<\n  TResult extends object,\n  TKey extends string | number,\n  TUtils extends Record<string, any>,\n>(\n  liveQueryCollection: Accessor<\n    Collection<TResult, TKey, TUtils> & SingleResult\n  >,\n): Accessor<TResult | undefined> & {\n  /**\n   * @deprecated use function result instead\n   * query.data -> query()\n   */\n  data: TResult | undefined\n  state: ReactiveMap<TKey, TResult>\n  collection: Collection<TResult, TKey, TUtils> & SingleResult\n  status: CollectionStatus\n  isLoading: boolean\n  isReady: boolean\n  isIdle: boolean\n  isError: boolean\n  isCleanedUp: boolean\n}\n\n// Implementation - use function overloads to infer the actual collection type\nexport function useLiveQuery(\n  configOrQueryOrCollection: (queryFn?: any) => any,\n) {\n  const collection = createMemo(\n    () => {\n      if (configOrQueryOrCollection.length === 1) {\n        // This is a query function - check if it returns null/undefined\n        const queryBuilder = new BaseQueryBuilder() as InitialQueryBuilder\n        const result = configOrQueryOrCollection(queryBuilder)\n\n        if (result === undefined || result === null) {\n          // Disabled query - return null\n          return null\n        }\n\n        return createLiveQueryCollection({\n          query: configOrQueryOrCollection,\n          startSync: true,\n        })\n      }\n\n      const innerCollection = configOrQueryOrCollection()\n\n      if (innerCollection === undefined || innerCollection === null) {\n        // Disabled query - return null\n        return null\n      }\n\n      if (isCollection(innerCollection)) {\n        innerCollection.startSyncImmediate()\n        return innerCollection as Collection\n      }\n\n      return createLiveQueryCollection({\n        ...innerCollection,\n        startSync: true,\n      })\n    },\n    undefined,\n    { name: `TanstackDBCollectionMemo` },\n  )\n\n  // Reactive state that gets updated granularly through change events\n  const state = new ReactiveMap<string | number, any>()\n\n  // Reactive data array that maintains sorted order\n  const [data, setData] = createStore<Array<any>>([], {\n    name: `TanstackDBData`,\n  })\n\n  // Track collection status reactively\n  const [status, setStatus] = createSignal(\n    collection() ? collection()!.status : (`disabled` as const),\n    {\n      name: `TanstackDBStatus`,\n    },\n  )\n\n  // Helper to sync data array from collection in correct order\n  const syncDataFromCollection = (\n    currentCollection: Collection<any, any, any>,\n  ) => {\n    setData((prev) =>\n      reconcile(Array.from(currentCollection.values()))(prev).filter(Boolean),\n    )\n  }\n\n  const [getDataResource] = createResource(\n    () => ({ currentCollection: collection() }),\n    async ({ currentCollection }) => {\n      if (!currentCollection) {\n        return []\n      }\n      setStatus(currentCollection.status)\n      try {\n        await currentCollection.toArrayWhenReady()\n      } catch (error) {\n        setStatus(`error`)\n        throw error\n      }\n      // Initialize state with current collection data\n      batch(() => {\n        state.clear()\n        for (const [key, value] of currentCollection.entries()) {\n          state.set(key, value)\n        }\n        syncDataFromCollection(currentCollection)\n        setStatus(currentCollection.status)\n      })\n      return data\n    },\n    {\n      name: `TanstackDBData`,\n      deferStream: false,\n      initialValue: data,\n    },\n  )\n\n  createEffect(() => {\n    const currentCollection = collection()\n    if (!currentCollection) {\n      setStatus(`disabled` as const)\n      state.clear()\n      setData([])\n      return\n    }\n    const subscription = currentCollection.subscribeChanges(\n      (changes: Array<ChangeMessage<any>>) => {\n        // Apply each change individually to the reactive state\n        batch(() => {\n          for (const change of changes) {\n            switch (change.type) {\n              case `insert`:\n              case `update`:\n                state.set(change.key, change.value)\n                break\n              case `delete`:\n                state.delete(change.key)\n                break\n            }\n          }\n\n          syncDataFromCollection(currentCollection)\n\n          // Update status ref on every change\n          setStatus(currentCollection.status)\n        })\n      },\n      {\n        // Include initial state to ensure immediate population for pre-created collections\n        includeInitialState: true,\n      },\n    )\n\n    onCleanup(() => {\n      subscription.unsubscribe()\n    })\n  })\n\n  // We have to remove getters from the resource function so we wrap it\n  function getData() {\n    const currentCollection = collection()\n    if (currentCollection) {\n      if (isSingleResultCollection(currentCollection)) {\n        // Force resource tracking so Suspense works\n        getDataResource()\n        return data[0]\n      }\n    }\n    return getDataResource()\n  }\n\n  Object.defineProperties(getData, {\n    data: {\n      get() {\n        return getData()\n      },\n    },\n    status: {\n      get() {\n        return status()\n      },\n    },\n    collection: {\n      get() {\n        return collection()\n      },\n    },\n    state: {\n      get() {\n        return state\n      },\n    },\n    isLoading: {\n      get() {\n        return status() === `loading`\n      },\n    },\n    isReady: {\n      get() {\n        return status() === `ready` || status() === `disabled`\n      },\n    },\n    isIdle: {\n      get() {\n        return status() === `idle`\n      },\n    },\n    isError: {\n      get() {\n        return status() === `error`\n      },\n    },\n    isCleanedUp: {\n      get() {\n        return status() === `cleaned-up`\n      },\n    },\n  })\n  return getData\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"useLiveQuery.js","sources":["../../src/useLiveQuery.ts"],"sourcesContent":["import {\n  batch,\n  createEffect,\n  createMemo,\n  createResource,\n  createSignal,\n  onCleanup,\n} from 'solid-js'\nimport { ReactiveMap } from '@solid-primitives/map'\nimport {\n  BaseQueryBuilder,\n  createLiveQueryCollection,\n  createLiveQueryObserver,\n  isCollection,\n  isSingleResultCollection,\n} from '@tanstack/db'\nimport { createStore, reconcile } from 'solid-js/store'\nimport type { Accessor } from 'solid-js'\nimport type {\n  ChangeMessage,\n  Collection,\n  CollectionStatus,\n  Context,\n  GetResult,\n  InferResultType,\n  InitialQueryBuilder,\n  LiveQueryCollectionConfig,\n  NonSingleResult,\n  QueryBuilder,\n  SingleResult,\n} from '@tanstack/db'\n\n/**\n * Create a live query using a query function\n * @param queryFn - Query function that defines what data to fetch\n * @returns Accessor that returns data with Suspense support, with state and status information as properties\n * @example\n * // Basic query with object syntax\n * const todosQuery = useLiveQuery((q) =>\n *   q.from({ todos: todosCollection })\n *    .where(({ todos }) => eq(todos.completed, false))\n *    .select(({ todos }) => ({ id: todos.id, text: todos.text }))\n * )\n *\n * @example\n * // With dependencies that trigger re-execution\n * const todosQuery = useLiveQuery(\n *   (q) => q.from({ todos: todosCollection })\n *          .where(({ todos }) => gt(todos.priority, minPriority())),\n * )\n *\n * @example\n * // Join pattern\n * const personIssues = useLiveQuery((q) =>\n *   q.from({ issues: issueCollection })\n *    .join({ persons: personCollection }, ({ issues, persons }) =>\n *      eq(issues.userId, persons.id)\n *    )\n *    .select(({ issues, persons }) => ({\n *      id: issues.id,\n *      title: issues.title,\n *      userName: persons.name\n *    }))\n * )\n *\n * @example\n * // Handle loading and error states\n * const todosQuery = useLiveQuery((q) =>\n *   q.from({ todos: todoCollection })\n * )\n *\n * return (\n *   <Switch>\n *     <Match when={todosQuery.isLoading}>\n *       <div>Loading...</div>\n *     </Match>\n *     <Match when={todosQuery.isError}>\n *       <div>Error: {todosQuery.status}</div>\n *     </Match>\n *     <Match when={todosQuery.isReady}>\n *       <For each={todosQuery()}>\n *         {(todo) => <li key={todo.id}>{todo.text}</li>}\n *       </For>\n *     </Match>\n *   </Switch>\n * )\n *\n * @example\n * // Use Suspense boundaries\n * const todosQuery = useLiveQuery((q) =>\n *   q.from({ todos: todoCollection })\n * )\n *\n * return (\n *   <Suspense fallback={<div>Loading...</div>}>\n *     <For each={todosQuery()}>\n *       {(todo) => <li key={todo.id}>{todo.text}</li>}\n *     </For>\n *   </Suspense>\n * )\n */\n// Overload 1: Accept query function that always returns QueryBuilder\nexport function useLiveQuery<TContext extends Context>(\n  queryFn: (q: InitialQueryBuilder) => QueryBuilder<TContext>,\n): Accessor<InferResultType<TContext>> & {\n  /**\n   * @deprecated use function result instead\n   * query.data -> query()\n   */\n  data: InferResultType<TContext>\n  state: ReactiveMap<string | number, GetResult<TContext>>\n  collection: Collection<GetResult<TContext>, string | number, {}>\n  status: CollectionStatus\n  isLoading: boolean\n  isReady: boolean\n  isIdle: boolean\n  isError: boolean\n  isCleanedUp: boolean\n}\n\n// Overload 1b: Accept query function that can return undefined/null\nexport function useLiveQuery<TContext extends Context>(\n  queryFn: (\n    q: InitialQueryBuilder,\n  ) => QueryBuilder<TContext> | undefined | null,\n): Accessor<InferResultType<TContext>> & {\n  /**\n   * @deprecated use function result instead\n   * query.data -> query()\n   */\n  data: InferResultType<TContext>\n  state: ReactiveMap<string | number, GetResult<TContext>>\n  collection: Collection<GetResult<TContext>, string | number, {}> | null\n  status: CollectionStatus | `disabled`\n  isLoading: boolean\n  isReady: boolean\n  isIdle: boolean\n  isError: boolean\n  isCleanedUp: boolean\n}\n\n/**\n * Create a live query using configuration object\n * @param config - Configuration object with query and options\n * @returns Accessor that returns data with Suspense support, with state and status information as properties\n * @example\n * // Basic config object usage\n * const todosQuery = useLiveQuery(() => ({\n *   query: (q) => q.from({ todos: todosCollection }),\n *   gcTime: 60000\n * }))\n *\n * @example\n * // With query builder and options\n * const queryBuilder = new Query()\n *   .from({ persons: collection })\n *   .where(({ persons }) => gt(persons.age, 30))\n *   .select(({ persons }) => ({ id: persons.id, name: persons.name }))\n *\n * const personsQuery = useLiveQuery(() => ({ query: queryBuilder }))\n *\n * @example\n * // Handle all states uniformly\n * const itemsQuery = useLiveQuery(() => ({\n *   query: (q) => q.from({ items: itemCollection })\n * }))\n *\n * return (\n *   <Switch fallback={<div>{itemsQuery().length} items loaded</div>}>\n *     <Match when={itemsQuery.isLoading}>\n *       <div>Loading...</div>\n *     </Match>\n *     <Match when={itemsQuery.isError}>\n *       <div>Something went wrong</div>\n *     </Match>\n *     <Match when={!itemsQuery.isReady}>\n *       <div>Preparing...</div>\n *     </Match>\n *   </Switch>\n * )\n */\n// Overload 2: Accept config object\nexport function useLiveQuery<TContext extends Context>(\n  config: Accessor<LiveQueryCollectionConfig<TContext>>,\n): Accessor<InferResultType<TContext>> & {\n  /**\n   * @deprecated use function result instead\n   * query.data -> query()\n   */\n  data: InferResultType<TContext>\n  state: ReactiveMap<string | number, GetResult<TContext>>\n  collection: Collection<GetResult<TContext>, string | number, {}>\n  status: CollectionStatus\n  isLoading: boolean\n  isReady: boolean\n  isIdle: boolean\n  isError: boolean\n  isCleanedUp: boolean\n}\n\n/**\n * Subscribe to an existing live query collection\n * @param liveQueryCollection - Pre-created live query collection to subscribe to\n * @returns Accessor that returns data with Suspense support, with state and status information as properties\n * @example\n * // Using pre-created live query collection\n * const myLiveQuery = createLiveQueryCollection((q) =>\n *   q.from({ todos: todosCollection }).where(({ todos }) => eq(todos.active, true))\n * )\n * const todosQuery = useLiveQuery(() => myLiveQuery)\n *\n * @example\n * // Access collection methods directly\n * const existingQuery = useLiveQuery(() => existingCollection)\n *\n * // Use collection for mutations\n * const handleToggle = (id) => {\n *   existingQuery.collection.update(id, draft => { draft.completed = !draft.completed })\n * }\n *\n * @example\n * // Handle states consistently\n * const sharedQuery = useLiveQuery(() => sharedCollection)\n *\n * return (\n *  <Switch fallback={<div><For each={sharedQuery()}>{(item) => <Item key={item.id} {...item} />}</For></div>}>\n *    <Match when={sharedQuery.isLoading}>\n *      <div>Loading...</div>\n *    </Match>\n *    <Match when={sharedQuery.isError}>\n *      <div>Error loading data</div>\n *    </Match>\n *  </Switch>\n * )\n */\n// Overload 3: Accept pre-created live query collection (non-single result)\nexport function useLiveQuery<\n  TResult extends object,\n  TKey extends string | number,\n  TUtils extends Record<string, any>,\n>(\n  liveQueryCollection: Accessor<\n    Collection<TResult, TKey, TUtils> & NonSingleResult\n  >,\n): Accessor<Array<TResult>> & {\n  /**\n   * @deprecated use function result instead\n   * query.data -> query()\n   */\n  data: Array<TResult>\n  state: ReactiveMap<TKey, TResult>\n  collection: Collection<TResult, TKey, TUtils>\n  status: CollectionStatus\n  isLoading: boolean\n  isReady: boolean\n  isIdle: boolean\n  isError: boolean\n  isCleanedUp: boolean\n}\n\n// Overload 3b: Accept pre-created live query collection with singleResult: true\nexport function useLiveQuery<\n  TResult extends object,\n  TKey extends string | number,\n  TUtils extends Record<string, any>,\n>(\n  liveQueryCollection: Accessor<\n    Collection<TResult, TKey, TUtils> & SingleResult\n  >,\n): Accessor<TResult | undefined> & {\n  /**\n   * @deprecated use function result instead\n   * query.data -> query()\n   */\n  data: TResult | undefined\n  state: ReactiveMap<TKey, TResult>\n  collection: Collection<TResult, TKey, TUtils> & SingleResult\n  status: CollectionStatus\n  isLoading: boolean\n  isReady: boolean\n  isIdle: boolean\n  isError: boolean\n  isCleanedUp: boolean\n}\n\n// Implementation - use function overloads to infer the actual collection type\nexport function useLiveQuery(\n  configOrQueryOrCollection: (queryFn?: any) => any,\n) {\n  const collection = createMemo(\n    () => {\n      if (configOrQueryOrCollection.length === 1) {\n        // This is a query function - check if it returns null/undefined\n        const queryBuilder = new BaseQueryBuilder() as InitialQueryBuilder\n        const result = configOrQueryOrCollection(queryBuilder)\n\n        if (result === undefined || result === null) {\n          // Disabled query - return null\n          return null\n        }\n\n        return createLiveQueryCollection({\n          query: configOrQueryOrCollection,\n          startSync: true,\n        })\n      }\n\n      const innerCollection = configOrQueryOrCollection()\n\n      if (innerCollection === undefined || innerCollection === null) {\n        // Disabled query - return null\n        return null\n      }\n\n      if (isCollection(innerCollection)) {\n        innerCollection.startSyncImmediate()\n        return innerCollection as Collection\n      }\n\n      return createLiveQueryCollection({\n        ...innerCollection,\n        startSync: true,\n      })\n    },\n    undefined,\n    { name: `TanstackDBCollectionMemo` },\n  )\n\n  // Reactive state that gets updated granularly through change events\n  const state = new ReactiveMap<string | number, any>()\n\n  // Reactive data array that maintains sorted order\n  const [data, setData] = createStore<Array<any>>([], {\n    name: `TanstackDBData`,\n  })\n\n  // Track collection status reactively\n  const [status, setStatus] = createSignal(\n    collection() ? collection()!.status : (`disabled` as const),\n    {\n      name: `TanstackDBStatus`,\n    },\n  )\n\n  // Helper to sync data array from collection in correct order\n  const syncDataFromCollection = (\n    currentCollection: Collection<any, any, any>,\n  ) => {\n    setData((prev) =>\n      reconcile(Array.from(currentCollection.values()))(prev).filter(Boolean),\n    )\n  }\n\n  // Generation guard for the resource's async continuations: Solid discards a\n  // superseded fetch's *return value*, but the writes below are side effects\n  // into hook-scoped state and would still run — resurrecting rows/status from\n  // a collection that has already been replaced.\n  let resourceGeneration = 0\n\n  const [getDataResource] = createResource(\n    () => ({ currentCollection: collection() }),\n    async ({ currentCollection }) => {\n      const generation = ++resourceGeneration\n      if (!currentCollection) {\n        return []\n      }\n      setStatus(currentCollection.status)\n      try {\n        await currentCollection.toArrayWhenReady()\n      } catch (error) {\n        if (generation === resourceGeneration) setStatus(`error`)\n        throw error\n      }\n      if (generation !== resourceGeneration) {\n        return data\n      }\n      // Initialize state with current collection data\n      batch(() => {\n        state.clear()\n        for (const [key, value] of currentCollection.entries()) {\n          state.set(key, value)\n        }\n        syncDataFromCollection(currentCollection)\n        setStatus(currentCollection.status)\n      })\n      return data\n    },\n    {\n      name: `TanstackDBData`,\n      deferStream: false,\n      initialValue: data,\n    },\n  )\n\n  createEffect(() => {\n    const currentCollection = collection()\n    if (!currentCollection) {\n      setStatus(`disabled` as const)\n      state.clear()\n      setData([])\n      return\n    }\n\n    // The shared observer owns subscription, the ready-race, and status; Solid\n    // materializes into its keyed ReactiveMap (granular) + reconciled store.\n    const observer = createLiveQueryObserver(currentCollection)\n    // Clear any keys carried over from a previous collection before the new\n    // observer re-seeds via `includeInitialState` (which only inserts current\n    // rows, never deletes stale ones). Without this, switching collections\n    // leaves the dropped keys in `state` until the async resource reconciles.\n    state.clear()\n    const unsubscribe = observer.subscribe(\n      (changes: Array<ChangeMessage<any>> | undefined) => {\n        batch(() => {\n          if (changes) {\n            for (const change of changes) {\n              switch (change.type) {\n                case `insert`:\n                case `update`:\n                  state.set(change.key, change.value)\n                  break\n                case `delete`:\n                  state.delete(change.key)\n                  break\n              }\n            }\n          } else {\n            // Cleanup and other status-only publications carry no row deltas.\n            // Rebuild the keyed view so it cannot diverge from ordered data.\n            state.clear()\n            for (const [key, value] of observer.getSnapshot().state ?? []) {\n              state.set(key, value)\n            }\n          }\n          syncDataFromCollection(currentCollection)\n          setStatus(observer.getSnapshot().status)\n        })\n      },\n    )\n    // An already-ready empty collection produces no initial row batch. Bring\n    // ordered data and status in line synchronously instead of waiting for the\n    // resource continuation to correct the previous collection's rows.\n    batch(() => {\n      syncDataFromCollection(currentCollection)\n      setStatus(observer.getSnapshot().status)\n    })\n\n    onCleanup(() => {\n      unsubscribe()\n      observer.dispose()\n    })\n  })\n\n  // We have to remove getters from the resource function so we wrap it\n  function getData() {\n    const currentCollection = collection()\n    if (currentCollection) {\n      if (isSingleResultCollection(currentCollection)) {\n        // Force resource tracking so Suspense works\n        getDataResource()\n        return data[0]\n      }\n    }\n    return getDataResource()\n  }\n\n  Object.defineProperties(getData, {\n    data: {\n      get() {\n        return getData()\n      },\n    },\n    status: {\n      get() {\n        return status()\n      },\n    },\n    collection: {\n      get() {\n        return collection()\n      },\n    },\n    state: {\n      get() {\n        return state\n      },\n    },\n    isLoading: {\n      get() {\n        return status() === `loading`\n      },\n    },\n    isReady: {\n      get() {\n        return status() === `ready` || status() === `disabled`\n      },\n    },\n    isIdle: {\n      get() {\n        return status() === `idle`\n      },\n    },\n    isError: {\n      get() {\n        return status() === `error`\n      },\n    },\n    isCleanedUp: {\n      get() {\n        return status() === `cleaned-up`\n      },\n    },\n  })\n  return getData\n}\n"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/solid-db",
-  "version": "0.2.31",
+  "version": "0.2.32",
   "description": "Solid integration for @tanstack/db",
   "author": "Kyle Mathews",
   "license": "MIT",
@@ -37,7 +37,7 @@
   ],
   "dependencies": {
     "@solid-primitives/map": "^0.7.2",
-    "@tanstack/db": "0.6.17"
+    "@tanstack/db": "0.7.0"
   },
   "peerDependencies": {
     "solid-js": ">=1.9.0"

package/src/useLiveQuery.ts

@@ -10,6 +10,7 @@ import { ReactiveMap } from '@solid-primitives/map'
 import {
   BaseQueryBuilder,
   createLiveQueryCollection,
+  createLiveQueryObserver,
   isCollection,
   isSingleResultCollection,
 } from '@tanstack/db'
@@ -350,9 +351,16 @@ export function useLiveQuery(
     )
   }
 
+  // Generation guard for the resource's async continuations: Solid discards a
+  // superseded fetch's *return value*, but the writes below are side effects
+  // into hook-scoped state and would still run — resurrecting rows/status from
+  // a collection that has already been replaced.
+  let resourceGeneration = 0
+
   const [getDataResource] = createResource(
     () => ({ currentCollection: collection() }),
     async ({ currentCollection }) => {
+      const generation = ++resourceGeneration
       if (!currentCollection) {
         return []
       }
@@ -360,9 +368,12 @@ export function useLiveQuery(
       try {
         await currentCollection.toArrayWhenReady()
       } catch (error) {
-        setStatus(`error`)
+        if (generation === resourceGeneration) setStatus(`error`)
         throw error
       }
+      if (generation !== resourceGeneration) {
+        return data
+      }
       // Initialize state with current collection data
       batch(() => {
         state.clear()
@@ -389,36 +400,54 @@ export function useLiveQuery(
       setData([])
       return
     }
-    const subscription = currentCollection.subscribeChanges(
-      (changes: Array<ChangeMessage<any>>) => {
-        // Apply each change individually to the reactive state
+
+    // The shared observer owns subscription, the ready-race, and status; Solid
+    // materializes into its keyed ReactiveMap (granular) + reconciled store.
+    const observer = createLiveQueryObserver(currentCollection)
+    // Clear any keys carried over from a previous collection before the new
+    // observer re-seeds via `includeInitialState` (which only inserts current
+    // rows, never deletes stale ones). Without this, switching collections
+    // leaves the dropped keys in `state` until the async resource reconciles.
+    state.clear()
+    const unsubscribe = observer.subscribe(
+      (changes: Array<ChangeMessage<any>> | undefined) => {
         batch(() => {
-          for (const change of changes) {
-            switch (change.type) {
-              case `insert`:
-              case `update`:
-                state.set(change.key, change.value)
-                break
-              case `delete`:
-                state.delete(change.key)
-                break
+          if (changes) {
+            for (const change of changes) {
+              switch (change.type) {
+                case `insert`:
+                case `update`:
+                  state.set(change.key, change.value)
+                  break
+                case `delete`:
+                  state.delete(change.key)
+                  break
+              }
+            }
+          } else {
+            // Cleanup and other status-only publications carry no row deltas.
+            // Rebuild the keyed view so it cannot diverge from ordered data.
+            state.clear()
+            for (const [key, value] of observer.getSnapshot().state ?? []) {
+              state.set(key, value)
             }
           }
-
           syncDataFromCollection(currentCollection)
-
-          // Update status ref on every change
-          setStatus(currentCollection.status)
+          setStatus(observer.getSnapshot().status)
         })
       },
-      {
-        // Include initial state to ensure immediate population for pre-created collections
-        includeInitialState: true,
-      },
     )
+    // An already-ready empty collection produces no initial row batch. Bring
+    // ordered data and status in line synchronously instead of waiting for the
+    // resource continuation to correct the previous collection's rows.
+    batch(() => {
+      syncDataFromCollection(currentCollection)
+      setStatus(observer.getSnapshot().status)
+    })
 
     onCleanup(() => {
-      subscription.unsubscribe()
+      unsubscribe()
+      observer.dispose()
     })
   })