@trpc/client 10.0.0-alpha.41 → 10.0.0-alpha.42

package/dist/createTRPCClientProxy.d.ts

@@ -1,7 +1,14 @@
 import type { AnyRouter, OmitNeverKeys, Procedure, ProcedureArgs, ProcedureRouterRecord, inferProcedureOutput } from '@trpc/server';
-import { TRPCClient as Client } from './internals/TRPCClient';
+import type { Unsubscribable, inferObservableValue } from '@trpc/server/observable';
+import type { TRPCResultMessage } from '@trpc/server/rpc';
+import { TRPCClientError } from './TRPCClientError';
+import { TRPCClient as Client, TRPCSubscriptionObserver } from './internals/TRPCClient';
 declare type Resolver<TProcedure extends Procedure<any>> = (...args: ProcedureArgs<TProcedure['_def']>) => Promise<inferProcedureOutput<TProcedure>>;
-declare type DecorateProcedure<TProcedure extends Procedure<any>> = OmitNeverKeys<{
+declare type SubscriptionResolver<TProcedure extends Procedure<any>, TRouter extends AnyRouter> = (...args: [
+    input: ProcedureArgs<TProcedure['_def']>[0],
+    opts: ProcedureArgs<TProcedure['_def']>[1] & Partial<TRPCSubscriptionObserver<TRPCResultMessage<inferObservableValue<inferProcedureOutput<TProcedure>>>, TRPCClientError<TRouter>>>
+]) => Unsubscribable;
+declare type DecorateProcedure<TProcedure extends Procedure<any>, TRouter extends AnyRouter> = OmitNeverKeys<{
     query: TProcedure extends {
         _query: true;
     } ? Resolver<TProcedure> : never;
@@ -10,15 +17,15 @@ declare type DecorateProcedure<TProcedure extends Procedure<any>> = OmitNeverKey
     } ? Resolver<TProcedure> : never;
     subscribe: TProcedure extends {
         _subscription: true;
-    } ? Resolver<TProcedure> : never;
+    } ? SubscriptionResolver<TProcedure, TRouter> : never;
 }>;
 declare type assertProcedure<T> = T extends Procedure<any> ? T : never;
 /**
  * @internal
  */
