Add flag for preserve jsx mode to rescript.json (#7547)

* Add flag feature to json parsing

* Add test

* Pass jsx flags to compiler

Author: nojaf

rewatch/src/build/compile.rs

@@ -394,6 +394,10 @@ pub fn compiler_args(
     };
 
     let uncurried_args = root_config.get_uncurried_args(version);
+    let jsx_args = root_config.get_jsx_args();
+    let jsx_module_args = root_config.get_jsx_module_args();
+    let jsx_mode_args = root_config.get_jsx_mode_args();
+    let jsx_preserve_args = root_config.get_jsx_preserve_args();
     let gentype_arg = config.get_gentype_arg();
 
     let warning_args: Vec<String> = match config.warnings.to_owned() {
@@ -476,6 +480,10 @@ pub fn compiler_args(
             Path::new("..").join("ocaml").to_string_lossy().to_string(),
         ],
         dependency_paths.concat(),
+        jsx_args,
+        jsx_module_args,
+        jsx_mode_args,
+        jsx_preserve_args,
         uncurried_args,
         bsc_flags.to_owned(),
         warning_args,

rewatch/src/build/packages.rs

@@ -839,6 +839,10 @@ impl Package {
         self.config.get_jsx_module_args()
     }
 
+    pub fn get_jsx_preserve_args(&self) -> Vec<String> {
+        self.config.get_jsx_preserve_args()
+    }
+
     pub fn get_uncurried_args(&self, version: &str, root_package: &packages::Package) -> Vec<String> {
         root_package.config.get_uncurried_args(version)
     }

rewatch/src/build/parse.rs

@@ -272,6 +272,7 @@ pub fn parser_args(
     let jsx_args = root_config.get_jsx_args();
     let jsx_module_args = root_config.get_jsx_module_args();
     let jsx_mode_args = root_config.get_jsx_mode_args();
+    let jsx_preserve_args = root_config.get_jsx_preserve_args();
     let uncurried_args = root_config.get_uncurried_args(version);
     let bsc_flags = config::flatten_flags(&config.bsc_flags);
 
@@ -285,6 +286,7 @@ pub fn parser_args(
             jsx_args,
             jsx_module_args,
             jsx_mode_args,
+            jsx_preserve_args,
             uncurried_args,
             bsc_flags,
             vec![

rewatch/src/config.rs

@@ -184,6 +184,7 @@ pub struct JsxSpecs {
     pub mode: Option<JsxMode>,
     #[serde(rename = "v3-dependencies")]
     pub v3_dependencies: Option<Vec<String>>,
+    pub preserve: Option<bool>,
 }
 
 /// We do not care about the internal structure because the gentype config is loaded by bsc.
@@ -434,6 +435,16 @@ impl Config {
         }
     }
 
+    pub fn get_jsx_preserve_args(&self) -> Vec<String> {
+        match self.jsx.to_owned() {
+            Some(jsx) => match jsx.preserve {
+                Some(true) => vec!["-bs-jsx-preserve".to_string()],
+                _ => vec![],
+            },
+            _ => vec![],
+        }
+    }
+
     pub fn get_uncurried_args(&self, version: &str) -> Vec<String> {
         match check_if_rescript11_or_higher(version) {
             Ok(true) => match self.uncurried.to_owned() {
@@ -614,6 +625,35 @@ mod tests {
                 module: Some(JsxModule::Other(String::from("Voby.JSX"))),
                 mode: None,
                 v3_dependencies: None,
+                preserve: None,
+            },
+        );
+    }
+
+    #[test]
+    fn test_jsx_preserve() {
+        let json = r#"
+        {
+            "name": "my-monorepo",
+            "sources": [ { "dir": "src/", "subdirs": true } ],
+            "package-specs": [ { "module": "es6", "in-source": true } ],
+            "suffix": ".mjs",
+            "pinned-dependencies": [ "@teamwalnut/app" ],
+            "bs-dependencies": [ "@teamwalnut/app" ],
+            "jsx": { "version": 4, "preserve": true }
+        }
+        "#;
+
+        let config = serde_json::from_str::<Config>(json).unwrap();
+        assert!(config.jsx.is_some());
+        assert_eq!(
+            config.jsx.unwrap(),
+            JsxSpecs {
+                version: Some(4),
+                module: None,
+                mode: None,
+                v3_dependencies: None,
+                preserve: Some(true),
             },
         );
     }