chore: resolve module option in tsconfig#compilerOptions (#479)

Author: Brooooooklyn

fixtures/tsconfig/cases/merge_compiler_options/base-tsconfig.json

@@ -4,6 +4,8 @@
     "jsx": "react-jsx",
     "jsxFactory": "h",
     "jsxFragmentFactory": "Fragment",
-    "jsxImportSource": "xxx"
+    "jsxImportSource": "xxx",
+    "module": "ESNext",
+    "target": "ESNext"
   }
 }

src/tests/tsconfig_paths.rs

@@ -236,6 +236,8 @@ fn test_merge_tsconfig() {
     assert_eq!(compiler_options.jsx_factory, Some("h".to_string()));
     assert_eq!(compiler_options.jsx_fragment_factory, Some("Fragment".to_string()));
     assert_eq!(compiler_options.jsx_import_source, Some("xxx".to_string()));
+    assert_eq!(compiler_options.module, Some("ESNext".to_string()));
+    assert_eq!(compiler_options.target, Some("ESNext".to_string()));
 }
 
 #[test]

src/tsconfig.rs

@@ -126,8 +126,44 @@ pub trait TsConfig: Sized + Debug {
                 compiler_options.set_jsx_import_source(jsx_import_source.to_string());
             }
         }
-    }
 
+        if compiler_options.verbatim_module_syntax().is_none() {
+            if let Some(verbatim_module_syntax) =
+                tsconfig.compiler_options().verbatim_module_syntax()
+            {
+                compiler_options.set_verbatim_module_syntax(*verbatim_module_syntax);
+            }
+        }
+
+        if compiler_options.preserve_value_imports().is_none() {
+            if let Some(preserve_value_imports) =
+                tsconfig.compiler_options().preserve_value_imports()
+            {
+                compiler_options.set_preserve_value_imports(*preserve_value_imports);
+            }
+        }
+
+        if compiler_options.imports_not_used_as_values().is_none() {
+            if let Some(imports_not_used_as_values) =
+                tsconfig.compiler_options().imports_not_used_as_values()
+            {
+                compiler_options
+                    .set_imports_not_used_as_values(imports_not_used_as_values.to_string());
+            }
+        }
+
+        if compiler_options.target().is_none() {
+            if let Some(target) = tsconfig.compiler_options().target() {
+                compiler_options.set_target(target.to_string());
+            }
+        }
+
+        if compiler_options.module().is_none() {
+            if let Some(module) = tsconfig.compiler_options().module() {
+                compiler_options.set_module(module.to_string());
+            }
+        }
+    }
     /// "Build" the root tsconfig, resolve:
     ///
     /// * `{configDir}` template variable
@@ -347,6 +383,46 @@ pub trait CompilerOptions {
 
     /// Sets JSX import source.
     fn set_jsx_import_source(&mut self, _jsx_import_source: String) {}
+
+    /// Whether to use verbatim module syntax.
+    fn verbatim_module_syntax(&self) -> Option<&bool> {
+        None
+    }
+
+    /// Sets whether to use verbatim module syntax.
+    fn set_verbatim_module_syntax(&mut self, _verbatim_module_syntax: bool) {}
+
+    /// Whether to preserve value imports.
+    fn preserve_value_imports(&self) -> Option<&bool> {
+        None
+    }
+
+    /// Sets whether to preserve value imports.
+    fn set_preserve_value_imports(&mut self, _preserve_value_imports: bool) {}
+
+    /// Whether to use imports not used as values.
+    fn imports_not_used_as_values(&self) -> Option<&str> {
+        None
+    }
+
+    /// Sets whether to use imports not used as values.
+    fn set_imports_not_used_as_values(&mut self, _imports_not_used_as_values: String) {}
+
+    /// Target.
+    fn target(&self) -> Option<&str> {
+        None
+    }
+
+    /// Sets the target.
+    fn set_target(&mut self, _target: String) {}
+
+    /// Module.
+    fn module(&self) -> Option<&str> {
+        None
+    }
+
+    /// Sets the module.
+    fn set_module(&mut self, _module: String) {}
 }
 
 /// Project Reference.

src/tsconfig_serde.rs

@@ -145,6 +145,9 @@ pub struct CompilerOptionsSerde {
 
     /// <https://www.typescriptlang.org/tsconfig/#target>
     pub target: Option<String>,
+
+    /// <https://www.typescriptlang.org/tsconfig/#module>
+    pub module: Option<String>,
 }
 
 impl CompilerOptions for CompilerOptionsSerde {
@@ -223,6 +226,46 @@ impl CompilerOptions for CompilerOptionsSerde {
     fn set_jsx_import_source(&mut self, jsx_import_source: String) {
         self.jsx_import_source = Some(jsx_import_source);
     }
+
+    fn verbatim_module_syntax(&self) -> Option<&bool> {
+        self.verbatim_module_syntax.as_ref()
+    }
+
+    fn set_verbatim_module_syntax(&mut self, verbatim_module_syntax: bool) {
+        self.verbatim_module_syntax = Some(verbatim_module_syntax);
+    }
+
+    fn preserve_value_imports(&self) -> Option<&bool> {
+        self.preserve_value_imports.as_ref()
+    }
+
+    fn set_preserve_value_imports(&mut self, preserve_value_imports: bool) {
+        self.preserve_value_imports = Some(preserve_value_imports);
+    }
+
+    fn imports_not_used_as_values(&self) -> Option<&str> {
+        self.imports_not_used_as_values.as_deref()
+    }
+
+    fn set_imports_not_used_as_values(&mut self, imports_not_used_as_values: String) {
+        self.imports_not_used_as_values = Some(imports_not_used_as_values);
+    }
+
+    fn target(&self) -> Option<&str> {
+        self.target.as_deref()
+    }
+
+    fn set_target(&mut self, target: String) {
+        self.target = Some(target);
+    }
+
+    fn module(&self) -> Option<&str> {
+        self.module.as_deref()
+    }
+
+    fn set_module(&mut self, module: String) {
+        self.module = Some(module);
+    }
 }
 
 /// Value for the "extends" field.