@adaptivestone/framework 5.0.0-beta.44 → 5.0.0-beta.47
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 +30 -2
- package/dist/codegen/appTypes.d.ts +19 -0
- package/dist/codegen/appTypes.js +49 -0
- package/dist/codegen/appTypes.js.map +1 -0
- package/dist/codegen/collectMetadata.d.ts +37 -0
- package/dist/codegen/collectMetadata.js +51 -0
- package/dist/codegen/collectMetadata.js.map +1 -0
- package/dist/codegen/emit.d.ts +29 -0
- package/dist/codegen/emit.js +214 -0
- package/dist/codegen/emit.js.map +1 -0
- package/dist/codegen/index.d.ts +16 -0
- package/dist/codegen/index.js +18 -0
- package/dist/codegen/index.js.map +1 -0
- package/dist/codegen/routeTypes.d.ts +13 -0
- package/dist/codegen/routeTypes.js +126 -0
- package/dist/codegen/routeTypes.js.map +1 -0
- package/dist/commands/GenerateTypes.d.ts +0 -4
- package/dist/commands/GenerateTypes.js +4 -42
- package/dist/commands/GenerateTypes.js.map +1 -1
- package/dist/controllers/Auth.d.ts +15 -124
- package/dist/controllers/Auth.js.map +1 -1
- package/dist/controllers/Auth.routes.gen.d.ts +57 -0
- package/dist/controllers/Auth.routes.gen.js +10 -0
- package/dist/controllers/Auth.routes.gen.js.map +1 -0
- package/dist/controllers/Home.routes.gen.d.ts +14 -0
- package/dist/controllers/Home.routes.gen.js +10 -0
- package/dist/controllers/Home.routes.gen.js.map +1 -0
- package/dist/controllers/index.d.ts +23 -3
- package/dist/controllers/index.js +355 -8
- package/dist/controllers/index.js.map +1 -1
- package/dist/helpers/files.js +2 -0
- package/dist/helpers/files.js.map +1 -1
- package/dist/helpers/logger.d.ts +1 -1
- package/dist/helpers/logger.js +1 -1
- package/dist/helpers/logger.js.map +1 -1
- package/dist/models/Lock.js +1 -1
- package/dist/models/Lock.js.map +1 -1
- package/dist/models/Sequence.js +1 -1
- package/dist/models/Sequence.js.map +1 -1
- package/dist/models/User.d.ts +28 -28
- package/dist/models/UserOld.d.ts +16 -6
- package/dist/modules/AbstractController.d.ts +10 -31
- package/dist/modules/AbstractController.js +1 -253
- package/dist/modules/AbstractController.js.map +1 -1
- package/dist/modules/BaseCli.d.ts +1 -1
- package/dist/modules/BaseCli.js +1 -0
- package/dist/modules/BaseCli.js.map +1 -1
- package/dist/server.d.ts +2 -3
- package/dist/server.js +11 -1
- package/dist/server.js.map +1 -1
- package/dist/services/cache/Cache.d.ts +1 -1
- package/dist/services/cache/Cache.js +9 -8
- package/dist/services/cache/Cache.js.map +1 -1
- package/dist/services/http/HttpServer.d.ts +9 -0
- package/dist/services/http/HttpServer.js +20 -9
- package/dist/services/http/HttpServer.js.map +1 -1
- package/dist/services/http/middleware/AbstractMiddleware.d.ts +19 -4
- package/dist/services/http/middleware/AbstractMiddleware.js +16 -5
- package/dist/services/http/middleware/AbstractMiddleware.js.map +1 -1
- package/dist/services/http/middleware/GetUserByToken.d.ts +9 -0
- package/dist/services/http/middleware/GetUserByToken.js +9 -0
- package/dist/services/http/middleware/GetUserByToken.js.map +1 -1
- package/dist/services/http/routing/ExpressAdapter.d.ts +12 -0
- package/dist/services/http/routing/ExpressAdapter.js +93 -0
- package/dist/services/http/routing/ExpressAdapter.js.map +1 -0
- package/dist/services/http/routing/RouteNode.d.ts +99 -0
- package/dist/services/http/routing/RouteNode.js +21 -0
- package/dist/services/http/routing/RouteNode.js.map +1 -0
- package/dist/services/http/routing/RouteRegistry.d.ts +37 -0
- package/dist/services/http/routing/RouteRegistry.js +207 -0
- package/dist/services/http/routing/RouteRegistry.js.map +1 -0
- package/dist/services/http/routing/formatTree.d.ts +23 -0
- package/dist/services/http/routing/formatTree.js +158 -0
- package/dist/services/http/routing/formatTree.js.map +1 -0
- package/dist/services/http/routing/match.d.ts +30 -0
- package/dist/services/http/routing/match.js +128 -0
- package/dist/services/http/routing/match.js.map +1 -0
- package/dist/services/http/routing/middlewareNormalization.d.ts +16 -0
- package/dist/services/http/routing/middlewareNormalization.js +28 -0
- package/dist/services/http/routing/middlewareNormalization.js.map +1 -0
- package/dist/services/http/types.d.ts +74 -0
- package/dist/services/http/types.js +8 -0
- package/dist/services/http/types.js.map +1 -0
- package/dist/services/logging/SentryTransport.js +2 -2
- package/dist/services/logging/SentryTransport.js.map +1 -1
- package/dist/services/validate/ValidateService.d.ts +46 -23
- package/dist/services/validate/ValidateService.js +101 -74
- package/dist/services/validate/ValidateService.js.map +1 -1
- package/dist/services/validate/ValidationError.d.ts +35 -0
- package/dist/services/validate/ValidationError.js +77 -0
- package/dist/services/validate/ValidationError.js.map +1 -0
- package/dist/services/validate/drivers/StandardSchemaDriver.d.ts +15 -0
- package/dist/services/validate/drivers/StandardSchemaDriver.js +34 -0
- package/dist/services/validate/drivers/StandardSchemaDriver.js.map +1 -0
- package/dist/services/validate/drivers/YupDriver.d.ts +21 -0
- package/dist/services/validate/drivers/YupDriver.js +66 -0
- package/dist/services/validate/drivers/YupDriver.js.map +1 -0
- package/dist/services/validate/types.d.ts +104 -0
- package/dist/services/validate/types.js +11 -0
- package/dist/services/validate/types.js.map +1 -0
- package/dist/tests/setupVitest.js +4 -1
- package/dist/tests/setupVitest.js.map +1 -1
- package/dist/tests/testHelpers.d.ts +18 -16
- package/package.json +19 -10
- package/dist/commands/Documentation.d.ts +0 -5
- package/dist/commands/Documentation.js +0 -15
- package/dist/commands/Documentation.js.map +0 -1
- package/dist/commands/GetOpenApiJson.d.ts +0 -17
- package/dist/commands/GetOpenApiJson.js +0 -272
- package/dist/commands/GetOpenApiJson.js.map +0 -1
- package/dist/services/documentation/DocumentationGenerator.d.ts +0 -11
- package/dist/services/documentation/DocumentationGenerator.js +0 -130
- package/dist/services/documentation/DocumentationGenerator.js.map +0 -1
- package/dist/services/validate/drivers/AbstractValidator.d.ts +0 -14
- package/dist/services/validate/drivers/AbstractValidator.js +0 -29
- package/dist/services/validate/drivers/AbstractValidator.js.map +0 -1
- package/dist/services/validate/drivers/CustomValidator.d.ts +0 -14
- package/dist/services/validate/drivers/CustomValidator.js +0 -48
- package/dist/services/validate/drivers/CustomValidator.js.map +0 -1
- package/dist/services/validate/drivers/YupValidator.d.ts +0 -13
- package/dist/services/validate/drivers/YupValidator.js +0 -86
- package/dist/services/validate/drivers/YupValidator.js.map +0 -1
|
@@ -0,0 +1,128 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Tree-walk matcher. Pure function.
|
|
3
|
+
*
|
|
4
|
+
* Specificity: static children → paramChild → splatChild. Per-segment
|
|
5
|
+
* URL decoding (Spring's `PathPatternParser` model): keeps `%2F` inside
|
|
6
|
+
* a segment instead of letting it act as a separator.
|
|
7
|
+
*
|
|
8
|
+
* Splat captures the rest of the path AFTER per-segment decoding, so
|
|
9
|
+
* `/a/foo%2Fbar/baz` and `/a/foo/bar/baz` produce the same splat value.
|
|
10
|
+
* Documented trade-off — handle the rare encoded-slash case in `'raw'`
|
|
11
|
+
* body mode if needed.
|
|
12
|
+
*/
|
|
13
|
+
/** Thrown when a path contains a malformed `%XX` sequence. */
|
|
14
|
+
export class MalformedPathError extends Error {
|
|
15
|
+
statusCode = 400;
|
|
16
|
+
constructor(message) {
|
|
17
|
+
super(message);
|
|
18
|
+
this.name = 'MalformedPathError';
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
/**
|
|
22
|
+
* - `null` → no path match (404).
|
|
23
|
+
* - `{ entry: null, allowedMethods }` → path matched, method didn't (405).
|
|
24
|
+
* - full result → success.
|
|
25
|
+
*/
|
|
26
|
+
export function match(root, method, path, options = {}) {
|
|
27
|
+
const upMethod = method.toUpperCase();
|
|
28
|
+
const segments = pathToSegments(path, options.strictTrailingSlash ?? false);
|
|
29
|
+
const result = walk(root, segments, 0, [], {}, undefined, options.caseSensitive ?? false);
|
|
30
|
+
if (!result) {
|
|
31
|
+
return null;
|
|
32
|
+
}
|
|
33
|
+
const methods = result.node.methods;
|
|
34
|
+
if (!methods || Object.keys(methods).length === 0) {
|
|
35
|
+
// Structural node, no handlers → 404 (not 405).
|
|
36
|
+
return null;
|
|
37
|
+
}
|
|
38
|
+
const handler = resolveHandler(methods, upMethod);
|
|
39
|
+
const allowedMethods = Object.keys(methods);
|
|
40
|
+
// HEAD implicitly allowed when GET is registered.
|
|
41
|
+
if (methods.GET && !methods.HEAD) {
|
|
42
|
+
allowedMethods.push('HEAD');
|
|
43
|
+
}
|
|
44
|
+
return {
|
|
45
|
+
entry: handler,
|
|
46
|
+
allowedMethods,
|
|
47
|
+
middlewares: handler
|
|
48
|
+
? [...result.middlewares, ...(handler.middlewares ?? [])]
|
|
49
|
+
: result.middlewares,
|
|
50
|
+
params: result.params,
|
|
51
|
+
bodyParsing: handler?.bodyParsing ?? result.bodyParsing ?? 'parsed',
|
|
52
|
+
};
|
|
53
|
+
}
|
|
54
|
+
function resolveHandler(methods, method) {
|
|
55
|
+
const direct = methods[method];
|
|
56
|
+
if (direct) {
|
|
57
|
+
return direct;
|
|
58
|
+
}
|
|
59
|
+
if (method === 'HEAD' && methods.GET) {
|
|
60
|
+
return methods.GET;
|
|
61
|
+
}
|
|
62
|
+
return null;
|
|
63
|
+
}
|
|
64
|
+
function walk(node, segments, index, parentMw, parentParams, parentBodyParsing, caseSensitive) {
|
|
65
|
+
const middlewares = [...parentMw, ...node.middlewares];
|
|
66
|
+
const bodyParsing = node.bodyParsing ?? parentBodyParsing;
|
|
67
|
+
if (index === segments.length) {
|
|
68
|
+
return { node, middlewares, params: parentParams, bodyParsing };
|
|
69
|
+
}
|
|
70
|
+
const seg = segments[index];
|
|
71
|
+
// Static (most specific).
|
|
72
|
+
const staticChild = lookupStaticChild(node.children, seg, caseSensitive);
|
|
73
|
+
if (staticChild) {
|
|
74
|
+
const result = walk(staticChild, segments, index + 1, middlewares, parentParams, bodyParsing, caseSensitive);
|
|
75
|
+
if (result) {
|
|
76
|
+
return result;
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
// Param (`:name`).
|
|
80
|
+
if (node.paramChild) {
|
|
81
|
+
const paramName = node.paramChild.segment.slice(1);
|
|
82
|
+
const result = walk(node.paramChild, segments, index + 1, middlewares, { ...parentParams, [paramName]: seg }, bodyParsing, caseSensitive);
|
|
83
|
+
if (result) {
|
|
84
|
+
return result;
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
// Splat (`*name`) — consumes remaining segments.
|
|
88
|
+
if (node.splatChild) {
|
|
89
|
+
const splatName = node.splatChild.segment.slice(1);
|
|
90
|
+
const splatValue = segments.slice(index).join('/');
|
|
91
|
+
const result = walk(node.splatChild, segments, segments.length, middlewares, { ...parentParams, [splatName]: splatValue }, bodyParsing, caseSensitive);
|
|
92
|
+
if (result) {
|
|
93
|
+
return result;
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
return null;
|
|
97
|
+
}
|
|
98
|
+
function lookupStaticChild(children, seg, caseSensitive) {
|
|
99
|
+
if (caseSensitive) {
|
|
100
|
+
return children.get(seg);
|
|
101
|
+
}
|
|
102
|
+
const lower = seg.toLowerCase();
|
|
103
|
+
for (const [key, child] of children) {
|
|
104
|
+
if (key.toLowerCase() === lower) {
|
|
105
|
+
return child;
|
|
106
|
+
}
|
|
107
|
+
}
|
|
108
|
+
return undefined;
|
|
109
|
+
}
|
|
110
|
+
function pathToSegments(path, strict) {
|
|
111
|
+
let trimmed = path.startsWith('/') ? path.slice(1) : path;
|
|
112
|
+
if (!strict && trimmed.endsWith('/')) {
|
|
113
|
+
trimmed = trimmed.slice(0, -1);
|
|
114
|
+
}
|
|
115
|
+
if (trimmed === '') {
|
|
116
|
+
return [];
|
|
117
|
+
}
|
|
118
|
+
return trimmed.split('/').map(decodeSegment);
|
|
119
|
+
}
|
|
120
|
+
function decodeSegment(segment) {
|
|
121
|
+
try {
|
|
122
|
+
return decodeURIComponent(segment);
|
|
123
|
+
}
|
|
124
|
+
catch {
|
|
125
|
+
throw new MalformedPathError(`malformed URI sequence: "${segment}"`);
|
|
126
|
+
}
|
|
127
|
+
}
|
|
128
|
+
//# sourceMappingURL=match.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"match.js","sourceRoot":"","sources":["../../../../src/services/http/routing/match.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Convert authoring shorthand (`Class` or `[Class, params]`) into
|
|
3
|
+
* canonical `MiddlewareEntry`. The registry stores only canonical form;
|
|
4
|
+
* shorthand exists at the user-authoring boundary.
|
|
5
|
+
*
|
|
6
|
+
* `source` is caller-supplied — class references carry no import-path
|
|
7
|
+
* info at runtime. Convention:
|
|
8
|
+
* - `{ kind: 'package', spec: 'pkg/sub/path' }` for npm imports
|
|
9
|
+
* - `{ kind: 'file', spec: 'src/middleware/My.ts' }` for project files
|
|
10
|
+
*/
|
|
11
|
+
import type AbstractMiddleware from '../middleware/AbstractMiddleware.ts';
|
|
12
|
+
import type { MiddlewareEntry } from './RouteNode.ts';
|
|
13
|
+
export type MiddlewareSpec = typeof AbstractMiddleware | readonly [typeof AbstractMiddleware, Record<string, unknown>];
|
|
14
|
+
/** Throws `TypeError` on malformed input. */
|
|
15
|
+
export declare function normalizeMiddleware(spec: MiddlewareSpec, source: MiddlewareEntry['source']): MiddlewareEntry;
|
|
16
|
+
export declare function normalizeMiddlewares(specs: ReadonlyArray<MiddlewareSpec>, source: MiddlewareEntry['source']): MiddlewareEntry[];
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Convert authoring shorthand (`Class` or `[Class, params]`) into
|
|
3
|
+
* canonical `MiddlewareEntry`. The registry stores only canonical form;
|
|
4
|
+
* shorthand exists at the user-authoring boundary.
|
|
5
|
+
*
|
|
6
|
+
* `source` is caller-supplied — class references carry no import-path
|
|
7
|
+
* info at runtime. Convention:
|
|
8
|
+
* - `{ kind: 'package', spec: 'pkg/sub/path' }` for npm imports
|
|
9
|
+
* - `{ kind: 'file', spec: 'src/middleware/My.ts' }` for project files
|
|
10
|
+
*/
|
|
11
|
+
/** Throws `TypeError` on malformed input. */
|
|
12
|
+
export function normalizeMiddleware(spec, source) {
|
|
13
|
+
if (Array.isArray(spec)) {
|
|
14
|
+
const [Class, params] = spec;
|
|
15
|
+
if (typeof Class !== 'function') {
|
|
16
|
+
throw new TypeError(`normalizeMiddleware: tuple form expected [Class, params] but got [${typeof Class}, …]`);
|
|
17
|
+
}
|
|
18
|
+
return { Class, params, source };
|
|
19
|
+
}
|
|
20
|
+
if (typeof spec !== 'function') {
|
|
21
|
+
throw new TypeError(`normalizeMiddleware: expected middleware class or [Class, params] tuple, got ${typeof spec}`);
|
|
22
|
+
}
|
|
23
|
+
return { Class: spec, source };
|
|
24
|
+
}
|
|
25
|
+
export function normalizeMiddlewares(specs, source) {
|
|
26
|
+
return specs.map((spec) => normalizeMiddleware(spec, source));
|
|
27
|
+
}
|
|
28
|
+
//# sourceMappingURL=middlewareNormalization.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"middlewareNormalization.js","sourceRoot":"","sources":["../../../../src/services/http/routing/middlewareNormalization.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AASH,6CAA6C;AAC7C,MAAM,UAAU,mBAAmB,CACjC,IAAoB,EACpB,MAAiC;IAEjC,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;QACxB,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,GAAG,IAGvB,CAAC;QACF,IAAI,OAAO,KAAK,KAAK,UAAU,EAAE,CAAC;YAChC,MAAM,IAAI,SAAS,CACjB,qEAAqE,OAAO,KAAK,MAAM,CACxF,CAAC;QACJ,CAAC;QACD,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;IACnC,CAAC;IACD,IAAI,OAAO,IAAI,KAAK,UAAU,EAAE,CAAC;QAC/B,MAAM,IAAI,SAAS,CACjB,gFAAgF,OAAO,IAAI,EAAE,CAC9F,CAAC;IACJ,CAAC;IACD,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;AACjC,CAAC;AAED,MAAM,UAAU,oBAAoB,CAClC,KAAoC,EACpC,MAAiC;IAEjC,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,mBAAmB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;AAChE,CAAC"}
|
|
@@ -0,0 +1,74 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* HTTP type contracts. Pure type-only — no runtime, no behavior.
|
|
3
|
+
*
|
|
4
|
+
* Per-controller `<File>.routes.gen.ts` files (hand-written today, codegen-emitted
|
|
5
|
+
* later) compose these primitives into per-route `Request<M, P>` helpers.
|
|
6
|
+
*/
|
|
7
|
+
import type { TFunction } from 'i18next';
|
|
8
|
+
import type { IApp } from '../../server.ts';
|
|
9
|
+
import type { FrameworkRequest } from './HttpServer.ts';
|
|
10
|
+
/**
|
|
11
|
+
* Module-augmentation point for app-wide `appInfo` extensions. Users add:
|
|
12
|
+
*
|
|
13
|
+
* declare module '@adaptivestone/framework' {
|
|
14
|
+
* interface AppInfoExtensions {
|
|
15
|
+
* requestId: string;
|
|
16
|
+
* sentryTransaction?: SentryTransaction;
|
|
17
|
+
* }
|
|
18
|
+
* }
|
|
19
|
+
*
|
|
20
|
+
* Per-route precision (e.g. `appInfo.user` from a route's middleware stack)
|
|
21
|
+
* comes from the per-controller `Request<M, P>` helper, not from this interface.
|
|
22
|
+
*/
|
|
23
|
+
export interface AppInfoExtensions {
|
|
24
|
+
}
|
|
25
|
+
/**
|
|
26
|
+
* `appInfo` shape populated by the framework's built-in middlewares before any
|
|
27
|
+
* user middleware runs. Mirrors what `HttpServer`'s middleware chain sets per
|
|
28
|
+
* request (`PrepareAppInfo`, `IpDetector`, `I18n`) plus the slots that the
|
|
29
|
+
* route-level validation populates (`request`, `query`).
|
|
30
|
+
*
|
|
31
|
+
* `i18n` is required — `I18nMiddleware` is part of `HttpServer`'s default
|
|
32
|
+
* chain (`HttpServer.ts:63`) and runs on every HTTP request before any
|
|
33
|
+
* controller. If a user removes it, they should augment `BaseAppInfo` to
|
|
34
|
+
* relax the field.
|
|
35
|
+
*/
|
|
36
|
+
export interface BaseAppInfo {
|
|
37
|
+
app: IApp;
|
|
38
|
+
ip?: string | undefined;
|
|
39
|
+
i18n: {
|
|
40
|
+
t: TFunction;
|
|
41
|
+
language: string;
|
|
42
|
+
};
|
|
43
|
+
request: Record<string, unknown>;
|
|
44
|
+
query: Record<string, unknown>;
|
|
45
|
+
}
|
|
46
|
+
/**
|
|
47
|
+
* Default request context handlers see when no per-route `Request<M, P>` is
|
|
48
|
+
* imported. Equivalent to today's `FrameworkRequest` plus `AppInfoExtensions`.
|
|
49
|
+
*/
|
|
50
|
+
export type BaseRequestContext = FrameworkRequest & {
|
|
51
|
+
appInfo: BaseAppInfo & AppInfoExtensions;
|
|
52
|
+
};
|
|
53
|
+
/**
|
|
54
|
+
* Extract the static `provides` shape from a middleware class. Middlewares
|
|
55
|
+
* declare what they add to `appInfo` via:
|
|
56
|
+
*
|
|
57
|
+
* class GetUserByToken extends AbstractMiddleware {
|
|
58
|
+
* static get provides() {
|
|
59
|
+
* return {} as { user?: InstanceType<TUser> };
|
|
60
|
+
* }
|
|
61
|
+
* }
|
|
62
|
+
*
|
|
63
|
+
* `ProvidesOf<typeof GetUserByToken>` resolves to `{ user?: InstanceType<TUser> }`.
|
|
64
|
+
* Returns `Record<never, never>` for middlewares without `provides`.
|
|
65
|
+
*/
|
|
66
|
+
export type ProvidesOf<T> = T extends {
|
|
67
|
+
provides: infer P;
|
|
68
|
+
} ? P : Record<never, never>;
|
|
69
|
+
/**
|
|
70
|
+
* Reduce a tuple of middleware classes (or `[Class, params]` tuples) to the
|
|
71
|
+
* intersection of their `provides` shapes. Used by per-route `Request<M, P>`
|
|
72
|
+
* to layer middleware-contributed `appInfo` fields onto the base context.
|
|
73
|
+
*/
|
|
74
|
+
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>;
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* HTTP type contracts. Pure type-only — no runtime, no behavior.
|
|
3
|
+
*
|
|
4
|
+
* Per-controller `<File>.routes.gen.ts` files (hand-written today, codegen-emitted
|
|
5
|
+
* later) compose these primitives into per-route `Request<M, P>` helpers.
|
|
6
|
+
*/
|
|
7
|
+
export {};
|
|
8
|
+
//# sourceMappingURL=types.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/services/http/types.ts"],"names":[],"mappings":"AAAA;;;;;GAKG"}
|
|
@@ -36,7 +36,7 @@ class SentryTransport extends Transport {
|
|
|
36
36
|
// Try to load Sentry Winston transport asynchronously
|
|
37
37
|
this.loadSentryTransport(opts);
|
|
38
38
|
}
|
|
39
|
-
async loadSentryTransport(
|
|
39
|
+
async loadSentryTransport(_opts) {
|
|
40
40
|
if (this.#initializationAttempted) {
|
|
41
41
|
return;
|
|
42
42
|
}
|
|
@@ -49,7 +49,7 @@ class SentryTransport extends Transport {
|
|
|
49
49
|
this.#sentry = sentry;
|
|
50
50
|
console.log('[Framework] Sentry Winston transport loaded successfully');
|
|
51
51
|
}
|
|
52
|
-
catch (
|
|
52
|
+
catch (_error) {
|
|
53
53
|
// Sentry is not installed - this is fine for a framework
|
|
54
54
|
console.log('[Framework] Sentry Winston transport not available (package not installed)');
|
|
55
55
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SentryTransport.js","sourceRoot":"","sources":["../../../src/services/logging/SentryTransport.ts"],"names":[],"mappings":";;;;;;;;AAEA,OAAO,SAAS,MAAM,mBAAmB,CAAC;AAE1C,gDAAgD;AAChD,MAAM,YAAY,GAAG,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AACzC,MAAM,cAAc,GAAG,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;AAC7C,MAAM,YAAY,GAAG,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AAEzC,MAAM,aAAc,SAAQ,KAAK;IAC/B,YAAY,IAA6B;QACvC,KAAK,CAAE,IAAI,CAAC,OAAkB,IAAI,eAAe,CAAC,CAAC;QAEnD,IAAI,CAAC,IAAI,GAAI,IAAI,CAAC,IAAe,IAAI,OAAO,CAAC;QAC7C,IAAI,IAAI,CAAC,KAAK,IAAI,OAAO,IAAI,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;YACjD,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QAC1B,CAAC;IACH,CAAC;CACF;AAED,SAAS,QAAQ,CACf,QAAiB;IAEjB,OAAO,OAAO,QAAQ,KAAK,QAAQ,IAAI,QAAQ,IAAI,IAAI,CAAC;AAC1D,CAAC;AACD;;;;GAIG;AACH,MAAM,eAAgB,SAAQ,SAAS;IACrC,OAAO,GAAyB,IAAI,CAAC;IACrC,wBAAwB,GAAG,KAAK,CAAC;IAEjC,YAAY,OAAyC,EAAE;QACrD,KAAK,CAAC,IAAI,CAAC,CAAC;QAEZ,sDAAsD;QACtD,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;IACjC,CAAC;IAEO,KAAK,CAAC,mBAAmB,CAAC,
|
|
1
|
+
{"version":3,"file":"SentryTransport.js","sourceRoot":"","sources":["../../../src/services/logging/SentryTransport.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,31 +1,54 @@
|
|
|
1
|
-
|
|
1
|
+
import type { TFunction } from 'i18next';
|
|
2
|
+
import Base from '../../modules/Base.ts';
|
|
3
|
+
import type { IApp } from '../../server.ts';
|
|
4
|
+
import type { ValidatorDriver } from './types.ts';
|
|
5
|
+
/**
|
|
6
|
+
* Per-route validator dispatcher. Resolves a `ValidatorDriver` once at
|
|
7
|
+
* construction (cheap sync property check) and delegates per-request
|
|
8
|
+
* validation to it. Drivers are vendor-aware — see `./drivers/`.
|
|
9
|
+
*
|
|
10
|
+
* User-extension API: `ValidateService.register(myDriver)` prepends
|
|
11
|
+
* a custom driver, giving it priority over the built-ins. Drivers
|
|
12
|
+
* are matched in order via `canHandle(body)`; first match wins.
|
|
13
|
+
*
|
|
14
|
+
* Built-in resolution order (most specific first):
|
|
15
|
+
* 1. yupDriver — Standard Schema with `vendor: 'yup'` (strip-unknown)
|
|
16
|
+
* 2. standardSchemaDriver — any other `~standard`-conformant lib
|
|
17
|
+
*
|
|
18
|
+
* Schemas that match no driver throw at construction with a migration
|
|
19
|
+
* message — including legacy `{validate, cast}` plain objects (removed
|
|
20
|
+
* in 5.0; wrap as Standard Schema, ~10 lines).
|
|
21
|
+
*/
|
|
2
22
|
declare class ValidateService extends Base {
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
static isValidatorExists(validator: any): boolean;
|
|
8
|
-
static getDriverByValidatorBody(app: any, body?: {}): {};
|
|
9
|
-
constructor(app: any, validator: any);
|
|
10
|
-
validator: {} | null;
|
|
23
|
+
schema: unknown;
|
|
24
|
+
driver: ValidatorDriver | null;
|
|
25
|
+
static drivers: ValidatorDriver[];
|
|
26
|
+
constructor(app: IApp, schema: unknown | null);
|
|
11
27
|
/**
|
|
12
|
-
*
|
|
28
|
+
* Find the first registered driver whose `canHandle(schema)` returns true.
|
|
13
29
|
*/
|
|
14
|
-
|
|
30
|
+
static resolve(schema: unknown): ValidatorDriver | null;
|
|
15
31
|
/**
|
|
16
|
-
*
|
|
32
|
+
* Register a custom driver. By default prepends so user drivers take
|
|
33
|
+
* priority over the built-ins (e.g., to override yup-strip behavior
|
|
34
|
+
* or to add a non-Standard-Schema lib like raw Joi).
|
|
17
35
|
*/
|
|
18
|
-
|
|
19
|
-
request: any[];
|
|
20
|
-
query: any[];
|
|
21
|
-
};
|
|
22
|
-
validateSchema(req: any, validator: any, data: any): Promise<any>;
|
|
23
|
-
validateArrayOfSchemas(req: any, validators: any, data: any): Promise<any[]>;
|
|
36
|
+
static register(driver: ValidatorDriver, position?: 'first' | 'last'): void;
|
|
24
37
|
/**
|
|
25
|
-
* Validate
|
|
38
|
+
* Validate `data` against the route's schema. Returns the cast value
|
|
39
|
+
* on success; throws `ValidationError` on failure. If no schema was
|
|
40
|
+
* provided, returns `data` unchanged.
|
|
41
|
+
*
|
|
42
|
+
* If `i18n` is supplied, error messages are translated through `i18n.t`
|
|
43
|
+
* before the error is re-thrown — both `.message` (wire-shape) and
|
|
44
|
+
* `.issues` (structured). Skip the argument and consumers that don't
|
|
45
|
+
* need translation (workers, RPC, tests) get raw keys back. The HTTP
|
|
46
|
+
* controller path passes `req.appInfo.i18n` so users never have to
|
|
47
|
+
* remember a translation step.
|
|
26
48
|
*/
|
|
27
|
-
|
|
49
|
+
validate(data: unknown, i18n?: {
|
|
50
|
+
t: TFunction;
|
|
51
|
+
} | null): Promise<unknown>;
|
|
52
|
+
static get loggerGroup(): string;
|
|
28
53
|
}
|
|
29
|
-
|
|
30
|
-
import YupValidator from './drivers/YupValidator.js';
|
|
31
|
-
import CustomValidator from './drivers/CustomValidator.js';
|
|
54
|
+
export default ValidateService;
|
|
@@ -1,95 +1,122 @@
|
|
|
1
|
-
import { isSchema } from 'yup';
|
|
2
1
|
import Base from "../../modules/Base.js";
|
|
3
|
-
import
|
|
4
|
-
import
|
|
2
|
+
import { standardSchemaDriver } from "./drivers/StandardSchemaDriver.js";
|
|
3
|
+
import { yupDriver } from "./drivers/YupDriver.js";
|
|
4
|
+
import { issuesToPayload, ValidationError } from "./ValidationError.js";
|
|
5
|
+
/**
|
|
6
|
+
* Per-route validator dispatcher. Resolves a `ValidatorDriver` once at
|
|
7
|
+
* construction (cheap sync property check) and delegates per-request
|
|
8
|
+
* validation to it. Drivers are vendor-aware — see `./drivers/`.
|
|
9
|
+
*
|
|
10
|
+
* User-extension API: `ValidateService.register(myDriver)` prepends
|
|
11
|
+
* a custom driver, giving it priority over the built-ins. Drivers
|
|
12
|
+
* are matched in order via `canHandle(body)`; first match wins.
|
|
13
|
+
*
|
|
14
|
+
* Built-in resolution order (most specific first):
|
|
15
|
+
* 1. yupDriver — Standard Schema with `vendor: 'yup'` (strip-unknown)
|
|
16
|
+
* 2. standardSchemaDriver — any other `~standard`-conformant lib
|
|
17
|
+
*
|
|
18
|
+
* Schemas that match no driver throw at construction with a migration
|
|
19
|
+
* message — including legacy `{validate, cast}` plain objects (removed
|
|
20
|
+
* in 5.0; wrap as Standard Schema, ~10 lines).
|
|
21
|
+
*/
|
|
5
22
|
class ValidateService extends Base {
|
|
6
|
-
|
|
23
|
+
schema;
|
|
24
|
+
driver;
|
|
25
|
+
static drivers = [yupDriver, standardSchemaDriver];
|
|
26
|
+
constructor(app, schema) {
|
|
7
27
|
super(app);
|
|
8
|
-
this.
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
};
|
|
16
|
-
static isValidatorExists(validator) {
|
|
17
|
-
if (!(validator instanceof Object)) {
|
|
18
|
-
return false;
|
|
19
|
-
}
|
|
20
|
-
return Object.values(ValidateService.drivers).some((driver) => validator instanceof driver);
|
|
21
|
-
}
|
|
22
|
-
static getDriverByValidatorBody(app, body = {}) {
|
|
23
|
-
if (ValidateService.isValidatorExists(body)) {
|
|
24
|
-
return body;
|
|
28
|
+
this.schema = schema;
|
|
29
|
+
if (schema) {
|
|
30
|
+
const driver = ValidateService.resolve(schema);
|
|
31
|
+
if (!driver) {
|
|
32
|
+
throw new Error(buildNoDriverMessage(schema));
|
|
33
|
+
}
|
|
34
|
+
this.driver = driver;
|
|
25
35
|
}
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
return yupValidator;
|
|
36
|
+
else {
|
|
37
|
+
this.driver = null;
|
|
29
38
|
}
|
|
30
|
-
const customValidator = new CustomValidator(app, body);
|
|
31
|
-
return customValidator;
|
|
32
39
|
}
|
|
33
40
|
/**
|
|
34
|
-
*
|
|
41
|
+
* Find the first registered driver whose `canHandle(schema)` returns true.
|
|
35
42
|
*/
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
.filter((middleware) => middleware.method.toLowerCase() === method.toLowerCase() &&
|
|
39
|
-
middleware.fullPath.toLowerCase() === path.toLowerCase())
|
|
40
|
-
?.map((middleware) => {
|
|
41
|
-
const instance = new middleware.MiddlewareFunction(this.app, middleware.params);
|
|
42
|
-
return instance.relatedReqParameters;
|
|
43
|
-
});
|
|
44
|
-
return middlewaresParams;
|
|
43
|
+
static resolve(schema) {
|
|
44
|
+
return (ValidateService.drivers.find((driver) => driver.canHandle(schema)) ?? null);
|
|
45
45
|
}
|
|
46
46
|
/**
|
|
47
|
-
*
|
|
47
|
+
* Register a custom driver. By default prepends so user drivers take
|
|
48
|
+
* priority over the built-ins (e.g., to override yup-strip behavior
|
|
49
|
+
* or to add a non-Standard-Schema lib like raw Joi).
|
|
48
50
|
*/
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
const controllerMiddlewaresParams = this.filterRelatedParametersByRoute(controllerMiddlewares, method, path);
|
|
53
|
-
return {
|
|
54
|
-
request: [
|
|
55
|
-
...controllerMiddlewaresParams.map((x) => x.request),
|
|
56
|
-
...routeMiddlewaresParams.map((x) => x.request),
|
|
57
|
-
],
|
|
58
|
-
query: [
|
|
59
|
-
...controllerMiddlewaresParams.map((x) => x.query),
|
|
60
|
-
...routeMiddlewaresParams.map((x) => x.query),
|
|
61
|
-
],
|
|
62
|
-
};
|
|
63
|
-
}
|
|
64
|
-
async validateSchema(req, validator, data) {
|
|
65
|
-
if (!validator) {
|
|
66
|
-
return {};
|
|
51
|
+
static register(driver, position = 'first') {
|
|
52
|
+
if (position === 'first') {
|
|
53
|
+
ValidateService.drivers.unshift(driver);
|
|
67
54
|
}
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
}
|
|
71
|
-
async validateArrayOfSchemas(req, validators, data) {
|
|
72
|
-
const result = [];
|
|
73
|
-
for (const validator of validators) {
|
|
74
|
-
const formatedValidator = ValidateService.getDriverByValidatorBody(this.app, validator);
|
|
75
|
-
result.push(this.validateSchema(req, formatedValidator, data));
|
|
55
|
+
else {
|
|
56
|
+
ValidateService.drivers.push(driver);
|
|
76
57
|
}
|
|
77
|
-
return Promise.all(result);
|
|
78
58
|
}
|
|
79
59
|
/**
|
|
80
|
-
* Validate
|
|
60
|
+
* Validate `data` against the route's schema. Returns the cast value
|
|
61
|
+
* on success; throws `ValidationError` on failure. If no schema was
|
|
62
|
+
* provided, returns `data` unchanged.
|
|
63
|
+
*
|
|
64
|
+
* If `i18n` is supplied, error messages are translated through `i18n.t`
|
|
65
|
+
* before the error is re-thrown — both `.message` (wire-shape) and
|
|
66
|
+
* `.issues` (structured). Skip the argument and consumers that don't
|
|
67
|
+
* need translation (workers, RPC, tests) get raw keys back. The HTTP
|
|
68
|
+
* controller path passes `req.appInfo.i18n` so users never have to
|
|
69
|
+
* remember a translation step.
|
|
81
70
|
*/
|
|
82
|
-
async
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
const middlewareValidatedFields = await this.validateArrayOfSchemas(req, additionalMiddlewareSchemas, selectedReqData);
|
|
89
|
-
validatedFields = Object.assign({}, validatedFields, ...middlewareValidatedFields);
|
|
71
|
+
async validate(data, i18n) {
|
|
72
|
+
if (!this.driver) {
|
|
73
|
+
return data;
|
|
74
|
+
}
|
|
75
|
+
try {
|
|
76
|
+
return await this.driver.validate(this.schema, data);
|
|
90
77
|
}
|
|
91
|
-
|
|
78
|
+
catch (err) {
|
|
79
|
+
if (i18n?.t && err instanceof ValidationError) {
|
|
80
|
+
translateInPlace(err, i18n.t);
|
|
81
|
+
}
|
|
82
|
+
throw err;
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
static get loggerGroup() {
|
|
86
|
+
return 'service';
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
function translateInPlace(err, t) {
|
|
90
|
+
err.issues = err.issues.map((issue) => ({
|
|
91
|
+
...issue,
|
|
92
|
+
message: t(issue.message, issue.message, issue.params),
|
|
93
|
+
}));
|
|
94
|
+
err.message = issuesToPayload(err.issues);
|
|
95
|
+
}
|
|
96
|
+
function buildNoDriverMessage(schema) {
|
|
97
|
+
const looksLegacy = typeof schema === 'object' &&
|
|
98
|
+
schema !== null &&
|
|
99
|
+
typeof schema.validate === 'function' &&
|
|
100
|
+
typeof schema.cast === 'function';
|
|
101
|
+
if (looksLegacy) {
|
|
102
|
+
return ('Schema appears to be a legacy `{validate, cast}` plain object. ' +
|
|
103
|
+
'This pattern was removed in @adaptivestone/framework@5.0. Wrap as ' +
|
|
104
|
+
'Standard Schema (https://standardschema.dev/) — ~10 lines:\n\n' +
|
|
105
|
+
' const schema: StandardSchemaV1<Input, Output> = {\n' +
|
|
106
|
+
" '~standard': {\n" +
|
|
107
|
+
' version: 1,\n' +
|
|
108
|
+
" vendor: 'mycustom',\n" +
|
|
109
|
+
' validate(value) {\n' +
|
|
110
|
+
' // your validation logic; return {value} on success or {issues} on failure\n' +
|
|
111
|
+
' },\n' +
|
|
112
|
+
' },\n' +
|
|
113
|
+
' };');
|
|
92
114
|
}
|
|
115
|
+
return ('No ValidatorDriver matches this schema. Schemas must implement ' +
|
|
116
|
+
'Standard Schema (`~standard`). Yup ≥1.7, Zod ≥3.24, Valibot, and ArkType ' +
|
|
117
|
+
'all conform — see https://standardschema.dev/. ' +
|
|
118
|
+
'Custom validators: implement the `~standard` interface, or register ' +
|
|
119
|
+
'a custom driver via `ValidateService.register(driver)`.');
|
|
93
120
|
}
|
|
94
121
|
export default ValidateService;
|
|
95
122
|
//# sourceMappingURL=ValidateService.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ValidateService.js","sourceRoot":"","sources":["../../../src/services/validate/ValidateService.
|
|
1
|
+
{"version":3,"file":"ValidateService.js","sourceRoot":"","sources":["../../../src/services/validate/ValidateService.ts"],"names":[],"mappings":"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"}
|