Refactor cli args

devongovett · devongovett · commit 0d2844eed6cc · 2022-01-22T13:17:23.000-05:00
diff --git a/src/main.rs b/src/main.rs
@@ -15,16 +15,17 @@ struct CliArgs {
   #[clap(short, long)]
   minify: bool,
   /// Enable parsing CSS nesting
-  #[clap(short, long)]
+  #[clap(long)]
   nesting: bool,
-  /// Enable CSS modules in output
-  #[clap(short, long, group = "css_modules")]
-  css_modules: bool,
-  /// Default: <output_file>.json
-  #[clap(long, requires = "css_modules")]
-  css_modules_output_file: Option<String>,
+  /// Enable parsing custom media queries
+  #[clap(long)]
+  custom_media: bool,
+  /// Enable CSS modules in output.
+  /// If no filename is provided, <output_file>.json will be used.
+  #[clap(long, group = "css_modules", requires = "output_file")]
+  css_modules: Option<Option<String>>,
   /// Enable sourcemap, at <output_file>.map
-  #[clap(short, long, requires = "output_file")]
+  #[clap(long, requires = "output_file")]
   sourcemap: bool,
 }
 
@@ -53,7 +54,8 @@ pub fn main() -> Result<(), std::io::Error> {
     &source,
     ParserOptions {
       nesting: cli_args.nesting,
-      css_modules: cli_args.css_modules,
+      css_modules: cli_args.css_modules.is_some(),
+      custom_media: cli_args.custom_media,
       ..ParserOptions::default()
     },
   )
@@ -105,21 +107,19 @@ pub fn main() -> Result<(), std::io::Error> {
 
     fs::write(output_file, code.as_bytes())?;
 
-    if cli_args.css_modules {
-      let css_modules_filename = cli_args
-        .css_modules_output_file
-        .unwrap_or(infer_css_modules_filename(&output_file)?);
+    if let Some(css_modules) = cli_args.css_modules {
+      let css_modules_filename = if let Some(name) = css_modules {
+        name
+      } else {
+        infer_css_modules_filename(&output_file)?
+      };
       if let Some(exports) = res.exports {
         let css_modules_json = serde_json::to_string(&exports)?;
         fs::write(css_modules_filename, css_modules_json)?;
       }
     }
   } else {
     println!("{}", res.code);
-    if cli_args.css_modules {
-      let css_modules_json = serde_json::to_string(&res.exports)?;
-      println!("{}", css_modules_json);
-    }
   }
 
   Ok(())
diff --git a/tests/cli_integration_tests.rs b/tests/cli_integration_tests.rs
@@ -236,27 +236,6 @@ fn nesting_option() -> Result<(), Box<dyn std::error::Error>> {
   Ok(())
 }
 
-#[test]
-fn css_modules_stdout() -> Result<(), Box<dyn std::error::Error>> {
-  let (input, output, exports) = css_module_test_vals();
-  let infile = assert_fs::NamedTempFile::new("test.css")?;
-  infile.write_str(&input)?;
-  let mut cmd = Command::cargo_bin("parcel_css")?;
-  cmd.current_dir(infile.path().parent().unwrap());
-  cmd.arg(infile.path());
-  cmd.arg("--css-modules");
-  cmd.assert().success().stdout(predicate::str::contains(output));
-
-  let assert = cmd.assert();
-  let output = String::from_utf8(assert.get_output().stdout.clone())?;
-  let module_json_line = output.lines().next_back().unwrap();
-  let expected: serde_json::Value = serde_json::from_str(&exports)?;
-  let actual: serde_json::Value = serde_json::from_str(&module_json_line)?;
-  assert_eq!(expected, actual);
-
-  Ok(())
-}
-
 #[test]
 fn css_modules_infer_output_file() -> Result<(), Box<dyn std::error::Error>> {
   let (input, _, exports) = css_module_test_vals();
@@ -289,8 +268,7 @@ fn css_modules_output_target_option() -> Result<(), Box<dyn std::error::Error>>
   cmd.current_dir(infile.path().parent().unwrap());
   cmd.arg(infile.path());
   cmd.arg("-o").arg(outfile.path());
-  cmd.arg("--css-modules");
-  cmd.arg("--css-modules-output-file").arg(modules_file.path());
+  cmd.arg("--css-modules").arg(modules_file.path());
   cmd.assert().success();
 
   let expected: serde_json::Value = serde_json::from_str(&exports)?;
