@koala-ts/framework 2.14.1 → 2.15.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.
- package/dist/Config/types.d.ts +8 -0
- package/dist/Config/types.d.ts.map +1 -1
- package/dist/Http/Scope/State/ScopeStoreFactory.test.js +6 -6
- package/dist/Http/Scope/State/ScopeStoreFactory.test.js.map +1 -1
- package/dist/application/create-application.d.ts.map +1 -1
- package/dist/application/create-application.js +9 -2
- package/dist/application/create-application.js.map +1 -1
- package/dist/application/create-application.test.js +49 -0
- package/dist/application/create-application.test.js.map +1 -1
- package/dist/index.d.ts +18 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +16 -1
- package/dist/index.js.map +1 -1
- package/dist/routing/decorator/legacy-router.d.ts +10 -0
- package/dist/routing/decorator/legacy-router.d.ts.map +1 -0
- package/dist/routing/decorator/legacy-router.js +56 -0
- package/dist/routing/decorator/legacy-router.js.map +1 -0
- package/dist/routing/decorator/legacy-router.test.d.ts +2 -0
- package/dist/routing/decorator/legacy-router.test.d.ts.map +1 -0
- package/dist/routing/decorator/legacy-router.test.js +39 -0
- package/dist/routing/decorator/legacy-router.test.js.map +1 -0
- package/dist/routing/decorator/route-metadata.d.ts +15 -0
- package/dist/routing/decorator/route-metadata.d.ts.map +1 -0
- package/dist/routing/decorator/route-metadata.js +1 -0
- package/dist/routing/decorator/route-metadata.js.map +1 -0
- package/dist/routing/decorator/route.d.ts +18 -0
- package/dist/routing/decorator/route.d.ts.map +1 -0
- package/dist/routing/decorator/route.js +6 -0
- package/dist/routing/decorator/route.js.map +1 -0
- package/dist/routing/definition/create-route-definition.d.ts +15 -0
- package/dist/routing/definition/create-route-definition.d.ts.map +1 -0
- package/dist/routing/definition/create-route-definition.js +21 -0
- package/dist/routing/definition/create-route-definition.js.map +1 -0
- package/dist/routing/definition/create-route-definition.test.d.ts +2 -0
- package/dist/routing/definition/create-route-definition.test.d.ts.map +1 -0
- package/dist/routing/definition/create-route-definition.test.js +83 -0
- package/dist/routing/definition/create-route-definition.test.js.map +1 -0
- package/dist/routing/definition/resolve-route-options.d.ts +5 -0
- package/dist/routing/definition/resolve-route-options.d.ts.map +1 -0
- package/dist/routing/definition/resolve-route-options.js +20 -0
- package/dist/routing/definition/resolve-route-options.js.map +1 -0
- package/dist/routing/definition/resolve-route-options.test.d.ts +2 -0
- package/dist/routing/definition/resolve-route-options.test.d.ts.map +1 -0
- package/dist/routing/definition/resolve-route-options.test.js +60 -0
- package/dist/routing/definition/resolve-route-options.test.js.map +1 -0
- package/dist/routing/definition/route-definition.d.ts +13 -0
- package/dist/routing/definition/route-definition.d.ts.map +1 -0
- package/dist/routing/definition/route-definition.js +1 -0
- package/dist/routing/definition/route-definition.js.map +1 -0
- package/dist/routing/helpers/create-path-for.d.ts +7 -0
- package/dist/routing/helpers/create-path-for.d.ts.map +1 -0
- package/dist/routing/helpers/create-path-for.js +16 -0
- package/dist/routing/helpers/create-path-for.js.map +1 -0
- package/dist/routing/helpers/create-path-for.test.d.ts +2 -0
- package/dist/routing/helpers/create-path-for.test.d.ts.map +1 -0
- package/dist/routing/helpers/create-path-for.test.js +47 -0
- package/dist/routing/helpers/create-path-for.test.js.map +1 -0
- package/dist/routing/helpers/http-verb-helpers.d.ts +17 -0
- package/dist/routing/helpers/http-verb-helpers.d.ts.map +1 -0
- package/dist/routing/helpers/http-verb-helpers.js +32 -0
- package/dist/routing/helpers/http-verb-helpers.js.map +1 -0
- package/dist/routing/helpers/http-verb-helpers.test.d.ts +2 -0
- package/dist/routing/helpers/http-verb-helpers.test.d.ts.map +1 -0
- package/dist/routing/helpers/http-verb-helpers.test.js +52 -0
- package/dist/routing/helpers/http-verb-helpers.test.js.map +1 -0
- package/dist/routing/helpers/route-group.d.ts +17 -0
- package/dist/routing/helpers/route-group.d.ts.map +1 -0
- package/dist/routing/helpers/route-group.js +8 -0
- package/dist/routing/helpers/route-group.js.map +1 -0
- package/dist/routing/helpers/route-group.test.d.ts +2 -0
- package/dist/routing/helpers/route-group.test.d.ts.map +1 -0
- package/dist/routing/helpers/route-group.test.js +32 -0
- package/dist/routing/helpers/route-group.test.js.map +1 -0
- package/dist/routing/http-method.d.ts +2 -0
- package/dist/routing/http-method.d.ts.map +1 -0
- package/dist/routing/http-method.js +1 -0
- package/dist/routing/http-method.js.map +1 -0
- package/dist/routing/index.d.ts +9 -3
- package/dist/routing/index.d.ts.map +1 -1
- package/dist/routing/index.js +4 -2
- package/dist/routing/index.js.map +1 -1
- package/dist/routing/registration/expand-route-definitions.d.ts +4 -0
- package/dist/routing/registration/expand-route-definitions.d.ts.map +1 -0
- package/dist/routing/registration/expand-route-definitions.js +21 -0
- package/dist/routing/registration/expand-route-definitions.js.map +1 -0
- package/dist/routing/registration/expand-route-definitions.test.d.ts +2 -0
- package/dist/routing/registration/expand-route-definitions.test.d.ts.map +1 -0
- package/dist/routing/registration/expand-route-definitions.test.js +48 -0
- package/dist/routing/registration/expand-route-definitions.test.js.map +1 -0
- package/dist/routing/registration/register-routes.d.ts +4 -0
- package/dist/routing/registration/register-routes.d.ts.map +1 -0
- package/dist/routing/registration/register-routes.js +21 -0
- package/dist/routing/registration/register-routes.js.map +1 -0
- package/dist/routing/registration/register-routes.test.d.ts +2 -0
- package/dist/routing/registration/register-routes.test.d.ts.map +1 -0
- package/dist/routing/registration/register-routes.test.js +139 -0
- package/dist/routing/registration/register-routes.test.js.map +1 -0
- package/dist/routing/registration/route-registration.d.ts +8 -0
- package/dist/routing/registration/route-registration.d.ts.map +1 -0
- package/dist/routing/registration/route-registration.js +1 -0
- package/dist/routing/registration/route-registration.js.map +1 -0
- package/dist/routing/route-options.d.ts +5 -0
- package/dist/routing/route-options.d.ts.map +1 -0
- package/dist/routing/route-options.js +1 -0
- package/dist/routing/route-options.js.map +1 -0
- package/dist/routing/route.d.ts +14 -0
- package/dist/routing/route.d.ts.map +1 -0
- package/dist/routing/route.js +5 -0
- package/dist/routing/route.js.map +1 -0
- package/dist/routing/route.test.d.ts +2 -0
- package/dist/routing/route.test.d.ts.map +1 -0
- package/dist/routing/route.test.js +31 -0
- package/dist/routing/route.test.js.map +1 -0
- package/dist/routing/router-method.d.ts +2 -0
- package/dist/routing/router-method.d.ts.map +1 -0
- package/dist/routing/router-method.js +1 -0
- package/dist/routing/router-method.js.map +1 -0
- package/dist/routing/source/create-path-catalog.d.ts +3 -0
- package/dist/routing/source/create-path-catalog.d.ts.map +1 -0
- package/dist/routing/source/create-path-catalog.js +15 -0
- package/dist/routing/source/create-path-catalog.js.map +1 -0
- package/dist/routing/source/create-path-catalog.test.d.ts +2 -0
- package/dist/routing/source/create-path-catalog.test.d.ts.map +1 -0
- package/dist/routing/source/create-path-catalog.test.js +62 -0
- package/dist/routing/source/create-path-catalog.test.js.map +1 -0
- package/dist/routing/source/normalize-route-sources.d.ts +10 -0
- package/dist/routing/source/normalize-route-sources.d.ts.map +1 -0
- package/dist/routing/source/normalize-route-sources.js +82 -0
- package/dist/routing/source/normalize-route-sources.js.map +1 -0
- package/dist/routing/source/normalize-route-sources.test.d.ts +2 -0
- package/dist/routing/source/normalize-route-sources.test.d.ts.map +1 -0
- package/dist/routing/source/normalize-route-sources.test.js +268 -0
- package/dist/routing/source/normalize-route-sources.test.js.map +1 -0
- package/dist/routing/source/resolve-path-template.d.ts +6 -0
- package/dist/routing/source/resolve-path-template.d.ts.map +1 -0
- package/dist/routing/source/resolve-path-template.js +58 -0
- package/dist/routing/source/resolve-path-template.js.map +1 -0
- package/dist/routing/source/resolve-path-template.test.d.ts +2 -0
- package/dist/routing/source/resolve-path-template.test.d.ts.map +1 -0
- package/dist/routing/source/resolve-path-template.test.js +44 -0
- package/dist/routing/source/resolve-path-template.test.js.map +1 -0
- package/dist/routing/source/route-source.d.ts +4 -0
- package/dist/routing/source/route-source.d.ts.map +1 -0
- package/dist/routing/source/route-source.js +1 -0
- package/dist/routing/source/route-source.js.map +1 -0
- package/dist/routing/validation/validate-route-definitions.d.ts +4 -0
- package/dist/routing/validation/validate-route-definitions.d.ts.map +1 -0
- package/dist/routing/validation/validate-route-definitions.js +27 -0
- package/dist/routing/validation/validate-route-definitions.js.map +1 -0
- package/dist/routing/validation/validate-route-definitions.test.d.ts +2 -0
- package/dist/routing/validation/validate-route-definitions.test.d.ts.map +1 -0
- package/dist/routing/validation/validate-route-definitions.test.js +105 -0
- package/dist/routing/validation/validate-route-definitions.test.js.map +1 -0
- package/dist/routing/verify-routing-mode.d.ts +4 -0
- package/dist/routing/verify-routing-mode.d.ts.map +1 -0
- package/dist/routing/verify-routing-mode.js +8 -0
- package/dist/routing/verify-routing-mode.js.map +1 -0
- package/dist/routing/verify-routing-mode.test.d.ts +2 -0
- package/dist/routing/verify-routing-mode.test.d.ts.map +1 -0
- package/dist/routing/verify-routing-mode.test.js +24 -0
- package/dist/routing/verify-routing-mode.test.js.map +1 -0
- package/dist/validator/validator.test.js +2 -2
- package/dist/validator/validator.test.js.map +1 -1
- package/package.json +5 -1
- package/dist/routing/router.d.ts +0 -7
- package/dist/routing/router.d.ts.map +0 -1
- package/dist/routing/router.js +0 -73
- package/dist/routing/router.js.map +0 -1
- package/dist/routing/router.test.d.ts +0 -2
- package/dist/routing/router.test.d.ts.map +0 -1
- package/dist/routing/router.test.js +0 -163
- package/dist/routing/router.test.js.map +0 -1
- package/dist/routing/types.d.ts +0 -22
- package/dist/routing/types.d.ts.map +0 -1
- package/dist/routing/types.js +0 -1
- package/dist/routing/types.js.map +0 -1
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
import { expandRouteDefinitions } from '../../routing/registration/expand-route-definitions.js';
|
|
2
|
+
import { normalizeRouteSources } from '../../routing/source/normalize-route-sources.js';
|
|
3
|
+
import { validateRouteDefinitions } from '../../routing/validation/validate-route-definitions.js';
|
|
4
|
+
import Router from '@koa/router';
|
|
5
|
+
export function registerRoutes(app, routes = []) {
|
|
6
|
+
const router = createRouter(routes);
|
|
7
|
+
app.use(router.routes());
|
|
8
|
+
app.use(router.allowedMethods());
|
|
9
|
+
return app;
|
|
10
|
+
}
|
|
11
|
+
function createRouter(routeSources) {
|
|
12
|
+
const router = new Router();
|
|
13
|
+
const routes = normalizeRouteSources(routeSources);
|
|
14
|
+
const registrations = expandRouteDefinitions(routes);
|
|
15
|
+
validateRouteDefinitions(routes, registrations);
|
|
16
|
+
for (const route of registrations) {
|
|
17
|
+
router[route.method](route.path, ...route.middleware);
|
|
18
|
+
}
|
|
19
|
+
return router;
|
|
20
|
+
}
|
|
21
|
+
//# sourceMappingURL=register-routes.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"register-routes.js","sourceRoot":"","sources":["../../../src/routing/registration/register-routes.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,sBAAsB,EAAE,MAAM,iDAAiD,CAAC;AACzF,OAAO,EAAE,qBAAqB,EAAE,MAAM,0CAA0C,CAAC;AAEjF,OAAO,EAAE,wBAAwB,EAAE,MAAM,iDAAiD,CAAC;AAE3F,OAAO,MAA+B,MAAM,aAAa,CAAC;AAE1D,MAAM,UAAU,cAAc,CAAC,GAAgB,EAAE,SAAwB,EAAE;IACzE,MAAM,MAAM,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;IAEpC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,EAAqE,CAAC,CAAC;IAC5F,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,cAAc,EAAqE,CAAC,CAAC;IAEpG,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAS,YAAY,CAAC,YAA2B;IAC/C,MAAM,MAAM,GAAG,IAAI,MAAM,EAAE,CAAC;IAC5B,MAAM,MAAM,GAAG,qBAAqB,CAAC,YAAY,CAAC,CAAC;IACnD,MAAM,aAAa,GAAG,sBAAsB,CAAC,MAAM,CAAC,CAAC;IAErD,wBAAwB,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;IAEhD,KAAK,MAAM,KAAK,IAAI,aAAa,EAAE,CAAC;QAClC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,GAAI,KAAK,CAAC,UAAqE,CAAC,CAAC;IACpH,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"register-routes.test.d.ts","sourceRoot":"","sources":["../../../src/routing/registration/register-routes.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,139 @@
|
|
|
1
|
+
import Koa from 'koa';
|
|
2
|
+
import supertest from 'supertest';
|
|
3
|
+
import { describe, expect, test } from 'vitest';
|
|
4
|
+
import { Get } from '../../routing/helpers/http-verb-helpers.js';
|
|
5
|
+
import { registerRoutes } from './register-routes.js';
|
|
6
|
+
import { RouteGroup } from '../../routing/helpers/route-group.js';
|
|
7
|
+
import { Route } from '../../routing/route.js';
|
|
8
|
+
describe('register routes', () => {
|
|
9
|
+
test('it registers a function-first route', async () => {
|
|
10
|
+
const app = new Koa();
|
|
11
|
+
registerRoutes(app, [
|
|
12
|
+
Route({
|
|
13
|
+
method: 'GET',
|
|
14
|
+
path: '/users',
|
|
15
|
+
handler: async (scope) => {
|
|
16
|
+
scope.response.body = [{ id: 1 }];
|
|
17
|
+
},
|
|
18
|
+
}),
|
|
19
|
+
]);
|
|
20
|
+
const response = await supertest(app.callback()).get('/users');
|
|
21
|
+
expect(response.status).toBe(200);
|
|
22
|
+
expect(response.body).toEqual([{ id: 1 }]);
|
|
23
|
+
});
|
|
24
|
+
test('it expands multiple methods and any routes', async () => {
|
|
25
|
+
const app = new Koa();
|
|
26
|
+
registerRoutes(app, [
|
|
27
|
+
Route({
|
|
28
|
+
method: ['GET', 'POST'],
|
|
29
|
+
path: '/users',
|
|
30
|
+
handler: async (scope) => {
|
|
31
|
+
scope.response.body = { method: scope.request.method };
|
|
32
|
+
},
|
|
33
|
+
}),
|
|
34
|
+
Route({
|
|
35
|
+
method: 'ANY',
|
|
36
|
+
path: '/fallback',
|
|
37
|
+
handler: async (scope) => {
|
|
38
|
+
scope.response.body = { method: scope.request.method };
|
|
39
|
+
},
|
|
40
|
+
}),
|
|
41
|
+
]);
|
|
42
|
+
const getResponse = await supertest(app.callback()).get('/users');
|
|
43
|
+
const postResponse = await supertest(app.callback()).post('/users');
|
|
44
|
+
const patchResponse = await supertest(app.callback()).patch('/fallback');
|
|
45
|
+
expect(getResponse.body).toEqual({ method: 'GET' });
|
|
46
|
+
expect(postResponse.body).toEqual({ method: 'POST' });
|
|
47
|
+
expect(patchResponse.body).toEqual({ method: 'PATCH' });
|
|
48
|
+
});
|
|
49
|
+
test('it applies route middleware and respects parseBody false', async () => {
|
|
50
|
+
const app = new Koa();
|
|
51
|
+
registerRoutes(app, [
|
|
52
|
+
Route({
|
|
53
|
+
method: 'POST',
|
|
54
|
+
path: '/raw-body',
|
|
55
|
+
middleware: [
|
|
56
|
+
async (scope, next) => {
|
|
57
|
+
scope.response.set('x-route-middleware', 'applied');
|
|
58
|
+
await next();
|
|
59
|
+
},
|
|
60
|
+
],
|
|
61
|
+
options: { parseBody: false },
|
|
62
|
+
handler: async (scope) => {
|
|
63
|
+
scope.response.body = { bodyType: typeof scope.request.body };
|
|
64
|
+
},
|
|
65
|
+
}),
|
|
66
|
+
]);
|
|
67
|
+
const response = await supertest(app.callback()).post('/raw-body').send({ name: 'Koala' });
|
|
68
|
+
expect(response.headers['x-route-middleware']).toBe('applied');
|
|
69
|
+
expect(response.body).toEqual({ bodyType: 'undefined' });
|
|
70
|
+
});
|
|
71
|
+
test('it rejects duplicate route signatures', () => {
|
|
72
|
+
const app = new Koa();
|
|
73
|
+
expect(() => registerRoutes(app, [
|
|
74
|
+
Route({
|
|
75
|
+
method: 'GET',
|
|
76
|
+
path: '/users',
|
|
77
|
+
handler: async (scope) => {
|
|
78
|
+
scope.response.body = [{ id: 1 }];
|
|
79
|
+
},
|
|
80
|
+
}),
|
|
81
|
+
Route({
|
|
82
|
+
method: 'GET',
|
|
83
|
+
path: '/users',
|
|
84
|
+
handler: async (scope) => {
|
|
85
|
+
scope.response.body = [{ id: 2 }];
|
|
86
|
+
},
|
|
87
|
+
}),
|
|
88
|
+
])).toThrow('Duplicate route signature detected: GET /users.');
|
|
89
|
+
});
|
|
90
|
+
test('it rejects duplicate route names', () => {
|
|
91
|
+
const app = new Koa();
|
|
92
|
+
expect(() => registerRoutes(app, [
|
|
93
|
+
Route({
|
|
94
|
+
name: 'users.list',
|
|
95
|
+
method: 'GET',
|
|
96
|
+
path: '/users',
|
|
97
|
+
handler: async (scope) => {
|
|
98
|
+
scope.response.body = [{ id: 1 }];
|
|
99
|
+
},
|
|
100
|
+
}),
|
|
101
|
+
Route({
|
|
102
|
+
name: 'users.list',
|
|
103
|
+
method: 'POST',
|
|
104
|
+
path: '/users',
|
|
105
|
+
handler: async (scope) => {
|
|
106
|
+
scope.response.body = [{ id: 2 }];
|
|
107
|
+
},
|
|
108
|
+
}),
|
|
109
|
+
])).toThrow('Duplicate route name detected: users.list.');
|
|
110
|
+
});
|
|
111
|
+
test('it registers grouped route sources through the modern registrar', async () => {
|
|
112
|
+
const app = new Koa();
|
|
113
|
+
registerRoutes(app, [
|
|
114
|
+
RouteGroup({
|
|
115
|
+
prefix: '/api',
|
|
116
|
+
namePrefix: 'api.',
|
|
117
|
+
}, () => [
|
|
118
|
+
Get('/users', 'users.list', async (scope) => {
|
|
119
|
+
scope.response.body = [{ id: 1 }];
|
|
120
|
+
}),
|
|
121
|
+
]),
|
|
122
|
+
]);
|
|
123
|
+
const response = await supertest(app.callback()).get('/api/users');
|
|
124
|
+
expect(response.status).toBe(200);
|
|
125
|
+
expect(response.body).toEqual([{ id: 1 }]);
|
|
126
|
+
});
|
|
127
|
+
test('it rejects duplicate grouped route signatures after normalization', () => {
|
|
128
|
+
const app = new Koa();
|
|
129
|
+
expect(() => registerRoutes(app, [
|
|
130
|
+
RouteGroup({
|
|
131
|
+
prefix: '/api',
|
|
132
|
+
}, () => [Get('/users', async () => undefined)]),
|
|
133
|
+
RouteGroup({
|
|
134
|
+
prefix: '/api',
|
|
135
|
+
}, () => [Get('/users', async () => undefined)]),
|
|
136
|
+
])).toThrow('Duplicate route signature detected: GET /api/users.');
|
|
137
|
+
});
|
|
138
|
+
});
|
|
139
|
+
//# sourceMappingURL=register-routes.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"register-routes.test.js","sourceRoot":"","sources":["../../../src/routing/registration/register-routes.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import type { RouteDefinition } from '../../routing/definition/route-definition.js';
|
|
2
|
+
import type { RouterMethod } from '../../routing/router-method.js';
|
|
3
|
+
export interface RouteRegistration {
|
|
4
|
+
method: RouterMethod;
|
|
5
|
+
path: string;
|
|
6
|
+
middleware: Array<RouteDefinition['middleware'][number] | RouteDefinition['handler']>;
|
|
7
|
+
}
|
|
8
|
+
//# sourceMappingURL=route-registration.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"route-registration.d.ts","sourceRoot":"","sources":["../../../src/routing/registration/route-registration.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AAC7E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAE5D,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,YAAY,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,KAAK,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC,MAAM,CAAC,GAAG,eAAe,CAAC,SAAS,CAAC,CAAC,CAAC;CACvF"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
//# sourceMappingURL=route-registration.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"route-registration.js","sourceRoot":"","sources":["../../../src/routing/registration/route-registration.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"route-options.d.ts","sourceRoot":"","sources":["../../src/routing/route-options.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,UAAU,CAAC;AAEzD,MAAM,MAAM,YAAY,GAAG,OAAO,CAChC,wBAAwB,GAAG;IACzB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,CACF,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
//# sourceMappingURL=route-options.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"route-options.js","sourceRoot":"","sources":["../../src/routing/route-options.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import type { HttpMiddleware } from '../Http/index.js';
|
|
2
|
+
import type { RouteDefinition } from '../routing/definition/route-definition.js';
|
|
3
|
+
import type { HttpMethod } from '../routing/http-method.js';
|
|
4
|
+
import type { RouteOptions } from '../routing/route-options.js';
|
|
5
|
+
export interface RouteDeclaration {
|
|
6
|
+
name?: string;
|
|
7
|
+
path: string;
|
|
8
|
+
method: HttpMethod | HttpMethod[];
|
|
9
|
+
handler: HttpMiddleware;
|
|
10
|
+
middleware?: HttpMiddleware[];
|
|
11
|
+
options?: RouteOptions;
|
|
12
|
+
}
|
|
13
|
+
export declare function Route(route: RouteDeclaration): RouteDefinition;
|
|
14
|
+
//# sourceMappingURL=route.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"route.d.ts","sourceRoot":"","sources":["../../src/routing/route.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AAE7C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AAC7E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAE5D,MAAM,WAAW,gBAAgB;IAC/B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,UAAU,GAAG,UAAU,EAAE,CAAC;IAClC,OAAO,EAAE,cAAc,CAAC;IACxB,UAAU,CAAC,EAAE,cAAc,EAAE,CAAC;IAC9B,OAAO,CAAC,EAAE,YAAY,CAAC;CACxB;AAED,wBAAgB,KAAK,CAAC,KAAK,EAAE,gBAAgB,GAAG,eAAe,CAE9D"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"route.js","sourceRoot":"","sources":["../../src/routing/route.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,8CAA8C,CAAC;AAcrF,MAAM,UAAU,KAAK,CAAC,KAAuB;IAC3C,OAAO,qBAAqB,CAAC,KAAK,CAAC,CAAC;AACtC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"route.test.d.ts","sourceRoot":"","sources":["../../src/routing/route.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
import { describe, expect, test, vi } from 'vitest';
|
|
2
|
+
import { Route } from './route.js';
|
|
3
|
+
describe('routing route', () => {
|
|
4
|
+
test('it creates a function first route definition', () => {
|
|
5
|
+
const handler = vi.fn(async () => undefined);
|
|
6
|
+
const route = Route({
|
|
7
|
+
method: 'GET',
|
|
8
|
+
path: '/users',
|
|
9
|
+
handler,
|
|
10
|
+
});
|
|
11
|
+
expect(route).toEqual({
|
|
12
|
+
bodyOptions: {},
|
|
13
|
+
handler,
|
|
14
|
+
methods: ['get'],
|
|
15
|
+
middleware: [],
|
|
16
|
+
parseBody: true,
|
|
17
|
+
path: '/users',
|
|
18
|
+
});
|
|
19
|
+
});
|
|
20
|
+
test('it keeps the route name when provided', () => {
|
|
21
|
+
const handler = vi.fn(async () => undefined);
|
|
22
|
+
const route = Route({
|
|
23
|
+
name: 'users.list',
|
|
24
|
+
method: 'GET',
|
|
25
|
+
path: '/users',
|
|
26
|
+
handler,
|
|
27
|
+
});
|
|
28
|
+
expect(route.name).toBe('users.list');
|
|
29
|
+
});
|
|
30
|
+
});
|
|
31
|
+
//# sourceMappingURL=route.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"route.test.js","sourceRoot":"","sources":["../../src/routing/route.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AACpD,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAEhC,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;IAC7B,IAAI,CAAC,8CAA8C,EAAE,GAAG,EAAE;QACxD,MAAM,OAAO,GAAG,EAAE,CAAC,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC,SAAS,CAAC,CAAC;QAE7C,MAAM,KAAK,GAAG,KAAK,CAAC;YAClB,MAAM,EAAE,KAAK;YACb,IAAI,EAAE,QAAQ;YACd,OAAO;SACR,CAAC,CAAC;QAEH,MAAM,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC;YACpB,WAAW,EAAE,EAAE;YACf,OAAO;YACP,OAAO,EAAE,CAAC,KAAK,CAAC;YAChB,UAAU,EAAE,EAAE;YACd,SAAS,EAAE,IAAI;YACf,IAAI,EAAE,QAAQ;SACf,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,uCAAuC,EAAE,GAAG,EAAE;QACjD,MAAM,OAAO,GAAG,EAAE,CAAC,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC,SAAS,CAAC,CAAC;QAE7C,MAAM,KAAK,GAAG,KAAK,CAAC;YAClB,IAAI,EAAE,YAAY;YAClB,MAAM,EAAE,KAAK;YACb,IAAI,EAAE,QAAQ;YACd,OAAO;SACR,CAAC,CAAC;QAEH,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IACxC,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"router-method.d.ts","sourceRoot":"","sources":["../../src/routing/router-method.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,YAAY,GAAG,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,OAAO,GAAG,QAAQ,GAAG,SAAS,GAAG,MAAM,GAAG,KAAK,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
//# sourceMappingURL=router-method.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"router-method.js","sourceRoot":"","sources":["../../src/routing/router-method.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"create-path-catalog.d.ts","sourceRoot":"","sources":["../../../src/routing/source/create-path-catalog.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAEjE,wBAAgB,iBAAiB,CAAC,YAAY,EAAE,WAAW,EAAE,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAgBlF"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import { normalizeRouteSources } from '../../routing/source/normalize-route-sources.js';
|
|
2
|
+
export function createPathCatalog(routeSources) {
|
|
3
|
+
const catalog = new Map();
|
|
4
|
+
for (const route of normalizeRouteSources(routeSources)) {
|
|
5
|
+
if (route.name === undefined) {
|
|
6
|
+
continue;
|
|
7
|
+
}
|
|
8
|
+
if (catalog.has(route.name)) {
|
|
9
|
+
throw new Error(`Duplicate route name detected: ${route.name}.`);
|
|
10
|
+
}
|
|
11
|
+
catalog.set(route.name, route.path);
|
|
12
|
+
}
|
|
13
|
+
return catalog;
|
|
14
|
+
}
|
|
15
|
+
//# sourceMappingURL=create-path-catalog.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"create-path-catalog.js","sourceRoot":"","sources":["../../../src/routing/source/create-path-catalog.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,0CAA0C,CAAC;AAGjF,MAAM,UAAU,iBAAiB,CAAC,YAA2B;IAC3D,MAAM,OAAO,GAAG,IAAI,GAAG,EAAkB,CAAC;IAE1C,KAAK,MAAM,KAAK,IAAI,qBAAqB,CAAC,YAAY,CAAC,EAAE,CAAC;QACxD,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YAC7B,SAAS;QACX,CAAC;QAED,IAAI,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;YAC5B,MAAM,IAAI,KAAK,CAAC,kCAAkC,KAAK,CAAC,IAAI,GAAG,CAAC,CAAC;QACnE,CAAC;QAED,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;IACtC,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"create-path-catalog.test.d.ts","sourceRoot":"","sources":["../../../src/routing/source/create-path-catalog.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,62 @@
|
|
|
1
|
+
import { describe, expect, test, vi } from 'vitest';
|
|
2
|
+
import { Get } from '../../routing/helpers/http-verb-helpers.js';
|
|
3
|
+
import { RouteGroup } from '../../routing/helpers/route-group.js';
|
|
4
|
+
import { Route } from '../../routing/route.js';
|
|
5
|
+
import { createPathCatalog } from './create-path-catalog.js';
|
|
6
|
+
describe('create path catalog', () => {
|
|
7
|
+
test('it collects named route paths from route sources', () => {
|
|
8
|
+
const routes = [
|
|
9
|
+
Get('/users', 'users.index', vi.fn(async () => undefined)),
|
|
10
|
+
Route({
|
|
11
|
+
name: 'users.show',
|
|
12
|
+
method: 'GET',
|
|
13
|
+
path: '/users/:id',
|
|
14
|
+
handler: vi.fn(async () => undefined),
|
|
15
|
+
}),
|
|
16
|
+
];
|
|
17
|
+
const catalog = createPathCatalog(routes);
|
|
18
|
+
expect(catalog).toEqual(new Map([
|
|
19
|
+
['users.index', '/users'],
|
|
20
|
+
['users.show', '/users/:id'],
|
|
21
|
+
]));
|
|
22
|
+
});
|
|
23
|
+
test('it collects grouped route names using their normalized paths', () => {
|
|
24
|
+
const routes = [
|
|
25
|
+
RouteGroup({
|
|
26
|
+
prefix: '/api',
|
|
27
|
+
namePrefix: 'api.',
|
|
28
|
+
}, () => [
|
|
29
|
+
Get('/users/:id', 'users.show', vi.fn(async () => undefined)),
|
|
30
|
+
]),
|
|
31
|
+
];
|
|
32
|
+
const catalog = createPathCatalog(routes);
|
|
33
|
+
expect(catalog).toEqual(new Map([['api.users.show', '/api/users/:id']]));
|
|
34
|
+
});
|
|
35
|
+
test('it ignores unnamed routes', () => {
|
|
36
|
+
const routes = [
|
|
37
|
+
Get('/users', vi.fn(async () => undefined)),
|
|
38
|
+
Get('/users/:id', 'users.show', vi.fn(async () => undefined)),
|
|
39
|
+
];
|
|
40
|
+
const catalog = createPathCatalog(routes);
|
|
41
|
+
expect(catalog).toEqual(new Map([['users.show', '/users/:id']]));
|
|
42
|
+
});
|
|
43
|
+
test('it throws when normalized route names are duplicated', () => {
|
|
44
|
+
const routes = [
|
|
45
|
+
RouteGroup({
|
|
46
|
+
prefix: '/api',
|
|
47
|
+
namePrefix: 'api.',
|
|
48
|
+
}, () => [
|
|
49
|
+
Get('/users', 'users.index', vi.fn(async () => undefined)),
|
|
50
|
+
]),
|
|
51
|
+
Route({
|
|
52
|
+
name: 'api.users.index',
|
|
53
|
+
method: 'GET',
|
|
54
|
+
path: '/members',
|
|
55
|
+
handler: vi.fn(async () => undefined),
|
|
56
|
+
}),
|
|
57
|
+
];
|
|
58
|
+
const createCatalog = () => createPathCatalog(routes);
|
|
59
|
+
expect(createCatalog).toThrow('Duplicate route name detected: api.users.index.');
|
|
60
|
+
});
|
|
61
|
+
});
|
|
62
|
+
//# sourceMappingURL=create-path-catalog.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"create-path-catalog.test.js","sourceRoot":"","sources":["../../../src/routing/source/create-path-catalog.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import type { RouteDefinition } from '../../routing/definition/route-definition.js';
|
|
2
|
+
import type { RouteSource } from './route-source.js';
|
|
3
|
+
interface NormalizationContext {
|
|
4
|
+
prefix: string;
|
|
5
|
+
namePrefix: string;
|
|
6
|
+
middleware: RouteDefinition['middleware'];
|
|
7
|
+
}
|
|
8
|
+
export declare function normalizeRouteSources(routeSources: RouteSource[], context?: NormalizationContext): RouteDefinition[];
|
|
9
|
+
export {};
|
|
10
|
+
//# sourceMappingURL=normalize-route-sources.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"normalize-route-sources.d.ts","sourceRoot":"","sources":["../../../src/routing/source/normalize-route-sources.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AAG7E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAElD,UAAU,oBAAoB;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,eAAe,CAAC,YAAY,CAAC,CAAC;CAC3C;AAQD,wBAAgB,qBAAqB,CACnC,YAAY,EAAE,WAAW,EAAE,EAC3B,OAAO,GAAE,oBAAkD,GAC1D,eAAe,EAAE,CAanB"}
|
|
@@ -0,0 +1,82 @@
|
|
|
1
|
+
import { mergeRouteOptions } from '../../routing/definition/resolve-route-options.js';
|
|
2
|
+
const defaultNormalizationContext = {
|
|
3
|
+
prefix: '',
|
|
4
|
+
namePrefix: '',
|
|
5
|
+
middleware: [],
|
|
6
|
+
};
|
|
7
|
+
export function normalizeRouteSources(routeSources, context = defaultNormalizationContext) {
|
|
8
|
+
const routes = [];
|
|
9
|
+
for (const routeSource of routeSources) {
|
|
10
|
+
if (isRouteGroupDefinition(routeSource)) {
|
|
11
|
+
routes.push(...normalizeRouteGroup(routeSource, context));
|
|
12
|
+
continue;
|
|
13
|
+
}
|
|
14
|
+
routes.push(normalizeRouteDefinition(routeSource, context));
|
|
15
|
+
}
|
|
16
|
+
return routes;
|
|
17
|
+
}
|
|
18
|
+
function normalizeRouteGroup(group, parentContext) {
|
|
19
|
+
const context = createChildContext(group, parentContext);
|
|
20
|
+
return normalizeRouteSources(applyRouteConfig(group.resolveRoutes(), group), context);
|
|
21
|
+
}
|
|
22
|
+
function createChildContext(group, parentContext) {
|
|
23
|
+
return {
|
|
24
|
+
prefix: group.options.prefix === undefined
|
|
25
|
+
? parentContext.prefix
|
|
26
|
+
: joinRoutePath(parentContext.prefix, group.options.prefix),
|
|
27
|
+
namePrefix: `${parentContext.namePrefix}${group.options.namePrefix ?? ''}`,
|
|
28
|
+
middleware: [...parentContext.middleware, ...(group.options.middleware ?? [])],
|
|
29
|
+
};
|
|
30
|
+
}
|
|
31
|
+
function normalizeRouteDefinition(route, context) {
|
|
32
|
+
return {
|
|
33
|
+
...route,
|
|
34
|
+
path: joinRoutePath(context.prefix, route.path),
|
|
35
|
+
name: route.name ? `${context.namePrefix}${route.name}` : undefined,
|
|
36
|
+
middleware: [...context.middleware, ...route.middleware],
|
|
37
|
+
};
|
|
38
|
+
}
|
|
39
|
+
function applyRouteConfig(routeSources, group) {
|
|
40
|
+
return routeSources.map(routeSource => {
|
|
41
|
+
if (isRouteGroupDefinition(routeSource)) {
|
|
42
|
+
return routeSource;
|
|
43
|
+
}
|
|
44
|
+
const routeConfig = routeSource.name ? group.options.routeConfig?.[routeSource.name] : undefined;
|
|
45
|
+
if (!routeConfig) {
|
|
46
|
+
return routeSource;
|
|
47
|
+
}
|
|
48
|
+
return {
|
|
49
|
+
...routeSource,
|
|
50
|
+
middleware: [...(routeConfig.middleware ?? []), ...routeSource.middleware],
|
|
51
|
+
...resolveRouteConfigOptions(routeSource, routeConfig),
|
|
52
|
+
};
|
|
53
|
+
});
|
|
54
|
+
}
|
|
55
|
+
function resolveRouteConfigOptions(route, routeConfig) {
|
|
56
|
+
return routeConfig.options ? mergeRouteOptions(route, routeConfig.options) : {};
|
|
57
|
+
}
|
|
58
|
+
function isRouteGroupDefinition(routeSource) {
|
|
59
|
+
return 'kind' in routeSource && routeSource.kind === 'route-group';
|
|
60
|
+
}
|
|
61
|
+
function joinRoutePath(prefix, path) {
|
|
62
|
+
const normalizedPrefix = trimTrailingSlash(prefix);
|
|
63
|
+
const normalizedPath = trimLeadingSlash(path);
|
|
64
|
+
if (normalizedPrefix === '') {
|
|
65
|
+
return normalizedPath === '' ? '/' : `/${normalizedPath}`;
|
|
66
|
+
}
|
|
67
|
+
if (normalizedPath === '') {
|
|
68
|
+
return normalizedPrefix;
|
|
69
|
+
}
|
|
70
|
+
return `${normalizedPrefix}/${normalizedPath}`;
|
|
71
|
+
}
|
|
72
|
+
function trimLeadingSlash(value) {
|
|
73
|
+
return value.replace(/^\/+/, '');
|
|
74
|
+
}
|
|
75
|
+
function trimTrailingSlash(value) {
|
|
76
|
+
if (value === '') {
|
|
77
|
+
return value;
|
|
78
|
+
}
|
|
79
|
+
const normalized = value.replace(/\/+$/, '');
|
|
80
|
+
return normalized === '' ? '' : normalized;
|
|
81
|
+
}
|
|
82
|
+
//# sourceMappingURL=normalize-route-sources.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"normalize-route-sources.js","sourceRoot":"","sources":["../../../src/routing/source/normalize-route-sources.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"normalize-route-sources.test.d.ts","sourceRoot":"","sources":["../../../src/routing/source/normalize-route-sources.test.ts"],"names":[],"mappings":""}
|