@adaptivestone/framework 5.2.2 → 5.3.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +36 -1
- package/README.md +10 -0
- package/dist/codegen/astConfig.js +2 -2
- package/dist/codegen/astConfig.js.map +1 -1
- package/dist/codegen/astEmit.js +1 -0
- package/dist/codegen/astEmit.js.map +1 -1
- package/dist/codegen/astExtract.d.ts +9 -4
- package/dist/codegen/astExtract.js +34 -13
- package/dist/codegen/astExtract.js.map +1 -1
- package/dist/codegen/collectMetadata.d.ts +2 -0
- package/dist/codegen/emit.js +6 -0
- package/dist/codegen/emit.js.map +1 -1
- package/dist/codegen/parser.d.ts +35 -0
- package/dist/codegen/parser.js +39 -0
- package/dist/codegen/parser.js.map +1 -0
- package/dist/controllers/index.js +14 -0
- package/dist/controllers/index.js.map +1 -1
- package/dist/helpers/appInstance.d.ts +1 -1
- package/dist/helpers/appInstance.js +2 -2
- package/dist/helpers/appInstance.js.map +1 -1
- package/dist/modules/AbstractController.d.ts +8 -0
- package/dist/modules/AbstractController.js.map +1 -1
- package/dist/modules/BaseModel.d.ts +49 -22
- package/dist/modules/BaseModel.js.map +1 -1
- package/dist/server.js +7 -9
- package/dist/server.js.map +1 -1
- package/dist/services/documentation/OpenApiGenerator.js +36 -7
- package/dist/services/documentation/OpenApiGenerator.js.map +1 -1
- package/dist/services/http/HttpServer.d.ts +1 -0
- package/dist/services/http/HttpServer.js.map +1 -1
- package/dist/services/http/builtinErrorHandlers.d.ts +20 -0
- package/dist/services/http/builtinErrorHandlers.js +78 -0
- package/dist/services/http/builtinErrorHandlers.js.map +1 -1
- package/dist/services/http/middleware/PrepareAppInfo.js +4 -3
- package/dist/services/http/middleware/PrepareAppInfo.js.map +1 -1
- package/dist/services/http/routing/RouteNode.d.ts +1 -0
- package/dist/services/http/types.d.ts +5 -0
- package/dist/tests/assertions.d.ts +42 -0
- package/dist/tests/assertions.js +225 -0
- package/dist/tests/assertions.js.map +1 -0
- package/dist/tests/frameworkNodeTestSetup.d.ts +1 -0
- package/dist/tests/frameworkNodeTestSetup.js +13 -0
- package/dist/tests/frameworkNodeTestSetup.js.map +1 -0
- package/dist/tests/frameworkVitestSetup.js +1 -1
- package/dist/tests/frameworkVitestSetup.js.map +1 -1
- package/dist/tests/globalSetupNodeTest.js +2 -2
- package/dist/tests/globalSetupNodeTest.js.map +1 -1
- package/dist/tests/globalSetupVitest.js +2 -8
- package/dist/tests/globalSetupVitest.js.map +1 -1
- package/dist/tests/mocks.d.ts +17 -0
- package/dist/tests/mocks.js +33 -0
- package/dist/tests/mocks.js.map +1 -0
- package/dist/tests/nodeRunner.node-test.d.ts +3 -3
- package/dist/tests/nodeRunner.node-test.js +6 -7
- package/dist/tests/nodeRunner.node-test.js.map +1 -1
- package/dist/tests/nodeRunnerShared.node-test.d.ts +1 -1
- package/dist/tests/nodeRunnerShared.node-test.js +1 -1
- package/dist/tests/parameterized.d.ts +4 -0
- package/dist/tests/parameterized.js +10 -0
- package/dist/tests/parameterized.js.map +1 -0
- package/dist/tests/redisAvailability.d.ts +28 -0
- package/dist/tests/redisAvailability.js +73 -0
- package/dist/tests/redisAvailability.js.map +1 -0
- package/dist/tests/setupFramework.d.ts +3 -5
- package/dist/tests/setupFramework.js +3 -5
- package/dist/tests/setupFramework.js.map +1 -1
- package/dist/tests/setupNodeTest.js +26 -13
- package/dist/tests/setupNodeTest.js.map +1 -1
- package/dist/tests/setupVitest.js +3 -3
- package/dist/tests/setupVitest.js.map +1 -1
- package/package.json +10 -8
package/CHANGELOG.md
CHANGED
|
@@ -4,7 +4,42 @@ 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.
|
|
7
|
+
## [5.3.1] - Unreleased
|
|
8
|
+
|
|
9
|
+
### Fixed
|
|
10
|
+
|
|
11
|
+
- **Single-nested subdocuments dropped `TsTypeOverride` on the raw surface entirely.** A field marked `TsTypeOverride<…>` inside a subdocument declared in the `{ type: { … } }` form kept its plain inferred type on raw, lean and create surfaces — `lean.description.short` was `string` rather than the overridden locale map. `ApplyTsOverrides` recursed into the wrapper object, whose own keys are `type`/`_id`, so every inner key failed the `K extends keyof Schema` alignment and fell through unchanged. It now unwraps the single-nested definition before recursing. Plain nested paths (`organizer: { name: … }`, no `type` wrapper) were never affected, which is why this went unnoticed; `HasTsOverride` needed no change, as it walks every key blindly and already saw markers through the wrapper. Independent of `_id: false` — it affected every single-nested subdocument.
|
|
12
|
+
|
|
13
|
+
- **`_id: false` single-nested subdocuments exposed the RAW type override on their hydrated surface.** A field marked `TsTypeOverride<TRaw, THydrated>` inside a single-nested subdocument declared with `_id: false` resolved to `TRaw` on a hydrated document instead of `THydrated` — e.g. `doc.description.short` typed as the stored locale map rather than `string | LocaleMap`, forcing a cast at every read. `CorrectHydratedSubdocumentElement` re-derives the subdocument type from the schema and called `MaybeApplyOverrides` without a surface argument, which defaults to `'raw'`; it now passes `'hydrated'` explicitly, like the two top-level builders already did. Top-level fields were never affected, and the path only runs for `_id: false` schemas, so nothing else changes. Pinned by a new case in the `tsTypeOverride` tsc-gate fixture.
|
|
14
|
+
|
|
15
|
+
## [5.3.0] - 2026-08-08
|
|
16
|
+
|
|
17
|
+
### Added
|
|
18
|
+
|
|
19
|
+
- **Routes can now validate and coerce their path params with a `params:` schema.** Path params were the last request input the framework never checked — `request:` covers the body and `query:` the query string, but `:id` segments arrived as raw strings straight from the matcher. A route may now declare `params:` with any Standard Schema validator; it is validated before the handler runs, a failure is a **400** with the framework's usual `{ errors: { <param>: [...] } }` shape, and the validated, coerced result lands on `req.appInfo.params` — parallel to `.request` and `.query`. Raw `req.params` is deliberately untouched and keeps its Express string values, so nothing existing changes: the two surfaces are separate on purpose. Codegen types the validated surface from the schema's output (`req.appInfo.params.n` is a `number` where `req.params.n` is still a `string`); generated output is byte-identical for routes that declare no `params:`. Route-level only — middleware contribute body/query schemas but never param schemas.
|
|
20
|
+
|
|
21
|
+
```ts
|
|
22
|
+
'/person/:id': {
|
|
23
|
+
handler: this.getOne,
|
|
24
|
+
params: z.object({ id: z.string().regex(/^[0-9a-fA-F]{24}$/) }),
|
|
25
|
+
}
|
|
26
|
+
```
|
|
27
|
+
|
|
28
|
+
- **The OpenAPI generator now types path parameters from the route's `params:` schema.** Path parameters were emitted from the URL pattern alone, always as `schema: { type: 'string' }`. When a route declares `params:`, each matching parameter now carries that schema's introspected JSON Schema (pattern, numeric bounds, enum, format) through the same `toJsonSchema` driver seam that already documents `request:` and `query:`. Parameters stay `required: true` regardless of the schema's optionality — a path param is part of the URL by construction, and OpenAPI 3.1 forbids an optional one. A param the schema omits, or a schema no driver can introspect, degrades to the previous `string` (with the usual containment warning) rather than dropping the route. A `params:` key with no matching path segment is reported as a warning — it can never be populated at runtime.
|
|
29
|
+
|
|
30
|
+
### Changed
|
|
31
|
+
|
|
32
|
+
- **`oxc-parser` is now an optional peer dependency — action required if you run code generation.** It is a native (napi) package used only by the codegen front end (`astExtract`/`astConfig`), reachable only through the `generatetypes` command, and it was never loaded at runtime — yet every production install carried it and its platform binary (~3 MB, about 11% of the installed footprint). It is now loaded lazily and declared optional, so `npm ci --omit=dev` no longer pulls a native binary the app will never call. **Projects that run `npm run gen` must add it as a devDependency** (`npm i -D oxc-parser`); the command fails with that exact instruction if it is missing. Same treatment already given to `@redis/client` and `yup`, and the packaging smoke test now asserts the package stays absent from a default install.
|
|
33
|
+
|
|
34
|
+
- **Behavior change — a Mongoose `CastError` caused by client input is now a 400 instead of a 500.** Passing an unvalidated path param to Mongoose (`findById(req.params.id)` with a malformed id) threw a `CastError`, which — being a sibling of `ValidationError`, not a subclass — the v5.1 validation safety net structurally could not see, so it surfaced as `500 Platform error` and was logged at `error` with a full stack. A standalone `CastError` is now resolved through the error-handler registry: when the rejected value is one the client actually supplied (matched by value against the path params and the validated body/query), it becomes a **400** keyed by that public input name, logged at `warn`. A cast failure on a server-computed value matches nothing and keeps its honest 500 at `error` — a genuine server defect is never blamed on the caller. The message is rebuilt from the cast `kind` (`Must be a valid id`), so neither the rejected value nor the internal model path (`_id`) reaches the response; the `warn` log line is sanitized the same way. Declaring a route `params:` schema still produces a better 400 earlier, with wording you control — this floor only covers the routes that declare none.
|
|
35
|
+
|
|
36
|
+
- **The framework's own test suite now runs on Node's built-in test runner.** All framework tests, assertions, parameterized cases, timers, spies, and module mocks have moved from Vitest to `node:test`; `npm test` now emits native JUnit and LCOV reports, and the test workflow is pinned to Node 26. Vitest remains an optional peer dependency, and the public `tests/setupVitest.js` / `tests/globalSetupVitest.js` adapters remain available for consumer projects. Native-runner consumers should preload `@adaptivestone/framework/tests/setupNodeTest.js` and use `--test-global-setup=@adaptivestone/framework/tests/globalSetupNodeTest.js`. The published runtime requirement remains Node 24 or newer; Node 26 is the development and CI test runtime.
|
|
37
|
+
|
|
38
|
+
### Fixed
|
|
39
|
+
|
|
40
|
+
- **Plugin-reshaped model fields can now declare different raw and hydrated types.** `TsTypeOverride<TRaw, THydrated = TRaw>` keeps its existing one-type behavior by default, while plugins with a stored shape that differs from their document getter can opt into both surfaces. Raw values drive create/casting inputs and lean results; hydrated values drive loaded documents, including nested objects and `DocumentArray` elements. This remains a generic, compile-time-only extension point—the framework does not special-case plugin options such as `intl: true`. A locale plugin can therefore accept a stored `{ en, fr }` map while exposing `string | LocaleMap` from its stateful hydrated getter, without per-call model casts.
|
|
41
|
+
|
|
42
|
+
## [5.2.2] - 2026-08-01
|
|
8
43
|
|
|
9
44
|
### Added
|
|
10
45
|
|
package/README.md
CHANGED
|
@@ -47,6 +47,16 @@ them with:
|
|
|
47
47
|
node src/cli.ts generatetypes
|
|
48
48
|
```
|
|
49
49
|
|
|
50
|
+
Code generation needs the **optional peer dependency `oxc-parser`** — install it
|
|
51
|
+
as a devDependency in your project:
|
|
52
|
+
|
|
53
|
+
```sh
|
|
54
|
+
npm i -D oxc-parser
|
|
55
|
+
```
|
|
56
|
+
|
|
57
|
+
It parses your controller sources and is never loaded at runtime, so it stays
|
|
58
|
+
out of production installs (`npm ci --omit=dev`).
|
|
59
|
+
|
|
50
60
|
They are gitignored — regenerate after pulling (a fresh checkout is red in the
|
|
51
61
|
editor until the first run). In CI, guard against stale types with
|
|
52
62
|
`node src/cli.ts generatetypes --check`, which writes nothing and exits non-zero
|
|
@@ -27,7 +27,7 @@
|
|
|
27
27
|
*/
|
|
28
28
|
import { promises as fs } from 'node:fs';
|
|
29
29
|
import merge from 'deepmerge';
|
|
30
|
-
import {
|
|
30
|
+
import { parseSource } from './parser.js';
|
|
31
31
|
/** True for `process.env.X` and `process.env['X']` (the dropped, no-default form). */
|
|
32
32
|
function isProcessEnv(node) {
|
|
33
33
|
return (node?.type === 'MemberExpression' &&
|
|
@@ -130,7 +130,7 @@ export async function extractConfigEnvShape(srcPath) {
|
|
|
130
130
|
return {};
|
|
131
131
|
}
|
|
132
132
|
try {
|
|
133
|
-
const { program } =
|
|
133
|
+
const { program } = parseSource(srcPath, source);
|
|
134
134
|
const obj = findDefaultExportObject(program.body);
|
|
135
135
|
return obj ? shapeOfObject(obj) : {};
|
|
136
136
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"astConfig.js","sourceRoot":"","sources":["../../src/codegen/astConfig.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AAEH,OAAO,EAAE,QAAQ,IAAI,EAAE,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,KAAK,MAAM,WAAW,CAAC;AAC9B,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"astConfig.js","sourceRoot":"","sources":["../../src/codegen/astConfig.ts"],"names":[],"mappings":"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"}
|
package/dist/codegen/astEmit.js
CHANGED
|
@@ -164,6 +164,7 @@ function renderResolved(srcPath, resolved, flatByKey, urlPrefix) {
|
|
|
164
164
|
handlerName: r.handler,
|
|
165
165
|
hasSchema: r.hasRequest,
|
|
166
166
|
hasQuerySchema: r.hasQuery,
|
|
167
|
+
hasParamsSchema: r.hasParams,
|
|
167
168
|
...(r.requestContentTypes
|
|
168
169
|
? { requestContentTypes: r.requestContentTypes }
|
|
169
170
|
: {}),
|
|
@@ -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":"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"}
|
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
* `AuthMiddleware`) that `importResolution` solved by live-class
|
|
13
13
|
* identity matching simply never arises.
|
|
14
14
|
* - `extendsName`: the EXPORTED class's parent identifier (or `null`).
|
|
15
|
-
* - `routes`: method → path → { handler, hasRequest, hasQuery }.
|
|
15
|
+
* - `routes`: method → path → { handler, hasRequest, hasQuery, hasParams }.
|
|
16
16
|
* - `middleware`: name-tagged `[{ scope, bindings }]`, or `undefined` when the
|
|
17
17
|
* controller declares none (inherits its parent's).
|
|
18
18
|
*
|
|
@@ -23,9 +23,12 @@
|
|
|
23
23
|
* aspect is flagged via `ok: false` / `reason`; codegen can't statically analyze
|
|
24
24
|
* that controller and the run throws (no boot fallback — declarative-only).
|
|
25
25
|
*
|
|
26
|
-
* oxc, not the TypeScript API: `ts.createSourceFile` is dropped in TS 7's Go port
|
|
27
|
-
*
|
|
28
|
-
*
|
|
26
|
+
* oxc, not the TypeScript API: `ts.createSourceFile` is dropped in TS 7's Go port
|
|
27
|
+
* (its `unstable/ast` replacement exposes a scanner/visitor but no standalone file
|
|
28
|
+
* parser, and `unstable/sync` is the full Program/Checker API). oxc is a stable
|
|
29
|
+
* in-process napi parser, and codegen needs only syntactic extraction — it emits
|
|
30
|
+
* type expressions, it never resolves types. The parser is an OPTIONAL peer loaded
|
|
31
|
+
* lazily; see `parser.ts`.
|
|
29
32
|
*/
|
|
30
33
|
export interface ImportInfo {
|
|
31
34
|
specifier: string;
|
|
@@ -40,6 +43,8 @@ export interface RouteInfo {
|
|
|
40
43
|
handler: string | null;
|
|
41
44
|
hasRequest: boolean;
|
|
42
45
|
hasQuery: boolean;
|
|
46
|
+
/** A route-level `params:` schema is declared (validated path params). */
|
|
47
|
+
hasParams: boolean;
|
|
43
48
|
/** Media-type keys when `request` is a content-type map (`{ 'application/json':
|
|
44
49
|
* … }`); absent for a single-schema request. */
|
|
45
50
|
requestContentTypes?: string[];
|
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
* `AuthMiddleware`) that `importResolution` solved by live-class
|
|
13
13
|
* identity matching simply never arises.
|
|
14
14
|
* - `extendsName`: the EXPORTED class's parent identifier (or `null`).
|
|
15
|
-
* - `routes`: method → path → { handler, hasRequest, hasQuery }.
|
|
15
|
+
* - `routes`: method → path → { handler, hasRequest, hasQuery, hasParams }.
|
|
16
16
|
* - `middleware`: name-tagged `[{ scope, bindings }]`, or `undefined` when the
|
|
17
17
|
* controller declares none (inherits its parent's).
|
|
18
18
|
*
|
|
@@ -23,19 +23,22 @@
|
|
|
23
23
|
* aspect is flagged via `ok: false` / `reason`; codegen can't statically analyze
|
|
24
24
|
* that controller and the run throws (no boot fallback — declarative-only).
|
|
25
25
|
*
|
|
26
|
-
* oxc, not the TypeScript API: `ts.createSourceFile` is dropped in TS 7's Go port
|
|
27
|
-
*
|
|
28
|
-
*
|
|
26
|
+
* oxc, not the TypeScript API: `ts.createSourceFile` is dropped in TS 7's Go port
|
|
27
|
+
* (its `unstable/ast` replacement exposes a scanner/visitor but no standalone file
|
|
28
|
+
* parser, and `unstable/sync` is the full Program/Checker API). oxc is a stable
|
|
29
|
+
* in-process napi parser, and codegen needs only syntactic extraction — it emits
|
|
30
|
+
* type expressions, it never resolves types. The parser is an OPTIONAL peer loaded
|
|
31
|
+
* lazily; see `parser.ts`.
|
|
29
32
|
*/
|
|
30
|
-
import { parseSync } from 'oxc-parser';
|
|
31
33
|
import { HTTP_METHODS } from '../services/http/routing/RouteNode.js';
|
|
34
|
+
import { parseSource } from './parser.js';
|
|
32
35
|
/** Valid `routes`-getter verbs (upper-case), the single source of truth shared
|
|
33
36
|
* with the runtime loader. A route under any other key never matches at runtime,
|
|
34
37
|
* so codegen must not emit a request type for it. */
|
|
35
38
|
const ROUTE_VERBS = new Set(HTTP_METHODS);
|
|
36
39
|
/** Parse a controller source and extract its declarative codegen shape. */
|
|
37
40
|
export function extractController(src, fileName) {
|
|
38
|
-
const { program, errors } =
|
|
41
|
+
const { program, errors } = parseSource(fileName, src);
|
|
39
42
|
if (errors.length) {
|
|
40
43
|
return {
|
|
41
44
|
ok: false,
|
|
@@ -341,6 +344,15 @@ function unanalyzableRoute(init) {
|
|
|
341
344
|
}
|
|
342
345
|
return null;
|
|
343
346
|
}
|
|
347
|
+
/**
|
|
348
|
+
* Is this schema slot written as an explicit `null`/`undefined`? Both are legal
|
|
349
|
+
* (the runtime skips validation on a nullish schema — `obj.<slot> != null`), and
|
|
350
|
+
* neither is a schema, so codegen must not emit `InferOutput<null | undefined>`.
|
|
351
|
+
*/
|
|
352
|
+
function isNullishLiteral(node) {
|
|
353
|
+
return ((node.type === 'Literal' && node.value === null) ||
|
|
354
|
+
(node.type === 'Identifier' && node.name === 'undefined'));
|
|
355
|
+
}
|
|
344
356
|
function readRouteEntry(method, path, init) {
|
|
345
357
|
// Bare handler: `'/logout': this.postLogout`
|
|
346
358
|
if (init.type === 'MemberExpression' &&
|
|
@@ -351,6 +363,7 @@ function readRouteEntry(method, path, init) {
|
|
|
351
363
|
handler: init.property?.name ?? null,
|
|
352
364
|
hasRequest: false,
|
|
353
365
|
hasQuery: false,
|
|
366
|
+
hasParams: false,
|
|
354
367
|
};
|
|
355
368
|
}
|
|
356
369
|
// `{ handler: this.x, request?, query?, middleware? }`
|
|
@@ -361,6 +374,7 @@ function readRouteEntry(method, path, init) {
|
|
|
361
374
|
handler: null,
|
|
362
375
|
hasRequest: false,
|
|
363
376
|
hasQuery: false,
|
|
377
|
+
hasParams: false,
|
|
364
378
|
};
|
|
365
379
|
for (const prop of init.properties) {
|
|
366
380
|
if (prop.type !== 'Property') {
|
|
@@ -371,12 +385,7 @@ function readRouteEntry(method, path, init) {
|
|
|
371
385
|
out.handler = prop.value.property?.name ?? null;
|
|
372
386
|
}
|
|
373
387
|
else if (key === 'request') {
|
|
374
|
-
|
|
375
|
-
// validation when `request` is nullish, `obj.request != null`) — neither
|
|
376
|
-
// is a schema, so don't emit `InferOutput<null | undefined>`.
|
|
377
|
-
const isNullLiteral = prop.value.type === 'Literal' && prop.value.value === null;
|
|
378
|
-
const isUndefinedIdent = prop.value.type === 'Identifier' && prop.value.name === 'undefined';
|
|
379
|
-
if (!isNullLiteral && !isUndefinedIdent) {
|
|
388
|
+
if (!isNullishLiteral(prop.value)) {
|
|
380
389
|
out.hasRequest = true; // the VALUE (defineSchema(...)) is never evaluated
|
|
381
390
|
// A content-type map → its media-type keys (mirrors the runtime
|
|
382
391
|
// `isContentTypeRequestMap`: a plain object whose keys all contain `/`).
|
|
@@ -389,13 +398,25 @@ function readRouteEntry(method, path, init) {
|
|
|
389
398
|
else if (key === 'query') {
|
|
390
399
|
out.hasQuery = true;
|
|
391
400
|
}
|
|
401
|
+
else if (key === 'params') {
|
|
402
|
+
if (!isNullishLiteral(prop.value)) {
|
|
403
|
+
out.hasParams = true;
|
|
404
|
+
}
|
|
405
|
+
}
|
|
392
406
|
else if (key === 'middleware') {
|
|
393
407
|
out.middleware = middlewareBindings(prop.value);
|
|
394
408
|
}
|
|
395
409
|
}
|
|
396
410
|
return out;
|
|
397
411
|
}
|
|
398
|
-
return {
|
|
412
|
+
return {
|
|
413
|
+
method,
|
|
414
|
+
path,
|
|
415
|
+
handler: null,
|
|
416
|
+
hasRequest: false,
|
|
417
|
+
hasQuery: false,
|
|
418
|
+
hasParams: false,
|
|
419
|
+
};
|
|
399
420
|
}
|
|
400
421
|
/** The literal keys of an object expression, or `null` if any is computed/spread. */
|
|
401
422
|
function objectKeys(value) {
|
|
@@ -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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"}
|
|
@@ -38,6 +38,8 @@ export interface RouteMeta {
|
|
|
38
38
|
requestContentTypes?: string[];
|
|
39
39
|
/** True when the route entry has a `query` schema. */
|
|
40
40
|
hasQuerySchema: boolean;
|
|
41
|
+
/** True when the route entry has a `params` schema (validated path params). */
|
|
42
|
+
hasParamsSchema?: boolean;
|
|
41
43
|
}
|
|
42
44
|
/** Aggregate metadata for one controller. */
|
|
43
45
|
export interface ControllerMeta {
|
package/dist/codegen/emit.js
CHANGED
|
@@ -167,6 +167,12 @@ function renderShape(route, chain, routesAlias, navigateSchema) {
|
|
|
167
167
|
if (route.hasQuerySchema && navigateSchema) {
|
|
168
168
|
appInfoOverrides.push(`query: StandardSchemaV1.InferOutput<${routesAlias}[${sq(route.method)}][${sq(route.path)}]['query']>`);
|
|
169
169
|
}
|
|
170
|
+
// A `params:` schema types the VALIDATED surface (`appInfo.params`) only. The
|
|
171
|
+
// raw `params` override above stays `string`-valued — the runtime never
|
|
172
|
+
// rewrites `req.params`, so the two surfaces are deliberately different types.
|
|
173
|
+
if (route.hasParamsSchema && navigateSchema) {
|
|
174
|
+
appInfoOverrides.push(`params: StandardSchemaV1.InferOutput<${routesAlias}[${sq(route.method)}][${sq(route.path)}]['params']>`);
|
|
175
|
+
}
|
|
170
176
|
const appInfoOverride = appInfoOverrides.length > 0 ? ` & { ${appInfoOverrides.join('; ')} }` : '';
|
|
171
177
|
return `BaseRequestContext & { appInfo: UnionAppInfoProvides<${tupleInner}>${appInfoOverride} }${paramsOverride}`;
|
|
172
178
|
}
|
package/dist/codegen/emit.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"emit.js","sourceRoot":"","sources":["../../src/codegen/emit.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"emit.js","sourceRoot":"","sources":["../../src/codegen/emit.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Lazy, optional binding to `oxc-parser`.
|
|
3
|
+
*
|
|
4
|
+
* `oxc-parser` is a **native (napi) package used only by code generation** —
|
|
5
|
+
* `astExtract` and `astConfig` are its sole importers, and both are reachable
|
|
6
|
+
* only through the `generatetypes` CLI command. Keeping it an optional peer
|
|
7
|
+
* keeps ~3 MB of platform binaries out of every consumer's production install,
|
|
8
|
+
* where it is never loaded. Same treatment as `@redis/client` and `yup`; the
|
|
9
|
+
* packaging smoke test asserts it stays absent.
|
|
10
|
+
*
|
|
11
|
+
* `createRequire` rather than `await import()`: the extractor entry point
|
|
12
|
+
* (`extractController`) is synchronous and called from synchronous code, so an
|
|
13
|
+
* async load would ripple a signature change through the whole codegen front
|
|
14
|
+
* end to buy nothing. Node resolves `require()` of an ESM package from 22.12
|
|
15
|
+
* onward, and the framework's floor is 24.
|
|
16
|
+
*/
|
|
17
|
+
/**
|
|
18
|
+
* The slice of oxc's result the codegen front end reads. Declared structurally
|
|
19
|
+
* rather than imported from `oxc-parser`, so no generated `.d.ts` references a
|
|
20
|
+
* package that may not be installed. Nothing is lost: the extractor already
|
|
21
|
+
* walks the ESTree program untyped (`type Node = any`).
|
|
22
|
+
*/
|
|
23
|
+
export interface ParseResult {
|
|
24
|
+
program: any;
|
|
25
|
+
errors: {
|
|
26
|
+
message: string;
|
|
27
|
+
}[];
|
|
28
|
+
}
|
|
29
|
+
/**
|
|
30
|
+
* Parse a source file, loading the parser on first use.
|
|
31
|
+
*
|
|
32
|
+
* @throws when `oxc-parser` is not installed — with the install command, since
|
|
33
|
+
* this is only ever reached from code generation and the fix is one line.
|
|
34
|
+
*/
|
|
35
|
+
export declare function parseSource(fileName: string, source: string): ParseResult;
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Lazy, optional binding to `oxc-parser`.
|
|
3
|
+
*
|
|
4
|
+
* `oxc-parser` is a **native (napi) package used only by code generation** —
|
|
5
|
+
* `astExtract` and `astConfig` are its sole importers, and both are reachable
|
|
6
|
+
* only through the `generatetypes` CLI command. Keeping it an optional peer
|
|
7
|
+
* keeps ~3 MB of platform binaries out of every consumer's production install,
|
|
8
|
+
* where it is never loaded. Same treatment as `@redis/client` and `yup`; the
|
|
9
|
+
* packaging smoke test asserts it stays absent.
|
|
10
|
+
*
|
|
11
|
+
* `createRequire` rather than `await import()`: the extractor entry point
|
|
12
|
+
* (`extractController`) is synchronous and called from synchronous code, so an
|
|
13
|
+
* async load would ripple a signature change through the whole codegen front
|
|
14
|
+
* end to buy nothing. Node resolves `require()` of an ESM package from 22.12
|
|
15
|
+
* onward, and the framework's floor is 24.
|
|
16
|
+
*/
|
|
17
|
+
import { createRequire } from 'node:module';
|
|
18
|
+
let parseSync = null;
|
|
19
|
+
/**
|
|
20
|
+
* Parse a source file, loading the parser on first use.
|
|
21
|
+
*
|
|
22
|
+
* @throws when `oxc-parser` is not installed — with the install command, since
|
|
23
|
+
* this is only ever reached from code generation and the fix is one line.
|
|
24
|
+
*/
|
|
25
|
+
export function parseSource(fileName, source) {
|
|
26
|
+
if (!parseSync) {
|
|
27
|
+
const require = createRequire(import.meta.url);
|
|
28
|
+
try {
|
|
29
|
+
({ parseSync } = require('oxc-parser'));
|
|
30
|
+
}
|
|
31
|
+
catch (cause) {
|
|
32
|
+
throw new Error('Code generation requires the optional peer dependency `oxc-parser`, which is not installed. ' +
|
|
33
|
+
'Add it as a devDependency:\n\n npm i -D oxc-parser\n\n' +
|
|
34
|
+
'It is needed only to run `generatetypes`; the framework never loads it at runtime.', { cause });
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
return parseSync(fileName, source);
|
|
38
|
+
}
|
|
39
|
+
//# sourceMappingURL=parser.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"parser.js","sourceRoot":"","sources":["../../src/codegen/parser.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAgB5C,IAAI,SAAS,GAAqB,IAAI,CAAC;AAEvC;;;;;GAKG;AACH,MAAM,UAAU,WAAW,CAAC,QAAgB,EAAE,MAAc;IAC1D,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,MAAM,OAAO,GAAG,aAAa,CAAC,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC;QAC/C,IAAI,CAAC;YACH,CAAC,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,YAAY,CAA6B,CAAC,CAAC;QACtE,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,IAAI,KAAK,CACb,8FAA8F;gBAC5F,yDAAyD;gBACzD,oFAAoF,EACtF,EAAE,KAAK,EAAE,CACV,CAAC;QACJ,CAAC;IACH,CAAC;IACD,OAAO,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;AACrC,CAAC"}
|
|
@@ -298,8 +298,18 @@ class ControllerManager extends Base {
|
|
|
298
298
|
querySchemas.push(entry.query);
|
|
299
299
|
}
|
|
300
300
|
querySchemas.push(...middlewareQuerySchemas);
|
|
301
|
+
// Path params are route-level only — middleware contribute body/query
|
|
302
|
+
// schemas but never param schemas, so there is nothing to merge here.
|
|
303
|
+
const paramsSchema = entry.params;
|
|
301
304
|
const wrapped = async (req, res, next) => {
|
|
302
305
|
try {
|
|
306
|
+
// Params first: a malformed `:id` means the request targets nothing
|
|
307
|
+
// coherent, so it should decide the 400 before body/query detail does.
|
|
308
|
+
// Raw `req.params` is left untouched (Express string contract); only
|
|
309
|
+
// `req.appInfo.params` carries the validated, coerced values.
|
|
310
|
+
if (paramsSchema) {
|
|
311
|
+
req.appInfo.params = (await new ValidateService(app, paramsSchema).validate(req.params, req.appInfo.i18n));
|
|
312
|
+
}
|
|
303
313
|
const requestSchemas = [];
|
|
304
314
|
let resolvedContentType = null;
|
|
305
315
|
if (entryRequestMapLookup) {
|
|
@@ -499,6 +509,10 @@ function buildHandlerEntry(spec, controller) {
|
|
|
499
509
|
// biome-ignore lint/suspicious/noExplicitAny: Standard Schema validator passthrough
|
|
500
510
|
entry.query = obj.query;
|
|
501
511
|
}
|
|
512
|
+
if (obj.params != null) {
|
|
513
|
+
// biome-ignore lint/suspicious/noExplicitAny: Standard Schema validator passthrough
|
|
514
|
+
entry.params = obj.params;
|
|
515
|
+
}
|
|
502
516
|
if (obj.bodyParsing) {
|
|
503
517
|
entry.bodyParsing = obj.bodyParsing;
|
|
504
518
|
}
|