@adaptivestone/framework 5.6.1 → 5.7.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 +48 -0
- package/README.md +75 -0
- package/dist/clusterRunner.js +2 -1
- package/dist/clusterRunner.js.map +1 -1
- package/dist/codegen/astEmit.js +7 -0
- package/dist/codegen/astEmit.js.map +1 -1
- package/dist/codegen/astExtract.d.ts +3 -0
- package/dist/codegen/astExtract.js +1 -0
- package/dist/codegen/astExtract.js.map +1 -1
- package/dist/codegen/astResolve.d.ts +2 -0
- package/dist/codegen/astResolve.js +1 -0
- package/dist/codegen/astResolve.js.map +1 -1
- package/dist/codegen/emit.js +1 -1
- package/dist/codegen/index.js +1 -1
- package/dist/codegen/index.js.map +1 -1
- package/dist/config/http.js +5 -2
- package/dist/config/http.js.map +1 -1
- package/dist/controllers/Auth.d.ts +22 -14
- package/dist/controllers/Auth.js +38 -72
- package/dist/controllers/Auth.js.map +1 -1
- package/dist/controllers/Auth.routes.gen.d.ts +1 -1
- package/dist/controllers/Auth.routes.gen.js +1 -1
- package/dist/controllers/Health.d.ts +8 -5
- package/dist/controllers/Health.js +11 -6
- package/dist/controllers/Health.js.map +1 -1
- package/dist/controllers/Health.routes.gen.d.ts +1 -1
- package/dist/controllers/Health.routes.gen.js +1 -1
- package/dist/controllers/Home.d.ts +3 -2
- package/dist/controllers/Home.js +6 -2
- package/dist/controllers/Home.js.map +1 -1
- package/dist/controllers/Home.routes.gen.d.ts +1 -1
- package/dist/controllers/Home.routes.gen.js +1 -1
- package/dist/controllers/index.js +39 -29
- package/dist/controllers/index.js.map +1 -1
- package/dist/helpers/crypto.d.ts +6 -0
- package/dist/helpers/crypto.js +18 -4
- package/dist/helpers/crypto.js.map +1 -1
- package/dist/helpers/logger.d.ts +3 -1
- package/dist/helpers/logger.js +11 -1
- package/dist/helpers/logger.js.map +1 -1
- package/dist/helpers/passwordPolicy.d.ts +23 -0
- package/dist/helpers/passwordPolicy.js +62 -0
- package/dist/helpers/passwordPolicy.js.map +1 -0
- package/dist/helpers/redis/redisConnection.d.ts +1 -0
- package/dist/helpers/redis/redisConnection.js +1 -0
- package/dist/helpers/redis/redisConnection.js.map +1 -1
- package/dist/helpers/yup.d.ts +11 -5
- package/dist/helpers/yup.js +12 -6
- package/dist/helpers/yup.js.map +1 -1
- package/dist/locales/ru/translation.json +31 -0
- package/dist/models/User.d.ts +5 -4
- package/dist/models/User.js +0 -3
- package/dist/models/User.js.map +1 -1
- package/dist/models/UserOld.d.ts +2 -0
- package/dist/models/UserOld.js +9 -3
- package/dist/models/UserOld.js.map +1 -1
- package/dist/server.d.ts +22 -2
- package/dist/server.js +83 -14
- package/dist/server.js.map +1 -1
- package/dist/services/http/ExpressResponseWriter.d.ts +30 -0
- package/dist/services/http/ExpressResponseWriter.js +447 -0
- package/dist/services/http/ExpressResponseWriter.js.map +1 -0
- package/dist/services/http/HttpServer.d.ts +16 -10
- package/dist/services/http/HttpServer.js +71 -23
- package/dist/services/http/HttpServer.js.map +1 -1
- package/dist/services/http/ResponseWriter.d.ts +11 -0
- package/dist/services/http/ResponseWriter.js +2 -0
- package/dist/services/http/ResponseWriter.js.map +1 -0
- package/dist/services/http/builtInResponse.d.ts +26 -0
- package/dist/services/http/builtInResponse.js +70 -0
- package/dist/services/http/builtInResponse.js.map +1 -0
- package/dist/services/http/builtinErrorHandlers.d.ts +52 -5
- package/dist/services/http/builtinErrorHandlers.js +86 -5
- package/dist/services/http/builtinErrorHandlers.js.map +1 -1
- package/dist/services/http/files.d.ts +21 -8
- package/dist/services/http/files.js +2 -18
- package/dist/services/http/files.js.map +1 -1
- package/dist/services/http/httpErrors.d.ts +40 -2
- package/dist/services/http/httpErrors.js +50 -2
- package/dist/services/http/httpErrors.js.map +1 -1
- package/dist/services/http/middleware/RateLimiter.d.ts +1 -0
- package/dist/services/http/middleware/RateLimiter.js +36 -13
- package/dist/services/http/middleware/RateLimiter.js.map +1 -1
- package/dist/services/http/middleware/RequestParser.d.ts +5 -2
- package/dist/services/http/middleware/RequestParser.js +43 -25
- package/dist/services/http/middleware/RequestParser.js.map +1 -1
- package/dist/services/http/responses.d.ts +114 -0
- package/dist/services/http/responses.js +191 -0
- package/dist/services/http/responses.js.map +1 -0
- package/dist/services/http/routing/ExpressAdapter.d.ts +4 -1
- package/dist/services/http/routing/ExpressAdapter.js +82 -9
- package/dist/services/http/routing/ExpressAdapter.js.map +1 -1
- package/dist/services/validate/drivers/YupDriver.js +44 -6
- package/dist/services/validate/drivers/YupDriver.js.map +1 -1
- package/package.json +2 -2
|
@@ -0,0 +1,114 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Typed response values. A route handler returns one instead of writing to
|
|
3
|
+
* Express `res`; the framework renders it. Descriptors are immutable data:
|
|
4
|
+
* build them with the `HttpResponse` factories, never by hand.
|
|
5
|
+
*
|
|
6
|
+
* @example
|
|
7
|
+
* async create(req: CreateUserRequest): Promise<JsonResponse<201, UserDto>> {
|
|
8
|
+
* const user = await this.app.getModel('User').create(req.appInfo.request);
|
|
9
|
+
* return HttpResponse.json(201, user);
|
|
10
|
+
* }
|
|
11
|
+
*/
|
|
12
|
+
/** Registered, not module-private, so two installed copies of the framework recognize each other's responses. */
|
|
13
|
+
declare const BRAND: unique symbol;
|
|
14
|
+
/** Statuses that never carry a body; only `HttpResponse.empty` accepts them. */
|
|
15
|
+
export type NoBodyStatus = 204 | 205 | 304;
|
|
16
|
+
/** Statuses accepted by `HttpResponse.redirect`. */
|
|
17
|
+
export type RedirectStatus = 301 | 302 | 303 | 307 | 308;
|
|
18
|
+
/** A literal status a body response cannot use (1xx, 204/205/304, 206) becomes `never`. */
|
|
19
|
+
type BodyStatus<S extends number> = S extends NoBodyStatus | 206 ? never : `${S}` extends `1${string}` ? never : S;
|
|
20
|
+
/** A literal status `HttpResponse.empty` cannot use (1xx, 206) becomes `never`. */
|
|
21
|
+
type EmptyStatus<S extends number> = S extends 206 ? never : `${S}` extends `1${string}` ? never : S;
|
|
22
|
+
/** Response headers: lower-case names, one entry per `set-cookie` value. */
|
|
23
|
+
export type ResponseHeaders = ReadonlyArray<readonly [name: string, value: string]>;
|
|
24
|
+
/** Anything the Web `Headers` constructor accepts, including a descriptor's `headers`. */
|
|
25
|
+
export type ResponseHeadersInit = Headers | Record<string, string> | ReadonlyArray<readonly [string, string]>;
|
|
26
|
+
/** A byte source for `HttpResponse.stream`; a Node `Readable` is an async iterable too. */
|
|
27
|
+
export type ByteStream = ReadableStream<Uint8Array> | AsyncIterable<Uint8Array>;
|
|
28
|
+
export interface ResponseOptions {
|
|
29
|
+
headers?: ResponseHeadersInit;
|
|
30
|
+
}
|
|
31
|
+
export interface BodyResponseOptions<M extends string> extends ResponseOptions {
|
|
32
|
+
/** Media type; set it here, not as a `content-type` header. */
|
|
33
|
+
contentType?: M;
|
|
34
|
+
}
|
|
35
|
+
interface ResponseBase<K extends string, S extends number> {
|
|
36
|
+
readonly [BRAND]: true;
|
|
37
|
+
readonly kind: K;
|
|
38
|
+
readonly status: S;
|
|
39
|
+
readonly headers: ResponseHeaders;
|
|
40
|
+
}
|
|
41
|
+
export interface JsonResponse<S extends number = number, B = unknown, M extends string = 'application/json'> extends ResponseBase<'json', S> {
|
|
42
|
+
readonly contentType: M;
|
|
43
|
+
readonly body: B;
|
|
44
|
+
}
|
|
45
|
+
export interface TextResponse<S extends number = number, M extends string = 'text/plain'> extends ResponseBase<'text', S> {
|
|
46
|
+
readonly contentType: M;
|
|
47
|
+
readonly body: string;
|
|
48
|
+
}
|
|
49
|
+
export interface BytesResponse<S extends number = number, M extends string = 'application/octet-stream'> extends ResponseBase<'bytes', S> {
|
|
50
|
+
readonly contentType: M;
|
|
51
|
+
readonly body: Uint8Array;
|
|
52
|
+
}
|
|
53
|
+
export interface StreamResponse<S extends number = number, M extends string = 'application/octet-stream'> extends ResponseBase<'stream', S> {
|
|
54
|
+
readonly contentType: M;
|
|
55
|
+
readonly body: ByteStream;
|
|
56
|
+
}
|
|
57
|
+
export interface RedirectResponse<S extends RedirectStatus = RedirectStatus> extends ResponseBase<'redirect', S> {
|
|
58
|
+
readonly location: string;
|
|
59
|
+
}
|
|
60
|
+
export interface EmptyResponse<S extends number = number> extends ResponseBase<'empty', S> {
|
|
61
|
+
}
|
|
62
|
+
/** A Web `Response` passed through as-is; its status and body types are not tracked. */
|
|
63
|
+
export interface NativeResponse extends ResponseBase<'native', number> {
|
|
64
|
+
readonly response: Response;
|
|
65
|
+
}
|
|
66
|
+
/** Statuses that never carry a body, as a runtime set. */
|
|
67
|
+
export declare const NO_BODY_STATUSES: ReadonlySet<number>;
|
|
68
|
+
declare function json<S extends number, B, M extends string = 'application/json'>(status: BodyStatus<S>, body: B, options?: BodyResponseOptions<M>): JsonResponse<S, B, M>;
|
|
69
|
+
declare function text<S extends number, M extends string = 'text/plain'>(status: BodyStatus<S>, body: string, options?: BodyResponseOptions<M>): TextResponse<S, M>;
|
|
70
|
+
declare function bytes<S extends number, M extends string = 'application/octet-stream'>(status: BodyStatus<S>, body: Uint8Array, options?: BodyResponseOptions<M>): BytesResponse<S, M>;
|
|
71
|
+
/**
|
|
72
|
+
* Stream bytes. The status and headers are sent with the first chunk, so an
|
|
73
|
+
* error before it is answered like a thrown error; a later error aborts the
|
|
74
|
+
* response. A client that disconnects stops the source (`return()` on the
|
|
75
|
+
* iterator, `cancel()` on a `ReadableStream`).
|
|
76
|
+
*/
|
|
77
|
+
declare function stream<S extends number, M extends string = 'application/octet-stream'>(status: BodyStatus<S>, body: ByteStream, options?: BodyResponseOptions<M>): StreamResponse<S, M>;
|
|
78
|
+
declare function redirect<S extends RedirectStatus>(status: S, location: string | URL, options?: ResponseOptions): RedirectResponse<S>;
|
|
79
|
+
declare function empty<S extends number>(status: EmptyStatus<S>, options?: ResponseOptions): EmptyResponse<S>;
|
|
80
|
+
/**
|
|
81
|
+
* Pass a Web `Response` through: its status, status text, headers and body
|
|
82
|
+
* are sent as they are, except the framing headers the server sets itself
|
|
83
|
+
* (`connection`, `transfer-encoding`, …). A `fetch()` response (non-empty
|
|
84
|
+
* `url`) with a body, a status other than 206 and only codings `fetch` decodes
|
|
85
|
+
* (`gzip`, `deflate`, `br`, `zstd`; under Bun a single one) also loses its
|
|
86
|
+
* upstream `content-encoding`, `content-length` and digest headers, which
|
|
87
|
+
* describe the encoded bytes; any other response is passed on as received,
|
|
88
|
+
* headers intact.
|
|
89
|
+
* To forward the upstream bytes exactly as received (for example fetched with
|
|
90
|
+
* decoding turned off), pass `new Response(upstream.body, upstream)`, which
|
|
91
|
+
* has no `url`.
|
|
92
|
+
*/
|
|
93
|
+
declare function native(response: Response): NativeResponse;
|
|
94
|
+
/** Is `value` a response built by an `HttpResponse` factory? */
|
|
95
|
+
declare function is(value: unknown): value is HttpResponse;
|
|
96
|
+
/**
|
|
97
|
+
* Response factories. Status is always the first argument. Statuses a kind
|
|
98
|
+
* cannot use fail to compile when written as literals and throw a
|
|
99
|
+
* `RangeError` at runtime: 1xx everywhere; 204, 205 and 304 everywhere but
|
|
100
|
+
* `empty`; 206 (reserved for range-aware file responses) everywhere.
|
|
101
|
+
*/
|
|
102
|
+
export declare const HttpResponse: Readonly<{
|
|
103
|
+
json: typeof json;
|
|
104
|
+
text: typeof text;
|
|
105
|
+
bytes: typeof bytes;
|
|
106
|
+
stream: typeof stream;
|
|
107
|
+
redirect: typeof redirect;
|
|
108
|
+
empty: typeof empty;
|
|
109
|
+
native: typeof native;
|
|
110
|
+
is: typeof is;
|
|
111
|
+
}>;
|
|
112
|
+
/** Any response a handler can return. */
|
|
113
|
+
export type HttpResponse = JsonResponse<number, unknown, string> | TextResponse<number, string> | BytesResponse<number, string> | StreamResponse<number, string> | RedirectResponse | EmptyResponse | NativeResponse;
|
|
114
|
+
export {};
|
|
@@ -0,0 +1,191 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Typed response values. A route handler returns one instead of writing to
|
|
3
|
+
* Express `res`; the framework renders it. Descriptors are immutable data:
|
|
4
|
+
* build them with the `HttpResponse` factories, never by hand.
|
|
5
|
+
*
|
|
6
|
+
* @example
|
|
7
|
+
* async create(req: CreateUserRequest): Promise<JsonResponse<201, UserDto>> {
|
|
8
|
+
* const user = await this.app.getModel('User').create(req.appInfo.request);
|
|
9
|
+
* return HttpResponse.json(201, user);
|
|
10
|
+
* }
|
|
11
|
+
*/
|
|
12
|
+
/** Registered, not module-private, so two installed copies of the framework recognize each other's responses. */
|
|
13
|
+
const BRAND = Symbol.for('@adaptivestone/framework/HttpResponse');
|
|
14
|
+
/** Statuses that never carry a body, as a runtime set. */
|
|
15
|
+
export const NO_BODY_STATUSES = new Set([204, 205, 304]);
|
|
16
|
+
const REDIRECT_STATUSES = new Set([
|
|
17
|
+
301, 302, 303, 307, 308,
|
|
18
|
+
]);
|
|
19
|
+
const NO_HEADERS = Object.freeze([]);
|
|
20
|
+
function assertFinalStatus(factory, status) {
|
|
21
|
+
if (!Number.isInteger(status) || status < 200 || status > 599) {
|
|
22
|
+
throw new RangeError(`HttpResponse.${factory}: status must be an integer from 200 to 599, got ${status}`);
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
function assertBodyStatus(factory, status) {
|
|
26
|
+
assertFinalStatus(factory, status);
|
|
27
|
+
if (NO_BODY_STATUSES.has(status)) {
|
|
28
|
+
throw new RangeError(`HttpResponse.${factory}: status ${status} never carries a body; use HttpResponse.empty(${status})`);
|
|
29
|
+
}
|
|
30
|
+
if (status === 206) {
|
|
31
|
+
throw new RangeError(`HttpResponse.${factory}: status 206 is reserved for range-aware file responses`);
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
/** Normalize through Web `Headers` (validates names and values) into frozen pairs. */
|
|
35
|
+
function toHeaders(factory, init, owned) {
|
|
36
|
+
if (init === undefined) {
|
|
37
|
+
return NO_HEADERS;
|
|
38
|
+
}
|
|
39
|
+
// Headers accepts any sequence of pairs; its type only lists mutable ones.
|
|
40
|
+
const headers = new Headers(init);
|
|
41
|
+
if (owned && headers.has(owned)) {
|
|
42
|
+
throw new TypeError(owned === 'location'
|
|
43
|
+
? `HttpResponse.${factory}: pass the location as the second argument, not as a location header`
|
|
44
|
+
: `HttpResponse.${factory}: pass the media type as options.contentType, not as a content-type header`);
|
|
45
|
+
}
|
|
46
|
+
return Object.freeze([...headers].map(([name, value]) => Object.freeze([name, value])));
|
|
47
|
+
}
|
|
48
|
+
function json(status, body, options) {
|
|
49
|
+
assertBodyStatus('json', status);
|
|
50
|
+
if (body === undefined) {
|
|
51
|
+
throw new TypeError('HttpResponse.json: body is undefined; use HttpResponse.empty(status) for a response without a body');
|
|
52
|
+
}
|
|
53
|
+
return Object.freeze({
|
|
54
|
+
[BRAND]: true,
|
|
55
|
+
kind: 'json',
|
|
56
|
+
status: status,
|
|
57
|
+
headers: toHeaders('json', options?.headers, 'content-type'),
|
|
58
|
+
contentType: (options?.contentType ?? 'application/json'),
|
|
59
|
+
body,
|
|
60
|
+
});
|
|
61
|
+
}
|
|
62
|
+
function text(status, body, options) {
|
|
63
|
+
assertBodyStatus('text', status);
|
|
64
|
+
if (typeof body !== 'string') {
|
|
65
|
+
throw new TypeError('HttpResponse.text: body must be a string');
|
|
66
|
+
}
|
|
67
|
+
return Object.freeze({
|
|
68
|
+
[BRAND]: true,
|
|
69
|
+
kind: 'text',
|
|
70
|
+
status: status,
|
|
71
|
+
headers: toHeaders('text', options?.headers, 'content-type'),
|
|
72
|
+
contentType: (options?.contentType ?? 'text/plain'),
|
|
73
|
+
body,
|
|
74
|
+
});
|
|
75
|
+
}
|
|
76
|
+
function bytes(status, body, options) {
|
|
77
|
+
assertBodyStatus('bytes', status);
|
|
78
|
+
if (!(body instanceof Uint8Array)) {
|
|
79
|
+
throw new TypeError('HttpResponse.bytes: body must be a Uint8Array');
|
|
80
|
+
}
|
|
81
|
+
return Object.freeze({
|
|
82
|
+
[BRAND]: true,
|
|
83
|
+
kind: 'bytes',
|
|
84
|
+
status: status,
|
|
85
|
+
headers: toHeaders('bytes', options?.headers, 'content-type'),
|
|
86
|
+
contentType: (options?.contentType ?? 'application/octet-stream'),
|
|
87
|
+
body,
|
|
88
|
+
});
|
|
89
|
+
}
|
|
90
|
+
/**
|
|
91
|
+
* Stream bytes. The status and headers are sent with the first chunk, so an
|
|
92
|
+
* error before it is answered like a thrown error; a later error aborts the
|
|
93
|
+
* response. A client that disconnects stops the source (`return()` on the
|
|
94
|
+
* iterator, `cancel()` on a `ReadableStream`).
|
|
95
|
+
*/
|
|
96
|
+
function stream(status, body, options) {
|
|
97
|
+
assertBodyStatus('stream', status);
|
|
98
|
+
if (typeof body?.[Symbol.asyncIterator] !== 'function') {
|
|
99
|
+
throw new TypeError('HttpResponse.stream: body must be a ReadableStream or an async iterable of bytes');
|
|
100
|
+
}
|
|
101
|
+
return Object.freeze({
|
|
102
|
+
[BRAND]: true,
|
|
103
|
+
kind: 'stream',
|
|
104
|
+
status: status,
|
|
105
|
+
headers: toHeaders('stream', options?.headers, 'content-type'),
|
|
106
|
+
contentType: (options?.contentType ?? 'application/octet-stream'),
|
|
107
|
+
body,
|
|
108
|
+
});
|
|
109
|
+
}
|
|
110
|
+
function redirect(status, location, options) {
|
|
111
|
+
if (!REDIRECT_STATUSES.has(status)) {
|
|
112
|
+
throw new RangeError(`HttpResponse.redirect: status must be 301, 302, 303, 307 or 308, got ${status}`);
|
|
113
|
+
}
|
|
114
|
+
const target = String(location);
|
|
115
|
+
if (target === '') {
|
|
116
|
+
throw new TypeError('HttpResponse.redirect: location must not be empty');
|
|
117
|
+
}
|
|
118
|
+
return Object.freeze({
|
|
119
|
+
[BRAND]: true,
|
|
120
|
+
kind: 'redirect',
|
|
121
|
+
status,
|
|
122
|
+
headers: toHeaders('redirect', options?.headers, 'location'),
|
|
123
|
+
location: target,
|
|
124
|
+
});
|
|
125
|
+
}
|
|
126
|
+
function empty(status, options) {
|
|
127
|
+
assertFinalStatus('empty', status);
|
|
128
|
+
if (status === 206) {
|
|
129
|
+
throw new RangeError('HttpResponse.empty: status 206 is reserved for range-aware file responses');
|
|
130
|
+
}
|
|
131
|
+
return Object.freeze({
|
|
132
|
+
[BRAND]: true,
|
|
133
|
+
kind: 'empty',
|
|
134
|
+
status: status,
|
|
135
|
+
headers: toHeaders('empty', options?.headers, null),
|
|
136
|
+
});
|
|
137
|
+
}
|
|
138
|
+
/**
|
|
139
|
+
* Pass a Web `Response` through: its status, status text, headers and body
|
|
140
|
+
* are sent as they are, except the framing headers the server sets itself
|
|
141
|
+
* (`connection`, `transfer-encoding`, …). A `fetch()` response (non-empty
|
|
142
|
+
* `url`) with a body, a status other than 206 and only codings `fetch` decodes
|
|
143
|
+
* (`gzip`, `deflate`, `br`, `zstd`; under Bun a single one) also loses its
|
|
144
|
+
* upstream `content-encoding`, `content-length` and digest headers, which
|
|
145
|
+
* describe the encoded bytes; any other response is passed on as received,
|
|
146
|
+
* headers intact.
|
|
147
|
+
* To forward the upstream bytes exactly as received (for example fetched with
|
|
148
|
+
* decoding turned off), pass `new Response(upstream.body, upstream)`, which
|
|
149
|
+
* has no `url`.
|
|
150
|
+
*/
|
|
151
|
+
function native(response) {
|
|
152
|
+
if (!(response instanceof Response)) {
|
|
153
|
+
throw new TypeError('HttpResponse.native: expected a Web Response');
|
|
154
|
+
}
|
|
155
|
+
if (response.type === 'error') {
|
|
156
|
+
throw new TypeError('HttpResponse.native: a network-error Response (Response.error()) has no status to send');
|
|
157
|
+
}
|
|
158
|
+
if (response.bodyUsed) {
|
|
159
|
+
throw new TypeError('HttpResponse.native: the Response body was already read');
|
|
160
|
+
}
|
|
161
|
+
return Object.freeze({
|
|
162
|
+
[BRAND]: true,
|
|
163
|
+
kind: 'native',
|
|
164
|
+
status: response.status,
|
|
165
|
+
headers: NO_HEADERS,
|
|
166
|
+
response,
|
|
167
|
+
});
|
|
168
|
+
}
|
|
169
|
+
/** Is `value` a response built by an `HttpResponse` factory? */
|
|
170
|
+
function is(value) {
|
|
171
|
+
return (typeof value === 'object' &&
|
|
172
|
+
value !== null &&
|
|
173
|
+
value[BRAND] === true);
|
|
174
|
+
}
|
|
175
|
+
/**
|
|
176
|
+
* Response factories. Status is always the first argument. Statuses a kind
|
|
177
|
+
* cannot use fail to compile when written as literals and throw a
|
|
178
|
+
* `RangeError` at runtime: 1xx everywhere; 204, 205 and 304 everywhere but
|
|
179
|
+
* `empty`; 206 (reserved for range-aware file responses) everywhere.
|
|
180
|
+
*/
|
|
181
|
+
export const HttpResponse = Object.freeze({
|
|
182
|
+
json,
|
|
183
|
+
text,
|
|
184
|
+
bytes,
|
|
185
|
+
stream,
|
|
186
|
+
redirect,
|
|
187
|
+
empty,
|
|
188
|
+
native,
|
|
189
|
+
is,
|
|
190
|
+
});
|
|
191
|
+
//# sourceMappingURL=responses.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"responses.js","sourceRoot":"","sources":["../../../src/services/http/responses.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,9 @@
|
|
|
7
7
|
*/
|
|
8
8
|
import type { NextFunction, Request, Response } from 'express';
|
|
9
9
|
import type { IApp } from '../../../server.ts';
|
|
10
|
+
import type { ResponseWriter } from '../ResponseWriter.ts';
|
|
10
11
|
import type { RouteRegistry } from './RouteRegistry.ts';
|
|
12
|
+
/** @internal A failure for `next`: a falsy one would fall through to the 404. */
|
|
13
|
+
export declare function failure(reason: unknown): unknown;
|
|
11
14
|
export type ExpressAdapter = (req: Request, res: Response, next: NextFunction) => Promise<void>;
|
|
12
|
-
export declare function createExpressAdapter(registry: RouteRegistry, app: IApp): ExpressAdapter;
|
|
15
|
+
export declare function createExpressAdapter(registry: RouteRegistry, app: IApp, writer?: ResponseWriter<Request, Response>): ExpressAdapter;
|
|
@@ -5,10 +5,30 @@
|
|
|
5
5
|
* Middleware instances are cached by `MiddlewareEntry` identity (WeakMap)
|
|
6
6
|
* — each entry is constructed once on first request and reused thereafter.
|
|
7
7
|
*/
|
|
8
|
+
import { describeThrown } from '../../../helpers/logger.js';
|
|
8
9
|
import { translateWithDefault } from '../../../helpers/translate.js';
|
|
10
|
+
import { claimBuiltInResponse } from '../builtInResponse.js';
|
|
11
|
+
import { ExpressResponseWriter, releaseUnsentBody, } from '../ExpressResponseWriter.js';
|
|
12
|
+
import { FRAMEWORK_ERROR_CODES } from '../httpErrors.js';
|
|
13
|
+
import { HttpResponse } from '../responses.js';
|
|
9
14
|
import { getMatchedNode, MalformedPathError } from './match.js';
|
|
10
15
|
const instanceCache = new WeakMap();
|
|
11
|
-
|
|
16
|
+
const warnedDroppedResponse = new Set();
|
|
17
|
+
/** Once per handler: it called a framework handler and dropped its response. */
|
|
18
|
+
function warnDroppedResponse(entry) {
|
|
19
|
+
const name = `${entry.meta?.controllerClass ?? 'Controller'}.${entry.meta?.methodName ?? 'handler'}`;
|
|
20
|
+
if (warnedDroppedResponse.has(name)) {
|
|
21
|
+
return;
|
|
22
|
+
}
|
|
23
|
+
warnedDroppedResponse.add(name);
|
|
24
|
+
process.emitWarning(`${name} called a framework handler without returning its response; the response was sent anyway. Return it (\`return super.${entry.meta?.methodName ?? 'handler'}(req, res)\`): v6 will not send a response that was not returned.`, { type: 'DeprecationWarning', code: 'ASF_DEP_DROPPED_RESPONSE' });
|
|
25
|
+
}
|
|
26
|
+
/** @internal A failure for `next`: a falsy one would fall through to the 404. */
|
|
27
|
+
export function failure(reason) {
|
|
28
|
+
return (reason ||
|
|
29
|
+
new Error(`A handler or response write failed without a reason (${describeThrown(reason)})`));
|
|
30
|
+
}
|
|
31
|
+
export function createExpressAdapter(registry, app, writer = new ExpressResponseWriter()) {
|
|
12
32
|
const routeTemplates = new WeakMap();
|
|
13
33
|
const indexTemplates = () => registry.walk((node, path) => routeTemplates.set(node, path));
|
|
14
34
|
indexTemplates();
|
|
@@ -19,10 +39,13 @@ export function createExpressAdapter(registry, app) {
|
|
|
19
39
|
}
|
|
20
40
|
catch (err) {
|
|
21
41
|
if (err instanceof MalformedPathError) {
|
|
22
|
-
|
|
42
|
+
const malformed = HttpResponse.json(400, {
|
|
43
|
+
error: FRAMEWORK_ERROR_CODES.malformedUrl,
|
|
23
44
|
message: translateWithDefault(req, 'http.malformedUrl', 'Malformed URL'),
|
|
24
45
|
});
|
|
25
|
-
return
|
|
46
|
+
return writer
|
|
47
|
+
.write(malformed, req, res)
|
|
48
|
+
.catch((err) => next(failure(err)));
|
|
26
49
|
}
|
|
27
50
|
return next(err);
|
|
28
51
|
}
|
|
@@ -32,11 +55,13 @@ export function createExpressAdapter(registry, app) {
|
|
|
32
55
|
}
|
|
33
56
|
if (result.entry === null) {
|
|
34
57
|
// 405 — path matched, method didn't.
|
|
35
|
-
|
|
36
|
-
|
|
58
|
+
const notAllowed = HttpResponse.json(405, {
|
|
59
|
+
error: FRAMEWORK_ERROR_CODES.methodNotAllowed,
|
|
37
60
|
message: translateWithDefault(req, 'http.methodNotAllowed', 'Method not allowed'),
|
|
38
|
-
});
|
|
39
|
-
return
|
|
61
|
+
}, { headers: { Allow: result.allowedMethods.join(', ') } });
|
|
62
|
+
return writer
|
|
63
|
+
.write(notAllowed, req, res)
|
|
64
|
+
.catch((err) => next(failure(err)));
|
|
40
65
|
}
|
|
41
66
|
// Populate request with match metadata before middleware runs.
|
|
42
67
|
req.params = result.params;
|
|
@@ -67,10 +92,58 @@ export function createExpressAdapter(registry, app) {
|
|
|
67
92
|
return;
|
|
68
93
|
}
|
|
69
94
|
}
|
|
70
|
-
|
|
95
|
+
// The streams still piped into res (`pipe`, `pipeline`) when the handler
|
|
96
|
+
// returns. One may not have sent its headers yet: returning it as the
|
|
97
|
+
// response body is a write to res too.
|
|
98
|
+
const piped = new Set();
|
|
99
|
+
const onPipe = (source) => piped.add(source);
|
|
100
|
+
const onUnpipe = (source) => piped.delete(source);
|
|
101
|
+
res.on('pipe', onPipe);
|
|
102
|
+
res.on('unpipe', onUnpipe);
|
|
103
|
+
let returned;
|
|
104
|
+
try {
|
|
105
|
+
returned = await Promise.resolve(result.entry.handler(req, res, next));
|
|
106
|
+
}
|
|
107
|
+
finally {
|
|
108
|
+
res.off('pipe', onPipe);
|
|
109
|
+
res.off('unpipe', onUnpipe);
|
|
110
|
+
}
|
|
111
|
+
// Only a branded `HttpResponse` is rendered; any other return value is
|
|
112
|
+
// the legacy `res` style, which has already answered (or will).
|
|
113
|
+
if (HttpResponse.is(returned)) {
|
|
114
|
+
const pipedBody = returned.kind === 'stream' && piped.has(returned.body);
|
|
115
|
+
if (res.headersSent || pipedBody) {
|
|
116
|
+
// The response written to res stands. A returned stream that res may
|
|
117
|
+
// be sending keeps running; one nobody reads is destroyed.
|
|
118
|
+
app.logger?.error(`${req.method} ${req.route.path}: the handler both wrote to res and returned an HttpResponse. Use one or the other.`);
|
|
119
|
+
releaseUnsentBody(returned);
|
|
120
|
+
return;
|
|
121
|
+
}
|
|
122
|
+
await writer.write(returned, req, res);
|
|
123
|
+
}
|
|
124
|
+
else if (!res.headersSent) {
|
|
125
|
+
// An override that called a framework handler without returning its
|
|
126
|
+
// response would answer nothing. Transitional: removed in v6 (see
|
|
127
|
+
// `builtInResponse`).
|
|
128
|
+
const { entry } = result;
|
|
129
|
+
claimBuiltInResponse(req, res, (dropped) => {
|
|
130
|
+
if (!res.headersSent && !res.destroyed) {
|
|
131
|
+
warnDroppedResponse(entry);
|
|
132
|
+
// A late call runs outside the try below: a throw goes to `next` too.
|
|
133
|
+
try {
|
|
134
|
+
writer
|
|
135
|
+
.write(dropped, req, res)
|
|
136
|
+
.catch((err) => next(failure(err)));
|
|
137
|
+
}
|
|
138
|
+
catch (err) {
|
|
139
|
+
next(failure(err));
|
|
140
|
+
}
|
|
141
|
+
}
|
|
142
|
+
});
|
|
143
|
+
}
|
|
71
144
|
}
|
|
72
145
|
catch (err) {
|
|
73
|
-
next(err);
|
|
146
|
+
next(failure(err));
|
|
74
147
|
}
|
|
75
148
|
};
|
|
76
149
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ExpressAdapter.js","sourceRoot":"","sources":["../../../../src/services/http/routing/ExpressAdapter.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAGH,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"ExpressAdapter.js","sourceRoot":"","sources":["../../../../src/services/http/routing/ExpressAdapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -36,6 +36,9 @@ export const yupDriver = {
|
|
|
36
36
|
if (isYupValidationError(e)) {
|
|
37
37
|
throw fromYupError(e);
|
|
38
38
|
}
|
|
39
|
+
if (e instanceof TypeError) {
|
|
40
|
+
throw (await shapeTypeErrors(body, data)) ?? e;
|
|
41
|
+
}
|
|
39
42
|
throw e;
|
|
40
43
|
}
|
|
41
44
|
},
|
|
@@ -54,6 +57,40 @@ export const yupDriver = {
|
|
|
54
57
|
}
|
|
55
58
|
},
|
|
56
59
|
};
|
|
60
|
+
/**
|
|
61
|
+
* A transform that assumes its type (`string().trim()`, `.lowercase()`) throws
|
|
62
|
+
* a `TypeError` when a client sends an array or object. Re-check without
|
|
63
|
+
* transforms: type errors on such values become a `ValidationError`. Anything
|
|
64
|
+
* else (e.g. a `.test()` that throws again) yields `undefined`, so the caller
|
|
65
|
+
* rethrows its original error.
|
|
66
|
+
*/
|
|
67
|
+
async function shapeTypeErrors(schema, data) {
|
|
68
|
+
try {
|
|
69
|
+
await schema.validate(data, { strict: true, abortEarly: false });
|
|
70
|
+
}
|
|
71
|
+
catch (e) {
|
|
72
|
+
if (!isYupValidationError(e)) {
|
|
73
|
+
return undefined;
|
|
74
|
+
}
|
|
75
|
+
// Strict mode also rejects castable input (`'42'` for `number()`), so keep
|
|
76
|
+
// only the values no cast accepts.
|
|
77
|
+
const inner = (e.inner ?? []).filter((issue) => issue.type === 'typeError' && isArrayOrPlainObject(issue.value));
|
|
78
|
+
if (inner.length > 0) {
|
|
79
|
+
return fromYupError({ ...e, inner });
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
return undefined;
|
|
83
|
+
}
|
|
84
|
+
function isArrayOrPlainObject(value) {
|
|
85
|
+
if (Array.isArray(value)) {
|
|
86
|
+
return true;
|
|
87
|
+
}
|
|
88
|
+
if (typeof value !== 'object' || value === null) {
|
|
89
|
+
return false;
|
|
90
|
+
}
|
|
91
|
+
const proto = Object.getPrototypeOf(value);
|
|
92
|
+
return proto === Object.prototype || proto === null;
|
|
93
|
+
}
|
|
57
94
|
function isYupValidationError(e) {
|
|
58
95
|
return (typeof e === 'object' &&
|
|
59
96
|
e !== null &&
|
|
@@ -76,17 +113,18 @@ function fromYupError(e) {
|
|
|
76
113
|
return new ValidationError(issues);
|
|
77
114
|
}
|
|
78
115
|
/**
|
|
79
|
-
* Drop
|
|
80
|
-
* value
|
|
81
|
-
*
|
|
82
|
-
*
|
|
83
|
-
* are
|
|
116
|
+
* Drop submitted input from yup's `params`. Yup echoes the offending value in
|
|
117
|
+
* `value`/`originalValue`, and `oneOf`/`notOneOf` put the values a `ref()`
|
|
118
|
+
* resolves to (e.g. the password a `repeatPassword` must match) in `resolved`;
|
|
119
|
+
* surfacing them on `.issues` would leak input into anything that logs issues.
|
|
120
|
+
* `spec`/`disableStackTrace` are schema internals. The interpolation params
|
|
121
|
+
* (`min`, `max`, `length`, `values`, …) are kept so i18n placeholders resolve.
|
|
84
122
|
*/
|
|
85
123
|
function sanitizeParams(params) {
|
|
86
124
|
if (!params) {
|
|
87
125
|
return undefined;
|
|
88
126
|
}
|
|
89
|
-
const { value, originalValue, ...safe } = params;
|
|
127
|
+
const { value, originalValue, resolved, spec, disableStackTrace, ...safe } = params;
|
|
90
128
|
return safe;
|
|
91
129
|
}
|
|
92
130
|
function describeToJsonSchema(desc) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"YupDriver.js","sourceRoot":"","sources":["../../../../src/services/validate/drivers/YupDriver.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,CAAC,MAAM,SAAS,GAAoB;IACxC,SAAS,CAAC,IAAa;QACrB,OAAO,CACL,OAAO,IAAI,KAAK,QAAQ;YACxB,IAAI,KAAK,IAAI;YACb,WAAW,IAAI,IAAI;YAClB,IAAyB,CAAC,WAAW,CAAC,EAAE,MAAM,KAAK,KAAK,CAC1D,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,IAAa,EAAE,IAAa;
|
|
1
|
+
{"version":3,"file":"YupDriver.js","sourceRoot":"","sources":["../../../../src/services/validate/drivers/YupDriver.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,CAAC,MAAM,SAAS,GAAoB;IACxC,SAAS,CAAC,IAAa;QACrB,OAAO,CACL,OAAO,IAAI,KAAK,QAAQ;YACxB,IAAI,KAAK,IAAI;YACb,WAAW,IAAI,IAAI;YAClB,IAAyB,CAAC,WAAW,CAAC,EAAE,MAAM,KAAK,KAAK,CAC1D,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,IAAa,EAAE,IAAa;QACzC,IAAI,CAAC;YACH,OAAO,MAAO,IAAsB,CAAC,QAAQ,CAAC,IAAI,EAAE;gBAClD,YAAY,EAAE,IAAI;gBAClB,UAAU,EAAE,KAAK;aAClB,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,CAAU,EAAE,CAAC;YACpB,IAAI,oBAAoB,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC5B,MAAM,YAAY,CAAC,CAAC,CAAC,CAAC;YACxB,CAAC;YACD,IAAI,CAAC,YAAY,SAAS,EAAE,CAAC;gBAC3B,MAAM,CAAC,MAAM,eAAe,CAAC,IAAqB,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC;YAClE,CAAC;YACD,MAAM,CAAC,CAAC;QACV,CAAC;IACH,CAAC;IAED,YAAY,CAAC,IAAa;QACxB,MAAM,QAAQ,GAAI,IAA4C,CAAC,QAAQ,CAAC;QACxE,IAAI,OAAO,QAAQ,KAAK,UAAU,EAAE,CAAC;YACnC,OAAO,IAAI,CAAC;QACd,CAAC;QACD,IAAI,CAAC;YACH,OAAO,oBAAoB,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QACnD,CAAC;QAAC,MAAM,CAAC;YACP,wEAAwE;YACxE,iEAAiE;YACjE,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;CACF,CAAC;AAoBF;;;;;;GAMG;AACH,KAAK,UAAU,eAAe,CAC5B,MAAqB,EACrB,IAAa;IAEb,IAAI,CAAC;QACH,MAAM,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,CAAC;IACnE,CAAC;IAAC,OAAO,CAAU,EAAE,CAAC;QACpB,IAAI,CAAC,oBAAoB,CAAC,CAAC,CAAC,EAAE,CAAC;YAC7B,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,2EAA2E;QAC3E,mCAAmC;QACnC,MAAM,KAAK,GAAG,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,MAAM,CAClC,CAAC,KAAK,EAAE,EAAE,CACR,KAAK,CAAC,IAAI,KAAK,WAAW,IAAI,oBAAoB,CAAC,KAAK,CAAC,KAAK,CAAC,CAClE,CAAC;QACF,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACrB,OAAO,YAAY,CAAC,EAAE,GAAG,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;QACvC,CAAC;IACH,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,oBAAoB,CAAC,KAAc;IAC1C,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;QAChD,OAAO,KAAK,CAAC;IACf,CAAC;IACD,MAAM,KAAK,GAAG,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;IAC3C,OAAO,KAAK,KAAK,MAAM,CAAC,SAAS,IAAI,KAAK,KAAK,IAAI,CAAC;AACtD,CAAC;AAED,SAAS,oBAAoB,CAAC,CAAU;IACtC,OAAO,CACL,OAAO,CAAC,KAAK,QAAQ;QACrB,CAAC,KAAK,IAAI;QACT,CAAwB,CAAC,IAAI,KAAK,iBAAiB;QACpD,KAAK,CAAC,OAAO,CAAE,CAAyB,CAAC,KAAK,CAAC,CAChD,CAAC;AACJ,CAAC;AAED,SAAS,YAAY,CAAC,CAA0B;IAC9C,MAAM,MAAM,GAAsB,EAAE,CAAC;IACrC,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAE5E,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,MAAM,IAAI,GAA4B,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAC5E,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC;YAC1C,CAAC,CAAC,KAAK,CAAC,MAAM;YACd,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACpB,MAAM,MAAM,GAAG,cAAc,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAC5C,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;YAC/B,MAAM,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;QACzC,CAAC;IACH,CAAC;IAED,OAAO,IAAI,eAAe,CAAC,MAAM,CAAC,CAAC;AACrC,CAAC;AAED;;;;;;;GAOG;AACH,SAAS,cAAc,CACrB,MAAgC;IAEhC,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,MAAM,EAAE,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,IAAI,EAAE,iBAAiB,EAAE,GAAG,IAAI,EAAE,GACxE,MAAM,CAAC;IACT,OAAO,IAAI,CAAC;AACd,CAAC;AAyBD,SAAS,oBAAoB,CAAC,IAAoB;IAChD,MAAM,MAAM,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;IAChC,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACvD,MAAM,CAAC,IAAI,GAAG,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC;IAChC,CAAC;IACD,+EAA+E;IAC/E,mEAAmE;IACnE,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS,IAAI,IAAI,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QACzD,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;IAChC,CAAC;IACD,MAAM,WAAW,GACf,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,CAAC,IAAI,CAAC,WAAW,KAAK,QAAQ;QACpD,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW;QACvB,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC;IACjB,IAAI,WAAW,EAAE,CAAC;QAChB,MAAM,CAAC,WAAW,GAAG,WAAW,CAAC;IACnC,CAAC;IACD,OAAO,aAAa,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;AACrC,CAAC;AAED,SAAS,UAAU,CAAC,IAAoB;IACtC,QAAQ,IAAI,CAAC,IAAI,EAAE,CAAC;QAClB,KAAK,QAAQ,EAAE,CAAC;YACd,MAAM,UAAU,GAA+B,EAAE,CAAC;YAClD,MAAM,QAAQ,GAAa,EAAE,CAAC;YAC9B,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,IAAI,EAAE,CAAC,EAAE,CAAC;gBAC7D,UAAU,CAAC,GAAG,CAAC,GAAG,oBAAoB,CAAC,KAAK,CAAC,CAAC;gBAC9C,IAAI,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;oBACtB,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBACrB,CAAC;YACH,CAAC;YACD,MAAM,GAAG,GAAe,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC;YACvD,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACxB,GAAG,CAAC,QAAQ,GAAG,QAAQ,CAAC;YAC1B,CAAC;YACD,OAAO,GAAG,CAAC;QACb,CAAC;QACD,KAAK,OAAO,EAAE,CAAC;YACb,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC;gBACzC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;gBACnB,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC;YACnB,OAAO;gBACL,IAAI,EAAE,OAAO;gBACb,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE;aAChD,CAAC;QACJ,CAAC;QACD,KAAK,QAAQ;YACX,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;QAC5B,KAAK,QAAQ;YACX,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;QACnE,KAAK,SAAS;YACZ,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;QAC7B,KAAK,MAAM;YACT,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC;QACjD,KAAK,MAAM;YACT,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC;QAC9C;YACE,2DAA2D;YAC3D,OAAO,EAAE,CAAC;IACd,CAAC;AACH,CAAC;AAED,SAAS,UAAU,CAAC,IAAoB;IACtC,IAAI,IAAI,CAAC,QAAQ,KAAK,KAAK,EAAE,CAAC;QAC5B,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,OAAO,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,OAAO,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;AAC/D,CAAC;AAED,SAAS,OAAO,CAAC,IAAoB,EAAE,IAAY;IACjD,OAAO,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,KAAK,IAAI,CAAC,CAAC;AAC/E,CAAC;AAED,qEAAqE;AACrE,SAAS,aAAa,CAAC,MAAkB,EAAE,IAAoB;IAC7D,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;QACnB,OAAO,MAAM,CAAC;IAChB,CAAC;IACD,IAAI,OAAO,MAAM,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QACpC,OAAO,EAAE,GAAG,MAAM,EAAE,IAAI,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,CAAC;IACpD,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@adaptivestone/framework",
|
|
3
|
-
"version": "5.
|
|
3
|
+
"version": "5.7.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.159.0",
|
|
87
87
|
"typescript": "^7.0.2",
|
|
88
88
|
"vitest": "^5.0.3",
|
|
89
89
|
"yup": "^1.7.0",
|