Commit

Author: qwtel

json-parse-stream.ts

@@ -55,21 +55,21 @@ export class JSONParseStream<T = any> extends TransformStream<string | BufferSou
     });
   }
 
-  promise<T>(jsonPath: string): Promise<T> {
+  promise<T = any>(jsonPath: string): Promise<T> {
     if (this.readable.locked) throw Error('Already locked')
     const p = new ResolvablePromise<T>()
     this.#promises.set(normalize(jsonPath), p);
-    return p;
+    return Promise.resolve(p);
   }
 
-  generator<T>(jsonPath: string): AsyncIterableIterator<T> {
+  iterable<T = any>(jsonPath: string): AsyncIterableIterator<T> {
     if (this.readable.locked) throw Error('Already locked')
     const q = new AsyncQueue<T>()
     this.#queues.set(normalize(jsonPath), q)
-    return q;
+    return identity(q);
   }
 
-  stream<T>(jsonPath: string): ReadableStream<T> {
-    return asyncIterToStream(this.generator(jsonPath));
+  stream<T = any>(jsonPath: string): ReadableStream<T> {
+    return asyncIterToStream(this.iterable(jsonPath));
   }
 }

test/json-parse-stream.test.ts

@@ -1,4 +1,4 @@
-// deno-lint-ignore-file no-explicit-any no-unused-vars require-await
+// deno-lint-ignore-file no-explicit-any no-unused-vars require-await ban-unused-ignore
 import 'https://gist.githubusercontent.com/qwtel/b14f0f81e3a96189f7771f83ee113f64/raw/TestRequest.ts'
 import {
   assert,
@@ -78,7 +78,7 @@ test('promise value', async () => {
   const parseStream = new JSONParseStream()
   const actual = {
     type: parseStream.promise('$.type'),
-    data: parseStream.generator('$.data.*')
+    data: parseStream.iterable('$.data.*')
   }
   const expected = JSON.stringify({ type: 'foo', data: [{ a: 1 }, { b: 2 }, { c: 3 }] })
   const done = new Response(expected).body!
@@ -88,3 +88,18 @@ test('promise value', async () => {
   assertEquals(await aJoin(jsonStringifyGenerator(actual)), expected)
   await done;
 })
+
+test('promise value II', async () => {
+  const parseStream = new JSONParseStream()
+  const actual = {
+    type: parseStream.promise('$.type'),
+    data: parseStream.stream('$.data.*')
+  }
+  const expected = JSON.stringify({ type: 'foo', data: [{ a: 1 }, { b: 2 }, { c: 3 }] })
+  const done = new Response(expected).body!
+    .pipeThrough(parseStream)
+    .pipeTo(new WritableStream())
+
+  assertEquals(await aJoin(jsonStringifyGenerator(actual)), expected)
+  await done;
+})