ovr 3.0.1 → 4.0.0

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.
@@ -1 +1 @@
1
- {"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../src/app/context.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,GAAG,EAAe,MAAM,iBAAiB,CAAC;AACxD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAE9C,OAAO,EAEN,KAAK,YAAY,EACjB,KAAK,UAAU,EACf,KAAK,eAAe,EACpB,KAAK,MAAM,EACX,KAAK,aAAa,EAClB,MAAM,YAAY,CAAC;AAGpB,KAAK,MAAM,GAAG,CAAC,KAAK,EAAE;IAAE,QAAQ,EAAE,GAAG,CAAC,OAAO,CAAA;CAAE,KAAK,GAAG,CAAC,OAAO,CAAC;AAShE,qBAAa,OAAO,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM;;IAC7C,gFAAgF;IAChF,GAAG,EAAE,OAAO,CAAC;IAEb,4EAA4E;IAC5E,GAAG,EAAE,GAAG,CAAC;IAET;;;;;;;OAOG;IACH,MAAM,EAAG,CAAC,CAAC;IAEX,oCAAoC;IACpC,KAAK,EAAG,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IAE/B,+FAA+F;IAC/F,IAAI,EAAE,QAAQ,GAAG,IAAI,CAAQ;IAE7B,gFAAgF;IAChF,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,gFAAgF;IAChF,OAAO,UAAiB;IAQxB,6BAA6B;IAC7B,IAAI,EAAE,MAAM,CAAC;IAEb,8BAA8B;IAC9B,KAAK,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC;IAEvB,iCAAiC;IACjC,QAAQ,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC;IAI7B,IAAI,mEAAkB;gBAGrB,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,GAAG,EACR,aAAa,EAAE,aAAa,EAC5B,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,YAAY,CAAC,CAAC,CAAC,EACtB,QAAQ,EAAE,eAAe,CAAC,CAAC,CAAC;IAU7B;;;;;OAKG;IACH,GAAG,CACF,IAAI,EAAE,QAAQ,GAAG,IAAI,EACrB,IAAI,CAAC,EAAE;QACN;;;;WAIG;QACH,MAAM,CAAC,EAAE,MAAM,CAAC;QAEhB,gFAAgF;QAChF,OAAO,CAAC,EAAE,WAAW,CAAC;KACtB;IAYF;;;;;OAKG;IACH,IAAI,CAAC,IAAI,EAAE,QAAQ,GAAG,IAAI,EAAE,MAAM,CAAC,EAAE,MAAM;IAO3C;;;;;OAKG;IACH,IAAI,CAAC,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE,MAAM;IAO/B;;;;;OAKG;IACH,IAAI,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,MAAM;IAOpC;;;;;;;;;;;OAWG;IACH,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,GAAG,EAAE,MAAM,GAAE,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAS;IAK1E;;OAEG;IACH,IAAI,CAAC,GAAG,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE;IAI9B;;OAEG;IACH,MAAM,CAAC,GAAG,MAAM,EAAE,MAAM,EAAE;IAI1B;;;;;OAKG;IACH,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE,MAAM;IAiDvC;;;;;;;;OAQG;IACH,IAAI,CAAC,CAAC,EAAE,MAAM;IAed;;OAEG;IACH,KAAK;IAyBL;;;;;;;;;;;;;;;;;;;;;;;OAuBG;IACH,MAAM,CAAC,GAAG;CAUV"}
1
+ {"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../src/app/context.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,GAAG,EAAe,MAAM,iBAAiB,CAAC;AACxD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAE9C,OAAO,EAEN,KAAK,YAAY,EACjB,KAAK,UAAU,EACf,KAAK,eAAe,EACpB,KAAK,MAAM,EACX,KAAK,aAAa,EAClB,MAAM,YAAY,CAAC;AAGpB,KAAK,MAAM,GAAG,CAAC,KAAK,EAAE;IAAE,QAAQ,EAAE,GAAG,CAAC,OAAO,CAAA;CAAE,KAAK,GAAG,CAAC,OAAO,CAAC;AAShE,qBAAa,OAAO,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM;;IAC7C,gFAAgF;IAChF,GAAG,EAAE,OAAO,CAAC;IAEb,4EAA4E;IAC5E,GAAG,EAAE,GAAG,CAAC;IAET;;;;;;;OAOG;IACH,MAAM,EAAG,CAAC,CAAC;IAEX,oCAAoC;IACpC,KAAK,EAAG,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IAE/B,+FAA+F;IAC/F,IAAI,EAAE,QAAQ,GAAG,IAAI,CAAQ;IAE7B,gFAAgF;IAChF,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,gFAAgF;IAChF,OAAO,UAAiB;IAQxB,6BAA6B;IAC7B,IAAI,EAAE,MAAM,CAAC;IAEb,8BAA8B;IAC9B,KAAK,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC;IAEvB,iCAAiC;IACjC,QAAQ,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC;IAI7B,IAAI,mEAAkB;gBAGrB,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,GAAG,EACR,aAAa,EAAE,aAAa,EAC5B,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,YAAY,CAAC,CAAC,CAAC,EACtB,QAAQ,EAAE,eAAe,CAAC,CAAC,CAAC;IAU7B;;;;;OAKG;IACH,GAAG,CACF,IAAI,EAAE,QAAQ,GAAG,IAAI,EACrB,IAAI,CAAC,EAAE;QACN;;;;WAIG;QACH,MAAM,CAAC,EAAE,MAAM,CAAC;QAEhB,gFAAgF;QAChF,OAAO,CAAC,EAAE,WAAW,CAAC;KACtB;IAYF;;;;;OAKG;IACH,IAAI,CAAC,IAAI,EAAE,QAAQ,GAAG,IAAI,EAAE,MAAM,CAAC,EAAE,MAAM;IAO3C;;;;;OAKG;IACH,IAAI,CAAC,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE,MAAM;IAO/B;;;;;OAKG;IACH,IAAI,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,MAAM;IAOpC;;;;;;;;;;;OAWG;IACH,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,GAAG,EAAE,MAAM,GAAE,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAS;IAK1E;;OAEG;IACH,IAAI,CAAC,GAAG,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE;IAI9B;;OAEG;IACH,MAAM,CAAC,GAAG,MAAM,EAAE,MAAM,EAAE;IAI1B;;;;;OAKG;IACH,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE,MAAM;IAgEvC;;;;;;;;OAQG;IACH,IAAI,CAAC,CAAC,EAAE,MAAM;IAed;;OAEG;IACH,KAAK;IA+BL;;;;;;;;;;;;;;;;;;;;;;;OAuBG;IACH,MAAM,CAAC,GAAG;CAUV"}
@@ -136,38 +136,52 @@ export class Context {
136
136
  * @param status [HTTP response status code](https://developer.mozilla.org/en-US/docs/Web/HTTP/Status)
137
137
  */
138
138
  page(Page, status) {
139
- for (let i = this.#layouts.length - 1; i >= 0; i--)
139
+ for (let i = this.#layouts.length - 1; i >= 0; i--) {
140
140
  Page = this.#layouts[i]({ children: Page });
141
- const headClose = "</head>";
142
- const bodyClose = "</body>";
143
- const elements = this.base.split(headClose);
144
- if (!elements[1])
145
- throw new TagNotFound(headClose);
146
- elements.splice(1, 0, this.#headElements, headClose);
147
- const bodyParts = elements[3].split(bodyClose);
148
- if (!bodyParts[1])
149
- throw new TagNotFound(bodyClose);
150
- const userAgent = this.req.headers.get("user-agent");
151
- if (userAgent?.includes("Safari") && !userAgent.includes("Chrome")) {
152
- // https://bugs.webkit.org/show_bug.cgi?id=252413
153
- // https://github.com/sveltejs/kit/issues/10315
154
- // https://github.com/remix-run/remix/issues/5804
155
- bodyParts[0] += `<div aria-hidden=true style=position:absolute;width:0;height:0;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);white-space:nowrap;border-width:0>${"\u200b".repeat(200)}</div>`;
156
141
  }
157
- elements[3] = bodyParts[0];
158
- elements.push(Page, bodyClose + bodyParts[1]);
159
- const gen = toGenerator(elements.map((el) => {
160
- if (typeof el === "string")
161
- return new Chunk(el, true);
162
- return el;
163
- }));
142
+ let gen;
143
+ if (this.base) {
144
+ // inject into base
145
+ const headClose = "</head>";
146
+ const bodyClose = "</body>";
147
+ const elements = this.base.split(headClose);
148
+ if (!elements[1])
149
+ throw new TagNotFound(headClose);
150
+ elements.splice(1, 0, this.#headElements, headClose);
151
+ const bodyParts = elements[3].split(bodyClose);
152
+ if (!bodyParts[1])
153
+ throw new TagNotFound(bodyClose);
154
+ const userAgent = this.req.headers.get("user-agent");
155
+ if (userAgent?.includes("Safari") && !userAgent.includes("Chrome")) {
156
+ // https://bugs.webkit.org/show_bug.cgi?id=252413
157
+ // https://github.com/sveltejs/kit/issues/10315
158
+ // https://github.com/remix-run/remix/issues/5804
159
+ bodyParts[0] += `<div aria-hidden=true style=position:absolute;width:0;height:0;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);white-space:nowrap;border-width:0>${"\u200b".repeat(200)}</div>`;
160
+ }
161
+ elements[3] = bodyParts[0];
162
+ elements.push(Page, bodyClose + bodyParts[1]);
163
+ gen = toGenerator(elements.map((el) => {
164
+ if (typeof el === "string")
165
+ return new Chunk(el, true);
166
+ return el;
167
+ }));
168
+ }
169
+ else {
170
+ // HTML partial - just use the layouts + page
171
+ gen = toGenerator(Page);
172
+ }
164
173
  this.html(new ReadableStream({
165
- async pull(c) {
166
- const { value, done } = await gen.next();
167
- if (done)
174
+ pull: async (c) => {
175
+ if (this.req.signal.aborted) {
176
+ c.close();
177
+ gen.return();
178
+ return;
179
+ }
180
+ const result = await gen.next();
181
+ if (result.done)
168
182
  c.close();
169
183
  else
170
- c.enqueue(value?.value);
184
+ c.enqueue(result.value.value);
171
185
  },
172
186
  cancel() {
173
187
  gen.return();
@@ -197,6 +211,11 @@ export class Context {
197
211
  * @returns the constructed `Response`
198
212
  */
199
213
  build() {
214
+ if (this.req.signal.aborted) {
215
+ // user cancelled the request
216
+ this.body = null;
217
+ this.status = 408;
218
+ }
200
219
  if ((!this.status || this.status === 404) &&
201
220
  this.#trailingSlash !== "ignore") {
202
221
  const last = this.url.pathname.at(-1);
@@ -6,7 +6,7 @@ type AnchorProps<P extends Params> = JSX.IntrinsicElements["a"] & (keyof P exten
6
6
  } : {
7
7
  params: P;
8
8
  });
9
- export declare class Page<Pattern extends string = string> {
9
+ export declare class Get<Pattern extends string = string> {
10
10
  #private;
11
11
  /** Route pattern */
12
12
  pattern: Pattern;
@@ -21,10 +21,9 @@ export declare class Page<Pattern extends string = string> {
21
21
  * @example
22
22
  *
23
23
  * ```tsx
24
- * // page.tsx
25
- * import { Page } from "ovr";
24
+ * import { Get } from "ovr";
26
25
  *
27
- * export const page = new Page("/", () => {
26
+ * const page = new Get("/", () => {
28
27
  * return <p>Hello world</p>
29
28
  * });
30
29
  *
@@ -32,11 +31,10 @@ export declare class Page<Pattern extends string = string> {
32
31
  * return <page.Anchor>Home</page.Anchor>
33
32
  * }
34
33
  *
35
- * // app.tsx
36
- * app.add(page); registers the page
34
+ * app.add(page); register
37
35
  * ```
38
36
  */
39
37
  constructor(pattern: Pattern, ...middleware: Middleware<ExtractParams<Pattern>>[]);
40
38
  }
41
39
  export {};
42
- //# sourceMappingURL=page.d.ts.map
40
+ //# sourceMappingURL=get.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"get.d.ts","sourceRoot":"","sources":["../../src/app/get.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,GAAG,EAAO,MAAM,iBAAiB,CAAC;AAEhD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAErD,KAAK,WAAW,CAAC,CAAC,SAAS,MAAM,IAAI,GAAG,CAAC,iBAAiB,CAAC,GAAG,CAAC,GAC9D,CAAC,MAAM,CAAC,SAAS,KAAK,GAAG;IAAE,MAAM,CAAC,EAAE,KAAK,CAAA;CAAE,GAAG;IAAE,MAAM,EAAE,CAAC,CAAA;CAAE,CAAC,CAAC;AAE9D,qBAAa,GAAG,CAAC,OAAO,SAAS,MAAM,GAAG,MAAM;;IAC/C,oBAAoB;IACpB,OAAO,EAAE,OAAO,CAAC;IAEjB,qBAAqB;IACrB,UAAU,EAAE,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;IAE9B,oDAAoD;IACpD,MAAM,EAAE,CAAC,KAAK,EAAE,WAAW,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,KAAK,GAAG,CAAC,OAAO,CAAC;IAIpE;;;;;;;;;;;;;;;;;;;OAmBG;gBAEF,OAAO,EAAE,OAAO,EAChB,GAAG,UAAU,EAAE,UAAU,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,EAAE;CAWpD"}
@@ -1,6 +1,6 @@
1
1
  import { jsx } from "../jsx/index.js";
2
2
  import { insertParams } from "../trie/insert-params.js";
3
- export class Page {
3
+ export class Get {
4
4
  /** Route pattern */
5
5
  pattern;
6
6
  /** GET middleware */
@@ -15,10 +15,9 @@ export class Page {
15
15
  * @example
16
16
  *
17
17
  * ```tsx
18
- * // page.tsx
19
- * import { Page } from "ovr";
18
+ * import { Get } from "ovr";
20
19
  *
21
- * export const page = new Page("/", () => {
20
+ * const page = new Get("/", () => {
22
21
  * return <p>Hello world</p>
23
22
  * });
24
23
  *
@@ -26,8 +25,7 @@ export class Page {
26
25
  * return <page.Anchor>Home</page.Anchor>
27
26
  * }
28
27
  *
29
- * // app.tsx
30
- * app.add(page); registers the page
28
+ * app.add(page); register
31
29
  * ```
32
30
  */
33
31
  constructor(pattern, ...middleware) {
@@ -1,7 +1,7 @@
1
1
  import type { DeepArray, ExtractMultiParams, ExtractParams } from "../types/index.js";
2
- import { Action } from "./action.js";
3
2
  import { Context } from "./context.js";
4
- import { Page } from "./page.js";
3
+ import { Get } from "./get.js";
4
+ import { Post } from "./post.js";
5
5
  import { AsyncLocalStorage } from "node:async_hooks";
6
6
  export type Params = Record<string, string>;
7
7
  export type Middleware<P extends Params = Params> = (context: Context<P>, next: () => Promise<void>) => any;
@@ -57,10 +57,10 @@ export declare class App {
57
57
  /** Stores context per request. */
58
58
  static storage: AsyncLocalStorage<Context<Params>>;
59
59
  /**
60
- * @param routes `Page`s or `Action`s to add to the `App`
60
+ * @param routes `Get` or `Post` to add to `App`
61
61
  * @returns `App` instance
62
62
  */
63
- add(...routes: DeepArray<Page | Action | Record<string, Page | Action>>[]): this;
63
+ add(...routes: DeepArray<Get | Post | Record<string, Get | Post>>[]): this;
64
64
  /**
65
65
  * Add global middleware.
66
66
  *
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/app/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/app/index.ts"],"names":[],"mappings":"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"}
package/dist/app/index.js CHANGED
@@ -1,7 +1,7 @@
1
1
  import { Route, Trie } from "../trie/index.js";
2
- import { Action } from "./action.js";
3
2
  import { Context } from "./context.js";
4
- import { Page } from "./page.js";
3
+ import { Get } from "./get.js";
4
+ import { Post } from "./post.js";
5
5
  import { AsyncLocalStorage } from "node:async_hooks";
6
6
  export class App {
7
7
  /** Built tries per HTTP method. */
@@ -54,7 +54,7 @@ export class App {
54
54
  /** Stores context per request. */
55
55
  static storage = new AsyncLocalStorage();
56
56
  /**
57
- * @param routes `Page`s or `Action`s to add to the `App`
57
+ * @param routes `Get` or `Post` to add to `App`
58
58
  * @returns `App` instance
59
59
  */
60
60
  add(...routes) {
@@ -62,10 +62,10 @@ export class App {
62
62
  if (route instanceof Array) {
63
63
  this.add(...route);
64
64
  }
65
- else if (route instanceof Page) {
65
+ else if (route instanceof Get) {
66
66
  this.get(route.pattern, ...route.middleware);
67
67
  }
68
- else if (route instanceof Action) {
68
+ else if (route instanceof Post) {
69
69
  this.post(route.pattern, ...route.middleware);
70
70
  }
71
71
  else {
@@ -148,7 +148,7 @@ export class App {
148
148
  c.res(result.body, result);
149
149
  else if (result instanceof ReadableStream)
150
150
  c.body = result;
151
- else if (result)
151
+ else if (result != null)
152
152
  c.page(result);
153
153
  }
154
154
  };
@@ -6,7 +6,7 @@ type FormProps<P extends Params> = JSX.IntrinsicElements["form"] & (keyof P exte
6
6
  } : {
7
7
  params: P;
8
8
  });
9
- export declare class Action<Pattern extends string = string> {
9
+ export declare class Post<Pattern extends string = string> {
10
10
  #private;
11
11
  /** Route pattern */
12
12
  pattern: Pattern;
@@ -20,23 +20,21 @@ export declare class Action<Pattern extends string = string> {
20
20
  * @example
21
21
  *
22
22
  * ```tsx
23
- * // action.tsx
24
- * import { Action } from "ovr";
23
+ * import { Post } from "ovr";
25
24
  *
26
- * export const action = new Action((c) => {
25
+ * const post = new Post((c) => {
27
26
  * console.log("posted");
28
27
  * c.redirect("/", 303);
29
28
  * });
30
29
  *
31
- * export const page = new Page("/", () => (
32
- * <action.Form>
30
+ * const page = new Get("/", () => (
31
+ * <post.Form>
33
32
  * <input />
34
33
  * <button>Submit</button>
35
- * </action.Form>
34
+ * </post.Form>
36
35
  * ));
37
36
  *
38
- * // app.tsx
39
- * app.add(page, action); registers the action
37
+ * app.add(page, post); register
40
38
  * ```
41
39
  */
42
40
  constructor(...middleware: Middleware<{}>[]);
@@ -47,4 +45,4 @@ export declare class Action<Pattern extends string = string> {
47
45
  constructor(pattern: Pattern, ...middleware: Middleware<ExtractParams<Pattern>>[]);
48
46
  }
49
47
  export {};
50
- //# sourceMappingURL=action.d.ts.map
48
+ //# sourceMappingURL=post.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"post.d.ts","sourceRoot":"","sources":["../../src/app/post.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,GAAG,EAAO,MAAM,iBAAiB,CAAC;AAEhD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAEvD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAErD,KAAK,SAAS,CAAC,CAAC,SAAS,MAAM,IAAI,GAAG,CAAC,iBAAiB,CAAC,MAAM,CAAC,GAC/D,CAAC,MAAM,CAAC,SAAS,KAAK,GAAG;IAAE,MAAM,CAAC,EAAE,KAAK,CAAA;CAAE,GAAG;IAAE,MAAM,EAAE,CAAC,CAAA;CAAE,CAAC,CAAC;AAE9D,qBAAa,IAAI,CAAC,OAAO,SAAS,MAAM,GAAG,MAAM;;IAChD,oBAAoB;IACpB,OAAO,EAAE,OAAO,CAAC;IAEjB,sBAAsB;IACtB,UAAU,EAAE,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;IAE9B,uEAAuE;IACvE,IAAI,EAAE,CAAC,KAAK,EAAE,SAAS,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,KAAK,GAAG,CAAC,OAAO,CAAC;IAIhE;;;;;;;;;;;;;;;;;;;;;;OAsBG;gBACS,GAAG,UAAU,EAAE,UAAU,CAAC,EAAE,CAAC,EAAE;IAC3C;;;OAGG;gBAEF,OAAO,EAAE,OAAO,EAChB,GAAG,UAAU,EAAE,UAAU,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,EAAE;CA2BpD"}
@@ -1,7 +1,7 @@
1
1
  import { jsx } from "../jsx/index.js";
2
2
  import { insertParams } from "../trie/insert-params.js";
3
3
  import { hash } from "../util/hash.js";
4
- export class Action {
4
+ export class Post {
5
5
  /** Route pattern */
6
6
  pattern;
7
7
  /** POST middleware */
package/dist/index.d.ts CHANGED
@@ -3,8 +3,8 @@ export { Chunk } from "./jsx/chunk/index.js";
3
3
  export { Trie, Route } from "./trie/index.js";
4
4
  export { App, type Middleware, type Params } from "./app/index.js";
5
5
  export { Context } from "./app/context.js";
6
- export { Page } from "./app/page.js";
7
- export { Action } from "./app/action.js";
6
+ export { Get } from "./app/get.js";
7
+ export { Post } from "./app/post.js";
8
8
  export { csrf } from "./app/mw/csrf.js";
9
9
  export type * from "./types/index.js";
10
10
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,WAAW,EAAE,QAAQ,EAAE,KAAK,GAAG,EAAE,MAAM,gBAAgB,CAAC;AACtE,OAAO,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAC7C,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,GAAG,EAAE,KAAK,UAAU,EAAE,KAAK,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACnE,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AACrC,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AACxC,mBAAmB,kBAAkB,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,WAAW,EAAE,QAAQ,EAAE,KAAK,GAAG,EAAE,MAAM,gBAAgB,CAAC;AACtE,OAAO,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAC7C,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,GAAG,EAAE,KAAK,UAAU,EAAE,KAAK,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACnE,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AACnC,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AACrC,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AACxC,mBAAmB,kBAAkB,CAAC"}
package/dist/index.js CHANGED
@@ -3,6 +3,6 @@ export { Chunk } from "./jsx/chunk/index.js";
3
3
  export { Trie, Route } from "./trie/index.js";
4
4
  export { App } from "./app/index.js";
5
5
  export { Context } from "./app/context.js";
6
- export { Page } from "./app/page.js";
7
- export { Action } from "./app/action.js";
6
+ export { Get } from "./app/get.js";
7
+ export { Post } from "./app/post.js";
8
8
  export { csrf } from "./app/mw/csrf.js";
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/jsx/chunk/index.ts"],"names":[],"mappings":"AAAA,qBAAa,KAAK;;IAIjB,2BAA2B;IAC3B,KAAK,EAAE,MAAM,CAAC;IAEd;;;;;OAKG;gBACS,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,OAAO;IAOtC;;OAEG;IACH,QAAQ;IAIR;;OAEG;IACH,MAAM,CAAC,GAAG,MAAM,EAAE,KAAK,EAAE;IAIzB;;;;;;OAMG;IACH,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO;CA4BvC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/jsx/chunk/index.ts"],"names":[],"mappings":"AAAA,qBAAa,KAAK;;IAIjB,2BAA2B;IAC3B,KAAK,EAAE,MAAM,CAAC;IAEd;;;;;OAKG;gBACS,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,OAAO;IAKtC;;OAEG;IACH,QAAQ;IAIR;;OAEG;IACH,MAAM,CAAC,GAAG,MAAM,EAAE,KAAK,EAAE;IAIzB;;;;;;OAMG;IACH,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO;CA4BvC"}
@@ -11,10 +11,7 @@ export class Chunk {
11
11
  */
12
12
  constructor(s, safe) {
13
13
  const value = String(s ?? "");
14
- if (safe)
15
- this.value = value;
16
- else
17
- this.value = Chunk.escape(value);
14
+ this.value = safe ? value : Chunk.escape(value);
18
15
  }
19
16
  /**
20
17
  * @returns `value`
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/jsx/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACrE,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACzC,OAAO,KAAK,EAAE,iBAAiB,IAAI,EAAE,EAAE,MAAM,yBAAyB,CAAC;AAGvE,wBAAwB;AACxB,yBAAiB,GAAG,CAAC;IACpB,6BAA6B;IAC7B,UAAiB,iBAAkB,SAAQ,EAAE;KAAG;IAEhD,kBAAkB;IAClB,KAAY,OAAO,GAAG,aAAa,CAClC,YAAY,CACT,MAAM,GACN,MAAM,GACN,MAAM,GACN,OAAO,GACP,MAAM,GACN,IAAI,GACJ,SAAS,GACT,MAAM,GACN,QAAQ,CAAC,OAAO,CAAC,GACjB,aAAa,CAAC,OAAO,CAAC,CACxB,CACD,CAAC;CACF;AAED,+BAA+B;AAC/B,MAAM,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;AAuBhD;;;;;;;GAOG;AACH,wBAAuB,GAAG,CAAC,CAAC,SAAS,KAAK,GAAG,KAAK,EACjD,GAAG,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,KAAK,GAAG,CAAC,OAAO,CAAC,GAAG,MAAM,EACzC,KAAK,EAAE,CAAC,wCAwCR;AAED;;;;;GAKG;AACH,wBAAuB,QAAQ,CAAC,KAAK,GAAE;IAAE,QAAQ,CAAC,EAAE,GAAG,CAAC,OAAO,CAAA;CAAO,wCAErE;AAED;;;GAGG;AACH,wBAAuB,WAAW,CACjC,OAAO,EAAE,GAAG,CAAC,OAAO,GAClB,cAAc,CAAC,KAAK,EAAE,IAAI,EAAE,OAAO,CAAC,CAkGtC;AAED;;;;;;;;;;GAUG;AACH,eAAO,MAAM,QAAQ,GAAU,SAAS,GAAG,CAAC,OAAO,oBAIlD,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/jsx/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACrE,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACzC,OAAO,KAAK,EAAE,iBAAiB,IAAI,EAAE,EAAE,MAAM,yBAAyB,CAAC;AAIvE,wBAAwB;AACxB,yBAAiB,GAAG,CAAC;IACpB,6BAA6B;IAC7B,UAAiB,iBAAkB,SAAQ,EAAE;KAAG;IAEhD,kBAAkB;IAClB,KAAY,OAAO,GAAG,aAAa,CAClC,YAAY,CACT,MAAM,GACN,MAAM,GACN,MAAM,GACN,OAAO,GACP,MAAM,GACN,IAAI,GACJ,SAAS,GACT,MAAM,GACN,QAAQ,CAAC,OAAO,CAAC,GACjB,aAAa,CAAC,OAAO,CAAC,CACxB,CACD,CAAC;CACF;AAED,+BAA+B;AAC/B,MAAM,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;AAuBhD;;;;;;;GAOG;AACH,wBAAuB,GAAG,CAAC,CAAC,SAAS,KAAK,GAAG,KAAK,EACjD,GAAG,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,KAAK,GAAG,CAAC,OAAO,CAAC,GAAG,MAAM,EACzC,KAAK,EAAE,CAAC,wCAwCR;AAED;;;;;GAKG;AACH,wBAAuB,QAAQ,CAAC,KAAK,GAAE;IAAE,QAAQ,CAAC,EAAE,GAAG,CAAC,OAAO,CAAA;CAAO,wCAErE;AAED;;;GAGG;AACH,wBAAuB,WAAW,CACjC,OAAO,EAAE,GAAG,CAAC,OAAO,GAClB,cAAc,CAAC,KAAK,EAAE,IAAI,EAAE,OAAO,CAAC,CA6GtC;AAED;;;;;;;;;;GAUG;AACH,eAAO,MAAM,QAAQ,GAAU,SAAS,GAAG,CAAC,OAAO,oBAIlD,CAAC"}
package/dist/jsx/index.js CHANGED
@@ -1,5 +1,6 @@
1
1
  import { Chunk } from "./chunk/index.js";
2
2
  import { merge } from "./merge-async-generators.js";
3
+ import { setImmediate } from "node:timers/promises";
3
4
  /**
4
5
  * These are the HTML tags that do not require a closing tag.
5
6
  *
@@ -105,11 +106,19 @@ export async function* toGenerator(element) {
105
106
  typeof iterator.return === "function") {
106
107
  // sync generator
107
108
  // process lazily - avoids loading all in memory
109
+ const yieldIterations = 50;
110
+ let yieldCounter = yieldIterations;
108
111
  while (true) {
109
112
  const result = iterator.next();
110
113
  if (result.done)
111
114
  break;
112
115
  yield* toGenerator(result.value);
116
+ if (--yieldCounter === 0) {
117
+ // yields back to the event loop to send chunks
118
+ // or check if the request has been cancelled
119
+ await setImmediate();
120
+ yieldCounter = yieldIterations;
121
+ }
113
122
  }
114
123
  return;
115
124
  }
@@ -8,8 +8,5 @@
8
8
  * @param returnValue Passed into each `iterator.return()`
9
9
  * @yields `IteratorResult` and `index` of the resolved generator.
10
10
  */
11
- export declare function merge<T>(generators: AsyncGenerator<T, void>[]): AsyncGenerator<{
12
- index: number;
13
- result: IteratorResult<T, void>;
14
- }, void, unknown>;
11
+ export declare function merge<T>(generators: AsyncGenerator<T, void>[]): AsyncGenerator<any, void, unknown>;
15
12
  //# sourceMappingURL=merge-async-generators.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"merge-async-generators.d.ts","sourceRoot":"","sources":["../../src/jsx/merge-async-generators.ts"],"names":[],"mappings":"AAOA;;;;;;;;;GASG;AACH,wBAAuB,KAAK,CAAC,CAAC,EAAE,UAAU,EAAE,cAAc,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE;;;kBAwBpE"}
1
+ {"version":3,"file":"merge-async-generators.d.ts","sourceRoot":"","sources":["../../src/jsx/merge-async-generators.ts"],"names":[],"mappings":"AAKA;;;;;;;;;GASG;AACH,wBAAuB,KAAK,CAAC,CAAC,EAAE,UAAU,EAAE,cAAc,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,sCA0BpE"}
@@ -1,4 +1,3 @@
1
- const never = new Promise(() => { });
2
1
  const next = async (iterator, index) => ({
3
2
  index,
4
3
  result: await iterator.next(),
@@ -15,23 +14,22 @@ const next = async (iterator, index) => ({
15
14
  */
16
15
  export async function* merge(generators) {
17
16
  const iterators = generators.map((gen) => gen[Symbol.asyncIterator]());
18
- const promises = iterators.map(next);
19
- let remaining = promises.length;
17
+ const promises = new Map();
18
+ iterators.forEach((iterator, index) => promises.set(index, next(iterator, index)));
20
19
  let current;
21
20
  try {
22
- while (remaining) {
23
- yield (current = await Promise.race(promises));
21
+ while (promises.size > 0) {
22
+ yield (current = await Promise.race(promises.values()));
24
23
  if (current.result.done) {
25
- promises[current.index] = never;
26
- remaining--;
24
+ promises.delete(current.index);
27
25
  }
28
26
  else {
29
- promises[current.index] = next(iterators[current.index], current.index);
27
+ promises.set(current.index, next(iterators[current.index], current.index));
30
28
  }
31
29
  }
32
30
  }
33
31
  finally {
34
32
  for (const iter of iterators)
35
- iter.return().catch(); // could have already returned
33
+ iter.return().catch(() => { }); // could have already returned
36
34
  }
37
35
  }
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "ovr",
3
3
  "description": "Progressive HTML Rendering",
4
- "version": "3.0.1",
4
+ "version": "4.0.0",
5
5
  "license": "MIT",
6
6
  "repository": {
7
7
  "type": "git",
@@ -192,44 +192,59 @@ export class Context<P extends Params = Params> {
192
192
  * @param status [HTTP response status code](https://developer.mozilla.org/en-US/docs/Web/HTTP/Status)
193
193
  */
194
194
  page(Page: JSX.Element, status?: number) {
195
- for (let i = this.#layouts.length - 1; i >= 0; i--)
195
+ for (let i = this.#layouts.length - 1; i >= 0; i--) {
196
196
  Page = this.#layouts[i]!({ children: Page });
197
+ }
197
198
 
198
- const headClose = "</head>";
199
- const bodyClose = "</body>";
199
+ let gen: AsyncGenerator<Chunk, void>;
200
200
 
201
- const elements: JSX.Element[] = this.base.split(headClose);
202
- if (!elements[1]) throw new TagNotFound(headClose);
201
+ if (this.base) {
202
+ // inject into base
203
+ const headClose = "</head>";
204
+ const bodyClose = "</body>";
203
205
 
204
- elements.splice(1, 0, this.#headElements, headClose);
206
+ const elements: JSX.Element[] = this.base.split(headClose);
207
+ if (!elements[1]) throw new TagNotFound(headClose);
205
208
 
206
- const bodyParts = (elements[3] as string).split(bodyClose);
207
- if (!bodyParts[1]) throw new TagNotFound(bodyClose);
209
+ elements.splice(1, 0, this.#headElements, headClose);
208
210
 
209
- const userAgent = this.req.headers.get("user-agent");
210
- if (userAgent?.includes("Safari") && !userAgent.includes("Chrome")) {
211
- // https://bugs.webkit.org/show_bug.cgi?id=252413
212
- // https://github.com/sveltejs/kit/issues/10315
213
- // https://github.com/remix-run/remix/issues/5804
214
- bodyParts[0] += `<div aria-hidden=true style=position:absolute;width:0;height:0;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);white-space:nowrap;border-width:0>${"\u200b".repeat(200)}</div>`;
215
- }
211
+ const bodyParts = (elements[3] as string).split(bodyClose);
212
+ if (!bodyParts[1]) throw new TagNotFound(bodyClose);
216
213
 
217
- elements[3] = bodyParts[0];
218
- elements.push(Page, bodyClose + bodyParts[1]);
214
+ const userAgent = this.req.headers.get("user-agent");
215
+ if (userAgent?.includes("Safari") && !userAgent.includes("Chrome")) {
216
+ // https://bugs.webkit.org/show_bug.cgi?id=252413
217
+ // https://github.com/sveltejs/kit/issues/10315
218
+ // https://github.com/remix-run/remix/issues/5804
219
+ bodyParts[0] += `<div aria-hidden=true style=position:absolute;width:0;height:0;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);white-space:nowrap;border-width:0>${"\u200b".repeat(200)}</div>`;
220
+ }
219
221
 
220
- const gen = toGenerator(
221
- elements.map((el) => {
222
- if (typeof el === "string") return new Chunk(el, true);
223
- return el;
224
- }),
225
- );
222
+ elements[3] = bodyParts[0];
223
+ elements.push(Page, bodyClose + bodyParts[1]);
224
+
225
+ gen = toGenerator(
226
+ elements.map((el) => {
227
+ if (typeof el === "string") return new Chunk(el, true);
228
+ return el;
229
+ }),
230
+ );
231
+ } else {
232
+ // HTML partial - just use the layouts + page
233
+ gen = toGenerator(Page);
234
+ }
226
235
 
227
236
  this.html(
228
237
  new ReadableStream<string>({
229
- async pull(c) {
230
- const { value, done } = await gen.next();
231
- if (done) c.close();
232
- else c.enqueue(value?.value);
238
+ pull: async (c) => {
239
+ if (this.req.signal.aborted) {
240
+ c.close();
241
+ gen.return();
242
+ return;
243
+ }
244
+
245
+ const result = await gen.next();
246
+ if (result.done) c.close();
247
+ else c.enqueue(result.value.value);
233
248
  },
234
249
 
235
250
  cancel() {
@@ -268,6 +283,12 @@ export class Context<P extends Params = Params> {
268
283
  * @returns the constructed `Response`
269
284
  */
270
285
  build() {
286
+ if (this.req.signal.aborted) {
287
+ // user cancelled the request
288
+ this.body = null;
289
+ this.status = 408;
290
+ }
291
+
271
292
  if (
272
293
  (!this.status || this.status === 404) &&
273
294
  this.#trailingSlash !== "ignore"
@@ -6,7 +6,7 @@ import type { Middleware, Params } from "./index.js";
6
6
  type AnchorProps<P extends Params> = JSX.IntrinsicElements["a"] &
7
7
  (keyof P extends never ? { params?: never } : { params: P });
8
8
 
9
- export class Page<Pattern extends string = string> {
9
+ export class Get<Pattern extends string = string> {
10
10
  /** Route pattern */
11
11
  pattern: Pattern;
12
12
 
@@ -25,10 +25,9 @@ export class Page<Pattern extends string = string> {
25
25
  * @example
26
26
  *
27
27
  * ```tsx
28
- * // page.tsx
29
- * import { Page } from "ovr";
28
+ * import { Get } from "ovr";
30
29
  *
31
- * export const page = new Page("/", () => {
30
+ * const page = new Get("/", () => {
32
31
  * return <p>Hello world</p>
33
32
  * });
34
33
  *
@@ -36,8 +35,7 @@ export class Page<Pattern extends string = string> {
36
35
  * return <page.Anchor>Home</page.Anchor>
37
36
  * }
38
37
  *
39
- * // app.tsx
40
- * app.add(page); registers the page
38
+ * app.add(page); register
41
39
  * ```
42
40
  */
43
41
  constructor(
package/src/app/index.ts CHANGED
@@ -4,9 +4,9 @@ import type {
4
4
  ExtractMultiParams,
5
5
  ExtractParams,
6
6
  } from "../types/index.js";
7
- import { Action } from "./action.js";
8
7
  import { Context } from "./context.js";
9
- import { Page } from "./page.js";
8
+ import { Get } from "./get.js";
9
+ import { Post } from "./post.js";
10
10
  import { AsyncLocalStorage } from "node:async_hooks";
11
11
 
12
12
  export type Params = Record<string, string>;
@@ -105,16 +105,16 @@ export class App {
105
105
  static storage = new AsyncLocalStorage<Context>();
106
106
 
107
107
  /**
108
- * @param routes `Page`s or `Action`s to add to the `App`
108
+ * @param routes `Get` or `Post` to add to `App`
109
109
  * @returns `App` instance
110
110
  */
111
- add(...routes: DeepArray<Page | Action | Record<string, Page | Action>>[]) {
111
+ add(...routes: DeepArray<Get | Post | Record<string, Get | Post>>[]) {
112
112
  for (const route of routes) {
113
113
  if (route instanceof Array) {
114
114
  this.add(...route);
115
- } else if (route instanceof Page) {
115
+ } else if (route instanceof Get) {
116
116
  this.get(route.pattern, ...route.middleware);
117
- } else if (route instanceof Action) {
117
+ } else if (route instanceof Post) {
118
118
  this.post(route.pattern, ...route.middleware);
119
119
  } else {
120
120
  this.add(...Object.values(route));
@@ -284,7 +284,7 @@ export class App {
284
284
 
285
285
  if (result instanceof Response) c.res(result.body, result);
286
286
  else if (result instanceof ReadableStream) c.body = result;
287
- else if (result) c.page(result);
287
+ else if (result != null) c.page(result);
288
288
  }
289
289
  };
290
290
 
@@ -7,7 +7,7 @@ import type { Middleware, Params } from "./index.js";
7
7
  type FormProps<P extends Params> = JSX.IntrinsicElements["form"] &
8
8
  (keyof P extends never ? { params?: never } : { params: P });
9
9
 
10
- export class Action<Pattern extends string = string> {
10
+ export class Post<Pattern extends string = string> {
11
11
  /** Route pattern */
12
12
  pattern: Pattern;
13
13
 
@@ -25,23 +25,21 @@ export class Action<Pattern extends string = string> {
25
25
  * @example
26
26
  *
27
27
  * ```tsx
28
- * // action.tsx
29
- * import { Action } from "ovr";
28
+ * import { Post } from "ovr";
30
29
  *
31
- * export const action = new Action((c) => {
30
+ * const post = new Post((c) => {
32
31
  * console.log("posted");
33
32
  * c.redirect("/", 303);
34
33
  * });
35
34
  *
36
- * export const page = new Page("/", () => (
37
- * <action.Form>
35
+ * const page = new Get("/", () => (
36
+ * <post.Form>
38
37
  * <input />
39
38
  * <button>Submit</button>
40
- * </action.Form>
39
+ * </post.Form>
41
40
  * ));
42
41
  *
43
- * // app.tsx
44
- * app.add(page, action); registers the action
42
+ * app.add(page, post); register
45
43
  * ```
46
44
  */
47
45
  constructor(...middleware: Middleware<{}>[]);
package/src/index.ts CHANGED
@@ -3,7 +3,7 @@ export { Chunk } from "./jsx/chunk/index.js";
3
3
  export { Trie, Route } from "./trie/index.js";
4
4
  export { App, type Middleware, type Params } from "./app/index.js";
5
5
  export { Context } from "./app/context.js";
6
- export { Page } from "./app/page.js";
7
- export { Action } from "./app/action.js";
6
+ export { Get } from "./app/get.js";
7
+ export { Post } from "./app/post.js";
8
8
  export { csrf } from "./app/mw/csrf.js";
9
9
  export type * from "./types/index.js";
@@ -13,9 +13,7 @@ export class Chunk {
13
13
  */
14
14
  constructor(s: unknown, safe?: boolean) {
15
15
  const value = String(s ?? "");
16
-
17
- if (safe) this.value = value;
18
- else this.value = Chunk.escape(value);
16
+ this.value = safe ? value : Chunk.escape(value);
19
17
  }
20
18
 
21
19
  /**
package/src/jsx/index.ts CHANGED
@@ -2,6 +2,7 @@ import type { MaybeFunction, MaybePromise } from "../types/index.js";
2
2
  import { Chunk } from "./chunk/index.js";
3
3
  import type { IntrinsicElements as IE } from "./intrinsic-elements.js";
4
4
  import { merge } from "./merge-async-generators.js";
5
+ import { setImmediate } from "node:timers/promises";
5
6
 
6
7
  /** ovr JSX namespace */
7
8
  export namespace JSX {
@@ -154,10 +155,21 @@ export async function* toGenerator(
154
155
  ) {
155
156
  // sync generator
156
157
  // process lazily - avoids loading all in memory
158
+ const yieldIterations = 50;
159
+ let yieldCounter = yieldIterations;
160
+
157
161
  while (true) {
158
162
  const result = iterator.next();
163
+
159
164
  if (result.done) break;
160
165
  yield* toGenerator(result.value);
166
+
167
+ if (--yieldCounter === 0) {
168
+ // yields back to the event loop to send chunks
169
+ // or check if the request has been cancelled
170
+ await setImmediate();
171
+ yieldCounter = yieldIterations;
172
+ }
161
173
  }
162
174
 
163
175
  return;
@@ -1,5 +1,3 @@
1
- const never = new Promise(() => {}) as Promise<any>;
2
-
3
1
  const next = async <T, R>(iterator: AsyncIterator<T, R>, index: number) => ({
4
2
  index,
5
3
  result: await iterator.next(),
@@ -17,26 +15,28 @@ const next = async <T, R>(iterator: AsyncIterator<T, R>, index: number) => ({
17
15
  */
18
16
  export async function* merge<T>(generators: AsyncGenerator<T, void>[]) {
19
17
  const iterators = generators.map((gen) => gen[Symbol.asyncIterator]());
20
- const promises = iterators.map(next);
18
+ const promises = new Map<number, Promise<any>>();
19
+
20
+ iterators.forEach((iterator, index) =>
21
+ promises.set(index, next(iterator, index)),
22
+ );
21
23
 
22
- let remaining = promises.length;
23
24
  let current: Awaited<ReturnType<typeof next>>;
24
25
 
25
26
  try {
26
- while (remaining) {
27
- yield (current = await Promise.race(promises));
27
+ while (promises.size > 0) {
28
+ yield (current = await Promise.race(promises.values()));
28
29
 
29
30
  if (current.result.done) {
30
- promises[current.index] = never;
31
- remaining--;
31
+ promises.delete(current.index);
32
32
  } else {
33
- promises[current.index] = next(
34
- iterators[current.index]!,
33
+ promises.set(
35
34
  current.index,
35
+ next(iterators[current.index]!, current.index),
36
36
  );
37
37
  }
38
38
  }
39
39
  } finally {
40
- for (const iter of iterators) iter.return().catch(); // could have already returned
40
+ for (const iter of iterators) iter.return().catch(() => {}); // could have already returned
41
41
  }
42
42
  }
@@ -1 +0,0 @@
1
- {"version":3,"file":"action.d.ts","sourceRoot":"","sources":["../../src/app/action.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,GAAG,EAAO,MAAM,iBAAiB,CAAC;AAEhD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAEvD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAErD,KAAK,SAAS,CAAC,CAAC,SAAS,MAAM,IAAI,GAAG,CAAC,iBAAiB,CAAC,MAAM,CAAC,GAC/D,CAAC,MAAM,CAAC,SAAS,KAAK,GAAG;IAAE,MAAM,CAAC,EAAE,KAAK,CAAA;CAAE,GAAG;IAAE,MAAM,EAAE,CAAC,CAAA;CAAE,CAAC,CAAC;AAE9D,qBAAa,MAAM,CAAC,OAAO,SAAS,MAAM,GAAG,MAAM;;IAClD,oBAAoB;IACpB,OAAO,EAAE,OAAO,CAAC;IAEjB,sBAAsB;IACtB,UAAU,EAAE,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;IAE9B,uEAAuE;IACvE,IAAI,EAAE,CAAC,KAAK,EAAE,SAAS,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,KAAK,GAAG,CAAC,OAAO,CAAC;IAIhE;;;;;;;;;;;;;;;;;;;;;;;;OAwBG;gBACS,GAAG,UAAU,EAAE,UAAU,CAAC,EAAE,CAAC,EAAE;IAC3C;;;OAGG;gBAEF,OAAO,EAAE,OAAO,EAChB,GAAG,UAAU,EAAE,UAAU,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,EAAE;CA2BpD"}
@@ -1 +0,0 @@
1
- {"version":3,"file":"page.d.ts","sourceRoot":"","sources":["../../src/app/page.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,GAAG,EAAO,MAAM,iBAAiB,CAAC;AAEhD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAErD,KAAK,WAAW,CAAC,CAAC,SAAS,MAAM,IAAI,GAAG,CAAC,iBAAiB,CAAC,GAAG,CAAC,GAC9D,CAAC,MAAM,CAAC,SAAS,KAAK,GAAG;IAAE,MAAM,CAAC,EAAE,KAAK,CAAA;CAAE,GAAG;IAAE,MAAM,EAAE,CAAC,CAAA;CAAE,CAAC,CAAC;AAE9D,qBAAa,IAAI,CAAC,OAAO,SAAS,MAAM,GAAG,MAAM;;IAChD,oBAAoB;IACpB,OAAO,EAAE,OAAO,CAAC;IAEjB,qBAAqB;IACrB,UAAU,EAAE,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;IAE9B,oDAAoD;IACpD,MAAM,EAAE,CAAC,KAAK,EAAE,WAAW,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,KAAK,GAAG,CAAC,OAAO,CAAC;IAIpE;;;;;;;;;;;;;;;;;;;;;OAqBG;gBAEF,OAAO,EAAE,OAAO,EAChB,GAAG,UAAU,EAAE,UAAU,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,EAAE;CAWpD"}