@tanstack/angular-db 0.2.12 → 1.0.0-rc.1.1

package/README.md

@@ -226,11 +226,16 @@ Template Usage
 Use Angular's new control flow syntax for best performance:
 
     @if (query.isReady()) {
+      @if (query.isSyncError()) {
+        <div>Data may be out of date</div>
+      }
       @for (item of query.data(); track item.id) {
         <div>{{ item.text }}</div>
       }
-    } @else if (query.isError()) {
+    } @else if (query.isLoadingError()) {
       <div>Error loading data</div>
+    } @else if (query.isCrashed()) {
+      <div>Local storage failed</div>
     } @else {
       <div>Loading...</div>
     }
@@ -274,12 +279,15 @@ An object with Angular signals:
 - data: Signal<Array<T>> - Array of query results, automatically updates
 - state: Signal<Map<Key, T>> - Map of results by key, automatically updates
 - collection: Signal<Collection> - The underlying collection instance
-- status: Signal<CollectionStatus> - Current status ('idle' | 'loading' | 'ready' | 'error' | 'cleaned-up')
+- status: Signal<CollectionStatus | 'disabled'> - Current status ('idle' | 'loading' | 'ready' | 'error' | 'crashed' | 'cleaned-up' | 'disabled')
 - isLoading: Signal<boolean> - true when status is 'loading'
 - isReady: Signal<boolean> - true when status is 'ready'
 - isIdle: Signal<boolean> - true when status is 'idle'
-- isError: Signal<boolean> - true when status is 'error'
+- isLoadingError: Signal<boolean> - true when status is 'error': the first load failed
+- isCrashed: Signal<boolean> - true when status is 'crashed': local storage broke
 - isCleanedUp: Signal<boolean> - true when status is 'cleaned-up'
+- isSyncError: Signal<boolean> - true when status is 'ready' and the health tree has a problem
+- health: Signal<HealthNode | undefined> - The health tree: one node for the query and one per source; undefined for a disabled query
 
 Parameters
 

package/dist/cjs/index.cjs

@@ -20,14 +20,15 @@ function injectLiveQuery(opts) {
     }
     const isReactiveQueryOptions = opts && typeof opts === `object` && typeof opts.query === `function` && typeof opts.params === `function`;
     if (isReactiveQueryOptions) {
-      const { params, query } = opts;
-      const currentParams = params();
-      const queryBuilder = new db.BaseQueryBuilder();
-      const result = query({ params: currentParams, q: queryBuilder });
-      if (result === void 0 || result === null) {
-        return null;
-      }
-      return db.resolveLiveQueryValue(result, { gcTime: DEFAULT_GC_TIME_MS });
+      const pool = db.configPool(opts);
+      const result = opts.query({
+        params: opts.params(),
+        q: new db.BaseQueryBuilder()
+      });
+      return db.resolveLiveQueryValue(result, {
+        gcTime: DEFAULT_GC_TIME_MS,
+        pool
+      });
     }
     if (opts && typeof opts === `object` && typeof opts.query === `function`) {
       return db.resolveLiveQueryValue(opts, { gcTime: DEFAULT_GC_TIME_MS });
@@ -41,8 +42,10 @@ function injectLiveQuery(opts) {
     const value = statusValue();
     return value === `idle` && !collection() ? `disabled` : value;
   });
