@trpc/client 11.0.0-rc.417 → 11.0.0-rc.419

package/dist/bundle-analysis.json

@@ -1,7 +1,7 @@
 {
-  "bundleSize": 46957,
-  "bundleOrigSize": 63578,
-  "bundleReduction": 26.14,
+  "bundleSize": 50717,
+  "bundleOrigSize": 67665,
+  "bundleReduction": 25.05,
   "modules": [
     {
       "id": "/src/links/wsLink.ts",
@@ -13,20 +13,20 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 25.68,
+      "percent": 23.78,
       "reduction": 11.68
     },
     {
       "id": "/src/links/httpBatchStreamLink.ts",
-      "size": 6153,
-      "origSize": 6253,
+      "size": 6237,
+      "origSize": 6400,
       "renderedExports": [
         "unstable_httpBatchStreamLink"
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 13.1,
-      "reduction": 1.6
+      "percent": 12.3,
+      "reduction": 2.55
     },
     {
       "id": "/src/links/loggerLink.ts",
@@ -37,7 +37,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 11.62,
+      "percent": 10.76,
       "reduction": 18.48
     },
     {
@@ -52,25 +52,25 @@
         "/src/links/httpBatchLink.ts",
         "/src/links/httpBatchStreamLink.ts"
       ],
-      "percent": 9.59,
+      "percent": 8.88,
       "reduction": 6.34
     },
     {
       "id": "/src/links/httpBatchLink.ts",
-      "size": 3906,
-      "origSize": 4074,
+      "size": 4030,
+      "origSize": 4173,
       "renderedExports": [
         "httpBatchLink"
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 8.32,
-      "reduction": 4.12
+      "percent": 7.95,
+      "reduction": 3.43
     },
     {
       "id": "/src/links/internals/httpUtils.ts",
-      "size": 3469,
-      "origSize": 5927,
+      "size": 3443,
+      "origSize": 5895,
       "renderedExports": [
         "resolveHTTPLinkOptions",
         "getInput",
@@ -84,27 +84,40 @@
       "dependents": [
         "/src/links/httpBatchLink.ts",
         "/src/links/httpLink.ts",
-        "/src/links/httpBatchStreamLink.ts"
+        "/src/links/httpBatchStreamLink.ts",
+        "/src/links/httpSubscriptionLink.ts"
+      ],
+      "percent": 6.79,
+      "reduction": 41.59
+    },
+    {
+      "id": "/src/links/httpSubscriptionLink.ts",
+      "size": 3277,
+      "origSize": 3535,
+      "renderedExports": [
+        "unstable_httpSubscriptionLink"
       ],
-      "percent": 7.39,
-      "reduction": 41.47
+      "removedExports": [],
+      "dependents": [],
+      "percent": 6.46,
+      "reduction": 7.3
     },
     {
       "id": "/src/links/httpLink.ts",
-      "size": 2939,
-      "origSize": 3459,
+      "size": 3167,
+      "origSize": 3698,
       "renderedExports": [
         "httpLink"
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 6.26,
-      "reduction": 15.03
+      "percent": 6.24,
+      "reduction": 14.36
     },
     {
       "id": "/src/internals/TRPCUntypedClient.ts",
-      "size": 2299,
-      "origSize": 4207,
+      "size": 2372,
+      "origSize": 4306,
       "renderedExports": [
         "TRPCUntypedClient"
       ],
@@ -113,8 +126,8 @@
         "/src/createTRPCUntypedClient.ts",
         "/src/createTRPCClient.ts"
       ],
-      "percent": 4.9,
-      "reduction": 45.35
+      "percent": 4.68,
+      "reduction": 44.91
     },
     {
       "id": "/src/TRPCClientError.ts",
@@ -130,10 +143,11 @@
         "/src/links/httpLink.ts",
         "/src/links/wsLink.ts",
         "/src/links/httpBatchStreamLink.ts",
+        "/src/links/httpSubscriptionLink.ts",
         "/src/internals/TRPCUntypedClient.ts",
         "/src/links/internals/httpUtils.ts"
       ],
-      "percent": 3.97,
+      "percent": 3.68,
       "reduction": 45.71
     },
     {
@@ -150,7 +164,7 @@
       "dependents": [
         "/src/index.ts"
       ],
-      "percent": 2.53,
+      "percent": 2.34,
       "reduction": 73.19
     },
     {
@@ -165,7 +179,7 @@
         "/src/links/splitLink.ts",
         "/src/internals/TRPCUntypedClient.ts"
       ],
-      "percent": 1.47,
+      "percent": 1.36,
       "reduction": 32.75
     },
     {
@@ -177,7 +191,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 1.3,
+      "percent": 1.2,
       "reduction": 44.95
     },
     {
@@ -191,7 +205,7 @@
       "dependents": [
         "/src/unstable-internals.ts"
       ],
-      "percent": 1.2,
+      "percent": 1.11,
       "reduction": 66.75
     },
     {
@@ -206,7 +220,7 @@
         "/src/index.ts",
         "/src/links/internals/httpUtils.ts"
       ],
-      "percent": 0.91,
+      "percent": 0.84,
       "reduction": 33.54
     },
     {
@@ -220,7 +234,7 @@
       "dependents": [
         "/src/links/internals/httpUtils.ts"
       ],
-      "percent": 0.84,
+      "percent": 0.78,
       "reduction": 30.4
     },
     {
@@ -234,7 +248,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 0.7,
+      "percent": 0.65,
       "reduction": 15.17
     },
     {
@@ -248,7 +262,7 @@
       "dependents": [
         "/src/index.ts"
       ],
-      "percent": 0.21,
+      "percent": 0.2,
       "reduction": 82.58
     },
     {
@@ -269,11 +283,12 @@
       "removedExports": [],
       "dependents": [
         "/src/links/wsLink.ts",
+        "/src/links/httpSubscriptionLink.ts",
         "/src/links/internals/httpUtils.ts"
       ],
       "percent": 0,
       "reduction": 100
     }
   ],
-  "moduleCount": 19
+  "moduleCount": 20
 }

package/dist/index.js

@@ -11,6 +11,7 @@ var httpLink = require('./links/httpLink.js');
 var loggerLink = require('./links/loggerLink.js');
 var splitLink = require('./links/splitLink.js');
 var wsLink = require('./links/wsLink.js');
+var httpSubscriptionLink = require('./links/httpSubscriptionLink.js');
 var TRPCUntypedClient = require('./internals/TRPCUntypedClient.js');
 
 
@@ -33,4 +34,5 @@ exports.loggerLink = loggerLink.loggerLink;
 exports.splitLink = splitLink.splitLink;
 exports.createWSClient = wsLink.createWSClient;
 exports.wsLink = wsLink.wsLink;
+exports.unstable_httpSubscriptionLink = httpSubscriptionLink.unstable_httpSubscriptionLink;
 exports.TRPCUntypedClient = TRPCUntypedClient.TRPCUntypedClient;

package/dist/index.mjs

@@ -9,4 +9,5 @@ export { httpLink } from './links/httpLink.mjs';
 export { loggerLink } from './links/loggerLink.mjs';
 export { splitLink } from './links/splitLink.mjs';
 export { createWSClient, wsLink } from './links/wsLink.mjs';
+export { unstable_httpSubscriptionLink } from './links/httpSubscriptionLink.mjs';
 export { TRPCUntypedClient } from './internals/TRPCUntypedClient.mjs';

package/dist/internals/TRPCUntypedClient.d.ts

