Get rid of console_error_panic_hook

Author: ije

Cargo.lock

@@ -1,17 +1,14 @@
 [package]
 name = "esm-cjs-lexer"
 version = "0.10.1"
-description = "A WASM module to parse the `module.exports` of a commonjs module for ESM converting."
-repository = "https://github.com/esm-dev/esm.sh"
+description = "A WASM module to parse the `module.exports` of a commonjs module."
+repository = "https://github.com/esm-dev/esm-cjs-lexer"
 license = "MIT"
 edition = "2021"
 
 [lib]
 crate-type = ["cdylib", "rlib"]
 
-[features]
-default = ["console_error_panic_hook"]
-
 [dependencies]
 anyhow = "1.0.86"
 indexmap = "2.2.6"
@@ -27,11 +24,8 @@ swc_ecma_visit = "0.99.1"
 
 # wasm-bindgen
 # docs: https://rustwasm.github.io/docs/wasm-bindgen
-wasm-bindgen = {version = "0.2.92", features = ["serde-serialize"]}
+wasm-bindgen = { version = "0.2.92", features = ["serde-serialize"] }
 serde-wasm-bindgen = "0.6.5"
-console_error_panic_hook = { version = "0.1.7", optional = true }
-# We get build error without this
-# https://docs.rs/getrandom/latest/getrandom/#webassembly-support
 getrandom = { version = "0.2.15", features = ["js"] }
 
 [profile.release]

Cargo.toml

@@ -1,4 +1,5 @@
-use std::{fmt, sync::Arc, sync::RwLock};
+use std::fmt;
+use std::sync::{Arc, RwLock};
 use swc_common::{
   errors::{Diagnostic, DiagnosticBuilder, Emitter},
   Loc, Span,

src/error.rs

@@ -5,7 +5,7 @@ mod test;
 
 use serde::{Deserialize, Serialize};
 use swc::SWC;
-use wasm_bindgen::prelude::{wasm_bindgen, JsValue};
+use wasm_bindgen::prelude::*;
 
 #[derive(Deserialize)]
 #[serde(deny_unknown_fields, rename_all = "camelCase")]
@@ -23,25 +23,22 @@ pub struct Output {
 
 #[wasm_bindgen(js_name = "parse")]
 pub fn parse(specifier: &str, code: &str, options: JsValue) -> Result<JsValue, JsValue> {
-  console_error_panic_hook::set_once();
-
-  let options: Options = serde_wasm_bindgen::from_value(options).unwrap_or(Options{
+  let options: Options = serde_wasm_bindgen::from_value(options).unwrap_or(Options {
     node_env: None,
     call_mode: None,
   });
-  let swc = SWC::parse(specifier, code).expect("could not parse module");
+  let ret = match SWC::parse(specifier, code) {
+    Ok(ret) => ret,
+    Err(e) => {
+      return Err(JsError::new(&e.to_string()).into());
+    }
+  };
   let node_env = if let Some(env) = options.node_env {
     env
   } else {
     "production".to_owned()
   };
   let call_mode = if let Some(ok) = options.call_mode { ok } else { false };
-  let (exports, reexports) = swc.parse_cjs_exports(node_env.as_str(), call_mode).unwrap();
-  Ok(
-    serde_wasm_bindgen::to_value(&Output {
-      exports: exports,
-      reexports: reexports,
-    })
-    .unwrap(),
-  )
+  let (exports, reexports) = ret.parse_cjs_exports(&node_env, call_mode).unwrap();
+  Ok(serde_wasm_bindgen::to_value(&Output { exports, reexports }).unwrap())
 }

src/lib.rs

@@ -2,7 +2,7 @@ use crate::cjs::CJSLexer;
 use crate::error::{DiagnosticBuffer, ErrorBuffer};
 
 use indexmap::{IndexMap, IndexSet};
-use std::{path::Path, rc::Rc};
+use std::path::Path;
 use swc_common::{
   comments::SingleThreadedComments,
   errors::{Handler, HandlerFlags},
@@ -16,10 +16,7 @@ use swc_ecmascript::{
 };
 
 pub struct SWC {
-  pub specifier: String,
   pub module: Module,
-  pub source_map: Rc<SourceMap>,
-  pub comments: SingleThreadedComments,
 }
 
 impl SWC {
@@ -29,7 +26,7 @@ impl SWC {
     let source_file = source_map.new_source_file(FileName::Real(Path::new(specifier).to_path_buf()), source.into());
     let sm = &source_map;
     let error_buffer = ErrorBuffer::new(specifier);
-    let syntax = Syntax::Es(get_es_config());
+    let syntax = Syntax::Es(EsConfig::default());
     let input = StringInput::from(&*source_file);
     let comments = SingleThreadedComments::default();
     let lexer = Lexer::new(syntax, EsVersion::Es2020, input, Some(&comments));
@@ -51,42 +48,31 @@ impl SWC {
       })
       .unwrap();
 
-    Ok(SWC {
-      specifier: specifier.into(),
-      module,
-      source_map: Rc::new(source_map),
-      comments,
-    })
+    Ok(SWC { module })
   }
 
-  /// parse export names in the cjs module.
+  /// get named exports and reexports of the module.
   pub fn parse_cjs_exports(
     &self,
     node_env: &str,
     call_mode: bool,
   ) -> Result<(Vec<String>, Vec<String>), anyhow::Error> {
     let mut lexer = CJSLexer {
+      call_mode,
       node_env: node_env.to_owned(),
-      call_mode: call_mode,
       fn_returned: false,
       idents: IndexMap::new(),
       exports_alias: IndexSet::new(),
-      exports: IndexSet::new(),
+      named_exports: IndexSet::new(),
       reexports: IndexSet::new(),
     };
     let program = Program::Module(self.module.clone());
     program.fold_with(&mut lexer);
     Ok((
-      lexer.exports.into_iter().collect(),
+      lexer.named_exports.into_iter().collect(),
       lexer.reexports.into_iter().collect(),
     ))
   }
 }
 
-fn get_es_config() -> EsConfig {
-  EsConfig {
-    import_attributes: true,
-    jsx: false,
-    ..EsConfig::default()
-  }
-}
+