@trpc/server 9.23.1-alpha.0 → 9.23.3

package/adapters/fastify/dist/trpc-server-adapters-fastify.cjs.dev.js

@@ -65,7 +65,7 @@ async function fastifyRequestHandler(opts) {
   await res.send(result.body);
 }
 
-/// <reference types="fastify-websocket" />
+/// <reference types="@fastify/websocket" />
 function fastifyTRPCPlugin(fastify, opts, done) {
   var _opts$prefix;
 

package/adapters/fastify/dist/trpc-server-adapters-fastify.cjs.prod.js

@@ -65,7 +65,7 @@ async function fastifyRequestHandler(opts) {
   await res.send(result.body);
 }
 
-/// <reference types="fastify-websocket" />
+/// <reference types="@fastify/websocket" />
 function fastifyTRPCPlugin(fastify, opts, done) {
   var _opts$prefix;
 

package/adapters/fastify/dist/trpc-server-adapters-fastify.esm.js

@@ -61,7 +61,7 @@ async function fastifyRequestHandler(opts) {
   await res.send(result.body);
 }
 
-/// <reference types="fastify-websocket" />
+/// <reference types="@fastify/websocket" />
 function fastifyTRPCPlugin(fastify, opts, done) {
   var _opts$prefix;
 

package/dist/declarations/src/internals/procedure.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"procedure.d.ts","sourceRoot":"../../../../src/internals","sources":["procedure.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"procedure.d.ts","sourceRoot":"../../../../src/internals","sources":["procedure.ts"],"names":[],"mappings":"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"}

package/dist/trpc-server.cjs.dev.js

@@ -40,25 +40,6 @@ const requestHandler = nodeHTTPRequestHandler.nodeHTTPRequestHandler;
 
 const middlewareMarker = /*#__PURE__*/Symbol('middlewareMarker');
 
-/**
- * Wrap a function in a safe wrapper that never throws
- * Returns a discriminated union
- */
-async function wrapCallSafe(fn) {
-  try {
-    const data = await fn();
-    return {
-      ok: true,
-      data
-    };
-  } catch (cause) {
-    return {
-      ok: false,
-      error: cause
-    };
-  }
-}
-
 /* eslint-disable @typescript-eslint/no-explicit-any */
 resolveHTTPResponse.assertNotBrowser();
 
@@ -160,31 +141,39 @@ class Procedure {
         data,
         ctx
       };
-    }]); // create `next()` calls in resolvers
+    }]); // run the middlewares recursively with the resolver as the last one
 
-    const nextFns = middlewaresWithResolver.map((fn, index) => {
-      return async nextOpts => {
-        const res = await wrapCallSafe(() => fn({
-          ctx: nextOpts ? nextOpts.ctx : opts.ctx,
+    const callRecursive = async (callOpts = {
+      index: 0,
+      ctx: opts.ctx
+    }) => {
+      try {
+        const result = await middlewaresWithResolver[callOpts.index]({
+          ctx: callOpts.ctx,
           type: opts.type,
           path: opts.path,
           rawInput: opts.rawInput,
           meta: this.meta,
-          next: nextFns[index + 1]
-        }));
-
-        if (res.ok) {
-          return res.data;
-        }
-
+          next: async nextOpts => {
+            return await callRecursive({
+              index: callOpts.index + 1,
+              ctx: nextOpts ? nextOpts.ctx : callOpts.ctx
+            });
+          }
+        });
+        return result;
+      } catch (cause) {
         return {
+          ctx: callOpts.ctx,
           ok: false,
-          error: transformTRPCResponse.getErrorFromUnknown(res.error)
+          error: transformTRPCResponse.getErrorFromUnknown(cause),
+          marker: middlewareMarker
         };
-      };
-    }); // there's always at least one "next" since we wrap this.resolver in a middleware
+      }
+    }; // there's always at least one "next" since we wrap this.resolver in a middleware
+
 
-    const result = await nextFns[0]();
+    const result = await callRecursive();
 
     if (!result) {
       throw new transformTRPCResponse.TRPCError({

package/dist/trpc-server.cjs.prod.js

@@ -40,25 +40,6 @@ const requestHandler = nodeHTTPRequestHandler.nodeHTTPRequestHandler;
 
 const middlewareMarker = /*#__PURE__*/Symbol('middlewareMarker');
 
-/**
- * Wrap a function in a safe wrapper that never throws
- * Returns a discriminated union
- */
-async function wrapCallSafe(fn) {
-  try {
-    const data = await fn();
-    return {
-      ok: true,
-      data
-    };
-  } catch (cause) {
-    return {
-      ok: false,
-      error: cause
-    };
-  }
-}
-
 /* eslint-disable @typescript-eslint/no-explicit-any */
 resolveHTTPResponse.assertNotBrowser();
 
@@ -160,31 +141,39 @@ class Procedure {
         data,
         ctx
       };
-    }]); // create `next()` calls in resolvers
+    }]); // run the middlewares recursively with the resolver as the last one
 
