Fix error handling when rescript.json parsing fails

Author: cknitt

rewatch/src/build.rs

@@ -16,7 +16,7 @@ use crate::helpers::emojis::*;
 use crate::helpers::{self};
 use crate::project_context::ProjectContext;
 use crate::{config, sourcedirs};
-use anyhow::{Result, anyhow};
+use anyhow::{Context, Result, anyhow};
 use build_types::*;
 use console::style;
 use indicatif::{ProgressBar, ProgressStyle};
@@ -501,7 +501,7 @@ pub fn build(
         plain_output,
         warn_error,
     )
-    .map_err(|e| anyhow!("Could not initialize build. Error: {e}"))?;
+    .with_context(|| "Could not initialize build")?;
 
     match incremental_build(
         &mut build_state,

rewatch/src/main.rs

@@ -56,7 +56,7 @@ fn main() -> Result<()> {
                 (*build_args.warn_error).clone(),
             ) {
                 Err(e) => {
-                    println!("{e}");
+                    println!("{:#}", e);
                     std::process::exit(1)
                 }
                 Ok(_) => {
@@ -76,17 +76,21 @@ fn main() -> Result<()> {
                 );
             }
 
-            watcher::start(
+            match watcher::start(
                 &watch_args.filter,
                 show_progress,
                 &watch_args.folder,
                 (*watch_args.after_build).clone(),
                 *watch_args.create_sourcedirs,
                 plain_output,
                 (*watch_args.warn_error).clone(),
-            );
-
-            Ok(())
+            ) {
+                Err(e) => {
+                    println!("{:#}", e);
+                    std::process::exit(1)
+                }
+                Ok(_) => Ok(()),
+            }
         }
         cli::Command::Clean { folder, dev } => {
             let _lock = get_lock(&folder);

rewatch/src/project_context.rs

@@ -2,8 +2,8 @@ use crate::build::packages;
 use crate::config::Config;
 use crate::helpers;
 use ahash::{AHashMap, AHashSet};
-use anyhow::Result;
 use anyhow::anyhow;
+use anyhow::{Context, Result};
 use log::debug;
 use std::fmt;
 use std::path::{Path, PathBuf};
@@ -168,7 +168,7 @@ impl ProjectContext {
     pub fn new(path: &Path) -> Result<ProjectContext> {
         let path = helpers::get_abs_path(path);
         let current_config = packages::read_config(&path)
-            .map_err(|_| anyhow!("Could not read rescript.json at {}", path.to_string_lossy()))?;
+            .with_context(|| format!("Could not read rescript.json at {}", path.to_string_lossy()))?;
         let nearest_parent_config_path = match path.parent() {
             None => Err(anyhow!(
                 "The current path \"{}\" does not have a parent folder",

rewatch/src/watcher.rs

@@ -8,6 +8,7 @@ use crate::helpers::emojis::*;
 use crate::lock::LOCKFILE;
 use crate::queue::FifoQueue;
 use crate::queue::*;
+use anyhow::{Context, Result};
 use futures_timer::Delay;
 use notify::event::ModifyKind;
 use notify::{Config, Error, Event, EventKind, RecommendedWatcher, RecursiveMode, Watcher};
@@ -78,10 +79,10 @@ async fn async_watch(
         plain_output,
         warn_error,
     }: AsyncWatchArgs<'_>,
-) -> notify::Result<()> {
+) -> Result<()> {
     let mut build_state: build::build_types::BuildCommandState =
         build::initialize_build(None, filter, show_progress, path, plain_output, warn_error)
-            .expect("Can't initialize build");
+            .with_context(|| "Could not initialize build")?;
     let mut needs_compile_type = CompileType::Incremental;
     // create a mutex to capture if ctrl-c was pressed
     let ctrlc_pressed = Arc::new(Mutex::new(false));
@@ -278,7 +279,7 @@ async fn async_watch(
                     plain_output,
                     build_state.get_warn_error_override(),
                 )
-                .expect("Can't initialize build");
+                .expect("Could not initialize build");
                 let _ = build::incremental_build(
                     &mut build_state,
                     None,
@@ -324,7 +325,7 @@ pub fn start(
     create_sourcedirs: bool,
     plain_output: bool,
     warn_error: Option<String>,
-) {
+) -> Result<()> {
     futures::executor::block_on(async {
         let queue = Arc::new(FifoQueue::<Result<Event, Error>>::new());
         let producer = queue.clone();
@@ -341,7 +342,7 @@ pub fn start(
 
         let path = Path::new(folder);
 
-        if let Err(e) = async_watch(AsyncWatchArgs {
+        async_watch(AsyncWatchArgs {
             q: consumer,
             path,
             show_progress,
@@ -352,8 +353,5 @@ pub fn start(
             warn_error: warn_error.clone(),
         })
         .await
-        {
-            println!("{e:?}")
-        }
     })
 }

rewatch/tests/experimental.sh

@@ -38,3 +38,88 @@ fi
 mv rescript.json.bak rescript.json
 
 success "experimental-features emits -enable-experimental twice as string list"
+
+bold "Test: build surfaces experimental-features list parse error"
+
+cp rescript.json rescript.json.bak
+
+node -e '
+const fs = require("fs");
+const j = JSON.parse(fs.readFileSync("rescript.json", "utf8"));
+j["experimental-features"] = ["LetUnwrap"];
+fs.writeFileSync("rescript.json", JSON.stringify(j, null, 2));
+'
+
+out=$(rewatch build 2>&1)
+status=$?
+
+mv rescript.json.bak rescript.json
+rm -f lib/rescript.lock
+
+if [ $status -eq 0 ]; then
+  error "Expected build to fail for experimental-features list input"
+  echo "$out"
+  exit 1
+fi
+
+echo "$out" | grep -q "Could not read rescript.json"
+if [ $? -ne 0 ]; then
+  error "Missing rescript.json path context in build error"
+  echo "$out"
+  exit 1
+fi
+
+echo "$out" | grep -qi "invalid type"
+if [ $? -ne 0 ]; then
+  error "Missing detailed parse error in build output"
+  echo "$out"
+  exit 1
+fi
+
+success "Experimental-features list produces detailed build error"
+
+bold "Test: watch reports invalid experimental-features without panicking"
+
+cp rescript.json rescript.json.bak
+
+node -e '
+const fs = require("fs");
+const cfg = JSON.parse(fs.readFileSync("rescript.json", "utf8"));
+cfg["experimental-features"] = ["LetUnwrap"];
+fs.writeFileSync("rescript.json", JSON.stringify(cfg, null, 2));
+'
+
+out=$(rewatch watch 2>&1)
+status=$?
+
+mv rescript.json.bak rescript.json
+rm -f lib/rescript.lock
+
+if [ $status -eq 0 ]; then
+  error "Expected watch to fail for invalid experimental-features list"
+  echo "$out"
+  exit 1
+fi
+
+echo "$out" | grep -q "Could not read rescript.json"
+if [ $? -ne 0 ]; then
+  error "Missing rescript.json path context in watch error"
+  echo "$out"
+  exit 1
+fi
+
+echo "$out" | grep -qi "invalid type"
+if [ $? -ne 0 ]; then
+  error "Missing detailed parse error for experimental-features list"
+  echo "$out"
+  exit 1
+fi
+
+echo "$out" | grep -q "panicked"
+if [ $? -eq 0 ]; then
+  error "Watcher should not panic when config is invalid"
+  echo "$out"
+  exit 1
+fi
+
+success "Invalid experimental-features list handled without panic"

rewatch/tests/snapshots/clean-rebuild.txt

@@ -11,6 +11,6 @@ Use 'dev-dependencies' instead.
 The field 'bsc-flags' found in the package config of '@testrepo/deprecated-config' is deprecated and will be removed in a future version.
 Use 'compiler-flags' instead.
 
-The field 'ignored-dirs' found in the package config of '@testrepo/deprecated-config' is not supported by ReScript's new build system (rewatch).
+The field 'ignored-dirs' found in the package config of '@testrepo/deprecated-config' is not supported by ReScript 12's new build system.
 
 Unknown field 'some-new-field' found in the package config of '@testrepo/deprecated-config'. This option will be ignored.