@adaptivestone/framework 5.1.3 → 5.2.0

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 CHANGED
@@ -4,7 +4,29 @@ 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.3] - Unreleased
7
+ ## [5.2.0] - 2026-07-20
8
+
9
+ ### Added
10
+
11
+ - **Controller route groups.** A fully parenthesized folder below `controllers/` is now organizational only and does not contribute a URL segment: `controllers/(group)/Reports.ts` keeps the default `/reports` mount, while `controllers/(group)/admin/Settings.ts` mounts at `/admin/settings`. Runtime registration and AST route-type generation use the same prefix normalizer, generated files remain beside their controller sources, ordinary folders are unchanged, and a route collision created by grouping fails loudly at boot.
12
+
13
+ ### Fixed
14
+
15
+ - **One unrepresentable request schema no longer aborts the entire OpenAPI export.** Zod schemas are exported from their input shape (`io: 'input'`), so transforms describe what clients send; unsupported constructs degrade to an unconstrained schema instead of throwing, and `z.coerce.date()` follows the framework HTTP convention of an RFC 3339 `date-time` string. Conversion failures from any validator driver are contained per schema with a contextual warning: body schemas receive the existing placeholder, query parameters are omitted, and every healthy route remains in the document. Genuine command failures still exit non-zero through the existing CLI failure path.
16
+ - **Application node:test setup can no longer race framework server bootstrap.** `ensureTestServerReady()` is now exported from `@adaptivestone/framework/tests/testHelpers.js`; it and the framework preload share one idempotent per-file startup promise, so sibling root-level `before()` hooks can explicitly await the initialized server without constructing it twice. The node-runner regression suite exercises the race, and testing guidance now covers hook placement plus common assertion and mocking migration traps. The documented coverage thresholds remain enforced by Node 24 with simultaneous `spec` and `lcov` reporters.
17
+
18
+ ## [5.1.4] - 2026-07-19
19
+
20
+ ### Added
21
+
22
+ - **Public Node cluster runner.** Consumers can import `runCluster` from `@adaptivestone/framework/cluster.js` to run a worker callback across a configurable number of processes. The narrow API exposes worker count, shutdown timeout, and a structured lifecycle-event hook; fixed internal safety policy provides delayed abnormal-exit recovery and crash-loop protection without turning the framework into a configurable process manager. SIGTERM/SIGINT are forwarded, stuck workers are force-terminated after the timeout, the callback runs only in workers, and importing the entry has no side effects. Clustering is optional—systemd, PM2, Kubernetes, and similar deployment supervisors should normally own replica count and restarts themselves. The framework's `prod` entry now uses this same implementation and no longer enables file watching implicitly.
23
+
24
+ ### Documentation
25
+
26
+ - **Controller routing now documents the runtime rule precisely.** The default mount path is the controller-folder prefix plus the lowercased class name; the filename does not determine the URL and exporting one controller class from multiple files mounts it multiple times. Multi-word class names are not implicitly kebab-cased.
27
+ - **Typed rate-limit policies and stable validation assertions are documented.** Reusable limiter option objects can live under `config/rateLimiter.ts` `policy`, where generated config types catch misspelled names before the selected object is passed directly to `RateLimiter`. The testing guide now explains that application validation keys remain raw unless the application locale folder is explicitly enabled, so ordinary API tests should assert keys and status codes rather than translated prose.
28
+
29
+ ## [5.1.3] - 2026-07-18
8
30
 
9
31
  ### Security
10
32
 
package/README.md CHANGED
@@ -52,14 +52,33 @@ editor until the first run). In CI, guard against stale types with
52
52
  `node src/cli.ts generatetypes --check`, which writes nothing and exits non-zero
53
53
  if anything is out of date. The template wires this into its `check:types` script.
54
54
 
