@orpc/tanstack-query 2.0.0-beta.22 → 2.0.0-beta.24

package/README.md

@@ -44,6 +44,7 @@ You can read the documentation [here](https://orpc.dev).
 
 - [@orpc/publisher](https://www.npmjs.com/package/@orpc/publisher): Pub/Sub with memory, Redis, and Upstash adapters.
 - [@orpc/ratelimit](https://www.npmjs.com/package/@orpc/ratelimit): Rate limiting with memory, Redis, and Upstash adapters.
+- [@orpc/hibernation](https://www.npmjs.com/package/@orpc/hibernation): Leverage Hibernation APIs like [Cloudflare's Hibernation WebSocket](https://developers.cloudflare.com/durable-objects/best-practices/websockets/#durable-objects-hibernation-websocket-api).
 - [@orpc/json-schema](https://www.npmjs.com/package/@orpc/json-schema): Smart coercion for OpenAPI requests.
 
 **Framework & ecosystem integrations**
@@ -114,6 +115,7 @@ Like what we build over at [middleapi](https://github.com/middleapi)? You can he
   </tr>
   <tr>
    <td align="center"><a href="https://github.com/itigoore01?ref=orpc" target="_blank" rel="noopener" title="shota"><img src="https://avatars.githubusercontent.com/u/11831107?u=c976a6dc7e055eb026304c46c99100ed22b0c8e0&amp;v=4" width="139" alt="shota"/><br />shota</a></td>
+   <td align="center"><a href="https://github.com/ellis-driscoll?ref=orpc" target="_blank" rel="noopener" title="Ellis Driscoll"><img src="https://avatars.githubusercontent.com/u/70685966?u=c5f95bc33b5991d9744abe00052542e4a2ed3cb9&amp;v=4" width="139" alt="Ellis Driscoll"/><br />Ellis Driscoll</a></td>
   </tr>
 </table>
 
@@ -139,8 +141,9 @@ Like what we build over at [middleapi](https://github.com/middleapi)? You can he
    <td align="center"><a href="https://github.com/mr-kelly?ref=orpc" target="_blank" rel="noopener" title="Kelly Peilin Chan"><img src="https://avatars.githubusercontent.com/u/520852?u=6b0f7105f694e7b5cacf410a3f04c7044b469dc8&amp;v=4" width="119" alt="Kelly Peilin Chan"/><br />Kelly Peilin Chan</a></td>
   </tr>
   <tr>
+   <td align="center"><a href="https://github.com/guyariely?ref=orpc" target="_blank" rel="noopener" title="Guy Ariely"><img src="https://avatars.githubusercontent.com/u/42813496?u=edb6b7f563bf28e160a290832e7da57c0506f8ca&amp;v=4" width="119" alt="Guy Ariely"/><br />Guy Ariely</a></td>
    <td align="center"><a href="https://github.com/piscis?ref=orpc" target="_blank" rel="noopener" title="Alex"><img src="https://avatars.githubusercontent.com/u/326163?u=b245f368bd940cf51d08c0b6bf55f8257f359437&amp;v=4" width="119" alt="Alex"/><br />Alex</a></td>
-   <td align="center"><a href="https://github.com/finom?ref=orpc" target="_blank" rel="noopener" title="Andrey Gubanov"><img src="https://avatars.githubusercontent.com/u/1082083?u=29e91400dbd4a9c217048a8f59562c4f740498e6&amp;v=4" width="119" alt="Andrey Gubanov"/><br />Andrey Gubanov</a></td>
+   <td align="center"><a href="https://github.com/finom?ref=orpc" target="_blank" rel="noopener" title="Andrey Gubanov"><img src="https://avatars.githubusercontent.com/u/1082083?u=c5f2daf7ebece498e85c83367bb37b4e10e2649d&amp;v=4" width="119" alt="Andrey Gubanov"/><br />Andrey Gubanov</a></td>
   </tr>
 </table>
 

package/dist/index.d.mts

@@ -33,7 +33,19 @@ declare function serializableStreamedQuery<TQueryFnData = unknown, TQueryKey ext
 type InferStreamedQueryOutput<TOutput> = TOutput extends AsyncIterable<infer U> ? U[] : never;
 type InferLiveQueryOutput<TOutput> = TOutput extends AsyncIterable<infer U> ? U : never;
 type OperationType = 'query' | 'streamed' | 'live' | 'infinite' | 'mutation';
+/**
+ * The symbol under which TanStack Query utils attach operation details
+ * (key and operation type) to the client context.
+ *
+ * @see {@link https://orpc.dev/docs/integrations/tanstack-query#client-context | TanStack Query Integration - Client Context}
+ */
 declare const OPERATION_CONTEXT_SYMBOL: unique symbol;
+/**
+ * A client context automatically populated by TanStack Query utils,
+ * exposing the operation key and type of the calling operation.
+ *
+ * @see {@link https://orpc.dev/docs/integrations/tanstack-query#client-context | TanStack Query Integration - Client Context}
+ */
 interface OperationContext {
     [OPERATION_CONTEXT_SYMBOL]?: {
         key: QueryKey;
@@ -331,6 +343,12 @@ declare class CompositeRouterUtilsPlugin<T extends AnyNestedClient> implements R
     initProcedureOptions(path: string[], options: ProcedureUtilsOptions<InferClientContext<T>, any, any, InferClientError<T>>): ProcedureUtilsOptions<InferClientContext<T>, any, any, InferClientError<T>>;
 }
 
+/**
+ * The utils shape derived from a client: procedure clients map to procedure
+ * utils, and routers map recursively to nested utils.
+ *
+ * @see {@link https://orpc.dev/docs/integrations/tanstack-query | TanStack Query Integration}
+ */
 type RouterUtils<T extends AnyNestedClient> = T extends Client<infer UClientContext, infer UInput, infer UOutput, infer UError> ? Public<ProcedureUtils<UClientContext, UInput, UOutput, UError>> : {
     [K in keyof T]: T[K] extends AnyNestedClient ? RouterUtils<T[K]> : never;
 } & Public<SharedUtils<unknown>>;
@@ -376,9 +394,13 @@ interface RouterUtilsOptions<T extends AnyNestedClient> extends OperationKeyPref
     plugins?: RouterUtilsPlugin<T>[] | undefined;
 }
 /**
- * Create a router utils from a client.
+ * Creates TanStack Query utils from a client, exposing query/mutation
+ * option builders for every procedure in the router.
  *
- * @info Both client-side and server-side clients are supported.
+ * @remarks
+ * **Note**: Both client-side and server-side clients are supported.
+ *
+ * @see {@link https://orpc.dev/docs/integrations/tanstack-query | TanStack Query Integration}
  */
 declare function createRouterUtils<T extends AnyNestedClient>(client: T, options?: NoInfer<RouterUtilsOptions<T>>): RouterUtils<T>;
 
@@ -387,6 +409,16 @@ interface ContractUtilsFactory<TClientContext extends ClientContext> {
 }
 interface ContractUtilsFactoryOptions<TClientContext extends ClientContext> extends Omit<RouterUtilsOptions<RouterContractClient<RouterContract, TClientContext>>, 'path'> {
 }
+/**
+ * Creates a factory that builds TanStack Query utils directly from a contract,
+ * using the given contract client factory. Useful for scaling large projects
+ * where each part only needs a slice of the router.
+ *
+ * @remarks
+ * **Note**: The contract must define a `path` meta matching its position in the root router contract.
+ *
+ * @see {@link https://orpc.dev/docs/advanced/scaling-large-projects#tanstack-query-integration | Scaling Large Projects - TanStack Query Integration}
+ */
 declare function createContractUtilsFactory<TClientContext extends ClientContext>(clientFactory: ContractClientFactory<TClientContext>, options: ContractUtilsFactoryOptions<TClientContext>): ContractUtilsFactory<TClientContext>;
 interface ContractJsonifiedUtilsFactory<TClientContext extends ClientContext> {
     <T extends RouterContract>(contract: T): RouterUtils<JsonifiedClient<RouterContractClient<T, TClientContext>>>;
@@ -407,7 +439,7 @@ interface TanstackQueryMetaPlugin<TInputSchema extends AnySchema, TOutputSchema
  *
  * Apply them to router utils with {@link ContractOptionsUtilsPlugin}.
  *
- * @see {@link https://orpc.dev/docs/integrations/tanstack-query#contract-options-plugin TanStack Query Contract Options Plugin Docs}
+ * @see {@link https://orpc.dev/docs/integrations/tanstack-query#contract-options-plugin | TanStack Query Integration - Contract Options Plugin}
  */
 declare function tanstackQuery<TInputSchema extends AnySchema, TOutputSchema extends AnySchema, TErrorMap extends ErrorMap>(options: TanstackQueryMetaOptions<ClientContext, InferSchemaInput<TInputSchema>, InferSchemaOutput<TOutputSchema>, ORPCErrorFromErrorMap<TErrorMap> | ThrowableError>): TanstackQueryMetaPlugin<TInputSchema, TOutputSchema, TErrorMap>;
 declare function getTanstackQueryMeta(procedureOrLazy: {
@@ -423,7 +455,7 @@ declare function getTanstackQueryMeta(procedureOrLazy: {
  * The contract shape must match the client the utils are created from,
  * so pass the root router contract when utils paths start from the root.
  *
- * @see {@link https://orpc.dev/docs/integrations/tanstack-query#contract-options-plugin TanStack Query Contract Options Plugin Docs}
+ * @see {@link https://orpc.dev/docs/integrations/tanstack-query#contract-options-plugin | TanStack Query Integration - Contract Options Plugin}
  */
 declare class ContractOptionsUtilsPlugin<T extends AnyNestedClient = AnyNestedClient> implements RouterUtilsPlugin<T> {
     private readonly contract;

package/dist/index.d.ts

@@ -33,7 +33,19 @@ declare function serializableStreamedQuery<TQueryFnData = unknown, TQueryKey ext
 type InferStreamedQueryOutput<TOutput> = TOutput extends AsyncIterable<infer U> ? U[] : never;
 type InferLiveQueryOutput<TOutput> = TOutput extends AsyncIterable<infer U> ? U : never;
 type OperationType = 'query' | 'streamed' | 'live' | 'infinite' | 'mutation';
+/**
+ * The symbol under which TanStack Query utils attach operation details
+ * (key and operation type) to the client context.
+ *
+ * @see {@link https://orpc.dev/docs/integrations/tanstack-query#client-context | TanStack Query Integration - Client Context}
+ */
 declare const OPERATION_CONTEXT_SYMBOL: unique symbol;
+/**
+ * A client context automatically populated by TanStack Query utils,
+ * exposing the operation key and type of the calling operation.
+ *
+ * @see {@link https://orpc.dev/docs/integrations/tanstack-query#client-context | TanStack Query Integration - Client Context}
+ */
 interface OperationContext {
     [OPERATION_CONTEXT_SYMBOL]?: {
         key: QueryKey;
@@ -331,6 +343,12 @@ declare class CompositeRouterUtilsPlugin<T extends AnyNestedClient> implements R
     initProcedureOptions(path: string[], options: ProcedureUtilsOptions<InferClientContext<T>, any, any, InferClientError<T>>): ProcedureUtilsOptions<InferClientContext<T>, any, any, InferClientError<T>>;
 }
 
+/**
+ * The utils shape derived from a client: procedure clients map to procedure
+ * utils, and routers map recursively to nested utils.
+ *
+ * @see {@link https://orpc.dev/docs/integrations/tanstack-query | TanStack Query Integration}
+ */
 type RouterUtils<T extends AnyNestedClient> = T extends Client<infer UClientContext, infer UInput, infer UOutput, infer UError> ? Public<ProcedureUtils<UClientContext, UInput, UOutput, UError>> : {
     [K in keyof T]: T[K] extends AnyNestedClient ? RouterUtils<T[K]> : never;
 } & Public<SharedUtils<unknown>>;
@@ -376,9 +394,13 @@ interface RouterUtilsOptions<T extends AnyNestedClient> extends OperationKeyPref
     plugins?: RouterUtilsPlugin<T>[] | undefined;
 }
 /**
- * Create a router utils from a client.
+ * Creates TanStack Query utils from a client, exposing query/mutation
+ * option builders for every procedure in the router.
  *
- * @info Both client-side and server-side clients are supported.
+ * @remarks
+ * **Note**: Both client-side and server-side clients are supported.
+ *
+ * @see {@link https://orpc.dev/docs/integrations/tanstack-query | TanStack Query Integration}
  */
 declare function createRouterUtils<T extends AnyNestedClient>(client: T, options?: NoInfer<RouterUtilsOptions<T>>): RouterUtils<T>;
 
@@ -387,6 +409,16 @@ interface ContractUtilsFactory<TClientContext extends ClientContext> {
 }
 interface ContractUtilsFactoryOptions<TClientContext extends ClientContext> extends Omit<RouterUtilsOptions<RouterContractClient<RouterContract, TClientContext>>, 'path'> {
 }
+/**
+ * Creates a factory that builds TanStack Query utils directly from a contract,
+ * using the given contract client factory. Useful for scaling large projects
+ * where each part only needs a slice of the router.
+ *
+ * @remarks
+ * **Note**: The contract must define a `path` meta matching its position in the root router contract.
+ *
+ * @see {@link https://orpc.dev/docs/advanced/scaling-large-projects#tanstack-query-integration | Scaling Large Projects - TanStack Query Integration}
+ */
 declare function createContractUtilsFactory<TClientContext extends ClientContext>(clientFactory: ContractClientFactory<TClientContext>, options: ContractUtilsFactoryOptions<TClientContext>): ContractUtilsFactory<TClientContext>;
 interface ContractJsonifiedUtilsFactory<TClientContext extends ClientContext> {
     <T extends RouterContract>(contract: T): RouterUtils<JsonifiedClient<RouterContractClient<T, TClientContext>>>;
@@ -407,7 +439,7 @@ interface TanstackQueryMetaPlugin<TInputSchema extends AnySchema, TOutputSchema
  *
  * Apply them to router utils with {@link ContractOptionsUtilsPlugin}.
  *
- * @see {@link https://orpc.dev/docs/integrations/tanstack-query#contract-options-plugin TanStack Query Contract Options Plugin Docs}
+ * @see {@link https://orpc.dev/docs/integrations/tanstack-query#contract-options-plugin | TanStack Query Integration - Contract Options Plugin}
  */
 declare function tanstackQuery<TInputSchema extends AnySchema, TOutputSchema extends AnySchema, TErrorMap extends ErrorMap>(options: TanstackQueryMetaOptions<ClientContext, InferSchemaInput<TInputSchema>, InferSchemaOutput<TOutputSchema>, ORPCErrorFromErrorMap<TErrorMap> | ThrowableError>): TanstackQueryMetaPlugin<TInputSchema, TOutputSchema, TErrorMap>;
 declare function getTanstackQueryMeta(procedureOrLazy: {
@@ -423,7 +455,7 @@ declare function getTanstackQueryMeta(procedureOrLazy: {
  * The contract shape must match the client the utils are created from,
  * so pass the root router contract when utils paths start from the root.
  *
- * @see {@link https://orpc.dev/docs/integrations/tanstack-query#contract-options-plugin TanStack Query Contract Options Plugin Docs}
+ * @see {@link https://orpc.dev/docs/integrations/tanstack-query#contract-options-plugin | TanStack Query Integration - Contract Options Plugin}
  */
 declare class ContractOptionsUtilsPlugin<T extends AnyNestedClient = AnyNestedClient> implements RouterUtilsPlugin<T> {
     private readonly contract;

package/dist/index.mjs

@@ -1,5 +1,5 @@
 import { resolveBasePathMeta, getRouterContract, ProcedureContract } from '@orpc/contract';
-import { sortPlugins, stringifyJSON, resolveMaybeOptionalOptions, intercept, toArray, isAsyncIteratorObject, isTypescriptObject, bindMethods, getOrBind, get } from '@orpc/shared';
+import { sortPlugins, stringifyJSON, resolveMaybeOptionalOptions, intercept, toArray, isAsyncIteratorObject, isTypescriptObject, bindMethods, get } from '@orpc/shared';
 import { RECURSIVE_CLIENT_UNWRAP_KEYS } from '@orpc/client';
 import { skipToken } from '@tanstack/query-core';
 
@@ -528,30 +528,33 @@ function createRouterUtilsInternal(client, options, plugin) {
       },
       options.scoped ?? {}
     ))
-  )) : bindMethods(new SharedUtils(path, options));
+  ), { unbound: ["call"] }) : bindMethods(new SharedUtils(path, options));
+  const cache = /* @__PURE__ */ new Map();
   const recursive = new Proxy(utils, {
     get(target, prop) {
-      const value = getOrBind(target, prop);
-      const nextClient = client[prop];
+      const value = Reflect.get(target, prop);
+      const nextClient = Reflect.get(client, prop);
       if (typeof prop !== "string" || RECURSIVE_CLIENT_UNWRAP_KEYS.has(prop) || !isTypescriptObject(nextClient)) {
         return value;
       }
-      const nextUtils = createRouterUtilsInternal(nextClient, {
-        ...options,
-        path: [...path, prop],
-        scoped: get(options.scoped, [prop])
-      }, plugin);
-      if (typeof value !== "function") {
-        return nextUtils;
-      }
-      return new Proxy(value, {
-        get(target2, prop2) {
-          if (typeof prop2 !== "string" || RECURSIVE_CLIENT_UNWRAP_KEYS.has(prop2)) {
-            return getOrBind(target2, prop2);
+      let result = cache.get(prop);
+      if (result === void 0) {
+        const nextUtils = createRouterUtilsInternal(nextClient, {
+          ...options,
+          path: [...path, prop],
+          scoped: options.scoped?.[prop]
+        }, plugin);
+        result = typeof value !== "function" ? nextUtils : new Proxy(value, {
+          get(target2, prop2) {
+            if (typeof prop2 !== "string" || RECURSIVE_CLIENT_UNWRAP_KEYS.has(prop2)) {
+              return Reflect.get(target2, prop2);
+            }
+            return Reflect.get(nextUtils, prop2);
           }
-          return getOrBind(nextUtils, prop2);
-        }
-      });
+        });
+        cache.set(prop, result);
+      }
+      return result;
     }
   });
   return recursive;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/tanstack-query",
   "type": "module",
-  "version": "2.0.0-beta.22",
+  "version": "2.0.0-beta.24",
   "license": "MIT",
   "homepage": "https://orpc.dev",
   "repository": {
@@ -29,13 +29,13 @@
     "@tanstack/query-core": ">=5.80.2"
   },
   "dependencies": {
-    "@orpc/client": "2.0.0-beta.22",
-    "@orpc/contract": "2.0.0-beta.22",
-    "@orpc/shared": "2.0.0-beta.22",
-    "@orpc/openapi": "2.0.0-beta.22"
+    "@orpc/openapi": "2.0.0-beta.24",
+    "@orpc/client": "2.0.0-beta.24",
+    "@orpc/shared": "2.0.0-beta.24",
+    "@orpc/contract": "2.0.0-beta.24"
   },
   "devDependencies": {
-    "@angular/core": "^22.0.8",
+    "@angular/core": "^22.1.0",
     "@tanstack/angular-query-experimental": "^5.101.4",
     "@tanstack/query-core": "^5.101.4",
     "@tanstack/react-query": "^5.101.4",