ovr 4.1.0 → 4.2.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.
Files changed (47) hide show
  1. package/dist/app/context.d.ts +2 -2
  2. package/dist/app/context.d.ts.map +1 -1
  3. package/dist/app/context.js +2 -1
  4. package/dist/app/helper/get.d.ts +30 -0
  5. package/dist/app/helper/get.d.ts.map +1 -0
  6. package/dist/app/helper/get.js +38 -0
  7. package/dist/app/helper/index.d.ts +23 -0
  8. package/dist/app/helper/index.d.ts.map +1 -0
  9. package/dist/app/helper/index.js +63 -0
  10. package/dist/app/{post.d.ts → helper/post.d.ts} +4 -13
  11. package/dist/app/helper/post.d.ts.map +1 -0
  12. package/dist/app/helper/post.js +15 -0
  13. package/dist/app/index.d.ts +5 -5
  14. package/dist/app/index.d.ts.map +1 -1
  15. package/dist/app/index.js +12 -12
  16. package/dist/index.d.ts +3 -3
  17. package/dist/index.d.ts.map +1 -1
  18. package/dist/index.js +2 -2
  19. package/dist/jsx/chunk/index.js +5 -3
  20. package/dist/jsx/index.d.ts.map +1 -1
  21. package/dist/jsx/index.js +36 -28
  22. package/dist/jsx/merge-async-generators.d.ts +4 -1
  23. package/dist/jsx/merge-async-generators.d.ts.map +1 -1
  24. package/dist/types/index.d.ts +2 -1
  25. package/dist/types/index.d.ts.map +1 -1
  26. package/package.json +1 -1
  27. package/src/app/context.ts +4 -3
  28. package/src/app/helper/get.ts +48 -0
  29. package/src/app/helper/index.ts +98 -0
  30. package/src/app/helper/post.ts +54 -0
  31. package/src/app/index.ts +13 -15
  32. package/src/index.ts +3 -3
  33. package/src/jsx/chunk/index.ts +5 -5
  34. package/src/jsx/index.ts +36 -32
  35. package/src/jsx/merge-async-generators.ts +1 -1
  36. package/src/types/index.ts +18 -1
  37. package/dist/app/get.d.ts +0 -38
  38. package/dist/app/get.d.ts.map +0 -1
  39. package/dist/app/get.js +0 -59
  40. package/dist/app/post.d.ts.map +0 -1
  41. package/dist/app/post.js +0 -41
  42. package/dist/trie/insert-params.d.ts +0 -8
  43. package/dist/trie/insert-params.d.ts.map +0 -1
  44. package/dist/trie/insert-params.js +0 -24
  45. package/src/app/get.ts +0 -82
  46. package/src/app/post.ts +0 -89
  47. package/src/trie/insert-params.ts +0 -31
@@ -1,6 +1,6 @@
1
1
  import { type JSX } from "../jsx/index.js";
2
- import type { Route } from "../trie/index.js";
3
- import { type ErrorHandler, type Middleware, type NotFoundHandler, type Params, type TrailingSlash } from "./index.js";
2
+ import type { Params, Route } from "../trie/index.js";
3
+ import { type ErrorHandler, type Middleware, type NotFoundHandler, type TrailingSlash } from "./index.js";
4
4
  type Layout = (props: {
5
5
  children: JSX.Element;
6
6
  }) => JSX.Element;
@@ -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;IAgEvC;;;;;;;;OAQG;IACH,IAAI,CAAC,CAAC,EAAE,MAAM;IAed;;OAEG;IACH,KAAK;IA+BL;;;;;;;;;;;;;;;;;;;;;;;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,MAAM,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAEtD,OAAO,EAEN,KAAK,YAAY,EACjB,KAAK,UAAU,EACf,KAAK,eAAe,EACpB,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;IAkEvC;;;;;;;;OAQG;IACH,IAAI,CAAC,CAAC,EAAE,MAAM;IAed;;OAEG;IACH,KAAK;IA+BL;;;;;;;;;;;;;;;;;;;;;;;OAuBG;IACH,MAAM,CAAC,GAAG;CAUV"}
@@ -170,6 +170,7 @@ export class Context {
170
170
  // HTML partial - just use the layouts + page
171
171
  gen = toGenerator(Page);
172
172
  }
