Replae deprecated types

icflorescu · Mar 3, 2024 · 0714408 · 0714408
1 parent 70800a3
commit 0714408
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 24 deletions.
diff --git a/package/src/client.ts b/package/src/client.ts
@@ -1,14 +1,14 @@
 import {
-  createTRPCProxyClient,
   httpBatchLink,
+  createTRPCClient as internalCreateTRPCClient,
   type HTTPHeaders,
   type TRPCLink
 } from '@trpc/client';
-import type { AnyRouter } from '@trpc/server';
+import type { AnyTRPCRouter, TRPCCombinedDataTransformer } from '@trpc/server';
 
 export type TRPCClientInit = { fetch?: typeof window.fetch; url: { origin: string } };
 
-type CreateTRPCClientOptions<Router extends AnyRouter> = (
+type CreateTRPCClientOptions<Router extends AnyTRPCRouter> = (
   | {
       links?: never;
 
@@ -52,36 +52,27 @@ type CreateTRPCClientOptions<Router extends AnyRouter> = (
         serialize: (object: any) => any;
         deserialize: (object: any) => any;
       }
-    | {
-        input: {
-          serialize: (object: any) => any;
-          deserialize: (object: any) => any;
-        };
-        output: {
-          serialize: (object: any) => any;
-          deserialize: (object: any) => any;
-        };
-      };
+    | TRPCCombinedDataTransformer;
 };
 
 /**
  * Create a tRPC client.
  * @see https://trpc.io/docs/vanilla
  */
-export function createTRPCClient<Router extends AnyRouter>(
+export function createTRPCClient<Router extends AnyTRPCRouter>(
   { links, url = '/trpc', transformer, init, headers }: CreateTRPCClientOptions<Router> = {
     url: '/trpc'
   }
 ) {
-  if (links) return createTRPCProxyClient<Router>({ links });
+  if (links) return internalCreateTRPCClient<Router>({ links });
 
   if (typeof window === 'undefined' && !init) {
     throw new Error(
       'Calling createTRPCClient() on the server requires passing a valid LoadEvent argument'
     );
   }
 
-  return createTRPCProxyClient<Router>({
+  return internalCreateTRPCClient<Router>({
     links: [
       httpBatchLink({
         url:

diff --git a/package/src/server.ts b/package/src/server.ts
@@ -1,16 +1,15 @@
 import type { Handle, RequestEvent } from '@sveltejs/kit';
 import type {
-  AnyRouter,
-  Dict,
-  ProcedureType,
+  AnyTRPCRouter,
   TRPCError,
+  TRPCProcedureType,
   inferRouterContext,
   inferRouterError
 } from '@trpc/server';
 import { resolveHTTPResponse, type ResponseMeta } from '@trpc/server/http';
 import type { TRPCResponse } from '@trpc/server/rpc';
-import type { ValidRoute } from './ValidRoute';
 import { serialize, type CookieSerializeOptions } from 'cookie';
+import type { ValidRoute } from './ValidRoute';
 
 /**
  * Create a SvelteKit handle function for tRPC requests.
@@ -19,7 +18,7 @@ import { serialize, type CookieSerializeOptions } from 'cookie';
  * consider [the sequence helper function](https://kit.svelte.dev/docs/modules#sveltejs-kit-hooks).
  * @see https://kit.svelte.dev/docs/hooks
  */
-export function createTRPCHandle<Router extends AnyRouter, URL extends string>({
+export function createTRPCHandle<Router extends AnyTRPCRouter, URL extends string>({
   router,
   url = '/trpc',
   createContext,
@@ -52,7 +51,7 @@ export function createTRPCHandle<Router extends AnyRouter, URL extends string>({
     data: TRPCResponse<unknown, inferRouterError<Router>>[];
     ctx?: inferRouterContext<Router>;
     paths?: string[];
-    type: ProcedureType;
+    type: TRPCProcedureType;
     errors: TRPCError[];
   }) => ResponseMeta;
 
@@ -66,13 +65,13 @@ export function createTRPCHandle<Router extends AnyRouter, URL extends string>({
     path: string;
     input: unknown;
     req: RequestInit;
-    type: ProcedureType | 'unknown';
+    type: TRPCProcedureType | 'unknown';
   }) => void;
 }): Handle {
   return async ({ event, resolve }) => {
     if (event.url.pathname.startsWith(url + '/')) {
       const request = event.request as Request & {
-        headers: Dict<string | string[]>;
+        headers: Record<string, string | string[]>;
       };
 
       const req = {