@adaptivestone/framework 5.0.0-beta.45 → 5.0.0-beta.48
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 +27 -0
- 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 +39 -0
- package/dist/codegen/collectMetadata.js +59 -0
- package/dist/codegen/collectMetadata.js.map +1 -0
- package/dist/codegen/emit.d.ts +29 -0
- package/dist/codegen/emit.js +247 -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/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 +7 -29
- package/dist/modules/AbstractController.js +1 -253
- package/dist/modules/AbstractController.js.map +1 -1
- package/dist/server.d.ts +0 -1
- package/dist/server.js +11 -1
- package/dist/server.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/middleware/Pagination.d.ts +1 -0
- package/dist/services/http/middleware/Pagination.js +3 -0
- package/dist/services/http/middleware/Pagination.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/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/testHelpers.d.ts +18 -16
- package/package.json +17 -8
- 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
|
@@ -9,8 +9,16 @@ 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 { normalizeMiddlewares, } from "../services/http/routing/middlewareNormalization.js";
|
|
13
|
+
import { HTTP_METHODS } from "../services/http/routing/RouteNode.js";
|
|
14
|
+
import { createNode } from "../services/http/routing/RouteRegistry.js";
|
|
15
|
+
import ValidateService from "../services/validate/ValidateService.js";
|
|
16
|
+
/** HTTP methods valid in a controller's `routes` getter (no `'ALL'`). */
|
|
17
|
+
const ROUTE_HTTP_METHODS = new Set(HTTP_METHODS);
|
|
18
|
+
/** HTTP methods plus the `'ALL'` pseudo-verb for middleware-Map scope keys. */
|
|
19
|
+
const MAP_KEY_METHODS = new Set([...HTTP_METHODS, 'ALL']);
|
|
12
20
|
/**
|
|
13
|
-
* Class
|
|
21
|
+
* Class does autoloading a http controllers
|
|
14
22
|
*/
|
|
15
23
|
class ControllerManager extends Base {
|
|
16
24
|
controllers;
|
|
@@ -19,9 +27,49 @@ class ControllerManager extends Base {
|
|
|
19
27
|
this.controllers = {};
|
|
20
28
|
}
|
|
21
29
|
/**
|
|
22
|
-
*
|
|
30
|
+
* Register a controller explicitly. Returns the constructed instance.
|
|
31
|
+
* Builds a `RouteNode` subtree from the controller's `routes` getter and
|
|
32
|
+
* `static middleware` Map, wraps handlers with validation, and registers
|
|
33
|
+
* with the `RouteRegistry`. For late registration (after `startServer`
|
|
34
|
+
* finishes) use `Server.startServer`'s `callbackBefore404` hook.
|
|
23
35
|
*/
|
|
24
|
-
|
|
36
|
+
registerController(ControllerClass, prefix = '', options = {}) {
|
|
37
|
+
const name = ControllerClass.name.toLowerCase();
|
|
38
|
+
const key = prefix ? `${prefix}/${name}` : name;
|
|
39
|
+
const instance = new ControllerClass(this.app, prefix);
|
|
40
|
+
this.controllers[key] = instance;
|
|
41
|
+
const registry = this.app.httpServer?.routeRegistry;
|
|
42
|
+
if (!registry) {
|
|
43
|
+
this.logger?.warn(`RouteRegistry not available; controller ${key} not registered with the new routing.`);
|
|
44
|
+
return instance;
|
|
45
|
+
}
|
|
46
|
+
const source = {
|
|
47
|
+
kind: 'package',
|
|
48
|
+
spec: `<${ControllerClass.name}>`,
|
|
49
|
+
};
|
|
50
|
+
const subtree = this.#buildSubtree(instance, source);
|
|
51
|
+
// `skipWrap` is the codegen escape hatch — we only need the tree
|
|
52
|
+
// structure to emit types, not the runtime validation wrappers.
|
|
53
|
+
// Wrapping instantiates every middleware in every handler's chain
|
|
54
|
+
// to read schemas, which side-effects (Redis clients, timers, etc.)
|
|
55
|
+
// and keeps the event loop open for codegen-only runs.
|
|
56
|
+
if (!options.skipWrap) {
|
|
57
|
+
this.#wrapHandlersInSubtree(subtree, []);
|
|
58
|
+
}
|
|
59
|
+
registry.registerSubtree(instance.getHttpPath(), subtree);
|
|
60
|
+
return instance;
|
|
61
|
+
}
|
|
62
|
+
/**
|
|
63
|
+
* Auto-load controllers from the framework's internal folder and the user's
|
|
64
|
+
* external folder, then register each one. User overrides win when filenames
|
|
65
|
+
* collide (handled by `getFilesPathWithInheritance`).
|
|
66
|
+
*
|
|
67
|
+
* `options.skipWrap` (codegen-only): build the registry tree without
|
|
68
|
+
* wrapping handlers with validation. Skips middleware instantiation —
|
|
69
|
+
* which avoids side effects (Redis clients, timers) in introspection
|
|
70
|
+
* commands like `generatetypes`.
|
|
71
|
+
*/
|
|
72
|
+
async initControllers(options = {}) {
|
|
25
73
|
const dirname = url.fileURLToPath(new URL('.', import.meta.url));
|
|
26
74
|
const controllersToLoad = await this.getFilesPathWithInheritance(dirname, this.app.foldersConfig.controllers);
|
|
27
75
|
controllersToLoad.sort((a, b) => {
|
|
@@ -38,22 +86,321 @@ class ControllerManager extends Base {
|
|
|
38
86
|
const controllers = [];
|
|
39
87
|
for (const controller of controllersToLoad) {
|
|
40
88
|
controllers.push(import(__rewriteRelativeImportExtension(controller.path)).then(({ default: ControllerModule }) => {
|
|
41
|
-
const contollerName = ControllerModule.name.toLowerCase();
|
|
42
89
|
let prefix = path.dirname(controller.file);
|
|
43
90
|
if (prefix === '.') {
|
|
44
91
|
prefix = '';
|
|
45
92
|
}
|
|
46
|
-
|
|
47
|
-
? `${prefix}/${contollerName}`
|
|
48
|
-
: contollerName;
|
|
49
|
-
this.controllers[controllePath] = new ControllerModule(this.app, prefix);
|
|
93
|
+
this.registerController(ControllerModule, prefix, options);
|
|
50
94
|
}));
|
|
51
95
|
}
|
|
52
96
|
await Promise.all(controllers);
|
|
53
97
|
}
|
|
98
|
+
/**
|
|
99
|
+
* Build a `RouteNode` subtree for one controller — walks `routes` getter,
|
|
100
|
+
* places handlers in the tree, then attaches the `static middleware` Map
|
|
101
|
+
* entries to the right tree positions. Path syntax conversion: user-facing
|
|
102
|
+
* `{*splat}` → internal `*splat`. Map scope keys: `'METHOD/path'`,
|
|
103
|
+
* `'ALL/path'`, `'/path'`.
|
|
104
|
+
*/
|
|
105
|
+
#buildSubtree(controller, source) {
|
|
106
|
+
const subtree = createNode('');
|
|
107
|
+
const ctrlName = controller.constructor.name;
|
|
108
|
+
// 1. Routes first — handlers placed in the tree before middleware
|
|
109
|
+
// attachments look for them.
|
|
110
|
+
const routes = controller.routes;
|
|
111
|
+
if (routes && typeof routes === 'object') {
|
|
112
|
+
for (const [verb, routeMap] of Object.entries(routes)) {
|
|
113
|
+
if (!routeMap || typeof routeMap !== 'object') {
|
|
114
|
+
continue;
|
|
115
|
+
}
|
|
116
|
+
const upperVerb = verb.toUpperCase();
|
|
117
|
+
if (!ROUTE_HTTP_METHODS.has(upperVerb)) {
|
|
118
|
+
this.logger?.warn(`Controller ${ctrlName}: unknown verb '${verb}' in routes getter (expected one of: ${[...ROUTE_HTTP_METHODS].join(', ').toLowerCase()}). Routes under this verb will never match.`);
|
|
119
|
+
continue;
|
|
120
|
+
}
|
|
121
|
+
for (const [pathKey, routeSpec] of Object.entries(routeMap)) {
|
|
122
|
+
const entry = buildHandlerEntry(routeSpec, controller, source);
|
|
123
|
+
if (!entry) {
|
|
124
|
+
// Object spec but no callable `handler` field — a common
|
|
125
|
+
// misconfiguration (e.g., `{ request: schema }` without a
|
|
126
|
+
// handler). Warn and skip; the old framework also rejected
|
|
127
|
+
// these with a 500 at request time.
|
|
128
|
+
if (routeSpec !== null &&
|
|
129
|
+
typeof routeSpec === 'object' &&
|
|
130
|
+
typeof routeSpec.handler !== 'function') {
|
|
131
|
+
this.logger?.warn(`Controller ${ctrlName}: route ${upperVerb} ${pathKey} has no \`handler\` function. Skipping.`);
|
|
132
|
+
}
|
|
133
|
+
continue;
|
|
134
|
+
}
|
|
135
|
+
attachHandler(subtree, upperVerb, convertPathSyntax(pathKey), entry);
|
|
136
|
+
}
|
|
137
|
+
}
|
|
138
|
+
}
|
|
139
|
+
// 2. Middleware Map — attach to nodes / per-handler.
|
|
140
|
+
// `static get middleware()` lives on the class; instance.constructor
|
|
141
|
+
// types as `Function`, so cast to read the static member.
|
|
142
|
+
const ControllerClass = controller.constructor;
|
|
143
|
+
const mwMap = ControllerClass.middleware;
|
|
144
|
+
if (mwMap instanceof Map) {
|
|
145
|
+
for (const [scopeKey, mwList] of mwMap) {
|
|
146
|
+
if (typeof scopeKey !== 'string') {
|
|
147
|
+
this.logger?.warn(`Controller ${ctrlName}: middleware Map key is not a string (got ${typeof scopeKey}). Skipping.`);
|
|
148
|
+
continue;
|
|
149
|
+
}
|
|
150
|
+
if (!Array.isArray(mwList) || mwList.length === 0) {
|
|
151
|
+
continue;
|
|
152
|
+
}
|
|
153
|
+
const parsed = parseScopeKey(scopeKey);
|
|
154
|
+
if (parsed.unknownMethod) {
|
|
155
|
+
this.logger?.warn(`Controller ${ctrlName}: middleware Map key '${scopeKey}' has unknown method prefix '${parsed.unknownMethod}'. Treating the whole key as a path. Expected method prefix is one of: ${[...MAP_KEY_METHODS].join(', ')}.`);
|
|
156
|
+
}
|
|
157
|
+
const entries = normalizeMiddlewares(mwList, source);
|
|
158
|
+
attachMiddlewares(subtree, parsed.method, convertPathSyntax(parsed.path), entries);
|
|
159
|
+
}
|
|
160
|
+
}
|
|
161
|
+
return subtree;
|
|
162
|
+
}
|
|
163
|
+
/**
|
|
164
|
+
* Walk the subtree depth-first, accumulating middleware as we descend.
|
|
165
|
+
* For each handler, wrap with validation that merges route schemas +
|
|
166
|
+
* schemas declared by middlewares in the chain (`relatedRequestParameters`
|
|
167
|
+
* / `relatedQueryParameters`).
|
|
168
|
+
*/
|
|
169
|
+
#wrapHandlersInSubtree(node, accumulated) {
|
|
170
|
+
const chain = [...accumulated, ...node.middlewares];
|
|
171
|
+
if (node.methods) {
|
|
172
|
+
for (const method of Object.keys(node.methods)) {
|
|
173
|
+
const entry = node.methods[method];
|
|
174
|
+
if (entry) {
|
|
175
|
+
const fullChain = [...chain, ...(entry.middlewares ?? [])];
|
|
176
|
+
this.#wrapHandlerEntry(entry, fullChain);
|
|
177
|
+
}
|
|
178
|
+
}
|
|
179
|
+
}
|
|
180
|
+
for (const child of node.children.values()) {
|
|
181
|
+
this.#wrapHandlersInSubtree(child, chain);
|
|
182
|
+
}
|
|
183
|
+
if (node.paramChild) {
|
|
184
|
+
this.#wrapHandlersInSubtree(node.paramChild, chain);
|
|
185
|
+
}
|
|
186
|
+
if (node.splatChild) {
|
|
187
|
+
this.#wrapHandlersInSubtree(node.splatChild, chain);
|
|
188
|
+
}
|
|
189
|
+
}
|
|
190
|
+
#wrapHandlerEntry(entry, chain) {
|
|
191
|
+
const original = entry.handler;
|
|
192
|
+
const app = this.app;
|
|
193
|
+
const logger = this.logger;
|
|
194
|
+
// Collect middleware-declared schemas at translation time.
|
|
195
|
+
const middlewareRequestSchemas = [];
|
|
196
|
+
const middlewareQuerySchemas = [];
|
|
197
|
+
for (const mw of chain) {
|
|
198
|
+
const inst = new mw.Class(app, mw.params ?? {});
|
|
199
|
+
const r = inst.relatedReqParameters?.request;
|
|
200
|
+
const q = inst.relatedReqParameters?.query;
|
|
201
|
+
if (r) {
|
|
202
|
+
middlewareRequestSchemas.push(r);
|
|
203
|
+
}
|
|
204
|
+
if (q) {
|
|
205
|
+
middlewareQuerySchemas.push(q);
|
|
206
|
+
}
|
|
207
|
+
}
|
|
208
|
+
const requestSchemas = [];
|
|
209
|
+
if (entry.request) {
|
|
210
|
+
requestSchemas.push(entry.request);
|
|
211
|
+
}
|
|
212
|
+
requestSchemas.push(...middlewareRequestSchemas);
|
|
213
|
+
const querySchemas = [];
|
|
214
|
+
if (entry.query) {
|
|
215
|
+
querySchemas.push(entry.query);
|
|
216
|
+
}
|
|
217
|
+
querySchemas.push(...middlewareQuerySchemas);
|
|
218
|
+
const wrapped = async (req, res, next) => {
|
|
219
|
+
try {
|
|
220
|
+
if (requestSchemas.length > 0) {
|
|
221
|
+
const parts = await Promise.all(requestSchemas.map((s) => new ValidateService(app, s).validate(req.body, req.appInfo.i18n)));
|
|
222
|
+
req.appInfo.request = Object.assign({}, ...parts);
|
|
223
|
+
}
|
|
224
|
+
if (querySchemas.length > 0) {
|
|
225
|
+
const parts = await Promise.all(querySchemas.map((s) => new ValidateService(app, s).validate(req.query, req.appInfo.i18n)));
|
|
226
|
+
req.appInfo.query = Object.assign({}, ...parts);
|
|
227
|
+
}
|
|
228
|
+
}
|
|
229
|
+
catch (err) {
|
|
230
|
+
return res.status(400).json({
|
|
231
|
+
errors: err instanceof Error ? err.message : String(err),
|
|
232
|
+
});
|
|
233
|
+
}
|
|
234
|
+
try {
|
|
235
|
+
return await Promise.resolve(original(req, res, next));
|
|
236
|
+
}
|
|
237
|
+
catch (err) {
|
|
238
|
+
logger?.error(err);
|
|
239
|
+
return res.status(500).json({
|
|
240
|
+
message: 'Platform error. Please check later or contact support',
|
|
241
|
+
});
|
|
242
|
+
}
|
|
243
|
+
};
|
|
244
|
+
entry.handler = wrapped;
|
|
245
|
+
}
|
|
54
246
|
static get loggerGroup() {
|
|
55
247
|
return 'controller';
|
|
56
248
|
}
|
|
57
249
|
}
|
|
250
|
+
// ─── translation helpers (file-local) ────────────────────────────────
|
|
251
|
+
/**
|
|
252
|
+
* `'POST/login'` → method=POST,path=/login · `'/login'` → method=ALL,path=/login
|
|
253
|
+
*
|
|
254
|
+
* When the key looks like `METHOD/path` but the method isn't recognized
|
|
255
|
+
* (likely a typo, e.g., `'PATC/login'`), returns `unknownMethod` so the
|
|
256
|
+
* caller can warn instead of silently treating the whole key as a path.
|
|
257
|
+
*/
|
|
258
|
+
function parseScopeKey(key) {
|
|
259
|
+
if (key.startsWith('/')) {
|
|
260
|
+
return { method: 'ALL', path: key };
|
|
261
|
+
}
|
|
262
|
+
const slashIdx = key.indexOf('/');
|
|
263
|
+
if (slashIdx === -1) {
|
|
264
|
+
return { method: 'ALL', path: `/${key}` };
|
|
265
|
+
}
|
|
266
|
+
const candidate = key.slice(0, slashIdx).toUpperCase();
|
|
267
|
+
if (MAP_KEY_METHODS.has(candidate)) {
|
|
268
|
+
return {
|
|
269
|
+
method: candidate,
|
|
270
|
+
path: key.slice(slashIdx),
|
|
271
|
+
};
|
|
272
|
+
}
|
|
273
|
+
return { method: 'ALL', path: `/${key}`, unknownMethod: candidate };
|
|
274
|
+
}
|
|
275
|
+
/** `{*splat}` → `*splat`. Other syntax stays as-is. */
|
|
276
|
+
function convertPathSyntax(p) {
|
|
277
|
+
return p.replace(/\{\*([a-zA-Z_][a-zA-Z0-9_]*)\}/g, '*$1');
|
|
278
|
+
}
|
|
279
|
+
function buildHandlerEntry(spec, controller, source) {
|
|
280
|
+
if (typeof spec === 'function') {
|
|
281
|
+
return {
|
|
282
|
+
handler: spec.bind(controller),
|
|
283
|
+
meta: { methodName: spec.name || undefined },
|
|
284
|
+
};
|
|
285
|
+
}
|
|
286
|
+
if (typeof spec !== 'object' || spec === null) {
|
|
287
|
+
return null;
|
|
288
|
+
}
|
|
289
|
+
const obj = spec;
|
|
290
|
+
if (typeof obj.handler !== 'function') {
|
|
291
|
+
return null;
|
|
292
|
+
}
|
|
293
|
+
const handlerName = obj.handler.name;
|
|
294
|
+
const entry = {
|
|
295
|
+
// biome-ignore lint/complexity/noBannedTypes: handler is a user-provided callable
|
|
296
|
+
handler: obj.handler.bind(controller),
|
|
297
|
+
meta: { methodName: handlerName || undefined },
|
|
298
|
+
};
|
|
299
|
+
if (obj.request != null) {
|
|
300
|
+
// biome-ignore lint/suspicious/noExplicitAny: Standard Schema validator passthrough
|
|
301
|
+
entry.request = obj.request;
|
|
302
|
+
}
|
|
303
|
+
if (obj.query != null) {
|
|
304
|
+
// biome-ignore lint/suspicious/noExplicitAny: Standard Schema validator passthrough
|
|
305
|
+
entry.query = obj.query;
|
|
306
|
+
}
|
|
307
|
+
if (obj.bodyParsing) {
|
|
308
|
+
entry.bodyParsing = obj.bodyParsing;
|
|
309
|
+
}
|
|
310
|
+
if (Array.isArray(obj.middleware) && obj.middleware.length > 0) {
|
|
311
|
+
entry.middlewares = normalizeMiddlewares(obj.middleware, source);
|
|
312
|
+
}
|
|
313
|
+
return entry;
|
|
314
|
+
}
|
|
315
|
+
function attachHandler(subtree, method, pathStr, entry) {
|
|
316
|
+
const target = walkToNode(subtree, pathStr);
|
|
317
|
+
if (!target.methods) {
|
|
318
|
+
target.methods = {};
|
|
319
|
+
}
|
|
320
|
+
if (target.methods[method]) {
|
|
321
|
+
throw new Error(`ControllerManager: duplicate handler for ${method} ${pathStr}`);
|
|
322
|
+
}
|
|
323
|
+
target.methods[method] = entry;
|
|
324
|
+
}
|
|
325
|
+
/**
|
|
326
|
+
* Attach middlewares to the right tree position.
|
|
327
|
+
*
|
|
328
|
+
* - `ALL` + path → node-level middlewares (apply to all methods at the
|
|
329
|
+
* path + descendants via walk).
|
|
330
|
+
* - `METHOD` + specific path → prepend to the handler's middleware list
|
|
331
|
+
* so they run before any route-level middlewares.
|
|
332
|
+
* - `METHOD` + splat (e.g. `'PUT/{*splat}'`) → walk the subtree at the
|
|
333
|
+
* splat's parent and attach to every handler that matches the method.
|
|
334
|
+
*/
|
|
335
|
+
function attachMiddlewares(subtree, method, pathStr, entries) {
|
|
336
|
+
const segments = pathStr.split('/').filter((s) => s.length > 0);
|
|
337
|
+
const hasSplat = segments.length > 0 && segments[segments.length - 1]?.startsWith('*');
|
|
338
|
+
if (hasSplat) {
|
|
339
|
+
segments.pop();
|
|
340
|
+
}
|
|
341
|
+
let target = subtree;
|
|
342
|
+
for (const seg of segments) {
|
|
343
|
+
target = ensureChildSegment(target, seg);
|
|
344
|
+
}
|
|
345
|
+
if (method === 'ALL') {
|
|
346
|
+
target.middlewares.push(...entries);
|
|
347
|
+
return;
|
|
348
|
+
}
|
|
349
|
+
if (hasSplat) {
|
|
350
|
+
attachToMethodHandlers(target, method, entries);
|
|
351
|
+
return;
|
|
352
|
+
}
|
|
353
|
+
const existingHandler = target.methods?.[method];
|
|
354
|
+
if (existingHandler) {
|
|
355
|
+
existingHandler.middlewares = [
|
|
356
|
+
...entries,
|
|
357
|
+
...(existingHandler.middlewares ?? []),
|
|
358
|
+
];
|
|
359
|
+
}
|
|
360
|
+
}
|
|
361
|
+
/** Walk a subtree, attaching mws to every handler that matches `method`. */
|
|
362
|
+
function attachToMethodHandlers(node, method, entries) {
|
|
363
|
+
const handler = node.methods?.[method];
|
|
364
|
+
if (handler) {
|
|
365
|
+
handler.middlewares = [...entries, ...(handler.middlewares ?? [])];
|
|
366
|
+
}
|
|
367
|
+
for (const child of node.children.values()) {
|
|
368
|
+
attachToMethodHandlers(child, method, entries);
|
|
369
|
+
}
|
|
370
|
+
if (node.paramChild) {
|
|
371
|
+
attachToMethodHandlers(node.paramChild, method, entries);
|
|
372
|
+
}
|
|
373
|
+
if (node.splatChild) {
|
|
374
|
+
attachToMethodHandlers(node.splatChild, method, entries);
|
|
375
|
+
}
|
|
376
|
+
}
|
|
377
|
+
function walkToNode(subtree, pathStr) {
|
|
378
|
+
const segments = pathStr.split('/').filter((s) => s.length > 0);
|
|
379
|
+
let target = subtree;
|
|
380
|
+
for (const seg of segments) {
|
|
381
|
+
target = ensureChildSegment(target, seg);
|
|
382
|
+
}
|
|
383
|
+
return target;
|
|
384
|
+
}
|
|
385
|
+
function ensureChildSegment(node, segment) {
|
|
386
|
+
if (segment.startsWith(':')) {
|
|
387
|
+
if (!node.paramChild) {
|
|
388
|
+
node.paramChild = createNode(segment);
|
|
389
|
+
}
|
|
390
|
+
return node.paramChild;
|
|
391
|
+
}
|
|
392
|
+
if (segment.startsWith('*')) {
|
|
393
|
+
if (!node.splatChild) {
|
|
394
|
+
node.splatChild = createNode(segment);
|
|
395
|
+
}
|
|
396
|
+
return node.splatChild;
|
|
397
|
+
}
|
|
398
|
+
let child = node.children.get(segment);
|
|
399
|
+
if (!child) {
|
|
400
|
+
child = createNode(segment);
|
|
401
|
+
node.children.set(segment, child);
|
|
402
|
+
}
|
|
403
|
+
return child;
|
|
404
|
+
}
|
|
58
405
|
export default ControllerManager;
|
|
59
406
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/controllers/index.ts"],"names":[],"mappings":";;;;;;;;AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,KAAK,GAAG,MAAM,UAAU,CAAC;AAEhC,OAAO,IAAI,MAAM,oBAAoB,CAAC;AAGtC;;GAEG;AACH,MAAM,iBAAkB,SAAQ,IAAI;IAClC,WAAW,CAAqC;IAChD,YAAY,GAAS;QACnB,KAAK,CAAC,GAAG,CAAC,CAAC;QACX,IAAI,CAAC,WAAW,GAAG,EAAE,CAAC;IACxB,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,eAAe;QACnB,MAAM,OAAO,GAAG,GAAG,CAAC,aAAa,CAAC,IAAI,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QACjE,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,2BAA2B,CAC9D,OAAO,EACP,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,WAAW,CACnC,CAAC;QAEF,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;YAC9B,IACE,CAAC,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,UAAU,CAAC;gBACzC,CAAC,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,UAAU,CAAC,EACzC,CAAC;gBACD,IACE,CAAC,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,UAAU,CAAC;oBACzC,CAAC,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,UAAU,CAAC,EACzC,CAAC;oBACD,OAAO,CAAC,CAAC;gBACX,CAAC;gBACD,OAAO,CAAC,CAAC,CAAC;YACZ,CAAC;YACD,OAAO,CAAC,CAAC;QACX,CAAC,CAAC,CAAC;QACH,MAAM,WAAW,GAAG,EAAE,CAAC;QACvB,KAAK,MAAM,UAAU,IAAI,iBAAiB,EAAE,CAAC;YAC3C,WAAW,CAAC,IAAI,CACd,MAAM,kCAAC,UAAU,CAAC,IAAI,EAAC,CAAC,IAAI,CAAC,CAAC,EAAE,OAAO,EAAE,gBAAgB,EAAE,EAAE,EAAE;gBAC7D,MAAM,aAAa,GAAG,gBAAgB,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;gBAC1D,IAAI,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;gBAC3C,IAAI,MAAM,KAAK,GAAG,EAAE,CAAC;oBACnB,MAAM,GAAG,EAAE,CAAC;gBACd,CAAC;gBACD,MAAM,aAAa,GAAG,MAAM;oBAC1B,CAAC,CAAC,GAAG,MAAM,IAAI,aAAa,EAAE;oBAC9B,CAAC,CAAC,aAAa,CAAC;gBAClB,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,GAAG,IAAI,gBAAgB,CACpD,IAAI,CAAC,GAAG,EACR,MAAM,CACP,CAAC;YACJ,CAAC,CAAC,CACH,CAAC;QACJ,CAAC;QACD,MAAM,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IACjC,CAAC;IAED,MAAM,KAAK,WAAW;QACpB,OAAO,YAAY,CAAC;IACtB,CAAC;CACF;AAED,eAAe,iBAAiB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/controllers/index.ts"],"names":[],"mappings":"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"}
|
package/dist/helpers/files.js
CHANGED
|
@@ -18,6 +18,8 @@ const getFilesPathWithInheritance = async ({ internalFolder, externalFolder, log
|
|
|
18
18
|
if (notTests &&
|
|
19
19
|
(file.endsWith('.test.js') ||
|
|
20
20
|
file.endsWith('.test.ts') ||
|
|
21
|
+
file.endsWith('.gen.js') ||
|
|
22
|
+
file.endsWith('.gen.ts') ||
|
|
21
23
|
file.endsWith('.d.ts'))) {
|
|
22
24
|
return false;
|
|
23
25
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"files.js","sourceRoot":"","sources":["../../src/helpers/files.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"files.js","sourceRoot":"","sources":["../../src/helpers/files.ts"],"names":[],"mappings":"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"}
|
package/dist/models/Sequence.js
CHANGED
|
@@ -9,7 +9,7 @@ class Sequence extends BaseModel {
|
|
|
9
9
|
static get modelStatics() {
|
|
10
10
|
return {
|
|
11
11
|
getSequence: async function (forType) {
|
|
12
|
-
const sequence = await this.findByIdAndUpdate({ _id: forType }, { $inc: { seq: 1 } }, {
|
|
12
|
+
const sequence = await this.findByIdAndUpdate({ _id: forType }, { $inc: { seq: 1 } }, { returnDocument: 'after', upsert: true });
|
|
13
13
|
return sequence.seq;
|
|
14
14
|
},
|
|
15
15
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Sequence.js","sourceRoot":"","sources":["../../src/models/Sequence.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAIpD,MAAM,QAAS,SAAQ,SAAS;IAC9B,MAAM,KAAK,WAAW;QACpB,OAAO;YACL,GAAG,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;YACrC,GAAG,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,EAAE;SACzB,CAAC;IACb,CAAC;IAED,MAAM,KAAK,YAAY;QAKrB,OAAO;YACL,WAAW,EAAE,KAAK,WAEhB,OAAe;gBAEf,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAC3C,EAAE,GAAG,EAAE,OAAO,EAAE,EAChB,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,EACpB,EAAE,
|
|
1
|
+
{"version":3,"file":"Sequence.js","sourceRoot":"","sources":["../../src/models/Sequence.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAIpD,MAAM,QAAS,SAAQ,SAAS;IAC9B,MAAM,KAAK,WAAW;QACpB,OAAO;YACL,GAAG,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;YACrC,GAAG,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,EAAE;SACzB,CAAC;IACb,CAAC;IAED,MAAM,KAAK,YAAY;QAKrB,OAAO;YACL,WAAW,EAAE,KAAK,WAEhB,OAAe;gBAEf,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAC3C,EAAE,GAAG,EAAE,OAAO,EAAE,EAChB,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,EACpB,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,CAC1C,CAAC;gBACF,OAAO,QAAQ,CAAC,GAAG,CAAC;YACtB,CAAC;SACO,CAAC;IACb,CAAC;CACF;AAED,eAAe,QAAQ,CAAC"}
|