@@ -10,7 +10,9 @@ export interface TRPCRequestOptions {
     signal?: AbortSignal;
 }
 export interface TRPCSubscriptionObserver<TValue, TError> {
-    onStarted: () => void;
+    onStarted: (opts: {
+        context: OperationContext | undefined;
+    }) => void;
     onData: (value: TValue) => void;
     onError: (err: TError) => void;
     onStopped: () => void;

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

@@ -1 +1 @@
-{"version":3,"file":"TRPCUntypedClient.d.ts","sourceRoot":"","sources":["../../src/internals/TRPCUntypedClient.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,cAAc,EACf,MAAM,yBAAyB,CAAC;AAEjC,OAAO,KAAK,EACV,SAAS,EACT,qBAAqB,EACrB,SAAS,EACV,MAAM,0CAA0C,CAAC;AAElD,OAAO,KAAK,EACV,gBAAgB,EAEhB,iBAAiB,EACjB,QAAQ,EACT,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAGrD,MAAM,WAAW,kBAAkB;IACjC;;OAEG;IACH,OAAO,CAAC,EAAE,gBAAgB,CAAC;IAC3B,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AAED,MAAM,WAAW,wBAAwB,CAAC,MAAM,EAAE,MAAM;IACtD,SAAS,EAAE,MAAM,IAAI,CAAC;IACtB,MAAM,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAChC,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/B,SAAS,EAAE,MAAM,IAAI,CAAC;IACtB,UAAU,EAAE,MAAM,IAAI,CAAC;CACxB;AAED,gBAAgB;AAChB,MAAM,MAAM,uBAAuB,CAAC,OAAO,SAAS,qBAAqB,IAAI;IAC3E,KAAK,EAAE,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;IAC3B,WAAW,CAAC,EAAE,SAAS,CAAC,qEAAqE,CAAC,CAAC;CAChG,CAAC;AAEF,gBAAgB;AAChB,MAAM,MAAM,uBAAuB,GAC/B,UAAU,GACV,OAAO,GACP,UAAU,GACV,OAAO,GACP,kBAAkB,GAClB,WAAW,GACX,SAAS,GACT,cAAc,CAAC;AAEnB,qBAAa,iBAAiB,CAAC,OAAO,SAAS,SAAS;IACtD,OAAO,CAAC,QAAQ,CAAC,KAAK,CAA6B;IACnD,SAAgB,OAAO,EAAE,iBAAiB,CAAC;IAC3C,OAAO,CAAC,SAAS,CAAS;gBAEd,IAAI,EAAE,uBAAuB,CAAC,OAAO,CAAC;IASlD,OAAO,CAAC,QAAQ;IAuBhB,OAAO,CAAC,gBAAgB;IAyBjB,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,kBAAkB;IAS9D,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,kBAAkB;IASjE,YAAY,CACjB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,OAAO,EACd,IAAI,EAAE,OAAO,CACX,wBAAwB,CAAC,OAAO,EAAE,eAAe,CAAC,SAAS,CAAC,CAAC,CAC9D,GACC,kBAAkB,GACnB,cAAc;CAyBlB"}
+{"version":3,"file":"TRPCUntypedClient.d.ts","sourceRoot":"","sources":["../../src/internals/TRPCUntypedClient.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,cAAc,EACf,MAAM,yBAAyB,CAAC;AAEjC,OAAO,KAAK,EACV,SAAS,EACT,qBAAqB,EACrB,SAAS,EACV,MAAM,0CAA0C,CAAC;AAElD,OAAO,KAAK,EACV,gBAAgB,EAEhB,iBAAiB,EACjB,QAAQ,EACT,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAGrD,MAAM,WAAW,kBAAkB;IACjC;;OAEG;IACH,OAAO,CAAC,EAAE,gBAAgB,CAAC;IAC3B,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AAED,MAAM,WAAW,wBAAwB,CAAC,MAAM,EAAE,MAAM;IACtD,SAAS,EAAE,CAAC,IAAI,EAAE;QAAE,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAAA;KAAE,KAAK,IAAI,CAAC;IACrE,MAAM,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAChC,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/B,SAAS,EAAE,MAAM,IAAI,CAAC;IACtB,UAAU,EAAE,MAAM,IAAI,CAAC;CACxB;AAED,gBAAgB;AAChB,MAAM,MAAM,uBAAuB,CAAC,OAAO,SAAS,qBAAqB,IAAI;IAC3E,KAAK,EAAE,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;IAC3B,WAAW,CAAC,EAAE,SAAS,CAAC,qEAAqE,CAAC,CAAC;CAChG,CAAC;AAEF,gBAAgB;AAChB,MAAM,MAAM,uBAAuB,GAC/B,UAAU,GACV,OAAO,GACP,UAAU,GACV,OAAO,GACP,kBAAkB,GAClB,WAAW,GACX,SAAS,GACT,cAAc,CAAC;AAEnB,qBAAa,iBAAiB,CAAC,OAAO,SAAS,SAAS;IACtD,OAAO,CAAC,QAAQ,CAAC,KAAK,CAA6B;IACnD,SAAgB,OAAO,EAAE,iBAAiB,CAAC;IAC3C,OAAO,CAAC,SAAS,CAAS;gBAEd,IAAI,EAAE,uBAAuB,CAAC,OAAO,CAAC;IASlD,OAAO,CAAC,QAAQ;IAuBhB,OAAO,CAAC,gBAAgB;IAyBjB,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,kBAAkB;IAS9D,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,kBAAkB;IASjE,YAAY,CACjB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,OAAO,EACd,IAAI,EAAE,OAAO,CACX,wBAAwB,CAAC,OAAO,EAAE,eAAe,CAAC,SAAS,CAAC,CAAC,CAC9D,GACC,kBAAkB,GACnB,cAAc;CA2BlB"}

package/dist/internals/TRPCUntypedClient.js

@@ -59,7 +59,9 @@ class TRPCUntypedClient {
         return observable$.subscribe({
             next (envelope) {
                 if (envelope.result.type === 'started') {
-                    opts.onStarted?.();
+                    opts.onStarted?.({
+                        context: envelope.context
+                    });
                 } else if (envelope.result.type === 'stopped') {
                     opts.onStopped?.();
                 } else {

package/dist/internals/TRPCUntypedClient.mjs

@@ -57,7 +57,9 @@ class TRPCUntypedClient {
         return observable$.subscribe({
             next (envelope) {
                 if (envelope.result.type === 'started') {
-                    opts.onStarted?.();
+                    opts.onStarted?.({
+                        context: envelope.context
+                    });
                 } else if (envelope.result.type === 'stopped') {
                     opts.onStopped?.();
                 } else {

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

@@ -1 +1 @@
-{"version":3,"file":"dataLoader.d.ts","sourceRoot":"","sources":["../../src/internals/dataLoader.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAajE,MAAM,MAAM,WAAW,CAAC,IAAI,EAAE,MAAM,IAAI;IACtC,QAAQ,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,OAAO,CAAC;IACpC,KAAK,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK;QACvB,OAAO,EAAE,OAAO,CAAC,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAC/C,MAAM,EAAE,QAAQ,CAAC;KAClB,CAAC;CACH,CAAC;AAWF;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,EACrC,WAAW,EAAE,WAAW,CAAC,IAAI,EAAE,MAAM,CAAC;gBA0GnB,IAAI,KAAG,iBAAiB,MAAM,CAAC;EAsCnD"}
+{"version":3,"file":"dataLoader.d.ts","sourceRoot":"","sources":["../../src/internals/dataLoader.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAajE,MAAM,MAAM,WAAW,CAAC,IAAI,EAAE,MAAM,IAAI;IACtC,QAAQ,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,OAAO,CAAC;IACpC,KAAK,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK;QACvB,OAAO,EAAE,OAAO,CAAC,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAC/C,MAAM,EAAE,QAAQ,CAAC;KAClB,CAAC;CACH,CAAC;AAWF;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,EACrC,WAAW,EAAE,WAAW,CAAC,IAAI,EAAE,MAAM,CAAC;gBA0GnB,IAAI,KAAG,gBAAgB,CAAC,MAAM,CAAC;EAsCnD"}

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,KAAK,EAAE,SAAS,EAAiB,MAAM,cAAc,CAAC;AAO7D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAOnE,OAAO,KAAK,EAAa,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEnD;;GAEG;AACH,wBAAgB,aAAa,CAAC,OAAO,SAAS,SAAS,EACrD,IAAI,EAAE,oBAAoB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,CAAC,GAC/D,QAAQ,CAAC,OAAO,CAAC,CAmHnB"}
+{"version":3,"file":"httpBatchLink.d.ts","sourceRoot":"","sources":["../../src/links/httpBatchLink.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAiB,MAAM,cAAc,CAAC;AAO7D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAOnE,OAAO,KAAK,EAAa,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEnD;;GAEG;AACH,wBAAgB,aAAa,CAAC,OAAO,SAAS,SAAS,EACrD,IAAI,EAAE,oBAAoB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,CAAC,GAC/D,QAAQ,CAAC,OAAO,CAAC,CAsHnB"}

package/dist/links/httpBatchLink.js

@@ -65,14 +65,15 @@ var httpUtils = require('./internals/httpUtils.js');
         };
         const query = dataLoader.dataLoader(batchLoader('query'));
         const mutation = dataLoader.dataLoader(batchLoader('mutation'));
-        const subscription = dataLoader.dataLoader(batchLoader('subscription'));
         const loaders = {
             query,
-            subscription,
             mutation
         };
         return ({ op  })=>{
             return observable.observable((observer)=>{
+                /* istanbul ignore if -- @preserve */ if (op.type === 'subscription') {
+                    throw new Error('Subscriptions are unsupported by `httpLink` - use `httpSubscriptionLink` or `wsLink`');
+                }
                 const loader = loaders[op.type];
                 const { promise , cancel  } = loader.load(op);
                 let _res = undefined;

package/dist/links/httpBatchLink.mjs

@@ -63,14 +63,15 @@ import { resolveHTTPLinkOptions, getUrl, jsonHttpRequester } from './internals/h
         };
         const query = dataLoader(batchLoader('query'));
         const mutation = dataLoader(batchLoader('mutation'));
-        const subscription = dataLoader(batchLoader('subscription'));
         const loaders = {
             query,
-            subscription,
             mutation
         };
         return ({ op  })=>{
             return observable((observer)=>{
+                /* istanbul ignore if -- @preserve */ if (op.type === 'subscription') {
+                    throw new Error('Subscriptions are unsupported by `httpLink` - use `httpSubscriptionLink` or `wsLink`');
+                }
                 const loader = loaders[op.type];
                 const { promise , cancel  } = loader.load(op);
                 let _res = undefined;

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

@@ -1 +1 @@
-{"version":3,"file":"httpBatchStreamLink.d.ts","sourceRoot":"","sources":["../../src/links/httpBatchStreamLink.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAiB,MAAM,cAAc,CAAC;AAG7D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0CAA0C,CAAC;AAM7E,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAQnE,OAAO,KAAK,EAAa,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEnD,MAAM,MAAM,0BAA0B,CAAC,KAAK,SAAS,YAAY,IAC/D,oBAAoB,CAAC,KAAK,CAAC,GAAG;IAC5B;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEJ;;GAEG;AACH,wBAAgB,4BAA4B,CAAC,OAAO,SAAS,SAAS,EACpE,IAAI,EAAE,0BAA0B,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,CAAC,GACrE,QAAQ,CAAC,OAAO,CAAC,CAkKnB"}
+{"version":3,"file":"httpBatchStreamLink.d.ts","sourceRoot":"","sources":["../../src/links/httpBatchStreamLink.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAiB,MAAM,cAAc,CAAC;AAG7D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0CAA0C,CAAC;AAM7E,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAQnE,OAAO,KAAK,EAAa,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEnD,MAAM,MAAM,0BAA0B,CAAC,KAAK,SAAS,YAAY,IAC/D,oBAAoB,CAAC,KAAK,CAAC,GAAG;IAC5B;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEJ;;GAEG;AACH,wBAAgB,4BAA4B,CAAC,OAAO,SAAS,SAAS,EACpE,IAAI,EAAE,0BAA0B,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,CAAC,GACrE,QAAQ,CAAC,OAAO,CAAC,CAqKnB"}

package/dist/links/httpBatchStreamLink.js

@@ -60,10 +60,8 @@ var httpUtils = require('./internals/httpUtils.js');
                     }, ac);
                     return {
                         promise: responsePromise.then(async (res)=>{
-                            if (!res.body) {
-                                throw new Error('Received response without body');
-                            }
                             const [head] = await unstableCoreDoNotImport.jsonlStreamConsumer({
+                                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
                                 from: res.body,
                                 deserialize: resolvedOpts.transformer.output.deserialize,
                                 // onError: console.error,
@@ -75,7 +73,7 @@ var httpUtils = require('./internals/httpUtils.js');
                                 }
                             });
                             const promises = Object.keys(batchOps).map(async (key)=>{
-                                let json = await head[key];
+                                let json = await Promise.resolve(head[key]);
                                 if ('result' in json) {
                                     /**
                      * Not very pretty, but we need to unwrap nested data as promises
@@ -105,14 +103,15 @@ var httpUtils = require('./internals/httpUtils.js');
         };
         const query = dataLoader.dataLoader(batchLoader('query'));
         const mutation = dataLoader.dataLoader(batchLoader('mutation'));
-        const subscription = dataLoader.dataLoader(batchLoader('subscription'));
         const loaders = {
             query,
-            subscription,
             mutation
         };
         return ({ op  })=>{
             return observable.observable((observer)=>{
+                /* istanbul ignore if -- @preserve */ if (op.type === 'subscription') {
+                    throw new Error('Subscriptions are unsupported by `httpLink` - use `httpSubscriptionLink` or `wsLink`');
+                }
                 const loader = loaders[op.type];
                 const { promise , cancel  } = loader.load(op);
                 let _res = undefined;

package/dist/links/httpBatchStreamLink.mjs

@@ -58,10 +58,8 @@ import { resolveHTTPLinkOptions, getUrl, fetchHTTPResponse, getBody } from './in
                     }, ac);
                     return {
                         promise: responsePromise.then(async (res)=>{
-                            if (!res.body) {
-                                throw new Error('Received response without body');
-                            }
                             const [head] = await jsonlStreamConsumer({
+                                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
                                 from: res.body,
                                 deserialize: resolvedOpts.transformer.output.deserialize,
                                 // onError: console.error,
@@ -73,7 +71,7 @@ import { resolveHTTPLinkOptions, getUrl, fetchHTTPResponse, getBody } from './in
                                 }
                             });
                             const promises = Object.keys(batchOps).map(async (key)=>{
-                                let json = await head[key];
+                                let json = await Promise.resolve(head[key]);
                                 if ('result' in json) {
                                     /**
                      * Not very pretty, but we need to unwrap nested data as promises
@@ -103,14 +101,15 @@ import { resolveHTTPLinkOptions, getUrl, fetchHTTPResponse, getBody } from './in
         };
         const query = dataLoader(batchLoader('query'));
         const mutation = dataLoader(batchLoader('mutation'));
-        const subscription = dataLoader(batchLoader('subscription'));
         const loaders = {
             query,
-            subscription,
             mutation
         };
         return ({ op  })=>{
             return observable((observer)=>{
+                /* istanbul ignore if -- @preserve */ if (op.type === 'subscription') {
+                    throw new Error('Subscriptions are unsupported by `httpLink` - use `httpSubscriptionLink` or `wsLink`');
+                }
                 const loader = loaders[op.type];
                 const { promise , cancel  } = loader.load(op);
                 let _res = undefined;

package/dist/links/httpLink.d.ts

@@ -1,7 +1,7 @@
-import type { AnyRootTypes, AnyRouter } from '@trpc/server/unstable-core-do-not-import';
+import type { AnyClientTypes, AnyRouter } from '@trpc/server/unstable-core-do-not-import';
 import type { HTTPLinkBaseOptions } from './internals/httpUtils';
 import { type HTTPHeaders, type Operation, type TRPCLink } from './types';
-export type HTTPLinkOptions<TRoot extends AnyRootTypes> = HTTPLinkBaseOptions<TRoot> & {
+export type HTTPLinkOptions<TRoot extends AnyClientTypes> = HTTPLinkBaseOptions<TRoot> & {
     /**
      * Headers to be set on outgoing requests or a callback that of said headers
      * @link http://trpc.io/docs/client/headers

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

@@ -1 +1 @@
-{"version":3,"file":"httpLink.d.ts","sourceRoot":"","sources":["../../src/links/httpLink.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,YAAY,EACZ,SAAS,EACV,MAAM,0CAA0C,CAAC;AAGlD,OAAO,KAAK,EACV,mBAAmB,EAGpB,MAAM,uBAAuB,CAAC;AAQ/B,OAAO,EAGL,KAAK,WAAW,EAChB,KAAK,SAAS,EACd,KAAK,QAAQ,EACd,MAAM,SAAS,CAAC;AAEjB,MAAM,MAAM,eAAe,CAAC,KAAK,SAAS,YAAY,IACpD,mBAAmB,CAAC,KAAK,CAAC,GAAG;IAC3B;;;OAGG;IACH,OAAO,CAAC,EACJ,WAAW,GACX,CAAC,CAAC,IAAI,EAAE;QAAE,EAAE,EAAE,SAAS,CAAA;KAAE,KAAK,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC;CACvE,CAAC;AAmCJ;;GAEG;AACH,wBAAgB,QAAQ,CAAC,OAAO,SAAS,SAAS,GAAG,SAAS,EAC5D,IAAI,EAAE,eAAe,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,CAAC,GAC1D,QAAQ,CAAC,OAAO,CAAC,CAyDnB"}
+{"version":3,"file":"httpLink.d.ts","sourceRoot":"","sources":["../../src/links/httpLink.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,cAAc,EACd,SAAS,EACV,MAAM,0CAA0C,CAAC;AAGlD,OAAO,KAAK,EACV,mBAAmB,EAGpB,MAAM,uBAAuB,CAAC;AAQ/B,OAAO,EAGL,KAAK,WAAW,EAChB,KAAK,SAAS,EACd,KAAK,QAAQ,EACd,MAAM,SAAS,CAAC;AAEjB,MAAM,MAAM,eAAe,CAAC,KAAK,SAAS,cAAc,IACtD,mBAAmB,CAAC,KAAK,CAAC,GAAG;IAC3B;;;OAGG;IACH,OAAO,CAAC,EACJ,WAAW,GACX,CAAC,CAAC,IAAI,EAAE;QAAE,EAAE,EAAE,SAAS,CAAA;KAAE,KAAK,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC;CACvE,CAAC;AAmCJ;;GAEG;AACH,wBAAgB,QAAQ,CAAC,OAAO,SAAS,SAAS,GAAG,SAAS,EAC5D,IAAI,EAAE,eAAe,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,CAAC,GAC1D,QAAQ,CAAC,OAAO,CAAC,CA+DnB"}

package/dist/links/httpLink.js

@@ -41,6 +41,9 @@ const universalRequester = (opts)=>{
         return ({ op  })=>{
             return observable.observable((observer)=>{
                 const { path , input , type  } = op;
+                /* istanbul ignore if -- @preserve */ if (type === 'subscription') {
+                    throw new Error('Subscriptions are unsupported by `httpLink` - use `httpSubscriptionLink` or `wsLink`');
+                }
                 const request = universalRequester({
                     ...resolvedOpts,
                     type,

package/dist/links/httpLink.mjs

@@ -39,6 +39,9 @@ const universalRequester = (opts)=>{
         return ({ op  })=>{
             return observable((observer)=>{
                 const { path , input , type  } = op;
+                /* istanbul ignore if -- @preserve */ if (type === 'subscription') {
+                    throw new Error('Subscriptions are unsupported by `httpLink` - use `httpSubscriptionLink` or `wsLink`');
+                }
                 const request = universalRequester({
                     ...resolvedOpts,
                     type,

package/dist/links/httpSubscriptionLink.d.ts

@@ -0,0 +1,19 @@
+import type { AnyClientTypes, inferClientTypes, InferrableClientTypes, MaybePromise } from '@trpc/server/unstable-core-do-not-import';
+import { type TransformerOptions } from '../unstable-internals';
+import type { TRPCLink } from './types';
+type HTTPSubscriptionLinkOptions<TRoot extends AnyClientTypes> = {
+    /**
+     * The URL to connect to (can be a function that returns a URL)
+     */
+    url: string | (() => MaybePromise<string>);
+    /**
+     * EventSource options
+     */
+    eventSourceOptions?: EventSourceInit;
+} & TransformerOptions<TRoot>;
+/**
+ * @see https://trpc.io/docs/client/links/httpSubscriptionLink
+ */
+export declare function unstable_httpSubscriptionLink<TInferrable extends InferrableClientTypes>(opts: HTTPSubscriptionLinkOptions<inferClientTypes<TInferrable>>): TRPCLink<TInferrable>;
+export {};
+//# sourceMappingURL=httpSubscriptionLink.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"httpSubscriptionLink.d.ts","sourceRoot":"","sources":["../../src/links/httpSubscriptionLink.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,cAAc,EACd,gBAAgB,EAChB,qBAAqB,EACrB,YAAY,EAEb,MAAM,0CAA0C,CAAC;AAMlD,OAAO,EAAkB,KAAK,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAEhF,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAExC,KAAK,2BAA2B,CAAC,KAAK,SAAS,cAAc,IAAI;IAC/D;;OAEG;IACH,GAAG,EAAE,MAAM,GAAG,CAAC,MAAM,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC;IAC3C;;OAEG;IACH,kBAAkB,CAAC,EAAE,eAAe,CAAC;CACtC,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC;AAS9B;;GAEG;AACH,wBAAgB,6BAA6B,CAC3C,WAAW,SAAS,qBAAqB,EAEzC,IAAI,EAAE,2BAA2B,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC,GAC/D,QAAQ,CAAC,WAAW,CAAC,CA8EvB"}

package/dist/links/httpSubscriptionLink.js

@@ -0,0 +1,87 @@
+'use strict';
+
+var observable = require('@trpc/server/observable');
+var unstableCoreDoNotImport = require('@trpc/server/unstable-core-do-not-import');
+var TRPCClientError = require('../TRPCClientError.js');
+var transformer = require('../internals/transformer.js');
+var httpUtils = require('./internals/httpUtils.js');
+
+/**
+ * Get the result of a value or function that returns a value
+ */ const resultOf = (value)=>{
+    return typeof value === 'function' ? value() : value;
+};
+/**
+ * @see https://trpc.io/docs/client/links/httpSubscriptionLink
+ */ function unstable_httpSubscriptionLink(opts) {
+    const transformer$1 = transformer.getTransformer(opts.transformer);
+    return ()=>{
+        return ({ op  })=>{
+            return observable.observable((observer)=>{
+                const { type , path , input  } = op;
+                /* istanbul ignore if -- @preserve */ if (type !== 'subscription') {
+                    throw new Error('httpSubscriptionLink only supports subscriptions');
+                }
+                let eventSource = null;
+                let unsubscribed = false;
+                unstableCoreDoNotImport.run(async ()=>{
+                    const url = httpUtils.getUrl({
+                        transformer: transformer$1,
+                        url: await resultOf(opts.url),
+                        input,
+                        path,
+                        type,
+                        AbortController: null
+                    });
+                    /* istanbul ignore if -- @preserve */ if (unsubscribed) {
+                        // already unsubscribed - rare race condition
+                        return;
+                    }
+                    eventSource = new EventSource(url, opts.eventSourceOptions);
+                    const onStarted = ()=>{
+                        observer.next({
+                            result: {
+                                type: 'started'
+                            },
+                            context: {
+                                eventSource
+                            }
+                        });
+                        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                        eventSource.removeEventListener('open', onStarted);
+                    };
+                    // console.log('starting', new Date());
+                    eventSource.addEventListener('open', onStarted);
+                    const iterable = unstableCoreDoNotImport.sseStreamConsumer({
+                        from: eventSource,
+                        deserialize: transformer$1.input.deserialize
+                    });
+                    for await (const chunk of iterable){
+                        // if the `sse({})`-helper is used, we always have an `id` field
+                        const data = 'id' in chunk ? chunk : chunk.data;
+                        observer.next({
+                            result: {
+                                data
+                            }
+                        });
+                    }
+                    observer.next({
+                        result: {
+                            type: 'stopped'
+                        }
+                    });
+                    observer.complete();
+                }).catch((error)=>{
+                    observer.error(TRPCClientError.TRPCClientError.from(error));
+                });
+                return ()=>{
+                    observer.complete();
+                    eventSource?.close();
+                    unsubscribed = true;
+                };
+            });
+        };
+    };
+}
+
+exports.unstable_httpSubscriptionLink = unstable_httpSubscriptionLink;

package/dist/links/httpSubscriptionLink.mjs

@@ -0,0 +1,85 @@
+import { observable } from '@trpc/server/observable';
+import { run, sseStreamConsumer } from '@trpc/server/unstable-core-do-not-import';
+import { TRPCClientError } from '../TRPCClientError.mjs';
+import { getTransformer } from '../internals/transformer.mjs';
+import { getUrl } from './internals/httpUtils.mjs';
+
+/**
+ * Get the result of a value or function that returns a value
+ */ const resultOf = (value)=>{
+    return typeof value === 'function' ? value() : value;
+};
+/**
+ * @see https://trpc.io/docs/client/links/httpSubscriptionLink
+ */ function unstable_httpSubscriptionLink(opts) {
+    const transformer = getTransformer(opts.transformer);
+    return ()=>{
+        return ({ op  })=>{
+            return observable((observer)=>{
+                const { type , path , input  } = op;
+                /* istanbul ignore if -- @preserve */ if (type !== 'subscription') {
+                    throw new Error('httpSubscriptionLink only supports subscriptions');
+                }
+                let eventSource = null;
+                let unsubscribed = false;
+                run(async ()=>{
+                    const url = getUrl({
+                        transformer,
+                        url: await resultOf(opts.url),
+                        input,
+                        path,
+                        type,
+                        AbortController: null
+                    });
+                    /* istanbul ignore if -- @preserve */ if (unsubscribed) {
+                        // already unsubscribed - rare race condition
+                        return;
+                    }
+                    eventSource = new EventSource(url, opts.eventSourceOptions);
+                    const onStarted = ()=>{
+                        observer.next({
+                            result: {
+                                type: 'started'
+                            },
+                            context: {
+                                eventSource
+                            }
+                        });
+                        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                        eventSource.removeEventListener('open', onStarted);
+                    };
+                    // console.log('starting', new Date());
+                    eventSource.addEventListener('open', onStarted);
+                    const iterable = sseStreamConsumer({
+                        from: eventSource,
+                        deserialize: transformer.input.deserialize
+                    });
+                    for await (const chunk of iterable){
+                        // if the `sse({})`-helper is used, we always have an `id` field
+                        const data = 'id' in chunk ? chunk : chunk.data;
+                        observer.next({
+                            result: {
+                                data
+                            }
+                        });
+                    }
+                    observer.next({
+                        result: {
+                            type: 'stopped'
+                        }
+                    });
+                    observer.complete();
+                }).catch((error)=>{
+                    observer.error(TRPCClientError.from(error));
+                });
+                return ()=>{
+                    observer.complete();
+                    eventSource?.close();
+                    unsubscribed = true;
+                };
+            });
+        };
+    };
+}
+
+export { unstable_httpSubscriptionLink };

package/dist/links/internals/contentTypes.d.ts

@@ -1,4 +1,4 @@
-export declare function isOctetType(input: unknown): boolean;
-export declare function isFormData(input: unknown): boolean;
-export declare function isNonJsonSerializable(input: unknown): boolean;
+export declare function isOctetType(input: unknown): input is Uint8Array | Blob;
+export declare function isFormData(input: unknown): input is FormData;
+export declare function isNonJsonSerializable(input: unknown): input is Uint8Array | Blob | FormData;
 //# sourceMappingURL=contentTypes.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"contentTypes.d.ts","sourceRoot":"","sources":["../../../src/links/internals/contentTypes.ts"],"names":[],"mappings":"AAAA,wBAAgB,WAAW,CAAC,KAAK,EAAE,OAAO,WAMzC;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,OAAO,WAExC;AAED,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,OAAO,WAEnD"}
+{"version":3,"file":"contentTypes.d.ts","sourceRoot":"","sources":["../../../src/links/internals/contentTypes.ts"],"names":[],"mappings":"AAAA,wBAAgB,WAAW,CAAC,KAAK,EAAE,OAAO,8BAMzC;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,OAAO,qBAExC;AAED,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,OAAO,yCAEnD"}

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

@@ -1,11 +1,11 @@
-import type { AnyRootTypes, CombinedDataTransformer, ProcedureType, TRPCResponse } from '@trpc/server/unstable-core-do-not-import';
+import type { AnyClientTypes, CombinedDataTransformer, ProcedureType, TRPCAcceptHeader, TRPCResponse } from '@trpc/server/unstable-core-do-not-import';
 import type { AbortControllerEsque, AbortControllerInstanceEsque, FetchEsque, RequestInitEsque, ResponseEsque } from '../../internals/types';
 import type { TransformerOptions } from '../../unstable-internals';
 import type { HTTPHeaders, PromiseAndCancel } from '../types';
 /**
  * @internal
  */
-export type HTTPLinkBaseOptions<TRoot extends Pick<AnyRootTypes, 'transformer'>> = {
+export type HTTPLinkBaseOptions<TRoot extends Pick<AnyClientTypes, 'transformer'>> = {
     url: string | URL;
     /**
      * Add ponyfill for fetch
@@ -29,7 +29,7 @@ export interface ResolvedHTTPLinkOptions {
     transformer: CombinedDataTransformer;
     methodOverride?: 'POST';
 }
-export declare function resolveHTTPLinkOptions(opts: HTTPLinkBaseOptions<AnyRootTypes>): ResolvedHTTPLinkOptions;
+export declare function resolveHTTPLinkOptions(opts: HTTPLinkBaseOptions<AnyClientTypes>): ResolvedHTTPLinkOptions;
 export interface HTTPResult {
     json: TRPCResponse;
     meta: {
@@ -52,7 +52,7 @@ export type HTTPBaseRequestOptions = GetInputOptions & ResolvedHTTPLinkOptions &
 type GetUrl = (opts: HTTPBaseRequestOptions) => string;
 type GetBody = (opts: HTTPBaseRequestOptions) => RequestInitEsque['body'];
 export type ContentOptions = {
-    trpcAcceptHeader?: 'application/jsonl';
+    trpcAcceptHeader?: TRPCAcceptHeader;
     contentTypeHeader?: string;
     getUrl: GetUrl;
     getBody: GetBody;

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

@@ -1 +1 @@
-{"version":3,"file":"httpUtils.d.ts","sourceRoot":"","sources":["../../../src/links/internals/httpUtils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"httpUtils.d.ts","sourceRoot":"","sources":["../../../src/links/internals/httpUtils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,cAAc,EACd,uBAAuB,EACvB,aAAa,EACb,gBAAgB,EAChB,YAAY,EACb,MAAM,0CAA0C,CAAC;AAGlD,OAAO,KAAK,EACV,oBAAoB,EACpB,4BAA4B,EAC5B,UAAU,EACV,gBAAgB,EAChB,aAAa,EACd,MAAM,uBAAuB,CAAC;AAE/B,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAEnE,OAAO,KAAK,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAE9D;;GAEG;AACH,MAAM,MAAM,mBAAmB,CAC7B,KAAK,SAAS,IAAI,CAAC,cAAc,EAAE,aAAa,CAAC,IAC/C;IACF,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;IAClB;;OAEG;IACH,KAAK,CAAC,EAAE,UAAU,CAAC;IACnB;;OAEG;IACH,eAAe,CAAC,EAAE,oBAAoB,GAAG,IAAI,CAAC;IAC9C;;;;OAIG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC;AAE9B,MAAM,WAAW,uBAAuB;IACtC,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,CAAC,EAAE,UAAU,CAAC;IACnB,eAAe,EAAE,oBAAoB,GAAG,IAAI,CAAC;IAC7C,WAAW,EAAE,uBAAuB,CAAC;IACrC,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,mBAAmB,CAAC,cAAc,CAAC,GACxC,uBAAuB,CAQzB;AAkBD,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,YAAY,CAAC;IACnB,IAAI,EAAE;QACJ,QAAQ,EAAE,aAAa,CAAC;QACxB,YAAY,CAAC,EAAE,OAAO,CAAC;KACxB,CAAC;CACH;AAED,KAAK,eAAe,GAAG;IACrB,WAAW,EAAE,uBAAuB,CAAC;CACtC,GAAG,CAAC;IAAE,KAAK,EAAE,OAAO,CAAA;CAAE,GAAG;IAAE,MAAM,EAAE,OAAO,EAAE,CAAA;CAAE,CAAC,CAAC;AAEjD,wBAAgB,QAAQ,CAAC,IAAI,EAAE,eAAe,OAM7C;AAED,MAAM,MAAM,sBAAsB,GAAG,eAAe,GAClD,uBAAuB,GAAG;IACxB,IAAI,EAAE,aAAa,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEJ,KAAK,MAAM,GAAG,CAAC,IAAI,EAAE,sBAAsB,KAAK,MAAM,CAAC;AACvD,KAAK,OAAO,GAAG,CAAC,IAAI,EAAE,sBAAsB,KAAK,gBAAgB,CAAC,MAAM,CAAC,CAAC;AAE1E,MAAM,MAAM,cAAc,GAAG;IAC3B,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,eAAO,MAAM,MAAM,EAAE,MAiBpB,CAAC;AAEF,eAAO,MAAM,OAAO,EAAE,OAMrB,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG,CACtB,IAAI,EAAE,sBAAsB,GAAG;IAC7B,OAAO,EAAE,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;CACnD,KACE,gBAAgB,CAAC,UAAU,CAAC,CAAC;AAElC,eAAO,MAAM,iBAAiB,EAAE,SAO/B,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG,cAAc,GAC7C,sBAAsB,GAAG;IACvB,OAAO,EAAE,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;CACnD,CAAC;AAEJ,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,kBAAkB,EACxB,EAAE,CAAC,EAAE,4BAA4B,GAAG,IAAI,0BA4BzC;AAED,wBAAgB,WAAW,CACzB,IAAI,EAAE,kBAAkB,GACvB,gBAAgB,CAAC,UAAU,CAAC,CA8B9B"}

package/dist/links/internals/httpUtils.js

@@ -7,7 +7,7 @@ var transformer = require('../../internals/transformer.js');
 
 function resolveHTTPLinkOptions(opts) {
     return {
-        url: opts.url.toString().replace(/\/$/, ''),
+        url: opts.url.toString(),
         fetch: opts.fetch,
         AbortController: getAbortController.getAbortController(opts.AbortController),
         transformer: transformer.getTransformer(opts.transformer),
@@ -25,18 +25,20 @@ function arrayToDict(array) {
 }
 const METHOD = {
     query: 'GET',
-    mutation: 'POST'
+    mutation: 'POST',
+    subscription: 'PATCH'
 };
 function getInput(opts) {
     return 'input' in opts ? opts.transformer.input.serialize(opts.input) : arrayToDict(opts.inputs.map((_input)=>opts.transformer.input.serialize(_input)));
 }
 const getUrl = (opts)=>{
-    let url = opts.url + '/' + opts.path;
+    const base = opts.url.replace(/\/$/, ''); // Remove any trailing slashes
+    let url = base + '/' + opts.path;
     const queryParts = [];
     if ('inputs' in opts) {
         queryParts.push('batch=1');
     }
-    if (opts.type === 'query') {
+    if (opts.type === 'query' || opts.type === 'subscription') {
         const input = getInput(opts);
         if (input !== undefined && opts.methodOverride !== 'POST') {
             queryParts.push(`input=${encodeURIComponent(JSON.stringify(input))}`);
@@ -73,9 +75,6 @@ async function fetchHTTPResponse(opts, ac) {
         }
         return heads;
     })();
-    /* istanbul ignore if -- @preserve */ if (type === 'subscription') {
-        throw new Error('Subscriptions should use wsLink');
-    }
     const headers = {
         ...opts.contentTypeHeader ? {
             'content-type': opts.contentTypeHeader

package/dist/links/internals/httpUtils.mjs

@@ -5,7 +5,7 @@ import { getTransformer } from '../../internals/transformer.mjs';
 
 function resolveHTTPLinkOptions(opts) {
     return {
-        url: opts.url.toString().replace(/\/$/, ''),
+        url: opts.url.toString(),
         fetch: opts.fetch,
         AbortController: getAbortController(opts.AbortController),
         transformer: getTransformer(opts.transformer),
@@ -23,18 +23,20 @@ function arrayToDict(array) {
 }
 const METHOD = {
     query: 'GET',
-    mutation: 'POST'
+    mutation: 'POST',
+    subscription: 'PATCH'
 };
 function getInput(opts) {
     return 'input' in opts ? opts.transformer.input.serialize(opts.input) : arrayToDict(opts.inputs.map((_input)=>opts.transformer.input.serialize(_input)));
 }
 const getUrl = (opts)=>{
-    let url = opts.url + '/' + opts.path;
+    const base = opts.url.replace(/\/$/, ''); // Remove any trailing slashes
+    let url = base + '/' + opts.path;
     const queryParts = [];
     if ('inputs' in opts) {
         queryParts.push('batch=1');
     }
-    if (opts.type === 'query') {
+    if (opts.type === 'query' || opts.type === 'subscription') {
         const input = getInput(opts);
         if (input !== undefined && opts.methodOverride !== 'POST') {
             queryParts.push(`input=${encodeURIComponent(JSON.stringify(input))}`);
@@ -71,9 +73,6 @@ async function fetchHTTPResponse(opts, ac) {
         }
         return heads;
     })();
-    /* istanbul ignore if -- @preserve */ if (type === 'subscription') {
-        throw new Error('Subscriptions should use wsLink');
-    }
     const headers = {
         ...opts.contentTypeHeader ? {
             'content-type': opts.contentTypeHeader

package/dist/links/loggerLink.d.ts

@@ -1,4 +1,3 @@
-/// <reference lib="dom.iterable" />
 import type { AnyRouter } from '@trpc/server/unstable-core-do-not-import';
 import type { TRPCClientError } from '../TRPCClientError';
 import type { Operation, OperationResultEnvelope, TRPCLink } from './types';

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

@@ -1 +1 @@
-{"version":3,"file":"loggerLink.d.ts","sourceRoot":"","sources":["../../src/links/loggerLink.ts"],"names":[],"mappings":";AAQA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,0CAA0C,CAAC;AAC1E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,KAAK,EAAE,SAAS,EAAE,uBAAuB,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAE5E,KAAK,YAAY,GAAG;IAClB,GAAG,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAC;IAC9B,KAAK,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAC;CACjC,CAAC;AAEF,KAAK,eAAe,CAAC,OAAO,SAAS,SAAS,IAC1C;IACE,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,uBAAuB,CAAC,OAAO,CAAC,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;CACrE,GACD,CAAC,SAAS,GAAG;IACX,SAAS,EAAE,IAAI,CAAC;CACjB,CAAC,CAAC;AACP,KAAK,SAAS,CAAC,OAAO,SAAS,SAAS,IAAI,CAC1C,IAAI,EAAE,eAAe,CAAC,OAAO,CAAC,KAC3B,OAAO,CAAC;AAEb,KAAK,mBAAmB,CAAC,OAAO,SAAS,SAAS,IAAI,SAAS,GAC7D,CACI;IACE;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,uBAAuB,CAAC,OAAO,CAAC,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;IACpE,SAAS,EAAE,MAAM,CAAC;CACnB,GACD;IACE;;OAEG;IACH,SAAS,EAAE,IAAI,CAAC;CACjB,CACJ,CAAC;AAEJ,KAAK,YAAY,CAAC,OAAO,SAAS,SAAS,IAAI,CAC7C,IAAI,EAAE,mBAAmB,CAAC,OAAO,CAAC,KAC/B,IAAI,CAAC;AAEV,KAAK,SAAS,GAAG,MAAM,GAAG,KAAK,GAAG,MAAM,CAAC;AAEzC,MAAM,WAAW,iBAAiB,CAAC,OAAO,SAAS,SAAS;IAC1D,MAAM,CAAC,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC;IAC/B,OAAO,CAAC,EAAE,SAAS,CAAC,OAAO,CAAC,CAAC;IAC7B;;OAEG;IACH,OAAO,CAAC,EAAE,YAAY,CAAC;IACvB;;;OAGG;IACH,SAAS,CAAC,EAAE,SAAS,CAAC;IAEtB;;OAEG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAoID;;GAEG;AACH,wBAAgB,UAAU,CAAC,OAAO,SAAS,SAAS,GAAG,SAAS,EAC9D,IAAI,GAAE,iBAAiB,CAAC,OAAO,CAAM,GACpC,QAAQ,CAAC,OAAO,CAAC,CAgDnB"}
+{"version":3,"file":"loggerLink.d.ts","sourceRoot":"","sources":["../../src/links/loggerLink.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,0CAA0C,CAAC;AAC1E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,KAAK,EAAE,SAAS,EAAE,uBAAuB,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAE5E,KAAK,YAAY,GAAG;IAClB,GAAG,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAC;IAC9B,KAAK,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAC;CACjC,CAAC;AAEF,KAAK,eAAe,CAAC,OAAO,SAAS,SAAS,IAC1C;IACE,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,uBAAuB,CAAC,OAAO,CAAC,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;CACrE,GACD,CAAC,SAAS,GAAG;IACX,SAAS,EAAE,IAAI,CAAC;CACjB,CAAC,CAAC;AACP,KAAK,SAAS,CAAC,OAAO,SAAS,SAAS,IAAI,CAC1C,IAAI,EAAE,eAAe,CAAC,OAAO,CAAC,KAC3B,OAAO,CAAC;AAEb,KAAK,mBAAmB,CAAC,OAAO,SAAS,SAAS,IAAI,SAAS,GAC7D,CACI;IACE;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,uBAAuB,CAAC,OAAO,CAAC,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;IACpE,SAAS,EAAE,MAAM,CAAC;CACnB,GACD;IACE;;OAEG;IACH,SAAS,EAAE,IAAI,CAAC;CACjB,CACJ,CAAC;AAEJ,KAAK,YAAY,CAAC,OAAO,SAAS,SAAS,IAAI,CAC7C,IAAI,EAAE,mBAAmB,CAAC,OAAO,CAAC,KAC/B,IAAI,CAAC;AAEV,KAAK,SAAS,GAAG,MAAM,GAAG,KAAK,GAAG,MAAM,CAAC;AAEzC,MAAM,WAAW,iBAAiB,CAAC,OAAO,SAAS,SAAS;IAC1D,MAAM,CAAC,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC;IAC/B,OAAO,CAAC,EAAE,SAAS,CAAC,OAAO,CAAC,CAAC;IAC7B;;OAEG;IACH,OAAO,CAAC,EAAE,YAAY,CAAC;IACvB;;;OAGG;IACH,SAAS,CAAC,EAAE,SAAS,CAAC;IAEtB;;OAEG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAoID;;GAEG;AACH,wBAAgB,UAAU,CAAC,OAAO,SAAS,SAAS,GAAG,SAAS,EAC9D,IAAI,GAAE,iBAAiB,CAAC,OAAO,CAAM,GACpC,QAAQ,CAAC,OAAO,CAAC,CAgDnB"}

package/dist/links/wsLink.d.ts

@@ -52,14 +52,14 @@ export declare function createWSClient(opts: WebSocketClientOptions): {
     readonly connection: ({
         id: number;
     } & ({
-        state: 'open';
+        state: "open";
         ws: WebSocket;
     } | {
-        state: 'closed';
+        state: "closed";
         ws: WebSocket;
     } | {
-        state: 'connecting';
-        ws?: WebSocket | undefined;
+        state: "connecting";
+        ws?: WebSocket;
     })) | null;
 };
 export type TRPCWebSocketClient = ReturnType<typeof createWSClient>;

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,KAAK,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAEvE,OAAO,KAAK,EACV,SAAS,EACT,gBAAgB,EAChB,gBAAgB,EAChB,YAAY,EAMZ,mBAAmB,EACpB,MAAM,0CAA0C,CAAC;AAElD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAEhE,OAAO,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAInD,KAAK,gBAAgB,CAAC,OAAO,SAAS,SAAS,EAAE,OAAO,IAAI,mBAAmB,CAC7E,OAAO,EACP,gBAAgB,CAAC,OAAO,CAAC,CAC1B,CAAC;AAEF,KAAK,kBAAkB,CAAC,OAAO,SAAS,SAAS,EAAE,OAAO,IAAI,QAAQ,CACpE,gBAAgB,CAAC,OAAO,EAAE,OAAO,CAAC,EAClC,eAAe,CAAC,OAAO,CAAC,CACzB,CAAC;AAEF,QAAA,MAAM,kBAAkB,iBAAkB,MAAM,WACoB,CAAC;AAErE,MAAM,WAAW,sBAAsB;IACrC;;OAEG;IACH,GAAG,EAAE,MAAM,GAAG,CAAC,MAAM,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC;IAC3C;;OAEG;IACH,SAAS,CAAC,EAAE,OAAO,SAAS,CAAC;IAC7B;;;OAGG;IACH,YAAY,CAAC,EAAE,OAAO,kBAAkB,CAAC;IACzC;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;IACpB;;OAEG;IACH,OAAO,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;IAC9C;;OAEG;IACH,IAAI,CAAC,EAAE;QACL;;;WAGG;QACH,OAAO,EAAE,OAAO,CAAC;QACjB;;;WAGG;QACH,OAAO,EAAE,MAAM,CAAC;KACjB,CAAC;CACH;AAOD,wBAAgB,cAAc,CAAC,IAAI,EAAE,sBAAsB;;kBAgSpC,SAAS,wDAA0B,aAAa;;YAhP/D,MAAM;;eAGC,MAAM;YACT,SAAS;;eAGN,QAAQ;YACX,SAAS;;eAGN,YAAY;;;EAqS1B;AACD,MAAM,MAAM,mBAAmB,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAC;AAEpE,MAAM,MAAM,oBAAoB,CAAC,OAAO,SAAS,SAAS,IAAI;IAC5D,MAAM,EAAE,mBAAmB,CAAC;CAC7B,GAAG,kBAAkB,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC;AASlD;;GAEG;AACH,wBAAgB,MAAM,CAAC,OAAO,SAAS,SAAS,EAC9C,IAAI,EAAE,oBAAoB,CAAC,OAAO,CAAC,GAClC,QAAQ,CAAC,OAAO,CAAC,CA8CnB"}
+{"version":3,"file":"wsLink.d.ts","sourceRoot":"","sources":["../../src/links/wsLink.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAEvE,OAAO,KAAK,EACV,SAAS,EACT,gBAAgB,EAChB,gBAAgB,EAChB,YAAY,EAMZ,mBAAmB,EACpB,MAAM,0CAA0C,CAAC;AAElD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAEhE,OAAO,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAInD,KAAK,gBAAgB,CAAC,OAAO,SAAS,SAAS,EAAE,OAAO,IAAI,mBAAmB,CAC7E,OAAO,EACP,gBAAgB,CAAC,OAAO,CAAC,CAC1B,CAAC;AAEF,KAAK,kBAAkB,CAAC,OAAO,SAAS,SAAS,EAAE,OAAO,IAAI,QAAQ,CACpE,gBAAgB,CAAC,OAAO,EAAE,OAAO,CAAC,EAClC,eAAe,CAAC,OAAO,CAAC,CACzB,CAAC;AAEF,QAAA,MAAM,kBAAkB,iBAAkB,MAAM,WACoB,CAAC;AAErE,MAAM,WAAW,sBAAsB;IACrC;;OAEG;IACH,GAAG,EAAE,MAAM,GAAG,CAAC,MAAM,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC;IAC3C;;OAEG;IACH,SAAS,CAAC,EAAE,OAAO,SAAS,CAAC;IAC7B;;;OAGG;IACH,YAAY,CAAC,EAAE,OAAO,kBAAkB,CAAC;IACzC;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;IACpB;;OAEG;IACH,OAAO,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;IAC9C;;OAEG;IACH,IAAI,CAAC,EAAE;QACL;;;WAGG;QACH,OAAO,EAAE,OAAO,CAAC;QACjB;;;WAGG;QACH,OAAO,EAAE,MAAM,CAAC;KACjB,CAAC;CACH;AAOD,wBAAgB,cAAc,CAAC,IAAI,EAAE,sBAAsB;;kBAgSpC,SAAS,wDAA0B,aAAa;;YAhP/D,MAAM;;eAGC,MAAM;YACT,SAAS;;eAGN,QAAQ;YACX,SAAS;;eAGN,YAAY;aACd,SAAS;;EAoSrB;AACD,MAAM,MAAM,mBAAmB,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAC;AAEpE,MAAM,MAAM,oBAAoB,CAAC,OAAO,SAAS,SAAS,IAAI;IAC5D,MAAM,EAAE,mBAAmB,CAAC;CAC7B,GAAG,kBAAkB,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC;AASlD;;GAEG;AACH,wBAAgB,MAAM,CAAC,OAAO,SAAS,SAAS,EAC9C,IAAI,EAAE,oBAAoB,CAAC,OAAO,CAAC,GAClC,QAAQ,CAAC,OAAO,CAAC,CA8CnB"}

package/dist/links.d.ts

@@ -6,4 +6,5 @@ export * from './links/httpLink';
 export * from './links/loggerLink';
 export * from './links/splitLink';
 export * from './links/wsLink';
+export * from './links/httpSubscriptionLink';
 //# sourceMappingURL=links.d.ts.map

package/dist/links.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"links.d.ts","sourceRoot":"","sources":["../src/links.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAE9B,cAAc,8BAA8B,CAAC;AAC7C,cAAc,uBAAuB,CAAC;AACtC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,kBAAkB,CAAC;AACjC,cAAc,oBAAoB,CAAC;AACnC,cAAc,mBAAmB,CAAC;AAClC,cAAc,gBAAgB,CAAC"}
+{"version":3,"file":"links.d.ts","sourceRoot":"","sources":["../src/links.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAE9B,cAAc,8BAA8B,CAAC;AAC7C,cAAc,uBAAuB,CAAC;AACtC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,kBAAkB,CAAC;AACjC,cAAc,oBAAoB,CAAC;AACnC,cAAc,mBAAmB,CAAC;AAClC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,8BAA8B,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/client",
-  "version": "11.0.0-rc.417+94650c185",
+  "version": "11.0.0-rc.419+343b6de2e",
   "description": "The tRPC client library",
   "author": "KATT",
   "license": "MIT",
@@ -76,10 +76,10 @@
     "!**/*.test.*"
   ],
   "peerDependencies": {
-    "@trpc/server": "11.0.0-rc.417+94650c185"
+    "@trpc/server": "11.0.0-rc.419+343b6de2e"
   },
   "devDependencies": {
-    "@trpc/server": "11.0.0-rc.417+94650c185",
+    "@trpc/server": "11.0.0-rc.419+343b6de2e",
     "@types/isomorphic-fetch": "^0.0.39",
     "@types/node": "^20.10.0",
     "eslint": "^8.56.0",
@@ -96,5 +96,5 @@
   "funding": [
     "https://trpc.io/sponsor"
   ],
-  "gitHead": "94650c185b067c86f2e71fb224b1e70f463632b7"
+  "gitHead": "343b6de2ea719347bffe8332f37589c66c323349"
 }

package/src/internals/TRPCUntypedClient.ts

@@ -27,7 +27,7 @@ export interface TRPCRequestOptions {
 }
 
 export interface TRPCSubscriptionObserver<TValue, TError> {
-  onStarted: () => void;
+  onStarted: (opts: { context: OperationContext | undefined }) => void;
   onData: (value: TValue) => void;
   onError: (err: TError) => void;
   onStopped: () => void;
@@ -148,7 +148,9 @@ export class TRPCUntypedClient<TRouter extends AnyRouter> {
     return observable$.subscribe({
       next(envelope) {
         if (envelope.result.type === 'started') {
-          opts.onStarted?.();
+          opts.onStarted?.({
+            context: envelope.context,
+          });
         } else if (envelope.result.type === 'stopped') {
           opts.onStopped?.();
         } else {

package/src/links/httpBatchLink.ts

@@ -86,14 +86,17 @@ export function httpBatchLink<TRouter extends AnyRouter>(
     };
 
     const query = dataLoader(batchLoader('query'));
-    const mutation = dataLoader<Operation, HTTPResult>(batchLoader('mutation'));
-    const subscription = dataLoader<Operation, HTTPResult>(
-      batchLoader('subscription'),
-    );
+    const mutation = dataLoader(batchLoader('mutation'));
 
-    const loaders = { query, subscription, mutation };
+    const loaders = { query, mutation };
     return ({ op }) => {
       return observable((observer) => {
+        /* istanbul ignore if -- @preserve */
+        if (op.type === 'subscription') {
+          throw new Error(
+            'Subscriptions are unsupported by `httpLink` - use `httpSubscriptionLink` or `wsLink`',
+          );
+        }
         const loader = loaders[op.type];
         const { promise, cancel } = loader.load(op);
 

package/src/links/httpBatchStreamLink.ts

@@ -95,13 +95,11 @@ export function unstable_httpBatchStreamLink<TRouter extends AnyRouter>(
 
           return {
             promise: responsePromise.then(async (res) => {
-              if (!res.body) {
-                throw new Error('Received response without body');
-              }
               const [head] = await jsonlStreamConsumer<
                 Record<string, Promise<any>>
               >({
-                from: res.body,
+                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                from: res.body!,
                 deserialize: resolvedOpts.transformer.output.deserialize,
                 // onError: console.error,
                 formatError(opts) {
@@ -114,7 +112,7 @@ export function unstable_httpBatchStreamLink<TRouter extends AnyRouter>(
 
               const promises = Object.keys(batchOps).map(
                 async (key): Promise<HTTPResult> => {
-                  let json: TRPCResponse = await head[key];
+                  let json: TRPCResponse = await Promise.resolve(head[key]);
 
                   if ('result' in json) {
                     /**
@@ -149,11 +147,16 @@ export function unstable_httpBatchStreamLink<TRouter extends AnyRouter>(
 
     const query = dataLoader(batchLoader('query'));
     const mutation = dataLoader(batchLoader('mutation'));
-    const subscription = dataLoader(batchLoader('subscription'));
 
-    const loaders = { query, subscription, mutation };
+    const loaders = { query, mutation };
     return ({ op }) => {
       return observable((observer) => {
+        /* istanbul ignore if -- @preserve */
+        if (op.type === 'subscription') {
+          throw new Error(
+            'Subscriptions are unsupported by `httpLink` - use `httpSubscriptionLink` or `wsLink`',
+          );
+        }
         const loader = loaders[op.type];
         const { promise, cancel } = loader.load(op);
 

package/src/links/httpLink.ts

@@ -1,6 +1,6 @@
 import { observable } from '@trpc/server/observable';
 import type {
-  AnyRootTypes,
+  AnyClientTypes,
   AnyRouter,
 } from '@trpc/server/unstable-core-do-not-import';
 import { transformResult } from '@trpc/server/unstable-core-do-not-import';
@@ -25,7 +25,7 @@ import {
   type TRPCLink,
 } from './types';
 
-export type HTTPLinkOptions<TRoot extends AnyRootTypes> =
+export type HTTPLinkOptions<TRoot extends AnyClientTypes> =
   HTTPLinkBaseOptions<TRoot> & {
     /**
      * Headers to be set on outgoing requests or a callback that of said headers
@@ -80,6 +80,12 @@ export function httpLink<TRouter extends AnyRouter = AnyRouter>(
     return ({ op }) => {
       return observable((observer) => {
         const { path, input, type } = op;
+        /* istanbul ignore if -- @preserve */
+        if (type === 'subscription') {
+          throw new Error(
+            'Subscriptions are unsupported by `httpLink` - use `httpSubscriptionLink` or `wsLink`',
+          );
+        }
 
         const request = universalRequester({
           ...resolvedOpts,

package/src/links/httpSubscriptionLink.ts

@@ -0,0 +1,121 @@
+import { observable } from '@trpc/server/observable';
+import type {
+  AnyClientTypes,
+  inferClientTypes,
+  InferrableClientTypes,
+  MaybePromise,
+  SSEvent,
+} from '@trpc/server/unstable-core-do-not-import';
+import {
+  run,
+  sseStreamConsumer,
+} from '@trpc/server/unstable-core-do-not-import';
+import { TRPCClientError } from '../TRPCClientError';
+import { getTransformer, type TransformerOptions } from '../unstable-internals';
+import { getUrl } from './internals/httpUtils';
+import type { TRPCLink } from './types';
+
+type HTTPSubscriptionLinkOptions<TRoot extends AnyClientTypes> = {
+  /**
+   * The URL to connect to (can be a function that returns a URL)
+   */
+  url: string | (() => MaybePromise<string>);
+  /**
+   * EventSource options
+   */
+  eventSourceOptions?: EventSourceInit;
+} & TransformerOptions<TRoot>;
+
+/**
+ * Get the result of a value or function that returns a value
+ */
+const resultOf = <T>(value: T | (() => T)): T => {
+  return typeof value === 'function' ? (value as () => T)() : value;
+};
+
+/**
+ * @see https://trpc.io/docs/client/links/httpSubscriptionLink
+ */
+export function unstable_httpSubscriptionLink<
+  TInferrable extends InferrableClientTypes,
+>(
+  opts: HTTPSubscriptionLinkOptions<inferClientTypes<TInferrable>>,
+): TRPCLink<TInferrable> {
+  const transformer = getTransformer(opts.transformer);
+  return () => {
+    return ({ op }) => {
+      return observable((observer) => {
+        const { type, path, input } = op;
+        /* istanbul ignore if -- @preserve */
+        if (type !== 'subscription') {
+          throw new Error('httpSubscriptionLink only supports subscriptions');
+        }
+
+        let eventSource: EventSource | null = null;
+        let unsubscribed = false;
+
+        run(async () => {
+          const url = getUrl({
+            transformer,
+            url: await resultOf(opts.url),
+            input,
+            path,
+            type,
+            AbortController: null,
+          });
+
+          /* istanbul ignore if -- @preserve */
+          if (unsubscribed) {
+            // already unsubscribed - rare race condition
+            return;
+          }
+          eventSource = new EventSource(url, opts.eventSourceOptions);
+          const onStarted = () => {
+            observer.next({
+              result: {
+                type: 'started',
+              },
+              context: {
+                eventSource,
+              },
+            });
+
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            eventSource!.removeEventListener('open', onStarted);
+          };
+          // console.log('starting', new Date());
+          eventSource.addEventListener('open', onStarted);
+          const iterable = sseStreamConsumer<SSEvent>({
+            from: eventSource,
+            deserialize: transformer.input.deserialize,
+          });
+
+          for await (const chunk of iterable) {
+            // if the `sse({})`-helper is used, we always have an `id` field
+            const data = 'id' in chunk ? chunk : chunk.data;
+            observer.next({
+              result: {
+                data,
+              },
+            });
+          }
+
+          observer.next({
+            result: {
+              type: 'stopped',
+            },
+          });
+          observer.complete();
+        }).catch((error) => {
+          observer.error(TRPCClientError.from(error));
+        });
+
+        return () => {
+          observer.complete();
+          eventSource?.close();
+          unsubscribed = true;
+        };
+      });
+    };
+  };
+}

package/src/links/internals/httpUtils.ts

@@ -1,7 +1,8 @@
 import type {
-  AnyRootTypes,
+  AnyClientTypes,
   CombinedDataTransformer,
   ProcedureType,
+  TRPCAcceptHeader,
   TRPCResponse,
 } from '@trpc/server/unstable-core-do-not-import';
 import { getFetch } from '../../getFetch';
@@ -22,7 +23,7 @@ import type { HTTPHeaders, PromiseAndCancel } from '../types';
  * @internal
  */
 export type HTTPLinkBaseOptions<
-  TRoot extends Pick<AnyRootTypes, 'transformer'>,
+  TRoot extends Pick<AnyClientTypes, 'transformer'>,
 > = {
   url: string | URL;
   /**
@@ -50,10 +51,10 @@ export interface ResolvedHTTPLinkOptions {
 }
 
 export function resolveHTTPLinkOptions(
-  opts: HTTPLinkBaseOptions<AnyRootTypes>,
+  opts: HTTPLinkBaseOptions<AnyClientTypes>,
 ): ResolvedHTTPLinkOptions {
   return {
-    url: opts.url.toString().replace(/\/$/, ''), // Remove any trailing slashes
+    url: opts.url.toString(),
     fetch: opts.fetch,
     AbortController: getAbortController(opts.AbortController),
     transformer: getTransformer(opts.transformer),
@@ -74,6 +75,7 @@ function arrayToDict(array: unknown[]) {
 const METHOD = {
   query: 'GET',
   mutation: 'POST',
+  subscription: 'PATCH',
 } as const;
 
 export interface HTTPResult {
@@ -106,19 +108,20 @@ type GetUrl = (opts: HTTPBaseRequestOptions) => string;
 type GetBody = (opts: HTTPBaseRequestOptions) => RequestInitEsque['body'];
 
 export type ContentOptions = {
-  trpcAcceptHeader?: 'application/jsonl';
+  trpcAcceptHeader?: TRPCAcceptHeader;
   contentTypeHeader?: string;
   getUrl: GetUrl;
   getBody: GetBody;
 };
 
 export const getUrl: GetUrl = (opts) => {
-  let url = opts.url + '/' + opts.path;
+  const base = opts.url.replace(/\/$/, ''); // Remove any trailing slashes
+  let url = base + '/' + opts.path;
   const queryParts: string[] = [];
   if ('inputs' in opts) {
     queryParts.push('batch=1');
   }
-  if (opts.type === 'query') {
+  if (opts.type === 'query' || opts.type === 'subscription') {
     const input = getInput(opts);
     if (input !== undefined && opts.methodOverride !== 'POST') {
       queryParts.push(`input=${encodeURIComponent(JSON.stringify(input))}`);
@@ -172,10 +175,6 @@ export async function fetchHTTPResponse(
     }
     return heads;
   })();
-  /* istanbul ignore if -- @preserve */
-  if (type === 'subscription') {
-    throw new Error('Subscriptions should use wsLink');
-  }
   const headers = {
     ...(opts.contentTypeHeader
       ? { 'content-type': opts.contentTypeHeader }

package/src/links.ts

@@ -7,6 +7,7 @@ export * from './links/httpLink';
 export * from './links/loggerLink';
 export * from './links/splitLink';
 export * from './links/wsLink';
+export * from './links/httpSubscriptionLink';
 
 // These are not public (yet) as we get this functionality from tanstack query
 // export * from './links/internals/retryLink';