@tanstack/angular-db 0.1.76 → 0.1.78

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?title=TanStack%20Angular%20DB&theme=dark"
+    />
+    <source
+      media="(prefers-color-scheme: light)"
+      srcset="https://tanstack.com/api/readme/db.png?title=TanStack%20Angular%20DB"
+    />
+    <img
+      src="https://tanstack.com/api/readme/db.png?title=TanStack%20Angular%20DB"
+      alt="TanStack Angular DB"
+      width="900"
+    />
+  </picture>
+</div>
 # @tanstack/angular-db
 
 Angular hooks for TanStack DB. See [TanStack/db](https://github.com/TanStack/db) for more details.

package/dist/cjs/index.cjs

@@ -75,20 +75,17 @@ function injectLiveQuery(opts) {
       return;
     }
     cleanup();
-    syncDataFromCollection(currentCollection);
-    if (currentCollection.status === `idle`) {
-      currentCollection.startSyncImmediate();
-      status.set(currentCollection.status);
-    }
-    const subscription = currentCollection.subscribeChanges(
-      (_) => {
-        syncDataFromCollection(currentCollection);
-      }
-    );
-    unsub = subscription.unsubscribe.bind(subscription);
-    currentCollection.onFirstReady(() => {
-      status.set(currentCollection.status);
+    const observer = db.createLiveQueryObserver(currentCollection, {
+      mode: `wholesale`
     });
+    const unsubscribe = observer.subscribe(() => {
+      syncDataFromCollection(currentCollection);
+    });
+    syncDataFromCollection(currentCollection);
+    unsub = () => {
+      unsubscribe();
+      observer.dispose();
+    };
     onCleanup(cleanup);
   });
   destroyRef.onDestroy(cleanup);

package/dist/cjs/index.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.cjs","sources":["../../src/index.ts"],"sourcesContent":["import {\n  DestroyRef,\n  assertInInjectionContext,\n  computed,\n  effect,\n  inject,\n  signal,\n} from '@angular/core'\nimport {\n  BaseQueryBuilder,\n  createLiveQueryCollection,\n  isCollection,\n  isSingleResultCollection,\n} from '@tanstack/db'\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'\nimport type { Signal } from '@angular/core'\n\nexport * from '@tanstack/db'\n\n/**\n * The result of calling `injectLiveQuery`.\n * Contains reactive signals for the query state and data.\n */\nexport interface InjectLiveQueryResult<TContext extends Context> {\n  /** A signal containing the complete state map of results keyed by their ID */\n  state: Signal<Map<string | number, GetResult<TContext>>>\n  /** A signal containing the results as an array, or single result for findOne queries */\n  data: Signal<InferResultType<TContext>>\n  /** A signal containing the underlying collection instance (null for disabled queries) */\n  collection: Signal<Collection<\n    GetResult<TContext>,\n    string | number,\n    {}\n  > | null>\n  /** A signal containing the current status of the collection */\n  status: Signal<CollectionStatus | `disabled`>\n  /** A signal indicating whether the collection is currently loading */\n  isLoading: Signal<boolean>\n  /** A signal indicating whether the collection is ready */\n  isReady: Signal<boolean>\n  /** A signal indicating whether the collection is idle */\n  isIdle: Signal<boolean>\n  /** A signal indicating whether the collection has an error */\n  isError: Signal<boolean>\n  /** A signal indicating whether the collection has been cleaned up */\n  isCleanedUp: Signal<boolean>\n}\n\nexport interface InjectLiveQueryResultWithCollection<\n  TResult extends object = any,\n  TKey extends string | number = string | number,\n  TUtils extends Record<string, any> = {},\n> {\n  state: Signal<Map<TKey, TResult>>\n  data: Signal<Array<TResult>>\n  collection: Signal<Collection<TResult, TKey, TUtils> | null>\n  status: Signal<CollectionStatus | `disabled`>\n  isLoading: Signal<boolean>\n  isReady: Signal<boolean>\n  isIdle: Signal<boolean>\n  isError: Signal<boolean>\n  isCleanedUp: Signal<boolean>\n}\n\nexport interface InjectLiveQueryResultWithSingleResultCollection<\n  TResult extends object = any,\n  TKey extends string | number = string | number,\n  TUtils extends Record<string, any> = {},\n> {\n  state: Signal<Map<TKey, TResult>>\n  data: Signal<TResult | undefined>\n  collection: Signal<(Collection<TResult, TKey, TUtils> & SingleResult) | null>\n  status: Signal<CollectionStatus | `disabled`>\n  isLoading: Signal<boolean>\n  isReady: Signal<boolean>\n  isIdle: Signal<boolean>\n  isError: Signal<boolean>\n  isCleanedUp: Signal<boolean>\n}\n\nexport function injectLiveQuery<\n  TContext extends Context,\n  TParams extends any,\n>(options: {\n  params: () => TParams\n  query: (args: {\n    params: TParams\n    q: InitialQueryBuilder\n  }) => QueryBuilder<TContext>\n}): InjectLiveQueryResult<TContext>\nexport function injectLiveQuery<\n  TContext extends Context,\n  TParams extends any,\n>(options: {\n  params: () => TParams\n  query: (args: {\n    params: TParams\n    q: InitialQueryBuilder\n  }) => QueryBuilder<TContext> | undefined | null\n}): InjectLiveQueryResult<TContext>\nexport function injectLiveQuery<TContext extends Context>(\n  queryFn: (q: InitialQueryBuilder) => QueryBuilder<TContext>,\n): InjectLiveQueryResult<TContext>\nexport function injectLiveQuery<TContext extends Context>(\n  queryFn: (\n    q: InitialQueryBuilder,\n  ) => QueryBuilder<TContext> | undefined | null,\n): InjectLiveQueryResult<TContext>\nexport function injectLiveQuery<TContext extends Context>(\n  config: LiveQueryCollectionConfig<TContext>,\n): InjectLiveQueryResult<TContext>\n// Pre-created collection without singleResult\nexport function injectLiveQuery<\n  TResult extends object,\n  TKey extends string | number,\n  TUtils extends Record<string, any>,\n>(\n  liveQueryCollection: Collection<TResult, TKey, TUtils> & NonSingleResult,\n): InjectLiveQueryResultWithCollection<TResult, TKey, TUtils>\n// Pre-created collection with singleResult\nexport function injectLiveQuery<\n  TResult extends object,\n  TKey extends string | number,\n  TUtils extends Record<string, any>,\n>(\n  liveQueryCollection: Collection<TResult, TKey, TUtils> & SingleResult,\n): InjectLiveQueryResultWithSingleResultCollection<TResult, TKey, TUtils>\nexport function injectLiveQuery(opts: any) {\n  assertInInjectionContext(injectLiveQuery)\n  const destroyRef = inject(DestroyRef)\n\n  const collection = computed(() => {\n    // Check if it's an existing collection\n    if (isCollection(opts)) {\n      return opts\n    }\n\n    if (typeof opts === `function`) {\n      // Check if query function returns null/undefined (disabled query)\n      const queryBuilder = new BaseQueryBuilder() as InitialQueryBuilder\n      const result = opts(queryBuilder)\n\n      if (result === undefined || result === null) {\n        // Disabled query - return null\n        return null\n      }\n\n      return createLiveQueryCollection({\n        query: opts,\n        startSync: true,\n        gcTime: 0,\n      })\n    }\n\n    // Check if it's reactive query options\n    const isReactiveQueryOptions =\n      opts &&\n      typeof opts === `object` &&\n      typeof opts.query === `function` &&\n      typeof opts.params === `function`\n\n    if (isReactiveQueryOptions) {\n      const { params, query } = opts\n      const currentParams = params()\n\n      // Check if query function returns null/undefined (disabled query)\n      const queryBuilder = new BaseQueryBuilder() as InitialQueryBuilder\n      const result = query({ params: currentParams, q: queryBuilder })\n\n      if (result === undefined || result === null) {\n        // Disabled query - return null\n        return null\n      }\n\n      return createLiveQueryCollection({\n        query: () => result,\n        startSync: true,\n        gcTime: 0,\n      })\n    }\n\n    // Handle LiveQueryCollectionConfig objects. Default startSync/gcTime to\n    // match the query-fn and reactive-options paths, but let an explicit value\n    // in the config win — otherwise a bare `{ query }` never syncs.\n    if (opts && typeof opts === `object` && typeof opts.query === `function`) {\n      return createLiveQueryCollection({ startSync: true, gcTime: 0, ...opts })\n    }\n\n    throw new Error(`Invalid options provided to injectLiveQuery`)\n  })\n\n  const state = signal(new Map<string | number, any>())\n  const internalData = signal<Array<any>>([])\n  const status = signal<CollectionStatus | `disabled`>(\n    collection() ? `idle` : `disabled`,\n  )\n\n  // Returns single item for singleResult collections, array otherwise\n  const data = computed(() => {\n    const currentCollection = collection()\n    if (!currentCollection) {\n      return internalData()\n    }\n    return isSingleResultCollection(currentCollection)\n      ? internalData()[0]\n      : internalData()\n  })\n\n  const syncDataFromCollection = (\n    currentCollection: Collection<any, any, any>,\n  ) => {\n    const newState = new Map(currentCollection.entries())\n    const newData = Array.from(currentCollection.values())\n\n    state.set(newState)\n    internalData.set(newData)\n    status.set(currentCollection.status)\n  }\n\n  let unsub: (() => void) | null = null\n  const cleanup = () => {\n    unsub?.()\n    unsub = null\n  }\n\n  effect((onCleanup) => {\n    const currentCollection = collection()\n\n    // Handle null collection (disabled query)\n    if (!currentCollection) {\n      status.set(`disabled` as const)\n      state.set(new Map())\n      internalData.set([])\n      cleanup()\n      return\n    }\n\n    cleanup()\n\n    // Initialize immediately with current state\n    syncDataFromCollection(currentCollection)\n\n    // Start sync if idle\n    if (currentCollection.status === `idle`) {\n      currentCollection.startSyncImmediate()\n      // Update status after starting sync\n      status.set(currentCollection.status)\n    }\n\n    // Subscribe to changes\n    const subscription = currentCollection.subscribeChanges(\n      (_: Array<ChangeMessage<any>>) => {\n        syncDataFromCollection(currentCollection)\n      },\n    )\n    unsub = subscription.unsubscribe.bind(subscription)\n\n    // Handle ready state\n    currentCollection.onFirstReady(() => {\n      status.set(currentCollection.status)\n    })\n\n    onCleanup(cleanup)\n  })\n\n  destroyRef.onDestroy(cleanup)\n\n  return {\n    state,\n    data,\n    // Loosely typed so the impl return stays compatible with every overload\n    // (the shared `isCollection` guard narrows the computed to `Collection | null`).\n    collection: collection as Signal<any>,\n    status,\n    isLoading: computed(() => status() === `loading`),\n    isReady: computed(() => status() === `ready` || status() === `disabled`),\n    isIdle: computed(() => status() === `idle`),\n    isError: computed(() => status() === `error`),\n    isCleanedUp: computed(() => status() === `cleaned-up`),\n  }\n}\n"],"names":["assertInInjectionContext","inject","DestroyRef","computed","isCollection","BaseQueryBuilder","createLiveQueryCollection","signal","isSingleResultCollection","effect"],"mappings":"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"}
+{"version":3,"file":"index.cjs","sources":["../../src/index.ts"],"sourcesContent":["import {\n  DestroyRef,\n  assertInInjectionContext,\n  computed,\n  effect,\n  inject,\n  signal,\n} from '@angular/core'\nimport {\n  BaseQueryBuilder,\n  createLiveQueryCollection,\n  createLiveQueryObserver,\n  isCollection,\n  isSingleResultCollection,\n} from '@tanstack/db'\nimport type {\n  Collection,\n  CollectionStatus,\n  Context,\n  GetResult,\n  InferResultType,\n  InitialQueryBuilder,\n  LiveQueryCollectionConfig,\n  NonSingleResult,\n  QueryBuilder,\n  SingleResult,\n} from '@tanstack/db'\nimport type { Signal } from '@angular/core'\n\nexport * from '@tanstack/db'\n\n/**\n * The result of calling `injectLiveQuery`.\n * Contains reactive signals for the query state and data.\n */\nexport interface InjectLiveQueryResult<TContext extends Context> {\n  /** A signal containing the complete state map of results keyed by their ID */\n  state: Signal<Map<string | number, GetResult<TContext>>>\n  /** A signal containing the results as an array, or single result for findOne queries */\n  data: Signal<InferResultType<TContext>>\n  /** A signal containing the underlying collection instance (null for disabled queries) */\n  collection: Signal<Collection<\n    GetResult<TContext>,\n    string | number,\n    {}\n  > | null>\n  /** A signal containing the current status of the collection */\n  status: Signal<CollectionStatus | `disabled`>\n  /** A signal indicating whether the collection is currently loading */\n  isLoading: Signal<boolean>\n  /** A signal indicating whether the collection is ready */\n  isReady: Signal<boolean>\n  /** A signal indicating whether the collection is idle */\n  isIdle: Signal<boolean>\n  /** A signal indicating whether the collection has an error */\n  isError: Signal<boolean>\n  /** A signal indicating whether the collection has been cleaned up */\n  isCleanedUp: Signal<boolean>\n}\n\nexport interface InjectLiveQueryResultWithCollection<\n  TResult extends object = any,\n  TKey extends string | number = string | number,\n  TUtils extends Record<string, any> = {},\n> {\n  state: Signal<Map<TKey, TResult>>\n  data: Signal<Array<TResult>>\n  collection: Signal<Collection<TResult, TKey, TUtils> | null>\n  status: Signal<CollectionStatus | `disabled`>\n  isLoading: Signal<boolean>\n  isReady: Signal<boolean>\n  isIdle: Signal<boolean>\n  isError: Signal<boolean>\n  isCleanedUp: Signal<boolean>\n}\n\nexport interface InjectLiveQueryResultWithSingleResultCollection<\n  TResult extends object = any,\n  TKey extends string | number = string | number,\n  TUtils extends Record<string, any> = {},\n> {\n  state: Signal<Map<TKey, TResult>>\n  data: Signal<TResult | undefined>\n  collection: Signal<(Collection<TResult, TKey, TUtils> & SingleResult) | null>\n  status: Signal<CollectionStatus | `disabled`>\n  isLoading: Signal<boolean>\n  isReady: Signal<boolean>\n  isIdle: Signal<boolean>\n  isError: Signal<boolean>\n  isCleanedUp: Signal<boolean>\n}\n\nexport function injectLiveQuery<\n  TContext extends Context,\n  TParams extends any,\n>(options: {\n  params: () => TParams\n  query: (args: {\n    params: TParams\n    q: InitialQueryBuilder\n  }) => QueryBuilder<TContext>\n}): InjectLiveQueryResult<TContext>\nexport function injectLiveQuery<\n  TContext extends Context,\n  TParams extends any,\n>(options: {\n  params: () => TParams\n  query: (args: {\n    params: TParams\n    q: InitialQueryBuilder\n  }) => QueryBuilder<TContext> | undefined | null\n}): InjectLiveQueryResult<TContext>\nexport function injectLiveQuery<TContext extends Context>(\n  queryFn: (q: InitialQueryBuilder) => QueryBuilder<TContext>,\n): InjectLiveQueryResult<TContext>\nexport function injectLiveQuery<TContext extends Context>(\n  queryFn: (\n    q: InitialQueryBuilder,\n  ) => QueryBuilder<TContext> | undefined | null,\n): InjectLiveQueryResult<TContext>\nexport function injectLiveQuery<TContext extends Context>(\n  config: LiveQueryCollectionConfig<TContext>,\n): InjectLiveQueryResult<TContext>\n// Pre-created collection without singleResult\nexport function injectLiveQuery<\n  TResult extends object,\n  TKey extends string | number,\n  TUtils extends Record<string, any>,\n>(\n  liveQueryCollection: Collection<TResult, TKey, TUtils> & NonSingleResult,\n): InjectLiveQueryResultWithCollection<TResult, TKey, TUtils>\n// Pre-created collection with singleResult\nexport function injectLiveQuery<\n  TResult extends object,\n  TKey extends string | number,\n  TUtils extends Record<string, any>,\n>(\n  liveQueryCollection: Collection<TResult, TKey, TUtils> & SingleResult,\n): InjectLiveQueryResultWithSingleResultCollection<TResult, TKey, TUtils>\nexport function injectLiveQuery(opts: any) {\n  assertInInjectionContext(injectLiveQuery)\n  const destroyRef = inject(DestroyRef)\n\n  const collection = computed(() => {\n    // Check if it's an existing collection\n    if (isCollection(opts)) {\n      return opts\n    }\n\n    if (typeof opts === `function`) {\n      // Check if query function returns null/undefined (disabled query)\n      const queryBuilder = new BaseQueryBuilder() as InitialQueryBuilder\n      const result = opts(queryBuilder)\n\n      if (result === undefined || result === null) {\n        // Disabled query - return null\n        return null\n      }\n\n      return createLiveQueryCollection({\n        query: opts,\n        startSync: true,\n        gcTime: 0,\n      })\n    }\n\n    // Check if it's reactive query options\n    const isReactiveQueryOptions =\n      opts &&\n      typeof opts === `object` &&\n      typeof opts.query === `function` &&\n      typeof opts.params === `function`\n\n    if (isReactiveQueryOptions) {\n      const { params, query } = opts\n      const currentParams = params()\n\n      // Check if query function returns null/undefined (disabled query)\n      const queryBuilder = new BaseQueryBuilder() as InitialQueryBuilder\n      const result = query({ params: currentParams, q: queryBuilder })\n\n      if (result === undefined || result === null) {\n        // Disabled query - return null\n        return null\n      }\n\n      return createLiveQueryCollection({\n        query: () => result,\n        startSync: true,\n        gcTime: 0,\n      })\n    }\n\n    // Handle LiveQueryCollectionConfig objects. Default startSync/gcTime to\n    // match the query-fn and reactive-options paths, but let an explicit value\n    // in the config win — otherwise a bare `{ query }` never syncs.\n    if (opts && typeof opts === `object` && typeof opts.query === `function`) {\n      return createLiveQueryCollection({ startSync: true, gcTime: 0, ...opts })\n    }\n\n    throw new Error(`Invalid options provided to injectLiveQuery`)\n  })\n\n  const state = signal(new Map<string | number, any>())\n  const internalData = signal<Array<any>>([])\n  const status = signal<CollectionStatus | `disabled`>(\n    collection() ? `idle` : `disabled`,\n  )\n\n  // Returns single item for singleResult collections, array otherwise\n  const data = computed(() => {\n    const currentCollection = collection()\n    if (!currentCollection) {\n      return internalData()\n    }\n    return isSingleResultCollection(currentCollection)\n      ? internalData()[0]\n      : internalData()\n  })\n\n  const syncDataFromCollection = (\n    currentCollection: Collection<any, any, any>,\n  ) => {\n    const newState = new Map(currentCollection.entries())\n    const newData = Array.from(currentCollection.values())\n\n    state.set(newState)\n    internalData.set(newData)\n    status.set(currentCollection.status)\n  }\n\n  let unsub: (() => void) | null = null\n  const cleanup = () => {\n    unsub?.()\n    unsub = null\n  }\n\n  effect((onCleanup) => {\n    const currentCollection = collection()\n\n    // Handle null collection (disabled query)\n    if (!currentCollection) {\n      status.set(`disabled` as const)\n      state.set(new Map())\n      internalData.set([])\n      cleanup()\n      return\n    }\n\n    cleanup()\n\n    // The shared observer owns sync start, subscription, the ready-race, and\n    // status transitions; Angular re-reads the whole collection on each notify\n    // (wholesale) into its signals.\n    // Angular re-reads the collection on notify; wholesale mode preserves its\n    // pre-observer loading policy (no initial-state snapshot request).\n    const observer = createLiveQueryObserver(currentCollection, {\n      mode: `wholesale`,\n    })\n\n    const unsubscribe = observer.subscribe(() => {\n      syncDataFromCollection(currentCollection)\n    })\n    // Wholesale attach suppresses listener calls raised by synchronous sync\n    // startup. Read once after subscribe returns to capture that final state.\n    syncDataFromCollection(currentCollection)\n    unsub = () => {\n      unsubscribe()\n      observer.dispose()\n    }\n\n    onCleanup(cleanup)\n  })\n\n  destroyRef.onDestroy(cleanup)\n\n  return {\n    state,\n    data,\n    // Loosely typed so the impl return stays compatible with every overload\n    // (the shared `isCollection` guard narrows the computed to `Collection | null`).\n    collection: collection as Signal<any>,\n    status,\n    isLoading: computed(() => status() === `loading`),\n    isReady: computed(() => status() === `ready` || status() === `disabled`),\n    isIdle: computed(() => status() === `idle`),\n    isError: computed(() => status() === `error`),\n    isCleanedUp: computed(() => status() === `cleaned-up`),\n  }\n}\n"],"names":["assertInInjectionContext","inject","DestroyRef","computed","isCollection","BaseQueryBuilder","createLiveQueryCollection","signal","isSingleResultCollection","effect","createLiveQueryObserver"],"mappings":"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"}

package/dist/esm/index.js

@@ -1,5 +1,5 @@
 import { assertInInjectionContext, inject, DestroyRef, computed, signal, effect } from "@angular/core";
-import { isCollection, BaseQueryBuilder, createLiveQueryCollection, isSingleResultCollection } from "@tanstack/db";
+import { isCollection, BaseQueryBuilder, createLiveQueryCollection, isSingleResultCollection, createLiveQueryObserver } from "@tanstack/db";
 export * from "@tanstack/db";
 function injectLiveQuery(opts) {
   assertInInjectionContext(injectLiveQuery);
@@ -74,20 +74,17 @@ function injectLiveQuery(opts) {
       return;
     }
     cleanup();
-    syncDataFromCollection(currentCollection);
-    if (currentCollection.status === `idle`) {
-      currentCollection.startSyncImmediate();
-      status.set(currentCollection.status);
-    }
-    const subscription = currentCollection.subscribeChanges(
-      (_) => {
-        syncDataFromCollection(currentCollection);
-      }
-    );
-    unsub = subscription.unsubscribe.bind(subscription);
-    currentCollection.onFirstReady(() => {
-      status.set(currentCollection.status);
+    const observer = createLiveQueryObserver(currentCollection, {
+      mode: `wholesale`
     });
+    const unsubscribe = observer.subscribe(() => {
+      syncDataFromCollection(currentCollection);
+    });
+    syncDataFromCollection(currentCollection);
+    unsub = () => {
+      unsubscribe();
+      observer.dispose();
+    };
     onCleanup(cleanup);
   });
   destroyRef.onDestroy(cleanup);

package/dist/esm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":["../../src/index.ts"],"sourcesContent":["import {\n  DestroyRef,\n  assertInInjectionContext,\n  computed,\n  effect,\n  inject,\n  signal,\n} from '@angular/core'\nimport {\n  BaseQueryBuilder,\n  createLiveQueryCollection,\n  isCollection,\n  isSingleResultCollection,\n} from '@tanstack/db'\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'\nimport type { Signal } from '@angular/core'\n\nexport * from '@tanstack/db'\n\n/**\n * The result of calling `injectLiveQuery`.\n * Contains reactive signals for the query state and data.\n */\nexport interface InjectLiveQueryResult<TContext extends Context> {\n  /** A signal containing the complete state map of results keyed by their ID */\n  state: Signal<Map<string | number, GetResult<TContext>>>\n  /** A signal containing the results as an array, or single result for findOne queries */\n  data: Signal<InferResultType<TContext>>\n  /** A signal containing the underlying collection instance (null for disabled queries) */\n  collection: Signal<Collection<\n    GetResult<TContext>,\n    string | number,\n    {}\n  > | null>\n  /** A signal containing the current status of the collection */\n  status: Signal<CollectionStatus | `disabled`>\n  /** A signal indicating whether the collection is currently loading */\n  isLoading: Signal<boolean>\n  /** A signal indicating whether the collection is ready */\n  isReady: Signal<boolean>\n  /** A signal indicating whether the collection is idle */\n  isIdle: Signal<boolean>\n  /** A signal indicating whether the collection has an error */\n  isError: Signal<boolean>\n  /** A signal indicating whether the collection has been cleaned up */\n  isCleanedUp: Signal<boolean>\n}\n\nexport interface InjectLiveQueryResultWithCollection<\n  TResult extends object = any,\n  TKey extends string | number = string | number,\n  TUtils extends Record<string, any> = {},\n> {\n  state: Signal<Map<TKey, TResult>>\n  data: Signal<Array<TResult>>\n  collection: Signal<Collection<TResult, TKey, TUtils> | null>\n  status: Signal<CollectionStatus | `disabled`>\n  isLoading: Signal<boolean>\n  isReady: Signal<boolean>\n  isIdle: Signal<boolean>\n  isError: Signal<boolean>\n  isCleanedUp: Signal<boolean>\n}\n\nexport interface InjectLiveQueryResultWithSingleResultCollection<\n  TResult extends object = any,\n  TKey extends string | number = string | number,\n  TUtils extends Record<string, any> = {},\n> {\n  state: Signal<Map<TKey, TResult>>\n  data: Signal<TResult | undefined>\n  collection: Signal<(Collection<TResult, TKey, TUtils> & SingleResult) | null>\n  status: Signal<CollectionStatus | `disabled`>\n  isLoading: Signal<boolean>\n  isReady: Signal<boolean>\n  isIdle: Signal<boolean>\n  isError: Signal<boolean>\n  isCleanedUp: Signal<boolean>\n}\n\nexport function injectLiveQuery<\n  TContext extends Context,\n  TParams extends any,\n>(options: {\n  params: () => TParams\n  query: (args: {\n    params: TParams\n    q: InitialQueryBuilder\n  }) => QueryBuilder<TContext>\n}): InjectLiveQueryResult<TContext>\nexport function injectLiveQuery<\n  TContext extends Context,\n  TParams extends any,\n>(options: {\n  params: () => TParams\n  query: (args: {\n    params: TParams\n    q: InitialQueryBuilder\n  }) => QueryBuilder<TContext> | undefined | null\n}): InjectLiveQueryResult<TContext>\nexport function injectLiveQuery<TContext extends Context>(\n  queryFn: (q: InitialQueryBuilder) => QueryBuilder<TContext>,\n): InjectLiveQueryResult<TContext>\nexport function injectLiveQuery<TContext extends Context>(\n  queryFn: (\n    q: InitialQueryBuilder,\n  ) => QueryBuilder<TContext> | undefined | null,\n): InjectLiveQueryResult<TContext>\nexport function injectLiveQuery<TContext extends Context>(\n  config: LiveQueryCollectionConfig<TContext>,\n): InjectLiveQueryResult<TContext>\n// Pre-created collection without singleResult\nexport function injectLiveQuery<\n  TResult extends object,\n  TKey extends string | number,\n  TUtils extends Record<string, any>,\n>(\n  liveQueryCollection: Collection<TResult, TKey, TUtils> & NonSingleResult,\n): InjectLiveQueryResultWithCollection<TResult, TKey, TUtils>\n// Pre-created collection with singleResult\nexport function injectLiveQuery<\n  TResult extends object,\n  TKey extends string | number,\n  TUtils extends Record<string, any>,\n>(\n  liveQueryCollection: Collection<TResult, TKey, TUtils> & SingleResult,\n): InjectLiveQueryResultWithSingleResultCollection<TResult, TKey, TUtils>\nexport function injectLiveQuery(opts: any) {\n  assertInInjectionContext(injectLiveQuery)\n  const destroyRef = inject(DestroyRef)\n\n  const collection = computed(() => {\n    // Check if it's an existing collection\n    if (isCollection(opts)) {\n      return opts\n    }\n\n    if (typeof opts === `function`) {\n      // Check if query function returns null/undefined (disabled query)\n      const queryBuilder = new BaseQueryBuilder() as InitialQueryBuilder\n      const result = opts(queryBuilder)\n\n      if (result === undefined || result === null) {\n        // Disabled query - return null\n        return null\n      }\n\n      return createLiveQueryCollection({\n        query: opts,\n        startSync: true,\n        gcTime: 0,\n      })\n    }\n\n    // Check if it's reactive query options\n    const isReactiveQueryOptions =\n      opts &&\n      typeof opts === `object` &&\n      typeof opts.query === `function` &&\n      typeof opts.params === `function`\n\n    if (isReactiveQueryOptions) {\n      const { params, query } = opts\n      const currentParams = params()\n\n      // Check if query function returns null/undefined (disabled query)\n      const queryBuilder = new BaseQueryBuilder() as InitialQueryBuilder\n      const result = query({ params: currentParams, q: queryBuilder })\n\n      if (result === undefined || result === null) {\n        // Disabled query - return null\n        return null\n      }\n\n      return createLiveQueryCollection({\n        query: () => result,\n        startSync: true,\n        gcTime: 0,\n      })\n    }\n\n    // Handle LiveQueryCollectionConfig objects. Default startSync/gcTime to\n    // match the query-fn and reactive-options paths, but let an explicit value\n    // in the config win — otherwise a bare `{ query }` never syncs.\n    if (opts && typeof opts === `object` && typeof opts.query === `function`) {\n      return createLiveQueryCollection({ startSync: true, gcTime: 0, ...opts })\n    }\n\n    throw new Error(`Invalid options provided to injectLiveQuery`)\n  })\n\n  const state = signal(new Map<string | number, any>())\n  const internalData = signal<Array<any>>([])\n  const status = signal<CollectionStatus | `disabled`>(\n    collection() ? `idle` : `disabled`,\n  )\n\n  // Returns single item for singleResult collections, array otherwise\n  const data = computed(() => {\n    const currentCollection = collection()\n    if (!currentCollection) {\n      return internalData()\n    }\n    return isSingleResultCollection(currentCollection)\n      ? internalData()[0]\n      : internalData()\n  })\n\n  const syncDataFromCollection = (\n    currentCollection: Collection<any, any, any>,\n  ) => {\n    const newState = new Map(currentCollection.entries())\n    const newData = Array.from(currentCollection.values())\n\n    state.set(newState)\n    internalData.set(newData)\n    status.set(currentCollection.status)\n  }\n\n  let unsub: (() => void) | null = null\n  const cleanup = () => {\n    unsub?.()\n    unsub = null\n  }\n\n  effect((onCleanup) => {\n    const currentCollection = collection()\n\n    // Handle null collection (disabled query)\n    if (!currentCollection) {\n      status.set(`disabled` as const)\n      state.set(new Map())\n      internalData.set([])\n      cleanup()\n      return\n    }\n\n    cleanup()\n\n    // Initialize immediately with current state\n    syncDataFromCollection(currentCollection)\n\n    // Start sync if idle\n    if (currentCollection.status === `idle`) {\n      currentCollection.startSyncImmediate()\n      // Update status after starting sync\n      status.set(currentCollection.status)\n    }\n\n    // Subscribe to changes\n    const subscription = currentCollection.subscribeChanges(\n      (_: Array<ChangeMessage<any>>) => {\n        syncDataFromCollection(currentCollection)\n      },\n    )\n    unsub = subscription.unsubscribe.bind(subscription)\n\n    // Handle ready state\n    currentCollection.onFirstReady(() => {\n      status.set(currentCollection.status)\n    })\n\n    onCleanup(cleanup)\n  })\n\n  destroyRef.onDestroy(cleanup)\n\n  return {\n    state,\n    data,\n    // Loosely typed so the impl return stays compatible with every overload\n    // (the shared `isCollection` guard narrows the computed to `Collection | null`).\n    collection: collection as Signal<any>,\n    status,\n    isLoading: computed(() => status() === `loading`),\n    isReady: computed(() => status() === `ready` || status() === `disabled`),\n    isIdle: computed(() => status() === `idle`),\n    isError: computed(() => status() === `error`),\n    isCleanedUp: computed(() => status() === `cleaned-up`),\n  }\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sources":["../../src/index.ts"],"sourcesContent":["import {\n  DestroyRef,\n  assertInInjectionContext,\n  computed,\n  effect,\n  inject,\n  signal,\n} from '@angular/core'\nimport {\n  BaseQueryBuilder,\n  createLiveQueryCollection,\n  createLiveQueryObserver,\n  isCollection,\n  isSingleResultCollection,\n} from '@tanstack/db'\nimport type {\n  Collection,\n  CollectionStatus,\n  Context,\n  GetResult,\n  InferResultType,\n  InitialQueryBuilder,\n  LiveQueryCollectionConfig,\n  NonSingleResult,\n  QueryBuilder,\n  SingleResult,\n} from '@tanstack/db'\nimport type { Signal } from '@angular/core'\n\nexport * from '@tanstack/db'\n\n/**\n * The result of calling `injectLiveQuery`.\n * Contains reactive signals for the query state and data.\n */\nexport interface InjectLiveQueryResult<TContext extends Context> {\n  /** A signal containing the complete state map of results keyed by their ID */\n  state: Signal<Map<string | number, GetResult<TContext>>>\n  /** A signal containing the results as an array, or single result for findOne queries */\n  data: Signal<InferResultType<TContext>>\n  /** A signal containing the underlying collection instance (null for disabled queries) */\n  collection: Signal<Collection<\n    GetResult<TContext>,\n    string | number,\n    {}\n  > | null>\n  /** A signal containing the current status of the collection */\n  status: Signal<CollectionStatus | `disabled`>\n  /** A signal indicating whether the collection is currently loading */\n  isLoading: Signal<boolean>\n  /** A signal indicating whether the collection is ready */\n  isReady: Signal<boolean>\n  /** A signal indicating whether the collection is idle */\n  isIdle: Signal<boolean>\n  /** A signal indicating whether the collection has an error */\n  isError: Signal<boolean>\n  /** A signal indicating whether the collection has been cleaned up */\n  isCleanedUp: Signal<boolean>\n}\n\nexport interface InjectLiveQueryResultWithCollection<\n  TResult extends object = any,\n  TKey extends string | number = string | number,\n  TUtils extends Record<string, any> = {},\n> {\n  state: Signal<Map<TKey, TResult>>\n  data: Signal<Array<TResult>>\n  collection: Signal<Collection<TResult, TKey, TUtils> | null>\n  status: Signal<CollectionStatus | `disabled`>\n  isLoading: Signal<boolean>\n  isReady: Signal<boolean>\n  isIdle: Signal<boolean>\n  isError: Signal<boolean>\n  isCleanedUp: Signal<boolean>\n}\n\nexport interface InjectLiveQueryResultWithSingleResultCollection<\n  TResult extends object = any,\n  TKey extends string | number = string | number,\n  TUtils extends Record<string, any> = {},\n> {\n  state: Signal<Map<TKey, TResult>>\n  data: Signal<TResult | undefined>\n  collection: Signal<(Collection<TResult, TKey, TUtils> & SingleResult) | null>\n  status: Signal<CollectionStatus | `disabled`>\n  isLoading: Signal<boolean>\n  isReady: Signal<boolean>\n  isIdle: Signal<boolean>\n  isError: Signal<boolean>\n  isCleanedUp: Signal<boolean>\n}\n\nexport function injectLiveQuery<\n  TContext extends Context,\n  TParams extends any,\n>(options: {\n  params: () => TParams\n  query: (args: {\n    params: TParams\n    q: InitialQueryBuilder\n  }) => QueryBuilder<TContext>\n}): InjectLiveQueryResult<TContext>\nexport function injectLiveQuery<\n  TContext extends Context,\n  TParams extends any,\n>(options: {\n  params: () => TParams\n  query: (args: {\n    params: TParams\n    q: InitialQueryBuilder\n  }) => QueryBuilder<TContext> | undefined | null\n}): InjectLiveQueryResult<TContext>\nexport function injectLiveQuery<TContext extends Context>(\n  queryFn: (q: InitialQueryBuilder) => QueryBuilder<TContext>,\n): InjectLiveQueryResult<TContext>\nexport function injectLiveQuery<TContext extends Context>(\n  queryFn: (\n    q: InitialQueryBuilder,\n  ) => QueryBuilder<TContext> | undefined | null,\n): InjectLiveQueryResult<TContext>\nexport function injectLiveQuery<TContext extends Context>(\n  config: LiveQueryCollectionConfig<TContext>,\n): InjectLiveQueryResult<TContext>\n// Pre-created collection without singleResult\nexport function injectLiveQuery<\n  TResult extends object,\n  TKey extends string | number,\n  TUtils extends Record<string, any>,\n>(\n  liveQueryCollection: Collection<TResult, TKey, TUtils> & NonSingleResult,\n): InjectLiveQueryResultWithCollection<TResult, TKey, TUtils>\n// Pre-created collection with singleResult\nexport function injectLiveQuery<\n  TResult extends object,\n  TKey extends string | number,\n  TUtils extends Record<string, any>,\n>(\n  liveQueryCollection: Collection<TResult, TKey, TUtils> & SingleResult,\n): InjectLiveQueryResultWithSingleResultCollection<TResult, TKey, TUtils>\nexport function injectLiveQuery(opts: any) {\n  assertInInjectionContext(injectLiveQuery)\n  const destroyRef = inject(DestroyRef)\n\n  const collection = computed(() => {\n    // Check if it's an existing collection\n    if (isCollection(opts)) {\n      return opts\n    }\n\n    if (typeof opts === `function`) {\n      // Check if query function returns null/undefined (disabled query)\n      const queryBuilder = new BaseQueryBuilder() as InitialQueryBuilder\n      const result = opts(queryBuilder)\n\n      if (result === undefined || result === null) {\n        // Disabled query - return null\n        return null\n      }\n\n      return createLiveQueryCollection({\n        query: opts,\n        startSync: true,\n        gcTime: 0,\n      })\n    }\n\n    // Check if it's reactive query options\n    const isReactiveQueryOptions =\n      opts &&\n      typeof opts === `object` &&\n      typeof opts.query === `function` &&\n      typeof opts.params === `function`\n\n    if (isReactiveQueryOptions) {\n      const { params, query } = opts\n      const currentParams = params()\n\n      // Check if query function returns null/undefined (disabled query)\n      const queryBuilder = new BaseQueryBuilder() as InitialQueryBuilder\n      const result = query({ params: currentParams, q: queryBuilder })\n\n      if (result === undefined || result === null) {\n        // Disabled query - return null\n        return null\n      }\n\n      return createLiveQueryCollection({\n        query: () => result,\n        startSync: true,\n        gcTime: 0,\n      })\n    }\n\n    // Handle LiveQueryCollectionConfig objects. Default startSync/gcTime to\n    // match the query-fn and reactive-options paths, but let an explicit value\n    // in the config win — otherwise a bare `{ query }` never syncs.\n    if (opts && typeof opts === `object` && typeof opts.query === `function`) {\n      return createLiveQueryCollection({ startSync: true, gcTime: 0, ...opts })\n    }\n\n    throw new Error(`Invalid options provided to injectLiveQuery`)\n  })\n\n  const state = signal(new Map<string | number, any>())\n  const internalData = signal<Array<any>>([])\n  const status = signal<CollectionStatus | `disabled`>(\n    collection() ? `idle` : `disabled`,\n  )\n\n  // Returns single item for singleResult collections, array otherwise\n  const data = computed(() => {\n    const currentCollection = collection()\n    if (!currentCollection) {\n      return internalData()\n    }\n    return isSingleResultCollection(currentCollection)\n      ? internalData()[0]\n      : internalData()\n  })\n\n  const syncDataFromCollection = (\n    currentCollection: Collection<any, any, any>,\n  ) => {\n    const newState = new Map(currentCollection.entries())\n    const newData = Array.from(currentCollection.values())\n\n    state.set(newState)\n    internalData.set(newData)\n    status.set(currentCollection.status)\n  }\n\n  let unsub: (() => void) | null = null\n  const cleanup = () => {\n    unsub?.()\n    unsub = null\n  }\n\n  effect((onCleanup) => {\n    const currentCollection = collection()\n\n    // Handle null collection (disabled query)\n    if (!currentCollection) {\n      status.set(`disabled` as const)\n      state.set(new Map())\n      internalData.set([])\n      cleanup()\n      return\n    }\n\n    cleanup()\n\n    // The shared observer owns sync start, subscription, the ready-race, and\n    // status transitions; Angular re-reads the whole collection on each notify\n    // (wholesale) into its signals.\n    // Angular re-reads the collection on notify; wholesale mode preserves its\n    // pre-observer loading policy (no initial-state snapshot request).\n    const observer = createLiveQueryObserver(currentCollection, {\n      mode: `wholesale`,\n    })\n\n    const unsubscribe = observer.subscribe(() => {\n      syncDataFromCollection(currentCollection)\n    })\n    // Wholesale attach suppresses listener calls raised by synchronous sync\n    // startup. Read once after subscribe returns to capture that final state.\n    syncDataFromCollection(currentCollection)\n    unsub = () => {\n      unsubscribe()\n      observer.dispose()\n    }\n\n    onCleanup(cleanup)\n  })\n\n  destroyRef.onDestroy(cleanup)\n\n  return {\n    state,\n    data,\n    // Loosely typed so the impl return stays compatible with every overload\n    // (the shared `isCollection` guard narrows the computed to `Collection | null`).\n    collection: collection as Signal<any>,\n    status,\n    isLoading: computed(() => status() === `loading`),\n    isReady: computed(() => status() === `ready` || status() === `disabled`),\n    isIdle: computed(() => status() === `idle`),\n    isError: computed(() => status() === `error`),\n    isCleanedUp: computed(() => status() === `cleaned-up`),\n  }\n}\n"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/angular-db",
-  "version": "0.1.76",
+  "version": "0.1.78",
   "description": "Angular integration for @tanstack/db",
   "author": "Ethan McDaniel",
   "license": "MIT",
@@ -40,7 +40,7 @@
     "skills"
   ],
   "dependencies": {
-    "@tanstack/db": "0.6.16"
+    "@tanstack/db": "0.7.0"
   },
   "peerDependencies": {
     "@angular/core": ">=16.0.0",

package/src/index.ts

@@ -9,11 +9,11 @@ import {
 import {
   BaseQueryBuilder,
   createLiveQueryCollection,
+  createLiveQueryObserver,
   isCollection,
   isSingleResultCollection,
 } from '@tanstack/db'
 import type {
-  ChangeMessage,
   Collection,
   CollectionStatus,
   Context,
@@ -249,28 +249,25 @@ export function injectLiveQuery(opts: any) {
 
     cleanup()
 
-    // Initialize immediately with current state
-    syncDataFromCollection(currentCollection)
-
-    // Start sync if idle
-    if (currentCollection.status === `idle`) {
-      currentCollection.startSyncImmediate()
-      // Update status after starting sync
-      status.set(currentCollection.status)
-    }
-
-    // Subscribe to changes
-    const subscription = currentCollection.subscribeChanges(
-      (_: Array<ChangeMessage<any>>) => {
-        syncDataFromCollection(currentCollection)
-      },
-    )
-    unsub = subscription.unsubscribe.bind(subscription)
+    // The shared observer owns sync start, subscription, the ready-race, and
+    // status transitions; Angular re-reads the whole collection on each notify
+    // (wholesale) into its signals.
+    // Angular re-reads the collection on notify; wholesale mode preserves its
+    // pre-observer loading policy (no initial-state snapshot request).
+    const observer = createLiveQueryObserver(currentCollection, {
+      mode: `wholesale`,
+    })
 
-    // Handle ready state
-    currentCollection.onFirstReady(() => {
-      status.set(currentCollection.status)
+    const unsubscribe = observer.subscribe(() => {
+      syncDataFromCollection(currentCollection)
     })
+    // Wholesale attach suppresses listener calls raised by synchronous sync
+    // startup. Read once after subscribe returns to capture that final state.
+    syncDataFromCollection(currentCollection)
+    unsub = () => {
+      unsubscribe()
+      observer.dispose()
+    }
 
     onCleanup(cleanup)
   })