From 40a72f35550ad2fd995b1d176540cc4fa0858370 Mon Sep 17 00:00:00 2001 From: David Sherret Date: Wed, 16 Nov 2022 13:44:31 -0500 Subject: fix(npm): support non-all lowercase package names (#16669) Supports package names that aren't all lowercase. This stores the package with a leading underscore (since that's not allowed in npm's registry and no package exists with a leading underscore) then base32 encoded (A-Z0-9) so it can be lowercased and avoid collisions. Global cache dir: ``` $DENO_DIR/npm/registry.npmjs.org/_{base32_encode(package_name).to_lowercase()}/{version} ``` node_modules dir `.deno` folder: ``` node_modules/.deno/_{base32_encode(package_name).to_lowercase()}@{version}/node_modules/ ``` Within node_modules folder: ``` node_modules/ ``` So, direct childs of the node_modules folder can have collisions between packages like `JSON` vs `json`, but this is already something npm itself doesn't handle well. Plus, Deno doesn't actually ever resolve to the `node_modules/` folder, but just has that for compatibility. Additionally, packages in the `.deno` dir could have collissions if they have multiple dependencies that only differ in casing or a dependency that has different casing, but if someone is doing that then they're already going to have trouble with npm and they are asking for trouble in general. --- cli/npm/resolvers/local.rs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'cli/npm/resolvers') diff --git a/cli/npm/resolvers/local.rs b/cli/npm/resolvers/local.rs index 367198965..0a47a7ff1 100644 --- a/cli/npm/resolvers/local.rs +++ b/cli/npm/resolvers/local.rs @@ -2,6 +2,7 @@ //! Code for local node_modules resolution. +use std::borrow::Cow; use std::collections::HashSet; use std::collections::VecDeque; use std::fs; @@ -23,6 +24,7 @@ use tokio::task::JoinHandle; use crate::fs_util; use crate::lockfile::Lockfile; +use crate::npm::cache::mixed_case_package_name_encode; use crate::npm::cache::should_sync_download; use crate::npm::cache::NpmPackageCacheFolderId; use crate::npm::resolution::NpmResolution; @@ -438,7 +440,12 @@ fn get_package_folder_id_folder_name(id: &NpmPackageCacheFolderId) -> String { } else { format!("_{}", id.copy_index) }; - format!("{}@{}{}", id.name, id.version, copy_str).replace('/', "+") + let name = if id.name.to_lowercase() == id.name { + Cow::Borrowed(&id.name) + } else { + Cow::Owned(format!("_{}", mixed_case_package_name_encode(&id.name))) + }; + format!("{}@{}{}", name, id.version, copy_str).replace('/', "+") } fn symlink_package_dir( -- cgit v1.2.3