@trpc/server 10.13.2 → 10.14.1

package/dist/nodeHTTPRequestHandler-41accae1.mjs

@@ -0,0 +1,92 @@
+import { r as resolveHTTPResponse } from './resolveHTTPResponse-5c43d189.mjs';
+import { T as TRPCError } from './TRPCError-226f5343.mjs';
+
+async function getPostBody(opts) {
+    const { req , maxBodySize =Infinity  } = opts;
+    return new Promise((resolve)=>{
+        if ('body' in req) {
+            resolve({
+                ok: true,
+                data: req.body
+            });
+            return;
+        }
+        let body = '';
+        let hasBody = false;
+        req.on('data', function(data) {
+            body += data;
+            hasBody = true;
+            if (body.length > maxBodySize) {
+                resolve({
+                    ok: false,
+                    error: new TRPCError({
+                        code: 'PAYLOAD_TOO_LARGE'
+                    })
+                });
+                req.socket.destroy();
+            }
+        });
+        req.on('end', ()=>{
+            resolve({
+                ok: true,
+                data: hasBody ? body : undefined
+            });
+        });
+    });
+}
+
+async function nodeHTTPRequestHandler(opts) {
+    const handleViaMiddleware = opts.middleware ?? ((_req, _res, next)=>{
+        return next();
+    });
+    return handleViaMiddleware(opts.req, opts.res, async (err)=>{
+        if (err) {
+            throw err;
+        }
+        //
+        // Build tRPC dependencies
+        async function createContext() {
+            return await opts.createContext?.(opts);
+        }
+        const bodyResult = await getPostBody(opts);
+        const query = opts.req.query ? new URLSearchParams(opts.req.query) : new URLSearchParams(opts.req.url.split('?')[1]);
+        const req = {
+            method: opts.req.method,
+            headers: opts.req.headers,
+            query,
+            body: bodyResult.ok ? bodyResult.data : undefined
+        };
+        //
+        // Invoke tRPC
+        const result = await resolveHTTPResponse({
+            batching: opts.batching,
+            responseMeta: opts.responseMeta,
+            path: opts.path,
+            createContext,
+            router: opts.router,
+            req,
+            error: bodyResult.ok ? null : bodyResult.error,
+            onError (o) {
+                opts?.onError?.({
+                    ...o,
+                    req: opts.req
+                });
+            }
+        });
+        //
+        // Handle result
+        const { res  } = opts;
+        if ('status' in result && (!res.statusCode || res.statusCode === 200)) {
+            res.statusCode = result.status;
+        }
+        for (const [key, value] of Object.entries(result.headers ?? {})){
+            if (typeof value === 'undefined') {
+                continue;
+            }
+            res.setHeader(key, value);
+        }
+        res.end(result.body);
+    });
+}
+
+export { nodeHTTPRequestHandler as n };

package/dist/nodeHTTPRequestHandler-4f981ca6.js

@@ -0,0 +1,94 @@
+'use strict';
+
+var resolveHTTPResponse = require('./resolveHTTPResponse-4798ae79.js');
+var TRPCError = require('./TRPCError-98f26ad6.js');
+
+async function getPostBody(opts) {
+    const { req , maxBodySize =Infinity  } = opts;
+    return new Promise((resolve)=>{
+        if ('body' in req) {
+            resolve({
+                ok: true,
+                data: req.body
+            });
+            return;
+        }
+        let body = '';
+        let hasBody = false;
+        req.on('data', function(data) {
+            body += data;
+            hasBody = true;
+            if (body.length > maxBodySize) {
+                resolve({
+                    ok: false,
+                    error: new TRPCError.TRPCError({
+                        code: 'PAYLOAD_TOO_LARGE'
+                    })
+                });
+                req.socket.destroy();
+            }
+        });
+        req.on('end', ()=>{
+            resolve({
+                ok: true,
+                data: hasBody ? body : undefined
+            });
+        });
+    });
+}
+
+async function nodeHTTPRequestHandler(opts) {
+    const handleViaMiddleware = opts.middleware ?? ((_req, _res, next)=>{
+        return next();
+    });
+    return handleViaMiddleware(opts.req, opts.res, async (err)=>{
+        if (err) {
+            throw err;
+        }
+        //
+        // Build tRPC dependencies
+        async function createContext() {
+            return await opts.createContext?.(opts);
+        }
+        const bodyResult = await getPostBody(opts);
+        const query = opts.req.query ? new URLSearchParams(opts.req.query) : new URLSearchParams(opts.req.url.split('?')[1]);
+        const req = {
+            method: opts.req.method,
+            headers: opts.req.headers,
+            query,
+            body: bodyResult.ok ? bodyResult.data : undefined
+        };
+        //
+        // Invoke tRPC
+        const result = await resolveHTTPResponse.resolveHTTPResponse({
+            batching: opts.batching,
+            responseMeta: opts.responseMeta,
+            path: opts.path,
+            createContext,
+            router: opts.router,
+            req,
+            error: bodyResult.ok ? null : bodyResult.error,
+            onError (o) {
+                opts?.onError?.({
+                    ...o,
+                    req: opts.req
+                });
+            }
+        });
+        //
+        // Handle result
+        const { res  } = opts;
+        if ('status' in result && (!res.statusCode || res.statusCode === 200)) {
+            res.statusCode = result.status;
+        }
+        for (const [key, value] of Object.entries(result.headers ?? {})){
+            if (typeof value === 'undefined') {
+                continue;
+            }
+            res.setHeader(key, value);
+        }
+        res.end(result.body);
+    });
+}
+
+exports.nodeHTTPRequestHandler = nodeHTTPRequestHandler;

