@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.
Files changed (82) hide show
  1. package/AGENTS.md +37 -0
  2. package/CHANGELOG.md +109 -0
  3. package/CLAUDE.md +1 -0
  4. package/README.md +34 -1
  5. package/dist/controllers/Auth.js +103 -33
  6. package/dist/controllers/Auth.js.map +1 -1
  7. package/dist/helpers/translate.d.ts +11 -0
  8. package/dist/helpers/translate.js +14 -0
  9. package/dist/helpers/translate.js.map +1 -0
  10. package/dist/locales/en/translation.json +1 -27
  11. package/dist/locales/ru/translation.json +3 -7
  12. package/dist/models/User.d.ts +3 -4
  13. package/dist/models/User.js +8 -0
  14. package/dist/models/User.js.map +1 -1
  15. package/dist/models/UserOld.js +8 -0
  16. package/dist/models/UserOld.js.map +1 -1
  17. package/dist/modules/BaseModel.d.ts +18 -3
  18. package/dist/modules/BaseModel.js.map +1 -1
  19. package/dist/services/http/HttpServer.js +9 -4
  20. package/dist/services/http/HttpServer.js.map +1 -1
  21. package/dist/services/http/middleware/AbstractMiddleware.d.ts +8 -0
  22. package/dist/services/http/middleware/AbstractMiddleware.js +11 -0
  23. package/dist/services/http/middleware/AbstractMiddleware.js.map +1 -1
  24. package/dist/services/http/middleware/Auth.js +1 -1
  25. package/dist/services/http/middleware/Auth.js.map +1 -1
  26. package/dist/services/http/middleware/I18n.js +6 -1
  27. package/dist/services/http/middleware/I18n.js.map +1 -1
  28. package/dist/services/http/middleware/RateLimiter.js +3 -1
  29. package/dist/services/http/middleware/RateLimiter.js.map +1 -1
  30. package/dist/services/http/middleware/RequestParser.js +3 -3
  31. package/dist/services/http/middleware/RequestParser.js.map +1 -1
  32. package/dist/services/http/middleware/Role.js +6 -2
  33. package/dist/services/http/middleware/Role.js.map +1 -1
  34. package/dist/services/i18n/I18n.d.ts +12 -0
  35. package/dist/services/i18n/I18n.js +73 -6
  36. package/dist/services/i18n/I18n.js.map +1 -1
  37. package/dist/services/messaging/email/escapeHtml.d.ts +6 -0
  38. package/dist/services/messaging/email/escapeHtml.js +12 -0
  39. package/dist/services/messaging/email/escapeHtml.js.map +1 -0
  40. package/dist/services/messaging/email/templates/recovery/html.d.ts +3 -0
  41. package/dist/services/messaging/email/templates/recovery/html.js +20 -0
  42. package/dist/services/messaging/email/templates/recovery/html.js.map +1 -0
  43. package/dist/services/messaging/email/templates/recovery/subject.d.ts +3 -0
  44. package/dist/services/messaging/email/templates/recovery/subject.js +3 -0
  45. package/dist/services/messaging/email/templates/recovery/subject.js.map +1 -0
  46. package/dist/services/messaging/email/templates/recovery/text.d.ts +3 -0
  47. package/dist/services/messaging/email/templates/recovery/text.js +15 -0
  48. package/dist/services/messaging/email/templates/recovery/text.js.map +1 -0
  49. package/dist/services/messaging/email/templates/verification/html.d.ts +3 -0
  50. package/dist/services/messaging/email/templates/verification/html.js +23 -0
  51. package/dist/services/messaging/email/templates/verification/html.js.map +1 -0
  52. package/dist/services/messaging/email/templates/verification/subject.d.ts +3 -0
  53. package/dist/services/messaging/email/templates/verification/subject.js +3 -0
  54. package/dist/services/messaging/email/templates/verification/subject.js.map +1 -0
  55. package/dist/services/messaging/email/templates/verification/text.d.ts +3 -0
  56. package/dist/services/messaging/email/templates/verification/text.js +15 -0
  57. package/dist/services/messaging/email/templates/verification/text.js.map +1 -0
  58. package/dist/services/messaging/email/types.d.ts +28 -0
  59. package/dist/services/messaging/email/types.js +2 -0
  60. package/dist/services/messaging/email/types.js.map +1 -0
  61. package/dist/tests/assertions.d.ts +4 -2
  62. package/dist/tests/assertions.js.map +1 -1
  63. package/dist/tests/mocks.d.ts +7 -0
  64. package/dist/tests/mocks.js +9 -0
  65. package/dist/tests/mocks.js.map +1 -1
  66. package/dist/tests/setupFramework.d.ts +4 -0
  67. package/dist/tests/setupFramework.js +8 -1
  68. package/dist/tests/setupFramework.js.map +1 -1
  69. package/dist/tests/setupNodeTest.js +7 -0
  70. package/dist/tests/setupNodeTest.js.map +1 -1
  71. package/dist/tests/testHelpers.d.ts +28 -8
  72. package/dist/tests/testHelpers.js +29 -0
  73. package/dist/tests/testHelpers.js.map +1 -1
  74. package/package.json +20 -8
  75. package/tsconfig.tests.json +14 -0
  76. package/dist/services/messaging/email/templates/.gitkeep +0 -0
  77. package/dist/services/messaging/email/templates/recovery/html.pug +0 -8
  78. package/dist/services/messaging/email/templates/recovery/subject.pug +0 -2
  79. package/dist/services/messaging/email/templates/recovery/text.pug +0 -3
  80. package/dist/services/messaging/email/templates/verification/html.pug +0 -10
  81. package/dist/services/messaging/email/templates/verification/subject.pug +0 -1
  82. package/dist/services/messaging/email/templates/verification/text.pug +0 -1
