@adaptivestone/framework 5.3.3 → 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.
Files changed (111) hide show
  1. package/AGENTS.md +58 -0
  2. package/CHANGELOG.md +123 -1
  3. package/CLAUDE.md +1 -0
  4. package/README.md +71 -1
  5. package/dist/codegen/astExtract.js +6 -1
  6. package/dist/codegen/astExtract.js.map +1 -1
  7. package/dist/codegen/emit.js +27 -26
  8. package/dist/codegen/emit.js.map +1 -1
  9. package/dist/config/auth.d.ts +4 -0
  10. package/dist/config/auth.js +2 -0
  11. package/dist/config/auth.js.map +1 -1
  12. package/dist/controllers/Auth.js +138 -60
  13. package/dist/controllers/Auth.js.map +1 -1
  14. package/dist/controllers/Auth.routes.gen.d.ts +18 -32
  15. package/dist/controllers/Home.routes.gen.d.ts +2 -4
  16. package/dist/controllers/index.js +4 -4
  17. package/dist/controllers/index.js.map +1 -1
  18. package/dist/helpers/translate.d.ts +11 -0
  19. package/dist/helpers/translate.js +14 -0
  20. package/dist/helpers/translate.js.map +1 -0
  21. package/dist/locales/en/translation.json +1 -27
  22. package/dist/locales/ru/translation.json +3 -7
  23. package/dist/models/User.d.ts +5 -11
  24. package/dist/models/User.js +16 -3
  25. package/dist/models/User.js.map +1 -1
  26. package/dist/models/UserOld.d.ts +3 -9
  27. package/dist/models/UserOld.js +8 -0
  28. package/dist/models/UserOld.js.map +1 -1
  29. package/dist/modules/BaseModel.d.ts +160 -58
  30. package/dist/modules/BaseModel.js.map +1 -1
  31. package/dist/server.d.ts +13 -3
  32. package/dist/server.js +2 -0
  33. package/dist/server.js.map +1 -1
  34. package/dist/services/cache/Cache.js +14 -7
  35. package/dist/services/cache/Cache.js.map +1 -1
  36. package/dist/services/http/HttpServer.d.ts +2 -5
  37. package/dist/services/http/HttpServer.js +9 -4
  38. package/dist/services/http/HttpServer.js.map +1 -1
  39. package/dist/services/http/middleware/AbstractMiddleware.d.ts +8 -0
  40. package/dist/services/http/middleware/AbstractMiddleware.js +11 -0
  41. package/dist/services/http/middleware/AbstractMiddleware.js.map +1 -1
  42. package/dist/services/http/middleware/Auth.js +1 -1
  43. package/dist/services/http/middleware/Auth.js.map +1 -1
  44. package/dist/services/http/middleware/I18n.js +6 -1
  45. package/dist/services/http/middleware/I18n.js.map +1 -1
  46. package/dist/services/http/middleware/RateLimiter.js +12 -2
  47. package/dist/services/http/middleware/RateLimiter.js.map +1 -1
  48. package/dist/services/http/middleware/RequestParser.js +38 -19
  49. package/dist/services/http/middleware/RequestParser.js.map +1 -1
  50. package/dist/services/http/middleware/Role.js +6 -2
  51. package/dist/services/http/middleware/Role.js.map +1 -1
  52. package/dist/services/http/routing/ExpressAdapter.js +17 -1
  53. package/dist/services/http/routing/ExpressAdapter.js.map +1 -1
  54. package/dist/services/http/routing/match.d.ts +1 -0
  55. package/dist/services/http/routing/match.js +9 -1
  56. package/dist/services/http/routing/match.js.map +1 -1
  57. package/dist/services/http/types.d.ts +70 -5
  58. package/dist/services/i18n/I18n.d.ts +16 -10
  59. package/dist/services/i18n/I18n.js +74 -6
  60. package/dist/services/i18n/I18n.js.map +1 -1
  61. package/dist/services/i18n/types.d.ts +44 -0
  62. package/dist/services/i18n/types.js +2 -0
  63. package/dist/services/i18n/types.js.map +1 -0
  64. package/dist/services/messaging/email/escapeHtml.d.ts +6 -0
  65. package/dist/services/messaging/email/escapeHtml.js +12 -0
  66. package/dist/services/messaging/email/escapeHtml.js.map +1 -0
  67. package/dist/services/messaging/email/templates/recovery/html.d.ts +3 -0
  68. package/dist/services/messaging/email/templates/recovery/html.js +20 -0
  69. package/dist/services/messaging/email/templates/recovery/html.js.map +1 -0
  70. package/dist/services/messaging/email/templates/recovery/subject.d.ts +3 -0
  71. package/dist/services/messaging/email/templates/recovery/subject.js +3 -0
  72. package/dist/services/messaging/email/templates/recovery/subject.js.map +1 -0
  73. package/dist/services/messaging/email/templates/recovery/text.d.ts +3 -0
  74. package/dist/services/messaging/email/templates/recovery/text.js +15 -0
  75. package/dist/services/messaging/email/templates/recovery/text.js.map +1 -0
  76. package/dist/services/messaging/email/templates/verification/html.d.ts +3 -0
  77. package/dist/services/messaging/email/templates/verification/html.js +23 -0
  78. package/dist/services/messaging/email/templates/verification/html.js.map +1 -0
  79. package/dist/services/messaging/email/templates/verification/subject.d.ts +3 -0
  80. package/dist/services/messaging/email/templates/verification/subject.js +3 -0
  81. package/dist/services/messaging/email/templates/verification/subject.js.map +1 -0
  82. package/dist/services/messaging/email/templates/verification/text.d.ts +3 -0
  83. package/dist/services/messaging/email/templates/verification/text.js +15 -0
  84. package/dist/services/messaging/email/templates/verification/text.js.map +1 -0
  85. package/dist/services/messaging/email/types.d.ts +28 -0
  86. package/dist/services/messaging/email/types.js +2 -0
  87. package/dist/services/messaging/email/types.js.map +1 -0
  88. package/dist/services/validate/ValidateService.d.ts +2 -2
  89. package/dist/services/validate/ValidateService.js.map +1 -1
  90. package/dist/services/validate/mergeValidatedOutputs.d.ts +19 -0
  91. package/dist/services/validate/mergeValidatedOutputs.js +43 -0
  92. package/dist/services/validate/mergeValidatedOutputs.js.map +1 -0
  93. package/dist/tests/assertions.d.ts +4 -2
  94. package/dist/tests/assertions.js.map +1 -1
  95. package/dist/tests/mocks.d.ts +7 -0
  96. package/dist/tests/mocks.js +9 -0
  97. package/dist/tests/mocks.js.map +1 -1
  98. package/dist/tests/setupNodeTest.js +7 -0
  99. package/dist/tests/setupNodeTest.js.map +1 -1
  100. package/dist/tests/testHelpers.d.ts +4 -12
  101. package/dist/tests/testHelpers.js +3 -1
  102. package/dist/tests/testHelpers.js.map +1 -1
  103. package/package.json +20 -8
  104. package/tsconfig.tests.json +14 -0
  105. package/dist/services/messaging/email/templates/.gitkeep +0 -0
  106. package/dist/services/messaging/email/templates/recovery/html.pug +0 -8
  107. package/dist/services/messaging/email/templates/recovery/subject.pug +0 -2
  108. package/dist/services/messaging/email/templates/recovery/text.pug +0 -3
  109. package/dist/services/messaging/email/templates/verification/html.pug +0 -10
  110. package/dist/services/messaging/email/templates/verification/subject.pug +0 -1
  111. package/dist/services/messaging/email/templates/verification/text.pug +0 -1
