tidy: implement js:typecheck and js:es-lint extra checks

Author: lolbinarycat

src/tools/tidy/src/ext_tool_checks.rs

@@ -252,6 +252,14 @@ fn check_impl(
         rustdoc_js::lint(librustdoc_path, tools_path, src_path)?;
     }
 
+    if js_typecheck {
+        rustdoc_js::typecheck(librustdoc_path)?;
+    }
+
+    if js_es_check {
+        rustdoc_js::es_check(librustdoc_path)?;
+    }
+
     Ok(())
 }
 

src/tools/tidy/src/ext_tool_checks/rustdoc_js.rs

@@ -9,6 +9,18 @@ use ignore::DirEntry;
 
 use crate::walk::walk_no_read;
 
+fn rustdoc_js_files(librustdoc_path: &Path) -> Vec<PathBuf> {
+    let mut files = Vec::new();
+    walk_no_read(
+        &[&librustdoc_path.join("html/static/js")],
+        |path, is_dir| is_dir || !path.extension().is_some_and(|ext| ext == OsStr::new("js")),
+        &mut |path: &DirEntry| {
+            files.push(path.path().into());
+        },
+    );
+    return files;
+}
+
 fn run_eslint(args: &[PathBuf], config_folder: PathBuf) -> Result<(), super::Error> {
     let mut child = Command::new("npx")
         .arg("eslint")
@@ -83,18 +95,48 @@ pub(super) fn lint(
             ));
         }
     }
-    let mut files_to_check = Vec::new();
-    walk_no_read(
-        &[&librustdoc_path.join("html/static/js")],
-        |path, is_dir| is_dir || !path.extension().is_some_and(|ext| ext == OsStr::new("js")),
-        &mut |path: &DirEntry| {
-            files_to_check.push(path.path().into());
-        },
-    );
+    let files_to_check = rustdoc_js_files(librustdoc_path);
     println!("Running eslint on rustdoc JS files");
     run_eslint(&files_to_check, librustdoc_path.join("html/static"))?;
 
     run_eslint(&[tools_path.join("rustdoc-js/tester.js")], tools_path.join("rustdoc-js"))?;
     run_eslint(&[tools_path.join("rustdoc-gui/tester.js")], tools_path.join("rustdoc-gui"))?;
     Ok(())
 }
+
+pub(super) fn typecheck(librustdoc_path: &Path) -> Result<(), super::Error> {
+    // use npx to ensure correct version
+    let mut child = Command::new("npx")
+        .arg("tsc")
+        .arg("-p")
+        .arg(librustdoc_path.join("html/static/js/tsconfig.json"))
+        .spawn()?;
+    match child.wait() {
+        Ok(exit_status) => {
+            if exit_status.success() {
+                return Ok(());
+            }
+            Err(super::Error::FailedCheck("tsc command failed"))
+        }
+        Err(error) => Err(super::Error::Generic(format!("tsc command failed: {error:?}"))),
+    }
+}
+
+pub(super) fn es_check(librustdoc_path: &Path) -> Result<(), super::Error> {
+    let files_to_check = rustdoc_js_files(librustdoc_path);
+    // use npx to ensure correct version
+    let mut cmd = Command::new("npx");
+    cmd.arg("es-check").arg("es2019");
+    for f in files_to_check {
+        cmd.arg(f);
+    }
+    match cmd.spawn()?.wait() {
+        Ok(exit_status) => {
+            if exit_status.success() {
+                return Ok(());
+            }
+            Err(super::Error::FailedCheck("es-check command failed"))
+        }
+        Err(error) => Err(super::Error::Generic(format!("es-check command failed: {error:?}"))),
+    }
+}