@adaptivestone/framework 5.5.0 → 5.6.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +112 -77
- package/README.md +31 -1
- package/dist/controllers/Auth.js +34 -20
- package/dist/controllers/Auth.js.map +1 -1
- package/dist/controllers/index.js +86 -71
- package/dist/controllers/index.js.map +1 -1
- package/dist/models/User.d.ts +22 -9
- package/dist/models/User.js +35 -7
- package/dist/models/User.js.map +1 -1
- package/dist/server.js +6 -1
- package/dist/server.js.map +1 -1
- package/dist/services/cache/Cache.js +4 -2
- package/dist/services/cache/Cache.js.map +1 -1
- package/dist/services/cache/drivers/MemoryDriver.js +3 -1
- package/dist/services/cache/drivers/MemoryDriver.js.map +1 -1
- package/dist/services/http/middleware/Auth.d.ts +1 -1
- package/dist/services/http/middleware/Auth.js.map +1 -1
- package/dist/services/http/middleware/RateLimiter.js +7 -1
- package/dist/services/http/middleware/RateLimiter.js.map +1 -1
- package/dist/services/http/middleware/Role.d.ts +1 -1
- package/dist/services/http/middleware/Role.js.map +1 -1
- package/dist/services/http/routing/RouteNode.d.ts +4 -3
- package/dist/services/http/routing/match.d.ts +7 -2
- package/dist/services/http/routing/match.js +58 -41
- package/dist/services/http/routing/match.js.map +1 -1
- package/dist/services/i18n/types.d.ts +2 -1
- package/dist/services/validate/ValidateService.d.ts +2 -0
- package/dist/services/validate/ValidateService.js +2 -0
- package/dist/services/validate/ValidateService.js.map +1 -1
- package/dist/services/validate/ValidationError.d.ts +4 -0
- package/dist/services/validate/ValidationError.js +6 -1
- package/dist/services/validate/ValidationError.js.map +1 -1
- package/package.json +3 -3
|
@@ -10,12 +10,16 @@
|
|
|
10
10
|
* Documented trade-off — handle the rare encoded-slash case in `'raw'`
|
|
11
11
|
* body mode if needed.
|
|
12
12
|
*
|
|
13
|
-
*
|
|
13
|
+
* Deliberate semantics:
|
|
14
14
|
* - A `{*splat}` matches ZERO trailing segments, so `/api/{*rest}` matches
|
|
15
15
|
* `/api` (with `rest: ''`).
|
|
16
16
|
* - A method-less structural node is NOT a match: walking to a dead end fails
|
|
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
|
+
* - Matching is method-aware: a node without the request's method does not
|
|
20
|
+
* end the walk either, so `DELETE /events/new` reaches `DELETE /events/:slug`
|
|
21
|
+
* next to a GET-only `/events/new`. 405 only when no route matching the path
|
|
22
|
+
* has the method; `Allow` lists the methods of all of them.
|
|
19
23
|
*/
|
|
20
24
|
// Runtime adapter metadata, separate from the public match-result contract.
|
|
21
25
|
// Nodes identify routes even when callers reuse one handler entry at many paths.
|
|
@@ -33,7 +37,8 @@ export class MalformedPathError extends Error {
|
|
|
33
37
|
}
|
|
34
38
|
/**
|
|
35
39
|
* - `null` → no path match (404).
|
|
36
|
-
* - `{ entry: null, allowedMethods }` → path matched,
|
|
40
|
+
* - `{ entry: null, allowedMethods }` → path matched, but no matching route
|
|
41
|
+
* has the method (405).
|
|
37
42
|
* - full result → success.
|
|
38
43
|
*/
|
|
39
44
|
export function match(root, method, path) {
|
|
@@ -44,19 +49,17 @@ export function match(root, method, path) {
|
|
|
44
49
|
if (segments.includes('')) {
|
|
45
50
|
return null;
|
|
46
51
|
}
|
|
47
|
-
|
|
52
|
+
// Path matches whose node lacks the method, most specific first.
|
|
53
|
+
const misses = [];
|
|
54
|
+
const hit = walk(root, upMethod, segments, 0, [], {}, [], undefined, misses);
|
|
55
|
+
const result = hit ?? misses[0];
|
|
48
56
|
if (!result) {
|
|
49
57
|
return null;
|
|
50
58
|
}
|
|
51
|
-
const
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
const handler = resolveHandler(methods, upMethod);
|
|
56
|
-
const allowedMethods = Object.keys(methods);
|
|
57
|
-
if (methods.GET && !methods.HEAD) {
|
|
58
|
-
allowedMethods.push('HEAD');
|
|
59
|
-
}
|
|
59
|
+
const handler = result.handler;
|
|
60
|
+
const allowedMethods = hit
|
|
61
|
+
? allowedMethodsOf(hit.node)
|
|
62
|
+
: [...new Set(misses.flatMap((miss) => allowedMethodsOf(miss.node)))];
|
|
60
63
|
let params = result.params;
|
|
61
64
|
if (handler?.paramNames && result.paramValues.length > 0) {
|
|
62
65
|
params = {};
|
|
@@ -76,8 +79,13 @@ export function match(root, method, path) {
|
|
|
76
79
|
matchedNodes.set(matched, result.node);
|
|
77
80
|
return matched;
|
|
78
81
|
}
|
|
79
|
-
function
|
|
80
|
-
|
|
82
|
+
function allowedMethodsOf(node) {
|
|
83
|
+
const methods = node.methods ?? {};
|
|
84
|
+
const allowed = Object.keys(methods);
|
|
85
|
+
if (methods.GET && !methods.HEAD) {
|
|
86
|
+
allowed.push('HEAD');
|
|
87
|
+
}
|
|
88
|
+
return allowed;
|
|
81
89
|
}
|
|
82
90
|
function resolveHandler(methods, method) {
|
|
83
91
|
const direct = methods[method];
|
|
@@ -89,46 +97,55 @@ function resolveHandler(methods, method) {
|
|
|
89
97
|
}
|
|
90
98
|
return null;
|
|
91
99
|
}
|
|
92
|
-
|
|
100
|
+
/**
|
|
101
|
+
* End of the path at `node`. Returns a hit when the node serves `method`;
|
|
102
|
+
* a node with other methods is recorded in `misses` (405 candidate) and the
|
|
103
|
+
* walk goes on. A method-less node is a dead end: the caller falls through to
|
|
104
|
+
* its param/splat siblings instead of reporting a spurious 404.
|
|
105
|
+
*/
|
|
106
|
+
function arrive(node, method, middlewares, params, paramValues, bodyParsing, misses) {
|
|
107
|
+
const methods = node.methods;
|
|
108
|
+
if (!methods || Object.keys(methods).length === 0) {
|
|
109
|
+
return null;
|
|
110
|
+
}
|
|
111
|
+
const handler = resolveHandler(methods, method);
|
|
112
|
+
const result = {
|
|
113
|
+
node,
|
|
114
|
+
handler,
|
|
115
|
+
middlewares,
|
|
116
|
+
params,
|
|
117
|
+
paramValues,
|
|
118
|
+
bodyParsing,
|
|
119
|
+
};
|
|
120
|
+
if (handler) {
|
|
121
|
+
return result;
|
|
122
|
+
}
|
|
123
|
+
misses.push(result);
|
|
124
|
+
return null;
|
|
125
|
+
}
|
|
126
|
+
function walk(node, method, segments, index, parentMw, parentParams, parentParamValues, parentBodyParsing, misses) {
|
|
93
127
|
const middlewares = [...parentMw, ...node.middlewares];
|
|
94
128
|
const bodyParsing = node.bodyParsing ?? parentBodyParsing;
|
|
95
129
|
if (index === segments.length) {
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
middlewares,
|
|
100
|
-
params: parentParams,
|
|
101
|
-
paramValues: parentParamValues,
|
|
102
|
-
bodyParsing,
|
|
103
|
-
};
|
|
104
|
-
}
|
|
105
|
-
// Zero-segment splat: a method-less node with a splat child that HAS
|
|
106
|
-
// methods matches the splat as ''.
|
|
107
|
-
if (node.splatChild && nodeHasMethods(node.splatChild)) {
|
|
108
|
-
const splatName = node.splatChild.segment.slice(1);
|
|
109
|
-
return {
|
|
110
|
-
node: node.splatChild,
|
|
111
|
-
middlewares: [...middlewares, ...node.splatChild.middlewares],
|
|
112
|
-
params: { ...parentParams, [splatName]: '' },
|
|
113
|
-
paramValues: [...parentParamValues, ''],
|
|
114
|
-
bodyParsing: node.splatChild.bodyParsing ?? bodyParsing,
|
|
115
|
-
};
|
|
130
|
+
const exact = arrive(node, method, middlewares, parentParams, parentParamValues, bodyParsing, misses);
|
|
131
|
+
if (exact || !node.splatChild) {
|
|
132
|
+
return exact;
|
|
116
133
|
}
|
|
117
|
-
//
|
|
118
|
-
|
|
119
|
-
return
|
|
134
|
+
// Zero-segment splat: the splat child matches the empty rest as ''.
|
|
135
|
+
const splatName = node.splatChild.segment.slice(1);
|
|
136
|
+
return arrive(node.splatChild, method, [...middlewares, ...node.splatChild.middlewares], { ...parentParams, [splatName]: '' }, [...parentParamValues, ''], node.splatChild.bodyParsing ?? bodyParsing, misses);
|
|
120
137
|
}
|
|
121
138
|
const seg = segments[index];
|
|
122
139
|
const staticChild = lookupStaticChild(node.children, seg);
|
|
123
140
|
if (staticChild) {
|
|
124
|
-
const result = walk(staticChild, segments, index + 1, middlewares, parentParams, parentParamValues, bodyParsing);
|
|
141
|
+
const result = walk(staticChild, method, segments, index + 1, middlewares, parentParams, parentParamValues, bodyParsing, misses);
|
|
125
142
|
if (result) {
|
|
126
143
|
return result;
|
|
127
144
|
}
|
|
128
145
|
}
|
|
129
146
|
if (node.paramChild) {
|
|
130
147
|
const paramName = node.paramChild.segment.slice(1);
|
|
131
|
-
const result = walk(node.paramChild, segments, index + 1, middlewares, { ...parentParams, [paramName]: seg }, [...parentParamValues, seg], bodyParsing);
|
|
148
|
+
const result = walk(node.paramChild, method, segments, index + 1, middlewares, { ...parentParams, [paramName]: seg }, [...parentParamValues, seg], bodyParsing, misses);
|
|
132
149
|
if (result) {
|
|
133
150
|
return result;
|
|
134
151
|
}
|
|
@@ -136,7 +153,7 @@ function walk(node, segments, index, parentMw, parentParams, parentParamValues,
|
|
|
136
153
|
if (node.splatChild) {
|
|
137
154
|
const splatName = node.splatChild.segment.slice(1);
|
|
138
155
|
const splatValue = segments.slice(index).join('/');
|
|
139
|
-
const result = walk(node.splatChild, segments, segments.length, middlewares, { ...parentParams, [splatName]: splatValue }, [...parentParamValues, splatValue], bodyParsing);
|
|
156
|
+
const result = walk(node.splatChild, method, segments, segments.length, middlewares, { ...parentParams, [splatName]: splatValue }, [...parentParamValues, splatValue], bodyParsing, misses);
|
|
140
157
|
if (result) {
|
|
141
158
|
return result;
|
|
142
159
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"match.js","sourceRoot":"","sources":["../../../../src/services/http/routing/match.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"match.js","sourceRoot":"","sources":["../../../../src/services/http/routing/match.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,7 +16,8 @@ type StringTranslationOptions = TranslationOptions & {
|
|
|
16
16
|
/** String-key translator; object/detail results must be narrowed by the caller. */
|
|
17
17
|
export interface TranslationFunction {
|
|
18
18
|
(key: string | string[], options?: StringTranslationOptions): string;
|
|
19
|
-
(key: string | string[], defaultValue: string
|
|
19
|
+
(key: string | string[], defaultValue: string): string;
|
|
20
|
+
(key: string | string[], defaultValue: string, options: StringTranslationOptions): string;
|
|
20
21
|
(key: string | string[], options: TranslationOptions): unknown;
|
|
21
22
|
(key: string | string[], defaultValue: string, options: TranslationOptions): unknown;
|
|
22
23
|
}
|
|
@@ -10,6 +10,8 @@ import type { ValidatorDriver } from './types.ts';
|
|
|
10
10
|
* User-extension API: `ValidateService.register(myDriver)` prepends
|
|
11
11
|
* a custom driver, giving it priority over the built-ins. Drivers
|
|
12
12
|
* are matched in order via `canHandle(body)`; first match wins.
|
|
13
|
+
* Routes build their validators at boot, so register before `startServer()`
|
|
14
|
+
* (module scope) — not in the `bootHttp` hook, which runs after routes wrap.
|
|
13
15
|
*
|
|
14
16
|
* Built-in resolution order (most specific first):
|
|
15
17
|
* 1. yupDriver — Standard Schema with `vendor: 'yup'` (strip-unknown)
|
|
@@ -10,6 +10,8 @@ import { issuesToPayload, translateIssues, ValidationError, } from './Validation
|
|
|
10
10
|
* User-extension API: `ValidateService.register(myDriver)` prepends
|
|
11
11
|
* a custom driver, giving it priority over the built-ins. Drivers
|
|
12
12
|
* are matched in order via `canHandle(body)`; first match wins.
|
|
13
|
+
* Routes build their validators at boot, so register before `startServer()`
|
|
14
|
+
* (module scope) — not in the `bootHttp` hook, which runs after routes wrap.
|
|
13
15
|
*
|
|
14
16
|
* Built-in resolution order (most specific first):
|
|
15
17
|
* 1. yupDriver — Standard Schema with `vendor: 'yup'` (strip-unknown)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ValidateService.js","sourceRoot":"","sources":["../../../src/services/validate/ValidateService.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,uBAAuB,CAAC;AAGzC,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAEnD,OAAO,EACL,eAAe,EACf,eAAe,EACf,eAAe,GAChB,MAAM,sBAAsB,CAAC;AAE9B
|
|
1
|
+
{"version":3,"file":"ValidateService.js","sourceRoot":"","sources":["../../../src/services/validate/ValidateService.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,6 +30,10 @@ export declare class ValidationError extends Error {
|
|
|
30
30
|
* Cross-realm-safe duck check. Mirrors `yup.ValidationError.isError`.
|
|
31
31
|
* Use this in framework code instead of `instanceof` when the error
|
|
32
32
|
* may have crossed a module-graph boundary.
|
|
33
|
+
*
|
|
34
|
+
* The name alone is not enough: Mongoose's `ValidationError` (and yup's) share
|
|
35
|
+
* it, and their `.message` is a string that embeds the rejected value. The
|
|
36
|
+
* framework error is the only one carrying a structured `issues` array.
|
|
33
37
|
*/
|
|
34
38
|
static isValidationError(err: unknown): err is ValidationError;
|
|
35
39
|
}
|
|
@@ -33,10 +33,15 @@ export class ValidationError extends Error {
|
|
|
33
33
|
* Cross-realm-safe duck check. Mirrors `yup.ValidationError.isError`.
|
|
34
34
|
* Use this in framework code instead of `instanceof` when the error
|
|
35
35
|
* may have crossed a module-graph boundary.
|
|
36
|
+
*
|
|
37
|
+
* The name alone is not enough: Mongoose's `ValidationError` (and yup's) share
|
|
38
|
+
* it, and their `.message` is a string that embeds the rejected value. The
|
|
39
|
+
* framework error is the only one carrying a structured `issues` array.
|
|
36
40
|
*/
|
|
37
41
|
static isValidationError(err) {
|
|
38
42
|
return (err instanceof Error &&
|
|
39
|
-
err.name === 'ValidationError'
|
|
43
|
+
err.name === 'ValidationError' &&
|
|
44
|
+
Array.isArray(err.issues));
|
|
40
45
|
}
|
|
41
46
|
}
|
|
42
47
|
function payloadToIssues(payload) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ValidationError.js","sourceRoot":"","sources":["../../../src/services/validate/ValidationError.ts"],"names":[],"mappings":"AAaA;;;;;;;;;;;;GAYG;AACH,MAAM,OAAO,eAAgB,SAAQ,KAAK;IACxC,MAAM,CAAoB;IAQ1B,YACE,OAAgE;QAEhE,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,IAAI,GAAG,iBAAiB,CAAC;QAE9B,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;YAC3B,MAAM,MAAM,GAAG,CAAC,GAAI,OAA0C,CAAC,CAAC;YAChE,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;YACrB,IAAI,CAAC,OAAO,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;QACzC,CAAC;aAAM,CAAC;YACN,MAAM,GAAG,GAAG,EAAE,GAAI,OAAkC,EAAE,CAAC;YACvD,IAAI,CAAC,MAAM,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC;YACnC,iEAAiE;YACjE,sCAAsC;YACtC,IAAI,CAAC,OAAO,GAAG,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC9C,CAAC;IACH,CAAC;IAED
|
|
1
|
+
{"version":3,"file":"ValidationError.js","sourceRoot":"","sources":["../../../src/services/validate/ValidationError.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@adaptivestone/framework",
|
|
3
|
-
"version": "5.
|
|
3
|
+
"version": "5.6.0",
|
|
4
4
|
"description": "Adaptive stone node js framework",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"engines": {
|
|
@@ -83,7 +83,7 @@
|
|
|
83
83
|
"i18next-fs-backend": "^2.0.0",
|
|
84
84
|
"lefthook": "^2.0.0",
|
|
85
85
|
"mongodb-memory-server": "^11.0.0",
|
|
86
|
-
"oxc-parser": "^0.
|
|
86
|
+
"oxc-parser": "^0.156.0",
|
|
87
87
|
"typescript": "^7.0.2",
|
|
88
88
|
"vitest": "^5.0.3",
|
|
89
89
|
"yup": "^1.7.0",
|
|
@@ -97,7 +97,7 @@
|
|
|
97
97
|
"i18next": "^26.0.1",
|
|
98
98
|
"i18next-fs-backend": "^2.0.0",
|
|
99
99
|
"mongodb-memory-server": "^11.0.0",
|
|
100
|
-
"oxc-parser": "^0.
|
|
100
|
+
"oxc-parser": "^0.156.0",
|
|
101
101
|
"vitest": "^4.0.0 || ^5.0.0",
|
|
102
102
|
"yup": "^1.7.0",
|
|
103
103
|
"zod": "^3.24.0 || ^4.0.0"
|