CLI: Add watching for .json, .cjs, .mjs, and .ts

src/cli/run.js

@@ -8,7 +8,8 @@ const requireQUnit = require( "./require-qunit" );
 const utils = require( "./utils" );
 const { findReporter } = require( "./find-reporter" );
 
-const RESTART_DEBOUNCE_LENGTH = 200;
+const DEBOUNCE_WATCH_LENGTH = 60;
+const DEBOUNCE_RESTART_LENGTH = 200 - DEBOUNCE_WATCH_LENGTH;
 
 const changedPendingPurge = [];
 
@@ -158,7 +159,7 @@ run.restart = function( args ) {
 		}
 
 		run.abort( () => run.apply( null, args ) );
-	}, RESTART_DEBOUNCE_LENGTH );
+	}, DEBOUNCE_RESTART_LENGTH );
 };
 
 run.abort = function( callback ) {
@@ -179,18 +180,40 @@ run.abort = function( callback ) {
 	}
 };
 
-run.watch = function watch() {
+run.watch = function watch( _, options ) {
 	const watch = require( "node-watch" );
 	const args = Array.prototype.slice.call( arguments );
 	const baseDir = process.cwd();
 
+	QUnit = requireQUnit();
+	global.QUnit = QUnit;
+	options.requires.forEach( requireFromCWD );
+
+	// Include TypeScript when in use (automatically via require.extensions),
+	// https://github.com/qunitjs/qunit/issues/1669.
+	//
+	// Include ".json" (part of require.extensions) for test suites that use a data files,
+	// and for changes to package.json that may affect how a file is parsed (e.g. type=module).
+	//
+	// Include ".cjs" and ".mjs", which Node.js doesn't expose via require.extensions by default.
+	//
+	// eslint-disable-next-line node/no-deprecated-api
+	const includeExts = Object.keys( require.extensions ).concat( [ ".cjs", ".mjs" ] );
+	const ignoreDirs = [ ".git", "node_modules" ];
+
 	const watcher = watch( baseDir, {
 		persistent: true,
 		recursive: true,
-		delay: 0,
-		filter: ( fullpath ) => {
-			return !/\/node_modules\//.test( fullpath ) &&
-				/\.js$/.test( fullpath );
+
+		// Bare minimum delay, we have another debounce in run.restart().
+		delay: DEBOUNCE_WATCH_LENGTH,
+		filter: ( fullpath, skip ) => {
+			if ( /\/node_modules\//.test( fullpath ) ||
+				ignoreDirs.includes( path.basename( fullpath ) )
+			) {
+				return skip;
+			}
+			return includeExts.includes( path.extname( fullpath ) );
 		}
 	}, ( event, fullpath ) => {
 		console.log( `File ${event}: ${path.relative( baseDir, fullpath )}` );

test/cli/cli-watch.js

@@ -28,6 +28,10 @@ if ( process.platform === "win32" ) {
 }
 
 QUnit.module( "CLI Watch", function( hooks ) {
+	hooks.before( function() {
+		rimraf.sync( fixturePath );
+	} );
+
 	hooks.beforeEach( function() {
 		fs.mkdirSync( path.dirname( fixturePath ), { recursive: true } );
 		fixturify.writeSync( fixturePath, {
@@ -171,6 +175,92 @@ QUnit.module( "CLI Watch", function( hooks ) {
 		assert.equal( result.stdout, expectedWatchOutput[ "remove-file" ] );
 	} );
 
+	// Skip in coverage mode since NYC adds non-default extensions
+	QUnit[ process.env.NYC_PROCESS_ID ? "skip" : "test" ]( "default file extensions", async assert => {
+		fixturify.writeSync( fixturePath, {
+			"tests": {
+				"setup.js": "QUnit.on('runEnd', function() { process.send('runEnd'); });",
+				"foo.js": "QUnit.test('foo', function(assert) { assert.true(true); });"
+			}
+		} );
+
+		const command = [ "qunit", "--watch", "watching/tests" ];
+		const result = await executeIpc(
+			command,
+			execution => {
+				execution.once( "message", () => {
+					fixturify.writeSync( fixturePath, {
+						"x.cjs": "-",
+						"x.js": "-",
+						"x.json": "-",
+						"x.mjs": "-",
+						"x.ts": "-",
+						"x.txt": "-",
+
+						"node_modules": {
+							"x": {
+								"y.js": "-"
+							}
+						},
+
+						"tests": {
+							"foo.js": "QUnit.test('foo2', function(assert) { assert.true(true); });",
+							"setup.js": "QUnit.on('runEnd', function() { process.send('runEnd2'); });"
+						}
+					} );
+
+					execution.once( "message", data => {
+
+						// Ignore other re-runs
+						if ( data === "runEnd2" ) {
+							kill( execution );
+						}
+					} );
+				} );
+			}
+		);
+
+		assert.equal( result.code, 0 );
+		assert.equal( result.stderr, "" );
+		assert.equal( result.stdout, expectedWatchOutput[ "file-extensions" ] );
+	} );
+
+	// Skip in coverage mode since NYC adds non-default extensions
+	QUnit[ process.env.NYC_PROCESS_ID ? "skip" : "test" ]( "TypeScript file extension", async assert => {
+		fixturify.writeSync( fixturePath, {
+			"register.js": "require.extensions['.ts'] = function() {};",
+			"tests": {
+				"setup.js": "QUnit.on('runEnd', function() { process.send('runEnd'); });",
+				"foo.js": "QUnit.test('foo', function(assert) { assert.true(true); });"
+			}
+		} );
+
+		const command = [ "qunit", "--watch", "--require", "./watching/register", "watching/tests" ];
+		const result = await executeIpc(
+			command,
+			execution => {
+				execution.once( "message", () => {
+					fixturify.writeSync( fixturePath, {
+						"x.js": "-",
+						"x.ts": "-",
+						"tests": {
+							"foo.js": "QUnit.test('foo2', function(assert) { assert.true(true); });",
+							"setup.js": "QUnit.on('runEnd', function() { process.send('runEnd2'); });"
+						}
+					} );
+
+					execution.once( "message", () => {
+						kill( execution );
+					} );
+				} );
+			}
+		);
+
+		assert.equal( result.code, 0 );
+		assert.equal( result.stderr, "" );
+		assert.equal( result.stdout, expectedWatchOutput[ "file-extension-ts" ] );
+	} );
+
 	QUnit.test( "aborts and restarts when in middle of run", async assert => {
 
 		// A proper abort finishes the currently running test and runs any remaining

test/cli/fixtures/expected/watch-tap-outputs.js

@@ -62,6 +62,50 @@ ok 1 foo
 # skip 0
 # todo 0
 # fail 0
+Stopping QUnit...`,
+
+	"file-extensions": `TAP version 13
+ok 1 foo
+1..1
+# pass 1
+# skip 0
+# todo 0
+# fail 0
+File update: watching/x.cjs
+File update: watching/x.js
+File update: watching/x.json
+File update: watching/x.mjs
+File update: watching/tests/foo.js
+File update: watching/tests/setup.js
+Restarting...
+TAP version 13
+ok 1 foo2
+1..1
+# pass 1
+# skip 0
+# todo 0
+# fail 0
+Stopping QUnit...`,
+
+	"file-extension-ts": `TAP version 13
+ok 1 foo
+1..1
+# pass 1
+# skip 0
+# todo 0
+# fail 0
+File update: watching/x.js
+File update: watching/x.ts
+File update: watching/tests/foo.js
+File update: watching/tests/setup.js
+Restarting...
+TAP version 13
+ok 1 foo2
+1..1
+# pass 1
+# skip 0
+# todo 0
+# fail 0
 Stopping QUnit...`,
 
 	"change-file-mid-run": `TAP version 13

test/cli/helpers/execute.js

@@ -110,7 +110,7 @@ module.exports.execute = async function execute( command, options = {}, hook ) {
 			result.code = exitCode;
 			const stderr = normalize( String( result.stderr ).trimEnd() );
 			if ( exitCode !== 0 ) {
-				reject( new Error( "Error code " + exitCode + "\n" + stderr ) );
+				reject( new Error( "Error code " + exitCode + "\n" + ( stderr || result.stdout ) ) );
 			} else {
 				resolve();
 			}