rouzer 1.2.2 → 1.2.3
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.
- package/dist/server/router.js +33 -20
- package/package.json +1 -1
package/dist/server/router.js
CHANGED
|
@@ -29,10 +29,24 @@ class RouterObject extends MiddlewareChain {
|
|
|
29
29
|
return handler;
|
|
30
30
|
}
|
|
31
31
|
/** @internal */
|
|
32
|
-
useRoutes(
|
|
32
|
+
useRoutes(routeSchemas, handlers) {
|
|
33
33
|
const { config, basePath } = this;
|
|
34
|
-
const
|
|
35
|
-
|
|
34
|
+
const routes = Object.entries(routeSchemas).map(([name, route]) => ({
|
|
35
|
+
name,
|
|
36
|
+
path: basePath
|
|
37
|
+
? new RoutePattern(route.path.source.replace(/^\/?/, basePath))
|
|
38
|
+
: route.path,
|
|
39
|
+
methods: mapValues(route.methods, (schema, method) => {
|
|
40
|
+
const handler = handlers[name][method];
|
|
41
|
+
if (!handler && config.debug) {
|
|
42
|
+
console.error(`Handler missing for route: ${method} ${name}`);
|
|
43
|
+
}
|
|
44
|
+
return {
|
|
45
|
+
schema,
|
|
46
|
+
handler,
|
|
47
|
+
};
|
|
48
|
+
}),
|
|
49
|
+
}));
|
|
36
50
|
return super.use(async function (context) {
|
|
37
51
|
const request = context.request;
|
|
38
52
|
const origin = request.headers.get('Origin');
|
|
@@ -45,18 +59,17 @@ class RouterObject extends MiddlewareChain {
|
|
|
45
59
|
request.headers.get('Access-Control-Request-Method')?.toUpperCase() ??
|
|
46
60
|
'GET';
|
|
47
61
|
}
|
|
48
|
-
for (
|
|
49
|
-
const
|
|
50
|
-
|
|
51
|
-
if (!route) {
|
|
62
|
+
for (const route of routes) {
|
|
63
|
+
const props = route.methods[method] ?? route.methods.ALL;
|
|
64
|
+
if (!props) {
|
|
52
65
|
continue;
|
|
53
66
|
}
|
|
54
|
-
const
|
|
55
|
-
if (!
|
|
67
|
+
const { schema, handler } = props;
|
|
68
|
+
if (!handler) {
|
|
56
69
|
continue;
|
|
57
70
|
}
|
|
58
|
-
const
|
|
59
|
-
if (!
|
|
71
|
+
const match = route.path.match(url);
|
|
72
|
+
if (!match) {
|
|
60
73
|
continue;
|
|
61
74
|
}
|
|
62
75
|
if (isPreflight) {
|
|
@@ -71,8 +84,8 @@ class RouterObject extends MiddlewareChain {
|
|
|
71
84
|
if (origin) {
|
|
72
85
|
context.setHeader('Access-Control-Allow-Origin', origin);
|
|
73
86
|
}
|
|
74
|
-
if (
|
|
75
|
-
const error = parsePathParams(context, enableStringParsing(
|
|
87
|
+
if (schema.path) {
|
|
88
|
+
const error = parsePathParams(context, enableStringParsing(schema.path), match.params);
|
|
76
89
|
if (error) {
|
|
77
90
|
return httpClientError(error, 'Invalid path parameter', config);
|
|
78
91
|
}
|
|
@@ -80,25 +93,25 @@ class RouterObject extends MiddlewareChain {
|
|
|
80
93
|
else {
|
|
81
94
|
context.path = match.params;
|
|
82
95
|
}
|
|
83
|
-
if (
|
|
84
|
-
const error = parseHeaders(context, enableStringParsing(
|
|
96
|
+
if (schema.headers) {
|
|
97
|
+
const error = parseHeaders(context, enableStringParsing(schema.headers));
|
|
85
98
|
if (error) {
|
|
86
99
|
return httpClientError(error, 'Invalid request headers', config);
|
|
87
100
|
}
|
|
88
101
|
}
|
|
89
|
-
if (
|
|
90
|
-
const error = parseQueryString(context, enableStringParsing(
|
|
102
|
+
if (schema.query) {
|
|
103
|
+
const error = parseQueryString(context, enableStringParsing(schema.query));
|
|
91
104
|
if (error) {
|
|
92
105
|
return httpClientError(error, 'Invalid query string', config);
|
|
93
106
|
}
|
|
94
107
|
}
|
|
95
|
-
if (
|
|
96
|
-
const error = await parseRequestBody(context,
|
|
108
|
+
if (schema.body) {
|
|
109
|
+
const error = await parseRequestBody(context, schema.body);
|
|
97
110
|
if (error) {
|
|
98
111
|
return httpClientError(error, 'Invalid request body', config);
|
|
99
112
|
}
|
|
100
113
|
}
|
|
101
|
-
const result = await
|
|
114
|
+
const result = await handler(context);
|
|
102
115
|
if (result instanceof Response) {
|
|
103
116
|
return result;
|
|
104
117
|
}
|