@adaptivestone/framework 5.1.1 → 5.1.3
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 +59 -1
- package/dist/Cli.js +4 -4
- package/dist/Cli.js.map +1 -1
- package/dist/cluster.js +1 -1
- package/dist/codegen/appTypes.js +7 -6
- package/dist/codegen/appTypes.js.map +1 -1
- package/dist/codegen/astEmit.js +31 -10
- package/dist/codegen/astEmit.js.map +1 -1
- package/dist/codegen/astExtract.js +33 -24
- package/dist/codegen/astExtract.js.map +1 -1
- package/dist/codegen/astModel.js +2 -2
- package/dist/codegen/astResolve.js +3 -3
- package/dist/codegen/astSpec.js +2 -2
- package/dist/codegen/collectMetadata.d.ts +12 -0
- package/dist/codegen/emit.d.ts +10 -3
- package/dist/codegen/emit.js +50 -6
- package/dist/codegen/emit.js.map +1 -1
- package/dist/codegen/index.js +2 -2
- package/dist/codegen/index.js.map +1 -1
- package/dist/commands/CreateUser.d.ts +10 -10
- package/dist/commands/CreateUser.js +1 -1
- package/dist/commands/DropIndex.d.ts +1 -1
- package/dist/commands/DropIndex.js +1 -1
- package/dist/commands/GenerateRandomBytes.js +1 -1
- package/dist/commands/GenerateRandomBytes.js.map +1 -1
- package/dist/commands/GenerateTypes.d.ts +1 -1
- package/dist/commands/GenerateTypes.js +5 -5
- package/dist/commands/GenerateTypes.js.map +1 -1
- package/dist/commands/OpenApi.d.ts +1 -1
- package/dist/commands/OpenApi.js +4 -4
- package/dist/commands/OpenApi.js.map +1 -1
- package/dist/commands/Routes.js +4 -4
- package/dist/commands/Routes.js.map +1 -1
- package/dist/commands/SyncIndexes.js +1 -1
- package/dist/commands/SyncIndexes.js.map +1 -1
- package/dist/commands/migration/Create.d.ts +1 -1
- package/dist/commands/migration/Create.js +1 -1
- package/dist/commands/migration/Migrate.js +25 -3
- package/dist/commands/migration/Migrate.js.map +1 -1
- package/dist/config/cache.d.ts +1 -1
- package/dist/config/log.js +1 -1
- package/dist/controllers/Auth.js +54 -15
- package/dist/controllers/Auth.js.map +1 -1
- package/dist/controllers/Home.js +1 -1
- package/dist/controllers/index.d.ts +13 -1
- package/dist/controllers/index.js +64 -48
- package/dist/controllers/index.js.map +1 -1
- package/dist/folderConfig.js +2 -1
- package/dist/folderConfig.js.map +1 -1
- package/dist/helpers/crypto.js +1 -1
- package/dist/helpers/logger.d.ts +1 -1
- package/dist/helpers/redis/redisConnection.js +1 -1
- package/dist/index.js +2 -2
- package/dist/models/KeyValue.js +1 -1
- package/dist/models/Lock.js +18 -8
- package/dist/models/Lock.js.map +1 -1
- package/dist/models/Migration.js +1 -1
- package/dist/models/Sequence.js +1 -1
- package/dist/models/User.d.ts +3 -3
- package/dist/models/User.js +3 -3
- package/dist/models/UserOld.d.ts +10 -10
- package/dist/models/UserOld.js +17 -8
- package/dist/models/UserOld.js.map +1 -1
- package/dist/modules/AbstractCommand.js +1 -1
- package/dist/modules/AbstractCommand.js.map +1 -1
- package/dist/modules/AbstractConnector.js +1 -1
- package/dist/modules/AbstractController.js +3 -3
- package/dist/modules/AbstractModel.js +1 -1
- package/dist/modules/Base.js +2 -2
- package/dist/modules/BaseCli.d.ts +1 -1
- package/dist/modules/BaseCli.js +5 -2
- package/dist/modules/BaseCli.js.map +1 -1
- package/dist/server.d.ts +1 -1
- package/dist/server.js +34 -17
- package/dist/server.js.map +1 -1
- package/dist/services/cache/Cache.js +9 -7
- package/dist/services/cache/Cache.js.map +1 -1
- package/dist/services/cache/drivers/MemoryDriver.js +6 -0
- package/dist/services/cache/drivers/MemoryDriver.js.map +1 -1
- package/dist/services/cache/drivers/RedisDriver.js +1 -1
- package/dist/services/documentation/OpenApiGenerator.js +54 -7
- package/dist/services/documentation/OpenApiGenerator.js.map +1 -1
- package/dist/services/http/HttpServer.d.ts +6 -1
- package/dist/services/http/HttpServer.js +16 -11
- package/dist/services/http/HttpServer.js.map +1 -1
- package/dist/services/http/builtinErrorHandlers.js +1 -1
- package/dist/services/http/builtinErrorHandlers.js.map +1 -1
- package/dist/services/http/httpErrors.js.map +1 -1
- package/dist/services/http/middleware/AbstractMiddleware.js +1 -1
- package/dist/services/http/middleware/Auth.js +1 -1
- package/dist/services/http/middleware/Cors.js +6 -2
- package/dist/services/http/middleware/Cors.js.map +1 -1
- package/dist/services/http/middleware/GetUserByToken.d.ts +10 -2
- package/dist/services/http/middleware/GetUserByToken.js +29 -12
- package/dist/services/http/middleware/GetUserByToken.js.map +1 -1
- package/dist/services/http/middleware/I18n.js +1 -1
- package/dist/services/http/middleware/IpDetector.js +1 -1
- package/dist/services/http/middleware/Pagination.d.ts +1 -1
- package/dist/services/http/middleware/Pagination.js +2 -2
- package/dist/services/http/middleware/PrepareAppInfo.js +8 -2
- package/dist/services/http/middleware/PrepareAppInfo.js.map +1 -1
- package/dist/services/http/middleware/RateLimiter.js +2 -2
- package/dist/services/http/middleware/RequestLogger.js +1 -1
- package/dist/services/http/middleware/RequestParser.js +1 -1
- package/dist/services/http/middleware/Role.js +1 -1
- package/dist/services/http/routing/ExpressAdapter.js +9 -1
- package/dist/services/http/routing/ExpressAdapter.js.map +1 -1
- package/dist/services/http/routing/RouteNode.d.ts +1 -1
- package/dist/services/http/routing/RouteRegistry.d.ts +7 -0
- package/dist/services/http/routing/RouteRegistry.js +8 -2
- package/dist/services/http/routing/RouteRegistry.js.map +1 -1
- package/dist/services/http/routing/formatTree.js.map +1 -1
- package/dist/services/i18n/I18n.js +1 -1
- package/dist/services/logging/SentryTransport.js.map +1 -1
- package/dist/services/validate/ValidateService.js +4 -4
- package/dist/services/validate/ValidateService.js.map +1 -1
- package/dist/services/validate/drivers/StandardSchemaDriver.js +1 -1
- package/dist/services/validate/drivers/YupDriver.js +1 -1
- package/dist/services/validate/drivers/YupDriver.js.map +1 -1
- package/dist/tests/frameworkVitestSetup.js +1 -1
- package/dist/tests/globalSetupNodeTest.js +1 -1
- package/dist/tests/globalSetupVitest.js +1 -1
- package/dist/tests/nodeRunner.node-test.js +3 -3
- package/dist/tests/nodeRunnerShared.node-test.js +2 -2
- package/dist/tests/setupFramework.js +3 -3
- package/dist/tests/setupFramework.js.map +1 -1
- package/dist/tests/setupNodeTest.js +1 -1
- package/dist/tests/setupVitest.js +1 -1
- package/dist/tests/testHelpers.d.ts +16 -16
- package/dist/tests/testHelpers.js +1 -1
- package/dist/types.js +1 -1
- package/package.json +4 -5
package/dist/codegen/emit.js
CHANGED
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
*/
|
|
11
11
|
import path from 'node:path';
|
|
12
12
|
import { fileURLToPath } from 'node:url';
|
|
13
|
-
import { relativeImport } from
|
|
13
|
+
import { relativeImport } from './paths.js';
|
|
14
14
|
/**
|
|
15
15
|
* Render the gen.ts text from already-resolved chains + import map. The AST
|
|
16
16
|
* front-end (`astEmit.ts`) resolves the chains (binding names) + the import map
|
|
@@ -40,7 +40,7 @@ export function renderGenFile(input) {
|
|
|
40
40
|
const ctrlBaseName = path.basename(srcPath, ctrlExt);
|
|
41
41
|
const ctrlImportPath = `./${ctrlBaseName}${ctrlExt}`;
|
|
42
42
|
const middlewareImports = uniqueMiddlewares
|
|
43
|
-
.map((mw) =>
|
|
43
|
+
.map((mw) => renderMiddlewareImport(mw, importMap.get(mw)))
|
|
44
44
|
.sort();
|
|
45
45
|
const routesAlias = `${controller.className}Routes`;
|
|
46
46
|
const anyRouteHasSchema = controller.routes.some((r) => r.hasSchema || r.hasQuerySchema);
|
|
@@ -117,7 +117,7 @@ function renderHandlerGroup(group, routesAlias, navigateSchema) {
|
|
|
117
117
|
const handlerName = group[0].route.handlerName;
|
|
118
118
|
const typeName = `${pascalCase(handlerName)}Request`;
|
|
119
119
|
const docComment = group
|
|
120
|
-
.map(({ route }) => `\`${route.method.toUpperCase()} ${route.path}\``)
|
|
120
|
+
.map(({ route }) => `\`${route.method.toUpperCase()} ${escapeBlockComment(route.path)}\``)
|
|
121
121
|
.join(', ');
|
|
122
122
|
// Dedup identical shapes (same chain + same schemas + same path params)
|
|
123
123
|
// so multi-route handlers with structurally-equivalent contexts emit one
|
|
@@ -142,7 +142,7 @@ function renderShape(route, chain, routesAlias, navigateSchema) {
|
|
|
142
142
|
// string, not an array (see `match.ts`).
|
|
143
143
|
const pathParams = parsePathParams(route.path);
|
|
144
144
|
const paramsOverride = pathParams.length > 0
|
|
145
|
-
? ` & { params: { ${pathParams.map((p) => `${p}: string`).join('; ')} } }`
|
|
145
|
+
? ` & { params: { ${pathParams.map((p) => `${paramKey(p)}: string`).join('; ')} } }`
|
|
146
146
|
: '';
|
|
147
147
|
// appInfo overrides for body/query when their schema is declared inline
|
|
148
148
|
// on the route entry.
|
|
@@ -174,10 +174,17 @@ function renderShape(route, chain, routesAlias, navigateSchema) {
|
|
|
174
174
|
* Pull path-param names out of a route path string. Handles `:name` (single
|
|
175
175
|
* segment) and `{*name}` (splat — author-facing syntax that the registry
|
|
176
176
|
* normalizes to internal `*name` for matching).
|
|
177
|
+
*
|
|
178
|
+
* A `:name` param is the WHOLE segment after `:` — the runtime router does
|
|
179
|
+
* `seg.slice(1)` with no character restriction (`RouteRegistry`), so
|
|
180
|
+
* `:order-id` → `order-id` and `:1st` → `1st` land in `req.params` verbatim;
|
|
181
|
+
* matching `[^/]+` mirrors that. The splat form mirrors `convertPathSyntax`'s
|
|
182
|
+
* `\{\*([a-zA-Z_][a-zA-Z0-9_]*)\}` exactly — a non-identifier there is NOT
|
|
183
|
+
* normalized to a splat at runtime, so it must not be reported as a param here.
|
|
177
184
|
*/
|
|
178
185
|
function parsePathParams(routePath) {
|
|
179
186
|
const names = [];
|
|
180
|
-
for (const match of routePath.matchAll(/:([
|
|
187
|
+
for (const match of routePath.matchAll(/:([^/]+)/g)) {
|
|
181
188
|
names.push(match[1]);
|
|
182
189
|
}
|
|
183
190
|
for (const match of routePath.matchAll(/\{\*([a-zA-Z_][a-zA-Z0-9_]*)\}/g)) {
|
|
@@ -185,6 +192,33 @@ function parsePathParams(routePath) {
|
|
|
185
192
|
}
|
|
186
193
|
return names;
|
|
187
194
|
}
|
|
195
|
+
/**
|
|
196
|
+
* Render a path-param name as an object-type key: bare when it is a valid TS
|
|
197
|
+
* identifier (so identifier params stay byte-identical to the pre-quoting
|
|
198
|
+
* output), single-quoted otherwise so full runtime segment names like
|
|
199
|
+
* `order-id` or `1st` remain valid TS.
|
|
200
|
+
*/
|
|
201
|
+
function paramKey(name) {
|
|
202
|
+
return /^[A-Za-z_$][A-Za-z0-9_$]*$/.test(name) ? name : sq(name);
|
|
203
|
+
}
|
|
204
|
+
/**
|
|
205
|
+
* Emit the `import type` line for one middleware binding, matching the shape it
|
|
206
|
+
* was imported with — a default import must not be forced onto a named export
|
|
207
|
+
* (`TS2613`), and a renamed named import keeps its `Orig as Local` binding.
|
|
208
|
+
*/
|
|
209
|
+
function renderMiddlewareImport(binding, info) {
|
|
210
|
+
const spec = info?.specifier ?? '';
|
|
211
|
+
switch (info?.kind) {
|
|
212
|
+
case 'named':
|
|
213
|
+
return info.orig && info.orig !== binding
|
|
214
|
+
? `import type { ${info.orig} as ${binding} } from '${spec}';`
|
|
215
|
+
: `import type { ${binding} } from '${spec}';`;
|
|
216
|
+
case 'namespace':
|
|
217
|
+
return `import type * as ${binding} from '${spec}';`;
|
|
218
|
+
default:
|
|
219
|
+
return `import type ${binding} from '${spec}';`;
|
|
220
|
+
}
|
|
221
|
+
}
|
|
188
222
|
function collectUniqueMiddlewares(chains) {
|
|
189
223
|
const set = new Set();
|
|
190
224
|
for (const chain of chains) {
|
|
@@ -200,9 +234,19 @@ function collectUniqueMiddlewares(chains) {
|
|
|
200
234
|
* Route keys round-trip exactly (the literal denotes the author's original key),
|
|
201
235
|
* and ordinary paths (no `\`/`'`) come out byte-identical to a plain `'${s}'`.
|
|
202
236
|
*/
|
|
203
|
-
function sq(s) {
|
|
237
|
+
export function sq(s) {
|
|
204
238
|
return `'${s.replace(/\\/g, '\\\\').replace(/'/g, "\\'")}'`;
|
|
205
239
|
}
|
|
240
|
+
/**
|
|
241
|
+
* Escape `*\/` so a route path that legally contains it (only a LEADING `*` is a
|
|
242
|
+
* splat, so `/a*\/b` is a valid key) can't terminate the generated JSDoc block
|
|
243
|
+
* comment (TS1443/TS1160). `*\/` reads identically; paths without it are
|
|
244
|
+
* byte-identical. Only the doc comment needs this — type-navigation keys go
|
|
245
|
+
* through `sq()` into string literals, where `*\/` is inert.
|
|
246
|
+
*/
|
|
247
|
+
function escapeBlockComment(s) {
|
|
248
|
+
return s.replace(/\*\//g, '*\\/');
|
|
249
|
+
}
|
|
206
250
|
function pascalCase(name) {
|
|
207
251
|
if (name.length === 0) {
|
|
208
252
|
return name;
|
package/dist/codegen/emit.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"emit.js","sourceRoot":"","sources":["../../src/codegen/emit.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"emit.js","sourceRoot":"","sources":["../../src/codegen/emit.ts"],"names":[],"mappings":"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"}
|
package/dist/codegen/index.js
CHANGED
|
@@ -9,8 +9,8 @@
|
|
|
9
9
|
*/
|
|
10
10
|
import fs from 'node:fs/promises';
|
|
11
11
|
import path from 'node:path';
|
|
12
|
-
import { generateAppTypes, getTemplate, } from
|
|
13
|
-
import { deleteOrphans, generateRouteTypesViaAst, planRouteTypes, writePlanned, } from
|
|
12
|
+
import { generateAppTypes, getTemplate, } from './appTypes.js';
|
|
13
|
+
import { deleteOrphans, generateRouteTypesViaAst, planRouteTypes, writePlanned, } from './astEmit.js';
|
|
14
14
|
export { generateAppTypes, generateRouteTypesViaAst };
|
|
15
15
|
/**
|
|
16
16
|
* Generate both app-level and per-controller route types from the AST front-end
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/codegen/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAEL,gBAAgB,EAChB,WAAW,GACZ,MAAM,eAAe,CAAC;AACvB,OAAO,EACL,aAAa,EACb,wBAAwB,EAExB,cAAc,EACd,YAAY,GACb,MAAM,cAAc,CAAC;AAGtB,OAAO,EAAE,gBAAgB,EAAE,wBAAwB,EAAE,CAAC;AAQtD;;;;;;;;;;;;GAYG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,GAAS,EACT,MAA6B,EAC7B,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/codegen/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAEL,gBAAgB,EAChB,WAAW,GACZ,MAAM,eAAe,CAAC;AACvB,OAAO,EACL,aAAa,EACb,wBAAwB,EAExB,cAAc,EACd,YAAY,GACb,MAAM,cAAc,CAAC;AAGtB,OAAO,EAAE,gBAAgB,EAAE,wBAAwB,EAAE,CAAC;AAQtD;;;;;;;;;;;;GAYG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,GAAS,EACT,MAA6B,EAC7B,OAAO,GAAuB,EAAE;IAEhC,sDAAsD;IACtD,MAAM,YAAY,GAAG,MAAM,WAAW,CACpC,GAAG,CAAC,kBAAkB,CAAC,OAAO,EAC9B,GAAG,CAAC,kBAAkB,CAAC,UAAU,EACjC,GAAG,CAAC,kBAAkB,CAAC,WAAW,CACnC,CAAC;IACF,MAAM,IAAI,GAAG,MAAM,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC,CAAC;IAC5E,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC9B,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACrE,MAAM,EAAE,IAAI,EAAE,CACZ,8BAA8B,IAAI,CAAC,SAAS,CAAC,MAAM,qDAAqD,KAAK,IAAI;YAC/G,oGAAoG;YACpG,wGAAwG;YACxG,6EAA6E,CAChF,CAAC;IACJ,CAAC;IAED,MAAM,OAAO,GAAoB;QAC/B,EAAE,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,eAAe,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE;QAC1E,GAAG,IAAI,CAAC,OAAO;KAChB,CAAC;IAEF,sEAAsE;IACtE,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;QAClB,MAAM,KAAK,GAAG,MAAM,YAAY,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QACxD,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACrB,MAAM,IAAI,KAAK,CACb,0BAA0B,KAAK,CAAC,MAAM,0DAA0D,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CACnH,CAAC;QACJ,CAAC;QACD,MAAM,EAAE,IAAI,EAAE,CAAC,uDAAuD,CAAC,CAAC;QACxE,OAAO;IACT,CAAC;IAED,0DAA0D;IAC1D,MAAM,YAAY,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACpC,MAAM,aAAa,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAC1C,MAAM,EAAE,IAAI,EAAE,CAAC,0DAA0D,CAAC,CAAC;AAC7E,CAAC;AAED,kFAAkF;AAClF,KAAK,UAAU,YAAY,CACzB,OAAwB,EACxB,OAAiB;IAEjB,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,KAAK,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,OAAO,EAAE,CAAC;QACxC,IAAI,MAAM,GAAkB,IAAI,CAAC;QACjC,IAAI,CAAC;YACH,MAAM,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAC9C,CAAC;QAAC,MAAM,CAAC;YACP,MAAM,GAAG,IAAI,CAAC;QAChB,CAAC;QACD,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;YACpB,KAAK,CAAC,IAAI,CAAC,cAAc,OAAO,EAAE,CAAC,CAAC;QACtC,CAAC;aAAM,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;YAC3B,KAAK,CAAC,IAAI,CAAC,cAAc,OAAO,EAAE,CAAC,CAAC;QACtC,CAAC;IACH,CAAC;IACD,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC7B,KAAK,CAAC,IAAI,CAAC,cAAc,MAAM,EAAE,CAAC,CAAC;IACrC,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC"}
|
|
@@ -6,25 +6,25 @@ declare class CreateUser extends AbstractCommand {
|
|
|
6
6
|
*/
|
|
7
7
|
static get commandArguments(): {
|
|
8
8
|
readonly id: {
|
|
9
|
-
readonly type:
|
|
10
|
-
readonly description:
|
|
9
|
+
readonly type: 'string';
|
|
10
|
+
readonly description: 'User id to find user';
|
|
11
11
|
};
|
|
12
12
|
readonly email: {
|
|
13
|
-
readonly type:
|
|
14
|
-
readonly description:
|
|
13
|
+
readonly type: 'string';
|
|
14
|
+
readonly description: 'User id to find/create user';
|
|
15
15
|
};
|
|
16
16
|
readonly password: {
|
|
17
|
-
readonly type:
|
|
18
|
-
readonly description:
|
|
17
|
+
readonly type: 'string';
|
|
18
|
+
readonly description: 'New password for user';
|
|
19
19
|
};
|
|
20
20
|
readonly roles: {
|
|
21
|
-
readonly type:
|
|
22
|
-
readonly description:
|
|
21
|
+
readonly type: 'string';
|
|
22
|
+
readonly description: 'User roles comma separated string (--roles=user,admin,someOtherRoles)';
|
|
23
23
|
};
|
|
24
24
|
readonly update: {
|
|
25
|
-
readonly type:
|
|
25
|
+
readonly type: 'boolean';
|
|
26
26
|
readonly default: false;
|
|
27
|
-
readonly description:
|
|
27
|
+
readonly description: 'Update user if it exists';
|
|
28
28
|
};
|
|
29
29
|
};
|
|
30
30
|
run(): Promise<boolean>;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import AbstractCommand, {} from
|
|
1
|
+
import AbstractCommand, {} from '../modules/AbstractCommand.js';
|
|
2
2
|
// Example: node src/cli createuser --email=somemail@gmail.com --password=somePassword --roles=user,admin,someOtherRoles
|
|
3
3
|
class CreateUser extends AbstractCommand {
|
|
4
4
|
static get description() {
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { randomBytes } from 'node:crypto';
|
|
2
|
-
import AbstractCommand from
|
|
2
|
+
import AbstractCommand from '../modules/AbstractCommand.js';
|
|
3
3
|
class GenerateRandomBytes extends AbstractCommand {
|
|
4
4
|
static get description() {
|
|
5
5
|
return 'Generate random bytes ising randomBytes from node:crypto';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GenerateRandomBytes.js","sourceRoot":"","sources":["../../src/commands/GenerateRandomBytes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,eAAe,MAAM,+BAA+B,CAAC;AAE5D,MAAM,mBAAoB,SAAQ,eAAe;IAC/C,MAAM,KAAK,WAAW;QACpB,OAAO,2DAA2D,CAAC;IACrE,CAAC;IAED,MAAM,CAAC,kBAAkB,GAAG,KAAK,CAAC;IAElC,KAAK,CAAC,GAAG;QACP,MAAM,KAAK,GAAG,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QACrC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,MAAM,KAAK,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;YAChD,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,IAAI,WAAW,KAAK,EAAE,CAAC,CAAC;QAC/C,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC
|
|
1
|
+
{"version":3,"file":"GenerateRandomBytes.js","sourceRoot":"","sources":["../../src/commands/GenerateRandomBytes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,eAAe,MAAM,+BAA+B,CAAC;AAE5D,MAAM,mBAAoB,SAAQ,eAAe;IAC/C,MAAM,KAAK,WAAW;QACpB,OAAO,2DAA2D,CAAC;IACrE,CAAC;IAED,MAAM,CAAC,kBAAkB,GAAG,KAAK,CAAC;IAElC,KAAK,CAAC,GAAG;QACP,MAAM,KAAK,GAAG,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QACrC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,MAAM,KAAK,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;YAChD,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,IAAI,WAAW,KAAK,EAAE,CAAC,CAAC;QAC/C,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AAED,eAAe,mBAAmB,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { generateAll } from
|
|
2
|
-
import AbstractCommand from
|
|
1
|
+
import { generateAll } from '../codegen/index.js';
|
|
2
|
+
import AbstractCommand from '../modules/AbstractCommand.js';
|
|
3
3
|
class GenerateTypes extends AbstractCommand {
|
|
4
4
|
static get description() {
|
|
5
5
|
return 'Generates TypeScript types (app-level + per-controller routes)';
|
|
@@ -20,10 +20,10 @@ class GenerateTypes extends AbstractCommand {
|
|
|
20
20
|
}
|
|
21
21
|
catch (e) {
|
|
22
22
|
if (check) {
|
|
23
|
-
// CI drift guard: the
|
|
24
|
-
//
|
|
23
|
+
// CI drift guard: report just the mismatch (not a full stack) and fail
|
|
24
|
+
// the command — a `false` result makes the CLI exit non-zero.
|
|
25
25
|
this.logger?.error(e.message);
|
|
26
|
-
|
|
26
|
+
return false;
|
|
27
27
|
}
|
|
28
28
|
throw e;
|
|
29
29
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GenerateTypes.js","sourceRoot":"","sources":["../../src/commands/GenerateTypes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,eAAe,MAAM,+BAA+B,CAAC;AAE5D,MAAM,aAAc,SAAQ,eAAe;IACzC,MAAM,KAAK,WAAW;QACpB,OAAO,gEAAgE,CAAC;IAC1E,CAAC;IAED,MAAM,CAAC,kBAAkB,GAAG,KAAK,CAAC;IAElC,MAAM,KAAK,gBAAgB;QACzB,OAAO;YACL,KAAK,EAAE;gBACL,IAAI,EAAE,SAAkB;gBACxB,WAAW,EACT,yGAAyG;aAC5G;SACF,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,GAAG;QACP,MAAM,KAAK,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC;QAChC,IAAI,CAAC;YACH,MAAM,WAAW,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,MAAM,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;QACtD,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,IAAI,KAAK,EAAE,CAAC;gBACV,
|
|
1
|
+
{"version":3,"file":"GenerateTypes.js","sourceRoot":"","sources":["../../src/commands/GenerateTypes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,eAAe,MAAM,+BAA+B,CAAC;AAE5D,MAAM,aAAc,SAAQ,eAAe;IACzC,MAAM,KAAK,WAAW;QACpB,OAAO,gEAAgE,CAAC;IAC1E,CAAC;IAED,MAAM,CAAC,kBAAkB,GAAG,KAAK,CAAC;IAElC,MAAM,KAAK,gBAAgB;QACzB,OAAO;YACL,KAAK,EAAE;gBACL,IAAI,EAAE,SAAkB;gBACxB,WAAW,EACT,yGAAyG;aAC5G;SACF,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,GAAG;QACP,MAAM,KAAK,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC;QAChC,IAAI,CAAC;YACH,MAAM,WAAW,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,MAAM,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;QACtD,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,IAAI,KAAK,EAAE,CAAC;gBACV,uEAAuE;gBACvE,8DAA8D;gBAC9D,IAAI,CAAC,MAAM,EAAE,KAAK,CAAE,CAAW,CAAC,OAAO,CAAC,CAAC;gBACzC,OAAO,KAAK,CAAC;YACf,CAAC;YACD,MAAM,CAAC,CAAC;QACV,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AAED,eAAe,aAAa,CAAC"}
|
package/dist/commands/OpenApi.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import fs from 'node:fs/promises';
|
|
2
2
|
import path from 'node:path';
|
|
3
|
-
import AbstractCommand from
|
|
4
|
-
import { generateOpenApi, } from
|
|
3
|
+
import AbstractCommand from '../modules/AbstractCommand.js';
|
|
4
|
+
import { generateOpenApi, } from '../services/documentation/OpenApiGenerator.js';
|
|
5
5
|
/**
|
|
6
6
|
* Generate an OpenAPI 3.1 document from the app's controllers.
|
|
7
7
|
*
|
|
@@ -29,8 +29,8 @@ class OpenApi extends AbstractCommand {
|
|
|
29
29
|
}
|
|
30
30
|
async run() {
|
|
31
31
|
// 1. Build the route registry without an HttpServer (its ctor binds a port).
|
|
32
|
-
const { RouteRegistry } = await import(
|
|
33
|
-
const { default: ControllerManager } = await import(
|
|
32
|
+
const { RouteRegistry } = await import('../services/http/routing/RouteRegistry.js');
|
|
33
|
+
const { default: ControllerManager } = await import('../controllers/index.js');
|
|
34
34
|
const registry = new RouteRegistry();
|
|
35
35
|
this.app.httpServer = {
|
|
36
36
|
routeRegistry: registry,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OpenApi.js","sourceRoot":"","sources":["../../src/commands/OpenApi.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"OpenApi.js","sourceRoot":"","sources":["../../src/commands/OpenApi.ts"],"names":[],"mappings":"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"}
|
package/dist/commands/Routes.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import AbstractCommand from
|
|
2
|
-
import { formatRouteTree } from
|
|
1
|
+
import AbstractCommand from '../modules/AbstractCommand.js';
|
|
2
|
+
import { formatRouteTree } from '../services/http/routing/formatTree.js';
|
|
3
3
|
/**
|
|
4
4
|
* Print the project's route tree — "what's mounted in my app".
|
|
5
5
|
*
|
|
@@ -18,8 +18,8 @@ class Routes extends AbstractCommand {
|
|
|
18
18
|
static isShouldGetModelPaths = false;
|
|
19
19
|
async run() {
|
|
20
20
|
// Build the route registry without an HttpServer (its ctor binds a port).
|
|
21
|
-
const { RouteRegistry } = await import(
|
|
22
|
-
const { default: ControllerManager } = await import(
|
|
21
|
+
const { RouteRegistry } = await import('../services/http/routing/RouteRegistry.js');
|
|
22
|
+
const { default: ControllerManager } = await import('../controllers/index.js');
|
|
23
23
|
const registry = new RouteRegistry();
|
|
24
24
|
this.app.httpServer = {
|
|
25
25
|
routeRegistry: registry,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Routes.js","sourceRoot":"","sources":["../../src/commands/Routes.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,MAAM,+BAA+B,CAAC;AAE5D,OAAO,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAC;AAEzE;;;;;;;;GAQG;AACH,MAAM,MAAO,SAAQ,eAAe;IAClC,MAAM,KAAK,WAAW;QACpB,OAAO,2DAA2D,CAAC;IACrE,CAAC;IAED,qDAAqD;IACrD,MAAM,CAAC,kBAAkB,GAAG,KAAK,CAAC;IAClC,MAAM,CAAC,qBAAqB,GAAG,KAAK,CAAC;IAErC,KAAK,CAAC,GAAG;QACP,0EAA0E;QAC1E,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,MAAM,CACpC,2CAA2C,CAC5C,CAAC;QACF,MAAM,EAAE,OAAO,EAAE,iBAAiB,EAAE,GAAG,MAAM,MAAM,CACjD,yBAAyB,CAC1B,CAAC;QACF,MAAM,QAAQ,GAAG,IAAI,aAAa,EAAE,CAAC;QACrC,IAAI,CAAC,GAAG,CAAC,UAAU,GAAG;YACpB,aAAa,EAAE,QAAQ;SACC,CAAC;QAC3B,MAAM,iBAAiB,GAAG,IAAI,iBAAiB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC1D,IAAI,CAAC,GAAG,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;QAC/C,MAAM,iBAAiB,CAAC,eAAe,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;QAE5D,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAC;QACvC,OAAO,IAAI,CAAC;IACd,CAAC
|
|
1
|
+
{"version":3,"file":"Routes.js","sourceRoot":"","sources":["../../src/commands/Routes.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,MAAM,+BAA+B,CAAC;AAE5D,OAAO,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAC;AAEzE;;;;;;;;GAQG;AACH,MAAM,MAAO,SAAQ,eAAe;IAClC,MAAM,KAAK,WAAW;QACpB,OAAO,2DAA2D,CAAC;IACrE,CAAC;IAED,qDAAqD;IACrD,MAAM,CAAC,kBAAkB,GAAG,KAAK,CAAC;IAClC,MAAM,CAAC,qBAAqB,GAAG,KAAK,CAAC;IAErC,KAAK,CAAC,GAAG;QACP,0EAA0E;QAC1E,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,MAAM,CACpC,2CAA2C,CAC5C,CAAC;QACF,MAAM,EAAE,OAAO,EAAE,iBAAiB,EAAE,GAAG,MAAM,MAAM,CACjD,yBAAyB,CAC1B,CAAC;QACF,MAAM,QAAQ,GAAG,IAAI,aAAa,EAAE,CAAC;QACrC,IAAI,CAAC,GAAG,CAAC,UAAU,GAAG;YACpB,aAAa,EAAE,QAAQ;SACC,CAAC;QAC3B,MAAM,iBAAiB,GAAG,IAAI,iBAAiB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC1D,IAAI,CAAC,GAAG,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;QAC/C,MAAM,iBAAiB,CAAC,eAAe,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;QAE5D,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAC;QACvC,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AAED,eAAe,MAAM,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import path from 'node:path';
|
|
2
2
|
import * as url from 'node:url';
|
|
3
|
-
import AbstractCommand from
|
|
3
|
+
import AbstractCommand from '../modules/AbstractCommand.js';
|
|
4
4
|
class SyncIndexes extends AbstractCommand {
|
|
5
5
|
async run() {
|
|
6
6
|
const dirname = url.fileURLToPath(new URL('.', import.meta.url));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SyncIndexes.js","sourceRoot":"","sources":["../../src/commands/SyncIndexes.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,KAAK,GAAG,MAAM,UAAU,CAAC;AAEhC,OAAO,eAAe,MAAM,+BAA+B,CAAC;AAE5D,MAAM,WAAY,SAAQ,eAAe;IACvC,KAAK,CAAC,GAAG;QACP,MAAM,OAAO,GAAG,GAAG,CAAC,aAAa,CAAC,IAAI,GAAG,CAAC,GAAG,EAAE,
|
|
1
|
+
{"version":3,"file":"SyncIndexes.js","sourceRoot":"","sources":["../../src/commands/SyncIndexes.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,KAAK,GAAG,MAAM,UAAU,CAAC;AAEhC,OAAO,eAAe,MAAM,+BAA+B,CAAC;AAE5D,MAAM,WAAY,SAAQ,eAAe;IACvC,KAAK,CAAC,GAAG;QACP,MAAM,OAAO,GAAG,GAAG,CAAC,aAAa,CAAC,IAAI,GAAG,CAAC,GAAG,EAAE,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QACjE,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,2BAA2B,CAClD,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,YAAY,CAAC,EAChC,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,MAAM,CAC9B,CAAC;QACF,IAAI,MAAM,GAAG,EAAE,CAAC;QAEhB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACjE,CAAC;QACD,MAAM,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC;QACvB,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,eAAe,MAAM,CAAC,MAAM,SAAS,CAAC,CAAC;QAEzD,KAAK,MAAM,SAAS,IAAI,MAAM,EAAE,CAAC;YAC/B,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAoB,CAAC;YAC9D,MAAM,cAAc,GAAG,MAAM,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC,8CAA8C;YAChG,IAAI,cAAc,CAAC,MAAM,EAAE,CAAC;gBAC1B,IAAI,CAAC,MAAM,EAAE,IAAI,CACf,WAAW,SAAS,qBAAqB,cAAc,EAAE,CAC1D,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,WAAW,SAAS,qBAAqB,CAAC,CAAC;YAC/D,CAAC;QACH,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,KAAK,WAAW;QACpB,OAAO,iOAAiO,CAAC;IAC3O,CAAC;CACF;AAED,eAAe,WAAW,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { promises as fs } from 'node:fs';
|
|
2
2
|
import path from 'node:path';
|
|
3
|
-
import AbstractCommand from
|
|
3
|
+
import AbstractCommand from '../../modules/AbstractCommand.js';
|
|
4
4
|
class CreateMigration extends AbstractCommand {
|
|
5
5
|
static get description() {
|
|
6
6
|
return 'Create new migration';
|
|
@@ -8,7 +8,7 @@ var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExte
|
|
|
8
8
|
};
|
|
9
9
|
import path from 'node:path';
|
|
10
10
|
import * as url from 'node:url';
|
|
11
|
-
import AbstractCommand from
|
|
11
|
+
import AbstractCommand from '../../modules/AbstractCommand.js';
|
|
12
12
|
class Migrate extends AbstractCommand {
|
|
13
13
|
static get description() {
|
|
14
14
|
return 'Run all pending migrations';
|
|
@@ -34,8 +34,10 @@ class Migrate extends AbstractCommand {
|
|
|
34
34
|
// migrations approach that runtime.
|
|
35
35
|
const gotLock = await LockModel.acquireLock('migrations', 600);
|
|
36
36
|
if (!gotLock) {
|
|
37
|
+
// Lock contention is a successful skip, not a failure: another instance
|
|
38
|
+
// is running the migrations, so this replica returns true to exit 0.
|
|
37
39
|
this.logger?.warn('Another migration run holds the lock — skipping');
|
|
38
|
-
return
|
|
40
|
+
return true;
|
|
39
41
|
}
|
|
40
42
|
try {
|
|
41
43
|
// Pending = files not yet recorded as applied (set difference). Comparing
|
|
@@ -43,9 +45,29 @@ class Migrate extends AbstractCommand {
|
|
|
43
45
|
// recent one — means a branch-merged migration with an older timestamp is
|
|
44
46
|
// still run instead of silently skipped. Order by filename timestamp.
|
|
45
47
|
const applied = new Set(await MigrationModel.distinct('migrationFile'));
|
|
48
|
+
// Discovery is recursive, so a migration can arrive as a subfolder-relative
|
|
49
|
+
// path (`2024/1699…_x.ts`). Order by the numeric timestamp prefix of the
|
|
50
|
+
// *basename* (strip directory segments), not the whole path.
|
|
46
51
|
const pending = files
|
|
47
52
|
.filter((f) => !applied.has(f.file))
|
|
48
|
-
.
|
|
53
|
+
.map((f) => {
|
|
54
|
+
const prefix = /^(\d+)_/.exec(path.basename(f.file));
|
|
55
|
+
return { ...f, order: prefix ? Number(prefix[1]) : NaN };
|
|
56
|
+
});
|
|
57
|
+
// A pending migration whose basename is not `<timestamp>_name` has no
|
|
58
|
+
// defined position — running migrations in an undefined order against prod
|
|
59
|
+
// is worse than refusing. Fail loudly (log + non-zero exit) BEFORE running
|
|
60
|
+
// anything, rather than let a NaN comparator silently mis-sort the rest.
|
|
61
|
+
const malformed = pending.filter((f) => Number.isNaN(f.order));
|
|
62
|
+
if (malformed.length > 0) {
|
|
63
|
+
this.logger?.error(`Refusing to run migrations — these files are not named <timestamp>_name: ${malformed
|
|
64
|
+
.map((f) => f.file)
|
|
65
|
+
.join(', ')}`);
|
|
66
|
+
return false;
|
|
67
|
+
}
|
|
68
|
+
// Ties (same timestamp) break on the full path so the order is total and
|
|
69
|
+
// deterministic even across subfolders.
|
|
70
|
+
pending.sort((a, b) => a.order - b.order || a.file.localeCompare(b.file));
|
|
49
71
|
// NOTE: `up()` and the journal write below are NOT atomic — no transaction
|
|
50
72
|
// wraps them. If the process dies (or the lock is stolen after its TTL)
|
|
51
73
|
// between a migration's side effects landing and its record being written,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Migrate.js","sourceRoot":"","sources":["../../../src/commands/migration/Migrate.ts"],"names":[],"mappings":";;;;;;;;AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,KAAK,GAAG,MAAM,UAAU,CAAC;AAGhC,OAAO,eAAe,MAAM,kCAAkC,CAAC;AAE/D,MAAM,OAAQ,SAAQ,eAAe;IACnC,MAAM,KAAK,WAAW;QACpB,OAAO,4BAA4B,CAAC;IACtC,CAAC;IAED,KAAK,CAAC,GAAG;QACP,MAAM,OAAO,GAAG,GAAG,CAAC,aAAa,CAAC,IAAI,GAAG,CAAC,GAAG,EAAE,
|
|
1
|
+
{"version":3,"file":"Migrate.js","sourceRoot":"","sources":["../../../src/commands/migration/Migrate.ts"],"names":[],"mappings":"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"}
|
package/dist/config/cache.d.ts
CHANGED
|
@@ -9,6 +9,6 @@ declare const _default: {
|
|
|
9
9
|
* Override per environment via `CACHE_DRIVER`. The cache key namespace is
|
|
10
10
|
* shared with the rate limiter and lives in `config/redis.ts` (`namespace`).
|
|
11
11
|
*/
|
|
12
|
-
driver:
|
|
12
|
+
driver: 'memory' | 'redis';
|
|
13
13
|
};
|
|
14
14
|
export default _default;
|
package/dist/config/log.js
CHANGED
package/dist/controllers/Auth.js
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { hashToken } from
|
|
2
|
-
import AbstractController from
|
|
3
|
-
import GetUserByToken from
|
|
4
|
-
import RateLimiter from
|
|
5
|
-
import { defineSchema } from
|
|
1
|
+
import { hashToken } from '../models/User.js';
|
|
2
|
+
import AbstractController from '../modules/AbstractController.js';
|
|
3
|
+
import GetUserByToken from '../services/http/middleware/GetUserByToken.js';
|
|
4
|
+
import RateLimiter from '../services/http/middleware/RateLimiter.js';
|
|
5
|
+
import { defineSchema } from '../services/validate/defineSchema.js';
|
|
6
6
|
// Zero-dependency validation for the built-in auth routes. Messages are i18n
|
|
7
7
|
// keys (see `src/locales/*`); the framework auto-translates them via the
|
|
8
8
|
// request's `i18n.t` before the error is serialized.
|
|
@@ -15,6 +15,21 @@ const isMissing = (v) => v === undefined || v === null || v === '';
|
|
|
15
15
|
// `undefined`, and non-primitives (arrays/objects) pass through unchanged — yup
|
|
16
16
|
// did not stringify those either, so the type/required checks still fire.
|
|
17
17
|
const coerceStr = (v) => v == null || typeof v === 'object' ? v : String(v);
|
|
18
|
+
// Mongo surfaces a unique-index violation as a raw driver error with
|
|
19
|
+
// `code === 11000` and a `keyPattern`/`keyValue` map keyed by the offending
|
|
20
|
+
// index field(s) — mongoose does not wrap it. Returns the collided field names,
|
|
21
|
+
// or `null` when `err` is not a duplicate-key error.
|
|
22
|
+
const DUPLICATE_KEY_CODE = 11000;
|
|
23
|
+
const duplicateKeyFields = (err) => {
|
|
24
|
+
if (typeof err !== 'object' ||
|
|
25
|
+
err === null ||
|
|
26
|
+
err.code !== DUPLICATE_KEY_CODE) {
|
|
27
|
+
return null;
|
|
28
|
+
}
|
|
29
|
+
const source = err.keyPattern ??
|
|
30
|
+
err.keyValue;
|
|
31
|
+
return source ? Object.keys(source) : [];
|
|
32
|
+
};
|
|
18
33
|
const pushEmailIssues = (email, issues) => {
|
|
19
34
|
if (isMissing(email)) {
|
|
20
35
|
issues.push({ message: 'auth.emailProvided', path: ['email'] });
|
|
@@ -236,15 +251,36 @@ class Auth extends AbstractController {
|
|
|
236
251
|
.json({ message: req.appInfo.i18n?.t('auth.nicknameExists') });
|
|
237
252
|
}
|
|
238
253
|
}
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
254
|
+
try {
|
|
255
|
+
user = await User.create({
|
|
256
|
+
email: req.appInfo.request.email,
|
|
257
|
+
password: req.appInfo.request.password,
|
|
258
|
+
name: {
|
|
259
|
+
first: req.appInfo.request.firstName,
|
|
260
|
+
last: req.appInfo.request.lastName,
|
|
261
|
+
nick: req.appInfo.request.nickName,
|
|
262
|
+
},
|
|
263
|
+
});
|
|
264
|
+
}
|
|
265
|
+
catch (err) {
|
|
266
|
+
// Concurrency: a request that passed the existence checks above can still
|
|
267
|
+
// lose the race to the unique index. Map the same distinct 400s the
|
|
268
|
+
// sequential path returns, keyed by which index collided. Any other
|
|
269
|
+
// collision (a future index) or non-duplicate error is rethrown unchanged
|
|
270
|
+
// so the error-handler registry keeps returning its honest 500.
|
|
271
|
+
const dupFields = duplicateKeyFields(err);
|
|
272
|
+
if (dupFields?.includes('email')) {
|
|
273
|
+
return res
|
|
274
|
+
.status(400)
|
|
275
|
+
.json({ message: req.appInfo.i18n?.t('email.registered') });
|
|
276
|
+
}
|
|
277
|
+
if (dupFields?.includes('name.nick')) {
|
|
278
|
+
return res
|
|
279
|
+
.status(400)
|
|
280
|
+
.json({ message: req.appInfo.i18n?.t('auth.nicknameExists') });
|
|
281
|
+
}
|
|
282
|
+
throw err;
|
|
283
|
+
}
|
|
248
284
|
const isAuthWithVerificationFlow = isVerificationFlowEnabled(this.app.getConfig('auth'));
|
|
249
285
|
if (isAuthWithVerificationFlow) {
|
|
250
286
|
await user
|
|
@@ -258,7 +294,10 @@ class Auth extends AbstractController {
|
|
|
258
294
|
async postLogout(req, res) {
|
|
259
295
|
const user = req.appInfo.user;
|
|
260
296
|
if (user) {
|
|
261
|
-
|
|
297
|
+
// Revoke the exact session the request authenticated with: resolve the
|
|
298
|
+
// token with the same precedence/normalization as GetUserByToken (body
|
|
299
|
+
// token first, then Authorization header).
|
|
300
|
+
const rawToken = GetUserByToken.resolveToken(req);
|
|
262
301
|
if (rawToken) {
|
|
263
302
|
const UserModel = this.app.getModel('User');
|
|
264
303
|
// Tokens are stored hashed, so match by hash.
|