@trpc/server 10.28.1 → 10.29.0

package/dist/resolveHTTPResponse-2c307e04.js

@@ -0,0 +1,284 @@
+'use strict';
+
+var config = require('./config-f3ce0144.js');
+var TRPCError = require('./TRPCError-16b2e52d.js');
+var transformTRPCResponse = require('./transformTRPCResponse-48d70ef6.js');
+var contentType = require('./contentType-8356d528.js');
+var index = require('./index-4a823936.js');
+
+const HTTP_METHOD_PROCEDURE_TYPE_MAP = {
+    GET: 'query',
+    POST: 'mutation'
+};
+const fallbackContentTypeHandler = {
+    getInputs: contentType.getJsonContentTypeInputs
+};
+function initResponse(initOpts) {
+    const { ctx , paths , type , responseMeta , untransformedJSON , errors =[] ,  } = initOpts;
+    let status = untransformedJSON ? index.getHTTPStatusCode(untransformedJSON) : 200;
+    const headers = {
+        'Content-Type': 'application/json'
+    };
+    const eagerGeneration = !untransformedJSON;
+    const data = eagerGeneration ? [] : Array.isArray(untransformedJSON) ? untransformedJSON : [
+        untransformedJSON
+    ];
+    const meta = responseMeta?.({
+        ctx,
+        paths,
+        type,
+        data,
+        errors,
+        eagerGeneration
+    }) ?? {};
+    for (const [key, value] of Object.entries(meta.headers ?? {})){
+        headers[key] = value;
+    }
+    if (meta.status) {
+        status = meta.status;
+    }
+    return {
+        status,
+        headers
+    };
+}
+async function inputToProcedureCall(procedureOpts) {
+    const { opts , ctx , type , input , path  } = procedureOpts;
+    try {
+        const data = await config.callProcedure({
+            procedures: opts.router._def.procedures,
+            path,
+            rawInput: input,
+            ctx,
+            type
+        });
+        return {
+            result: {
+                data
+            }
+        };
+    } catch (cause) {
+        const error = TRPCError.getTRPCErrorFromUnknown(cause);
+        opts.onError?.({
+            error,
+            path,
+            input,
+            ctx,
+            type: type,
+            req: opts.req
+        });
+        return {
+            error: transformTRPCResponse.getErrorShape({
+                config: opts.router._def._config,
+                error,
+                type,
+                path,
+                input,
+                ctx
+            })
+        };
+    }
+}
+function caughtErrorToData(cause, errorOpts) {
+    const { router , req , onError  } = errorOpts.opts;
+    const error = TRPCError.getTRPCErrorFromUnknown(cause);
+    onError?.({
+        error,
+        path: errorOpts.path,
+        input: errorOpts.input,
+        ctx: errorOpts.ctx,
+        type: errorOpts.type,
+        req
+    });
+    const untransformedJSON = {
+        error: transformTRPCResponse.getErrorShape({
+            config: router._def._config,
+            error,
+            type: errorOpts.type,
+            path: errorOpts.path,
+            input: errorOpts.input,
+            ctx: errorOpts.ctx
+        })
+    };
+    const transformedJSON = transformTRPCResponse.transformTRPCResponse(router._def._config, untransformedJSON);
+    const body = JSON.stringify(transformedJSON);
+    return {
+        error,
+        untransformedJSON,
+        body
+    };
+}
+// implementation
+async function resolveHTTPResponse(opts) {
+    const { router , req , onHead , onChunk  } = opts;
+    if (req.method === 'HEAD') {
+        // can be used for lambda warmup
+        const headResponse = {
+            status: 204
+        };
+        onHead?.(headResponse);
+        onChunk?.([
+            -1,
+            ''
+        ]);
+        return headResponse;
+    }
+    const contentTypeHandler = opts.contentTypeHandler ?? fallbackContentTypeHandler;
+    const batchingEnabled = opts.batching?.enabled ?? true;
+    const type = HTTP_METHOD_PROCEDURE_TYPE_MAP[req.method] ?? 'unknown';
+    let ctx = undefined;
+    let paths;
+    const isBatchCall = !!req.query.get('batch');
+    const isStreamCall = isBatchCall && onHead && onChunk && req.headers['trpc-batch-mode'] === 'stream';
+    try {
+        if (opts.error) {
+            throw opts.error;
+        }
+        if (isBatchCall && !batchingEnabled) {
+            throw new Error(`Batching is not enabled on the server`);
+        }
+        /* istanbul ignore if -- @preserve */ if (type === 'subscription') {
+            throw new TRPCError.TRPCError({
+                message: 'Subscriptions should use wsLink',
+                code: 'METHOD_NOT_SUPPORTED'
+            });
+        }
+        if (type === 'unknown') {
+            throw new TRPCError.TRPCError({
+                message: `Unexpected request method ${req.method}`,
+                code: 'METHOD_NOT_SUPPORTED'
+            });
+        }
+        const inputs = await contentTypeHandler.getInputs({
+            isBatchCall,
+            req,
+            router,
+            preprocessedBody: opts.preprocessedBody ?? false
+        });
+        paths = isBatchCall ? opts.path.split(',') : [
+            opts.path
+        ];
+        ctx = await opts.createContext();
+        const promises = paths.map((path, index)=>inputToProcedureCall({
+                opts,
+                ctx,
+                type,
+                input: inputs[index],
+                path
+            }));
+        if (!isStreamCall) {
+            /**
+       * Non-streaming response:
+       * - await all responses in parallel, blocking on the slowest one
+       * - create headers with known response body
+       * - return a complete HTTPResponse
+       */ const untransformedJSON = await Promise.all(promises);
+            const errors = untransformedJSON.flatMap((response)=>'error' in response ? [
+                    response.error
+                ] : []);
+            const headResponse1 = initResponse({
+                ctx,
+                paths,
+                type,
+                responseMeta: opts.responseMeta,
+                untransformedJSON,
+                errors
+            });
+            onHead?.(headResponse1);
+            // return body stuff
+            const result = isBatchCall ? untransformedJSON : untransformedJSON[0]; // eslint-disable-line @typescript-eslint/no-non-null-assertion -- `untransformedJSON` should be the length of `paths` which should be at least 1 otherwise there wouldn't be a request at all
+            const transformedJSON = transformTRPCResponse.transformTRPCResponse(router._def._config, result);
+            const body = JSON.stringify(transformedJSON);
+            onChunk?.([
+                -1,
+                body
+            ]);
+            return {
+                status: headResponse1.status,
+                headers: headResponse1.headers,
+                body
+            };
+        }
+        /**
+     * Streaming response:
+     * - block on none, call `onChunk` as soon as each response is ready
+     * - create headers with minimal data (cannot know the response body in advance)
+     * - return void
+     */ const headResponse2 = initResponse({
+            ctx,
+            paths,
+            type,
+            responseMeta: opts.responseMeta
+        });
+        onHead(headResponse2);
+        const indexedPromises = new Map(promises.map((promise, index)=>[
+                index,
+                promise.then((r)=>[
+                        index,
+                        r
+                    ])
+            ]));
+        for(let i = 0; i < paths.length; i++){
+            const [index, untransformedJSON1] = await Promise.race(indexedPromises.values());
+            indexedPromises.delete(index);
+            try {
+                const transformedJSON1 = transformTRPCResponse.transformTRPCResponse(router._def._config, untransformedJSON1);
+                const body1 = JSON.stringify(transformedJSON1);
+                onChunk([
+                    index,
+                    body1
+                ]);
+            } catch (cause) {
+                const path = paths[index];
+                const input = inputs[index];
+                const { body: body2  } = caughtErrorToData(cause, {
+                    opts,
+                    ctx,
+                    type,
+                    path,
+                    input
+                });
+                onChunk([
+                    index,
+                    body2
+                ]);
+            }
+        }
+        return;
+    } catch (cause1) {
+        // we get here if
+        // - batching is called when it's not enabled
+        // - `createContext()` throws
+        // - `router._def._config.transformer.output.serialize()` throws
+        // - post body is too large
+        // - input deserialization fails
+        // - `errorFormatter` return value is malformed
+        const { error , untransformedJSON: untransformedJSON2 , body: body3  } = caughtErrorToData(cause1, {
+            opts,
+            ctx,
+            type
+        });
+        const headResponse3 = initResponse({
+            ctx,
+            paths,
+            type,
+            responseMeta: opts.responseMeta,
+            untransformedJSON: untransformedJSON2,
+            errors: [
+                error
+            ]
+        });
+        onHead?.(headResponse3);
+        onChunk?.([
+            -1,
+            body3
+        ]);
+        return {
+            status: headResponse3.status,
+            headers: headResponse3.headers,
+            body: body3
+        };
+    }
+}
+
+exports.resolveHTTPResponse = resolveHTTPResponse;

