cool

trpc · Oct 13, 2023 · 46e26c2 · 46e26c2
1 parent 19e6dcd
commit 46e26c2
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 191 deletions.
diff --git a/examples/sse/package.json b/examples/sse/package.json
diff --git a/examples/sse/src/index.html b/examples/sse/src/index.html
diff --git a/examples/sse/src/server.ts b/examples/sse/src/server.ts
diff --git a/examples/sse/src/shared.ts b/examples/sse/src/shared.ts
diff --git a/examples/sse/tsconfig.json b/examples/sse/tsconfig.json
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/async/createTsonAsync.ts b/src/async/createTsonAsync.ts
@@ -6,9 +6,8 @@ import {
 } from "./serializeAsync.js";
 
 /**
- * @internal
- *
  * Only used for testing - when using the async you gotta pick which one you want
+ * @internal
  */
 export const createTsonAsync = (opts: TsonAsyncOptions) => ({
 	parseJsonStream: createTsonParseAsync(opts),

diff --git a/src/async/deserializeAsync.ts b/src/async/deserializeAsync.ts
@@ -11,17 +11,12 @@ import {
 } from "../sync/syncTypes.js";
 import { TsonStreamInterruptedError } from "./asyncErrors.js";
 import {
-	BrandSerialized,
 	TsonAsyncIndex,
 	TsonAsyncOptions,
 	TsonAsyncStringifierIterable,
 	TsonAsyncType,
 } from "./asyncTypes.js";
-import {
-	createReadableStream,
-	mapIterable,
-	readableStreamToAsyncIterable,
-} from "./iterableUtils.js";
+import { createReadableStream } from "./iterableUtils.js";
 import { TsonAsyncValueTuple } from "./serializeAsync.js";
 
 type WalkFn = (value: unknown) => unknown;
@@ -85,13 +80,8 @@ export function createTsonDeserializer(opts: TsonAsyncOptions) {
 
 					const idx = serializedValue as TsonAsyncIndex;
 
-					let controller: ReadableStreamDefaultController<unknown> =
-						null as unknown as ReadableStreamDefaultController<unknown>;
-					const readable = new ReadableStream<unknown>({
-						start(c) {
-							controller = c;
-						},
-					});
+					const [readable, controller] = createReadableStream();
+
 					// the `start` method is called "immediately when the object is constructed"
 					// [MDN](http://developer.mozilla.org/en-US/docs/Web/API/ReadableStream/ReadableStream)
 					// so we're guaranteed that the controller is set in the cache

diff --git a/src/async/iterableUtils.ts b/src/async/iterableUtils.ts
@@ -1,4 +1,4 @@
-import { assert } from "../internals/assert";
+import { assert } from "../internals/assert.js";
 
 export async function* readableStreamToAsyncIterable<T>(
 	stream: ReadableStream<T>,
@@ -34,7 +34,7 @@ export async function* mapIterable<T, TValue>(
 	}
 }
 
-export function createReadableStream<TValue>() {
+export function createReadableStream<TValue = unknown>() {
 	let controller: ReadableStreamDefaultController<TValue> =
 		null as unknown as ReadableStreamDefaultController<TValue>;
 	const stream = new ReadableStream<TValue>({

diff --git a/src/async/serializeAsync.ts b/src/async/serializeAsync.ts
@@ -19,6 +19,7 @@ import {
 	TsonAsyncOptions,
 	TsonAsyncStringifier,
 } from "./asyncTypes.js";
+import { createReadableStream } from "./iterableUtils.js";
 
 type WalkFn = (value: unknown) => unknown;
 
@@ -253,13 +254,7 @@ export function createTsonSSEResponse(opts: TsonAsyncOptions) {
 	const serialize = createAsyncTsonSerialize(opts);
 
 	return <TValue>(value: TValue) => {
-		let controller: ReadableStreamDefaultController<unknown> =
-			null as unknown as ReadableStreamDefaultController<unknown>;
-		const readable = new ReadableStream<unknown>({
-			start(c) {
-				controller = c;
-			},
-		});
+		const [readable, controller] = createReadableStream();
 
 		async function iterate() {
 			const [head, iterable] = serialize(value);

diff --git a/src/async/sse.test.ts b/src/async/sse.test.ts
@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-unnecessary-condition */
 import { EventSourcePolyfill, NativeEventSource } from "event-source-polyfill";
 import { expect, test } from "vitest";
-global.EventSource = NativeEventSource || EventSourcePolyfill;
+(global as any).EventSource = NativeEventSource || EventSourcePolyfill;
 
 import { TsonAsyncOptions, tsonAsyncIterable, tsonPromise } from "../index.js";
 import { createTestServer, sleep } from "../internals/testUtils.js";