kaleidawave · kaleidawave · Nov 10, 2024 · Aug 30, 2024 · Aug 30, 2024 · Nov 10, 2024
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -43,7 +43,6 @@ base64 = "0.21"
 console = "0.15"
 codespan-reporting = "0.11"
 enum-variants-strings = "0.3"
-glob = "0.3"
 # For `StrComparison` for string comparison
 pretty_assertions = "1.3.0"
 serde = { version = "1.0", features = ["derive"] }
@@ -59,6 +58,8 @@ native-tls = "0.2.11"
 multiline-term-input = "0.1.0"
 # For watching files
 notify = "6.1.0"
+notify-debouncer-full = "0.3.1"
+glob = "0.3"
 
 [dependencies.checker]
 path = "./checker"

diff --git a/checker/src/options.rs b/checker/src/options.rs
@@ -3,6 +3,7 @@
 #[cfg_attr(feature = "serde-serialize", derive(serde::Deserialize), serde(default))]
 #[cfg_attr(target_family = "wasm", derive(tsify::Tsify))]
 #[allow(clippy::struct_excessive_bools)]
+#[derive(Clone)]
 pub struct TypeCheckOptions {
 	/// Parameters cannot be reassigned
 	pub constant_parameters: bool,

diff --git a/src/cli.rs b/src/cli.rs
@@ -5,7 +5,7 @@ use std::{
 	path::{Path, PathBuf},
 	process::Command,
 	process::ExitCode,
-	time::Instant,
+	time::{Duration, Instant},
 };
 
 use crate::{
@@ -112,9 +112,9 @@ pub(crate) struct CheckArguments {
 	/// paths to definition files
 	#[argh(option, short = 'd')]
 	pub definition_file: Option<PathBuf>,
-	/// whether to re-check on file changes TODO #164
+	/// whether to re-check on file changes
 	#[argh(switch)]
-	pub _watch: bool,
+	pub watch: bool,
 	/// whether to display check time
 	#[argh(switch)]
 	pub timings: bool,
@@ -173,6 +173,68 @@ fn file_system_resolver(path: &Path) -> Option<String> {
 	}
 }
 
+fn run_checker<T: crate::ReadFromFS>(
+	entry_points: Vec<PathBuf>,
+	read_file: &T,
+	timings: bool,
+	definition_file: Option<PathBuf>,
+	max_diagnostics: MaxDiagnostics,
+	type_check_options: TypeCheckOptions,
+	compact_diagnostics: bool,
+) -> ExitCode {
+	let CheckOutput { diagnostics, module_contents, chronometer, types, .. } =
+		check(entry_points, read_file, definition_file.as_deref(), type_check_options);
+
+	let diagnostics_count = diagnostics.count();
+	let current = timings.then(std::time::Instant::now);
+
+	let result = if diagnostics.has_error() {
+		if let MaxDiagnostics::FixedTo(0) = max_diagnostics {
+			let count = diagnostics.into_iter().count();
+			print_to_cli(format_args!(
+				"Found {count} type errors and warnings {}",
+				console::Emoji(" 😬", ":/")
+			))
+		} else {
+			report_diagnostics_to_cli(
+				diagnostics,
+				&module_contents,
+				compact_diagnostics,
+				max_diagnostics,
+			)
+			.unwrap();
+		}
+		ExitCode::FAILURE
+	} else {
+		// May be warnings or information here
+		report_diagnostics_to_cli(
+			diagnostics,
+			&module_contents,
+			compact_diagnostics,
+			max_diagnostics,
+		)
+		.unwrap();
+		print_to_cli(format_args!("No type errors found {}", console::Emoji("🎉", ":)")));
+		ExitCode::SUCCESS
+	};
+
+	#[cfg(not(target_family = "wasm"))]
+	if timings {
+		let reporting = current.unwrap().elapsed();
+		eprintln!("---\n");
+		eprintln!("Diagnostics:\t{}", diagnostics_count);
+		eprintln!("Types:      \t{}", types.count_of_types());
+		eprintln!("Lines:      \t{}", chronometer.lines);
+		eprintln!("Cache read: \t{:?}", chronometer.cached);
+		eprintln!("FS read:    \t{:?}", chronometer.fs);
+		eprintln!("Parsed in:  \t{:?}", chronometer.parse);
+		eprintln!("Checked in: \t{:?}", chronometer.check);
+		eprintln!("Reporting:  \t{:?}", reporting);
+	}
+
+	result
+}
+
 pub fn run_cli<T: crate::ReadFromFS, U: crate::WriteToFS, V: crate::CLIInputResolver>(
 	cli_arguments: &[&str],
 	read_file: &T,
@@ -195,8 +257,7 @@ pub fn run_cli<T: crate::ReadFromFS, U: crate::WriteToFS, V: crate::CLIInputReso
 		CompilerSubCommand::Check(check_arguments) => {
 			let CheckArguments {
 				input,
-				// TODO #164
-				_watch,
+				watch,
 				definition_file,
 				timings,
 				compact_diagnostics,
@@ -215,57 +276,64 @@ pub fn run_cli<T: crate::ReadFromFS, U: crate::WriteToFS, V: crate::CLIInputReso
 				Err(_) => return ExitCode::FAILURE,
 			};
 
-			let CheckOutput { diagnostics, module_contents, chronometer, types, .. } =
-				check(entry_points, read_file, definition_file.as_deref(), type_check_options);
+			if watch {
+				#[cfg(target_family = "wasm")]
+				panic!("'watch' mode not supported on WASM");
 
-			let diagnostics_count = diagnostics.count();
-			let current = timings.then(std::time::Instant::now);
+				#[cfg(not(target_family = "wasm"))]
+				{
+					use notify::Watcher;
+					use notify_debouncer_full::new_debouncer;
 
-			let result = if diagnostics.has_error() {
-				if let MaxDiagnostics::FixedTo(0) = max_diagnostics {
-					let count = diagnostics.into_iter().count();
-					print_to_cli(format_args!(
-						"Found {count} type errors and warnings {}",
-						console::Emoji(" 😬", ":/")
-					))
-				} else {
-					report_diagnostics_to_cli(
-						diagnostics,
-						&module_contents,
+					let (tx, rx) = std::sync::mpsc::channel();
+					let mut debouncer =
+						new_debouncer(Duration::from_millis(200), None, tx).unwrap();
+
+					for e in &entry_points {
+						_ = debouncer.watcher().watch(e, notify::RecursiveMode::Recursive).unwrap();
+					}
+
+					// Run once
+					run_checker(
+						entry_points.clone(),
+						read_file,
+						timings,
+						definition_file.clone(),
+						max_diagnostics.clone(),
+						type_check_options.clone(),
 						compact_diagnostics,
-						max_diagnostics,
-					)
-					.unwrap();
+					);
+
+					for res in rx {
+						match res {
+							Ok(_e) => {
+								run_checker(
+									entry_points.clone(),
+									read_file,
+									timings,
+									definition_file.clone(),
+									max_diagnostics.clone(),
+									type_check_options.clone(),
+									compact_diagnostics,
+								);
+							}
+							Err(error) => eprintln!("Error: {error:?}"),
+						}
+					}
+					// Infinite loop here so the compiler is satisfied that this never returns
+					loop {}
 				}
-				ExitCode::FAILURE
-			} else {
-				// May be warnings or information here
-				report_diagnostics_to_cli(
-					diagnostics,
-					&module_contents,
-					compact_diagnostics,
-					max_diagnostics,
-				)
-				.unwrap();
-				print_to_cli(format_args!("No type errors found {}", console::Emoji("🎉", ":)")));
-				ExitCode::SUCCESS
-			};
-
-			#[cfg(not(target_family = "wasm"))]
-			if timings {
-				let reporting = current.unwrap().elapsed();
-				eprintln!("---\n");
-				eprintln!("Diagnostics:\t{}", diagnostics_count);
-				eprintln!("Types:      \t{}", types.count_of_types());
-				eprintln!("Lines:      \t{}", chronometer.lines);
-				eprintln!("Cache read: \t{:?}", chronometer.cached);
-				eprintln!("FS read:    \t{:?}", chronometer.fs);
-				eprintln!("Parsed in:  \t{:?}", chronometer.parse);
-				eprintln!("Checked in: \t{:?}", chronometer.check);
-				eprintln!("Reporting:  \t{:?}", reporting);
 			}
 
-			result
+			run_checker(
+				entry_points,
+				read_file,
+				timings,
+				definition_file,
+				max_diagnostics,
+				type_check_options,
+				compact_diagnostics,
+			)
 		}
 		CompilerSubCommand::Experimental(ExperimentalArguments {
 			nested: ExperimentalSubcommand::Build(build_config),
@@ -454,6 +522,13 @@ pub fn run_cli<T: crate::ReadFromFS, U: crate::WriteToFS, V: crate::CLIInputReso
 	}
 }
 
+// `glob` library does not work on WASM :(
+#[cfg(target_family = "wasm")]
+fn get_entry_points(input: String) -> Result<Vec<PathBuf>, ()> {
+	Ok(vec![input.into()])
+}
+
+#[cfg(not(target_family = "wasm"))]
 fn get_entry_points(input: String) -> Result<Vec<PathBuf>, ()> {
 	match glob::glob(&input) {
 		Ok(files) => {