@tanstack/solid-db 0.1.21 → 0.1.22

package/dist/esm/useLiveQuery.js

@@ -45,8 +45,7 @@ function useLiveQuery(configOrQueryOrCollection) {
       for (const [key, value] of currentCollection.entries()) {
         state.set(key, value);
       }
-      syncDataFromCollection(currentCollection);
-      currentUnsubscribe = currentCollection.subscribeChanges(
+      const subscription = currentCollection.subscribeChanges(
         (changes) => {
           batch(() => {
             for (const change of changes) {
@@ -63,8 +62,12 @@ function useLiveQuery(configOrQueryOrCollection) {
           });
           syncDataFromCollection(currentCollection);
           setStatus(currentCollection.status);
+        },
+        {
+          includeInitialState: true
         }
       );
+      currentUnsubscribe = subscription.unsubscribe.bind(subscription);
       if (currentCollection.status === `idle`) {
         createResource(() => currentCollection.preload());
       }

package/dist/esm/useLiveQuery.js.map

@@ -1 +1 @@
-{"version":3,"file":"useLiveQuery.js","sources":["../../src/useLiveQuery.ts"],"sourcesContent":["import {\n  batch,\n  createComputed,\n  createMemo,\n  createResource,\n  createSignal,\n  onCleanup,\n} from \"solid-js\"\nimport { ReactiveMap } from \"@solid-primitives/map\"\nimport { CollectionImpl, createLiveQueryCollection } 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  InitialQueryBuilder,\n  LiveQueryCollectionConfig,\n  QueryBuilder,\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 Object with reactive data, state, and status information\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.data()}>\n *         {(todo) => <li key={todo.id}>{todo.text}</li>}\n *       </For>\n *     </Match>\n *   </Switch>\n * )\n */\n// Overload 1: Accept just the query function\nexport function useLiveQuery<TContext extends Context>(\n  queryFn: (q: InitialQueryBuilder) => QueryBuilder<TContext>\n): {\n  state: ReactiveMap<string | number, GetResult<TContext>>\n  data: Array<GetResult<TContext>>\n  collection: Accessor<Collection<GetResult<TContext>, string | number, {}>>\n  status: Accessor<CollectionStatus>\n  isLoading: Accessor<boolean>\n  isReady: Accessor<boolean>\n  isIdle: Accessor<boolean>\n  isError: Accessor<boolean>\n  isCleanedUp: Accessor<boolean>\n}\n\n/**\n * Create a live query using configuration object\n * @param config - Configuration object with query and options\n * @returns Object with reactive data, state, and status information\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.data.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): {\n  state: ReactiveMap<string | number, GetResult<TContext>>\n  data: Array<GetResult<TContext>>\n  collection: Accessor<Collection<GetResult<TContext>, string | number, {}>>\n  status: Accessor<CollectionStatus>\n  isLoading: Accessor<boolean>\n  isReady: Accessor<boolean>\n  isIdle: Accessor<boolean>\n  isError: Accessor<boolean>\n  isCleanedUp: Accessor<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 Object with reactive data, state, and status information\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.data()}>{(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\nexport function useLiveQuery<\n  TResult extends object,\n  TKey extends string | number,\n  TUtils extends Record<string, any>,\n>(\n  liveQueryCollection: Accessor<Collection<TResult, TKey, TUtils>>\n): {\n  state: ReactiveMap<TKey, TResult>\n  data: Array<TResult>\n  collection: Accessor<Collection<TResult, TKey, TUtils>>\n  status: Accessor<CollectionStatus>\n  isLoading: Accessor<boolean>\n  isReady: Accessor<boolean>\n  isIdle: Accessor<boolean>\n  isError: Accessor<boolean>\n  isCleanedUp: Accessor<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        return createLiveQueryCollection({\n          query: configOrQueryOrCollection,\n          startSync: true,\n        })\n      }\n\n      const innerCollection = configOrQueryOrCollection()\n      if (innerCollection instanceof CollectionImpl) {\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(collection().status, {\n    name: `TanstackDBStatus`,\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  // Track current unsubscribe function\n  let currentUnsubscribe: (() => void) | null = null\n\n  createComputed(\n    () => {\n      const currentCollection = collection()\n\n      // Update status ref whenever the effect runs\n      setStatus(currentCollection.status)\n\n      // Initialize state with current collection data\n      state.clear()\n      for (const [key, value] of currentCollection.entries()) {\n        state.set(key, value)\n      }\n\n      // Initialize data array in correct order\n      syncDataFromCollection(currentCollection)\n\n      // Subscribe to collection changes with granular updates\n      currentUnsubscribe = 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\n          // Update the data array to maintain sorted order\n          syncDataFromCollection(currentCollection)\n\n          // Update status ref on every change\n          setStatus(currentCollection.status)\n        }\n      )\n\n      // Preload collection data if not already started\n      if (currentCollection.status === `idle`) {\n        createResource(() => currentCollection.preload())\n      }\n\n      // Cleanup when computed is invalidated\n      onCleanup(() => {\n        if (currentUnsubscribe) {\n          currentUnsubscribe()\n          currentUnsubscribe = null\n        }\n      })\n    },\n    undefined,\n    { name: `TanstackDBSyncComputed` }\n  )\n\n  return {\n    state,\n    data,\n    collection,\n    status,\n    isLoading: () => status() === `loading` || status() === `initialCommit`,\n    isReady: () => status() === `ready`,\n    isIdle: () => status() === `idle`,\n    isError: () => status() === `error`,\n    isCleanedUp: () => status() === `cleaned-up`,\n  }\n}\n"],"names":[],"mappings":";;;;AA2MO,SAAS,aACd,2BACA;AACA,QAAM,aAAa;AAAA,IACjB,MAAM;AACJ,UAAI,0BAA0B,WAAW,GAAG;AAC1C,eAAO,0BAA0B;AAAA,UAC/B,OAAO;AAAA,UACP,WAAW;AAAA,QAAA,CACZ;AAAA,MACH;AAEA,YAAM,kBAAkB,0BAAA;AACxB,UAAI,2BAA2B,gBAAgB;AAC7C,wBAAgB,mBAAA;AAChB,eAAO;AAAA,MACT;AAEA,aAAO,0BAA0B;AAAA,QAC/B,GAAG;AAAA,QACH,WAAW;AAAA,MAAA,CACZ;AAAA,IACH;AAAA,IACA;AAAA,IACA,EAAE,MAAM,2BAAA;AAAA,EAA2B;AAIrC,QAAM,QAAQ,IAAI,YAAA;AAGlB,QAAM,CAAC,MAAM,OAAO,IAAI,YAAwB,CAAA,GAAI;AAAA,IAClD,MAAM;AAAA,EAAA,CACP;AAGD,QAAM,CAAC,QAAQ,SAAS,IAAI,aAAa,WAAA,EAAa,QAAQ;AAAA,IAC5D,MAAM;AAAA,EAAA,CACP;AAGD,QAAM,yBAAyB,CAC7B,sBACG;AACH;AAAA,MAAQ,CAAC,SACP,UAAU,MAAM,KAAK,kBAAkB,OAAA,CAAQ,CAAC,EAAE,IAAI,EAAE,OAAO,OAAO;AAAA,IAAA;AAAA,EAE1E;AAGA,MAAI,qBAA0C;AAE9C;AAAA,IACE,MAAM;AACJ,YAAM,oBAAoB,WAAA;AAG1B,gBAAU,kBAAkB,MAAM;AAGlC,YAAM,MAAA;AACN,iBAAW,CAAC,KAAK,KAAK,KAAK,kBAAkB,WAAW;AACtD,cAAM,IAAI,KAAK,KAAK;AAAA,MACtB;AAGA,6BAAuB,iBAAiB;AAGxC,2BAAqB,kBAAkB;AAAA,QACrC,CAAC,YAAuC;AAEtC,gBAAM,MAAM;AACV,uBAAW,UAAU,SAAS;AAC5B,sBAAQ,OAAO,MAAA;AAAA,gBACb,KAAK;AAAA,gBACL,KAAK;AACH,wBAAM,IAAI,OAAO,KAAK,OAAO,KAAK;AAClC;AAAA,gBACF,KAAK;AACH,wBAAM,OAAO,OAAO,GAAG;AACvB;AAAA,cAAA;AAAA,YAEN;AAAA,UACF,CAAC;AAGD,iCAAuB,iBAAiB;AAGxC,oBAAU,kBAAkB,MAAM;AAAA,QACpC;AAAA,MAAA;AAIF,UAAI,kBAAkB,WAAW,QAAQ;AACvC,uBAAe,MAAM,kBAAkB,SAAS;AAAA,MAClD;AAGA,gBAAU,MAAM;AACd,YAAI,oBAAoB;AACtB,6BAAA;AACA,+BAAqB;AAAA,QACvB;AAAA,MACF,CAAC;AAAA,IACH;AAAA,IACA;AAAA,IACA,EAAE,MAAM,yBAAA;AAAA,EAAyB;AAGnC,SAAO;AAAA,IACL;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA,WAAW,MAAM,aAAa,aAAa,aAAa;AAAA,IACxD,SAAS,MAAM,aAAa;AAAA,IAC5B,QAAQ,MAAM,aAAa;AAAA,IAC3B,SAAS,MAAM,aAAa;AAAA,IAC5B,aAAa,MAAM,OAAA,MAAa;AAAA,EAAA;AAEpC;"}
+{"version":3,"file":"useLiveQuery.js","sources":["../../src/useLiveQuery.ts"],"sourcesContent":["import {\n  batch,\n  createComputed,\n  createMemo,\n  createResource,\n  createSignal,\n  onCleanup,\n} from \"solid-js\"\nimport { ReactiveMap } from \"@solid-primitives/map\"\nimport { CollectionImpl, createLiveQueryCollection } 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  InitialQueryBuilder,\n  LiveQueryCollectionConfig,\n  QueryBuilder,\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 Object with reactive data, state, and status information\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.data()}>\n *         {(todo) => <li key={todo.id}>{todo.text}</li>}\n *       </For>\n *     </Match>\n *   </Switch>\n * )\n */\n// Overload 1: Accept just the query function\nexport function useLiveQuery<TContext extends Context>(\n  queryFn: (q: InitialQueryBuilder) => QueryBuilder<TContext>\n): {\n  state: ReactiveMap<string | number, GetResult<TContext>>\n  data: Array<GetResult<TContext>>\n  collection: Accessor<Collection<GetResult<TContext>, string | number, {}>>\n  status: Accessor<CollectionStatus>\n  isLoading: Accessor<boolean>\n  isReady: Accessor<boolean>\n  isIdle: Accessor<boolean>\n  isError: Accessor<boolean>\n  isCleanedUp: Accessor<boolean>\n}\n\n/**\n * Create a live query using configuration object\n * @param config - Configuration object with query and options\n * @returns Object with reactive data, state, and status information\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.data.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): {\n  state: ReactiveMap<string | number, GetResult<TContext>>\n  data: Array<GetResult<TContext>>\n  collection: Accessor<Collection<GetResult<TContext>, string | number, {}>>\n  status: Accessor<CollectionStatus>\n  isLoading: Accessor<boolean>\n  isReady: Accessor<boolean>\n  isIdle: Accessor<boolean>\n  isError: Accessor<boolean>\n  isCleanedUp: Accessor<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 Object with reactive data, state, and status information\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.data()}>{(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\nexport function useLiveQuery<\n  TResult extends object,\n  TKey extends string | number,\n  TUtils extends Record<string, any>,\n>(\n  liveQueryCollection: Accessor<Collection<TResult, TKey, TUtils>>\n): {\n  state: ReactiveMap<TKey, TResult>\n  data: Array<TResult>\n  collection: Accessor<Collection<TResult, TKey, TUtils>>\n  status: Accessor<CollectionStatus>\n  isLoading: Accessor<boolean>\n  isReady: Accessor<boolean>\n  isIdle: Accessor<boolean>\n  isError: Accessor<boolean>\n  isCleanedUp: Accessor<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        return createLiveQueryCollection({\n          query: configOrQueryOrCollection,\n          startSync: true,\n        })\n      }\n\n      const innerCollection = configOrQueryOrCollection()\n      if (innerCollection instanceof CollectionImpl) {\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(collection().status, {\n    name: `TanstackDBStatus`,\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  // Track current unsubscribe function\n  let currentUnsubscribe: (() => void) | null = null\n\n  createComputed(\n    () => {\n      const currentCollection = collection()\n\n      // Update status ref whenever the effect runs\n      setStatus(currentCollection.status)\n\n      // Initialize state with current collection data\n      state.clear()\n      for (const [key, value] of currentCollection.entries()) {\n        state.set(key, value)\n      }\n\n      // Subscribe to collection changes with granular updates\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\n          // Update the data array to maintain sorted order\n          syncDataFromCollection(currentCollection)\n\n          // Update status ref on every change\n          setStatus(currentCollection.status)\n        },\n        {\n          includeInitialState: true,\n        }\n      )\n\n      currentUnsubscribe = subscription.unsubscribe.bind(subscription)\n\n      // Preload collection data if not already started\n      if (currentCollection.status === `idle`) {\n        createResource(() => currentCollection.preload())\n      }\n\n      // Cleanup when computed is invalidated\n      onCleanup(() => {\n        if (currentUnsubscribe) {\n          currentUnsubscribe()\n          currentUnsubscribe = null\n        }\n      })\n    },\n    undefined,\n    { name: `TanstackDBSyncComputed` }\n  )\n\n  return {\n    state,\n    data,\n    collection,\n    status,\n    isLoading: () => status() === `loading` || status() === `initialCommit`,\n    isReady: () => status() === `ready`,\n    isIdle: () => status() === `idle`,\n    isError: () => status() === `error`,\n    isCleanedUp: () => status() === `cleaned-up`,\n  }\n}\n"],"names":[],"mappings":";;;;AA2MO,SAAS,aACd,2BACA;AACA,QAAM,aAAa;AAAA,IACjB,MAAM;AACJ,UAAI,0BAA0B,WAAW,GAAG;AAC1C,eAAO,0BAA0B;AAAA,UAC/B,OAAO;AAAA,UACP,WAAW;AAAA,QAAA,CACZ;AAAA,MACH;AAEA,YAAM,kBAAkB,0BAAA;AACxB,UAAI,2BAA2B,gBAAgB;AAC7C,wBAAgB,mBAAA;AAChB,eAAO;AAAA,MACT;AAEA,aAAO,0BAA0B;AAAA,QAC/B,GAAG;AAAA,QACH,WAAW;AAAA,MAAA,CACZ;AAAA,IACH;AAAA,IACA;AAAA,IACA,EAAE,MAAM,2BAAA;AAAA,EAA2B;AAIrC,QAAM,QAAQ,IAAI,YAAA;AAGlB,QAAM,CAAC,MAAM,OAAO,IAAI,YAAwB,CAAA,GAAI;AAAA,IAClD,MAAM;AAAA,EAAA,CACP;AAGD,QAAM,CAAC,QAAQ,SAAS,IAAI,aAAa,WAAA,EAAa,QAAQ;AAAA,IAC5D,MAAM;AAAA,EAAA,CACP;AAGD,QAAM,yBAAyB,CAC7B,sBACG;AACH;AAAA,MAAQ,CAAC,SACP,UAAU,MAAM,KAAK,kBAAkB,OAAA,CAAQ,CAAC,EAAE,IAAI,EAAE,OAAO,OAAO;AAAA,IAAA;AAAA,EAE1E;AAGA,MAAI,qBAA0C;AAE9C;AAAA,IACE,MAAM;AACJ,YAAM,oBAAoB,WAAA;AAG1B,gBAAU,kBAAkB,MAAM;AAGlC,YAAM,MAAA;AACN,iBAAW,CAAC,KAAK,KAAK,KAAK,kBAAkB,WAAW;AACtD,cAAM,IAAI,KAAK,KAAK;AAAA,MACtB;AAGA,YAAM,eAAe,kBAAkB;AAAA,QACrC,CAAC,YAAuC;AAEtC,gBAAM,MAAM;AACV,uBAAW,UAAU,SAAS;AAC5B,sBAAQ,OAAO,MAAA;AAAA,gBACb,KAAK;AAAA,gBACL,KAAK;AACH,wBAAM,IAAI,OAAO,KAAK,OAAO,KAAK;AAClC;AAAA,gBACF,KAAK;AACH,wBAAM,OAAO,OAAO,GAAG;AACvB;AAAA,cAAA;AAAA,YAEN;AAAA,UACF,CAAC;AAGD,iCAAuB,iBAAiB;AAGxC,oBAAU,kBAAkB,MAAM;AAAA,QACpC;AAAA,QACA;AAAA,UACE,qBAAqB;AAAA,QAAA;AAAA,MACvB;AAGF,2BAAqB,aAAa,YAAY,KAAK,YAAY;AAG/D,UAAI,kBAAkB,WAAW,QAAQ;AACvC,uBAAe,MAAM,kBAAkB,SAAS;AAAA,MAClD;AAGA,gBAAU,MAAM;AACd,YAAI,oBAAoB;AACtB,6BAAA;AACA,+BAAqB;AAAA,QACvB;AAAA,MACF,CAAC;AAAA,IACH;AAAA,IACA;AAAA,IACA,EAAE,MAAM,yBAAA;AAAA,EAAyB;AAGnC,SAAO;AAAA,IACL;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA,WAAW,MAAM,aAAa,aAAa,aAAa;AAAA,IACxD,SAAS,MAAM,aAAa;AAAA,IAC5B,QAAQ,MAAM,aAAa;AAAA,IAC3B,SAAS,MAAM,aAAa;AAAA,IAC5B,aAAa,MAAM,OAAA,MAAa;AAAA,EAAA;AAEpC;"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tanstack/solid-db",
   "description": "Solid integration for @tanstack/db",
-  "version": "0.1.21",
+  "version": "0.1.22",
   "author": "Kyle Mathews",
   "license": "MIT",
   "repository": {
@@ -17,13 +17,13 @@
   ],
   "dependencies": {
     "@solid-primitives/map": "^0.7.2",
-    "@tanstack/db": "0.3.2"
+    "@tanstack/db": "0.4.0"
   },
   "devDependencies": {
-    "@electric-sql/client": "1.0.0",
+    "@electric-sql/client": "1.0.10",
     "@solidjs/testing-library": "^0.8.10",
     "@vitest/coverage-istanbul": "^3.2.4",
-    "jsdom": "^26.1.0",
+    "jsdom": "^27.0.0",
     "solid-js": "^1.9.9",
     "vite-plugin-solid": "^2.11.8",
     "vitest": "^3.2.4"

package/src/useLiveQuery.ts

@@ -266,11 +266,8 @@ export function useLiveQuery(
         state.set(key, value)
       }
 
-      // Initialize data array in correct order
-      syncDataFromCollection(currentCollection)
-
       // Subscribe to collection changes with granular updates
-      currentUnsubscribe = currentCollection.subscribeChanges(
+      const subscription = currentCollection.subscribeChanges(
         (changes: Array<ChangeMessage<any>>) => {
           // Apply each change individually to the reactive state
           batch(() => {
@@ -292,9 +289,14 @@ export function useLiveQuery(
 
           // Update status ref on every change
           setStatus(currentCollection.status)
+        },
+        {
+          includeInitialState: true,
         }
       )
 
+      currentUnsubscribe = subscription.unsubscribe.bind(subscription)
+
       // Preload collection data if not already started
       if (currentCollection.status === `idle`) {
         createResource(() => currentCollection.preload())