@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.
Files changed (132) hide show
  1. package/CHANGELOG.md +59 -1
  2. package/dist/Cli.js +4 -4
  3. package/dist/Cli.js.map +1 -1
  4. package/dist/cluster.js +1 -1
  5. package/dist/codegen/appTypes.js +7 -6
  6. package/dist/codegen/appTypes.js.map +1 -1
  7. package/dist/codegen/astEmit.js +31 -10
  8. package/dist/codegen/astEmit.js.map +1 -1
  9. package/dist/codegen/astExtract.js +33 -24
  10. package/dist/codegen/astExtract.js.map +1 -1
  11. package/dist/codegen/astModel.js +2 -2
  12. package/dist/codegen/astResolve.js +3 -3
  13. package/dist/codegen/astSpec.js +2 -2
  14. package/dist/codegen/collectMetadata.d.ts +12 -0
  15. package/dist/codegen/emit.d.ts +10 -3
  16. package/dist/codegen/emit.js +50 -6
  17. package/dist/codegen/emit.js.map +1 -1
  18. package/dist/codegen/index.js +2 -2
  19. package/dist/codegen/index.js.map +1 -1
  20. package/dist/commands/CreateUser.d.ts +10 -10
  21. package/dist/commands/CreateUser.js +1 -1
  22. package/dist/commands/DropIndex.d.ts +1 -1
  23. package/dist/commands/DropIndex.js +1 -1
  24. package/dist/commands/GenerateRandomBytes.js +1 -1
  25. package/dist/commands/GenerateRandomBytes.js.map +1 -1
  26. package/dist/commands/GenerateTypes.d.ts +1 -1
  27. package/dist/commands/GenerateTypes.js +5 -5
  28. package/dist/commands/GenerateTypes.js.map +1 -1
  29. package/dist/commands/OpenApi.d.ts +1 -1
  30. package/dist/commands/OpenApi.js +4 -4
  31. package/dist/commands/OpenApi.js.map +1 -1
  32. package/dist/commands/Routes.js +4 -4
  33. package/dist/commands/Routes.js.map +1 -1
  34. package/dist/commands/SyncIndexes.js +1 -1
  35. package/dist/commands/SyncIndexes.js.map +1 -1
  36. package/dist/commands/migration/Create.d.ts +1 -1
  37. package/dist/commands/migration/Create.js +1 -1
  38. package/dist/commands/migration/Migrate.js +25 -3
  39. package/dist/commands/migration/Migrate.js.map +1 -1
  40. package/dist/config/cache.d.ts +1 -1
  41. package/dist/config/log.js +1 -1
  42. package/dist/controllers/Auth.js +54 -15
  43. package/dist/controllers/Auth.js.map +1 -1
  44. package/dist/controllers/Home.js +1 -1
  45. package/dist/controllers/index.d.ts +13 -1
  46. package/dist/controllers/index.js +64 -48
  47. package/dist/controllers/index.js.map +1 -1
  48. package/dist/folderConfig.js +2 -1
  49. package/dist/folderConfig.js.map +1 -1
  50. package/dist/helpers/crypto.js +1 -1
  51. package/dist/helpers/logger.d.ts +1 -1
  52. package/dist/helpers/redis/redisConnection.js +1 -1
  53. package/dist/index.js +2 -2
  54. package/dist/models/KeyValue.js +1 -1
  55. package/dist/models/Lock.js +18 -8
  56. package/dist/models/Lock.js.map +1 -1
  57. package/dist/models/Migration.js +1 -1
  58. package/dist/models/Sequence.js +1 -1
  59. package/dist/models/User.d.ts +3 -3
  60. package/dist/models/User.js +3 -3
  61. package/dist/models/UserOld.d.ts +10 -10
  62. package/dist/models/UserOld.js +17 -8
  63. package/dist/models/UserOld.js.map +1 -1
  64. package/dist/modules/AbstractCommand.js +1 -1
  65. package/dist/modules/AbstractCommand.js.map +1 -1
  66. package/dist/modules/AbstractConnector.js +1 -1
  67. package/dist/modules/AbstractController.js +3 -3
  68. package/dist/modules/AbstractModel.js +1 -1
  69. package/dist/modules/Base.js +2 -2
  70. package/dist/modules/BaseCli.d.ts +1 -1
  71. package/dist/modules/BaseCli.js +5 -2
  72. package/dist/modules/BaseCli.js.map +1 -1
  73. package/dist/server.d.ts +1 -1
  74. package/dist/server.js +34 -17
  75. package/dist/server.js.map +1 -1
  76. package/dist/services/cache/Cache.js +9 -7
  77. package/dist/services/cache/Cache.js.map +1 -1
  78. package/dist/services/cache/drivers/MemoryDriver.js +6 -0
  79. package/dist/services/cache/drivers/MemoryDriver.js.map +1 -1
  80. package/dist/services/cache/drivers/RedisDriver.js +1 -1
  81. package/dist/services/documentation/OpenApiGenerator.js +54 -7
  82. package/dist/services/documentation/OpenApiGenerator.js.map +1 -1
  83. package/dist/services/http/HttpServer.d.ts +6 -1
  84. package/dist/services/http/HttpServer.js +16 -11
  85. package/dist/services/http/HttpServer.js.map +1 -1
  86. package/dist/services/http/builtinErrorHandlers.js +1 -1
  87. package/dist/services/http/builtinErrorHandlers.js.map +1 -1
  88. package/dist/services/http/httpErrors.js.map +1 -1
  89. package/dist/services/http/middleware/AbstractMiddleware.js +1 -1
  90. package/dist/services/http/middleware/Auth.js +1 -1
  91. package/dist/services/http/middleware/Cors.js +6 -2
  92. package/dist/services/http/middleware/Cors.js.map +1 -1
  93. package/dist/services/http/middleware/GetUserByToken.d.ts +10 -2
  94. package/dist/services/http/middleware/GetUserByToken.js +29 -12
  95. package/dist/services/http/middleware/GetUserByToken.js.map +1 -1
  96. package/dist/services/http/middleware/I18n.js +1 -1
  97. package/dist/services/http/middleware/IpDetector.js +1 -1
  98. package/dist/services/http/middleware/Pagination.d.ts +1 -1
  99. package/dist/services/http/middleware/Pagination.js +2 -2
  100. package/dist/services/http/middleware/PrepareAppInfo.js +8 -2
  101. package/dist/services/http/middleware/PrepareAppInfo.js.map +1 -1
  102. package/dist/services/http/middleware/RateLimiter.js +2 -2
  103. package/dist/services/http/middleware/RequestLogger.js +1 -1
  104. package/dist/services/http/middleware/RequestParser.js +1 -1
  105. package/dist/services/http/middleware/Role.js +1 -1
  106. package/dist/services/http/routing/ExpressAdapter.js +9 -1
  107. package/dist/services/http/routing/ExpressAdapter.js.map +1 -1
  108. package/dist/services/http/routing/RouteNode.d.ts +1 -1
  109. package/dist/services/http/routing/RouteRegistry.d.ts +7 -0
  110. package/dist/services/http/routing/RouteRegistry.js +8 -2
  111. package/dist/services/http/routing/RouteRegistry.js.map +1 -1
  112. package/dist/services/http/routing/formatTree.js.map +1 -1
  113. package/dist/services/i18n/I18n.js +1 -1
  114. package/dist/services/logging/SentryTransport.js.map +1 -1
  115. package/dist/services/validate/ValidateService.js +4 -4
  116. package/dist/services/validate/ValidateService.js.map +1 -1
  117. package/dist/services/validate/drivers/StandardSchemaDriver.js +1 -1
  118. package/dist/services/validate/drivers/YupDriver.js +1 -1
  119. package/dist/services/validate/drivers/YupDriver.js.map +1 -1
  120. package/dist/tests/frameworkVitestSetup.js +1 -1
  121. package/dist/tests/globalSetupNodeTest.js +1 -1
  122. package/dist/tests/globalSetupVitest.js +1 -1
  123. package/dist/tests/nodeRunner.node-test.js +3 -3
  124. package/dist/tests/nodeRunnerShared.node-test.js +2 -2
  125. package/dist/tests/setupFramework.js +3 -3
  126. package/dist/tests/setupFramework.js.map +1 -1
  127. package/dist/tests/setupNodeTest.js +1 -1
  128. package/dist/tests/setupVitest.js +1 -1
  129. package/dist/tests/testHelpers.d.ts +16 -16
  130. package/dist/tests/testHelpers.js +1 -1
  131. package/dist/types.js +1 -1
  132. package/package.json +4 -5