-  const persistedStatus = core.signal(`unavailable`);
-  const persistedError = core.signal(void 0);
+  const health = core.signal(void 0);
+  const flags = core.computed(
+    () => db.getLiveQueryStatusFlags(status(), health())
+  );
   const data = core.computed(() => {
     const currentCollection = collection();
     if (!currentCollection) {
@@ -57,8 +60,7 @@ function injectLiveQuery(opts) {
     internalData.set(newData);
     const snapshot = observer.getSnapshot();
     statusValue.set(snapshot.status);
-    persistedStatus.set(snapshot.persistedStatus);
-    persistedError.set(snapshot.persistedError);
+    health.set(snapshot.health);
   };
   let unsub = null;
   const cleanup = () => {
@@ -69,8 +71,7 @@ function injectLiveQuery(opts) {
     const currentCollection = collection();
     if (!currentCollection) {
       statusValue.set(`disabled`);
-      persistedStatus.set(`unavailable`);
-      persistedError.set(void 0);
+      health.set(void 0);
       state.set(/* @__PURE__ */ new Map());
       internalData.set([]);
       cleanup();
@@ -100,14 +101,14 @@ function injectLiveQuery(opts) {
       () => db.getPublicCollection(collection())
     ),
     status,
-    isLoading: core.computed(() => status() === `loading`),
-    isReady: core.computed(() => status() === `ready` || status() === `disabled`),
-    persistedStatus,
-    isPersistedReady: core.computed(() => persistedStatus() === `ready`),
-    persistedError,
-    isIdle: core.computed(() => status() === `idle`),
-    isError: core.computed(() => status() === `error`),
-    isCleanedUp: core.computed(() => status() === `cleaned-up`)
+    isLoading: core.computed(() => flags().isLoading),
+    isReady: core.computed(() => flags().isReady || status() === `disabled`),
+    isIdle: core.computed(() => flags().isIdle),
+    isLoadingError: core.computed(() => flags().isLoadingError),
+    isCrashed: core.computed(() => flags().isCrashed),
+    isCleanedUp: core.computed(() => flags().isCleanedUp),
+    isSyncError: core.computed(() => flags().isSyncError),
+    health
   };
 }
 exports.injectLiveQuery = injectLiveQuery;

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  createLiveQueryObserver,\n  getPublicCollection,\n  isCollection,\n  isSingleResultCollection,\n  resolveLiveQueryValue,\n} from '@tanstack/db'\nimport type {\n  Collection,\n  CollectionStatus,\n  Context,\n  GetResult,\n  InferResultType,\n  InitialQueryBuilder,\n  LiveQueryCollectionConfig,\n  LiveQueryObserver,\n  LiveQueryPersistedStatus,\n  NonSingleResult,\n  QueryBuilder,\n  SingleResult,\n} from '@tanstack/db'\nimport type { Signal } from '@angular/core'\n\nconst DEFAULT_GC_TIME_MS = 1\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  persistedStatus: Signal<LiveQueryPersistedStatus>\n  isPersistedReady: Signal<boolean>\n  persistedError: Signal<unknown | undefined>\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\ntype InferConditionalResultType<TContext extends Context> =\n  TContext extends SingleResult\n    ? InferResultType<TContext> | []\n    : InferResultType<TContext>\n\nexport type InjectConditionalLiveQueryResult<TContext extends Context> = Omit<\n  InjectLiveQueryResult<TContext>,\n  `data`\n> & {\n  data: Signal<InferConditionalResultType<TContext>>\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  persistedStatus: Signal<LiveQueryPersistedStatus>\n  isPersistedReady: Signal<boolean>\n  persistedError: Signal<unknown | undefined>\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  persistedStatus: Signal<LiveQueryPersistedStatus>\n  isPersistedReady: Signal<boolean>\n  persistedError: Signal<unknown | undefined>\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}): InjectConditionalLiveQueryResult<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): InjectConditionalLiveQueryResult<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 resolveLiveQueryValue(result, { gcTime: DEFAULT_GC_TIME_MS })\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 resolveLiveQueryValue(result, { gcTime: DEFAULT_GC_TIME_MS })\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 resolveLiveQueryValue(opts, { gcTime: DEFAULT_GC_TIME_MS })\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 statusValue = signal<CollectionStatus | `disabled`>(`idle`)\n  const status = computed(() => {\n    const value = statusValue()\n    return value === `idle` && !collection() ? `disabled` : value\n  })\n  const persistedStatus = signal<LiveQueryPersistedStatus>(`unavailable`)\n  const persistedError = signal<unknown>(undefined)\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    observer: LiveQueryObserver<any, any>,\n  ) => {\n    const newState = new Map(currentCollection.entries())\n    const newData = Array.from(newState.values())\n\n    state.set(newState)\n    internalData.set(newData)\n    const snapshot = observer.getSnapshot()\n    statusValue.set(snapshot.status)\n    persistedStatus.set(snapshot.persistedStatus)\n    persistedError.set(snapshot.persistedError)\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      statusValue.set(`disabled` as const)\n      persistedStatus.set(`unavailable`)\n      persistedError.set(undefined)\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, observer)\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, observer)\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: computed(() =>\n      getPublicCollection(collection()),\n    ) as Signal<any>,\n    status,\n    isLoading: computed(() => status() === `loading`),\n    isReady: computed(() => status() === `ready` || status() === `disabled`),\n    persistedStatus,\n    isPersistedReady: computed(() => persistedStatus() === `ready`),\n    persistedError,\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","resolveLiveQueryValue","signal","isSingleResultCollection","effect","createLiveQueryObserver","getPublicCollection"],"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  configPool,\n  createLiveQueryObserver,\n  getLiveQueryStatusFlags,\n  getPublicCollection,\n  isCollection,\n  isSingleResultCollection,\n  resolveLiveQueryValue,\n} from '@tanstack/db'\nimport type {\n  Collection,\n  CollectionStatus,\n  Context,\n  GetResult,\n  HealthNode,\n  InferResultType,\n  InitialQueryBuilder,\n  LiveQueryHookConfig,\n  LiveQueryObserver,\n  LiveQueryStatusFlags,\n  NonSingleResult,\n  PooledLiveQueries,\n  QueryBuilder,\n  SingleResult,\n} from '@tanstack/db'\nimport type { Signal } from '@angular/core'\n\nconst DEFAULT_GC_TIME_MS = 1\n\nexport * from '@tanstack/db'\n\n/**\n * The result of calling `injectLiveQuery`.\n * Contains reactive signals for the query state and data.\n */\n/** The status and flag signals every `injectLiveQuery` result has. */\nexport type InjectLiveQueryFlags = {\n  /** A signal containing the current status of the collection */\n  status: Signal<CollectionStatus | `disabled`>\n} & {\n  [K in keyof LiveQueryStatusFlags]: Signal<LiveQueryStatusFlags[K]>\n}\n\nexport interface InjectLiveQueryResult<\n  TContext extends Context,\n> extends InjectLiveQueryFlags {\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}\n\ntype InferConditionalResultType<TContext extends Context> =\n  TContext extends SingleResult\n    ? InferResultType<TContext> | []\n    : InferResultType<TContext>\n\nexport type InjectConditionalLiveQueryResult<TContext extends Context> = Omit<\n  InjectLiveQueryResult<TContext>,\n  `data`\n> & {\n  data: Signal<InferConditionalResultType<TContext>>\n}\n\nexport interface InjectLiveQueryResultWithCollection<\n  TResult extends object = any,\n  TKey extends string | number = string | number,\n  TUtils extends Record<string, any> = {},\n> extends InjectLiveQueryFlags {\n  state: Signal<Map<TKey, TResult>>\n  data: Signal<Array<TResult>>\n  collection: Signal<Collection<TResult, TKey, TUtils> | null>\n}\n\nexport interface InjectLiveQueryResultWithSingleResultCollection<\n  TResult extends object = any,\n  TKey extends string | number = string | number,\n  TUtils extends Record<string, any> = {},\n> extends InjectLiveQueryFlags {\n  state: Signal<Map<TKey, TResult>>\n  data: Signal<TResult | undefined>\n  collection: Signal<(Collection<TResult, TKey, TUtils> & SingleResult) | null>\n}\n\nexport function injectLiveQuery<\n  TContext extends Context,\n  TParams extends any,\n>(options: {\n  params: () => TParams\n  /** Pass `pooledLiveQueries` to share one partition among equal-shape queries. */\n  pool?: PooledLiveQueries\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  /** Pass `pooledLiveQueries` to share one partition among equal-shape queries. */\n  pool?: PooledLiveQueries\n  query: (args: {\n    params: TParams\n    q: InitialQueryBuilder\n  }) => QueryBuilder<TContext> | undefined | null\n}): InjectConditionalLiveQueryResult<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): InjectConditionalLiveQueryResult<TContext>\nexport function injectLiveQuery<TContext extends Context>(\n  config: LiveQueryHookConfig<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 resolveLiveQueryValue(result, { gcTime: DEFAULT_GC_TIME_MS })\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      // The pool is checked first, so a disabled query rejects it too.\n      const pool = configPool(opts)\n      // A query function returning null or undefined disables the query.\n      const result = opts.query({\n        params: opts.params(),\n        q: new BaseQueryBuilder() as InitialQueryBuilder,\n      })\n      return resolveLiveQueryValue(result, {\n        gcTime: DEFAULT_GC_TIME_MS,\n        pool,\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 resolveLiveQueryValue(opts, { gcTime: DEFAULT_GC_TIME_MS })\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 statusValue = signal<CollectionStatus | `disabled`>(`idle`)\n  const status = computed(() => {\n    const value = statusValue()\n    return value === `idle` && !collection() ? `disabled` : value\n  })\n  const health = signal<HealthNode | undefined>(undefined)\n  // Every status flag comes from the shared rule; a disabled query is ready.\n  const flags = computed(() =>\n    getLiveQueryStatusFlags(status() as CollectionStatus, health()),\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    observer: LiveQueryObserver<any, any>,\n  ) => {\n    const newState = new Map(currentCollection.entries())\n    const newData = Array.from(newState.values())\n\n    state.set(newState)\n    internalData.set(newData)\n    const snapshot = observer.getSnapshot()\n    statusValue.set(snapshot.status)\n    health.set(snapshot.health)\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      statusValue.set(`disabled` as const)\n      health.set(undefined)\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, observer)\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, observer)\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: computed(() =>\n      getPublicCollection(collection()),\n    ) as Signal<any>,\n    status,\n    isLoading: computed(() => flags().isLoading),\n    isReady: computed(() => flags().isReady || status() === `disabled`),\n    isIdle: computed(() => flags().isIdle),\n    isLoadingError: computed(() => flags().isLoadingError),\n    isCrashed: computed(() => flags().isCrashed),\n    isCleanedUp: computed(() => flags().isCleanedUp),\n    isSyncError: computed(() => flags().isSyncError),\n    health,\n  }\n}\n"],"names":["assertInInjectionContext","inject","DestroyRef","computed","isCollection","BaseQueryBuilder","resolveLiveQueryValue","configPool","signal","getLiveQueryStatusFlags","isSingleResultCollection","effect","createLiveQueryObserver","getPublicCollection"],"mappings":"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"}

package/dist/cjs/index.d.cts

@@ -1,67 +1,43 @@
-import { Collection, CollectionStatus, Context, GetResult, InferResultType, InitialQueryBuilder, LiveQueryCollectionConfig, LiveQueryPersistedStatus, NonSingleResult, QueryBuilder, SingleResult } from '@tanstack/db';
+import { Collection, CollectionStatus, Context, GetResult, InferResultType, InitialQueryBuilder, LiveQueryHookConfig, LiveQueryStatusFlags, NonSingleResult, PooledLiveQueries, QueryBuilder, SingleResult } from '@tanstack/db';
 import { Signal } from '@angular/core';
 export * from '@tanstack/db';
 /**
  * The result of calling `injectLiveQuery`.
  * Contains reactive signals for the query state and data.
  */
-export interface InjectLiveQueryResult<TContext extends Context> {
+/** The status and flag signals every `injectLiveQuery` result has. */
+export type InjectLiveQueryFlags = {
+    /** A signal containing the current status of the collection */
+    status: Signal<CollectionStatus | `disabled`>;
+} & {
+    [K in keyof LiveQueryStatusFlags]: Signal<LiveQueryStatusFlags[K]>;
+};
+export interface InjectLiveQueryResult<TContext extends Context> extends InjectLiveQueryFlags {
     /** A signal containing the complete state map of results keyed by their ID */
     state: Signal<Map<string | number, GetResult<TContext>>>;
     /** A signal containing the results as an array, or single result for findOne queries */
     data: Signal<InferResultType<TContext>>;
     /** A signal containing the underlying collection instance (null for disabled queries) */
     collection: Signal<Collection<GetResult<TContext>, string | number, {}> | null>;
-    /** A signal containing the current status of the collection */
-    status: Signal<CollectionStatus | `disabled`>;
-    /** A signal indicating whether the collection is currently loading */
-    isLoading: Signal<boolean>;
-    /** A signal indicating whether the collection is ready */
-    isReady: Signal<boolean>;
-    persistedStatus: Signal<LiveQueryPersistedStatus>;
-    isPersistedReady: Signal<boolean>;
-    persistedError: Signal<unknown | undefined>;
-    /** A signal indicating whether the collection is idle */
-    isIdle: Signal<boolean>;
-    /** A signal indicating whether the collection has an error */
-    isError: Signal<boolean>;
-    /** A signal indicating whether the collection has been cleaned up */
-    isCleanedUp: Signal<boolean>;
 }
 type InferConditionalResultType<TContext extends Context> = TContext extends SingleResult ? InferResultType<TContext> | [] : InferResultType<TContext>;
 export type InjectConditionalLiveQueryResult<TContext extends Context> = Omit<InjectLiveQueryResult<TContext>, `data`> & {
     data: Signal<InferConditionalResultType<TContext>>;
 };
-export interface InjectLiveQueryResultWithCollection<TResult extends object = any, TKey extends string | number = string | number, TUtils extends Record<string, any> = {}> {
+export interface InjectLiveQueryResultWithCollection<TResult extends object = any, TKey extends string | number = string | number, TUtils extends Record<string, any> = {}> extends InjectLiveQueryFlags {
     state: Signal<Map<TKey, TResult>>;
     data: Signal<Array<TResult>>;
     collection: Signal<Collection<TResult, TKey, TUtils> | null>;
-    status: Signal<CollectionStatus | `disabled`>;
-    isLoading: Signal<boolean>;
-    isReady: Signal<boolean>;
-    persistedStatus: Signal<LiveQueryPersistedStatus>;
-    isPersistedReady: Signal<boolean>;
-    persistedError: Signal<unknown | undefined>;
-    isIdle: Signal<boolean>;
-    isError: Signal<boolean>;
-    isCleanedUp: Signal<boolean>;
 }
-export interface InjectLiveQueryResultWithSingleResultCollection<TResult extends object = any, TKey extends string | number = string | number, TUtils extends Record<string, any> = {}> {
+export interface InjectLiveQueryResultWithSingleResultCollection<TResult extends object = any, TKey extends string | number = string | number, TUtils extends Record<string, any> = {}> extends InjectLiveQueryFlags {
     state: Signal<Map<TKey, TResult>>;
     data: Signal<TResult | undefined>;
     collection: Signal<(Collection<TResult, TKey, TUtils> & SingleResult) | null>;
-    status: Signal<CollectionStatus | `disabled`>;
-    isLoading: Signal<boolean>;
-    isReady: Signal<boolean>;
-    persistedStatus: Signal<LiveQueryPersistedStatus>;
-    isPersistedReady: Signal<boolean>;
-    persistedError: Signal<unknown | undefined>;
-    isIdle: Signal<boolean>;
-    isError: Signal<boolean>;
-    isCleanedUp: Signal<boolean>;
 }
 export declare function injectLiveQuery<TContext extends Context, TParams extends any>(options: {
     params: () => TParams;
+    /** Pass `pooledLiveQueries` to share one partition among equal-shape queries. */
+    pool?: PooledLiveQueries;
     query: (args: {
         params: TParams;
         q: InitialQueryBuilder;
@@ -69,6 +45,8 @@ export declare function injectLiveQuery<TContext extends Context, TParams extend
 }): InjectLiveQueryResult<TContext>;
 export declare function injectLiveQuery<TContext extends Context, TParams extends any>(options: {
     params: () => TParams;
+    /** Pass `pooledLiveQueries` to share one partition among equal-shape queries. */
+    pool?: PooledLiveQueries;
     query: (args: {
         params: TParams;
         q: InitialQueryBuilder;
@@ -76,6 +54,6 @@ export declare function injectLiveQuery<TContext extends Context, TParams extend
 }): InjectConditionalLiveQueryResult<TContext>;
 export declare function injectLiveQuery<TContext extends Context>(queryFn: (q: InitialQueryBuilder) => QueryBuilder<TContext>): InjectLiveQueryResult<TContext>;
 export declare function injectLiveQuery<TContext extends Context>(queryFn: (q: InitialQueryBuilder) => QueryBuilder<TContext> | undefined | null): InjectConditionalLiveQueryResult<TContext>;
-export declare function injectLiveQuery<TContext extends Context>(config: LiveQueryCollectionConfig<TContext>): InjectLiveQueryResult<TContext>;
+export declare function injectLiveQuery<TContext extends Context>(config: LiveQueryHookConfig<TContext>): InjectLiveQueryResult<TContext>;
 export declare function injectLiveQuery<TResult extends object, TKey extends string | number, TUtils extends Record<string, any>>(liveQueryCollection: Collection<TResult, TKey, TUtils> & NonSingleResult): InjectLiveQueryResultWithCollection<TResult, TKey, TUtils>;
 export declare function injectLiveQuery<TResult extends object, TKey extends string | number, TUtils extends Record<string, any>>(liveQueryCollection: Collection<TResult, TKey, TUtils> & SingleResult): InjectLiveQueryResultWithSingleResultCollection<TResult, TKey, TUtils>;

package/dist/esm/index.d.ts

@@ -1,67 +1,43 @@
-import { Collection, CollectionStatus, Context, GetResult, InferResultType, InitialQueryBuilder, LiveQueryCollectionConfig, LiveQueryPersistedStatus, NonSingleResult, QueryBuilder, SingleResult } from '@tanstack/db';
+import { Collection, CollectionStatus, Context, GetResult, InferResultType, InitialQueryBuilder, LiveQueryHookConfig, LiveQueryStatusFlags, NonSingleResult, PooledLiveQueries, QueryBuilder, SingleResult } from '@tanstack/db';
 import { Signal } from '@angular/core';
 export * from '@tanstack/db';
 /**
  * The result of calling `injectLiveQuery`.
  * Contains reactive signals for the query state and data.
  */
-export interface InjectLiveQueryResult<TContext extends Context> {
+/** The status and flag signals every `injectLiveQuery` result has. */
+export type InjectLiveQueryFlags = {
+    /** A signal containing the current status of the collection */
+    status: Signal<CollectionStatus | `disabled`>;
+} & {
+    [K in keyof LiveQueryStatusFlags]: Signal<LiveQueryStatusFlags[K]>;
+};
+export interface InjectLiveQueryResult<TContext extends Context> extends InjectLiveQueryFlags {
     /** A signal containing the complete state map of results keyed by their ID */
     state: Signal<Map<string | number, GetResult<TContext>>>;
     /** A signal containing the results as an array, or single result for findOne queries */
     data: Signal<InferResultType<TContext>>;
     /** A signal containing the underlying collection instance (null for disabled queries) */
     collection: Signal<Collection<GetResult<TContext>, string | number, {}> | null>;
-    /** A signal containing the current status of the collection */
-    status: Signal<CollectionStatus | `disabled`>;
-    /** A signal indicating whether the collection is currently loading */
-    isLoading: Signal<boolean>;
-    /** A signal indicating whether the collection is ready */
-    isReady: Signal<boolean>;
-    persistedStatus: Signal<LiveQueryPersistedStatus>;
-    isPersistedReady: Signal<boolean>;
-    persistedError: Signal<unknown | undefined>;
-    /** A signal indicating whether the collection is idle */
-    isIdle: Signal<boolean>;
-    /** A signal indicating whether the collection has an error */
-    isError: Signal<boolean>;
-    /** A signal indicating whether the collection has been cleaned up */
-    isCleanedUp: Signal<boolean>;
 }
 type InferConditionalResultType<TContext extends Context> = TContext extends SingleResult ? InferResultType<TContext> | [] : InferResultType<TContext>;
 export type InjectConditionalLiveQueryResult<TContext extends Context> = Omit<InjectLiveQueryResult<TContext>, `data`> & {
     data: Signal<InferConditionalResultType<TContext>>;
 };
-export interface InjectLiveQueryResultWithCollection<TResult extends object = any, TKey extends string | number = string | number, TUtils extends Record<string, any> = {}> {
+export interface InjectLiveQueryResultWithCollection<TResult extends object = any, TKey extends string | number = string | number, TUtils extends Record<string, any> = {}> extends InjectLiveQueryFlags {
     state: Signal<Map<TKey, TResult>>;
     data: Signal<Array<TResult>>;
     collection: Signal<Collection<TResult, TKey, TUtils> | null>;
-    status: Signal<CollectionStatus | `disabled`>;
-    isLoading: Signal<boolean>;
-    isReady: Signal<boolean>;
-    persistedStatus: Signal<LiveQueryPersistedStatus>;
-    isPersistedReady: Signal<boolean>;
-    persistedError: Signal<unknown | undefined>;
-    isIdle: Signal<boolean>;
-    isError: Signal<boolean>;
-    isCleanedUp: Signal<boolean>;
 }
-export interface InjectLiveQueryResultWithSingleResultCollection<TResult extends object = any, TKey extends string | number = string | number, TUtils extends Record<string, any> = {}> {
+export interface InjectLiveQueryResultWithSingleResultCollection<TResult extends object = any, TKey extends string | number = string | number, TUtils extends Record<string, any> = {}> extends InjectLiveQueryFlags {
     state: Signal<Map<TKey, TResult>>;
     data: Signal<TResult | undefined>;
     collection: Signal<(Collection<TResult, TKey, TUtils> & SingleResult) | null>;
-    status: Signal<CollectionStatus | `disabled`>;
-    isLoading: Signal<boolean>;
-    isReady: Signal<boolean>;
-    persistedStatus: Signal<LiveQueryPersistedStatus>;
-    isPersistedReady: Signal<boolean>;
-    persistedError: Signal<unknown | undefined>;
-    isIdle: Signal<boolean>;
-    isError: Signal<boolean>;
-    isCleanedUp: Signal<boolean>;
 }
 export declare function injectLiveQuery<TContext extends Context, TParams extends any>(options: {
     params: () => TParams;
+    /** Pass `pooledLiveQueries` to share one partition among equal-shape queries. */
+    pool?: PooledLiveQueries;
     query: (args: {
         params: TParams;
         q: InitialQueryBuilder;
@@ -69,6 +45,8 @@ export declare function injectLiveQuery<TContext extends Context, TParams extend
 }): InjectLiveQueryResult<TContext>;
 export declare function injectLiveQuery<TContext extends Context, TParams extends any>(options: {
     params: () => TParams;
+    /** Pass `pooledLiveQueries` to share one partition among equal-shape queries. */
+    pool?: PooledLiveQueries;
     query: (args: {
         params: TParams;
         q: InitialQueryBuilder;
@@ -76,6 +54,6 @@ export declare function injectLiveQuery<TContext extends Context, TParams extend
 }): InjectConditionalLiveQueryResult<TContext>;
 export declare function injectLiveQuery<TContext extends Context>(queryFn: (q: InitialQueryBuilder) => QueryBuilder<TContext>): InjectLiveQueryResult<TContext>;
 export declare function injectLiveQuery<TContext extends Context>(queryFn: (q: InitialQueryBuilder) => QueryBuilder<TContext> | undefined | null): InjectConditionalLiveQueryResult<TContext>;
-export declare function injectLiveQuery<TContext extends Context>(config: LiveQueryCollectionConfig<TContext>): InjectLiveQueryResult<TContext>;
+export declare function injectLiveQuery<TContext extends Context>(config: LiveQueryHookConfig<TContext>): InjectLiveQueryResult<TContext>;
 export declare function injectLiveQuery<TResult extends object, TKey extends string | number, TUtils extends Record<string, any>>(liveQueryCollection: Collection<TResult, TKey, TUtils> & NonSingleResult): InjectLiveQueryResultWithCollection<TResult, TKey, TUtils>;
 export declare function injectLiveQuery<TResult extends object, TKey extends string | number, TUtils extends Record<string, any>>(liveQueryCollection: Collection<TResult, TKey, TUtils> & SingleResult): InjectLiveQueryResultWithSingleResultCollection<TResult, TKey, TUtils>;

package/dist/esm/index.js

@@ -1,5 +1,5 @@
 import { assertInInjectionContext, inject, DestroyRef, computed, signal, effect } from "@angular/core";
-import { isCollection, BaseQueryBuilder, resolveLiveQueryValue, isSingleResultCollection, createLiveQueryObserver, getPublicCollection } from "@tanstack/db";
+import { isCollection, BaseQueryBuilder, resolveLiveQueryValue, configPool, getLiveQueryStatusFlags, isSingleResultCollection, createLiveQueryObserver, getPublicCollection } from "@tanstack/db";
 export * from "@tanstack/db";
 const DEFAULT_GC_TIME_MS = 1;
 function injectLiveQuery(opts) {
@@ -19,14 +19,15 @@ function injectLiveQuery(opts) {
     }
     const isReactiveQueryOptions = opts && typeof opts === `object` && typeof opts.query === `function` && typeof opts.params === `function`;
     if (isReactiveQueryOptions) {
-      const { params, query } = opts;
-      const currentParams = params();
-      const queryBuilder = new BaseQueryBuilder();
-      const result = query({ params: currentParams, q: queryBuilder });
-      if (result === void 0 || result === null) {
-        return null;
-      }
-      return resolveLiveQueryValue(result, { gcTime: DEFAULT_GC_TIME_MS });
+      const pool = configPool(opts);
+      const result = opts.query({
+        params: opts.params(),
+        q: new BaseQueryBuilder()
+      });
+      return resolveLiveQueryValue(result, {
+        gcTime: DEFAULT_GC_TIME_MS,
+        pool
+      });
     }
     if (opts && typeof opts === `object` && typeof opts.query === `function`) {
       return resolveLiveQueryValue(opts, { gcTime: DEFAULT_GC_TIME_MS });
@@ -40,8 +41,10 @@ function injectLiveQuery(opts) {
     const value = statusValue();
     return value === `idle` && !collection() ? `disabled` : value;
   });
-  const persistedStatus = signal(`unavailable`);
-  const persistedError = signal(void 0);
+  const health = signal(void 0);
+  const flags = computed(
+    () => getLiveQueryStatusFlags(status(), health())
+  );
   const data = computed(() => {
     const currentCollection = collection();
     if (!currentCollection) {
@@ -56,8 +59,7 @@ function injectLiveQuery(opts) {
     internalData.set(newData);
     const snapshot = observer.getSnapshot();
     statusValue.set(snapshot.status);
-    persistedStatus.set(snapshot.persistedStatus);
-    persistedError.set(snapshot.persistedError);
+    health.set(snapshot.health);
   };
   let unsub = null;
   const cleanup = () => {
@@ -68,8 +70,7 @@ function injectLiveQuery(opts) {
     const currentCollection = collection();
     if (!currentCollection) {
       statusValue.set(`disabled`);
-      persistedStatus.set(`unavailable`);
-      persistedError.set(void 0);
+      health.set(void 0);
       state.set(/* @__PURE__ */ new Map());
       internalData.set([]);
       cleanup();
@@ -99,14 +100,14 @@ function injectLiveQuery(opts) {
       () => getPublicCollection(collection())
     ),
     status,
-    isLoading: computed(() => status() === `loading`),
-    isReady: computed(() => status() === `ready` || status() === `disabled`),
-    persistedStatus,
-    isPersistedReady: computed(() => persistedStatus() === `ready`),
-    persistedError,
-    isIdle: computed(() => status() === `idle`),
-    isError: computed(() => status() === `error`),
-    isCleanedUp: computed(() => status() === `cleaned-up`)
+    isLoading: computed(() => flags().isLoading),
+    isReady: computed(() => flags().isReady || status() === `disabled`),
+    isIdle: computed(() => flags().isIdle),
+    isLoadingError: computed(() => flags().isLoadingError),
+    isCrashed: computed(() => flags().isCrashed),
+    isCleanedUp: computed(() => flags().isCleanedUp),
+    isSyncError: computed(() => flags().isSyncError),
+    health
   };
 }
 export {

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  createLiveQueryObserver,\n  getPublicCollection,\n  isCollection,\n  isSingleResultCollection,\n  resolveLiveQueryValue,\n} from '@tanstack/db'\nimport type {\n  Collection,\n  CollectionStatus,\n  Context,\n  GetResult,\n  InferResultType,\n  InitialQueryBuilder,\n  LiveQueryCollectionConfig,\n  LiveQueryObserver,\n  LiveQueryPersistedStatus,\n  NonSingleResult,\n  QueryBuilder,\n  SingleResult,\n} from '@tanstack/db'\nimport type { Signal } from '@angular/core'\n\nconst DEFAULT_GC_TIME_MS = 1\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  persistedStatus: Signal<LiveQueryPersistedStatus>\n  isPersistedReady: Signal<boolean>\n  persistedError: Signal<unknown | undefined>\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\ntype InferConditionalResultType<TContext extends Context> =\n  TContext extends SingleResult\n    ? InferResultType<TContext> | []\n    : InferResultType<TContext>\n\nexport type InjectConditionalLiveQueryResult<TContext extends Context> = Omit<\n  InjectLiveQueryResult<TContext>,\n  `data`\n> & {\n  data: Signal<InferConditionalResultType<TContext>>\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  persistedStatus: Signal<LiveQueryPersistedStatus>\n  isPersistedReady: Signal<boolean>\n  persistedError: Signal<unknown | undefined>\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  persistedStatus: Signal<LiveQueryPersistedStatus>\n  isPersistedReady: Signal<boolean>\n  persistedError: Signal<unknown | undefined>\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}): InjectConditionalLiveQueryResult<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): InjectConditionalLiveQueryResult<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 resolveLiveQueryValue(result, { gcTime: DEFAULT_GC_TIME_MS })\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 resolveLiveQueryValue(result, { gcTime: DEFAULT_GC_TIME_MS })\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 resolveLiveQueryValue(opts, { gcTime: DEFAULT_GC_TIME_MS })\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 statusValue = signal<CollectionStatus | `disabled`>(`idle`)\n  const status = computed(() => {\n    const value = statusValue()\n    return value === `idle` && !collection() ? `disabled` : value\n  })\n  const persistedStatus = signal<LiveQueryPersistedStatus>(`unavailable`)\n  const persistedError = signal<unknown>(undefined)\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    observer: LiveQueryObserver<any, any>,\n  ) => {\n    const newState = new Map(currentCollection.entries())\n    const newData = Array.from(newState.values())\n\n    state.set(newState)\n    internalData.set(newData)\n    const snapshot = observer.getSnapshot()\n    statusValue.set(snapshot.status)\n    persistedStatus.set(snapshot.persistedStatus)\n    persistedError.set(snapshot.persistedError)\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      statusValue.set(`disabled` as const)\n      persistedStatus.set(`unavailable`)\n      persistedError.set(undefined)\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, observer)\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, observer)\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: computed(() =>\n      getPublicCollection(collection()),\n    ) as Signal<any>,\n    status,\n    isLoading: computed(() => status() === `loading`),\n    isReady: computed(() => status() === `ready` || status() === `disabled`),\n    persistedStatus,\n    isPersistedReady: computed(() => persistedStatus() === `ready`),\n    persistedError,\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  configPool,\n  createLiveQueryObserver,\n  getLiveQueryStatusFlags,\n  getPublicCollection,\n  isCollection,\n  isSingleResultCollection,\n  resolveLiveQueryValue,\n} from '@tanstack/db'\nimport type {\n  Collection,\n  CollectionStatus,\n  Context,\n  GetResult,\n  HealthNode,\n  InferResultType,\n  InitialQueryBuilder,\n  LiveQueryHookConfig,\n  LiveQueryObserver,\n  LiveQueryStatusFlags,\n  NonSingleResult,\n  PooledLiveQueries,\n  QueryBuilder,\n  SingleResult,\n} from '@tanstack/db'\nimport type { Signal } from '@angular/core'\n\nconst DEFAULT_GC_TIME_MS = 1\n\nexport * from '@tanstack/db'\n\n/**\n * The result of calling `injectLiveQuery`.\n * Contains reactive signals for the query state and data.\n */\n/** The status and flag signals every `injectLiveQuery` result has. */\nexport type InjectLiveQueryFlags = {\n  /** A signal containing the current status of the collection */\n  status: Signal<CollectionStatus | `disabled`>\n} & {\n  [K in keyof LiveQueryStatusFlags]: Signal<LiveQueryStatusFlags[K]>\n}\n\nexport interface InjectLiveQueryResult<\n  TContext extends Context,\n> extends InjectLiveQueryFlags {\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}\n\ntype InferConditionalResultType<TContext extends Context> =\n  TContext extends SingleResult\n    ? InferResultType<TContext> | []\n    : InferResultType<TContext>\n\nexport type InjectConditionalLiveQueryResult<TContext extends Context> = Omit<\n  InjectLiveQueryResult<TContext>,\n  `data`\n> & {\n  data: Signal<InferConditionalResultType<TContext>>\n}\n\nexport interface InjectLiveQueryResultWithCollection<\n  TResult extends object = any,\n  TKey extends string | number = string | number,\n  TUtils extends Record<string, any> = {},\n> extends InjectLiveQueryFlags {\n  state: Signal<Map<TKey, TResult>>\n  data: Signal<Array<TResult>>\n  collection: Signal<Collection<TResult, TKey, TUtils> | null>\n}\n\nexport interface InjectLiveQueryResultWithSingleResultCollection<\n  TResult extends object = any,\n  TKey extends string | number = string | number,\n  TUtils extends Record<string, any> = {},\n> extends InjectLiveQueryFlags {\n  state: Signal<Map<TKey, TResult>>\n  data: Signal<TResult | undefined>\n  collection: Signal<(Collection<TResult, TKey, TUtils> & SingleResult) | null>\n}\n\nexport function injectLiveQuery<\n  TContext extends Context,\n  TParams extends any,\n>(options: {\n  params: () => TParams\n  /** Pass `pooledLiveQueries` to share one partition among equal-shape queries. */\n  pool?: PooledLiveQueries\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  /** Pass `pooledLiveQueries` to share one partition among equal-shape queries. */\n  pool?: PooledLiveQueries\n  query: (args: {\n    params: TParams\n    q: InitialQueryBuilder\n  }) => QueryBuilder<TContext> | undefined | null\n}): InjectConditionalLiveQueryResult<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): InjectConditionalLiveQueryResult<TContext>\nexport function injectLiveQuery<TContext extends Context>(\n  config: LiveQueryHookConfig<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 resolveLiveQueryValue(result, { gcTime: DEFAULT_GC_TIME_MS })\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      // The pool is checked first, so a disabled query rejects it too.\n      const pool = configPool(opts)\n      // A query function returning null or undefined disables the query.\n      const result = opts.query({\n        params: opts.params(),\n        q: new BaseQueryBuilder() as InitialQueryBuilder,\n      })\n      return resolveLiveQueryValue(result, {\n        gcTime: DEFAULT_GC_TIME_MS,\n        pool,\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 resolveLiveQueryValue(opts, { gcTime: DEFAULT_GC_TIME_MS })\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 statusValue = signal<CollectionStatus | `disabled`>(`idle`)\n  const status = computed(() => {\n    const value = statusValue()\n    return value === `idle` && !collection() ? `disabled` : value\n  })\n  const health = signal<HealthNode | undefined>(undefined)\n  // Every status flag comes from the shared rule; a disabled query is ready.\n  const flags = computed(() =>\n    getLiveQueryStatusFlags(status() as CollectionStatus, health()),\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    observer: LiveQueryObserver<any, any>,\n  ) => {\n    const newState = new Map(currentCollection.entries())\n    const newData = Array.from(newState.values())\n\n    state.set(newState)\n    internalData.set(newData)\n    const snapshot = observer.getSnapshot()\n    statusValue.set(snapshot.status)\n    health.set(snapshot.health)\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      statusValue.set(`disabled` as const)\n      health.set(undefined)\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, observer)\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, observer)\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: computed(() =>\n      getPublicCollection(collection()),\n    ) as Signal<any>,\n    status,\n    isLoading: computed(() => flags().isLoading),\n    isReady: computed(() => flags().isReady || status() === `disabled`),\n    isIdle: computed(() => flags().isIdle),\n    isLoadingError: computed(() => flags().isLoadingError),\n    isCrashed: computed(() => flags().isCrashed),\n    isCleanedUp: computed(() => flags().isCleanedUp),\n    isSyncError: computed(() => flags().isSyncError),\n    health,\n  }\n}\n"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/angular-db",
-  "version": "0.2.12",
+  "version": "1.0.0-rc.1.1",
   "description": "Angular integration for @tanstack/db",
   "author": "Ethan McDaniel",
   "license": "MIT",
@@ -40,19 +40,19 @@
     "skills"
   ],
   "dependencies": {
-    "@tanstack/db": "0.15.2"
+    "@tanstack/db": "1.0.0-rc.1.1"
   },
   "peerDependencies": {
     "@angular/core": ">=16.0.0",
     "rxjs": ">=6.0.0"
   },
   "devDependencies": {
-    "@angular/common": "^20.3.16",
-    "@angular/compiler": "^20.3.16",
-    "@angular/core": "^20.3.16",
-    "@angular/platform-browser": "^20.3.16",
-    "@angular/platform-browser-dynamic": "^20.3.16",
-    "@vitest/coverage-istanbul": "^3.2.4",
+    "@angular/common": "^20.3.34",
+    "@angular/compiler": "^20.3.34",
+    "@angular/core": "^20.3.34",
+    "@angular/platform-browser": "^20.3.34",
+    "@angular/platform-browser-dynamic": "^20.3.34",
+    "@vitest/coverage-istanbul": "^4.1.12",
     "rxjs": "^7.8.2",
     "zone.js": "~0.15.0"
   },

package/skills/angular-db/SKILL.md

@@ -66,7 +66,11 @@ Returns an object with Angular `Signal<T>` properties — call with `()` in temp
 const query = injectLiveQuery((q) => q.from({ todo: todoCollection }))
 // query.data()       → Array<T>
 // query.status()     → CollectionStatus | 'disabled'
-// query.isLoading(), query.isReady(), query.isError()
+// query.isLoading(), query.isReady()
+// query.isLoadingError() → the first load failed: nothing to show
+// query.isCrashed()      → status 'crashed': local storage broke
+// query.isSyncError()    → data is shown, but a sync problem is in health
+// query.health()     → health tree: one node for the query and one per source
 // query.isIdle(), query.isCleanedUp()  (seldom used)
 // query.state()      → Map<TKey, T>
 // query.collection() → Collection | null
@@ -188,7 +192,7 @@ Angular 16 structural directives:
 
 ## Includes (Hierarchical Data)
 
-When a query uses includes (subqueries in `select`), each child field is a live `Collection` by default. Subscribe to it with `injectLiveQuery` in a child component:
+When a query uses `include()` for a subquery in `select`, each child field is a live `Collection`. Subscribe to it with `injectLiveQuery` in a child component:
 
 ```typescript
 @Component({
@@ -209,10 +213,12 @@ export class ProjectListComponent {
     q.from({ p: projectsCollection }).select(({ p }) => ({
       id: p.id,
       name: p.name,
-      issues: q
-        .from({ i: issuesCollection })
-        .where(({ i }) => eq(i.projectId, p.id))
-        .select(({ i }) => ({ id: i.id, title: i.title })),
+      issues: include(
+        q
+          .from({ i: issuesCollection })
+          .where(({ i }) => eq(i.projectId, p.id))
+          .select(({ i }) => ({ id: i.id, title: i.title })),
+      ),
     })),
   )
 }

package/src/index.ts

@@ -8,7 +8,9 @@ import {
 } from '@angular/core'
 import {
   BaseQueryBuilder,
+  configPool,
   createLiveQueryObserver,
+  getLiveQueryStatusFlags,
   getPublicCollection,
   isCollection,
   isSingleResultCollection,
@@ -19,12 +21,14 @@ import type {
   CollectionStatus,
   Context,
   GetResult,
+  HealthNode,
   InferResultType,
   InitialQueryBuilder,
-  LiveQueryCollectionConfig,
+  LiveQueryHookConfig,
   LiveQueryObserver,
-  LiveQueryPersistedStatus,
+  LiveQueryStatusFlags,
   NonSingleResult,
+  PooledLiveQueries,
   QueryBuilder,
   SingleResult,
 } from '@tanstack/db'
@@ -38,7 +42,17 @@ export * from '@tanstack/db'
  * The result of calling `injectLiveQuery`.
  * Contains reactive signals for the query state and data.
  */
-export interface InjectLiveQueryResult<TContext extends Context> {
+/** The status and flag signals every `injectLiveQuery` result has. */
+export type InjectLiveQueryFlags = {
+  /** A signal containing the current status of the collection */
+  status: Signal<CollectionStatus | `disabled`>
+} & {
+  [K in keyof LiveQueryStatusFlags]: Signal<LiveQueryStatusFlags[K]>
+}
+
+export interface InjectLiveQueryResult<
+  TContext extends Context,
+> extends InjectLiveQueryFlags {
   /** A signal containing the complete state map of results keyed by their ID */
   state: Signal<Map<string | number, GetResult<TContext>>>
   /** A signal containing the results as an array, or single result for findOne queries */
@@ -49,21 +63,6 @@ export interface InjectLiveQueryResult<TContext extends Context> {
     string | number,
     {}
   > | null>
-  /** A signal containing the current status of the collection */
-  status: Signal<CollectionStatus | `disabled`>
-  /** A signal indicating whether the collection is currently loading */
-  isLoading: Signal<boolean>
-  /** A signal indicating whether the collection is ready */
-  isReady: Signal<boolean>
-  persistedStatus: Signal<LiveQueryPersistedStatus>
-  isPersistedReady: Signal<boolean>
-  persistedError: Signal<unknown | undefined>
-  /** A signal indicating whether the collection is idle */
-  isIdle: Signal<boolean>
-  /** A signal indicating whether the collection has an error */
-  isError: Signal<boolean>
-  /** A signal indicating whether the collection has been cleaned up */
-  isCleanedUp: Signal<boolean>
 }
 
 type InferConditionalResultType<TContext extends Context> =
@@ -82,38 +81,20 @@ export interface InjectLiveQueryResultWithCollection<
   TResult extends object = any,
   TKey extends string | number = string | number,
   TUtils extends Record<string, any> = {},
-> {
+> extends InjectLiveQueryFlags {
   state: Signal<Map<TKey, TResult>>
   data: Signal<Array<TResult>>
   collection: Signal<Collection<TResult, TKey, TUtils> | null>
-  status: Signal<CollectionStatus | `disabled`>
-  isLoading: Signal<boolean>
-  isReady: Signal<boolean>
-  persistedStatus: Signal<LiveQueryPersistedStatus>
-  isPersistedReady: Signal<boolean>
-  persistedError: Signal<unknown | undefined>
-  isIdle: Signal<boolean>
-  isError: Signal<boolean>
-  isCleanedUp: Signal<boolean>
 }
 
 export interface InjectLiveQueryResultWithSingleResultCollection<
   TResult extends object = any,
   TKey extends string | number = string | number,
   TUtils extends Record<string, any> = {},
-> {
+> extends InjectLiveQueryFlags {
   state: Signal<Map<TKey, TResult>>
   data: Signal<TResult | undefined>
   collection: Signal<(Collection<TResult, TKey, TUtils> & SingleResult) | null>
-  status: Signal<CollectionStatus | `disabled`>
-  isLoading: Signal<boolean>
-  isReady: Signal<boolean>
-  persistedStatus: Signal<LiveQueryPersistedStatus>
-  isPersistedReady: Signal<boolean>
-  persistedError: Signal<unknown | undefined>
-  isIdle: Signal<boolean>
-  isError: Signal<boolean>
-  isCleanedUp: Signal<boolean>
 }
 
 export function injectLiveQuery<
@@ -121,6 +102,8 @@ export function injectLiveQuery<
   TParams extends any,
 >(options: {
   params: () => TParams
+  /** Pass `pooledLiveQueries` to share one partition among equal-shape queries. */
+  pool?: PooledLiveQueries
   query: (args: {
     params: TParams
     q: InitialQueryBuilder
@@ -131,6 +114,8 @@ export function injectLiveQuery<
   TParams extends any,
 >(options: {
   params: () => TParams
+  /** Pass `pooledLiveQueries` to share one partition among equal-shape queries. */
+  pool?: PooledLiveQueries
   query: (args: {
     params: TParams
     q: InitialQueryBuilder
@@ -145,7 +130,7 @@ export function injectLiveQuery<TContext extends Context>(
   ) => QueryBuilder<TContext> | undefined | null,
 ): InjectConditionalLiveQueryResult<TContext>
 export function injectLiveQuery<TContext extends Context>(
-  config: LiveQueryCollectionConfig<TContext>,
+  config: LiveQueryHookConfig<TContext>,
 ): InjectLiveQueryResult<TContext>
 // Pre-created collection without singleResult
 export function injectLiveQuery<
@@ -194,19 +179,17 @@ export function injectLiveQuery(opts: any) {
       typeof opts.params === `function`
 
     if (isReactiveQueryOptions) {
-      const { params, query } = opts
-      const currentParams = params()
-
-      // Check if query function returns null/undefined (disabled query)
-      const queryBuilder = new BaseQueryBuilder() as InitialQueryBuilder
-      const result = query({ params: currentParams, q: queryBuilder })
-
-      if (result === undefined || result === null) {
-        // Disabled query - return null
-        return null
-      }
-
-      return resolveLiveQueryValue(result, { gcTime: DEFAULT_GC_TIME_MS })
+      // The pool is checked first, so a disabled query rejects it too.
+      const pool = configPool(opts)
+      // A query function returning null or undefined disables the query.
+      const result = opts.query({
+        params: opts.params(),
+        q: new BaseQueryBuilder() as InitialQueryBuilder,
+      })
+      return resolveLiveQueryValue(result, {
+        gcTime: DEFAULT_GC_TIME_MS,
+        pool,
+      })
     }
 
     // Handle LiveQueryCollectionConfig objects. Default startSync/gcTime to
@@ -226,8 +209,11 @@ export function injectLiveQuery(opts: any) {
     const value = statusValue()
     return value === `idle` && !collection() ? `disabled` : value
   })
-  const persistedStatus = signal<LiveQueryPersistedStatus>(`unavailable`)
-  const persistedError = signal<unknown>(undefined)
+  const health = signal<HealthNode | undefined>(undefined)
+  // Every status flag comes from the shared rule; a disabled query is ready.
+  const flags = computed(() =>
+    getLiveQueryStatusFlags(status() as CollectionStatus, health()),
+  )
 
   // Returns single item for singleResult collections, array otherwise
   const data = computed(() => {
@@ -251,8 +237,7 @@ export function injectLiveQuery(opts: any) {
     internalData.set(newData)
     const snapshot = observer.getSnapshot()
     statusValue.set(snapshot.status)
-    persistedStatus.set(snapshot.persistedStatus)
-    persistedError.set(snapshot.persistedError)
+    health.set(snapshot.health)
   }
 
   let unsub: (() => void) | null = null
@@ -267,8 +252,7 @@ export function injectLiveQuery(opts: any) {
     // Handle null collection (disabled query)
     if (!currentCollection) {
       statusValue.set(`disabled` as const)
-      persistedStatus.set(`unavailable`)
-      persistedError.set(undefined)
+      health.set(undefined)
       state.set(new Map())
       internalData.set([])
       cleanup()
@@ -311,13 +295,13 @@ export function injectLiveQuery(opts: any) {
       getPublicCollection(collection()),
     ) as Signal<any>,
     status,
-    isLoading: computed(() => status() === `loading`),
-    isReady: computed(() => status() === `ready` || status() === `disabled`),
-    persistedStatus,
-    isPersistedReady: computed(() => persistedStatus() === `ready`),
-    persistedError,
-    isIdle: computed(() => status() === `idle`),
-    isError: computed(() => status() === `error`),
-    isCleanedUp: computed(() => status() === `cleaned-up`),
+    isLoading: computed(() => flags().isLoading),
+    isReady: computed(() => flags().isReady || status() === `disabled`),
+    isIdle: computed(() => flags().isIdle),
+    isLoadingError: computed(() => flags().isLoadingError),
+    isCrashed: computed(() => flags().isCrashed),
+    isCleanedUp: computed(() => flags().isCleanedUp),
+    isSyncError: computed(() => flags().isSyncError),
+    health,
   }
 }