package/dist/resolveHTTPResponse-a9be3d96.mjs

@@ -0,0 +1,282 @@
+import { b as callProcedure } from './config-65c5b6d1.mjs';
+import { T as TRPCError, a as getTRPCErrorFromUnknown } from './TRPCError-2b10c8d2.mjs';
+import { t as transformTRPCResponse, g as getErrorShape } from './transformTRPCResponse-3dca0b20.mjs';
+import { g as getJsonContentTypeInputs } from './contentType-acc3be52.mjs';
+import { b as getHTTPStatusCode } from './index-044a193b.mjs';
+
+const HTTP_METHOD_PROCEDURE_TYPE_MAP = {
+    GET: 'query',
+    POST: 'mutation'
+};
+const fallbackContentTypeHandler = {
+    getInputs: getJsonContentTypeInputs
+};
+function initResponse(initOpts) {
+    const { ctx , paths , type , responseMeta , untransformedJSON , errors =[] ,  } = initOpts;
+    let status = untransformedJSON ? getHTTPStatusCode(untransformedJSON) : 200;
+    const headers = {
+        'Content-Type': 'application/json'
+    };
+    const eagerGeneration = !untransformedJSON;
+    const data = eagerGeneration ? [] : Array.isArray(untransformedJSON) ? untransformedJSON : [
+        untransformedJSON
+    ];
+    const meta = responseMeta?.({
+        ctx,
+        paths,
+        type,
+        data,
+        errors,
+        eagerGeneration
+    }) ?? {};
+    for (const [key, value] of Object.entries(meta.headers ?? {})){
+        headers[key] = value;
+    }
+    if (meta.status) {
+        status = meta.status;
+    }
+    return {
+        status,
+        headers
+    };
+}
+async function inputToProcedureCall(procedureOpts) {
+    const { opts , ctx , type , input , path  } = procedureOpts;
+    try {
+        const data = await callProcedure({
+            procedures: opts.router._def.procedures,
+            path,
+            rawInput: input,
+            ctx,
+            type
+        });
+        return {
+            result: {
+                data
+            }
+        };
+    } catch (cause) {
+        const error = getTRPCErrorFromUnknown(cause);
+        opts.onError?.({
+            error,
+            path,
+            input,
+            ctx,
+            type: type,
+            req: opts.req
+        });
+        return {
+            error: getErrorShape({
+                config: opts.router._def._config,
+                error,
+                type,
+                path,
+                input,
+                ctx
+            })
+        };
+    }
+}
+function caughtErrorToData(cause, errorOpts) {
+    const { router , req , onError  } = errorOpts.opts;
+    const error = getTRPCErrorFromUnknown(cause);
+    onError?.({
+        error,
+        path: errorOpts.path,
+        input: errorOpts.input,
+        ctx: errorOpts.ctx,
+        type: errorOpts.type,
+        req
+    });
+    const untransformedJSON = {
+        error: getErrorShape({
+            config: router._def._config,
+            error,
+            type: errorOpts.type,
+            path: errorOpts.path,
+            input: errorOpts.input,
+            ctx: errorOpts.ctx
+        })
+    };
+    const transformedJSON = transformTRPCResponse(router._def._config, untransformedJSON);
+    const body = JSON.stringify(transformedJSON);
+    return {
+        error,
+        untransformedJSON,
+        body
+    };
+}
+// implementation
+async function resolveHTTPResponse(opts) {
+    const { router , req , onHead , onChunk  } = opts;
+    if (req.method === 'HEAD') {
+        // can be used for lambda warmup
+        const headResponse = {
+            status: 204
+        };
+        onHead?.(headResponse);
+        onChunk?.([
+            -1,
+            ''
+        ]);
+        return headResponse;
+    }
+    const contentTypeHandler = opts.contentTypeHandler ?? fallbackContentTypeHandler;
+    const batchingEnabled = opts.batching?.enabled ?? true;
+    const type = HTTP_METHOD_PROCEDURE_TYPE_MAP[req.method] ?? 'unknown';
+    let ctx = undefined;
+    let paths;
+    const isBatchCall = !!req.query.get('batch');
+    const isStreamCall = isBatchCall && onHead && onChunk && req.headers['trpc-batch-mode'] === 'stream';
+    try {
+        if (opts.error) {
+            throw opts.error;
+        }
+        if (isBatchCall && !batchingEnabled) {
+            throw new Error(`Batching is not enabled on the server`);
+        }
+        /* istanbul ignore if -- @preserve */ if (type === 'subscription') {
+            throw new TRPCError({
+                message: 'Subscriptions should use wsLink',
+                code: 'METHOD_NOT_SUPPORTED'
+            });
+        }
+        if (type === 'unknown') {
+            throw new TRPCError({
+                message: `Unexpected request method ${req.method}`,
+                code: 'METHOD_NOT_SUPPORTED'
+            });
+        }
+        const inputs = await contentTypeHandler.getInputs({
+            isBatchCall,
+            req,
+            router,
+            preprocessedBody: opts.preprocessedBody ?? false
+        });
+        paths = isBatchCall ? opts.path.split(',') : [
+            opts.path
+        ];
+        ctx = await opts.createContext();
+        const promises = paths.map((path, index)=>inputToProcedureCall({
+                opts,
+                ctx,
+                type,
+                input: inputs[index],
+                path
+            }));
+        if (!isStreamCall) {
+            /**
+       * Non-streaming response:
+       * - await all responses in parallel, blocking on the slowest one
+       * - create headers with known response body
+       * - return a complete HTTPResponse
+       */ const untransformedJSON = await Promise.all(promises);
+            const errors = untransformedJSON.flatMap((response)=>'error' in response ? [
+                    response.error
+                ] : []);
+            const headResponse1 = initResponse({
+                ctx,
+                paths,
+                type,
+                responseMeta: opts.responseMeta,
+                untransformedJSON,
+                errors
+            });
+            onHead?.(headResponse1);
+            // return body stuff
+            const result = isBatchCall ? untransformedJSON : untransformedJSON[0]; // eslint-disable-line @typescript-eslint/no-non-null-assertion -- `untransformedJSON` should be the length of `paths` which should be at least 1 otherwise there wouldn't be a request at all
+            const transformedJSON = transformTRPCResponse(router._def._config, result);
+            const body = JSON.stringify(transformedJSON);
+            onChunk?.([
+                -1,
+                body
+            ]);
+            return {
+                status: headResponse1.status,
+                headers: headResponse1.headers,
+                body
+            };
+        }
+        /**
+     * Streaming response:
+     * - block on none, call `onChunk` as soon as each response is ready
+     * - create headers with minimal data (cannot know the response body in advance)
+     * - return void
+     */ const headResponse2 = initResponse({
+            ctx,
+            paths,
+            type,
+            responseMeta: opts.responseMeta
+        });
+        onHead(headResponse2);
+        const indexedPromises = new Map(promises.map((promise, index)=>[
+                index,
+                promise.then((r)=>[
+                        index,
+                        r
+                    ])
+            ]));
+        for(let i = 0; i < paths.length; i++){
+            const [index, untransformedJSON1] = await Promise.race(indexedPromises.values());
+            indexedPromises.delete(index);
+            try {
+                const transformedJSON1 = transformTRPCResponse(router._def._config, untransformedJSON1);
+                const body1 = JSON.stringify(transformedJSON1);
+                onChunk([
+                    index,
+                    body1
+                ]);
+            } catch (cause) {
+                const path = paths[index];
+                const input = inputs[index];
+                const { body: body2  } = caughtErrorToData(cause, {
+                    opts,
+                    ctx,
+                    type,
+                    path,
+                    input
+                });
+                onChunk([
+                    index,
+                    body2
+                ]);
+            }
+        }
+        return;
+    } catch (cause1) {
+        // we get here if
+        // - batching is called when it's not enabled
+        // - `createContext()` throws
+        // - `router._def._config.transformer.output.serialize()` throws
+        // - post body is too large
+        // - input deserialization fails
+        // - `errorFormatter` return value is malformed
+        const { error , untransformedJSON: untransformedJSON2 , body: body3  } = caughtErrorToData(cause1, {
+            opts,
+            ctx,
+            type
+        });
+        const headResponse3 = initResponse({
+            ctx,
+            paths,
+            type,
+            responseMeta: opts.responseMeta,
+            untransformedJSON: untransformedJSON2,
+            errors: [
+                error
+            ]
+        });
+        onHead?.(headResponse3);
+        onChunk?.([
+            -1,
+            body3
+        ]);
+        return {
+            status: headResponse3.status,
+            headers: headResponse3.headers,
+            body: body3
+        };
+    }
+}
+
+export { resolveHTTPResponse as r };