55
+ Starting with v5.2.0, a fully parenthesized controller-folder segment is an
56
+ organizational route group: `src/controllers/(group)/Reports.ts` keeps the
57
+ default `/reports` URL, while its generated file remains beside the controller.
58
+ Ordinary folders still contribute their lowercased URL segments.
59
+
60
+ ## OpenAPI
61
+
62
+ Generate an OpenAPI 3.1 document from the same controller routes and request
63
+ schemas used at runtime:
64
+
65
+ ```sh
66
+ node src/cli.ts openapi --output openapi.json
67
+ ```
68
+
69
+ Zod request schemas describe their input shape. An unsupported individual
70
+ schema produces a contextual warning and safe fallback without removing healthy
71
+ routes from the document. See the full [OpenAPI guide](https://framework.adaptivestone.com/docs/openapi).
72
+
55
73
  ## Public API & stability
56
74
 
57
75
  Only the subpaths listed under `exports` in `package.json` are importable as
58
76
  `@adaptivestone/framework/<path>`; internal modules are intentionally not
59
77
  exported. Exported paths follow semver in two tiers:
60
78
 
61
- - **Tier 1 — stable:** `server.js`, `Cli.js`, `types.js`, `folderConfig.js`,
62
- `modules/*`, `models/*`, `controllers/*`, `tests/*`, `migrations/*`.
79
+ - **Tier 1 — stable:** `server.js`, `Cli.js`, `cluster.js`, `types.js`,
80
+ `folderConfig.js`, `modules/*`, `models/*`, `controllers/*`, `tests/*`,
81
+ `migrations/*`.
63
82
  - **Tier 2 — extension surface:** `config/*`, `helpers/*`, and `services/*` — may
64
83
  change in a minor (with a deprecation cycle); pin to a minor if you import them
65
84
  directly. `config/*` is what you import to extend the framework's default
package/dist/cluster.d.ts CHANGED
@@ -1 +1,3 @@
1
- export {};
1
+ import { type ClusterEvent, type ClusterWorkerCount, type RunClusterOptions, runCluster } from './clusterRunner.ts';
2
+ export type { ClusterEvent, ClusterWorkerCount, RunClusterOptions };
3
+ export { runCluster };
package/dist/cluster.js CHANGED
@@ -1,67 +1,11 @@
1
- import cluster from 'node:cluster';
2
- import { cpus } from 'node:os';
3
- const numCPUs = cpus().length;
4
- if (cluster.isPrimary) {
5
- console.log(`Master ${process.pid} is running`);
6
- // Fork workers.
7
- for (let i = 0; i < numCPUs; i += 1) {
8
- cluster.fork();
9
- }
10
- // An orchestrator sends SIGTERM/SIGINT to PID 1 (the primary). Forward it to
11
- // every worker so each drains gracefully via its own signal handler (workers
12
- // run index.ts → startServer); the primary exits once the last worker is gone.
13
- let shuttingDown = false;
14
- for (const signal of ['SIGTERM', 'SIGINT']) {
15
- process.on(signal, () => {
16
- shuttingDown = true;
17
- for (const worker of Object.values(cluster.workers ?? {})) {
18
- worker?.kill(signal);
19
- }
20
- });
21
- }
22
- // Bound crash-loop restarts. A worker that keeps dying on boot (bad config,
23
- // port in use, missing Mongo/AUTH_SALT, unhandled rejection) must NOT be
24
- // re-forked in a tight loop — that pegs every core and floods logs. Track
25
- // restarts in a rolling window; if they arrive too fast, stop forking and
26
- // exit so the orchestrator surfaces the crash-loop instead of the primary
27
- // masking it forever. Healthy single crashes still recover (after a short
28
- // backoff).
29
- const RESTART_WINDOW_MS = 60_000;
30
- const MAX_RESTARTS_PER_WINDOW = numCPUs * 5;
31
- const RESTART_BACKOFF_MS = 1_000;
32
- let restartTimes = [];
33
- cluster.on('exit', (worker, code, signal) => {
34
- if (shuttingDown) {
35
- // Tearing down: don't resurrect; exit when the last worker has gone.
36
- if (Object.keys(cluster.workers ?? {}).length === 0) {
37
- process.exit(0);
38
- }
39
- return;
40
- }
41
- // Deliberate shutdown (clean exit, no kill signal) — do not resurrect,
42
- // otherwise the primary fights a graceful shutdown forever.
43
- if (code === 0 && !signal) {
44
- return;
45
- }
46
- const now = Date.now();
47
- restartTimes = restartTimes.filter((t) => now - t < RESTART_WINDOW_MS);
48
- restartTimes.push(now);
49
- if (restartTimes.length > MAX_RESTARTS_PER_WINDOW) {
50
- console.error(`Too many worker crashes (${restartTimes.length} in ${RESTART_WINDOW_MS / 1000}s). Refusing to keep forking — check the boot error above (config, DB, port). Exiting.`);
51
- process.exit(1);
52
- }
53
- console.log(`Worker \x1B[45m ${worker.process.pid} \x1B[49m \x1B[41m †††† died †††† \x1B[49m. Code: ${signal || code}. Restarting in ${RESTART_BACKOFF_MS}ms...`);
54
- setTimeout(() => {
55
- if (!shuttingDown) {
56
- cluster.fork();
57
- }
58
- }, RESTART_BACKOFF_MS).unref();
1
+ import { runCluster, } from './clusterRunner.js';
2
+ export { runCluster };
3
+ // Keep the framework's own production entry on the public implementation.
4
+ // Importing `@adaptivestone/framework/cluster.js` has no side effects; this runs
5
+ // only for `node src/cluster.ts` / `node dist/cluster.js`.
6
+ if (import.meta.main) {
7
+ await runCluster(async () => {
8
+ await import('./index.js');
59
9
  });
60
10
  }
61
- else {
62
- // index.ts is the entry that actually constructs the Server and starts
63
- // listening. server.ts only DEFINES the class, so importing it here would
64
- // let the worker's event loop drain and exit → infinite fork storm.
65
- import('./index.js');
66
- }
67
11
  //# sourceMappingURL=cluster.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"cluster.js","sourceRoot":"","sources":["../src/cluster.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"cluster.js","sourceRoot":"","sources":["../src/cluster.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,UAAU,GACX,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,UAAU,EAAE,CAAC;AAEtB,0EAA0E;AAC1E,iFAAiF;AACjF,2DAA2D;AAC3D,IAAI,OAAO,IAAI,CAAC,IAAI,EAAE,CAAC;IACrB,MAAM,UAAU,CAAC,KAAK,IAAI,EAAE;QAC1B,MAAM,MAAM,CAAC,YAAY,CAAC,CAAC;IAC7B,CAAC,CAAC,CAAC;AACL,CAAC"}
@@ -0,0 +1,16 @@
1
+ export type ClusterWorkerCount = 'auto' | number;
2
+ export interface ClusterEvent {
3
+ type: 'primary:start' | 'worker:exit' | 'cluster:shutdown' | 'cluster:error';
4
+ level: 'info' | 'warn' | 'error';
5
+ message: string;
6
+ }
7
+ export interface RunClusterOptions {
8
+ /** Number of workers, or the host's available parallelism. Default: `auto`. */
9
+ workers?: ClusterWorkerCount;
10
+ /** Maximum time workers get to stop after a shutdown signal. Default: 30 seconds. */
11
+ shutdownTimeoutMs?: number;
12
+ /** Receives early lifecycle events before the application logger exists. */
13
+ onEvent?(event: ClusterEvent): void;
14
+ }
15
+ /** Run `startWorker` only in Node cluster workers; the primary supervises them. */
16
+ export declare function runCluster(startWorker: () => void | Promise<void>, options?: RunClusterOptions): Promise<void>;
@@ -0,0 +1,180 @@
1
+ import cluster, {} from 'node:cluster';
2
+ import { availableParallelism } from 'node:os';
3
+ const RESTART_DELAY_MS = 1_000;
4
+ const RESTART_WINDOW_MS = 60_000;
5
+ const RESTARTS_PER_WORKER = 5;
6
+ const DEFAULT_SHUTDOWN_TIMEOUT_MS = 30_000;
7
+ function defaultEventHandler(event) {
8
+ const write = event.level === 'error'
9
+ ? console.error
10
+ : event.level === 'warn'
11
+ ? console.warn
12
+ : console.log;
13
+ write(event.message);
14
+ }
15
+ function createEmitter(handler = defaultEventHandler) {
16
+ return (event) => {
17
+ try {
18
+ handler(event);
19
+ }
20
+ catch (error) {
21
+ console.error('Cluster onEvent callback failed:', error);
22
+ }
23
+ };
24
+ }
25
+ function resolveOptions(options) {
26
+ const workersOption = options.workers ?? 'auto';
27
+ const workers = workersOption === 'auto' ? availableParallelism() : workersOption;
28
+ if (!Number.isInteger(workers) || workers < 1) {
29
+ throw new RangeError('workers must be `auto` or a positive integer');
30
+ }
31
+ const shutdownTimeoutMs = options.shutdownTimeoutMs ?? DEFAULT_SHUTDOWN_TIMEOUT_MS;
32
+ if (!Number.isFinite(shutdownTimeoutMs) || shutdownTimeoutMs < 1) {
33
+ throw new RangeError('shutdownTimeoutMs must be a finite number >= 1');
34
+ }
35
+ return { workers, shutdownTimeoutMs };
36
+ }
37
+ /** Run `startWorker` only in Node cluster workers; the primary supervises them. */
38
+ export async function runCluster(startWorker, options = {}) {
39
+ const resolved = resolveOptions(options);
40
+ if (!cluster.isPrimary) {
41
+ await startWorker();
42
+ return;
43
+ }
44
+ await supervisePrimary(resolved.workers, resolved.shutdownTimeoutMs, createEmitter(options.onEvent));
45
+ }
46
+ function supervisePrimary(workerCount, shutdownTimeoutMs, emit) {
47
+ return new Promise((resolve) => {
48
+ const activeWorkers = new Map();
49
+ const restartTimers = new Set();
50
+ let restartTimes = [];
51
+ let shutdownTimer;
52
+ let shutdownSignal;
53
+ let shuttingDown = false;
54
+ let exitCode = 0;
55
+ let finished = false;
56
+ const onSigterm = () => beginShutdown('SIGTERM', 0);
57
+ const onSigint = () => beginShutdown('SIGINT', 0);
58
+ const report = (type, level, message) => emit({ type, level, message });
59
+ function finish() {
60
+ if (finished) {
61
+ return;
62
+ }
63
+ finished = true;
64
+ cluster.off('exit', onWorkerExit);
65
+ process.off('SIGTERM', onSigterm);
66
+ process.off('SIGINT', onSigint);
67
+ if (shutdownTimer) {
68
+ clearTimeout(shutdownTimer);
69
+ }
70
+ for (const timer of restartTimers) {
71
+ clearTimeout(timer);
72
+ }
73
+ restartTimers.clear();
74
+ process.exitCode = exitCode;
75
+ resolve();
76
+ }
77
+ function finishIfIdle() {
78
+ if (activeWorkers.size === 0 && restartTimers.size === 0) {
79
+ finish();
80
+ }
81
+ }
82
+ function signalWorker(worker, signal) {
83
+ try {
84
+ worker.kill(signal);
85
+ }
86
+ catch (error) {
87
+ report('cluster:error', 'error', `Could not send ${signal} to worker ${worker.process.pid ?? worker.id}: ${error instanceof Error ? error.message : String(error)}`);
88
+ }
89
+ }
90
+ function beginShutdown(signal, code) {
91
+ exitCode = Math.max(exitCode, code);
92
+ if (shuttingDown) {
93
+ return;
94
+ }
95
+ shuttingDown = true;
96
+ shutdownSignal = signal;
97
+ report('cluster:shutdown', code === 0 ? 'info' : 'error', `Cluster shutting down with ${signal}.`);
98
+ for (const timer of restartTimers) {
99
+ clearTimeout(timer);
100
+ }
101
+ restartTimers.clear();
102
+ if (activeWorkers.size === 0) {
103
+ finish();
104
+ return;
105
+ }
106
+ shutdownTimer = setTimeout(() => {
107
+ shutdownTimer = undefined;
108
+ if (activeWorkers.size === 0) {
109
+ finishIfIdle();
110
+ return;
111
+ }
112
+ exitCode = 1;
113
+ report('cluster:error', 'error', `Cluster shutdown timed out after ${shutdownTimeoutMs}ms; force-terminating ${activeWorkers.size} worker(s).`);
114
+ for (const worker of activeWorkers.values()) {
115
+ signalWorker(worker, 'SIGKILL');
116
+ }
117
+ }, shutdownTimeoutMs);
118
+ for (const worker of activeWorkers.values()) {
119
+ signalWorker(worker, signal);
120
+ }
121
+ }
122
+ function forkWorker() {
123
+ if (shuttingDown) {
124
+ return;
125
+ }
126
+ try {
127
+ const worker = cluster.fork();
128
+ activeWorkers.set(worker.id, worker);
129
+ }
130
+ catch (error) {
131
+ report('cluster:error', 'error', `Failed to fork cluster worker: ${error instanceof Error ? error.message : String(error)}`);
132
+ beginShutdown('SIGTERM', 1);
133
+ }
134
+ }
135
+ function scheduleRestart() {
136
+ const timer = setTimeout(() => {
137
+ restartTimers.delete(timer);
138
+ forkWorker();
139
+ finishIfIdle();
140
+ }, RESTART_DELAY_MS);
141
+ restartTimers.add(timer);
142
+ }
143
+ function onWorkerExit(worker, code, rawSignal) {
144
+ const signal = rawSignal;
145
+ activeWorkers.delete(worker.id);
146
+ if (shuttingDown) {
147
+ if (code !== 0 || (signal && signal !== shutdownSignal)) {
148
+ exitCode = 1;
149
+ }
150
+ finishIfIdle();
151
+ return;
152
+ }
153
+ if (code === 0 && !signal) {
154
+ report('worker:exit', 'info', `Worker ${worker.process.pid ?? worker.id} exited cleanly; it will not be restarted.`);
155
+ finishIfIdle();
156
+ return;
157
+ }
158
+ const now = Date.now();
159
+ restartTimes = restartTimes.filter((time) => now - time < RESTART_WINDOW_MS);
160
+ const restartLimit = workerCount * RESTARTS_PER_WORKER;
161
+ if (restartTimes.length >= restartLimit) {
162
+ report('cluster:error', 'error', `Cluster exceeded its restart limit (${restartLimit} in ${RESTART_WINDOW_MS}ms).`);
163
+ beginShutdown('SIGTERM', 1);
164
+ return;
165
+ }
166
+ restartTimes.push(now);
167
+ report('worker:exit', 'warn', `Worker ${worker.process.pid ?? worker.id} exited abnormally (${signal ?? `code ${code}`}); restarting in ${RESTART_DELAY_MS}ms.`);
168
+ scheduleRestart();
169
+ }
170
+ cluster.on('exit', onWorkerExit);
171
+ process.once('SIGTERM', onSigterm);
172
+ process.once('SIGINT', onSigint);
173
+ report('primary:start', 'info', `Cluster primary ${process.pid} starting ${workerCount} worker(s).`);
174
+ for (let index = 0; index < workerCount; index += 1) {
175
+ forkWorker();
176
+ }
177
+ finishIfIdle();
178
+ });
179
+ }
180
+ //# sourceMappingURL=clusterRunner.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"clusterRunner.js","sourceRoot":"","sources":["../src/clusterRunner.ts"],"names":[],"mappings":"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"}
@@ -38,11 +38,18 @@ export type RouteParams = {
38
38
  [path: string]: RouteObject | RouteHandler;
39
39
  };
40
40
  };
41
+ /**
42
+ * Convert a physical controller-folder prefix into its URL prefix. A fully
43
+ * parenthesized segment is a route-transparent organizational group:
44
+ * `(group)/admin` becomes `admin`. Both runtime loading and AST codegen call
45
+ * the default-path helper below, so the convention cannot drift between them.
46
+ */
47
+ export declare function controllerRoutePrefix(prefix: string): string;
41
48
  /**
42
49
  * The default mount segment for a controller: `ClassName`, prefixed by the
43
- * folder when nested (`admin/Users.ts` → `Admin/Users`). Exported so codegen
44
- * computes the same mount path as the runtime instance method below — the two
45
- * must never drift on where a controller mounts (see codegen doc 06).
50
+ * route-bearing folders when nested (`admin/Users.ts` → `Admin/Users`). Exported
51
+ * so codegen computes the same mount path as the runtime instance method below
52
+ * — the two must never drift on where a controller mounts (see codegen doc 06).
46
53
  */
47
54
  export declare function controllerConstructorName(prefix: string, className: string): string;
48
55
  /** Default HTTP mount path for a controller that doesn't override `getHttpPath`. */
@@ -1,15 +1,29 @@
1
1
  import Auth from '../services/http/middleware/Auth.js';
2
2
  import GetUserByToken from '../services/http/middleware/GetUserByToken.js';
3
3
  import Base from './Base.js';
4
+ /**
5
+ * Convert a physical controller-folder prefix into its URL prefix. A fully
6
+ * parenthesized segment is a route-transparent organizational group:
7
+ * `(group)/admin` becomes `admin`. Both runtime loading and AST codegen call
8
+ * the default-path helper below, so the convention cannot drift between them.
9
+ */
10
+ export function controllerRoutePrefix(prefix) {
11
+ return prefix
12
+ .split(/[\\/]+/)
13
+ .filter((segment) => segment.length > 0 &&
14
+ !(segment.startsWith('(') && segment.endsWith(')')))
15
+ .join('/');
16
+ }
4
17
  /**
5
18
  * The default mount segment for a controller: `ClassName`, prefixed by the
6
- * folder when nested (`admin/Users.ts` → `Admin/Users`). Exported so codegen
7
- * computes the same mount path as the runtime instance method below — the two
8
- * must never drift on where a controller mounts (see codegen doc 06).
19
+ * route-bearing folders when nested (`admin/Users.ts` → `Admin/Users`). Exported
20
+ * so codegen computes the same mount path as the runtime instance method below
21
+ * — the two must never drift on where a controller mounts (see codegen doc 06).
9
22
  */
10
23
  export function controllerConstructorName(prefix, className) {
11
- return prefix
12
- ? `${prefix.charAt(0).toUpperCase()}${prefix.slice(1)}/${className}`
24
+ const routePrefix = controllerRoutePrefix(prefix);
25
+ return routePrefix
26
+ ? `${routePrefix.charAt(0).toUpperCase()}${routePrefix.slice(1)}/${className}`
13
27
  : className;
14
28
  }
15
29
  /** Default HTTP mount path for a controller that doesn't override `getHttpPath`. */
@@ -1 +1 @@
1
- {"version":3,"file":"AbstractController.js","sourceRoot":"","sources":["../../src/modules/AbstractController.ts"],"names":[],"mappings":"AAEA,OAAO,IAAI,MAAM,qCAAqC,CAAC;AACvD,OAAO,cAAc,MAAM,+CAA+C,CAAC;AAI3E,OAAO,IAAI,MAAM,WAAW,CAAC;AAyC7B;;;;;GAKG;AACH,MAAM,UAAU,yBAAyB,CACvC,MAAc,EACd,SAAiB;IAEjB,OAAO,MAAM;QACX,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,SAAS,EAAE;QACpE,CAAC,CAAC,SAAS,CAAC;AAChB,CAAC;AAED,oFAAoF;AACpF,MAAM,UAAU,yBAAyB,CACvC,MAAc,EACd,SAAiB;IAEjB,OAAO,IAAI,yBAAyB,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,OAAO,CAC7E,IAAI,EACJ,GAAG,CACJ,CAAC;AACJ,CAAC;AAED;;;;;;GAMG;AACH,MAAM,kBAAmB,SAAQ,IAAI;IACnC,MAAM,GAAG,EAAE,CAAC;IAEZ,YAAY,GAAS,EAAE,MAAc;QACnC,KAAK,CAAC,GAAG,CAAC,CAAC;QACX,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IAED;;;;;;;;;;;;;OAaG;IACH,IAAI,MAAM;QACR,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,iDAAiD,CAAC,CAAC;QACrE,OAAO,EAAE,CAAC;IACZ,CAAC;IAED;;;;;;;;;;;;OAYG;IACH,MAAM,KAAK,UAAU;QACnB,OAAO,IAAI,GAAG,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1D,CAAC;IAED;;OAEG;IACH,kBAAkB;QAChB,OAAO,yBAAyB,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IACvE,CAAC;IAED;;OAEG;IACH,WAAW;QACT,OAAO,yBAAyB,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IACvE,CAAC;IAED,MAAM,KAAK,WAAW;QACpB,OAAO,YAAY,CAAC;IACtB,CAAC;CACF;AAED,eAAe,kBAAkB,CAAC"}
1
+ {"version":3,"file":"AbstractController.js","sourceRoot":"","sources":["../../src/modules/AbstractController.ts"],"names":[],"mappings":"AAEA,OAAO,IAAI,MAAM,qCAAqC,CAAC;AACvD,OAAO,cAAc,MAAM,+CAA+C,CAAC;AAI3E,OAAO,IAAI,MAAM,WAAW,CAAC;AAyC7B;;;;;GAKG;AACH,MAAM,UAAU,qBAAqB,CAAC,MAAc;IAClD,OAAO,MAAM;SACV,KAAK,CAAC,QAAQ,CAAC;SACf,MAAM,CACL,CAAC,OAAO,EAAE,EAAE,CACV,OAAO,CAAC,MAAM,GAAG,CAAC;QAClB,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CACtD;SACA,IAAI,CAAC,GAAG,CAAC,CAAC;AACf,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,yBAAyB,CACvC,MAAc,EACd,SAAiB;IAEjB,MAAM,WAAW,GAAG,qBAAqB,CAAC,MAAM,CAAC,CAAC;IAClD,OAAO,WAAW;QAChB,CAAC,CAAC,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,SAAS,EAAE;QAC9E,CAAC,CAAC,SAAS,CAAC;AAChB,CAAC;AAED,oFAAoF;AACpF,MAAM,UAAU,yBAAyB,CACvC,MAAc,EACd,SAAiB;IAEjB,OAAO,IAAI,yBAAyB,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,OAAO,CAC7E,IAAI,EACJ,GAAG,CACJ,CAAC;AACJ,CAAC;AAED;;;;;;GAMG;AACH,MAAM,kBAAmB,SAAQ,IAAI;IACnC,MAAM,GAAG,EAAE,CAAC;IAEZ,YAAY,GAAS,EAAE,MAAc;QACnC,KAAK,CAAC,GAAG,CAAC,CAAC;QACX,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IAED;;;;;;;;;;;;;OAaG;IACH,IAAI,MAAM;QACR,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,iDAAiD,CAAC,CAAC;QACrE,OAAO,EAAE,CAAC;IACZ,CAAC;IAED;;;;;;;;;;;;OAYG;IACH,MAAM,KAAK,UAAU;QACnB,OAAO,IAAI,GAAG,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1D,CAAC;IAED;;OAEG;IACH,kBAAkB;QAChB,OAAO,yBAAyB,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IACvE,CAAC;IAED;;OAEG;IACH,WAAW;QACT,OAAO,yBAAyB,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IACvE,CAAC;IAED,MAAM,KAAK,WAAW;QACpB,OAAO,YAAY,CAAC;IACtB,CAAC;CACF;AAED,eAAe,kBAAkB,CAAC"}
@@ -135,19 +135,37 @@ function baseOperationId(route, controllerName, path) {
135
135
  return `${route.method.toLowerCase()}_${slug || 'root'}`;
136
136
  }
137
137
  // ── schema conversion ──────────────────────────────────────────────────────────
138
- /** Resolve a schema's driver and emit JSON Schema; null when not introspectable. */
139
- async function schemaToJson(schema) {
140
- const driver = ValidateService.resolve(schema);
141
- if (!driver?.toJsonSchema) {
142
- return null;
138
+ /**
139
+ * Resolve one schema's driver and emit JSON Schema. Conversion is contained at
140
+ * this boundary: a vendor exporter may throw for an unsupported construct, but
141
+ * one bad route must not discard the rest of the OpenAPI document.
142
+ */
143
+ async function schemaToJson(schema, warn, context) {
144
+ try {
145
+ const driver = ValidateService.resolve(schema);
146
+ if (!driver?.toJsonSchema) {
147
+ warn(`${context}: schema introspection unavailable.`);
148
+ return null;
149
+ }
150
+ const result = await driver.toJsonSchema(schema);
151
+ if (!result) {
152
+ warn(`${context}: schema introspection unavailable.`);
153
+ return null;
154
+ }
155
+ // `$schema` is a standalone-document marker; invalid when embedded in OpenAPI.
156
+ const { $schema, ...rest } = result;
157
+ return rest;
143
158
  }
144
- const result = await driver.toJsonSchema(schema);
145
- if (!result) {
159
+ catch (error) {
160
+ warn(`${context}: schema conversion failed — ${errorMessage(error)}.`);
146
161
  return null;
147
162
  }
148
- // `$schema` is a standalone-document marker; invalid when embedded in OpenAPI.
149
- const { $schema, ...rest } = result;
150
- return rest;
163
+ }
164
+ function errorMessage(error) {
165
+ if (error instanceof Error && error.message) {
166
+ return error.message;
167
+ }
168
+ return String(error);
151
169
  }
152
170
  function placeholderSchema() {
153
171
  return {
@@ -234,9 +252,8 @@ async function buildQueryParameters(route, warn, ctx) {
234
252
  ];
235
253
  const params = [];
236
254
  for (const schema of schemas) {
237
- const json = await schemaToJson(schema);
255
+ const json = await schemaToJson(schema, warn, `${ctx} query`);
238
256
  if (!json) {
239
- warn(`${ctx} query: schema introspection unavailable — params omitted.`);
240
257
  continue;
241
258
  }
242
259
  const props = json.properties ?? {};
@@ -255,15 +272,12 @@ async function buildQueryParameters(route, warn, ctx) {
255
272
  async function buildRequestBody(route, warn, ctx) {
256
273
  const req = route.entry.request;
257
274
  const mwSchemas = collectMiddlewareSchemas(route.middlewares, 'request');
258
- const mwParts = (await Promise.all(mwSchemas.map((s) => schemaToJson(s)))).filter((s) => s != null);
275
+ const mwParts = (await Promise.all(mwSchemas.map((s) => schemaToJson(s, warn, `${ctx} middleware request`)))).filter((s) => s != null);
259
276
  // Content-type map → one media type per declared key (native multipart support).
260
277
  if (req && isContentTypeRequestMap(req)) {
261
278
  const content = {};
262
279
  for (const [mediaType, schema] of Object.entries(req)) {
263
- const converted = await schemaToJson(schema);
264
- if (!converted) {
265
- warn(`${ctx} body (${mediaType}): schema introspection unavailable.`);
266
- }
280
+ const converted = await schemaToJson(schema, warn, `${ctx} body (${mediaType})`);
267
281
  const merged = combineSchemas([
268
282
  converted ?? placeholderSchema(),
269
283
  ...mwParts,
@@ -275,10 +289,7 @@ async function buildRequestBody(route, warn, ctx) {
275
289
  // Single schema (or none).
276
290
  let routeObj = null;
277
291
  if (req) {
278
- routeObj = await schemaToJson(req);
279
- if (!routeObj) {
280
- warn(`${ctx} body: schema introspection unavailable — placeholder emitted.`);
281
- }
292
+ routeObj = await schemaToJson(req, warn, `${ctx} body`);
282
293
  }
283
294
  const parts = [
284
295
  ...(routeObj ? [routeObj] : req ? [placeholderSchema()] : []),
@@ -1 +1 @@
1
- {"version":3,"file":"OpenApiGenerator.js","sourceRoot":"","sources":["../../../src/services/documentation/OpenApiGenerator.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAIH,OAAO,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAErE,OAAO,eAAe,MAAM,gCAAgC,CAAC;AAuB7D;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,MAAmB,EACnB,IAA4B;IAE5B,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,IAAI,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;IAC1C,MAAM,KAAK,GAAQ,EAAE,CAAC;IACtB,MAAM,eAAe,GAAQ,EAAE,CAAC;IAChC,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAU,CAAC;IACnC,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;IAElC,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACvE,IAAI,QAAQ,EAAE,CAAC;YACb,IAAI,CACF,GAAG,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,IAAI,8EAA8E,CAC5G,CAAC;QACJ,CAAC;QAED,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC;QACpC,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC,eAAe,IAAI,SAAS,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAW,CAAC;QACxE,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAElB,MAAM,UAAU,GAAU,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YAClD,IAAI;YACJ,EAAE,EAAE,MAAM;YACV,QAAQ,EAAE,IAAI;YACd,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;SAC3B,CAAC,CAAC,CAAC;QAEJ,MAAM,GAAG,GAAG,GAAG,KAAK,CAAC,MAAM,IAAI,IAAI,EAAE,CAAC;QACtC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,oBAAoB,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;QAEnE,MAAM,SAAS,GAAQ;YACrB,WAAW,EAAE,WAAW,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,CAAC;YACnD,IAAI,EAAE,CAAC,GAAG,CAAC;YACX,SAAS,EAAE,gBAAgB,EAAE;SAC9B,CAAC;QACF,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YACrB,SAAS,CAAC,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC;QACvC,CAAC;QACD,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,UAAU,CAAC,CAAC;QACtD,IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAChC,SAAS,CAAC,UAAU,GAAG,gBAAgB,CAAC;QAC1C,CAAC;QAED,MAAM,WAAW,GAAG,MAAM,gBAAgB,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;QAC7D,IAAI,WAAW,EAAE,CAAC;YAChB,SAAS,CAAC,WAAW,GAAG,WAAW,CAAC;QACtC,CAAC;QAED,MAAM,QAAQ,GAAG,eAAe,CAAC,KAAK,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;QACrE,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACxB,SAAS,CAAC,QAAQ,GAAG,QAAQ,CAAC;QAChC,CAAC;QAED,IAAI,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAoB,CAAC;QAC9C,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,QAAQ,GAAG,EAAE,CAAC;YACd,KAAK,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC;QACzB,CAAC;QACD,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,GAAG,SAAS,CAAC;IACnD,CAAC;IAED,MAAM,GAAG,GAAQ;QACf,OAAO,EAAE,OAAO;QAChB,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,KAAK;QACL,IAAI,EAAE,CAAC,GAAG,QAAQ,CAAC,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;QACpD,UAAU,EAAE,EAAE,eAAe,EAAE;KAChC,CAAC;IACF,IAAI,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC5C,GAAG,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;IAC7B,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,iFAAiF;AAEjF,wEAAwE;AACxE,SAAS,WAAW,CAAC,YAAoB;IAKvC,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,IAAI,QAAQ,GAAG,KAAK,CAAC;IACrB,MAAM,GAAG,GAAG,YAAY;SACrB,KAAK,CAAC,GAAG,CAAC;SACV,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;QACX,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;YACxB,MAAM,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAC1B,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAClB,OAAO,IAAI,IAAI,GAAG,CAAC;QACrB,CAAC;QACD,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;YACxB,QAAQ,GAAG,IAAI,CAAC;YAChB,MAAM,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC;YACrC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAClB,OAAO,IAAI,IAAI,GAAG,CAAC;QACrB,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC,CAAC;SACD,IAAI,CAAC,GAAG,CAAC,CAAC;IACb,OAAO,EAAE,IAAI,EAAE,GAAG,IAAI,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC;AAChD,CAAC;AAED;;;;;;GAMG;AACH,SAAS,WAAW,CAClB,KAAgB,EAChB,cAAsB,EACtB,IAAY,EACZ,OAAoB;IAEpB,MAAM,IAAI,GAAG,eAAe,CAAC,KAAK,EAAE,cAAc,EAAE,IAAI,CAAC,CAAC;IAC1D,IAAI,SAAS,GAAG,IAAI,CAAC;IACrB,IAAI,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;QAC3B,SAAS,GAAG,GAAG,IAAI,IAAI,KAAK,CAAC,MAAM,CAAC,WAAW,EAAE,EAAE,CAAC;IACtD,CAAC;IACD,IAAI,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;QAC3B,MAAM,IAAI,GAAG,SAAS,CAAC;QACvB,IAAI,CAAC,GAAG,CAAC,CAAC;QACV,OAAO,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;YACnC,CAAC,IAAI,CAAC,CAAC;QACT,CAAC;QACD,SAAS,GAAG,GAAG,IAAI,IAAI,CAAC,EAAE,CAAC;IAC7B,CAAC;IACD,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IACvB,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,eAAe,CACtB,KAAgB,EAChB,cAAsB,EACtB,IAAY;IAEZ,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,UAAU,CAAC;IAC1C,IAAI,IAAI,EAAE,CAAC;QACT,OAAO,GAAG,cAAc,IAAI,IAAI,EAAE,CAAC;IACrC,CAAC;IACD,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;IACvE,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,WAAW,EAAE,IAAI,IAAI,IAAI,MAAM,EAAE,CAAC;AAC3D,CAAC;AAED,kFAAkF;AAElF,oFAAoF;AACpF,KAAK,UAAU,YAAY,CAAC,MAAe;IACzC,MAAM,MAAM,GAAG,eAAe,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAC/C,IAAI,CAAC,MAAM,EAAE,YAAY,EAAE,CAAC;QAC1B,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;IACjD,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,IAAI,CAAC;IACd,CAAC;IACD,+EAA+E;IAC/E,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,EAAE,GAAG,MAAa,CAAC;IAC3C,OAAO,IAAkB,CAAC;AAC5B,CAAC;AAED,SAAS,iBAAiB;IACxB,OAAO;QACL,IAAI,EAAE,QAAQ;QACd,WAAW,EACT,mGAAmG;KACtG,CAAC;AACJ,CAAC;AAED;;;;;GAKG;AACH,SAAS,cAAc,CAAC,OAAqB;IAC3C,OAAO,OAAO,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;AACzE,CAAC;AAED,0EAA0E;AAC1E,SAAS,kBAAkB,CAAC,OAAqB;IAC/C,MAAM,UAAU,GAAQ,EAAE,CAAC;IAC3B,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAU,CAAC;IACnC,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC7B,MAAM,KAAK,GAAG,MAAM,CAAC,UAAU,CAAC;QAChC,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YACvC,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;QACnC,CAAC;QACD,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;YACnC,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;gBAClC,QAAQ,CAAC,GAAG,CAAC,GAAa,CAAC,CAAC;YAC9B,CAAC;QACH,CAAC;IACH,CAAC;IACD,MAAM,GAAG,GAAe,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC;IACvD,IAAI,QAAQ,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;QACtB,GAAG,CAAC,QAAQ,GAAG,CAAC,GAAG,QAAQ,CAAC,CAAC;IAC/B,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAS,cAAc,CAAC,MAAkB;IACxC,MAAM,KAAK,GAAG,MAAM,CAAC,UAAU,CAAC;IAChC,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QACxC,OAAO,KAAK,CAAC;IACf,CAAC;IACD,OAAO,MAAM,CAAC,MAAM,CAAC,KAAY,CAAC,CAAC,IAAI,CACrC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,IAAI,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAK,CAAS,CAAC,MAAM,KAAK,QAAQ,CAC5E,CAAC;AACJ,CAAC;AAED,mFAAmF;AAEnF,qFAAqF;AACrF,SAAS,wBAAwB,CAC/B,WAA8B,EAC9B,IAAyB;IAEzB,MAAM,IAAI,GACR,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,0BAA0B,CAAC,CAAC,CAAC,wBAAwB,CAAC;IAC7E,MAAM,GAAG,GAAuB,EAAE,CAAC;IACnC,KAAK,MAAM,EAAE,IAAI,WAAW,EAAE,CAAC;QAC7B,MAAM,MAAM,GAAI,EAAE,CAAC,KAA4C,CAAC,IAAI,CAAC,CAAC;QACtE,IAAI,MAAM,EAAE,CAAC;YACX,GAAG,CAAC,IAAI,CAAC,MAA0B,CAAC,CAAC;QACvC,CAAC;IACH,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,mFAAmF;AAEnF;;;;;;;GAOG;AACH,SAAS,gBAAgB,CAAC,MAAa;IACrC,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,MAAM,GAAG,GAAU,EAAE,CAAC;IACtB,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,MAAM,GAAG,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;QACxD,IAAI,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YAClB,SAAS;QACX,CAAC;QACD,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACd,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAClB,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,KAAK,UAAU,oBAAoB,CACjC,KAAgB,EAChB,IAAyB,EACzB,GAAW;IAEX,MAAM,OAAO,GAAc;QACzB,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACjD,GAAG,wBAAwB,CAAC,KAAK,CAAC,WAAW,EAAE,OAAO,CAAC;KACxD,CAAC;IACF,MAAM,MAAM,GAAU,EAAE,CAAC;IACzB,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC7B,MAAM,IAAI,GAAG,MAAM,YAAY,CAAC,MAAM,CAAC,CAAC;QACxC,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,IAAI,CAAC,GAAG,GAAG,4DAA4D,CAAC,CAAC;YACzE,SAAS;QACX,CAAC;QACD,MAAM,KAAK,GAAI,IAAI,CAAC,UAAkB,IAAI,EAAE,CAAC;QAC7C,MAAM,QAAQ,GAAG,IAAI,GAAG,CACtB,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAE,IAAI,CAAC,QAAqB,CAAC,CAAC,CAAC,EAAE,CAChE,CAAC;QACF,KAAK,MAAM,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YACvD,MAAM,CAAC,IAAI,CAAC;gBACV,IAAI;gBACJ,EAAE,EAAE,OAAO;gBACX,QAAQ,EAAE,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC;gBAC5B,MAAM,EAAE,UAAU;aACnB,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,KAAK,UAAU,gBAAgB,CAC7B,KAAgB,EAChB,IAAyB,EACzB,GAAW;IAEX,MAAM,GAAG,GAAG,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC;IAChC,MAAM,SAAS,GAAG,wBAAwB,CAAC,KAAK,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;IACzE,MAAM,OAAO,GAAG,CACd,MAAM,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CACzD,CAAC,MAAM,CAAC,CAAC,CAAC,EAAmB,EAAE,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC;IAE5C,iFAAiF;IACjF,IAAI,GAAG,IAAI,uBAAuB,CAAC,GAAG,CAAC,EAAE,CAAC;QACxC,MAAM,OAAO,GAAQ,EAAE,CAAC;QACxB,KAAK,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;YACtD,MAAM,SAAS,GAAG,MAAM,YAAY,CAAC,MAAM,CAAC,CAAC;YAC7C,IAAI,CAAC,SAAS,EAAE,CAAC;gBACf,IAAI,CAAC,GAAG,GAAG,UAAU,SAAS,sCAAsC,CAAC,CAAC;YACxE,CAAC;YACD,MAAM,MAAM,GAAG,cAAc,CAAC;gBAC5B,SAAS,IAAI,iBAAiB,EAAE;gBAChC,GAAG,OAAO;aACX,CAAC,CAAC;YACH,OAAO,CAAC,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;QAC1C,CAAC;QACD,OAAO,EAAE,OAAO,EAAE,CAAC;IACrB,CAAC;IAED,2BAA2B;IAC3B,IAAI,QAAQ,GAAsB,IAAI,CAAC;IACvC,IAAI,GAAG,EAAE,CAAC;QACR,QAAQ,GAAG,MAAM,YAAY,CAAC,GAAG,CAAC,CAAC;QACnC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,IAAI,CACF,GAAG,GAAG,gEAAgE,CACvE,CAAC;QACJ,CAAC;IACH,CAAC;IAED,MAAM,KAAK,GAAG;QACZ,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC7D,GAAG,OAAO;KACX,CAAC;IACF,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACvB,OAAO,SAAS,CAAC,CAAC,mBAAmB;IACvC,CAAC;IAED,MAAM,MAAM,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;IACrC,MAAM,SAAS,GAAG,cAAc,CAAC,MAAM,CAAC;QACtC,CAAC,CAAC,qBAAqB;QACvB,CAAC,CAAC,kBAAkB,CAAC;IACvB,OAAO,EAAE,OAAO,EAAE,EAAE,CAAC,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;AAClD,CAAC;AAED,SAAS,eAAe,CACtB,WAA8B,EAC9B,eAAoB;IAEpB,MAAM,YAAY,GAAU,EAAE,CAAC;IAC/B,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,KAAK,MAAM,EAAE,IAAI,WAAW,EAAE,CAAC;QAC7B,MAAM,MAAM,GAAI,EAAE,CAAC,KAAqD;aACrE,kBAAkB,CAAC;QACtB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YAC3B,SAAS;QACX,CAAC;QACD,KAAK,MAAM,KAAK,IAAI,MAAyB,EAAE,CAAC;YAC9C,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;gBACjC,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,gBAAgB,CAAC,KAAK,CAAC,CAAC;YACxD,CAAC;YACD,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC1B,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBACrB,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;YAC1C,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,YAAY,CAAC;AACtB,CAAC;AAED,SAAS,gBAAgB,CAAC,KAAoB;IAC5C,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC5B,OAAO;YACL,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,EAAE,EAAE,KAAK,CAAC,EAAE,IAAI,QAAQ;YACxB,WAAW,EAAE,KAAK,CAAC,WAAW;SAC/B,CAAC;IACJ,CAAC;IACD,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;QAC1B,OAAO;YACL,IAAI,EAAE,MAAM;YACZ,MAAM,EAAE,KAAK,CAAC,MAAM,IAAI,QAAQ;YAChC,WAAW,EAAE,KAAK,CAAC,WAAW;SAC/B,CAAC;IACJ,CAAC;IACD,OAAO,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,WAAW,EAAE,KAAK,CAAC,WAAW,EAAE,CAAC;AAC9D,CAAC;AAED,SAAS,gBAAgB;IACvB,OAAO;QACL,KAAK,EAAE,EAAE,WAAW,EAAE,qBAAqB,EAAE;QAC7C,KAAK,EAAE,EAAE,WAAW,EAAE,kBAAkB,EAAE;QAC1C,KAAK,EAAE,EAAE,WAAW,EAAE,cAAc,EAAE;QACtC,KAAK,EAAE,EAAE,WAAW,EAAE,WAAW,EAAE;KACpC,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"OpenApiGenerator.js","sourceRoot":"","sources":["../../../src/services/documentation/OpenApiGenerator.ts"],"names":[],"mappings":"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"}
@@ -48,12 +48,29 @@ export const standardSchemaDriver = {
48
48
  const mod = (await import('zod'));
49
49
  const toJSONSchema = mod.toJSONSchema ?? mod.z?.toJSONSchema;
50
50
  if (typeof toJSONSchema === 'function') {
51
- // draft-2020-12 is what OpenAPI 3.1 expects.
52
- return toJSONSchema(body, { target: 'draft-2020-12' });
51
+ // Route schemas describe what an HTTP client sends, so transforms and
52
+ // coercions must be rendered from their INPUT shape. A validator detail
53
+ // that JSON Schema cannot express degrades to `{}` instead of aborting
54
+ // the entire OpenAPI export. `z.coerce.date()` accepts wire values but
55
+ // otherwise becomes `{}`; the framework's HTTP convention documents it
56
+ // as an RFC 3339 date-time string.
57
+ return toJSONSchema(body, {
58
+ target: 'draft-2020-12',
59
+ io: 'input',
60
+ unrepresentable: 'any',
61
+ override: applyZodOpenApiOverride,
62
+ });
53
63
  }
54
64
  }
55
65
  // 3. valibot / older zod / anything else with no introspection → degrade.
56
66
  return null;
57
67
  },
58
68
  };
69
+ function applyZodOpenApiOverride(ctx) {
70
+ const def = ctx.zodSchema?._zod?.def;
71
+ if (def?.type === 'date' && def.coerce === true) {
72
+ ctx.jsonSchema.type = 'string';
73
+ ctx.jsonSchema.format = 'date-time';
74
+ }
75
+ }
59
76
  //# sourceMappingURL=StandardSchemaDriver.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"StandardSchemaDriver.js","sourceRoot":"","sources":["../../../../src/services/validate/drivers/StandardSchemaDriver.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD;;;;;;;;;;;;;;;GAeG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAoB;IACnD,SAAS,CAAC,IAAa;QACrB,OAAO,CACL,OAAO,IAAI,KAAK,QAAQ;YACxB,IAAI,KAAK,IAAI;YACb,WAAW,IAAI,IAAI;YACnB,OAAQ,IAAkC,CAAC,WAAW,CAAC,KAAK,QAAQ,CACrE,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,IAAa,EAAE,IAAa;QACzC,MAAM,GAAG,GAAI,IAAyB,CAAC,WAAW,CAAC,CAAC;QACpD,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACxC,2EAA2E;QAC3E,6EAA6E;QAC7E,2EAA2E;QAC3E,6EAA6E;QAC7E,IAAI,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC9C,MAAM,IAAI,eAAe,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAC3C,CAAC;QACD,OAAQ,MAA8B,CAAC,KAAK,CAAC;IAC/C,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,IAAa;QAC9B,2EAA2E;QAC3E,iFAAiF;QACjF,MAAM,MAAM,GAAI,IAAmC,CAAC,YAAY,CAAC;QACjE,IAAI,OAAO,MAAM,KAAK,UAAU,EAAE,CAAC;YACjC,OAAQ,MAA2B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjD,CAAC;QAED,0EAA0E;QAC1E,gFAAgF;QAChF,MAAM,MAAM,GAAI,IAAyB,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;QAC/D,IAAI,MAAM,KAAK,KAAK,EAAE,CAAC;YACrB,MAAM,GAAG,GAAG,CAAC,MAAM,MAAM,CAAC,KAAK,CAAC,CAG/B,CAAC;YACF,MAAM,YAAY,GAAG,GAAG,CAAC,YAAY,IAAI,GAAG,CAAC,CAAC,EAAE,YAAY,CAAC;YAC7D,IAAI,OAAO,YAAY,KAAK,UAAU,EAAE,CAAC;gBACvC,6CAA6C;gBAC7C,OAAO,YAAY,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,eAAe,EAAE,CAAC,CAAC;YACzD,CAAC;QACH,CAAC;QAED,0EAA0E;QAC1E,OAAO,IAAI,CAAC;IACd,CAAC;CACF,CAAC"}
1
+ {"version":3,"file":"StandardSchemaDriver.js","sourceRoot":"","sources":["../../../../src/services/validate/drivers/StandardSchemaDriver.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD;;;;;;;;;;;;;;;GAeG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAoB;IACnD,SAAS,CAAC,IAAa;QACrB,OAAO,CACL,OAAO,IAAI,KAAK,QAAQ;YACxB,IAAI,KAAK,IAAI;YACb,WAAW,IAAI,IAAI;YACnB,OAAQ,IAAkC,CAAC,WAAW,CAAC,KAAK,QAAQ,CACrE,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,IAAa,EAAE,IAAa;QACzC,MAAM,GAAG,GAAI,IAAyB,CAAC,WAAW,CAAC,CAAC;QACpD,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACxC,2EAA2E;QAC3E,6EAA6E;QAC7E,2EAA2E;QAC3E,6EAA6E;QAC7E,IAAI,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC9C,MAAM,IAAI,eAAe,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAC3C,CAAC;QACD,OAAQ,MAA8B,CAAC,KAAK,CAAC;IAC/C,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,IAAa;QAC9B,2EAA2E;QAC3E,iFAAiF;QACjF,MAAM,MAAM,GAAI,IAAmC,CAAC,YAAY,CAAC;QACjE,IAAI,OAAO,MAAM,KAAK,UAAU,EAAE,CAAC;YACjC,OAAQ,MAA2B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjD,CAAC;QAED,0EAA0E;QAC1E,gFAAgF;QAChF,MAAM,MAAM,GAAI,IAAyB,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;QAC/D,IAAI,MAAM,KAAK,KAAK,EAAE,CAAC;YACrB,MAAM,GAAG,GAAG,CAAC,MAAM,MAAM,CAAC,KAAK,CAAC,CAG/B,CAAC;YACF,MAAM,YAAY,GAAG,GAAG,CAAC,YAAY,IAAI,GAAG,CAAC,CAAC,EAAE,YAAY,CAAC;YAC7D,IAAI,OAAO,YAAY,KAAK,UAAU,EAAE,CAAC;gBACvC,sEAAsE;gBACtE,wEAAwE;gBACxE,uEAAuE;gBACvE,uEAAuE;gBACvE,uEAAuE;gBACvE,mCAAmC;gBACnC,OAAO,YAAY,CAAC,IAAI,EAAE;oBACxB,MAAM,EAAE,eAAe;oBACvB,EAAE,EAAE,OAAO;oBACX,eAAe,EAAE,KAAK;oBACtB,QAAQ,EAAE,uBAAuB;iBAClC,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAED,0EAA0E;QAC1E,OAAO,IAAI,CAAC;IACd,CAAC;CACF,CAAC;AAsBF,SAAS,uBAAuB,CAAC,GAAuB;IACtD,MAAM,GAAG,GAAG,GAAG,CAAC,SAAS,EAAE,IAAI,EAAE,GAAG,CAAC;IACrC,IAAI,GAAG,EAAE,IAAI,KAAK,MAAM,IAAI,GAAG,CAAC,MAAM,KAAK,IAAI,EAAE,CAAC;QAChD,GAAG,CAAC,UAAU,CAAC,IAAI,GAAG,QAAQ,CAAC;QAC/B,GAAG,CAAC,UAAU,CAAC,MAAM,GAAG,WAAW,CAAC;IACtC,CAAC;AACH,CAAC"}
@@ -13,11 +13,25 @@
13
13
  */
14
14
  import './setupNodeTest.js';
15
15
  import assert from 'node:assert/strict';
16
- import { describe, it } from 'node:test';
16
+ import { before, describe, it } from 'node:test';
17
17
  import mongoose from 'mongoose';
18
18
  import { appInstance } from '../helpers/appInstance.js';
19
- import { createDefaultTestUser, getTestServerURL } from './testHelpers.js';
19
+ import { createDefaultTestUser, ensureTestServerReady, getTestServerURL, serverInstance, } from './testHelpers.js';
20
+ let serverAwaitedBySiblingRootHook;
21
+ // This is intentionally a sibling of setupNodeTest's root hook. node:test may
22
+ // start both hooks concurrently; the public helper must return the same startup
23
+ // promise and resolve only after the server is ready.
24
+ before(async () => {
25
+ const firstReadiness = ensureTestServerReady();
26
+ const secondReadiness = ensureTestServerReady();
27
+ assert.strictEqual(firstReadiness, secondReadiness);
28
+ serverAwaitedBySiblingRootHook = await firstReadiness;
29
+ });
20
30
  describe('node:test: server boot + Mongo round-trip', () => {
31
+ it('shares readiness with sibling root-level setup hooks', async () => {
32
+ assert.strictEqual(serverAwaitedBySiblingRootHook, serverInstance);
33
+ assert.strictEqual(await ensureTestServerReady(), serverInstance);
34
+ });
21
35
  it('booted a Server connected to the shared Mongo', async () => {
22
36
  await mongoose.connection.asPromise(); // resolves once the connection is open
23
37
  assert.equal(mongoose.connection.readyState, 1); // 1 === connected
@@ -1 +1 @@
1
- {"version":3,"file":"nodeRunner.node-test.js","sourceRoot":"","sources":["../../src/tests/nodeRunner.node-test.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AACH,OAAO,oBAAoB,CAAC;AAC5B,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,QAAQ,MAAM,UAAU,CAAC;AAChC,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAExD,OAAO,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAE3E,QAAQ,CAAC,2CAA2C,EAAE,GAAG,EAAE;IACzD,EAAE,CAAC,+CAA+C,EAAE,KAAK,IAAI,EAAE;QAC7D,MAAM,QAAQ,CAAC,UAAU,CAAC,SAAS,EAAE,CAAC,CAAC,uCAAuC;QAC9E,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC,kBAAkB;QACnE,MAAM,CAAC,EAAE,CAAC,WAAW,EAAE,4BAA4B,CAAC,CAAC;IACvD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oCAAoC,EAAE,KAAK,IAAI,EAAE;QAClD,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,KAAK,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC;YACjE,MAAM,EAAE,GAAG;SACZ,CAAC,CAAC,CAAC;QACJ,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC5B,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gEAAgE,EAAE,KAAK,IAAI,EAAE;QAC9E,MAAM,MAAM,GAAG,MAAM,qBAAqB,EAAE,CAAC;QAC7C,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,gCAAgC,CAAC,CAAC;QACpD,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE,mCAAmC,CAAC,CAAC;QAE7D,MAAM,IAAI,GAAG,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAqB,CAAC;QAC9D,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,eAAe,EAAE,CAAC,CAAC;QAC7D,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,iDAAiD,CAAC,CAAC;IACtE,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"nodeRunner.node-test.js","sourceRoot":"","sources":["../../src/tests/nodeRunner.node-test.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AACH,OAAO,oBAAoB,CAAC;AAC5B,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,WAAW,CAAC;AACjD,OAAO,QAAQ,MAAM,UAAU,CAAC;AAChC,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAGxD,OAAO,EACL,qBAAqB,EACrB,qBAAqB,EACrB,gBAAgB,EAChB,cAAc,GACf,MAAM,kBAAkB,CAAC;AAE1B,IAAI,8BAAsC,CAAC;AAE3C,8EAA8E;AAC9E,gFAAgF;AAChF,sDAAsD;AACtD,MAAM,CAAC,KAAK,IAAI,EAAE;IAChB,MAAM,cAAc,GAAG,qBAAqB,EAAE,CAAC;IAC/C,MAAM,eAAe,GAAG,qBAAqB,EAAE,CAAC;IAChD,MAAM,CAAC,WAAW,CAAC,cAAc,EAAE,eAAe,CAAC,CAAC;IACpD,8BAA8B,GAAG,MAAM,cAAc,CAAC;AACxD,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,2CAA2C,EAAE,GAAG,EAAE;IACzD,EAAE,CAAC,sDAAsD,EAAE,KAAK,IAAI,EAAE;QACpE,MAAM,CAAC,WAAW,CAAC,8BAA8B,EAAE,cAAc,CAAC,CAAC;QACnE,MAAM,CAAC,WAAW,CAAC,MAAM,qBAAqB,EAAE,EAAE,cAAc,CAAC,CAAC;IACpE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+CAA+C,EAAE,KAAK,IAAI,EAAE;QAC7D,MAAM,QAAQ,CAAC,UAAU,CAAC,SAAS,EAAE,CAAC,CAAC,uCAAuC;QAC9E,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC,kBAAkB;QACnE,MAAM,CAAC,EAAE,CAAC,WAAW,EAAE,4BAA4B,CAAC,CAAC;IACvD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oCAAoC,EAAE,KAAK,IAAI,EAAE;QAClD,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,KAAK,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC;YACjE,MAAM,EAAE,GAAG;SACZ,CAAC,CAAC,CAAC;QACJ,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC5B,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gEAAgE,EAAE,KAAK,IAAI,EAAE;QAC9E,MAAM,MAAM,GAAG,MAAM,qBAAqB,EAAE,CAAC;QAC7C,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,gCAAgC,CAAC,CAAC;QACpD,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE,mCAAmC,CAAC,CAAC;QAE7D,MAAM,IAAI,GAAG,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAqB,CAAC;QAC9D,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,eAAe,EAAE,CAAC,CAAC;QAC7D,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,iDAAiD,CAAC,CAAC;IACtE,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
@@ -8,7 +8,7 @@
8
8
  * and that it got its own fresh per-suite DB off the shared instance.
9
9
  *
10
10
  * The per-file server lifecycle comes from the shipped `setupNodeTest.ts` glue
11
- * (it wires `before(startTestServer)` etc. but never touches Mongo init). Runs as
11
+ * (it wires the idempotent server-readiness hook but never touches Mongo init). Runs as
12
12
  * part of `npm run test:node`.
13
13
  */
14
14
  import './setupNodeTest.ts';
@@ -8,7 +8,7 @@
8
8
  * and that it got its own fresh per-suite DB off the shared instance.
9
9
  *
10
10
  * The per-file server lifecycle comes from the shipped `setupNodeTest.ts` glue
11
- * (it wires `before(startTestServer)` etc. but never touches Mongo init). Runs as
11
+ * (it wires the idempotent server-readiness hook but never touches Mongo init). Runs as
12
12
  * part of `npm run test:node`.
13
13
  */
14
14
  import './setupNodeTest.js';
@@ -20,10 +20,14 @@ export declare function startTestMongo(): Promise<string>;
20
20
  /** Stop the in-memory Mongo replica set. */
21
21
  export declare function stopTestMongo(): Promise<void>;
22
22
  /**
23
- * Boot a framework `Server` against a fresh per-suite database (derived from
24
- * `TEST_MONGO_URI`) and start its HTTP server on a random port. Registers the
25
- * instance via `setServerInstance` so `testHelpers` can reach it.
23
+ * Return the one shared server-start promise for this test-file process.
24
+ *
25
+ * node:test may execute sibling root-level `before()` hooks concurrently. Both
26
+ * the framework preload and application setup hooks must use this gate so they
27
+ * await the same initialization instead of racing two server boots.
26
28
  */
29
+ export declare function ensureTestServerReady(): Promise<Server>;
30
+ /** Start the per-file test server through the idempotent readiness gate. */
27
31
  export declare function startTestServer(): Promise<Server>;
28
32
  /** Shut down the server, drop its database, and disconnect mongoose. */
29
33
  export declare function stopTestServer(): Promise<void>;
@@ -46,12 +46,13 @@ export async function stopTestMongo() {
46
46
  mongoServer = null;
47
47
  }
48
48
  // ── Per-suite server lifecycle ──────────────────────────────────────────────
49
+ let testServerStartPromise = null;
49
50
  /**
50
51
  * Boot a framework `Server` against a fresh per-suite database (derived from
51
52
  * `TEST_MONGO_URI`) and start its HTTP server on a random port. Registers the
52
53
  * instance via `setServerInstance` so `testHelpers` can reach it.
53
54
  */
54
- export async function startTestServer() {
55
+ async function bootTestServer() {
55
56
  process.env.LOGGER_CONSOLE_LEVEL = 'error';
56
57
  process.env.AUTH_SALT = crypto.randomBytes(16).toString('hex');
57
58
  const server = new Server({
@@ -90,6 +91,21 @@ export async function startTestServer() {
90
91
  await server.startServer();
91
92
  return server;
92
93
  }
94
+ /**
95
+ * Return the one shared server-start promise for this test-file process.
96
+ *
97
+ * node:test may execute sibling root-level `before()` hooks concurrently. Both
98
+ * the framework preload and application setup hooks must use this gate so they
99
+ * await the same initialization instead of racing two server boots.
100
+ */
101
+ export function ensureTestServerReady() {
102
+ testServerStartPromise ??= bootTestServer();
103
+ return testServerStartPromise;
104
+ }
105
+ /** Start the per-file test server through the idempotent readiness gate. */
106
+ export function startTestServer() {
107
+ return ensureTestServerReady();
108
+ }
93
109
  /** Shut down the server, drop its database, and disconnect mongoose. */
94
110
  export async function stopTestServer() {
95
111
  if (serverInstance) {
@@ -1 +1 @@
1
- {"version":3,"file":"setupFramework.js","sourceRoot":"","sources":["../../src/tests/setupFramework.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"setupFramework.js","sourceRoot":"","sources":["../../src/tests/setupFramework.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,QAAQ,MAAM,UAAU,CAAC,CAAC,yCAAyC;AAE1E,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACpE,OAAO,MAAM,MAAM,cAAc,CAAC;AAClC,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAErE,QAAQ,CAAC,GAAG,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;AAEjC,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,GAAG,EAAE,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC;AAExD,+EAA+E;AAE/E,8EAA8E;AAC9E,iFAAiF;AACjF,8EAA8E;AAC9E,oDAAoD;AACpD,IAAI,WAAW,GAA4C,IAAI,CAAC;AAEhE,yEAAyE;AACzE,MAAM,CAAC,KAAK,UAAU,cAAc;IAClC,MAAM,EAAE,kBAAkB,EAAE,GAAG,MAAM,MAAM,CAAC,uBAAuB,CAAC,CAAC;IACrE,MAAM,QAAQ,GAAG,MAAM,kBAAkB,CAAC,MAAM,CAAC;QAC/C,OAAO,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,aAAa,EAAE,YAAY,EAAE;KACnD,CAAC,CAAC;IACH,MAAM,QAAQ,CAAC,gBAAgB,EAAE,CAAC;IAClC,WAAW,GAAG,QAAQ,CAAC;IACvB,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC;IACvD,OAAO,CAAC,GAAG,CAAC,cAAc,GAAG,GAAG,CAAC;IACjC,OAAO,GAAG,CAAC;AACb,CAAC;AAED,4CAA4C;AAC5C,MAAM,CAAC,KAAK,UAAU,aAAa;IACjC,MAAM,WAAW,EAAE,IAAI,EAAE,CAAC;IAC1B,WAAW,GAAG,IAAI,CAAC;AACrB,CAAC;AAED,+EAA+E;AAE/E,IAAI,sBAAsB,GAA2B,IAAI,CAAC;AAE1D;;;;GAIG;AACH,KAAK,UAAU,cAAc;IAC3B,OAAO,CAAC,GAAG,CAAC,oBAAoB,GAAG,OAAO,CAAC;IAC3C,OAAO,CAAC,GAAG,CAAC,SAAS,GAAG,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC/D,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC;QACxB,OAAO,EAAE;YACP,MAAM,EACJ,OAAO,CAAC,GAAG,CAAC,kBAAkB,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,WAAW,CAAC;YACvE,WAAW,EACT,OAAO,CAAC,GAAG,CAAC,uBAAuB;gBACnC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,gBAAgB,CAAC;YAC1C,MAAM,EACJ,OAAO,CAAC,GAAG,CAAC,kBAAkB,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,WAAW,CAAC;YACvE,MAAM,EACJ,OAAO,CAAC,GAAG,CAAC,iBAAiB;gBAC7B,OAAO,CAAC,GAAG,CAAC,kBAAkB;gBAC9B,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,uCAAuC,CAAC;YACjE,OAAO,EACL,OAAO,CAAC,GAAG,CAAC,mBAAmB,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,YAAY,CAAC;YACzE,QAAQ,EACN,OAAO,CAAC,GAAG,CAAC,oBAAoB;gBAChC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,aAAa,CAAC;YACvC,UAAU,EACR,OAAO,CAAC,GAAG,CAAC,sBAAsB;gBAClC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,eAAe,CAAC;SAC1C;KACF,CAAC,CAAC;IACH,iBAAiB,CAAC,MAAM,CAAC,CAAC;IAE1B,MAAM,MAAM,CAAC,IAAI,CAAC,EAAE,eAAe,EAAE,IAAI,EAAE,CAAC,CAAC;IAC7C,MAAM,gBAAgB,GAAI,OAAO,CAAC,GAAG,CAAC,cAAyB,CAAC,OAAO,CACrE,mBAAmB,EACnB,QAAQ,MAAM,CAAC,UAAU,EAAE,EAAE,CAC9B,CAAC;IACF,MAAM,CAAC,YAAY,CAAC,OAAO,EAAE,EAAE,gBAAgB,EAAE,CAAC,CAAC;IACnD,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,sBAAsB;IAChE,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,CAAC;IACnD,+EAA+E;IAC/E,6EAA6E;IAC7E,yEAAyE;IACzE,+DAA+D;IAC/D,MAAM,CAAC,YAAY,CAAC,aAAa,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;IACzD,+EAA+E;IAC/E,+EAA+E;IAC/E,yEAAyE;IACzE,oDAAoD;IACpD,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;IAChE,MAAM,MAAM,CAAC,aAAa,EAAE,CAAC;IAC7B,MAAM,MAAM,CAAC,WAAW,EAAE,CAAC;IAC3B,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,qBAAqB;IACnC,sBAAsB,KAAK,cAAc,EAAE,CAAC;IAC5C,OAAO,sBAAsB,CAAC;AAChC,CAAC;AAED,4EAA4E;AAC5E,MAAM,UAAU,eAAe;IAC7B,OAAO,qBAAqB,EAAE,CAAC;AACjC,CAAC;AAED,wEAAwE;AACxE,MAAM,CAAC,KAAK,UAAU,cAAc;IAClC,IAAI,cAAc,EAAE,CAAC;QACnB,cAAc,CAAC,GAAG,CAAC,UAAU,EAAE,QAAQ,EAAE,CAAC;QAC1C,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC7C,CAAC;IACD,IAAI,CAAC;QACH,MAAM,QAAQ,CAAC,UAAU,CAAC,EAAE,EAAE,YAAY,EAAE,CAAC,CAAC,4BAA4B;IAC5E,CAAC;IAAC,MAAM,CAAC;QACP,kCAAkC;IACpC,CAAC;IACD,MAAM,QAAQ,CAAC,UAAU,EAAE,CAAC;AAC9B,CAAC;AAED,+EAA+E;AAE/E,yEAAyE;AACzE,MAAM,UAAU,qBAAqB;IACnC,IAAI,cAAc,EAAE,CAAC;QACnB,MAAM,GAAG,GAAG,QAAQ,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC;QAC9D,cAAc,CAAC,GAAG,CAAC,YAAY,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,CAAC;IAC/D,CAAC;AACH,CAAC;AAED,qFAAqF;AACrF,MAAM,CAAC,KAAK,UAAU,uBAAuB;IAC3C,IAAI,CAAC,cAAc,EAAE,CAAC;QACpB,OAAO;IACT,CAAC;IACD,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,cAAc,CAAC,SAAS,CACjD,OAAO,CACc,CAAC;IACxB,IAAI,CAAC;QACH,4EAA4E;QAC5E,kDAAkD;QAClD,MAAM,EAAE,YAAY,EAAE,GAAG,MAAM,MAAM,CAAC,eAAe,CAAC,CAAC;QACvD,MAAM,WAAW,GAAG,YAAY,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC;QAC1C,MAAM,WAAW,CAAC,OAAO,EAAE,CAAC;QAC5B,MAAM,cAAc,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;QAC7C,MAAM,WAAW,CAAC,OAAO,EAAE,CAAC;IAC9B,CAAC;IAAC,MAAM,CAAC;QACP,+BAA+B;IACjC,CAAC;AACH,CAAC"}
@@ -8,8 +8,8 @@
8
8
  // processes (a preload that calls `startTestMongo`, see the testing docs) or
9
9
  // point `TEST_MONGO_URI` at an external instance.
10
10
  import { after, afterEach, before, beforeEach } from 'node:test';
11
- import { clearTestRedisNamespace, setTestRedisNamespace, startTestServer, stopTestServer, } from './setupFramework.js';
12
- before(startTestServer);
11
+ import { clearTestRedisNamespace, ensureTestServerReady, setTestRedisNamespace, stopTestServer, } from './setupFramework.js';
12
+ before(ensureTestServerReady);
13
13
  beforeEach(setTestRedisNamespace);
14
14
  afterEach(clearTestRedisNamespace);
15
15
  after(stopTestServer);
@@ -1 +1 @@
1
- {"version":3,"file":"setupNodeTest.js","sourceRoot":"","sources":["../../src/tests/setupNodeTest.ts"],"names":[],"mappings":"AAAA,+EAA+E;AAC/E,4EAA4E;AAC5E,iCAAiC;AACjC,EAAE;AACF,uEAAuE;AACvE,+EAA+E;AAC/E,8EAA8E;AAC9E,6EAA6E;AAC7E,kDAAkD;AAClD,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AACjE,OAAO,EACL,uBAAuB,EACvB,qBAAqB,EACrB,eAAe,EACf,cAAc,GACf,MAAM,qBAAqB,CAAC;AAE7B,MAAM,CAAC,eAAe,CAAC,CAAC;AACxB,UAAU,CAAC,qBAAqB,CAAC,CAAC;AAClC,SAAS,CAAC,uBAAuB,CAAC,CAAC;AACnC,KAAK,CAAC,cAAc,CAAC,CAAC"}
1
+ {"version":3,"file":"setupNodeTest.js","sourceRoot":"","sources":["../../src/tests/setupNodeTest.ts"],"names":[],"mappings":"AAAA,+EAA+E;AAC/E,4EAA4E;AAC5E,iCAAiC;AACjC,EAAE;AACF,uEAAuE;AACvE,+EAA+E;AAC/E,8EAA8E;AAC9E,6EAA6E;AAC7E,kDAAkD;AAClD,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AACjE,OAAO,EACL,uBAAuB,EACvB,qBAAqB,EACrB,qBAAqB,EACrB,cAAc,GACf,MAAM,qBAAqB,CAAC;AAE7B,MAAM,CAAC,qBAAqB,CAAC,CAAC;AAC9B,UAAU,CAAC,qBAAqB,CAAC,CAAC;AAClC,SAAS,CAAC,uBAAuB,CAAC,CAAC;AACnC,KAAK,CAAC,cAAc,CAAC,CAAC"}
@@ -8,6 +8,12 @@ export declare const setServerInstance: (serverInstanceToSet: Server) => void;
8
8
  export declare const setDefaultUser: (userToSet: InstanceType<GetModelTypeFromClass<typeof UserModel>>) => void;
9
9
  export declare const setDefaultAuthToken: (tokenToSet: string) => void;
10
10
  export declare const getTestServerURL: (urlPart?: string) => string;
11
+ /**
12
+ * Await the idempotent per-file server startup used by the node:test preload.
13
+ * Call this first from an application root-level `before()` hook before using
14
+ * `appInstance`, models, config, or the HTTP server.
15
+ */
16
+ export declare function ensureTestServerReady(): Promise<Server>;
11
17
  export declare const createDefaultTestUser: () => Promise<false | {
12
18
  user: import("mongoose").Document<unknown, object, {
13
19
  createdAt: NativeDate;
@@ -21,6 +21,18 @@ export const setDefaultAuthToken = (tokenToSet) => {
21
21
  defaultAuthToken = tokenToSet;
22
22
  };
23
23
  export const getTestServerURL = (urlPart) => `http://127.0.0.1:${appInstance.getConfig('http').port}${urlPart}`;
24
+ let publicServerReadyPromise = null;
25
+ /**
26
+ * Await the idempotent per-file server startup used by the node:test preload.
27
+ * Call this first from an application root-level `before()` hook before using
28
+ * `appInstance`, models, config, or the HTTP server.
29
+ */
30
+ export function ensureTestServerReady() {
31
+ // Lazy import avoids an eager cycle: setupFramework owns startup and imports
32
+ // the instance setters above, while consumer tests discover this helper here.
33
+ publicServerReadyPromise ??= import('./setupFramework.js').then(({ ensureTestServerReady: ensureReady }) => ensureReady());
34
+ return publicServerReadyPromise;
35
+ }
24
36
  export const createDefaultTestUser = async () => {
25
37
  if (defaultUser) {
26
38
  throw new Error('You already have created default user');
@@ -1 +1 @@
1
- {"version":3,"file":"testHelpers.js","sourceRoot":"","sources":["../../src/tests/testHelpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAMxD,MAAM,CAAC,IAAI,cAAuB,CAAC;AACnC,MAAM,CAAC,IAAI,WAAkE,CAAC;AAC9E,MAAM,CAAC,IAAI,gBAAwB,CAAC;AAEpC,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,mBAA2B,EAAE,EAAE;IAC/D,IAAI,cAAc,EAAE,CAAC;QACnB,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;IACpD,CAAC;IACD,cAAc,GAAG,mBAAmB,CAAC;AACvC,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG,CAC5B,SAAgE,EAChE,EAAE;IACF,IAAI,WAAW,EAAE,CAAC;QAChB,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACjD,CAAC;IACD,WAAW,GAAG,SAAS,CAAC;AAC1B,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,UAAkB,EAAE,EAAE;IACxD,IAAI,gBAAgB,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;IAC/C,CAAC;IACD,gBAAgB,GAAG,UAAU,CAAC;AAChC,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,OAAgB,EAAE,EAAE,CACnD,oBAAoB,WAAW,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,IAAI,GAAG,OAAO,EAAE,CAAC;AAErE,MAAM,CAAC,MAAM,qBAAqB,GAAG,KAAK,IAAI,EAAE;IAC9C,IAAI,WAAW,EAAE,CAAC;QAChB,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;IAC3D,CAAC;IACD,MAAM,IAAI,GAAG,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAqB,CAAC;IAC9D,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC;QAC7B,KAAK,EAAE,eAAe;QACtB,QAAQ,EAAE,cAAc;QACxB,UAAU,EAAE,IAAI;QAChB,IAAI,EAAE;YACJ,IAAI,EAAE,kBAAkB;SACzB;KACF,CAAC,CAAC,KAAK,CAAC,CAAC,CAAQ,EAAE,EAAE;QACpB,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACjB,OAAO,CAAC,IAAI,CACV,qGAAqG,CACtG,CAAC;IACJ,CAAC,CAAC,CAAC;IACH,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO,KAAK,CAAC;IACf,CAAC;IACD,cAAc,CAAC,IAAI,CAAC,CAAC;IACrB,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;IACzC,mBAAmB,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACjC,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC;AACtC,CAAC,CAAC"}
1
+ {"version":3,"file":"testHelpers.js","sourceRoot":"","sources":["../../src/tests/testHelpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAMxD,MAAM,CAAC,IAAI,cAAuB,CAAC;AACnC,MAAM,CAAC,IAAI,WAAkE,CAAC;AAC9E,MAAM,CAAC,IAAI,gBAAwB,CAAC;AAEpC,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,mBAA2B,EAAE,EAAE;IAC/D,IAAI,cAAc,EAAE,CAAC;QACnB,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;IACpD,CAAC;IACD,cAAc,GAAG,mBAAmB,CAAC;AACvC,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG,CAC5B,SAAgE,EAChE,EAAE;IACF,IAAI,WAAW,EAAE,CAAC;QAChB,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACjD,CAAC;IACD,WAAW,GAAG,SAAS,CAAC;AAC1B,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,UAAkB,EAAE,EAAE;IACxD,IAAI,gBAAgB,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;IAC/C,CAAC;IACD,gBAAgB,GAAG,UAAU,CAAC;AAChC,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,OAAgB,EAAE,EAAE,CACnD,oBAAoB,WAAW,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,IAAI,GAAG,OAAO,EAAE,CAAC;AAErE,IAAI,wBAAwB,GAA2B,IAAI,CAAC;AAE5D;;;;GAIG;AACH,MAAM,UAAU,qBAAqB;IACnC,6EAA6E;IAC7E,8EAA8E;IAC9E,wBAAwB,KAAK,MAAM,CAAC,qBAAqB,CAAC,CAAC,IAAI,CAC7D,CAAC,EAAE,qBAAqB,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC,WAAW,EAAE,CAC1D,CAAC;IACF,OAAO,wBAAwB,CAAC;AAClC,CAAC;AAED,MAAM,CAAC,MAAM,qBAAqB,GAAG,KAAK,IAAI,EAAE;IAC9C,IAAI,WAAW,EAAE,CAAC;QAChB,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;IAC3D,CAAC;IACD,MAAM,IAAI,GAAG,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAqB,CAAC;IAC9D,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC;QAC7B,KAAK,EAAE,eAAe;QACtB,QAAQ,EAAE,cAAc;QACxB,UAAU,EAAE,IAAI;QAChB,IAAI,EAAE;YACJ,IAAI,EAAE,kBAAkB;SACzB;KACF,CAAC,CAAC,KAAK,CAAC,CAAC,CAAQ,EAAE,EAAE;QACpB,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACjB,OAAO,CAAC,IAAI,CACV,qGAAqG,CACtG,CAAC;IACJ,CAAC,CAAC,CAAC;IACH,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO,KAAK,CAAC;IACf,CAAC;IACD,cAAc,CAAC,IAAI,CAAC,CAAC;IACrB,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;IACzC,mBAAmB,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACjC,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC;AACtC,CAAC,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@adaptivestone/framework",
3
- "version": "5.1.3",
3
+ "version": "5.2.0",
4
4
  "description": "Adaptive stone node js framework",
5
5
  "type": "module",
6
6
  "engines": {
@@ -10,6 +10,7 @@
10
10
  "./package.json": "./package.json",
11
11
  "./server.js": "./dist/server.js",
12
12
  "./Cli.js": "./dist/Cli.js",
13
+ "./cluster.js": "./dist/cluster.js",
13
14
  "./types.js": "./dist/types.js",
14
15
  "./folderConfig.js": "./dist/folderConfig.js",
15
16
  "./config/*": "./dist/config/*",
@@ -33,7 +34,7 @@
33
34
  "check:types:raw": "tsc --noEmit",
34
35
  "check:types:fast": "npm run gen && tsc --noEmit",
35
36
  "dev": "node --watch ./src/index.ts",
36
- "prod": "node --watch ./src/cluster.ts",
37
+ "prod": "node ./src/cluster.ts",
37
38
  "test": "vitest run",
38
39
  "t": "vitest --coverage=false --reporter=default",
39
40
  "test:node": "node --test --test-global-setup=./src/tests/globalSetupNodeTest.ts 'src/tests/**/*.node-test.ts'",