@shirudo/ddd-kit 3.0.0-rc.6 → 3.0.0-rc.8

package/dist/testing.d.ts

@@ -147,6 +147,14 @@ interface EsRepositoryContractHarness<TAggregate extends Aggregate<Id<string>, T
    * Enables the snapshot catch-up proof.
    */
   captureSnapshot?(aggregate: TAggregate, environment: EsRepositoryContractEnvironment<TAggregate, TEvent>): Promise<void>;
+  /**
+   * Bound for the overlapping `run` calls, in milliseconds: the second call
+   * of the environment preflight, and the committing call of each
+   * stale-writer proof. Raise it only for a second connection that needs
+   * more time to open, or for a slow commit. Keep twice the bound, plus
+   * environment creation and teardown, below the test timeout of the runner.
+   */
+  overlappingCallsBoundMs?: number;
 }
 type EsRepositoryContractTest = ContractTest;
 /**
@@ -537,6 +545,14 @@ interface RepositoryContractHarness<TAggregate extends Aggregate<Id<string>, TEv
   removesAreSupported?: boolean;
   /** The remove flush predicates on the version captured at load. */
   removesAreVersionChecked?: boolean;
+  /**
+   * Bound for the overlapping `run` calls, in milliseconds: the second call
+   * of the environment preflight, and the committing call of each
+   * stale-writer proof. Raise it only for a second connection that needs
+   * more time to open, or for a slow commit. Keep twice the bound, plus
+   * environment creation and teardown, below the test timeout of the runner.
+   */
+  overlappingCallsBoundMs?: number;
 }
 type RepositoryContractTest = ContractTest;
 /**

package/dist/testing.js

@@ -1,4 +1,4 @@
-import { E as deepEqual, t as isDispatchTrackingOutbox, u as isRecordedDomainEvent } from "./chunks/ports.js";
+import { N as deepEqual, _ as isRecordedDomainEvent, i as runBoundedExecution, t as isDispatchTrackingOutbox } from "./chunks/ports.js";
 
 //#region src/testing/contract-assertions.ts
 /**
@@ -44,6 +44,123 @@ function captureRejection(promise) {
 	return promise.then(() => void 0, (error) => error);
 }
 /**
+* Default bound for the overlapping `run` calls of the contract suites, in
+* milliseconds. On an environment that gives each `run` call its own
+* connection, the second call completes in milliseconds. The failure path
+* takes up to twice the bound: the bound itself, then the wait for the
+* released calls to settle. Twice the bound plus environment creation and
+* teardown stays below the default test timeout of common runners
+* (5000 ms). So the named failure reaches the report before the runner's
+* own timeout replaces it.
+*/
+const OVERLAPPING_CALLS_BOUND_MS = 1e3;
+const overlappingCallsViolation = (boundMs) => `run must permit overlapping calls: a second run call did not complete within ${boundMs} ms while the first call stayed open. Either run serializes its calls, the first call holds a lock that blocks the second one, or the second call needs more time than the bound. Give each call its own transaction and connection, load without row locks, or raise overlappingCallsBoundMs on the harness`;
+function settle(promise) {
+	return promise.then((value) => ({
+		status: "fulfilled",
+		value
+	}), (reason) => ({
+		status: "rejected",
+		reason
+	}));
+}
+/** Outcomes of every promise, or `undefined` when one is still open after `boundMs`. */
+function settledWithin(promises, boundMs) {
+	return runBoundedExecution("release of the overlapping calls", { timeoutMs: boundMs }, () => Promise.allSettled(promises)).catch(() => void 0);
+}
+/**
+* Starts a `run` call and holds it open. `start` receives `hold`. The work
+* of the call awaits `hold()` at the point where it must stay open, for
+* example after its load. The result resolves once the work holds and the
+* call is still open. A call that rejects before that propagates its
+* rejection. A call that resolves while its work holds fails: `run` did not
+* await its work.
+*/
+async function parkRunCall(start) {
+	let release;
+	const mayContinue = new Promise((resolve) => {
+		release = resolve;
+	});
+	let markHolding;
+	const holding = new Promise((resolve) => {
+		markHolding = () => resolve("holding");
+	});
+	const call = start(() => {
+		markHolding();
+		return mayContinue;
+	});
+	const settled = settle(call).then((outcome) => outcome.status);
+	let state = await Promise.race([holding, settled]);
+	if (state === "holding") state = await Promise.race([settled, Promise.resolve("holding")]);
+	if (state === "rejected") await call;
+	assert(state === "holding", "run must await its work: the call resolved while its work still holds");
+	return {
+		call,
+		release
+	};
+}
+/**
+* Starts a `run` call through `startCall` and awaits it. The call must
+* complete while `parked` stays open. On an environment that serializes
+* `run`, it never completes. So this bounds the wait. After `boundMs` it
+* releases the parked call and waits up to `boundMs` for both calls to
+* settle. Then it fails with the requirement. A rejection of the call, or a
+* synchronous throw of `startCall`, releases the parked call the same way
+* and then propagates. On success the parked call stays parked; the proof
+* releases it when it is ready.
+*/
+async function awaitOverlappingCall(startCall, parked, boundMs) {
+	let call;
+	try {
+		call = startCall();
+	} catch (error) {
+		parked.release();
+		await settledWithin([parked.call], boundMs);
+		throw error;
+	}
+	const outcome = await runBoundedExecution("overlapping run call", { timeoutMs: boundMs }, () => settle(call)).catch(() => void 0);
+	if (outcome?.status === "fulfilled") return outcome.value;
+	parked.release();
+	await settledWithin([parked.call, call], boundMs);
+	assert(outcome !== void 0, overlappingCallsViolation(boundMs));
+	throw outcome.reason;
+}
+/**
+* Proves that the environment lets two `run` calls stay open at once.
+*
+* The stale-writer proofs hold one transaction open while a second one
+* commits. An environment that serializes `run` (one connection, a mutex)
+* blocks the second call behind the first. The suite then hangs at the test
+* timeout with no cause. This proof turns that hang into a named failure
+* within `boundMs`. It releases the first call before it returns and waits
+* up to `boundMs` for both calls to complete. A second call that is still
+* blocked after that stays in flight, observed, while the failure reports.
+*/
+async function assertRunPermitsOverlappingCalls(run, boundMs) {
+	const first = await parkRunCall((hold) => run(hold));
+	await awaitOverlappingCall(() => run(async () => {}), first, boundMs);
+	first.release();
+	const firstOutcome = (await settledWithin([first.call], boundMs))?.[0];
+	assert(firstOutcome !== void 0, `the first run call did not complete within ${boundMs} ms after the proof released it`);
+	if (firstOutcome.status === "rejected") throw firstOutcome.reason;
+}
+/**
+* The preflight entry both repository suites put first: it names a
+* serializing environment before the stale-writer proofs can hang on it.
+* Each `run` call of the proof reads `freshId()` before it holds. So an
+* adapter that reserves its connection on the first statement holds the
+* connection while the call stays open.
+*/
+function overlappingCallsPreflight(inEnvironment, freshId, boundMs) {
+	return {
+		name: "environment preflight: a second run call completes while the first call stays open",
+		run: inEnvironment((env) => assertRunPermitsOverlappingCalls((work) => env.run(async ({ repository }) => {
+			await repository.findById(freshId());
+			await work();
+		}), boundMs))
+	};
+}
+/**
 * Load with a contract diagnostic instead of a bare TypeError downstream.
 * `suspectHint` names the suite-specific likely cause (broken hydration
 * vs broken replay read).
@@ -804,6 +921,7 @@ function createEsRepositoryContractTests(harness) {
 	const createAggregateWithId = harness.createAggregateWithId;
 	const snapshotState = harness.snapshotState;
 	const captureSnapshot = harness.captureSnapshot;
+	const overlappingCallsBoundMs = harness.overlappingCallsBoundMs ?? 1e3;
 	const load = (repository, id) => loadAggregateOrFail(repository, id, "the stream was not appended or replayed correctly");
 	const streamFor = (id) => harness.streamKeyFor(id);
 	const recordedIds = (events) => recordedPendingEventIds(events, "pending events must be recorded before flush");
@@ -820,6 +938,7 @@ function createEsRepositoryContractTests(harness) {
 		return aggregate;
 	}
 	const tests = [
+		overlappingCallsPreflight(inEnvironment, () => harness.createAggregate().id, overlappingCallsBoundMs),
 		{
 			name: "add appends the exact creation batch to stream and outbox",
 			run: inEnvironment(async (environment) => {
@@ -839,32 +958,22 @@ function createEsRepositoryContractTests(harness) {
 			name: "MANDATORY stale append: writer B conflicts after writer A commits and appends no prefix",
 			run: inEnvironment(async (environment) => {
 				const seeded = await seed(environment);
-				let loaded;
-				const bLoaded = new Promise((resolve) => {
-					loaded = resolve;
-				});
-				let release;
-				const mayAppend = new Promise((resolve) => {
-					release = resolve;
-				});
-				const writerB = environment.run(async ({ repository }) => {
+				const writerB = await parkRunCall((hold) => environment.run(async ({ repository }) => {
 					const stale = await load(repository, seeded.id);
-					loaded();
-					await mayAppend;
+					await hold();
 					harness.mutate(stale);
 					harness.mutate(stale);
 					repository.update(stale);
-				});
-				await bLoaded;
-				const winner = await environment.run(async ({ repository }) => {
+				}));
+				const winner = await awaitOverlappingCall(() => environment.run(async ({ repository }) => {
 					const current = await load(repository, seeded.id);
 					harness.mutate(current);
 					repository.update(current);
 					return current;
-				});
+				}), writerB, overlappingCallsBoundMs);
 				const streamAfterWinner = await environment.committedStreamEvents(streamFor(seeded.id), readAll);
-				release();
-				const rejection = await captureRejection(writerB);
+				writerB.release();
+				const rejection = await captureRejection(writerB.call);
 				assertChainContainsKitError(rejection, ["CONCURRENCY_CONFLICT"], `stale append must reject with ConcurrencyConflictError; got ${describeError(rejection)}`);
 				const finalStream = await environment.committedStreamEvents(streamFor(seeded.id), readAll);
 				assert(finalStream.exists && deepEqual(ids(finalStream.events), ids(streamAfterWinner.events)), "a rejected multi-event append must leave no prefix in the stream");
@@ -2489,6 +2598,7 @@ function createRepositoryContractTests(harness) {
 	const insertsAreDuplicateChecked = harness.insertsAreDuplicateChecked !== false;
 	const removesAreSupported = harness.removesAreSupported === true;
 	const removesAreVersionChecked = removesAreSupported && harness.removesAreVersionChecked === true;
+	const overlappingCallsBoundMs = harness.overlappingCallsBoundMs ?? 1e3;
 	const load = (repository, id) => loadAggregateOrFail(repository, id, "the adapter did not commit or reconstitute the aggregate");
 	async function seed(environment) {
 		const aggregate = harness.createAggregate();
@@ -2502,6 +2612,7 @@ function createRepositoryContractTests(harness) {
 	const eventIds = (events) => sortedCommittedEventIds(events);
 	const pendingEventIds = (events) => recordedPendingEventIds(events, "the harness must record pending events before persistence");
 	const tests = [
+		overlappingCallsPreflight(inEnvironment, () => harness.createAggregate().id, overlappingCallsBoundMs),
 		{
 			name: "add flushes a new aggregate and its exact event batch atomically",
 			run: inEnvironment(async (environment) => {
@@ -2543,31 +2654,21 @@ function createRepositoryContractTests(harness) {
 			name: "MANDATORY stale update: writer B conflicts after writer A commits and persists nothing",
 			run: inEnvironment(async (environment) => {
 				const seeded = await seed(environment);
-				let loadedB;
-				const bLoaded = new Promise((resolve) => {
-					loadedB = resolve;
-				});
-				let releaseB;
-				const bMayFlush = new Promise((resolve) => {
-					releaseB = resolve;
-				});
-				const writerB = environment.run(async ({ repository }) => {
+				const writerB = await parkRunCall((hold) => environment.run(async ({ repository }) => {
 					const stale = await load(repository, seeded.id);
-					loadedB();
-					await bMayFlush;
+					await hold();
 					harness.mutate(stale);
 					repository.update(stale);
-				});
-				await bLoaded;
-				const committedA = await environment.run(async ({ repository }) => {
+				}));
+				const committedA = await awaitOverlappingCall(() => environment.run(async ({ repository }) => {
 					const current = await load(repository, seeded.id);
 					harness.mutate(current);
 					repository.update(current);
 					return current;
-				});
+				}), writerB, overlappingCallsBoundMs);
 				const outboxAfterA = await environment.committedOutboxEvents();
-				releaseB();
-				const rejection = await captureRejection(writerB);
+				writerB.release();
+				const rejection = await captureRejection(writerB.call);
 				assertChainContainsKitError(rejection, ["CONCURRENCY_CONFLICT"], `stale update must reject with ConcurrencyConflictError; got ${describeError(rejection)}`);
 				const final = await reload(environment, seeded.id);
 				assertEqual(final.version, committedA.version, "the stale writer must not replace writer A's version");
@@ -2711,29 +2812,19 @@ function createRepositoryContractTests(harness) {
 		name: "stale remove conflicts and cannot delete a concurrent update",
 		run: inEnvironment(async (environment) => {
 			const seeded = await seed(environment);
-			let loaded;
-			const staleLoaded = new Promise((resolve) => {
-				loaded = resolve;
-			});
-			let release;
-			const mayRemove = new Promise((resolve) => {
-				release = resolve;
-			});
-			const staleRemove = environment.run(async ({ repository }) => {
+			const staleRemove = await parkRunCall((hold) => environment.run(async ({ repository }) => {
 				assert(repository.remove !== void 0, "remove capability gate");
 				const stale = await load(repository, seeded.id);
-				loaded();
-				await mayRemove;
+				await hold();
 				repository.remove(stale);
-			});
-			await staleLoaded;
-			await environment.run(async ({ repository }) => {
+			}));
+			await awaitOverlappingCall(() => environment.run(async ({ repository }) => {
 				const current = await load(repository, seeded.id);
 				harness.mutate(current);
 				repository.update(current);
-			});
-			release();
-			const rejection = await captureRejection(staleRemove);
+			}), staleRemove, overlappingCallsBoundMs);
+			staleRemove.release();
+			const rejection = await captureRejection(staleRemove.call);
 			assertChainContainsKitError(rejection, ["CONCURRENCY_CONFLICT"], `stale remove must reject with ConcurrencyConflictError; got ${describeError(rejection)}`);
 			assert(await reload(environment, seeded.id) !== void 0, "stale remove must not delete the concurrent winner");
 		})