State change -> event

avajs · Oct 28, 2023 · f10831b · f10831b
1 parent e15de69
commit f10831b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 50 deletions.
diff --git a/entrypoints/internal.d.mts b/entrypoints/internal.d.mts
@@ -1,25 +1,7 @@
 import type {StateChangeEvent} from '../types/state-change-events.d.cts';
 
-export type RunEvent = {
-	type: 'stateChange';
-	stateChange: StateChangeEvent;
-} | {
-	type: 'run';
-	plan: {
-		bailWithoutReporting: boolean;
-		debug: boolean;
-		failFastEnabled: boolean;
-		filePathPrefix: string;
-		files: string[];
-		matching: boolean;
-		previousFailures: number;
-		runOnlyExclusive: boolean;
-		firstRun: boolean;
-	};
-};
-
-export type {StateChangeEvent} from '../types/state-change-events.d.cts';
+export type Event = StateChangeEvent;
 
 export type ObservedRun = {
-	events: AsyncIterableIterator<RunEvent>;
+	events: AsyncIterableIterator<Event>;
 };
diff --git a/lib/api-event-iterator.js b/lib/api-event-iterator.js
@@ -2,20 +2,9 @@ import {on} from 'node:events';
 
 export async function * asyncEventIteratorFromApi(api) {
 	for await (const [plan] of on(api, 'run')) {
-		yield {
-			type: 'run',
-			plan,
-		};
 
 		for await (const [stateChange] of on(plan.status, 'stateChange')) {
-			yield {
-				type: 'stateChange',
-				stateChange,
-			};
-
-			if (stateChange.type === 'end') {
-				break;
-			}
+			yield stateChange;
 		}
 	}
 }
diff --git a/test/internal-events/fixtures/ava.config.js b/test/internal-events/fixtures/ava.config.js
@@ -13,7 +13,7 @@ export default {
 		for await (const event of run.events) {
 			internalEvents.push(event);
 
-			if (event.type === 'stateChange' && event.stateChange.type === 'end') {
+			if (event.type === 'end') {
 				await fs.writeFile('internal-events.json', JSON.stringify(internalEvents));
 			}
 		}

diff --git a/test/internal-events/test.js b/test/internal-events/test.js
@@ -11,28 +11,18 @@ test('internal events are emitted', async t => {
 	const result = JSON.parse(await fs.readFile(fileURLToPath(new URL('fixtures/internal-events.json', import.meta.url))));
 
 	t.like(result[0], {
-		type: 'run',
-		plan: {
-			files: [
-				fileURLToPath(new URL('fixtures/test.js', import.meta.url)),
-			],
-		},
+		type: 'starting',
+		testFile: fileURLToPath(new URL('fixtures/test.js', import.meta.url)),
 	});
 
-	const testPassedEvent = result.find(event => event.type === 'stateChange' && event.stateChange.type === 'test-passed');
+	const testPassedEvent = result.find(event => event.type === 'test-passed');
 	t.like(testPassedEvent, {
-		type: 'stateChange',
-		stateChange: {
-			type: 'test-passed',
-			title: 'placeholder',
-			testFile: fileURLToPath(new URL('fixtures/test.js', import.meta.url)),
-		},
+		type: 'test-passed',
+		title: 'placeholder',
+		testFile: fileURLToPath(new URL('fixtures/test.js', import.meta.url)),
 	});
 
 	t.like(result[result.length - 1], {
-		type: 'stateChange',
-		stateChange: {
-			type: 'end',
-		},
+		type: 'end',
 	});
 });