language-servers/deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2025-08-04 02:48:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

refactor: faster args for op_load in TSC (#21438)

Browse source 
This commit changes the argument that "op_load" accepts, from
a serde struct to "&str". This should equal to a slightly better
performance.
This commit is contained in:
Bartek Iwańczuk 2023-12-03 03:07:04 +01:00 • committed by GitHub
parent f6b889b432
commit 39c7d8dafe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 29 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

59
cli/tsc/mod.rs
View file

@ -414,12 +414,6 @@ fn op_emit(state: &mut OpState, #[serde] args: EmitArgs) -> bool {
true
}
#[derive(Debug, Deserialize)]
struct LoadArgs {
/// The fully qualified specifier that should be loaded.
specifier: String,
}
pub fn as_ts_script_kind(media_type: MediaType) -> i32 {
match media_type {
MediaType::JavaScript => 1,
@ -453,36 +447,37 @@ struct LoadResponse {
#[serde]
fn op_load(
state: &mut OpState,
#[serde] v: LoadArgs,
#[string] load_specifier: &str,
) -> Result<LoadResponse, AnyError> {
let state = state.borrow_mut::<State>();
let specifier = normalize_specifier(&v.specifier, &state.current_dir)
let specifier = normalize_specifier(load_specifier, &state.current_dir)
.context("Error converting a string module specifier for \"op_load\".")?;
let mut hash: Option<String> = None;
let mut media_type = MediaType::Unknown;
let graph = &state.graph;
let data = if &v.specifier == "internal:///.tsbuildinfo" {
let data = if load_specifier == "internal:///.tsbuildinfo" {
state.maybe_tsbuildinfo.as_deref().map(Cow::Borrowed)
// in certain situations we return a "blank" module to tsc and we need to
// handle the request for that module here.
} else if &v.specifier == "internal:///missing_dependency.d.ts" {
} else if load_specifier == "internal:///missing_dependency.d.ts" {
hash = Some("1".to_string());
media_type = MediaType::Dts;
Some(Cow::Borrowed("declare const __: any;\nexport = __;\n"))
} else if let Some(name) = v.specifier.strip_prefix("asset:///") {
} else if let Some(name) = load_specifier.strip_prefix("asset:///") {
let maybe_source = get_lazily_loaded_asset(name);
hash = get_maybe_hash(maybe_source, state.hash_data);
media_type = MediaType::from_str(&v.specifier);
media_type = MediaType::from_str(load_specifier);
maybe_source.map(Cow::Borrowed)
} else {
let specifier = if let Some(remapped_specifier) =
state.remapped_specifiers.get(&v.specifier)
state.remapped_specifiers.get(load_specifier)
{
remapped_specifier
} else if let Some(remapped_specifier) = state.root_map.get(&v.specifier) {
} else if let Some(remapped_specifier) = state.root_map.get(load_specifier)
{
remapped_specifier
} else {
&specifier
@ -1062,13 +1057,8 @@ mod tests {
Some("some content".to_string()),
)
.await;
let actual = op_load::call(
&mut state,
LoadArgs {
specifier: "https://deno.land/x/mod.ts".to_string(),
},
)
.unwrap();
let actual =
op_load::call(&mut state, "https://deno.land/x/mod.ts").unwrap();
assert_eq!(
serde_json::to_value(actual).unwrap(),
json!({
@ -1087,13 +1077,8 @@ mod tests {
Some("some content".to_string()),
)
.await;
let actual = op_load::call(
&mut state,
LoadArgs {
specifier: "asset:///lib.dom.d.ts".to_string(),
},
)
.expect("should have invoked op");
let actual = op_load::call(&mut state, "asset:///lib.dom.d.ts")
.expect("should have invoked op");
let expected = get_lazily_loaded_asset("lib.dom.d.ts").unwrap();
assert_eq!(actual.data.unwrap(), expected);
assert!(actual.version.is_some());
@ -1108,13 +1093,8 @@ mod tests {
Some("some content".to_string()),
)
.await;
let actual = op_load::call(
&mut state,
LoadArgs {
specifier: "internal:///.tsbuildinfo".to_string(),
},
)
.expect("should have invoked op");
let actual = op_load::call(&mut state, "internal:///.tsbuildinfo")
.expect("should have invoked op");
assert_eq!(
serde_json::to_value(actual).unwrap(),
json!({
@ -1128,13 +1108,8 @@ mod tests {
#[tokio::test]
async fn test_load_missing_specifier() {
let mut state = setup(None, None, None).await;
let actual = op_load::call(
&mut state,
LoadArgs {
specifier: "https://deno.land/x/mod.ts".to_string(),
},
)
.expect("should have invoked op");
let actual = op_load::call(&mut state, "https://deno.land/x/mod.ts")
.expect("should have invoked op");
assert_eq!(
serde_json::to_value(actual).unwrap(),
json!({