@trpc/server 10.0.0-alpha.21 → 10.0.0-alpha.22

package/dist/adapters/next.js

@@ -2,10 +2,11 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var transformTRPCResponse = require('../transformTRPCResponse-a57d3226.js');
-var nodeHTTPRequestHandler = require('../nodeHTTPRequestHandler-745e43e5.js');
-require('../resolveHTTPResponse-b1167b6a.js');
-require('../codes-4e4d55a9.js');
+var TRPCError = require('../TRPCError-ddec3395.js');
+var nodeHTTPRequestHandler = require('../nodeHTTPRequestHandler-848f07b5.js');
+require('../resolveHTTPResponse-ec3dccaa.js');
+require('../transformTRPCResponse-333bed6c.js');
+require('../envelopes-a953b930.js');
 
 /* eslint-disable @typescript-eslint/no-explicit-any */
 function createNextApiHandler(opts) {
@@ -26,7 +27,7 @@ function createNextApiHandler(opts) {
 
     if (path === null) {
       const error = opts.router.getErrorShape({
-        error: new transformTRPCResponse.TRPCError({
+        error: new TRPCError.TRPCError({
           message: 'Query "trpc" not found - is the file named `[trpc]`.ts or `[...trpc].ts`?',
           code: 'INTERNAL_SERVER_ERROR'
         }),
@@ -35,12 +36,11 @@ function createNextApiHandler(opts) {
         path: undefined,
         input: undefined
       });
-      const json = {
+      res.statusCode = 500;
+      res.json({
         id: -1,
         error
-      };
-      res.statusCode = 500;
-      res.json(json);
+      });
       return;
     }
 

package/dist/adapters/next.mjs

@@ -1,7 +1,8 @@
-import { T as TRPCError } from '../transformTRPCResponse-9fdeecca.mjs';
-import { n as nodeHTTPRequestHandler } from '../nodeHTTPRequestHandler-13c4bded.mjs';
-import '../resolveHTTPResponse-de40fda7.mjs';
-import '../codes-6c13cf43.mjs';
+import { T as TRPCError } from '../TRPCError-7971540a.mjs';
+import { n as nodeHTTPRequestHandler } from '../nodeHTTPRequestHandler-1cdb6383.mjs';
+import '../resolveHTTPResponse-54a79e6c.mjs';
+import '../transformTRPCResponse-e0cba527.mjs';
+import '../envelopes-1deb2fa7.mjs';
 
 /* eslint-disable @typescript-eslint/no-explicit-any */
 function createNextApiHandler(opts) {
@@ -31,12 +32,11 @@ function createNextApiHandler(opts) {
         path: undefined,
         input: undefined
       });
-      const json = {
+      res.statusCode = 500;
+      res.json({
         id: -1,
         error
-      };
-      res.statusCode = 500;
-      res.json(json);
+      });
       return;
     }
 

package/dist/adapters/node-http/index.js

@@ -2,10 +2,11 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var nodeHTTPRequestHandler = require('../../nodeHTTPRequestHandler-745e43e5.js');
-require('../../resolveHTTPResponse-b1167b6a.js');
-require('../../transformTRPCResponse-a57d3226.js');
-require('../../codes-4e4d55a9.js');
+var nodeHTTPRequestHandler = require('../../nodeHTTPRequestHandler-848f07b5.js');
+require('../../resolveHTTPResponse-ec3dccaa.js');
+require('../../TRPCError-ddec3395.js');
+require('../../transformTRPCResponse-333bed6c.js');
+require('../../envelopes-a953b930.js');
 
 
 

package/dist/adapters/node-http/index.mjs

@@ -1,4 +1,5 @@
-export { n as nodeHTTPRequestHandler } from '../../nodeHTTPRequestHandler-13c4bded.mjs';
-import '../../resolveHTTPResponse-de40fda7.mjs';
-import '../../transformTRPCResponse-9fdeecca.mjs';
-import '../../codes-6c13cf43.mjs';
+export { n as nodeHTTPRequestHandler } from '../../nodeHTTPRequestHandler-1cdb6383.mjs';
+import '../../resolveHTTPResponse-54a79e6c.mjs';
+import '../../TRPCError-7971540a.mjs';
+import '../../transformTRPCResponse-e0cba527.mjs';
+import '../../envelopes-1deb2fa7.mjs';

package/dist/adapters/node-http/types.d.ts

@@ -1,9 +1,8 @@
 /// <reference types="node" />
 import { IncomingMessage, ServerResponse } from 'http';
 import qs from 'qs';
-import { inferRouterContext } from '../..';
 import { HTTPBaseHandlerOptions } from '../../http/internals/types';
-import { AnyRouter } from '../../router';
+import { AnyRouter, inferRouterContext } from '../../router';
 export declare type NodeHTTPRequest = IncomingMessage & {
     method?: string;
     query?: qs.ParsedQs;

package/dist/adapters/node-http/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/adapters/node-http/types.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,MAAM,CAAC;AACvD,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,EAAE,kBAAkB,EAAE,MAAM,OAAO,CAAC;AAC3C,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AACpE,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,oBAAY,eAAe,GAAG,eAAe,GAAG;IAC9C,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC;IACpB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB,CAAC;AACF,oBAAY,gBAAgB,GAAG,cAAc,CAAC;AAE9C,oBAAY,2BAA2B,CACrC,OAAO,SAAS,SAAS,EACzB,QAAQ,EACR,SAAS,IACP,OAAO,SAAS,kBAAkB,CAAC,OAAO,CAAC,GAC3C;IACE;;QAEI;IACJ,aAAa,CAAC,EAAE,uBAAuB,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;CACvE,GACD;IACE;;QAEI;IACJ,aAAa,EAAE,uBAAuB,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;CACtE,CAAC;AAEN,oBAAY,sBAAsB,CAChC,OAAO,SAAS,SAAS,EACzB,QAAQ,SAAS,eAAe,EAChC,SAAS,SAAS,gBAAgB,IAChC,sBAAsB,CAAC,OAAO,EAAE,QAAQ,CAAC,GAAG;IAC9C,QAAQ,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/B,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,GAAG,2BAA2B,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;AAE9D,oBAAY,8BAA8B,CAAC,QAAQ,EAAE,SAAS,IAAI;IAChE,GAAG,EAAE,QAAQ,CAAC;IACd,GAAG,EAAE,SAAS,CAAC;CAChB,CAAC;AACF,oBAAY,uBAAuB,CACjC,OAAO,SAAS,SAAS,EACzB,QAAQ,EACR,SAAS,IACP,CACF,IAAI,EAAE,8BAA8B,CAAC,QAAQ,EAAE,SAAS,CAAC,KACtD,kBAAkB,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/adapters/node-http/types.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,MAAM,CAAC;AACvD,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AACpE,OAAO,EAAE,SAAS,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAE7D,oBAAY,eAAe,GAAG,eAAe,GAAG;IAC9C,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC;IACpB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB,CAAC;AACF,oBAAY,gBAAgB,GAAG,cAAc,CAAC;AAE9C,oBAAY,2BAA2B,CACrC,OAAO,SAAS,SAAS,EACzB,QAAQ,EACR,SAAS,IACP,OAAO,SAAS,kBAAkB,CAAC,OAAO,CAAC,GAC3C;IACE;;QAEI;IACJ,aAAa,CAAC,EAAE,uBAAuB,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;CACvE,GACD;IACE;;QAEI;IACJ,aAAa,EAAE,uBAAuB,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;CACtE,CAAC;AAEN,oBAAY,sBAAsB,CAChC,OAAO,SAAS,SAAS,EACzB,QAAQ,SAAS,eAAe,EAChC,SAAS,SAAS,gBAAgB,IAChC,sBAAsB,CAAC,OAAO,EAAE,QAAQ,CAAC,GAAG;IAC9C,QAAQ,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/B,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,GAAG,2BAA2B,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;AAE9D,oBAAY,8BAA8B,CAAC,QAAQ,EAAE,SAAS,IAAI;IAChE,GAAG,EAAE,QAAQ,CAAC;IACd,GAAG,EAAE,SAAS,CAAC;CAChB,CAAC;AACF,oBAAY,uBAAuB,CACjC,OAAO,SAAS,SAAS,EACzB,QAAQ,EACR,SAAS,IACP,CACF,IAAI,EAAE,8BAA8B,CAAC,QAAQ,EAAE,SAAS,CAAC,KACtD,kBAAkB,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC"}

package/dist/adapters/standalone.js

@@ -3,10 +3,11 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var http = require('http');
-var nodeHTTPRequestHandler = require('../nodeHTTPRequestHandler-745e43e5.js');
-require('../resolveHTTPResponse-b1167b6a.js');
-require('../transformTRPCResponse-a57d3226.js');
-require('../codes-4e4d55a9.js');
+var nodeHTTPRequestHandler = require('../nodeHTTPRequestHandler-848f07b5.js');
+require('../resolveHTTPResponse-ec3dccaa.js');
+require('../TRPCError-ddec3395.js');
+require('../transformTRPCResponse-333bed6c.js');
+require('../envelopes-a953b930.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 

package/dist/adapters/standalone.mjs

@@ -1,8 +1,9 @@
 import http from 'http';
-import { n as nodeHTTPRequestHandler } from '../nodeHTTPRequestHandler-13c4bded.mjs';
-import '../resolveHTTPResponse-de40fda7.mjs';
-import '../transformTRPCResponse-9fdeecca.mjs';
-import '../codes-6c13cf43.mjs';
+import { n as nodeHTTPRequestHandler } from '../nodeHTTPRequestHandler-1cdb6383.mjs';
+import '../resolveHTTPResponse-54a79e6c.mjs';
+import '../TRPCError-7971540a.mjs';
+import '../transformTRPCResponse-e0cba527.mjs';
+import '../envelopes-1deb2fa7.mjs';
 
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
 function createHTTPHandler(opts) {

package/dist/adapters/ws.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ws.d.ts","sourceRoot":"","sources":["../../src/adapters/ws.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AACvC,OAAO,EAAE,MAAM,IAAI,CAAC;AAEpB,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AAIrE,OAAO,EAAE,SAAS,EAAqC,MAAM,WAAW,CAAC;AASzE,OAAO,EAAE,2BAA2B,EAAE,MAAM,aAAa,CAAC;AAiE1D;;GAEG;AACH,oBAAY,iBAAiB,CAAC,OAAO,SAAS,SAAS,IAAI,kBAAkB,CAC3E,OAAO,EACP,eAAe,CAChB,GAAG;IACF,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC;CAC1B,GAAG,2BAA2B,CAAC,OAAO,EAAE,eAAe,EAAE,EAAE,CAAC,CAAC;AAE9D,wBAAgB,eAAe,CAAC,OAAO,SAAS,SAAS,EACvD,IAAI,EAAE,iBAAiB,CAAC,OAAO,CAAC;;EAmNjC"}
+{"version":3,"file":"ws.d.ts","sourceRoot":"","sources":["../../src/adapters/ws.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AACvC,OAAO,EAAE,MAAM,IAAI,CAAC;AAEpB,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AAKrE,OAAO,EAAE,SAAS,EAAqC,MAAM,WAAW,CAAC;AAQzE,OAAO,EAAE,2BAA2B,EAAE,MAAM,aAAa,CAAC;AAyE1D;;GAEG;AACH,oBAAY,iBAAiB,CAAC,OAAO,SAAS,SAAS,IAAI,kBAAkB,CAC3E,OAAO,EACP,eAAe,CAChB,GAAG;IACF,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC;CAC1B,GAAG,2BAA2B,CAAC,OAAO,EAAE,eAAe,EAAE,EAAE,CAAC,CAAC;AAE9D,wBAAgB,eAAe,CAAC,OAAO,SAAS,SAAS,EACvD,IAAI,EAAE,iBAAiB,CAAC,OAAO,CAAC;;EAiPjC"}

package/dist/adapters/ws.js

@@ -2,9 +2,9 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var transformTRPCResponse = require('../transformTRPCResponse-a57d3226.js');
-var subscription = require('../subscription-4b936ba3.js');
-require('events');
+var TRPCError = require('../TRPCError-ddec3395.js');
+var transformTRPCResponse = require('../transformTRPCResponse-333bed6c.js');
+var observable = require('../observable-3aa4d911.js');
 
 /* istanbul ignore next */
 function assertIsObject(obj) {
@@ -59,8 +59,8 @@ function parseMessage(obj, transformer) {
   if (method === 'subscription.stop') {
     return {
       id,
-      method,
-      params: undefined
+      jsonrpc,
+      method
     };
   }
 
@@ -73,8 +73,8 @@ function parseMessage(obj, transformer) {
   assertIsString(path);
   const input = transformer.input.deserialize(rawInput);
   return {
-    jsonrpc,
     id,
+    jsonrpc,
     method,
     params: {
       input,
@@ -103,6 +103,20 @@ function applyWSSHandler(opts) {
       client.send(JSON.stringify(transformTRPCResponse.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
@@ -111,12 +125,13 @@ function applyWSSHandler(opts) {
 
     async function handleRequest(msg) {
       const {
-        id
+        id,
+        jsonrpc
       } = msg;
       /* istanbul ignore next */
 
       if (id === null) {
-        throw new transformTRPCResponse.TRPCError({
+        throw new TRPCError.TRPCError({
           code: 'BAD_REQUEST',
           message: '`id` is required'
         });
@@ -126,7 +141,10 @@ function applyWSSHandler(opts) {
         const sub = clientSubscriptions.get(id);
 
         if (sub) {
-          sub.destroy();
+          stopSubscription(sub, {
+            id,
+            jsonrpc
+          });
         }
 
         clientSubscriptions.delete(id);
@@ -150,9 +168,18 @@ function applyWSSHandler(opts) {
           ctx
         });
 
-        if (!(result instanceof subscription.Subscription)) {
+        if (type === 'subscription') {
+          if (!observable.isObservable(result)) {
+            throw new TRPCError.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
@@ -161,12 +188,61 @@ function applyWSSHandler(opts) {
           return;
         }
 
-        const sub = result;
+        const observable$1 = result;
+        const sub = observable$1.subscribe({
+          next(data) {
+            respond({
+              id,
+              jsonrpc,
+              result: {
+                type: 'data',
+                data
+              }
+            });
+          },
+
+          error(err) {
+            var _opts$onError;
+
+            const error = TRPCError.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 */
@@ -174,76 +250,31 @@ function applyWSSHandler(opts) {
 
         if (clientSubscriptions.has(id)) {
           // duplicate request ids for client
-          sub.destroy();
-          throw new transformTRPCResponse.TRPCError({
+          stopSubscription(sub, {
+            id,
+            jsonrpc
+          });
+          throw new TRPCError.TRPCError({
             message: `Duplicate id ${id}`,
             code: 'BAD_REQUEST'
           });
         }
 
         clientSubscriptions.set(id, sub);
-        sub.on('data', data => {
-          respond({
-            id,
-            result: {
-              type: 'data',
-              data
-            }
-          });
-        });
-        sub.on('error', _error => {
-          var _opts$onError;
-
-          const error = transformTRPCResponse.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 */
       {
         var _opts$onError2;
 
         // procedure threw an error
-        const error = transformTRPCResponse.getErrorFromUnknown(cause);
-        const json = router.getErrorShape({
-          error,
-          type,
-          path,
-          input,
-          ctx
-        });
+        const error = TRPCError.getErrorFromUnknown(cause);
         (_opts$onError2 = opts.onError) === null || _opts$onError2 === void 0 ? void 0 : _opts$onError2.call(opts, {
           error,
           path,
@@ -254,7 +285,14 @@ function applyWSSHandler(opts) {
         });
         respond({
           id,
-          error: json
+          jsonrpc,
+          error: router.getErrorShape({
+            error,
+            type,
+            path,
+            input,
+            ctx
+          })
         });
       }
     }
@@ -266,9 +304,9 @@ function applyWSSHandler(opts) {
         const promises = msgs.map(raw => parseMessage(raw, transformer)).map(handleRequest);
         await Promise.all(promises);
       } catch (cause) {
-        const error = new transformTRPCResponse.TRPCError({
+        const error = new TRPCError.TRPCError({
           code: 'PARSE_ERROR',
-          cause: transformTRPCResponse.getCauseFromUnknown(cause)
+          cause: TRPCError.getCauseFromUnknown(cause)
         });
         respond({
           id: null,
@@ -284,7 +322,7 @@ function applyWSSHandler(opts) {
     });
     client.once('close', () => {
       for (const sub of clientSubscriptions.values()) {
-        sub.destroy();
+        sub.unsubscribe();
       }
 
       clientSubscriptions.clear();
@@ -296,17 +334,7 @@ function applyWSSHandler(opts) {
       } catch (cause) {
         var _opts$onError3, _global$setImmediate;
 
-        const error = transformTRPCResponse.getErrorFromUnknown(cause);
-        const json = {
-          id: null,
-          error: router.getErrorShape({
-            error,
-            type: 'unknown',
-            path: undefined,
-            input: undefined,
-            ctx
-          })
-        };
+        const error = TRPCError.getErrorFromUnknown(cause);
         (_opts$onError3 = opts.onError) === null || _opts$onError3 === void 0 ? void 0 : _opts$onError3.call(opts, {
           error,
           path: undefined,
@@ -315,7 +343,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();