package/dist/subscription.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"subscription.d.ts","sourceRoot":"","sources":["../src/subscription.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAc,MAAM,cAAc,CAAC;AAEhE;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,IAAI,EAAE;IACrD;;OAEG;IACH,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC9D,GAAG,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC,CA2B/B"}
+{"version":3,"file":"subscription.d.ts","sourceRoot":"","sources":["../src/subscription.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAc,QAAQ,EAAE,MAAM,cAAc,CAAC;AAEhE;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,IAAI,EAAE;IACrD;;OAEG;IACH,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC9D,GAAG,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC,CA2B/B"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/server",
-  "version": "10.28.1",
+  "version": "10.29.0",
   "description": "The tRPC server library",
   "author": "KATT",
   "license": "MIT",
@@ -143,7 +143,7 @@
     "@types/express": "^4.17.17",
     "@types/hash-sum": "^1.0.0",
     "@types/node": "^18.16.16",
-    "@types/react": "^18.2.6",
+    "@types/react": "^18.2.8",
     "@types/react-dom": "^18.2.4",
     "@types/ws": "^8.2.0",
     "@web3-storage/multipart-parser": "^1.0.0",
@@ -164,7 +164,7 @@
     "superstruct": "^1.0.0",
     "tslib": "^2.5.0",
     "tsx": "^3.12.7",
-    "typescript": "^5.0.4",
+    "typescript": "^5.1.3",
     "vitest": "^0.28.5",
     "ws": "^8.0.0",
     "yup": "^1.0.0",
@@ -173,5 +173,5 @@
   "funding": [
     "https://trpc.io/sponsor"
   ],
-  "gitHead": "ea70b1c33899b66f964a7d11f5a8710148f03f8e"
+  "gitHead": "49b0a55b74b57bbf7451dad5976d315d9fb7785c"
 }

package/src/adapters/aws-lambda/index.ts

@@ -1,9 +1,9 @@
 import type {
-  Context as APIGWContext,
   APIGatewayProxyEvent,
   APIGatewayProxyEventV2,
   APIGatewayProxyResult,
   APIGatewayProxyStructuredResultV2,
+  Context as APIGWContext,
 } from 'aws-lambda';
 import { TRPCError } from '../..';
 import { AnyRouter, inferRouterContext } from '../../core';
@@ -13,12 +13,12 @@ import {
   APIGatewayEvent,
   APIGatewayResult,
   AWSLambdaOptions,
-  UNKNOWN_PAYLOAD_FORMAT_VERSION_ERROR_MESSAGE,
   getHTTPMethod,
   getPath,
   isPayloadV1,
   isPayloadV2,
   transformHeaders,
+  UNKNOWN_PAYLOAD_FORMAT_VERSION_ERROR_MESSAGE,
 } from './utils';
 
 export * from './utils';

package/src/adapters/aws-lambda/utils.ts

@@ -1,9 +1,9 @@
 import type {
-  Context as APIGWContext,
   APIGatewayProxyEvent,
   APIGatewayProxyEventV2,
   APIGatewayProxyResult,
   APIGatewayProxyStructuredResultV2,
+  Context as APIGWContext,
 } from 'aws-lambda';
 import type { AnyRouter, inferRouterContext } from '../../core';
 import { TRPCError } from '../../error/TRPCError';

package/src/adapters/express.ts

@@ -1,9 +1,9 @@
 import type * as express from 'express';
 import { AnyRouter } from '../core';
-import { nodeHTTPRequestHandler } from './node-http';
 import {
   NodeHTTPCreateContextFnOptions,
   NodeHTTPHandlerOptions,
+  nodeHTTPRequestHandler,
 } from './node-http';
 
 export type CreateExpressContextOptions = NodeHTTPCreateContextFnOptions<