Dont crash watch on error (#1241)

levkk · web-flow · commit a64be9b81bb8 · 2023-12-14T11:08:21.000-08:00
diff --git a/packages/cargo-pgml-components/Cargo.lock b/packages/cargo-pgml-components/Cargo.lock
diff --git a/packages/cargo-pgml-components/Cargo.toml b/packages/cargo-pgml-components/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cargo-pgml-components"
-version = "0.1.23"
+version = "0.1.24"
 edition = "2021"
 authors = ["PostgresML <team@postgresml.org>"]
 license = "MIT"
diff --git a/packages/cargo-pgml-components/src/frontend/tools.rs b/packages/cargo-pgml-components/src/frontend/tools.rs
@@ -132,6 +132,8 @@ pub fn debug() {
 }
 
 pub fn watch() {
+    rebuild();
+
     let mut debouncer = unwrap_or_exit!(new_debouncer(
         Duration::from_secs(1),
         None,
@@ -156,9 +158,7 @@ pub fn watch() {
                     }
 
                     if detected {
-                        print("changes detected, rebuilding...");
                         rebuild();
-                        info("done");
                     }
                 }
 
@@ -211,7 +211,12 @@ pub fn lint(check: bool) {
 }
 
 fn rebuild() {
-    unwrap_or_exit!(execute_command(
-        Command::new("cargo").arg("pgml-components").arg("bundle")
-    ));
+    print("changes detected, rebuilding...");
+    match execute_command(Command::new("cargo").arg("pgml-components").arg("bundle")) {
+        Ok(_) => info("ok"),
+        Err(err) => {
+            error("error");
+            error!("{}", err);
+        }
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -132,6 +132,8 @@ pub fn debug() {`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`pub fn watch() {`
	`135`	`+ rebuild();`
	`136`	`+`
`135`	`137`	`let mut debouncer = unwrap_or_exit!(new_debouncer(`
`136`	`138`	`Duration::from_secs(1),`
`137`	`139`	`None,`
`@@ -156,9 +158,7 @@ pub fn watch() {`
`156`	`158`	`}`
`157`	`159`
`158`	`160`	`if detected {`
`159`		`- print("changes detected, rebuilding...");`
`160`	`161`	`rebuild();`
`161`		`- info("done");`
`162`	`162`	`}`
`163`	`163`	`}`
`164`	`164`
`@@ -211,7 +211,12 @@ pub fn lint(check: bool) {`
`211`	`211`	`}`
`212`	`212`
`213`	`213`	`fn rebuild() {`
`214`		`- unwrap_or_exit!(execute_command(`
`215`		`- Command::new("cargo").arg("pgml-components").arg("bundle")`
`216`		`- ));`
	`214`	`+ print("changes detected, rebuilding...");`
	`215`	`+ match execute_command(Command::new("cargo").arg("pgml-components").arg("bundle")) {`
	`216`	`+ Ok(_) => info("ok"),`
	`217`	`+ Err(err) => {`
	`218`	`+ error("error");`
	`219`	`+ error!("{}", err);`
	`220`	`+ }`
	`221`	`+ }`
`217`	`222`	`}`