@adaptivestone/framework 5.0.0-beta.50 → 5.0.0-beta.52
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 +36 -11
- package/dist/codegen/appTypes.d.ts +2 -2
- package/dist/codegen/appTypes.js +20 -5
- package/dist/codegen/appTypes.js.map +1 -1
- package/dist/codegen/collectMetadata.d.ts +6 -0
- package/dist/codegen/collectMetadata.js +4 -0
- package/dist/codegen/collectMetadata.js.map +1 -1
- package/dist/codegen/emit.js +15 -1
- package/dist/codegen/emit.js.map +1 -1
- package/dist/controllers/Auth.d.ts +14 -29
- package/dist/controllers/Auth.js +147 -21
- package/dist/controllers/Auth.js.map +1 -1
- package/dist/controllers/index.js +81 -8
- package/dist/controllers/index.js.map +1 -1
- package/dist/helpers/logger.d.ts +3 -1
- package/dist/helpers/logger.js +22 -1
- package/dist/helpers/logger.js.map +1 -1
- package/dist/helpers/yup.d.ts +11 -2
- package/dist/helpers/yup.js +20 -2
- package/dist/helpers/yup.js.map +1 -1
- package/dist/models/KeyValue.d.ts +22 -0
- package/dist/models/KeyValue.js +17 -0
- package/dist/models/KeyValue.js.map +1 -0
- package/dist/modules/AbstractController.d.ts +12 -1
- package/dist/modules/AbstractController.js.map +1 -1
- package/dist/modules/Base.d.ts +1 -1
- package/dist/modules/Base.js +12 -8
- package/dist/modules/Base.js.map +1 -1
- package/dist/server.d.ts +7 -0
- package/dist/server.js +10 -6
- package/dist/server.js.map +1 -1
- package/dist/services/http/files.d.ts +18 -0
- package/dist/services/http/files.js +19 -0
- package/dist/services/http/files.js.map +1 -0
- package/dist/services/http/middleware/AbstractMiddleware.d.ts +24 -7
- package/dist/services/http/middleware/AbstractMiddleware.js +28 -7
- package/dist/services/http/middleware/AbstractMiddleware.js.map +1 -1
- package/dist/services/http/middleware/Pagination.d.ts +5 -7
- package/dist/services/http/middleware/Pagination.js +22 -5
- package/dist/services/http/middleware/Pagination.js.map +1 -1
- package/dist/services/http/routing/RouteNode.d.ts +2 -1
- package/dist/services/http/routing/RouteNode.js.map +1 -1
- package/dist/services/validate/ValidateService.js +2 -2
- package/dist/services/validate/ValidateService.js.map +1 -1
- package/dist/services/validate/contentType.d.ts +18 -0
- package/dist/services/validate/contentType.js +30 -0
- package/dist/services/validate/contentType.js.map +1 -0
- package/dist/services/validate/defineSchema.d.ts +23 -0
- package/dist/services/validate/defineSchema.js +25 -0
- package/dist/services/validate/defineSchema.js.map +1 -0
- package/dist/types.d.ts +4 -0
- package/dist/types.js +5 -0
- package/dist/types.js.map +1 -0
- package/package.json +8 -4
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Auth.js","sourceRoot":"","sources":["../../src/controllers/Auth.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"Auth.js","sourceRoot":"","sources":["../../src/controllers/Auth.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,14 +9,43 @@ var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExte
|
|
|
9
9
|
import path from 'node:path';
|
|
10
10
|
import * as url from 'node:url';
|
|
11
11
|
import Base from "../modules/Base.js";
|
|
12
|
+
import AbstractMiddleware from "../services/http/middleware/AbstractMiddleware.js";
|
|
12
13
|
import { normalizeMiddlewares, } from "../services/http/routing/middlewareNormalization.js";
|
|
13
14
|
import { HTTP_METHODS } from "../services/http/routing/RouteNode.js";
|
|
14
15
|
import { createNode } from "../services/http/routing/RouteRegistry.js";
|
|
16
|
+
import { isContentTypeRequestMap, normalizeContentType, } from "../services/validate/contentType.js";
|
|
15
17
|
import ValidateService from "../services/validate/ValidateService.js";
|
|
16
18
|
/** HTTP methods valid in a controller's `routes` getter (no `'ALL'`). */
|
|
17
19
|
const ROUTE_HTTP_METHODS = new Set(HTTP_METHODS);
|
|
18
20
|
/** HTTP methods plus the `'ALL'` pseudo-verb for middleware-Map scope keys. */
|
|
19
21
|
const MAP_KEY_METHODS = new Set([...HTTP_METHODS, 'ALL']);
|
|
22
|
+
// Middleware schema reading (P1j Phase 1): prefer the static getters; the
|
|
23
|
+
// instance form is deprecated. A middleware is only instantiated when it
|
|
24
|
+
// actually overrides the deprecated instance getter — warned once per class.
|
|
25
|
+
const warnedInstanceSchema = new WeakSet();
|
|
26
|
+
function warnInstanceSchemaDeprecated(Class) {
|
|
27
|
+
if (warnedInstanceSchema.has(Class)) {
|
|
28
|
+
return;
|
|
29
|
+
}
|
|
30
|
+
warnedInstanceSchema.add(Class);
|
|
31
|
+
process.emitWarning(`Middleware "${Class.name}" declares request/query schemas via the deprecated instance getter (relatedRequestParameters / relatedQueryParameters). Switch to the static form (static get relatedRequestParameters() { ... }) — the instance form forces instantiation and will be removed in v6.`, { type: 'DeprecationWarning', code: 'ASF_DEP_MW_INSTANCE_SCHEMA' });
|
|
32
|
+
}
|
|
33
|
+
/**
|
|
34
|
+
* Does a middleware class override the deprecated instance schema getters? Walks
|
|
35
|
+
* its prototype chain (excluding `AbstractMiddleware`'s own defaults) without
|
|
36
|
+
* instantiating, so middlewares with no instance schema are never constructed.
|
|
37
|
+
*/
|
|
38
|
+
function overridesInstanceSchema(Class) {
|
|
39
|
+
let proto = Class.prototype;
|
|
40
|
+
while (proto && proto !== AbstractMiddleware.prototype) {
|
|
41
|
+
if (Object.getOwnPropertyDescriptor(proto, 'relatedRequestParameters') ||
|
|
42
|
+
Object.getOwnPropertyDescriptor(proto, 'relatedQueryParameters')) {
|
|
43
|
+
return true;
|
|
44
|
+
}
|
|
45
|
+
proto = Object.getPrototypeOf(proto);
|
|
46
|
+
}
|
|
47
|
+
return false;
|
|
48
|
+
}
|
|
20
49
|
/**
|
|
21
50
|
* Class does autoloading a http controllers
|
|
22
51
|
*/
|
|
@@ -191,13 +220,20 @@ class ControllerManager extends Base {
|
|
|
191
220
|
const original = entry.handler;
|
|
192
221
|
const app = this.app;
|
|
193
222
|
const logger = this.logger;
|
|
194
|
-
// Collect middleware-declared schemas at translation time.
|
|
223
|
+
// Collect middleware-declared schemas at translation time. Static-first (no
|
|
224
|
+
// instantiation); the instance form is deprecated and only read — via
|
|
225
|
+
// instantiation — when a middleware actually overrides it.
|
|
195
226
|
const middlewareRequestSchemas = [];
|
|
196
227
|
const middlewareQuerySchemas = [];
|
|
197
228
|
for (const mw of chain) {
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
229
|
+
let r = mw.Class.relatedRequestParameters;
|
|
230
|
+
let q = mw.Class.relatedQueryParameters;
|
|
231
|
+
if (!r && !q && overridesInstanceSchema(mw.Class)) {
|
|
232
|
+
warnInstanceSchemaDeprecated(mw.Class);
|
|
233
|
+
const inst = new mw.Class(app, mw.params ?? {});
|
|
234
|
+
r = inst.relatedRequestParameters;
|
|
235
|
+
q = inst.relatedQueryParameters;
|
|
236
|
+
}
|
|
201
237
|
if (r) {
|
|
202
238
|
middlewareRequestSchemas.push(r);
|
|
203
239
|
}
|
|
@@ -205,11 +241,25 @@ class ControllerManager extends Base {
|
|
|
205
241
|
middlewareQuerySchemas.push(q);
|
|
206
242
|
}
|
|
207
243
|
}
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
244
|
+
// Route-entry request schema: a single Standard Schema, or a content-type
|
|
245
|
+
// map resolved per-request by `Content-Type`. The map is resolved inside
|
|
246
|
+
// the request handler (it depends on the incoming header); middleware
|
|
247
|
+
// schemas are content-type-agnostic and resolved once here.
|
|
248
|
+
//
|
|
249
|
+
// The lookup table is a null-prototype object with lower-cased keys: this
|
|
250
|
+
// makes matching case-insensitive AND prevents a header like `__proto__`
|
|
251
|
+
// or `constructor` from resolving to an inherited `Object.prototype`
|
|
252
|
+
// member (which would otherwise be truthy and bypass the 415).
|
|
253
|
+
const entryRequest = entry.request;
|
|
254
|
+
let entryRequestMapLookup = null;
|
|
255
|
+
let entryRequestMapKeys = [];
|
|
256
|
+
if (isContentTypeRequestMap(entryRequest)) {
|
|
257
|
+
entryRequestMapLookup = Object.create(null);
|
|
258
|
+
entryRequestMapKeys = Object.keys(entryRequest);
|
|
259
|
+
for (const key of entryRequestMapKeys) {
|
|
260
|
+
entryRequestMapLookup[key.toLowerCase()] = entryRequest[key];
|
|
261
|
+
}
|
|
211
262
|
}
|
|
212
|
-
requestSchemas.push(...middlewareRequestSchemas);
|
|
213
263
|
const querySchemas = [];
|
|
214
264
|
if (entry.query) {
|
|
215
265
|
querySchemas.push(entry.query);
|
|
@@ -217,9 +267,32 @@ class ControllerManager extends Base {
|
|
|
217
267
|
querySchemas.push(...middlewareQuerySchemas);
|
|
218
268
|
const wrapped = async (req, res, next) => {
|
|
219
269
|
try {
|
|
270
|
+
const requestSchemas = [];
|
|
271
|
+
let resolvedContentType = null;
|
|
272
|
+
if (entryRequestMapLookup) {
|
|
273
|
+
const contentType = normalizeContentType(req.headers['content-type']);
|
|
274
|
+
const matched = contentType && Object.hasOwn(entryRequestMapLookup, contentType)
|
|
275
|
+
? entryRequestMapLookup[contentType]
|
|
276
|
+
: undefined;
|
|
277
|
+
if (!matched) {
|
|
278
|
+
return res.status(415).json({
|
|
279
|
+
message: `Unsupported Content-Type. Expected one of: ${entryRequestMapKeys.join(', ')}`,
|
|
280
|
+
});
|
|
281
|
+
}
|
|
282
|
+
requestSchemas.push(matched);
|
|
283
|
+
resolvedContentType = contentType;
|
|
284
|
+
}
|
|
285
|
+
else if (entryRequest) {
|
|
286
|
+
requestSchemas.push(entryRequest);
|
|
287
|
+
}
|
|
288
|
+
requestSchemas.push(...middlewareRequestSchemas);
|
|
220
289
|
if (requestSchemas.length > 0) {
|
|
221
290
|
const parts = await Promise.all(requestSchemas.map((s) => new ValidateService(app, s).validate(req.body, req.appInfo.i18n)));
|
|
222
291
|
req.appInfo.request = Object.assign({}, ...parts);
|
|
292
|
+
if (resolvedContentType) {
|
|
293
|
+
req.appInfo.request.contentType =
|
|
294
|
+
resolvedContentType;
|
|
295
|
+
}
|
|
223
296
|
}
|
|
224
297
|
if (querySchemas.length > 0) {
|
|
225
298
|
const parts = await Promise.all(querySchemas.map((s) => new ValidateService(app, s).validate(req.query, req.appInfo.i18n)));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/controllers/index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/controllers/index.ts"],"names":[],"mappings":"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"}
|
package/dist/helpers/logger.d.ts
CHANGED
|
@@ -1,4 +1,6 @@
|
|
|
1
|
+
import type winston from 'winston';
|
|
1
2
|
declare const levels: readonly ["error", "warn", "info", "debug"];
|
|
2
3
|
type LogLevel = (typeof levels)[number];
|
|
4
|
+
declare const noopLogger: winston.Logger;
|
|
3
5
|
declare const consoleLogger: (level: LogLevel, message: string) => void;
|
|
4
|
-
export { consoleLogger, levels };
|
|
6
|
+
export { consoleLogger, levels, noopLogger };
|
package/dist/helpers/logger.js
CHANGED
|
@@ -1,4 +1,25 @@
|
|
|
1
1
|
const levels = ['error', 'warn', 'info', 'debug'];
|
|
2
|
+
/**
|
|
3
|
+
* Silent no-op logger — satisfies the `winston.Logger` shape without
|
|
4
|
+
* constructing one (no transports, no eager init, no winston value import). Used
|
|
5
|
+
* as a non-null fallback when a real logger isn't available, e.g. `Base.logger`
|
|
6
|
+
* reached through a Mongoose model proxy. Covers the log levels + `child` the
|
|
7
|
+
* framework actually calls.
|
|
8
|
+
*/
|
|
9
|
+
const noop = () => { };
|
|
10
|
+
const noopLogger = {
|
|
11
|
+
error: noop,
|
|
12
|
+
warn: noop,
|
|
13
|
+
info: noop,
|
|
14
|
+
http: noop,
|
|
15
|
+
verbose: noop,
|
|
16
|
+
debug: noop,
|
|
17
|
+
silly: noop,
|
|
18
|
+
log: noop,
|
|
19
|
+
child() {
|
|
20
|
+
return noopLogger;
|
|
21
|
+
},
|
|
22
|
+
};
|
|
2
23
|
function isLogLevel(level) {
|
|
3
24
|
return (typeof level === 'string' &&
|
|
4
25
|
levels.includes(level));
|
|
@@ -16,5 +37,5 @@ const consoleLogger = (level, message) => {
|
|
|
16
37
|
}
|
|
17
38
|
}
|
|
18
39
|
};
|
|
19
|
-
export { consoleLogger, levels };
|
|
40
|
+
export { consoleLogger, levels, noopLogger };
|
|
20
41
|
//# sourceMappingURL=logger.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/helpers/logger.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/helpers/logger.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAU,CAAC;AAI3D;;;;;;GAMG;AACH,MAAM,IAAI,GAAG,GAAG,EAAE,GAAE,CAAC,CAAC;AACtB,MAAM,UAAU,GAAG;IACjB,KAAK,EAAE,IAAI;IACX,IAAI,EAAE,IAAI;IACV,IAAI,EAAE,IAAI;IACV,IAAI,EAAE,IAAI;IACV,OAAO,EAAE,IAAI;IACb,KAAK,EAAE,IAAI;IACX,KAAK,EAAE,IAAI;IACX,GAAG,EAAE,IAAI;IACT,KAAK;QACH,OAAO,UAAU,CAAC;IACpB,CAAC;CAC2B,CAAC;AAE/B,SAAS,UAAU,CAAC,KAAc;IAChC,OAAO,CACL,OAAO,KAAK,KAAK,QAAQ;QACxB,MAAgC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAClD,CAAC;AACJ,CAAC;AAED,MAAM,aAAa,GAAG,CAAC,KAAe,EAAE,OAAe,EAAE,EAAE;IACzD,MAAM,oBAAoB,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC5E,MAAM,iBAAiB,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAChD,MAAM,SAAS,GACb,oBAAoB,KAAK,CAAC,CAAC,IAAI,oBAAoB,IAAI,iBAAiB,CAAC;IAC3E,IAAI,SAAS,EAAE,CAAC;QACd,IAAI,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YACnB,OAAO,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC;QAC1B,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACvB,CAAC;IACH,CAAC;AACH,CAAC,CAAC;AAEF,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC"}
|
package/dist/helpers/yup.d.ts
CHANGED
|
@@ -1,7 +1,16 @@
|
|
|
1
1
|
import { Schema } from 'yup';
|
|
2
2
|
/**
|
|
3
|
-
* Validator for file
|
|
4
|
-
*
|
|
3
|
+
* Validator for an uploaded file (yup-specific).
|
|
4
|
+
*
|
|
5
|
+
* @deprecated Since 5.0.0-beta.51 — `YupFile` will be removed in v6. Validate
|
|
6
|
+
* files with the framework's vendor-neutral `File` type and your validator's
|
|
7
|
+
* `instanceof` idiom instead (no yup required):
|
|
8
|
+
*
|
|
9
|
+
* import { File } from '@adaptivestone/framework/types.js';
|
|
10
|
+
* // zod: z.instanceof(File)
|
|
11
|
+
* // valibot: v.instance(File)
|
|
12
|
+
* // yup: mixed().test('file', 'not a file', (v) => v instanceof File)
|
|
13
|
+
*
|
|
5
14
|
* @example
|
|
6
15
|
* request: yup.object().shape({
|
|
7
16
|
* someFile: new YupFile().required(),
|
package/dist/helpers/yup.js
CHANGED
|
@@ -1,8 +1,22 @@
|
|
|
1
1
|
import { PersistentFile } from 'formidable';
|
|
2
2
|
import { Schema } from 'yup';
|
|
3
|
+
// Emit the runtime deprecation notice at most once per process. Use Node's
|
|
4
|
+
// DeprecationWarning channel so consumers can silence it (`--no-deprecation`),
|
|
5
|
+
// trace it (`--trace-deprecation`), or escalate it to a thrown error
|
|
6
|
+
// (`--throw-deprecation`) without us hard-breaking anyone before v6.
|
|
7
|
+
let deprecationWarned = false;
|
|
3
8
|
/**
|
|
4
|
-
* Validator for file
|
|
5
|
-
*
|
|
9
|
+
* Validator for an uploaded file (yup-specific).
|
|
10
|
+
*
|
|
11
|
+
* @deprecated Since 5.0.0-beta.51 — `YupFile` will be removed in v6. Validate
|
|
12
|
+
* files with the framework's vendor-neutral `File` type and your validator's
|
|
13
|
+
* `instanceof` idiom instead (no yup required):
|
|
14
|
+
*
|
|
15
|
+
* import { File } from '@adaptivestone/framework/types.js';
|
|
16
|
+
* // zod: z.instanceof(File)
|
|
17
|
+
* // valibot: v.instance(File)
|
|
18
|
+
* // yup: mixed().test('file', 'not a file', (v) => v instanceof File)
|
|
19
|
+
*
|
|
6
20
|
* @example
|
|
7
21
|
* request: yup.object().shape({
|
|
8
22
|
* someFile: new YupFile().required(),
|
|
@@ -15,6 +29,10 @@ class YupFile extends Schema {
|
|
|
15
29
|
check: (value) => Array.isArray(value) &&
|
|
16
30
|
value.every((item) => item instanceof PersistentFile),
|
|
17
31
|
});
|
|
32
|
+
if (!deprecationWarned) {
|
|
33
|
+
deprecationWarned = true;
|
|
34
|
+
process.emitWarning('YupFile is deprecated and will be removed in v6. Validate uploaded files with the `File` export from "@adaptivestone/framework/types.js" and your validator\'s instanceof idiom (e.g. z.instanceof(File)).', { type: 'DeprecationWarning', code: 'ASF_DEP_YUPFILE' });
|
|
35
|
+
}
|
|
18
36
|
}
|
|
19
37
|
}
|
|
20
38
|
export { YupFile };
|
package/dist/helpers/yup.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yup.js","sourceRoot":"","sources":["../../src/helpers/yup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,EAAE,MAAM,EAAE,MAAM,KAAK,CAAC;AAE7B
|
|
1
|
+
{"version":3,"file":"yup.js","sourceRoot":"","sources":["../../src/helpers/yup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,EAAE,MAAM,EAAE,MAAM,KAAK,CAAC;AAE7B,2EAA2E;AAC3E,+EAA+E;AAC/E,qEAAqE;AACrE,qEAAqE;AACrE,IAAI,iBAAiB,GAAG,KAAK,CAAC;AAE9B;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,OAAQ,SAAQ,MAAM;IAC1B;QACE,KAAK,CAAC;YACJ,IAAI,EAAE,MAAM;YACZ,KAAK,EAAE,CAAC,KAAc,EAAE,EAAE,CACxB,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;gBACpB,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,YAAY,cAAc,CAAC;SACxD,CAAC,CAAC;QACH,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACvB,iBAAiB,GAAG,IAAI,CAAC;YACzB,OAAO,CAAC,WAAW,CACjB,4MAA4M,EAC5M,EAAE,IAAI,EAAE,oBAAoB,EAAE,IAAI,EAAE,iBAAiB,EAAE,CACxD,CAAC;QACJ,CAAC;IACH,CAAC;CACF;AAED,OAAO,EAAE,OAAO,EAAE,CAAC"}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
import { Schema } from 'mongoose';
|
|
2
|
+
import type { GetModelTypeFromClass } from '../modules/BaseModel.ts';
|
|
3
|
+
import { BaseModel } from '../modules/BaseModel.ts';
|
|
4
|
+
export type TKeyValue = GetModelTypeFromClass<typeof KeyValue>;
|
|
5
|
+
/**
|
|
6
|
+
* Simple key/value storage backed by MongoDB.
|
|
7
|
+
* Handy as a lightweight persistent cache, runtime config, feature flags, etc.
|
|
8
|
+
* The key is the document `_id` (a string); the value can be anything.
|
|
9
|
+
*/
|
|
10
|
+
declare class KeyValue extends BaseModel {
|
|
11
|
+
static get modelSchema(): {
|
|
12
|
+
readonly _id: {
|
|
13
|
+
readonly type: StringConstructor;
|
|
14
|
+
readonly required: true;
|
|
15
|
+
};
|
|
16
|
+
readonly value: {
|
|
17
|
+
readonly type: typeof Schema.Types.Mixed;
|
|
18
|
+
readonly required: true;
|
|
19
|
+
};
|
|
20
|
+
};
|
|
21
|
+
}
|
|
22
|
+
export default KeyValue;
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import { Schema } from 'mongoose';
|
|
2
|
+
import { BaseModel } from "../modules/BaseModel.js";
|
|
3
|
+
/**
|
|
4
|
+
* Simple key/value storage backed by MongoDB.
|
|
5
|
+
* Handy as a lightweight persistent cache, runtime config, feature flags, etc.
|
|
6
|
+
* The key is the document `_id` (a string); the value can be anything.
|
|
7
|
+
*/
|
|
8
|
+
class KeyValue extends BaseModel {
|
|
9
|
+
static get modelSchema() {
|
|
10
|
+
return {
|
|
11
|
+
_id: { type: String, required: true },
|
|
12
|
+
value: { type: Schema.Types.Mixed, required: true },
|
|
13
|
+
};
|
|
14
|
+
}
|
|
15
|
+
}
|
|
16
|
+
export default KeyValue;
|
|
17
|
+
//# sourceMappingURL=KeyValue.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"KeyValue.js","sourceRoot":"","sources":["../../src/models/KeyValue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAIpD;;;;GAIG;AACH,MAAM,QAAS,SAAQ,SAAS;IAC9B,MAAM,KAAK,WAAW;QACpB,OAAO;YACL,GAAG,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;YACrC,KAAK,EAAE,EAAE,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE;SAC3C,CAAC;IACb,CAAC;CACF;AAED,eAAe,QAAQ,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import type { IApp } from '../server.ts';
|
|
2
2
|
import type AbstractMiddleware from '../services/http/middleware/AbstractMiddleware.ts';
|
|
3
3
|
import type { BodyParsingMode } from '../services/http/routing/RouteNode.ts';
|
|
4
|
+
import type { RequestContentTypeMap } from '../services/validate/contentType.ts';
|
|
4
5
|
import type { StandardSchemaV1 } from '../services/validate/types.ts';
|
|
5
6
|
import Base from './Base.ts';
|
|
6
7
|
type MiddlewareWithParamsTuple = readonly [
|
|
@@ -13,7 +14,17 @@ type RouteObject = {
|
|
|
13
14
|
handler: RouteHandler;
|
|
14
15
|
description?: string;
|
|
15
16
|
middleware?: TMiddleware | null;
|
|
16
|
-
|
|
17
|
+
/**
|
|
18
|
+
* Body schema. Either a single Standard Schema (validates any body), or a
|
|
19
|
+
* content-type map (`{ 'application/json': schema, 'multipart/form-data':
|
|
20
|
+
* schema }`) validated by the request's `Content-Type` — mirrors OpenAPI's
|
|
21
|
+
* `requestBody.content`. Media-type matching is case-insensitive and ignores
|
|
22
|
+
* parameters (`; charset=...`). With a map, `req.appInfo.request` is a
|
|
23
|
+
* discriminated union keyed by a reserved `contentType` field — it holds the
|
|
24
|
+
* matched media type and overwrites any body field of the same name, so do
|
|
25
|
+
* not declare a schema field named `contentType`.
|
|
26
|
+
*/
|
|
27
|
+
request?: StandardSchemaV1 | RequestContentTypeMap | null;
|
|
17
28
|
query?: StandardSchemaV1 | null;
|
|
18
29
|
bodyParsing?: BodyParsingMode;
|
|
19
30
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractController.js","sourceRoot":"","sources":["../../src/modules/AbstractController.ts"],"names":[],"mappings":"AAEA,OAAO,IAAI,MAAM,qCAAqC,CAAC;AACvD,OAAO,cAAc,MAAM,+CAA+C,CAAC;
|
|
1
|
+
{"version":3,"file":"AbstractController.js","sourceRoot":"","sources":["../../src/modules/AbstractController.ts"],"names":[],"mappings":"AAEA,OAAO,IAAI,MAAM,qCAAqC,CAAC;AACvD,OAAO,cAAc,MAAM,+CAA+C,CAAC;AAI3E,OAAO,IAAI,MAAM,WAAW,CAAC;AAoC7B;;;;;;GAMG;AACH,MAAM,kBAAmB,SAAQ,IAAI;IACnC,MAAM,GAAG,EAAE,CAAC;IAEZ,YAAY,GAAS,EAAE,MAAc;QACnC,KAAK,CAAC,GAAG,CAAC,CAAC;QACX,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IAED;;;;;;;;;;;;;OAaG;IACH,IAAI,MAAM;QACR,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,iDAAiD,CAAC,CAAC;QACrE,OAAO,EAAE,CAAC;IACZ,CAAC;IAED;;;;;;;;;;;;OAYG;IACH,MAAM,KAAK,UAAU;QACnB,OAAO,IAAI,GAAG,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1D,CAAC;IAED;;OAEG;IACH,kBAAkB;QAChB,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAChB,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,IAClE,IAAI,CAAC,WAAW,CAAC,IACnB,EAAE,CAAC;QACL,CAAC;QACD,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;IAC/B,CAAC;IAED;;OAEG;IACH,WAAW;QACT,OAAO,IAAI,IAAI,CAAC,kBAAkB,EAAE,CAAC,WAAW,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAC1E,CAAC;IAED,MAAM,KAAK,WAAW;QACpB,OAAO,YAAY,CAAC;IACtB,CAAC;CACF;AAED,eAAe,kBAAkB,CAAC"}
|
package/dist/modules/Base.d.ts
CHANGED
|
@@ -11,7 +11,7 @@ declare class Base {
|
|
|
11
11
|
/**
|
|
12
12
|
* Optimzation to lazy load logger. It will be inited only on request
|
|
13
13
|
*/
|
|
14
|
-
get logger(): winston.Logger
|
|
14
|
+
get logger(): winston.Logger;
|
|
15
15
|
/**
|
|
16
16
|
* Get winston loger for given label
|
|
17
17
|
* @param {string} label name of logger
|
package/dist/modules/Base.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { getFilesPathWithInheritance } from "../helpers/files.js";
|
|
2
|
-
import { consoleLogger } from "../helpers/logger.js";
|
|
2
|
+
import { consoleLogger, noopLogger } from "../helpers/logger.js";
|
|
3
3
|
class Base {
|
|
4
4
|
#realLogger = null;
|
|
5
5
|
app;
|
|
@@ -16,19 +16,23 @@ class Base {
|
|
|
16
16
|
* Optimzation to lazy load logger. It will be inited only on request
|
|
17
17
|
*/
|
|
18
18
|
get logger() {
|
|
19
|
-
let
|
|
19
|
+
let current;
|
|
20
20
|
try {
|
|
21
|
-
|
|
21
|
+
current = this.#realLogger;
|
|
22
22
|
}
|
|
23
23
|
catch {
|
|
24
|
-
|
|
25
|
-
|
|
24
|
+
// `this` is not a real `Base` instance (private field read threw) — e.g.
|
|
25
|
+
// accessed through a model proxy. Warn (every access, as before) and
|
|
26
|
+
// return the no-op logger so callers never get null.
|
|
27
|
+
console.warn('logger accessed outside a Base instance (e.g. a model proxy); using a no-op logger — logs from this context are dropped. This can be ok for models.');
|
|
28
|
+
return noopLogger;
|
|
26
29
|
}
|
|
27
|
-
if (!
|
|
30
|
+
if (!current) {
|
|
28
31
|
const { loggerGroup } = this.constructor;
|
|
29
|
-
|
|
32
|
+
current = this.getLogger(loggerGroup + this.getConstructorName());
|
|
33
|
+
this.#realLogger = current;
|
|
30
34
|
}
|
|
31
|
-
return
|
|
35
|
+
return current;
|
|
32
36
|
}
|
|
33
37
|
/**
|
|
34
38
|
* Get winston loger for given label
|
package/dist/modules/Base.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Base.js","sourceRoot":"","sources":["../../src/modules/Base.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,2BAA2B,EAAE,MAAM,qBAAqB,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"Base.js","sourceRoot":"","sources":["../../src/modules/Base.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,2BAA2B,EAAE,MAAM,qBAAqB,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAGjE,MAAM,IAAI;IACR,WAAW,GAA0B,IAAI,CAAC;IAE1C,GAAG,CAAO;IAEV,YAAY,GAAS;QACnB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;IACjB,CAAC;IAED;;OAEG;IACH,kBAAkB;QAChB,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;IAC/B,CAAC;IAED;;OAEG;IACH,IAAI,MAAM;QACR,IAAI,OAA8B,CAAC;QACnC,IAAI,CAAC;YACH,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC;QAC7B,CAAC;QAAC,MAAM,CAAC;YACP,yEAAyE;YACzE,qEAAqE;YACrE,qDAAqD;YACrD,OAAO,CAAC,IAAI,CACV,qJAAqJ,CACtJ,CAAC;YACF,OAAO,UAAU,CAAC;QACpB,CAAC;QAED,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC,WAA0B,CAAC;YACxD,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,WAAW,GAAG,IAAI,CAAC,kBAAkB,EAAE,CAAC,CAAC;YAClE,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC;QAC7B,CAAC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IAED;;;OAGG;IACH,SAAS,CAAC,KAAa;QACrB,OAAO,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;IAC1C,CAAC;IAED,KAAK,CAAC,2BAA2B,CAC/B,cAAsB,EACtB,cAAsB,EACtB,iBAAiB,GAAG,KAAK;QAEzB,MAAM,MAAM,GAAG,iBAAiB;YAC9B,CAAC,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC,CAAC;YACzC,CAAC,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;QAC3C,OAAO,2BAA2B,CAAC;YACjC,cAAc;YACd,cAAc;YACd,MAAM;SACP,CAAC,CAAC;IACL,CAAC;IAED;;OAEG;IACH,MAAM,KAAK,WAAW;QACpB,OAAO,wBAAwB,CAAC;IAClC,CAAC;CACF;AAED,eAAe,IAAI,CAAC"}
|
package/dist/server.d.ts
CHANGED
|
@@ -10,6 +10,13 @@ import type HttpServer from './services/http/HttpServer.ts';
|
|
|
10
10
|
import type { I18n } from './services/i18n/I18n.ts';
|
|
11
11
|
interface AppCache {
|
|
12
12
|
configs: Map<string, unknown>;
|
|
13
|
+
/**
|
|
14
|
+
* Per-config-name source file paths, post-inheritance: `{ default, [env] }`.
|
|
15
|
+
* Kept alongside the merged `configs` values so codegen can emit `getConfig`
|
|
16
|
+
* types as references to the config modules' shapes instead of serializing
|
|
17
|
+
* live values (which leaks secrets / drops env-only fields).
|
|
18
|
+
*/
|
|
19
|
+
configPaths: Map<string, Record<string, string>>;
|
|
13
20
|
models: Map<string, AbstractModel['mongooseModel'] | TBaseModel>;
|
|
14
21
|
modelConstructors: Map<string, typeof AbstractModel | typeof BaseModel>;
|
|
15
22
|
modelPaths: {
|
package/dist/server.js
CHANGED
|
@@ -36,6 +36,7 @@ class Server {
|
|
|
36
36
|
config;
|
|
37
37
|
cache = {
|
|
38
38
|
configs: new Map(),
|
|
39
|
+
configPaths: new Map(),
|
|
39
40
|
models: new Map(),
|
|
40
41
|
modelConstructors: new Map(),
|
|
41
42
|
modelPaths: [],
|
|
@@ -143,7 +144,7 @@ class Server {
|
|
|
143
144
|
mongoose.set('strictQuery', true);
|
|
144
145
|
if (!mongoose.connection.readyState) {
|
|
145
146
|
this.app.events.on('shutdown', async () => {
|
|
146
|
-
this.app.logger
|
|
147
|
+
this.app.logger.verbose('Shutdown was called. Closing all mongoose connections');
|
|
147
148
|
for (const c of mongoose.connections) {
|
|
148
149
|
c.close(true);
|
|
149
150
|
}
|
|
@@ -154,7 +155,7 @@ class Server {
|
|
|
154
155
|
if (process.env.MONGO_APP_NAME.length >= 64) {
|
|
155
156
|
// https://github.com/mongodb/specifications/blob/master/source/mongodb-handshake/handshake.md?plain=1#L460
|
|
156
157
|
// all metadata 512 and app name 128, better to keep as low as possible
|
|
157
|
-
this.app.logger
|
|
158
|
+
this.app.logger.error(`Mongo connection MONGO_APP_NAME mare then 64 symbols. This is a limitation of mogno driver. Ignoring it ${process.env.MONGO_APP_NAME}`);
|
|
158
159
|
}
|
|
159
160
|
else {
|
|
160
161
|
connectionParams.appName = process.env.MONGO_APP_NAME;
|
|
@@ -163,13 +164,13 @@ class Server {
|
|
|
163
164
|
mongoose
|
|
164
165
|
.connect(this.app.getConfig('mongo').connectionString, connectionParams)
|
|
165
166
|
.then(() => {
|
|
166
|
-
this.app.logger
|
|
167
|
+
this.app.logger.info(`Mongo connection success ${connectionParams.appName}`);
|
|
167
168
|
mongoose.connection.on('error', (err) => {
|
|
168
|
-
this.app.logger
|
|
169
|
+
this.app.logger.error('Mongo connection error', err);
|
|
169
170
|
console.error(err);
|
|
170
171
|
});
|
|
171
172
|
}, (error) => {
|
|
172
|
-
this.app.logger
|
|
173
|
+
this.app.logger.error("Can't install mongodb connection", error);
|
|
173
174
|
});
|
|
174
175
|
}
|
|
175
176
|
}
|
|
@@ -196,7 +197,7 @@ class Server {
|
|
|
196
197
|
this.cache.models.set(modelName, model);
|
|
197
198
|
}
|
|
198
199
|
else {
|
|
199
|
-
this.app.logger
|
|
200
|
+
this.app.logger.warn(`Model ${modelName} is old type model. Please update it to BaseModel`);
|
|
200
201
|
const model = new ModelConstructor(this.app);
|
|
201
202
|
this.cache.models.set(modelName, model.mongooseModel);
|
|
202
203
|
}
|
|
@@ -257,6 +258,9 @@ class Server {
|
|
|
257
258
|
};
|
|
258
259
|
const loadingPromises = [];
|
|
259
260
|
for (const [configFile, value] of Object.entries(configFiles)) {
|
|
261
|
+
// Retain the resolved source paths for codegen (type references, not
|
|
262
|
+
// serialized values). Runtime reads merged values from `cache.configs`.
|
|
263
|
+
this.cache.configPaths.set(configFile, value);
|
|
260
264
|
loadingPromises.push(loadConfig(configFile, value));
|
|
261
265
|
}
|
|
262
266
|
const configs = await Promise.all(loadingPromises);
|