feat(query): support observables in each client method

README.md

@@ -58,6 +58,49 @@ export class TodosService {
 }
 ```
 
+For methods that require a `queryFn` parameter like
+[ensureQueryData](https://tanstack.com/query/latest/docs/react/reference/QueryClient#queryclientensurequerydata), [fetchQuery](https://tanstack.com/query/latest/docs/react/reference/QueryClient#queryclientfetchquery), [prefetchQuery](), [fetchInfiniteQuery]() and [prefetchInfiniteQuery]() it's possible to use both Promises and Observables.
+
+```ts
+import { injectQueryClient } from '@ngneat/query';
+
+@Injectable({ providedIn: 'root' })
+export class TodosService {
+  #queryClient = injectQueryClient();
+
+  getQueryObservable() {
+    return {
+      queryKey: ['todos'] as const,
+      queryFn: () => {
+        return this.http.get<Todo[]>(
+          'https://jsonplaceholder.typicode.com/todos',
+        );
+      }
+    };
+  }
+
+  getQueryPromise() {
+    return {
+      queryKey: ['todos'] as const,
+      queryFn: () => {
+        return lastValueFrom(this.http.get<Todo[]>(
+          'https://jsonplaceholder.typicode.com/todos',
+        ));
+      }
+    };
+  }
+
+  ensureQueryDataFromPromise(): Promise<Todo[]> {
+    return this.#queryClient.ensureQueryData(this.getQueryFromPromise());
+  }
+
+  ensureQueryDataFromObservable(): Promise<Todo[]> {
+    return this.#queryClient.ensureQueryData(this.getQueryFromObservable());
+  }
+}
+```
+
+
 > The function should run inside an injection context
 
 ### Query

query/src/index.ts

@@ -1,18 +1,22 @@
-export { injectQueryClient, provideQueryClient } from './lib/query-client';
-export { injectQuery } from './lib/query';
-export { injectMutation } from './lib/mutation';
+export { injectInfiniteQuery } from './lib/infinite-query';
 export { injectIsFetching } from './lib/is-fetching';
 export { injectIsMutating } from './lib/is-mutating';
-export { injectInfiniteQuery } from './lib/infinite-query';
-
+export { injectMutation } from './lib/mutation';
+export { injectQuery } from './lib/query';
 export {
-  toPromise,
-  createSuccessObserverResult,
-  createPendingObserverResult,
-} from './lib/utils';
-export * from './lib/operators';
+  injectQueryClient,
+  provideQueryClient
+} from './lib/query-client';
+
 export * from '@tanstack/query-core';
-export { ObservableQueryResult, SignalQueryResult } from './lib/types';
-export { queryOptions } from './lib/query-options';
+export * from './lib/operators';
 export { provideQueryClientOptions } from './lib/query-client-options';
+export { queryOptions } from './lib/query-options';
 export { intersectResults } from './lib/signals';
+export { ObservableQueryResult, SignalQueryResult } from './lib/types';
+export {
+  createPendingObserverResult,
+  createSuccessObserverResult,
+  toPromise
+} from './lib/utils';
+

query/src/lib/base-query.ts

@@ -1,3 +1,5 @@
+import { Injector, Signal, assertInInjectionContext } from '@angular/core';
+import { toSignal } from '@angular/core/rxjs-interop';
 import {
   DefaultError,
   QueryClient,
@@ -8,15 +10,8 @@ import {
   WithRequired,
   notifyManager,
 } from '@tanstack/query-core';
-import { Observable, isObservable, shareReplay } from 'rxjs';
-import { toSignal } from '@angular/core/rxjs-interop';
-import {
-  Injector,
-  Signal,
-  assertInInjectionContext,
-  runInInjectionContext,
-} from '@angular/core';
-import { toPromise } from './utils';
+import { Observable, shareReplay } from 'rxjs';
+import { normalizeOptions } from './query-options';
 
 export type QueryFunctionWithObservable<
   T = unknown,
@@ -36,8 +31,16 @@ interface _CreateBaseQueryOptions<
   TData = TQueryFnData,
   TQueryData = TQueryFnData,
   TQueryKey extends QueryKey = QueryKey,
+  TPageParam = never,
 > extends WithRequired<
-      QueryObserverOptions<TQueryFnData, TError, TData, TQueryData, TQueryKey>,
+      QueryObserverOptions<
+        TQueryFnData,
+        TError,
+        TData,
+        TQueryData,
+        TQueryKey,
+        TPageParam
+      >,
       'queryKey'
     >,
     Options {}
@@ -48,8 +51,16 @@ export type CreateBaseQueryOptions<
   TData = TQueryFnData,
   TQueryData = TQueryFnData,
   TQueryKey extends QueryKey = QueryKey,
+  TPageParam = never,
 > = Omit<
-  _CreateBaseQueryOptions<TQueryFnData, TError, TData, TQueryData, TQueryKey>,
+  _CreateBaseQueryOptions<
+    TQueryFnData,
+    TError,
+    TData,
+    TQueryData,
+    TQueryKey,
+    TPageParam
+  >,
   'queryFn'
 > & {
   queryFn: QueryFunctionWithObservable<TQueryFnData, TQueryKey>;
@@ -177,47 +188,3 @@ export function createBaseQuery<
     },
   };
 }
-
-function normalizeOptions<
-  TQueryFnData,
-  TError,
-  TData,
-  TQueryData,
-  TQueryKey extends QueryKey,
->(
-  client: QueryClient,
-  options: QueryObserverOptions<
-    TQueryFnData,
-    TError,
-    TData,
-    TQueryData,
-    TQueryKey
-  >,
-  injector: Injector,
-) {
-  const defaultedOptions = client.defaultQueryOptions(
-    options as unknown as QueryObserverOptions,
-  );
-  defaultedOptions._optimisticResults = 'optimistic';
-
-  const originalQueryFn = defaultedOptions.queryFn;
-
-  if (originalQueryFn) {
-    defaultedOptions.queryFn = function (ctx: QueryFunctionContext) {
-      // eslint-disable-next-line @typescript-eslint/no-this-alias
-      const _this = this;
-
-      return runInInjectionContext(injector, () => {
-        const value = originalQueryFn.call(_this, ctx);
-
-        if (isObservable(value)) {
-          return toPromise({ source: value, signal: ctx.signal });
-        }
-
-        return value;
-      });
-    };
-  }
-
-  return defaultedOptions;
-}

query/src/lib/infinite-query.ts

@@ -10,11 +10,11 @@ import { injectQueryClient } from './query-client';
 import {
   DefaultError,
   InfiniteData,
-  QueryKey,
-  QueryObserver,
   InfiniteQueryObserver,
   InfiniteQueryObserverOptions,
   InfiniteQueryObserverResult,
+  QueryKey,
+  QueryObserver,
   WithRequired,
 } from '@tanstack/query-core';
 import {
@@ -44,7 +44,7 @@ interface _CreateInfiniteQueryOptions<
     >,
     Options {}
 
-type CreateInfiniteQueryOptions<
+export type CreateInfiniteQueryOptions<
   TQueryFnData = unknown,
   TError = DefaultError,
   TData = TQueryFnData,