@trpc/client 11.0.0-rc.373 → 11.0.0-rc.374

package/dist/bundle-analysis.json

@@ -1,7 +1,7 @@
 {
-  "bundleSize": 46894,
-  "bundleOrigSize": 66367,
-  "bundleReduction": 29.34,
+  "bundleSize": 46599,
+  "bundleOrigSize": 63289,
+  "bundleReduction": 26.37,
   "modules": [
     {
       "id": "/src/links/wsLink.ts",
@@ -13,9 +13,21 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 25.71,
+      "percent": 25.88,
       "reduction": 11.68
     },
+    {
+      "id": "/src/links/httpBatchStreamLink.ts",
+      "size": 5776,
+      "origSize": 6023,
+      "renderedExports": [
+        "unstable_httpBatchStreamLink"
+      ],
+      "removedExports": [],
+      "dependents": [],
+      "percent": 12.4,
+      "reduction": 4.1
+    },
     {
       "id": "/src/links/loggerLink.ts",
       "size": 5457,
@@ -25,33 +37,46 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 11.64,
+      "percent": 11.71,
       "reduction": 18.48
     },
     {
       "id": "/src/internals/dataLoader.ts",
-      "size": 4409,
-      "origSize": 4766,
+      "size": 4504,
+      "origSize": 4809,
       "renderedExports": [
         "dataLoader"
       ],
       "removedExports": [],
       "dependents": [
-        "/src/links/internals/createHTTPBatchLink.ts"
+        "/src/links/httpBatchLink.ts",
+        "/src/links/httpBatchStreamLink.ts"
       ],
-      "percent": 9.4,
-      "reduction": 7.49
+      "percent": 9.67,
+      "reduction": 6.34
+    },
+    {
+      "id": "/src/links/httpBatchLink.ts",
+      "size": 3906,
+      "origSize": 4074,
+      "renderedExports": [
+        "httpBatchLink"
+      ],
+      "removedExports": [],
+      "dependents": [],
+      "percent": 8.38,
+      "reduction": 4.12
     },
     {
       "id": "/src/links/internals/httpUtils.ts",
-      "size": 4407,
-      "origSize": 6905,
+      "size": 3469,
+      "origSize": 5927,
       "renderedExports": [
         "resolveHTTPLinkOptions",
+        "getInput",
         "getUrl",
         "getBody",
         "jsonHttpRequester",
-        "universalRequester",
         "fetchHTTPResponse",
         "httpRequest"
       ],
@@ -59,41 +84,22 @@
       "dependents": [
         "/src/links/httpBatchLink.ts",
         "/src/links/httpLink.ts",
-        "/src/links/internals/createHTTPBatchLink.ts",
-        "/src/links/internals/parseJSONStream.ts"
-      ],
-      "percent": 9.4,
-      "reduction": 36.18
-    },
-    {
-      "id": "/src/links/internals/parseJSONStream.ts",
-      "size": 4007,
-      "origSize": 5037,
-      "renderedExports": [
-        "parseJSONStream",
-        "streamingJsonHttpRequester"
-      ],
-      "removedExports": [],
-      "dependents": [
         "/src/links/httpBatchStreamLink.ts"
       ],
-      "percent": 8.54,
-      "reduction": 20.45
+      "percent": 7.44,
+      "reduction": 41.47
     },
     {
-      "id": "/src/links/internals/createHTTPBatchLink.ts",
-      "size": 2944,
-      "origSize": 3711,
+      "id": "/src/links/httpLink.ts",
+      "size": 2939,
+      "origSize": 3459,
       "renderedExports": [
-        "createHTTPBatchLink"
+        "httpLink"
       ],
       "removedExports": [],
-      "dependents": [
-        "/src/links/httpBatchLink.ts",
-        "/src/links/httpBatchStreamLink.ts"
-      ],
-      "percent": 6.28,
-      "reduction": 20.67
+      "dependents": [],
+      "percent": 6.31,
+      "reduction": 15.03
     },
     {
       "id": "/src/internals/TRPCUntypedClient.ts",
@@ -107,22 +113,9 @@
         "/src/createTRPCUntypedClient.ts",
         "/src/createTRPCClient.ts"
       ],
-      "percent": 4.9,
+      "percent": 4.93,
       "reduction": 45.35
     },
-    {
-      "id": "/src/links/httpLink.ts",
-      "size": 2170,
-      "origSize": 2755,
-      "renderedExports": [
-        "httpLinkFactory",
-        "httpLink"
-      ],
-      "removedExports": [],
-      "dependents": [],
-      "percent": 4.63,
-      "reduction": 21.23
-    },
     {
       "id": "/src/TRPCClientError.ts",
       "size": 1866,
@@ -133,27 +126,16 @@
       "removedExports": [],
       "dependents": [
         "/src/index.ts",
+        "/src/links/httpBatchLink.ts",
         "/src/links/httpLink.ts",
         "/src/links/wsLink.ts",
+        "/src/links/httpBatchStreamLink.ts",
         "/src/internals/TRPCUntypedClient.ts",
-        "/src/links/internals/createHTTPBatchLink.ts",
         "/src/links/internals/httpUtils.ts"
       ],
-      "percent": 3.98,
+      "percent": 4,
       "reduction": 45.71
     },
-    {
-      "id": "/src/links/httpBatchStreamLink.ts",
-      "size": 1340,
-      "origSize": 2176,
-      "renderedExports": [
-        "unstable_httpBatchStreamLink"
-      ],
-      "removedExports": [],
-      "dependents": [],
-      "percent": 2.86,
-      "reduction": 38.42
-    },
     {
       "id": "/src/createTRPCClient.ts",
       "size": 1206,
@@ -168,21 +150,9 @@
       "dependents": [
         "/src/index.ts"
       ],
-      "percent": 2.57,
+      "percent": 2.59,
       "reduction": 72.4
     },
-    {
-      "id": "/src/links/httpBatchLink.ts",
-      "size": 1205,
-      "origSize": 1527,
-      "renderedExports": [
-        "httpBatchLink"
-      ],
-      "removedExports": [],
-      "dependents": [],
-      "percent": 2.57,
-      "reduction": 21.09
-    },
     {
       "id": "/src/links/internals/createChain.ts",
       "size": 690,
@@ -195,7 +165,7 @@
         "/src/links/splitLink.ts",
         "/src/internals/TRPCUntypedClient.ts"
       ],
-      "percent": 1.47,
+      "percent": 1.48,
       "reduction": 32.75
     },
     {
@@ -207,7 +177,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 1.3,
+      "percent": 1.31,
       "reduction": 44.95
     },
     {
@@ -221,7 +191,7 @@
       "dependents": [
         "/src/unstable-internals.ts"
       ],
-      "percent": 1.2,
+      "percent": 1.21,
       "reduction": 66.75
     },
     {
@@ -236,23 +206,9 @@
         "/src/index.ts",
         "/src/links/internals/httpUtils.ts"
       ],
