fixup! fixup! fixup! fixup! fixup! fixup! Add a brand new watcher

avajs · Jul 2, 2023 · a4b4ab4 · a4b4ab4
1 parent 1326724
commit a4b4ab4
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 22 deletions.
diff --git a/test/watch-mode/helpers/watch.js b/test/watch-mode/helpers/watch.js
@@ -82,7 +82,7 @@ export const withFixture = fixture => async (t, task) => {
 
 					t.timeout(10_000);
 
-					const promise = delay(5000, null, {ref: false}).then(() => {
+					const promise = Promise.all([delay(5000, null, {ref: false}), next?.()]).finally(() => {
 						if (idlePromise === promise) {
 							idlePromise = new Promise(() => {});
 							assertingIdle = false;
@@ -96,40 +96,43 @@ export const withFixture = fixture => async (t, task) => {
 					});
 					idlePromise = promise;
 
-					await next?.();
 					await promise;
 				};
 
 				let state = {};
 				let pendingState;
 
 				const results = run(args, options);
-				let nextResult = results.next();
-				while (true) { // eslint-disable-line no-constant-condition
-					const item = await Promise.race([nextResult, idlePromise, donePromise]); // eslint-disable-line no-await-in-loop
+				try {
+					let nextResult = results.next();
+					while (true) { // eslint-disable-line no-constant-condition
+						const item = await Promise.race([nextResult, idlePromise, donePromise]); // eslint-disable-line no-await-in-loop
 
-					if (item.value) {
-						failedIdleAssertion ||= assertingIdle;
+						if (item.value) {
+							failedIdleAssertion ||= assertingIdle;
 
-						state = (await pendingState) ?? state; // eslint-disable-line no-await-in-loop
-						const result = item.value;
-						const {[result.runCount]: handler = handlers.else} = handlers;
-						pendingState = handler?.call({assertIdle, done, ...operations}, result, state);
+							state = (await pendingState) ?? state; // eslint-disable-line no-await-in-loop
+							const result = item.value;
+							const {[result.runCount]: handler = handlers.else} = handlers;
+							pendingState = handler?.call({assertIdle, done, ...operations}, result, state);
 
-						if (!item.done && !isDone) {
-							nextResult = results.next();
+							if (!item.done && !isDone) {
+								nextResult = results.next();
+							}
 						}
-					}
 
-					if (item.done || isDone) {
-						item.value?.process.send('abort-watcher');
-						results.return();
-						break;
+						if (item.done || isDone) {
+							item.value?.process.send('abort-watcher');
+							break;
+						}
 					}
-				}
+				} finally {
+					results.return();
 
-				if (assertingIdle) await idlePromise;
-				await pendingState;
+					// Handle outstanding promises in case they reject.
+					if (assertingIdle) await idlePromise;
+					await pendingState;
+				}
 			},
 		});
 

diff --git a/test/watch-mode/typescript.js b/test/watch-mode/typescript.js
@@ -72,7 +72,7 @@ test('ignores changes to compiled files with inline compilation', withFixture('t
 	await fs.symlink(new URL('../../node_modules', import.meta.url), path.join(fixture.dir, 'node_modules'));
 	await fixture.watch({
 		async 1(result) {
-			t.log(result);
+			t.log(result.stats);
 			await this.assertIdle(async () => {
 				t.log(await fs.readdir(path.join(fixture.dir)));
 				t.log(await fs.readdir(path.join(fixture.dir, 'build')));