@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.
- package/AGENTS.md +58 -0
- package/CHANGELOG.md +123 -1
- package/CLAUDE.md +1 -0
- package/README.md +71 -1
- package/dist/codegen/astExtract.js +6 -1
- package/dist/codegen/astExtract.js.map +1 -1
- package/dist/codegen/emit.js +27 -26
- package/dist/codegen/emit.js.map +1 -1
- package/dist/config/auth.d.ts +4 -0
- package/dist/config/auth.js +2 -0
- package/dist/config/auth.js.map +1 -1
- package/dist/controllers/Auth.js +138 -60
- package/dist/controllers/Auth.js.map +1 -1
- package/dist/controllers/Auth.routes.gen.d.ts +18 -32
- package/dist/controllers/Home.routes.gen.d.ts +2 -4
- package/dist/controllers/index.js +4 -4
- package/dist/controllers/index.js.map +1 -1
- package/dist/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 +5 -11
- package/dist/models/User.js +16 -3
- package/dist/models/User.js.map +1 -1
- package/dist/models/UserOld.d.ts +3 -9
- package/dist/models/UserOld.js +8 -0
- package/dist/models/UserOld.js.map +1 -1
- package/dist/modules/BaseModel.d.ts +160 -58
- package/dist/modules/BaseModel.js.map +1 -1
- package/dist/server.d.ts +13 -3
- package/dist/server.js +2 -0
- package/dist/server.js.map +1 -1
- package/dist/services/cache/Cache.js +14 -7
- package/dist/services/cache/Cache.js.map +1 -1
- package/dist/services/http/HttpServer.d.ts +2 -5
- package/dist/services/http/HttpServer.js +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 +12 -2
- package/dist/services/http/middleware/RateLimiter.js.map +1 -1
- package/dist/services/http/middleware/RequestParser.js +38 -19
- 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/http/routing/ExpressAdapter.js +17 -1
- package/dist/services/http/routing/ExpressAdapter.js.map +1 -1
- package/dist/services/http/routing/match.d.ts +1 -0
- package/dist/services/http/routing/match.js +9 -1
- package/dist/services/http/routing/match.js.map +1 -1
- package/dist/services/http/types.d.ts +70 -5
- package/dist/services/i18n/I18n.d.ts +16 -10
- package/dist/services/i18n/I18n.js +74 -6
- package/dist/services/i18n/I18n.js.map +1 -1
- package/dist/services/i18n/types.d.ts +44 -0
- package/dist/services/i18n/types.js +2 -0
- package/dist/services/i18n/types.js.map +1 -0
- package/dist/services/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/services/validate/ValidateService.d.ts +2 -2
- package/dist/services/validate/ValidateService.js.map +1 -1
- package/dist/services/validate/mergeValidatedOutputs.d.ts +19 -0
- package/dist/services/validate/mergeValidatedOutputs.js +43 -0
- package/dist/services/validate/mergeValidatedOutputs.js.map +1 -0
- package/dist/tests/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/setupNodeTest.js +7 -0
- package/dist/tests/setupNodeTest.js.map +1 -1
- package/dist/tests/testHelpers.d.ts +4 -12
- package/dist/tests/testHelpers.js +3 -1
- 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
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/services/messaging/email/types.ts"],"names":[],"mappings":""}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import type { TFunction } from 'i18next';
|
|
2
1
|
import Base from '../../modules/Base.ts';
|
|
3
2
|
import type { IApp } from '../../server.ts';
|
|
3
|
+
import type { TranslationFunction } from '../i18n/types.ts';
|
|
4
4
|
import type { ValidatorDriver } from './types.ts';
|
|
5
5
|
/**
|
|
6
6
|
* Per-route validator dispatcher. Resolves a `ValidatorDriver` once at
|
|
@@ -47,7 +47,7 @@ declare class ValidateService extends Base {
|
|
|
47
47
|
* remember a translation step.
|
|
48
48
|
*/
|
|
49
49
|
validate(data: unknown, i18n?: {
|
|
50
|
-
t:
|
|
50
|
+
t: TranslationFunction;
|
|
51
51
|
} | null): Promise<unknown>;
|
|
52
52
|
static get loggerGroup(): string;
|
|
53
53
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ValidateService.js","sourceRoot":"","sources":["../../../src/services/validate/ValidateService.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ValidateService.js","sourceRoot":"","sources":["../../../src/services/validate/ValidateService.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* A validator output can be any JavaScript value. Only combining several
|
|
3
|
+
* validator outputs requires an object shape: the framework's established
|
|
4
|
+
* merge is a shallow, ordered merge of plain objects.
|
|
5
|
+
*/
|
|
6
|
+
export declare function isPlainObject(value: unknown): value is Record<PropertyKey, unknown>;
|
|
7
|
+
/**
|
|
8
|
+
* Preserve a single validator output exactly. When several schemas contribute
|
|
9
|
+
* to one request slot, merge their plain-object outputs in schema order so
|
|
10
|
+
* later keys overwrite earlier keys. Other shapes are a configuration error;
|
|
11
|
+
* spreading them would silently turn arrays and primitives into records.
|
|
12
|
+
*/
|
|
13
|
+
export declare function mergeValidatedOutputs(outputs: readonly unknown[]): unknown;
|
|
14
|
+
/**
|
|
15
|
+
* Add the framework-owned content-type discriminator without mutating a
|
|
16
|
+
* validator's singleton output. Content-type maps are object contracts, so a
|
|
17
|
+
* non-plain output is rejected explicitly rather than being spread.
|
|
18
|
+
*/
|
|
19
|
+
export declare function addContentTypeDiscriminator(output: unknown, contentType: string): Record<string, unknown>;
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* A validator output can be any JavaScript value. Only combining several
|
|
3
|
+
* validator outputs requires an object shape: the framework's established
|
|
4
|
+
* merge is a shallow, ordered merge of plain objects.
|
|
5
|
+
*/
|
|
6
|
+
export function isPlainObject(value) {
|
|
7
|
+
if (value === null || typeof value !== 'object') {
|
|
8
|
+
return false;
|
|
9
|
+
}
|
|
10
|
+
const prototype = Object.getPrototypeOf(value);
|
|
11
|
+
return prototype === Object.prototype || prototype === null;
|
|
12
|
+
}
|
|
13
|
+
/**
|
|
14
|
+
* Preserve a single validator output exactly. When several schemas contribute
|
|
15
|
+
* to one request slot, merge their plain-object outputs in schema order so
|
|
16
|
+
* later keys overwrite earlier keys. Other shapes are a configuration error;
|
|
17
|
+
* spreading them would silently turn arrays and primitives into records.
|
|
18
|
+
*/
|
|
19
|
+
export function mergeValidatedOutputs(outputs) {
|
|
20
|
+
if (outputs.length === 1) {
|
|
21
|
+
return outputs[0];
|
|
22
|
+
}
|
|
23
|
+
const objects = outputs.map((output, index) => {
|
|
24
|
+
if (!isPlainObject(output)) {
|
|
25
|
+
throw new Error(`Cannot merge validated outputs: output ${index + 1} is not a plain object. ` +
|
|
26
|
+
'Multiple validation schemas must return plain objects.');
|
|
27
|
+
}
|
|
28
|
+
return output;
|
|
29
|
+
});
|
|
30
|
+
return Object.assign({}, ...objects);
|
|
31
|
+
}
|
|
32
|
+
/**
|
|
33
|
+
* Add the framework-owned content-type discriminator without mutating a
|
|
34
|
+
* validator's singleton output. Content-type maps are object contracts, so a
|
|
35
|
+
* non-plain output is rejected explicitly rather than being spread.
|
|
36
|
+
*/
|
|
37
|
+
export function addContentTypeDiscriminator(output, contentType) {
|
|
38
|
+
if (!isPlainObject(output)) {
|
|
39
|
+
throw new Error('Cannot add a content-type discriminator: the matched validation output must be a plain object.');
|
|
40
|
+
}
|
|
41
|
+
return { ...output, contentType };
|
|
42
|
+
}
|
|
43
|
+
//# sourceMappingURL=mergeValidatedOutputs.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mergeValidatedOutputs.js","sourceRoot":"","sources":["../../../src/services/validate/mergeValidatedOutputs.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,MAAM,UAAU,aAAa,CAC3B,KAAc;IAEd,IAAI,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAChD,OAAO,KAAK,CAAC;IACf,CAAC;IACD,MAAM,SAAS,GAAG,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;IAC/C,OAAO,SAAS,KAAK,MAAM,CAAC,SAAS,IAAI,SAAS,KAAK,IAAI,CAAC;AAC9D,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,qBAAqB,CAAC,OAA2B;IAC/D,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,OAAO,CAAC,CAAC,CAAC,CAAC;IACpB,CAAC;IAED,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE;QAC5C,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC;YAC3B,MAAM,IAAI,KAAK,CACb,0CAA0C,KAAK,GAAG,CAAC,0BAA0B;gBAC3E,wDAAwD,CAC3D,CAAC;QACJ,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,GAAG,OAAO,CAAC,CAAC;AACvC,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,2BAA2B,CACzC,MAAe,EACf,WAAmB;IAEnB,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC;QAC3B,MAAM,IAAI,KAAK,CACb,gGAAgG,CACjG,CAAC;IACJ,CAAC;IACD,OAAO,EAAE,GAAG,MAAM,EAAE,WAAW,EAAE,CAAC;AACpC,CAAC"}
|
|
@@ -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":"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"}
|
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"}
|
|
@@ -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"}
|
|
@@ -72,7 +72,7 @@ export declare const createDefaultTestUser: () => Promise<false | {
|
|
|
72
72
|
isVerified: boolean;
|
|
73
73
|
locale: string;
|
|
74
74
|
languages: string[];
|
|
75
|
-
},
|
|
75
|
+
}, {}, Omit<{
|
|
76
76
|
readonly timestamps: true;
|
|
77
77
|
readonly minimize: false;
|
|
78
78
|
}, never>> & Omit<{
|
|
@@ -145,7 +145,7 @@ export declare const createDefaultTestUser: () => Promise<false | {
|
|
|
145
145
|
_id: import("mongoose").Types.ObjectId;
|
|
146
146
|
}> & {
|
|
147
147
|
__v: number;
|
|
148
|
-
}, "generateToken" | "getPublic" | "id" | "sendPasswordRecoveryEmail" | "sendVerificationEmail"> & import("mongoose").HydratedDocumentOverrides<
|
|
148
|
+
}, "generateToken" | "getPublic" | "id" | "sendPasswordRecoveryEmail" | "sendVerificationEmail"> & import("mongoose").HydratedDocumentOverrides<{} & import("../modules/BaseModel.ts").DocFacingMethods<{
|
|
149
149
|
readonly generateToken: (this: {
|
|
150
150
|
email?: string | null;
|
|
151
151
|
sessionTokens?: {
|
|
@@ -161,18 +161,12 @@ export declare const createDefaultTestUser: () => Promise<false | {
|
|
|
161
161
|
name?: {
|
|
162
162
|
nick?: string | null;
|
|
163
163
|
} | null;
|
|
164
|
-
}, i18n:
|
|
165
|
-
t: import("i18next").TFunction;
|
|
166
|
-
language: string;
|
|
167
|
-
}) => Promise<any>;
|
|
164
|
+
}, i18n: import("../services/i18n/types.ts").TI18n) => Promise<any>;
|
|
168
165
|
readonly sendVerificationEmail: (this: import("../models/User.ts").UserAuthInstance & {
|
|
169
166
|
name?: {
|
|
170
167
|
nick?: string | null;
|
|
171
168
|
} | null;
|
|
172
|
-
}, i18n:
|
|
173
|
-
t: import("i18next").TFunction;
|
|
174
|
-
language: string;
|
|
175
|
-
}) => Promise<any>;
|
|
169
|
+
}, i18n: import("../services/i18n/types.ts").TI18n) => Promise<any>;
|
|
176
170
|
readonly getPublic: (this: import("../models/User.ts").UserPublicDoc) => {
|
|
177
171
|
avatar: string | null | undefined;
|
|
178
172
|
name: Omit<{
|
|
@@ -189,8 +183,6 @@ export declare const createDefaultTestUser: () => Promise<false | {
|
|
|
189
183
|
};
|
|
190
184
|
}> & {
|
|
191
185
|
id: string;
|
|
192
|
-
} & {
|
|
193
|
-
id: string;
|
|
194
186
|
}>;
|
|
195
187
|
token: string;
|
|
196
188
|
}>;
|
|
@@ -14,7 +14,9 @@ export const configureTestServer = (options) => {
|
|
|
14
14
|
if (areTestServerOptionsApplied) {
|
|
15
15
|
throw new Error('configureTestServer() must be called before the test server boots. ' +
|
|
16
16
|
'Call it at module scope in your test preload (the module that imports ' +
|
|
17
|
-
'@adaptivestone/framework/tests/setupNodeTest.js), not from a test hook.'
|
|
17
|
+
'@adaptivestone/framework/tests/setupNodeTest.js), not from a test hook. ' +
|
|
18
|
+
'If that preload awaits at top level before this call, move the call ' +
|
|
19
|
+
'into a separate module imported before the setup glue.');
|
|
18
20
|
}
|
|
19
21
|
testServerOptions = { ...testServerOptions, ...options };
|
|
20
22
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"testHelpers.js","sourceRoot":"","sources":["../../src/tests/testHelpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAcxD,IAAI,iBAAiB,GAAsB,EAAE,CAAC;AAC9C,IAAI,2BAA2B,GAAG,KAAK,CAAC;AAExC;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,OAA0B,EAAE,EAAE;IAChE,IAAI,2BAA2B,EAAE,CAAC;QAChC,MAAM,IAAI,KAAK,CACb,qEAAqE;YACnE,wEAAwE;YACxE,
|
|
1
|
+
{"version":3,"file":"testHelpers.js","sourceRoot":"","sources":["../../src/tests/testHelpers.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@adaptivestone/framework",
|
|
3
|
-
"version": "5.
|
|
3
|
+
"version": "5.4.1",
|
|
4
4
|
"description": "Adaptive stone node js framework",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"engines": {
|
|
7
|
-
"node": ">=24.0.0"
|
|
7
|
+
"node": ">=24.0.0",
|
|
8
|
+
"bun": ">=1.4.0"
|
|
8
9
|
},
|
|
9
10
|
"exports": {
|
|
10
11
|
"./package.json": "./package.json",
|
|
@@ -29,15 +30,17 @@
|
|
|
29
30
|
"homepage": "https://framework.adaptivestone.com/",
|
|
30
31
|
"scripts": {
|
|
31
32
|
"build": "rm -rf dist && tsc",
|
|
32
|
-
"postbuild": "cp -R ./src/migrations ./dist/migrations && cp -R ./src/locales ./dist/locales && cp -R ./src/services/messaging ./dist/services/messaging",
|
|
33
|
+
"postbuild": "cp -R ./src/migrations ./dist/migrations && cp -R ./src/locales ./dist/locales && cp -R ./src/services/messaging/email/resources ./dist/services/messaging/email/resources",
|
|
33
34
|
"check:types": "npm run gen && tsc --noEmit",
|
|
34
35
|
"check:types:raw": "tsc --noEmit",
|
|
35
36
|
"check:types:fast": "npm run gen && tsc --noEmit",
|
|
37
|
+
"check:types:tests": "npm run gen && tsc --noEmit -p tsconfig.tests.json",
|
|
36
38
|
"dev": "node --watch ./src/index.ts",
|
|
37
39
|
"prod": "node ./src/cluster.ts",
|
|
38
40
|
"test": "npm run test:coverage",
|
|
39
41
|
"t": "node --experimental-test-module-mocks --test --import=./src/tests/setupNodeTest.ts --import=./src/tests/frameworkNodeTestSetup.ts --test-global-setup=./src/tests/globalSetupNodeTest.ts --test-timeout=10000 'src/**/*.test.ts' 'src/**/*.node-test.ts'",
|
|
40
42
|
"test:node": "npm run t",
|
|
43
|
+
"test:bun": "./scripts/bun-test.sh",
|
|
41
44
|
"test:coverage": "mkdir -p coverage && node --experimental-test-module-mocks --experimental-test-coverage --test --import=./src/tests/setupNodeTest.ts --import=./src/tests/frameworkNodeTestSetup.ts --test-global-setup=./src/tests/globalSetupNodeTest.ts --test-timeout=10000 --test-coverage-exclude='src/tests/**' --test-coverage-exclude='**/*.test.ts' --test-coverage-exclude='**/*.node-test.ts' --test-reporter=spec --test-reporter-destination=stdout --test-reporter=junit --test-reporter-destination=coverage/junit.rspec.xml --test-reporter=lcov --test-reporter-destination=coverage/lcov.info 'src/**/*.test.ts' 'src/**/*.node-test.ts'",
|
|
42
45
|
"format": "biome format",
|
|
43
46
|
"format:fix": "biome format --write",
|
|
@@ -47,6 +50,7 @@
|
|
|
47
50
|
"check:fix": "biome check --write",
|
|
48
51
|
"prepublishOnly": "npm run gen && npm run build",
|
|
49
52
|
"smoke": "./scripts/packaging-smoke-test.sh",
|
|
53
|
+
"smoke:bun": "./scripts/bun-packaging-smoke-test.sh",
|
|
50
54
|
"cli": "node cliCommand.ts",
|
|
51
55
|
"gen": "node cliCommand.ts generatetypes",
|
|
52
56
|
"openapi": "node cliCommand.ts openapi",
|
|
@@ -62,8 +66,6 @@
|
|
|
62
66
|
"deepmerge": "^4.2.2",
|
|
63
67
|
"express": "^5.0.1",
|
|
64
68
|
"formidable": "^3.5.1",
|
|
65
|
-
"i18next": "^26.0.1",
|
|
66
|
-
"i18next-fs-backend": "^2.0.0",
|
|
67
69
|
"mongoose": "^9.9.1",
|
|
68
70
|
"rate-limiter-flexible": "^11.0.0",
|
|
69
71
|
"winston": "^3.3.3",
|
|
@@ -77,21 +79,25 @@
|
|
|
77
79
|
"@types/express": "^5.0.1",
|
|
78
80
|
"@types/formidable": "^3.4.5",
|
|
79
81
|
"@types/node": "^26.0.0",
|
|
82
|
+
"i18next": "^26.0.1",
|
|
83
|
+
"i18next-fs-backend": "^2.0.0",
|
|
80
84
|
"lefthook": "^2.0.0",
|
|
81
85
|
"mongodb-memory-server": "^11.0.0",
|
|
82
|
-
"oxc-parser": "^0.
|
|
86
|
+
"oxc-parser": "^0.149.0",
|
|
83
87
|
"typescript": "^7.0.2",
|
|
84
88
|
"vitest": "^4.0.0",
|
|
85
89
|
"yup": "^1.7.0",
|
|
86
90
|
"zod": "^4.0.0"
|
|
87
91
|
},
|
|
88
92
|
"peerDependencies": {
|
|
89
|
-
"@adaptivestone/framework-module-email": "^
|
|
93
|
+
"@adaptivestone/framework-module-email": "^2.1.0",
|
|
90
94
|
"@redis/client": "^6.0.0",
|
|
91
95
|
"@sentry/core": "^10.34.0",
|
|
92
96
|
"@sentry/node": "^10.34.0",
|
|
97
|
+
"i18next": "^26.0.1",
|
|
98
|
+
"i18next-fs-backend": "^2.0.0",
|
|
93
99
|
"mongodb-memory-server": "^11.0.0",
|
|
94
|
-
"oxc-parser": "^0.
|
|
100
|
+
"oxc-parser": "^0.149.0",
|
|
95
101
|
"vitest": "^4.0.0",
|
|
96
102
|
"yup": "^1.7.0",
|
|
97
103
|
"zod": "^3.24.0 || ^4.0.0"
|
|
@@ -109,6 +115,12 @@
|
|
|
109
115
|
"@sentry/node": {
|
|
110
116
|
"optional": true
|
|
111
117
|
},
|
|
118
|
+
"i18next": {
|
|
119
|
+
"optional": true
|
|
120
|
+
},
|
|
121
|
+
"i18next-fs-backend": {
|
|
122
|
+
"optional": true
|
|
123
|
+
},
|
|
112
124
|
"mongodb-memory-server": {
|
|
113
125
|
"optional": true
|
|
114
126
|
},
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
{
|
|
2
|
+
// Type-checks the test suite, which `tsconfig.json` excludes from the build.
|
|
3
|
+
// `src/**/__fixtures__` stays excluded: those files carry deliberate module
|
|
4
|
+
// augmentations (e.g. a custom `AppModelTypes['User']`) that would leak into
|
|
5
|
+
// every other file, and they are already type-checked in isolation through
|
|
6
|
+
// their own tsconfig by `ModelTyping.typecheck.test.ts` and
|
|
7
|
+
// `routeTypes.golden.test.ts`.
|
|
8
|
+
"extends": "./tsconfig.json",
|
|
9
|
+
"compilerOptions": {
|
|
10
|
+
"noEmit": true
|
|
11
|
+
},
|
|
12
|
+
"include": ["src/**/*"],
|
|
13
|
+
"exclude": ["src/codegen/__fixtures__/**", "src/models/__fixtures__/**"]
|
|
14
|
+
}
|
|
File without changes
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
= `Верификаия емейла`
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
= `Добрый день {{username}} Для верификации емейла перейдите по ссылке ${link}`
|