@trpc/server 11.0.0-rc.419 → 11.0.0-rc.432

package/dist/bundle-analysis.json

@@ -1,7 +1,7 @@
 {
-  "bundleSize": 125779,
-  "bundleOrigSize": 175288,
-  "bundleReduction": 28.24,
+  "bundleSize": 125989,
+  "bundleOrigSize": 175377,
+  "bundleReduction": 28.16,
   "modules": [
     {
       "id": "/src/unstable-core-do-not-import/http/resolveResponse.ts",
@@ -14,7 +14,7 @@
       "dependents": [
         "/src/unstable-core-do-not-import.ts"
       ],
-      "percent": 13.57,
+      "percent": 13.55,
       "reduction": 0
     },
     {
@@ -31,7 +31,7 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/http/resolveResponse.ts"
       ],
-      "percent": 12.46,
+      "percent": 12.44,
       "reduction": 6.72
     },
     {
@@ -46,7 +46,7 @@
       "dependents": [
         "/src/adapters/fastify/fastifyTRPCPlugin.ts"
       ],
-      "percent": 9.79,
+      "percent": 9.78,
       "reduction": 0
     },
     {
@@ -61,7 +61,7 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/http/resolveResponse.ts"
       ],
-      "percent": 5.8,
+      "percent": 5.79,
       "reduction": 0
     },
     {
@@ -79,7 +79,7 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/initTRPC.ts"
       ],
-      "percent": 5.07,
+      "percent": 5.06,
       "reduction": 39.72
     },
     {
@@ -94,16 +94,16 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/initTRPC.ts"
       ],
-      "percent": 5.03,
+      "percent": 5.02,
       "reduction": 60.06
     },
     {
       "id": "/src/unstable-core-do-not-import/stream/sse.ts",
-      "size": 5427,
-      "origSize": 7375,
+      "size": 5637,
+      "origSize": 7464,
       "renderedExports": [
         "sse",
-        "isServerSentEventEnvelope",
+        "isSSEMessageEnvelope",
         "sseStreamProducer",
         "sseStreamConsumer",
         "sseHeaders"
@@ -113,8 +113,8 @@
         "/src/unstable-core-do-not-import.ts",
         "/src/unstable-core-do-not-import/http/resolveResponse.ts"
       ],
-      "percent": 4.31,
-      "reduction": 26.41
+      "percent": 4.47,
+      "reduction": 24.48
     },
     {
       "id": "/src/adapters/aws-lambda/getPlanner.ts",
@@ -127,7 +127,7 @@
       "dependents": [
         "/src/adapters/aws-lambda/index.ts"
       ],
-      "percent": 4.31,
+      "percent": 4.3,
       "reduction": 11.38
     },
     {
@@ -193,9 +193,9 @@
       "removedExports": [],
       "dependents": [
         "/src/unstable-core-do-not-import.ts",
+        "/src/unstable-core-do-not-import/http/resolveResponse.ts",
         "/src/unstable-core-do-not-import/initTRPC.ts",
-        "/src/unstable-core-do-not-import/router.ts",
-        "/src/unstable-core-do-not-import/http/resolveResponse.ts"
+        "/src/unstable-core-do-not-import/router.ts"
       ],
       "percent": 2.18,
       "reduction": 45.94
@@ -319,10 +319,10 @@
       "removedExports": [],
       "dependents": [
         "/src/unstable-core-do-not-import.ts",
+        "/src/unstable-core-do-not-import/http/resolveResponse.ts",
         "/src/unstable-core-do-not-import/stream/sse.ts",
         "/src/unstable-core-do-not-import/middleware.ts",
         "/src/unstable-core-do-not-import/router.ts",
-        "/src/unstable-core-do-not-import/http/resolveResponse.ts",
         "/src/unstable-core-do-not-import/http/contentType.ts",
         "/src/unstable-core-do-not-import/procedureBuilder.ts",
         "/src/unstable-core-do-not-import/stream/jsonl.ts"
@@ -339,7 +339,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 1.26,
+      "percent": 1.25,
       "reduction": 21.04
     },
     {
@@ -351,7 +351,7 @@
       ],
       "removedExports": [],
       "dependents": [],
-      "percent": 1.23,
+      "percent": 1.22,
       "reduction": 26.94
     },
     {
@@ -392,10 +392,10 @@
       "removedExports": [],
       "dependents": [
         "/src/unstable-core-do-not-import.ts",
-        "/src/unstable-core-do-not-import/error/getErrorShape.ts",
-        "/src/unstable-core-do-not-import/http/resolveResponse.ts"
+        "/src/unstable-core-do-not-import/http/resolveResponse.ts",
+        "/src/unstable-core-do-not-import/error/getErrorShape.ts"
       ],
-      "percent": 1.01,
+      "percent": 1,
       "reduction": 23.5
     },
     {
@@ -414,15 +414,15 @@
       "removedExports": [],
       "dependents": [
         "/src/unstable-core-do-not-import.ts",
+        "/src/unstable-core-do-not-import/http/resolveResponse.ts",
+        "/src/unstable-core-do-not-import/rpc/parseTRPCMessage.ts",
         "/src/unstable-core-do-not-import/error/TRPCError.ts",
         "/src/unstable-core-do-not-import/stream/sse.ts",
         "/src/unstable-core-do-not-import/transformer.ts",
         "/src/unstable-core-do-not-import/middleware.ts",
         "/src/unstable-core-do-not-import/router.ts",
-        "/src/unstable-core-do-not-import/http/resolveResponse.ts",
         "/src/unstable-core-do-not-import/http/contentType.ts",
         "/src/unstable-core-do-not-import/procedureBuilder.ts",
-        "/src/unstable-core-do-not-import/rpc/parseTRPCMessage.ts",
         "/src/unstable-core-do-not-import/stream/jsonl.ts"
       ],
       "percent": 0.95,
@@ -690,9 +690,9 @@
       "reduction": 93.8
     },
     {
-      "id": "/src/index.ts",
+      "id": "/src/http.ts",
       "size": 0,
-      "origSize": 32,
+      "origSize": 37,
       "renderedExports": [],
       "removedExports": [],
       "dependents": [],
@@ -700,9 +700,9 @@
       "reduction": 100
     },
     {
-      "id": "/src/http.ts",
+      "id": "/src/rpc.ts",
       "size": 0,
-      "origSize": 37,
+      "origSize": 36,
       "renderedExports": [],
       "removedExports": [],
       "dependents": [],
@@ -710,9 +710,9 @@
       "reduction": 100
     },
     {
-      "id": "/src/shared.ts",
+      "id": "/src/index.ts",
       "size": 0,
-      "origSize": 653,
+      "origSize": 32,
       "renderedExports": [],
       "removedExports": [],
       "dependents": [],
@@ -732,9 +732,9 @@
       "reduction": 100
     },
     {
-      "id": "/src/rpc.ts",
+      "id": "/src/shared.ts",
       "size": 0,
-      "origSize": 36,
+      "origSize": 653,
       "renderedExports": [],
       "removedExports": [],
       "dependents": [],
@@ -773,16 +773,6 @@
       "percent": 0,
       "reduction": 100
     },