package/CHANGELOG.md CHANGED
@@ -4,7 +4,65 @@ All notable changes to this project will be documented in this file.
4
4
 
5
5
  The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
6
6
 
7
- ## [5.1.1] - Unreleased
7
+ ## [5.1.3] - Unreleased
8
+
9
+ ### Security
10
+
11
+ - **`logout` now revokes the session the client actually authenticated with.** `postLogout` re-extracted the bearer token from the `Authorization` header only, while the `GetUserByToken` middleware that authenticates every Auth route accepts the token from `req.body.token` first (a supported path) and falls back to the header. A client that authenticated with a **body** token and called `logout` with that same body token got a `200 Ok` while its session token was never `$pull`-ed — the 30-day token stayed valid, undetectably. Both call sites now resolve the presented token through one shared `GetUserByToken.resolveToken(req)` (body first, then `Authorization`, `'null'` treated as absent, `Bearer` prefix stripped, trimmed), so logout always revokes the exact session the request authenticated with — including the case where a request carries both a body and a header token (the body-authenticated session is the one revoked). Logout without any token still returns `200`. The middleware's behavior is unchanged.
12
+
13
+ - **Request validation no longer echoes an internal error message to the client.** The validation-phase catch in `src/controllers/index.ts` returned `400 { errors: err.message }` for **any** thrown error, not only a framework `ValidationError` — so an error raised inside a schema's `.transform`/`.test` (e.g. an async validator that hits the database), or the developer-facing "no `ValidatorDriver` matches this schema" message, rode verbatim into the `400` body. A repro leaked a Mongo connection string (`mongodb://admin:s3cret@…`) to an unauthenticated client. A framework `ValidationError` still maps to `400` with the same path-keyed `errors` response body as before; every other error now routes through the same error-handler registry as a handler throw (`app.httpServer.resolveError` — consumer-registered handlers and built-in `HttpError` mapping apply), falling back to a generic `500` with the "Platform error. Please check later or contact support" body, logged at `error`. **Behavior change:** a throwing `.transform`/`.test`, or a schema with no matching driver, now yields a `500` (or whatever the registry maps it to) instead of a `400` that echoed the internal message, and an `HttpError` thrown inside a validator maps to its own status — consistent with how it behaves when thrown from a handler.
14
+
15
+ - **`UserOld` legacy auth is hardened, and its deprecation is now audible.** The deprecated `UserOld` model — kept until v6 for consumers who haven't migrated — received three surgical changes. Its constructor deprecation notice is now a `process.emitWarning` with code `ASF_DEP_USEROLD` and an explicit security note (its legacy auth is known-weak; migrate to the `User` model), where it was a bare `console.warn`. The recovery- and verification-token lookups now include `until: { $gt: new Date() }`, so an expired token is rejected — previously an admitted TODO left a stale token valid forever. And the unknown-email login path now performs the same KDF burn as the `User` model (`burnPasswordVerify`), closing an account-enumeration timing oracle that had returned before doing any hashing work on an unknown email. Session-token behavior is unchanged, and only a consumer who deliberately kept authentication on `UserOld` across the v5 migration is affected. **Behavior change (UserOld consumers):** a recovery or verification token past its expiry is now rejected instead of continuing to work indefinitely.
16
+
17
+ ### Changed
18
+
19
+ - **The development toolchain now uses stable TypeScript 7.0.2.** TypeScript 6 and the separate `@typescript/native-preview`/`tsgo` preview compiler have been replaced by the stable TypeScript 7 package, and all build and type-check scripts now use `tsc`. Codegen syntax tests now invoke the compiler CLI because TypeScript 7 no longer exposes the legacy `transpileModule`, `ModuleKind`, and `ScriptTarget` API from the package root. Runtime behavior and the framework's published API are unchanged.
20
+
21
+ ### Fixed
22
+
23
+ - **Route-type codegen now accepts middleware tuples wrapped in TypeScript-only expressions such as `as const`.** A route-level tuple like `middleware: [[RateLimiter, options] as const]` is represented by OXC as a `TSAsExpression` around the tuple, but the extractor inspected middleware entries only as direct identifiers or array expressions. It therefore misclassified the otherwise-static route as using unanalyzable middleware and skipped its generated `*.routes.gen.ts` file. Middleware extraction now unwraps `as`, `satisfies`, non-null, and parenthesized expressions around the complete list, each entry, and the binding at the head of a tuple. The same handling applies to tuples in a controller's static middleware `Map`; genuinely dynamic middleware such as `buildMiddleware()` remains rejected.
24
+
25
+ - **The CLI now exits non-zero when a command fails.** A command that threw (including a migration whose `up()` rejected) was caught and logged, but the process still exited `0` — so a CI/deploy step running `node cli.ts migration/migrate` treated a failed migration as success and shipped against an un-migrated schema. The failure was swallowed at three layers: `BaseCli.run` caught and returned `undefined`, `Cli.run` discarded the result and returned `true`, and the entry script exited `0` unconditionally. Now `BaseCli.run` returns `false` on a thrown command (the error is still logged with its stack), `Cli.run` returns that result, and the entry exits `process.exit(result ? 0 : 1)`. **Behavior change:** a CLI command that fails (throws, or returns a falsy result — every shipped command returns an explicit boolean) now exits `1`. If your project has its own CLI entry that calls `cli.run()` without using the result, mirror the framework's entry (`process.exit(result ? 0 : 1)`) to get failure exit codes. In a multi-instance deploy, a `migrate` invocation that skips because another instance already holds the advisory lock now counts as **success** and exits `0` — another instance is running the migrations, so the skip is expected and is logged as a warning.
26
+
27
+ - **Controller routes with a mixed-case path segment below the first level were unreachable, and method-scoped middleware on a case-mismatched key was silently dropped.** The controller route-tree builder keyed static child segments by their original case, while the router's matcher (and `RouteRegistry`) look them up lower-cased. A first-level segment was healed by an incidental re-keying, but a nested route like `get: { '/user/Profile': handler }` produced a tree node the matcher could never reach — a `404` for both `/user/Profile` and `/user/profile`. The same drift meant a `static middleware` map key differing only in case from its route (e.g. `'POST/Login'` vs a `/login` route) attached its middleware (Auth, RateLimiter) to a phantom node — silently not running it — at any depth. The builder now keys segments through the same shared `RouteRegistry.ensureChildBySegment` the matcher uses (single source of truth; the drifted duplicate is removed), so mixed-case routes match case-insensitively at any depth and method-scoped middleware always attaches. A middleware key that points at a non-existent route now logs a warning at boot instead of failing silently. Runtime routing, `req.params` extraction, and the `405`-over-param-backtracking behavior are unchanged.
28
+
29
+ - **A non-string body `token` no longer crashes the request with a `500`.** `GetUserByToken` read `req.body.token` and called `.replace()` on it with no type check, and body parsing preserves a JSON number and keeps a repeated form field as an array — so a request carrying `{"token": 123}`, or `token` sent twice as a form field, threw `token.replace is not a function` → `TypeError` → the generic `500` sink, instead of being treated as an unauthenticated request. A non-string token is now treated as **absent**: the middleware falls through to the `Authorization` header (and `postLogout`, which shares the same `GetUserByToken.resolveToken`, treats it as no token and returns `200`). A string token behaves exactly as before.
30
+
31
+ - **Route-type codegen now emits the correct import form for named-export middleware.** The AST resolver classifies each middleware import as `default` or `named` (carrying its original name for an alias), but the emitter discarded that and always rendered a default import (`import type Mw from '…'`). A middleware exported as a **named** export, or a middleware class exported from the controller's own file, therefore produced a `.routes.gen.ts` that either failed to typecheck (`TS2613`: the module has no default export) or silently bound the middleware type to the file's *default* export — a wrong type that surfaced later as a confusing `TS2339` in the handler. The `kind` and original name are now threaded through to emit (via a shared `MiddlewareImport` type), so named and aliased middleware render as `import type { Name } from '…'` / `import type { Orig as Local } from '…'`. Output for default-export middleware — every framework built-in — is byte-identical.
32
+
33
+ - **`Lock.waitForUnlock` no longer races the change stream into an eternal hang.** The change stream opens its server-side cursor lazily on the first `'change'` listener, and its logical start point is fixed only then — but the old code ran the `findOne` existence check *before* attaching the listener, so a `releaseLock` that committed in that window was never observed: the waiter hung forever (or, with `timeoutMs`, surfaced a spurious timeout while the lock was already gone). The `'change'` listener is now attached first, and the code waits for mongoose's forwarded `resumeTokenChanged` signal (which fires only once the stream's start point is fixed) before the authoritative `findOne` re-check — closing the window. The public API is unchanged and no default timeout was added. **Edge note:** on a standalone MongoDB (change streams unsupported — never a working topology for this API), `waitForUnlock` on an absent lock now rejects with the stream error rather than accidentally resolving.
34
+
35
+ - **OpenAPI `operationId`s are now unique and controller-namespaced.** The generator emitted the bare handler name (`getList`) as the `operationId` with no uniqueness guard, so two controllers that both define `getList` — or one handler wired to multiple verbs/paths — produced duplicate ids, which OpenAPI 3.1 forbids: validators (Redocly, Spectral, swagger-cli) reject the document and client generators emit colliding function names. Each `operationId` is now namespaced by its controller (`${controllerName}_${methodName}`, the same derivation already used for `tags`) and de-duplicated against a document-wide set — a residual collision (the same handler on multiple verbs/paths) gets a deterministic verb suffix, then a numeric one. **Behavior change (consumer-visible output):** every emitted `operationId` changes (e.g. `getList` → `Users_getList`); regenerate and re-pin any client SDK or tooling that referenced the old ids.
36
+
37
+ - **A concurrent duplicate registration now returns the same `400` as the sequential existence check, not a `500` for the loser.** `postRegister` (`src/controllers/Auth.ts`) checks for an existing email/nickname and then calls `User.create`, with nothing guarding the window between the check and the insert — so two registrations racing on the same email both passed the checks and the second `create` threw a `MongoServerError` E11000 duplicate-key error, which is neither an `HttpError` nor a Mongoose `ValidationError` and so fell through to the generic `500` sink. A narrow catch around `User.create` now maps E11000 on the `email` unique index to the same `400 email.registered`, and on the `name.nick` index to `400 auth.nicknameExists`, that the pre-insert checks return. A duplicate-key error on any other index is rethrown (an honest `500`); non-duplicate errors propagate unchanged.
38
+
39
+ - **A non-positive cache TTL now means "don't cache" on every driver, instead of being cached forever in memory.** `Cache.getSetValue` short-circuited only an exact `storeTime === 0`, and `MemoryDriver.set` stored the entry unconditionally while arming its expiry timer only when `ttlSeconds > 0` — so a computed **negative** TTL (e.g. `Math.floor((expiresAt - Date.now()) / 1000)` once the source is already expired) wrote a timer-less, never-expiring entry, and the default memory driver served that stale value forever while Redis (which rejects `EX <= 0`) degraded to no-cache. The short-circuit is now `storeTime <= 0` and `MemoryDriver.set` early-returns on `ttlSeconds <= 0`, so the two drivers agree: a non-positive TTL is not stored. This is strictly a fix — the old memory-driver behavior was never intended (the `=== 0` guard existed precisely so a `0` could not write a never-expiring entry, and a negative value slipped past it) — but the **semantics changed**: a computed non-positive TTL now recomputes every call instead of being served from a permanent in-memory entry.
40
+
41
+ - **A config that exists only as an env-specific file no longer crashes boot with a cryptic `Cannot find package 'undefined'`.** A config present only as `config/foo.production.ts` with no base `config/foo.ts` left its resolved `default` path undefined, so `loadConfig` built `paths = [undefined]` and `import(undefined)` rejected with `ERR_MODULE_NOT_FOUND` — even when `NODE_ENV` matched the env file. Now, when `NODE_ENV` matches, the env file loads as the config; when it doesn't match, the config behaves exactly like an unknown config name (`getConfig` → warn + `{}`); and boot logs a clear diagnostic naming the config, its env segments, and the missing base file. A config that has a base file is unchanged — an env file still overrides the base.
42
+
43
+ - **A project checked out under a path containing a space (or on Windows) no longer breaks boot.** `src/folderConfig.ts` and `app.frameworkFolder` (`src/server.ts`) derived a filesystem path from `new URL('.', import.meta.url).pathname`, which leaves percent-encoding in place (a space stays `%20`) and yields `/C:/…` on Windows — so `folderConfig` fed `%20` paths into `fs.readdir` and boot failed with a misleading foldersConfig error. Both now use `fileURLToPath`, like the rest of the codebase.
44
+
45
+ - **Migrations organized into subfolders now apply in the correct order, and a non-conforming filename refuses to run instead of silently mis-sorting.** The pending-migration sort keyed on `Number(file.split('_')[0])`, but discovery is recursive and yields folder-relative paths, so a subfolder migration like `2024/1699…_x.ts` produced `NaN` and the `NaN` comparator applied migrations in an arbitrary order (`3000_a` could run before `1000_b`). The sort now uses the validated numeric timestamp prefix of the **basename** (directory segments stripped), with ties broken deterministically by full path. A pending migration whose basename doesn't match `<digits>_…` makes `migration/migrate` log an error naming the offending file(s) and return `false` (CLI exit 1) **before** running anything. **Behavior change:** a non-conforming pending migration filename now refuses to run instead of being mis-sorted.
46
+
47
+ - **A middleware rejection that arrives after the chain already advanced is now logged instead of silently dropped.** `ExpressAdapter`'s one-shot `settle()` returns silently once the middleware chain has resolved, so a middleware that calls `next()` and then awaits a call that later rejects (`next(); await audit.log(req);`) had its rejection consumed with no `500`, no log, and no `unhandledRejection` — the error vanished without a trace. `settle()` now logs such a late rejection at `logger.error` with the middleware class name and its stack. Observability only — responses are unchanged, and a benign double-`next()` stays silent.
48
+
49
+ - **A handler on a schema-less route that reads `req.appInfo.request`/`.query` no longer crashes with a logged `500`.** Both fields are typed as non-optional `Record<string, unknown>`, but `PrepareAppInfo` seeded only `{ app }` and the real assignments were gated on schema presence — so on a route with no `request:`/`query:` schema, a handler reading `req.appInfo.query.page` type-checked cleanly yet threw `TypeError` at runtime, which the handler wrapper caught and logged as a `500` "Platform error". `PrepareAppInfo` now seeds both fields to `{}`; a route that declares a schema is unchanged (the validated values still overwrite the defaults). **Behavior change:** such a handler now runs — each absent key reads as `undefined` — instead of `500`ing.
50
+
51
+ - **Controller load order is now a contractual, consistent sort rather than a coincidence of V8's sort internals.** The index-first comparator returned `-1` when `a` was an index file and `0` otherwise — it never returned `1`, so `compare(index, nonIndex)` was `-1` while `compare(nonIndex, index)` was `0`, violating ECMA-262's antisymmetry requirement. Index-first registration (and root `index` before a nested `index`) therefore held only by sort luck, and a V8 sort-strategy change or a longer controller list could have loaded a nested controller before a root index one, shifting middleware accumulation at boot. A new `compareControllerLoadOrder` is antisymmetric and consistent — index files before others, a shallower index before a deeper one — and separator-agnostic (works with `\` paths). Registration order for existing apps is unchanged.
52
+
53
+ - **Route-type codegen no longer truncates non-identifier path-param names, and a literal `*/` in a route path no longer breaks the generated file.** (a) `parsePathParams` matched only `:([a-zA-Z_][a-zA-Z0-9_]*)`, while the runtime router takes the whole segment after `:` — so `'/order/:order-id'` emitted `params: { order: string }` even though the runtime populates `req.params['order-id']`, and `:1st` was dropped entirely; codegen now captures the full segment and quotes any key that isn't a valid identifier (`'order-id': string`). (b) A literal `*/` in a route path (a legal static segment — only a *leading* `*` is a splat) terminated the generated file's JSDoc comment and broke parsing; the path is now escaped where it's rendered into the comment. Output for normal routes is byte-identical.
54
+
55
+ - **The OpenAPI generator no longer emits duplicate query parameters.** `buildQueryParameters` concatenated the route's own query schema with every middleware's introspectable `relatedQueryParameters` and pushed one parameter per property with no dedup — so a route query key that overlapped a middleware-declared one (e.g. `limit` on both) produced two `{ name: 'limit', in: 'query' }` entries, which OpenAPI 3.1 forbids and validators (Redocly, Spectral, swagger-cli) reject. Parameters are now deduplicated by `(name, in)`, with the route's own schema taking precedence over middleware contributions. A document that had no collision is byte-identical.
56
+
57
+ - **A config or model name containing a quote or backslash no longer breaks the generated `genTypes.d.ts`.** Config names, model names, and model paths were interpolated into single-quoted TypeScript string literals with no escaping, while the `sq()` escaper lived only in `emit.ts` — so a name that is legal on disk but contains `'` or `\` (e.g. `config/user's.ts`) produced an unterminated string literal that broke the whole project's typecheck. Every interpolation site now escapes through the shared `sq()`; output for benign names is byte-identical.
58
+
59
+ ## [5.1.2] - 2026-07-05
60
+
61
+ ### Fixed
62
+
63
+ - **Route-type codegen emitted an empty middleware chain for sibling param routes with different names.** When two routes on the same controller sat at the same position in the route tree but used param segments with **different** names (e.g. `PUT /:slug` and `POST /:event`), the generated `*.routes.gen.ts` gave the sibling whose param name was *not* registered first an empty `UnionAppInfoProvides<readonly []>` — dropping `req.appInfo.user` (and every other middleware-provided field) from its request type, even though that route runs the controller's full middleware chain at runtime. Root cause: the router keeps a single param child per tree node, so same-depth param siblings collapse onto one node named after the first-registered segment (`:slug`); `flatten()` then reconstructs every sibling's path with that name, while codegen looked each route's chain up by its own **source** path (`:event`) and missed. The middleware-chain lookup is now param-name-insensitive (segment names never affect which node a path resolves to), so all siblings resolve their real chain. **Types-only fix — runtime routing, `req.params` extraction, and middleware execution are unchanged** (they were already correct; only the generated types were wrong).
64
+
65
+ ## [5.1.1] - 2026-07-05
8
66
 
9
67
  ### Security
10
68
 
package/dist/Cli.js CHANGED
@@ -1,6 +1,6 @@
1
1
  import mongoose from 'mongoose';
2
- import BaseCli from "./modules/BaseCli.js";
3
- import Server from "./server.js";
2
+ import BaseCli from './modules/BaseCli.js';
3
+ import Server from './server.js';
4
4
  class Cli extends BaseCli {
5
5
  constructor(serverConfig) {
6
6
  mongoose.set('autoIndex', false); // we do not need create indexes on CLI.
@@ -10,9 +10,9 @@ class Cli extends BaseCli {
10
10
  async run() {
11
11
  await this.server.init({ isSkipModelInit: true, isSkipModelLoading: true });
12
12
  const command = process.argv[2]?.toLowerCase();
13
- await super.run(command);
13
+ const result = await super.run(command);
14
14
  this.app.events.emit('shutdown');
15
- return true;
15
+ return result;
16
16
  }
17
17
  }
18
18
  export default Cli;
package/dist/Cli.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Cli.js","sourceRoot":"","sources":["../src/Cli.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,UAAU,CAAC;AAEhC,OAAO,OAAO,MAAM,sBAAsB,CAAC;AAC3C,OAAO,MAAM,MAAM,aAAa,CAAC;AAEjC,MAAM,GAAI,SAAQ,OAAO;IACvB,YAAY,YAA2B;QACrC,QAAQ,CAAC,GAAG,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC,CAAC,wCAAwC;QAC1E,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,YAAY,CAAC,CAAC;QACxC,KAAK,CAAC,MAAM,CAAC,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,GAAG;QACP,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,eAAe,EAAE,IAAI,EAAE,kBAAkB,EAAE,IAAI,EAAE,CAAC,CAAC;QAC5E,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC;QAC/C,MAAM,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACzB,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACjC,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AAED,eAAe,GAAG,CAAC"}
1
+ {"version":3,"file":"Cli.js","sourceRoot":"","sources":["../src/Cli.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,UAAU,CAAC;AAEhC,OAAO,OAAO,MAAM,sBAAsB,CAAC;AAC3C,OAAO,MAAM,MAAM,aAAa,CAAC;AAEjC,MAAM,GAAI,SAAQ,OAAO;IACvB,YAAY,YAA2B;QACrC,QAAQ,CAAC,GAAG,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC,CAAC,wCAAwC;QAC1E,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,YAAY,CAAC,CAAC;QACxC,KAAK,CAAC,MAAM,CAAC,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,GAAG;QACP,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,eAAe,EAAE,IAAI,EAAE,kBAAkB,EAAE,IAAI,EAAE,CAAC,CAAC;QAC5E,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC;QAC/C,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACxC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACjC,OAAO,MAAM,CAAC;IAChB,CAAC;CACF;AAED,eAAe,GAAG,CAAC"}
package/dist/cluster.js CHANGED
@@ -62,6 +62,6 @@ else {
62
62
  // index.ts is the entry that actually constructs the Server and starts
63
63
  // listening. server.ts only DEFINES the class, so importing it here would
64
64
  // let the worker's event loop drain and exit → infinite fork storm.
65
- import("./index.js");
65
+ import('./index.js');
66
66
  }
67
67
  //# sourceMappingURL=cluster.js.map
@@ -6,8 +6,9 @@
6
6
  */
7
7
  import fs from 'node:fs/promises';
8
8
  import path from 'node:path';
9
- import { envShapeToType, extractConfigEnvShape, mergeEnvShapes, } from "./astConfig.js";
10
- import { isBaseModelSource } from "./astModel.js";
9
+ import { envShapeToType, extractConfigEnvShape, mergeEnvShapes, } from './astConfig.js';
10
+ import { isBaseModelSource } from './astModel.js';
11
+ import { sq } from './emit.js';
11
12
  /** A `./`-rooted, forward-slash specifier from `dir` to `target` for the emitted
12
13
  * `import('…')`. Throws if `target` is outside `dir` (can't be a relative import)
13
14
  * — better a clear error than an accidental absolute path baked into the file. */
@@ -130,7 +131,7 @@ export async function getTemplate(configs, modelPaths, configPaths) {
130
131
  }));
131
132
  }
132
133
  const configTypes = Array.from(configs)
133
- .map(([name, value]) => ` getConfig(configName: '${name}'): ${valueToTypeString(value, envByConfig.get(name))};`)
134
+ .map(([name, value]) => ` getConfig(configName: ${sq(name)}): ${valueToTypeString(value, envByConfig.get(name))};`)
134
135
  .join('\n');
135
136
  // Detect `BaseModel` subclasses by parsing each model's source (no runtime
136
137
  // import — codegen never loads the model graph / Mongoose). Result drives both
@@ -144,8 +145,8 @@ export async function getTemplate(configs, modelPaths, configPaths) {
144
145
  })));
145
146
  const modelTypes = models
146
147
  .map((m) => m.isBaseModel
147
- ? ` getModel(modelName: '${m.file}'): GetModelTypeFromClass<typeof import('${m.relPath}').default>`
148
- : ` getModel(modelName: '${m.file}'): import('${m.relPath}').default['mongooseModel']`)
148
+ ? ` getModel(modelName: ${sq(m.file)}): GetModelTypeFromClass<typeof import(${sq(m.relPath)}).default>`
149
+ : ` getModel(modelName: ${sq(m.file)}): import(${sq(m.relPath)}).default['mongooseModel']`)
149
150
  .join('\n');
150
151
  // Bind `req.appInfo.user` to the project's `User` model (if it's a BaseModel),
151
152
  // so it follows a replaced model exactly like `getModel('User')` does. The
@@ -157,7 +158,7 @@ export async function getTemplate(configs, modelPaths, configPaths) {
157
158
  ? `
158
159
  declare module '@adaptivestone/framework/models/User.js' {
159
160
  export interface AppModels {
160
- User: InstanceType<GetModelTypeFromClass<typeof import('${userModel.relPath}').default>>;
161
+ User: InstanceType<GetModelTypeFromClass<typeof import(${sq(userModel.relPath)}).default>>;
161
162
  }
162
163
  }
163
164
  `
@@ -1 +1 @@
1
- {"version":3,"file":"appTypes.js","sourceRoot":"","sources":["../../src/codegen/appTypes.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"appTypes.js","sourceRoot":"","sources":["../../src/codegen/appTypes.ts"],"names":[],"mappings":"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"}
@@ -14,11 +14,11 @@
14
14
  import { existsSync, promises as fs } from 'node:fs';
15
15
  import path from 'node:path';
16
16
  import { fileURLToPath } from 'node:url';
17
- import { buildSubtreeFromSpec, convertPathSyntax, } from "../controllers/index.js";
18
- import { getFilesPathWithInheritance } from "../helpers/files.js";
19
- import { RouteRegistry } from "../services/http/routing/RouteRegistry.js";
20
- import { specFromExtracted } from "./astSpec.js";
21
- import { renderGenFile } from "./emit.js";
17
+ import { buildSubtreeFromSpec, convertPathSyntax, } from '../controllers/index.js';
18
+ import { getFilesPathWithInheritance } from '../helpers/files.js';
19
+ import { RouteRegistry } from '../services/http/routing/RouteRegistry.js';
20
+ import { specFromExtracted } from './astSpec.js';
21
+ import { renderGenFile } from './emit.js';
22
22
  /**
23
23
  * Analyze the project's controller sources (no import, no boot) and return the
24
24
  * gen files to write — WITHOUT writing anything. Registers all controllers
@@ -168,7 +168,14 @@ function renderResolved(srcPath, resolved, flatByKey, urlPrefix) {
168
168
  : {}),
169
169
  }));
170
170
  const ctrlDir = path.dirname(srcPath);
171
- const importMap = new Map(resolved.imports.map((i) => [i.binding, i.specifier]));
171
+ const importMap = new Map(resolved.imports.map((i) => [
172
+ i.binding,
173
+ {
174
+ specifier: i.specifier,
175
+ kind: i.kind,
176
+ ...(i.orig ? { orig: i.orig } : {}),
177
+ },
178
+ ]));
172
179
  // Drop any middleware whose `import type` wouldn't type-check: an untyped `.js`
173
180
  // middleware with no sibling `.d.ts` would be a `TS7016` in a strict consumer
174
181
  // build (no `allowJs`). Removing the binding here drops it from BOTH the
@@ -176,8 +183,8 @@ function renderResolved(srcPath, resolved, flatByKey, urlPrefix) {
176
183
  // filter below), so it degrades to "provides nothing" rather than breaking the
177
184
  // consumer's typecheck. Same rule as the controller self-import; framework
178
185
  // middleware come in as bare specifiers (which ship `.d.ts`) and are kept.
179
- for (const [binding, specifier] of [...importMap]) {
180
- if (!specifierTypeImportable(specifier, ctrlDir)) {
186
+ for (const [binding, info] of [...importMap]) {
187
+ if (!specifierTypeImportable(info.specifier, ctrlDir)) {
181
188
  importMap.delete(binding);
182
189
  }
183
190
  }
@@ -229,9 +236,23 @@ function specifierTypeImportable(specifier, fromDir) {
229
236
  }
230
237
  return moduleTypeImportable(path.resolve(fromDir, specifier));
231
238
  }
239
+ /**
240
+ * Canonicalize param/splat segment NAMES so paths that are structurally the same
241
+ * but differ only in param names resolve to one key. The router keeps a single
242
+ * `paramChild` per node, so same-depth param siblings (`/:slug`, `/:event`)
243
+ * collapse onto ONE trie node named by whichever registered first — meaning
244
+ * `flatten()` reconstructs every sibling's path with that one name, while codegen
245
+ * looks each route up by its own SOURCE name. Names never affect which node a
246
+ * path resolves to at runtime, so erase them from the lookup key on both sides
247
+ * (`indexFlat` build + `chainAt` lookup). Without this the sibling whose name
248
+ * lost the race misses the lookup and emits an empty middleware chain.
249
+ */
250
+ function canonicalizeParams(routePath) {
251
+ return routePath.replace(/:[^/]+/g, ':*').replace(/\*[^/]+/g, '*');
252
+ }
232
253
  /** The deduped, importable middleware chain (binding names) for one flat route. */
233
254
  function chainAt(flatByKey, method, absPath, importable) {
234
- const fr = flatByKey.get(`${method} ${absPath}`);
255
+ const fr = flatByKey.get(`${method} ${canonicalizeParams(absPath)}`);
235
256
  if (!fr) {
236
257
  return [];
237
258
  }
@@ -249,7 +270,7 @@ function chainAt(flatByKey, method, absPath, importable) {
249
270
  function indexFlat(flat) {
250
271
  const out = new Map();
251
272
  for (const fr of flat) {
252
- out.set(`${fr.method} ${fr.path}`, fr);
273
+ out.set(`${fr.method} ${canonicalizeParams(fr.path)}`, fr);
253
274
  }
254
275
  return out;
255
276
  }
@@ -1 +1 @@
1
- {"version":3,"file":"astEmit.js","sourceRoot":"","sources":["../../src/codegen/astEmit.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"astEmit.js","sourceRoot":"","sources":["../../src/codegen/astEmit.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,EAAe,UAAU,EAAE,QAAQ,IAAI,EAAE,EAAE,MAAM,SAAS,CAAC;AAClE,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EACL,oBAAoB,EACpB,iBAAiB,GAClB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,2BAA2B,EAAE,MAAM,qBAAqB,CAAC;AAGlE,OAAO,EAAE,aAAa,EAAE,MAAM,2CAA2C,CAAC;AAG1E,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAMjD,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAoB1C;;;;;;;;GAQG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,GAAS,EACT,MAA6B,EAC7B,OAAO,GAAoC,EAAE;IAE7C,MAAM,UAAU,GAAG,MAAM,mBAAmB,CAC1C,GAAG,CAAC,aAAa,CAAC,WAAW,EAC7B,MAAM,CACP,CAAC;IACF,MAAM,EAAE,IAAI,EAAE,CACZ,SAAS,UAAU,CAAC,MAAM,uCAAuC,CAClE,CAAC;IAEF,mEAAmE;IACnE,MAAM,KAAK,GAAiB,IAAI,GAAG,EAAE,CAAC;IACtC,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,GAAG,CACnC,UAAU,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;QAC3B,GAAG,CAAC;QACJ,GAAG,CAAC,MAAM,iBAAiB,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;KACzD,CAAC,CAAC,CACJ,CAAC;IAEF,MAAM,OAAO,GAAG,MAAM,kBAAkB,CAAC,GAAG,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAExE,MAAM,SAAS,GAAG,WAAW;SAC1B,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC;SACnC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;IACzB,0EAA0E;IAC1E,6EAA6E;IAC7E,uDAAuD;IACvD,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,iBAAiB,EAAE,CAAC;QACvD,MAAM,EAAE,IAAI,EAAE,CACZ,GAAG,SAAS,CAAC,MAAM,0FAA0F,CAC9G,CAAC;QACF,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC;IAC7C,CAAC;IAED,8EAA8E;IAC9E,6EAA6E;IAC7E,0EAA0E;IAC1E,MAAM,UAAU,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;IAEpE,8EAA8E;IAC9E,+EAA+E;IAC/E,6EAA6E;IAC7E,mDAAmD;IACnD,EAAE;IACF,0EAA0E;IAC1E,uEAAuE;IACvE,4EAA4E;IAC5E,8EAA8E;IAC9E,MAAM,QAAQ,GAAG,IAAI,aAAa,EAAE,CAAC;IACrC,MAAM,KAAK,GAAG,IAAI,GAAG,EAAkB,CAAC;IACxC,KAAK,MAAM,CAAC,IAAI,UAAU,EAAE,CAAC;QAC3B,MAAM,KAAK,GAAG,IAAI,aAAa,EAAE,CAAC;QAClC,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC,QAAQ,CAAC,SAAS,EAAE,oBAAoB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;QAC1E,KAAK,MAAM,EAAE,IAAI,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC;YACjC,MAAM,GAAG,GAAG,GAAG,EAAE,CAAC,MAAM,IAAI,EAAE,CAAC,IAAI,EAAE,CAAC;YACtC,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAC5B,IAAI,IAAI,IAAI,IAAI,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC;gBAC/B,MAAM,IAAI,KAAK,CACb,yCAAyC,GAAG,wBAAwB,IAAI,QAAQ,CAAC,CAAC,OAAO,EAAE,CAC5F,CAAC;YACJ,CAAC;YACD,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC;QAC5B,CAAC;QACD,QAAQ,CAAC,eAAe,CACtB,CAAC,CAAC,QAAQ,CAAC,SAAS,EACpB,oBAAoB,CAAC,CAAC,CAAC,IAAI,CAAC,CAC7B,CAAC;IACJ,CAAC;IACD,MAAM,SAAS,GAAG,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC;IAEhD,MAAM,OAAO,GAAoB,EAAE,CAAC;IACpC,KAAK,MAAM,CAAC,IAAI,UAAU,EAAE,CAAC;QAC3B,2EAA2E;QAC3E,iEAAiE;QACjE,IAAI,CAAC,CAAC,UAAU,EAAE,CAAC;YACjB,SAAS;QACX,CAAC;QACD,MAAM,IAAI,GAAG,cAAc,CACzB,CAAC,CAAC,OAAO,EACT,CAAC,CAAC,QAAQ,EACV,SAAS,EACT,CAAC,CAAC,QAAQ,CAAC,SAAS,CACrB,CAAC;QACF,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CACvB,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC;QACvB,6EAA6E;QAC7E,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,gBAAgB,CACrE,CAAC;QACF,OAAO,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;IAClC,CAAC;IACD,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC;AACzC,CAAC;AAED;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAC5C,GAAS,EACT,MAA6B;IAE7B,MAAM,IAAI,GAAG,MAAM,cAAc,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IAC/C,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC9B,OAAO,EAAE,OAAO,EAAE,CAAC,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,CAAC;IACnD,CAAC;IACD,MAAM,YAAY,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACzC,MAAM,aAAa,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAC1C,MAAM,EAAE,IAAI,EAAE,CAAC,SAAS,IAAI,CAAC,OAAO,CAAC,MAAM,6BAA6B,CAAC,CAAC;IAC1E,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC;AACzD,CAAC;AAED,2CAA2C;AAC3C,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,OAAwB,EACxB,MAA6B;IAE7B,KAAK,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,OAAO,EAAE,CAAC;QACxC,MAAM,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;QAC1C,MAAM,EAAE,IAAI,EAAE,CAAC,OAAO,OAAO,EAAE,CAAC,CAAC;IACnC,CAAC;AACH,CAAC;AAED,2EAA2E;AAC3E,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,OAAiB,EACjB,MAA6B;IAE7B,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC7B,MAAM,EAAE,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QACrC,MAAM,EAAE,IAAI,EAAE,CAAC,+BAA+B,MAAM,EAAE,CAAC,CAAC;IAC1D,CAAC;AACH,CAAC;AAED;;;;;GAKG;AACH,KAAK,UAAU,kBAAkB,CAAC,OAAe;IAC/C,IAAI,OAAiB,CAAC;IACtB,IAAI,CAAC;QACH,OAAO,GAAG,MAAM,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE;YAClC,SAAS,EAAE,IAAI;YACf,aAAa,EAAE,IAAI;SACpB,CAAC,CAAC;IACL,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,MAAM,GAAG,GAAa,EAAE,CAAC;IACzB,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE,CAAC;QACxB,IAAI,CAAC,CAAC,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,CAAC;YACtD,SAAS;QACX,CAAC;QACD,MAAM,MAAM,GACT,CAAwC,CAAC,UAAU,IAAI,OAAO,CAAC;QAClE,MAAM,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;QACvD,MAAM,SAAS,GACb,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,IAAI,KAAK,CAAC,CAAC;YAC3C,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,IAAI,KAAK,CAAC,CAAC,CAAC;QAC9C,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;QACtC,CAAC;IACH,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,gFAAgF;AAEhF,+EAA+E;AAC/E,SAAS,cAAc,CACrB,OAAe,EACf,QAA4B,EAC5B,SAAiC,EACjC,SAAiB;IAEjB,MAAM,MAAM,GAAgB,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QACtD,MAAM,EAAE,CAAC,CAAC,MAAM;QAChB,IAAI,EAAE,CAAC,CAAC,IAAI;QACZ,WAAW,EAAE,CAAC,CAAC,OAAO;QACtB,SAAS,EAAE,CAAC,CAAC,UAAU;QACvB,cAAc,EAAE,CAAC,CAAC,QAAQ;QAC1B,GAAG,CAAC,CAAC,CAAC,mBAAmB;YACvB,CAAC,CAAC,EAAE,mBAAmB,EAAE,CAAC,CAAC,mBAAmB,EAAE;YAChD,CAAC,CAAC,EAAE,CAAC;KACR,CAAC,CAAC,CAAC;IACJ,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IACtC,MAAM,SAAS,GAAG,IAAI,GAAG,CACvB,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;QAC1B,CAAC,CAAC,OAAO;QACT;YACE,SAAS,EAAE,CAAC,CAAC,SAAS;YACtB,IAAI,EAAE,CAAC,CAAC,IAAI;YACZ,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACpC;KACF,CAAC,CACH,CAAC;IACF,gFAAgF;IAChF,8EAA8E;IAC9E,yEAAyE;IACzE,6EAA6E;IAC7E,+EAA+E;IAC/E,2EAA2E;IAC3E,2EAA2E;IAC3E,KAAK,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,EAAE,CAAC;QAC7C,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE,CAAC;YACtD,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAC5B,CAAC;IACH,CAAC;IACD,6EAA6E;IAC7E,6EAA6E;IAC7E,8EAA8E;IAC9E,2CAA2C;IAC3C,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC;IAC7C,MAAM,cAAc,GAAsB,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAC7D,OAAO,CACL,SAAS,EACT,KAAK,CAAC,MAAM,CAAC,WAAW,EAAE,EAC1B,QAAQ,CAAC,SAAS,EAAE,iBAAiB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,EAClD,UAAU,CACX,CACF,CAAC;IACF,MAAM,UAAU,GAAmB;QACjC,SAAS,EAAE,QAAQ,CAAC,SAAS,IAAI,SAAS;QAC1C,MAAM,EAAE,EAAE;QACV,SAAS;QACT,MAAM;KACP,CAAC;IACF,uEAAuE;IACvE,4EAA4E;IAC5E,MAAM,wBAAwB,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAC;IAC/D,OAAO,aAAa,CAAC;QACnB,UAAU;QACV,OAAO;QACP,cAAc;QACd,SAAS;QACT,wBAAwB;KACzB,CAAC,CAAC;AACL,CAAC;AAED;;;;;GAKG;AACH,SAAS,oBAAoB,CAAC,OAAe;IAC3C,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAClC,IAAI,GAAG,KAAK,KAAK,IAAI,GAAG,KAAK,MAAM,IAAI,GAAG,KAAK,MAAM,EAAE,CAAC;QACtD,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAM,IAAI,GAAG,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;IAC3D,OAAO,UAAU,CAAC,GAAG,IAAI,OAAO,CAAC,CAAC;AACpC,CAAC;AAED;;;;GAIG;AACH,SAAS,uBAAuB,CAAC,SAAiB,EAAE,OAAe;IACjE,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;QAC/B,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,oBAAoB,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC;AAChE,CAAC;AAED;;;;;;;;;;GAUG;AACH,SAAS,kBAAkB,CAAC,SAAiB;IAC3C,OAAO,SAAS,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC,OAAO,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;AACrE,CAAC;AAED,mFAAmF;AACnF,SAAS,OAAO,CACd,SAAiC,EACjC,MAAc,EACd,OAAe,EACf,UAAuB;IAEvB,MAAM,EAAE,GAAG,SAAS,CAAC,GAAG,CAAC,GAAG,MAAM,IAAI,kBAAkB,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IACrE,IAAI,CAAC,EAAE,EAAE,CAAC;QACR,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,MAAM,GAAG,GAAoB,EAAE,CAAC;IAChC,KAAK,MAAM,KAAK,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;QACnC,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC;QAC9B,IAAI,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;YAC5C,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YACf,GAAG,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAChC,CAAC;IACH,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAS,SAAS,CAAC,IAAiB;IAClC,MAAM,GAAG,GAAG,IAAI,GAAG,EAAqB,CAAC;IACzC,KAAK,MAAM,EAAE,IAAI,IAAI,EAAE,CAAC;QACtB,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,MAAM,IAAI,kBAAkB,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IAC7D,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED;gEACgE;AAChE,SAAS,QAAQ,CAAC,MAAc,EAAE,GAAW;IAC3C,MAAM,QAAQ,GAAG,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAC/D,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CACpB,CAAC;IACF,OAAO,QAAQ,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;AAChE,CAAC;AAED,8EAA8E;AAC9E,SAAS,uBAAuB;IAC9B,OAAO,IAAI,CAAC,OAAO,CACjB,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,EAC5C,gBAAgB,CACjB,CAAC;AACJ,CAAC;AAED,SAAS,OAAO,CAAC,MAAc,EAAE,KAAa;IAC5C,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IACzC,OAAO,GAAG,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;AACtE,CAAC;AAUD;;;;;;GAMG;AACH,KAAK,UAAU,mBAAmB,CAChC,OAAe,EACf,MAA6B;IAE7B,MAAM,WAAW,GAAG,uBAAuB,EAAE,CAAC;IAC9C,0EAA0E;IAC1E,uEAAuE;IACvE,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IACrE,MAAM,KAAK,GAAG,MAAM,2BAA2B,CAAC;QAC9C,cAAc,EAAE,WAAW;QAC3B,cAAc,EAAE,OAAO;QACvB,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;KACjC,CAAC,CAAC;IACH,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE;QAC3C,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC/B,OAAO;YACL,OAAO;YACP,MAAM,EAAE,GAAG,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG;YAC9B,UAAU,EAAE,CAAC,QAAQ,IAAI,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC;SACvD,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC"}
@@ -28,7 +28,7 @@
28
28
  * extraction (it emits type expressions; it never resolves types).
29
29
  */
30
30
  import { parseSync } from 'oxc-parser';
31
- import { HTTP_METHODS } from "../services/http/routing/RouteNode.js";
31
+ import { HTTP_METHODS } from '../services/http/routing/RouteNode.js';
32
32
  /** Valid `routes`-getter verbs (upper-case), the single source of truth shared
33
33
  * with the runtime loader. A route under any other key never matches at runtime,
34
34
  * so codegen must not emit a request type for it. */
@@ -415,24 +415,35 @@ function objectKeys(value) {
415
415
  /** Binding names from a `[X, [Y, params]]` middleware array, or `undefined` if
416
416
  * the value isn't a literal array of binding identifiers. */
417
417
  function middlewareBindings(value) {
418
- if (value.type !== 'ArrayExpression') {
418
+ const list = unwrapExpression(value);
419
+ if (list?.type !== 'ArrayExpression') {
419
420
  return undefined;
420
421
  }
421
422
  const out = [];
422
- for (const el of value.elements) {
423
- if (el?.type === 'Identifier') {
424
- out.push(el.name);
425
- }
426
- else if (el?.type === 'ArrayExpression' &&
427
- el.elements[0]?.type === 'Identifier') {
428
- out.push(el.elements[0].name);
429
- }
430
- else {
423
+ for (const el of list.elements) {
424
+ const binding = middlewareBindingName(el);
425
+ if (binding === undefined) {
431
426
  return undefined;
432
427
  }
428
+ out.push(binding);
433
429
  }
434
430
  return out;
435
431
  }
432
+ /** A middleware binding from either `Mw` or `[Mw, params]`, ignoring TS-only
433
+ * wrappers such as `as const` at both the entry and tuple-head boundaries. */
434
+ function middlewareBindingName(value) {
435
+ const entry = unwrapExpression(value);
436
+ if (entry?.type === 'Identifier') {
437
+ return entry.name;
438
+ }
439
+ if (entry?.type === 'ArrayExpression') {
440
+ const binding = unwrapExpression(entry.elements[0]);
441
+ if (binding?.type === 'Identifier') {
442
+ return binding.name;
443
+ }
444
+ }
445
+ return undefined;
446
+ }
436
447
  // ─── middleware ──────────────────────────────────────────────────────────────
437
448
  function extractMiddleware(node) {
438
449
  const ret = literalReturn(node);
@@ -441,19 +452,22 @@ function extractMiddleware(node) {
441
452
  ret.callee.name !== 'Map') {
442
453
  return { ok: false, reason: 'not `return new Map([ … ])`' };
443
454
  }
444
- const arg = ret.arguments?.[0];
445
- if (!arg) {
455
+ const rawArg = ret.arguments?.[0];
456
+ if (!rawArg) {
446
457
  return { ok: true, scopes: [] }; // `new Map()` — a valid empty middleware map
447
458
  }
448
- if (arg.type !== 'ArrayExpression') {
459
+ const arg = unwrapExpression(rawArg);
460
+ if (arg?.type !== 'ArrayExpression') {
449
461
  return { ok: false, reason: 'Map arg not an array literal' };
450
462
  }
451
463
  const scopes = [];
452
- for (const pair of arg.elements) {
464
+ for (const rawPair of arg.elements) {
465
+ const pair = unwrapExpression(rawPair);
453
466
  if (pair?.type !== 'ArrayExpression' || pair.elements.length < 2) {
454
467
  return { ok: false, reason: 'Map entry not a `[scope, [...]]` tuple' };
455
468
  }
456
- const [scopeNode, listNode] = pair.elements;
469
+ const scopeNode = unwrapExpression(pair.elements[0]);
470
+ const listNode = unwrapExpression(pair.elements[1]);
457
471
  if (scopeNode?.type !== 'Literal' || typeof scopeNode.value !== 'string') {
458
472
  return { ok: false, reason: 'scope key not a string literal' };
459
473
  }
@@ -462,19 +476,14 @@ function extractMiddleware(node) {
462
476
  }
463
477
  const bindings = [];
464
478
  for (const el of listNode.elements) {
465
- if (el?.type === 'Identifier') {
466
- bindings.push(el.name); // `Mw`
467
- }
468
- else if (el?.type === 'ArrayExpression' &&
469
- el.elements[0]?.type === 'Identifier') {
470
- bindings.push(el.elements[0].name); // `[Mw, params]`
471
- }
472
- else {
479
+ const binding = middlewareBindingName(el);
480
+ if (binding === undefined) {
473
481
  return {
474
482
  ok: false,
475
483
  reason: 'middleware entry not a binding identifier',
476
484
  };
477
485
  }
486
+ bindings.push(binding);
478
487
  }
479
488
  scopes.push({ scope: scopeNode.value, bindings });
480
489
  }
@@ -1 +1 @@
1
- {"version":3,"file":"astExtract.js","sourceRoot":"","sources":["../../src/codegen/astExtract.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"astExtract.js","sourceRoot":"","sources":["../../src/codegen/astExtract.ts"],"names":[],"mappings":"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"}
@@ -8,8 +8,8 @@
8
8
  import { promises as fs } from 'node:fs';
9
9
  import { createRequire } from 'node:module';
10
10
  import path from 'node:path';
11
- import { extractController } from "./astExtract.js";
12
- import { resolveRelativeFile } from "./paths.js";
11
+ import { extractController } from './astExtract.js';
12
+ import { resolveRelativeFile } from './paths.js';
13
13
  /**
14
14
  * Is the model at `srcPath` a `BaseModel` subclass? Walks the `extends` chain in
15
15
  * source (relative AND bare-package ancestors), matching the framework's
@@ -25,9 +25,9 @@
25
25
  import { promises as fs } from 'node:fs';
26
26
  import { createRequire } from 'node:module';
27
27
  import path from 'node:path';
28
- import { defaultControllerHttpPath } from "../modules/AbstractController.js";
29
- import { extractController, } from "./astExtract.js";
30
- import { relativeImport, resolveRelativeFile } from "./paths.js";
28
+ import { defaultControllerHttpPath } from '../modules/AbstractController.js';
29
+ import { extractController, } from './astExtract.js';
30
+ import { relativeImport, resolveRelativeFile } from './paths.js';
31
31
  async function readAndExtract(absPath, cache) {
32
32
  const cached = cache?.get(absPath);
33
33
  if (cached) {
@@ -13,8 +13,8 @@
13
13
  * with them) are gone. The emittable `binding → specifier` map comes from
14
14
  * `astResolve` (`resolved.imports`), never from a live class.
15
15
  */
16
- import { convertPathSyntax, parseScopeKey, } from "../controllers/index.js";
17
- import { resolveController, } from "./astResolve.js";
16
+ import { convertPathSyntax, parseScopeKey, } from '../controllers/index.js';
17
+ import { resolveController, } from './astResolve.js';
18
18
  /** A no-op function whose `.name` is `name` (codegen never calls it). */
19
19
  function named(name) {
20
20
  return { [name]: () => { } }[name];
@@ -10,6 +10,18 @@ export interface MiddlewareRef {
10
10
  /** Present when declared as `[Class, params]` in a Map / route-level array. */
11
11
  params?: Record<string, unknown>;
12
12
  }
13
+ /**
14
+ * How a middleware binding was imported, so the gen file emits the matching
15
+ * `import type` form: `default` → `import type X`, `named` → `import type { X }`
16
+ * (or `{ Orig as X }` when renamed), `namespace` → `import type * as X`.
17
+ */
18
+ export interface MiddlewareImport {
19
+ /** Module specifier to import the binding from. */
20
+ specifier: string;
21
+ kind: 'default' | 'named' | 'namespace';
22
+ /** Original export name when the local binding renames it (`{ Orig as X }`). */
23
+ orig?: string;
24
+ }
13
25
  /** One route registered by a controller. */
14
26
  export interface RouteMeta {
15
27
  method: string;
@@ -8,7 +8,7 @@
8
8
  * Framework type paths (`BaseRequestContext`, `StandardSchemaV1`) are computed
9
9
  * relative to the controller's location.
10
10
  */
11
- import type { ControllerMeta, MiddlewareRef } from './collectMetadata.ts';
11
+ import type { ControllerMeta, MiddlewareImport, MiddlewareRef } from './collectMetadata.ts';
12
12
  /**
13
13
  * Inputs for the renderer — resolution (the middleware chains as binding names +
14
14
  * the `binding → specifier` import map) is already done by the caller.
@@ -19,8 +19,8 @@ export interface RenderInput {
19
19
  srcPath: string;
20
20
  /** Resolved+filtered chains (binding names), parallel to `controller.routes`. */
21
21
  filteredChains: MiddlewareRef[][];
22
- /** `binding → specifier` for every binding referenced in `filteredChains`. */
23
- importMap: Map<string, string>;
22
+ /** `binding → import` (specifier + kind) for every binding in `filteredChains`. */
23
+ importMap: Map<string, MiddlewareImport>;
24
24
  /**
25
25
  * Whether the gen file may `import type` the controller's own module to
26
26
  * navigate its `routes` type for precise inline-schema `InferOutput`. False
@@ -39,3 +39,10 @@ export interface RenderInput {
39
39
  * from parsed source and feeds them here.
40
40
  */
41
41
  export declare function renderGenFile(input: RenderInput): string;
42
+ /**
43
+ * Emit a single-quoted TS string literal for a type-navigation key, escaping the
44
+ * only two characters a single-quoted string treats specially (`\` and `'`).
45
+ * Route keys round-trip exactly (the literal denotes the author's original key),
46
+ * and ordinary paths (no `\`/`'`) come out byte-identical to a plain `'${s}'`.
47
+ */
48
+ export declare function sq(s: string): string;