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

package/dist/TRPCClientError.d.ts

@@ -11,7 +11,7 @@ export declare class TRPCClientError<TRouter extends AnyRouter> extends Error im
     readonly data: Maybe<inferRouterError<TRouter>['data']>;
     readonly meta: Record<string, unknown> | undefined;
     constructor(message: string, opts?: {
-        result: Maybe<TRPCErrorResponse<inferRouterError<TRouter>>>;
+        result?: Maybe<TRPCErrorResponse<inferRouterError<TRouter>>>;
         cause?: Error;
         meta?: Record<string, unknown>;
     });

package/dist/TRPCClientError.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TRPCClientError.d.ts","sourceRoot":"","sources":["../src/TRPCClientError.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAClE,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAErD,MAAM,WAAW,mBAAmB,CAAC,OAAO,SAAS,SAAS;IAC5D,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC;IACjD,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;CACzD;AAED,qBAAa,eAAe,CAAC,OAAO,SAAS,SAAS,CACpD,SAAQ,KACR,YAAW,mBAAmB,CAAC,OAAO,CAAC;IAEvC,SAAgB,KAAK,oBAAC;IACtB,SAAgB,KAAK,EAAE,KAAK,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC;IACxD,SAAgB,IAAI,EAAE,KAAK,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;IAC/D,SAAgB,IAAI,sCAAC;gBAGnB,OAAO,EAAE,MAAM,EACf,IAAI,CAAC,EAAE;QACL,MAAM,EAAE,KAAK,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QAC5D,KAAK,CAAC,EAAE,KAAK,CAAC;QACd,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KAChC;WAkBW,IAAI,CAAC,OAAO,SAAS,SAAS,EAC1C,KAAK,EAAE,KAAK,GAAG,iBAAiB,CAAC,GAAG,CAAC,EACrC,IAAI,GAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAO,GAC5C,eAAe,CAAC,OAAO,CAAC;CAkB5B"}
+{"version":3,"file":"TRPCClientError.d.ts","sourceRoot":"","sources":["../src/TRPCClientError.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAClE,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAErD,MAAM,WAAW,mBAAmB,CAAC,OAAO,SAAS,SAAS;IAC5D,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC;IACjD,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;CACzD;AAED,qBAAa,eAAe,CAAC,OAAO,SAAS,SAAS,CACpD,SAAQ,KACR,YAAW,mBAAmB,CAAC,OAAO,CAAC;IAEvC,SAAgB,KAAK,oBAAC;IACtB,SAAgB,KAAK,EAAE,KAAK,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC;IACxD,SAAgB,IAAI,EAAE,KAAK,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;IAC/D,SAAgB,IAAI,sCAAC;gBAGnB,OAAO,EAAE,MAAM,EACf,IAAI,CAAC,EAAE;QACL,MAAM,CAAC,EAAE,KAAK,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QAC7D,KAAK,CAAC,EAAE,KAAK,CAAC;QACd,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KAChC;WAkBW,IAAI,CAAC,OAAO,SAAS,SAAS,EAC1C,KAAK,EAAE,KAAK,GAAG,iBAAiB,CAAC,GAAG,CAAC,EACrC,IAAI,GAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAO,GAC5C,eAAe,CAAC,OAAO,CAAC;CAkB5B"}

package/dist/createTRPCClient.d.ts

@@ -1,5 +1,5 @@
 import type { AnyRouter } from '@trpc/server';
 import { TRPCClient as Client, CreateTRPCClientOptions } from './internals/TRPCClient';
 export declare function createTRPCClient<TRouter extends AnyRouter>(opts: CreateTRPCClientOptions<TRouter>): Client<TRouter>;
-export type { TRPCRequestOptions, CreateTRPCClientOptions, TRPCClient, } from './internals/TRPCClient';
+export type { TRPCRequestOptions, CreateTRPCClientOptions, TRPCClient, AssertLegacyDef, } from './internals/TRPCClient';
 //# sourceMappingURL=createTRPCClient.d.ts.map

package/dist/createTRPCClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createTRPCClient.d.ts","sourceRoot":"","sources":["../src/createTRPCClient.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EACL,UAAU,IAAI,MAAM,EACpB,uBAAuB,EACxB,MAAM,wBAAwB,CAAC;AAEhC,wBAAgB,gBAAgB,CAAC,OAAO,SAAS,SAAS,EACxD,IAAI,EAAE,uBAAuB,CAAC,OAAO,CAAC,mBAIvC;AAID,YAAY,EACV,kBAAkB,EAClB,uBAAuB,EACvB,UAAU,GACX,MAAM,wBAAwB,CAAC"}
+{"version":3,"file":"createTRPCClient.d.ts","sourceRoot":"","sources":["../src/createTRPCClient.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EACL,UAAU,IAAI,MAAM,EACpB,uBAAuB,EACxB,MAAM,wBAAwB,CAAC;AAEhC,wBAAgB,gBAAgB,CAAC,OAAO,SAAS,SAAS,EACxD,IAAI,EAAE,uBAAuB,CAAC,OAAO,CAAC,mBAIvC;AAID,YAAY,EACV,kBAAkB,EAClB,uBAAuB,EACvB,UAAU,EACV,eAAe,GAChB,MAAM,wBAAwB,CAAC"}

package/dist/createTRPCClientProxy.d.ts

@@ -1,7 +1,15 @@
 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 { CreateTRPCClientOptions } from './createTRPCClient';
+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 +18,20 @@ 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]>>;
-};
-export declare function createTRPCClientProxy<TRouter extends AnyRouter>(client: Client<TRouter>): DecoratedProcedureRecord<TRouter["_def"]["record"]>;
+declare type DecoratedProcedureRecord<TProcedures extends ProcedureRouterRecord, TRouter extends AnyRouter> = OmitNeverKeys<{
+    [TKey in keyof TProcedures]: TProcedures[TKey] extends AnyRouter ? DecoratedProcedureRecord<TProcedures[TKey]['_def']['record'], TProcedures[TKey]> : assertProcedure<TProcedures[TKey]>['_def']['_old'] extends true ? never : DecorateProcedure<assertProcedure<TProcedures[TKey]>, TRouter>;
+}>;
+/**
+ * @deprecated use createTRPCProxyClient instead
+ * @internal
+ */
+export declare function createTRPCClientProxy<TRouter extends AnyRouter>(client: Client<TRouter>): DecoratedProcedureRecord<TRouter["_def"]["record"], TRouter>;
+export declare function createTRPCProxyClient<TRouter extends AnyRouter>(opts: CreateTRPCClientOptions<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,EAAE,uBAAuB,EAAoB,MAAM,oBAAoB,CAAC;AAC/E,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,aAAa,CAAC;KACf,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,eAAe,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,SAAS,IAAI,GAC/D,KAAK,GACL,iBAAiB,CAAC,eAAe,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,EAAE,OAAO,CAAC;CACnE,CAAC,CAAC;AAWH;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,SAAS,SAAS,EAC7D,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,gEAWxB;AAED,wBAAgB,qBAAqB,CAAC,OAAO,SAAS,SAAS,EAC7D,IAAI,EAAE,uBAAuB,CAAC,OAAO,CAAC,gEAKvC"}

package/dist/index.js

@@ -5,9 +5,9 @@ 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 transformResult = require('./transformResult-3ccc74ea.js');
 var links_httpBatchLink = require('./links/httpBatchLink.js');
-var _defineProperty = require('@babel/runtime/helpers/defineProperty');
+require('@babel/runtime/helpers/defineProperty');
 require('@babel/runtime/helpers/slicedToArray');
 var links_splitLink = require('./splitLink-23c5ce5c.js');
 require('@babel/runtime/helpers/assertThisInitialized');
@@ -19,13 +19,13 @@ var _toConsumableArray = require('@babel/runtime/helpers/toConsumableArray');
 var shared = require('@trpc/server/shared');
 var links_httpLink = require('./links/httpLink.js');
 var links_loggerLink = require('./links/loggerLink.js');
+var links_wsLink = require('./links/wsLink.js');
 require('./httpUtils-a0169eef.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var _classCallCheck__default = /*#__PURE__*/_interopDefaultLegacy(_classCallCheck);
 var _createClass__default = /*#__PURE__*/_interopDefaultLegacy(_createClass);
-var _defineProperty__default = /*#__PURE__*/_interopDefaultLegacy(_defineProperty);
 var _toConsumableArray__default = /*#__PURE__*/_interopDefaultLegacy(_toConsumableArray);
 
 function getWindow() {
@@ -136,7 +136,7 @@ function retryLink(opts) {
               attempt();
             },
             next: function next(result) {
-              if ('result' in result.data) {
+              if ('result' in result.result) {
                 isDone = true;
                 observer.next(result);
                 return;
@@ -170,61 +170,6 @@ function retryLink(opts) {
   };
 }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-/** @internal */
-function transformOperationResult(result, runtime) {
-  var context = result.context;
-
-  if ('error' in result.data) {
-    var error = links_wsLink.TRPCClientError.from(_objectSpread(_objectSpread({}, result.data), {}, {
-      error: runtime.transformer.deserialize(result.data.error)
-    }));
-    return {
-      ok: false,
-      error: error,
-      context: context
-    };
-  }
-
-  var data = runtime.transformer.deserialize(result.data.result.data);
-  return {
-    ok: true,
-    data: data,
-    context: context
-  };
-}
-/** @internal */
-
-function transformSubscriptionOperationResult(result, runtime) {
-  var context = result.context;
-
-  if ('error' in result.data) {
-    var error = links_wsLink.TRPCClientError.from(_objectSpread(_objectSpread({}, result.data), {}, {
-      error: runtime.transformer.deserialize(result.data.error)
-    }), {
-      meta: context
-    });
-    return {
-      ok: false,
-      error: error,
-      context: context
-    };
-  }
-
-  var data = _objectSpread(_objectSpread({}, result.data.result), result.data.result.type === 'data' && {
-    data: runtime.transformer.deserialize(result.data.result.data)
-  });
-
-  return {
-    ok: true,
-    data: data,
-    context: context
-  };
-}
-
 var idCounter = 0;
 
 function getRequestId() {
@@ -309,8 +254,6 @@ var TRPCClient = /*#__PURE__*/function () {
   }, {
     key: "requestAsPromise",
     value: function requestAsPromise(opts) {
-      var _this2 = this;
-
       var req$ = this.$request(opts);
 
       var _observableToPromise = observable.observableToPromise(req$),
@@ -318,17 +261,10 @@ var TRPCClient = /*#__PURE__*/function () {
           abort = _observableToPromise.abort;
 
       var cancellablePromise = new Promise(function (resolve, reject) {
-        promise.then(function (result) {
-          var transformed = transformOperationResult(result, _this2.runtime);
-
-          if (transformed.ok) {
-            resolve(transformed.data);
-            return;
-          }
-
-          reject(transformed.error);
+        promise.then(function (envelope) {
+          resolve(envelope.result.data);
         }).catch(function (err) {
-          reject(links_wsLink.TRPCClientError.from(err));
+          reject(transformResult.TRPCClientError.from(err));
         });
       });
       cancellablePromise.cancel = abort;
@@ -343,7 +279,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 +296,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 +311,33 @@ 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;
+        next: function next(envelope) {
+          if (envelope.result.type === 'started') {
+            var _opts$onStarted;
 
-          var transformed = transformSubscriptionOperationResult(result, runtime);
+            (_opts$onStarted = opts.onStarted) === null || _opts$onStarted === void 0 ? void 0 : _opts$onStarted.call(opts);
+          } else if (envelope.result.type === 'stopped') {
+            var _opts$onStopped;
 
-          if (transformed.ok) {
-            var _opts$next;
+            (_opts$onStopped = opts.onStopped) === null || _opts$onStopped === void 0 ? void 0 : _opts$onStopped.call(opts);
+          } else {
+            var _opts$onData;
 
-            (_opts$next = opts.next) === null || _opts$next === void 0 ? void 0 : _opts$next.call(opts, transformed.data);
-            return;
+            (_opts$onData = opts.onData) === null || _opts$onData === void 0 ? void 0 : _opts$onData.call(opts, envelope.result.data);
           }
-
-          (_opts$error = opts.error) === null || _opts$error === void 0 ? void 0 : _opts$error.call(opts, transformed.error);
         },
         error: function error(err) {
-          var _opts$error2;
+          var _opts$onError;
 
-          (_opts$error2 = opts.error) === null || _opts$error2 === void 0 ? void 0 : _opts$error2.call(opts, err);
+          (_opts$onError = opts.onError) === null || _opts$onError === void 0 ? void 0 : _opts$onError.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);
         }
       });
     }
@@ -421,6 +357,11 @@ var clientCallTypeMap = {
   mutate: 'mutation',
   subscribe: 'subscription'
 };
+/**
+ * @deprecated use createTRPCProxyClient instead
+ * @internal
+ */
+
 function createTRPCClientProxy(client) {
   var proxy = shared.createProxy(function (_ref) {
     var _ref2;
@@ -437,16 +378,22 @@ function createTRPCClientProxy(client) {
   });
   return proxy;
 }
+function createTRPCProxyClient(opts) {
+  var client = createTRPCClient(opts);
+  var proxy = createTRPCClientProxy(client);
+  return proxy;
+}
 
-exports.TRPCClientError = links_wsLink.TRPCClientError;
-exports.createWSClient = links_wsLink.createWSClient;
-exports.wsLink = links_wsLink.wsLink;
+exports.TRPCClientError = transformResult.TRPCClientError;
 exports.httpBatchLink = links_httpBatchLink.httpBatchLink;
 exports.splitLink = links_splitLink.splitLink;
 exports.httpLink = links_httpLink.httpLink;
 exports.loggerLink = links_loggerLink.loggerLink;
+exports.createWSClient = links_wsLink.createWSClient;
+exports.wsLink = links_wsLink.wsLink;
 exports.createTRPCClient = createTRPCClient;
 exports.createTRPCClientProxy = createTRPCClientProxy;
+exports.createTRPCProxyClient = createTRPCProxyClient;
 exports.dedupeLink = dedupeLink;
 exports.getFetch = getFetch;
 exports.retryLink = retryLink;

package/dist/index.mjs

@@ -1,11 +1,11 @@
 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 './transformResult-06bec648.mjs';
+export { T as TRPCClientError } from './transformResult-06bec648.mjs';
 import { httpBatchLink } from './links/httpBatchLink.mjs';
 export { httpBatchLink } from './links/httpBatchLink.mjs';
-import _defineProperty from '@babel/runtime/helpers/defineProperty';
+import '@babel/runtime/helpers/defineProperty';
 import '@babel/runtime/helpers/slicedToArray';
 import { c as createChain } from './splitLink-0202cd7b.mjs';
 export { s as splitLink } from './splitLink-0202cd7b.mjs';
@@ -18,6 +18,7 @@ import _toConsumableArray from '@babel/runtime/helpers/toConsumableArray';
 import { createProxy } from '@trpc/server/shared';
 export { httpLink } from './links/httpLink.mjs';
 export { loggerLink } from './links/loggerLink.mjs';
+export { createWSClient, wsLink } from './links/wsLink.mjs';
 import './httpUtils-089853f6.mjs';
 
 function getWindow() {
@@ -128,7 +129,7 @@ function retryLink(opts) {
               attempt();
             },
             next: function next(result) {
-              if ('result' in result.data) {
+              if ('result' in result.result) {
                 isDone = true;
                 observer.next(result);
                 return;
@@ -162,61 +163,6 @@ function retryLink(opts) {
   };
 }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-/** @internal */
-function transformOperationResult(result, runtime) {
-  var context = result.context;
-
-  if ('error' in result.data) {
-    var error = TRPCClientError.from(_objectSpread(_objectSpread({}, result.data), {}, {
-      error: runtime.transformer.deserialize(result.data.error)
-    }));
-    return {
-      ok: false,
-      error: error,
-      context: context
-    };
-  }
-
-  var data = runtime.transformer.deserialize(result.data.result.data);
-  return {
-    ok: true,
-    data: data,
-    context: context
-  };
-}
-/** @internal */
-
-function transformSubscriptionOperationResult(result, runtime) {
-  var context = result.context;
-
-  if ('error' in result.data) {
-    var error = TRPCClientError.from(_objectSpread(_objectSpread({}, result.data), {}, {
-      error: runtime.transformer.deserialize(result.data.error)
-    }), {
-      meta: context
-    });
-    return {
-      ok: false,
-      error: error,
-      context: context
-    };
-  }
-
-  var data = _objectSpread(_objectSpread({}, result.data.result), result.data.result.type === 'data' && {
-    data: runtime.transformer.deserialize(result.data.result.data)
-  });
-
-  return {
-    ok: true,
-    data: data,
-    context: context
-  };
-}
-
 var idCounter = 0;
 
 function getRequestId() {
@@ -301,8 +247,6 @@ var TRPCClient = /*#__PURE__*/function () {
   }, {
     key: "requestAsPromise",
     value: function requestAsPromise(opts) {
-      var _this2 = this;
-
       var req$ = this.$request(opts);
 
       var _observableToPromise = observableToPromise(req$),
@@ -310,15 +254,8 @@ var TRPCClient = /*#__PURE__*/function () {
           abort = _observableToPromise.abort;
 
       var cancellablePromise = new Promise(function (resolve, reject) {
-        promise.then(function (result) {
-          var transformed = transformOperationResult(result, _this2.runtime);
-
-          if (transformed.ok) {
-            resolve(transformed.data);
-            return;
-          }
-
-          reject(transformed.error);
+        promise.then(function (envelope) {
+          resolve(envelope.result.data);
         }).catch(function (err) {
           reject(TRPCClientError.from(err));
         });
@@ -335,7 +272,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 +289,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 +304,33 @@ 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;
+        next: function next(envelope) {
+          if (envelope.result.type === 'started') {
+            var _opts$onStarted;
 
-          var transformed = transformSubscriptionOperationResult(result, runtime);
+            (_opts$onStarted = opts.onStarted) === null || _opts$onStarted === void 0 ? void 0 : _opts$onStarted.call(opts);
+          } else if (envelope.result.type === 'stopped') {
+            var _opts$onStopped;
 
-          if (transformed.ok) {
-            var _opts$next;
+            (_opts$onStopped = opts.onStopped) === null || _opts$onStopped === void 0 ? void 0 : _opts$onStopped.call(opts);
+          } else {
+            var _opts$onData;
 
-            (_opts$next = opts.next) === null || _opts$next === void 0 ? void 0 : _opts$next.call(opts, transformed.data);
-            return;
+            (_opts$onData = opts.onData) === null || _opts$onData === void 0 ? void 0 : _opts$onData.call(opts, envelope.result.data);
           }
-
-          (_opts$error = opts.error) === null || _opts$error === void 0 ? void 0 : _opts$error.call(opts, transformed.error);
         },
         error: function error(err) {
-          var _opts$error2;
+          var _opts$onError;
 
-          (_opts$error2 = opts.error) === null || _opts$error2 === void 0 ? void 0 : _opts$error2.call(opts, err);
+          (_opts$onError = opts.onError) === null || _opts$onError === void 0 ? void 0 : _opts$onError.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);
         }
       });
     }
@@ -413,6 +350,11 @@ var clientCallTypeMap = {
   mutate: 'mutation',
   subscribe: 'subscription'
 };
+/**
+ * @deprecated use createTRPCProxyClient instead
+ * @internal
+ */
+
 function createTRPCClientProxy(client) {
   var proxy = createProxy(function (_ref) {
     var _ref2;
@@ -429,5 +371,10 @@ function createTRPCClientProxy(client) {
   });
   return proxy;
 }
+function createTRPCProxyClient(opts) {
+  var client = createTRPCClient(opts);
+  var proxy = createTRPCClientProxy(client);
+  return proxy;
+}
 
-export { createTRPCClient, createTRPCClientProxy, dedupeLink, getFetch, retryLink };
+export { createTRPCClient, createTRPCClientProxy, createTRPCProxyClient, dedupeLink, getFetch, retryLink };

package/dist/internals/TRPCClient.d.ts

@@ -1,6 +1,6 @@
 import { AnyRouter, ClientDataTransformerOptions, inferHandlerInput, inferProcedureInput, inferProcedureOutput, inferSubscriptionOutput } from '@trpc/server';
-import { Observer, Unsubscribable } from '@trpc/server/observable';
-import { TRPCResultMessage } from '@trpc/server/rpc';
+import { ProcedureRecord } from '@trpc/server';
+import { Unsubscribable } from '@trpc/server/observable';
 import { CancelFn } from '..';
 import { TRPCClientError } from '../TRPCClientError';
 import { HTTPHeaders, OperationContext, TRPCClientRuntime, TRPCLink } from '../links/types';
@@ -44,19 +44,41 @@ 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;
+export declare type AssertType<T, K> = T extends K ? T : never;
+/**
+ * @deprecated
+ */
+export declare type AssertLegacyDef<TRouter extends AnyRouter> = TRouter['_def']['legacy'] extends Record<'subscriptions' | 'queries' | 'mutations', ProcedureRecord> ? TRouter['_def']['legacy'] : {
+    subscriptions: {};
+    queries: {};
+    mutations: {};
+};
 export declare class TRPCClient<TRouter extends AnyRouter> {
     private readonly links;
     readonly runtime: TRPCClientRuntime;
     constructor(opts: CreateTRPCClientOptions<TRouter>);
     private $request;
     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;
+    query<TQueries extends AssertLegacyDef<TRouter>['queries'], TPath extends string & keyof TQueries>(path: TPath, ...args: [
+        ...inferHandlerInput<AssertType<TQueries, ProcedureRecord>[TPath]>,
+        TRPCRequestOptions?
+    ]): CancellablePromise<inferProcedureOutput<TQueries[TPath]>>;
+    mutation<TMutations extends AssertLegacyDef<TRouter>['mutations'], TPath extends string & keyof TMutations>(path: TPath, ...args: [
+        ...inferHandlerInput<AssertType<TMutations, ProcedureRecord>[TPath]>,
+        TRPCRequestOptions?
+    ]): CancellablePromise<inferProcedureOutput<TMutations[TPath]>>;
+    subscription<TSubscriptions extends AssertLegacyDef<TRouter>['subscriptions'], TPath extends string & keyof TSubscriptions, TOutput extends inferSubscriptionOutput<TRouter, TPath>, TInput extends inferProcedureInput<AssertType<TSubscriptions, ProcedureRecord>[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/httpBatchLink.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"httpBatchLink.d.ts","sourceRoot":"","sources":["../../src/links/httpBatchLink.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAiB,MAAM,cAAc,CAAC;AAGxD,OAAO,EACL,eAAe,EAIhB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEnC,MAAM,WAAW,oBAAqB,SAAQ,eAAe;IAC3D,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,wBAAgB,aAAa,CAAC,OAAO,SAAS,SAAS,EACrD,IAAI,EAAE,oBAAoB,GACzB,QAAQ,CAAC,OAAO,CAAC,CAoFnB"}
+{"version":3,"file":"httpBatchLink.d.ts","sourceRoot":"","sources":["../../src/links/httpBatchLink.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAiB,MAAM,cAAc,CAAC;AAIxD,OAAO,EACL,eAAe,EAIhB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEnC,MAAM,WAAW,oBAAqB,SAAQ,eAAe;IAC3D,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,wBAAgB,aAAa,CAAC,OAAO,SAAS,SAAS,EACrD,IAAI,EAAE,oBAAoB,GACzB,QAAQ,CAAC,OAAO,CAAC,CA4FnB"}

package/dist/links/httpBatchLink.js

@@ -3,8 +3,16 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var observable = require('@trpc/server/observable');
+var transformResult = require('../transformResult-3ccc74ea.js');
 var httpUtils = require('../httpUtils-a0169eef.js');
 require('@babel/runtime/helpers/defineProperty');
+require('@babel/runtime/helpers/classCallCheck');
+require('@babel/runtime/helpers/createClass');
+require('@babel/runtime/helpers/assertThisInitialized');
+require('@babel/runtime/helpers/inherits');
+require('@babel/runtime/helpers/possibleConstructorReturn');
+require('@babel/runtime/helpers/getPrototypeOf');
+require('@babel/runtime/helpers/wrapNativeSuper');
 
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 
@@ -298,9 +306,18 @@ function httpBatchLink(opts) {
             cancel = _loader$load.cancel;
 
         promise.then(function (res) {
+          var transformed = transformResult.transformResult(res.json, runtime);
+
+          if (!transformed.ok) {
+            observer.error(transformResult.TRPCClientError.from(transformed.error, {
+              meta: res.meta
+            }));
+            return;
+          }
+
           observer.next({
             context: res.meta,
-            data: res.json
+            result: transformed.result
           });
           observer.complete();
         }).catch(function (err) {