@trpc/server 10.0.0-alpha.20 → 10.0.0-alpha.23

package/dist/adapters/ws.mjs

@@ -1,6 +1,6 @@
-import { T as TRPCError, t as transformTRPCResponse, c as callProcedure, g as getErrorFromUnknown } from '../transformTRPCResponse-ff424ff4.mjs';
-import { S as Subscription } from '../subscription-0d8a48ec.mjs';
-import 'events';
+import { T as TRPCError, g as getCauseFromUnknown, a as getErrorFromUnknown } from '../TRPCError-7971540a.mjs';
+import { t as transformTRPCResponse, c as callProcedure } from '../transformTRPCResponse-e0cba527.mjs';
+import { i as isObservable } from '../observable-137ea1bd.mjs';
 
 /* istanbul ignore next */
 function assertIsObject(obj) {
@@ -55,8 +55,8 @@ function parseMessage(obj, transformer) {
   if (method === 'subscription.stop') {
     return {
       id,
-      method,
-      params: undefined
+      jsonrpc,
+      method
     };
   }
 
@@ -69,8 +69,8 @@ function parseMessage(obj, transformer) {
   assertIsString(path);
   const input = transformer.input.deserialize(rawInput);
   return {
-    jsonrpc,
     id,
+    jsonrpc,
     method,
     params: {
       input,
@@ -99,6 +99,20 @@ function applyWSSHandler(opts) {
       client.send(JSON.stringify(transformTRPCResponse(router, untransformedJSON)));
     }
 
+    function stopSubscription(subscription, {
+      id,
+      jsonrpc
+    }) {
+      subscription.unsubscribe();
+      respond({
+        id,
+        jsonrpc,
+        result: {
+          type: 'stopped'
+        }
+      });
+    }
+
     const ctxPromise = createContext === null || createContext === void 0 ? void 0 : createContext({
       req,
       res: client
@@ -107,7 +121,8 @@ function applyWSSHandler(opts) {
 
     async function handleRequest(msg) {
       const {
-        id
+        id,
+        jsonrpc
       } = msg;
       /* istanbul ignore next */
 
@@ -122,7 +137,10 @@ function applyWSSHandler(opts) {
         const sub = clientSubscriptions.get(id);
 
         if (sub) {
-          sub.destroy();
+          stopSubscription(sub, {
+            id,
+            jsonrpc
+          });
         }
 
         clientSubscriptions.delete(id);
@@ -146,9 +164,18 @@ function applyWSSHandler(opts) {
           ctx
         });
 
-        if (!(result instanceof Subscription)) {
+        if (type === 'subscription') {
+          if (!isObservable(result)) {
+            throw new TRPCError({
+              message: `Subscription ${path} did not return an observable`,
+              code: 'INTERNAL_SERVER_ERROR'
+            });
+          }
+        } else {
+          // send the value as data if the method is not a subscription
           respond({
             id,
+            jsonrpc,
             result: {
               type: 'data',
               data: result
@@ -157,12 +184,61 @@ function applyWSSHandler(opts) {
           return;
         }
 
-        const sub = result;
+        const observable = result;
+        const sub = observable.subscribe({
+          next(data) {
+            respond({
+              id,
+              jsonrpc,
+              result: {
+                type: 'data',
+                data
+              }
+            });
+          },
+
+          error(err) {
+            var _opts$onError;
+
+            const error = getErrorFromUnknown(err);
+            (_opts$onError = opts.onError) === null || _opts$onError === void 0 ? void 0 : _opts$onError.call(opts, {
+              error,
+              path,
+              type,
+              ctx,
+              req,
+              input
+            });
+            respond({
+              id,
+              jsonrpc,
+              error: router.getErrorShape({
+                error,
+                type,
+                path,
+                input,
+                ctx
+              })
+            });
+          },
+
+          complete() {
+            respond({
+              id,
+              jsonrpc,
+              result: {
+                type: 'stopped'
+              }
+            });
+          }
+
+        });
         /* istanbul ignore next */
 
         if (client.readyState !== client.OPEN) {
           // if the client got disconnected whilst initializing the subscription
-          sub.destroy();
+          // no need to send stopped message if the client is disconnected
+          sub.unsubscribe();
           return;
         }
         /* istanbul ignore next */
@@ -170,7 +246,10 @@ function applyWSSHandler(opts) {
 
         if (clientSubscriptions.has(id)) {
           // duplicate request ids for client
-          sub.destroy();
+          stopSubscription(sub, {
+            id,
+            jsonrpc
+          });
           throw new TRPCError({
             message: `Duplicate id ${id}`,
             code: 'BAD_REQUEST'
@@ -178,54 +257,13 @@ function applyWSSHandler(opts) {
         }
 
         clientSubscriptions.set(id, sub);
-        sub.on('data', data => {
-          respond({
-            id,
-            result: {
-              type: 'data',
-              data
-            }
-          });
-        });
-        sub.on('error', _error => {
-          var _opts$onError;
-
-          const error = getErrorFromUnknown(_error);
-          const json = {
-            id,
-            error: router.getErrorShape({
-              error,
-              type,
-              path,
-              input,
-              ctx
-            })
-          };
-          (_opts$onError = opts.onError) === null || _opts$onError === void 0 ? void 0 : _opts$onError.call(opts, {
-            error,
-            path,
-            type,
-            ctx,
-            req,
-            input
-          });
-          respond(json);
-        });
-        sub.on('destroy', () => {
-          respond({
-            id,
-            result: {
-              type: 'stopped'
-            }
-          });
-        });
         respond({
           id,
+          jsonrpc,
           result: {
             type: 'started'
           }
         });
-        await sub.start();
       } catch (cause)
       /* istanbul ignore next */
       {
@@ -233,13 +271,6 @@ function applyWSSHandler(opts) {
 
         // procedure threw an error
         const error = getErrorFromUnknown(cause);
-        const json = router.getErrorShape({
-          error,
-          type,
-          path,
-          input,
-          ctx
-        });
         (_opts$onError2 = opts.onError) === null || _opts$onError2 === void 0 ? void 0 : _opts$onError2.call(opts, {
           error,
           path,
@@ -250,7 +281,14 @@ function applyWSSHandler(opts) {
         });
         respond({
           id,
-          error: json
+          jsonrpc,
+          error: router.getErrorShape({
+            error,
+            type,
+            path,
+            input,
+            ctx
+          })
         });
       }
     }
@@ -264,7 +302,7 @@ function applyWSSHandler(opts) {
       } catch (cause) {
         const error = new TRPCError({
           code: 'PARSE_ERROR',
-          cause
+          cause: getCauseFromUnknown(cause)
         });
         respond({
           id: null,
@@ -280,7 +318,7 @@ function applyWSSHandler(opts) {
     });
     client.once('close', () => {
       for (const sub of clientSubscriptions.values()) {
-        sub.destroy();
+        sub.unsubscribe();
       }
 
       clientSubscriptions.clear();
@@ -293,16 +331,6 @@ function applyWSSHandler(opts) {
         var _opts$onError3, _global$setImmediate;
 
         const error = getErrorFromUnknown(cause);
-        const json = {
-          id: null,
-          error: router.getErrorShape({
-            error,
-            type: 'unknown',
-            path: undefined,
-            input: undefined,
-            ctx
-          })
-        };
         (_opts$onError3 = opts.onError) === null || _opts$onError3 === void 0 ? void 0 : _opts$onError3.call(opts, {
           error,
           path: undefined,
@@ -311,7 +339,16 @@ function applyWSSHandler(opts) {
           req,
           input: undefined
         });
-        respond(json); // close in next tick
+        respond({
+          id: null,
+          error: router.getErrorShape({
+            error,
+            type: 'unknown',
+            path: undefined,
+            input: undefined,
+            ctx
+          })
+        }); // close in next tick
 
         ((_global$setImmediate = global.setImmediate) !== null && _global$setImmediate !== void 0 ? _global$setImmediate : global.setTimeout)(() => {
           client.close();

package/dist/assertNotBrowser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"assertNotBrowser.d.ts","sourceRoot":"","sources":["../src/assertNotBrowser.ts"],"names":[],"mappings":"AAEA,wBAAgB,gBAAgB,SAQ/B"}
+{"version":3,"file":"assertNotBrowser.d.ts","sourceRoot":"","sources":["../src/assertNotBrowser.ts"],"names":[],"mappings":"AAEA,wBAAgB,gBAAgB,SAS/B"}

package/dist/{codes-7a3d4f65.mjs → envelopes-1deb2fa7.mjs}

@@ -44,6 +44,8 @@ const TRPC_ERROR_CODES_BY_KEY = {
   // 405
   TIMEOUT: -32008,
   // 408
+  CONFLICT: -32009,
+  // 409
   PRECONDITION_FAILED: -32012,
   // 412
   PAYLOAD_TOO_LARGE: -32013,
@@ -53,4 +55,20 @@ const TRPC_ERROR_CODES_BY_KEY = {
 };
 const TRPC_ERROR_CODES_BY_NUMBER = /*#__PURE__*/invert(TRPC_ERROR_CODES_BY_KEY);
 
-export { TRPC_ERROR_CODES_BY_KEY as T, TRPC_ERROR_CODES_BY_NUMBER as a, invert as i };
+/* eslint-disable @typescript-eslint/no-namespace */
+
+/**
+ * Error response
+ */
+
+/**
+ * JSON-RPC 2.0 Specification
+ */
+let JSONRPC2;
+/**
+ * TRPC HTTP Envelopes
+ */
+
+(function (_JSONRPC) {})(JSONRPC2 || (JSONRPC2 = {}));
+
+export { JSONRPC2 as J, TRPC_ERROR_CODES_BY_KEY as T, TRPC_ERROR_CODES_BY_NUMBER as a, invert as i };

package/dist/{codes-7f46544e.js → envelopes-a953b930.js}

@@ -46,6 +46,8 @@ const TRPC_ERROR_CODES_BY_KEY = {
   // 405
   TIMEOUT: -32008,
   // 408
+  CONFLICT: -32009,
+  // 409
   PRECONDITION_FAILED: -32012,
   // 412
   PAYLOAD_TOO_LARGE: -32013,
@@ -55,6 +57,22 @@ const TRPC_ERROR_CODES_BY_KEY = {
 };
 const TRPC_ERROR_CODES_BY_NUMBER = /*#__PURE__*/invert(TRPC_ERROR_CODES_BY_KEY);
 
+/* eslint-disable @typescript-eslint/no-namespace */
+
+/**
+ * Error response
+ */
+
+/**
+ * JSON-RPC 2.0 Specification
+ */
+exports.JSONRPC2 = void 0;
+/**
+ * TRPC HTTP Envelopes
+ */
+
+(function (_JSONRPC) {})(exports.JSONRPC2 || (exports.JSONRPC2 = {}));
+
 exports.TRPC_ERROR_CODES_BY_KEY = TRPC_ERROR_CODES_BY_KEY;
 exports.TRPC_ERROR_CODES_BY_NUMBER = TRPC_ERROR_CODES_BY_NUMBER;
 exports.invert = invert;

package/dist/http/index.d.ts

@@ -1,3 +1,3 @@
 export * from './resolveHTTPResponse';
-export * from './ResponseMeta';
+export * from './responseMeta';
 //# sourceMappingURL=index.d.ts.map

package/dist/http/internals/getHTTPStatusCode.d.ts

@@ -9,6 +9,7 @@ export declare const TRPC_ERROR_CODES_BY_NUMBER: {
     [-32004]: "NOT_FOUND";
     [-32005]: "METHOD_NOT_SUPPORTED";
     [-32008]: "TIMEOUT";
+    [-32009]: "CONFLICT";
     [-32012]: "PRECONDITION_FAILED";
     [-32013]: "PAYLOAD_TOO_LARGE";
     [-32099]: "CLIENT_CLOSED_REQUEST";

package/dist/http/internals/getHTTPStatusCode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getHTTPStatusCode.d.ts","sourceRoot":"","sources":["../../../src/http/internals/getHTTPStatusCode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EAAE,YAAY,EAAE,uBAAuB,EAAE,MAAM,WAAW,CAAC;AAElE,eAAO,MAAM,0BAA0B;;;;;;;;;;;;CAAkC,CAAC;AAC1E,aAAK,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;AAE7B,oBAAY,sBAAsB,GAAG,OAAO,CAAC,OAAO,uBAAuB,CAAC,CAAC;AAsB7E,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,YAAY,GAAG,YAAY,EAAE,OAuBpE;AAED,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,SAAS,UAI1D"}
+{"version":3,"file":"getHTTPStatusCode.d.ts","sourceRoot":"","sources":["../../../src/http/internals/getHTTPStatusCode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EAAE,YAAY,EAAE,uBAAuB,EAAE,MAAM,WAAW,CAAC;AAElE,eAAO,MAAM,0BAA0B;;;;;;;;;;;;;CAAkC,CAAC;AAC1E,aAAK,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;AAE7B,oBAAY,sBAAsB,GAAG,OAAO,CAAC,OAAO,uBAAuB,CAAC,CAAC;AAuB7E,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,YAAY,GAAG,YAAY,EAAE,OAuBpE;AAED,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,SAAS,UAI1D"}

package/dist/http/internals/types.d.ts

@@ -1,8 +1,9 @@
-/// <reference types="node" />
-import { AnyRouter, Dict, ProcedureType, ResponseMeta, TRPCError, inferRouterContext, inferRouterError } from '@trpc/server';
-import { URLSearchParams } from 'url';
-import { BaseHandlerOptions } from '../../internals/BaseHandlerOptions';
+import { TRPCError } from '../../TRPCError';
+import { BaseHandlerOptions } from '../../internals/baseHandlerOptions';
+import { AnyRouter, ProcedureType, inferRouterContext, inferRouterError } from '../../router';
 import { TRPCResponse } from '../../rpc';
+import { Dict } from '../../types';
+import { ResponseMeta } from '../responseMeta';
 export declare type HTTPHeaders = Dict<string | string[]>;
 export interface HTTPResponse {
     status: number;

package/dist/http/internals/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/http/internals/types.ts"],"names":[],"mappings":";AAAA,OAAO,EACL,SAAS,EACT,IAAI,EACJ,aAAa,EACb,YAAY,EACZ,SAAS,EACT,kBAAkB,EAClB,gBAAgB,EACjB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,eAAe,EAAE,MAAM,KAAK,CAAC;AACtC,OAAO,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AACxE,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAEzC,oBAAY,WAAW,GAAG,IAAI,CAAC,MAAM,GAAG,MAAM,EAAE,CAAC,CAAC;AAElD,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,WAAW,CAAC;IACtB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,eAAe,CAAC;IACvB,OAAO,EAAE,WAAW,CAAC;IACrB,IAAI,EAAE,OAAO,CAAC;CACf;AAED,aAAK,cAAc,CAAC,OAAO,SAAS,SAAS,IAAI,CAAC,IAAI,EAAE;IACtD,IAAI,EAAE,YAAY,CAAC,OAAO,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC;IACzD,GAAG,CAAC,EAAE,kBAAkB,CAAC,OAAO,CAAC,CAAC;IAClC;;QAEI;IACJ,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,IAAI,EAAE,aAAa,GAAG,SAAS,CAAC;IAChC,MAAM,EAAE,SAAS,EAAE,CAAC;CACrB,KAAK,YAAY,CAAC;AAEnB;;GAEG;AACH,MAAM,WAAW,sBAAsB,CAAC,OAAO,SAAS,SAAS,EAAE,QAAQ,CACzE,SAAQ,kBAAkB,CAAC,OAAO,EAAE,QAAQ,CAAC;IAC7C;;;;OAIG;IACH,YAAY,CAAC,EAAE,cAAc,CAAC,OAAO,CAAC,CAAC;CACxC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/http/internals/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AACxE,OAAO,EACL,SAAS,EACT,aAAa,EACb,kBAAkB,EAClB,gBAAgB,EACjB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AACnC,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,oBAAY,WAAW,GAAG,IAAI,CAAC,MAAM,GAAG,MAAM,EAAE,CAAC,CAAC;AAElD,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,WAAW,CAAC;IACtB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,eAAe,CAAC;IACvB,OAAO,EAAE,WAAW,CAAC;IACrB,IAAI,EAAE,OAAO,CAAC;CACf;AAED,aAAK,cAAc,CAAC,OAAO,SAAS,SAAS,IAAI,CAAC,IAAI,EAAE;IACtD,IAAI,EAAE,YAAY,CAAC,OAAO,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC;IACzD,GAAG,CAAC,EAAE,kBAAkB,CAAC,OAAO,CAAC,CAAC;IAClC;;QAEI;IACJ,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,IAAI,EAAE,aAAa,GAAG,SAAS,CAAC;IAChC,MAAM,EAAE,SAAS,EAAE,CAAC;CACrB,KAAK,YAAY,CAAC;AAEnB;;GAEG;AACH,MAAM,WAAW,sBAAsB,CAAC,OAAO,SAAS,SAAS,EAAE,QAAQ,CACzE,SAAQ,kBAAkB,CAAC,OAAO,EAAE,QAAQ,CAAC;IAC7C;;;;OAIG;IACH,YAAY,CAAC,EAAE,cAAc,CAAC,OAAO,CAAC,CAAC;CACxC"}

package/dist/http/resolveHTTPResponse.d.ts

@@ -1,6 +1,6 @@
-import { Maybe } from '@trpc/server';
 import { TRPCError } from '../TRPCError';
 import { AnyRouter, inferRouterContext } from '../router';
+import { Maybe } from '../types';
 import { HTTPBaseHandlerOptions, HTTPRequest, HTTPResponse } from './internals/types';
 interface ResolveHTTPRequestOptions<TRouter extends AnyRouter, TRequest extends HTTPRequest> extends HTTPBaseHandlerOptions<TRouter, TRequest> {
     createContext: () => Promise<inferRouterContext<TRouter>>;

package/dist/http/resolveHTTPResponse.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolveHTTPResponse.d.ts","sourceRoot":"","sources":["../../src/http/resolveHTTPResponse.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAIzC,OAAO,EACL,SAAS,EAET,kBAAkB,EAEnB,MAAM,WAAW,CAAC;AAGnB,OAAO,EACL,sBAAsB,EAEtB,WAAW,EACX,YAAY,EACb,MAAM,mBAAmB,CAAC;AA4B3B,UAAU,yBAAyB,CACjC,OAAO,SAAS,SAAS,EACzB,QAAQ,SAAS,WAAW,CAC5B,SAAQ,sBAAsB,CAAC,OAAO,EAAE,QAAQ,CAAC;IACjD,aAAa,EAAE,MAAM,OAAO,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC;IAC1D,GAAG,EAAE,QAAQ,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;CAC1B;AAED,wBAAsB,mBAAmB,CACvC,OAAO,SAAS,SAAS,EACzB,QAAQ,SAAS,WAAW,EAC5B,IAAI,EAAE,yBAAyB,CAAC,OAAO,EAAE,QAAQ,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC,CAmM3E"}
+{"version":3,"file":"resolveHTTPResponse.d.ts","sourceRoot":"","sources":["../../src/http/resolveHTTPResponse.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAIzC,OAAO,EACL,SAAS,EAET,kBAAkB,EAEnB,MAAM,WAAW,CAAC;AAEnB,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAEjC,OAAO,EACL,sBAAsB,EAEtB,WAAW,EACX,YAAY,EACb,MAAM,mBAAmB,CAAC;AA4B3B,UAAU,yBAAyB,CACjC,OAAO,SAAS,SAAS,EACzB,QAAQ,SAAS,WAAW,CAC5B,SAAQ,sBAAsB,CAAC,OAAO,EAAE,QAAQ,CAAC;IACjD,aAAa,EAAE,MAAM,OAAO,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC;IAC1D,GAAG,EAAE,QAAQ,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;CAC1B;AAED,wBAAsB,mBAAmB,CACvC,OAAO,SAAS,SAAS,EACzB,QAAQ,SAAS,WAAW,EAC5B,IAAI,EAAE,yBAAyB,CAAC,OAAO,EAAE,QAAQ,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC,CA+L3E"}

package/dist/http/{ResponseMeta.d.ts → responseMeta.d.ts}

@@ -2,4 +2,4 @@ export interface ResponseMeta {
     status?: number;
     headers?: Record<string, string>;
 }
-//# sourceMappingURL=ResponseMeta.d.ts.map
+//# sourceMappingURL=responseMeta.d.ts.map

package/dist/http/responseMeta.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"responseMeta.d.ts","sourceRoot":"","sources":["../../src/http/responseMeta.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,YAAY;IAC3B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAClC"}

package/dist/index.d.ts

@@ -1,6 +1,5 @@
 export * from './assertNotBrowser';
 export * from './http';
-export * from './subscription';
 export * from './transformer';
 export * from './TRPCError';
 export * from './types';

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,QAAQ,CAAC;AACvB,cAAc,gBAAgB,CAAC;AAC/B,cAAc,eAAe,CAAC;AAC9B,cAAc,aAAa,CAAC;AAC5B,cAAc,SAAS,CAAC;AACxB,cAAc,UAAU,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,QAAQ,CAAC;AACvB,cAAc,eAAe,CAAC;AAC9B,cAAc,aAAa,CAAC;AAC5B,cAAc,SAAS,CAAC;AACxB,cAAc,UAAU,CAAC"}

package/dist/index.js

@@ -2,34 +2,14 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var resolveHTTPResponse = require('./resolveHTTPResponse-c3777a47.js');
-var subscription = require('./subscription-41611bc2.js');
-var transformTRPCResponse = require('./transformTRPCResponse-43a869de.js');
-var codes = require('./codes-7f46544e.js');
-require('events');
+var resolveHTTPResponse = require('./resolveHTTPResponse-ec3dccaa.js');
+var envelopes = require('./envelopes-a953b930.js');
+var TRPCError = require('./TRPCError-ddec3395.js');
+require('./transformTRPCResponse-333bed6c.js');
 
 resolveHTTPResponse.assertNotBrowser();
 
-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
-    };
-  }
-}
+const middlewareMarker = 'middlewareMarker';
 
 /* eslint-disable @typescript-eslint/no-explicit-any */
 resolveHTTPResponse.assertNotBrowser();
@@ -77,21 +57,23 @@ class Procedure {
     this.parseInputFn = void 0;
     this.outputParser = void 0;
     this.parseOutputFn = void 0;
+    this.meta = void 0;
     this.middlewares = opts.middlewares;
     this.resolver = opts.resolver;
     this.inputParser = opts.inputParser;
     this.parseInputFn = getParseFn(this.inputParser);
     this.outputParser = opts.outputParser;
     this.parseOutputFn = getParseFn(this.outputParser);
+    this.meta = opts.meta;
   }
 
   async parseInput(rawInput) {
     try {
       return await this.parseInputFn(rawInput);
     } catch (cause) {
-      throw new transformTRPCResponse.TRPCError({
+      throw new TRPCError.TRPCError({
         code: 'BAD_REQUEST',
-        cause
+        cause: TRPCError.getCauseFromUnknown(cause)
       });
     }
   }
@@ -100,9 +82,9 @@ class Procedure {
     try {
       return await this.parseOutputFn(rawOutput);
     } catch (cause) {
-      throw new transformTRPCResponse.TRPCError({
+      throw new TRPCError.TRPCError({
         code: 'INTERNAL_SERVER_ERROR',
-        cause,
+        cause: TRPCError.getCauseFromUnknown(cause),
         message: 'Output validation failed'
       });
     }
@@ -130,33 +112,42 @@ 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,
-          next: nextFns[index + 1]
-        }));
-
-        if (res.ok) {
-          return res.data;
-        }
-
+          meta: this.meta,
+          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: TRPCError.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({
+      throw new TRPCError.TRPCError({
         code: 'INTERNAL_SERVER_ERROR',
         message: 'No result from middlewares - did you forget to `return next()`?'
       });
@@ -181,7 +172,8 @@ class Procedure {
       middlewares: [...middlewares, ...this.middlewares],
       resolver: this.resolver,
       inputParser: this.inputParser,
-      outputParser: this.outputParser
+      outputParser: this.outputParser,
+      meta: this.meta
     });
     return instance;
   }
@@ -190,7 +182,7 @@ class Procedure {
 function createProcedure(opts) {
   const inputParser = 'input' in opts ? opts.input : input => {
     if (input != null) {
-      throw new transformTRPCResponse.TRPCError({
+      throw new TRPCError.TRPCError({
         code: 'BAD_REQUEST',
         message: 'No input expected'
       });
@@ -203,7 +195,8 @@ function createProcedure(opts) {
     inputParser: inputParser,
     resolver: opts.resolve,
     middlewares: [],
-    outputParser: outputParser
+    outputParser: outputParser,
+    meta: opts.meta
   });
 }
 
@@ -379,7 +372,7 @@ class Router {
     const procedure = defs[path];
 
     if (!procedure) {
-      throw new transformTRPCResponse.TRPCError({
+      throw new TRPCError.TRPCError({
         code: 'NOT_FOUND',
         message: `No "${type}"-procedure on path "${path}"`
       });
@@ -453,7 +446,7 @@ class Router {
     } = opts.error;
     const shape = {
       message: error.message,
-      code: codes.TRPC_ERROR_CODES_BY_KEY[code],
+      code: envelopes.TRPC_ERROR_CODES_BY_KEY[code],
       data: {
         code,
         httpStatus: resolveHTTPResponse.getHTTPStatusCodeFromError(error)
@@ -508,8 +501,6 @@ function router() {
 
 exports.assertNotBrowser = resolveHTTPResponse.assertNotBrowser;
 exports.resolveHTTPResponse = resolveHTTPResponse.resolveHTTPResponse;
-exports.Subscription = subscription.Subscription;
-exports.subscriptionPullFactory = subscription.subscriptionPullFactory;
-exports.TRPCError = transformTRPCResponse.TRPCError;
+exports.TRPCError = TRPCError.TRPCError;
 exports.Router = Router;
 exports.router = router;