move out workspace resolution from arg parsing

Author: dsherret

cli/args/flags.rs

@@ -26,9 +26,6 @@ use color_print::cstr;
 use deno_config::deno_json::NodeModulesDirMode;
 use deno_config::glob::FilePatterns;
 use deno_config::glob::PathOrPatternSet;
-use deno_config::workspace::WorkspaceDirectory;
-use deno_config::workspace::WorkspaceDiscoverOptions;
-use deno_config::workspace::WorkspaceDiscoverStart;
 use deno_core::anyhow::bail;
 use deno_core::anyhow::Context;
 use deno_core::error::AnyError;
@@ -3269,7 +3266,8 @@ fn publish_subcommand() -> Command {
         .arg(
           Arg::new("set-version")
             .long("set-version")
-            .help("Set the version specified in the configuration file")
+            .help("Set version for a package to be published.
+  <p(245)>This flag can be used while publishing individual packages and cannot be used in a workspace.</>")
             .value_name("VERSION")
             .help_heading(PUBLISH_HEADING)
         )
@@ -5251,32 +5249,13 @@ fn publish_parse(
   check_arg_parse(flags, matches);
   config_args_parse(flags, matches);
 
-  let set_version = matches.remove_one::<String>("set-version");
-
-  if set_version.is_some() {
-    if let Ok(workspace_dir) = WorkspaceDirectory::discover(
-      WorkspaceDiscoverStart::Paths(&[
-        std::env::current_dir().unwrap_or_default()
-      ]),
-      &WorkspaceDiscoverOptions::default(),
-    ) {
-      let jsr_packages = workspace_dir.jsr_packages_for_publish();
-      if jsr_packages.len() > 1 {
-        return Err(clap::Error::raw(
-          clap::error::ErrorKind::ArgumentConflict,
-          "The --set-version flag cannot be used in a workspace. It is only allowed for individual packages.",
-        ));
-      }
-    }
-  }
-
   flags.subcommand = DenoSubcommand::Publish(PublishFlags {
     token: matches.remove_one("token"),
     dry_run: matches.get_flag("dry-run"),
     allow_slow_types: matches.get_flag("allow-slow-types"),
     allow_dirty: matches.get_flag("allow-dirty"),
     no_provenance: matches.get_flag("no-provenance"),
-    set_version,
+    set_version: matches.remove_one::<String>("set-version"),
   });
 
   Ok(())

cli/tools/registry/mod.rs

@@ -111,15 +111,14 @@ pub async fn publish(
   }
 
   if let Some(version) = &publish_flags.set_version {
-    publish_configs = publish_configs
-      .into_iter()
-      .map(|mut config| {
-        let mut config_file = config.config_file.as_ref().clone();
-        config_file.json.version = Some(version.clone());
-        config.config_file = Arc::new(config_file);
-        config
-      })
-      .collect();
+    if publish_configs.len() > 1 {
+      bail!("Cannot use --set-version when publishing a workspace. Change your cwd to an individual package instead.");
+    }
+    if let Some(publish_config) = publish_configs.get_mut(0) {
+      let mut config_file = publish_config.config_file.as_ref().clone();
+      config_file.json.version = Some(version.clone());
+      publish_config.config_file = Arc::new(config_file);
+    }
   }
 
   let specifier_unfurler = Arc::new(SpecifierUnfurler::new(

tests/specs/publish/error_set_version/error_set_version.out

@@ -0,0 +1 @@
+error: Cannot use --set-version when publishing a workspace. Change your cwd to an individual package instead.

tests/specs/publish/error_set_version/LICENSE tests/specs/publish/set_version/multiple_packages/LICENSE

@@ -1,6 +1,6 @@
-Check file:///[WILDCARD]/publish/successful_set_version/mod.ts
+Check file:///[WILDCARD]/success/mod.ts
 Checking for slow types in the public API...
-Check file:///[WILDCARD]/publish/successful_set_version/mod.ts
+Check file:///[WILDCARD]/success/mod.ts
 Publishing @foo/[email protected] ...
 Successfully published @foo/[email protected]
 Visit http://127.0.0.1:4250/@foo/[email protected] for details