foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-12-24 16:19:12 -05:00
Code Issues Packages 1 Wiki Activity

fix(npm): better error is version is specified after subpath (#16131)

Browse source
This commit is contained in:
Bartek Iwańczuk 2022-10-03 19:10:53 +02:00 committed by GitHub
parent 8e1b2fca59
commit 5b097fd7e5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 40 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
cli/npm/resolution.rs
View file

@ -77,6 +77,18 @@ impl NpmPackageReference {
} else {
Some(parts[name_part_len..].join("/"))
};
if let Some(sub_path) = &sub_path {
if let Some(at_index) = sub_path.rfind('@') {
let (new_sub_path, version) = sub_path.split_at(at_index);
let msg = format!(
"Invalid package specifier 'npm:{}/{}'. Did you mean to write 'npm:{}{}/{}'?",
name, sub_path, name, version, new_sub_path
);
return Err(generic_error(msg));
}
}
Ok(NpmPackageReference {
req: NpmPackageReq { name, version_req },
sub_path,

8
cli/tests/integration/npm_tests.rs
View file

@ -195,6 +195,14 @@ itest!(require_json {
http_server: true,
});
itest!(error_version_after_subpath {
args: "run --unstable -A --quiet npm/error_version_after_subpath/main.js",
output: "npm/error_version_after_subpath/main.out",
envs: env_vars(),
http_server: true,
exit_code: 1,
});
#[test]
fn parallel_downloading() {
let (out, _err) = util::run_and_collect_output_with_args(

1
cli/tests/testdata/npm/error_version_after_subpath/main.js vendored Normal file
View file

@ -0,0 +1 @@
import "npm:react-dom/server@18.2.0";

2
cli/tests/testdata/npm/error_version_after_subpath/main.out vendored Normal file
View file

@ -0,0 +1,2 @@
error: Invalid package specifier 'npm:react-dom/server@18.2.0'. Did you mean to write 'npm:react-dom@18.2.0/server'?
at [WILDCARD]/npm/error_version_after_subpath/main.js:1:8

21
ext/node/errors.rs
View file

@ -81,23 +81,36 @@ pub fn err_invalid_package_target(
}
pub fn err_package_path_not_exported(
pkg_path: String,
mut pkg_path: String,
subpath: String,
maybe_referrer: Option<String>,
) -> AnyError {
let mut msg = "[ERR_PACKAGE_PATH_NOT_EXPORTED]".to_string();
#[cfg(windows)]
{
if !pkg_path.ends_with('\\') {
pkg_path.push('\\');
}
}
#[cfg(not(windows))]
{
if !pkg_path.ends_with('/') {
pkg_path.push('/');
}
}
if subpath == "." {
msg = format!(
"{} No \"exports\" main defined in {}package.json",
"{} No \"exports\" main defined in '{}package.json'",
msg, pkg_path
);
} else {
msg = format!("{} Package subpath \'{}\' is not defined by \"exports\" in {}package.json", msg, subpath, pkg_path);
msg = format!("{} Package subpath '{}' is not defined by \"exports\" in '{}package.json'", msg, subpath, pkg_path);
};
if let Some(referrer) = maybe_referrer {
msg = format!("{} imported from {}", msg, referrer);
msg = format!("{} imported from '{}'", msg, referrer);
}
generic_error(msg)