@@ -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":"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"}
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
- return {
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":"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"}
1
+ {"version":3,"file":"match.js","sourceRoot":"","sources":["../../../../src/services/http/routing/match.ts"],"names":[],"mappings":"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"}
@@ -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,21 @@
1
- import type { i18n, TFunction } from 'i18next';
2
1
  import Base from '../../modules/Base.ts';
3
- export type TI18n = {
4
- t: TFunction;
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
- }>;
13
- getI18nBaseInstance(): Promise<i18n>;
6
+ getI18nForLang(lang?: string): Promise<TI18n>;
7
+ /**
8
+ * Base i18next instance, initialised on first use.
9
+ *
10
+ * @throws when the optional `i18next`/`i18next-fs-backend` packages are not
11
+ * installed — use `getI18nBaseInstanceIfAvailable()` where falling back to
12
+ * the framework's English defaults is the better answer.
13
+ */
14
+ getI18nBaseInstance(): Promise<I18nBaseInstance>;
15
+ /**
16
+ * Base i18next instance, or `null` when the optional packages are missing —
17
+ * logged once, not per request. Any other initialisation failure still throws.
18
+ */
19
+ getI18nBaseInstanceIfAvailable(): Promise<I18nBaseInstance | null>;
14
20
  static get loggerGroup(): string;
15
21
  }
@@ -1,10 +1,49 @@
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: ((text) => text),
43
+ t: (key, options) => typeof options === 'string'
44
+ ? options
45
+ : (options?.defaultValue ??
46
+ (Array.isArray(key) ? (key.at(-1) ?? '') : key)),
8
47
  language: 'en',
9
48
  };
10
49
  async getI18nForLang(lang) {
@@ -17,23 +56,33 @@ export class I18n extends Base {
17
56
  lang = i18NConfig.fallbackLng;
18
57
  }
19
58
  if (!this.#cache[lang]) {
20
- this.#cache[lang] = (await this.getI18nBaseInstance()).cloneInstance({
59
+ const i18nBase = await this.getI18nBaseInstanceIfAvailable();
60
+ if (!i18nBase) {
61
+ // i18next is not installed: serve the in-code English defaults rather
62
+ // than failing the request. Reported once by the call above.
63
+ return this.#i18nFallback;
64
+ }
65
+ this.#cache[lang] = i18nBase.cloneInstance({
21
66
  initAsync: false,
22
67
  lng: lang,
23
68
  });
