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

package/dist/links/httpLink.js

@@ -4,60 +4,86 @@ var observable = require('@trpc/server/observable');
 var unstableCoreDoNotImport = require('@trpc/server/unstable-core-do-not-import');
 var TRPCClientError = require('../TRPCClientError.js');
 var httpUtils = require('./internals/httpUtils.js');
+var contentTypes = require('./internals/contentTypes.js');
 
-function httpLinkFactory(factoryOpts) {
-    return (opts)=>{
-        const resolvedOpts = httpUtils.resolveHTTPLinkOptions(opts);
-        return ()=>({ op  })=>observable.observable((observer)=>{
-                    const { path , input , type  } = op;
-                    const { promise , cancel  } = factoryOpts.requester({
-                        ...resolvedOpts,
-                        type,
-                        path,
-                        input,
-                        headers () {
-                            if (!opts.headers) {
-                                return {};
-                            }
-                            if (typeof opts.headers === 'function') {
-                                return opts.headers({
-                                    op
-                                });
-                            }
-                            return opts.headers;
+const universalRequester = (opts)=>{
+    const input = httpUtils.getInput(opts);
+    if (contentTypes.isFormData(input)) {
+        if (opts.type !== 'mutation' && opts.methodOverride !== 'POST') {
+            throw new Error('FormData is only supported for mutations');
+        }
+        return httpUtils.httpRequest({
+            ...opts,
+            // The browser will set this automatically and include the boundary= in it
+            contentTypeHeader: undefined,
+            getUrl: httpUtils.getUrl,
+            getBody: ()=>input
+        });
+    }
+    if (contentTypes.isOctetType(input)) {
+        if (opts.type !== 'mutation' && opts.methodOverride !== 'POST') {
+            throw new Error('Octet type input is only supported for mutations');
+        }
+        return httpUtils.httpRequest({
+            ...opts,
+            contentTypeHeader: 'application/octet-stream',
+            getUrl: httpUtils.getUrl,
+            getBody: ()=>input
+        });
+    }
+    return httpUtils.jsonHttpRequester(opts);
+};
+/**
+ * @link https://trpc.io/docs/client/links/httpLink
+ */ function httpLink(opts) {
+    const resolvedOpts = httpUtils.resolveHTTPLinkOptions(opts);
+    return ()=>{
+        return ({ op  })=>{
+            return observable.observable((observer)=>{
+                const { path , input , type  } = op;
+                const request = universalRequester({
+                    ...resolvedOpts,
+                    type,
+                    path,
+                    input,
+                    headers () {
+                        if (!opts.headers) {
+                            return {};
                         }
-                    });
-                    let meta = undefined;
-                    promise.then((res)=>{
-                        meta = res.meta;
-                        const transformed = unstableCoreDoNotImport.transformResult(res.json, resolvedOpts.transformer.output);
-                        if (!transformed.ok) {
-                            observer.error(TRPCClientError.TRPCClientError.from(transformed.error, {
-                                meta
-                            }));
-                            return;
+                        if (typeof opts.headers === 'function') {
+                            return opts.headers({
+                                op
+                            });
                         }
-                        observer.next({
-                            context: res.meta,
-                            result: transformed.result
-                        });
-                        observer.complete();
-                    }).catch((cause)=>{
-                        observer.error(TRPCClientError.TRPCClientError.from(cause, {
+                        return opts.headers;
+                    }
+                });
+                let meta = undefined;
+                request.promise.then((res)=>{
+                    meta = res.meta;
+                    const transformed = unstableCoreDoNotImport.transformResult(res.json, resolvedOpts.transformer.output);
+                    if (!transformed.ok) {
+                        observer.error(TRPCClientError.TRPCClientError.from(transformed.error, {
                             meta
                         }));
+                        return;
+                    }
+                    observer.next({
+                        context: res.meta,
+                        result: transformed.result
                     });
-                    return ()=>{
-                        cancel();
-                    };
+                    observer.complete();
+                }).catch((cause)=>{
+                    observer.error(TRPCClientError.TRPCClientError.from(cause, {
+                        meta
+                    }));
                 });
+                return ()=>{
+                    request.cancel();
+                };
+            });
+        };
     };
 }
-/**
- * @link https://trpc.io/docs/v11/client/links/httpLink
- */ const httpLink = httpLinkFactory({
-    requester: httpUtils.universalRequester
-});
 
 exports.httpLink = httpLink;
-exports.httpLinkFactory = httpLinkFactory;

package/dist/links/httpLink.mjs

@@ -1,60 +1,87 @@
 import { observable } from '@trpc/server/observable';
 import { transformResult } from '@trpc/server/unstable-core-do-not-import';
 import { TRPCClientError } from '../TRPCClientError.mjs';
-import { resolveHTTPLinkOptions, universalRequester } from './internals/httpUtils.mjs';
+import { resolveHTTPLinkOptions, getInput, httpRequest, getUrl, jsonHttpRequester } from './internals/httpUtils.mjs';
+import { isFormData, isOctetType } from './internals/contentTypes.mjs';
 
-function httpLinkFactory(factoryOpts) {
-    return (opts)=>{
-        const resolvedOpts = resolveHTTPLinkOptions(opts);
-        return ()=>({ op  })=>observable((observer)=>{
-                    const { path , input , type  } = op;
-                    const { promise , cancel  } = factoryOpts.requester({
-                        ...resolvedOpts,
-                        type,
-                        path,
-                        input,
-                        headers () {
-                            if (!opts.headers) {
-                                return {};
-                            }
-                            if (typeof opts.headers === 'function') {
-                                return opts.headers({
-                                    op
-                                });
-                            }
-                            return opts.headers;
+const universalRequester = (opts)=>{
+    const input = getInput(opts);
+    if (isFormData(input)) {
+        if (opts.type !== 'mutation' && opts.methodOverride !== 'POST') {
+            throw new Error('FormData is only supported for mutations');
+        }
+        return httpRequest({
+            ...opts,
+            // The browser will set this automatically and include the boundary= in it
+            contentTypeHeader: undefined,
+            getUrl,
+            getBody: ()=>input
+        });
+    }
+    if (isOctetType(input)) {
+        if (opts.type !== 'mutation' && opts.methodOverride !== 'POST') {
+            throw new Error('Octet type input is only supported for mutations');
+        }
+        return httpRequest({
+            ...opts,
+            contentTypeHeader: 'application/octet-stream',
+            getUrl,
+            getBody: ()=>input
+        });
+    }
+    return jsonHttpRequester(opts);
+};
+/**
+ * @link https://trpc.io/docs/client/links/httpLink
+ */ function httpLink(opts) {
+    const resolvedOpts = resolveHTTPLinkOptions(opts);
+    return ()=>{
+        return ({ op  })=>{
+            return observable((observer)=>{
+                const { path , input , type  } = op;
+                const request = universalRequester({
+                    ...resolvedOpts,
+                    type,
+                    path,
+                    input,
+                    headers () {
+                        if (!opts.headers) {
+                            return {};
                         }
-                    });
-                    let meta = undefined;
-                    promise.then((res)=>{
-                        meta = res.meta;
-                        const transformed = transformResult(res.json, resolvedOpts.transformer.output);
-                        if (!transformed.ok) {
-                            observer.error(TRPCClientError.from(transformed.error, {
-                                meta
-                            }));
-                            return;
+                        if (typeof opts.headers === 'function') {
+                            return opts.headers({
+                                op
+                            });
                         }
-                        observer.next({
-                            context: res.meta,
-                            result: transformed.result
-                        });
-                        observer.complete();
-                    }).catch((cause)=>{
-                        observer.error(TRPCClientError.from(cause, {
+                        return opts.headers;
+                    }
+                });
+                let meta = undefined;
+                request.promise.then((res)=>{
+                    meta = res.meta;
+                    const transformed = transformResult(res.json, resolvedOpts.transformer.output);
+                    if (!transformed.ok) {
+                        observer.error(TRPCClientError.from(transformed.error, {
                             meta
                         }));
+                        return;
+                    }
+                    observer.next({
+                        context: res.meta,
+                        result: transformed.result
                     });
-                    return ()=>{
-                        cancel();
-                    };
+                    observer.complete();
+                }).catch((cause)=>{
+                    observer.error(TRPCClientError.from(cause, {
+                        meta
+                    }));
                 });
+                return ()=>{
+                    request.cancel();
+                };
+            });
+        };
     };
 }
-/**
- * @link https://trpc.io/docs/v11/client/links/httpLink
- */ const httpLink = httpLinkFactory({
-    requester: universalRequester
-});
 
-export { httpLink, httpLinkFactory };
+export { httpLink };

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

@@ -1,7 +1,6 @@
 import type { AnyRootTypes, CombinedDataTransformer, ProcedureType, 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 { TextDecoderEsque } from '../internals/streamingUtils';
 import type { HTTPHeaders, PromiseAndCancel } from '../types';
 /**
  * @internal
@@ -45,6 +44,7 @@ type GetInputOptions = {
 } | {
     inputs: unknown[];
 });
+export declare function getInput(opts: GetInputOptions): any;
 export type HTTPBaseRequestOptions = GetInputOptions & ResolvedHTTPLinkOptions & {
     type: ProcedureType;
     path: string;
@@ -52,7 +52,7 @@ export type HTTPBaseRequestOptions = GetInputOptions & ResolvedHTTPLinkOptions &
 type GetUrl = (opts: HTTPBaseRequestOptions) => string;
 type GetBody = (opts: HTTPBaseRequestOptions) => RequestInitEsque['body'];
 export type ContentOptions = {
-    batchModeHeader?: 'stream';
+    trpcAcceptHeader?: 'application/jsonl';
     contentTypeHeader?: string;
     getUrl: GetUrl;
     getBody: GetBody;
@@ -63,10 +63,8 @@ export type Requester = (opts: HTTPBaseRequestOptions & {
     headers: () => HTTPHeaders | Promise<HTTPHeaders>;
 }) => PromiseAndCancel<HTTPResult>;
 export declare const jsonHttpRequester: Requester;
-export declare const universalRequester: Requester;
 export type HTTPRequestOptions = ContentOptions & HTTPBaseRequestOptions & {
     headers: () => HTTPHeaders | Promise<HTTPHeaders>;
-    TextDecoder?: TextDecoderEsque;
 };
 export declare function fetchHTTPResponse(opts: HTTPRequestOptions, ac?: AbortControllerInstanceEsque | null): Promise<ResponseEsque>;
 export declare function httpRequest(opts: HTTPRequestOptions): PromiseAndCancel<HTTPResult>;

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":"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"}

package/dist/links/internals/httpUtils.js

@@ -4,7 +4,6 @@ var getFetch = require('../../getFetch.js');
 var getAbortController = require('../../internals/getAbortController.js');
 var TRPCClientError = require('../../TRPCClientError.js');
 var transformer = require('../../internals/transformer.js');
-var contentTypes = require('./contentTypes.js');
 
 function resolveHTTPLinkOptions(opts) {
     return {
@@ -63,33 +62,6 @@ const jsonHttpRequester = (opts)=>{
         getBody
     });
 };
-const universalRequester = (opts)=>{
-    const input = getInput(opts);
-    if (contentTypes.isFormData(input)) {
-        if (opts.type !== 'mutation' && opts.methodOverride !== 'POST') {
-            throw new Error('FormData is only supported for mutations');
-        }
-        return httpRequest({
-            ...opts,
-            // The browser will set this automatically and include the boundary= in it
-            contentTypeHeader: undefined,
-            getUrl,
-            getBody: ()=>input
-        });
-    }
-    if (contentTypes.isOctetType(input)) {
-        if (opts.type !== 'mutation' && opts.methodOverride !== 'POST') {
-            throw new Error('Octet type input is only supported for mutations');
-        }
-        return httpRequest({
-            ...opts,
-            contentTypeHeader: 'application/octet-stream',
-            getUrl,
-            getBody: ()=>input
-        });
-    }
-    return jsonHttpRequester(opts);
-};
 async function fetchHTTPResponse(opts, ac) {
     const url = opts.getUrl(opts);
     const body = opts.getBody(opts);
@@ -108,9 +80,9 @@ async function fetchHTTPResponse(opts, ac) {
         ...opts.contentTypeHeader ? {
             'content-type': opts.contentTypeHeader
         } : {},
-        ...opts.batchModeHeader ? {
-            'trpc-batch-mode': opts.batchModeHeader
-        } : {},
+        ...opts.trpcAcceptHeader ? {
+            'trpc-accept': opts.trpcAcceptHeader
+        } : undefined,
         ...resolvedHeaders
     };
     return getFetch.getFetch(opts.fetch)(url, {
@@ -155,8 +127,8 @@ function httpRequest(opts) {
 
 exports.fetchHTTPResponse = fetchHTTPResponse;
 exports.getBody = getBody;
+exports.getInput = getInput;
 exports.getUrl = getUrl;
 exports.httpRequest = httpRequest;
 exports.jsonHttpRequester = jsonHttpRequester;
 exports.resolveHTTPLinkOptions = resolveHTTPLinkOptions;
-exports.universalRequester = universalRequester;

package/dist/links/internals/httpUtils.mjs

@@ -2,7 +2,6 @@ import { getFetch } from '../../getFetch.mjs';
 import { getAbortController } from '../../internals/getAbortController.mjs';
 import { TRPCClientError } from '../../TRPCClientError.mjs';
 import { getTransformer } from '../../internals/transformer.mjs';
-import { isFormData, isOctetType } from './contentTypes.mjs';
 
 function resolveHTTPLinkOptions(opts) {
     return {
@@ -61,33 +60,6 @@ const jsonHttpRequester = (opts)=>{
         getBody
     });
 };
-const universalRequester = (opts)=>{
-    const input = getInput(opts);
-    if (isFormData(input)) {
-        if (opts.type !== 'mutation' && opts.methodOverride !== 'POST') {
-            throw new Error('FormData is only supported for mutations');
-        }
-        return httpRequest({
-            ...opts,
-            // The browser will set this automatically and include the boundary= in it
-            contentTypeHeader: undefined,
-            getUrl,
-            getBody: ()=>input
-        });
-    }
-    if (isOctetType(input)) {
-        if (opts.type !== 'mutation' && opts.methodOverride !== 'POST') {
-            throw new Error('Octet type input is only supported for mutations');
-        }
-        return httpRequest({
-            ...opts,
-            contentTypeHeader: 'application/octet-stream',
-            getUrl,
-            getBody: ()=>input
-        });
-    }
-    return jsonHttpRequester(opts);
-};
 async function fetchHTTPResponse(opts, ac) {
     const url = opts.getUrl(opts);
     const body = opts.getBody(opts);
@@ -106,9 +78,9 @@ async function fetchHTTPResponse(opts, ac) {
         ...opts.contentTypeHeader ? {
             'content-type': opts.contentTypeHeader
         } : {},
-        ...opts.batchModeHeader ? {
-            'trpc-batch-mode': opts.batchModeHeader
-        } : {},
+        ...opts.trpcAcceptHeader ? {
+            'trpc-accept': opts.trpcAcceptHeader
+        } : undefined,
         ...resolvedHeaders
     };
     return getFetch(opts.fetch)(url, {
@@ -151,4 +123,4 @@ function httpRequest(opts) {
     };
 }
 
-export { fetchHTTPResponse, getBody, getUrl, httpRequest, jsonHttpRequester, resolveHTTPLinkOptions, universalRequester };
+export { fetchHTTPResponse, getBody, getInput, getUrl, httpRequest, jsonHttpRequester, resolveHTTPLinkOptions };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/client",
-  "version": "11.0.0-rc.370+1a920ac81",
+  "version": "11.0.0-rc.374+5027209bc",
   "description": "The tRPC client library",
   "author": "KATT",
   "license": "MIT",
@@ -76,10 +76,10 @@
     "!**/*.test.*"
   ],
   "peerDependencies": {
-    "@trpc/server": "11.0.0-rc.370+1a920ac81"
+    "@trpc/server": "11.0.0-rc.374+5027209bc"
   },
   "devDependencies": {
-    "@trpc/server": "11.0.0-rc.370+1a920ac81",
+    "@trpc/server": "11.0.0-rc.374+5027209bc",
     "@types/isomorphic-fetch": "^0.0.39",
     "@types/node": "^20.10.0",
     "eslint": "^8.56.0",
@@ -95,5 +95,5 @@
   "funding": [
     "https://trpc.io/sponsor"
   ],
-  "gitHead": "1a920ac8160dacfb6a49e6161f56208859168317"
+  "gitHead": "5027209bc300d299224ecef764adeac09b8cab8d"
 }

package/src/internals/dataLoader.ts

@@ -12,13 +12,10 @@ type Batch<TKey, TValue> = {
   items: BatchItem<TKey, TValue>[];
   cancel: CancelFn;
 };
-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;
   };
 };
@@ -107,25 +104,30 @@ export function dataLoader<TKey, TValue>(
       for (const item of items) {
         item.batch = batch;
       }
-      const unitResolver = (index: number, value: NonNullable<TValue>) => {
-        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,
       );
       batch.cancel = cancel;
 
       promise
-        .then((result) => {
-          for (let i = 0; i < result.length; i++) {
-            const value = result[i]!;
-            unitResolver(i, value);
-          }
+        .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 as Error);
+              }
+
+              item.batch = null;
+              item.reject = null;
+              item.resolve = null;
+            }),
+          );
+
           for (const item of batch.items) {
             item.reject?.(new Error('Missing result'));
             item.batch = null;