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

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":"AAAA,OAAO,KAAK,EACV,YAAY,EACZ,uBAAuB,EACvB,aAAa,EACb,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,YAAY,EAAE,aAAa,CAAC,IAC7C;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,YAAY,CAAC,GACtC,uBAAuB,CAQzB;AAiBD,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,mBAAmB,CAAC;IACvC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,eAAO,MAAM,MAAM,EAAE,MAgBpB,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,0BAgCzC;AAED,wBAAgB,WAAW,CACzB,IAAI,EAAE,kBAAkB,GACvB,gBAAgB,CAAC,UAAU,CAAC,CA8B9B"}
+{"version":3,"file":"httpUtils.d.ts","sourceRoot":"","sources":["../../../src/links/internals/httpUtils.ts"],"names":[],"mappings":"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"}

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.413+87f0cbc94",
+  "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.413+87f0cbc94"
+    "@trpc/server": "11.0.0-rc.419+343b6de2e"
   },
   "devDependencies": {
-    "@trpc/server": "11.0.0-rc.413+87f0cbc94",
+    "@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": "87f0cbc948c7b3a1a642cf9dde710bcabec7bc0c"
+  "gitHead": "343b6de2ea719347bffe8332f37589c66c323349"
 }

package/src/createTRPCClient.ts

@@ -126,6 +126,16 @@ export type CreateTRPCClient<TRouter extends AnyRouter> =
 export function createTRPCClientProxy<TRouter extends AnyRouter>(
   client: TRPCUntypedClient<TRouter>,
 ): CreateTRPCClient<TRouter> {
+  const proxy = createRecursiveProxy<CreateTRPCClient<TRouter>>(
+    ({ path, args }) => {
+      const pathCopy = [...path];
+      const procedureType = clientCallTypeToProcedureType(pathCopy.pop()!);
+
+      const fullPath = pathCopy.join('.');
+
+      return (client as any)[procedureType](fullPath, ...args);
+    },
+  );
   return createFlatProxy<CreateTRPCClient<TRouter>>((key) => {
     if (client.hasOwnProperty(key)) {
       return (client as any)[key as any];
@@ -133,14 +143,7 @@ export function createTRPCClientProxy<TRouter extends AnyRouter>(
     if (key === '__untypedClient') {
       return client;
     }
-    return createRecursiveProxy(({ path, args }) => {
-      const pathCopy = [key, ...path];
-      const procedureType = clientCallTypeToProcedureType(pathCopy.pop()!);
-
-      const fullPath = pathCopy.join('.');
-
-      return (client as any)[procedureType](fullPath, ...args);
-    });
+    return proxy[key];
   });
 }
 

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,