@adaptivestone/framework 5.3.2 → 5.4.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/AGENTS.md +37 -0
- package/CHANGELOG.md +109 -0
- package/CLAUDE.md +1 -0
- package/README.md +34 -1
- package/dist/controllers/Auth.js +103 -33
- package/dist/controllers/Auth.js.map +1 -1
- package/dist/helpers/translate.d.ts +11 -0
- package/dist/helpers/translate.js +14 -0
- package/dist/helpers/translate.js.map +1 -0
- package/dist/locales/en/translation.json +1 -27
- package/dist/locales/ru/translation.json +3 -7
- package/dist/models/User.d.ts +3 -4
- package/dist/models/User.js +8 -0
- package/dist/models/User.js.map +1 -1
- package/dist/models/UserOld.js +8 -0
- package/dist/models/UserOld.js.map +1 -1
- package/dist/modules/BaseModel.d.ts +18 -3
- package/dist/modules/BaseModel.js.map +1 -1
- package/dist/services/http/HttpServer.js +9 -4
- package/dist/services/http/HttpServer.js.map +1 -1
- package/dist/services/http/middleware/AbstractMiddleware.d.ts +8 -0
- package/dist/services/http/middleware/AbstractMiddleware.js +11 -0
- package/dist/services/http/middleware/AbstractMiddleware.js.map +1 -1
- package/dist/services/http/middleware/Auth.js +1 -1
- package/dist/services/http/middleware/Auth.js.map +1 -1
- package/dist/services/http/middleware/I18n.js +6 -1
- package/dist/services/http/middleware/I18n.js.map +1 -1
- package/dist/services/http/middleware/RateLimiter.js +3 -1
- package/dist/services/http/middleware/RateLimiter.js.map +1 -1
- package/dist/services/http/middleware/RequestParser.js +3 -3
- package/dist/services/http/middleware/RequestParser.js.map +1 -1
- package/dist/services/http/middleware/Role.js +6 -2
- package/dist/services/http/middleware/Role.js.map +1 -1
- package/dist/services/i18n/I18n.d.ts +12 -0
- package/dist/services/i18n/I18n.js +73 -6
- package/dist/services/i18n/I18n.js.map +1 -1
- package/dist/services/messaging/email/escapeHtml.d.ts +6 -0
- package/dist/services/messaging/email/escapeHtml.js +12 -0
- package/dist/services/messaging/email/escapeHtml.js.map +1 -0
- package/dist/services/messaging/email/templates/recovery/html.d.ts +3 -0
- package/dist/services/messaging/email/templates/recovery/html.js +20 -0
- package/dist/services/messaging/email/templates/recovery/html.js.map +1 -0
- package/dist/services/messaging/email/templates/recovery/subject.d.ts +3 -0
- package/dist/services/messaging/email/templates/recovery/subject.js +3 -0
- package/dist/services/messaging/email/templates/recovery/subject.js.map +1 -0
- package/dist/services/messaging/email/templates/recovery/text.d.ts +3 -0
- package/dist/services/messaging/email/templates/recovery/text.js +15 -0
- package/dist/services/messaging/email/templates/recovery/text.js.map +1 -0
- package/dist/services/messaging/email/templates/verification/html.d.ts +3 -0
- package/dist/services/messaging/email/templates/verification/html.js +23 -0
- package/dist/services/messaging/email/templates/verification/html.js.map +1 -0
- package/dist/services/messaging/email/templates/verification/subject.d.ts +3 -0
- package/dist/services/messaging/email/templates/verification/subject.js +3 -0
- package/dist/services/messaging/email/templates/verification/subject.js.map +1 -0
- package/dist/services/messaging/email/templates/verification/text.d.ts +3 -0
- package/dist/services/messaging/email/templates/verification/text.js +15 -0
- package/dist/services/messaging/email/templates/verification/text.js.map +1 -0
- package/dist/services/messaging/email/types.d.ts +28 -0
- package/dist/services/messaging/email/types.js +2 -0
- package/dist/services/messaging/email/types.js.map +1 -0
- package/dist/tests/assertions.d.ts +4 -2
- package/dist/tests/assertions.js.map +1 -1
- package/dist/tests/mocks.d.ts +7 -0
- package/dist/tests/mocks.js +9 -0
- package/dist/tests/mocks.js.map +1 -1
- package/dist/tests/setupFramework.d.ts +4 -0
- package/dist/tests/setupFramework.js +8 -1
- package/dist/tests/setupFramework.js.map +1 -1
- package/dist/tests/setupNodeTest.js +7 -0
- package/dist/tests/setupNodeTest.js.map +1 -1
- package/dist/tests/testHelpers.d.ts +28 -8
- package/dist/tests/testHelpers.js +29 -0
- package/dist/tests/testHelpers.js.map +1 -1
- package/package.json +20 -8
- package/tsconfig.tests.json +14 -0
- package/dist/services/messaging/email/templates/.gitkeep +0 -0
- package/dist/services/messaging/email/templates/recovery/html.pug +0 -8
- package/dist/services/messaging/email/templates/recovery/subject.pug +0 -2
- package/dist/services/messaging/email/templates/recovery/text.pug +0 -3
- package/dist/services/messaging/email/templates/verification/html.pug +0 -10
- package/dist/services/messaging/email/templates/verification/subject.pug +0 -1
- package/dist/services/messaging/email/templates/verification/text.pug +0 -1
|
@@ -1,10 +1,48 @@
|
|
|
1
1
|
import Base from '../../modules/Base.js';
|
|
2
|
+
const MISSING_I18NEXT_MESSAGE = 'Loading translations requires the optional peer dependencies `i18next` and ' +
|
|
3
|
+
'`i18next-fs-backend`, which are not installed. Add them:\n\n' +
|
|
4
|
+
' npm i i18next i18next-fs-backend\n\n' +
|
|
5
|
+
'or set `enabled: false` in your `config/i18n.ts` if you do not translate. ' +
|
|
6
|
+
'Framework messages stay English either way.';
|
|
7
|
+
/** Thrown when `i18n.enabled` is true but the optional packages are absent. */
|
|
8
|
+
class MissingI18nextError extends Error {
|
|
9
|
+
name = 'MissingI18nextError';
|
|
10
|
+
}
|
|
11
|
+
/**
|
|
12
|
+
* Load the optional i18next packages, mapping a missing install to one clear,
|
|
13
|
+
* actionable error instead of a bare `ERR_MODULE_NOT_FOUND`. Any other failure
|
|
14
|
+
* (a broken install, an i18next-side error) propagates unchanged.
|
|
15
|
+
*/
|
|
16
|
+
async function loadI18next() {
|
|
17
|
+
try {
|
|
18
|
+
const [{ default: i18next }, { default: BackendFS }] = await Promise.all([
|
|
19
|
+
import('i18next'), // Speed optimisation
|
|
20
|
+
import('i18next-fs-backend'), // Speed optimisation
|
|
21
|
+
]);
|
|
22
|
+
return { i18next, BackendFS };
|
|
23
|
+
}
|
|
24
|
+
catch (cause) {
|
|
25
|
+
if (cause?.code === 'ERR_MODULE_NOT_FOUND') {
|
|
26
|
+
throw new MissingI18nextError(MISSING_I18NEXT_MESSAGE, { cause });
|
|
27
|
+
}
|
|
28
|
+
throw cause;
|
|
29
|
+
}
|
|
30
|
+
}
|
|
2
31
|
export class I18n extends Base {
|
|
3
32
|
#cache = {};
|
|
4
33
|
#i18nBase;
|
|
5
34
|
#i18nBasePromise;
|
|
35
|
+
#missingReported = false;
|
|
36
|
+
/**
|
|
37
|
+
* Translator used when i18n is disabled. Honours both i18next default-value
|
|
38
|
+
* overloads (`t(key, 'default')` and `t(key, { defaultValue })`) so framework
|
|
39
|
+
* messages emitted with an in-code English default stay English instead of
|
|
40
|
+
* leaking the raw key. A call with no default keeps returning the key.
|
|
41
|
+
*/
|
|
6
42
|
#i18nFallback = {
|
|
7
|
-
t: ((
|
|
43
|
+
t: ((key, options) => typeof options === 'string'
|
|
44
|
+
? options
|
|
45
|
+
: (options?.defaultValue ?? key)),
|
|
8
46
|
language: 'en',
|
|
9
47
|
};
|
|
10
48
|
async getI18nForLang(lang) {
|
|
@@ -17,23 +55,33 @@ export class I18n extends Base {
|
|
|
17
55
|
lang = i18NConfig.fallbackLng;
|
|
18
56
|
}
|
|
19
57
|
if (!this.#cache[lang]) {
|
|
20
|
-
|
|
58
|
+
const i18nBase = await this.getI18nBaseInstanceIfAvailable();
|
|
59
|
+
if (!i18nBase) {
|
|
60
|
+
// i18next is not installed: serve the in-code English defaults rather
|
|
61
|
+
// than failing the request. Reported once by the call above.
|
|
62
|
+
return this.#i18nFallback;
|
|
63
|
+
}
|
|
64
|
+
this.#cache[lang] = i18nBase.cloneInstance({
|
|
21
65
|
initAsync: false,
|
|
22
66
|
lng: lang,
|
|
23
67
|
});
|
|
24
68
|
}
|
|
25
69
|
return this.#cache[lang];
|
|
26
70
|
}
|
|
71
|
+
/**
|
|
72
|
+
* Base i18next instance, initialised on first use.
|
|
73
|
+
*
|
|
74
|
+
* @throws when the optional `i18next`/`i18next-fs-backend` packages are not
|
|
75
|
+
* installed — use `getI18nBaseInstanceIfAvailable()` where falling back to
|
|
76
|
+
* the framework's English defaults is the better answer.
|
|
77
|
+
*/
|
|
27
78
|
async getI18nBaseInstance() {
|
|
28
79
|
if (this.#i18nBase) {
|
|
29
80
|
return this.#i18nBase;
|
|
30
81
|
}
|
|
31
82
|
if (!this.#i18nBasePromise) {
|
|
32
83
|
this.#i18nBasePromise = (async () => {
|
|
33
|
-
const
|
|
34
|
-
import('i18next'), // Speed optimisation
|
|
35
|
-
import('i18next-fs-backend'), // Speed optimisation
|
|
36
|
-
]);
|
|
84
|
+
const { i18next, BackendFS } = await loadI18next();
|
|
37
85
|
const i18NConfig = this.app.getConfig('i18n');
|
|
38
86
|
await i18next.use(BackendFS).init({
|
|
39
87
|
backend: {
|
|
@@ -51,6 +99,25 @@ export class I18n extends Base {
|
|
|
51
99
|
}
|
|
52
100
|
return this.#i18nBasePromise;
|
|
53
101
|
}
|
|
102
|
+
/**
|
|
103
|
+
* Base i18next instance, or `null` when the optional packages are missing —
|
|
104
|
+
* logged once, not per request. Any other initialisation failure still throws.
|
|
105
|
+
*/
|
|
106
|
+
async getI18nBaseInstanceIfAvailable() {
|
|
107
|
+
try {
|
|
108
|
+
return await this.getI18nBaseInstance();
|
|
109
|
+
}
|
|
110
|
+
catch (e) {
|
|
111
|
+
if (!(e instanceof MissingI18nextError)) {
|
|
112
|
+
throw e;
|
|
113
|
+
}
|
|
114
|
+
if (!this.#missingReported) {
|
|
115
|
+
this.#missingReported = true;
|
|
116
|
+
this.logger?.warn(e.message);
|
|
117
|
+
}
|
|
118
|
+
return null;
|
|
119
|
+
}
|
|
120
|
+
}
|
|
54
121
|
static get loggerGroup() {
|
|
55
122
|
return 'I18n_';
|
|
56
123
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"I18n.js","sourceRoot":"","sources":["../../../src/services/i18n/I18n.ts"],"names":[],"mappings":"AAEA,OAAO,IAAI,MAAM,uBAAuB,CAAC;AAIzC,MAAM,OAAO,IAAK,SAAQ,IAAI;IAC5B,MAAM,GAA4B,EAAE,CAAC;IAErC,SAAS,CAAQ;IACjB,gBAAgB,CAAiB;
|
|
1
|
+
{"version":3,"file":"I18n.js","sourceRoot":"","sources":["../../../src/services/i18n/I18n.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Escape a value interpolated into the HTML body of an email template. Template
|
|
3
|
+
* modules build markup as plain strings, so the escaping a template language
|
|
4
|
+
* did implicitly has to be explicit here.
|
|
5
|
+
*/
|
|
6
|
+
export declare const escapeHtml: (value: unknown) => string;
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Escape a value interpolated into the HTML body of an email template. Template
|
|
3
|
+
* modules build markup as plain strings, so the escaping a template language
|
|
4
|
+
* did implicitly has to be explicit here.
|
|
5
|
+
*/
|
|
6
|
+
export const escapeHtml = (value) => String(value ?? '')
|
|
7
|
+
.replaceAll('&', '&')
|
|
8
|
+
.replaceAll('<', '<')
|
|
9
|
+
.replaceAll('>', '>')
|
|
10
|
+
.replaceAll('"', '"')
|
|
11
|
+
.replaceAll("'", ''');
|
|
12
|
+
//# sourceMappingURL=escapeHtml.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"escapeHtml.js","sourceRoot":"","sources":["../../../../src/services/messaging/email/escapeHtml.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,KAAc,EAAU,EAAE,CACnD,MAAM,CAAC,KAAK,IAAI,EAAE,CAAC;KAChB,UAAU,CAAC,GAAG,EAAE,OAAO,CAAC;KACxB,UAAU,CAAC,GAAG,EAAE,MAAM,CAAC;KACvB,UAAU,CAAC,GAAG,EAAE,MAAM,CAAC;KACvB,UAAU,CAAC,GAAG,EAAE,QAAQ,CAAC;KACzB,UAAU,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC"}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import { escapeHtml } from '../../escapeHtml.js';
|
|
2
|
+
const html = ({ t, link, locale }) => {
|
|
3
|
+
const heading = t('email.passwordRecovery', {
|
|
4
|
+
defaultValue: 'Recovery password',
|
|
5
|
+
});
|
|
6
|
+
const body = t('email.passwordChanged', { defaultValue: 'Password changed' });
|
|
7
|
+
return `<!DOCTYPE html>
|
|
8
|
+
<html lang="${escapeHtml(locale || 'en')}">
|
|
9
|
+
<head>
|
|
10
|
+
<meta charset="UTF-8" />
|
|
11
|
+
</head>
|
|
12
|
+
<body>
|
|
13
|
+
<h1>${escapeHtml(heading)}</h1>
|
|
14
|
+
<p>${escapeHtml(body)} ${escapeHtml(link)}</p>
|
|
15
|
+
</body>
|
|
16
|
+
</html>
|
|
17
|
+
`;
|
|
18
|
+
};
|
|
19
|
+
export default html;
|
|
20
|
+
//# sourceMappingURL=html.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"html.js","sourceRoot":"","sources":["../../../../../../src/services/messaging/email/templates/recovery/html.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAGjD,MAAM,IAAI,GAAmB,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE;IACnD,MAAM,OAAO,GAAG,CAAC,CAAC,wBAAwB,EAAE;QAC1C,YAAY,EAAE,mBAAmB;KAClC,CAAC,CAAC;IACH,MAAM,IAAI,GAAG,CAAC,CAAC,uBAAuB,EAAE,EAAE,YAAY,EAAE,kBAAkB,EAAE,CAAC,CAAC;IAE9E,OAAO;cACK,UAAU,CAAC,MAAM,IAAI,IAAI,CAAC;;;;;UAK9B,UAAU,CAAC,OAAO,CAAC;SACpB,UAAU,CAAC,IAAI,CAAC,IAAI,UAAU,CAAC,IAAI,CAAC;;;CAG5C,CAAC;AACF,CAAC,CAAC;AAEF,eAAe,IAAI,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"subject.js","sourceRoot":"","sources":["../../../../../../src/services/messaging/email/templates/recovery/subject.ts"],"names":[],"mappings":"AAEA,MAAM,OAAO,GAAmB,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CACxC,CAAC,CAAC,wBAAwB,EAAE,EAAE,YAAY,EAAE,mBAAmB,EAAE,CAAC,CAAC;AAErE,eAAe,OAAO,CAAC"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
const text = ({ t, link }) => {
|
|
2
|
+
// 'email.greeating' is the deprecated pre-5.4 spelling — honoured as a
|
|
3
|
+
// fallback until v6 so app catalogs that translated it keep working.
|
|
4
|
+
const greeting = t('email.greeting', {
|
|
5
|
+
defaultValue: t('email.greeating', { defaultValue: 'Dear user' }),
|
|
6
|
+
});
|
|
7
|
+
const body = t('email.passwordRecovery', {
|
|
8
|
+
defaultValue: 'Recovery password',
|
|
9
|
+
});
|
|
10
|
+
return `${greeting}
|
|
11
|
+
${body} ${link}
|
|
12
|
+
`;
|
|
13
|
+
};
|
|
14
|
+
export default text;
|
|
15
|
+
//# sourceMappingURL=text.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"text.js","sourceRoot":"","sources":["../../../../../../src/services/messaging/email/templates/recovery/text.ts"],"names":[],"mappings":"AAEA,MAAM,IAAI,GAAmB,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE;IAC3C,uEAAuE;IACvE,qEAAqE;IACrE,MAAM,QAAQ,GAAG,CAAC,CAAC,gBAAgB,EAAE;QACnC,YAAY,EAAE,CAAC,CAAC,iBAAiB,EAAE,EAAE,YAAY,EAAE,WAAW,EAAE,CAAC;KAClE,CAAC,CAAC;IACH,MAAM,IAAI,GAAG,CAAC,CAAC,wBAAwB,EAAE;QACvC,YAAY,EAAE,mBAAmB;KAClC,CAAC,CAAC;IAEH,OAAO,GAAG,QAAQ;EAClB,IAAI,IAAI,IAAI;CACb,CAAC;AACF,CAAC,CAAC;AAEF,eAAe,IAAI,CAAC"}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
import { escapeHtml } from '../../escapeHtml.js';
|
|
2
|
+
const html = ({ t, link, locale }) => {
|
|
3
|
+
const title = t('email.emailConfirm', { defaultValue: 'Email confirmation' });
|
|
4
|
+
const heading = t('email.verify', { defaultValue: 'Verify email' });
|
|
5
|
+
const body = t('email.verifyInstructions', {
|
|
6
|
+
defaultValue: 'To verify your email address, follow the link:',
|
|
7
|
+
});
|
|
8
|
+
const href = escapeHtml(link);
|
|
9
|
+
return `<!DOCTYPE html>
|
|
10
|
+
<html lang="${escapeHtml(locale || 'en')}">
|
|
11
|
+
<head>
|
|
12
|
+
<meta charset="UTF-8" />
|
|
13
|
+
<title>${escapeHtml(title)}</title>
|
|
14
|
+
</head>
|
|
15
|
+
<body>
|
|
16
|
+
<h1>${escapeHtml(heading)}</h1>
|
|
17
|
+
<p>${escapeHtml(body)} <a href="${href}">${href}</a></p>
|
|
18
|
+
</body>
|
|
19
|
+
</html>
|
|
20
|
+
`;
|
|
21
|
+
};
|
|
22
|
+
export default html;
|
|
23
|
+
//# sourceMappingURL=html.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"html.js","sourceRoot":"","sources":["../../../../../../src/services/messaging/email/templates/verification/html.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAGjD,MAAM,IAAI,GAAmB,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE;IACnD,MAAM,KAAK,GAAG,CAAC,CAAC,oBAAoB,EAAE,EAAE,YAAY,EAAE,oBAAoB,EAAE,CAAC,CAAC;IAC9E,MAAM,OAAO,GAAG,CAAC,CAAC,cAAc,EAAE,EAAE,YAAY,EAAE,cAAc,EAAE,CAAC,CAAC;IACpE,MAAM,IAAI,GAAG,CAAC,CAAC,0BAA0B,EAAE;QACzC,YAAY,EAAE,gDAAgD;KAC/D,CAAC,CAAC;IACH,MAAM,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;IAE9B,OAAO;cACK,UAAU,CAAC,MAAM,IAAI,IAAI,CAAC;;;aAG3B,UAAU,CAAC,KAAK,CAAC;;;UAGpB,UAAU,CAAC,OAAO,CAAC;SACpB,UAAU,CAAC,IAAI,CAAC,aAAa,IAAI,KAAK,IAAI;;;CAGlD,CAAC;AACF,CAAC,CAAC;AAEF,eAAe,IAAI,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"subject.js","sourceRoot":"","sources":["../../../../../../src/services/messaging/email/templates/verification/subject.ts"],"names":[],"mappings":"AAEA,MAAM,OAAO,GAAmB,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CACxC,CAAC,CAAC,oBAAoB,EAAE,EAAE,YAAY,EAAE,oBAAoB,EAAE,CAAC,CAAC;AAElE,eAAe,OAAO,CAAC"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
const text = ({ t, link }) => {
|
|
2
|
+
// 'email.greeating' is the deprecated pre-5.4 spelling — honoured as a
|
|
3
|
+
// fallback until v6 so app catalogs that translated it keep working.
|
|
4
|
+
const greeting = t('email.greeting', {
|
|
5
|
+
defaultValue: t('email.greeating', { defaultValue: 'Dear user' }),
|
|
6
|
+
});
|
|
7
|
+
const body = t('email.verifyInstructions', {
|
|
8
|
+
defaultValue: 'To verify your email address, follow the link:',
|
|
9
|
+
});
|
|
10
|
+
return `${greeting}
|
|
11
|
+
${body} ${link}
|
|
12
|
+
`;
|
|
13
|
+
};
|
|
14
|
+
export default text;
|
|
15
|
+
//# sourceMappingURL=text.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"text.js","sourceRoot":"","sources":["../../../../../../src/services/messaging/email/templates/verification/text.ts"],"names":[],"mappings":"AAEA,MAAM,IAAI,GAAmB,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE;IAC3C,uEAAuE;IACvE,qEAAqE;IACrE,MAAM,QAAQ,GAAG,CAAC,CAAC,gBAAgB,EAAE;QACnC,YAAY,EAAE,CAAC,CAAC,iBAAiB,EAAE,EAAE,YAAY,EAAE,WAAW,EAAE,CAAC;KAClE,CAAC,CAAC;IACH,MAAM,IAAI,GAAG,CAAC,CAAC,0BAA0B,EAAE;QACzC,YAAY,EAAE,gDAAgD;KAC/D,CAAC,CAAC;IAEH,OAAO,GAAG,QAAQ;EAClB,IAAI,IAAI,IAAI;CACb,CAAC;AACF,CAAC,CAAC;AAEF,eAAe,IAAI,CAAC"}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Data a shipped email template receives. The email module builds it as
|
|
3
|
+
* `{ locale, t, ...mailConfig.globalVariablesToTemplates, ...templateData }`,
|
|
4
|
+
* so whatever an app adds through those two stays reachable through the index
|
|
5
|
+
* signature.
|
|
6
|
+
*/
|
|
7
|
+
export type TEmailTemplateData = {
|
|
8
|
+
/** Language the mail is rendered for — the request locale, `en` by default. */
|
|
9
|
+
locale: string;
|
|
10
|
+
/**
|
|
11
|
+
* Translator taken from the request i18n. Always call it with the English
|
|
12
|
+
* text as `defaultValue`: that in-code default is the single English source
|
|
13
|
+
* of truth and holds when the key is missing or i18n is disabled.
|
|
14
|
+
*/
|
|
15
|
+
t: (key: string, options?: {
|
|
16
|
+
defaultValue?: string;
|
|
17
|
+
}) => string;
|
|
18
|
+
/** Link the auth flow asks the user to follow. */
|
|
19
|
+
link: string;
|
|
20
|
+
/** Nickname of the user the mail is about, when they set one. */
|
|
21
|
+
editor?: string | null;
|
|
22
|
+
[key: string]: unknown;
|
|
23
|
+
};
|
|
24
|
+
/**
|
|
25
|
+
* One file of a template folder (`html`, `subject`, `text`): a module whose
|
|
26
|
+
* default export renders the data into the final string.
|
|
27
|
+
*/
|
|
28
|
+
export type TEmailTemplate = (data: TEmailTemplateData) => string;
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/services/messaging/email/types.ts"],"names":[],"mappings":""}
|
|
@@ -6,6 +6,8 @@ type Matcher = {
|
|
|
6
6
|
type FunctionLike = ((...args: never[]) => unknown) & {
|
|
7
7
|
readonly name: string;
|
|
8
8
|
};
|
|
9
|
+
/** Error classes are matched with `instanceof`, so constructors count too. */
|
|
10
|
+
type ErrorClass = abstract new (...args: never[]) => object;
|
|
9
11
|
export declare const pattern: {
|
|
10
12
|
any(type: FunctionLike): Matcher;
|
|
11
13
|
anything(): Matcher;
|
|
@@ -21,8 +23,8 @@ export declare function assertContainEqual(actual: readonly unknown[], expected:
|
|
|
21
23
|
export declare function assertTextMatch(actual: string, expected: string | RegExp, message?: string): void;
|
|
22
24
|
export declare function assertTextNotMatch(actual: string, expected: string | RegExp): void;
|
|
23
25
|
export declare function assertHasProperty(actual: object, property: PropertyKey, expected?: unknown): void;
|
|
24
|
-
export declare function assertThrowsLike(fn: () => unknown, expected?: string | RegExp | FunctionLike | Error): void;
|
|
25
|
-
export declare function assertRejectsLike(value: Promise<unknown> | (() => Promise<unknown>), expected?: string | RegExp | FunctionLike | Error): Promise<void>;
|
|
26
|
+
export declare function assertThrowsLike(fn: () => unknown, expected?: string | RegExp | FunctionLike | ErrorClass | Error): void;
|
|
27
|
+
export declare function assertRejectsLike(value: Promise<unknown> | (() => Promise<unknown>), expected?: string | RegExp | FunctionLike | ErrorClass | Error): Promise<void>;
|
|
26
28
|
export declare function assertRejectsValue(value: Promise<unknown> | (() => Promise<unknown>), expected: unknown): Promise<void>;
|
|
27
29
|
type MockCall = readonly unknown[] | {
|
|
28
30
|
arguments: readonly unknown[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assertions.js","sourceRoot":"","sources":["../../src/tests/assertions.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAE9C,MAAM,iBAAiB,GAAG,MAAM,CAAC,mBAAmB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"assertions.js","sourceRoot":"","sources":["../../src/tests/assertions.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAE9C,MAAM,iBAAiB,GAAG,MAAM,CAAC,mBAAmB,CAAC,CAAC;AAYtD,SAAS,OAAO,CACd,WAAmB,EACnB,SAAuC;IAEvC,OAAO,EAAE,CAAC,iBAAiB,CAAC,EAAE,SAAS,EAAE,WAAW,EAAE,CAAC;AACzD,CAAC;AAED,SAAS,SAAS,CAAC,KAAc;IAC/B,OAAO,CACL,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,iBAAiB,IAAI,KAAK,CAC1E,CAAC;AACJ,CAAC;AAED,SAAS,YAAY,CAAC,MAAe,EAAE,QAAiB;IACtD,IAAI,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC;QACxB,OAAO,QAAQ,CAAC,iBAAiB,CAAC,CAAC,MAAM,CAAC,CAAC;IAC7C,CAAC;IACD,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC5B,OAAO,CACL,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;YACrB,MAAM,CAAC,MAAM,KAAK,QAAQ,CAAC,MAAM;YACjC,QAAQ,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,CAAC,CACrE,CAAC;IACJ,CAAC;IACD,IACE,OAAO,QAAQ,KAAK,QAAQ;QAC5B,QAAQ,KAAK,IAAI;QACjB,OAAO,MAAM,KAAK,QAAQ;QAC1B,MAAM,KAAK,IAAI,EACf,CAAC;QACD,MAAM,cAAc,GAAG,QAAwC,CAAC;QAChE,MAAM,YAAY,GAAG,MAAsC,CAAC;QAC5D,MAAM,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QACrD,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QACjD,OAAO,CACL,YAAY,CAAC,MAAM,KAAK,UAAU,CAAC,MAAM;YACzC,YAAY,CAAC,KAAK,CAChB,CAAC,GAAG,EAAE,EAAE,CACN,MAAM,CAAC,MAAM,CAAC,YAAY,EAAE,GAAG,CAAC;gBAChC,YAAY,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC,CACvD,CACF,CAAC;IACJ,CAAC;IACD,OAAO,iBAAiB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;AAC7C,CAAC;AAED,SAAS,cAAc,CAAC,MAAe,EAAE,QAAiB;IACxD,IAAI,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC;QACxB,OAAO,QAAQ,CAAC,iBAAiB,CAAC,CAAC,MAAM,CAAC,CAAC;IAC7C,CAAC;IACD,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC5B,OAAO,CACL,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;YACrB,QAAQ,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,cAAc,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,CAAC,CACvE,CAAC;IACJ,CAAC;IACD,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;QACtD,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;YAClD,OAAO,KAAK,CAAC;QACf,CAAC;QACD,MAAM,cAAc,GAAG,QAAwC,CAAC;QAChE,MAAM,YAAY,GAAG,MAAsC,CAAC;QAC5D,OAAO,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,KAAK,CAC1C,CAAC,GAAG,EAAE,EAAE,CACN,MAAM,CAAC,MAAM,CAAC,YAAY,EAAE,GAAG,CAAC;YAChC,cAAc,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC,CACzD,CAAC;IACJ,CAAC;IACD,OAAO,iBAAiB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;AAC7C,CAAC;AAED,SAAS,gBAAgB,CAAC,QAAiB;IACzC,OAAO,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;AACvE,CAAC;AAED,MAAM,CAAC,MAAM,OAAO,GAAG;IACrB,GAAG,CAAC,IAAkB;QACpB,OAAO,OAAO,CAAC,OAAO,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,EAAE,EAAE;YAC5C,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;gBACpB,OAAO,OAAO,MAAM,KAAK,QAAQ,CAAC;YACpC,CAAC;YACD,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;gBACpB,OAAO,OAAO,MAAM,KAAK,QAAQ,CAAC;YACpC,CAAC;YACD,IAAI,IAAI,KAAK,OAAO,EAAE,CAAC;gBACrB,OAAO,OAAO,MAAM,KAAK,SAAS,CAAC;YACrC,CAAC;YACD,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;gBACpB,OAAO,OAAO,MAAM,KAAK,QAAQ,CAAC;YACpC,CAAC;YACD,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;gBACpB,OAAO,OAAO,MAAM,KAAK,QAAQ,CAAC;YACpC,CAAC;YACD,OAAO,MAAM,YAAY,IAAI,CAAC;QAChC,CAAC,CAAC,CAAC;IACL,CAAC;IACD,QAAQ;QACN,OAAO,OAAO,CACZ,mCAAmC,EACnC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,IAAI,IAAI,CAC3B,CAAC;IACJ,CAAC;IACD,eAAe,CAAC,QAA4B;QAC1C,OAAO,OAAO,CAAC,yCAAyC,EAAE,CAAC,MAAM,EAAE,EAAE,CACnE,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;YACnB,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CACvB,MAAM,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,YAAY,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC,CAC3D;YACH,CAAC,CAAC,KAAK,CACV,CAAC;IACJ,CAAC;IACD,gBAAgB,CAAC,QAAsC;QACrD,OAAO,OAAO,CAAC,8CAA8C,EAAE,CAAC,MAAM,EAAE,EAAE,CACxE,cAAc,CAAC,MAAM,EAAE,QAAQ,CAAC,CACjC,CAAC;IACJ,CAAC;IACD,gBAAgB,CAAC,QAAgB;QAC/B,OAAO,OAAO,CAAC,uBAAuB,QAAQ,EAAE,EAAE,CAAC,MAAM,EAAE,EAAE,CAC3D,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,CAC/D,CAAC;IACJ,CAAC;IACD,cAAc,CAAC,QAAyB;QACtC,OAAO,OAAO,CAAC,qBAAqB,QAAQ,EAAE,EAAE,CAAC,MAAM,EAAE,EAAE,CACzD,OAAO,MAAM,KAAK,QAAQ;YACxB,CAAC,CAAC,OAAO,QAAQ,KAAK,QAAQ;gBAC5B,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC;gBAC3B,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC;YACzB,CAAC,CAAC,KAAK,CACV,CAAC;IACJ,CAAC;CACF,CAAC;AAEF,MAAM,UAAU,aAAa,CAAC,MAAe,EAAE,QAAiB;IAC9D,MAAM,CAAC,EAAE,CACP,YAAY,CAAC,MAAM,EAAE,QAAQ,CAAC,EAC9B,2BAA2B,gBAAgB,CAAC,QAAQ,CAAC,EAAE,CACxD,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,MAAe,EAAE,QAAiB;IACjE,MAAM,CAAC,EAAE,CACP,CAAC,YAAY,CAAC,MAAM,EAAE,QAAQ,CAAC,EAC/B,+BAA+B,gBAAgB,CAAC,QAAQ,CAAC,EAAE,CAC5D,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,MAAe,EAAE,QAAiB;IAClE,MAAM,CAAC,EAAE,CACP,cAAc,CAAC,MAAM,EAAE,QAAQ,CAAC,EAChC,kCAAkC,CACnC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,kBAAkB,CAChC,MAA0B,EAC1B,QAAiB;IAEjB,MAAM,CAAC,EAAE,CACP,MAAM,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,YAAY,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC,EAC7D,0CAA0C,CAC3C,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,eAAe,CAC7B,MAAc,EACd,QAAyB,EACzB,OAAgB;IAEhB,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE,CAAC;QACjC,IAAI,OAAO,EAAE,CAAC;YACZ,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC,CAAC;QAChD,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;QACvC,CAAC;IACH,CAAC;SAAM,CAAC;QACN,IAAI,OAAO,EAAE,CAAC;YACZ,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;QAC1C,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QACjC,CAAC;IACH,CAAC;AACH,CAAC;AAED,MAAM,UAAU,kBAAkB,CAChC,MAAc,EACd,QAAyB;IAEzB,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE,CAAC;QACjC,MAAM,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;IACxC,CAAC;SAAM,CAAC;QACN,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IACxC,CAAC;AACH,CAAC;AAED,MAAM,UAAU,iBAAiB,CAC/B,MAAc,EACd,QAAqB,EACrB,QAAkB;IAElB,MAAM,CAAC,EAAE,CAAC,QAAQ,IAAI,MAAM,CAAC,CAAC;IAC9B,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QAC3B,MAAM,CAAC,eAAe,CACnB,MAAuC,CAAC,QAAQ,CAAC,EAClD,QAAQ,CACT,CAAC;IACJ,CAAC;AACH,CAAC;AAED,MAAM,UAAU,gBAAgB,CAC9B,EAAiB,EACjB,QAA8D;IAE9D,IAAI,QAAQ,GAAG,KAAK,CAAC;IACrB,IAAI,KAAc,CAAC;IACnB,IAAI,CAAC;QACH,EAAE,EAAE,CAAC;IACP,CAAC;IAAC,OAAO,MAAM,EAAE,CAAC;QAChB,QAAQ,GAAG,IAAI,CAAC;QAChB,KAAK,GAAG,MAAM,CAAC;IACjB,CAAC;IACD,MAAM,CAAC,EAAE,CAAC,QAAQ,EAAE,4BAA4B,CAAC,CAAC;IAClD,kBAAkB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;AACtC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,KAAkD,EAClD,QAA8D;IAE9D,IAAI,SAAS,GAAG,KAAK,CAAC;IACtB,IAAI,KAAc,CAAC;IACnB,IAAI,CAAC;QACH,MAAM,CAAC,OAAO,KAAK,KAAK,UAAU,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;IACxD,CAAC;IAAC,OAAO,MAAM,EAAE,CAAC;QAChB,SAAS,GAAG,IAAI,CAAC;QACjB,KAAK,GAAG,MAAM,CAAC;IACjB,CAAC;IACD,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,4BAA4B,CAAC,CAAC;IACnD,kBAAkB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;AACtC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,KAAkD,EAClD,QAAiB;IAEjB,IAAI,SAAS,GAAG,KAAK,CAAC;IACtB,IAAI,KAAc,CAAC;IACnB,IAAI,CAAC;QACH,MAAM,CAAC,OAAO,KAAK,KAAK,UAAU,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;IACxD,CAAC;IAAC,OAAO,MAAM,EAAE,CAAC;QAChB,SAAS,GAAG,IAAI,CAAC;QACjB,KAAK,GAAG,MAAM,CAAC;IACjB,CAAC;IACD,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,4BAA4B,CAAC,CAAC;IACnD,MAAM,CAAC,eAAe,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;AAC1C,CAAC;AAED,SAAS,kBAAkB,CACzB,KAAc,EACd,QAA8D;IAE9D,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QAC3B,OAAO;IACT,CAAC;IACD,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE,CAAC;QACjC,MAAM,CAAC,EAAE,CAAC,KAAK,YAAY,KAAK,CAAC,CAAC;QAClC,MAAM,CAAC,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC9C,CAAC;SAAM,IAAI,QAAQ,YAAY,MAAM,EAAE,CAAC;QACtC,MAAM,CAAC,EAAE,CAAC,KAAK,YAAY,KAAK,CAAC,CAAC;QAClC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IACxC,CAAC;SAAM,IAAI,OAAO,QAAQ,KAAK,UAAU,EAAE,CAAC;QAC1C,MAAM,CAAC,EAAE,CACP,KAAK;YACF,QAEW,CACf,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,MAAM,CAAC,eAAe,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IAC1C,CAAC;AACH,CAAC;AAOD,SAAS,OAAO,CAAC,KAAe;IAC9B,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC;IACtC,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CACxB,WAAW,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAE,IAA2B,CACpE,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,KAAe;IAC1C,MAAM,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,mCAAmC,CAAC,CAAC;AAC5E,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,KAAe;IAC7C,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;AAC/C,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,KAAe,EAAE,QAAgB;IACjE,MAAM,CAAC,WAAW,CAChB,KAAK,CAAC,IAAI,EAAE,SAAS,EAAE,EAAE,IAAI,OAAO,CAAC,KAAK,CAAC,CAAC,MAAM,EAClD,QAAQ,CACT,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,gBAAgB,CAC9B,KAAe,EACf,GAAG,QAA4B;IAE/B,MAAM,CAAC,EAAE,CACP,OAAO,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,EAC3D,+DAA+D,CAChE,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,mBAAmB,CACjC,KAAe,EACf,GAAG,QAA4B;IAE/B,MAAM,CAAC,EAAE,CACP,OAAO,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,YAAY,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,EAC7D,mEAAmE,CACpE,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,mBAAmB,CACjC,KAAe,EACf,GAAW,EACX,GAAG,QAA4B;IAE/B,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC;IACrC,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,kCAAkC,GAAG,QAAQ,CAAC,CAAC;IAC/D,aAAa,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;AAChC,CAAC"}
|
package/dist/tests/mocks.d.ts
CHANGED
|
@@ -1,4 +1,11 @@
|
|
|
1
|
+
import type { TI18n } from '../services/i18n/I18n.ts';
|
|
1
2
|
type AnyFunction = (...args: never[]) => unknown;
|
|
3
|
+
/**
|
|
4
|
+
* Per-request i18n stub for middleware tests: resolves exactly the keys it is
|
|
5
|
+
* given; anything else behaves like a miss and hands back the caller's
|
|
6
|
+
* `defaultValue` (or the key, matching i18next).
|
|
7
|
+
*/
|
|
8
|
+
export declare const stubI18n: (resources: Record<string, string>) => TI18n;
|
|
2
9
|
type ConfigurableMock = {
|
|
3
10
|
mock: {
|
|
4
11
|
callCount(): number;
|
package/dist/tests/mocks.js
CHANGED
|
@@ -1,3 +1,12 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Per-request i18n stub for middleware tests: resolves exactly the keys it is
|
|
3
|
+
* given; anything else behaves like a miss and hands back the caller's
|
|
4
|
+
* `defaultValue` (or the key, matching i18next).
|
|
5
|
+
*/
|
|
6
|
+
export const stubI18n = (resources) => ({
|
|
7
|
+
language: 'en',
|
|
8
|
+
t: (key, options) => resources[key] ?? options?.defaultValue ?? key,
|
|
9
|
+
});
|
|
1
10
|
const nextOnceCall = new WeakMap();
|
|
2
11
|
function onceIndex(value) {
|
|
3
12
|
const index = nextOnceCall.get(value) ?? value.mock.callCount();
|
package/dist/tests/mocks.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mocks.js","sourceRoot":"","sources":["../../src/tests/mocks.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"mocks.js","sourceRoot":"","sources":["../../src/tests/mocks.ts"],"names":[],"mappings":"AAIA;;;;GAIG;AACH,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,SAAiC,EAAE,EAAE,CAC5D,CAAC;IACC,QAAQ,EAAE,IAAI;IACd,CAAC,EAAE,CAAC,GAAW,EAAE,OAAmC,EAAE,EAAE,CACtD,SAAS,CAAC,GAAG,CAAC,IAAI,OAAO,EAAE,YAAY,IAAI,GAAG;CACjD,CAAqB,CAAC;AAUzB,MAAM,YAAY,GAAG,IAAI,OAAO,EAAkB,CAAC;AAEnD,SAAS,SAAS,CAAC,KAAuB;IACxC,MAAM,KAAK,GAAG,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;IAChE,YAAY,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC;IACnC,OAAO,KAAK,CAAC;AACf,CAAC;AAED,MAAM,UAAU,kBAAkB,CAChC,KAAQ,EACR,cAA2B;IAE3B,KAAK,CAAC,IAAI,CAAC,kBAAkB,CAAC,cAAc,CAAC,CAAC;IAC9C,OAAO,KAAK,CAAC;AACf,CAAC;AAED,MAAM,UAAU,sBAAsB,CACpC,KAAQ,EACR,cAA2B;IAE3B,KAAK,CAAC,IAAI,CAAC,sBAAsB,CAAC,cAAc,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;IACpE,OAAO,KAAK,CAAC;AACf,CAAC;AAED,MAAM,UAAU,eAAe,CAC7B,KAAQ,EACR,MAAe;IAEf,OAAO,kBAAkB,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,CAAC;AACjD,CAAC;AAED,MAAM,UAAU,mBAAmB,CACjC,KAAQ,EACR,MAAe;IAEf,OAAO,sBAAsB,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,CAAC;AACrD,CAAC;AAED,MAAM,UAAU,iBAAiB,CAC/B,KAAQ,EACR,MAAe;IAEf,OAAO,kBAAkB,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;AAClE,CAAC;AAED,MAAM,UAAU,qBAAqB,CACnC,KAAQ,EACR,MAAe;IAEf,OAAO,sBAAsB,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;AACtE,CAAC;AAED,MAAM,UAAU,iBAAiB,CAC/B,KAAQ,EACR,KAAc;IAEd,OAAO,kBAAkB,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;AAChE,CAAC;AAED,MAAM,UAAU,qBAAqB,CACnC,KAAQ,EACR,KAAc;IAEd,OAAO,sBAAsB,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;AACpE,CAAC"}
|
|
@@ -11,6 +11,10 @@
|
|
|
11
11
|
* framework `Server` against a fresh DB and tears it down.
|
|
12
12
|
* - `setTestRedisNamespace` / `clearTestRedisNamespace` — per test; isolate the
|
|
13
13
|
* cache/rate-limiter keyspace.
|
|
14
|
+
*
|
|
15
|
+
* Project `Server` options (notably the `bootHttp` hook) are declared with
|
|
16
|
+
* `configureTestServer` from `testHelpers.ts` before the server boots; this
|
|
17
|
+
* module owns only the `folders` config.
|
|
14
18
|
*/
|
|
15
19
|
import Server from '../server.ts';
|
|
16
20
|
/** Start an in-memory Mongo replica set and publish `TEST_MONGO_URI`. */
|
|
@@ -11,13 +11,17 @@
|
|
|
11
11
|
* framework `Server` against a fresh DB and tears it down.
|
|
12
12
|
* - `setTestRedisNamespace` / `clearTestRedisNamespace` — per test; isolate the
|
|
13
13
|
* cache/rate-limiter keyspace.
|
|
14
|
+
*
|
|
15
|
+
* Project `Server` options (notably the `bootHttp` hook) are declared with
|
|
16
|
+
* `configureTestServer` from `testHelpers.ts` before the server boots; this
|
|
17
|
+
* module owns only the `folders` config.
|
|
14
18
|
*/
|
|
15
19
|
import crypto from 'node:crypto';
|
|
16
20
|
import path from 'node:path';
|
|
17
21
|
import mongoose from 'mongoose'; // we do not need create indexes on tests
|
|
18
22
|
import { clearNamespace } from '../helpers/redis/clearNamespace.js';
|
|
19
23
|
import Server from '../server.js';
|
|
20
|
-
import { serverInstance, setServerInstance } from './testHelpers.js';
|
|
24
|
+
import { serverInstance, setServerInstance, takeTestServerOptions, } from './testHelpers.js';
|
|
21
25
|
mongoose.set('autoIndex', false);
|
|
22
26
|
const basePath = new URL('.', import.meta.url).pathname;
|
|
23
27
|
// ── Global Mongo lifecycle (once per test run) ──────────────────────────────
|
|
@@ -54,6 +58,9 @@ async function bootTestServer() {
|
|
|
54
58
|
process.env.LOGGER_CONSOLE_LEVEL = 'error';
|
|
55
59
|
process.env.AUTH_SALT = crypto.randomBytes(16).toString('hex');
|
|
56
60
|
const server = new Server({
|
|
61
|
+
// Project-declared options (`bootHttp`, …) so the test server wires itself
|
|
62
|
+
// the same way production does. Folders stay owned by the bootstrap.
|
|
63
|
+
...takeTestServerOptions(),
|
|
57
64
|
folders: {
|
|
58
65
|
config: process.env.TEST_FOLDER_CONFIG || path.resolve(basePath, '../config'),
|
|
59
66
|
controllers: process.env.TEST_FOLDER_CONTROLLERS ||
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setupFramework.js","sourceRoot":"","sources":["../../src/tests/setupFramework.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"setupFramework.js","sourceRoot":"","sources":["../../src/tests/setupFramework.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,6 +9,13 @@ before(async () => {
|
|
|
9
9
|
if (isFrameworkSetupSkipped) {
|
|
10
10
|
return;
|
|
11
11
|
}
|
|
12
|
+
// node:test runs a root `before()` registered from a `--import` preload
|
|
13
|
+
// immediately — synchronously inside the `before()` call, while the preload
|
|
14
|
+
// graph is still evaluating. Booting right here would consume the
|
|
15
|
+
// `configureTestServer` options window before the preload's own module body
|
|
16
|
+
// (below its hoisted imports) ever ran. Yield one microtask so the boot
|
|
17
|
+
// starts after the preload finishes evaluating.
|
|
18
|
+
await null;
|
|
12
19
|
await ensureTestServerReady();
|
|
13
20
|
});
|
|
14
21
|
beforeEach(() => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setupNodeTest.js","sourceRoot":"","sources":["../../src/tests/setupNodeTest.ts"],"names":[],"mappings":"AAAA,2EAA2E;AAC3E,8EAA8E;AAC9E,8DAA8D;AAC9D,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AACjE,OAAO,EACL,uBAAuB,EACvB,qBAAqB,EACrB,qBAAqB,EACrB,cAAc,GACf,MAAM,qBAAqB,CAAC;AAE7B,OAAO,CAAC,GAAG,CAAC,cAAc,GAAG,GAAG,CAAC;AAEjC,MAAM,uBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAC7D,QAAQ,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CACtC,CAAC;AAEF,MAAM,CAAC,KAAK,IAAI,EAAE;IAChB,IAAI,uBAAuB,EAAE,CAAC;QAC5B,OAAO;IACT,CAAC;IACD,MAAM,qBAAqB,EAAE,CAAC;AAChC,CAAC,CAAC,CAAC;AACH,UAAU,CAAC,GAAG,EAAE;IACd,IAAI,CAAC,uBAAuB,EAAE,CAAC;QAC7B,qBAAqB,EAAE,CAAC;IAC1B,CAAC;AACH,CAAC,CAAC,CAAC;AACH,SAAS,CAAC,KAAK,IAAI,EAAE;IACnB,IAAI,CAAC,uBAAuB,EAAE,CAAC;QAC7B,MAAM,uBAAuB,EAAE,CAAC;IAClC,CAAC;AACH,CAAC,CAAC,CAAC;AACH,KAAK,CAAC,KAAK,IAAI,EAAE;IACf,IAAI,CAAC,uBAAuB,EAAE,CAAC;QAC7B,MAAM,cAAc,EAAE,CAAC;IACzB,CAAC;AACH,CAAC,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"setupNodeTest.js","sourceRoot":"","sources":["../../src/tests/setupNodeTest.ts"],"names":[],"mappings":"AAAA,2EAA2E;AAC3E,8EAA8E;AAC9E,8DAA8D;AAC9D,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AACjE,OAAO,EACL,uBAAuB,EACvB,qBAAqB,EACrB,qBAAqB,EACrB,cAAc,GACf,MAAM,qBAAqB,CAAC;AAE7B,OAAO,CAAC,GAAG,CAAC,cAAc,GAAG,GAAG,CAAC;AAEjC,MAAM,uBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAC7D,QAAQ,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CACtC,CAAC;AAEF,MAAM,CAAC,KAAK,IAAI,EAAE;IAChB,IAAI,uBAAuB,EAAE,CAAC;QAC5B,OAAO;IACT,CAAC;IACD,wEAAwE;IACxE,4EAA4E;IAC5E,kEAAkE;IAClE,4EAA4E;IAC5E,wEAAwE;IACxE,gDAAgD;IAChD,MAAM,IAAI,CAAC;IACX,MAAM,qBAAqB,EAAE,CAAC;AAChC,CAAC,CAAC,CAAC;AACH,UAAU,CAAC,GAAG,EAAE;IACd,IAAI,CAAC,uBAAuB,EAAE,CAAC;QAC7B,qBAAqB,EAAE,CAAC;IAC1B,CAAC;AACH,CAAC,CAAC,CAAC;AACH,SAAS,CAAC,KAAK,IAAI,EAAE;IACnB,IAAI,CAAC,uBAAuB,EAAE,CAAC;QAC7B,MAAM,uBAAuB,EAAE,CAAC;IAClC,CAAC;AACH,CAAC,CAAC,CAAC;AACH,KAAK,CAAC,KAAK,IAAI,EAAE;IACf,IAAI,CAAC,uBAAuB,EAAE,CAAC;QAC7B,MAAM,cAAc,EAAE,CAAC;IACzB,CAAC;AACH,CAAC,CAAC,CAAC"}
|
|
@@ -1,6 +1,28 @@
|
|
|
1
1
|
import type UserModel from '../models/User.ts';
|
|
2
2
|
import type { GetModelTypeFromClass } from '../modules/BaseModel.ts';
|
|
3
3
|
import type Server from '../server.ts';
|
|
4
|
+
import type { ServerOptions } from '../server.ts';
|
|
5
|
+
/**
|
|
6
|
+
* Server options a project can declare for the test server the shipped setup
|
|
7
|
+
* boots. `folders` is excluded — the bootstrap resolves those itself from the
|
|
8
|
+
* `TEST_FOLDER_*` env vars.
|
|
9
|
+
*/
|
|
10
|
+
export type TestServerOptions = Omit<ServerOptions, 'folders'>;
|
|
11
|
+
/**
|
|
12
|
+
* Declare `Server` options — notably the `bootHttp` hook — for the test server.
|
|
13
|
+
* Without this, app-wide HTTP wiring that production does in `bootHttp` is
|
|
14
|
+
* simply absent under test, so tests see the unwired behavior (a 500 where
|
|
15
|
+
* production returns the mapped status) with nothing reporting the difference.
|
|
16
|
+
*
|
|
17
|
+
* Call it at module scope in the preload that imports the framework setup glue,
|
|
18
|
+
* before any hook boots the server.
|
|
19
|
+
*/
|
|
20
|
+
export declare const configureTestServer: (options: TestServerOptions) => void;
|
|
21
|
+
/**
|
|
22
|
+
* Read the declared options and close the window for further configuration.
|
|
23
|
+
* Called once by the test bootstrap as it constructs the `Server`.
|
|
24
|
+
*/
|
|
25
|
+
export declare const takeTestServerOptions: () => TestServerOptions;
|
|
4
26
|
export declare let serverInstance: Server;
|
|
5
27
|
export declare let defaultUser: InstanceType<GetModelTypeFromClass<typeof UserModel>>;
|
|
6
28
|
export declare let defaultAuthToken: string;
|
|
@@ -58,13 +80,12 @@ export declare const createDefaultTestUser: () => Promise<false | {
|
|
|
58
80
|
createdAt: NativeDate;
|
|
59
81
|
updatedAt: NativeDate;
|
|
60
82
|
avatar?: string | null | undefined;
|
|
61
|
-
name?:
|
|
83
|
+
name?: Omit<{
|
|
84
|
+
_id: import("mongoose").Types.ObjectId;
|
|
62
85
|
first?: string | null | undefined;
|
|
63
86
|
last?: string | null | undefined;
|
|
64
87
|
nick?: string | null | undefined;
|
|
65
|
-
}
|
|
66
|
-
_id: import("mongoose").Types.ObjectId;
|
|
67
|
-
}) | null | undefined;
|
|
88
|
+
}, "_id"> | null | undefined;
|
|
68
89
|
password?: string | null | undefined;
|
|
69
90
|
email?: string | null | undefined;
|
|
70
91
|
sessionTokens: import("mongoose").Types.DocumentArray<{
|
|
@@ -154,13 +175,12 @@ export declare const createDefaultTestUser: () => Promise<false | {
|
|
|
154
175
|
}) => Promise<any>;
|
|
155
176
|
readonly getPublic: (this: import("../models/User.ts").UserPublicDoc) => {
|
|
156
177
|
avatar: string | null | undefined;
|
|
157
|
-
name:
|
|
178
|
+
name: Omit<{
|
|
179
|
+
_id: import("mongoose").Types.ObjectId;
|
|
158
180
|
first?: string | null | undefined;
|
|
159
181
|
last?: string | null | undefined;
|
|
160
182
|
nick?: string | null | undefined;
|
|
161
|
-
}
|
|
162
|
-
_id: import("mongoose").Types.ObjectId;
|
|
163
|
-
}) | null | undefined;
|
|
183
|
+
}, "_id"> | null | undefined;
|
|
164
184
|
email: string | null | undefined;
|
|
165
185
|
id: string;
|
|
166
186
|
isVerified: boolean;
|