@questpie/tanstack-query 3.6.1 → 3.7.0

package/dist/index.d.mts

@@ -1,5 +1,5 @@
 import { DefaultError, QueryKey, UseMutationOptions, UseQueryOptions } from "@tanstack/react-query";
-import { QuestpieApp, QuestpieClient, RealtimeAPI, TopicConfig, buildCollectionTopic, buildGlobalTopic } from "questpie/client";
+import { ApplyQuery, CollectionRelations, CollectionSelect, FindManyOptions, FindOneOptionsBase, FindResult, GetCollection, GetGlobal, GlobalRelations, GlobalSelect, QuestpieApp, QuestpieClient, RealtimeAPI, ResolveRelationsDeep, TopicConfig, With, buildCollectionTopic, buildGlobalTopic } from "questpie/client";
 
 //#region src/index.d.ts
 type QuestpieQueryErrorMap = (error: unknown) => unknown;
@@ -37,9 +37,11 @@ type MutationBuilder<TVariables, TData> = () => UseMutationOptions<TData, Defaul
 type CollectionKeys<TApp extends QuestpieApp> = Extract<keyof QuestpieClient<TApp>["collections"], string>;
 /** Extract global keys from QuestpieClient */
 type GlobalKeys<TApp extends QuestpieApp> = Extract<keyof QuestpieClient<TApp>["globals"], string>;
-type CollectionFind<TApp extends QuestpieApp, K$1 extends CollectionKeys<TApp>> = QuestpieClient<TApp>["collections"][K$1]["find"];
+type CollectionSelectOf<TApp extends QuestpieApp, K$1 extends CollectionKeys<TApp>> = CollectionSelect<GetCollection<TApp["collections"], K$1>>;
+type CollectionRelationsOf<TApp extends QuestpieApp, K$1 extends CollectionKeys<TApp>> = ResolveRelationsDeep<CollectionRelations<GetCollection<TApp["collections"], K$1>>, TApp["collections"]>;
+type GlobalSelectOf<TApp extends QuestpieApp, K$1 extends GlobalKeys<TApp>> = GlobalSelect<GetGlobal<NonNullable<TApp["globals"]>, K$1>>;
+type GlobalRelationsOf<TApp extends QuestpieApp, K$1 extends GlobalKeys<TApp>> = ResolveRelationsDeep<GlobalRelations<GetGlobal<NonNullable<TApp["globals"]>, K$1>>, TApp["collections"]>;
 type CollectionCount<TApp extends QuestpieApp, K$1 extends CollectionKeys<TApp>> = QuestpieClient<TApp>["collections"][K$1]["count"];
-type CollectionFindOne<TApp extends QuestpieApp, K$1 extends CollectionKeys<TApp>> = QuestpieClient<TApp>["collections"][K$1]["findOne"];
 type CollectionCreate<TApp extends QuestpieApp, K$1 extends CollectionKeys<TApp>> = QuestpieClient<TApp>["collections"][K$1]["create"];
 type CollectionUpdate<TApp extends QuestpieApp, K$1 extends CollectionKeys<TApp>> = QuestpieClient<TApp>["collections"][K$1]["update"];
 type CollectionDelete<TApp extends QuestpieApp, K$1 extends CollectionKeys<TApp>> = QuestpieClient<TApp>["collections"][K$1]["delete"];
@@ -47,9 +49,6 @@ type CollectionRestore<TApp extends QuestpieApp, K$1 extends CollectionKeys<TApp
 type CollectionFindVersions<TApp extends QuestpieApp, K$1 extends CollectionKeys<TApp>> = QuestpieClient<TApp>["collections"][K$1]["findVersions"];
 type CollectionRevertToVersion<TApp extends QuestpieApp, K$1 extends CollectionKeys<TApp>> = QuestpieClient<TApp>["collections"][K$1]["revertToVersion"];
 type CollectionTransitionStage<TApp extends QuestpieApp, K$1 extends CollectionKeys<TApp>> = QuestpieClient<TApp>["collections"][K$1]["transitionStage"];
-type GlobalGet<TApp extends QuestpieApp, K$1 extends GlobalKeys<TApp>> = QuestpieClient<TApp>["globals"][K$1] extends {
-  get: infer TGet;
-} ? TGet extends AnyAsyncFn ? TGet : never : never;
 type GlobalUpdate<TApp extends QuestpieApp, K$1 extends GlobalKeys<TApp>> = QuestpieClient<TApp>["globals"][K$1] extends {
   update: infer TUpdate;
 } ? TUpdate extends AnyAsyncFn ? TUpdate : never : never;