173
+ let result;
173
174
  this.html(new ReadableStream({
174
175
  pull: async (c) => {
175
176
  if (this.req.signal.aborted) {
@@ -177,7 +178,7 @@ export class Context {
177
178
  gen.return();
178
179
  return;
179
180
  }
180
- const result = await gen.next();
181
+ result = await gen.next();
181
182
  if (result.done)
182
183
  c.close();
183
184
  else
@@ -0,0 +1,30 @@
1
+ import { type JSX } from "../../jsx/index.js";
2
+ import type { AnchorProps, ExtractParams } from "../../types/index.js";
3
+ import type { Middleware } from "../index.js";
4
+ import { Helper } from "./index.js";
5
+ export declare class Get<Pattern extends string = string> extends Helper<Pattern> {
6
+ /** `<a>` component with preset `href` attribute. */
7
+ Anchor: (props: AnchorProps<ExtractParams<Pattern>>) => JSX.Element;
8
+ /**
9
+ * @param pattern Route pattern
10
+ * @param middleware GET middleware
11
+ *
12
+ * @example
13
+ *
14
+ * ```tsx
15
+ * import { Get } from "ovr";
16
+ *
17
+ * const page = new Get("/", () => {
18
+ * return <p>Hello world</p>
19
+ * });
20
+ *
21
+ * const Nav = () => {
22
+ * return <page.Anchor>Home</page.Anchor>
23
+ * }
24
+ *
25
+ * app.add(page); register
26
+ * ```
27
+ */
28
+ constructor(pattern: Pattern, ...middleware: Middleware<ExtractParams<Pattern>>[]);
29
+ }
30
+ //# sourceMappingURL=get.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"get.d.ts","sourceRoot":"","sources":["../../../src/app/helper/get.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,GAAG,EAAO,MAAM,oBAAoB,CAAC;AACnD,OAAO,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACvE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAEpC,qBAAa,GAAG,CAAC,OAAO,SAAS,MAAM,GAAG,MAAM,CAAE,SAAQ,MAAM,CAAC,OAAO,CAAC;IACxE,oDAAoD;IACpD,MAAM,EAAE,CAAC,KAAK,EAAE,WAAW,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,KAAK,GAAG,CAAC,OAAO,CAAC;IAEpE;;;;;;;;;;;;;;;;;;;OAmBG;gBAEF,OAAO,EAAE,OAAO,EAChB,GAAG,UAAU,EAAE,UAAU,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,EAAE;CAgBpD"}
@@ -0,0 +1,38 @@
1
+ import { jsx } from "../../jsx/index.js";
2
+ import { Helper } from "./index.js";
3
+ export class Get extends Helper {
4
+ /** `<a>` component with preset `href` attribute. */
5
+ Anchor;
6
+ /**
7
+ * @param pattern Route pattern
8
+ * @param middleware GET middleware
9
+ *
10
+ * @example
11
+ *
12
+ * ```tsx
13
+ * import { Get } from "ovr";
14
+ *
15
+ * const page = new Get("/", () => {
16
+ * return <p>Hello world</p>
17
+ * });
18
+ *
19
+ * const Nav = () => {
20
+ * return <page.Anchor>Home</page.Anchor>
21
+ * }
22
+ *
23
+ * app.add(page); register
24
+ * ```
25
+ */
26
+ constructor(pattern, ...middleware) {
27
+ super("GET", pattern, ...middleware);
28
+ this.Anchor = (props) => {
29
+ const { params, ...rest } = props;
30
+ return jsx("a", {
31
+ href: this.pathname(
32
+ // @ts-expect-error - do not have to pass in {} if no params
33
+ params),
34
+ ...rest,
35
+ });
36
+ };
37
+ }
38
+ }
@@ -0,0 +1,23 @@
1
+ import { type JSX } from "../../jsx/index.js";
2
+ import type { ButtonProps, ExtractParams, FormProps, InsertParams } from "../../types/index.js";
3
+ import type { Middleware } from "../index.js";
4
+ export declare class Helper<Pattern extends string> {
5
+ #private;
6
+ /** Extracted parameters type for the pattern */
7
+ readonly Params: ExtractParams<Pattern>;
8
+ /** Route pattern */
9
+ pattern: Pattern;
10
+ /** GET middleware */
11
+ middleware: Middleware<any>[];
12
+ /** `<button>` component with preset `formaction` and `formmethod` attributes. */
13
+ Button: (props: ButtonProps<ExtractParams<Pattern>>) => JSX.Element;
14
+ /** `<form>` component with preset `method` and `action` attributes. */
15
+ Form: (props: FormProps<ExtractParams<Pattern>>) => JSX.Element;
16
+ constructor(method: string, pattern: Pattern, ...middleware: Middleware<ExtractParams<Pattern>>[]);
17
+ /**
18
+ * @param [params] Parameters to insert
19
+ * @returns Resolved `pathname` with params
20
+ */
21
+ pathname<Params extends ExtractParams<Pattern>>(...[params]: keyof Params extends never ? [] : [Params]): InsertParams<Pattern, Params>;
22
+ }
23
+ //# sourceMappingURL=index.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/app/helper/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,GAAG,EAAO,MAAM,oBAAoB,CAAC;AACnD,OAAO,KAAK,EACX,WAAW,EACX,aAAa,EACb,SAAS,EACT,YAAY,EACZ,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAE9C,qBAAa,MAAM,CAAC,OAAO,SAAS,MAAM;;IACzC,gDAAgD;IAChD,SAAiB,MAAM,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC;IAEhD,oBAAoB;IACpB,OAAO,EAAE,OAAO,CAAC;IAEjB,qBAAqB;IACrB,UAAU,EAAE,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;IAE9B,iFAAiF;IACjF,MAAM,EAAE,CAAC,KAAK,EAAE,WAAW,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,KAAK,GAAG,CAAC,OAAO,CAAC;IAEpE,uEAAuE;IACvE,IAAI,EAAE,CAAC,KAAK,EAAE,SAAS,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,KAAK,GAAG,CAAC,OAAO,CAAC;gBAM/D,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,OAAO,EAChB,GAAG,UAAU,EAAE,UAAU,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,EAAE;IAiCpD;;;OAGG;IACH,QAAQ,CAAC,MAAM,SAAS,aAAa,CAAC,OAAO,CAAC,EAC7C,GAAG,CAAC,MAAM,CAAC,EAAE,MAAM,MAAM,SAAS,KAAK,GAAG,EAAE,GAAG,CAAC,MAAM,CAAC,GACrD,YAAY,CAAC,OAAO,EAAE,MAAM,CAAC;CA2BhC"}
@@ -0,0 +1,63 @@
1
+ import { jsx } from "../../jsx/index.js";
2
+ export class Helper {
3
+ /** Route pattern */
4
+ pattern;
5
+ /** GET middleware */
6
+ middleware; // any so you can use other middleware
7
+ /** `<button>` component with preset `formaction` and `formmethod` attributes. */
8
+ Button;
9
+ /** `<form>` component with preset `method` and `action` attributes. */
10
+ Form;
11
+ /** Pattern parts */
12
+ #parts;
13
+ constructor(method, pattern, ...middleware) {
14
+ this.pattern = pattern;
15
+ this.middleware = middleware;
16
+ this.#parts = pattern.split("/");
17
+ this.Button = (props) => {
18
+ const { params, ...rest } = props;
19
+ return jsx("button", {
20
+ formaction: this.pathname(
21
+ // @ts-expect-error - do not have to pass in {} if no params
22
+ params),
23
+ formmethod: method,
24
+ ...rest,
25
+ });
26
+ };
27
+ this.Form = (props) => {
28
+ const { params, ...rest } = props;
29
+ return jsx("form", {
30
+ action: this.pathname(
31
+ // @ts-expect-error - do not have to pass in {} if no params
32
+ params),
33
+ method,
34
+ ...rest,
35
+ });
36
+ };
37
+ }
38
+ /**
39
+ * @param [params] Parameters to insert
40
+ * @returns Resolved `pathname` with params
41
+ */
42
+ pathname(...[params]) {
43
+ if (!params)
44
+ return this.pattern;
45
+ const wild = "*";
46
+ return this.#parts
47
+ .map((part) => {
48
+ if (part.startsWith(":")) {
49
+ const param = part.slice(1);
50
+ if (!(param in params))
51
+ throw new Error(`Parameter "${param}" did not match pattern.`);
52
+ return params[param];
53
+ }
54
+ if (part === wild) {
55
+ if (!(wild in params))
56
+ throw new Error("No wildcard parameter found.");
57
+ return params[wild];
58
+ }
59
+ return part;
60
+ })
61
+ .join("/");
62
+ }
63
+ }
@@ -1,16 +1,7 @@
1
- import { type JSX } from "../jsx/index.js";
2
- import type { ButtonProps, ExtractParams, FormProps } from "../types/index.js";
3
- import type { Middleware } from "./index.js";
4
- export declare class Post<Pattern extends string = string> {
5
- #private;
6
- /** Route pattern */
7
- pattern: Pattern;
8
- /** POST middleware */
9
- middleware: Middleware<any>[];
10
- /** `<button>` component with preset `formaction` and `formmethod` attributes. */
11
- Button: (props: ButtonProps<ExtractParams<Pattern>>) => JSX.Element;
12
- /** `<form>` component with preset `method` and `action` attributes. */
13
- Form: (props: FormProps<ExtractParams<Pattern>>) => JSX.Element;
1
+ import type { ExtractParams } from "../../types/index.js";
2
+ import type { Middleware } from "../index.js";
3
+ import { Helper } from "./index.js";
4
+ export declare class Post<Pattern extends string = string> extends Helper<Pattern> {
14
5
  /**
15
6
  * @param middleware POST middleware
16
7
  *
@@ -0,0 +1 @@
1
+ {"version":3,"file":"post.d.ts","sourceRoot":"","sources":["../../../src/app/helper/post.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAE1D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAEpC,qBAAa,IAAI,CAAC,OAAO,SAAS,MAAM,GAAG,MAAM,CAAE,SAAQ,MAAM,CAAC,OAAO,CAAC;IACzE;;;;;;;;;;;;;;;;;;;;;;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;CAiBpD"}
@@ -0,0 +1,15 @@
1
+ import { hash } from "../../util/hash.js";
2
+ import { Helper } from "./index.js";
3
+ export class Post extends Helper {
4
+ constructor(patternOrMiddleware, ...middleware) {
5
+ let pattern;
6
+ if (typeof patternOrMiddleware === "string") {
7
+ pattern = patternOrMiddleware;
8
+ }
9
+ else {
10
+ middleware.unshift(patternOrMiddleware);
11
+ pattern = `/_p/${hash(middleware.join())}`;
12
+ }
13
+ super("POST", pattern, ...middleware);
14
+ }
15
+ }
@@ -1,9 +1,9 @@
1
+ import { type Params } from "../trie/index.js";
1
2
  import type { DeepArray, ExtractMultiParams, ExtractParams } from "../types/index.js";
2
3
  import { Context } from "./context.js";
3
- import { Get } from "./get.js";
4
- import { Post } from "./post.js";
4
+ import { Get } from "./helper/get.js";
5
+ import { Post } from "./helper/post.js";
5
6
  import { AsyncLocalStorage } from "node:async_hooks";
6
- export type Params = Record<string, string>;
7
7
  export type Middleware<P extends Params = Params> = (context: Context<P>, next: () => Promise<void>) => any;
8
8
  export type TrailingSlash = "always" | "never" | "ignore";
9
9
  type Method = "GET" | "HEAD" | "POST" | "PUT" | "DELETE" | "CONNECT" | "OPTIONS" | "TRACE" | "PATCH" | (string & {});
@@ -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 `Get` or `Post` to add to `App`
60
+ * @param helpers `Helper` to add to `App`
61
61
  * @returns `App` instance
62
62
  */
63
- add(...routes: DeepArray<Get | Post | Record<string, Get | Post>>[]): this;
63
+ add(...helpers: 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
2
  import { Context } from "./context.js";
3
- import { Get } from "./get.js";
4
- import { Post } from "./post.js";
3
+ import { Get } from "./helper/get.js";
4
+ import { Post } from "./helper/post.js";
5
5
  import { AsyncLocalStorage } from "node:async_hooks";
6
6
  export class App {
7
7
  /** Built tries per HTTP method. */
@@ -54,22 +54,22 @@ export class App {
54
54
  /** Stores context per request. */
55
55
  static storage = new AsyncLocalStorage();
56
56
  /**
57
- * @param routes `Get` or `Post` to add to `App`
57
+ * @param helpers `Helper` to add to `App`
58
58
  * @returns `App` instance
59
59
  */
60
- add(...routes) {
61
- for (const route of routes) {
62
- if (route instanceof Array) {
63
- this.add(...route);
60
+ add(...helpers) {
61
+ for (const helper of helpers) {
62
+ if (helper instanceof Array) {
63
+ this.add(...helper);
64
64
  }
65
- else if (route instanceof Get) {
66
- this.get(route.pattern, ...route.middleware);
65
+ else if (helper instanceof Get) {
66
+ this.get(helper.pattern, ...helper.middleware);
67
67
  }
68
- else if (route instanceof Post) {
69
- this.post(route.pattern, ...route.middleware);
68
+ else if (helper instanceof Post) {
69
+ this.post(helper.pattern, ...helper.middleware);
70
70
  }
71
71
  else {
72
- this.add(...Object.values(route));
72
+ this.add(...Object.values(helper));
73
73
  }
74
74
  }
75
75
  return this;
package/dist/index.d.ts CHANGED
@@ -1,9 +1,9 @@
1
1
  export { jsx, toGenerator, toString, type JSX } from "./jsx/index.js";
2
2
  export { Chunk } from "./jsx/chunk/index.js";
3
3
  export { Trie, Route } from "./trie/index.js";
4
- export { App, type Middleware, type Params } from "./app/index.js";
4
+ export { App, type Middleware } from "./app/index.js";
5
5
  export { Context } from "./app/context.js";
6
- export { Get } from "./app/get.js";
7
- export { Post } from "./app/post.js";
6
+ export { Get } from "./app/helper/get.js";
7
+ export { Post } from "./app/helper/post.js";
8
8
  export { csrf } from "./app/mw/csrf.js";
9
9
  //# 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,GAAG,EAAE,MAAM,cAAc,CAAC;AACnC,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AACrC,OAAO,EAAE,IAAI,EAAE,MAAM,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,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,GAAG,EAAE,MAAM,qBAAqB,CAAC;AAC1C,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAC5C,OAAO,EAAE,IAAI,EAAE,MAAM,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 { Get } from "./app/get.js";
7
- export { Post } from "./app/post.js";
6
+ export { Get } from "./app/helper/get.js";
7
+ export { Post } from "./app/helper/post.js";
8
8
  export { csrf } from "./app/mw/csrf.js";
@@ -40,12 +40,14 @@ export class Chunk {
40
40
  // tracks the position of the last successful match in the input string
41
41
  let start = 0;
42
42
  let result = "";
43
+ // index of the match
44
+ let i;
45
+ let match;
43
46
  // since `g` flag is used, regex maintains state with each loop,
44
47
  // checking from the lastIndex onward each time
45
48
  while (regex.test(s)) {
46
- // index of the match
47
- const i = regex.lastIndex - 1;
48
- const match = s[i];
49
+ i = regex.lastIndex - 1;
50
+ match = s[i];
49
51
  result +=
50
52
  // everything that didn't match during this test
51
53
  s.slice(start, i) +
@@ -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;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"}
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,CA8GtC;AAED;;;;;;;;;;GAUG;AACH,eAAO,MAAM,QAAQ,GAAU,SAAS,GAAG,CAAC,OAAO,oBAOlD,CAAC"}
package/dist/jsx/index.js CHANGED
@@ -37,25 +37,28 @@ export async function* jsx(tag, props) {
37
37
  }
38
38
  // intrinsic element
39
39
  const { children, ...rest } = props;
40
- const attributes = [];
41
- for (let key in rest) {
42
- const value = rest[key]; // needs to come before reassigning keys
40
+ let attributes = "";
41
+ let key;
42
+ let value;
43
+ for (key in rest) {
44
+ value = rest[key]; // needs to come before reassigning keys
43
45
  if (key === "className")
44
46
  key = "class";
45
47
  else if (key === "htmlFor")
46
48
  key = "for";
47
49
  if (value === true) {
48
50
  // just put the key without the value
49
- attributes.push(` ${key}`);
51
+ attributes += ` ${key}`;
50
52
  }
51
- else if (typeof value === "string" ||
52
- typeof value === "number" ||
53
- typeof value === "bigint") {
54
- attributes.push(` ${key}="${Chunk.escape(String(value), true)}"`);
53
+ else if (typeof value === "string") {
54
+ attributes += ` ${key}="${Chunk.escape(value, true)}"`;
55
+ }
56
+ else if (typeof value === "number" || typeof value === "bigint") {
57
+ attributes += ` ${key}="${value}"`;
55
58
  }
56
59
  // otherwise, don't include the attribute
57
60
  }
58
- yield new Chunk(`<${tag}${attributes.join("")}>`, true);
61
+ yield new Chunk(`<${tag}${attributes}>`, true);
59
62
  if (voidElements.has(tag))
60
63
  return;
61
64
  yield* toGenerator(children);
@@ -94,7 +97,8 @@ export async function* toGenerator(element) {
94
97
  if (typeof element === "object") {
95
98
  if (Symbol.asyncIterator in element) {
96
99
  // async iterable - lazily resolve
97
- for await (const children of element)
100
+ let children;
101
+ for await (children of element)
98
102
  yield* toGenerator(children);
99
103
  return;
100
104
  }
@@ -106,10 +110,11 @@ export async function* toGenerator(element) {
106
110
  typeof iterator.return === "function") {
107
111
  // sync generator
108
112
  // process lazily - avoids loading all in memory
109
- const yieldIterations = 50;
113
+ const yieldIterations = 150;
110
114
  let yieldCounter = yieldIterations;
115
+ let result;
111
116
  while (true) {
112
- const result = iterator.next();
117
+ result = iterator.next();
113
118
  if (result.done)
114
119
  break;
115
120
  yield* toGenerator(result.value);
@@ -125,19 +130,21 @@ export async function* toGenerator(element) {
125
130
  // other iterable - array, set, etc.
126
131
  // process children in parallel
127
132
  const generators = [];
133
+ let result;
128
134
  while (true) {
129
- const result = iterator.next();
135
+ result = iterator.next();
130
136
  if (result.done)
131
137
  break;
132
138
  generators.push(toGenerator(result.value));
133
139
  }
134
- const queue = new Array(generators.length).fill(null);
135
- let current = 0;
140
+ const queue = new Array(generators.length);
136
141
  const complete = new Set();
137
- for await (const { index, result: { done, value: chunk }, } of merge(generators)) {
138
- if (done) {
139
- complete.add(index);
140
- if (index === current) {
142
+ let current = 0;
143
+ let m;
144
+ for await (m of merge(generators)) {
145
+ if (m.result.done) {
146
+ complete.add(m.index);
147
+ if (m.index === current) {
141
148
  while (++current < generators.length) {
142
149
  if (queue[current]) {
143
150
  // yield whatever is in the next queue even if it hasn't completed yet
@@ -150,15 +157,15 @@ export async function* toGenerator(element) {
150
157
  }
151
158
  }
152
159
  }
153
- else if (index === current) {
154
- yield chunk; // stream the current value directly
160
+ else if (m.index === current) {
161
+ yield m.result.value; // stream the current value directly
155
162
  }
156
163
  else {
157
164
  // queue the value for later
158
- if (queue[index])
159
- queue[index].concat(chunk);
165
+ if (queue[m.index])
166
+ queue[m.index].concat(m.result.value);
160
167
  else
161
- queue[index] = chunk;
168
+ queue[m.index] = m.result.value;
162
169
  }
163
170
  }
164
171
  // clear the queue
@@ -181,8 +188,9 @@ export async function* toGenerator(element) {
181
188
  * @returns Concatenated HTML
182
189
  */
183
190
  export const toString = async (element) => {
184
- const buffer = [];
185
- for await (const chunk of toGenerator(element))
186
- buffer.push(chunk);
187
- return buffer.join("");
191
+ let buffer = "";
192
+ let chunk;
193
+ for await (chunk of toGenerator(element))
194
+ buffer += chunk.value;
195
+ return buffer;
188
196
  };
@@ -7,5 +7,8 @@
7
7
  * @param generators Resolved in parallel.
8
8
  * @yields `IteratorResult` and `index` of the resolved generator.
9
9
  */
10
- export declare function merge<T>(generators: AsyncGenerator<T, void>[]): AsyncGenerator<any, void, unknown>;
10
+ export declare function merge<T>(generators: AsyncGenerator<T, void>[]): AsyncGenerator<{
11
+ index: number;
12
+ result: IteratorResult<T, void>;
13
+ }, void, unknown>;
11
14
  //# 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":"AAKA;;;;;;;;GAQG;AACH,wBAAuB,KAAK,CAAC,CAAC,EAAE,UAAU,EAAE,cAAc,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,sCA6BpE"}
1
+ {"version":3,"file":"merge-async-generators.d.ts","sourceRoot":"","sources":["../../src/jsx/merge-async-generators.ts"],"names":[],"mappings":"AAKA;;;;;;;;GAQG;AACH,wBAAuB,KAAK,CAAC,CAAC,EAAE,UAAU,EAAE,cAAc,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE;;;kBA6BpE"}
@@ -1,5 +1,5 @@
1
- import type { Params } from "../app/index.js";
2
1
  import type { JSX } from "../jsx/index.js";
2
+ import type { Params } from "../trie/index.js";
3
3
  export type MaybePromise<T> = T | Promise<T>;
4
4
  export type MaybeFunction<T> = T | (() => T);
5
5
  export type DeepArray<T> = T | DeepArray<T>[];
@@ -14,6 +14,7 @@ export type ExtractMultiParams<Patterns extends string[]> = Patterns extends [
14
14
  infer First extends string,
15
15
  ...infer Rest extends string[]
16
16
  ] ? Rest["length"] extends 0 ? ExtractParams<First> : ExtractParams<First> | ExtractMultiParams<Rest> : never;
17
+ export type InsertParams<Pattern extends string, P extends Params> = Pattern extends `${infer Start}:${infer Param}/${infer Rest}` ? Param extends keyof P ? `${Start}${P[Param]}/${InsertParams<Rest, P>}` : Pattern : Pattern extends `${infer Start}:${infer Param}` ? Param extends keyof P ? `${Start}${P[Param]}` : Pattern : Pattern extends `${infer Start}*` ? "*" extends keyof P ? `${Start}${P["*"]}` : Pattern : Pattern;
17
18
  export type AnchorProps<P extends Params> = JSX.IntrinsicElements["a"] & (keyof P extends never ? {
18
19
  params?: never;
19
20
  } : {
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAE3C,MAAM,MAAM,YAAY,CAAC,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;AAE7C,MAAM,MAAM,aAAa,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;AAE7C,MAAM,MAAM,SAAS,CAAC,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC;AAE9C,MAAM,MAAM,aAAa,CAAC,OAAO,SAAS,MAAM,GAAG,MAAM,IACxD,OAAO,SAAS,GAAG,MAAM,MAAM,IAAI,MAAM,KAAK,IAAI,MAAM,IAAI,EAAE,GAC3D;KAAG,CAAC,IAAI,KAAK,GAAG,MAAM,aAAa,CAAC,IAAI,CAAC,GAAG,MAAM;CAAE,GACpD,OAAO,SAAS,GAAG,MAAM,MAAM,IAAI,MAAM,KAAK,EAAE,GAC/C;KAAG,CAAC,IAAI,KAAK,GAAG,MAAM;CAAE,GACxB,OAAO,SAAS,GAAG,MAAM,KAAK,GAAG,GAChC;IAAE,GAAG,EAAE,MAAM,CAAA;CAAE,GACf,EAAE,CAAC;AAET,MAAM,MAAM,kBAAkB,CAAC,QAAQ,SAAS,MAAM,EAAE,IAAI,QAAQ,SAAS;IAC5E,MAAM,KAAK,SAAS,MAAM;IAC1B,GAAG,MAAM,IAAI,SAAS,MAAM,EAAE;CAC9B,GACE,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,GACvB,aAAa,CAAC,KAAK,CAAC,GACpB,aAAa,CAAC,KAAK,CAAC,GAAG,kBAAkB,CAAC,IAAI,CAAC,GAChD,KAAK,CAAC;AAET,MAAM,MAAM,WAAW,CAAC,CAAC,SAAS,MAAM,IAAI,GAAG,CAAC,iBAAiB,CAAC,GAAG,CAAC,GACrE,CAAC,MAAM,CAAC,SAAS,KAAK,GAAG;IAAE,MAAM,CAAC,EAAE,KAAK,CAAA;CAAE,GAAG;IAAE,MAAM,EAAE,CAAC,CAAA;CAAE,CAAC,CAAC;AAE9D,MAAM,MAAM,SAAS,CAAC,CAAC,SAAS,MAAM,IAAI,GAAG,CAAC,iBAAiB,CAAC,MAAM,CAAC,GACtE,CAAC,MAAM,CAAC,SAAS,KAAK,GAAG;IAAE,MAAM,CAAC,EAAE,KAAK,CAAA;CAAE,GAAG;IAAE,MAAM,EAAE,CAAC,CAAA;CAAE,CAAC,CAAC;AAE9D,MAAM,MAAM,WAAW,CAAC,CAAC,SAAS,MAAM,IAAI,GAAG,CAAC,iBAAiB,CAAC,QAAQ,CAAC,GAC1E,CAAC,MAAM,CAAC,SAAS,KAAK,GAAG;IAAE,MAAM,CAAC,EAAE,KAAK,CAAA;CAAE,GAAG;IAAE,MAAM,EAAE,CAAC,CAAA;CAAE,CAAC,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE/C,MAAM,MAAM,YAAY,CAAC,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;AAE7C,MAAM,MAAM,aAAa,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;AAE7C,MAAM,MAAM,SAAS,CAAC,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC;AAE9C,MAAM,MAAM,aAAa,CAAC,OAAO,SAAS,MAAM,GAAG,MAAM,IACxD,OAAO,SAAS,GAAG,MAAM,MAAM,IAAI,MAAM,KAAK,IAAI,MAAM,IAAI,EAAE,GAC3D;KAAG,CAAC,IAAI,KAAK,GAAG,MAAM,aAAa,CAAC,IAAI,CAAC,GAAG,MAAM;CAAE,GACpD,OAAO,SAAS,GAAG,MAAM,MAAM,IAAI,MAAM,KAAK,EAAE,GAC/C;KAAG,CAAC,IAAI,KAAK,GAAG,MAAM;CAAE,GACxB,OAAO,SAAS,GAAG,MAAM,KAAK,GAAG,GAChC;IAAE,GAAG,EAAE,MAAM,CAAA;CAAE,GACf,EAAE,CAAC;AAET,MAAM,MAAM,kBAAkB,CAAC,QAAQ,SAAS,MAAM,EAAE,IAAI,QAAQ,SAAS;IAC5E,MAAM,KAAK,SAAS,MAAM;IAC1B,GAAG,MAAM,IAAI,SAAS,MAAM,EAAE;CAC9B,GACE,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,GACvB,aAAa,CAAC,KAAK,CAAC,GACpB,aAAa,CAAC,KAAK,CAAC,GAAG,kBAAkB,CAAC,IAAI,CAAC,GAChD,KAAK,CAAC;AAET,MAAM,MAAM,YAAY,CACvB,OAAO,SAAS,MAAM,EACtB,CAAC,SAAS,MAAM,IACb,OAAO,SAAS,GAAG,MAAM,KAAK,IAAI,MAAM,KAAK,IAAI,MAAM,IAAI,EAAE,GAC9D,KAAK,SAAS,MAAM,CAAC,GACpB,GAAG,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,IAAI,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,GAC9C,OAAO,GACR,OAAO,SAAS,GAAG,MAAM,KAAK,IAAI,MAAM,KAAK,EAAE,GAC9C,KAAK,SAAS,MAAM,CAAC,GACpB,GAAG,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,EAAE,GACrB,OAAO,GACR,OAAO,SAAS,GAAG,MAAM,KAAK,GAAG,GAChC,GAAG,SAAS,MAAM,CAAC,GAClB,GAAG,KAAK,GAAG,CAAC,CAAC,GAAG,CAAC,EAAE,GACnB,OAAO,GACR,OAAO,CAAC;AAEb,MAAM,MAAM,WAAW,CAAC,CAAC,SAAS,MAAM,IAAI,GAAG,CAAC,iBAAiB,CAAC,GAAG,CAAC,GACrE,CAAC,MAAM,CAAC,SAAS,KAAK,GAAG;IAAE,MAAM,CAAC,EAAE,KAAK,CAAA;CAAE,GAAG;IAAE,MAAM,EAAE,CAAC,CAAA;CAAE,CAAC,CAAC;AAE9D,MAAM,MAAM,SAAS,CAAC,CAAC,SAAS,MAAM,IAAI,GAAG,CAAC,iBAAiB,CAAC,MAAM,CAAC,GACtE,CAAC,MAAM,CAAC,SAAS,KAAK,GAAG;IAAE,MAAM,CAAC,EAAE,KAAK,CAAA;CAAE,GAAG;IAAE,MAAM,EAAE,CAAC,CAAA;CAAE,CAAC,CAAC;AAE9D,MAAM,MAAM,WAAW,CAAC,CAAC,SAAS,MAAM,IAAI,GAAG,CAAC,iBAAiB,CAAC,QAAQ,CAAC,GAC1E,CAAC,MAAM,CAAC,SAAS,KAAK,GAAG;IAAE,MAAM,CAAC,EAAE,KAAK,CAAA;CAAE,GAAG;IAAE,MAAM,EAAE,CAAC,CAAA;CAAE,CAAC,CAAC"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "ovr",
3
3
  "description": "Progressive HTML Rendering",
4
- "version": "4.1.0",
4
+ "version": "4.2.0",
5
5
  "license": "MIT",
6
6
  "repository": {
7
7
  "type": "git",
@@ -1,13 +1,12 @@
1
1
  import { Chunk } from "../jsx/chunk/index.js";
2
2
  import { type JSX, toGenerator } from "../jsx/index.js";
3
- import type { Route } from "../trie/index.js";
3
+ import type { Params, Route } from "../trie/index.js";
4
4
  import { hash } from "../util/hash.js";
5
5
  import {
6
6
  App,
7
7
  type ErrorHandler,
8
8
  type Middleware,
9
9
  type NotFoundHandler,
10
- type Params,
11
10
  type TrailingSlash,
12
11
  } from "./index.js";
13
12
  import { Memo } from "./memo/index.js";
@@ -233,6 +232,8 @@ export class Context<P extends Params = Params> {
233
232
  gen = toGenerator(Page);
234
233
  }
235
234
 
235
+ let result: IteratorResult<Chunk>;
236
+
236
237
  this.html(
237
238
  new ReadableStream<string>({
238
239
  pull: async (c) => {
@@ -242,7 +243,7 @@ export class Context<P extends Params = Params> {
242
243
  return;
243
244
  }
244
245
 
245
- const result = await gen.next();
246
+ result = await gen.next();
246
247
  if (result.done) c.close();
247
248
  else c.enqueue(result.value.value);
248
249
  },