-    const nextFns = middlewaresWithResolver.map((fn, index) => {
-      return async nextOpts => {
-        const res = await wrapCallSafe(() => fn({
-          ctx: nextOpts ? nextOpts.ctx : opts.ctx,
+    const callRecursive = async (callOpts = {
+      index: 0,
+      ctx: opts.ctx
+    }) => {
+      try {
+        const result = await middlewaresWithResolver[callOpts.index]({
+          ctx: callOpts.ctx,
           type: opts.type,
           path: opts.path,
           rawInput: opts.rawInput,
           meta: this.meta,
-          next: nextFns[index + 1]
-        }));
-
-        if (res.ok) {
-          return res.data;
-        }
-
+          next: async nextOpts => {
+            return await callRecursive({
+              index: callOpts.index + 1,
+              ctx: nextOpts ? nextOpts.ctx : callOpts.ctx
+            });
+          }
+        });
+        return result;
+      } catch (cause) {
         return {
+          ctx: callOpts.ctx,
           ok: false,
-          error: transformTRPCResponse.getErrorFromUnknown(res.error)
+          error: transformTRPCResponse.getErrorFromUnknown(cause),
+          marker: middlewareMarker
         };
-      };
-    }); // there's always at least one "next" since we wrap this.resolver in a middleware
+      }
+    }; // there's always at least one "next" since we wrap this.resolver in a middleware
+
 
-    const result = await nextFns[0]();
+    const result = await callRecursive();
 
     if (!result) {
       throw new transformTRPCResponse.TRPCError({

package/dist/trpc-server.esm.js

@@ -38,25 +38,6 @@ const requestHandler = nodeHTTPRequestHandler;
 
 const middlewareMarker = /*#__PURE__*/Symbol('middlewareMarker');
 
-/**
- * Wrap a function in a safe wrapper that never throws
- * Returns a discriminated union
- */
-async function wrapCallSafe(fn) {
-  try {
-    const data = await fn();
-    return {
-      ok: true,
-      data
-    };
-  } catch (cause) {
-    return {
-      ok: false,
-      error: cause
-    };
-  }
-}
-
 /* eslint-disable @typescript-eslint/no-explicit-any */
 assertNotBrowser();
 
@@ -158,31 +139,39 @@ class Procedure {
         data,
         ctx
       };
-    }]); // create `next()` calls in resolvers
+    }]); // run the middlewares recursively with the resolver as the last one
 
-    const nextFns = middlewaresWithResolver.map((fn, index) => {
-      return async nextOpts => {
-        const res = await wrapCallSafe(() => fn({
-          ctx: nextOpts ? nextOpts.ctx : opts.ctx,
+    const callRecursive = async (callOpts = {
+      index: 0,
+      ctx: opts.ctx
+    }) => {
+      try {
+        const result = await middlewaresWithResolver[callOpts.index]({
+          ctx: callOpts.ctx,
           type: opts.type,
           path: opts.path,
           rawInput: opts.rawInput,
           meta: this.meta,
-          next: nextFns[index + 1]
-        }));
-
-        if (res.ok) {
-          return res.data;
-        }
-
+          next: async nextOpts => {
+            return await callRecursive({
+              index: callOpts.index + 1,
+              ctx: nextOpts ? nextOpts.ctx : callOpts.ctx
+            });
+          }
+        });
+        return result;
+      } catch (cause) {
         return {
+          ctx: callOpts.ctx,
           ok: false,
-          error: getErrorFromUnknown(res.error)
+          error: getErrorFromUnknown(cause),
+          marker: middlewareMarker
         };
-      };
-    }); // there's always at least one "next" since we wrap this.resolver in a middleware
+      }
+    }; // there's always at least one "next" since we wrap this.resolver in a middleware
+
 
