@tanstack/angular-db 0.1.54 → 0.1.55

package/dist/cjs/index.cjs

@@ -43,15 +43,23 @@ function injectLiveQuery(opts) {
     throw new Error(`Invalid options provided to injectLiveQuery`);
   });
   const state = core.signal(/* @__PURE__ */ new Map());
-  const data = core.signal([]);
+  const internalData = core.signal([]);
   const status = core.signal(
     collection() ? `idle` : `disabled`
   );
+  const data = core.computed(() => {
+    const currentCollection = collection();
+    if (!currentCollection) {
+      return internalData();
+    }
+    const config = currentCollection.config;
+    return config?.singleResult ? internalData()[0] : internalData();
+  });
   const syncDataFromCollection = (currentCollection) => {
     const newState = new Map(currentCollection.entries());
     const newData = Array.from(currentCollection.values());
     state.set(newState);
-    data.set(newData);
+    internalData.set(newData);
     status.set(currentCollection.status);
   };
   let unsub = null;
@@ -64,7 +72,7 @@ function injectLiveQuery(opts) {
     if (!currentCollection) {
       status.set(`disabled`);
       state.set(/* @__PURE__ */ new Map());
-      data.set([]);
+      internalData.set([]);
       cleanup();
       return;
     }

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 { BaseQueryBuilder, createLiveQueryCollection } from '@tanstack/db'\nimport type {\n  ChangeMessage,\n  Collection,\n  CollectionStatus,\n  Context,\n  GetResult,\n  InitialQueryBuilder,\n  LiveQueryCollectionConfig,\n  QueryBuilder,\n} from '@tanstack/db'\nimport type { Signal } from '@angular/core'\n\n/**\n * The result of calling `injectLiveQuery`.\n * Contains reactive signals for the query state and data.\n */\nexport interface InjectLiveQueryResult<\n  TResult extends object = any,\n  TKey extends string | number = string | number,\n  TUtils extends Record<string, any> = {},\n> {\n  /** A signal containing the complete state map of results keyed by their ID */\n  state: Signal<Map<TKey, TResult>>\n  /** A signal containing the results as an array */\n  data: Signal<Array<TResult>>\n  /** A signal containing the underlying collection instance (null for disabled queries) */\n  collection: Signal<Collection<TResult, TKey, TUtils> | 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 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<GetResult<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<GetResult<TContext>>\nexport function injectLiveQuery<TContext extends Context>(\n  queryFn: (q: InitialQueryBuilder) => QueryBuilder<TContext>,\n): InjectLiveQueryResult<GetResult<TContext>>\nexport function injectLiveQuery<TContext extends Context>(\n  queryFn: (\n    q: InitialQueryBuilder,\n  ) => QueryBuilder<TContext> | undefined | null,\n): InjectLiveQueryResult<GetResult<TContext>>\nexport function injectLiveQuery<TContext extends Context>(\n  config: LiveQueryCollectionConfig<TContext>,\n): InjectLiveQueryResult<GetResult<TContext>>\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>,\n): InjectLiveQueryResult<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    const isExistingCollection =\n      opts &&\n      typeof opts === `object` &&\n      typeof opts.subscribeChanges === `function` &&\n      typeof opts.startSyncImmediate === `function` &&\n      typeof opts.id === `string`\n\n    if (isExistingCollection) {\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: (q) => query({ params: currentParams, q }),\n        startSync: true,\n        gcTime: 0,\n      })\n    }\n\n    // Handle LiveQueryCollectionConfig objects\n    if (opts && typeof opts === `object` && typeof opts.query === `function`) {\n      return createLiveQueryCollection(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 data = signal<Array<any>>([])\n  const status = signal<CollectionStatus | `disabled`>(\n    collection() ? `idle` : `disabled`,\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    data.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      data.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    collection,\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","BaseQueryBuilder","createLiveQueryCollection","signal","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 { BaseQueryBuilder, createLiveQueryCollection } from '@tanstack/db'\nimport type {\n  ChangeMessage,\n  Collection,\n  CollectionConfigSingleRowOption,\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\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    const isExistingCollection =\n      opts &&\n      typeof opts === `object` &&\n      typeof opts.subscribeChanges === `function` &&\n      typeof opts.startSyncImmediate === `function` &&\n      typeof opts.id === `string`\n\n    if (isExistingCollection) {\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: (q) => query({ params: currentParams, q }),\n        startSync: true,\n        gcTime: 0,\n      })\n    }\n\n    // Handle LiveQueryCollectionConfig objects\n    if (opts && typeof opts === `object` && typeof opts.query === `function`) {\n      return createLiveQueryCollection(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    const config = currentCollection.config as\n      | CollectionConfigSingleRowOption<any, any, any>\n      | undefined\n    return config?.singleResult ? internalData()[0] : 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    collection,\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","BaseQueryBuilder","createLiveQueryCollection","signal","effect"],"mappings":"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"}

