Skip to content

Commit 0714408

Browse files
committed
Replae deprecated types
1 parent 70800a3 commit 0714408

File tree

2 files changed

+14
-24
lines changed

2 files changed

+14
-24
lines changed

package/src/client.ts

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import {
2-
createTRPCProxyClient,
32
httpBatchLink,
3+
createTRPCClient as internalCreateTRPCClient,
44
type HTTPHeaders,
55
type TRPCLink
66
} from '@trpc/client';
7-
import type { AnyRouter } from '@trpc/server';
7+
import type { AnyTRPCRouter, TRPCCombinedDataTransformer } from '@trpc/server';
88

99
export type TRPCClientInit = { fetch?: typeof window.fetch; url: { origin: string } };
1010

11-
type CreateTRPCClientOptions<Router extends AnyRouter> = (
11+
type CreateTRPCClientOptions<Router extends AnyTRPCRouter> = (
1212
| {
1313
links?: never;
1414

@@ -52,36 +52,27 @@ type CreateTRPCClientOptions<Router extends AnyRouter> = (
5252
serialize: (object: any) => any;
5353
deserialize: (object: any) => any;
5454
}
55-
| {
56-
input: {
57-
serialize: (object: any) => any;
58-
deserialize: (object: any) => any;
59-
};
60-
output: {
61-
serialize: (object: any) => any;
62-
deserialize: (object: any) => any;
63-
};
64-
};
55+
| TRPCCombinedDataTransformer;
6556
};
6657

6758
/**
6859
* Create a tRPC client.
6960
* @see https://trpc.io/docs/vanilla
7061
*/
71-
export function createTRPCClient<Router extends AnyRouter>(
62+
export function createTRPCClient<Router extends AnyTRPCRouter>(
7263
{ links, url = '/trpc', transformer, init, headers }: CreateTRPCClientOptions<Router> = {
7364
url: '/trpc'
7465
}
7566
) {
76-
if (links) return createTRPCProxyClient<Router>({ links });
67+
if (links) return internalCreateTRPCClient<Router>({ links });
7768

7869
if (typeof window === 'undefined' && !init) {
7970
throw new Error(
8071
'Calling createTRPCClient() on the server requires passing a valid LoadEvent argument'
8172
);
8273
}
8374

84-
return createTRPCProxyClient<Router>({
75+
return internalCreateTRPCClient<Router>({
8576
links: [
8677
httpBatchLink({
8778
url:

package/src/server.ts

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
import type { Handle, RequestEvent } from '@sveltejs/kit';
22
import type {
3-
AnyRouter,
4-
Dict,
5-
ProcedureType,
3+
AnyTRPCRouter,
64
TRPCError,
5+
TRPCProcedureType,
76
inferRouterContext,
87
inferRouterError
98
} from '@trpc/server';
109
import { resolveHTTPResponse, type ResponseMeta } from '@trpc/server/http';
1110
import type { TRPCResponse } from '@trpc/server/rpc';
12-
import type { ValidRoute } from './ValidRoute';
1311
import { serialize, type CookieSerializeOptions } from 'cookie';
12+
import type { ValidRoute } from './ValidRoute';
1413

1514
/**
1615
* Create a SvelteKit handle function for tRPC requests.
@@ -19,7 +18,7 @@ import { serialize, type CookieSerializeOptions } from 'cookie';
1918
* consider [the sequence helper function](https://kit.svelte.dev/docs/modules#sveltejs-kit-hooks).
2019
* @see https://kit.svelte.dev/docs/hooks
2120
*/
22-
export function createTRPCHandle<Router extends AnyRouter, URL extends string>({
21+
export function createTRPCHandle<Router extends AnyTRPCRouter, URL extends string>({
2322
router,
2423
url = '/trpc',
2524
createContext,
@@ -52,7 +51,7 @@ export function createTRPCHandle<Router extends AnyRouter, URL extends string>({
5251
data: TRPCResponse<unknown, inferRouterError<Router>>[];
5352
ctx?: inferRouterContext<Router>;
5453
paths?: string[];
55-
type: ProcedureType;
54+
type: TRPCProcedureType;
5655
errors: TRPCError[];
5756
}) => ResponseMeta;
5857

@@ -66,13 +65,13 @@ export function createTRPCHandle<Router extends AnyRouter, URL extends string>({
6665
path: string;
6766
input: unknown;
6867
req: RequestInit;
69-
type: ProcedureType | 'unknown';
68+
type: TRPCProcedureType | 'unknown';
7069
}) => void;
7170
}): Handle {
7271
return async ({ event, resolve }) => {
7372
if (event.url.pathname.startsWith(url + '/')) {
7473
const request = event.request as Request & {
75-
headers: Dict<string | string[]>;
74+
headers: Record<string, string | string[]>;
7675
};
7776

7877
const req = {

0 commit comments

Comments
 (0)