Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

perf: resolver - skip cwd lookup if able #23851

Merged
merged 7 commits into from
May 21, 2024
Merged

perf: resolver - skip cwd lookup if able #23851

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
80e7888
perf: cache cwd lookup in CliModuleLoader
dsherret May 15, 2024
ebfd6fb
perf: resolver - skip cwd lookup if able
dsherret May 16, 2024
311c569
remove file
dsherret May 16, 2024
88b4b61
Merge branch 'main' into perf_skip_cwd_check_if_able
dsherret May 16, 2024
dd4d893
fix
dsherret May 16, 2024
10fe5f4
move most common condition first
dsherret May 16, 2024
ed80cb7
fix to use resolve_path
dsherret May 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix
  • Loading branch information
@dsherret
dsherret committed May 16, 2024
commit dd4d89396cc64e4a4edda5f17564fbc8af55a7ba
45 changes: 38 additions & 7 deletions cli/module_loader.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

use std::borrow::Cow;
use std::cell::RefCell;
use std::path::PathBuf;
use std::pin::Pin;
use std::rc::Rc;
use std::str;
Expand Down Expand Up @@ -214,6 +215,7 @@ struct SharedCliModuleLoaderState {
graph_kind: GraphKind,
lib_window: TsTypeLib,
lib_worker: TsTypeLib,
initial_cwd: PathBuf,
is_inspecting: bool,
is_repl: bool,
code_cache: Option<Arc<CodeCache>>,
Expand Down Expand Up @@ -250,6 +252,7 @@ impl CliModuleLoaderFactory {
graph_kind: options.graph_kind(),
lib_window: options.ts_type_lib_window(),
lib_worker: options.ts_type_lib_worker(),
initial_cwd: options.initial_cwd().to_path_buf(),
is_inspecting: options.is_inspecting(),
is_repl: matches!(
options.sub_command(),
Expand Down Expand Up @@ -422,16 +425,44 @@ impl<TGraphContainer: ModuleGraphContainer> CliModuleLoader<TGraphContainer> {
&self,
referrer: &str,
) -> Result<ModuleSpecifier, AnyError> {
// TODO(bartlomieju): ideally we shouldn't need to call `current_dir()` on each
// call - maybe it should be caller's responsibility to pass it as an arg?
let cwd = std::env::current_dir().context("Unable to get CWD")?;
if referrer.is_empty() && self.shared.is_repl {
// todo(https://github.com/denoland/deno_core/pull/741): use function from deno_core
fn specifier_has_uri_scheme(specifier: &str) -> bool {
let mut chars = specifier.chars();
let mut len = 0usize;
// The first character must be a letter.
match chars.next() {
Some(c) if c.is_ascii_alphabetic() => len += 1,
_ => return false,
}
// Second and following characters must be either a letter, number,
// plus sign, minus sign, or dot.
loop {
match chars.next() {
Some(c) if c.is_ascii_alphanumeric() || "+-.".contains(c) => len += 1,
Some(':') if len >= 2 => return true,
_ => return false,
}
}
}

let referrer = if referrer.is_empty() && self.shared.is_repl {
// FIXME(bartlomieju): this is a hacky way to provide compatibility with REPL
// and `Deno.core.evalContext` API. Ideally we should always have a referrer filled
// but sadly that's not the case due to missing APIs in V8.
deno_core::resolve_path("./$deno$repl.ts", &cwd).map_err(|e| e.into())
"./$deno$repl.ts"
} else {
referrer
};

if referrer == "." {
// main module, use the initial cwd
deno_core::resolve_url_or_path(referrer, &self.shared.initial_cwd)
.map_err(|e| e.into())
} else if specifier_has_uri_scheme(referrer) {
deno_core::resolve_url(referrer).map_err(|e| e.into())
} else {
deno_core::resolve_url_or_path(referrer, &cwd).map_err(|e| e.into())
// this cwd check is slow, so try to avoid it
let cwd = std::env::current_dir().context("Unable to get CWD")?;
deno_core::resolve_path(referrer, &cwd).map_err(|e| e.into())
}
}

Expand Down
Loading