@trpc/server 10.43.0 → 11.0.0-next.91

package/dist/adapters/ws.js

@@ -2,21 +2,73 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var config = require('../config-3ab6b85e.js');
+var router = require('../router-3c22fe56.js');
 var TRPCError = require('../TRPCError-ae7b67e8.js');
+require('../config-60fc2667.js');
 var observable = require('../observable-464116ac.js');
-require('../codes-87f6824b.js');
-var parseTRPCMessage = require('../parseTRPCMessage-1377f305.js');
 var transformTRPCResponse = require('../transformTRPCResponse-e65f34e9.js');
 require('../index-784ff647.js');
+require('../codes-87f6824b.js');
 
+/* istanbul ignore next -- @preserve */ function assertIsObject(obj) {
+    if (typeof obj !== 'object' || Array.isArray(obj) || !obj) {
+        throw new Error('Not an object');
+    }
+}
+/* istanbul ignore next -- @preserve */ function assertIsProcedureType(obj) {
+    if (obj !== 'query' && obj !== 'subscription' && obj !== 'mutation') {
+        throw new Error('Invalid procedure type');
+    }
+}
+/* istanbul ignore next -- @preserve */ function assertIsRequestId(obj) {
+    if (obj !== null && typeof obj === 'number' && isNaN(obj) && typeof obj !== 'string') {
+        throw new Error('Invalid request id');
+    }
+}
+/* istanbul ignore next -- @preserve */ function assertIsString(obj) {
+    if (typeof obj !== 'string') {
+        throw new Error('Invalid string');
+    }
+}
+/* istanbul ignore next -- @preserve */ function assertIsJSONRPC2OrUndefined(obj) {
+    if (typeof obj !== 'undefined' && obj !== '2.0') {
+        throw new Error('Must be JSONRPC 2.0');
+    }
+}
+function parseMessage(obj, transformer) {
+    assertIsObject(obj);
+    const { method , params , id , jsonrpc  } = obj;
+    assertIsRequestId(id);
+    assertIsJSONRPC2OrUndefined(jsonrpc);
+    if (method === 'subscription.stop') {
+        return {
+            id,
+            jsonrpc,
+            method
+        };
+    }
+    assertIsProcedureType(method);
+    assertIsObject(params);
+    const { input: rawInput , path  } = params;
+    assertIsString(path);
+    const input = transformer.input.deserialize(rawInput);
+    return {
+        id,
+        jsonrpc,
+        method,
+        params: {
+            input,
+            path
+        }
+    };
+}
 function applyWSSHandler(opts) {
-    const { wss , createContext , router  } = opts;
-    const { transformer  } = router._def._config;
+    const { wss , createContext , router: router$1  } = opts;
+    const { transformer  } = router$1._def._config;
     wss.on('connection', async (client, req)=>{
         const clientSubscriptions = new Map();
         function respond(untransformedJSON) {
-            client.send(JSON.stringify(transformTRPCResponse.transformTRPCResponse(router._def._config, untransformedJSON)));
+            client.send(JSON.stringify(transformTRPCResponse.transformTRPCResponse(router$1._def._config, untransformedJSON)));
         }
         function stopSubscription(subscription, { id , jsonrpc  }) {
             subscription.unsubscribe();
@@ -56,10 +108,10 @@ function applyWSSHandler(opts) {
             const type = msg.method;
             try {
                 await ctxPromise; // asserts context has been set
-                const result = await config.callProcedure({
-                    procedures: router._def.procedures,
+                const result = await router.callProcedure({
+                    procedures: router$1._def.procedures,
                     path,
-                    rawInput: input,
+                    getRawInput: async ()=>input,
                     ctx,
                     type
                 });
@@ -108,7 +160,7 @@ function applyWSSHandler(opts) {
                             id,
                             jsonrpc,
                             error: transformTRPCResponse.getErrorShape({
-                                config: router._def._config,
+                                config: router$1._def._config,
                                 error,
                                 type,
                                 path,
@@ -167,7 +219,7 @@ function applyWSSHandler(opts) {
                     id,
                     jsonrpc,
                     error: transformTRPCResponse.getErrorShape({
-                        config: router._def._config,
+                        config: router$1._def._config,
                         error,
                         type,
                         path,
@@ -184,7 +236,7 @@ function applyWSSHandler(opts) {
                 const msgs = Array.isArray(msgJSON) ? msgJSON : [
                     msgJSON
                 ];
-                const promises = msgs.map((raw)=>parseTRPCMessage.parseTRPCMessage(raw, transformer)).map(handleRequest);
+                const promises = msgs.map((raw)=>parseMessage(raw, transformer)).map(handleRequest);
                 await Promise.all(promises);
             } catch (cause) {
                 const error = new TRPCError.TRPCError({
@@ -194,7 +246,7 @@ function applyWSSHandler(opts) {
                 respond({
                     id: null,
                     error: transformTRPCResponse.getErrorShape({
-                        config: router._def._config,
+                        config: router$1._def._config,
                         error,
                         type: 'unknown',
                         path: undefined,
@@ -240,7 +292,7 @@ function applyWSSHandler(opts) {
                 respond({
                     id: null,
                     error: transformTRPCResponse.getErrorShape({
-                        config: router._def._config,
+                        config: router$1._def._config,
                         error,
                         type: 'unknown',
                         path: undefined,
@@ -273,3 +325,4 @@ function applyWSSHandler(opts) {
 }
 
 exports.applyWSSHandler = applyWSSHandler;
+exports.parseMessage = parseMessage;

package/dist/adapters/ws.mjs

@@ -1,11 +1,63 @@
-import { b as callProcedure } from '../config-4c0f8e88.mjs';
+import { b as callProcedure } from '../router-5274e533.mjs';
 import { T as TRPCError, g as getTRPCErrorFromUnknown } from '../TRPCError-816ff32e.mjs';
+import '../config-ab4c1c6b.mjs';
 import { i as isObservable } from '../observable-ade1bad8.mjs';
-import '../codes-c924c3db.mjs';
-import { p as parseTRPCMessage } from '../parseTRPCMessage-a0f17853.mjs';
 import { g as getErrorShape, t as transformTRPCResponse } from '../transformTRPCResponse-1153b421.mjs';
 import '../index-f91d720c.mjs';
+import '../codes-c924c3db.mjs';
 
+/* istanbul ignore next -- @preserve */ function assertIsObject(obj) {
+    if (typeof obj !== 'object' || Array.isArray(obj) || !obj) {
+        throw new Error('Not an object');
+    }
+}
+/* istanbul ignore next -- @preserve */ function assertIsProcedureType(obj) {
+    if (obj !== 'query' && obj !== 'subscription' && obj !== 'mutation') {
+        throw new Error('Invalid procedure type');
+    }
+}
+/* istanbul ignore next -- @preserve */ function assertIsRequestId(obj) {
+    if (obj !== null && typeof obj === 'number' && isNaN(obj) && typeof obj !== 'string') {
+        throw new Error('Invalid request id');
+    }
+}
+/* istanbul ignore next -- @preserve */ function assertIsString(obj) {
+    if (typeof obj !== 'string') {
+        throw new Error('Invalid string');
+    }
+}
+/* istanbul ignore next -- @preserve */ function assertIsJSONRPC2OrUndefined(obj) {
+    if (typeof obj !== 'undefined' && obj !== '2.0') {
+        throw new Error('Must be JSONRPC 2.0');
+    }
+}
+function parseMessage(obj, transformer) {
+    assertIsObject(obj);
+    const { method , params , id , jsonrpc  } = obj;
+    assertIsRequestId(id);
+    assertIsJSONRPC2OrUndefined(jsonrpc);
+    if (method === 'subscription.stop') {
+        return {
+            id,
+            jsonrpc,
+            method
+        };
+    }
+    assertIsProcedureType(method);
+    assertIsObject(params);
+    const { input: rawInput , path  } = params;
+    assertIsString(path);
+    const input = transformer.input.deserialize(rawInput);
+    return {
+        id,
+        jsonrpc,
+        method,
+        params: {
+            input,
+            path
+        }
+    };
+}
 function applyWSSHandler(opts) {
     const { wss , createContext , router  } = opts;
     const { transformer  } = router._def._config;
@@ -55,7 +107,7 @@ function applyWSSHandler(opts) {
                 const result = await callProcedure({
                     procedures: router._def.procedures,
                     path,
-                    rawInput: input,
+                    getRawInput: async ()=>input,
                     ctx,
                     type
                 });
@@ -180,7 +232,7 @@ function applyWSSHandler(opts) {
                 const msgs = Array.isArray(msgJSON) ? msgJSON : [
                     msgJSON
                 ];
-                const promises = msgs.map((raw)=>parseTRPCMessage(raw, transformer)).map(handleRequest);
+                const promises = msgs.map((raw)=>parseMessage(raw, transformer)).map(handleRequest);
                 await Promise.all(promises);
             } catch (cause) {
                 const error = new TRPCError({
@@ -268,4 +320,4 @@ function applyWSSHandler(opts) {
     };
 }
 
-export { applyWSSHandler };
+export { applyWSSHandler, parseMessage };