@adtrackify/at-service-common 3.17.6 → 3.17.8
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/cjs/__tests__/unit/libs/api-router/public-api-router.spec.d.ts +1 -0
- package/dist/cjs/__tests__/unit/libs/api-router/public-api-router.spec.js +198 -0
- package/dist/cjs/__tests__/unit/libs/api-router/public-api-router.spec.js.map +1 -0
- package/dist/cjs/__tests__/unit/libs/api-router/route-matcher.spec.d.ts +1 -0
- package/dist/cjs/__tests__/unit/libs/api-router/route-matcher.spec.js +70 -0
- package/dist/cjs/__tests__/unit/libs/api-router/route-matcher.spec.js.map +1 -0
- package/dist/cjs/libs/api-router/index.d.ts +2 -0
- package/dist/cjs/libs/api-router/index.js +19 -0
- package/dist/cjs/libs/api-router/index.js.map +1 -0
- package/dist/cjs/libs/api-router/public-api-router.d.ts +3 -0
- package/dist/cjs/libs/api-router/public-api-router.js +37 -0
- package/dist/cjs/libs/api-router/public-api-router.js.map +1 -0
- package/dist/cjs/libs/api-router/route-matcher.d.ts +21 -0
- package/dist/cjs/libs/api-router/route-matcher.js +37 -0
- package/dist/cjs/libs/api-router/route-matcher.js.map +1 -0
- package/dist/cjs/libs/index.d.ts +1 -0
- package/dist/cjs/libs/index.js +1 -0
- package/dist/cjs/libs/index.js.map +1 -1
- package/dist/esm/__tests__/unit/libs/api-router/public-api-router.spec.d.ts +1 -0
- package/dist/esm/__tests__/unit/libs/api-router/public-api-router.spec.js +173 -0
- package/dist/esm/__tests__/unit/libs/api-router/public-api-router.spec.js.map +1 -0
- package/dist/esm/__tests__/unit/libs/api-router/route-matcher.spec.d.ts +1 -0
- package/dist/esm/__tests__/unit/libs/api-router/route-matcher.spec.js +68 -0
- package/dist/esm/__tests__/unit/libs/api-router/route-matcher.spec.js.map +1 -0
- package/dist/esm/libs/api-router/index.d.ts +2 -0
- package/dist/esm/libs/api-router/index.js +3 -0
- package/dist/esm/libs/api-router/index.js.map +1 -0
- package/dist/esm/libs/api-router/public-api-router.d.ts +3 -0
- package/dist/esm/libs/api-router/public-api-router.js +33 -0
- package/dist/esm/libs/api-router/public-api-router.js.map +1 -0
- package/dist/esm/libs/api-router/route-matcher.d.ts +21 -0
- package/dist/esm/libs/api-router/route-matcher.js +31 -0
- package/dist/esm/libs/api-router/route-matcher.js.map +1 -0
- package/dist/esm/libs/index.d.ts +1 -0
- package/dist/esm/libs/index.js +1 -0
- package/dist/esm/libs/index.js.map +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,198 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
25
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
+
const public_api_router_js_1 = require("../../../../libs/api-router/public-api-router.js");
|
|
27
|
+
const ok = (body = { ok: true }) => ({ statusCode: 200, body: JSON.stringify(body) });
|
|
28
|
+
const baseEvent = (overrides) => {
|
|
29
|
+
const { httpMethod, proxy, ...rest } = overrides;
|
|
30
|
+
return {
|
|
31
|
+
httpMethod,
|
|
32
|
+
path: `/api/${proxy}`,
|
|
33
|
+
requestContext: {
|
|
34
|
+
authorizer: {
|
|
35
|
+
pixelId: 'px_1',
|
|
36
|
+
accountId: 'acc_1',
|
|
37
|
+
scopes: 'account:read',
|
|
38
|
+
},
|
|
39
|
+
},
|
|
40
|
+
pathParameters: { proxy },
|
|
41
|
+
queryStringParameters: null,
|
|
42
|
+
body: null,
|
|
43
|
+
...rest,
|
|
44
|
+
};
|
|
45
|
+
};
|
|
46
|
+
const ctx = { awsRequestId: 'req_1' };
|
|
47
|
+
describe('createPublicApiRouter', () => {
|
|
48
|
+
it('dispatches to the route handler for a literal path', async () => {
|
|
49
|
+
const getAccount = jest.fn().mockResolvedValue(ok());
|
|
50
|
+
const routes = [
|
|
51
|
+
{ method: 'GET', path: '/api/account', handler: getAccount },
|
|
52
|
+
];
|
|
53
|
+
const handler = (0, public_api_router_js_1.createPublicApiRouter)(routes);
|
|
54
|
+
const result = await handler(baseEvent({ httpMethod: 'GET', proxy: 'account' }), ctx);
|
|
55
|
+
expect(result.statusCode).toBe(200);
|
|
56
|
+
expect(getAccount).toHaveBeenCalledTimes(1);
|
|
57
|
+
});
|
|
58
|
+
it('extracts named path parameters and clears the API-GW {proxy+} placeholder', async () => {
|
|
59
|
+
const updateCog = jest.fn().mockResolvedValue(ok());
|
|
60
|
+
const routes = [
|
|
61
|
+
{ method: 'PUT', path: '/api/products/:productId/:variantId/cogs/:cogId', handler: updateCog },
|
|
62
|
+
];
|
|
63
|
+
const handler = (0, public_api_router_js_1.createPublicApiRouter)(routes);
|
|
64
|
+
await handler(baseEvent({
|
|
65
|
+
httpMethod: 'PUT',
|
|
66
|
+
proxy: 'products/prd_1/var_2/cogs/cog_3',
|
|
67
|
+
body: JSON.stringify({ cost: 5 }),
|
|
68
|
+
}), ctx);
|
|
69
|
+
expect(updateCog).toHaveBeenCalledTimes(1);
|
|
70
|
+
const dispatched = updateCog.mock.calls[0][0];
|
|
71
|
+
expect(dispatched.pathParameters).toEqual({
|
|
72
|
+
productId: 'prd_1',
|
|
73
|
+
variantId: 'var_2',
|
|
74
|
+
cogId: 'cog_3',
|
|
75
|
+
});
|
|
76
|
+
expect(dispatched.pathParameters?.proxy).toBeUndefined();
|
|
77
|
+
});
|
|
78
|
+
it('routes off pathParameters.proxy, not event.path (custom-domain basePath regression)', async () => {
|
|
79
|
+
const getAccount = jest.fn().mockResolvedValue(ok());
|
|
80
|
+
const routes = [
|
|
81
|
+
{ method: 'GET', path: '/api/account', handler: getAccount },
|
|
82
|
+
];
|
|
83
|
+
const handler = (0, public_api_router_js_1.createPublicApiRouter)(routes);
|
|
84
|
+
const event = baseEvent({ httpMethod: 'GET', proxy: 'account' });
|
|
85
|
+
event.path = '/accounts/api/account';
|
|
86
|
+
const result = await handler(event, ctx);
|
|
87
|
+
expect(result.statusCode).toBe(200);
|
|
88
|
+
expect(getAccount).toHaveBeenCalledTimes(1);
|
|
89
|
+
});
|
|
90
|
+
it('passes path params through unchanged (API GW already decoded them, no double-decode)', async () => {
|
|
91
|
+
const updateCog = jest.fn().mockResolvedValue(ok());
|
|
92
|
+
const routes = [
|
|
93
|
+
{ method: 'PUT', path: '/api/products/:productId/:variantId/cogs/:cogId', handler: updateCog },
|
|
94
|
+
];
|
|
95
|
+
const handler = (0, public_api_router_js_1.createPublicApiRouter)(routes);
|
|
96
|
+
await handler(baseEvent({
|
|
97
|
+
httpMethod: 'PUT',
|
|
98
|
+
proxy: 'products/prd_a/var_b/cogs/cog_c%10',
|
|
99
|
+
body: JSON.stringify({ cost: 5 }),
|
|
100
|
+
}), ctx);
|
|
101
|
+
expect(updateCog).toHaveBeenCalledTimes(1);
|
|
102
|
+
const dispatched = updateCog.mock.calls[0][0];
|
|
103
|
+
expect(dispatched.pathParameters?.cogId).toBe('cog_c%10');
|
|
104
|
+
});
|
|
105
|
+
it('returns 404 when no route matches', async () => {
|
|
106
|
+
const getAccount = jest.fn().mockResolvedValue(ok());
|
|
107
|
+
const routes = [
|
|
108
|
+
{ method: 'GET', path: '/api/account', handler: getAccount },
|
|
109
|
+
];
|
|
110
|
+
const handler = (0, public_api_router_js_1.createPublicApiRouter)(routes);
|
|
111
|
+
const result = await handler(baseEvent({ httpMethod: 'GET', proxy: 'nope' }), ctx);
|
|
112
|
+
expect(result.statusCode).toBe(404);
|
|
113
|
+
expect(getAccount).not.toHaveBeenCalled();
|
|
114
|
+
});
|
|
115
|
+
it('does not log a 404 at error level (avoids double-log + false-positive error alerts)', async () => {
|
|
116
|
+
const loggingHelper = await Promise.resolve().then(() => __importStar(require('../../../../helpers/logging-helper.js')));
|
|
117
|
+
const errorSpy = jest.spyOn(loggingHelper.Logger, 'error').mockImplementation(() => undefined);
|
|
118
|
+
const warnSpy = jest.spyOn(loggingHelper.Logger, 'warn').mockImplementation(() => undefined);
|
|
119
|
+
try {
|
|
120
|
+
const routes = [
|
|
121
|
+
{ method: 'GET', path: '/api/account', handler: jest.fn().mockResolvedValue(ok()) },
|
|
122
|
+
];
|
|
123
|
+
const handler = (0, public_api_router_js_1.createPublicApiRouter)(routes);
|
|
124
|
+
const result = await handler(baseEvent({ httpMethod: 'GET', proxy: 'nope' }), ctx);
|
|
125
|
+
expect(result.statusCode).toBe(404);
|
|
126
|
+
expect(warnSpy).toHaveBeenCalledTimes(1);
|
|
127
|
+
expect(errorSpy).not.toHaveBeenCalled();
|
|
128
|
+
}
|
|
129
|
+
finally {
|
|
130
|
+
errorSpy.mockRestore();
|
|
131
|
+
warnSpy.mockRestore();
|
|
132
|
+
}
|
|
133
|
+
});
|
|
134
|
+
it('handles OPTIONS preflight without invoking any downstream handler', async () => {
|
|
135
|
+
const getAccount = jest.fn().mockResolvedValue(ok());
|
|
136
|
+
const routes = [
|
|
137
|
+
{ method: 'GET', path: '/api/account', handler: getAccount },
|
|
138
|
+
];
|
|
139
|
+
const handler = (0, public_api_router_js_1.createPublicApiRouter)(routes);
|
|
140
|
+
const result = await handler(baseEvent({ httpMethod: 'OPTIONS', proxy: 'account' }), ctx);
|
|
141
|
+
expect(result.statusCode).toBe(200);
|
|
142
|
+
expect(getAccount).not.toHaveBeenCalled();
|
|
143
|
+
});
|
|
144
|
+
it('treats OPTIONS case-insensitively (matches matchRoute method-case contract)', async () => {
|
|
145
|
+
const getAccount = jest.fn().mockResolvedValue(ok());
|
|
146
|
+
const routes = [
|
|
147
|
+
{ method: 'GET', path: '/api/account', handler: getAccount },
|
|
148
|
+
];
|
|
149
|
+
const handler = (0, public_api_router_js_1.createPublicApiRouter)(routes);
|
|
150
|
+
const result = await handler(baseEvent({ httpMethod: 'options', proxy: 'account' }), ctx);
|
|
151
|
+
expect(result.statusCode).toBe(200);
|
|
152
|
+
expect(getAccount).not.toHaveBeenCalled();
|
|
153
|
+
});
|
|
154
|
+
it('preserves the request body when dispatching', async () => {
|
|
155
|
+
const updateCog = jest.fn().mockResolvedValue(ok());
|
|
156
|
+
const routes = [
|
|
157
|
+
{ method: 'PUT', path: '/api/products/:productId/:variantId/cogs/:cogId', handler: updateCog },
|
|
158
|
+
];
|
|
159
|
+
const handler = (0, public_api_router_js_1.createPublicApiRouter)(routes);
|
|
160
|
+
await handler(baseEvent({
|
|
161
|
+
httpMethod: 'PUT',
|
|
162
|
+
proxy: 'products/prd_1/var_2/cogs/cog_3',
|
|
163
|
+
body: JSON.stringify({ cost: 7 }),
|
|
164
|
+
}), ctx);
|
|
165
|
+
const dispatched = updateCog.mock.calls[0][0];
|
|
166
|
+
expect(dispatched.body).toBe(JSON.stringify({ cost: 7 }));
|
|
167
|
+
});
|
|
168
|
+
it('preserves the authorizer context when dispatching', async () => {
|
|
169
|
+
const getAccount = jest.fn().mockResolvedValue(ok());
|
|
170
|
+
const routes = [
|
|
171
|
+
{ method: 'GET', path: '/api/account', handler: getAccount },
|
|
172
|
+
];
|
|
173
|
+
const handler = (0, public_api_router_js_1.createPublicApiRouter)(routes);
|
|
174
|
+
await handler(baseEvent({ httpMethod: 'GET', proxy: 'account' }), ctx);
|
|
175
|
+
const dispatched = getAccount.mock.calls[0][0];
|
|
176
|
+
expect(dispatched.requestContext.authorizer?.pixelId).toBe('px_1');
|
|
177
|
+
expect(dispatched.requestContext.authorizer?.scopes).toContain('account:read');
|
|
178
|
+
});
|
|
179
|
+
it('compiles routes once at factory call, not per-request', async () => {
|
|
180
|
+
const h = jest.fn().mockResolvedValue(ok());
|
|
181
|
+
const routes = [{ method: 'GET', path: '/api/x', handler: h }];
|
|
182
|
+
const handler = (0, public_api_router_js_1.createPublicApiRouter)(routes);
|
|
183
|
+
await handler(baseEvent({ httpMethod: 'GET', proxy: 'x' }), ctx);
|
|
184
|
+
await handler(baseEvent({ httpMethod: 'GET', proxy: 'x' }), ctx);
|
|
185
|
+
expect(h).toHaveBeenCalledTimes(2);
|
|
186
|
+
});
|
|
187
|
+
it('returns failure() envelope when the downstream handler throws', async () => {
|
|
188
|
+
const broken = jest.fn().mockRejectedValue(new Error('boom'));
|
|
189
|
+
const routes = [
|
|
190
|
+
{ method: 'GET', path: '/api/broken', handler: broken },
|
|
191
|
+
];
|
|
192
|
+
const handler = (0, public_api_router_js_1.createPublicApiRouter)(routes);
|
|
193
|
+
const result = await handler(baseEvent({ httpMethod: 'GET', proxy: 'broken' }), ctx);
|
|
194
|
+
expect(result.statusCode).toBeGreaterThanOrEqual(400);
|
|
195
|
+
expect(broken).toHaveBeenCalledTimes(1);
|
|
196
|
+
});
|
|
197
|
+
});
|
|
198
|
+
//# sourceMappingURL=public-api-router.spec.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"public-api-router.spec.js","sourceRoot":"","sources":["../../../../../../src/__tests__/unit/libs/api-router/public-api-router.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,70 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const route_matcher_js_1 = require("../../../../libs/api-router/route-matcher.js");
|
|
4
|
+
const noop = async () => ({ statusCode: 200, body: '{}' });
|
|
5
|
+
const defs = [
|
|
6
|
+
{ method: 'GET', path: '/api/account', handler: noop },
|
|
7
|
+
{ method: 'PATCH', path: '/api/account', handler: noop },
|
|
8
|
+
{ method: 'GET', path: '/api/account/settings/order', handler: noop },
|
|
9
|
+
{ method: 'PUT', path: '/api/account/settings/order', handler: noop },
|
|
10
|
+
{ method: 'GET', path: '/api/products/search', handler: noop },
|
|
11
|
+
{ method: 'GET', path: '/api/products/:productId/:variantId/cost', handler: noop },
|
|
12
|
+
{ method: 'POST', path: '/api/products/:productId/:variantId/cogs', handler: noop },
|
|
13
|
+
{ method: 'PUT', path: '/api/products/:productId/:variantId/cogs/:cogId', handler: noop },
|
|
14
|
+
{ method: 'DELETE', path: '/api/products/:productId/:variantId/cogs/:cogId', handler: noop },
|
|
15
|
+
{ method: 'POST', path: '/api/dashboard/views/from-preset', handler: noop },
|
|
16
|
+
{ method: 'POST', path: '/api/dashboard/views/:dashboardViewId/copy', handler: noop },
|
|
17
|
+
{ method: 'GET', path: '/api/dashboard/views/:dashboardViewId', handler: noop },
|
|
18
|
+
];
|
|
19
|
+
const compiled = (0, route_matcher_js_1.compileRoutes)(defs);
|
|
20
|
+
describe('matchRoute', () => {
|
|
21
|
+
it('matches a literal static route', () => {
|
|
22
|
+
const m = (0, route_matcher_js_1.matchRoute)(compiled, 'GET', '/api/account');
|
|
23
|
+
expect(m?.route.path).toBe('/api/account');
|
|
24
|
+
expect(m?.pathParameters).toEqual({});
|
|
25
|
+
});
|
|
26
|
+
it('discriminates by method on the same path', () => {
|
|
27
|
+
expect((0, route_matcher_js_1.matchRoute)(compiled, 'GET', '/api/account')?.route.path).toBe('/api/account');
|
|
28
|
+
expect((0, route_matcher_js_1.matchRoute)(compiled, 'PATCH', '/api/account')?.route.path).toBe('/api/account');
|
|
29
|
+
});
|
|
30
|
+
it('extracts named path parameters', () => {
|
|
31
|
+
const m = (0, route_matcher_js_1.matchRoute)(compiled, 'PUT', '/api/products/prd_1/var_2/cogs/cog_3');
|
|
32
|
+
expect(m?.pathParameters).toEqual({ productId: 'prd_1', variantId: 'var_2', cogId: 'cog_3' });
|
|
33
|
+
});
|
|
34
|
+
it('prefers an earlier literal route over a later wildcard (search vs :productId)', () => {
|
|
35
|
+
const m = (0, route_matcher_js_1.matchRoute)(compiled, 'GET', '/api/products/search');
|
|
36
|
+
expect(m?.route.path).toBe('/api/products/search');
|
|
37
|
+
expect(m?.pathParameters).toEqual({});
|
|
38
|
+
});
|
|
39
|
+
it('prefers an earlier literal route over a later wildcard (from-preset vs :dashboardViewId)', () => {
|
|
40
|
+
const m = (0, route_matcher_js_1.matchRoute)(compiled, 'POST', '/api/dashboard/views/from-preset');
|
|
41
|
+
expect(m?.route.path).toBe('/api/dashboard/views/from-preset');
|
|
42
|
+
});
|
|
43
|
+
it('returns RAW (still-encoded) path params — decoding is the caller’s responsibility', () => {
|
|
44
|
+
const m = (0, route_matcher_js_1.matchRoute)(compiled, 'GET', '/api/products/prd%20space/var_2/cost');
|
|
45
|
+
expect(m?.pathParameters.productId).toBe('prd%20space');
|
|
46
|
+
});
|
|
47
|
+
it('does not throw on malformed percent-encoding (matcher stays pure)', () => {
|
|
48
|
+
expect(() => (0, route_matcher_js_1.matchRoute)(compiled, 'GET', '/api/products/%ZZ/var_2/cost')).not.toThrow();
|
|
49
|
+
});
|
|
50
|
+
it('accepts and ignores a trailing slash', () => {
|
|
51
|
+
const m = (0, route_matcher_js_1.matchRoute)(compiled, 'GET', '/api/account/');
|
|
52
|
+
expect(m?.route.path).toBe('/api/account');
|
|
53
|
+
});
|
|
54
|
+
it('returns null when path does not match any route', () => {
|
|
55
|
+
expect((0, route_matcher_js_1.matchRoute)(compiled, 'GET', '/api/unknown')).toBeNull();
|
|
56
|
+
});
|
|
57
|
+
it('returns null when method does not match a registered path', () => {
|
|
58
|
+
expect((0, route_matcher_js_1.matchRoute)(compiled, 'DELETE', '/api/account')).toBeNull();
|
|
59
|
+
});
|
|
60
|
+
it('treats methods case-insensitively', () => {
|
|
61
|
+
expect((0, route_matcher_js_1.matchRoute)(compiled, 'get', '/api/account')?.route.path).toBe('/api/account');
|
|
62
|
+
});
|
|
63
|
+
it('does not match a partial path (no greedy fallthrough)', () => {
|
|
64
|
+
expect((0, route_matcher_js_1.matchRoute)(compiled, 'GET', '/api/account/extra')).toBeNull();
|
|
65
|
+
});
|
|
66
|
+
it('does not let a wildcard segment swallow a slash', () => {
|
|
67
|
+
expect((0, route_matcher_js_1.matchRoute)(compiled, 'POST', '/api/products/foo/bar/baz/cogs')).toBeNull();
|
|
68
|
+
});
|
|
69
|
+
});
|
|
70
|
+
//# sourceMappingURL=route-matcher.spec.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"route-matcher.spec.js","sourceRoot":"","sources":["../../../../../../src/__tests__/unit/libs/api-router/route-matcher.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
14
|
+
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
|
+
};
|
|
16
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
+
__exportStar(require("./route-matcher.js"), exports);
|
|
18
|
+
__exportStar(require("./public-api-router.js"), exports);
|
|
19
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/libs/api-router/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,qDAAmC;AACnC,yDAAuC"}
|
|
@@ -0,0 +1,3 @@
|
|
|
1
|
+
import type { APIGatewayProxyResult, Context } from 'aws-lambda';
|
|
2
|
+
import { type RouteDef } from './route-matcher.js';
|
|
3
|
+
export declare const createPublicApiRouter: (routes: RouteDef[]) => (event: import("aws-lambda").APIGatewayProxyEvent, context: Context) => Promise<APIGatewayProxyResult>;
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.createPublicApiRouter = void 0;
|
|
4
|
+
const logging_helper_js_1 = require("../../helpers/logging-helper.js");
|
|
5
|
+
const response_helper_js_1 = require("../../helpers/response-helper.js");
|
|
6
|
+
const http_error_js_1 = require("../http-error.js");
|
|
7
|
+
const route_matcher_js_1 = require("./route-matcher.js");
|
|
8
|
+
const createPublicApiRouter = (routes) => {
|
|
9
|
+
const compiled = (0, route_matcher_js_1.compileRoutes)(routes);
|
|
10
|
+
return async function handler(event, context) {
|
|
11
|
+
try {
|
|
12
|
+
(0, logging_helper_js_1.configureLogger)(event, context);
|
|
13
|
+
const method = event.httpMethod.toUpperCase();
|
|
14
|
+
if (method === 'OPTIONS') {
|
|
15
|
+
return (0, response_helper_js_1.success)({});
|
|
16
|
+
}
|
|
17
|
+
const proxy = event.pathParameters?.proxy ?? '';
|
|
18
|
+
const path = `/api/${proxy}`.replace(/\/+$/, '') || '/api';
|
|
19
|
+
const match = (0, route_matcher_js_1.matchRoute)(compiled, method, path);
|
|
20
|
+
if (!match) {
|
|
21
|
+
logging_helper_js_1.Logger.warn('PublicApiRouter: no route matched', { method, path, rawPath: event.path });
|
|
22
|
+
return (0, response_helper_js_1.failure)(http_error_js_1.HttpError.notFound(`No route for ${method} ${path}`));
|
|
23
|
+
}
|
|
24
|
+
const enrichedEvent = {
|
|
25
|
+
...event,
|
|
26
|
+
pathParameters: { ...match.pathParameters },
|
|
27
|
+
};
|
|
28
|
+
return await match.route.handler(enrichedEvent, context);
|
|
29
|
+
}
|
|
30
|
+
catch (error) {
|
|
31
|
+
logging_helper_js_1.Logger.error('PublicApiRouter: failed', { error });
|
|
32
|
+
return (0, response_helper_js_1.failure)(error);
|
|
33
|
+
}
|
|
34
|
+
};
|
|
35
|
+
};
|
|
36
|
+
exports.createPublicApiRouter = createPublicApiRouter;
|
|
37
|
+
//# sourceMappingURL=public-api-router.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"public-api-router.js","sourceRoot":"","sources":["../../../../src/libs/api-router/public-api-router.ts"],"names":[],"mappings":";;;AACA,uEAA0E;AAC1E,yEAAoE;AACpE,oDAA6C;AAC7C,yDAA8E;AAyBvE,MAAM,qBAAqB,GAAG,CAAC,MAAkB,EAAE,EAAE;IAC1D,MAAM,QAAQ,GAAG,IAAA,gCAAa,EAAC,MAAM,CAAC,CAAC;IAEvC,OAAO,KAAK,UAAU,OAAO,CAAC,KAAsB,EAAE,OAAgB;QACpE,IAAI;YACF,IAAA,mCAAe,EAAC,KAAK,EAAE,OAAO,CAAC,CAAC;YAMhC,MAAM,MAAM,GAAG,KAAK,CAAC,UAAU,CAAC,WAAW,EAAE,CAAC;YAE9C,IAAI,MAAM,KAAK,SAAS,EAAE;gBACxB,OAAO,IAAA,4BAAO,EAAC,EAAE,CAAC,CAAC;aACpB;YAED,MAAM,KAAK,GAAG,KAAK,CAAC,cAAc,EAAE,KAAK,IAAI,EAAE,CAAC;YAChD,MAAM,IAAI,GAAG,QAAQ,KAAK,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,MAAM,CAAC;YAE3D,MAAM,KAAK,GAAG,IAAA,6BAAU,EAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;YACjD,IAAI,CAAC,KAAK,EAAE;gBAMV,0BAAM,CAAC,IAAI,CAAC,mCAAmC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;gBACxF,OAAO,IAAA,4BAAO,EAAC,yBAAS,CAAC,QAAQ,CAAC,gBAAgB,MAAM,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC;aACtE;YAED,MAAM,aAAa,GAAoB;gBACrC,GAAG,KAAK;gBACR,cAAc,EAAE,EAAE,GAAG,KAAK,CAAC,cAAc,EAAE;aAC5C,CAAC;YAEF,OAAO,MAAM,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;SAC1D;QAAC,OAAO,KAAK,EAAE;YACd,0BAAM,CAAC,KAAK,CAAC,yBAAyB,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;YACnD,OAAO,IAAA,4BAAO,EAAC,KAAK,CAAC,CAAC;SACvB;IACH,CAAC,CAAC;AACJ,CAAC,CAAC;AA1CW,QAAA,qBAAqB,yBA0ChC"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
import type { APIGatewayEvent, APIGatewayProxyResult, Context } from 'aws-lambda';
|
|
2
|
+
export type ApiHandler = (event: APIGatewayEvent, context: Context) => Promise<APIGatewayProxyResult>;
|
|
3
|
+
export interface RouteDef {
|
|
4
|
+
method: string;
|
|
5
|
+
path: string;
|
|
6
|
+
handler: ApiHandler;
|
|
7
|
+
}
|
|
8
|
+
export interface CompiledRoute {
|
|
9
|
+
method: string;
|
|
10
|
+
path: string;
|
|
11
|
+
paramNames: string[];
|
|
12
|
+
pattern: RegExp;
|
|
13
|
+
handler: ApiHandler;
|
|
14
|
+
}
|
|
15
|
+
export interface RouteMatch {
|
|
16
|
+
route: CompiledRoute;
|
|
17
|
+
pathParameters: Record<string, string>;
|
|
18
|
+
}
|
|
19
|
+
export declare const compileRoute: (def: RouteDef) => CompiledRoute;
|
|
20
|
+
export declare const compileRoutes: (defs: RouteDef[]) => CompiledRoute[];
|
|
21
|
+
export declare const matchRoute: (routes: CompiledRoute[], method: string, path: string) => RouteMatch | null;
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.matchRoute = exports.compileRoutes = exports.compileRoute = void 0;
|
|
4
|
+
const escapeRegex = (s) => s.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
|
|
5
|
+
const compileRoute = (def) => {
|
|
6
|
+
const paramNames = [];
|
|
7
|
+
const segments = def.path.split('/').map(seg => {
|
|
8
|
+
if (seg.startsWith(':')) {
|
|
9
|
+
paramNames.push(seg.slice(1));
|
|
10
|
+
return '([^/]+)';
|
|
11
|
+
}
|
|
12
|
+
return escapeRegex(seg);
|
|
13
|
+
});
|
|
14
|
+
const pattern = new RegExp('^' + segments.join('/') + '/?$');
|
|
15
|
+
return { method: def.method.toUpperCase(), path: def.path, paramNames, pattern, handler: def.handler };
|
|
16
|
+
};
|
|
17
|
+
exports.compileRoute = compileRoute;
|
|
18
|
+
const compileRoutes = (defs) => defs.map(exports.compileRoute);
|
|
19
|
+
exports.compileRoutes = compileRoutes;
|
|
20
|
+
const matchRoute = (routes, method, path) => {
|
|
21
|
+
const upper = method.toUpperCase();
|
|
22
|
+
for (const route of routes) {
|
|
23
|
+
if (route.method !== upper)
|
|
24
|
+
continue;
|
|
25
|
+
const m = route.pattern.exec(path);
|
|
26
|
+
if (!m)
|
|
27
|
+
continue;
|
|
28
|
+
const pathParameters = {};
|
|
29
|
+
for (let i = 0; i < route.paramNames.length; i++) {
|
|
30
|
+
pathParameters[route.paramNames[i]] = m[i + 1];
|
|
31
|
+
}
|
|
32
|
+
return { route, pathParameters };
|
|
33
|
+
}
|
|
34
|
+
return null;
|
|
35
|
+
};
|
|
36
|
+
exports.matchRoute = matchRoute;
|
|
37
|
+
//# sourceMappingURL=route-matcher.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"route-matcher.js","sourceRoot":"","sources":["../../../../src/libs/api-router/route-matcher.ts"],"names":[],"mappings":";;;AA2BA,MAAM,WAAW,GAAG,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,qBAAqB,EAAE,MAAM,CAAC,CAAC;AAErE,MAAM,YAAY,GAAG,CAAC,GAAa,EAAiB,EAAE;IAC3D,MAAM,UAAU,GAAa,EAAE,CAAC;IAChC,MAAM,QAAQ,GAAG,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;QAC7C,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;YACvB,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YAC9B,OAAO,SAAS,CAAC;SAClB;QACD,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC;IAC1B,CAAC,CAAC,CAAC;IACH,MAAM,OAAO,GAAG,IAAI,MAAM,CAAC,GAAG,GAAG,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC;IAC7D,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,WAAW,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC;AACzG,CAAC,CAAC;AAXW,QAAA,YAAY,gBAWvB;AAEK,MAAM,aAAa,GAAG,CAAC,IAAgB,EAAmB,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,oBAAY,CAAC,CAAC;AAA9E,QAAA,aAAa,iBAAiE;AAepF,MAAM,UAAU,GAAG,CACxB,MAAuB,EACvB,MAAc,EACd,IAAY,EACO,EAAE;IACrB,MAAM,KAAK,GAAG,MAAM,CAAC,WAAW,EAAE,CAAC;IACnC,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;QAC1B,IAAI,KAAK,CAAC,MAAM,KAAK,KAAK;YAAE,SAAS;QACrC,MAAM,CAAC,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACnC,IAAI,CAAC,CAAC;YAAE,SAAS;QACjB,MAAM,cAAc,GAA2B,EAAE,CAAC;QAClD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAChD,cAAc,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;SAChD;QACD,OAAO,EAAE,KAAK,EAAE,cAAc,EAAE,CAAC;KAClC;IACD,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAjBW,QAAA,UAAU,cAiBrB"}
|
package/dist/cjs/libs/index.d.ts
CHANGED
package/dist/cjs/libs/index.js
CHANGED
|
@@ -31,4 +31,5 @@ __exportStar(require("./strings.js"), exports);
|
|
|
31
31
|
__exportStar(require("./cookie.js"), exports);
|
|
32
32
|
__exportStar(require("./domain.js"), exports);
|
|
33
33
|
__exportStar(require("./emails.js"), exports);
|
|
34
|
+
__exportStar(require("./api-router/index.js"), exports);
|
|
34
35
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/libs/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+DAA6C;AAC7C,8CAA4B;AAC5B,6CAA2B;AAC3B,kDAAgC;AAChC,yDAAuC;AACvC,2CAAyB;AACzB,6DAA2C;AAC3C,uDAAqC;AACrC,mDAAiC;AACjC,2CAAyB;AACzB,8CAA4B;AAC5B,gDAA8B;AAC9B,+CAA6B;AAC7B,+CAA6B;AAC7B,8CAA4B;AAC5B,8CAA4B;AAC5B,8CAA4B"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/libs/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+DAA6C;AAC7C,8CAA4B;AAC5B,6CAA2B;AAC3B,kDAAgC;AAChC,yDAAuC;AACvC,2CAAyB;AACzB,6DAA2C;AAC3C,uDAAqC;AACrC,mDAAiC;AACjC,2CAAyB;AACzB,8CAA4B;AAC5B,gDAA8B;AAC9B,+CAA6B;AAC7B,+CAA6B;AAC7B,8CAA4B;AAC5B,8CAA4B;AAC5B,8CAA4B;AAC5B,wDAAsC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,173 @@
|
|
|
1
|
+
import { createPublicApiRouter } from '../../../../libs/api-router/public-api-router.js';
|
|
2
|
+
const ok = (body = { ok: true }) => ({ statusCode: 200, body: JSON.stringify(body) });
|
|
3
|
+
const baseEvent = (overrides) => {
|
|
4
|
+
const { httpMethod, proxy, ...rest } = overrides;
|
|
5
|
+
return {
|
|
6
|
+
httpMethod,
|
|
7
|
+
path: `/api/${proxy}`,
|
|
8
|
+
requestContext: {
|
|
9
|
+
authorizer: {
|
|
10
|
+
pixelId: 'px_1',
|
|
11
|
+
accountId: 'acc_1',
|
|
12
|
+
scopes: 'account:read',
|
|
13
|
+
},
|
|
14
|
+
},
|
|
15
|
+
pathParameters: { proxy },
|
|
16
|
+
queryStringParameters: null,
|
|
17
|
+
body: null,
|
|
18
|
+
...rest,
|
|
19
|
+
};
|
|
20
|
+
};
|
|
21
|
+
const ctx = { awsRequestId: 'req_1' };
|
|
22
|
+
describe('createPublicApiRouter', () => {
|
|
23
|
+
it('dispatches to the route handler for a literal path', async () => {
|
|
24
|
+
const getAccount = jest.fn().mockResolvedValue(ok());
|
|
25
|
+
const routes = [
|
|
26
|
+
{ method: 'GET', path: '/api/account', handler: getAccount },
|
|
27
|
+
];
|
|
28
|
+
const handler = createPublicApiRouter(routes);
|
|
29
|
+
const result = await handler(baseEvent({ httpMethod: 'GET', proxy: 'account' }), ctx);
|
|
30
|
+
expect(result.statusCode).toBe(200);
|
|
31
|
+
expect(getAccount).toHaveBeenCalledTimes(1);
|
|
32
|
+
});
|
|
33
|
+
it('extracts named path parameters and clears the API-GW {proxy+} placeholder', async () => {
|
|
34
|
+
const updateCog = jest.fn().mockResolvedValue(ok());
|
|
35
|
+
const routes = [
|
|
36
|
+
{ method: 'PUT', path: '/api/products/:productId/:variantId/cogs/:cogId', handler: updateCog },
|
|
37
|
+
];
|
|
38
|
+
const handler = createPublicApiRouter(routes);
|
|
39
|
+
await handler(baseEvent({
|
|
40
|
+
httpMethod: 'PUT',
|
|
41
|
+
proxy: 'products/prd_1/var_2/cogs/cog_3',
|
|
42
|
+
body: JSON.stringify({ cost: 5 }),
|
|
43
|
+
}), ctx);
|
|
44
|
+
expect(updateCog).toHaveBeenCalledTimes(1);
|
|
45
|
+
const dispatched = updateCog.mock.calls[0][0];
|
|
46
|
+
expect(dispatched.pathParameters).toEqual({
|
|
47
|
+
productId: 'prd_1',
|
|
48
|
+
variantId: 'var_2',
|
|
49
|
+
cogId: 'cog_3',
|
|
50
|
+
});
|
|
51
|
+
expect(dispatched.pathParameters?.proxy).toBeUndefined();
|
|
52
|
+
});
|
|
53
|
+
it('routes off pathParameters.proxy, not event.path (custom-domain basePath regression)', async () => {
|
|
54
|
+
const getAccount = jest.fn().mockResolvedValue(ok());
|
|
55
|
+
const routes = [
|
|
56
|
+
{ method: 'GET', path: '/api/account', handler: getAccount },
|
|
57
|
+
];
|
|
58
|
+
const handler = createPublicApiRouter(routes);
|
|
59
|
+
const event = baseEvent({ httpMethod: 'GET', proxy: 'account' });
|
|
60
|
+
event.path = '/accounts/api/account';
|
|
61
|
+
const result = await handler(event, ctx);
|
|
62
|
+
expect(result.statusCode).toBe(200);
|
|
63
|
+
expect(getAccount).toHaveBeenCalledTimes(1);
|
|
64
|
+
});
|
|
65
|
+
it('passes path params through unchanged (API GW already decoded them, no double-decode)', async () => {
|
|
66
|
+
const updateCog = jest.fn().mockResolvedValue(ok());
|
|
67
|
+
const routes = [
|
|
68
|
+
{ method: 'PUT', path: '/api/products/:productId/:variantId/cogs/:cogId', handler: updateCog },
|
|
69
|
+
];
|
|
70
|
+
const handler = createPublicApiRouter(routes);
|
|
71
|
+
await handler(baseEvent({
|
|
72
|
+
httpMethod: 'PUT',
|
|
73
|
+
proxy: 'products/prd_a/var_b/cogs/cog_c%10',
|
|
74
|
+
body: JSON.stringify({ cost: 5 }),
|
|
75
|
+
}), ctx);
|
|
76
|
+
expect(updateCog).toHaveBeenCalledTimes(1);
|
|
77
|
+
const dispatched = updateCog.mock.calls[0][0];
|
|
78
|
+
expect(dispatched.pathParameters?.cogId).toBe('cog_c%10');
|
|
79
|
+
});
|
|
80
|
+
it('returns 404 when no route matches', async () => {
|
|
81
|
+
const getAccount = jest.fn().mockResolvedValue(ok());
|
|
82
|
+
const routes = [
|
|
83
|
+
{ method: 'GET', path: '/api/account', handler: getAccount },
|
|
84
|
+
];
|
|
85
|
+
const handler = createPublicApiRouter(routes);
|
|
86
|
+
const result = await handler(baseEvent({ httpMethod: 'GET', proxy: 'nope' }), ctx);
|
|
87
|
+
expect(result.statusCode).toBe(404);
|
|
88
|
+
expect(getAccount).not.toHaveBeenCalled();
|
|
89
|
+
});
|
|
90
|
+
it('does not log a 404 at error level (avoids double-log + false-positive error alerts)', async () => {
|
|
91
|
+
const loggingHelper = await import('../../../../helpers/logging-helper.js');
|
|
92
|
+
const errorSpy = jest.spyOn(loggingHelper.Logger, 'error').mockImplementation(() => undefined);
|
|
93
|
+
const warnSpy = jest.spyOn(loggingHelper.Logger, 'warn').mockImplementation(() => undefined);
|
|
94
|
+
try {
|
|
95
|
+
const routes = [
|
|
96
|
+
{ method: 'GET', path: '/api/account', handler: jest.fn().mockResolvedValue(ok()) },
|
|
97
|
+
];
|
|
98
|
+
const handler = createPublicApiRouter(routes);
|
|
99
|
+
const result = await handler(baseEvent({ httpMethod: 'GET', proxy: 'nope' }), ctx);
|
|
100
|
+
expect(result.statusCode).toBe(404);
|
|
101
|
+
expect(warnSpy).toHaveBeenCalledTimes(1);
|
|
102
|
+
expect(errorSpy).not.toHaveBeenCalled();
|
|
103
|
+
}
|
|
104
|
+
finally {
|
|
105
|
+
errorSpy.mockRestore();
|
|
106
|
+
warnSpy.mockRestore();
|
|
107
|
+
}
|
|
108
|
+
});
|
|
109
|
+
it('handles OPTIONS preflight without invoking any downstream handler', async () => {
|
|
110
|
+
const getAccount = jest.fn().mockResolvedValue(ok());
|
|
111
|
+
const routes = [
|
|
112
|
+
{ method: 'GET', path: '/api/account', handler: getAccount },
|
|
113
|
+
];
|
|
114
|
+
const handler = createPublicApiRouter(routes);
|
|
115
|
+
const result = await handler(baseEvent({ httpMethod: 'OPTIONS', proxy: 'account' }), ctx);
|
|
116
|
+
expect(result.statusCode).toBe(200);
|
|
117
|
+
expect(getAccount).not.toHaveBeenCalled();
|
|
118
|
+
});
|
|
119
|
+
it('treats OPTIONS case-insensitively (matches matchRoute method-case contract)', async () => {
|
|
120
|
+
const getAccount = jest.fn().mockResolvedValue(ok());
|
|
121
|
+
const routes = [
|
|
122
|
+
{ method: 'GET', path: '/api/account', handler: getAccount },
|
|
123
|
+
];
|
|
124
|
+
const handler = createPublicApiRouter(routes);
|
|
125
|
+
const result = await handler(baseEvent({ httpMethod: 'options', proxy: 'account' }), ctx);
|
|
126
|
+
expect(result.statusCode).toBe(200);
|
|
127
|
+
expect(getAccount).not.toHaveBeenCalled();
|
|
128
|
+
});
|
|
129
|
+
it('preserves the request body when dispatching', async () => {
|
|
130
|
+
const updateCog = jest.fn().mockResolvedValue(ok());
|
|
131
|
+
const routes = [
|
|
132
|
+
{ method: 'PUT', path: '/api/products/:productId/:variantId/cogs/:cogId', handler: updateCog },
|
|
133
|
+
];
|
|
134
|
+
const handler = createPublicApiRouter(routes);
|
|
135
|
+
await handler(baseEvent({
|
|
136
|
+
httpMethod: 'PUT',
|
|
137
|
+
proxy: 'products/prd_1/var_2/cogs/cog_3',
|
|
138
|
+
body: JSON.stringify({ cost: 7 }),
|
|
139
|
+
}), ctx);
|
|
140
|
+
const dispatched = updateCog.mock.calls[0][0];
|
|
141
|
+
expect(dispatched.body).toBe(JSON.stringify({ cost: 7 }));
|
|
142
|
+
});
|
|
143
|
+
it('preserves the authorizer context when dispatching', async () => {
|
|
144
|
+
const getAccount = jest.fn().mockResolvedValue(ok());
|
|
145
|
+
const routes = [
|
|
146
|
+
{ method: 'GET', path: '/api/account', handler: getAccount },
|
|
147
|
+
];
|
|
148
|
+
const handler = createPublicApiRouter(routes);
|
|
149
|
+
await handler(baseEvent({ httpMethod: 'GET', proxy: 'account' }), ctx);
|
|
150
|
+
const dispatched = getAccount.mock.calls[0][0];
|
|
151
|
+
expect(dispatched.requestContext.authorizer?.pixelId).toBe('px_1');
|
|
152
|
+
expect(dispatched.requestContext.authorizer?.scopes).toContain('account:read');
|
|
153
|
+
});
|
|
154
|
+
it('compiles routes once at factory call, not per-request', async () => {
|
|
155
|
+
const h = jest.fn().mockResolvedValue(ok());
|
|
156
|
+
const routes = [{ method: 'GET', path: '/api/x', handler: h }];
|
|
157
|
+
const handler = createPublicApiRouter(routes);
|
|
158
|
+
await handler(baseEvent({ httpMethod: 'GET', proxy: 'x' }), ctx);
|
|
159
|
+
await handler(baseEvent({ httpMethod: 'GET', proxy: 'x' }), ctx);
|
|
160
|
+
expect(h).toHaveBeenCalledTimes(2);
|
|
161
|
+
});
|
|
162
|
+
it('returns failure() envelope when the downstream handler throws', async () => {
|
|
163
|
+
const broken = jest.fn().mockRejectedValue(new Error('boom'));
|
|
164
|
+
const routes = [
|
|
165
|
+
{ method: 'GET', path: '/api/broken', handler: broken },
|
|
166
|
+
];
|
|
167
|
+
const handler = createPublicApiRouter(routes);
|
|
168
|
+
const result = await handler(baseEvent({ httpMethod: 'GET', proxy: 'broken' }), ctx);
|
|
169
|
+
expect(result.statusCode).toBeGreaterThanOrEqual(400);
|
|
170
|
+
expect(broken).toHaveBeenCalledTimes(1);
|
|
171
|
+
});
|
|
172
|
+
});
|
|
173
|
+
//# sourceMappingURL=public-api-router.spec.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"public-api-router.spec.js","sourceRoot":"","sources":["../../../../../../src/__tests__/unit/libs/api-router/public-api-router.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,68 @@
|
|
|
1
|
+
import { compileRoutes, matchRoute } from '../../../../libs/api-router/route-matcher.js';
|
|
2
|
+
const noop = async () => ({ statusCode: 200, body: '{}' });
|
|
3
|
+
const defs = [
|
|
4
|
+
{ method: 'GET', path: '/api/account', handler: noop },
|
|
5
|
+
{ method: 'PATCH', path: '/api/account', handler: noop },
|
|
6
|
+
{ method: 'GET', path: '/api/account/settings/order', handler: noop },
|
|
7
|
+
{ method: 'PUT', path: '/api/account/settings/order', handler: noop },
|
|
8
|
+
{ method: 'GET', path: '/api/products/search', handler: noop },
|
|
9
|
+
{ method: 'GET', path: '/api/products/:productId/:variantId/cost', handler: noop },
|
|
10
|
+
{ method: 'POST', path: '/api/products/:productId/:variantId/cogs', handler: noop },
|
|
11
|
+
{ method: 'PUT', path: '/api/products/:productId/:variantId/cogs/:cogId', handler: noop },
|
|
12
|
+
{ method: 'DELETE', path: '/api/products/:productId/:variantId/cogs/:cogId', handler: noop },
|
|
13
|
+
{ method: 'POST', path: '/api/dashboard/views/from-preset', handler: noop },
|
|
14
|
+
{ method: 'POST', path: '/api/dashboard/views/:dashboardViewId/copy', handler: noop },
|
|
15
|
+
{ method: 'GET', path: '/api/dashboard/views/:dashboardViewId', handler: noop },
|
|
16
|
+
];
|
|
17
|
+
const compiled = compileRoutes(defs);
|
|
18
|
+
describe('matchRoute', () => {
|
|
19
|
+
it('matches a literal static route', () => {
|
|
20
|
+
const m = matchRoute(compiled, 'GET', '/api/account');
|
|
21
|
+
expect(m?.route.path).toBe('/api/account');
|
|
22
|
+
expect(m?.pathParameters).toEqual({});
|
|
23
|
+
});
|
|
24
|
+
it('discriminates by method on the same path', () => {
|
|
25
|
+
expect(matchRoute(compiled, 'GET', '/api/account')?.route.path).toBe('/api/account');
|
|
26
|
+
expect(matchRoute(compiled, 'PATCH', '/api/account')?.route.path).toBe('/api/account');
|
|
27
|
+
});
|
|
28
|
+
it('extracts named path parameters', () => {
|
|
29
|
+
const m = matchRoute(compiled, 'PUT', '/api/products/prd_1/var_2/cogs/cog_3');
|
|
30
|
+
expect(m?.pathParameters).toEqual({ productId: 'prd_1', variantId: 'var_2', cogId: 'cog_3' });
|
|
31
|
+
});
|
|
32
|
+
it('prefers an earlier literal route over a later wildcard (search vs :productId)', () => {
|
|
33
|
+
const m = matchRoute(compiled, 'GET', '/api/products/search');
|
|
34
|
+
expect(m?.route.path).toBe('/api/products/search');
|
|
35
|
+
expect(m?.pathParameters).toEqual({});
|
|
36
|
+
});
|
|
37
|
+
it('prefers an earlier literal route over a later wildcard (from-preset vs :dashboardViewId)', () => {
|
|
38
|
+
const m = matchRoute(compiled, 'POST', '/api/dashboard/views/from-preset');
|
|
39
|
+
expect(m?.route.path).toBe('/api/dashboard/views/from-preset');
|
|
40
|
+
});
|
|
41
|
+
it('returns RAW (still-encoded) path params — decoding is the caller’s responsibility', () => {
|
|
42
|
+
const m = matchRoute(compiled, 'GET', '/api/products/prd%20space/var_2/cost');
|
|
43
|
+
expect(m?.pathParameters.productId).toBe('prd%20space');
|
|
44
|
+
});
|
|
45
|
+
it('does not throw on malformed percent-encoding (matcher stays pure)', () => {
|
|
46
|
+
expect(() => matchRoute(compiled, 'GET', '/api/products/%ZZ/var_2/cost')).not.toThrow();
|
|
47
|
+
});
|
|
48
|
+
it('accepts and ignores a trailing slash', () => {
|
|
49
|
+
const m = matchRoute(compiled, 'GET', '/api/account/');
|
|
50
|
+
expect(m?.route.path).toBe('/api/account');
|
|
51
|
+
});
|
|
52
|
+
it('returns null when path does not match any route', () => {
|
|
53
|
+
expect(matchRoute(compiled, 'GET', '/api/unknown')).toBeNull();
|
|
54
|
+
});
|
|
55
|
+
it('returns null when method does not match a registered path', () => {
|
|
56
|
+
expect(matchRoute(compiled, 'DELETE', '/api/account')).toBeNull();
|
|
57
|
+
});
|
|
58
|
+
it('treats methods case-insensitively', () => {
|
|
59
|
+
expect(matchRoute(compiled, 'get', '/api/account')?.route.path).toBe('/api/account');
|
|
60
|
+
});
|
|
61
|
+
it('does not match a partial path (no greedy fallthrough)', () => {
|
|
62
|
+
expect(matchRoute(compiled, 'GET', '/api/account/extra')).toBeNull();
|
|
63
|
+
});
|
|
64
|
+
it('does not let a wildcard segment swallow a slash', () => {
|
|
65
|
+
expect(matchRoute(compiled, 'POST', '/api/products/foo/bar/baz/cogs')).toBeNull();
|
|
66
|
+
});
|
|
67
|
+
});
|
|
68
|
+
//# sourceMappingURL=route-matcher.spec.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"route-matcher.spec.js","sourceRoot":"","sources":["../../../../../../src/__tests__/unit/libs/api-router/route-matcher.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/libs/api-router/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,wBAAwB,CAAC"}
|
|
@@ -0,0 +1,3 @@
|
|
|
1
|
+
import type { APIGatewayProxyResult, Context } from 'aws-lambda';
|
|
2
|
+
import { type RouteDef } from './route-matcher.js';
|
|
3
|
+
export declare const createPublicApiRouter: (routes: RouteDef[]) => (event: import("aws-lambda").APIGatewayProxyEvent, context: Context) => Promise<APIGatewayProxyResult>;
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
import { configureLogger, Logger } from '../../helpers/logging-helper.js';
|
|
2
|
+
import { success, failure } from '../../helpers/response-helper.js';
|
|
3
|
+
import { HttpError } from '../http-error.js';
|
|
4
|
+
import { compileRoutes, matchRoute } from './route-matcher.js';
|
|
5
|
+
export const createPublicApiRouter = (routes) => {
|
|
6
|
+
const compiled = compileRoutes(routes);
|
|
7
|
+
return async function handler(event, context) {
|
|
8
|
+
try {
|
|
9
|
+
configureLogger(event, context);
|
|
10
|
+
const method = event.httpMethod.toUpperCase();
|
|
11
|
+
if (method === 'OPTIONS') {
|
|
12
|
+
return success({});
|
|
13
|
+
}
|
|
14
|
+
const proxy = event.pathParameters?.proxy ?? '';
|
|
15
|
+
const path = `/api/${proxy}`.replace(/\/+$/, '') || '/api';
|
|
16
|
+
const match = matchRoute(compiled, method, path);
|
|
17
|
+
if (!match) {
|
|
18
|
+
Logger.warn('PublicApiRouter: no route matched', { method, path, rawPath: event.path });
|
|
19
|
+
return failure(HttpError.notFound(`No route for ${method} ${path}`));
|
|
20
|
+
}
|
|
21
|
+
const enrichedEvent = {
|
|
22
|
+
...event,
|
|
23
|
+
pathParameters: { ...match.pathParameters },
|
|
24
|
+
};
|
|
25
|
+
return await match.route.handler(enrichedEvent, context);
|
|
26
|
+
}
|
|
27
|
+
catch (error) {
|
|
28
|
+
Logger.error('PublicApiRouter: failed', { error });
|
|
29
|
+
return failure(error);
|
|
30
|
+
}
|
|
31
|
+
};
|
|
32
|
+
};
|
|
33
|
+
//# sourceMappingURL=public-api-router.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"public-api-router.js","sourceRoot":"","sources":["../../../../src/libs/api-router/public-api-router.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,iCAAiC,CAAC;AAC1E,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,kCAAkC,CAAC;AACpE,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,UAAU,EAAiB,MAAM,oBAAoB,CAAC;AAyB9E,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,MAAkB,EAAE,EAAE;IAC1D,MAAM,QAAQ,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC;IAEvC,OAAO,KAAK,UAAU,OAAO,CAAC,KAAsB,EAAE,OAAgB;QACpE,IAAI;YACF,eAAe,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;YAMhC,MAAM,MAAM,GAAG,KAAK,CAAC,UAAU,CAAC,WAAW,EAAE,CAAC;YAE9C,IAAI,MAAM,KAAK,SAAS,EAAE;gBACxB,OAAO,OAAO,CAAC,EAAE,CAAC,CAAC;aACpB;YAED,MAAM,KAAK,GAAG,KAAK,CAAC,cAAc,EAAE,KAAK,IAAI,EAAE,CAAC;YAChD,MAAM,IAAI,GAAG,QAAQ,KAAK,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,MAAM,CAAC;YAE3D,MAAM,KAAK,GAAG,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;YACjD,IAAI,CAAC,KAAK,EAAE;gBAMV,MAAM,CAAC,IAAI,CAAC,mCAAmC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;gBACxF,OAAO,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,gBAAgB,MAAM,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC;aACtE;YAED,MAAM,aAAa,GAAoB;gBACrC,GAAG,KAAK;gBACR,cAAc,EAAE,EAAE,GAAG,KAAK,CAAC,cAAc,EAAE;aAC5C,CAAC;YAEF,OAAO,MAAM,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;SAC1D;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,CAAC,KAAK,CAAC,yBAAyB,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;YACnD,OAAO,OAAO,CAAC,KAAK,CAAC,CAAC;SACvB;IACH,CAAC,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
import type { APIGatewayEvent, APIGatewayProxyResult, Context } from 'aws-lambda';
|
|
2
|
+
export type ApiHandler = (event: APIGatewayEvent, context: Context) => Promise<APIGatewayProxyResult>;
|
|
3
|
+
export interface RouteDef {
|
|
4
|
+
method: string;
|
|
5
|
+
path: string;
|
|
6
|
+
handler: ApiHandler;
|
|
7
|
+
}
|
|
8
|
+
export interface CompiledRoute {
|
|
9
|
+
method: string;
|
|
10
|
+
path: string;
|
|
11
|
+
paramNames: string[];
|
|
12
|
+
pattern: RegExp;
|
|
13
|
+
handler: ApiHandler;
|
|
14
|
+
}
|
|
15
|
+
export interface RouteMatch {
|
|
16
|
+
route: CompiledRoute;
|
|
17
|
+
pathParameters: Record<string, string>;
|
|
18
|
+
}
|
|
19
|
+
export declare const compileRoute: (def: RouteDef) => CompiledRoute;
|
|
20
|
+
export declare const compileRoutes: (defs: RouteDef[]) => CompiledRoute[];
|
|
21
|
+
export declare const matchRoute: (routes: CompiledRoute[], method: string, path: string) => RouteMatch | null;
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
const escapeRegex = (s) => s.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
|
|
2
|
+
export const compileRoute = (def) => {
|
|
3
|
+
const paramNames = [];
|
|
4
|
+
const segments = def.path.split('/').map(seg => {
|
|
5
|
+
if (seg.startsWith(':')) {
|
|
6
|
+
paramNames.push(seg.slice(1));
|
|
7
|
+
return '([^/]+)';
|
|
8
|
+
}
|
|
9
|
+
return escapeRegex(seg);
|
|
10
|
+
});
|
|
11
|
+
const pattern = new RegExp('^' + segments.join('/') + '/?$');
|
|
12
|
+
return { method: def.method.toUpperCase(), path: def.path, paramNames, pattern, handler: def.handler };
|
|
13
|
+
};
|
|
14
|
+
export const compileRoutes = (defs) => defs.map(compileRoute);
|
|
15
|
+
export const matchRoute = (routes, method, path) => {
|
|
16
|
+
const upper = method.toUpperCase();
|
|
17
|
+
for (const route of routes) {
|
|
18
|
+
if (route.method !== upper)
|
|
19
|
+
continue;
|
|
20
|
+
const m = route.pattern.exec(path);
|
|
21
|
+
if (!m)
|
|
22
|
+
continue;
|
|
23
|
+
const pathParameters = {};
|
|
24
|
+
for (let i = 0; i < route.paramNames.length; i++) {
|
|
25
|
+
pathParameters[route.paramNames[i]] = m[i + 1];
|
|
26
|
+
}
|
|
27
|
+
return { route, pathParameters };
|
|
28
|
+
}
|
|
29
|
+
return null;
|
|
30
|
+
};
|
|
31
|
+
//# sourceMappingURL=route-matcher.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"route-matcher.js","sourceRoot":"","sources":["../../../../src/libs/api-router/route-matcher.ts"],"names":[],"mappings":"AA2BA,MAAM,WAAW,GAAG,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,qBAAqB,EAAE,MAAM,CAAC,CAAC;AAE5E,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,GAAa,EAAiB,EAAE;IAC3D,MAAM,UAAU,GAAa,EAAE,CAAC;IAChC,MAAM,QAAQ,GAAG,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;QAC7C,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;YACvB,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YAC9B,OAAO,SAAS,CAAC;SAClB;QACD,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC;IAC1B,CAAC,CAAC,CAAC;IACH,MAAM,OAAO,GAAG,IAAI,MAAM,CAAC,GAAG,GAAG,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC;IAC7D,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,WAAW,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC;AACzG,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,IAAgB,EAAmB,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;AAe3F,MAAM,CAAC,MAAM,UAAU,GAAG,CACxB,MAAuB,EACvB,MAAc,EACd,IAAY,EACO,EAAE;IACrB,MAAM,KAAK,GAAG,MAAM,CAAC,WAAW,EAAE,CAAC;IACnC,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;QAC1B,IAAI,KAAK,CAAC,MAAM,KAAK,KAAK;YAAE,SAAS;QACrC,MAAM,CAAC,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACnC,IAAI,CAAC,CAAC;YAAE,SAAS;QACjB,MAAM,cAAc,GAA2B,EAAE,CAAC;QAClD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAChD,cAAc,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;SAChD;QACD,OAAO,EAAE,KAAK,EAAE,cAAc,EAAE,CAAC;KAClC;IACD,OAAO,IAAI,CAAC;AACd,CAAC,CAAC"}
|
package/dist/esm/libs/index.d.ts
CHANGED
package/dist/esm/libs/index.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/libs/index.ts"],"names":[],"mappings":"AAAA,cAAc,8BAA8B,CAAC;AAC7C,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC;AAC3B,cAAc,iBAAiB,CAAC;AAChC,cAAc,wBAAwB,CAAC;AACvC,cAAc,UAAU,CAAC;AACzB,cAAc,4BAA4B,CAAC;AAC3C,cAAc,sBAAsB,CAAC;AACrC,cAAc,kBAAkB,CAAC;AACjC,cAAc,UAAU,CAAC;AACzB,cAAc,aAAa,CAAC;AAC5B,cAAc,eAAe,CAAC;AAC9B,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/libs/index.ts"],"names":[],"mappings":"AAAA,cAAc,8BAA8B,CAAC;AAC7C,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC;AAC3B,cAAc,iBAAiB,CAAC;AAChC,cAAc,wBAAwB,CAAC;AACvC,cAAc,UAAU,CAAC;AACzB,cAAc,4BAA4B,CAAC;AAC3C,cAAc,sBAAsB,CAAC;AACrC,cAAc,kBAAkB,CAAC;AACjC,cAAc,UAAU,CAAC;AACzB,cAAc,aAAa,CAAC;AAC5B,cAAc,eAAe,CAAC;AAC9B,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,uBAAuB,CAAC"}
|