@adaptivestone/framework 5.6.0 → 5.7.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +78 -1
- package/README.md +98 -0
- package/dist/clusterRunner.js +9 -4
- package/dist/clusterRunner.js.map +1 -1
- package/dist/codegen/appTypes.js +9 -6
- package/dist/codegen/appTypes.js.map +1 -1
- package/dist/codegen/astEmit.js +7 -0
- package/dist/codegen/astEmit.js.map +1 -1
- package/dist/codegen/astExtract.d.ts +3 -0
- package/dist/codegen/astExtract.js +1 -0
- package/dist/codegen/astExtract.js.map +1 -1
- package/dist/codegen/astResolve.d.ts +2 -0
- package/dist/codegen/astResolve.js +1 -0
- package/dist/codegen/astResolve.js.map +1 -1
- package/dist/codegen/emit.js +1 -1
- package/dist/codegen/index.js +1 -1
- package/dist/codegen/index.js.map +1 -1
- package/dist/commands/CreateUser.d.ts +1 -0
- package/dist/commands/CreateUser.js +1 -0
- package/dist/commands/CreateUser.js.map +1 -1
- package/dist/commands/SyncIndexes.js +4 -12
- package/dist/commands/SyncIndexes.js.map +1 -1
- package/dist/commands/migration/Migrate.js +3 -2
- package/dist/commands/migration/Migrate.js.map +1 -1
- package/dist/config/http.d.ts +1 -0
- package/dist/config/http.js +13 -2
- package/dist/config/http.js.map +1 -1
- package/dist/controllers/Auth.d.ts +22 -14
- package/dist/controllers/Auth.js +38 -72
- package/dist/controllers/Auth.js.map +1 -1
- package/dist/controllers/Auth.routes.gen.d.ts +1 -1
- package/dist/controllers/Auth.routes.gen.js +1 -1
- package/dist/controllers/Health.d.ts +8 -5
- package/dist/controllers/Health.js +11 -6
- package/dist/controllers/Health.js.map +1 -1
- package/dist/controllers/Health.routes.gen.d.ts +1 -1
- package/dist/controllers/Health.routes.gen.js +1 -1
- package/dist/controllers/Home.d.ts +3 -2
- package/dist/controllers/Home.js +6 -2
- package/dist/controllers/Home.js.map +1 -1
- package/dist/controllers/Home.routes.gen.d.ts +1 -1
- package/dist/controllers/Home.routes.gen.js +1 -1
- package/dist/controllers/index.js +83 -42
- package/dist/controllers/index.js.map +1 -1
- package/dist/helpers/crypto.d.ts +6 -0
- package/dist/helpers/crypto.js +21 -4
- package/dist/helpers/crypto.js.map +1 -1
- package/dist/helpers/logger.d.ts +3 -1
- package/dist/helpers/logger.js +11 -1
- package/dist/helpers/logger.js.map +1 -1
- package/dist/helpers/passwordPolicy.d.ts +23 -0
- package/dist/helpers/passwordPolicy.js +62 -0
- package/dist/helpers/passwordPolicy.js.map +1 -0
- package/dist/helpers/redis/redisConnection.d.ts +1 -0
- package/dist/helpers/redis/redisConnection.js +1 -0
- package/dist/helpers/redis/redisConnection.js.map +1 -1
- package/dist/helpers/yup.d.ts +11 -5
- package/dist/helpers/yup.js +12 -6
- package/dist/helpers/yup.js.map +1 -1
- package/dist/locales/ru/translation.json +31 -0
- package/dist/models/Lock.d.ts +2 -2
- package/dist/models/Lock.js +64 -15
- package/dist/models/Lock.js.map +1 -1
- package/dist/models/User.d.ts +5 -4
- package/dist/models/User.js +4 -4
- package/dist/models/User.js.map +1 -1
- package/dist/models/UserOld.d.ts +2 -0
- package/dist/models/UserOld.js +9 -3
- package/dist/models/UserOld.js.map +1 -1
- package/dist/modules/BaseCli.d.ts +5 -0
- package/dist/modules/BaseCli.js +10 -1
- package/dist/modules/BaseCli.js.map +1 -1
- package/dist/server.d.ts +22 -2
- package/dist/server.js +127 -18
- package/dist/server.js.map +1 -1
- package/dist/services/cache/Cache.js +16 -8
- package/dist/services/cache/Cache.js.map +1 -1
- package/dist/services/cache/drivers/RedisDriver.js +15 -11
- package/dist/services/cache/drivers/RedisDriver.js.map +1 -1
- package/dist/services/http/ExpressResponseWriter.d.ts +30 -0
- package/dist/services/http/ExpressResponseWriter.js +447 -0
- package/dist/services/http/ExpressResponseWriter.js.map +1 -0
- package/dist/services/http/HttpServer.d.ts +17 -11
- package/dist/services/http/HttpServer.js +71 -23
- package/dist/services/http/HttpServer.js.map +1 -1
- package/dist/services/http/ResponseWriter.d.ts +11 -0
- package/dist/services/http/ResponseWriter.js +2 -0
- package/dist/services/http/ResponseWriter.js.map +1 -0
- package/dist/services/http/builtInResponse.d.ts +26 -0
- package/dist/services/http/builtInResponse.js +70 -0
- package/dist/services/http/builtInResponse.js.map +1 -0
- package/dist/services/http/builtinErrorHandlers.d.ts +60 -7
- package/dist/services/http/builtinErrorHandlers.js +86 -5
- package/dist/services/http/builtinErrorHandlers.js.map +1 -1
- package/dist/services/http/files.d.ts +21 -8
- package/dist/services/http/files.js +2 -18
- package/dist/services/http/files.js.map +1 -1
- package/dist/services/http/httpErrors.d.ts +40 -2
- package/dist/services/http/httpErrors.js +50 -2
- package/dist/services/http/httpErrors.js.map +1 -1
- package/dist/services/http/middleware/Cors.js +5 -0
- package/dist/services/http/middleware/Cors.js.map +1 -1
- package/dist/services/http/middleware/IpDetector.js +23 -4
- package/dist/services/http/middleware/IpDetector.js.map +1 -1
- package/dist/services/http/middleware/Pagination.js +4 -2
- package/dist/services/http/middleware/Pagination.js.map +1 -1
- package/dist/services/http/middleware/RateLimiter.d.ts +1 -0
- package/dist/services/http/middleware/RateLimiter.js +37 -13
- package/dist/services/http/middleware/RateLimiter.js.map +1 -1
- package/dist/services/http/middleware/RequestParser.d.ts +9 -3
- package/dist/services/http/middleware/RequestParser.js +108 -36
- package/dist/services/http/middleware/RequestParser.js.map +1 -1
- package/dist/services/http/responses.d.ts +114 -0
- package/dist/services/http/responses.js +191 -0
- package/dist/services/http/responses.js.map +1 -0
- package/dist/services/http/routing/ExpressAdapter.d.ts +4 -1
- package/dist/services/http/routing/ExpressAdapter.js +82 -9
- package/dist/services/http/routing/ExpressAdapter.js.map +1 -1
- package/dist/services/http/routing/RouteRegistry.js +21 -10
- package/dist/services/http/routing/RouteRegistry.js.map +1 -1
- package/dist/services/i18n/I18n.js.map +1 -1
- package/dist/services/i18n/types.d.ts +2 -1
- package/dist/services/validate/ValidationError.d.ts +8 -1
- package/dist/services/validate/ValidationError.js +10 -2
- package/dist/services/validate/ValidationError.js.map +1 -1
- package/dist/services/validate/drivers/YupDriver.js +44 -6
- package/dist/services/validate/drivers/YupDriver.js.map +1 -1
- package/dist/tests/setupFramework.d.ts +4 -1
- package/dist/tests/setupFramework.js +15 -9
- package/dist/tests/setupFramework.js.map +1 -1
- package/package.json +5 -5
|
@@ -5,10 +5,30 @@
|
|
|
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 { describeThrown } from '../../../helpers/logger.js';
|
|
8
9
|
import { translateWithDefault } from '../../../helpers/translate.js';
|
|
10
|
+
import { claimBuiltInResponse } from '../builtInResponse.js';
|
|
11
|
+
import { ExpressResponseWriter, releaseUnsentBody, } from '../ExpressResponseWriter.js';
|
|
12
|
+
import { FRAMEWORK_ERROR_CODES } from '../httpErrors.js';
|
|
13
|
+
import { HttpResponse } from '../responses.js';
|
|
9
14
|
import { getMatchedNode, MalformedPathError } from './match.js';
|
|
10
15
|
const instanceCache = new WeakMap();
|
|
11
|
-
|
|
16
|
+
const warnedDroppedResponse = new Set();
|
|
17
|
+
/** Once per handler: it called a framework handler and dropped its response. */
|
|
18
|
+
function warnDroppedResponse(entry) {
|
|
19
|
+
const name = `${entry.meta?.controllerClass ?? 'Controller'}.${entry.meta?.methodName ?? 'handler'}`;
|
|
20
|
+
if (warnedDroppedResponse.has(name)) {
|
|
21
|
+
return;
|
|
22
|
+
}
|
|
23
|
+
warnedDroppedResponse.add(name);
|
|
24
|
+
process.emitWarning(`${name} called a framework handler without returning its response; the response was sent anyway. Return it (\`return super.${entry.meta?.methodName ?? 'handler'}(req, res)\`): v6 will not send a response that was not returned.`, { type: 'DeprecationWarning', code: 'ASF_DEP_DROPPED_RESPONSE' });
|
|
25
|
+
}
|
|
26
|
+
/** @internal A failure for `next`: a falsy one would fall through to the 404. */
|
|
27
|
+
export function failure(reason) {
|
|
28
|
+
return (reason ||
|
|
29
|
+
new Error(`A handler or response write failed without a reason (${describeThrown(reason)})`));
|
|
30
|
+
}
|
|
31
|
+
export function createExpressAdapter(registry, app, writer = new ExpressResponseWriter()) {
|
|
12
32
|
const routeTemplates = new WeakMap();
|
|
13
33
|
const indexTemplates = () => registry.walk((node, path) => routeTemplates.set(node, path));
|
|
14
34
|
indexTemplates();
|
|
@@ -19,10 +39,13 @@ export function createExpressAdapter(registry, app) {
|
|
|
19
39
|
}
|
|
20
40
|
catch (err) {
|
|
21
41
|
if (err instanceof MalformedPathError) {
|
|
22
|
-
|
|
42
|
+
const malformed = HttpResponse.json(400, {
|
|
43
|
+
error: FRAMEWORK_ERROR_CODES.malformedUrl,
|
|
23
44
|
message: translateWithDefault(req, 'http.malformedUrl', 'Malformed URL'),
|
|
24
45
|
});
|
|
25
|
-
return
|
|
46
|
+
return writer
|
|
47
|
+
.write(malformed, req, res)
|
|
48
|
+
.catch((err) => next(failure(err)));
|
|
26
49
|
}
|
|
27
50
|
return next(err);
|
|
28
51
|
}
|
|
@@ -32,11 +55,13 @@ export function createExpressAdapter(registry, app) {
|
|
|
32
55
|
}
|
|
33
56
|
if (result.entry === null) {
|
|
34
57
|
// 405 — path matched, method didn't.
|
|
35
|
-
|
|
36
|
-
|
|
58
|
+
const notAllowed = HttpResponse.json(405, {
|
|
59
|
+
error: FRAMEWORK_ERROR_CODES.methodNotAllowed,
|
|
37
60
|
message: translateWithDefault(req, 'http.methodNotAllowed', 'Method not allowed'),
|
|
38
|
-
});
|
|
39
|
-
return
|
|
61
|
+
}, { headers: { Allow: result.allowedMethods.join(', ') } });
|
|
62
|
+
return writer
|
|
63
|
+
.write(notAllowed, req, res)
|
|
64
|
+
.catch((err) => next(failure(err)));
|
|
40
65
|
}
|
|
41
66
|
// Populate request with match metadata before middleware runs.
|
|
42
67
|
req.params = result.params;
|
|
@@ -67,10 +92,58 @@ export function createExpressAdapter(registry, app) {
|
|
|
67
92
|
return;
|
|
68
93
|
}
|
|
69
94
|
}
|
|
70
|
-
|
|
95
|
+
// The streams still piped into res (`pipe`, `pipeline`) when the handler
|
|
96
|
+
// returns. One may not have sent its headers yet: returning it as the
|
|
97
|
+
// response body is a write to res too.
|
|
98
|
+
const piped = new Set();
|
|
99
|
+
const onPipe = (source) => piped.add(source);
|
|
100
|
+
const onUnpipe = (source) => piped.delete(source);
|
|
101
|
+
res.on('pipe', onPipe);
|
|
102
|
+
res.on('unpipe', onUnpipe);
|
|
103
|
+
let returned;
|
|
104
|
+
try {
|
|
105
|
+
returned = await Promise.resolve(result.entry.handler(req, res, next));
|
|
106
|
+
}
|
|
107
|
+
finally {
|
|
108
|
+
res.off('pipe', onPipe);
|
|
109
|
+
res.off('unpipe', onUnpipe);
|
|
110
|
+
}
|
|
111
|
+
// Only a branded `HttpResponse` is rendered; any other return value is
|
|
112
|
+
// the legacy `res` style, which has already answered (or will).
|
|
113
|
+
if (HttpResponse.is(returned)) {
|
|
114
|
+
const pipedBody = returned.kind === 'stream' && piped.has(returned.body);
|
|
115
|
+
if (res.headersSent || pipedBody) {
|
|
116
|
+
// The response written to res stands. A returned stream that res may
|
|
117
|
+
// be sending keeps running; one nobody reads is destroyed.
|
|
118
|
+
app.logger?.error(`${req.method} ${req.route.path}: the handler both wrote to res and returned an HttpResponse. Use one or the other.`);
|
|
119
|
+
releaseUnsentBody(returned);
|
|
120
|
+
return;
|
|
121
|
+
}
|
|
122
|
+
await writer.write(returned, req, res);
|
|
123
|
+
}
|
|
124
|
+
else if (!res.headersSent) {
|
|
125
|
+
// An override that called a framework handler without returning its
|
|
126
|
+
// response would answer nothing. Transitional: removed in v6 (see
|
|
127
|
+
// `builtInResponse`).
|
|
128
|
+
const { entry } = result;
|
|
129
|
+
claimBuiltInResponse(req, res, (dropped) => {
|
|
130
|
+
if (!res.headersSent && !res.destroyed) {
|
|
131
|
+
warnDroppedResponse(entry);
|
|
132
|
+
// A late call runs outside the try below: a throw goes to `next` too.
|
|
133
|
+
try {
|
|
134
|
+
writer
|
|
135
|
+
.write(dropped, req, res)
|
|
136
|
+
.catch((err) => next(failure(err)));
|
|
137
|
+
}
|
|
138
|
+
catch (err) {
|
|
139
|
+
next(failure(err));
|
|
140
|
+
}
|
|
141
|
+
}
|
|
142
|
+
});
|
|
143
|
+
}
|
|
71
144
|
}
|
|
72
145
|
catch (err) {
|
|
73
|
-
next(err);
|
|
146
|
+
next(failure(err));
|
|
74
147
|
}
|
|
75
148
|
};
|
|
76
149
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ExpressAdapter.js","sourceRoot":"","sources":["../../../../src/services/http/routing/ExpressAdapter.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAGH,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"ExpressAdapter.js","sourceRoot":"","sources":["../../../../src/services/http/routing/ExpressAdapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -36,7 +36,10 @@ export class RouteRegistry {
|
|
|
36
36
|
}
|
|
37
37
|
// A handler's `paramNames` only covers params in its OWN path, not in the
|
|
38
38
|
// mount prefix. `match()` zips paramNames against ALL collected values by
|
|
39
|
-
// index, so prefix params must be prepended or the values mis-align.
|
|
39
|
+
// index, so prefix params must be prepended or the values mis-align. When a
|
|
40
|
+
// handler has no explicit per-method names, derive its local names from the
|
|
41
|
+
// subtree path before prepending; relying on tree names fails when sibling
|
|
42
|
+
// subtrees with different prefix names merge onto the same param node.
|
|
40
43
|
if (prefixParamNames.length > 0) {
|
|
41
44
|
prependParamNames(subtree, prefixParamNames);
|
|
42
45
|
}
|
|
@@ -132,29 +135,37 @@ export function ensureChildBySegment(node, segment) {
|
|
|
132
135
|
return child;
|
|
133
136
|
}
|
|
134
137
|
/**
|
|
135
|
-
*
|
|
136
|
-
*
|
|
137
|
-
*
|
|
138
|
+
* Give every handler the full parameter sequence. Explicit handler names take
|
|
139
|
+
* precedence for its local path; otherwise derive local names from the source
|
|
140
|
+
* subtree so merged sibling prefixes cannot leak their node's first name.
|
|
138
141
|
*/
|
|
139
|
-
function prependParamNames(node, prefixNames) {
|
|
142
|
+
function prependParamNames(node, prefixNames, localParamNames = []) {
|
|
140
143
|
if (node.methods) {
|
|
141
144
|
for (const m of Object.keys(node.methods)) {
|
|
142
145
|
const handler = node.methods[m];
|
|
143
|
-
if (handler
|
|
144
|
-
handler.paramNames = [
|
|
146
|
+
if (handler) {
|
|
147
|
+
handler.paramNames = [
|
|
148
|
+
...prefixNames,
|
|
149
|
+
...(handler.paramNames ?? localParamNames),
|
|
150
|
+
];
|
|
145
151
|
}
|
|
146
152
|
}
|
|
147
153
|
}
|
|
148
154
|
for (const child of node.children.values()) {
|
|
149
|
-
prependParamNames(child, prefixNames);
|
|
155
|
+
prependParamNames(child, prefixNames, localParamNamesForChild(child, localParamNames));
|
|
150
156
|
}
|
|
151
157
|
if (node.paramChild) {
|
|
152
|
-
prependParamNames(node.paramChild, prefixNames);
|
|
158
|
+
prependParamNames(node.paramChild, prefixNames, localParamNamesForChild(node.paramChild, localParamNames));
|
|
153
159
|
}
|
|
154
160
|
if (node.splatChild) {
|
|
155
|
-
prependParamNames(node.splatChild, prefixNames);
|
|
161
|
+
prependParamNames(node.splatChild, prefixNames, localParamNamesForChild(node.splatChild, localParamNames));
|
|
156
162
|
}
|
|
157
163
|
}
|
|
164
|
+
function localParamNamesForChild(child, names) {
|
|
165
|
+
return child.segment.startsWith(':') || child.segment.startsWith('*')
|
|
166
|
+
? [...names, child.segment.slice(1)]
|
|
167
|
+
: names;
|
|
168
|
+
}
|
|
158
169
|
function mergeNode(target, source) {
|
|
159
170
|
target.middlewares.push(...source.middlewares);
|
|
160
171
|
if (source.methods) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RouteRegistry.js","sourceRoot":"","sources":["../../../../src/services/http/routing/RouteRegistry.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAWnC,sDAAsD;AACtD,MAAM,UAAU,UAAU,CAAC,OAAe;IACxC,OAAO;QACL,OAAO;QACP,WAAW,EAAE,EAAE;QACf,QAAQ,EAAE,IAAI,GAAG,EAAE;KACpB,CAAC;AACJ,CAAC;AAED,MAAM,OAAO,aAAa;IACf,IAAI,GAAc,UAAU,CAAC,EAAE,CAAC,CAAC;IAE1C;;;;;;;;;OASG;IACH,eAAe,CAAC,MAAc,EAAE,OAAkB;QAChD,IAAI,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC;QACvB,MAAM,gBAAgB,GAAa,EAAE,CAAC;QACtC,KAAK,MAAM,GAAG,IAAI,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC;YACvC,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC/C,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YACtC,CAAC;YACD,MAAM,GAAG,oBAAoB,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QAC7C,CAAC;QACD,0EAA0E;QAC1E,0EAA0E;QAC1E,
|
|
1
|
+
{"version":3,"file":"RouteRegistry.js","sourceRoot":"","sources":["../../../../src/services/http/routing/RouteRegistry.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
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,
|
|
1
|
+
{"version":3,"file":"I18n.js","sourceRoot":"","sources":["../../../src/services/i18n/I18n.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,8 @@ type StringTranslationOptions = TranslationOptions & {
|
|
|
15
15
|
};
|
|
16
16
|
/** String-key translator; object/detail results must be narrowed by the caller. */
|
|
17
17
|
export interface TranslationFunction {
|
|
18
|
-
(key: string | string[]
|
|
18
|
+
(key: string | string[]): string;
|
|
19
|
+
(key: string | string[], options: StringTranslationOptions): string;
|
|
19
20
|
(key: string | string[], defaultValue: string): string;
|
|
20
21
|
(key: string | string[], defaultValue: string, options: StringTranslationOptions): string;
|
|
21
22
|
(key: string | string[], options: TranslationOptions): unknown;
|
|
@@ -9,6 +9,12 @@ import type { ValidationIssue } from './types.ts';
|
|
|
9
9
|
* of which validator produced the error.
|
|
10
10
|
*/
|
|
11
11
|
export type ValidationErrorPayload = Record<string, string | string[]>;
|
|
12
|
+
/**
|
|
13
|
+
* `Error` at runtime, typed without `message`, so `ValidationError` can widen
|
|
14
|
+
* `message` to its payload in a declaration that checks under
|
|
15
|
+
* `skipLibCheck: false` (a `@ts-expect-error` would not reach the `.d.ts`).
|
|
16
|
+
*/
|
|
17
|
+
declare const ErrorWithPayloadMessage: new (message?: string) => Omit<Error, 'message'>;
|
|
12
18
|
/**
|
|
13
19
|
* Framework-owned validation error. Replaces yup's `ValidationError` at the
|
|
14
20
|
* framework layer.
|
|
@@ -22,7 +28,7 @@ export type ValidationErrorPayload = Record<string, string | string[]>;
|
|
|
22
28
|
* `.issues` is the canonical list (one entry per field/message pair) that
|
|
23
29
|
* non-wire consumers (logging, observability) should iterate.
|
|
24
30
|
*/
|
|
25
|
-
export declare class ValidationError extends
|
|
31
|
+
export declare class ValidationError extends ErrorWithPayloadMessage {
|
|
26
32
|
issues: ValidationIssue[];
|
|
27
33
|
message: ValidationErrorPayload;
|
|
28
34
|
constructor(payload: ValidationErrorPayload | ReadonlyArray<ValidationIssue>);
|
|
@@ -47,3 +53,4 @@ export declare function issuesToPayload(issues: ReadonlyArray<ValidationIssue>):
|
|
|
47
53
|
* resolve arbitrary keys out of the loaded translation bundle.
|
|
48
54
|
*/
|
|
49
55
|
export declare function translateIssues(issues: ReadonlyArray<ValidationIssue>, t: TranslationFunction): ValidationIssue[];
|
|
56
|
+
export {};
|
|
@@ -1,3 +1,9 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* `Error` at runtime, typed without `message`, so `ValidationError` can widen
|
|
3
|
+
* `message` to its payload in a declaration that checks under
|
|
4
|
+
* `skipLibCheck: false` (a `@ts-expect-error` would not reach the `.d.ts`).
|
|
5
|
+
*/
|
|
6
|
+
const ErrorWithPayloadMessage = Error;
|
|
1
7
|
/**
|
|
2
8
|
* Framework-owned validation error. Replaces yup's `ValidationError` at the
|
|
3
9
|
* framework layer.
|
|
@@ -11,7 +17,7 @@
|
|
|
11
17
|
* `.issues` is the canonical list (one entry per field/message pair) that
|
|
12
18
|
* non-wire consumers (logging, observability) should iterate.
|
|
13
19
|
*/
|
|
14
|
-
export class ValidationError extends
|
|
20
|
+
export class ValidationError extends ErrorWithPayloadMessage {
|
|
15
21
|
issues;
|
|
16
22
|
constructor(payload) {
|
|
17
23
|
super();
|
|
@@ -116,7 +122,9 @@ export function translateIssues(issues, t) {
|
|
|
116
122
|
// 2-arg form: the message IS the key; if it isn't loaded i18next returns
|
|
117
123
|
// the key string unchanged. `params` supplies interpolation values for the
|
|
118
124
|
// (trusted, app-authored) translation string.
|
|
119
|
-
message:
|
|
125
|
+
message: (issue.params
|
|
126
|
+
? t(issue.message, issue.params)
|
|
127
|
+
: t(issue.message)),
|
|
120
128
|
};
|
|
121
129
|
});
|
|
122
130
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ValidationError.js","sourceRoot":"","sources":["../../../src/services/validate/ValidationError.ts"],"names":[],"mappings":"AAaA;;;;;;;;;;;;GAYG;AACH,MAAM,OAAO,eAAgB,SAAQ,
|
|
1
|
+
{"version":3,"file":"ValidationError.js","sourceRoot":"","sources":["../../../src/services/validate/ValidationError.ts"],"names":[],"mappings":"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"}
|
|
@@ -36,6 +36,9 @@ export const yupDriver = {
|
|
|
36
36
|
if (isYupValidationError(e)) {
|
|
37
37
|
throw fromYupError(e);
|
|
38
38
|
}
|
|
39
|
+
if (e instanceof TypeError) {
|
|
40
|
+
throw (await shapeTypeErrors(body, data)) ?? e;
|
|
41
|
+
}
|
|
39
42
|
throw e;
|
|
40
43
|
}
|
|
41
44
|
},
|
|
@@ -54,6 +57,40 @@ export const yupDriver = {
|
|
|
54
57
|
}
|
|
55
58
|
},
|
|
56
59
|
};
|
|
60
|
+
/**
|
|
61
|
+
* A transform that assumes its type (`string().trim()`, `.lowercase()`) throws
|
|
62
|
+
* a `TypeError` when a client sends an array or object. Re-check without
|
|
63
|
+
* transforms: type errors on such values become a `ValidationError`. Anything
|
|
64
|
+
* else (e.g. a `.test()` that throws again) yields `undefined`, so the caller
|
|
65
|
+
* rethrows its original error.
|
|
66
|
+
*/
|
|
67
|
+
async function shapeTypeErrors(schema, data) {
|
|
68
|
+
try {
|
|
69
|
+
await schema.validate(data, { strict: true, abortEarly: false });
|
|
70
|
+
}
|
|
71
|
+
catch (e) {
|
|
72
|
+
if (!isYupValidationError(e)) {
|
|
73
|
+
return undefined;
|
|
74
|
+
}
|
|
75
|
+
// Strict mode also rejects castable input (`'42'` for `number()`), so keep
|
|
76
|
+
// only the values no cast accepts.
|
|
77
|
+
const inner = (e.inner ?? []).filter((issue) => issue.type === 'typeError' && isArrayOrPlainObject(issue.value));
|
|
78
|
+
if (inner.length > 0) {
|
|
79
|
+
return fromYupError({ ...e, inner });
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
return undefined;
|
|
83
|
+
}
|
|
84
|
+
function isArrayOrPlainObject(value) {
|
|
85
|
+
if (Array.isArray(value)) {
|
|
86
|
+
return true;
|
|
87
|
+
}
|
|
88
|
+
if (typeof value !== 'object' || value === null) {
|
|
89
|
+
return false;
|
|
90
|
+
}
|
|
91
|
+
const proto = Object.getPrototypeOf(value);
|
|
92
|
+
return proto === Object.prototype || proto === null;
|
|
93
|
+
}
|
|
57
94
|
function isYupValidationError(e) {
|
|
58
95
|
return (typeof e === 'object' &&
|
|
59
96
|
e !== null &&
|
|
@@ -76,17 +113,18 @@ function fromYupError(e) {
|
|
|
76
113
|
return new ValidationError(issues);
|
|
77
114
|
}
|
|
78
115
|
/**
|
|
79
|
-
* Drop
|
|
80
|
-
* value
|
|
81
|
-
*
|
|
82
|
-
*
|
|
83
|
-
* are
|
|
116
|
+
* Drop submitted input from yup's `params`. Yup echoes the offending value in
|
|
117
|
+
* `value`/`originalValue`, and `oneOf`/`notOneOf` put the values a `ref()`
|
|
118
|
+
* resolves to (e.g. the password a `repeatPassword` must match) in `resolved`;
|
|
119
|
+
* surfacing them on `.issues` would leak input into anything that logs issues.
|
|
120
|
+
* `spec`/`disableStackTrace` are schema internals. The interpolation params
|
|
121
|
+
* (`min`, `max`, `length`, `values`, …) are kept so i18n placeholders resolve.
|
|
84
122
|
*/
|
|
85
123
|
function sanitizeParams(params) {
|
|
86
124
|
if (!params) {
|
|
87
125
|
return undefined;
|
|
88
126
|
}
|
|
89
|
-
const { value, originalValue, ...safe } = params;
|
|
127
|
+
const { value, originalValue, resolved, spec, disableStackTrace, ...safe } = params;
|
|
90
128
|
return safe;
|
|
91
129
|
}
|
|
92
130
|
function describeToJsonSchema(desc) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"YupDriver.js","sourceRoot":"","sources":["../../../../src/services/validate/drivers/YupDriver.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,CAAC,MAAM,SAAS,GAAoB;IACxC,SAAS,CAAC,IAAa;QACrB,OAAO,CACL,OAAO,IAAI,KAAK,QAAQ;YACxB,IAAI,KAAK,IAAI;YACb,WAAW,IAAI,IAAI;YAClB,IAAyB,CAAC,WAAW,CAAC,EAAE,MAAM,KAAK,KAAK,CAC1D,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,IAAa,EAAE,IAAa;
|
|
1
|
+
{"version":3,"file":"YupDriver.js","sourceRoot":"","sources":["../../../../src/services/validate/drivers/YupDriver.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,CAAC,MAAM,SAAS,GAAoB;IACxC,SAAS,CAAC,IAAa;QACrB,OAAO,CACL,OAAO,IAAI,KAAK,QAAQ;YACxB,IAAI,KAAK,IAAI;YACb,WAAW,IAAI,IAAI;YAClB,IAAyB,CAAC,WAAW,CAAC,EAAE,MAAM,KAAK,KAAK,CAC1D,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,IAAa,EAAE,IAAa;QACzC,IAAI,CAAC;YACH,OAAO,MAAO,IAAsB,CAAC,QAAQ,CAAC,IAAI,EAAE;gBAClD,YAAY,EAAE,IAAI;gBAClB,UAAU,EAAE,KAAK;aAClB,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,CAAU,EAAE,CAAC;YACpB,IAAI,oBAAoB,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC5B,MAAM,YAAY,CAAC,CAAC,CAAC,CAAC;YACxB,CAAC;YACD,IAAI,CAAC,YAAY,SAAS,EAAE,CAAC;gBAC3B,MAAM,CAAC,MAAM,eAAe,CAAC,IAAqB,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC;YAClE,CAAC;YACD,MAAM,CAAC,CAAC;QACV,CAAC;IACH,CAAC;IAED,YAAY,CAAC,IAAa;QACxB,MAAM,QAAQ,GAAI,IAA4C,CAAC,QAAQ,CAAC;QACxE,IAAI,OAAO,QAAQ,KAAK,UAAU,EAAE,CAAC;YACnC,OAAO,IAAI,CAAC;QACd,CAAC;QACD,IAAI,CAAC;YACH,OAAO,oBAAoB,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QACnD,CAAC;QAAC,MAAM,CAAC;YACP,wEAAwE;YACxE,iEAAiE;YACjE,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;CACF,CAAC;AAoBF;;;;;;GAMG;AACH,KAAK,UAAU,eAAe,CAC5B,MAAqB,EACrB,IAAa;IAEb,IAAI,CAAC;QACH,MAAM,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,CAAC;IACnE,CAAC;IAAC,OAAO,CAAU,EAAE,CAAC;QACpB,IAAI,CAAC,oBAAoB,CAAC,CAAC,CAAC,EAAE,CAAC;YAC7B,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,2EAA2E;QAC3E,mCAAmC;QACnC,MAAM,KAAK,GAAG,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,MAAM,CAClC,CAAC,KAAK,EAAE,EAAE,CACR,KAAK,CAAC,IAAI,KAAK,WAAW,IAAI,oBAAoB,CAAC,KAAK,CAAC,KAAK,CAAC,CAClE,CAAC;QACF,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACrB,OAAO,YAAY,CAAC,EAAE,GAAG,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;QACvC,CAAC;IACH,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,oBAAoB,CAAC,KAAc;IAC1C,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;QAChD,OAAO,KAAK,CAAC;IACf,CAAC;IACD,MAAM,KAAK,GAAG,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;IAC3C,OAAO,KAAK,KAAK,MAAM,CAAC,SAAS,IAAI,KAAK,KAAK,IAAI,CAAC;AACtD,CAAC;AAED,SAAS,oBAAoB,CAAC,CAAU;IACtC,OAAO,CACL,OAAO,CAAC,KAAK,QAAQ;QACrB,CAAC,KAAK,IAAI;QACT,CAAwB,CAAC,IAAI,KAAK,iBAAiB;QACpD,KAAK,CAAC,OAAO,CAAE,CAAyB,CAAC,KAAK,CAAC,CAChD,CAAC;AACJ,CAAC;AAED,SAAS,YAAY,CAAC,CAA0B;IAC9C,MAAM,MAAM,GAAsB,EAAE,CAAC;IACrC,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAE5E,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,MAAM,IAAI,GAA4B,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAC5E,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC;YAC1C,CAAC,CAAC,KAAK,CAAC,MAAM;YACd,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACpB,MAAM,MAAM,GAAG,cAAc,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAC5C,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;YAC/B,MAAM,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;QACzC,CAAC;IACH,CAAC;IAED,OAAO,IAAI,eAAe,CAAC,MAAM,CAAC,CAAC;AACrC,CAAC;AAED;;;;;;;GAOG;AACH,SAAS,cAAc,CACrB,MAAgC;IAEhC,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,MAAM,EAAE,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,IAAI,EAAE,iBAAiB,EAAE,GAAG,IAAI,EAAE,GACxE,MAAM,CAAC;IACT,OAAO,IAAI,CAAC;AACd,CAAC;AAyBD,SAAS,oBAAoB,CAAC,IAAoB;IAChD,MAAM,MAAM,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;IAChC,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACvD,MAAM,CAAC,IAAI,GAAG,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC;IAChC,CAAC;IACD,+EAA+E;IAC/E,mEAAmE;IACnE,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS,IAAI,IAAI,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QACzD,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;IAChC,CAAC;IACD,MAAM,WAAW,GACf,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,CAAC,IAAI,CAAC,WAAW,KAAK,QAAQ;QACpD,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW;QACvB,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC;IACjB,IAAI,WAAW,EAAE,CAAC;QAChB,MAAM,CAAC,WAAW,GAAG,WAAW,CAAC;IACnC,CAAC;IACD,OAAO,aAAa,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;AACrC,CAAC;AAED,SAAS,UAAU,CAAC,IAAoB;IACtC,QAAQ,IAAI,CAAC,IAAI,EAAE,CAAC;QAClB,KAAK,QAAQ,EAAE,CAAC;YACd,MAAM,UAAU,GAA+B,EAAE,CAAC;YAClD,MAAM,QAAQ,GAAa,EAAE,CAAC;YAC9B,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,IAAI,EAAE,CAAC,EAAE,CAAC;gBAC7D,UAAU,CAAC,GAAG,CAAC,GAAG,oBAAoB,CAAC,KAAK,CAAC,CAAC;gBAC9C,IAAI,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;oBACtB,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBACrB,CAAC;YACH,CAAC;YACD,MAAM,GAAG,GAAe,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC;YACvD,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACxB,GAAG,CAAC,QAAQ,GAAG,QAAQ,CAAC;YAC1B,CAAC;YACD,OAAO,GAAG,CAAC;QACb,CAAC;QACD,KAAK,OAAO,EAAE,CAAC;YACb,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC;gBACzC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;gBACnB,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC;YACnB,OAAO;gBACL,IAAI,EAAE,OAAO;gBACb,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE;aAChD,CAAC;QACJ,CAAC;QACD,KAAK,QAAQ;YACX,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;QAC5B,KAAK,QAAQ;YACX,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;QACnE,KAAK,SAAS;YACZ,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;QAC7B,KAAK,MAAM;YACT,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC;QACjD,KAAK,MAAM;YACT,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC;QAC9C;YACE,2DAA2D;YAC3D,OAAO,EAAE,CAAC;IACd,CAAC;AACH,CAAC;AAED,SAAS,UAAU,CAAC,IAAoB;IACtC,IAAI,IAAI,CAAC,QAAQ,KAAK,KAAK,EAAE,CAAC;QAC5B,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,OAAO,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,OAAO,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;AAC/D,CAAC;AAED,SAAS,OAAO,CAAC,IAAoB,EAAE,IAAY;IACjD,OAAO,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,KAAK,IAAI,CAAC,CAAC;AAC/E,CAAC;AAED,qEAAqE;AACrE,SAAS,aAAa,CAAC,MAAkB,EAAE,IAAoB;IAC7D,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;QACnB,OAAO,MAAM,CAAC;IAChB,CAAC;IACD,IAAI,OAAO,MAAM,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QACpC,OAAO,EAAE,GAAG,MAAM,EAAE,IAAI,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,CAAC;IACpD,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC"}
|
|
@@ -31,7 +31,10 @@ export declare function stopTestMongo(): Promise<void>;
|
|
|
31
31
|
export declare function ensureTestServerReady(): Promise<Server>;
|
|
32
32
|
/** Start the per-file test server through the idempotent readiness gate. */
|
|
33
33
|
export declare function startTestServer(): Promise<Server>;
|
|
34
|
-
/**
|
|
34
|
+
/**
|
|
35
|
+
* Shut down the server, drop its database, and disconnect mongoose. A failed
|
|
36
|
+
* drop is rethrown after the connection is closed.
|
|
37
|
+
*/
|
|
35
38
|
export declare function stopTestServer(): Promise<void>;
|
|
36
39
|
/** Point the cache/rate-limiter keyspace at a fresh random namespace. */
|
|
37
40
|
export declare function setTestRedisNamespace(): void;
|
|
@@ -111,19 +111,25 @@ export function ensureTestServerReady() {
|
|
|
111
111
|
export function startTestServer() {
|
|
112
112
|
return ensureTestServerReady();
|
|
113
113
|
}
|
|
114
|
-
/**
|
|
114
|
+
/**
|
|
115
|
+
* Shut down the server, drop its database, and disconnect mongoose. A failed
|
|
116
|
+
* drop is rethrown after the connection is closed.
|
|
117
|
+
*/
|
|
115
118
|
export async function stopTestServer() {
|
|
116
|
-
|
|
117
|
-
serverInstance.app.httpServer?.shutdown();
|
|
118
|
-
serverInstance.app.events.emit('shutdown');
|
|
119
|
-
}
|
|
119
|
+
await serverInstance?.app.httpServer?.shutdown();
|
|
120
120
|
try {
|
|
121
|
-
|
|
121
|
+
if (mongoose.connection.readyState === mongoose.ConnectionStates.connected) {
|
|
122
|
+
// Compiled models create their collections in the background. A build
|
|
123
|
+
// still running after the drop would recreate the database.
|
|
124
|
+
await Promise.allSettled(Object.values(mongoose.connection.models).map((model) => model.init()));
|
|
125
|
+
await mongoose.connection.dropDatabase();
|
|
126
|
+
}
|
|
122
127
|
}
|
|
123
|
-
|
|
124
|
-
//
|
|
128
|
+
finally {
|
|
129
|
+
// Model shutdown listeners close the connection synchronously; drop first.
|
|
130
|
+
serverInstance?.app.events.emit('shutdown');
|
|
131
|
+
await mongoose.disconnect();
|
|
125
132
|
}
|
|
126
|
-
await mongoose.disconnect();
|
|
127
133
|
}
|
|
128
134
|
// ── Per-test redis namespace isolation ──────────────────────────────────────
|
|
129
135
|
/** Point the cache/rate-limiter keyspace at a fresh random namespace. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setupFramework.js","sourceRoot":"","sources":["../../src/tests/setupFramework.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"setupFramework.js","sourceRoot":"","sources":["../../src/tests/setupFramework.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@adaptivestone/framework",
|
|
3
|
-
"version": "5.
|
|
3
|
+
"version": "5.7.0",
|
|
4
4
|
"description": "Adaptive stone node js framework",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"engines": {
|
|
@@ -79,11 +79,11 @@
|
|
|
79
79
|
"@types/express": "^5.0.1",
|
|
80
80
|
"@types/formidable": "^3.4.5",
|
|
81
81
|
"@types/node": "^26.0.0",
|
|
82
|
-
"i18next": "^
|
|
82
|
+
"i18next": "^27.1.1",
|
|
83
83
|
"i18next-fs-backend": "^2.0.0",
|
|
84
84
|
"lefthook": "^2.0.0",
|
|
85
85
|
"mongodb-memory-server": "^11.0.0",
|
|
86
|
-
"oxc-parser": "^0.
|
|
86
|
+
"oxc-parser": "^0.159.0",
|
|
87
87
|
"typescript": "^7.0.2",
|
|
88
88
|
"vitest": "^5.0.3",
|
|
89
89
|
"yup": "^1.7.0",
|
|
@@ -94,10 +94,10 @@
|
|
|
94
94
|
"@redis/client": "^6.0.0",
|
|
95
95
|
"@sentry/core": "^10.34.0 || ^11.0.0",
|
|
96
96
|
"@sentry/node": "^10.34.0 || ^11.0.0",
|
|
97
|
-
"i18next": "^26.0.1",
|
|
97
|
+
"i18next": "^26.0.1 || ^27.0.0",
|
|
98
98
|
"i18next-fs-backend": "^2.0.0",
|
|
99
99
|
"mongodb-memory-server": "^11.0.0",
|
|
100
|
-
"oxc-parser": "
|
|
100
|
+
"oxc-parser": ">=0.156.0 <1",
|
|
101
101
|
"vitest": "^4.0.0 || ^5.0.0",
|
|
102
102
|
"yup": "^1.7.0",
|
|
103
103
|
"zod": "^3.24.0 || ^4.0.0"
|