@trpc/server 10.0.0-alpha.3 → 10.0.0-alpha.32

package/dist/adapters/ws.js

@@ -2,9 +2,9 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var transformTRPCResponse = require('../transformTRPCResponse-bd24f548.js');
-var subscription = require('../subscription-5b7e1eba.js');
-require('events');
+var TRPCError = require('../TRPCError-9050a68d.js');
+var transformTRPCResponse = require('../transformTRPCResponse-0c261655.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,
@@ -96,13 +96,27 @@ function applyWSSHandler(opts) {
   const {
     transformer
   } = router._def;
-  wss.on('connection', (client, req) => {
+  wss.on('connection', async (client, req) => {
     const clientSubscriptions = new Map();
 
     function respond(untransformedJSON) {
       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);
@@ -142,17 +160,21 @@ function applyWSSHandler(opts) {
       try {
         await ctxPromise; // asserts context has been set
 
-        const result = await transformTRPCResponse.callProcedure({
-          path,
-          input,
-          type,
-          router,
-          ctx
-        });
+        const caller = router.createCaller(ctx);
+        const result = await caller[type](path, input);
 
-        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 +183,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 +245,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 +280,14 @@ function applyWSSHandler(opts) {
         });
         respond({
           id,
-          error: json
+          jsonrpc,
+          error: router.getErrorShape({
+            error,
+            type,
+            path,
+            input,
+            ctx
+          })
         });
       }
     }
@@ -263,11 +296,12 @@ function applyWSSHandler(opts) {
       try {
         const msgJSON = JSON.parse(message.toString());
         const msgs = Array.isArray(msgJSON) ? msgJSON : [msgJSON];
-        msgs.map(raw => parseMessage(raw, transformer)).map(handleRequest);
+        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
+          cause: TRPCError.getCauseFromUnknown(cause)
         });
         respond({
           id: null,
@@ -283,7 +317,7 @@ function applyWSSHandler(opts) {
     });
     client.once('close', () => {
       for (const sub of clientSubscriptions.values()) {
-        sub.destroy();
+        sub.unsubscribe();
       }
 
       clientSubscriptions.clear();
@@ -295,17 +329,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,
@@ -314,7 +338,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();
@@ -322,7 +355,7 @@ function applyWSSHandler(opts) {
       }
     }
 
-    createContextAsync();
+    await createContextAsync();
   });
   return {
     broadcastReconnectNotification: () => {

package/dist/adapters/ws.mjs

@@ -1,6 +1,6 @@
-import { T as TRPCError, t as transformTRPCResponse, c as callProcedure, g as getErrorFromUnknown } from '../transformTRPCResponse-76e0c91e.mjs';
-import { S as Subscription } from '../subscription-e1d42e69.mjs';
-import 'events';
+import { T as TRPCError, g as getCauseFromUnknown, a as getErrorFromUnknown } from '../TRPCError-b7fa0c31.mjs';
+import { t as transformTRPCResponse } from '../transformTRPCResponse-747b9a68.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,
@@ -92,13 +92,27 @@ function applyWSSHandler(opts) {
   const {
     transformer
   } = router._def;
-  wss.on('connection', (client, req) => {
+  wss.on('connection', async (client, req) => {
     const clientSubscriptions = new Map();
 
     function respond(untransformedJSON) {
       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);
@@ -138,17 +156,21 @@ function applyWSSHandler(opts) {
       try {
         await ctxPromise; // asserts context has been set
 
-        const result = await callProcedure({
-          path,
-          input,
-          type,
-          router,
-          ctx
-        });
+        const caller = router.createCaller(ctx);
+        const result = await caller[type](path, input);
 
-        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 +179,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 +241,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 +252,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 +266,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 +276,14 @@ function applyWSSHandler(opts) {
         });
         respond({
           id,
-          error: json
+          jsonrpc,
+          error: router.getErrorShape({
+            error,
+            type,
+            path,
+            input,
+            ctx
+          })
         });
       }
     }
@@ -259,11 +292,12 @@ function applyWSSHandler(opts) {
       try {
         const msgJSON = JSON.parse(message.toString());
         const msgs = Array.isArray(msgJSON) ? msgJSON : [msgJSON];
-        msgs.map(raw => parseMessage(raw, transformer)).map(handleRequest);
+        const promises = msgs.map(raw => parseMessage(raw, transformer)).map(handleRequest);
+        await Promise.all(promises);
       } catch (cause) {
         const error = new TRPCError({
           code: 'PARSE_ERROR',
-          cause
+          cause: getCauseFromUnknown(cause)
         });
         respond({
           id: null,
@@ -279,7 +313,7 @@ function applyWSSHandler(opts) {
     });
     client.once('close', () => {
       for (const sub of clientSubscriptions.values()) {
-        sub.destroy();
+        sub.unsubscribe();
       }
 
       clientSubscriptions.clear();
@@ -292,16 +326,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,
@@ -310,7 +334,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();
@@ -318,7 +351,7 @@ function applyWSSHandler(opts) {
       }
     }
 
-    createContextAsync();
+    await createContextAsync();
   });
   return {
     broadcastReconnectNotification: () => {

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/core/index.d.ts

@@ -0,0 +1,5 @@
+export type { AnyRouter, ProcedureRouterRecord } from './router';
+export type { Procedure, ProcedureParams } from './procedure';
+export { initTRPC } from './initTRPC';
+export * from './types';
+//# sourceMappingURL=index.d.ts.map

package/dist/core/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,SAAS,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AACjE,YAAY,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9D,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,cAAc,SAAS,CAAC"}