@@ -1,4 +1,33 @@
1
1
  import { appInstance } from '../helpers/appInstance.js';
2
+ let testServerOptions = {};
3
+ let areTestServerOptionsApplied = false;
4
+ /**
5
+ * Declare `Server` options — notably the `bootHttp` hook — for the test server.
6
+ * Without this, app-wide HTTP wiring that production does in `bootHttp` is
7
+ * simply absent under test, so tests see the unwired behavior (a 500 where
8
+ * production returns the mapped status) with nothing reporting the difference.
9
+ *
10
+ * Call it at module scope in the preload that imports the framework setup glue,
11
+ * before any hook boots the server.
12
+ */
13
+ export const configureTestServer = (options) => {
14
+ if (areTestServerOptionsApplied) {
15
+ throw new Error('configureTestServer() must be called before the test server boots. ' +
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. ' +
18
+ 'If that preload awaits at top level before this call, move the call ' +
19
+ 'into a separate module imported before the setup glue.');
20
+ }
21
+ testServerOptions = { ...testServerOptions, ...options };
22
+ };
23
+ /**
24
+ * Read the declared options and close the window for further configuration.
25
+ * Called once by the test bootstrap as it constructs the `Server`.
26
+ */
27
+ export const takeTestServerOptions = () => {
28
+ areTestServerOptionsApplied = true;
29
+ return testServerOptions;
30
+ };
2
31
  export let serverInstance;
3
32
  export let defaultUser;
4
33
  export let defaultAuthToken;
@@ -1 +1 @@
1
- {"version":3,"file":"testHelpers.js","sourceRoot":"","sources":["../../src/tests/testHelpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAMxD,MAAM,CAAC,IAAI,cAAuB,CAAC;AACnC,MAAM,CAAC,IAAI,WAAkE,CAAC;AAC9E,MAAM,CAAC,IAAI,gBAAwB,CAAC;AAEpC,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,mBAA2B,EAAE,EAAE;IAC/D,IAAI,cAAc,EAAE,CAAC;QACnB,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;IACpD,CAAC;IACD,cAAc,GAAG,mBAAmB,CAAC;AACvC,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG,CAC5B,SAAgE,EAChE,EAAE;IACF,IAAI,WAAW,EAAE,CAAC;QAChB,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACjD,CAAC;IACD,WAAW,GAAG,SAAS,CAAC;AAC1B,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,UAAkB,EAAE,EAAE;IACxD,IAAI,gBAAgB,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;IAC/C,CAAC;IACD,gBAAgB,GAAG,UAAU,CAAC;AAChC,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,OAAgB,EAAE,EAAE,CACnD,oBAAoB,WAAW,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,IAAI,GAAG,OAAO,EAAE,CAAC;AAErE,IAAI,wBAAwB,GAA2B,IAAI,CAAC;AAE5D;;;;GAIG;AACH,MAAM,UAAU,qBAAqB;IACnC,6EAA6E;IAC7E,8EAA8E;IAC9E,wBAAwB,KAAK,MAAM,CAAC,qBAAqB,CAAC,CAAC,IAAI,CAC7D,CAAC,EAAE,qBAAqB,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC,WAAW,EAAE,CAC1D,CAAC;IACF,OAAO,wBAAwB,CAAC;AAClC,CAAC;AAED,MAAM,CAAC,MAAM,qBAAqB,GAAG,KAAK,IAAI,EAAE;IAC9C,IAAI,WAAW,EAAE,CAAC;QAChB,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;IAC3D,CAAC;IACD,MAAM,IAAI,GAAG,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAqB,CAAC;IAC9D,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC;QAC7B,KAAK,EAAE,eAAe;QACtB,QAAQ,EAAE,cAAc;QACxB,UAAU,EAAE,IAAI;QAChB,IAAI,EAAE;YACJ,IAAI,EAAE,kBAAkB;SACzB;KACF,CAAC,CAAC,KAAK,CAAC,CAAC,CAAQ,EAAE,EAAE;QACpB,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACjB,OAAO,CAAC,IAAI,CACV,qGAAqG,CACtG,CAAC;IACJ,CAAC,CAAC,CAAC;IACH,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO,KAAK,CAAC;IACf,CAAC;IACD,cAAc,CAAC,IAAI,CAAC,CAAC;IACrB,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;IACzC,mBAAmB,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACjC,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC;AACtC,CAAC,CAAC"}
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.2",
3
+ "version": "5.4.0",
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.143.0",
86
+ "oxc-parser": "^0.148.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": "^1.0.0 || ^2.0.0",
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.143.0",
100
+ "oxc-parser": "^0.148.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,8 +0,0 @@
1
- doctype html
2
- html(lang='en')
3
- head
4
- meta(charset='UTF-8')
5
- body
6
- h1 #{t('email.passwordRecovery')}
7
- p #{t('email.passwordChanged')} #{link}
8
-
@@ -1,2 +0,0 @@
1
- = `${t('email.passwordRecovery')}`
2
-
@@ -1,3 +0,0 @@
1
- .
2
- #{t('email.greeating')}
3
- #{t('email.passwordRecovery')} #{link}
@@ -1,10 +0,0 @@
1
- doctype html
2
- html(lang='en')
3
- head
4
- meta(charset='UTF-8')
5
- title верификация емейла
6
- body
7
- h1 Добрый день #{username}
8
- p
9
- | Для верификации емейла перейдите по ссылке
10
- a(href='#{link}') #{link}
@@ -1 +0,0 @@
1
- = `Верификаия емейла`
@@ -1 +0,0 @@
1
- = `Добрый день {{username}} Для верификации емейла перейдите по ссылке ${link}`