package/dist/{resolveHTTPResponse-cbfdc43d.js → resolveHTTPResponse-4798ae79.js}

@@ -1,7 +1,7 @@
 'use strict';
 
-var config = require('./config-bd759464.js');
-var TRPCError = require('./TRPCError-4cbab0d0.js');
+var config = require('./config-046e82fc.js');
+var TRPCError = require('./TRPCError-98f26ad6.js');
 var transformTRPCResponse = require('./transformTRPCResponse-d2700b72.js');
 
 const HTTP_METHOD_PROCEDURE_TYPE_MAP = {

package/dist/{resolveHTTPResponse-8e9dd846.mjs → resolveHTTPResponse-5c43d189.mjs}

@@ -1,5 +1,5 @@
-import { e as callProcedure, f as getHTTPStatusCode } from './config-fb5f49a1.mjs';
-import { T as TRPCError, a as getTRPCErrorFromUnknown, g as getCauseFromUnknown } from './TRPCError-e7333eae.mjs';
+import { e as callProcedure, f as getHTTPStatusCode } from './config-61d48858.mjs';
+import { T as TRPCError, a as getTRPCErrorFromUnknown, g as getCauseFromUnknown } from './TRPCError-226f5343.mjs';
 import { t as transformTRPCResponse } from './transformTRPCResponse-7a73a2df.mjs';
 
 const HTTP_METHOD_PROCEDURE_TYPE_MAP = {

package/dist/{resolveHTTPResponse-39258d19.js → resolveHTTPResponse-ef105097.js}

@@ -1,5 +1,5 @@
-import { e as callProcedure, f as getHTTPStatusCode } from './config-69ee2314.js';
-import { T as TRPCError, a as getTRPCErrorFromUnknown, g as getCauseFromUnknown } from './TRPCError-ed16b3b7.js';
+import { e as callProcedure, f as getHTTPStatusCode } from './config-cac4535e.js';
+import { T as TRPCError, a as getTRPCErrorFromUnknown, g as getCauseFromUnknown } from './TRPCError-92d93cfd.js';
 import { t as transformTRPCResponse } from './transformTRPCResponse-896669e0.js';
 
 /* eslint-disable @typescript-eslint/no-non-null-assertion */

package/dist/subscription.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var TRPCError = require('./TRPCError-4cbab0d0.js');
+var TRPCError = require('./TRPCError-98f26ad6.js');
 var observable = require('./observable-464116ac.js');
 
 /**

package/dist/subscription.mjs

@@ -1,4 +1,4 @@
-import { a as getTRPCErrorFromUnknown } from './TRPCError-e7333eae.mjs';
+import { a as getTRPCErrorFromUnknown } from './TRPCError-226f5343.mjs';
 import { o as observable } from './observable-ade1bad8.mjs';
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/server",
-  "version": "10.13.2",
+  "version": "10.14.1",
   "description": "tRPC Server",
   "author": "KATT",
   "license": "MIT",
@@ -133,6 +133,7 @@
     "@types/hash-sum": "^1.0.0",
     "@types/node": "^18.7.20",
     "@types/react": "^18.0.9",
+    "@types/react-dom": "^18.0.5",
     "@types/ws": "^8.2.0",
     "aws-lambda": "^1.0.7",
     "devalue": "^4.0.0",
@@ -156,5 +157,5 @@
     "yup": "^1.0.0",
     "zod": "^3.0.0"
   },
-  "gitHead": "5f4fb9641e1f43125f977b3f84268ac7e5884715"
+  "gitHead": "c20c66596798ea772f7684f0319b0dffdde4af2a"
 }

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

@@ -99,6 +99,10 @@ export function getHTTPMethod(event: APIGatewayEvent) {
 
 export function getPath(event: APIGatewayEvent) {
   if (isPayloadV1(event)) {
+    if (!event.pathParameters) {
+      // Then this event was not triggered by a resource denoted with {proxy+}
+      return event.path.split('/').pop() || '';
+    }
     const matches = event.resource.matchAll(/\{(.*?)\}/g);
     for (const match of matches) {
       // eslint-disable-next-line @typescript-eslint/no-non-null-assertion

package/src/adapters/node-http/nodeHTTPRequestHandler.ts

@@ -25,49 +25,72 @@ export async function nodeHTTPRequestHandler<
   TRequest extends NodeHTTPRequest,
   TResponse extends NodeHTTPResponse,
 >(opts: NodeHTTPRequestHandlerOptions<TRouter, TRequest, TResponse>) {
-  const createContext = async function _createContext(): Promise<
-    inferRouterContext<TRouter>
-  > {
-    return await opts.createContext?.(opts);
-  };
-  const { path, router } = opts;
+  const handleViaMiddleware =
+    opts.middleware ??
+    ((_req, _res, next) => {
+      return next();
+    });
 
-  const bodyResult = await getPostBody(opts);
+  return handleViaMiddleware(opts.req, opts.res, async (err) => {
+    if (err) {
+      throw err;
+    }
 
-  const query = opts.req.query
-    ? new URLSearchParams(opts.req.query as any)
-    : new URLSearchParams(opts.req.url!.split('?')[1]);
-  const req: HTTPRequest = {
-    method: opts.req.method!,
-    headers: opts.req.headers,
-    query,
-    body: bodyResult.ok ? bodyResult.data : undefined,
-  };
-  const result = await resolveHTTPResponse({
-    batching: opts.batching,
-    responseMeta: opts.responseMeta,
-    path,
-    createContext,
-    router,
-    req,
-    error: bodyResult.ok ? null : bodyResult.error,
-    onError(o) {
-      opts?.onError?.({
-        ...o,
-        req: opts.req,
-      });
-    },
-  });
+    //
+    // Build tRPC dependencies
 
-  const { res } = opts;
-  if ('status' in result && (!res.statusCode || res.statusCode === 200)) {
-    res.statusCode = result.status;
-  }
-  for (const [key, value] of Object.entries(result.headers ?? {})) {
-    if (typeof value === 'undefined') {
-      continue;
+    async function createContext(): Promise<inferRouterContext<TRouter>> {
+      return await opts.createContext?.(opts);
     }
-    res.setHeader(key, value);
-  }
-  res.end(result.body);
+
+    const bodyResult = await getPostBody(opts);
+
+    const query = opts.req.query
+      ? new URLSearchParams(opts.req.query as any)
+      : new URLSearchParams(opts.req.url!.split('?')[1]);
+
+    const req: HTTPRequest = {
+      method: opts.req.method!,
+      headers: opts.req.headers,
+      query,
+      body: bodyResult.ok ? bodyResult.data : undefined,
+    };
+
+    //
+    // Invoke tRPC
+
+    const result = await resolveHTTPResponse({
+      batching: opts.batching,
+      responseMeta: opts.responseMeta,
+      path: opts.path,
+      createContext,
+      router: opts.router,
+      req,
+      error: bodyResult.ok ? null : bodyResult.error,
+      onError(o) {
+        opts?.onError?.({
+          ...o,
+          req: opts.req,
+        });
+      },
+    });
+
+    //
+    // Handle result
+
+    const { res } = opts;
+    if ('status' in result && (!res.statusCode || res.statusCode === 200)) {
+      res.statusCode = result.status;
+    }
+
+    for (const [key, value] of Object.entries(result.headers ?? {})) {
+      if (typeof value === 'undefined') {
+        continue;
+      }
+
+      res.setHeader(key, value);
+    }
+
+    res.end(result.body);
+  });
 }

package/src/adapters/node-http/types.ts

@@ -31,11 +31,38 @@ export type NodeHTTPCreateContextOption<
       createContext: NodeHTTPCreateContextFn<TRouter, TRequest, TResponse>;
     };
 
+/**
+ * @internal
+ */
+interface ConnectMiddleware<
+  TRequest extends NodeHTTPRequest = NodeHTTPRequest,
+  TResponse extends NodeHTTPResponse = NodeHTTPResponse,
+> {
+  (req: TRequest, res: TResponse, next: (err?: any) => any): void;
+}
+
 export type NodeHTTPHandlerOptions<
   TRouter extends AnyRouter,
   TRequest extends NodeHTTPRequest,
   TResponse extends NodeHTTPResponse,
 > = HTTPBaseHandlerOptions<TRouter, TRequest> & {
+  /**
+   * By default, http `OPTIONS` requests are not handled, and CORS headers are not returned.
+   *
+   * This can be used to handle them manually or via the `cors` npm package: https://www.npmjs.com/package/cors
+   *
+   * ```ts
+   * import cors from 'cors'
+   *
+   * nodeHTTPRequestHandler({
+   *   cors: cors()
+   * })
+   * ```
+   *
+   * You can also use it for other needs which a connect/node.js compatible middleware can solve,
+   *  though you might wish to consider an alternative solution like the Express adapter if your needs are complex.
+   */
+  middleware?: ConnectMiddleware;
   maxBodySize?: number;
 } & NodeHTTPCreateContextOption<TRouter, TRequest, TResponse>;
 

package/src/core/index.ts

@@ -3,6 +3,7 @@ export type {
   ProcedureRecord,
   ProcedureRouterRecord,
   CreateRouterInner,
+  Router,
 } from './router';
 export { callProcedure } from './router';
 export type {

package/src/error/TRPCError.ts

@@ -6,10 +6,9 @@ import { TRPC_ERROR_CODE_KEY } from '../rpc/codes';
 
 export function getTRPCErrorFromUnknown(cause: unknown): TRPCError {
   const error = getErrorFromUnknown(cause);
-  // this should ideally be an `instanceof TRPCError` but for some reason that isn't working
-  // ref https://github.com/trpc/trpc/issues/331
-  if (error.name === 'TRPCError') {
-    return cause as TRPCError;
+
+  if (error instanceof TRPCError) {
+    return error;
   }
 
   const trpcError = new TRPCError({
@@ -25,7 +24,7 @@ export function getTRPCErrorFromUnknown(cause: unknown): TRPCError {
 }
 
 export class TRPCError extends Error {
-  public readonly cause?;
+  public readonly cause?: Error;
   public readonly code;
 
   constructor(opts: {
@@ -33,20 +32,16 @@ export class TRPCError extends Error {
     code: TRPC_ERROR_CODE_KEY;
     cause?: unknown;
   }) {
-    const code = opts.code;
     const message =
-      opts.message ?? getMessageFromUnknownError(opts.cause, code);
-    const cause: Error | undefined =
+      opts.message ?? getMessageFromUnknownError(opts.cause, opts.code);
+    const cause =
       opts.cause !== undefined ? getErrorFromUnknown(opts.cause) : undefined;
 
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-ignore https://github.com/tc39/proposal-error-cause
     super(message, { cause });
 
-    this.code = code;
-    this.cause = cause;
-    this.name = 'TRPCError';
-
-    Object.setPrototypeOf(this, new.target.prototype);
+    this.code = opts.code;
+    this.name = this.constructor.name;
   }
 }

package/dist/nodeHTTPRequestHandler-40bc6a18.js

@@ -1,81 +0,0 @@
-'use strict';
-
-var resolveHTTPResponse = require('./resolveHTTPResponse-cbfdc43d.js');
-var TRPCError = require('./TRPCError-4cbab0d0.js');
-
-async function getPostBody(opts) {
-    const { req , maxBodySize =Infinity  } = opts;
-    return new Promise((resolve)=>{
-        if ('body' in req) {
-            resolve({
-                ok: true,
-                data: req.body
-            });
-            return;
-        }
-        let body = '';
-        let hasBody = false;
-        req.on('data', function(data) {
-            body += data;
-            hasBody = true;
-            if (body.length > maxBodySize) {
-                resolve({
-                    ok: false,
-                    error: new TRPCError.TRPCError({
-                        code: 'PAYLOAD_TOO_LARGE'
-                    })
-                });
-                req.socket.destroy();
-            }
-        });
-        req.on('end', ()=>{
-            resolve({
-                ok: true,
-                data: hasBody ? body : undefined
-            });
-        });
-    });
-}
-
-async function nodeHTTPRequestHandler(opts) {
-    const createContext = async function _createContext() {
-        return await opts.createContext?.(opts);
-    };
-    const { path , router  } = opts;
-    const bodyResult = await getPostBody(opts);
-    const query = opts.req.query ? new URLSearchParams(opts.req.query) : new URLSearchParams(opts.req.url.split('?')[1]);
-    const req = {
-        method: opts.req.method,
-        headers: opts.req.headers,
-        query,
-        body: bodyResult.ok ? bodyResult.data : undefined
-    };
-    const result = await resolveHTTPResponse.resolveHTTPResponse({
-        batching: opts.batching,
-        responseMeta: opts.responseMeta,
-        path,
-        createContext,
-        router,
-        req,
-        error: bodyResult.ok ? null : bodyResult.error,
-        onError (o) {
-            opts?.onError?.({
-                ...o,
-                req: opts.req
-            });
-        }
-    });
-    const { res  } = opts;
-    if ('status' in result && (!res.statusCode || res.statusCode === 200)) {
-        res.statusCode = result.status;
-    }
-    for (const [key, value] of Object.entries(result.headers ?? {})){
-        if (typeof value === 'undefined') {
-            continue;
-        }
-        res.setHeader(key, value);
-    }
-    res.end(result.body);
-}
-
-exports.nodeHTTPRequestHandler = nodeHTTPRequestHandler;

package/dist/nodeHTTPRequestHandler-4314fa32.mjs

@@ -1,79 +0,0 @@
-import { r as resolveHTTPResponse } from './resolveHTTPResponse-8e9dd846.mjs';
-import { T as TRPCError } from './TRPCError-e7333eae.mjs';
-
-async function getPostBody(opts) {
-    const { req , maxBodySize =Infinity  } = opts;
-    return new Promise((resolve)=>{
-        if ('body' in req) {
-            resolve({
-                ok: true,
-                data: req.body
-            });
-            return;
-        }
-        let body = '';
-        let hasBody = false;
-        req.on('data', function(data) {
-            body += data;
-            hasBody = true;
-            if (body.length > maxBodySize) {
-                resolve({
-                    ok: false,
-                    error: new TRPCError({
-                        code: 'PAYLOAD_TOO_LARGE'
-                    })
-                });
-                req.socket.destroy();
-            }
-        });
-        req.on('end', ()=>{
-            resolve({
-                ok: true,
-                data: hasBody ? body : undefined
-            });
-        });
-    });
-}
-
-async function nodeHTTPRequestHandler(opts) {
-    const createContext = async function _createContext() {
-        return await opts.createContext?.(opts);
-    };
-    const { path , router  } = opts;
-    const bodyResult = await getPostBody(opts);
-    const query = opts.req.query ? new URLSearchParams(opts.req.query) : new URLSearchParams(opts.req.url.split('?')[1]);
-    const req = {
-        method: opts.req.method,
-        headers: opts.req.headers,
-        query,
-        body: bodyResult.ok ? bodyResult.data : undefined
-    };
-    const result = await resolveHTTPResponse({
-        batching: opts.batching,
-        responseMeta: opts.responseMeta,
-        path,
-        createContext,
-        router,
-        req,
-        error: bodyResult.ok ? null : bodyResult.error,
-        onError (o) {
-            opts?.onError?.({
-                ...o,
-                req: opts.req
-            });
-        }
-    });
-    const { res  } = opts;
-    if ('status' in result && (!res.statusCode || res.statusCode === 200)) {
-        res.statusCode = result.status;
-    }
-    for (const [key, value] of Object.entries(result.headers ?? {})){
-        if (typeof value === 'undefined') {
-            continue;
-        }
-        res.setHeader(key, value);
-    }
-    res.end(result.body);
-}
-
-export { nodeHTTPRequestHandler as n };