package/dist/cjs/index.d.cts

@@ -1,16 +1,16 @@
-import { Collection, CollectionStatus, Context, GetResult, InitialQueryBuilder, LiveQueryCollectionConfig, QueryBuilder } from '@tanstack/db';
+import { Collection, CollectionStatus, Context, GetResult, InferResultType, InitialQueryBuilder, LiveQueryCollectionConfig, NonSingleResult, QueryBuilder, SingleResult } from '@tanstack/db';
 import { Signal } from '@angular/core';
 /**
  * The result of calling `injectLiveQuery`.
  * Contains reactive signals for the query state and data.
  */
-export interface InjectLiveQueryResult<TResult extends object = any, TKey extends string | number = string | number, TUtils extends Record<string, any> = {}> {
+export interface InjectLiveQueryResult<TContext extends Context> {
     /** A signal containing the complete state map of results keyed by their ID */
-    state: Signal<Map<TKey, TResult>>;
-    /** A signal containing the results as an array */
-    data: Signal<Array<TResult>>;
+    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<TResult, TKey, TUtils> | null>;
+    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 */
@@ -24,21 +24,44 @@ export interface InjectLiveQueryResult<TResult extends object = any, TKey extend
     /** A signal indicating whether the collection has been cleaned up */
     isCleanedUp: Signal<boolean>;
 }
+export interface InjectLiveQueryResultWithCollection<TResult extends object = any, TKey extends string | number = string | number, TUtils extends Record<string, any> = {}> {
+    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>;
+    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> = {}> {
+    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>;
+    isIdle: Signal<boolean>;
+    isError: Signal<boolean>;
+    isCleanedUp: Signal<boolean>;
+}
 export declare function injectLiveQuery<TContext extends Context, TParams extends any>(options: {
     params: () => TParams;
     query: (args: {
         params: TParams;
         q: InitialQueryBuilder;
     }) => QueryBuilder<TContext>;
-}): InjectLiveQueryResult<GetResult<TContext>>;
+}): InjectLiveQueryResult<TContext>;
 export declare function injectLiveQuery<TContext extends Context, TParams extends any>(options: {
     params: () => TParams;
     query: (args: {
         params: TParams;
         q: InitialQueryBuilder;
     }) => QueryBuilder<TContext> | undefined | null;
-}): InjectLiveQueryResult<GetResult<TContext>>;
-export declare function injectLiveQuery<TContext extends Context>(queryFn: (q: InitialQueryBuilder) => QueryBuilder<TContext>): InjectLiveQueryResult<GetResult<TContext>>;
-export declare function injectLiveQuery<TContext extends Context>(queryFn: (q: InitialQueryBuilder) => QueryBuilder<TContext> | undefined | null): InjectLiveQueryResult<GetResult<TContext>>;
-export declare function injectLiveQuery<TContext extends Context>(config: LiveQueryCollectionConfig<TContext>): InjectLiveQueryResult<GetResult<TContext>>;
-export declare function injectLiveQuery<TResult extends object, TKey extends string | number, TUtils extends Record<string, any>>(liveQueryCollection: Collection<TResult, TKey, TUtils>): InjectLiveQueryResult<TResult, TKey, TUtils>;
+}): InjectLiveQueryResult<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): InjectLiveQueryResult<TContext>;
+export declare function injectLiveQuery<TContext extends Context>(config: LiveQueryCollectionConfig<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,16 +1,16 @@
-import { Collection, CollectionStatus, Context, GetResult, InitialQueryBuilder, LiveQueryCollectionConfig, QueryBuilder } from '@tanstack/db';
+import { Collection, CollectionStatus, Context, GetResult, InferResultType, InitialQueryBuilder, LiveQueryCollectionConfig, NonSingleResult, QueryBuilder, SingleResult } from '@tanstack/db';
 import { Signal } from '@angular/core';
 /**
  * The result of calling `injectLiveQuery`.
  * Contains reactive signals for the query state and data.
  */
-export interface InjectLiveQueryResult<TResult extends object = any, TKey extends string | number = string | number, TUtils extends Record<string, any> = {}> {
+export interface InjectLiveQueryResult<TContext extends Context> {
     /** A signal containing the complete state map of results keyed by their ID */
-    state: Signal<Map<TKey, TResult>>;
-    /** A signal containing the results as an array */
-    data: Signal<Array<TResult>>;
+    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<TResult, TKey, TUtils> | null>;
+    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 */
@@ -24,21 +24,44 @@ export interface InjectLiveQueryResult<TResult extends object = any, TKey extend
     /** A signal indicating whether the collection has been cleaned up */
     isCleanedUp: Signal<boolean>;
 }
+export interface InjectLiveQueryResultWithCollection<TResult extends object = any, TKey extends string | number = string | number, TUtils extends Record<string, any> = {}> {
+    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>;
+    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> = {}> {
+    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>;
+    isIdle: Signal<boolean>;
+    isError: Signal<boolean>;
+    isCleanedUp: Signal<boolean>;
+}
 export declare function injectLiveQuery<TContext extends Context, TParams extends any>(options: {
     params: () => TParams;
     query: (args: {
         params: TParams;
         q: InitialQueryBuilder;
     }) => QueryBuilder<TContext>;
-}): InjectLiveQueryResult<GetResult<TContext>>;
+}): InjectLiveQueryResult<TContext>;
 export declare function injectLiveQuery<TContext extends Context, TParams extends any>(options: {
     params: () => TParams;
     query: (args: {
         params: TParams;
         q: InitialQueryBuilder;
     }) => QueryBuilder<TContext> | undefined | null;
-}): InjectLiveQueryResult<GetResult<TContext>>;
-export declare function injectLiveQuery<TContext extends Context>(queryFn: (q: InitialQueryBuilder) => QueryBuilder<TContext>): InjectLiveQueryResult<GetResult<TContext>>;
-export declare function injectLiveQuery<TContext extends Context>(queryFn: (q: InitialQueryBuilder) => QueryBuilder<TContext> | undefined | null): InjectLiveQueryResult<GetResult<TContext>>;
-export declare function injectLiveQuery<TContext extends Context>(config: LiveQueryCollectionConfig<TContext>): InjectLiveQueryResult<GetResult<TContext>>;
-export declare function injectLiveQuery<TResult extends object, TKey extends string | number, TUtils extends Record<string, any>>(liveQueryCollection: Collection<TResult, TKey, TUtils>): InjectLiveQueryResult<TResult, TKey, TUtils>;
+}): InjectLiveQueryResult<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): InjectLiveQueryResult<TContext>;
+export declare function injectLiveQuery<TContext extends Context>(config: LiveQueryCollectionConfig<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

@@ -41,15 +41,23 @@ function injectLiveQuery(opts) {
     throw new Error(`Invalid options provided to injectLiveQuery`);
   });
   const state = signal(/* @__PURE__ */ new Map());