24
69
  }
25
70
  return this.#cache[lang];
26
71
  }
72
+ /**
73
+ * Base i18next instance, initialised on first use.
74
+ *
75
+ * @throws when the optional `i18next`/`i18next-fs-backend` packages are not
76
+ * installed — use `getI18nBaseInstanceIfAvailable()` where falling back to
77
+ * the framework's English defaults is the better answer.
78
+ */
27
79
  async getI18nBaseInstance() {
28
80
  if (this.#i18nBase) {
29
81
  return this.#i18nBase;
30
82
  }
31
83
  if (!this.#i18nBasePromise) {
32
84
  this.#i18nBasePromise = (async () => {
33
- const [{ default: i18next }, { default: BackendFS }] = await Promise.all([
34
- import('i18next'), // Speed optimisation
35
- import('i18next-fs-backend'), // Speed optimisation
36
- ]);
85
+ const { i18next, BackendFS } = await loadI18next();
37
86
  const i18NConfig = this.app.getConfig('i18n');
38
87
  await i18next.use(BackendFS).init({
39
88
  backend: {
@@ -51,6 +100,25 @@ export class I18n extends Base {
51
100
  }
52
101
  return this.#i18nBasePromise;
53
102
  }
103
+ /**
104
+ * Base i18next instance, or `null` when the optional packages are missing —
105
+ * logged once, not per request. Any other initialisation failure still throws.
106
+ */
107
+ async getI18nBaseInstanceIfAvailable() {
108
+ try {
109
+ return await this.getI18nBaseInstance();
110
+ }
111
+ catch (e) {
112
+ if (!(e instanceof MissingI18nextError)) {
113
+ throw e;
114
+ }
115
+ if (!this.#missingReported) {
116
+ this.#missingReported = true;
117
+ this.logger?.warn(e.message);
118
+ }
119
+ return null;
120
+ }
121
+ }
54
122
  static get loggerGroup() {
55
123
  return 'I18n_';
56
124
  }
@@ -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;IAEjC,aAAa,GAAuC;QAClD,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAc;QAChC,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,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,mBAAmB,EAAE,CAAC,CAAC,aAAa,CAAC;gBACnE,SAAS,EAAE,KAAK;gBAChB,GAAG,EAAE,IAAI;aACV,CAAC,CAAC;QACL,CAAC;QACD,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAC3B,CAAC;IAED,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,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC,GAClD,MAAM,OAAO,CAAC,GAAG,CAAC;oBAChB,MAAM,CAAC,SAAS,CAAC,EAAE,qBAAqB;oBACxC,MAAM,CAAC,oBAAoB,CAAC,EAAE,qBAAqB;iBACpD,CAAC,CAAC;gBACL,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,MAAM,KAAK,WAAW;QACpB,OAAO,OAAO,CAAC;IACjB,CAAC;CACF"}
1
+ {"version":3,"file":"I18n.js","sourceRoot":"","sources":["../../../src/services/i18n/I18n.ts"],"names":[],"mappings":"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"}
@@ -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,2 @@
1
+ export {};
2
+ //# sourceMappingURL=types.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/services/i18n/types.ts"],"names":[],"mappings":""}
@@ -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('&', '&amp;')
8
+ .replaceAll('<', '&lt;')
9
+ .replaceAll('>', '&gt;')
10
+ .replaceAll('"', '&quot;')
11
+ .replaceAll("'", '&#39;');
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,3 @@
1
+ import type { TEmailTemplate } from '../../types.ts';
2
+ declare const html: TEmailTemplate;
3
+ export default html;
@@ -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,3 @@
1
+ import type { TEmailTemplate } from '../../types.ts';
2
+ declare const subject: TEmailTemplate;
3
+ export default subject;
@@ -0,0 +1,3 @@
1
+ const subject = ({ t }) => t('email.passwordRecovery', { defaultValue: 'Recovery password' });
2
+ export default subject;
3
+ //# sourceMappingURL=subject.js.map
@@ -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,3 @@
1
+ import type { TEmailTemplate } from '../../types.ts';
2
+ declare const text: TEmailTemplate;
3
+ export default text;
@@ -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,3 @@
1
+ import type { TEmailTemplate } from '../../types.ts';
2
+ declare const html: TEmailTemplate;
3
+ export default html;
@@ -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,3 @@
1
+ import type { TEmailTemplate } from '../../types.ts';
2
+ declare const subject: TEmailTemplate;
3
+ export default subject;
@@ -0,0 +1,3 @@
1
+ const subject = ({ t }) => t('email.emailConfirm', { defaultValue: 'Email confirmation' });
2
+ export default subject;
3
+ //# sourceMappingURL=subject.js.map
@@ -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,3 @@
1
+ import type { TEmailTemplate } from '../../types.ts';
2
+ declare const text: TEmailTemplate;
3
+ export default text;
@@ -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;