mirror of
https://github.com/denoland/deno.git
synced 2024-11-25 15:29:32 -05:00
cf5a39a361
This PR removes op_cache and refactors how Deno interacts with TS compiler. Ultimate goal is to completely sandbox TS compiler worker; it should operate on simple request -> response basis. With this commit TS compiler no longer caches compiled sources as they are generated but rather collects all sources and sends them back to Rust when compilation is done. Additionally "Diagnostic" and its children got refactored to use "Deserialize" trait instead of manually implementing JSON deserialization.
62 lines
1.6 KiB
Rust
62 lines
1.6 KiB
Rust
// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
|
|
use super::dispatch_json::{Deserialize, JsonOp, Value};
|
|
use crate::diagnostics::Diagnostic;
|
|
use crate::op_error::OpError;
|
|
use crate::source_maps::get_orig_position;
|
|
use crate::source_maps::CachedMaps;
|
|
use crate::state::State;
|
|
use deno_core::CoreIsolate;
|
|
use deno_core::ZeroCopyBuf;
|
|
use std::collections::HashMap;
|
|
|
|
pub fn init(i: &mut CoreIsolate, s: &State) {
|
|
i.register_op(
|
|
"op_apply_source_map",
|
|
s.stateful_json_op(op_apply_source_map),
|
|
);
|
|
i.register_op(
|
|
"op_format_diagnostic",
|
|
s.stateful_json_op(op_format_diagnostic),
|
|
);
|
|
}
|
|
|
|
#[derive(Deserialize)]
|
|
#[serde(rename_all = "camelCase")]
|
|
struct ApplySourceMap {
|
|
file_name: String,
|
|
line_number: i32,
|
|
column_number: i32,
|
|
}
|
|
|
|
fn op_apply_source_map(
|
|
state: &State,
|
|
args: Value,
|
|
_zero_copy: Option<ZeroCopyBuf>,
|
|
) -> Result<JsonOp, OpError> {
|
|
let args: ApplySourceMap = serde_json::from_value(args)?;
|
|
|
|
let mut mappings_map: CachedMaps = HashMap::new();
|
|
let (orig_file_name, orig_line_number, orig_column_number) =
|
|
get_orig_position(
|
|
args.file_name,
|
|
args.line_number.into(),
|
|
args.column_number.into(),
|
|
&mut mappings_map,
|
|
&state.borrow().global_state.ts_compiler,
|
|
);
|
|
|
|
Ok(JsonOp::Sync(json!({
|
|
"fileName": orig_file_name,
|
|
"lineNumber": orig_line_number as u32,
|
|
"columnNumber": orig_column_number as u32,
|
|
})))
|
|
}
|
|
|
|
fn op_format_diagnostic(
|
|
_state: &State,
|
|
args: Value,
|
|
_zero_copy: Option<ZeroCopyBuf>,
|
|
) -> Result<JsonOp, OpError> {
|
|
let diagnostic = serde_json::from_value::<Diagnostic>(args)?;
|
|
Ok(JsonOp::Sync(json!(diagnostic.to_string())))
|
|
}
|