-  const data = signal([]);
+  const internalData = signal([]);
   const status = signal(
     collection() ? `idle` : `disabled`
   );
+  const data = computed(() => {
+    const currentCollection = collection();
+    if (!currentCollection) {
+      return internalData();
+    }
+    const config = currentCollection.config;
+    return config?.singleResult ? internalData()[0] : internalData();
+  });
   const syncDataFromCollection = (currentCollection) => {
     const newState = new Map(currentCollection.entries());
     const newData = Array.from(currentCollection.values());
     state.set(newState);
-    data.set(newData);
+    internalData.set(newData);
     status.set(currentCollection.status);
   };
   let unsub = null;
@@ -62,7 +70,7 @@ function injectLiveQuery(opts) {
     if (!currentCollection) {
       status.set(`disabled`);
       state.set(/* @__PURE__ */ new Map());
-      data.set([]);
+      internalData.set([]);
       cleanup();
       return;
     }

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 { BaseQueryBuilder, createLiveQueryCollection } from '@tanstack/db'\nimport type {\n  ChangeMessage,\n  Collection,\n  CollectionStatus,\n  Context,\n  GetResult,\n  InitialQueryBuilder,\n  LiveQueryCollectionConfig,\n  QueryBuilder,\n} from '@tanstack/db'\nimport type { Signal } from '@angular/core'\n\n/**\n * The result of calling `injectLiveQuery`.\n * Contains reactive signals for the query state and data.\n */\nexport interface InjectLiveQueryResult<\n  TResult extends object = any,\n  TKey extends string | number = string | number,\n  TUtils extends Record<string, any> = {},\n> {\n  /** A signal containing the complete state map of results keyed by their ID */\n  state: Signal<Map<TKey, TResult>>\n  /** A signal containing the results as an array */\n  data: Signal<Array<TResult>>\n  /** A signal containing the underlying collection instance (null for disabled queries) */\n  collection: Signal<Collection<TResult, TKey, TUtils> | 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 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<GetResult<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<GetResult<TContext>>\nexport function injectLiveQuery<TContext extends Context>(\n  queryFn: (q: InitialQueryBuilder) => QueryBuilder<TContext>,\n): InjectLiveQueryResult<GetResult<TContext>>\nexport function injectLiveQuery<TContext extends Context>(\n  queryFn: (\n    q: InitialQueryBuilder,\n  ) => QueryBuilder<TContext> | undefined | null,\n): InjectLiveQueryResult<GetResult<TContext>>\nexport function injectLiveQuery<TContext extends Context>(\n  config: LiveQueryCollectionConfig<TContext>,\n): InjectLiveQueryResult<GetResult<TContext>>\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>,\n): InjectLiveQueryResult<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    const isExistingCollection =\n      opts &&\n      typeof opts === `object` &&\n      typeof opts.subscribeChanges === `function` &&\n      typeof opts.startSyncImmediate === `function` &&\n      typeof opts.id === `string`\n\n    if (isExistingCollection) {\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: (q) => query({ params: currentParams, q }),\n        startSync: true,\n        gcTime: 0,\n      })\n    }\n\n    // Handle LiveQueryCollectionConfig objects\n    if (opts && typeof opts === `object` && typeof opts.query === `function`) {\n      return createLiveQueryCollection(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 data = signal<Array<any>>([])\n  const status = signal<CollectionStatus | `disabled`>(\n    collection() ? `idle` : `disabled`,\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    data.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      data.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    collection,\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":";;AAwFO,SAAS,gBAAgB,MAAW;AACzC,2BAAyB,eAAe;AACxC,QAAM,aAAa,OAAO,UAAU;AAEpC,QAAM,aAAa,SAAS,MAAM;AAEhC,UAAM,uBACJ,QACA,OAAO,SAAS,YAChB,OAAO,KAAK,qBAAqB,cACjC,OAAO,KAAK,uBAAuB,cACnC,OAAO,KAAK,OAAO;AAErB,QAAI,sBAAsB;AACxB,aAAO;AAAA,IACT;AAEA,QAAI,OAAO,SAAS,YAAY;AAE9B,YAAM,eAAe,IAAI,iBAAA;AACzB,YAAM,SAAS,KAAK,YAAY;AAEhC,UAAI,WAAW,UAAa,WAAW,MAAM;AAE3C,eAAO;AAAA,MACT;AAEA,aAAO,0BAA0B;AAAA,QAC/B,OAAO;AAAA,QACP,WAAW;AAAA,QACX,QAAQ;AAAA,MAAA,CACT;AAAA,IACH;AAGA,UAAM,yBACJ,QACA,OAAO,SAAS,YAChB,OAAO,KAAK,UAAU,cACtB,OAAO,KAAK,WAAW;AAEzB,QAAI,wBAAwB;AAC1B,YAAM,EAAE,QAAQ,MAAA,IAAU;AAC1B,YAAM,gBAAgB,OAAA;AAGtB,YAAM,eAAe,IAAI,iBAAA;AACzB,YAAM,SAAS,MAAM,EAAE,QAAQ,eAAe,GAAG,cAAc;AAE/D,UAAI,WAAW,UAAa,WAAW,MAAM;AAE3C,eAAO;AAAA,MACT;AAEA,aAAO,0BAA0B;AAAA,QAC/B,OAAO,CAAC,MAAM,MAAM,EAAE,QAAQ,eAAe,GAAG;AAAA,QAChD,WAAW;AAAA,QACX,QAAQ;AAAA,MAAA,CACT;AAAA,IACH;AAGA,QAAI,QAAQ,OAAO,SAAS,YAAY,OAAO,KAAK,UAAU,YAAY;AACxE,aAAO,0BAA0B,IAAI;AAAA,IACvC;AAEA,UAAM,IAAI,MAAM,6CAA6C;AAAA,EAC/D,CAAC;AAED,QAAM,QAAQ,OAAO,oBAAI,KAA2B;AACpD,QAAM,OAAO,OAAmB,EAAE;AAClC,QAAM,SAAS;AAAA,IACb,eAAe,SAAS;AAAA,EAAA;AAG1B,QAAM,yBAAyB,CAC7B,sBACG;AACH,UAAM,WAAW,IAAI,IAAI,kBAAkB,SAAS;AACpD,UAAM,UAAU,MAAM,KAAK,kBAAkB,QAAQ;AAErD,UAAM,IAAI,QAAQ;AAClB,SAAK,IAAI,OAAO;AAChB,WAAO,IAAI,kBAAkB,MAAM;AAAA,EACrC;AAEA,MAAI,QAA6B;AACjC,QAAM,UAAU,MAAM;AACpB,YAAA;AACA,YAAQ;AAAA,EACV;AAEA,SAAO,CAAC,cAAc;AACpB,UAAM,oBAAoB,WAAA;AAG1B,QAAI,CAAC,mBAAmB;AACtB,aAAO,IAAI,UAAmB;AAC9B,YAAM,IAAI,oBAAI,KAAK;AACnB,WAAK,IAAI,EAAE;AACX,cAAA;AACA;AAAA,IACF;AAEA,YAAA;AAGA,2BAAuB,iBAAiB;AAGxC,QAAI,kBAAkB,WAAW,QAAQ;AACvC,wBAAkB,mBAAA;AAElB,aAAO,IAAI,kBAAkB,MAAM;AAAA,IACrC;AAGA,UAAM,eAAe,kBAAkB;AAAA,MACrC,CAAC,MAAiC;AAChC,+BAAuB,iBAAiB;AAAA,MAC1C;AAAA,IAAA;AAEF,YAAQ,aAAa,YAAY,KAAK,YAAY;AAGlD,sBAAkB,aAAa,MAAM;AACnC,aAAO,IAAI,kBAAkB,MAAM;AAAA,IACrC,CAAC;AAED,cAAU,OAAO;AAAA,EACnB,CAAC;AAED,aAAW,UAAU,OAAO;AAE5B,SAAO;AAAA,IACL;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA,WAAW,SAAS,MAAM,OAAA,MAAa,SAAS;AAAA,IAChD,SAAS,SAAS,MAAM,aAAa,WAAW,OAAA,MAAa,UAAU;AAAA,IACvE,QAAQ,SAAS,MAAM,OAAA,MAAa,MAAM;AAAA,IAC1C,SAAS,SAAS,MAAM,OAAA,MAAa,OAAO;AAAA,IAC5C,aAAa,SAAS,MAAM,OAAA,MAAa,YAAY;AAAA,EAAA;AAEzD;"}
+{"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 { BaseQueryBuilder, createLiveQueryCollection } from '@tanstack/db'\nimport type {\n  ChangeMessage,\n  Collection,\n  CollectionConfigSingleRowOption,\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\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    const isExistingCollection =\n      opts &&\n      typeof opts === `object` &&\n      typeof opts.subscribeChanges === `function` &&\n      typeof opts.startSyncImmediate === `function` &&\n      typeof opts.id === `string`\n\n    if (isExistingCollection) {\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: (q) => query({ params: currentParams, q }),\n        startSync: true,\n        gcTime: 0,\n      })\n    }\n\n    // Handle LiveQueryCollectionConfig objects\n    if (opts && typeof opts === `object` && typeof opts.query === `function`) {\n      return createLiveQueryCollection(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    const config = currentCollection.config as\n      | CollectionConfigSingleRowOption<any, any, any>\n      | undefined\n    return config?.singleResult ? internalData()[0] : 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    collection,\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.54",
+  "version": "0.1.55",
   "description": "Angular integration for @tanstack/db",
   "author": "Ethan McDaniel",
   "license": "MIT",
@@ -38,7 +38,7 @@
     "src"
   ],
   "dependencies": {
-    "@tanstack/db": "0.5.28"
+    "@tanstack/db": "0.5.29"
   },
   "peerDependencies": {
     "@angular/core": ">=16.0.0",

package/src/index.ts

@@ -10,12 +10,16 @@ import { BaseQueryBuilder, createLiveQueryCollection } from '@tanstack/db'
 import type {
   ChangeMessage,
   Collection,
+  CollectionConfigSingleRowOption,
   CollectionStatus,
   Context,
   GetResult,
+  InferResultType,
   InitialQueryBuilder,
   LiveQueryCollectionConfig,
+  NonSingleResult,
   QueryBuilder,
+  SingleResult,
 } from '@tanstack/db'
 import type { Signal } from '@angular/core'
 
@@ -23,17 +27,17 @@ import type { Signal } from '@angular/core'
  * The result of calling `injectLiveQuery`.
  * Contains reactive signals for the query state and data.
  */
-export interface InjectLiveQueryResult<
-  TResult extends object = any,
-  TKey extends string | number = string | number,
-  TUtils extends Record<string, any> = {},
-> {
+export interface InjectLiveQueryResult<TContext extends Context> {
   /** A signal containing the complete state map of results keyed by their ID */
-  state: Signal<Map<TKey, TResult>>
-  /** A signal containing the results as an array */
-  data: Signal<Array<TResult>>
+  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<TResult, TKey, TUtils> | null>
+  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 */
@@ -48,6 +52,38 @@ export interface InjectLiveQueryResult<
   isCleanedUp: Signal<boolean>
 }
 
+export interface InjectLiveQueryResultWithCollection<
+  TResult extends object = any,
+  TKey extends string | number = string | number,
+  TUtils extends Record<string, any> = {},
+> {
+  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>
+  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> = {},
+> {
+  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>
+  isIdle: Signal<boolean>
+  isError: Signal<boolean>
+  isCleanedUp: Signal<boolean>
+}
+
 export function injectLiveQuery<
   TContext extends Context,
   TParams extends any,
@@ -57,7 +93,7 @@ export function injectLiveQuery<
     params: TParams
     q: InitialQueryBuilder
   }) => QueryBuilder<TContext>
-}): InjectLiveQueryResult<GetResult<TContext>>
+}): InjectLiveQueryResult<TContext>
 export function injectLiveQuery<
   TContext extends Context,
   TParams extends any,