-    {
-      "id": "/src/adapters/fetch/index.ts",
-      "size": 0,
-      "origSize": 64,
-      "renderedExports": [],
-      "removedExports": [],
-      "dependents": [],
-      "percent": 0,
-      "reduction": 100
-    },
     {
       "id": "/src/adapters/node-http/index.ts",
       "size": 0,
@@ -791,12 +781,22 @@
       "removedExports": [],
       "dependents": [
         "/src/adapters/express.ts",
-        "/src/adapters/next.ts",
         "/src/adapters/standalone.ts",
+        "/src/adapters/next.ts",
         "/src/adapters/fastify/fastifyRequestHandler.ts"
       ],
       "percent": 0,
       "reduction": 100
+    },
+    {
+      "id": "/src/adapters/fetch/index.ts",
+      "size": 0,
+      "origSize": 64,
+      "renderedExports": [],
+      "removedExports": [],
+      "dependents": [],
+      "percent": 0,
+      "reduction": 100
     }
   ],
   "moduleCount": 54

package/dist/unstable-core-do-not-import/stream/sse.d.ts

@@ -2,7 +2,12 @@ import type { ValidateShape } from '../types';
 import type { ConsumerOnError } from './jsonl';
 type Serialize = (value: any) => any;
 type Deserialize = (value: any) => any;