-declare type DecoratedProcedureRecord<TProcedures extends ProcedureRouterRecord> = {
-    [TKey in keyof TProcedures]: TProcedures[TKey] extends AnyRouter ? DecoratedProcedureRecord<TProcedures[TKey]['_def']['record']> : DecorateProcedure<assertProcedure<TProcedures[TKey]>>;
+declare type DecoratedProcedureRecord<TProcedures extends ProcedureRouterRecord, TRouter extends AnyRouter> = {
+    [TKey in keyof TProcedures]: TProcedures[TKey] extends AnyRouter ? DecoratedProcedureRecord<TProcedures[TKey]['_def']['record'], TProcedures[TKey]> : DecorateProcedure<assertProcedure<TProcedures[TKey]>, TRouter>;
 };
-export declare function createTRPCClientProxy<TRouter extends AnyRouter>(client: Client<TRouter>): DecoratedProcedureRecord<TRouter["_def"]["record"]>;
+export declare function createTRPCClientProxy<TRouter extends AnyRouter>(client: Client<TRouter>): DecoratedProcedureRecord<TRouter["_def"]["record"], TRouter>;
 export {};
 //# sourceMappingURL=createTRPCClientProxy.d.ts.map

package/dist/createTRPCClientProxy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createTRPCClientProxy.d.ts","sourceRoot":"","sources":["../src/createTRPCClientProxy.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,SAAS,EACT,aAAa,EACb,SAAS,EACT,aAAa,EACb,qBAAqB,EAErB,oBAAoB,EACrB,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,UAAU,IAAI,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAE9D,aAAK,QAAQ,CAAC,UAAU,SAAS,SAAS,CAAC,GAAG,CAAC,IAAI,CACjD,GAAG,IAAI,EAAE,aAAa,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,KACvC,OAAO,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC,CAAC;AAE/C,aAAK,iBAAiB,CAAC,UAAU,SAAS,SAAS,CAAC,GAAG,CAAC,IAAI,aAAa,CAAC;IACxE,KAAK,EAAE,UAAU,SAAS;QAAE,MAAM,EAAE,IAAI,CAAA;KAAE,GAAG,QAAQ,CAAC,UAAU,CAAC,GAAG,KAAK,CAAC;IAE1E,MAAM,EAAE,UAAU,SAAS;QAAE,SAAS,EAAE,IAAI,CAAA;KAAE,GAAG,QAAQ,CAAC,UAAU,CAAC,GAAG,KAAK,CAAC;IAE9E,SAAS,EAAE,UAAU,SAAS;QAAE,aAAa,EAAE,IAAI,CAAA;KAAE,GACjD,QAAQ,CAAC,UAAU,CAAC,GACpB,KAAK,CAAC;CACX,CAAC,CAAC;AAEH,aAAK,eAAe,CAAC,CAAC,IAAI,CAAC,SAAS,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;AAE/D;;GAEG;AACH,aAAK,wBAAwB,CAAC,WAAW,SAAS,qBAAqB,IAAI;KACxE,IAAI,IAAI,MAAM,WAAW,GAAG,WAAW,CAAC,IAAI,CAAC,SAAS,SAAS,GAC5D,wBAAwB,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,CAAC,GAC7D,iBAAiB,CAAC,eAAe,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC;CAC1D,CAAC;AAQF,wBAAgB,qBAAqB,CAAC,OAAO,SAAS,SAAS,EAC7D,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,uDAWxB"}
+{"version":3,"file":"createTRPCClientProxy.d.ts","sourceRoot":"","sources":["../src/createTRPCClientProxy.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,SAAS,EACT,aAAa,EACb,SAAS,EACT,aAAa,EACb,qBAAqB,EAErB,oBAAoB,EACrB,MAAM,cAAc,CAAC;AACtB,OAAO,KAAK,EACV,cAAc,EACd,oBAAoB,EACrB,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAE1D,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EACL,UAAU,IAAI,MAAM,EACpB,wBAAwB,EACzB,MAAM,wBAAwB,CAAC;AAEhC,aAAK,QAAQ,CAAC,UAAU,SAAS,SAAS,CAAC,GAAG,CAAC,IAAI,CACjD,GAAG,IAAI,EAAE,aAAa,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,KACvC,OAAO,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC,CAAC;AAE/C,aAAK,oBAAoB,CACvB,UAAU,SAAS,SAAS,CAAC,GAAG,CAAC,EACjC,OAAO,SAAS,SAAS,IACvB,CACF,GAAG,IAAI,EAAE;IACP,KAAK,EAAE,aAAa,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;IAC3C,IAAI,EAAE,aAAa,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,GACxC,OAAO,CACL,wBAAwB,CACtB,iBAAiB,CACf,oBAAoB,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC,CACvD,EACD,eAAe,CAAC,OAAO,CAAC,CACzB,CACF;CACJ,KACE,cAAc,CAAC;AAEpB,aAAK,iBAAiB,CACpB,UAAU,SAAS,SAAS,CAAC,GAAG,CAAC,EACjC,OAAO,SAAS,SAAS,IACvB,aAAa,CAAC;IAChB,KAAK,EAAE,UAAU,SAAS;QAAE,MAAM,EAAE,IAAI,CAAA;KAAE,GAAG,QAAQ,CAAC,UAAU,CAAC,GAAG,KAAK,CAAC;IAE1E,MAAM,EAAE,UAAU,SAAS;QAAE,SAAS,EAAE,IAAI,CAAA;KAAE,GAAG,QAAQ,CAAC,UAAU,CAAC,GAAG,KAAK,CAAC;IAE9E,SAAS,EAAE,UAAU,SAAS;QAAE,aAAa,EAAE,IAAI,CAAA;KAAE,GACjD,oBAAoB,CAAC,UAAU,EAAE,OAAO,CAAC,GACzC,KAAK,CAAC;CACX,CAAC,CAAC;AAEH,aAAK,eAAe,CAAC,CAAC,IAAI,CAAC,SAAS,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;AAE/D;;GAEG;AACH,aAAK,wBAAwB,CAC3B,WAAW,SAAS,qBAAqB,EACzC,OAAO,SAAS,SAAS,IACvB;KACD,IAAI,IAAI,MAAM,WAAW,GAAG,WAAW,CAAC,IAAI,CAAC,SAAS,SAAS,GAC5D,wBAAwB,CACtB,WAAW,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,EACnC,WAAW,CAAC,IAAI,CAAC,CAClB,GACD,iBAAiB,CAAC,eAAe,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,EAAE,OAAO,CAAC;CACnE,CAAC;AAWF,wBAAgB,qBAAqB,CAAC,OAAO,SAAS,SAAS,EAC7D,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,gEAWxB"}

package/dist/index.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
 var observable = require('@trpc/server/observable');
-var links_wsLink = require('./wsLink-807f4ad9.js');
+var links_wsLink = require('./wsLink-44703a83.js');
 var links_httpBatchLink = require('./links/httpBatchLink.js');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 require('@babel/runtime/helpers/slicedToArray');
@@ -343,7 +343,7 @@ var TRPCClient = /*#__PURE__*/function () {
         args[_key - 1] = arguments[_key];
       }
 
-      var context = (_args$ = args[1]) === null || _args$ === void 0 ? void 0 : _args$.context;
+      var context = (_args$ = args[1]) === null || _args$ === void 0 ? void 0 : _args$.requestContext;
       return this.requestAsPromise({
         type: 'query',
         path: path,
@@ -360,7 +360,7 @@ var TRPCClient = /*#__PURE__*/function () {
         args[_key2 - 1] = arguments[_key2];
       }
 
-      var context = (_args$2 = args[1]) === null || _args$2 === void 0 ? void 0 : _args$2.context;
+      var context = (_args$2 = args[1]) === null || _args$2 === void 0 ? void 0 : _args$2.requestContext;
       return this.requestAsPromise({
         type: 'mutation',
         path: path,
@@ -375,33 +375,44 @@ var TRPCClient = /*#__PURE__*/function () {
         type: 'subscription',
         path: path,
         input: input,
-        context: opts.context
+        context: opts.requestContext
       });
       var runtime = this.runtime;
       return observable$.subscribe({
         next: function next(result) {
-          var _opts$error;
+          var _opts$onError;
 
           var transformed = transformSubscriptionOperationResult(result, runtime);
 
           if (transformed.ok) {
-            var _opts$next;
+            if (transformed.data.type === 'started') {
+              var _opts$onStarted;
+
+              (_opts$onStarted = opts.onStarted) === null || _opts$onStarted === void 0 ? void 0 : _opts$onStarted.call(opts);
+            } else if (transformed.data.type === 'stopped') {
+              var _opts$onStopped;
+
+              (_opts$onStopped = opts.onStopped) === null || _opts$onStopped === void 0 ? void 0 : _opts$onStopped.call(opts);
+            } else if (transformed.data.type === 'data') {
+              var _opts$onData;
+
+              (_opts$onData = opts.onData) === null || _opts$onData === void 0 ? void 0 : _opts$onData.call(opts, transformed.data.data);
+            }
 
-            (_opts$next = opts.next) === null || _opts$next === void 0 ? void 0 : _opts$next.call(opts, transformed.data);
             return;
           }
 
-          (_opts$error = opts.error) === null || _opts$error === void 0 ? void 0 : _opts$error.call(opts, transformed.error);
+          (_opts$onError = opts.onError) === null || _opts$onError === void 0 ? void 0 : _opts$onError.call(opts, transformed.error);
         },
         error: function error(err) {
-          var _opts$error2;
+          var _opts$onError2;
 
-          (_opts$error2 = opts.error) === null || _opts$error2 === void 0 ? void 0 : _opts$error2.call(opts, err);
+          (_opts$onError2 = opts.onError) === null || _opts$onError2 === void 0 ? void 0 : _opts$onError2.call(opts, err);
         },
         complete: function complete() {
-          var _opts$complete;
+          var _opts$onComplete;
 
-          (_opts$complete = opts.complete) === null || _opts$complete === void 0 ? void 0 : _opts$complete.call(opts);
+          (_opts$onComplete = opts.onComplete) === null || _opts$onComplete === void 0 ? void 0 : _opts$onComplete.call(opts);
         }
       });
     }

package/dist/index.mjs

@@ -1,8 +1,8 @@
 import _classCallCheck from '@babel/runtime/helpers/classCallCheck';
 import _createClass from '@babel/runtime/helpers/createClass';
 import { observable, share, observableToPromise } from '@trpc/server/observable';
-import { T as TRPCClientError } from './wsLink-11ee4922.mjs';
-export { T as TRPCClientError, c as createWSClient, w as wsLink } from './wsLink-11ee4922.mjs';
+import { T as TRPCClientError } from './wsLink-27b93bd0.mjs';
+export { T as TRPCClientError, c as createWSClient, w as wsLink } from './wsLink-27b93bd0.mjs';
 import { httpBatchLink } from './links/httpBatchLink.mjs';
 export { httpBatchLink } from './links/httpBatchLink.mjs';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
@@ -335,7 +335,7 @@ var TRPCClient = /*#__PURE__*/function () {
         args[_key - 1] = arguments[_key];
       }
 
-      var context = (_args$ = args[1]) === null || _args$ === void 0 ? void 0 : _args$.context;
+      var context = (_args$ = args[1]) === null || _args$ === void 0 ? void 0 : _args$.requestContext;
       return this.requestAsPromise({
         type: 'query',
         path: path,
@@ -352,7 +352,7 @@ var TRPCClient = /*#__PURE__*/function () {
         args[_key2 - 1] = arguments[_key2];
       }
 
-      var context = (_args$2 = args[1]) === null || _args$2 === void 0 ? void 0 : _args$2.context;
+      var context = (_args$2 = args[1]) === null || _args$2 === void 0 ? void 0 : _args$2.requestContext;
       return this.requestAsPromise({
         type: 'mutation',
         path: path,
@@ -367,33 +367,44 @@ var TRPCClient = /*#__PURE__*/function () {
         type: 'subscription',
         path: path,
         input: input,
-        context: opts.context
+        context: opts.requestContext
       });
       var runtime = this.runtime;
       return observable$.subscribe({
         next: function next(result) {
-          var _opts$error;
+          var _opts$onError;
 
           var transformed = transformSubscriptionOperationResult(result, runtime);
 
           if (transformed.ok) {
-            var _opts$next;
+            if (transformed.data.type === 'started') {
+              var _opts$onStarted;
+
+              (_opts$onStarted = opts.onStarted) === null || _opts$onStarted === void 0 ? void 0 : _opts$onStarted.call(opts);
+            } else if (transformed.data.type === 'stopped') {
+              var _opts$onStopped;
+
+              (_opts$onStopped = opts.onStopped) === null || _opts$onStopped === void 0 ? void 0 : _opts$onStopped.call(opts);
+            } else if (transformed.data.type === 'data') {
+              var _opts$onData;
+
+              (_opts$onData = opts.onData) === null || _opts$onData === void 0 ? void 0 : _opts$onData.call(opts, transformed.data.data);
+            }
 
-            (_opts$next = opts.next) === null || _opts$next === void 0 ? void 0 : _opts$next.call(opts, transformed.data);
             return;
           }
 
-          (_opts$error = opts.error) === null || _opts$error === void 0 ? void 0 : _opts$error.call(opts, transformed.error);
+          (_opts$onError = opts.onError) === null || _opts$onError === void 0 ? void 0 : _opts$onError.call(opts, transformed.error);
         },
         error: function error(err) {
-          var _opts$error2;
+          var _opts$onError2;
 
-          (_opts$error2 = opts.error) === null || _opts$error2 === void 0 ? void 0 : _opts$error2.call(opts, err);
+          (_opts$onError2 = opts.onError) === null || _opts$onError2 === void 0 ? void 0 : _opts$onError2.call(opts, err);
         },
         complete: function complete() {
-          var _opts$complete;
+          var _opts$onComplete;
 
-          (_opts$complete = opts.complete) === null || _opts$complete === void 0 ? void 0 : _opts$complete.call(opts);
+          (_opts$onComplete = opts.onComplete) === null || _opts$onComplete === void 0 ? void 0 : _opts$onComplete.call(opts);
         }
       });
     }

package/dist/internals/TRPCClient.d.ts

@@ -1,6 +1,5 @@
 import { AnyRouter, ClientDataTransformerOptions, inferHandlerInput, inferProcedureInput, inferProcedureOutput, inferSubscriptionOutput } from '@trpc/server';
-import { Observer, Unsubscribable } from '@trpc/server/observable';
-import { TRPCResultMessage } from '@trpc/server/rpc';
+import { Unsubscribable } from '@trpc/server/observable';
 import { CancelFn } from '..';
 import { TRPCClientError } from '../TRPCClientError';
 import { HTTPHeaders, OperationContext, TRPCClientRuntime, TRPCLink } from '../links/types';
@@ -44,7 +43,14 @@ export interface TRPCRequestOptions {
     /**
      * Pass additional context to links
      */
-    context?: OperationContext;
+    requestContext?: OperationContext;
+}
+export interface TRPCSubscriptionObserver<TValue, TError> {
+    onStarted: () => void;
+    onData: (value: TValue) => void;
+    onError: (err: TError) => void;
+    onStopped: () => void;
+    onComplete: () => void;
 }
 /** @internal */
 export declare type CreateTRPCClientOptions<TRouter extends AnyRouter> = CreateTRPCClientWithLinksOptions<TRouter> | CreateTRPCClientWithURLOptions;
@@ -56,7 +62,7 @@ export declare class TRPCClient<TRouter extends AnyRouter> {
     private requestAsPromise;
     query<TQueries extends TRouter['_def']['queries'], TPath extends string & keyof TQueries>(path: TPath, ...args: [...inferHandlerInput<TQueries[TPath]>, TRPCRequestOptions?]): CancellablePromise<inferProcedureOutput<TQueries[TPath]>>;
     mutation<TMutations extends TRouter['_def']['mutations'], TPath extends string & keyof TMutations>(path: TPath, ...args: [...inferHandlerInput<TMutations[TPath]>, TRPCRequestOptions?]): CancellablePromise<inferProcedureOutput<TMutations[TPath]>>;
-    subscription<TSubscriptions extends TRouter['_def']['subscriptions'], TPath extends string & keyof TSubscriptions, TOutput extends inferSubscriptionOutput<TRouter, TPath>, TInput extends inferProcedureInput<TSubscriptions[TPath]>>(path: TPath, input: TInput, opts: TRPCRequestOptions & Partial<Observer<TRPCResultMessage<TOutput>, TRPCClientError<TRouter>>>): Unsubscribable;
+    subscription<TSubscriptions extends TRouter['_def']['subscriptions'], TPath extends string & keyof TSubscriptions, TOutput extends inferSubscriptionOutput<TRouter, TPath>, TInput extends inferProcedureInput<TSubscriptions[TPath]>>(path: TPath, input: TInput, opts: TRPCRequestOptions & Partial<TRPCSubscriptionObserver<TOutput, TRPCClientError<TRouter>>>): Unsubscribable;
 }
 export {};
 //# sourceMappingURL=TRPCClient.d.ts.map

package/dist/internals/TRPCClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TRPCClient.d.ts","sourceRoot":"","sources":["../../src/internals/TRPCClient.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"TRPCClient.d.ts","sourceRoot":"","sources":["../../src/internals/TRPCClient.ts"],"names":[],"mappings":"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"}

package/dist/links/wsLink.d.ts

@@ -6,6 +6,8 @@ export interface WebSocketClientOptions {
     url: string;
     WebSocket?: typeof WebSocket;
     retryDelayMs?: typeof retryDelay;
+    onOpen?: () => void;
+    onClose?: () => void;
 }
 export declare function createWSClient(opts: WebSocketClientOptions): {
     close: () => void;

package/dist/links/wsLink.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wsLink.d.ts","sourceRoot":"","sources":["../../src/links/wsLink.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAiB,MAAM,cAAc,CAAC;AACxD,OAAO,EAAE,aAAa,EAAc,MAAM,yBAAyB,CAAC;AASpE,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,uBAAuB,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEvE,MAAM,WAAW,sBAAsB;IACrC,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,CAAC,EAAE,OAAO,SAAS,CAAC;IAC7B,YAAY,CAAC,EAAE,OAAO,UAAU,CAAC;CAClC;AACD,wBAAgB,cAAc,CAAC,IAAI,EAAE,sBAAsB;;kBA6LpC,SAAS,6DAA0B,aAAa;;EAgDtE;AACD,oBAAY,mBAAmB,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAC;AAEpE,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,mBAAmB,CAAC;CAC7B;AAiBD,wBAAgB,MAAM,CAAC,OAAO,SAAS,SAAS,EAC9C,IAAI,EAAE,oBAAoB,GACzB,QAAQ,CAAC,OAAO,CAAC,CAoDnB"}
+{"version":3,"file":"wsLink.d.ts","sourceRoot":"","sources":["../../src/links/wsLink.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAiB,MAAM,cAAc,CAAC;AACxD,OAAO,EAAE,aAAa,EAAc,MAAM,yBAAyB,CAAC;AASpE,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,uBAAuB,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEvE,MAAM,WAAW,sBAAsB;IACrC,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,CAAC,EAAE,OAAO,SAAS,CAAC;IAC7B,YAAY,CAAC,EAAE,OAAO,UAAU,CAAC;IACjC,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;CACtB;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,sBAAsB;;kBAuMpC,SAAS,6DAA0B,aAAa;;EAiDtE;AACD,oBAAY,mBAAmB,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAC;AAEpE,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,mBAAmB,CAAC;CAC7B;AAiBD,wBAAgB,MAAM,CAAC,OAAO,SAAS,SAAS,EAC9C,IAAI,EAAE,oBAAoB,GACzB,QAAQ,CAAC,OAAO,CAAC,CAoDnB"}

package/dist/links/wsLink.js

@@ -11,7 +11,7 @@ require('@babel/runtime/helpers/getPrototypeOf');
 require('@babel/runtime/helpers/wrapNativeSuper');
 require('@babel/runtime/helpers/slicedToArray');
 require('@trpc/server/observable');
-var links_wsLink = require('../wsLink-807f4ad9.js');
+var links_wsLink = require('../wsLink-44703a83.js');
 require('@babel/runtime/helpers/defineProperty');
 
 

package/dist/links/wsLink.mjs

@@ -7,5 +7,5 @@ import '@babel/runtime/helpers/getPrototypeOf';
 import '@babel/runtime/helpers/wrapNativeSuper';
 import '@babel/runtime/helpers/slicedToArray';
 import '@trpc/server/observable';
-export { c as createWSClient, w as wsLink } from '../wsLink-11ee4922.mjs';
+export { c as createWSClient, w as wsLink } from '../wsLink-27b93bd0.mjs';
 import '@babel/runtime/helpers/defineProperty';

package/dist/{wsLink-11ee4922.mjs → wsLink-27b93bd0.mjs}

@@ -89,7 +89,9 @@ function createWSClient(opts) {
       _opts$WebSocket = opts.WebSocket,
       WebSocketImpl = _opts$WebSocket === void 0 ? WebSocket : _opts$WebSocket,
       _opts$retryDelayMs = opts.retryDelayMs,
-      retryDelayFn = _opts$retryDelayMs === void 0 ? retryDelay : _opts$retryDelayMs;
+      retryDelayFn = _opts$retryDelayMs === void 0 ? retryDelay : _opts$retryDelayMs,
+      onOpen = opts.onOpen,
+      onClose = opts.onClose;
   /* istanbul ignore next */
 
   if (!WebSocketImpl) {
@@ -194,6 +196,7 @@ function createWSClient(opts) {
 
       connectAttempt = 0;
       state = 'open';
+      onOpen === null || onOpen === void 0 ? void 0 : onOpen();
       dispatch();
     });
     conn.addEventListener('error', function () {
@@ -204,6 +207,10 @@ function createWSClient(opts) {
 
     var handleIncomingRequest = function handleIncomingRequest(req) {
       if (req.method === 'reconnect' && conn === activeConnection) {
+        if (state === 'open') {
+          onClose === null || onClose === void 0 ? void 0 : onClose();
+        }
+
         reconnect(); // notify subscribers
 
         for (var _i = 0, _Object$values = Object.values(pendingRequests); _i < _Object$values.length; _i++) {
@@ -258,6 +265,10 @@ function createWSClient(opts) {
       }
     });
     conn.addEventListener('close', function () {
+      if (state === 'open') {
+        onClose === null || onClose === void 0 ? void 0 : onClose();
+      }
+
       if (activeConnection === conn) {
         // connection might have been replaced already
         tryReconnect();
@@ -335,6 +346,7 @@ function createWSClient(opts) {
   return {
     close: function close() {
       state = 'closed';
+      onClose === null || onClose === void 0 ? void 0 : onClose();
       closeIfNoPending(activeConnection);
       clearTimeout(connectTimer);
       connectTimer = null;

package/dist/{wsLink-807f4ad9.js → wsLink-44703a83.js}

@@ -103,7 +103,9 @@ function createWSClient(opts) {
       _opts$WebSocket = opts.WebSocket,
       WebSocketImpl = _opts$WebSocket === void 0 ? WebSocket : _opts$WebSocket,
       _opts$retryDelayMs = opts.retryDelayMs,
-      retryDelayFn = _opts$retryDelayMs === void 0 ? retryDelay : _opts$retryDelayMs;
+      retryDelayFn = _opts$retryDelayMs === void 0 ? retryDelay : _opts$retryDelayMs,
+      onOpen = opts.onOpen,
+      onClose = opts.onClose;
   /* istanbul ignore next */
 
   if (!WebSocketImpl) {
@@ -208,6 +210,7 @@ function createWSClient(opts) {
 
       connectAttempt = 0;
       state = 'open';
+      onOpen === null || onOpen === void 0 ? void 0 : onOpen();
       dispatch();
     });
     conn.addEventListener('error', function () {
@@ -218,6 +221,10 @@ function createWSClient(opts) {
 
     var handleIncomingRequest = function handleIncomingRequest(req) {
       if (req.method === 'reconnect' && conn === activeConnection) {
+        if (state === 'open') {
+          onClose === null || onClose === void 0 ? void 0 : onClose();
+        }
+
         reconnect(); // notify subscribers
 
         for (var _i = 0, _Object$values = Object.values(pendingRequests); _i < _Object$values.length; _i++) {
@@ -272,6 +279,10 @@ function createWSClient(opts) {
       }
     });
     conn.addEventListener('close', function () {
+      if (state === 'open') {
+        onClose === null || onClose === void 0 ? void 0 : onClose();
+      }
+
       if (activeConnection === conn) {
         // connection might have been replaced already
         tryReconnect();
@@ -349,6 +360,7 @@ function createWSClient(opts) {
   return {
     close: function close() {
       state = 'closed';
+      onClose === null || onClose === void 0 ? void 0 : onClose();
       closeIfNoPending(activeConnection);
       clearTimeout(connectTimer);
       connectTimer = null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/client",
-  "version": "10.0.0-alpha.41",
+  "version": "10.0.0-alpha.42",
   "description": "tRPC Client lib",
   "author": "KATT",
   "license": "MIT",
@@ -67,13 +67,13 @@
     "@babel/runtime": "^7.9.0"
   },
   "peerDependencies": {
-    "@trpc/server": "10.0.0-alpha.41"
+    "@trpc/server": "10.0.0-alpha.42"
   },
   "devDependencies": {
-    "@trpc/server": "10.0.0-alpha.41"
+    "@trpc/server": "10.0.0-alpha.42"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "927344f2dd01312598720f0165a8f7ad3972761d"
+  "gitHead": "d5909785e8d024ef7869d9f5423dbe3bfd80cd59"
 }

package/src/createTRPCClientProxy.ts

@@ -10,20 +10,50 @@ import type {
   ProcedureType,
   inferProcedureOutput,
 } from '@trpc/server';
+import type {
+  Unsubscribable,
+  inferObservableValue,
+} from '@trpc/server/observable';
+import type { TRPCResultMessage } from '@trpc/server/rpc';
 import { createProxy } from '@trpc/server/shared';
-import { TRPCClient as Client } from './internals/TRPCClient';
+import { TRPCClientError } from './TRPCClientError';
+import {
+  TRPCClient as Client,
+  TRPCSubscriptionObserver,
+} from './internals/TRPCClient';
 
 type Resolver<TProcedure extends Procedure<any>> = (
   ...args: ProcedureArgs<TProcedure['_def']>
 ) => Promise<inferProcedureOutput<TProcedure>>;
 
-type DecorateProcedure<TProcedure extends Procedure<any>> = OmitNeverKeys<{
+type SubscriptionResolver<
+  TProcedure extends Procedure<any>,
+  TRouter extends AnyRouter,
+> = (
+  ...args: [
+    input: ProcedureArgs<TProcedure['_def']>[0],
+    opts: ProcedureArgs<TProcedure['_def']>[1] &
+      Partial<
+        TRPCSubscriptionObserver<
+          TRPCResultMessage<
+            inferObservableValue<inferProcedureOutput<TProcedure>>
+          >,
+          TRPCClientError<TRouter>
+        >
+      >,
+  ]
+) => Unsubscribable;
+
+type DecorateProcedure<
+  TProcedure extends Procedure<any>,
+  TRouter extends AnyRouter,
+> = OmitNeverKeys<{
   query: TProcedure extends { _query: true } ? Resolver<TProcedure> : never;
 
   mutate: TProcedure extends { _mutation: true } ? Resolver<TProcedure> : never;
 
   subscribe: TProcedure extends { _subscription: true }
-    ? Resolver<TProcedure>
+    ? SubscriptionResolver<TProcedure, TRouter>
     : never;
 }>;
 
@@ -32,13 +62,22 @@ type assertProcedure<T> = T extends Procedure<any> ? T : never;
 /**
  * @internal
  */
-type DecoratedProcedureRecord<TProcedures extends ProcedureRouterRecord> = {
+type DecoratedProcedureRecord<
+  TProcedures extends ProcedureRouterRecord,
+  TRouter extends AnyRouter,
+> = {
   [TKey in keyof TProcedures]: TProcedures[TKey] extends AnyRouter
-    ? DecoratedProcedureRecord<TProcedures[TKey]['_def']['record']>
-    : DecorateProcedure<assertProcedure<TProcedures[TKey]>>;
+    ? DecoratedProcedureRecord<
+        TProcedures[TKey]['_def']['record'],
+        TProcedures[TKey]
+      >
+    : DecorateProcedure<assertProcedure<TProcedures[TKey]>, TRouter>;
 };
 
-const clientCallTypeMap: Record<keyof DecorateProcedure<any>, ProcedureType> = {
+const clientCallTypeMap: Record<
+  keyof DecorateProcedure<any, any>,
+  ProcedureType
+> = {
   query: 'query',
   mutate: 'mutation',
   subscribe: 'subscription',
@@ -49,11 +88,11 @@ export function createTRPCClientProxy<TRouter extends AnyRouter>(
 ) {
   const proxy = createProxy(({ path, args }) => {
     const pathCopy = [...path];
-    const clientCallType = pathCopy.pop()! as keyof DecorateProcedure<any>;
+    const clientCallType = pathCopy.pop()! as keyof DecorateProcedure<any, any>;
     const procedureType = clientCallTypeMap[clientCallType];
 
     const fullPath = pathCopy.join('.');
     return (client as any)[procedureType](fullPath, ...args);
   });
-  return proxy as DecoratedProcedureRecord<TRouter['_def']['record']>;
+  return proxy as DecoratedProcedureRecord<TRouter['_def']['record'], TRouter>;
 }

package/src/internals/TRPCClient.ts

@@ -8,13 +8,11 @@ import {
   inferSubscriptionOutput,
 } from '@trpc/server';
 import {
-  Observer,
   Unsubscribable,
   inferObservableValue,
   observableToPromise,
   share,
 } from '@trpc/server/observable';
-import { TRPCResultMessage } from '@trpc/server/rpc';
 import { CancelFn } from '..';
 import { TRPCClientError } from '../TRPCClientError';
 import { getFetch } from '../getFetch';
@@ -84,7 +82,15 @@ export interface TRPCRequestOptions {
   /**
    * Pass additional context to links
    */
-  context?: OperationContext;
+  requestContext?: OperationContext;
+}
+
+export interface TRPCSubscriptionObserver<TValue, TError> {
+  onStarted: () => void;
+  onData: (value: TValue) => void;
+  onError: (err: TError) => void;
+  onStopped: () => void;
+  onComplete: () => void;
 }
 
 /** @internal */
@@ -197,7 +203,7 @@ export class TRPCClient<TRouter extends AnyRouter> {
     path: TPath,
     ...args: [...inferHandlerInput<TQueries[TPath]>, TRPCRequestOptions?]
   ) {
-    const context = (args[1] as TRPCRequestOptions | undefined)?.context;
+    const context = (args[1] as TRPCRequestOptions | undefined)?.requestContext;
     return this.requestAsPromise<
       inferHandlerInput<TQueries[TPath]>,
       inferProcedureOutput<TQueries[TPath]>
@@ -215,7 +221,7 @@ export class TRPCClient<TRouter extends AnyRouter> {
     path: TPath,
     ...args: [...inferHandlerInput<TMutations[TPath]>, TRPCRequestOptions?]
   ) {
-    const context = (args[1] as TRPCRequestOptions | undefined)?.context;
+    const context = (args[1] as TRPCRequestOptions | undefined)?.requestContext;
     return this.requestAsPromise<
       inferHandlerInput<TMutations[TPath]>,
       inferProcedureOutput<TMutations[TPath]>
@@ -235,13 +241,13 @@ export class TRPCClient<TRouter extends AnyRouter> {
     path: TPath,
     input: TInput,
     opts: TRPCRequestOptions &
-      Partial<Observer<TRPCResultMessage<TOutput>, TRPCClientError<TRouter>>>,
+      Partial<TRPCSubscriptionObserver<TOutput, TRPCClientError<TRouter>>>,
   ): Unsubscribable {
     const observable$ = this.$request<TInput, TOutput>({
       type: 'subscription',
       path,
       input,
-      context: opts.context,
+      context: opts.requestContext,
     });
     const runtime = this.runtime;
     return observable$.subscribe({
@@ -251,16 +257,22 @@ export class TRPCClient<TRouter extends AnyRouter> {
           runtime,
         );
         if (transformed.ok) {
-          opts.next?.(transformed.data);
+          if (transformed.data.type === 'started') {
+            opts.onStarted?.();
+          } else if (transformed.data.type === 'stopped') {
+            opts.onStopped?.();
+          } else if (transformed.data.type === 'data') {
+            opts.onData?.(transformed.data.data);
+          }
           return;
         }
-        opts.error?.(transformed.error);
+        opts.onError?.(transformed.error);
       },
       error(err) {
-        opts.error?.(err);
+        opts.onError?.(err);
       },
       complete() {
-        opts.complete?.();
+        opts.onComplete?.();
       },
     });
   }

package/src/links/wsLink.ts

@@ -15,12 +15,17 @@ export interface WebSocketClientOptions {
   url: string;
   WebSocket?: typeof WebSocket;
   retryDelayMs?: typeof retryDelay;
+  onOpen?: () => void;
+  onClose?: () => void;
 }
+
 export function createWSClient(opts: WebSocketClientOptions) {
   const {
     url,
     WebSocket: WebSocketImpl = WebSocket,
     retryDelayMs: retryDelayFn = retryDelay,
+    onOpen,
+    onClose,
   } = opts;
   /* istanbul ignore next */
   if (!WebSocketImpl) {
@@ -123,6 +128,7 @@ export function createWSClient(opts: WebSocketClientOptions) {
       }
       connectAttempt = 0;
       state = 'open';
+      onOpen?.();
       dispatch();
     });
     conn.addEventListener('error', () => {
@@ -132,6 +138,9 @@ export function createWSClient(opts: WebSocketClientOptions) {
     });
     const handleIncomingRequest = (req: TRPCClientIncomingRequest) => {
       if (req.method === 'reconnect' && conn === activeConnection) {
+        if (state === 'open') {
+          onClose?.();
+        }
         reconnect();
         // notify subscribers
         for (const pendingReq of Object.values(pendingRequests)) {
@@ -179,6 +188,10 @@ export function createWSClient(opts: WebSocketClientOptions) {
     });
 
     conn.addEventListener('close', () => {
+      if (state === 'open') {
+        onClose?.();
+      }
+
       if (activeConnection === conn) {
         // connection might have been replaced already
         tryReconnect();
@@ -244,6 +257,7 @@ export function createWSClient(opts: WebSocketClientOptions) {
   return {
     close: () => {
       state = 'closed';
+      onClose?.();
       closeIfNoPending(activeConnection);
       clearTimeout(connectTimer as any);
       connectTimer = null;