normal unwrapping

Author: Andcool-Systems

src/main.rs

@@ -87,13 +87,21 @@ fn main() -> Result<()> {
 
         if path.ends_with(".tsx") {
             let code = fs::read_to_string(entry)?;
-            let imported_css = extract_default_css_imports(&code);
+            let imported_css = extract_default_css_imports(&code).unwrap_or_else(|e| {
+                eprintln!("Could not parse file: {}\n{}", entry, e);
+                process::exit(1);
+            });
 
             for (mut style_path, class_names) in imported_css {
                 process_relative_import(Path::new(entry), &mut style_path)?;
                 replace_aliases(&mut style_path, tsconfig.compiler_options.paths.clone());
 
-                let used_fields = extract_used_classes(&code, &class_names, path.clone());
+                let used_fields = extract_used_classes(&code, &class_names, path.clone())
+                    .unwrap_or_else(|e| {
+                        eprintln!("Could not parse file: {}\n{}", entry, e);
+                        process::exit(1);
+                    });
+
                 used_classnames
                     .entry(style_path)
                     .or_insert_with(HashSet::new)

src/tsx_parser.rs

@@ -4,7 +4,7 @@ use swc_ecma_ast::{ImportSpecifier, Module, ModuleDecl};
 use swc_ecma_parser::{Parser, StringInput, Syntax, TsSyntax};
 use swc_ecma_visit::{Visit, VisitWith};
 
-pub fn module_parser(tsx_code: &str) -> (Module, Lrc<SourceMap>) {
+pub fn module_parser(tsx_code: &str) -> anyhow::Result<(Module, Lrc<SourceMap>)> {
     let cm: Lrc<SourceMap> = Default::default();
     let fm = cm.new_source_file(FileName::Custom("input.tsx".into()).into(), tsx_code.into());
 
@@ -18,7 +18,10 @@ pub fn module_parser(tsx_code: &str) -> (Module, Lrc<SourceMap>) {
 
     let mut parser = Parser::new(syntax, StringInput::from(&*fm), None);
 
-    (parser.parse_module().expect("Failed to parse"), cm)
+    let parse_res = parser
+        .parse_module()
+        .map_err(|e| anyhow::Error::msg(e.kind().msg()))?;
+    Ok((parse_res, cm))
 }
 
 #[derive(Eq, PartialEq, Hash, Debug)]
@@ -60,8 +63,8 @@ pub fn extract_used_classes(
     tsx_code: &str,
     variable_name: &str,
     file_name: String,
-) -> HashSet<UsedClassName> {
-    let (module, source_map) = module_parser(tsx_code);
+) -> anyhow::Result<HashSet<UsedClassName>> {
+    let (module, source_map) = module_parser(tsx_code)?;
 
     let mut finder = PropertyFinder {
         variable_name: variable_name.to_string(),
@@ -72,7 +75,7 @@ pub fn extract_used_classes(
 
     module.visit_with(&mut finder);
 
-    finder.properties
+    Ok(finder.properties)
 }
 
 struct DefaultCssImportFinder {
@@ -98,14 +101,14 @@ impl Visit for DefaultCssImportFinder {
     }
 }
 
-pub fn extract_default_css_imports(tsx_code: &str) -> HashSet<(String, String)> {
-    let (module, _) = module_parser(tsx_code);
+pub fn extract_default_css_imports(tsx_code: &str) -> anyhow::Result<HashSet<(String, String)>> {
+    let (module, _) = module_parser(tsx_code)?;
 
     let mut finder = DefaultCssImportFinder {
         imported_variables: HashSet::new(),
     };
 
     module.visit_with(&mut finder);
 
-    finder.imported_variables
+    Ok(finder.imported_variables)
 }

src/utils.rs

@@ -10,8 +10,7 @@ pub fn replace_aliases(s: &mut String, aliases: HashMap<String, Vec<String>>) {
         if to.is_empty() {
             continue;
         }
-        let replacement = to.get(0).unwrap();
-        *s = s.replace(&from.replace('*', ""), &replacement.replace('*', ""));
+        *s = s.replace(&from.replace('*', ""), &to[0].replace('*', ""));
     }
 }