ovr 2.0.3 → 2.0.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -155,11 +155,17 @@ export class Context {
155
155
  }
156
156
  elements[3] = bodyParts[0];
157
157
  elements.push(Page, bodyClose + bodyParts[1]);
158
+ const gen = toGenerator(elements);
158
159
  this.html(new ReadableStream({
159
- async start(c) {
160
- for await (const value of toGenerator(elements))
160
+ async pull(c) {
161
+ const { value, done } = await gen.next();
162
+ if (done)
163
+ c.close();
164
+ else
161
165
  c.enqueue(value);
162
- c.close();
166
+ },
167
+ cancel() {
168
+ gen.return();
163
169
  },
164
170
  }).pipeThrough(new TextEncoderStream()), status);
165
171
  }
package/dist/jsx/index.js CHANGED
@@ -1,6 +1,4 @@
1
- import { isGenerator } from "./is-generator.js";
2
1
  import { merge } from "./merge-async-iterables.js";
3
- import { YieldController } from "./yield-controller.js";
4
2
  // https://developer.mozilla.org/en-US/docs/Glossary/Void_element#self-closing_tags
5
3
  const voidElements = new Set([
6
4
  "area",
@@ -17,7 +15,6 @@ const voidElements = new Set([
17
15
  "track",
18
16
  "wbr",
19
17
  ]);
20
- const yieldController = new YieldController();
21
18
  /**
22
19
  * The main function of the JSX transform cycle, each time JSX is encountered
23
20
  * it is passed into this function to be resolved.
@@ -85,48 +82,59 @@ export async function* toGenerator(element) {
85
82
  yield* toGenerator(children);
86
83
  }
87
84
  else if (Symbol.iterator in element) {
88
- if (isGenerator(element)) {
89
- // process lazily - avoid loading all in memory
90
- for (const children of element)
91
- yield* toGenerator(children);
92
- }
93
- const generators = [];
94
- for (const children of element) {
95
- generators.push(toGenerator(children));
85
+ const iterator = element[Symbol.iterator]();
86
+ if (typeof iterator.next === "function" &&
87
+ typeof iterator.throw === "function" &&
88
+ typeof iterator.return === "function") {
89
+ // sync generator
90
+ // process lazily - avoids loading all in memory
91
+ while (true) {
92
+ const result = iterator.next();
93
+ if (result.done)
94
+ break;
95
+ yield* toGenerator(result.value);
96
+ }
96
97
  }
97
- let queue = new Array(generators.length).fill("");
98
- const complete = new Set();
99
- let current = 0;
100
- for await (const { index, result } of merge(generators)) {
101
- const maybeYield = yieldController.maybeYield();
102
- // yield control back to event loop to stream current
103
- if (maybeYield instanceof Promise)
104
- await maybeYield;
105
- if (result.done) {
106
- complete.add(index);
107
- if (index === current) {
108
- while (++current < generators.length) {
109
- if (queue[current]) {
110
- // yield whatever is in the next queue even if it hasn't completed yet
111
- yield queue[current];
112
- queue[current] = "";
98
+ else {
99
+ // other iterable - array, set, etc.
100
+ // process children in parallel
101
+ const generators = [];
102
+ while (true) {
103
+ const result = iterator.next();
104
+ if (result.done)
105
+ break;
106
+ generators.push(toGenerator(result.value));
107
+ }
108
+ let queue = new Array(generators.length).fill("");
109
+ let current = 0;
110
+ const complete = new Set();
111
+ for await (const { index, result } of merge(generators)) {
112
+ if (result.done) {
113
+ complete.add(index);
114
+ if (index === current) {
115
+ while (++current < generators.length) {
116
+ if (queue[current]) {
117
+ // yield whatever is in the next queue even if it hasn't completed yet
118
+ yield queue[current];
119
+ queue[current] = "";
120
+ }
121
+ // if it hasn't completed, stop iterating to the next
122
+ if (!complete.has(current))
123
+ break;
113
124
  }
114
- // if it hasn't completed, stop iterating to the next
115
- if (!complete.has(current))
116
- break;
117
125
  }
118
126
  }
127
+ else if (index === current) {
128
+ yield result.value; // stream the current value directly
129
+ }
130
+ else {
131
+ queue[index] += result.value; // queue the value for later
132
+ }
119
133
  }
120
- else if (index === current) {
121
- yield result.value; // stream the current value directly
122
- }
123
- else {
124
- queue[index] += result.value; // queue the value for later
125
- }
134
+ queue = queue.join("");
135
+ if (queue)
136
+ yield queue; // clear the queue
126
137
  }
127
- queue = queue.join("");
128
- if (queue)
129
- yield queue; // clear the queue
130
138
  }
131
139
  else {
132
140
  yield JSON.stringify(element); // avoids things like [object Object]
@@ -1,13 +1,14 @@
1
1
  /**
2
- * Merges `AsyncIterable[]` into a single `AsyncGenerator`, resolving all in parallel.
3
- * The return of each `AsyncIterable` is yielded from the generator with `done: true`.
2
+ * Merges `AsyncGenerator[]` into a single `AsyncGenerator`, resolving all in parallel.
3
+ * The return of each `AsyncGenerator` is yielded from the generator with `done: true`.
4
4
  *
5
5
  * Adapted from [stack overflow answers](https://stackoverflow.com/questions/50585456).
6
6
  *
7
- * @param iterables Resolved in parallel.
8
- * @yields `IteratorResult` and `index` of the resolved iterator.
7
+ * @param generators Resolved in parallel.
8
+ * @param returnValue Passed into each `iterator.return()`
9
+ * @yields `IteratorResult` and `index` of the resolved generator.
9
10
  */
10
- export declare function merge<T, R>(iterables: AsyncIterable<T, R>[]): AsyncGenerator<{
11
+ export declare function merge<T>(generators: AsyncGenerator<T, void>[]): AsyncGenerator<{
11
12
  index: number;
12
- result: IteratorResult<T, R>;
13
+ result: IteratorResult<T, void>;
13
14
  }, void, unknown>;
@@ -4,27 +4,34 @@ const next = async (iterator, index) => ({
4
4
  result: await iterator.next(),
5
5
  });
6
6
  /**
7
- * Merges `AsyncIterable[]` into a single `AsyncGenerator`, resolving all in parallel.
8
- * The return of each `AsyncIterable` is yielded from the generator with `done: true`.
7
+ * Merges `AsyncGenerator[]` into a single `AsyncGenerator`, resolving all in parallel.
8
+ * The return of each `AsyncGenerator` is yielded from the generator with `done: true`.
9
9
  *
10
10
  * Adapted from [stack overflow answers](https://stackoverflow.com/questions/50585456).
11
11
  *
12
- * @param iterables Resolved in parallel.
13
- * @yields `IteratorResult` and `index` of the resolved iterator.
12
+ * @param generators Resolved in parallel.
13
+ * @param returnValue Passed into each `iterator.return()`
14
+ * @yields `IteratorResult` and `index` of the resolved generator.
14
15
  */
15
- export async function* merge(iterables) {
16
- const iterators = iterables.map((iter) => iter[Symbol.asyncIterator]());
16
+ export async function* merge(generators) {
17
+ const iterators = generators.map((gen) => gen[Symbol.asyncIterator]());
17
18
  const promises = iterators.map(next);
18
19
  let remaining = promises.length;
19
20
  let current;
20
- while (remaining) {
21
- yield (current = await Promise.race(promises));
22
- if (current.result.done) {
23
- promises[current.index] = never;
24
- remaining--;
25
- }
26
- else {
27
- promises[current.index] = next(iterators[current.index], current.index);
21
+ try {
22
+ while (remaining) {
23
+ yield (current = await Promise.race(promises));
24
+ if (current.result.done) {
25
+ promises[current.index] = never;
26
+ remaining--;
27
+ }
28
+ else {
29
+ promises[current.index] = next(iterators[current.index], current.index);
30
+ }
28
31
  }
29
32
  }
33
+ finally {
34
+ for (const iter of iterators)
35
+ iter.return().catch(); // could have already returned
36
+ }
30
37
  }
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "ovr",
3
3
  "description": "Progressive HTML Rendering",
4
- "version": "2.0.3",
4
+ "version": "2.0.4",
5
5
  "license": "MIT",
6
6
  "repository": {
7
7
  "type": "git",
@@ -1 +0,0 @@
1
- export declare const isGenerator: <T, R = unknown, N = unknown>(iterable: Iterable<T, R, N>) => iterable is Generator<T, R, N>;
@@ -1,7 +0,0 @@
1
- export const isGenerator = (iterable) => {
2
- const iterator = iterable[Symbol.iterator]();
3
- return (iterable != null &&
4
- typeof iterator.next === "function" &&
5
- typeof iterator.throw === "function" &&
6
- typeof iterator.return === "function");
7
- };
@@ -1,4 +0,0 @@
1
- export declare class YieldController {
2
- count: number;
3
- maybeYield(): Promise<unknown> | undefined;
4
- }
@@ -1,8 +0,0 @@
1
- export class YieldController {
2
- count = 0;
3
- maybeYield() {
4
- if (++this.count % 50 === 0) {
5
- return new Promise((res) => setImmediate(res));
6
- }
7
- }
8
- }