ovr 6.1.0 → 6.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 (43) hide show
  1. package/dist/LICENSE.md +2 -0
  2. package/dist/app/index.d.ts.map +1 -1
  3. package/dist/app/index.js +13 -9
  4. package/dist/context/index.d.ts +33 -9
  5. package/dist/context/index.d.ts.map +1 -1
  6. package/dist/context/index.js +61 -17
  7. package/dist/cookie/index.d.ts +1 -1
  8. package/dist/cookie/index.d.ts.map +1 -1
  9. package/dist/cookie/index.js +2 -2
  10. package/dist/index.d.ts +4 -3
  11. package/dist/index.d.ts.map +1 -1
  12. package/dist/index.js +3 -2
  13. package/dist/middleware/index.d.ts +12 -3
  14. package/dist/middleware/index.d.ts.map +1 -1
  15. package/dist/multipart/index.d.ts +5 -0
  16. package/dist/multipart/index.d.ts.map +1 -1
  17. package/dist/multipart/index.js +20 -22
  18. package/dist/render/index.d.ts +1 -0
  19. package/dist/render/index.d.ts.map +1 -1
  20. package/dist/render/index.js +6 -4
  21. package/dist/route/index.d.ts +143 -42
  22. package/dist/route/index.d.ts.map +1 -1
  23. package/dist/route/index.js +94 -42
  24. package/dist/schema/index.d.ts +1286 -0
  25. package/dist/schema/index.d.ts.map +1 -0
  26. package/dist/schema/index.js +1321 -0
  27. package/dist/trie/index.d.ts.map +1 -1
  28. package/dist/trie/index.js +8 -2
  29. package/dist/util/index.d.ts +113 -19
  30. package/dist/util/index.d.ts.map +1 -1
  31. package/dist/util/index.js +111 -35
  32. package/package.json +4 -1
  33. package/src/app/index.ts +13 -12
  34. package/src/context/index.ts +104 -25
  35. package/src/cookie/index.ts +3 -3
  36. package/src/index.ts +4 -3
  37. package/src/middleware/index.ts +19 -8
  38. package/src/multipart/index.ts +23 -24
  39. package/src/render/index.ts +7 -4
  40. package/src/route/index.ts +336 -95
  41. package/src/schema/index.ts +2794 -0
  42. package/src/trie/index.ts +12 -2
  43. package/src/util/index.ts +142 -36
@@ -1,7 +1,13 @@
1
1
  import { type JSX } from "../jsx/index.js";
2
2
  import type { Middleware } from "../middleware/index.js";
3
+ import { Form as FormSchema } from "../schema/index.js";
3
4
  import type { Trie } from "../trie/index.js";