-interface SSEventWithId {
+/**
+ * Server-sent Event Message
+ * @see https://html.spec.whatwg.org/multipage/server-sent-events.html
+ * @public
+ */
+export interface SSEMessage {
     /**
      * The data field of the message - this can be anything
      */
@@ -12,30 +17,16 @@ interface SSEventWithId {
      * Passing this id will allow the client to resume the connection from this point if the connection is lost
      * @see https://html.spec.whatwg.org/multipage/server-sent-events.html#the-last-event-id-header
      */
-    id: string | number;
-    /**
-     * Event name for the message
-     */
-    event?: string;
-    /**
-     * A comment for the event
-     */
-    comment?: string;
+    id: string;
 }
-/**
- * Server-sent Event
- * @see https://html.spec.whatwg.org/multipage/server-sent-events.html
- * @public
- */
-export type SSEvent = Partial<SSEventWithId>;
 declare const sseSymbol: unique symbol;
-export type ServerSentEventEnvelope<TData> = [typeof sseSymbol, TData];
+export type SSEMessageEnvelope<TData> = [typeof sseSymbol, TData];
 /**
- * Produce a typed server-sent event
+ * Produce a typed server-sent event message
  */
-export declare function sse<TData extends SSEvent>(event: ValidateShape<TData, SSEvent>): ServerSentEventEnvelope<TData>;
-export declare function isServerSentEventEnvelope<TData extends SSEvent>(value: unknown): value is ServerSentEventEnvelope<TData>;
-export type SerializedSSEvent = Omit<SSEvent, 'data'> & {
+export declare function sse<TData extends SSEMessage>(event: ValidateShape<TData, SSEMessage>): SSEMessageEnvelope<TData>;
+export declare function isSSEMessageEnvelope<TData extends SSEMessage>(value: unknown): value is SSEMessageEnvelope<TData>;
+export type SerializedSSEvent = Omit<SSEMessage, 'data'> & {
     data?: string;
 };
 /**
@@ -76,7 +67,7 @@ export interface SSEStreamProducerOptions {
  * @see https://html.spec.whatwg.org/multipage/server-sent-events.html
  */
 export declare function sseStreamProducer(opts: SSEStreamProducerOptions): ReadableStream<string>;
-export type inferSSEOutput<TData> = TData extends ServerSentEventEnvelope<infer $Data> ? $Data : TData;
+export type inferSSEOutput<TData> = TData extends SSEMessageEnvelope<infer $Data> ? $Data : TData;
 /**
  * @see https://html.spec.whatwg.org/multipage/server-sent-events.html
  */

package/dist/unstable-core-do-not-import/stream/sse.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sse.d.ts","sourceRoot":"","sources":["../../../src/unstable-core-do-not-import/stream/sse.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAE9C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAI/C,KAAK,SAAS,GAAG,CAAC,KAAK,EAAE,GAAG,KAAK,GAAG,CAAC;AACrC,KAAK,WAAW,GAAG,CAAC,KAAK,EAAE,GAAG,KAAK,GAAG,CAAC;AAEvC,UAAU,aAAa;IACrB;;OAEG;IACH,IAAI,EAAE,OAAO,CAAC;IACd;;;;OAIG;IACH,EAAE,EAAE,MAAM,GAAG,MAAM,CAAC;IACpB;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;;;GAIG;AACH,MAAM,MAAM,OAAO,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;AAE7C,QAAA,MAAM,SAAS,eAA4B,CAAC;AAC5C,MAAM,MAAM,uBAAuB,CAAC,KAAK,IAAI,CAAC,OAAO,SAAS,EAAE,KAAK,CAAC,CAAC;AAEvE;;GAEG;AACH,wBAAgB,GAAG,CAAC,KAAK,SAAS,OAAO,EACvC,KAAK,EAAE,aAAa,CAAC,KAAK,EAAE,OAAO,CAAC,GACnC,uBAAuB,CAAC,KAAK,CAAC,CAEhC;AAED,wBAAgB,yBAAyB,CAAC,KAAK,SAAS,OAAO,EAC7D,KAAK,EAAE,OAAO,GACb,KAAK,IAAI,uBAAuB,CAAC,KAAK,CAAC,CAEzC;AAED,MAAM,MAAM,iBAAiB,GAAG,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,GAAG;IACtD,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAEF;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B;;;OAGG;IACH,OAAO,EAAE,OAAO,CAAC;IACjB;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,wBAAwB;IACvC,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,IAAI,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC;IAC7B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB;;;;OAIG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;;;OAIG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAC;CACjC;AACD;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,wBAAwB,0BA0G/D;AACD,MAAM,MAAM,cAAc,CAAC,KAAK,IAAI,KAAK,SAAS,uBAAuB,CACvE,MAAM,KAAK,CACZ,GACG,KAAK,GACL,KAAK,CAAC;AACV;;GAEG;AAEH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,IAAI,EAAE;IAC7C,IAAI,EAAE,WAAW,CAAC;IAClB,OAAO,CAAC,EAAE,eAAe,CAAC;IAC1B,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B,GAAG,aAAa,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAiEvC;AAED,eAAO,MAAM,UAAU;;;;;CAKb,CAAC"}
+{"version":3,"file":"sse.d.ts","sourceRoot":"","sources":["../../../src/unstable-core-do-not-import/stream/sse.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAE9C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAI/C,KAAK,SAAS,GAAG,CAAC,KAAK,EAAE,GAAG,KAAK,GAAG,CAAC;AACrC,KAAK,WAAW,GAAG,CAAC,KAAK,EAAE,GAAG,KAAK,GAAG,CAAC;AAEvC;;;;GAIG;AACH,MAAM,WAAW,UAAU;IACzB;;OAEG;IACH,IAAI,EAAE,OAAO,CAAC;IACd;;;;OAIG;IACH,EAAE,EAAE,MAAM,CAAC;CACZ;AAED,QAAA,MAAM,SAAS,eAA+B,CAAC;AAC/C,MAAM,MAAM,kBAAkB,CAAC,KAAK,IAAI,CAAC,OAAO,SAAS,EAAE,KAAK,CAAC,CAAC;AAElE;;GAEG;AACH,wBAAgB,GAAG,CAAC,KAAK,SAAS,UAAU,EAC1C,KAAK,EAAE,aAAa,CAAC,KAAK,EAAE,UAAU,CAAC,GACtC,kBAAkB,CAAC,KAAK,CAAC,CAQ3B;AAED,wBAAgB,oBAAoB,CAAC,KAAK,SAAS,UAAU,EAC3D,KAAK,EAAE,OAAO,GACb,KAAK,IAAI,kBAAkB,CAAC,KAAK,CAAC,CAEpC;AAED,MAAM,MAAM,iBAAiB,GAAG,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC,GAAG;IACzD,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAEF;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B;;;OAGG;IACH,OAAO,EAAE,OAAO,CAAC;IACjB;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,wBAAwB;IACvC,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,IAAI,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC;IAC7B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB;;;;OAIG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;;;OAIG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAC;CACjC;AAQD;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,wBAAwB,0BA2G/D;AACD,MAAM,MAAM,cAAc,CAAC,KAAK,IAAI,KAAK,SAAS,kBAAkB,CAClE,MAAM,KAAK,CACZ,GACG,KAAK,GACL,KAAK,CAAC;AACV;;GAEG;AAEH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,IAAI,EAAE;IAC7C,IAAI,EAAE,WAAW,CAAC;IAClB,OAAO,CAAC,EAAE,eAAe,CAAC;IAC1B,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B,GAAG,aAAa,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CA0DvC;AAED,eAAO,MAAM,UAAU;;;;;CAKb,CAAC"}

package/dist/unstable-core-do-not-import/stream/sse.js

@@ -5,16 +5,20 @@ var utils = require('../utils.js');
 var createDeferred = require('./utils/createDeferred.js');
 var createReadableStream = require('./utils/createReadableStream.js');
 
-const sseSymbol = Symbol('SSEventEnvelope');
+const sseSymbol = Symbol('SSEMessageEnvelope');
 /**
- * Produce a typed server-sent event
+ * Produce a typed server-sent event message
  */ function sse(event) {
+    if (event.id === '') {
+        // This could be removed by using different event names for `yield sse(x)`-emitted events and `yield y`-emitted events
+        throw new Error('`id` must not be an empty string as empty string is the same as not setting the id at all');
+    }
     return [
         sseSymbol,
         event
     ];
 }
-function isServerSentEventEnvelope(value) {
+function isSSEMessageEnvelope(value) {
     return Array.isArray(value) && value[0] === sseSymbol;
 }
 /**
@@ -64,11 +68,11 @@ function isServerSentEventEnvelope(value) {
                 break;
             }
             const value = next.value;
-            const data = isServerSentEventEnvelope(value) ? value[1] : {
+            const chunk = isSSEMessageEnvelope(value) ? {
+                ...value[1]
+            } : {
                 data: value
             };
-            const chunk = {};
-            Object.assign(chunk, data);
             if ('data' in chunk) {
                 chunk.data = JSON.stringify(serialize(chunk.data));
             }
@@ -98,6 +102,9 @@ function isServerSentEventEnvelope(value) {
             if ('id' in chunk) {
                 controller.enqueue(`id: ${chunk.id}\n`);
             }
+            if ('comment' in chunk) {
+                controller.enqueue(`: ${chunk.comment}\n`);
+            }
             controller.enqueue('\n\n');
         }
     }));
@@ -110,17 +117,13 @@ function isServerSentEventEnvelope(value) {
     const stream = createReadableStream.createReadableStream();
     const transform = new TransformStream({
         async transform (chunk, controller) {
-            if (chunk.data) {
-                const def = {};
-                def.data = deserialize(JSON.parse(chunk.data));
-                if ('id' in chunk) {
-                    def.id = chunk.id;
-                }
-                if ('event' in chunk) {
-                    def.event = chunk.event;
-                }
-                controller.enqueue(def);
+            const def = {
+                data: deserialize(JSON.parse(chunk.data))
+            };
+            if (chunk.lastEventId) {
+                def.id = chunk.lastEventId;
             }
+            controller.enqueue(def);
         }
     });
     eventSource.addEventListener('message', (msg)=>{
@@ -168,7 +171,7 @@ const sseHeaders = {
     Connection: 'keep-alive'
 };
 
-exports.isServerSentEventEnvelope = isServerSentEventEnvelope;
+exports.isSSEMessageEnvelope = isSSEMessageEnvelope;
 exports.sse = sse;
 exports.sseHeaders = sseHeaders;
 exports.sseStreamConsumer = sseStreamConsumer;

package/dist/unstable-core-do-not-import/stream/sse.mjs

@@ -3,16 +3,20 @@ import { run } from '../utils.mjs';
 import { createTimeoutPromise } from './utils/createDeferred.mjs';
 import { createReadableStream } from './utils/createReadableStream.mjs';
 
-const sseSymbol = Symbol('SSEventEnvelope');
+const sseSymbol = Symbol('SSEMessageEnvelope');
 /**
- * Produce a typed server-sent event
+ * Produce a typed server-sent event message
  */ function sse(event) {
+    if (event.id === '') {
+        // This could be removed by using different event names for `yield sse(x)`-emitted events and `yield y`-emitted events
+        throw new Error('`id` must not be an empty string as empty string is the same as not setting the id at all');
+    }
     return [
         sseSymbol,
         event
     ];
 }
-function isServerSentEventEnvelope(value) {
+function isSSEMessageEnvelope(value) {
     return Array.isArray(value) && value[0] === sseSymbol;
 }
 /**
@@ -62,11 +66,11 @@ function isServerSentEventEnvelope(value) {
                 break;
             }
             const value = next.value;
-            const data = isServerSentEventEnvelope(value) ? value[1] : {
+            const chunk = isSSEMessageEnvelope(value) ? {
+                ...value[1]
+            } : {
                 data: value
             };
-            const chunk = {};
-            Object.assign(chunk, data);
             if ('data' in chunk) {
                 chunk.data = JSON.stringify(serialize(chunk.data));
             }
@@ -96,6 +100,9 @@ function isServerSentEventEnvelope(value) {
             if ('id' in chunk) {
                 controller.enqueue(`id: ${chunk.id}\n`);
             }
+            if ('comment' in chunk) {
+                controller.enqueue(`: ${chunk.comment}\n`);
+            }
             controller.enqueue('\n\n');
         }
     }));
@@ -108,17 +115,13 @@ function isServerSentEventEnvelope(value) {
     const stream = createReadableStream();
     const transform = new TransformStream({
         async transform (chunk, controller) {
-            if (chunk.data) {
-                const def = {};
-                def.data = deserialize(JSON.parse(chunk.data));
-                if ('id' in chunk) {
-                    def.id = chunk.id;
-                }
-                if ('event' in chunk) {
-                    def.event = chunk.event;
-                }
-                controller.enqueue(def);
+            const def = {
+                data: deserialize(JSON.parse(chunk.data))
+            };
+            if (chunk.lastEventId) {
+                def.id = chunk.lastEventId;
             }
+            controller.enqueue(def);
         }
     });
     eventSource.addEventListener('message', (msg)=>{
@@ -166,4 +169,4 @@ const sseHeaders = {
     Connection: 'keep-alive'
 };
 
-export { isServerSentEventEnvelope, sse, sseHeaders, sseStreamConsumer, sseStreamProducer };
+export { isSSEMessageEnvelope, sse, sseHeaders, sseStreamConsumer, sseStreamProducer };

package/dist/unstable-core-do-not-import.js

@@ -73,7 +73,7 @@ exports.unsetMarker = utils.unsetMarker;
 exports.isPromise = jsonl.isPromise;
 exports.jsonlStreamConsumer = jsonl.jsonlStreamConsumer;
 exports.jsonlStreamProducer = jsonl.jsonlStreamProducer;
-exports.isServerSentEventEnvelope = sse.isServerSentEventEnvelope;
+exports.isSSEMessageEnvelope = sse.isSSEMessageEnvelope;
 exports.sse = sse.sse;
 exports.sseHeaders = sse.sseHeaders;
 exports.sseStreamConsumer = sse.sseStreamConsumer;

package/dist/unstable-core-do-not-import.mjs

@@ -21,4 +21,4 @@ export { defaultTransformer, getDataTransformer, transformResult, transformTRPCR
 export { ERROR_SYMBOL } from './unstable-core-do-not-import/types.mjs';
 export { isAsyncIterable, isFunction, isObject, mergeWithoutOverrides, omitPrototype, run, unsetMarker } from './unstable-core-do-not-import/utils.mjs';
 export { isPromise, jsonlStreamConsumer, jsonlStreamProducer } from './unstable-core-do-not-import/stream/jsonl.mjs';
-export { isServerSentEventEnvelope, sse, sseHeaders, sseStreamConsumer, sseStreamProducer } from './unstable-core-do-not-import/stream/sse.mjs';
+export { isSSEMessageEnvelope, sse, sseHeaders, sseStreamConsumer, sseStreamProducer } from './unstable-core-do-not-import/stream/sse.mjs';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/server",
-  "version": "11.0.0-rc.419+343b6de2e",
+  "version": "11.0.0-rc.432+f9477e279",
   "description": "The tRPC server library",
   "author": "KATT",
   "license": "MIT",
@@ -141,7 +141,7 @@
     "tslib": "^2.5.0",
     "tsx": "^4.0.0",
     "typescript": "^5.5.0",
-    "valibot": "^0.33.0",
+    "valibot": "^0.35.0",
     "ws": "^8.0.0",
     "yup": "^1.0.0",
     "zod": "^3.0.0"
@@ -149,5 +149,5 @@
   "funding": [
     "https://trpc.io/sponsor"
   ],
-  "gitHead": "343b6de2ea719347bffe8332f37589c66c323349"
+  "gitHead": "f9477e2791948cfb8adb052a1d47dace7f124d06"
 }

package/src/unstable-core-do-not-import/stream/sse.ts

@@ -8,7 +8,12 @@ import { createReadableStream } from './utils/createReadableStream';
 type Serialize = (value: any) => any;
 type Deserialize = (value: any) => any;
 
-interface SSEventWithId {
+/**
+ * Server-sent Event Message
+ * @see https://html.spec.whatwg.org/multipage/server-sent-events.html
+ * @public
+ */
+export interface SSEMessage {
   /**
    * The data field of the message - this can be anything
    */
@@ -18,43 +23,34 @@ interface SSEventWithId {
    * Passing this id will allow the client to resume the connection from this point if the connection is lost
    * @see https://html.spec.whatwg.org/multipage/server-sent-events.html#the-last-event-id-header
    */
-  id: string | number;
-  /**
-   * Event name for the message
-   */
-  event?: string;
-  /**
-   * A comment for the event
-   */
-  comment?: string;
+  id: string;
 }
 
-/**
- * Server-sent Event
- * @see https://html.spec.whatwg.org/multipage/server-sent-events.html
- * @public
- */
-export type SSEvent = Partial<SSEventWithId>;
-
-const sseSymbol = Symbol('SSEventEnvelope');
-export type ServerSentEventEnvelope<TData> = [typeof sseSymbol, TData];
+const sseSymbol = Symbol('SSEMessageEnvelope');
+export type SSEMessageEnvelope<TData> = [typeof sseSymbol, TData];
 
 /**
- * Produce a typed server-sent event
+ * Produce a typed server-sent event message
  */
-export function sse<TData extends SSEvent>(
-  event: ValidateShape<TData, SSEvent>,
-): ServerSentEventEnvelope<TData> {
+export function sse<TData extends SSEMessage>(
+  event: ValidateShape<TData, SSEMessage>,
+): SSEMessageEnvelope<TData> {
+  if (event.id === '') {
+    // This could be removed by using different event names for `yield sse(x)`-emitted events and `yield y`-emitted events
+    throw new Error(
+      '`id` must not be an empty string as empty string is the same as not setting the id at all',
+    );
+  }
   return [sseSymbol, event as TData];
 }
 
-export function isServerSentEventEnvelope<TData extends SSEvent>(
+export function isSSEMessageEnvelope<TData extends SSEMessage>(
   value: unknown,
-): value is ServerSentEventEnvelope<TData> {
+): value is SSEMessageEnvelope<TData> {
   return Array.isArray(value) && value[0] === sseSymbol;
 }
 
-export type SerializedSSEvent = Omit<SSEvent, 'data'> & {
+export type SerializedSSEvent = Omit<SSEMessage, 'data'> & {
   data?: string;
 };
 
@@ -92,12 +88,19 @@ export interface SSEStreamProducerOptions {
    */
   emitAndEndImmediately?: boolean;
 }
+
+type SSEvent = Partial<
+  SSEMessage & {
+    comment: string;
+    event: string;
+  }
+>;
 /**
  *
  * @see https://html.spec.whatwg.org/multipage/server-sent-events.html
  */
 export function sseStreamProducer(opts: SSEStreamProducerOptions) {
-  const stream = createReadableStream<SerializedSSEvent>();
+  const stream = createReadableStream<SSEvent>();
   stream.controller.enqueue({
     comment: 'connected',
   });
@@ -157,13 +160,11 @@ export function sseStreamProducer(opts: SSEStreamProducerOptions) {
 
       const value = next.value;
 
-      const data: SSEvent = isServerSentEventEnvelope(value)
-        ? value[1]
+      const chunk: SSEvent = isSSEMessageEnvelope(value)
+        ? { ...value[1] }
         : {
             data: value,
           };
-      const chunk: SerializedSSEvent = {};
-      Object.assign(chunk, data);
       if ('data' in chunk) {
         chunk.data = JSON.stringify(serialize(chunk.data));
       }
@@ -187,7 +188,7 @@ export function sseStreamProducer(opts: SSEStreamProducerOptions) {
   });
 
   return stream.readable.pipeThrough(
-    new TransformStream<SerializedSSEvent, string>({
+    new TransformStream<SSEvent, string>({
       transform(chunk, controller) {
         if ('event' in chunk) {
           controller.enqueue(`event: ${chunk.event}\n`);
@@ -198,12 +199,15 @@ export function sseStreamProducer(opts: SSEStreamProducerOptions) {
         if ('id' in chunk) {
           controller.enqueue(`id: ${chunk.id}\n`);
         }
+        if ('comment' in chunk) {
+          controller.enqueue(`: ${chunk.comment}\n`);
+        }
         controller.enqueue('\n\n');
       },
     }),
   );
 }
-export type inferSSEOutput<TData> = TData extends ServerSentEventEnvelope<
+export type inferSSEOutput<TData> = TData extends SSEMessageEnvelope<
   infer $Data
 >
   ? $Data
@@ -220,25 +224,18 @@ export function sseStreamConsumer<TData>(opts: {
   const { deserialize = (v) => v } = opts;
   const eventSource = opts.from;
 
-  const stream = createReadableStream<SerializedSSEvent>();
+  const stream = createReadableStream<MessageEvent>();
 
-  const transform = new TransformStream<
-    SerializedSSEvent,
-    inferSSEOutput<TData>
-  >({
+  const transform = new TransformStream<MessageEvent, inferSSEOutput<TData>>({
     async transform(chunk, controller) {
-      if (chunk.data) {
-        const def: SSEvent = {};
-        def.data = deserialize(JSON.parse(chunk.data));
-        if ('id' in chunk) {
-          def.id = chunk.id;
-        }
-        if ('event' in chunk) {
-          def.event = chunk.event;
-        }
+      const def: Partial<SSEMessage> = {
+        data: deserialize(JSON.parse(chunk.data)),
+      };
 
-        controller.enqueue(def as inferSSEOutput<TData>);
+      if (chunk.lastEventId) {
+        def.id = chunk.lastEventId;
       }
+      controller.enqueue(def as inferSSEOutput<TData>);
     },
   });