-    const result = await nextFns[0]();
+    const result = await callRecursive();
 
     if (!result) {
       throw new TRPCError({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/server",
-  "version": "9.23.1-alpha.0",
+  "version": "9.23.3",
   "description": "tRPC Server",
   "author": "KATT",
   "license": "MIT",
@@ -46,9 +46,7 @@
     "access": "public"
   },
   "devDependencies": {
-    "@testing-library/jest-dom": "^5.14.1",
-    "@testing-library/react": "^12.0.0",
-    "@testing-library/user-event": "^14.1.0",
+    "@fastify/websocket": "^5.0.0",
     "@types/express": "^4.17.12",
     "@types/hash-sum": "^1.0.0",
     "@types/ws": "^8.2.0",
@@ -57,12 +55,11 @@
     "express": "^4.17.1",
     "fastify": "^3.27.1",
     "fastify-plugin": "^3.0.1",
-    "fastify-websocket": "^4.0.0",
     "hash-sum": "^2.0.0",
     "jest": "^27.1.0",
     "konn": "^0.7.0",
     "myzod": "^1.3.1",
-    "next": "12.1.4",
+    "next": "^12.1.6",
     "node-fetch": "^2.6.1",
     "superstruct": "^0.15.2",
     "typescript": "4.4.4",
@@ -70,5 +67,5 @@
     "yup": "^0.32.8",
     "zod": "^3.0.0"
   },
-  "gitHead": "17ba7402893584f606e6181d92f8ef27d5e1638e"
+  "gitHead": "5de8a73b07339a578675a2c479dcb8621f06b3a6"
 }

package/src/adapters/fastify/fastifyTRPCPlugin.ts

@@ -1,4 +1,4 @@
-/// <reference types="fastify-websocket" />
+/// <reference types="@fastify/websocket" />
 import { FastifyInstance, FastifyReply, FastifyRequest } from 'fastify';
 import { FastifyHandlerOptions } from '.';
 import { AnyRouter } from '../..';

package/src/internals/procedure.ts

@@ -4,8 +4,11 @@ import { assertNotBrowser } from '../assertNotBrowser';
 import { ProcedureType } from '../router';
 import { InferLast } from '../types';
 import { getErrorFromUnknown } from './errors';
-import { MiddlewareFunction, middlewareMarker } from './middlewares';
-import { wrapCallSafe } from './wrapCallSafe';
+import {
+  MiddlewareFunction,
+  MiddlewareResult,
+  middlewareMarker,
+} from './middlewares';
 
 assertNotBrowser();
 
@@ -167,7 +170,7 @@ export class Procedure<
   ): Promise<TFinalOutput> {
     // wrap the actual resolver and treat as the last "middleware"
     const middlewaresWithResolver = this.middlewares.concat([
-      async ({ ctx }: { ctx: TContext }) => {
+      async ({ ctx }: { ctx: any }) => {
         const input = await this.parseInput(opts.rawInput);
         const rawOutput = await this.resolver({
           ...opts,
@@ -184,31 +187,40 @@ export class Procedure<
       },
     ]);
 
-    // create `next()` calls in resolvers
-    const nextFns = middlewaresWithResolver.map((fn, index) => {
-      return async (nextOpts?: { ctx: TContext }) => {
-        const res = await wrapCallSafe(() =>
-          fn({
-            ctx: nextOpts ? nextOpts.ctx : opts.ctx,
-            type: opts.type,
-            path: opts.path,
-            rawInput: opts.rawInput,
-            meta: this.meta,
-            next: nextFns[index + 1],
-          }),
-        );
-        if (res.ok) {
-          return res.data;
-        }
+    // run the middlewares recursively with the resolver as the last one
+    const callRecursive = async (
+      callOpts: { ctx: any; index: number } = {
+        index: 0,
+        ctx: opts.ctx,
+      },
+    ): Promise<MiddlewareResult<any>> => {
+      try {
+        const result = await middlewaresWithResolver[callOpts.index]({
+          ctx: callOpts.ctx,
+          type: opts.type,
+          path: opts.path,
+          rawInput: opts.rawInput,
+          meta: this.meta,
+          next: async (nextOpts?: { ctx: any }) => {
+            return await callRecursive({
+              index: callOpts.index + 1,
+              ctx: nextOpts ? nextOpts.ctx : callOpts.ctx,
+            });
+          },
+        });
+        return result;
+      } catch (cause) {
         return {
-          ok: false as const,
-          error: getErrorFromUnknown(res.error),
+          ctx: callOpts.ctx,
+          ok: false,
+          error: getErrorFromUnknown(cause),
+          marker: middlewareMarker,
         };
-      };
-    });
+      }
+    };
 
     // there's always at least one "next" since we wrap this.resolver in a middleware
-    const result = await nextFns[0]();
+    const result = await callRecursive();
     if (!result) {
       throw new TRPCError({
         code: 'INTERNAL_SERVER_ERROR',

package/dist/declarations/src/internals/wrapCallSafe.d.ts

@@ -1,16 +0,0 @@
-declare type AsyncFn<T> = () => Promise<T> | T;
-/**
- * Wrap a function in a safe wrapper that never throws
- * Returns a discriminated union
- */
-export declare function wrapCallSafe<T>(fn: AsyncFn<T>): Promise<{
-    ok: true;
-    data: T;
-    error?: undefined;
-} | {
-    ok: false;
-    error: unknown;
-    data?: undefined;
-}>;
-export {};
-//# sourceMappingURL=wrapCallSafe.d.ts.map

package/dist/declarations/src/internals/wrapCallSafe.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"wrapCallSafe.d.ts","sourceRoot":"../../../../src/internals","sources":["wrapCallSafe.ts"],"names":[],"mappings":"AAAA,aAAK,OAAO,CAAC,CAAC,IAAI,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;AACvC;;;GAGG;AACH,wBAAsB,YAAY,CAAC,CAAC,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC,CAAC;;;;;;;;GAanD"}

package/src/internals/wrapCallSafe.ts

@@ -1,19 +0,0 @@
-type AsyncFn<T> = () => Promise<T> | T;
-/**
- * Wrap a function in a safe wrapper that never throws
- * Returns a discriminated union
- */
-export async function wrapCallSafe<T>(fn: AsyncFn<T>) {
-  try {
-    const data = await fn();
-    return {
-      ok: true as const,
-      data,
-    };
-  } catch (cause) {
-    return {
-      ok: false as const,
-      error: cause,
-    };
-  }
-}