@trpc/client 10.0.0-proxy-alpha.57 → 10.0.0-proxy-alpha.60

package/README.md

@@ -7,8 +7,7 @@
 </p>
 
 <p align="center">
-  <!-- TODO: replace with new version GIF -->
-  <img src="https://storage.googleapis.com/trpc/trpcgif.gif" alt="Demo" />
+  <img src="https://assets.trpc.io/www/v10/preview-dark.gif" alt="Demo" />
 </p>
 
 # `@trpc/client`
@@ -23,13 +22,13 @@ Full documentation for `@trpc/client` can be found [here](https://trpc.io/docs/v
 
 ```bash
 # npm
-npm install @trpc/client
+npm install @trpc/client@next
 
 # Yarn
-yarn add @trpc/client
+yarn add @trpc/client@next
 
 # pnpm
-pnpm add @trpc/client
+pnpm add @trpc/client@next
 ```
 
 ## Basic Example

package/dist/createTRPCClientProxy.d.ts

@@ -1,13 +1,13 @@
 import type { AnyRouter, OmitNeverKeys, Procedure, ProcedureArgs, ProcedureRouterRecord, inferProcedureOutput } from '@trpc/server';
 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';
+export declare type inferRouterProxyClient<TRouter extends AnyRouter> = DecoratedProcedureRecord<TRouter['_def']['record'], TRouter>;
 declare type Resolver<TProcedure extends Procedure<any>> = (...args: ProcedureArgs<TProcedure['_def']>) => Promise<inferProcedureOutput<TProcedure>>;
 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>>>
+    opts: ProcedureArgs<TProcedure['_def']>[1] & Partial<TRPCSubscriptionObserver<inferObservableValue<inferProcedureOutput<TProcedure>>, TRPCClientError<TRouter>>>
 ]) => Unsubscribable;
 declare type DecorateProcedure<TProcedure extends Procedure<any>, TRouter extends AnyRouter> = OmitNeverKeys<{
     query: TProcedure extends {
@@ -31,7 +31,7 @@ declare type DecoratedProcedureRecord<TProcedures extends ProcedureRouterRecord,
  * @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 declare function createTRPCClientProxy<TRouter extends AnyRouter>(client: Client<TRouter>): inferRouterProxyClient<TRouter>;
+export declare function createTRPCProxyClient<TRouter extends AnyRouter>(opts: CreateTRPCClientOptions<TRouter>): inferRouterProxyClient<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;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"}
+{"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;AAEjC,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,oBAAY,sBAAsB,CAAC,OAAO,SAAS,SAAS,IAC1D,wBAAwB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC,CAAC;AAE/D,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,oBAAoB,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC,EACtD,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,mCAWxB;AAED,wBAAgB,qBAAqB,CAAC,OAAO,SAAS,SAAS,EAC7D,IAAI,EAAE,uBAAuB,CAAC,OAAO,CAAC,mCAKvC"}

package/dist/getFetch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getFetch.d.ts","sourceRoot":"","sources":["../src/getFetch.ts"],"names":[],"mappings":"AAEA,wBAAgB,QAAQ,CAAC,CAAC,CAAC,EAAE,OAAO,KAAK,GAAG,OAAO,KAAK,CAYvD"}
+{"version":3,"file":"getFetch.d.ts","sourceRoot":"","sources":["../src/getFetch.ts"],"names":[],"mappings":"AAEA,wBAAgB,QAAQ,CAAC,CAAC,CAAC,EAAE,OAAO,KAAK,GAAG,OAAO,KAAK,CAcvD"}

package/dist/{httpUtils-801112a6.js → httpUtils-0961d5e3.js}

@@ -11,8 +11,7 @@ function arrayToDict(array) {
 }
 const METHOD = {
     query: 'GET',
-    mutation: 'POST',
-    subscription: 'PATCH'
+    mutation: 'POST'
 };
 function getInput(opts) {
     return 'input' in opts ? opts.runtime.transformer.serialize(opts.input) : arrayToDict(opts.inputs.map((_input)=>opts.runtime.transformer.serialize(_input)));
@@ -48,7 +47,11 @@ function httpRequest(opts) {
         const url = getUrl(opts);
         const body = getBody(opts);
         const meta = {};
-        Promise.resolve(runtime.headers()).then((headers)=>runtime.fetch(url, {
+        Promise.resolve(runtime.headers()).then((headers)=>{
+            if (type === 'subscription') {
+                throw new Error('Subscriptions should use wsLink');
+            }
+            return runtime.fetch(url, {
                 method: METHOD[type],
                 signal: ac?.signal,
                 body: body,
@@ -56,7 +59,8 @@ function httpRequest(opts) {
                     'content-type': 'application/json',
                     ...headers
                 }
-            })).then((_res)=>{
+            });
+        }).then((_res)=>{
             meta.response = _res;
             return _res.json();
         }).then((json)=>{

package/dist/{httpUtils-44781613.mjs → httpUtils-ad4258b6.mjs}

@@ -9,8 +9,7 @@ function arrayToDict(array) {
 }
 const METHOD = {
     query: 'GET',
-    mutation: 'POST',
-    subscription: 'PATCH'
+    mutation: 'POST'
 };
 function getInput(opts) {
     return 'input' in opts ? opts.runtime.transformer.serialize(opts.input) : arrayToDict(opts.inputs.map((_input)=>opts.runtime.transformer.serialize(_input)));
@@ -46,7 +45,11 @@ function httpRequest(opts) {
         const url = getUrl(opts);
         const body = getBody(opts);
         const meta = {};
-        Promise.resolve(runtime.headers()).then((headers)=>runtime.fetch(url, {
+        Promise.resolve(runtime.headers()).then((headers)=>{
+            if (type === 'subscription') {
+                throw new Error('Subscriptions should use wsLink');
+            }
+            return runtime.fetch(url, {
                 method: METHOD[type],
                 signal: ac?.signal,
                 body: body,
@@ -54,7 +57,8 @@ function httpRequest(opts) {
                     'content-type': 'application/json',
                     ...headers
                 }
-            })).then((_res)=>{
+            });
+        }).then((_res)=>{
             meta.response = _res;
             return _res.json();
         }).then((json)=>{

package/dist/index.js

@@ -10,17 +10,16 @@ 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-801112a6.js');
+require('./httpUtils-0961d5e3.js');
 
 function getWindow() {
     if (typeof window !== 'undefined') {
         return window;
     }
-    return global;
+    return globalThis;
 }
 function getAbortController(ac) {
-    const win = getWindow();
-    return (ac ?? win.AbortController) ?? undefined;
+    return (ac ?? getWindow().AbortController) ?? undefined;
 }
 
 function getFetch(f) {
@@ -28,8 +27,9 @@ function getFetch(f) {
         return f;
     }
     const win = getWindow();
-    if (win.fetch) {
-        return typeof win.fetch.bind === 'function' ? win.fetch.bind(win) : win.fetch;
+    const globalFetch = win.fetch;
+    if (globalFetch) {
+        return typeof globalFetch.bind === 'function' ? globalFetch.bind(win) : globalFetch;
     }
     throw new Error('No fetch implementation found');
 }

package/dist/index.mjs

@@ -9,17 +9,16 @@ 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-44781613.mjs';
+import './httpUtils-ad4258b6.mjs';
 
 function getWindow() {
     if (typeof window !== 'undefined') {
         return window;
     }
-    return global;
+    return globalThis;
 }
 function getAbortController(ac) {
-    const win = getWindow();
-    return (ac ?? win.AbortController) ?? undefined;
+    return (ac ?? getWindow().AbortController) ?? undefined;
 }
 
 function getFetch(f) {
@@ -27,8 +26,9 @@ function getFetch(f) {
         return f;
     }
     const win = getWindow();
-    if (win.fetch) {
-        return typeof win.fetch.bind === 'function' ? win.fetch.bind(win) : win.fetch;
+    const globalFetch = win.fetch;
+    if (globalFetch) {
+        return typeof globalFetch.bind === 'function' ? globalFetch.bind(win) : globalFetch;
     }
     throw new Error('No fetch implementation found');
 }

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

@@ -1 +1 @@
-{"version":3,"file":"fetchHelpers.d.ts","sourceRoot":"","sources":["../../../../packages/client/src/internals/fetchHelpers.ts"],"names":[],"mappings":"AAAA,wBAAgB,SAAS,sBAKxB;AACD,wBAAgB,kBAAkB,CAChC,EAAE,CAAC,EAAE,OAAO,eAAe,GAC1B,OAAO,eAAe,GAAG,SAAS,CAGpC"}
+{"version":3,"file":"fetchHelpers.d.ts","sourceRoot":"","sources":["../../../../packages/client/src/internals/fetchHelpers.ts"],"names":[],"mappings":"AAAA,wBAAgB,SAAS,sBAKxB;AACD,wBAAgB,kBAAkB,CAChC,EAAE,CAAC,EAAE,OAAO,eAAe,GAC1B,OAAO,eAAe,GAAG,SAAS,CAEpC"}

package/dist/links/httpBatchLink.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var observable = require('@trpc/server/observable');
 var transformResult = require('../transformResult-e15ccdf6.js');
-var httpUtils = require('../httpUtils-801112a6.js');
+var httpUtils = require('../httpUtils-0961d5e3.js');
 
 /* eslint-disable @typescript-eslint/no-non-null-assertion */ /**
  * A function that should never be called unless we messed something up.

package/dist/links/httpBatchLink.mjs

@@ -1,6 +1,6 @@
 import { observable } from '@trpc/server/observable';
 import { t as transformResult, T as TRPCClientError } from '../transformResult-106791d7.mjs';
-import { g as getUrl, h as httpRequest } from '../httpUtils-44781613.mjs';
+import { g as getUrl, h as httpRequest } from '../httpUtils-ad4258b6.mjs';
 
 /* eslint-disable @typescript-eslint/no-non-null-assertion */ /**
  * A function that should never be called unless we messed something up.

package/dist/links/httpLink.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var observable = require('@trpc/server/observable');
 var transformResult = require('../transformResult-e15ccdf6.js');
-var httpUtils = require('../httpUtils-801112a6.js');
+var httpUtils = require('../httpUtils-0961d5e3.js');
 
 function httpLink(opts) {
     const { url  } = opts;

package/dist/links/httpLink.mjs

@@ -1,6 +1,6 @@
 import { observable } from '@trpc/server/observable';
 import { t as transformResult, T as TRPCClientError } from '../transformResult-106791d7.mjs';
-import { h as httpRequest } from '../httpUtils-44781613.mjs';
+import { h as httpRequest } from '../httpUtils-ad4258b6.mjs';
 
 function httpLink(opts) {
     const { url  } = opts;

package/dist/links/internals/httpUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"httpUtils.d.ts","sourceRoot":"","sources":["../../../../../packages/client/src/links/internals/httpUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAE/D,MAAM,WAAW,eAAe;IAC9B,GAAG,EAAE,MAAM,CAAC;CACb;AAkBD,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,YAAY,CAAC;IACnB,IAAI,EAAE;QACJ,QAAQ,EAAE,QAAQ,CAAC;KACpB,CAAC;CACH;AAED,aAAK,eAAe,GAAG;IACrB,OAAO,EAAE,iBAAiB,CAAC;CAC5B,GAAG,CAAC;IAAE,MAAM,EAAE,OAAO,EAAE,CAAA;CAAE,GAAG;IAAE,KAAK,EAAE,OAAO,CAAA;CAAE,CAAC,CAAC;AAUjD,oBAAY,kBAAkB,GAAG,eAAe,GAC9C,eAAe,GAAG;IAChB,IAAI,EAAE,aAAa,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEJ,wBAAgB,MAAM,CAAC,IAAI,EAAE,kBAAkB,UAgB9C;AAED,aAAK,cAAc,GAAG;IAAE,IAAI,EAAE,aAAa,CAAA;CAAE,GAAG,eAAe,CAAC;AAEhE,wBAAgB,OAAO,CAAC,IAAI,EAAE,cAAc,sBAM3C;AAED,wBAAgB,WAAW,CACzB,IAAI,EAAE,kBAAkB,GACvB,gBAAgB,CAAC,UAAU,CAAC,CAqC9B"}
+{"version":3,"file":"httpUtils.d.ts","sourceRoot":"","sources":["../../../../../packages/client/src/links/internals/httpUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAE/D,MAAM,WAAW,eAAe;IAC9B,GAAG,EAAE,MAAM,CAAC;CACb;AAiBD,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,YAAY,CAAC;IACnB,IAAI,EAAE;QACJ,QAAQ,EAAE,QAAQ,CAAC;KACpB,CAAC;CACH;AAED,aAAK,eAAe,GAAG;IACrB,OAAO,EAAE,iBAAiB,CAAC;CAC5B,GAAG,CAAC;IAAE,MAAM,EAAE,OAAO,EAAE,CAAA;CAAE,GAAG;IAAE,KAAK,EAAE,OAAO,CAAA;CAAE,CAAC,CAAC;AAUjD,oBAAY,kBAAkB,GAAG,eAAe,GAC9C,eAAe,GAAG;IAChB,IAAI,EAAE,aAAa,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEJ,wBAAgB,MAAM,CAAC,IAAI,EAAE,kBAAkB,UAgB9C;AAED,aAAK,cAAc,GAAG;IAAE,IAAI,EAAE,aAAa,CAAA;CAAE,GAAG,eAAe,CAAC;AAEhE,wBAAgB,OAAO,CAAC,IAAI,EAAE,cAAc,sBAM3C;AAED,wBAAgB,WAAW,CACzB,IAAI,EAAE,kBAAkB,GACvB,gBAAgB,CAAC,UAAU,CAAC,CAwC9B"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/client",
-  "version": "10.0.0-proxy-alpha.57",
+  "version": "10.0.0-proxy-alpha.60",
   "description": "tRPC Client lib",
   "author": "KATT",
   "license": "MIT",
@@ -63,13 +63,13 @@
     "ts-watch": "tsc --project tsconfig.watch.json"
   },
   "peerDependencies": {
-    "@trpc/server": "10.0.0-proxy-alpha.57"
+    "@trpc/server": "10.0.0-proxy-alpha.60"
   },
   "devDependencies": {
-    "@trpc/server": "10.0.0-proxy-alpha.57"
+    "@trpc/server": "10.0.0-proxy-alpha.60"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "e664229c3ffcfb1d6bccb890cbddebf3630fdd45"
+  "gitHead": "59424cddb6ac66a0ffafb66bf9e98d3cbfec09cf"
 }

package/src/createTRPCClientProxy.ts

@@ -14,7 +14,6 @@ import type {
   Unsubscribable,
   inferObservableValue,
 } from '@trpc/server/observable';
-import type { TRPCResultMessage } from '@trpc/server/rpc';
 import { createProxy } from '@trpc/server/shared';
 import { TRPCClientError } from './TRPCClientError';
 import { CreateTRPCClientOptions, createTRPCClient } from './createTRPCClient';
@@ -23,6 +22,9 @@ import {
   TRPCSubscriptionObserver,
 } from './internals/TRPCClient';
 
+export type inferRouterProxyClient<TRouter extends AnyRouter> =
+  DecoratedProcedureRecord<TRouter['_def']['record'], TRouter>;
+
 type Resolver<TProcedure extends Procedure<any>> = (
   ...args: ProcedureArgs<TProcedure['_def']>
 ) => Promise<inferProcedureOutput<TProcedure>>;
@@ -36,9 +38,7 @@ type SubscriptionResolver<
     opts: ProcedureArgs<TProcedure['_def']>[1] &
       Partial<
         TRPCSubscriptionObserver<
-          TRPCResultMessage<
-            inferObservableValue<inferProcedureOutput<TProcedure>>
-          >,
+          inferObservableValue<inferProcedureOutput<TProcedure>>,
           TRPCClientError<TRouter>
         >
       >,
@@ -101,7 +101,7 @@ export function createTRPCClientProxy<TRouter extends AnyRouter>(
     const fullPath = pathCopy.join('.');
     return (client as any)[procedureType](fullPath, ...args);
   });
-  return proxy as DecoratedProcedureRecord<TRouter['_def']['record'], TRouter>;
+  return proxy as inferRouterProxyClient<TRouter>;
 }
 
 export function createTRPCProxyClient<TRouter extends AnyRouter>(

package/src/getFetch.ts

@@ -4,11 +4,13 @@ export function getFetch(f?: typeof fetch): typeof fetch {
   if (f) {
     return f;
   }
+
   const win = getWindow();
-  if (win.fetch) {
-    return typeof win.fetch.bind === 'function'
-      ? win.fetch.bind(win)
-      : win.fetch;
+  const globalFetch = win.fetch;
+  if (globalFetch) {
+    return typeof globalFetch.bind === 'function'
+      ? globalFetch.bind(win)
+      : globalFetch;
   }
 
   throw new Error('No fetch implementation found');

package/src/internals/fetchHelpers.ts

@@ -2,11 +2,10 @@ export function getWindow() {
   if (typeof window !== 'undefined') {
     return window;
   }
-  return global;
+  return globalThis;
 }
 export function getAbortController(
   ac?: typeof AbortController,
 ): typeof AbortController | undefined {
-  const win = getWindow();
-  return ac ?? win.AbortController ?? undefined;
+  return ac ?? getWindow().AbortController ?? undefined;
 }

package/src/links/internals/httpUtils.ts

@@ -19,7 +19,6 @@ function arrayToDict(array: unknown[]) {
 const METHOD = {
   query: 'GET',
   mutation: 'POST',
-  subscription: 'PATCH',
 } as const;
 
 export interface HTTPResult {
@@ -87,8 +86,11 @@ export function httpRequest(
 
     const meta = {} as HTTPResult['meta'];
     Promise.resolve(runtime.headers())
-      .then((headers) =>
-        runtime.fetch(url, {
+      .then((headers) => {
+        if (type === 'subscription') {
+          throw new Error('Subscriptions should use wsLink');
+        }
+        return runtime.fetch(url, {
           method: METHOD[type],
           signal: ac?.signal,
           body: body,
@@ -96,8 +98,8 @@ export function httpRequest(
             'content-type': 'application/json',
             ...headers,
           },
-        }),
-      )
+        });
+      })
       .then((_res) => {
         meta.response = _res;
         return _res.json();