@trpc/server 10.0.0-alpha.40 → 10.0.0-alpha.43

package/src/rpc/envelopes.ts

@@ -48,28 +48,31 @@ export namespace JSONRPC2 {
   }
 }
 
-/**
- * TRPC HTTP Envelopes
- */
+/////////////////////////// HTTP envelopes ///////////////////////
 
-export type TRPCRequest = JSONRPC2.Request<
-  ProcedureType,
-  { path: string; input: unknown }
->;
+export interface TRPCRequest
+  extends JSONRPC2.Request<ProcedureType, { path: string; input: unknown }> {}
 
-export type TRPCResult<TData = unknown> = { data: TData };
+export interface TRPCResult<TData = unknown> {
+  data: TData;
+}
 
-export type TRPCErrorResponse<TError extends TRPCErrorShape = TRPCErrorShape> =
-  JSONRPC2.ErrorResponse<TError>;
+export interface TRPCSuccessResponse<TData>
+  extends JSONRPC2.ResultResponse<
+    TRPCResult<TData> & {
+      type?: 'data';
+    }
+  > {}
+export interface TRPCErrorResponse<
+  TError extends TRPCErrorShape = TRPCErrorShape,
+> extends JSONRPC2.ErrorResponse<TError> {}
 
 export type TRPCResponse<
-  TResult = unknown,
+  TData = unknown,
   TError extends TRPCErrorShape = TRPCErrorShape,
-> = JSONRPC2.ResultResponse<TRPCResult<TResult>> | TRPCErrorResponse<TError>;
+> = TRPCSuccessResponse<TData> | TRPCErrorResponse<TError>;
 
-/**
- * HTTP WS Envelopes
- */
+/////////////////////////// WebSocket envelopes ///////////////////////
 
 export type TRPCRequestMessage = {
   id: JSONRPC2.RequestId;
@@ -78,9 +81,10 @@ export type TRPCRequestMessage = {
 /**
  * The client asked the server to unsubscribe
  */
-export type TRPCSubscriptionStopNotification = {
+export interface TRPCSubscriptionStopNotification
+  extends JSONRPC2.BaseRequest<'subscription.stop'> {
   id: null;
-} & JSONRPC2.BaseRequest<'subscription.stop'>;
+}
 
 /**
  * The client's outgoing request types
@@ -94,25 +98,28 @@ export type TRPCClientOutgoingMessage =
   | TRPCRequestMessage
   | ({ id: JSONRPC2.RequestId } & JSONRPC2.BaseRequest<'subscription.stop'>);
 
-export type TRPCResultMessage<TData = unknown> =
-  | ({ type: 'data' } & TRPCResult<TData>)
-  | { type: 'started' }
-  | { type: 'stopped' };
+export interface TRPCResultMessage<TData>
+  extends JSONRPC2.ResultResponse<
+    | (TRPCResult<TData> & { type: 'data' })
+    | { type: 'started' }
+    | { type: 'stopped' }
+  > {}
 
 export type TRPCResponseMessage<
-  TResult = unknown,
+  TData = unknown,
   TError extends TRPCErrorShape = TRPCErrorShape,
 > = { id: JSONRPC2.RequestId } & (
-  | JSONRPC2.ResultResponse<TRPCResultMessage<TResult>>
+  | TRPCResultMessage<TData>
   | TRPCErrorResponse<TError>
 );
 
 /**
  * The server asked the client to reconnect - useful when restarting/redeploying service
  */
-export type TRPCReconnectNotification = {
+export interface TRPCReconnectNotification
+  extends JSONRPC2.BaseRequest<'reconnect'> {
   id: JSONRPC2.RequestId;
-} & JSONRPC2.BaseRequest<'reconnect'>;
+}
 
 /**
  * The client's incoming request types

package/src/types.ts

@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/ban-types */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
 /**