summaryrefslogtreecommitdiff
path: root/cli/ops/errors.rs
diff options
context:
space:
mode:
authorLeo K <crowlkats@toaxl.com>2021-10-05 22:38:27 +0200
committerGitHub <noreply@github.com>2021-10-05 22:38:27 +0200
commit77a00ce1fb4ae2523e22b9b84ae09a0200502e38 (patch)
tree0027a2ff3dbff1e2b0c3afa7ce0f0e54805c7d62 /cli/ops/errors.rs
parentd67e85850688117e116bbf7054e80f30fe07afe6 (diff)
chore: various op cleanup (#12329)
Diffstat (limited to 'cli/ops/errors.rs')
-rw-r--r--cli/ops/errors.rs25
1 files changed, 16 insertions, 9 deletions
diff --git a/cli/ops/errors.rs b/cli/ops/errors.rs
index ea6a5ae5a..14d21ee84 100644
--- a/cli/ops/errors.rs
+++ b/cli/ops/errors.rs
@@ -11,6 +11,7 @@ use deno_core::serde_json::json;
use deno_core::serde_json::Value;
use deno_core::OpState;
use serde::Deserialize;
+use serde::Serialize;
use std::collections::HashMap;
pub fn init(rt: &mut deno_core::JsRuntime) {
@@ -27,13 +28,19 @@ struct ApplySourceMap {
column_number: i32,
}
+#[derive(Serialize)]
+#[serde(rename_all = "camelCase")]
+struct AppliedSourceMap {
+ file_name: String,
+ line_number: u32,
+ column_number: u32,
+}
+
fn op_apply_source_map(
state: &mut OpState,
- args: Value,
+ args: ApplySourceMap,
_: (),
-) -> Result<Value, AnyError> {
- let args: ApplySourceMap = serde_json::from_value(args)?;
-
+) -> Result<AppliedSourceMap, AnyError> {
let mut mappings_map: CachedMaps = HashMap::new();
let ps = state.borrow::<ProcState>().clone();
@@ -46,11 +53,11 @@ fn op_apply_source_map(
ps,
);
- Ok(json!({
- "fileName": orig_file_name,
- "lineNumber": orig_line_number as u32,
- "columnNumber": orig_column_number as u32,
- }))
+ Ok(AppliedSourceMap {
+ file_name: orig_file_name,
+ line_number: orig_line_number as u32,
+ column_number: orig_column_number as u32,
+ })
}
fn op_format_diagnostic(