refactor: separate publish from pm subcommands (#28237)

cli/main.rs

@@ -15,6 +15,7 @@ mod module_loader;
 mod node;
 mod npm;
 mod ops;
+mod registry;
 mod resolver;
 mod standalone;
 mod task_runner;
@@ -108,10 +109,10 @@ fn spawn_subcommand<F: Future<Output = T> + 'static, T: SubcommandOutput>(
 async fn run_subcommand(flags: Arc<Flags>) -> Result<i32, AnyError> {
   let handle = match flags.subcommand.clone() {
     DenoSubcommand::Add(add_flags) => spawn_subcommand(async {
-      tools::registry::add(flags, add_flags, tools::registry::AddCommandName::Add).await
+      tools::pm::add(flags, add_flags, tools::pm::AddCommandName::Add).await
     }),
     DenoSubcommand::Remove(remove_flags) => spawn_subcommand(async {
-      tools::registry::remove(flags, remove_flags).await
+      tools::pm::remove(flags, remove_flags).await
     }),
     DenoSubcommand::Bench(bench_flags) => spawn_subcommand(async {
       if bench_flags.watch.is_some() {
@@ -193,7 +194,7 @@ async fn run_subcommand(flags: Arc<Flags>) -> Result<i32, AnyError> {
     }),
     DenoSubcommand::Outdated(update_flags) => {
       spawn_subcommand(async move {
-        tools::registry::outdated(flags, update_flags).await
+        tools::pm::outdated(flags, update_flags).await
       })
     }
     DenoSubcommand::Repl(repl_flags) => {
@@ -316,7 +317,7 @@ async fn run_subcommand(flags: Arc<Flags>) -> Result<i32, AnyError> {
     ),
     DenoSubcommand::Vendor => exit_with_message("⚠️ `deno vendor` was removed in Deno 2.\n\nSee the Deno 1.x to 2.x Migration Guide for migration instructions: https://docs.deno.com/runtime/manual/advanced/migrate_deprecations", 1),
     DenoSubcommand::Publish(publish_flags) => spawn_subcommand(async {
-      tools::registry::publish(flags, publish_flags).await
+      tools::publish::publish(flags, publish_flags).await
     }),
     DenoSubcommand::Help(help_flags) => spawn_subcommand(async move {
       use std::io::Write;

cli/tools/installer.rs

@@ -212,7 +212,7 @@ pub async fn uninstall(
   let uninstall_flags = match uninstall_flags.kind {
     UninstallKind::Global(flags) => flags,
     UninstallKind::Local(remove_flags) => {
-      return super::registry::remove(flags, remove_flags).await;
+      return super::pm::remove(flags, remove_flags).await;
     }
   };
 
@@ -300,12 +300,7 @@ async fn install_local(
 ) -> Result<(), AnyError> {
   match install_flags {
     InstallFlagsLocal::Add(add_flags) => {
-      super::registry::add(
+      super::pm::add(flags, add_flags, super::pm::AddCommandName::Install).await
-        flags,
-        add_flags,
-        super::registry::AddCommandName::Install,
-      )
-      .await
     }
     InstallFlagsLocal::Entrypoints(entrypoints) => {
       install_from_entrypoints(flags, &entrypoints).await
@@ -314,7 +309,7 @@ async fn install_local(
       let factory = CliFactory::from_flags(flags);
       // surface any errors in the package.json
       factory.npm_installer()?.ensure_no_pkg_json_dep_errors()?;
-      crate::tools::registry::cache_top_level_deps(&factory, None).await?;
+      crate::tools::pm::cache_top_level_deps(&factory, None).await?;
 
       if let Some(lockfile) = factory.cli_options()?.maybe_lockfile() {
         lockfile.write_if_changed()?;
@@ -393,8 +388,7 @@ async fn install_global(
   let entry_text = install_flags_global.module_url.as_str();
   if !cli_options.initial_cwd().join(entry_text).exists() {
     // check for package requirement missing prefix
-    if let Ok(Err(package_req)) =
+    if let Ok(Err(package_req)) = super::pm::AddRmPackageReq::parse(entry_text)
-      super::registry::AddRmPackageReq::parse(entry_text)
     {
       if jsr_resolver.req_to_nv(&package_req).await.is_some() {
         bail!(

cli/tools/mod.rs

@@ -12,7 +12,8 @@ pub mod init;
 pub mod installer;
 pub mod jupyter;
 pub mod lint;
-pub mod registry;
+pub mod pm;
+pub mod publish;
 pub mod repl;
 pub mod run;
 pub mod serve;

cli/tools/pm/outdated/interactive.rs

@@ -20,8 +20,8 @@ use deno_semver::VersionReq;
 use deno_terminal::colors;
 use unicode_width::UnicodeWidthStr;
 
-use crate::tools::registry::pm::deps::DepId;
+use crate::tools::pm::deps::DepId;
-use crate::tools::registry::pm::deps::DepKind;
+use crate::tools::pm::deps::DepKind;
 
 #[derive(Debug)]
 pub struct PackageInfo {

cli/tools/pm/outdated/mod.rs

@@ -16,6 +16,7 @@ use deno_terminal::colors;
 
 use super::deps::Dep;
 use super::deps::DepId;
+use super::deps::DepKind;
 use super::deps::DepManager;
 use super::deps::DepManagerArgs;
 use super::deps::PackageLatestVersion;
@@ -26,7 +27,6 @@ use crate::factory::CliFactory;
 use crate::file_fetcher::CliFileFetcher;
 use crate::jsr::JsrFetchResolver;
 use crate::npm::NpmFetchResolver;
-use crate::tools::registry::pm::deps::DepKind;
 
 #[derive(Debug, PartialEq, Eq, PartialOrd, Ord)]
 struct OutdatedPackage {

cli/tools/publish/diagnostics.rs

@@ -379,7 +379,7 @@ impl Diagnostic for PublishDiagnostic {
     use PublishDiagnostic::*;
     match &self {
       InvalidExternalImport { imported, .. } => {
-        match super::api::get_jsr_alternative(imported) {
+        match crate::registry::get_jsr_alternative(imported) {
           Some(replacement) => {
             let replacement = SourceTextInfo::new(replacement.into());
             let start = replacement.line_start(0);

cli/tools/publish/mod.rs

@@ -34,6 +34,8 @@ use serde::Serialize;
 use sha2::Digest;
 use tokio::process::Command;
 
+use self::diagnostics::PublishDiagnostic;
+use self::diagnostics::PublishDiagnosticsCollector;
 use self::graph::GraphDiagnosticsCollector;
 use self::module_content::ModuleContentProvider;
 use self::paths::CollectedPublishPath;
@@ -46,21 +48,18 @@ use crate::args::PublishFlags;
 use crate::factory::CliFactory;
 use crate::graph_util::ModuleGraphCreator;
 use crate::http_util::HttpClient;
+use crate::registry;
 use crate::tools::lint::collect_no_slow_type_diagnostics;
-use crate::tools::registry::diagnostics::PublishDiagnostic;
-use crate::tools::registry::diagnostics::PublishDiagnosticsCollector;
 use crate::type_checker::CheckOptions;
 use crate::type_checker::TypeChecker;
 use crate::util::display::human_size;
 
-mod api;
 mod auth;
 
 mod diagnostics;
 mod graph;
 mod module_content;
 mod paths;
-mod pm;
 mod provenance;
 mod publish_order;
 mod tar;
@@ -68,12 +67,6 @@ mod unfurl;
 
 use auth::get_auth_method;
 use auth::AuthMethod;
-pub use pm::add;
-pub use pm::cache_top_level_deps;
-pub use pm::outdated;
-pub use pm::remove;
-pub use pm::AddCommandName;
-pub use pm::AddRmPackageReq;
 use publish_order::PublishOrderGraph;
 use unfurl::SpecifierUnfurler;
 
@@ -558,10 +551,11 @@ async fn get_auth_headers(
         .send()
         .await
         .context("Failed to create interactive authorization")?;
-      let auth =
+      let auth = registry::parse_response::<
-        api::parse_response::<api::CreateAuthorizationResponse>(response)
+        registry::CreateAuthorizationResponse,
-          .await
+      >(response)
-          .context("Failed to create interactive authorization")?;
+      .await
+      .context("Failed to create interactive authorization")?;
 
       let auth_url = format!("{}?code={}", auth.verification_url, auth.code);
       let pkgs_text = if packages.len() > 1 {
@@ -594,9 +588,10 @@ async fn get_auth_headers(
           .send()
           .await
           .context("Failed to exchange authorization")?;
-        let res =
+        let res = registry::parse_response::<
-          api::parse_response::<api::ExchangeAuthorizationResponse>(response)
+          registry::ExchangeAuthorizationResponse,
-            .await;
+        >(response)
+        .await;
         match res {
           Ok(res) => {
             log::info!(
@@ -668,7 +663,7 @@ async fn get_auth_headers(
             text
           );
         }
-        let api::OidcTokenResponse { value } = serde_json::from_str(&text)
+        let registry::OidcTokenResponse { value } = serde_json::from_str(&text)
           .with_context(|| {
             format!(
               "Failed to parse OIDC token: '{}' (status {})",
@@ -702,13 +697,13 @@ async fn check_if_scope_and_package_exist(
   let mut needs_scope = false;
   let mut needs_package = false;
 
-  let response = api::get_scope(client, registry_api_url, scope).await?;
+  let response = registry::get_scope(client, registry_api_url, scope).await?;
   if response.status() == 404 {
     needs_scope = true;
   }
 
   let response =
-    api::get_package(client, registry_api_url, scope, package).await?;
+    registry::get_package(client, registry_api_url, scope, package).await?;
   if response.status() == 404 {
     needs_package = true;
   }
@@ -780,7 +775,7 @@ async fn ensure_scopes_and_packages_exist(
     log::warn!("{}", colors::gray("Waiting..."));
     let _ = open::that_detached(&create_package_url);
 
-    let package_api_url = api::get_package_api_url(
+    let package_api_url = registry::get_package_api_url(
       registry_api_url,
       &package.scope,
       &package.package,
@@ -926,11 +921,12 @@ async fn publish_package(
     .send()
     .await?;
 
-  let res = api::parse_response::<api::PublishingTask>(response).await;
+  let res =
+    registry::parse_response::<registry::PublishingTask>(response).await;
   let mut task = match res {
     Ok(task) => task,
     Err(mut err) if err.code == "duplicateVersionPublish" => {
-      let task = serde_json::from_value::<api::PublishingTask>(
+      let task = serde_json::from_value::<registry::PublishingTask>(
         err.data.get_mut("task").unwrap().take(),
       )
       .unwrap();
@@ -976,7 +972,7 @@ async fn publish_package(
           package.scope, package.package, package.version
         )
       })?;
-    task = api::parse_response::<api::PublishingTask>(resp)
+    task = registry::parse_response::<registry::PublishingTask>(resp)
       .await
       .with_context(|| {
         format!(
@@ -1285,10 +1281,10 @@ mod tests {
 
   use deno_ast::ModuleSpecifier;
 
+  use super::has_license_file;
   use super::tar::PublishableTarball;
   use super::tar::PublishableTarballFile;
   use super::verify_version_manifest;
-  use crate::tools::registry::has_license_file;
 
   #[test]
   fn test_verify_version_manifest() {

cli/tools/publish/module_content.rs

@@ -16,6 +16,7 @@ use lazy_regex::Lazy;
 use sys_traits::FsMetadata;
 use sys_traits::FsRead;
 
+use super::diagnostics::PublishDiagnostic;
 use super::diagnostics::PublishDiagnosticsCollector;
 use super::unfurl::SpecifierUnfurler;
 use super::unfurl::SpecifierUnfurlerDiagnostic;
@@ -23,7 +24,6 @@ use crate::args::deno_json::TsConfigResolver;
 use crate::cache::LazyGraphSourceParser;
 use crate::cache::ParsedSourceCache;
 use crate::sys::CliSys;
-use crate::tools::registry::diagnostics::PublishDiagnostic;
 
 struct JsxFolderOptions<'a> {
   jsx_factory: &'a str,

cli/tools/publish/provenance.rs

@@ -25,11 +25,11 @@ use spki::der::asn1;
 use spki::der::pem::LineEnding;
 use spki::der::EncodePem;
 
-use super::api::OidcTokenResponse;
 use super::auth::gha_oidc_token;
 use super::auth::is_gha;
 use crate::http_util;
 use crate::http_util::HttpClient;
+use crate::registry::OidcTokenResponse;
 
 const PAE_PREFIX: &str = "DSSEv1";