@adaptivestone/framework 5.4.0 → 5.4.1
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/AGENTS.md +21 -0
- package/CHANGELOG.md +32 -0
- package/README.md +37 -0
- package/dist/codegen/astExtract.js +6 -1
- package/dist/codegen/astExtract.js.map +1 -1
- package/dist/codegen/emit.js +27 -26
- package/dist/codegen/emit.js.map +1 -1
- package/dist/config/auth.d.ts +4 -0
- package/dist/config/auth.js +2 -0
- package/dist/config/auth.js.map +1 -1
- package/dist/controllers/Auth.js +40 -32
- package/dist/controllers/Auth.js.map +1 -1
- package/dist/controllers/Auth.routes.gen.d.ts +18 -32
- package/dist/controllers/Home.routes.gen.d.ts +2 -4
- package/dist/controllers/index.js +4 -4
- package/dist/controllers/index.js.map +1 -1
- package/dist/models/User.d.ts +5 -11
- package/dist/models/User.js +8 -3
- package/dist/models/User.js.map +1 -1
- package/dist/models/UserOld.d.ts +3 -9
- package/dist/models/UserOld.js.map +1 -1
- package/dist/modules/BaseModel.d.ts +160 -58
- package/dist/modules/BaseModel.js.map +1 -1
- package/dist/server.d.ts +13 -3
- package/dist/server.js +2 -0
- package/dist/server.js.map +1 -1
- package/dist/services/cache/Cache.js +14 -7
- package/dist/services/cache/Cache.js.map +1 -1
- package/dist/services/http/HttpServer.d.ts +2 -5
- package/dist/services/http/HttpServer.js.map +1 -1
- package/dist/services/http/middleware/RateLimiter.js +9 -1
- package/dist/services/http/middleware/RateLimiter.js.map +1 -1
- package/dist/services/http/middleware/RequestParser.js +35 -16
- package/dist/services/http/middleware/RequestParser.js.map +1 -1
- package/dist/services/http/routing/ExpressAdapter.js +17 -1
- package/dist/services/http/routing/ExpressAdapter.js.map +1 -1
- package/dist/services/http/routing/match.d.ts +1 -0
- package/dist/services/http/routing/match.js +9 -1
- package/dist/services/http/routing/match.js.map +1 -1
- package/dist/services/http/types.d.ts +70 -5
- package/dist/services/i18n/I18n.d.ts +5 -11
- package/dist/services/i18n/I18n.js +3 -2
- package/dist/services/i18n/I18n.js.map +1 -1
- package/dist/services/i18n/types.d.ts +44 -0
- package/dist/services/i18n/types.js +2 -0
- package/dist/services/i18n/types.js.map +1 -0
- package/dist/services/validate/ValidateService.d.ts +2 -2
- package/dist/services/validate/ValidateService.js.map +1 -1
- package/dist/services/validate/mergeValidatedOutputs.d.ts +19 -0
- package/dist/services/validate/mergeValidatedOutputs.js +43 -0
- package/dist/services/validate/mergeValidatedOutputs.js.map +1 -0
- package/dist/tests/testHelpers.d.ts +4 -12
- package/package.json +3 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RateLimiter.js","sourceRoot":"","sources":["../../../../src/services/http/middleware/RateLimiter.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"RateLimiter.js","sourceRoot":"","sources":["../../../../src/services/http/middleware/RateLimiter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { unlink } from 'node:fs/promises';
|
|
2
|
-
import formidable from 'formidable';
|
|
2
|
+
import formidable, { json, multipart, octetstream, querystring, } from 'formidable';
|
|
3
|
+
import { normalizeContentType } from '../../validate/contentType.js';
|
|
3
4
|
import AbstractMiddleware from './AbstractMiddleware.js';
|
|
4
5
|
/**
|
|
5
6
|
* Parses multipart / urlencoded / json request bodies (via formidable) into
|
|
@@ -18,13 +19,25 @@ class RequestParser extends AbstractMiddleware {
|
|
|
18
19
|
const { requestParser } = this.app.getConfig('http');
|
|
19
20
|
// Config defaults bound unauthenticated uploads; explicit per-mount params win.
|
|
20
21
|
const parserOptions = { ...requestParser, ...this.params };
|
|
21
|
-
const
|
|
22
|
-
|
|
23
|
-
//
|
|
24
|
-
//
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
22
|
+
const mediaType = normalizeContentType(req.headers?.['content-type']);
|
|
23
|
+
const isMultipart = mediaType === 'multipart/form-data' || mediaType === 'multipart/related';
|
|
24
|
+
// Formidable's default plugins inspect the entire header. Select one for
|
|
25
|
+
// known media types so parameter text cannot switch the parser.
|
|
26
|
+
const plugin = isMultipart
|
|
27
|
+
? multipart
|
|
28
|
+
: mediaType === 'application/json' || mediaType?.endsWith('+json')
|
|
29
|
+
? json
|
|
30
|
+
: mediaType === 'application/x-www-form-urlencoded'
|
|
31
|
+
? querystring
|
|
32
|
+
: mediaType === 'application/octet-stream'
|
|
33
|
+
? octetstream
|
|
34
|
+
: undefined;
|
|
35
|
+
const form = formidable({
|
|
36
|
+
...parserOptions,
|
|
37
|
+
...(plugin ? { enabledPlugins: [plugin] } : {}),
|
|
38
|
+
});
|
|
39
|
+
// JSON/urlencoded parsing buffers the body; multipart has its own field
|
|
40
|
+
// and file limits. Unknown media types retain the v5 fallback, bounded below.
|
|
28
41
|
const maxBodySize = typeof parserOptions.maxFieldsSize === 'number'
|
|
29
42
|
? parserOptions.maxFieldsSize
|
|
30
43
|
: 2 * 1024 * 1024;
|
|
@@ -37,15 +50,16 @@ class RequestParser extends AbstractMiddleware {
|
|
|
37
50
|
message: this.translate(req, 'middleware.requestParser.entityTooLarge', 'Request entity too large. Your upload exceeds the allowed size or count limits.'),
|
|
38
51
|
});
|
|
39
52
|
}
|
|
40
|
-
// Guard the streaming path too (chunked / absent Content-Length): abort as
|
|
41
|
-
// soon as the running byte count crosses the ceiling.
|
|
42
|
-
form.on('progress', (bytesReceived) => {
|
|
43
|
-
if (bytesReceived > maxBodySize) {
|
|
44
|
-
bodyTooLarge = true;
|
|
45
|
-
req.destroy();
|
|
46
|
-
}
|
|
47
|
-
});
|
|
48
53
|
}
|
|
54
|
+
// Also guard chunked bodies. Only a genuinely selected multipart parser
|
|
55
|
+
// may rely on the separate file/field limits.
|
|
56
|
+
form.on('progress', (bytesReceived) => {
|
|
57
|
+
if (form.type !== 'multipart' &&
|
|
58
|
+
bytesReceived > maxBodySize) {
|
|
59
|
+
bodyTooLarge = true;
|
|
60
|
+
req.destroy();
|
|
61
|
+
}
|
|
62
|
+
});
|
|
49
63
|
// Track every temp file formidable opens (via fileBegin, so a file that
|
|
50
64
|
// later errors mid-write is tracked too) and unlink them once the response
|
|
51
65
|
// is done — on 'finish' (success) and 'close' (aborted). Without this,
|
|
@@ -70,6 +84,11 @@ class RequestParser extends AbstractMiddleware {
|
|
|
70
84
|
let files;
|
|
71
85
|
try {
|
|
72
86
|
[fields, files] = await form.parse(req);
|
|
87
|
+
// Destroying the stream cannot cancel a chunk already inside the parser.
|
|
88
|
+
// Even if that chunk completes parsing, an oversized body must not advance.
|
|
89
|
+
if (bodyTooLarge) {
|
|
90
|
+
throw new Error('Request body exceeds maxFieldsSize');
|
|
91
|
+
}
|
|
73
92
|
}
|
|
74
93
|
catch (err) {
|
|
75
94
|
this.logger?.error(`Parsing failed ${err}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RequestParser.js","sourceRoot":"","sources":["../../../../src/services/http/middleware/RequestParser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE1C,OAAO,UAAU,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"RequestParser.js","sourceRoot":"","sources":["../../../../src/services/http/middleware/RequestParser.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,9 +5,12 @@
|
|
|
5
5
|
* Middleware instances are cached by `MiddlewareEntry` identity (WeakMap)
|
|
6
6
|
* — each entry is constructed once on first request and reused thereafter.
|
|
7
7
|
*/
|
|
8
|
-
import { MalformedPathError } from './match.js';
|
|
8
|
+
import { getMatchedNode, MalformedPathError } from './match.js';
|
|
9
9
|
const instanceCache = new WeakMap();
|
|
10
10
|
export function createExpressAdapter(registry, app) {
|
|
11
|
+
const routeTemplates = new WeakMap();
|
|
12
|
+
const indexTemplates = () => registry.walk((node, path) => routeTemplates.set(node, path));
|
|
13
|
+
indexTemplates();
|
|
11
14
|
return async function dispatch(req, res, next) {
|
|
12
15
|
let result;
|
|
13
16
|
try {
|
|
@@ -32,6 +35,19 @@ export function createExpressAdapter(registry, app) {
|
|
|
32
35
|
}
|
|
33
36
|
// Populate request with match metadata before middleware runs.
|
|
34
37
|
req.params = result.params;
|
|
38
|
+
// Follow Express's registered-template convention. Refresh on a miss for
|
|
39
|
+
// routes added after mounting; ordinary dispatch stays O(1).
|
|
40
|
+
const matchedNode = getMatchedNode(result);
|
|
41
|
+
if (matchedNode && !routeTemplates.has(matchedNode)) {
|
|
42
|
+
indexTemplates();
|
|
43
|
+
}
|
|
44
|
+
req.route = {
|
|
45
|
+
path: matchedNode ? routeTemplates.get(matchedNode) : 'unmatched',
|
|
46
|
+
methods: Object.fromEntries(Object.keys(matchedNode?.methods ?? {}).map((method) => [
|
|
47
|
+
method.toLowerCase(),
|
|
48
|
+
true,
|
|
49
|
+
])),
|
|
50
|
+
};
|
|
35
51
|
// biome-ignore lint/suspicious/noExplicitAny: routeMeta is a runtime extension on req
|
|
36
52
|
req.routeMeta = {
|
|
37
53
|
bodyParsing: result.bodyParsing,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ExpressAdapter.js","sourceRoot":"","sources":["../../../../src/services/http/routing/ExpressAdapter.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAKH,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"ExpressAdapter.js","sourceRoot":"","sources":["../../../../src/services/http/routing/ExpressAdapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,6 +18,7 @@
|
|
|
18
18
|
* `/users/:id` even when `/users/me/avatar` created a method-less `me` node).
|
|
19
19
|
*/
|
|
20
20
|
import type { MatchResult, RouteNode } from './RouteNode.ts';
|
|
21
|
+
export declare function getMatchedNode(result: MatchResult): RouteNode | undefined;
|
|
21
22
|
/** Thrown when a path contains a malformed `%XX` sequence. */
|
|
22
23
|
export declare class MalformedPathError extends Error {
|
|
23
24
|
readonly statusCode = 400;
|
|
@@ -17,6 +17,12 @@
|
|
|
17
17
|
* and backtracks to param/splat siblings (so `/users/me` still matches
|
|
18
18
|
* `/users/:id` even when `/users/me/avatar` created a method-less `me` node).
|
|
19
19
|
*/
|
|
20
|
+
// Runtime adapter metadata, separate from the public match-result contract.
|
|
21
|
+
// Nodes identify routes even when callers reuse one handler entry at many paths.
|
|
22
|
+
const matchedNodes = new WeakMap();
|
|
23
|
+
export function getMatchedNode(result) {
|
|
24
|
+
return matchedNodes.get(result);
|
|
25
|
+
}
|
|
20
26
|
/** Thrown when a path contains a malformed `%XX` sequence. */
|
|
21
27
|
export class MalformedPathError extends Error {
|
|
22
28
|
statusCode = 400;
|
|
@@ -58,7 +64,7 @@ export function match(root, method, path) {
|
|
|
58
64
|
params[handler.paramNames[i]] = result.paramValues[i];
|
|
59
65
|
}
|
|
60
66
|
}
|
|
61
|
-
|
|
67
|
+
const matched = {
|
|
62
68
|
entry: handler,
|
|
63
69
|
allowedMethods,
|
|
64
70
|
middlewares: handler
|
|
@@ -67,6 +73,8 @@ export function match(root, method, path) {
|
|
|
67
73
|
params,
|
|
68
74
|
bodyParsing: handler?.bodyParsing ?? result.bodyParsing ?? 'parsed',
|
|
69
75
|
};
|
|
76
|
+
matchedNodes.set(matched, result.node);
|
|
77
|
+
return matched;
|
|
70
78
|
}
|
|
71
79
|
function nodeHasMethods(node) {
|
|
72
80
|
return !!node.methods && Object.keys(node.methods).length > 0;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"match.js","sourceRoot":"","sources":["../../../../src/services/http/routing/match.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAWH,8DAA8D;AAC9D,MAAM,OAAO,kBAAmB,SAAQ,KAAK;IAClC,UAAU,GAAG,GAAG,CAAC;IAC1B,YAAY,OAAe;QACzB,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,oBAAoB,CAAC;IACnC,CAAC;CACF;AAUD;;;;GAIG;AACH,MAAM,UAAU,KAAK,CACnB,IAAe,EACf,MAAc,EACd,IAAY;IAEZ,MAAM,QAAQ,GAAG,MAAM,CAAC,WAAW,EAAgB,CAAC;IACpD,MAAM,QAAQ,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC;IAEtC,8EAA8E;IAC9E,sEAAsE;IACtE,IAAI,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC;QAC1B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,SAAS,CAAC,CAAC;IAC9D,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;IACpC,IAAI,CAAC,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAClD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,OAAO,GAAG,cAAc,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IAClD,MAAM,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAiB,CAAC;IAC5D,IAAI,OAAO,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;QACjC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC9B,CAAC;IAED,IAAI,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;IAC3B,IAAI,OAAO,EAAE,UAAU,IAAI,MAAM,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACzD,MAAM,GAAG,EAAE,CAAC;QACZ,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACnD,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAW,CAAC,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC,CAAW,CAAC;QAC5E,CAAC;IACH,CAAC;IAED,OAAO;
|
|
1
|
+
{"version":3,"file":"match.js","sourceRoot":"","sources":["../../../../src/services/http/routing/match.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAWH,4EAA4E;AAC5E,iFAAiF;AACjF,MAAM,YAAY,GAAG,IAAI,OAAO,EAA0B,CAAC;AAE3D,MAAM,UAAU,cAAc,CAAC,MAAmB;IAChD,OAAO,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AAClC,CAAC;AAED,8DAA8D;AAC9D,MAAM,OAAO,kBAAmB,SAAQ,KAAK;IAClC,UAAU,GAAG,GAAG,CAAC;IAC1B,YAAY,OAAe;QACzB,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,oBAAoB,CAAC;IACnC,CAAC;CACF;AAUD;;;;GAIG;AACH,MAAM,UAAU,KAAK,CACnB,IAAe,EACf,MAAc,EACd,IAAY;IAEZ,MAAM,QAAQ,GAAG,MAAM,CAAC,WAAW,EAAgB,CAAC;IACpD,MAAM,QAAQ,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC;IAEtC,8EAA8E;IAC9E,sEAAsE;IACtE,IAAI,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC;QAC1B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,SAAS,CAAC,CAAC;IAC9D,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;IACpC,IAAI,CAAC,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAClD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,OAAO,GAAG,cAAc,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IAClD,MAAM,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAiB,CAAC;IAC5D,IAAI,OAAO,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;QACjC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC9B,CAAC;IAED,IAAI,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;IAC3B,IAAI,OAAO,EAAE,UAAU,IAAI,MAAM,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACzD,MAAM,GAAG,EAAE,CAAC;QACZ,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACnD,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAW,CAAC,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC,CAAW,CAAC;QAC5E,CAAC;IACH,CAAC;IAED,MAAM,OAAO,GAAgB;QAC3B,KAAK,EAAE,OAAO;QACd,cAAc;QACd,WAAW,EAAE,OAAO;YAClB,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,WAAW,EAAE,GAAG,CAAC,OAAO,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC;YACzD,CAAC,CAAC,MAAM,CAAC,WAAW;QACtB,MAAM;QACN,WAAW,EAAE,OAAO,EAAE,WAAW,IAAI,MAAM,CAAC,WAAW,IAAI,QAAQ;KACpE,CAAC;IACF,YAAY,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;IACvC,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAS,cAAc,CAAC,IAAe;IACrC,OAAO,CAAC,CAAC,IAAI,CAAC,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;AAChE,CAAC;AAED,SAAS,cAAc,CACrB,OAA0C,EAC1C,MAAkB;IAElB,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAC/B,IAAI,MAAM,EAAE,CAAC;QACX,OAAO,MAAM,CAAC;IAChB,CAAC;IACD,IAAI,MAAM,KAAK,MAAM,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;QACrC,OAAO,OAAO,CAAC,GAAG,CAAC;IACrB,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,IAAI,CACX,IAAe,EACf,QAAkB,EAClB,KAAa,EACb,QAA2B,EAC3B,YAAoC,EACpC,iBAA2B,EAC3B,iBAA8C;IAE9C,MAAM,WAAW,GAAG,CAAC,GAAG,QAAQ,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC,CAAC;IACvD,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,IAAI,iBAAiB,CAAC;IAE1D,IAAI,KAAK,KAAK,QAAQ,CAAC,MAAM,EAAE,CAAC;QAC9B,IAAI,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC;YACzB,OAAO;gBACL,IAAI;gBACJ,WAAW;gBACX,MAAM,EAAE,YAAY;gBACpB,WAAW,EAAE,iBAAiB;gBAC9B,WAAW;aACZ,CAAC;QACJ,CAAC;QACD,qEAAqE;QACrE,mCAAmC;QACnC,IAAI,IAAI,CAAC,UAAU,IAAI,cAAc,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;YACvD,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACnD,OAAO;gBACL,IAAI,EAAE,IAAI,CAAC,UAAU;gBACrB,WAAW,EAAE,CAAC,GAAG,WAAW,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC;gBAC7D,MAAM,EAAE,EAAE,GAAG,YAAY,EAAE,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE;gBAC5C,WAAW,EAAE,CAAC,GAAG,iBAAiB,EAAE,EAAE,CAAC;gBACvC,WAAW,EAAE,IAAI,CAAC,UAAU,CAAC,WAAW,IAAI,WAAW;aACxD,CAAC;QACJ,CAAC;QACD,oEAAoE;QACpE,4DAA4D;QAC5D,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,GAAG,GAAG,QAAQ,CAAC,KAAK,CAAW,CAAC;IAEtC,MAAM,WAAW,GAAG,iBAAiB,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;IAC1D,IAAI,WAAW,EAAE,CAAC;QAChB,MAAM,MAAM,GAAG,IAAI,CACjB,WAAW,EACX,QAAQ,EACR,KAAK,GAAG,CAAC,EACT,WAAW,EACX,YAAY,EACZ,iBAAiB,EACjB,WAAW,CACZ,CAAC;QACF,IAAI,MAAM,EAAE,CAAC;YACX,OAAO,MAAM,CAAC;QAChB,CAAC;IACH,CAAC;IAED,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;QACpB,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACnD,MAAM,MAAM,GAAG,IAAI,CACjB,IAAI,CAAC,UAAU,EACf,QAAQ,EACR,KAAK,GAAG,CAAC,EACT,WAAW,EACX,EAAE,GAAG,YAAY,EAAE,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,EACrC,CAAC,GAAG,iBAAiB,EAAE,GAAG,CAAC,EAC3B,WAAW,CACZ,CAAC;QACF,IAAI,MAAM,EAAE,CAAC;YACX,OAAO,MAAM,CAAC;QAChB,CAAC;IACH,CAAC;IAED,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;QACpB,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACnD,MAAM,UAAU,GAAG,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACnD,MAAM,MAAM,GAAG,IAAI,CACjB,IAAI,CAAC,UAAU,EACf,QAAQ,EACR,QAAQ,CAAC,MAAM,EACf,WAAW,EACX,EAAE,GAAG,YAAY,EAAE,CAAC,SAAS,CAAC,EAAE,UAAU,EAAE,EAC5C,CAAC,GAAG,iBAAiB,EAAE,UAAU,CAAC,EAClC,WAAW,CACZ,CAAC;QACF,IAAI,MAAM,EAAE,CAAC;YACX,OAAO,MAAM,CAAC;QAChB,CAAC;IACH,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,iBAAiB,CACxB,QAAgC,EAChC,GAAW;IAEX,6EAA6E;IAC7E,uEAAuE;IACvE,2EAA2E;IAC3E,oCAAoC;IACpC,OAAO,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC;AACzC,CAAC;AAED,SAAS,cAAc,CAAC,IAAY;IAClC,IAAI,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAC1D,sDAAsD;IACtD,IAAI,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QAC1B,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IACjC,CAAC;IACD,IAAI,OAAO,KAAK,EAAE,EAAE,CAAC;QACnB,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,OAAO,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;AAC/C,CAAC;AAED,SAAS,aAAa,CAAC,OAAe;IACpC,IAAI,CAAC;QACH,OAAO,kBAAkB,CAAC,OAAO,CAAC,CAAC;IACrC,CAAC;IAAC,MAAM,CAAC;QACP,MAAM,IAAI,kBAAkB,CAAC,4BAA4B,OAAO,GAAG,CAAC,CAAC;IACvE,CAAC;AACH,CAAC"}
|
|
@@ -4,8 +4,9 @@
|
|
|
4
4
|
* Per-controller `<File>.routes.gen.ts` files (hand-written today, codegen-emitted
|
|
5
5
|
* later) compose these primitives into per-route `Request<M, P>` helpers.
|
|
6
6
|
*/
|
|
7
|
-
import type { TFunction } from 'i18next';
|
|
8
7
|
import type { IApp } from '../../server.ts';
|
|
8
|
+
import type { TI18n } from '../i18n/types.ts';
|
|
9
|
+
import type { StandardSchemaV1 } from '../validate/types.ts';
|
|
9
10
|
import type { FrameworkRequest } from './HttpServer.ts';
|
|
10
11
|
/**
|
|
11
12
|
* Module-augmentation point for app-wide `appInfo` extensions. Users add:
|
|
@@ -36,10 +37,7 @@ export interface AppInfoExtensions {
|
|
|
36
37
|
export interface BaseAppInfo {
|
|
37
38
|
app: IApp;
|
|
38
39
|
ip?: string | undefined;
|
|
39
|
-
i18n:
|
|
40
|
-
t: TFunction;
|
|
41
|
-
language: string;
|
|
42
|
-
};
|
|
40
|
+
i18n: TI18n;
|
|
43
41
|
request: Record<string, unknown>;
|
|
44
42
|
query: Record<string, unknown>;
|
|
45
43
|
/**
|
|
@@ -77,3 +75,70 @@ export type ProvidesOf<T> = T extends {
|
|
|
77
75
|
* to layer middleware-contributed `appInfo` fields onto the base context.
|
|
78
76
|
*/
|
|
79
77
|
export type UnionAppInfoProvides<MWs extends readonly unknown[]> = MWs extends readonly [infer Head, ...infer Tail extends readonly unknown[]] ? ProvidesOf<Head extends readonly [infer C, unknown] ? C : Head> & UnionAppInfoProvides<Tail> : Record<never, never>;
|
|
78
|
+
type MiddlewareClass<T> = T extends readonly [infer C, unknown] ? C : T;
|
|
79
|
+
type Member<T, K extends PropertyKey> = K extends keyof T ? T[K] : never;
|
|
80
|
+
/** A widened StandardSchema has no output information (including the base
|
|
81
|
+
* middleware's nullable defaults). An explicitly non-nullable schema whose
|
|
82
|
+
* output is `unknown` is still a real singleton output; retaining it avoids
|
|
83
|
+
* promising the object-shaped base fallback. */
|
|
84
|
+
type KnownSchema<S> = [Extract<S, StandardSchemaV1>] extends [never] ? never : unknown extends StandardSchemaV1.InferOutput<Extract<S, StandardSchemaV1>> ? [Extract<S, null | undefined>] extends [never] ? S : never : S;
|
|
85
|
+
type SchemaMetadata<S> = [KnownSchema<S>] extends [never] ? never : S;
|
|
86
|
+
type StaticSchemas<M> = {
|
|
87
|
+
request: SchemaMetadata<Member<M, 'relatedRequestParameters'>>;
|
|
88
|
+
query: SchemaMetadata<Member<M, 'relatedQueryParameters'>>;
|
|
89
|
+
};
|
|
90
|
+
type InstanceSchemas<M> = M extends {
|
|
91
|
+
prototype: infer I;
|
|
92
|
+
} ? {
|
|
93
|
+
request: SchemaMetadata<Member<I, 'relatedRequestParameters'>>;
|
|
94
|
+
query: SchemaMetadata<Member<I, 'relatedQueryParameters'>>;
|
|
95
|
+
} : {
|
|
96
|
+
request: never;
|
|
97
|
+
query: never;
|
|
98
|
+
};
|
|
99
|
+
type DefiniteSchema<S> = [S] extends [never] ? never : null extends S ? never : undefined extends S ? never : S;
|
|
100
|
+
type StaticSchemaSlots<M> = StaticSchemas<M>['request'] | StaticSchemas<M>['query'];
|
|
101
|
+
/** Instance metadata is the deprecated runtime fallback only when neither
|
|
102
|
+
* static slot contributes a schema. Reading its type never constructs it. */
|
|
103
|
+
type MiddlewareSchemas<M> = [
|
|
104
|
+
DefiniteSchema<StaticSchemas<M>['request']> | DefiniteSchema<StaticSchemas<M>['query']>
|
|
105
|
+
] extends [never] ? [StaticSchemaSlots<M>] extends [never] ? InstanceSchemas<M> : StaticSchemas<M> | InstanceSchemas<M> : StaticSchemas<M>;
|
|
106
|
+
type MiddlewareOutputs<MWs extends readonly unknown[], Slot extends 'request' | 'query'> = MWs extends readonly [infer Head, ...infer Tail] ? AppendMiddlewareOutput<MiddlewareSchemas<MiddlewareClass<Head>>, Slot, MiddlewareOutputs<Tail, Slot>> : [];
|
|
107
|
+
/** Distribute over metadata branches before indexing a slot: a `never` slot
|
|
108
|
+
* means no schema in that branch, and must not disappear from the union. */
|
|
109
|
+
type AppendMiddlewareOutput<Metadata, Slot extends PropertyKey, Tail extends unknown[]> = Metadata extends {
|
|
110
|
+
[K in Slot]: infer S;
|
|
111
|
+
} ? [S] extends [never] ? Tail : S extends StandardSchemaV1 ? [StandardSchemaV1.InferOutput<S>, ...Tail] : Tail : Tail;
|
|
112
|
+
type RequiredKeys<T> = {
|
|
113
|
+
[K in keyof T]-?: object extends Pick<T, K> ? never : K;
|
|
114
|
+
}[keyof T];
|
|
115
|
+
type MergedValue<L, R, K extends PropertyKey> = K extends keyof R ? K extends RequiredKeys<R> ? R[K] : K extends keyof L ? L[K] | R[K] : R[K] : K extends keyof L ? L[K] : never;
|
|
116
|
+
/** Ordered shallow assignment. Optional later keys may be absent, so an
|
|
117
|
+
* earlier value remains possible; a present undefined still overwrites it. */
|
|
118
|
+
type MergeValidationObjects<L, R> = {
|
|
119
|
+
[K in RequiredKeys<L> | RequiredKeys<R>]: MergedValue<L, R, K>;
|
|
120
|
+
} & {
|
|
121
|
+
[K in Exclude<keyof L | keyof R, RequiredKeys<L> | RequiredKeys<R>>]?: MergedValue<L, R, K>;
|
|
122
|
+
};
|
|
123
|
+
type MergeValidationOutputs<L, R> = L extends readonly unknown[] ? never : R extends readonly unknown[] ? never : L extends object ? R extends object ? MergeValidationObjects<L, R> : never : never;
|
|
124
|
+
type ReduceValidationOutputs<Parts extends unknown[], Fallback> = Parts extends [infer L, infer R, ...infer Tail] ? ReduceValidationOutputs<[MergeValidationOutputs<L, R>, ...Tail], Fallback> : Parts extends [infer Only] ? Only : Fallback;
|
|
125
|
+
type ValidatedSlot<MWs extends readonly unknown[], Outputs, Slot extends 'request' | 'query', Fallback> = ReduceValidationOutputs<[
|
|
126
|
+
...(Slot extends keyof Outputs ? [Outputs[Slot]] : []),
|
|
127
|
+
...MiddlewareOutputs<MWs, Slot>
|
|
128
|
+
], Fallback>;
|
|
129
|
+
type WithContentType<T, ContentType extends string> = [ContentType] extends [
|
|
130
|
+
never
|
|
131
|
+
] ? T : T extends readonly unknown[] ? never : T extends object ? Omit<T, 'contentType'> & {
|
|
132
|
+
contentType: ContentType;
|
|
133
|
+
} : never;
|
|
134
|
+
type ProvidedAppInfo<MWs extends readonly unknown[]> = BaseRequestContext['appInfo'] & UnionAppInfoProvides<MWs>;
|
|
135
|
+
/** Handler context after validation: route output first, then middleware
|
|
136
|
+
* outputs in chain order. Validated slots replace the base record types so
|
|
137
|
+
* arrays, primitives and nullable schema outputs retain their actual shape. */
|
|
138
|
+
export type ValidatedRequest<MWs extends readonly unknown[], Outputs = Record<never, never>, ContentType extends string = never> = Omit<BaseRequestContext, 'appInfo'> & {
|
|
139
|
+
appInfo: Omit<ProvidedAppInfo<MWs>, 'request' | 'query' | keyof Outputs> & {
|
|
140
|
+
request: WithContentType<ValidatedSlot<MWs, Outputs, 'request', ProvidedAppInfo<MWs>['request']>, ContentType>;
|
|
141
|
+
query: ValidatedSlot<MWs, Outputs, 'query', ProvidedAppInfo<MWs>['query']>;
|
|
142
|
+
} & Pick<Outputs, Exclude<keyof Outputs, 'request' | 'query'>>;
|
|
143
|
+
};
|
|
144
|
+
export {};
|
|
@@ -1,15 +1,9 @@
|
|
|
1
|
-
import type { i18n, TFunction } from 'i18next';
|
|
2
1
|
import Base from '../../modules/Base.ts';
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
language: string;
|
|
6
|
-
};
|
|
2
|
+
import type { I18nBaseInstance, TI18n } from './types.ts';
|
|
3
|
+
export type { TI18n } from './types.ts';
|
|
7
4
|
export declare class I18n extends Base {
|
|
8
5
|
#private;
|
|
9
|
-
getI18nForLang(lang?: string): Promise<
|
|
10
|
-
t: TFunction;
|
|
11
|
-
language: string;
|
|
12
|
-
}>;
|
|
6
|
+
getI18nForLang(lang?: string): Promise<TI18n>;
|
|
13
7
|
/**
|
|
14
8
|
* Base i18next instance, initialised on first use.
|
|
15
9
|
*
|
|
@@ -17,11 +11,11 @@ export declare class I18n extends Base {
|
|
|
17
11
|
* installed — use `getI18nBaseInstanceIfAvailable()` where falling back to
|
|
18
12
|
* the framework's English defaults is the better answer.
|
|
19
13
|
*/
|
|
20
|
-
getI18nBaseInstance(): Promise<
|
|
14
|
+
getI18nBaseInstance(): Promise<I18nBaseInstance>;
|
|
21
15
|
/**
|
|
22
16
|
* Base i18next instance, or `null` when the optional packages are missing —
|
|
23
17
|
* logged once, not per request. Any other initialisation failure still throws.
|
|
24
18
|
*/
|
|
25
|
-
getI18nBaseInstanceIfAvailable(): Promise<
|
|
19
|
+
getI18nBaseInstanceIfAvailable(): Promise<I18nBaseInstance | null>;
|
|
26
20
|
static get loggerGroup(): string;
|
|
27
21
|
}
|
|
@@ -40,9 +40,10 @@ export class I18n extends Base {
|
|
|
40
40
|
* leaking the raw key. A call with no default keeps returning the key.
|
|
41
41
|
*/
|
|
42
42
|
#i18nFallback = {
|
|
43
|
-
t: (
|
|
43
|
+
t: (key, options) => typeof options === 'string'
|
|
44
44
|
? options
|
|
45
|
-
: (options?.defaultValue ??
|
|
45
|
+
: (options?.defaultValue ??
|
|
46
|
+
(Array.isArray(key) ? (key.at(-1) ?? '') : key)),
|
|
46
47
|
language: 'en',
|
|
47
48
|
};
|
|
48
49
|
async getI18nForLang(lang) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"I18n.js","sourceRoot":"","sources":["../../../src/services/i18n/I18n.ts"],"names":[],"mappings":"AAEA,OAAO,IAAI,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"I18n.js","sourceRoot":"","sources":["../../../src/services/i18n/I18n.ts"],"names":[],"mappings":"AAEA,OAAO,IAAI,MAAM,uBAAuB,CAAC;AAKzC,MAAM,uBAAuB,GAC3B,6EAA6E;IAC7E,8DAA8D;IAC9D,wCAAwC;IACxC,4EAA4E;IAC5E,6CAA6C,CAAC;AAEhD,+EAA+E;AAC/E,MAAM,mBAAoB,SAAQ,KAAK;IACrC,IAAI,GAAG,qBAAqB,CAAC;CAC9B;AAED;;;;GAIG;AACH,KAAK,UAAU,WAAW;IACxB,IAAI,CAAC;QACH,MAAM,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACvE,MAAM,CAAC,SAAS,CAAC,EAAE,qBAAqB;YACxC,MAAM,CAAC,oBAAoB,CAAC,EAAE,qBAAqB;SACpD,CAAC,CAAC;QACH,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC;IAChC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAK,KAA2B,EAAE,IAAI,KAAK,sBAAsB,EAAE,CAAC;YAClE,MAAM,IAAI,mBAAmB,CAAC,uBAAuB,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;QACpE,CAAC;QACD,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC;AAED,MAAM,OAAO,IAAK,SAAQ,IAAI;IAC5B,MAAM,GAA6B,EAAE,CAAC;IAEtC,SAAS,CAAQ;IACjB,gBAAgB,CAAiB;IACjC,gBAAgB,GAAG,KAAK,CAAC;IAEzB;;;;;OAKG;IACH,aAAa,GAAU;QACrB,CAAC,EAAE,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE,CAClB,OAAO,OAAO,KAAK,QAAQ;YACzB,CAAC,CAAC,OAAO;YACT,CAAC,CAAC,CAAC,OAAO,EAAE,YAAY;gBACtB,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;QACtD,QAAQ,EAAE,IAAI;KACf,CAAC;IAEF,KAAK,CAAC,cAAc,CAAC,IAAa;QAChC,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,CAAsB,CAAC;QACnE,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;YACxB,OAAO,IAAI,CAAC,aAAa,CAAC;QAC5B,CAAC;QAED,IAAI,CAAC,IAAI,IAAI,UAAU,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;YAC3D,IAAI,CAAC,MAAM,EAAE,OAAO,CAClB,aAAa,IAAI,yDAAyD,UAAU,CAAC,WAAW,EAAE,CACnG,CAAC;YACF,IAAI,GAAG,UAAU,CAAC,WAAW,CAAC;QAChC,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;YACvB,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,8BAA8B,EAAE,CAAC;YAC7D,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,sEAAsE;gBACtE,6DAA6D;gBAC7D,OAAO,IAAI,CAAC,aAAa,CAAC;YAC5B,CAAC;YACD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,aAAa,CAAC;gBACzC,SAAS,EAAE,KAAK;gBAChB,GAAG,EAAE,IAAI;aACV,CAAC,CAAC;QACL,CAAC;QACD,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAC3B,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,mBAAmB;QACvB,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACnB,OAAO,IAAI,CAAC,SAAS,CAAC;QACxB,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAC3B,IAAI,CAAC,gBAAgB,GAAG,CAAC,KAAK,IAAI,EAAE;gBAClC,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,MAAM,WAAW,EAAE,CAAC;gBACnD,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,CAAsB,CAAC;gBAEnE,MAAM,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC;oBAChC,OAAO,EAAE;wBACP,QAAQ,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,OAAO,sBAAsB;wBACjE,OAAO,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,OAAO,8BAA8B;qBACzE;oBACD,WAAW,EAAE,UAAU,CAAC,WAAW;oBACnC,OAAO,EAAE,UAAU,CAAC,OAAO;oBAC3B,WAAW,EAAE,UAAU,CAAC,WAAW;oBACnC,KAAK,EAAE,UAAU,CAAC,KAAK;iBACxB,CAAC,CAAC;gBACH,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC;gBACzB,OAAO,IAAI,CAAC,SAAS,CAAC;YACxB,CAAC,CAAC,EAAE,CAAC;QACP,CAAC;QACD,OAAO,IAAI,CAAC,gBAAgB,CAAC;IAC/B,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,8BAA8B;QAClC,IAAI,CAAC;YACH,OAAO,MAAM,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAC1C,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,IAAI,CAAC,CAAC,CAAC,YAAY,mBAAmB,CAAC,EAAE,CAAC;gBACxC,MAAM,CAAC,CAAC;YACV,CAAC;YACD,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,CAAC;gBAC3B,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC;gBAC7B,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;YAC/B,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IAED,MAAM,KAAK,WAAW;QACpB,OAAO,OAAO,CAAC;IACjB,CAAC;CACF"}
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
/** Translation defaults, interpolation values and engine-specific options. */
|
|
2
|
+
export interface TranslationOptions {
|
|
3
|
+
defaultValue?: string;
|
|
4
|
+
count?: number;
|
|
5
|
+
context?: string;
|
|
6
|
+
lng?: string;
|
|
7
|
+
ns?: string | string[];
|
|
8
|
+
returnObjects?: boolean;
|
|
9
|
+
returnDetails?: boolean;
|
|
10
|
+
[key: string]: unknown;
|
|
11
|
+
}
|
|
12
|
+
type StringTranslationOptions = TranslationOptions & {
|
|
13
|
+
returnObjects?: false;
|
|
14
|
+
returnDetails?: false;
|
|
15
|
+
};
|
|
16
|
+
/** String-key translator; object/detail results must be narrowed by the caller. */
|
|
17
|
+
export interface TranslationFunction {
|
|
18
|
+
(key: string | string[], options?: StringTranslationOptions): string;
|
|
19
|
+
(key: string | string[], defaultValue: string, options?: StringTranslationOptions): string;
|
|
20
|
+
(key: string | string[], options: TranslationOptions): unknown;
|
|
21
|
+
(key: string | string[], defaultValue: string, options: TranslationOptions): unknown;
|
|
22
|
+
}
|
|
23
|
+
/** Translator available on requests, including when translations are disabled. */
|
|
24
|
+
export type TI18n = {
|
|
25
|
+
t: TranslationFunction;
|
|
26
|
+
language: string;
|
|
27
|
+
};
|
|
28
|
+
/**
|
|
29
|
+
* Base translation instance. For additional i18next APIs, install its optional
|
|
30
|
+
* peers and assert the returned base instance as `import('i18next').i18n`.
|
|
31
|
+
*/
|
|
32
|
+
export interface I18nBaseInstance extends TI18n {
|
|
33
|
+
cloneInstance(options?: {
|
|
34
|
+
lng?: string;
|
|
35
|
+
initAsync?: boolean;
|
|
36
|
+
}): I18nBaseInstance;
|
|
37
|
+
services: {
|
|
38
|
+
languageUtils: {
|
|
39
|
+
isSupportedCode(language: string): boolean;
|
|
40
|
+
getLanguagePartFromCode(language: string): string;
|
|
41
|
+
};
|
|
42
|
+
};
|
|
43
|
+
}
|
|
44
|
+
export {};
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/services/i18n/types.ts"],"names":[],"mappings":""}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import type { TFunction } from 'i18next';
|
|
2
1
|
import Base from '../../modules/Base.ts';
|
|
3
2
|
import type { IApp } from '../../server.ts';
|
|
3
|
+
import type { TranslationFunction } from '../i18n/types.ts';
|
|
4
4
|
import type { ValidatorDriver } from './types.ts';
|
|
5
5
|
/**
|
|
6
6
|
* Per-route validator dispatcher. Resolves a `ValidatorDriver` once at
|
|
@@ -47,7 +47,7 @@ declare class ValidateService extends Base {
|
|
|
47
47
|
* remember a translation step.
|
|
48
48
|
*/
|
|
49
49
|
validate(data: unknown, i18n?: {
|
|
50
|
-
t:
|
|
50
|
+
t: TranslationFunction;
|
|
51
51
|
} | null): Promise<unknown>;
|
|
52
52
|
static get loggerGroup(): string;
|
|
53
53
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ValidateService.js","sourceRoot":"","sources":["../../../src/services/validate/ValidateService.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ValidateService.js","sourceRoot":"","sources":["../../../src/services/validate/ValidateService.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* A validator output can be any JavaScript value. Only combining several
|
|
3
|
+
* validator outputs requires an object shape: the framework's established
|
|
4
|
+
* merge is a shallow, ordered merge of plain objects.
|
|
5
|
+
*/
|
|
6
|
+
export declare function isPlainObject(value: unknown): value is Record<PropertyKey, unknown>;
|
|
7
|
+
/**
|
|
8
|
+
* Preserve a single validator output exactly. When several schemas contribute
|
|
9
|
+
* to one request slot, merge their plain-object outputs in schema order so
|
|
10
|
+
* later keys overwrite earlier keys. Other shapes are a configuration error;
|
|
11
|
+
* spreading them would silently turn arrays and primitives into records.
|
|
12
|
+
*/
|
|
13
|
+
export declare function mergeValidatedOutputs(outputs: readonly unknown[]): unknown;
|
|
14
|
+
/**
|
|
15
|
+
* Add the framework-owned content-type discriminator without mutating a
|
|
16
|
+
* validator's singleton output. Content-type maps are object contracts, so a
|
|
17
|
+
* non-plain output is rejected explicitly rather than being spread.
|
|
18
|
+
*/
|
|
19
|
+
export declare function addContentTypeDiscriminator(output: unknown, contentType: string): Record<string, unknown>;
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* A validator output can be any JavaScript value. Only combining several
|
|
3
|
+
* validator outputs requires an object shape: the framework's established
|
|
4
|
+
* merge is a shallow, ordered merge of plain objects.
|
|
5
|
+
*/
|
|
6
|
+
export function isPlainObject(value) {
|
|
7
|
+
if (value === null || typeof value !== 'object') {
|
|
8
|
+
return false;
|
|
9
|
+
}
|
|
10
|
+
const prototype = Object.getPrototypeOf(value);
|
|
11
|
+
return prototype === Object.prototype || prototype === null;
|
|
12
|
+
}
|
|
13
|
+
/**
|
|
14
|
+
* Preserve a single validator output exactly. When several schemas contribute
|
|
15
|
+
* to one request slot, merge their plain-object outputs in schema order so
|
|
16
|
+
* later keys overwrite earlier keys. Other shapes are a configuration error;
|
|
17
|
+
* spreading them would silently turn arrays and primitives into records.
|
|
18
|
+
*/
|
|
19
|
+
export function mergeValidatedOutputs(outputs) {
|
|
20
|
+
if (outputs.length === 1) {
|
|
21
|
+
return outputs[0];
|
|
22
|
+
}
|
|
23
|
+
const objects = outputs.map((output, index) => {
|
|
24
|
+
if (!isPlainObject(output)) {
|
|
25
|
+
throw new Error(`Cannot merge validated outputs: output ${index + 1} is not a plain object. ` +
|
|
26
|
+
'Multiple validation schemas must return plain objects.');
|
|
27
|
+
}
|
|
28
|
+
return output;
|
|
29
|
+
});
|
|
30
|
+
return Object.assign({}, ...objects);
|
|
31
|
+
}
|
|
32
|
+
/**
|
|
33
|
+
* Add the framework-owned content-type discriminator without mutating a
|
|
34
|
+
* validator's singleton output. Content-type maps are object contracts, so a
|
|
35
|
+
* non-plain output is rejected explicitly rather than being spread.
|
|
36
|
+
*/
|
|
37
|
+
export function addContentTypeDiscriminator(output, contentType) {
|
|
38
|
+
if (!isPlainObject(output)) {
|
|
39
|
+
throw new Error('Cannot add a content-type discriminator: the matched validation output must be a plain object.');
|
|
40
|
+
}
|
|
41
|
+
return { ...output, contentType };
|
|
42
|
+
}
|
|
43
|
+
//# sourceMappingURL=mergeValidatedOutputs.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mergeValidatedOutputs.js","sourceRoot":"","sources":["../../../src/services/validate/mergeValidatedOutputs.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,MAAM,UAAU,aAAa,CAC3B,KAAc;IAEd,IAAI,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAChD,OAAO,KAAK,CAAC;IACf,CAAC;IACD,MAAM,SAAS,GAAG,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;IAC/C,OAAO,SAAS,KAAK,MAAM,CAAC,SAAS,IAAI,SAAS,KAAK,IAAI,CAAC;AAC9D,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,qBAAqB,CAAC,OAA2B;IAC/D,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,OAAO,CAAC,CAAC,CAAC,CAAC;IACpB,CAAC;IAED,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE;QAC5C,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC;YAC3B,MAAM,IAAI,KAAK,CACb,0CAA0C,KAAK,GAAG,CAAC,0BAA0B;gBAC3E,wDAAwD,CAC3D,CAAC;QACJ,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,GAAG,OAAO,CAAC,CAAC;AACvC,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,2BAA2B,CACzC,MAAe,EACf,WAAmB;IAEnB,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC;QAC3B,MAAM,IAAI,KAAK,CACb,gGAAgG,CACjG,CAAC;IACJ,CAAC;IACD,OAAO,EAAE,GAAG,MAAM,EAAE,WAAW,EAAE,CAAC;AACpC,CAAC"}
|
|
@@ -72,7 +72,7 @@ export declare const createDefaultTestUser: () => Promise<false | {
|
|
|
72
72
|
isVerified: boolean;
|
|
73
73
|
locale: string;
|
|
74
74
|
languages: string[];
|
|
75
|
-
},
|
|
75
|
+
}, {}, Omit<{
|
|
76
76
|
readonly timestamps: true;
|
|
77
77
|
readonly minimize: false;
|
|
78
78
|
}, never>> & Omit<{
|
|
@@ -145,7 +145,7 @@ export declare const createDefaultTestUser: () => Promise<false | {
|
|
|
145
145
|
_id: import("mongoose").Types.ObjectId;
|
|
146
146
|
}> & {
|
|
147
147
|
__v: number;
|
|
148
|
-
}, "generateToken" | "getPublic" | "id" | "sendPasswordRecoveryEmail" | "sendVerificationEmail"> & import("mongoose").HydratedDocumentOverrides<
|
|
148
|
+
}, "generateToken" | "getPublic" | "id" | "sendPasswordRecoveryEmail" | "sendVerificationEmail"> & import("mongoose").HydratedDocumentOverrides<{} & import("../modules/BaseModel.ts").DocFacingMethods<{
|
|
149
149
|
readonly generateToken: (this: {
|
|
150
150
|
email?: string | null;
|
|
151
151
|
sessionTokens?: {
|
|
@@ -161,18 +161,12 @@ export declare const createDefaultTestUser: () => Promise<false | {
|
|
|
161
161
|
name?: {
|
|
162
162
|
nick?: string | null;
|
|
163
163
|
} | null;
|
|
164
|
-
}, i18n:
|
|
165
|
-
t: import("i18next").TFunction;
|
|
166
|
-
language: string;
|
|
167
|
-
}) => Promise<any>;
|
|
164
|
+
}, i18n: import("../services/i18n/types.ts").TI18n) => Promise<any>;
|
|
168
165
|
readonly sendVerificationEmail: (this: import("../models/User.ts").UserAuthInstance & {
|
|
169
166
|
name?: {
|
|
170
167
|
nick?: string | null;
|
|
171
168
|
} | null;
|
|
172
|
-
}, i18n:
|
|
173
|
-
t: import("i18next").TFunction;
|
|
174
|
-
language: string;
|
|
175
|
-
}) => Promise<any>;
|
|
169
|
+
}, i18n: import("../services/i18n/types.ts").TI18n) => Promise<any>;
|
|
176
170
|
readonly getPublic: (this: import("../models/User.ts").UserPublicDoc) => {
|
|
177
171
|
avatar: string | null | undefined;
|
|
178
172
|
name: Omit<{
|
|
@@ -189,8 +183,6 @@ export declare const createDefaultTestUser: () => Promise<false | {
|
|
|
189
183
|
};
|
|
190
184
|
}> & {
|
|
191
185
|
id: string;
|
|
192
|
-
} & {
|
|
193
|
-
id: string;
|
|
194
186
|
}>;
|
|
195
187
|
token: string;
|
|
196
188
|
}>;
|