diff options
Diffstat (limited to 'ext/node/resolution.rs')
| -rw-r--r-- | ext/node/resolution.rs | 380 |
1 files changed, 211 insertions, 169 deletions
diff --git a/ext/node/resolution.rs b/ext/node/resolution.rs index 8047ac4ec..1b9a20012 100644 --- a/ext/node/resolution.rs +++ b/ext/node/resolution.rs @@ -4,10 +4,9 @@ use std::borrow::Cow; use std::collections::HashMap; use std::path::Path; use std::path::PathBuf; -use std::rc::Rc; +use deno_config::package_json::PackageJsonRc; use deno_core::anyhow::bail; -use deno_core::anyhow::Context; use deno_core::error::generic_error; use deno_core::error::AnyError; use deno_core::serde_json::Map; @@ -21,8 +20,6 @@ use crate::errors; use crate::is_builtin_node_module; use crate::path::to_file_specifier; use crate::polyfill::get_module_name_from_builtin_node_module_specifier; -use crate::AllowAllNodePermissions; -use crate::NodePermissions; use crate::NpmResolverRc; use crate::PackageJson; use crate::PathClean; @@ -30,11 +27,7 @@ use crate::PathClean; pub static DEFAULT_CONDITIONS: &[&str] = &["deno", "node", "import"]; pub static REQUIRE_CONDITIONS: &[&str] = &["require", "node"]; -#[derive(Clone, Copy, Debug, PartialEq, Eq)] -pub enum NodeModuleKind { - Esm, - Cjs, -} +pub type NodeModuleKind = deno_config::package_json::NodeModuleKind; #[derive(Debug, Clone, Copy, PartialEq, Eq)] pub enum NodeResolutionMode { @@ -236,8 +229,7 @@ impl NodeResolver { Some(resolved_specifier) } } else if specifier.starts_with('#') { - let pkg_config = self - .get_closest_package_json(referrer, &mut AllowAllNodePermissions)?; + let pkg_config = self.get_closest_package_json(referrer)?; Some(self.package_imports_resolve( specifier, referrer, @@ -325,31 +317,18 @@ impl NodeResolver { referrer: &ModuleSpecifier, mode: NodeResolutionMode, ) -> Result<Option<NodeResolution>, AnyError> { - let package_json_path = package_dir.join("package.json"); - let package_json = self.load_package_json( - &mut AllowAllNodePermissions, - package_json_path.clone(), - )?; let node_module_kind = NodeModuleKind::Esm; let package_subpath = package_subpath .map(|s| format!("./{s}")) .unwrap_or_else(|| ".".to_string()); - let maybe_resolved_url = self - .resolve_package_subpath( - &package_json, - &package_subpath, - referrer, - node_module_kind, - DEFAULT_CONDITIONS, - mode, - ) - .with_context(|| { - format!( - "Failed resolving package subpath '{}' for '{}'", - package_subpath, - package_json.path.display() - ) - })?; + let maybe_resolved_url = self.resolve_package_dir_subpath( + package_dir, + &package_subpath, + referrer, + node_module_kind, + DEFAULT_CONDITIONS, + mode, + )?; let resolved_url = match maybe_resolved_url { Some(resolved_path) => resolved_path, None => return Ok(None), @@ -383,10 +362,9 @@ impl NodeResolver { package_folder: &Path, ) -> Result<Vec<String>, AnyError> { let package_json_path = package_folder.join("package.json"); - let package_json = self.load_package_json( - &mut AllowAllNodePermissions, - package_json_path.clone(), - )?; + let Some(package_json) = self.load_package_json(&package_json_path)? else { + return Ok(Vec::new()); + }; Ok(match &package_json.bin { Some(Value::String(_)) => { @@ -408,10 +386,12 @@ impl NodeResolver { sub_path: Option<&str>, ) -> Result<NodeResolution, AnyError> { let package_json_path = package_folder.join("package.json"); - let package_json = self.load_package_json( - &mut AllowAllNodePermissions, - package_json_path.clone(), - )?; + let Some(package_json) = self.load_package_json(&package_json_path)? else { + bail!( + "Failed resolving binary export. '{}' did not exist", + package_json_path.display(), + ) + }; let bin_entry = resolve_bin_entry_value(&package_json, sub_path)?; let url = to_file_specifier(&package_folder.join(bin_entry)); @@ -429,8 +409,7 @@ impl NodeResolver { if url_str.starts_with("http") || url_str.ends_with(".json") { Ok(NodeResolution::Esm(url)) } else if url_str.ends_with(".js") || url_str.ends_with(".d.ts") { - let maybe_package_config = - self.get_closest_package_json(&url, &mut AllowAllNodePermissions)?; + let maybe_package_config = self.get_closest_package_json(&url)?; match maybe_package_config { Some(c) if c.typ == "module" => Ok(NodeResolution::Esm(url)), Some(_) => Ok(NodeResolution::CommonJs(url)), @@ -515,24 +494,19 @@ impl NodeResolver { return Ok(Some(to_file_specifier(&path))); } if self.fs.is_dir_sync(&path) { - let package_json_path = path.join("package.json"); - if let Ok(pkg_json) = - self.load_package_json(&mut AllowAllNodePermissions, package_json_path) - { - let maybe_resolution = self.resolve_package_subpath( - &pkg_json, - /* sub path */ ".", - referrer, - referrer_kind, - match referrer_kind { - NodeModuleKind::Esm => DEFAULT_CONDITIONS, - NodeModuleKind::Cjs => REQUIRE_CONDITIONS, - }, - NodeResolutionMode::Types, - )?; - if let Some(resolution) = maybe_resolution { - return Ok(Some(resolution)); - } + let maybe_resolution = self.resolve_package_dir_subpath( + &path, + /* sub path */ ".", + referrer, + referrer_kind, + match referrer_kind { + NodeModuleKind::Esm => DEFAULT_CONDITIONS, + NodeModuleKind::Cjs => REQUIRE_CONDITIONS, + }, + NodeResolutionMode::Types, + )?; + if let Some(resolution) = maybe_resolution { + return Ok(Some(resolution)); } let index_path = path.join("index.js"); if let Some(path) = probe_extensions( @@ -572,19 +546,59 @@ impl NodeResolver { let mut package_json_path = None; if let Some(pkg_json) = &referrer_pkg_json { - if pkg_json.exists { - package_json_path = Some(pkg_json.path.clone()); - if let Some(imports) = &pkg_json.imports { - if imports.contains_key(name) && !name.contains('*') { - let target = imports.get(name).unwrap(); + package_json_path = Some(pkg_json.path.clone()); + if let Some(imports) = &pkg_json.imports { + if imports.contains_key(name) && !name.contains('*') { + let target = imports.get(name).unwrap(); + let maybe_resolved = self.resolve_package_target( + package_json_path.as_ref().unwrap(), + target, + "", + name, + referrer, + referrer_kind, + false, + true, + conditions, + mode, + )?; + if let Some(resolved) = maybe_resolved { + return Ok(resolved); + } + } else { + let mut best_match = ""; + let mut best_match_subpath = None; + for key in imports.keys() { + let pattern_index = key.find('*'); + if let Some(pattern_index) = pattern_index { + let key_sub = &key[0..=pattern_index]; + if name.starts_with(key_sub) { + let pattern_trailer = &key[pattern_index + 1..]; + if name.len() > key.len() + && name.ends_with(&pattern_trailer) + && pattern_key_compare(best_match, key) == 1 + && key.rfind('*') == Some(pattern_index) + { + best_match = key; + best_match_subpath = Some( + name[pattern_index..=(name.len() - pattern_trailer.len())] + .to_string(), + ); + } + } + } + } + + if !best_match.is_empty() { + let target = imports.get(best_match).unwrap(); let maybe_resolved = self.resolve_package_target( package_json_path.as_ref().unwrap(), target, - "", - name, + &best_match_subpath.unwrap(), + best_match, referrer, referrer_kind, - false, + true, true, conditions, mode, @@ -592,49 +606,6 @@ impl NodeResolver { if let Some(resolved) = maybe_resolved { return Ok(resolved); } - } else { - let mut best_match = ""; - let mut best_match_subpath = None; - for key in imports.keys() { - let pattern_index = key.find('*'); - if let Some(pattern_index) = pattern_index { - let key_sub = &key[0..=pattern_index]; - if name.starts_with(key_sub) { - let pattern_trailer = &key[pattern_index + 1..]; - if name.len() > key.len() - && name.ends_with(&pattern_trailer) - && pattern_key_compare(best_match, key) == 1 - && key.rfind('*') == Some(pattern_index) - { - best_match = key; - best_match_subpath = Some( - name - [pattern_index..=(name.len() - pattern_trailer.len())] - .to_string(), - ); - } - } - } - } - - if !best_match.is_empty() { - let target = imports.get(best_match).unwrap(); - let maybe_resolved = self.resolve_package_target( - package_json_path.as_ref().unwrap(), - target, - &best_match_subpath.unwrap(), - best_match, - referrer, - referrer_kind, - true, - true, - conditions, - mode, - )?; - if let Some(resolved) = maybe_resolved { - return Ok(resolved); - } - } } } } @@ -1013,15 +984,11 @@ impl NodeResolver { let (package_name, package_subpath, _is_scoped) = parse_npm_pkg_name(specifier, referrer)?; - let Some(package_config) = - self.get_closest_package_json(referrer, &mut AllowAllNodePermissions)? - else { + let Some(package_config) = self.get_closest_package_json(referrer)? else { return Ok(None); }; // ResolveSelf - if package_config.exists - && package_config.name.as_ref() == Some(&package_name) - { + if package_config.name.as_ref() == Some(&package_name) { if let Some(exports) = &package_config.exports { return self .package_exports_resolve( @@ -1037,20 +1004,40 @@ impl NodeResolver { } } - let result = self.resolve_package_subpath_for_package( + self.resolve_package_subpath_for_package( &package_name, &package_subpath, referrer, referrer_kind, conditions, mode, + ) + } + + #[allow(clippy::too_many_arguments)] + fn resolve_package_subpath_for_package( + &self, + package_name: &str, + package_subpath: &str, + referrer: &ModuleSpecifier, + referrer_kind: NodeModuleKind, + conditions: &[&str], + mode: NodeResolutionMode, + ) -> Result<Option<ModuleSpecifier>, AnyError> { + let result = self.resolve_package_subpath_for_package_inner( + package_name, + package_subpath, + referrer, + referrer_kind, + conditions, + mode, ); if mode.is_types() && !matches!(result, Ok(Some(_))) { - // try to resolve with the @types/node package - let package_name = types_package_name(&package_name); - if let Ok(Some(result)) = self.resolve_package_subpath_for_package( + // try to resolve with the @types package + let package_name = types_package_name(package_name); + if let Ok(Some(result)) = self.resolve_package_subpath_for_package_inner( &package_name, - &package_subpath, + package_subpath, referrer, referrer_kind, conditions, @@ -1059,12 +1046,11 @@ impl NodeResolver { return Ok(Some(result)); } } - result } #[allow(clippy::too_many_arguments)] - fn resolve_package_subpath_for_package( + fn resolve_package_subpath_for_package_inner( &self, package_name: &str, package_subpath: &str, @@ -1076,7 +1062,6 @@ impl NodeResolver { let package_dir_path = self .npm_resolver .resolve_package_folder_from_package(package_name, referrer)?; - let package_json_path = package_dir_path.join("package.json"); // todo: error with this instead when can't find package // Err(errors::err_module_not_found( @@ -1092,10 +1077,8 @@ impl NodeResolver { // )) // Package match. - let package_json = self - .load_package_json(&mut AllowAllNodePermissions, package_json_path)?; - self.resolve_package_subpath( - &package_json, + self.resolve_package_dir_subpath( + &package_dir_path, package_subpath, referrer, referrer_kind, @@ -1105,6 +1088,36 @@ impl NodeResolver { } #[allow(clippy::too_many_arguments)] + fn resolve_package_dir_subpath( + &self, + package_dir_path: &Path, + package_subpath: &str, + referrer: &ModuleSpecifier, + referrer_kind: NodeModuleKind, + conditions: &[&str], + mode: NodeResolutionMode, + ) -> Result<Option<ModuleSpecifier>, AnyError> { + let package_json_path = package_dir_path.join("package.json"); + match self.load_package_json(&package_json_path)? { + Some(pkg_json) => self.resolve_package_subpath( + &pkg_json, + package_subpath, + referrer, + referrer_kind, + conditions, + mode, + ), + None => self.resolve_package_subpath_no_pkg_json( + package_dir_path, + package_subpath, + referrer, + referrer_kind, + mode, + ), + } + } + + #[allow(clippy::too_many_arguments)] fn resolve_package_subpath( &self, package_json: &PackageJson, @@ -1139,6 +1152,7 @@ impl NodeResolver { } } } + if package_subpath == "." { return self.legacy_main_resolve( package_json, @@ -1148,7 +1162,25 @@ impl NodeResolver { ); } - let file_path = package_json.path.parent().unwrap().join(package_subpath); + self.resolve_subpath_exact( + package_json.path.parent().unwrap(), + package_subpath, + referrer, + referrer_kind, + mode, + ) + } + + fn resolve_subpath_exact( + &self, + directory: &Path, + package_subpath: &str, + referrer: &ModuleSpecifier, + referrer_kind: NodeModuleKind, + mode: NodeResolutionMode, + ) -> Result<Option<ModuleSpecifier>, AnyError> { + assert_ne!(package_subpath, "."); + let file_path = directory.join(package_subpath); if mode.is_types() { self.path_to_declaration_url(file_path, referrer, referrer_kind) } else { @@ -1156,49 +1188,54 @@ impl NodeResolver { } } + fn resolve_package_subpath_no_pkg_json( + &self, + directory: &Path, + package_subpath: &str, + referrer: &ModuleSpecifier, + referrer_kind: NodeModuleKind, + mode: NodeResolutionMode, + ) -> Result<Option<ModuleSpecifier>, AnyError> { + if package_subpath == "." { + self.legacy_index_resolve(directory, referrer_kind, mode) + } else { + self.resolve_subpath_exact( + directory, + package_subpath, + referrer, + referrer_kind, + mode, + ) + } + } + pub fn get_closest_package_json( &self, url: &ModuleSpecifier, - permissions: &mut dyn NodePermissions, - ) -> Result<Option<Rc<PackageJson>>, AnyError> { + ) -> Result<Option<PackageJsonRc>, AnyError> { let Ok(file_path) = url.to_file_path() else { return Ok(None); }; - self.get_closest_package_json_from_path(&file_path, permissions) + self.get_closest_package_json_from_path(&file_path) } pub fn get_closest_package_json_from_path( &self, file_path: &Path, - permissions: &mut dyn NodePermissions, - ) -> Result<Option<Rc<PackageJson>>, AnyError> { - let Some(package_json_path) = - self.get_closest_package_json_path(file_path)? - else { - return Ok(None); - }; - self - .load_package_json(permissions, package_json_path) - .map(Some) - } - - fn get_closest_package_json_path( - &self, - file_path: &Path, - ) -> Result<Option<PathBuf>, AnyError> { + ) -> Result<Option<PackageJsonRc>, AnyError> { let current_dir = deno_core::strip_unc_prefix( self.fs.realpath_sync(file_path.parent().unwrap())?, ); let mut current_dir = current_dir.as_path(); let package_json_path = current_dir.join("package.json"); - if self.fs.exists_sync(&package_json_path) { - return Ok(Some(package_json_path)); + if let Some(pkg_json) = self.load_package_json(&package_json_path)? { + return Ok(Some(pkg_json)); } while let Some(parent) = current_dir.parent() { current_dir = parent; let package_json_path = current_dir.join("package.json"); - if self.fs.exists_sync(&package_json_path) { - return Ok(Some(package_json_path)); + if let Some(pkg_json) = self.load_package_json(&package_json_path)? { + return Ok(Some(pkg_json)); } } @@ -1207,15 +1244,12 @@ impl NodeResolver { pub(super) fn load_package_json( &self, - permissions: &mut dyn NodePermissions, - package_json_path: PathBuf, - ) -> Result<Rc<PackageJson>, AnyError> { - PackageJson::load( - &*self.fs, - &*self.npm_resolver, - permissions, - package_json_path, - ) + package_json_path: &Path, + ) -> Result< + Option<PackageJsonRc>, + deno_config::package_json::PackageJsonLoadError, + > { + crate::package_json::load_pkg_json(&*self.fs, package_json_path) } pub(super) fn legacy_main_resolve( @@ -1284,6 +1318,19 @@ impl NodeResolver { } } + self.legacy_index_resolve( + package_json.path.parent().unwrap(), + referrer_kind, + mode, + ) + } + + fn legacy_index_resolve( + &self, + directory: &Path, + referrer_kind: NodeModuleKind, + mode: NodeResolutionMode, + ) -> Result<Option<ModuleSpecifier>, AnyError> { let index_file_names = if mode.is_types() { // todo(dsherret): investigate exactly how typescript does this match referrer_kind { @@ -1294,12 +1341,7 @@ impl NodeResolver { vec!["index.js"] }; for index_file_name in index_file_names { - let guess = package_json - .path - .parent() - .unwrap() - .join(index_file_name) - .clean(); + let guess = directory.join(index_file_name).clean(); if self.fs.is_file_sync(&guess) { // TODO(bartlomieju): emitLegacyIndexDeprecation() return Ok(Some(to_file_specifier(&guess))); @@ -1651,7 +1693,7 @@ mod tests { use super::*; fn build_package_json(json: Value) -> PackageJson { - PackageJson::load_from_value(PathBuf::from("/package.json"), json).unwrap() + PackageJson::load_from_value(PathBuf::from("/package.json"), json) } #[test] |