diff options
| -rw-r--r-- | cli/worker.rs | 18 | ||||
| -rw-r--r-- | core/runtime.rs | 10 |
2 files changed, 17 insertions, 11 deletions
diff --git a/cli/worker.rs b/cli/worker.rs index 392a770c2..74bee1d03 100644 --- a/cli/worker.rs +++ b/cli/worker.rs @@ -118,21 +118,19 @@ impl Worker { ) -> Self { let global_state_ = program_state.clone(); + let js_error_create_fn = Box::new(move |core_js_error| { + let source_mapped_error = + apply_source_map(&core_js_error, global_state_.clone()); + PrettyJsError::create(source_mapped_error) + }); + let mut js_runtime = JsRuntime::new(RuntimeOptions { module_loader: Some(module_loader), startup_snapshot: Some(startup_snapshot), - js_error_create_fn: Some(Box::new(move |core_js_error| { - let source_mapped_error = - apply_source_map(&core_js_error, global_state_.clone()); - PrettyJsError::create(source_mapped_error) - })), + js_error_create_fn: Some(js_error_create_fn), + get_error_class_fn: Some(&crate::errors::get_error_class_name), ..Default::default() }); - { - let op_state = js_runtime.op_state(); - let mut op_state = op_state.borrow_mut(); - op_state.get_error_class_fn = &crate::errors::get_error_class_name; - } let inspector = if let Some(inspector_server) = &program_state.maybe_inspector_server { diff --git a/core/runtime.rs b/core/runtime.rs index e915571e0..7b63028cd 100644 --- a/core/runtime.rs +++ b/core/runtime.rs @@ -170,6 +170,10 @@ pub struct RuntimeOptions { /// is set to `JsError::create()`. pub js_error_create_fn: Option<Box<JsErrorCreateFn>>, + /// Allows to map error type to a string "class" used to represent + /// error in JavaScript. + pub get_error_class_fn: Option<GetErrorClassFn>, + /// Implementation of `ModuleLoader` which will be /// called when V8 requests to load ES modules. /// @@ -254,7 +258,11 @@ impl JsRuntime { let js_error_create_fn = options .js_error_create_fn .unwrap_or_else(|| Box::new(JsError::create)); - let op_state = OpState::default(); + let mut op_state = OpState::default(); + + if let Some(get_error_class_fn) = options.get_error_class_fn { + op_state.get_error_class_fn = get_error_class_fn; + } isolate.set_slot(Rc::new(RefCell::new(JsRuntimeState { global_context: Some(global_context), |