@@ -69,9 +68,14 @@ type RouteLeafQueryOptionsAPI<TFn extends AnyAsyncFn> = {
 };
 type RoutesQueryOptionsAPI<TNode> = TNode extends AnyAsyncFn ? RouteLeafQueryOptionsAPI<TNode> : TNode extends Record<string, any> ? { [K in keyof TNode]: RoutesQueryOptionsAPI<TNode[K]> } : never;
 type CollectionQueryOptionsAPI<TApp extends QuestpieApp, K$1 extends CollectionKeys<TApp>> = {
-  find: LiveQueryBuilder<CollectionFind<TApp, K$1>>;
+  /**
+   * Generic per call — `TQuery` narrows the result exactly like the direct
+   * client's `find()` (a `ReturnType`-based extraction would instantiate the
+   * client generic at its constraint and collapse docs to `{}`).
+   */
+  find: <TQuery extends FindManyOptions<CollectionSelectOf<TApp, K$1>, CollectionRelationsOf<TApp, K$1>> | undefined = undefined>(options?: TQuery, queryConfig?: RealtimeQueryConfig) => UseQueryOptions<FindResult<CollectionSelectOf<TApp, K$1>, CollectionRelationsOf<TApp, K$1>, TQuery>>;
   count: LiveQueryBuilder<CollectionCount<TApp, K$1>>;
-  findOne: QueryBuilder<CollectionFindOne<TApp, K$1>>;
+  findOne: <TQuery extends FindOneOptionsBase<CollectionSelectOf<TApp, K$1>, CollectionRelationsOf<TApp, K$1>> | undefined = undefined>(options?: TQuery) => UseQueryOptions<ApplyQuery<CollectionSelectOf<TApp, K$1>, CollectionRelationsOf<TApp, K$1>, TQuery> | null>;
   create: MutationBuilder<FirstArg<CollectionCreate<TApp, K$1>>, QueryData<CollectionCreate<TApp, K$1>>>;
   update: MutationBuilder<FirstArg<CollectionUpdate<TApp, K$1>>, QueryData<CollectionUpdate<TApp, K$1>>>;
   delete: MutationBuilder<FirstArg<CollectionDelete<TApp, K$1>>, QueryData<CollectionDelete<TApp, K$1>>>;
@@ -91,7 +95,14 @@ type CollectionQueryOptionsAPI<TApp extends QuestpieApp, K$1 extends CollectionK
   }>;
 };
 type GlobalQueryOptionsAPI<TApp extends QuestpieApp, K$1 extends GlobalKeys<TApp>> = {
-  get: LiveQueryBuilder<GlobalGet<TApp, K$1>>;
+  /** Generic per call — mirrors the direct client's `get()` narrowing. */
+  get: <TQuery extends {
+    with?: With<GlobalRelationsOf<TApp, K$1>>;
+    columns?: Record<string, boolean>;
+    locale?: string;
+    localeFallback?: boolean;
+    stage?: string;
+  } | undefined = undefined>(options?: TQuery, queryConfig?: RealtimeQueryConfig) => UseQueryOptions<ApplyQuery<GlobalSelectOf<TApp, K$1>, GlobalRelationsOf<TApp, K$1>, TQuery>>;
   update: MutationBuilder<{
     data: Parameters<GlobalUpdate<TApp, K$1>>[0];
     options?: Parameters<GlobalUpdate<TApp, K$1>>[1];
@@ -129,9 +140,9 @@ type QuestpieQueryOptionsProxy<TApp extends QuestpieApp = QuestpieApp> = {
  * ```ts
  * import { createQuestpieQueryOptions } from "@questpie/tanstack-query"
  * import { createClient } from "questpie/client"
- * import type { App, AppRpc } from "@/app"
+ * import type { AppConfig } from "@/questpie/server/.generated"
  *
- * const client = createClient<App, AppRpc>({ baseURL: "http://localhost:3000" })
+ * const client = createClient<AppConfig>({ baseURL: "http://localhost:3000" })
  * const cmsQueries = createQuestpieQueryOptions(client)
  *
  * // Use with useQuery

package/dist/index.mjs

@@ -79,9 +79,9 @@ async function* streamRealtimeQuery(options) {
 * ```ts
 * import { createQuestpieQueryOptions } from "@questpie/tanstack-query"
 * import { createClient } from "questpie/client"
-* import type { App, AppRpc } from "@/app"
+* import type { AppConfig } from "@/questpie/server/.generated"
 *
-* const client = createClient<App, AppRpc>({ baseURL: "http://localhost:3000" })
+* const client = createClient<AppConfig>({ baseURL: "http://localhost:3000" })
 * const cmsQueries = createQuestpieQueryOptions(client)
 *
 * // Use with useQuery

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@questpie/tanstack-query",
-	"version": "3.6.1",
+	"version": "3.7.0",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/questpie/questpie.git",