-      "percent": 0.91,
+      "percent": 0.92,
       "reduction": 33.54
     },
-    {
-      "id": "/src/links/internals/getTextDecoder.ts",
-      "size": 407,
-      "origSize": 493,
-      "renderedExports": [
-        "getTextDecoder"
-      ],
-      "removedExports": [],
-      "dependents": [
-        "/src/links/httpBatchStreamLink.ts"
-      ],
-      "percent": 0.87,
-      "reduction": 17.44
-    },
     {
       "id": "/src/internals/getAbortController.ts",
       "size": 396,
@@ -264,7 +220,7 @@
       "dependents": [
         "/src/links/internals/httpUtils.ts"
       ],
-      "percent": 0.84,
+      "percent": 0.85,
       "reduction": 30.4
     },
     {
@@ -277,10 +233,8 @@
         "isNonJsonSerializable"
       ],
       "removedExports": [],
-      "dependents": [
-        "/src/links/internals/httpUtils.ts"
-      ],
-      "percent": 0.7,
+      "dependents": [],
+      "percent": 0.71,
       "reduction": 15.17
     },
     {
@@ -321,5 +275,5 @@
       "reduction": 100
     }
   ],
-  "moduleCount": 22
+  "moduleCount": 19
 }

package/dist/index.js

@@ -29,7 +29,6 @@ exports.isOctetType = contentTypes.isOctetType;
 exports.httpBatchLink = httpBatchLink.httpBatchLink;
 exports.unstable_httpBatchStreamLink = httpBatchStreamLink.unstable_httpBatchStreamLink;
 exports.httpLink = httpLink.httpLink;
-exports.httpLinkFactory = httpLink.httpLinkFactory;
 exports.loggerLink = loggerLink.loggerLink;
 exports.splitLink = splitLink.splitLink;
 exports.createWSClient = wsLink.createWSClient;

package/dist/index.mjs

@@ -5,7 +5,7 @@ export { TRPCClientError } from './TRPCClientError.mjs';
 export { isFormData, isNonJsonSerializable, isOctetType } from './links/internals/contentTypes.mjs';
 export { httpBatchLink } from './links/httpBatchLink.mjs';
 export { unstable_httpBatchStreamLink } from './links/httpBatchStreamLink.mjs';
-export { httpLink, httpLinkFactory } from './links/httpLink.mjs';
+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';

package/dist/internals/dataLoader.d.ts

