diff options
Diffstat (limited to 'ext/node')
-rw-r--r-- | ext/node/global.rs | 6 | ||||
-rw-r--r-- | ext/node/resolution.rs | 25 |
2 files changed, 25 insertions, 6 deletions
diff --git a/ext/node/global.rs b/ext/node/global.rs index 3e3bfb853..78e009971 100644 --- a/ext/node/global.rs +++ b/ext/node/global.rs @@ -267,16 +267,12 @@ fn current_mode(scope: &mut v8::HandleScope) -> Mode { return Mode::Deno; }; let string = v8_string.to_rust_string_lossy(scope); - // TODO: don't require parsing the specifier - let Ok(specifier) = deno_core::ModuleSpecifier::parse(&string) else { - return Mode::Deno; - }; let op_state = deno_core::JsRuntime::op_state_from(scope); let op_state = op_state.borrow(); let Some(node_resolver) = op_state.try_borrow::<Rc<NodeResolver>>() else { return Mode::Deno; }; - if node_resolver.in_npm_package(&specifier) { + if node_resolver.in_npm_package_with_cache(string) { Mode::Node } else { Mode::Deno diff --git a/ext/node/resolution.rs b/ext/node/resolution.rs index 748506789..143edb6fe 100644 --- a/ext/node/resolution.rs +++ b/ext/node/resolution.rs @@ -1,5 +1,6 @@ // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license. +use std::collections::HashMap; use std::path::Path; use std::path::PathBuf; @@ -111,17 +112,39 @@ pub type NodeResolverRc = deno_fs::sync::MaybeArc<NodeResolver>; pub struct NodeResolver { fs: FileSystemRc, npm_resolver: NpmResolverRc, + in_npm_package_cache: deno_fs::sync::MaybeArcMutex<HashMap<String, bool>>, } impl NodeResolver { pub fn new(fs: FileSystemRc, npm_resolver: NpmResolverRc) -> Self { - Self { fs, npm_resolver } + Self { + fs, + npm_resolver, + in_npm_package_cache: deno_fs::sync::MaybeArcMutex::new(HashMap::new()), + } } pub fn in_npm_package(&self, specifier: &ModuleSpecifier) -> bool { self.npm_resolver.in_npm_package(specifier) } + pub fn in_npm_package_with_cache(&self, specifier: String) -> bool { + let mut cache = self.in_npm_package_cache.lock(); + + if let Some(result) = cache.get(&specifier) { + return *result; + } + + let result = + if let Ok(specifier) = deno_core::ModuleSpecifier::parse(&specifier) { + self.npm_resolver.in_npm_package(&specifier) + } else { + false + }; + cache.insert(specifier, result); + result + } + /// This function is an implementation of `defaultResolve` in /// `lib/internal/modules/esm/resolve.js` from Node. pub fn resolve( |