@trpc/client 11.0.0-alpha-tmp-subscription-connection-state.489 → 11.0.0-alpha-tmp-12-06-react.665

package/src/links/types.ts

@@ -7,6 +7,7 @@ import type {
 } from '@trpc/server/unstable-core-do-not-import';
 import type { ResponseEsque } from '../internals/types';
 import type { TRPCClientError } from '../TRPCClientError';
+import type { TRPCConnectionState } from './internals/subscriptions';
 
 export {
   isNonJsonSerializable,
@@ -55,56 +56,14 @@ export interface TRPCClientRuntime {
   // nothing here anymore
 }
 
-export type ConnectionState = 'idle' | 'connecting' | 'pending' | 'error';
-
-export interface ConnectionStateMessageBase {
-  type: 'state';
-}
-
-export interface IdleStateMessage extends ConnectionStateMessageBase {
-  state: 'idle';
-}
-
-export interface ConnectingStateMessage<TError>
-  extends ConnectionStateMessageBase {
-  state: 'connecting';
-  data: TError | null;
-}
-
-export interface PendingStateMessage extends ConnectionStateMessageBase {
-  state: 'pending';
-}
-
-export interface ErrorStateMessage<TError> extends ConnectionStateMessageBase {
-  state: 'error';
-  data: TError;
-}
-
-export type TRPCConnectionStateMessage<TError> =
-  | IdleStateMessage
-  | ConnectingStateMessage<TError>
-  | PendingStateMessage
-  | ErrorStateMessage<TError>;
-
-export const isConnectionStateMessage = <TError>(
-  msg: unknown,
-): msg is TRPCConnectionStateMessage<TError> => {
-  return (
-    typeof msg === 'object' &&
-    msg !== null &&
-    'type' in msg &&
-    msg.type === 'state'
-  );
-};
-
 /**
  * @internal
  */
-export interface OperationResultEnvelope<TOutput, TError = unknown> {
+export interface OperationResultEnvelope<TOutput, TError> {
   result:
-    | TRPCConnectionStateMessage<TError>
     | TRPCResultMessage<TOutput>['result']
-    | TRPCSuccessResponse<TOutput>['result'];
+    | TRPCSuccessResponse<TOutput>['result']
+    | TRPCConnectionState<TError>;
   context?: OperationContext;
 }
 
@@ -125,7 +84,10 @@ export type OperationResultObservable<
 export type OperationResultObserver<
   TInferrable extends InferrableClientTypes,
   TOutput,
-> = Observer<OperationResultEnvelope<TOutput>, TRPCClientError<TInferrable>>;
+> = Observer<
+  OperationResultEnvelope<TOutput, TRPCClientError<TInferrable>>,
+  TRPCClientError<TInferrable>
+>;
 
 /**
  * @internal