@@ -1,8 +1,8 @@
 import type { CancelFn, PromiseAndCancel } from '../links/types';
-type BatchLoader<TKey, TValue> = {
+export type BatchLoader<TKey, TValue> = {
     validate: (keys: TKey[]) => boolean;
-    fetch: (keys: TKey[], unitResolver: (index: number, value: NonNullable<TValue>) => void) => {
-        promise: Promise<TValue[]>;
+    fetch: (keys: TKey[]) => {
+        promise: Promise<TValue[] | Promise<TValue>[]>;
         cancel: CancelFn;
     };
 };
@@ -14,5 +14,4 @@ type BatchLoader<TKey, TValue> = {
 export declare function dataLoader<TKey, TValue>(batchLoader: BatchLoader<TKey, TValue>): {
     load: (key: TKey) => PromiseAndCancel<TValue>;
 };
-export {};
 //# sourceMappingURL=dataLoader.d.ts.map

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,KAAK,WAAW,CAAC,IAAI,EAAE,MAAM,IAAI;IAC/B,QAAQ,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,OAAO,CAAC;IACpC,KAAK,EAAE,CACL,IAAI,EAAE,IAAI,EAAE,EACZ,YAAY,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,WAAW,CAAC,MAAM,CAAC,KAAK,IAAI,KAC9D;QACH,OAAO,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;QAC3B,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;gBAqGnB,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,iBAAiB,MAAM,CAAC;EAsCnD"}

package/dist/internals/dataLoader.js

@@ -67,20 +67,21 @@
             for (const item of items){
                 item.batch = batch;
             }
-            const unitResolver = (index, value)=>{
-                const item = batch.items[index];
-                item.resolve?.(value);
-                item.batch = null;
-                item.reject = null;
-                item.resolve = null;
-            };
-            const { promise , cancel  } = batchLoader.fetch(batch.items.map((_item)=>_item.key), unitResolver);
+            const { promise , cancel  } = batchLoader.fetch(batch.items.map((_item)=>_item.key));
             batch.cancel = cancel;
-            promise.then((result)=>{
-                for(let i = 0; i < result.length; i++){
-                    const value = result[i];
-                    unitResolver(i, value);
-                }
+            promise.then(async (result)=>{
+                await Promise.all(result.map(async (valueOrPromise, index)=>{
+                    const item = batch.items[index];
+                    try {
+                        const value = await Promise.resolve(valueOrPromise);
+                        item.resolve?.(value);
+                    } catch (cause) {
+                        item.reject?.(cause);
+                    }
+                    item.batch = null;
+                    item.reject = null;
+                    item.resolve = null;
+                }));
                 for (const item of batch.items){
                     item.reject?.(new Error('Missing result'));
                     item.batch = null;

package/dist/internals/dataLoader.mjs

@@ -65,20 +65,21 @@
             for (const item of items){
                 item.batch = batch;
             }
-            const unitResolver = (index, value)=>{
-                const item = batch.items[index];
-                item.resolve?.(value);
-                item.batch = null;
-                item.reject = null;
-                item.resolve = null;
-            };
-            const { promise , cancel  } = batchLoader.fetch(batch.items.map((_item)=>_item.key), unitResolver);
+            const { promise , cancel  } = batchLoader.fetch(batch.items.map((_item)=>_item.key));
             batch.cancel = cancel;
-            promise.then((result)=>{
-                for(let i = 0; i < result.length; i++){
-                    const value = result[i];
-                    unitResolver(i, value);
-                }
+            promise.then(async (result)=>{
+                await Promise.all(result.map(async (valueOrPromise, index)=>{
+                    const item = batch.items[index];
+                    try {
+                        const value = await Promise.resolve(valueOrPromise);
+                        item.resolve?.(value);
+                    } catch (cause) {
+                        item.reject?.(cause);
+                    }
+                    item.batch = null;
+                    item.reject = null;
+                    item.resolve = null;
+                }));
                 for (const item of batch.items){
                     item.reject?.(new Error('Missing result'));
                     item.batch = null;

package/dist/links/httpBatchLink.d.ts

@@ -1,3 +1,8 @@
+import type { AnyRouter } from '@trpc/server';
 import type { HTTPBatchLinkOptions } from './HTTPBatchLinkOptions';
-export declare const httpBatchLink: <TRouter extends import("@trpc/server/unstable-core-do-not-import").AnyRouter>(opts: HTTPBatchLinkOptions<import("@trpc/server/unstable-core-do-not-import").inferClientTypes<TRouter>>) => import("./types").TRPCLink<TRouter>;
+import type { TRPCLink } from './types';
+/**
+ * @see https://trpc.io/docs/client/links/httpBatchLink
+ */
+export declare function httpBatchLink<TRouter extends AnyRouter>(opts: HTTPBatchLinkOptions<TRouter['_def']['_config']['$types']>): TRPCLink<TRouter>;
 //# sourceMappingURL=httpBatchLink.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"httpBatchLink.d.ts","sourceRoot":"","sources":["../../src/links/httpBatchLink.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAgDnE,eAAO,MAAM,aAAa,iOAAsC,CAAC"}
+{"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"}

package/dist/links/httpBatchLink.js

@@ -1,41 +1,106 @@
 'use strict';
 
-var createHTTPBatchLink = require('./internals/createHTTPBatchLink.js');
+var observable = require('@trpc/server/observable');
+var unstableCoreDoNotImport = require('@trpc/server/unstable-core-do-not-import');
+var dataLoader = require('../internals/dataLoader.js');
+var TRPCClientError = require('../TRPCClientError.js');
 var httpUtils = require('./internals/httpUtils.js');
 
-const batchRequester = (requesterOpts)=>{
-    return (batchOps)=>{
-        const path = batchOps.map((op)=>op.path).join(',');
-        const inputs = batchOps.map((op)=>op.input);
-        const { promise , cancel  } = httpUtils.jsonHttpRequester({
-            ...requesterOpts,
-            path,
-            inputs,
-            headers () {
-                if (!requesterOpts.opts.headers) {
-                    return {};
-                }
-                if (typeof requesterOpts.opts.headers === 'function') {
-                    return requesterOpts.opts.headers({
-                        opList: batchOps
+/**
+ * @see https://trpc.io/docs/client/links/httpBatchLink
+ */ function httpBatchLink(opts) {
+    const resolvedOpts = httpUtils.resolveHTTPLinkOptions(opts);
+    const maxURLLength = opts.maxURLLength ?? Infinity;
+    return ()=>{
+        const batchLoader = (type)=>{
+            return {
+                validate (batchOps) {
+                    if (maxURLLength === Infinity) {
+                        // escape hatch for quick calcs
+                        return true;
+                    }
+                    const path = batchOps.map((op)=>op.path).join(',');
+                    const inputs = batchOps.map((op)=>op.input);
+                    const url = httpUtils.getUrl({
+                        ...resolvedOpts,
+                        type,
+                        path,
+                        inputs
+                    });
+                    return url.length <= maxURLLength;
+                },
+                fetch (batchOps) {
+                    const path = batchOps.map((op)=>op.path).join(',');
+                    const inputs = batchOps.map((op)=>op.input);
+                    const requester = httpUtils.jsonHttpRequester({
+                        ...resolvedOpts,
+                        path,
+                        inputs,
+                        type,
+                        headers () {
+                            if (!opts.headers) {
+                                return {};
+                            }
+                            if (typeof opts.headers === 'function') {
+                                return opts.headers({
+                                    opList: batchOps
+                                });
+                            }
+                            return opts.headers;
+                        }
                     });
+                    return {
+                        cancel: requester.cancel,
+                        promise: requester.promise.then((res)=>{
+                            const resJSON = Array.isArray(res.json) ? res.json : batchOps.map(()=>res.json);
+                            const result = resJSON.map((item)=>({
+                                    meta: res.meta,
+                                    json: item
+                                }));
+                            return result;
+                        })
+                    };
                 }
-                return requesterOpts.opts.headers;
-            }
-        });
-        return {
-            promise: promise.then((res)=>{
-                const resJSON = Array.isArray(res.json) ? res.json : batchOps.map(()=>res.json);
-                const result = resJSON.map((item)=>({
-                        meta: res.meta,
-                        json: item
+            };
+        };
+        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)=>{
+                const loader = loaders[op.type];
+                const { promise , cancel  } = loader.load(op);
+                let _res = undefined;
+                promise.then((res)=>{
+                    _res = res;
+                    const transformed = unstableCoreDoNotImport.transformResult(res.json, resolvedOpts.transformer.output);
+                    if (!transformed.ok) {
+                        observer.error(TRPCClientError.TRPCClientError.from(transformed.error, {
+                            meta: res.meta
+                        }));
+                        return;
+                    }
+                    observer.next({
+                        context: res.meta,
+                        result: transformed.result
+                    });
+                    observer.complete();
+                }).catch((err)=>{
+                    observer.error(TRPCClientError.TRPCClientError.from(err, {
+                        meta: _res?.meta
                     }));
-                return result;
-            }),
-            cancel
+                });
+                return ()=>{
+                    cancel();
+                };
+            });
         };
     };
-};
-const httpBatchLink = createHTTPBatchLink.createHTTPBatchLink(batchRequester);
+}
 
 exports.httpBatchLink = httpBatchLink;