@trpc/next 10.0.0-proxy-alpha.61 → 10.0.0-proxy-alpha.64

package/README.md

@@ -68,7 +68,7 @@ Now you can query your API in any component.
 import { trpc } from '~/utils/trpc';
 
 export function Hello() {
-  const { data, error, status } = trpc.proxy.greeting.useQuery({
+  const { data, error, status } = trpc.greeting.useQuery({
     name: 'tRPC',
   });
 

package/dist/index.js

@@ -6,6 +6,7 @@ var reactQuery = require('@tanstack/react-query');
 var react = require('@trpc/react');
 var React = require('react');
 var ssrPrepass = require('react-ssr-prepass');
+var shared = require('@trpc/react/shared');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -182,19 +183,33 @@ function withTRPC(opts) {
 
 function setupTRPC(opts) {
     const hooks = react.createReactQueryHooks();
-    const proxy = react.createReactQueryHooksProxy(hooks);
     // TODO: maybe set TSSRContext to `never` when using `WithTRPCNoSSROptions`
     const _withTRPC = withTRPC(opts);
-    return {
-        proxy,
-        useContext: hooks.useContext,
-        useInfiniteQuery: hooks.useInfiniteQuery,
-        useMutation: hooks.useMutation,
-        useQuery: hooks.useQuery,
-        useSubscription: hooks.useSubscription,
-        withTRPC: _withTRPC,
-        queries: hooks.queries
-    };
+    const proxy = new Proxy(()=>{
+    // no-op
+    }, {
+        get (_obj, name) {
+            if (name === 'useContext') {
+                return ()=>{
+                    const context = hooks.useContext();
+                    // create a stable reference of the utils context
+                    return React.useMemo(()=>{
+                        return shared.createReactQueryUtilsProxy(context);
+                    }, [
+                        context
+                    ]);
+                };
+            }
+            if (name === 'withTRPC') {
+                return _withTRPC;
+            }
+            if (typeof name === 'string') {
+                return shared.createReactProxyDecoration(name, hooks);
+            }
+            throw new Error('Not supported');
+        }
+    });
+    return proxy;
 }
 
 exports.setupTRPC = setupTRPC;

package/dist/index.mjs

@@ -1,7 +1,8 @@
 import { QueryClient, QueryClientProvider, Hydrate, dehydrate } from '@tanstack/react-query';
-import { createReactQueryHooks, createTRPCClient, createReactQueryHooksProxy } from '@trpc/react';
-import React, { useState, createElement } from 'react';
+import { createReactQueryHooks, createTRPCClient } from '@trpc/react';
+import React, { useState, createElement, useMemo } from 'react';
 import ssrPrepass from 'react-ssr-prepass';
+import { createReactQueryUtilsProxy, createReactProxyDecoration } from '@trpc/react/shared';
 
 function extends_() {
   extends_ = Object.assign || function (target) {
@@ -173,19 +174,33 @@ function withTRPC(opts) {
 
 function setupTRPC(opts) {
     const hooks = createReactQueryHooks();
-    const proxy = createReactQueryHooksProxy(hooks);
     // TODO: maybe set TSSRContext to `never` when using `WithTRPCNoSSROptions`
     const _withTRPC = withTRPC(opts);
-    return {
-        proxy,
-        useContext: hooks.useContext,
-        useInfiniteQuery: hooks.useInfiniteQuery,
-        useMutation: hooks.useMutation,
-        useQuery: hooks.useQuery,
-        useSubscription: hooks.useSubscription,
-        withTRPC: _withTRPC,
-        queries: hooks.queries
-    };
+    const proxy = new Proxy(()=>{
+    // no-op
+    }, {
+        get (_obj, name) {
+            if (name === 'useContext') {
+                return ()=>{
+                    const context = hooks.useContext();
+                    // create a stable reference of the utils context
+                    return useMemo(()=>{
+                        return createReactQueryUtilsProxy(context);
+                    }, [
+                        context
+                    ]);
+                };
+            }
+            if (name === 'withTRPC') {
+                return _withTRPC;
+            }
+            if (typeof name === 'string') {
+                return createReactProxyDecoration(name, hooks);
+            }
+            throw new Error('Not supported');
+        }
+    });
+    return proxy;
 }
 
 export { setupTRPC, withTRPC };

package/dist/setupNext.d.ts

@@ -1,103 +1,9 @@
-/// <reference types="react" />
+import { DecoratedProcedureRecord, DecoratedProcedureUtilsRecord } from '@trpc/react/shared';
 import { AnyRouter } from '@trpc/server';
 import { NextPageContext } from 'next/types';
 import { WithTRPCNoSSROptions, WithTRPCSSROptions } from './withTRPC';
 export declare function setupTRPC<TRouter extends AnyRouter, TSSRContext extends NextPageContext = NextPageContext>(opts: WithTRPCNoSSROptions<TRouter> | WithTRPCSSROptions<TRouter>): {
-    proxy: {
-        useContext(): import("@trpc/react").DecoratedProcedureUtilsRecord<TRouter>;
-    } & {
-        Provider: (props: {
-            queryClient: import("@tanstack/query-core").QueryClient;
-            client: import("@trpc/react").TRPCClient<TRouter>;
-            children: import("react").ReactNode;
-            ssrContext?: unknown;
-            ssrState?: import("@trpc/react/dist/internals/context").SSRState | undefined;
-        }) => JSX.Element;
-        createClient: (opts: import("@trpc/react").CreateTRPCClientOptions<TRouter>) => import("@trpc/react").TRPCClient<TRouter>;
-        useContext: () => import("@trpc/react/dist/createReactQueryHooks").TRPCContextState<TRouter, unknown>;
-        useQuery: <TPath extends keyof import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["queries"], import("@trpc/server").ProcedureRecord> & string, TQueryFnData = (import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["queries"], import("@trpc/server").ProcedureRecord> extends infer T ? { [TPath_1 in keyof T]: {
-            input: import("@trpc/server").inferProcedureInput<(T & import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["queries"], import("@trpc/server").ProcedureRecord>)[TPath_1]>;
-            output: import("@trpc/server").inferProcedureOutput<(T & import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["queries"], import("@trpc/server").ProcedureRecord>)[TPath_1]>;
-        }; } : never)[TPath]["output"], TData = (import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["queries"], import("@trpc/server").ProcedureRecord> extends infer T_1 ? { [TPath_1_1 in keyof T_1]: {
-            input: import("@trpc/server").inferProcedureInput<(T_1 & import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["queries"], import("@trpc/server").ProcedureRecord>)[TPath_1_1]>;
-            output: import("@trpc/server").inferProcedureOutput<(T_1 & import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["queries"], import("@trpc/server").ProcedureRecord>)[TPath_1_1]>;
-        }; } : never)[TPath]["output"]>(pathAndInput: [path: TPath, ...args: import("@trpc/server").ProcedureArgs<import("@trpc/server").inferProcedureParams<import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["queries"], import("@trpc/server").ProcedureRecord>[TPath]>>], opts?: import("@trpc/react/dist/createReactQueryHooks").UseTRPCQueryOptions<TPath, (import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["queries"], import("@trpc/server").ProcedureRecord> extends infer T_2 ? { [TPath_1_2 in keyof T_2]: {
-            input: import("@trpc/server").inferProcedureInput<(T_2 & import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["queries"], import("@trpc/server").ProcedureRecord>)[TPath_1_2]>;
-            output: import("@trpc/server").inferProcedureOutput<(T_2 & import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["queries"], import("@trpc/server").ProcedureRecord>)[TPath_1_2]>;
-        }; } : never)[TPath]["input"], TQueryFnData, TData, import("@trpc/react").TRPCClientErrorLike<TRouter>> | undefined) => import("@tanstack/react-query").UseQueryResult<TData, import("@trpc/react").TRPCClientErrorLike<TRouter>>;
-        useMutation: <TPath_2 extends keyof import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["mutations"], import("@trpc/server").ProcedureRecord> & string, TContext = unknown>(path: TPath_2 | [TPath_2], opts?: import("@trpc/react/dist/createReactQueryHooks").UseTRPCMutationOptions<(import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["mutations"], import("@trpc/server").ProcedureRecord> extends infer T_1 ? { [TPath_3 in keyof T_1]: {
-            input: import("@trpc/server").inferProcedureInput<(T_1 & import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["mutations"], import("@trpc/server").ProcedureRecord>)[TPath_3]>;
-            output: import("@trpc/server").inferProcedureOutput<(T_1 & import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["mutations"], import("@trpc/server").ProcedureRecord>)[TPath_3]>;
-        }; } : never)[TPath_2]["input"], import("@trpc/react").TRPCClientErrorLike<TRouter>, (import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["mutations"], import("@trpc/server").ProcedureRecord> extends infer T_1_1 ? { [TPath_3_1 in keyof T_1_1]: {
-            input: import("@trpc/server").inferProcedureInput<(T_1_1 & import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["mutations"], import("@trpc/server").ProcedureRecord>)[TPath_3_1]>;
-            output: import("@trpc/server").inferProcedureOutput<(T_1_1 & import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["mutations"], import("@trpc/server").ProcedureRecord>)[TPath_3_1]>;
-        }; } : never)[TPath_2]["output"], TContext> | undefined) => import("@tanstack/react-query").UseMutationResult<(import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["mutations"], import("@trpc/server").ProcedureRecord> extends infer T_1_2 ? { [TPath_3_2 in keyof T_1_2]: {
-            input: import("@trpc/server").inferProcedureInput<(T_1_2 & import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["mutations"], import("@trpc/server").ProcedureRecord>)[TPath_3_2]>;
-            output: import("@trpc/server").inferProcedureOutput<(T_1_2 & import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["mutations"], import("@trpc/server").ProcedureRecord>)[TPath_3_2]>;
-        }; } : never)[TPath_2]["output"], import("@trpc/react").TRPCClientErrorLike<TRouter>, (import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["mutations"], import("@trpc/server").ProcedureRecord> extends infer T_1_3 ? { [TPath_3_3 in keyof T_1_3]: {
-            input: import("@trpc/server").inferProcedureInput<(T_1_3 & import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["mutations"], import("@trpc/server").ProcedureRecord>)[TPath_3_3]>;
-            output: import("@trpc/server").inferProcedureOutput<(T_1_3 & import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["mutations"], import("@trpc/server").ProcedureRecord>)[TPath_3_3]>;
-        }; } : never)[TPath_2]["input"], TContext>;
-        useSubscription: <TPath_4 extends keyof import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["subscriptions"], import("@trpc/server").ProcedureRecord> & string, TOutput extends import("@trpc/server/observable").inferObservableValue<import("@trpc/server").inferProcedureOutput<TRouter["_def"]["subscriptions"][TPath_4]>>>(pathAndInput: [path: TPath_4, ...args: import("@trpc/server").ProcedureArgs<import("@trpc/server").inferProcedureParams<import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["subscriptions"], import("@trpc/server").ProcedureRecord>[TPath_4]>>], opts: import("@trpc/react/dist/createReactQueryHooks").UseTRPCSubscriptionOptions<import("@trpc/server/observable").inferObservableValue<import("@trpc/server").inferProcedureOutput<import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["subscriptions"], import("@trpc/server").ProcedureRecord>[TPath_4]>>, import("@trpc/server").inferProcedureClientError<import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["subscriptions"], import("@trpc/server").ProcedureRecord>[TPath_4]>>) => void;
-        useDehydratedState: (client: import("@trpc/react").TRPCClient<TRouter>, trpcState: import("@tanstack/query-core").DehydratedState | undefined) => import("@tanstack/query-core").DehydratedState | undefined;
-        useInfiniteQuery: <TPath_6 extends (import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["queries"], import("@trpc/server").ProcedureRecord> extends infer T_2 ? { [TPath_5 in keyof T_2]: import("@trpc/server").inferProcedureInput<(T_2 & import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["queries"], import("@trpc/server").ProcedureRecord>)[TPath_5]> extends {
-            cursor?: any;
-        } ? TPath_5 : never; } : never)[keyof import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["queries"], import("@trpc/server").ProcedureRecord>] & string>(pathAndInput: [path: TPath_6, input: Omit<(import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["queries"], import("@trpc/server").ProcedureRecord> extends infer T_3 ? { [TPath_1_3 in keyof T_3]: {
-            input: import("@trpc/server").inferProcedureInput<(T_3 & import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["queries"], import("@trpc/server").ProcedureRecord>)[TPath_1_3]>;
-            output: import("@trpc/server").inferProcedureOutput<(T_3 & import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["queries"], import("@trpc/server").ProcedureRecord>)[TPath_1_3]>;
-        }; } : never)[TPath_6]["input"], "cursor">], opts?: import("@trpc/react/dist/createReactQueryHooks").UseTRPCInfiniteQueryOptions<TPath_6, Omit<(import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["queries"], import("@trpc/server").ProcedureRecord> extends infer T_4 ? { [TPath_1_4 in keyof T_4]: {
-            input: import("@trpc/server").inferProcedureInput<(T_4 & import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["queries"], import("@trpc/server").ProcedureRecord>)[TPath_1_4]>;
-            output: import("@trpc/server").inferProcedureOutput<(T_4 & import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["queries"], import("@trpc/server").ProcedureRecord>)[TPath_1_4]>;
-        }; } : never)[TPath_6]["input"], "cursor">, (import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["queries"], import("@trpc/server").ProcedureRecord> extends infer T_5 ? { [TPath_1_5 in keyof T_5]: {
-            input: import("@trpc/server").inferProcedureInput<(T_5 & import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["queries"], import("@trpc/server").ProcedureRecord>)[TPath_1_5]>;
-            output: import("@trpc/server").inferProcedureOutput<(T_5 & import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["queries"], import("@trpc/server").ProcedureRecord>)[TPath_1_5]>;
-        }; } : never)[TPath_6]["output"], import("@trpc/react").TRPCClientErrorLike<TRouter>> | undefined) => import("@tanstack/react-query").UseInfiniteQueryResult<(import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["queries"], import("@trpc/server").ProcedureRecord> extends infer T_6 ? { [TPath_1_6 in keyof T_6]: {
-            input: import("@trpc/server").inferProcedureInput<(T_6 & import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["queries"], import("@trpc/server").ProcedureRecord>)[TPath_1_6]>;
-            output: import("@trpc/server").inferProcedureOutput<(T_6 & import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["queries"], import("@trpc/server").ProcedureRecord>)[TPath_1_6]>;
-        }; } : never)[TPath_6]["output"], import("@trpc/react").TRPCClientErrorLike<TRouter>>;
-        queries: TRouter["_def"]["queries"];
-    } & import("@trpc/react").DecoratedProcedureRecord<TRouter["_def"]["record"], "">;
-    useContext: () => import("@trpc/react/dist/createReactQueryHooks").TRPCContextState<TRouter, TSSRContext>;
-    useInfiniteQuery: <TPath_3_4 extends (import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["queries"], import("@trpc/server").ProcedureRecord> extends infer T_7 ? { [TPath_7 in keyof T_7]: import("@trpc/server").inferProcedureInput<import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["queries"], import("@trpc/server").ProcedureRecord>[TPath_7]> extends {
-        cursor?: any;
-    } ? TPath_7 : never; } : never)[keyof import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["queries"], import("@trpc/server").ProcedureRecord>] & string>(pathAndInput: [path: TPath_3_4, input: Omit<(import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["queries"], import("@trpc/server").ProcedureRecord> extends infer T_8 ? { [TPath_8 in keyof T_8]: {
-        input: import("@trpc/server").inferProcedureInput<import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["queries"], import("@trpc/server").ProcedureRecord>[TPath_8]>;
-        output: import("@trpc/server").inferProcedureOutput<import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["queries"], import("@trpc/server").ProcedureRecord>[TPath_8]>;
-    }; } : never)[TPath_3_4]["input"], "cursor">], opts?: import("@trpc/react/dist/createReactQueryHooks").UseTRPCInfiniteQueryOptions<TPath_3_4, Omit<(import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["queries"], import("@trpc/server").ProcedureRecord> extends infer T_8 ? { [TPath_8 in keyof T_8]: {
-        input: import("@trpc/server").inferProcedureInput<import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["queries"], import("@trpc/server").ProcedureRecord>[TPath_8]>;
-        output: import("@trpc/server").inferProcedureOutput<import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["queries"], import("@trpc/server").ProcedureRecord>[TPath_8]>;
-    }; } : never)[TPath_3_4]["input"], "cursor">, (import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["queries"], import("@trpc/server").ProcedureRecord> extends infer T_8 ? { [TPath_8 in keyof T_8]: {
-        input: import("@trpc/server").inferProcedureInput<import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["queries"], import("@trpc/server").ProcedureRecord>[TPath_8]>;
-        output: import("@trpc/server").inferProcedureOutput<import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["queries"], import("@trpc/server").ProcedureRecord>[TPath_8]>;
-    }; } : never)[TPath_3_4]["output"], import("@trpc/react").TRPCClientErrorLike<TRouter>> | undefined) => import("@tanstack/react-query").UseInfiniteQueryResult<(import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["queries"], import("@trpc/server").ProcedureRecord> extends infer T_8 ? { [TPath_8 in keyof T_8]: {
-        input: import("@trpc/server").inferProcedureInput<import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["queries"], import("@trpc/server").ProcedureRecord>[TPath_8]>;
-        output: import("@trpc/server").inferProcedureOutput<import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["queries"], import("@trpc/server").ProcedureRecord>[TPath_8]>;
-    }; } : never)[TPath_3_4]["output"], import("@trpc/react").TRPCClientErrorLike<TRouter>>;
-    useMutation: <TPath_1_7 extends keyof import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["mutations"], import("@trpc/server").ProcedureRecord> & string, TContext_1 = unknown>(path: TPath_1_7 | [TPath_1_7], opts?: import("@trpc/react/dist/createReactQueryHooks").UseTRPCMutationOptions<(import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["mutations"], import("@trpc/server").ProcedureRecord> extends infer T_9 ? { [TPath_9 in keyof T_9]: {
-        input: import("@trpc/server").inferProcedureInput<import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["mutations"], import("@trpc/server").ProcedureRecord>[TPath_9]>;
-        output: import("@trpc/server").inferProcedureOutput<import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["mutations"], import("@trpc/server").ProcedureRecord>[TPath_9]>;
-    }; } : never)[TPath_1_7]["input"], import("@trpc/react").TRPCClientErrorLike<TRouter>, (import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["mutations"], import("@trpc/server").ProcedureRecord> extends infer T_9 ? { [TPath_9 in keyof T_9]: {
-        input: import("@trpc/server").inferProcedureInput<import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["mutations"], import("@trpc/server").ProcedureRecord>[TPath_9]>;
-        output: import("@trpc/server").inferProcedureOutput<import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["mutations"], import("@trpc/server").ProcedureRecord>[TPath_9]>;
-    }; } : never)[TPath_1_7]["output"], TContext_1> | undefined) => import("@tanstack/react-query").UseMutationResult<(import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["mutations"], import("@trpc/server").ProcedureRecord> extends infer T_9 ? { [TPath_9 in keyof T_9]: {
-        input: import("@trpc/server").inferProcedureInput<import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["mutations"], import("@trpc/server").ProcedureRecord>[TPath_9]>;
-        output: import("@trpc/server").inferProcedureOutput<import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["mutations"], import("@trpc/server").ProcedureRecord>[TPath_9]>;
-    }; } : never)[TPath_1_7]["output"], import("@trpc/react").TRPCClientErrorLike<TRouter>, (import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["mutations"], import("@trpc/server").ProcedureRecord> extends infer T_9 ? { [TPath_9 in keyof T_9]: {
-        input: import("@trpc/server").inferProcedureInput<import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["mutations"], import("@trpc/server").ProcedureRecord>[TPath_9]>;
-        output: import("@trpc/server").inferProcedureOutput<import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["mutations"], import("@trpc/server").ProcedureRecord>[TPath_9]>;
-    }; } : never)[TPath_1_7]["input"], TContext_1>;
-    useQuery: <TPath_10 extends keyof import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["queries"], import("@trpc/server").ProcedureRecord> & string, TQueryFnData_1 = (import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["queries"], import("@trpc/server").ProcedureRecord> extends infer T_8 ? { [TPath_8 in keyof T_8]: {
-        input: import("@trpc/server").inferProcedureInput<import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["queries"], import("@trpc/server").ProcedureRecord>[TPath_8]>;
-        output: import("@trpc/server").inferProcedureOutput<import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["queries"], import("@trpc/server").ProcedureRecord>[TPath_8]>;
-    }; } : never)[TPath_10]["output"], TData_1 = (import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["queries"], import("@trpc/server").ProcedureRecord> extends infer T_8 ? { [TPath_8 in keyof T_8]: {
-        input: import("@trpc/server").inferProcedureInput<import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["queries"], import("@trpc/server").ProcedureRecord>[TPath_8]>;
-        output: import("@trpc/server").inferProcedureOutput<import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["queries"], import("@trpc/server").ProcedureRecord>[TPath_8]>;
-    }; } : never)[TPath_10]["output"]>(pathAndInput: [path: TPath_10, ...args: import("@trpc/server").ProcedureArgs<import("@trpc/server").inferProcedureParams<import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["queries"], import("@trpc/server").ProcedureRecord>[TPath_10]>>], opts?: import("@trpc/react/dist/createReactQueryHooks").UseTRPCQueryOptions<TPath_10, (import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["queries"], import("@trpc/server").ProcedureRecord> extends infer T_8 ? { [TPath_8 in keyof T_8]: {
-        input: import("@trpc/server").inferProcedureInput<import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["queries"], import("@trpc/server").ProcedureRecord>[TPath_8]>;
-        output: import("@trpc/server").inferProcedureOutput<import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["queries"], import("@trpc/server").ProcedureRecord>[TPath_8]>;
-    }; } : never)[TPath_10]["input"], TQueryFnData_1, TData_1, import("@trpc/react").TRPCClientErrorLike<TRouter>> | undefined) => import("@tanstack/react-query").UseQueryResult<TData_1, import("@trpc/react").TRPCClientErrorLike<TRouter>>;
-    useSubscription: <TPath_2_1 extends keyof import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["subscriptions"], import("@trpc/server").ProcedureRecord> & string, TOutput_1 extends import("@trpc/server/observable").inferObservableValue<import("@trpc/server").inferProcedureOutput<TRouter["_def"]["subscriptions"][TPath_2_1]>>>(pathAndInput: [path: TPath_2_1, ...args: import("@trpc/server").ProcedureArgs<import("@trpc/server").inferProcedureParams<import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["subscriptions"], import("@trpc/server").ProcedureRecord>[TPath_2_1]>>], opts: import("@trpc/react/dist/createReactQueryHooks").UseTRPCSubscriptionOptions<import("@trpc/server/observable").inferObservableValue<import("@trpc/server").inferProcedureOutput<import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["subscriptions"], import("@trpc/server").ProcedureRecord>[TPath_2_1]>>, import("@trpc/server").inferProcedureClientError<import("@trpc/react/dist/createReactQueryHooks").AssertType<import("@trpc/react").AssertLegacyDef<TRouter>["subscriptions"], import("@trpc/server").ProcedureRecord>[TPath_2_1]>>) => void;
+    useContext(): DecoratedProcedureUtilsRecord<TRouter>;
     withTRPC: (AppOrPage: import("next/types").NextComponentType<any, any, any>) => import("next/types").NextComponentType<NextPageContext, {}, {}>;
-    queries: TRouter["_def"]["queries"];
-};
+} & DecoratedProcedureRecord<TRouter["_def"]["record"], "">;
 //# sourceMappingURL=setupNext.d.ts.map

package/dist/setupNext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setupNext.d.ts","sourceRoot":"","sources":["../src/setupNext.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,EAAE,oBAAoB,EAAE,kBAAkB,EAAY,MAAM,YAAY,CAAC;AAEhF,wBAAgB,SAAS,CACvB,OAAO,SAAS,SAAS,EACzB,WAAW,SAAS,eAAe,GAAG,eAAe,EACrD,IAAI,EAAE,oBAAoB,CAAC,OAAO,CAAC,GAAG,kBAAkB,CAAC,OAAO,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAiBlE"}
+{"version":3,"file":"setupNext.d.ts","sourceRoot":"","sources":["../src/setupNext.tsx"],"names":[],"mappings":"AACA,OAAO,EACL,wBAAwB,EACxB,6BAA6B,EAG9B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAE7C,OAAO,EAAE,oBAAoB,EAAE,kBAAkB,EAAY,MAAM,YAAY,CAAC;AAEhF,wBAAgB,SAAS,CACvB,OAAO,SAAS,SAAS,EACzB,WAAW,SAAS,eAAe,GAAG,eAAe,EACrD,IAAI,EAAE,oBAAoB,CAAC,OAAO,CAAC,GAAG,kBAAkB,CAAC,OAAO,CAAC;kBAoCjD,8BAA8B,OAAO,CAAC;;4DAGvD"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/next",
-  "version": "10.0.0-proxy-alpha.61",
+  "version": "10.0.0-proxy-alpha.64",
   "description": "tRPC Next lib",
   "author": "KATT",
   "license": "MIT",
@@ -36,9 +36,9 @@
   },
   "peerDependencies": {
     "@tanstack/react-query": "^4.0.10",
-    "@trpc/client": "10.0.0-proxy-alpha.61",
-    "@trpc/react": "10.0.0-proxy-alpha.61",
-    "@trpc/server": "10.0.0-proxy-alpha.61",
+    "@trpc/client": "10.0.0-proxy-alpha.64",
+    "@trpc/react": "10.0.0-proxy-alpha.64",
+    "@trpc/server": "10.0.0-proxy-alpha.64",
     "next": "*",
     "react": ">=16.8.0",
     "react-dom": ">=16.8.0"
@@ -48,9 +48,9 @@
   },
   "devDependencies": {
     "@tanstack/react-query": "^4.0.10",
-    "@trpc/client": "10.0.0-proxy-alpha.61",
-    "@trpc/react": "10.0.0-proxy-alpha.61",
-    "@trpc/server": "10.0.0-proxy-alpha.61",
+    "@trpc/client": "10.0.0-proxy-alpha.64",
+    "@trpc/react": "10.0.0-proxy-alpha.64",
+    "@trpc/server": "10.0.0-proxy-alpha.64",
     "@types/express": "^4.17.12",
     "express": "^4.17.1",
     "next": "^12.1.6",
@@ -61,5 +61,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "2cfc6617c7ed6532a1870391824def1a4e8130ba"
+  "gitHead": "0a159a6c4224920090105f6e60a2e6172a750d46"
 }

package/src/setupNext.tsx

@@ -1,6 +1,13 @@
-import { createReactQueryHooks, createReactQueryHooksProxy } from '@trpc/react';
+import { createReactQueryHooks } from '@trpc/react';
+import {
+  DecoratedProcedureRecord,
+  DecoratedProcedureUtilsRecord,
+  createReactProxyDecoration,
+  createReactQueryUtilsProxy,
+} from '@trpc/react/shared';
 import { AnyRouter } from '@trpc/server';
 import { NextPageContext } from 'next/types';
+import { useMemo } from 'react';
 import { WithTRPCNoSSROptions, WithTRPCSSROptions, withTRPC } from './withTRPC';
 
 export function setupTRPC<
@@ -8,19 +15,41 @@ export function setupTRPC<
   TSSRContext extends NextPageContext = NextPageContext,
 >(opts: WithTRPCNoSSROptions<TRouter> | WithTRPCSSROptions<TRouter>) {
   const hooks = createReactQueryHooks<TRouter, TSSRContext>();
-  const proxy = createReactQueryHooksProxy<TRouter, TSSRContext>(hooks);
 
   // TODO: maybe set TSSRContext to `never` when using `WithTRPCNoSSROptions`
   const _withTRPC = withTRPC<TRouter, TSSRContext>(opts);
 
-  return {
-    proxy,
-    useContext: hooks.useContext,
-    useInfiniteQuery: hooks.useInfiniteQuery,
-    useMutation: hooks.useMutation,
-    useQuery: hooks.useQuery,
-    useSubscription: hooks.useSubscription,
-    withTRPC: _withTRPC,
-    queries: hooks.queries,
-  };
+  const proxy: unknown = new Proxy(
+    () => {
+      // no-op
+    },
+    {
+      get(_obj, name) {
+        if (name === 'useContext') {
+          return () => {
+            const context = hooks.useContext();
+            // create a stable reference of the utils context
+            return useMemo(() => {
+              return createReactQueryUtilsProxy(context as any);
+            }, [context]);
+          };
+        }
+
+        if (name === 'withTRPC') {
+          return _withTRPC;
+        }
+
+        if (typeof name === 'string') {
+          return createReactProxyDecoration(name, hooks);
+        }
+
+        throw new Error('Not supported');
+      },
+    },
+  );
+
+  return proxy as {
+    useContext(): DecoratedProcedureUtilsRecord<TRouter>;
+    withTRPC: typeof _withTRPC;
+  } & DecoratedProcedureRecord<TRouter['_def']['record']>;
 }