4
- /** Helper type to extract the route params (`:slug`) into a record */
5
+ import type { Util } from "../util/index.js";
6
+ /**
7
+ * Helper type to extract the route params (`:slug`) into a record.
8
+ *
9
+ * @template Pattern Route pattern to extract params from
10
+ */
5
11
  export type ExtractParams<Pattern extends string = string> = Pattern extends `${infer _Start}:${infer Param}/${infer Rest}` ? {
6
12
  [k in Param | keyof ExtractParams<Rest>]: string;
7
13
  } : Pattern extends `${infer _Start}:${infer Param}` ? {
@@ -9,17 +15,83 @@ export type ExtractParams<Pattern extends string = string> = Pattern extends `${
9
15
  } : Pattern extends `${infer _Rest}*` ? {
10
16
  "*": string;
11
17
  } : {};
12
- /** Helper type to insert a record of params into a resolved string */
18
+ /**
19
+ * Helper type to insert a record of params into a resolved string.
20
+ *
21
+ * @template Pattern Route pattern to resolve
22
+ * @template Params Params to insert into pattern
23
+ */
13
24
  export type InsertParams<Pattern extends string, Params extends Trie.Params> = Pattern extends `${infer Start}:${infer Param}/${infer Rest}` ? Param extends keyof Params ? `${Start}${Params[Param]}/${InsertParams<Rest, Params>}` : Pattern : Pattern extends `${infer Start}:${infer Param}` ? Param extends keyof Params ? `${Start}${Params[Param]}` : Pattern : Pattern extends `${infer Start}*` ? "*" extends keyof Params ? `${Start}${Params["*"]}` : Pattern : Pattern;
14
25
  export declare namespace Route {
15
26
  /** HTTP Method */
16
- type Method = "GET" | "HEAD" | "POST" | "PUT" | "DELETE" | "CONNECT" | "OPTIONS" | "TRACE" | "PATCH" | (string & {});
27
+ export type Method = "GET" | "HEAD" | "POST" | "PUT" | "DELETE" | "CONNECT" | "OPTIONS" | "TRACE" | "PATCH" | (string & {});
28
+ /**
29
+ * Helper type for a route with a `<Button>` component.
30
+ *
31
+ * @template Pattern Route pattern
32
+ */
33
+ type WithButton<Pattern extends string = string> = {
34
+ /** `<button>` component with preset `formaction` and `formmethod` attributes */
35
+ readonly Button: Route.Button<Pattern>;
36
+ };
37
+ /**
38
+ * Helper type for a route with a `<Form>` component.
39
+ *
40
+ * @template Pattern Route pattern
41
+ */
42
+ type WithForm<Pattern extends string = string> = {
43
+ /** `<form>` component with preset `method` and `action` attributes */
44
+ readonly Form: Route.Form<Pattern>;
45
+ };
46
+ /**
47
+ * Helper type for a route with a `<Anchor>` component.
48
+ *
49
+ * @template Pattern Route pattern
50
+ */
51
+ type WithAnchor<Pattern extends string = string> = {
52
+ /** `<a>` component with preset `href` attribute */
53
+ readonly Anchor: Route.Anchor<Pattern>;
54
+ };
55
+ /**
56
+ * Form method subset attached to route helper types.
57
+ *
58
+ * Omits `component` so schema-specific `component` signatures are not widened when a
59
+ * concrete `Form<S>` is intersected onto the route type.
60
+ */
61
+ type FormMethods = Omit<Route.Schema<any>, "component">;
62
+ /**
63
+ * Optional form helper methods available when a route may have a schema.
64
+ *
65
+ * Function members are wrapped with bivariant parameters so routes can be
66
+ * structurally assigned across compatible generic instances.
67
+ */
68
+ type MaybeForm = {
69
+ [K in keyof FormMethods]?: FormMethods[K] extends (...args: any[]) => any ? Util.Bivariant<FormMethods[K]> : FormMethods[K];
70
+ };
71
+ /**
72
+ * GET route type with route components and optional schema helpers.
73
+ *
74
+ * @template Pattern Route pattern
75
+ */
76
+ export type Get<Pattern extends string = string> = Route<Pattern> & WithAnchor<Pattern> & WithButton<Pattern> & WithForm<Pattern> & MaybeForm;
77
+ /**
78
+ * POST route type with route components and optional schema helpers.
79
+ *
80
+ * @template Pattern Route pattern
81
+ */
82
+ export type Post<Pattern extends string = string> = Route<Pattern> & WithButton<Pattern> & WithForm<Pattern> & MaybeForm;
83
+ /**
84
+ * Schema helper type attached to routes that have a form schema.
85
+ *
86
+ * @template S Form field shape
87
+ */
88
+ export type Schema<S extends FormSchema.Shape = FormSchema.Shape> = FormSchema<S>;
17
89
  /**
18
90
  * Options to construct a relative URL from the route.
19
91
  *
20
92
  * @template Params Parameters created from a route match
21
93
  */
22
- type URLOptions<Params extends Trie.Params> = {
94
+ export type URLOptions<Params extends Trie.Params> = {
23
95
  /**
24
96
  * Passed into `URLSearchParams` constructor to create new params.
25
97
  *
@@ -44,51 +116,31 @@ export declare namespace Route {
44
116
  *
45
117
  * @template Pattern Route pattern
46
118
  */
47
- type Anchor<Pattern extends string> = (props: JSX.IntrinsicElements["a"] & URLOptions<ExtractParams<Pattern>>) => JSX.Element;
119
+ export type Anchor<Pattern extends string> = (props: JSX.IntrinsicElements["a"] & URLOptions<ExtractParams<Pattern>>) => JSX.Element;
48
120
  /**
49
121
  * `<Button>` route component type
50
122
  *
51
123
  * @template Pattern Route pattern
52
124
  */
53
- type Button<Pattern extends string> = (props: JSX.IntrinsicElements["button"] & URLOptions<ExtractParams<Pattern>>) => JSX.Element;
125
+ export type Button<Pattern extends string> = (props: JSX.IntrinsicElements["button"] & URLOptions<ExtractParams<Pattern>>) => JSX.Element;
54
126
  /**
55
127
  * `<Form>` route component type
56
128
  *
57
129
  * @template Pattern Route pattern
58
130
  */
59
- type Form<Pattern extends string> = (props: JSX.IntrinsicElements["form"] & URLOptions<ExtractParams<Pattern>>) => JSX.Element;
60
- /** Extract params from a Route instance. */
61
- type Params<R> = R extends {
131
+ export type Form<Pattern extends string> = (props: JSX.IntrinsicElements["form"] & URLOptions<ExtractParams<Pattern>> & {
132
+ state?: URL;
133
+ }) => JSX.Element;
134
+ /**
135
+ * Extract params from a Route instance.
136
+ *
137
+ * @template Route Route with pattern to extract params from
138
+ */
139
+ export type Params<Route> = Route extends {
62
140
  pattern: infer P;
63
141
  } ? P extends string ? ExtractParams<P> : never : never;
142
+ export {};
64
143
  }
65
- /**
66
- * Helper type for a route with a `<Button>` component.
67
- *
68
- * @template Pattern Route pattern
69
- */
70
- type WithButton<Pattern extends string = string> = {
71
- /** `<button>` component with preset `formaction` and `formmethod` attributes */
72
- readonly Button: Route.Button<Pattern>;
73
- };
74
- /**
75
- * Helper type for a route with a `<Form>` component.
76
- *
77
- * @template Pattern Route pattern
78
- */
79
- type WithForm<Pattern extends string = string> = {
80
- /** `<form>` component with preset `method` and `action` attributes */
81
- readonly Form: Route.Form<Pattern>;
82
- };
83
- /**
84
- * Helper type for a route with a `<Anchor>` component.
85
- *
86
- * @template Pattern Route pattern
87
- */
88
- type WithAnchor<Pattern extends string = string> = {
89
- /** `<a>` component with preset `href` attribute */
90
- readonly Anchor: Route.Anchor<Pattern>;
91
- };
92
144
  /**
93
145
  * Route to use in the application.
94
146
  *
@@ -101,7 +153,7 @@ export declare class Route<Pattern extends string = string> {
101
153
  /** HTTP method */
102
154
  readonly method: Route.Method;
103
155
  /** Route middleware stack, runs after global middleware */
104
- readonly middleware: Middleware<any>[];
156
+ readonly middleware: Middleware<any, any>[];
105
157
  /**
106
158
  * Create a new route.
107
159
  *
@@ -109,7 +161,7 @@ export declare class Route<Pattern extends string = string> {
109
161
  * @param pattern Route pattern
110
162
  * @param middleware Route middleware
111
163
  */
112
- constructor(method: Route.Method, pattern: Pattern, ...middleware: Middleware<ExtractParams<Pattern>>[]);
164
+ constructor(method: Route.Method, pattern: Pattern, ...middleware: Middleware<ExtractParams<Pattern>, any>[]);
113
165
  /**
114
166
  * Constructs a _relative_ URL for the route.
115
167
  *
@@ -129,19 +181,68 @@ export declare class Route<Pattern extends string = string> {
129
181
  * @param middleware GET middleware
130
182
  * @returns GET `Route` with added components
131
183
  */
132
- static get<Pattern extends string>(pattern: Pattern, ...middleware: Middleware<ExtractParams<Pattern>>[]): Route<Pattern> & WithButton<Pattern> & WithForm<Pattern> & WithAnchor<Pattern>;
184
+ static get<Pattern extends string>(pattern: Pattern, ...middleware: Middleware<ExtractParams<Pattern>>[]): Route.Get<Pattern>;
185
+ /**
186
+ * @template Pattern Route pattern
187
+ * @template S Form field shape
188
+ * @param pattern Route pattern
189
+ * @param fields Form field shape
190
+ * @param middleware GET middleware
191
+ * @returns GET `Route` with added components
192
+ */
193
+ static get<Pattern extends string, S extends FormSchema.Shape>(pattern: Pattern, fields: S, ...middleware: Middleware<ExtractParams<Pattern>, S>[]): Route.Get<Pattern> & Route.Schema<S>;
194
+ /**
195
+ * @template Pattern Route pattern
196
+ * @template S Form field shape
197
+ * @param pattern Route pattern
198
+ * @param form Form schema
199
+ * @param middleware GET middleware
200
+ * @returns GET `Route` with added components
201
+ */
202
+ static get<Pattern extends string, S extends FormSchema.Shape>(pattern: Pattern, form: Route.Schema<S>, ...middleware: Middleware<ExtractParams<Pattern>, S>[]): Route.Get<Pattern> & Route.Schema<S>;
133
203
  /**
134
204
  * @param middleware POST middleware
135
205
  * @returns POST `Route` with added components
136
206
  */
137
- static post(middleware: Middleware<{}>): Route & WithButton & WithForm;
207
+ static post(...middleware: Middleware<{}>[]): Route.Post;
208
+ /**
209
+ * @template S Form field shape
210
+ * @param fields Form field shape
211
+ * @param middleware POST middleware
212
+ * @returns POST `Route` with added components
213
+ */
214
+ static post<S extends FormSchema.Shape>(fields: S, ...middleware: Middleware<{}, S>[]): Route.Post & Route.Schema<S>;
215
+ /**
216
+ * @template S Form field shape
217
+ * @param form Form schema
218
+ * @param middleware POST middleware
219
+ * @returns POST `Route` with added components
220
+ */
221
+ static post<S extends FormSchema.Shape>(form: Route.Schema<S>, ...middleware: Middleware<{}, S>[]): Route.Post & Route.Schema<S>;
222
+ /**
223
+ * @template Pattern Route pattern
224
+ * @param pattern Route pattern
225
+ * @param middleware POST middleware
226
+ * @returns POST `Route` with added components
227
+ */
228
+ static post<Pattern extends string>(pattern: Pattern, ...middleware: Middleware<ExtractParams<Pattern>>[]): Route.Post<Pattern>;
229
+ /**
230
+ * @template Pattern Route pattern
231
+ * @template S Form field shape
232
+ * @param pattern Route pattern
233
+ * @param fields Form field shape
234
+ * @param middleware POST middleware
235
+ * @returns POST `Route` with added components
236
+ */
237
+ static post<Pattern extends string, S extends FormSchema.Shape>(pattern: Pattern, fields: S, ...middleware: Middleware<ExtractParams<Pattern>, S>[]): Route.Post<Pattern> & Route.Schema<S>;
138
238
  /**
139
239
  * @template Pattern Route pattern
240
+ * @template S Form field shape
140
241
  * @param pattern Route pattern
242
+ * @param form Form schema
141
243
  * @param middleware POST middleware
142
244
  * @returns POST `Route` with added components
143
245
  */
144
- static post<Pattern extends string>(pattern: Pattern, ...middleware: Middleware<ExtractParams<Pattern>>[]): Route<Pattern> & WithButton<Pattern> & WithForm<Pattern>;
246
+ static post<Pattern extends string, S extends FormSchema.Shape>(pattern: Pattern, form: Route.Schema<S>, ...middleware: Middleware<ExtractParams<Pattern>, S>[]): Route.Post<Pattern> & Route.Schema<S>;
145
247
  }
146
- export {};
147
248
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/route/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/route/index.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,6 @@
1
1
  import { jsx } from "../jsx/index.js";
2
- import { Hash, Method, Mime } from "../util/index.js";
2
+ import { Form as FormSchema } from "../schema/index.js";
3
+ import { Checksum, Method, Mime } from "../util/index.js";
3
4
  /**
4
5
  * Route to use in the application.
5
6
  *
@@ -34,27 +35,21 @@ export class Route {
34
35
  * @returns `pathname` + `search` + `hash`
35
36
  */
36
37
  url(...[options]) {
37
- const pathname = this.pathname(
38
+ return (this.pathname(
38
39
  // @ts-expect-error - do not have to pass in {} if no params
39
- options?.params);
40
- let search = "";
41
- let hash = "";
42
- if (options?.search) {
43
- // use the value as the init
44
- // @ts-expect-error - see above
45
- search = "?" + new URLSearchParams(options.search);
46
- }
47
- if (options?.hash) {
48
- // adding # prefix if not present matches the URL setter:
49
- // https://developer.mozilla.org/en-US/docs/Web/API/URL/hash
50
- if (options.hash.startsWith("#")) {
51
- hash = options.hash;
52
- }
53
- else {
54
- hash = "#" + options.hash;
55
- }
56
- }
57
- return pathname + search + hash;
40
+ options?.params) +
41
+ (options?.search
42
+ ? // use the value as the init
43
+ // @ts-expect-error - see type above
44
+ "?" + new URLSearchParams(options.search)
45
+ : "") +
46
+ (options?.hash
47
+ ? // adding # prefix if not present matches the URL setter:
48
+ // https://developer.mozilla.org/en-US/docs/Web/API/URL/hash
49
+ options.hash[0] === "#"
50
+ ? options.hash
51
+ : "#" + options.hash
52
+ : ""));
58
53
  }
59
54
  /**
60
55
  * @template Params Parameters to create the pathname with
@@ -81,7 +76,7 @@ export class Route {
81
76
  * @returns Route with added components
82
77
  */
83
78
  static #withComponents(route) {
84
- const enctype = route.method === Method.post ? Mime.multipartFormData : undefined;
79
+ const enctype = route.method === Method.post ? Mime.type.mp : undefined;
85
80
  return Object.assign(route, {
86
81
  Button: (({ params, search, hash, ...rest }) => jsx("button", {
87
82
  formaction: route.url({ params, search, hash }),
@@ -89,38 +84,95 @@ export class Route {
89
84
  formenctype: enctype,
90
85
  ...rest,
91
86
  })),
92
- Form: (({ params, search, hash, ...rest }) => jsx("form", {
93
- action: route.url({ params, search, hash }),
94
- method: route.method,
95
- enctype,
96
- ...rest,
97
- })),
87
+ Form: (({ params, search, hash, state, ...rest }) => {
88
+ let query;
89
+ if (route.method === Method.post && state) {
90
+ const target = new URL(state);
91
+ for (const param of FormSchema.params) {
92
+ target.searchParams.delete(param);
93
+ }
94
+ query = new URLSearchParams(
95
+ // @ts-expect-error - see type above
96
+ search);
97
+ query.set(FormSchema.params[0], target.pathname + target.search + target.hash);
98
+ }
99
+ return jsx("form", {
100
+ action: route.url({
101
+ params,
102
+ search: query ?? search,
103
+ hash,
104
+ }),
105
+ method: route.method,
106
+ enctype,
107
+ ...rest,
108
+ });
109
+ }),
98
110
  });
99
111
  }
100
112
  /**
101
113
  * @template Pattern Route pattern
102
- * @param pattern Route pattern
103
- * @param middleware GET middleware
104
- * @returns GET `Route` with added components
114
+ * @template R Route type with Form component
115
+ * @param route Route to add schema behavior to
116
+ * @param schema Form schema
117
+ * @returns Route with schema behavior attached
105
118
  */
106
- static get(pattern, ...middleware) {
119
+ static #withSchema(route, schema) {
120
+ if (!schema)
121
+ return route;
122
+ // original form shell from normal route
123
+ const { Form } = route;
124
+ return Object.assign(route, schema, {
125
+ Form: (({ state, ...rest }) => Form({
126
+ // add in the default children (Fields) with state and submit button
127
+ children: [
128
+ schema.Fields({ state }),
129
+ jsx("button", { children: "Submit" }),
130
+ ],
131
+ state,
132
+ ...rest,
133
+ })),
134
+ });
135
+ }
136
+ static get(pattern, schemaOrMiddleware, ...middleware) {
137
+ let schema;
138
+ if (schemaOrMiddleware) {
139
+ if (typeof schemaOrMiddleware === "function") {
140
+ middleware.unshift(schemaOrMiddleware);
141
+ }
142
+ else {
143
+ schema = FormSchema.from(schemaOrMiddleware);
144
+ }
145
+ }
107
146
  const route = Route.#withComponents(new Route(Method.get, pattern, ...middleware));
108
- return Object.assign(route, {
147
+ return Route.#withSchema(Object.assign(route, {
109
148
  Anchor: (({ params, search, hash, ...rest }) => jsx("a", {
110
149
  href: route.url({ params, search, hash }),
111
150
  ...rest,
112
151
  })),
113
- });
152
+ }), schema);
114
153
  }
115
- static post(patternOrMiddleware, ...middleware) {
154
+ static post(patternOrSchemaOrMiddleware, schemaOrMiddleware, ...middleware) {
116
155
  let pattern;
117
- if (typeof patternOrMiddleware === "string") {
118
- pattern = patternOrMiddleware;
119
- }
120
- else {
121
- middleware.unshift(patternOrMiddleware);
122
- pattern = `/_p/${Hash.djb2(middleware.join())}`;
156
+ let schema;
157
+ const resolve = (psm) => {
158
+ if (psm) {
159
+ if (typeof psm === "string") {
160
+ pattern = psm;
161
+ }
162
+ else if (typeof psm !== "function") {
163
+ schema = FormSchema.from(psm);
164
+ }
165
+ else {
166
+ middleware.unshift(psm);
167
+ }
168
+ }
169
+ };
170
+ resolve(patternOrSchemaOrMiddleware);
171
+ resolve(schemaOrMiddleware);
172
+ if (!pattern) {
173
+ // create pattern with checksum of all mw stringified
174
+ pattern = `/_p/${Checksum.djb2(middleware.join())}`;
123
175
  }
124
- return Route.#withComponents(new Route(Method.post, pattern, ...middleware));
176
+ return Route.#withSchema(Route.#withComponents(new Route(Method.post, pattern, ...middleware)), schema);
125
177
  }
126
178
  }