Skip to content

Commit

Permalink
simplify create_npm_dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
ry committed Feb 29, 2024
1 parent 9a44217 commit 0fa7d98
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 10 deletions.
2 changes: 1 addition & 1 deletion api/src/npm/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ pub async fn generate_npm_version_manifest<'a>(
};
Cow::Owned((dep.dependency_kind, PackageReqReference { req, sub_path }))
});
let npm_dependencies = create_npm_dependencies(dependencies)?;
let npm_dependencies = create_npm_dependencies(scope, name, dependencies);

let tarball = Url::options()
.base_url(Some(npm_url))
Expand Down
15 changes: 6 additions & 9 deletions api/src/npm/tarball.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ use crate::db::DependencyKind;
use crate::db::ExportsMap;
use crate::ids::PackageName;
use crate::ids::ScopeName;
use crate::ids::ScopedPackageName;
use crate::ids::Version;
use crate::npm::specifiers::rewrite_extension;
use crate::npm::specifiers::rewrite_specifier;
Expand Down Expand Up @@ -72,7 +71,7 @@ pub fn create_npm_tarball<'a>(
let npm_exports = create_npm_exports(exports);

let npm_dependencies =
create_npm_dependencies(dependencies.map(Cow::Borrowed))?;
create_npm_dependencies(scope, package, dependencies.map(Cow::Borrowed));

let homepage = Url::options()
.base_url(Some(registry_url))
Expand Down Expand Up @@ -208,18 +207,16 @@ pub fn create_npm_tarball<'a>(
}

pub fn create_npm_dependencies<'a>(
scope: &ScopeName,
package: &PackageName,
dependencies: impl Iterator<Item = Cow<'a, (DependencyKind, PackageReqReference)>>,
) -> Result<IndexMap<String, String>, anyhow::Error> {
) -> IndexMap<String, String> {
let mut npm_dependencies = IndexMap::new();
for dep in dependencies {
let (kind, req) = &*dep;
match kind {
DependencyKind::Jsr => {
let jsr_name = ScopedPackageName::new(req.req.name.clone())?;
let npm_name = NpmMappedJsrPackageName {
scope: &jsr_name.scope,
package: &jsr_name.package,
};
let npm_name = NpmMappedJsrPackageName { scope, package };
npm_dependencies
.insert(npm_name.to_string(), req.req.version_req.to_string());
}
Expand All @@ -230,7 +227,7 @@ pub fn create_npm_dependencies<'a>(
}
}
npm_dependencies.sort_keys();
Ok(npm_dependencies)
npm_dependencies
}

pub fn create_npm_exports(exports: &ExportsMap) -> IndexMap<String, String> {
Expand Down

0 comments on commit 0fa7d98

Please sign in to comment.