@@ -67,25 +103,34 @@ export function injectLiveQuery<
     params: TParams
     q: InitialQueryBuilder
   }) => QueryBuilder<TContext> | undefined | null
-}): InjectLiveQueryResult<GetResult<TContext>>
+}): InjectLiveQueryResult<TContext>
 export function injectLiveQuery<TContext extends Context>(
   queryFn: (q: InitialQueryBuilder) => QueryBuilder<TContext>,
-): InjectLiveQueryResult<GetResult<TContext>>
+): InjectLiveQueryResult<TContext>
 export function injectLiveQuery<TContext extends Context>(
   queryFn: (
     q: InitialQueryBuilder,
   ) => QueryBuilder<TContext> | undefined | null,
-): InjectLiveQueryResult<GetResult<TContext>>
+): InjectLiveQueryResult<TContext>
 export function injectLiveQuery<TContext extends Context>(
   config: LiveQueryCollectionConfig<TContext>,
-): InjectLiveQueryResult<GetResult<TContext>>
+): InjectLiveQueryResult<TContext>
+// Pre-created collection without singleResult
+export function injectLiveQuery<
+  TResult extends object,
+  TKey extends string | number,
+  TUtils extends Record<string, any>,
+>(
+  liveQueryCollection: Collection<TResult, TKey, TUtils> & NonSingleResult,
+): InjectLiveQueryResultWithCollection<TResult, TKey, TUtils>
+// Pre-created collection with singleResult
 export function injectLiveQuery<
   TResult extends object,
   TKey extends string | number,
   TUtils extends Record<string, any>,
 >(
-  liveQueryCollection: Collection<TResult, TKey, TUtils>,
-): InjectLiveQueryResult<TResult, TKey, TUtils>
+  liveQueryCollection: Collection<TResult, TKey, TUtils> & SingleResult,
+): InjectLiveQueryResultWithSingleResultCollection<TResult, TKey, TUtils>
 export function injectLiveQuery(opts: any) {
   assertInInjectionContext(injectLiveQuery)
   const destroyRef = inject(DestroyRef)
@@ -156,11 +201,23 @@ export function injectLiveQuery(opts: any) {
   })
 
   const state = signal(new Map<string | number, any>())
-  const data = signal<Array<any>>([])
+  const internalData = signal<Array<any>>([])
   const status = signal<CollectionStatus | `disabled`>(
     collection() ? `idle` : `disabled`,
   )
 
+  // Returns single item for singleResult collections, array otherwise
+  const data = computed(() => {
+    const currentCollection = collection()
+    if (!currentCollection) {
+      return internalData()
+    }
+    const config = currentCollection.config as
+      | CollectionConfigSingleRowOption<any, any, any>
+      | undefined
+    return config?.singleResult ? internalData()[0] : internalData()
+  })
+
   const syncDataFromCollection = (
     currentCollection: Collection<any, any, any>,
   ) => {
@@ -168,7 +225,7 @@ export function injectLiveQuery(opts: any) {
     const newData = Array.from(currentCollection.values())
 
     state.set(newState)
-    data.set(newData)
+    internalData.set(newData)
     status.set(currentCollection.status)
   }
 
@@ -185,7 +242,7 @@ export function injectLiveQuery(opts: any) {
     if (!currentCollection) {
       status.set(`disabled` as const)
       state.set(new Map())
-      data.set([])
+      internalData.set([])
       cleanup()
       return
     }