fix: treat @jsr/ scoped npm dependencies as JSR dependencies

api/src/analysis.rs

@@ -34,6 +34,7 @@ use deno_semver::StackString;
 use deno_semver::jsr::JsrPackageReqReference;
 use deno_semver::npm::NpmPackageReqReference;
 use deno_semver::package::PackageNv;
+use deno_semver::package::PackageReq;
 use deno_semver::package::PackageReqReference;
 use futures::FutureExt;
 use once_cell::sync::Lazy;
@@ -768,6 +769,32 @@ impl deno_graph::analysis::ModuleAnalyzer for ModuleAnalyzer {
   }
 }
 
+fn convert_npm_jsr_to_jsr_ref(
+  npm_req: &NpmPackageReqReference,
+) -> Option<PackageReqReference> {
+  let name = &npm_req.req().name;
+  if let Some(stripped) = name.strip_prefix("@jsr/") {
+    let parts: Vec<&str> = stripped.split("__").collect();
+    if parts.len() == 2 {
+      let scope = parts[0];
+      let package = parts[1];
+      let new_name = format!("@{}/{}", scope, package);
+      let new_req = PackageReq {
+        name: new_name.as_str().into(),
+        version_req: npm_req.req().version_req.clone(),
+      };
+      Some(PackageReqReference {
+        req: new_req,
+        sub_path: npm_req.sub_path().map(|s| s.into()),
+      })
+    } else {
+      None
+    }
+  } else {
+    None
+  }
+}
+
 fn collect_dependencies(
   graph: &ModuleGraph,
 ) -> Result<HashSet<(DependencyKind, PackageReqReference)>, PublishError> {
@@ -781,6 +808,12 @@ fn collect_dependencies(
           Ok(req) => {
             if req.req().version_req.version_text() == "*" {
               return Err(PublishError::NpmMissingConstraint(req));
+            } else if req.req().name.starts_with("@jsr/") {
+              if let Some(jsr_ref) = convert_npm_jsr_to_jsr_ref(&req) {
+                dependencies.insert((DependencyKind::Jsr, jsr_ref));
+              } else {
+                dependencies.insert((DependencyKind::Npm, req.into_inner()));
+              }
             } else {
               dependencies.insert((DependencyKind::Npm, req.into_inner()));
             }

api/src/publish.rs

@@ -1170,6 +1170,22 @@ pub mod tests {
     assert!(uses_npm(&t, &task).await);
   }
 
+  #[tokio::test]
+  async fn npm_jsr_import() {
+    let t = TestSetup::new().await;
+    // First publish the dependency package
+    let dep_task = process_tarball_setup(&t, create_mock_tarball("ok")).await;
+    assert_eq!(dep_task.status, PublishingTaskStatus::Success);
+    // Then publish the package that depends on it
+    let package_name = PackageName::try_from("bar").unwrap();
+    let version = Version::try_from("1.2.3").unwrap();
+    let bytes = create_mock_tarball("npm_jsr_import");
+    let task =
+      process_tarball_setup2(&t, bytes, &package_name, &version, false).await;
+    assert_eq!(task.status, PublishingTaskStatus::Success, "{task:#?}");
+    assert!(!uses_npm(&t, &task).await);
+  }
+
   #[tokio::test]
   async fn bun_import() {
     let t = TestSetup::new().await;

api/testdata/tarballs/npm_jsr_import/jsr.json

@@ -0,0 +1,5 @@
+{
+  "name": "@scope/bar",
+  "version": "1.2.3",
+  "exports": "./mod.ts"
+}

api/testdata/tarballs/npm_jsr_import/mod.ts

@@ -0,0 +1,2 @@
+import "npm:@jsr/scope__foo@1.2.3";
+export const hello = "Hello, world!";