mirror of
https://github.com/denoland/deno.git
synced 2024-11-29 16:30:56 -05:00
9026f20b2d
This improves the error messages when a specifier can't be resolved from a deno module into an npm package.
313 lines
8.8 KiB
Rust
313 lines
8.8 KiB
Rust
// Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
|
|
|
|
use std::borrow::Cow;
|
|
use std::path::Path;
|
|
use std::path::PathBuf;
|
|
use std::sync::Arc;
|
|
|
|
use deno_ast::ModuleSpecifier;
|
|
use deno_core::anyhow::bail;
|
|
use deno_core::error::AnyError;
|
|
use deno_core::serde_json;
|
|
use deno_runtime::deno_fs::FileSystem;
|
|
use deno_runtime::deno_node::NodePermissions;
|
|
use deno_runtime::deno_node::NodeResolutionMode;
|
|
use deno_runtime::deno_node::NpmResolver;
|
|
use deno_runtime::deno_node::PackageJson;
|
|
use deno_semver::package::PackageReq;
|
|
|
|
use crate::args::package_json::get_local_package_json_version_reqs;
|
|
use crate::args::NpmProcessState;
|
|
use crate::args::NpmProcessStateKind;
|
|
use crate::util::fs::canonicalize_path_maybe_not_exists;
|
|
use crate::util::path::specifier_to_file_path;
|
|
|
|
use super::common::types_package_name;
|
|
use super::CliNpmResolver;
|
|
use super::InnerCliNpmResolverRef;
|
|
|
|
pub struct CliNpmResolverByonmCreateOptions {
|
|
pub fs: Arc<dyn FileSystem>,
|
|
pub root_node_modules_dir: PathBuf,
|
|
}
|
|
|
|
pub fn create_byonm_npm_resolver(
|
|
options: CliNpmResolverByonmCreateOptions,
|
|
) -> Arc<dyn CliNpmResolver> {
|
|
Arc::new(ByonmCliNpmResolver {
|
|
fs: options.fs,
|
|
root_node_modules_dir: options.root_node_modules_dir,
|
|
})
|
|
}
|
|
|
|
#[derive(Debug)]
|
|
pub struct ByonmCliNpmResolver {
|
|
fs: Arc<dyn FileSystem>,
|
|
root_node_modules_dir: PathBuf,
|
|
}
|
|
|
|
impl ByonmCliNpmResolver {
|
|
/// Finds the ancestor package.json that contains the specified dependency.
|
|
pub fn find_ancestor_package_json_with_dep(
|
|
&self,
|
|
dep_name: &str,
|
|
referrer: &ModuleSpecifier,
|
|
) -> Option<PackageJson> {
|
|
let referrer_path = referrer.to_file_path().ok()?;
|
|
let mut current_folder = referrer_path.parent()?;
|
|
loop {
|
|
let pkg_json_path = current_folder.join("package.json");
|
|
if let Ok(pkg_json) =
|
|
PackageJson::load_skip_read_permission(self.fs.as_ref(), pkg_json_path)
|
|
{
|
|
if let Some(deps) = &pkg_json.dependencies {
|
|
if deps.contains_key(dep_name) {
|
|
return Some(pkg_json);
|
|
}
|
|
}
|
|
if let Some(deps) = &pkg_json.dev_dependencies {
|
|
if deps.contains_key(dep_name) {
|
|
return Some(pkg_json);
|
|
}
|
|
}
|
|
}
|
|
|
|
if let Some(parent) = current_folder.parent() {
|
|
current_folder = parent;
|
|
} else {
|
|
return None;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
impl NpmResolver for ByonmCliNpmResolver {
|
|
fn resolve_package_folder_from_package(
|
|
&self,
|
|
name: &str,
|
|
referrer: &ModuleSpecifier,
|
|
mode: NodeResolutionMode,
|
|
) -> Result<PathBuf, AnyError> {
|
|
fn inner(
|
|
fs: &dyn FileSystem,
|
|
name: &str,
|
|
package_root_path: &Path,
|
|
referrer: &ModuleSpecifier,
|
|
mode: NodeResolutionMode,
|
|
) -> Result<PathBuf, AnyError> {
|
|
let types_pkg_name = if mode.is_types() && !name.starts_with("@types/") {
|
|
Some(types_package_name(name))
|
|
} else {
|
|
None
|
|
};
|
|
let mut current_folder = package_root_path;
|
|
loop {
|
|
let node_modules_folder = if current_folder.ends_with("node_modules") {
|
|
Cow::Borrowed(current_folder)
|
|
} else {
|
|
Cow::Owned(current_folder.join("node_modules"))
|
|
};
|
|
|
|
// attempt to resolve the types package first, then fallback to the regular package
|
|
if let Some(types_pkg_name) = &types_pkg_name {
|
|
let sub_dir = join_package_name(&node_modules_folder, types_pkg_name);
|
|
if fs.is_dir_sync(&sub_dir) {
|
|
return Ok(sub_dir);
|
|
}
|
|
}
|
|
|
|
let sub_dir = join_package_name(&node_modules_folder, name);
|
|
if fs.is_dir_sync(&sub_dir) {
|
|
return Ok(sub_dir);
|
|
}
|
|
|
|
if let Some(parent) = current_folder.parent() {
|
|
current_folder = parent;
|
|
} else {
|
|
break;
|
|
}
|
|
}
|
|
|
|
bail!(
|
|
"could not find package '{}' from referrer '{}'.",
|
|
name,
|
|
referrer
|
|
);
|
|
}
|
|
|
|
let package_root_path =
|
|
self.resolve_package_folder_from_path(referrer)?.unwrap(); // todo(byonm): don't unwrap
|
|
let path = inner(&*self.fs, name, &package_root_path, referrer, mode)?;
|
|
Ok(self.fs.realpath_sync(&path)?)
|
|
}
|
|
|
|
fn resolve_package_folder_from_path(
|
|
&self,
|
|
specifier: &deno_core::ModuleSpecifier,
|
|
) -> Result<Option<PathBuf>, AnyError> {
|
|
let path = specifier.to_file_path().unwrap(); // todo(byonm): don't unwrap
|
|
let path = self.fs.realpath_sync(&path)?;
|
|
if self.in_npm_package(specifier) {
|
|
let mut path = path.as_path();
|
|
while let Some(parent) = path.parent() {
|
|
if parent
|
|
.file_name()
|
|
.and_then(|f| f.to_str())
|
|
.map(|s| s.to_ascii_lowercase())
|
|
.as_deref()
|
|
== Some("node_modules")
|
|
{
|
|
return Ok(Some(path.to_path_buf()));
|
|
} else {
|
|
path = parent;
|
|
}
|
|
}
|
|
} else {
|
|
// find the folder with a package.json
|
|
// todo(dsherret): not exactly correct, but good enough for a first pass
|
|
let mut path = path.as_path();
|
|
while let Some(parent) = path.parent() {
|
|
if self.fs.exists_sync(&parent.join("package.json")) {
|
|
return Ok(Some(parent.to_path_buf()));
|
|
} else {
|
|
path = parent;
|
|
}
|
|
}
|
|
}
|
|
Ok(None)
|
|
}
|
|
|
|
fn in_npm_package(&self, specifier: &ModuleSpecifier) -> bool {
|
|
specifier.scheme() == "file"
|
|
&& specifier
|
|
.path()
|
|
.to_ascii_lowercase()
|
|
.contains("/node_modules/")
|
|
}
|
|
|
|
fn ensure_read_permission(
|
|
&self,
|
|
permissions: &dyn NodePermissions,
|
|
path: &Path,
|
|
) -> Result<(), AnyError> {
|
|
if !path
|
|
.components()
|
|
.any(|c| c.as_os_str().to_ascii_lowercase() == "node_modules")
|
|
{
|
|
permissions.check_read(path)?;
|
|
}
|
|
Ok(())
|
|
}
|
|
}
|
|
|
|
impl CliNpmResolver for ByonmCliNpmResolver {
|
|
fn into_npm_resolver(self: Arc<Self>) -> Arc<dyn NpmResolver> {
|
|
self
|
|
}
|
|
|
|
fn clone_snapshotted(&self) -> Arc<dyn CliNpmResolver> {
|
|
Arc::new(Self {
|
|
fs: self.fs.clone(),
|
|
root_node_modules_dir: self.root_node_modules_dir.clone(),
|
|
})
|
|
}
|
|
|
|
fn as_inner(&self) -> InnerCliNpmResolverRef {
|
|
InnerCliNpmResolverRef::Byonm(self)
|
|
}
|
|
|
|
fn root_node_modules_path(&self) -> Option<std::path::PathBuf> {
|
|
Some(self.root_node_modules_dir.clone())
|
|
}
|
|
|
|
fn resolve_pkg_folder_from_deno_module_req(
|
|
&self,
|
|
req: &PackageReq,
|
|
referrer: &ModuleSpecifier,
|
|
) -> Result<PathBuf, AnyError> {
|
|
fn resolve_from_package_json(
|
|
req: &PackageReq,
|
|
fs: &dyn FileSystem,
|
|
path: PathBuf,
|
|
) -> Result<PathBuf, AnyError> {
|
|
let package_json = PackageJson::load_skip_read_permission(fs, path)?;
|
|
let deps = get_local_package_json_version_reqs(&package_json);
|
|
for (key, value) in deps {
|
|
if let Ok(value) = value {
|
|
if value.name == req.name
|
|
&& value.version_req.intersects(&req.version_req)
|
|
{
|
|
let package_path = package_json
|
|
.path
|
|
.parent()
|
|
.unwrap()
|
|
.join("node_modules")
|
|
.join(key);
|
|
return Ok(canonicalize_path_maybe_not_exists(&package_path)?);
|
|
}
|
|
}
|
|
}
|
|
bail!(
|
|
concat!(
|
|
"Could not find a matching package for 'npm:{}' in '{}'. ",
|
|
"You must specify this as a package.json dependency when the ",
|
|
"node_modules folder is not managed by Deno.",
|
|
),
|
|
req,
|
|
package_json.path.display()
|
|
);
|
|
}
|
|
|
|
// attempt to resolve the npm specifier from the referrer's package.json,
|
|
// but otherwise fallback to the project's package.json
|
|
if let Ok(file_path) = specifier_to_file_path(referrer) {
|
|
let mut current_path = file_path.as_path();
|
|
while let Some(dir_path) = current_path.parent() {
|
|
let package_json_path = dir_path.join("package.json");
|
|
if self.fs.exists_sync(&package_json_path) {
|
|
return resolve_from_package_json(
|
|
req,
|
|
self.fs.as_ref(),
|
|
package_json_path,
|
|
);
|
|
}
|
|
current_path = dir_path;
|
|
}
|
|
}
|
|
|
|
resolve_from_package_json(
|
|
req,
|
|
self.fs.as_ref(),
|
|
self
|
|
.root_node_modules_dir
|
|
.parent()
|
|
.unwrap()
|
|
.join("package.json"),
|
|
)
|
|
}
|
|
|
|
fn get_npm_process_state(&self) -> String {
|
|
serde_json::to_string(&NpmProcessState {
|
|
kind: NpmProcessStateKind::Byonm,
|
|
local_node_modules_path: Some(
|
|
self.root_node_modules_dir.to_string_lossy().to_string(),
|
|
),
|
|
})
|
|
.unwrap()
|
|
}
|
|
|
|
fn check_state_hash(&self) -> Option<u64> {
|
|
// it is very difficult to determine the check state hash for byonm
|
|
// so we just return None to signify check caching is not supported
|
|
None
|
|
}
|
|
}
|
|
|
|
fn join_package_name(path: &Path, package_name: &str) -> PathBuf {
|
|
let mut path = path.to_path_buf();
|
|
// ensure backslashes are used on windows
|
|
for part in package_name.split('/') {
|
|
path = path.join(part);
|
|
}
|
|
path
|
|
}
|