Make it a subcommand

crates/ruff/src/args.rs

@@ -7,7 +7,7 @@ use std::sync::Arc;
 
 use anyhow::{anyhow, bail};
 use clap::builder::{TypedValueParser, ValueParserFactory};
-use clap::{command, Parser};
+use clap::{command, Parser, Subcommand};
 use colored::Colorize;
 use path_absolutize::path_dedot;
 use regex::Regex;
@@ -132,17 +132,24 @@ pub enum Command {
     Format(FormatCommand),
     /// Run the language server.
     Server(ServerCommand),
-    /// Generate a map of Python file dependencies.
-    ImportMap(ImportMapCommand),
+    /// Analyze the import graph of the given files or directories.
+    #[clap(subcommand)]
+    Graph(GraphCommand),
     /// Display Ruff's version
     Version {
         #[arg(long, value_enum, default_value = "text")]
         output_format: HelpFormat,
     },
 }
 
+#[derive(Debug, Subcommand)]
+pub enum GraphCommand {
+    /// Generate a map of Python file dependencies.
+    Build(GraphBuildCommand),
+}
+
 #[derive(Clone, Debug, clap::Parser)]
-pub struct ImportMapCommand {
+pub struct GraphBuildCommand {
     /// List of files or directories to include.
     #[clap(help = "List of files or directories to include [default: .]")]
     pub files: Vec<PathBuf>,
@@ -758,14 +765,14 @@ impl FormatCommand {
     }
 }
 
-impl ImportMapCommand {
+impl GraphBuildCommand {
     /// Partition the CLI into command-line arguments and configuration
     /// overrides.
     pub fn partition(
         self,
         global_options: GlobalConfigArgs,
-    ) -> anyhow::Result<(ImportMapArgs, ConfigArguments)> {
-        let format_arguments = ImportMapArgs {
+    ) -> anyhow::Result<(GraphArgs, ConfigArguments)> {
+        let format_arguments = GraphArgs {
             files: self.files,
             direction: self.direction,
         };
@@ -1199,7 +1206,7 @@ impl LineColumnParseError {
 }
 
 /// CLI settings that are distinct from configuration (commands, lists of files, etc.).
-pub struct ImportMapArgs {
+pub struct GraphArgs {
     pub files: Vec<PathBuf>,
     pub direction: Direction,
 }

crates/ruff/src/commands/import_map.rs → crates/ruff/src/commands/graph.rs

@@ -1,4 +1,4 @@
-use crate::args::{ConfigArguments, ImportMapArgs};
+use crate::args::{ConfigArguments, GraphArgs};
 use crate::resolve::resolve;
 use crate::{resolve_default_files, ExitStatus};
 use anyhow::Result;
@@ -13,10 +13,7 @@ use std::path::Path;
 use std::sync::Arc;
 
 /// Generate an import map.
-pub(crate) fn import_map(
-    args: ImportMapArgs,
-    config_arguments: &ConfigArguments,
-) -> Result<ExitStatus> {
+pub(crate) fn graph(args: GraphArgs, config_arguments: &ConfigArguments) -> Result<ExitStatus> {
     // Construct the "default" settings. These are used when no `pyproject.toml`
     // files are present, or files are injected from outside the hierarchy.
     let pyproject_config = resolve(config_arguments, None)?;

crates/ruff/src/commands/mod.rs

@@ -5,7 +5,7 @@ pub(crate) mod clean;
 pub(crate) mod config;
 pub(crate) mod format;
 pub(crate) mod format_stdin;
-pub(crate) mod import_map;
+pub(crate) mod graph;
 pub(crate) mod linter;
 pub(crate) mod rule;
 pub(crate) mod server;

crates/ruff/src/lib.rs

@@ -20,7 +20,7 @@ use ruff_linter::settings::types::OutputFormat;
 use ruff_linter::{fs, warn_user, warn_user_once};
 use ruff_workspace::Settings;
 
-use crate::args::{Args, CheckCommand, Command, FormatCommand, ImportMapCommand};
+use crate::args::{Args, CheckCommand, Command, FormatCommand, GraphBuildCommand, GraphCommand};
 use crate::printer::{Flags as PrinterFlags, Printer};
 
 pub mod args;
@@ -186,7 +186,7 @@ pub fn run(
         Command::Check(args) => check(args, global_options),
         Command::Format(args) => format(args, global_options),
         Command::Server(args) => server(args),
-        Command::ImportMap(args) => import_map(args, global_options),
+        Command::Graph(GraphCommand::Build(args)) => graph_build(args, global_options),
     }
 }
 
@@ -200,10 +200,10 @@ fn format(args: FormatCommand, global_options: GlobalConfigArgs) -> Result<ExitS
     }
 }
 
-fn import_map(args: ImportMapCommand, global_options: GlobalConfigArgs) -> Result<ExitStatus> {
+fn graph_build(args: GraphBuildCommand, global_options: GlobalConfigArgs) -> Result<ExitStatus> {
     let (cli, config_arguments) = args.partition(global_options)?;
 
-    commands::import_map::import_map(cli, &config_arguments)
+    commands::graph::graph(cli, &config_arguments)
 }
 
 fn server(args: ServerCommand) -> Result<ExitStatus> {

crates/ruff_db/src/system/path.rs

@@ -192,9 +192,9 @@ impl SystemPath {
     /// [`self.file_name`]: SystemPath::file_name
     ///
     /// The stem is:
-    /// * The entire file name if there is no embedded `.`;
     ///
     /// * [`None`], if there is no file name;
+    /// * The entire file name if there is no embedded `.`;
     /// * The entire file name if the file name begins with `.` and has no other `.`s within;
     /// * Otherwise, the portion of the file name before the final `.`
     ///

crates/ruff_graph/Cargo.toml

@@ -21,7 +21,6 @@ ruff_python_stdlib = { workspace = true }
 
 anyhow = { workspace = true }
 clap = { workspace = true, optional = true }
-itertools = { workspace = true }
 salsa = { workspace = true }
 schemars = { workspace = true, optional = true }
 serde = { workspace = true, optional = true }

crates/ruff_graph/src/db.rs

@@ -16,37 +16,32 @@ pub struct ModuleDb {
 
 impl Default for ModuleDb {
     fn default() -> Self {
-        Self::new()
+        Self {
+            storage: salsa::Storage::default(),
+            system: OsSystem::default(),
+            vendored: VendoredFileSystem::default(),
+            files: Files::default(),
+        }
     }
 }
 
 impl ModuleDb {
     /// Initialize a [`ModuleDb`] from the given source root.
     pub fn from_src_root(src_root: PathBuf) -> Result<Self> {
-        let db = Self::new();
+        let db = Self::default();
         Program::from_settings(
             &db,
             &ProgramSettings {
                 target_version: PythonVersion::default(),
                 search_paths: SearchPathSettings::new(
-                    SystemPathBuf::from_path_buf(src_root).map_err(|path| {
-                        anyhow::anyhow!(format!("Invalid path: {}", path.display()))
-                    })?,
+                    SystemPathBuf::from_path_buf(src_root)
+                        .map_err(|path| anyhow::anyhow!("Invalid path: {}", path.display()))?,
                 ),
             },
         )?;
         Ok(db)
     }
 
-    pub fn new() -> Self {
-        Self {
-            storage: salsa::Storage::default(),
-            system: OsSystem::default(),
-            vendored: VendoredFileSystem::default(),
-            files: Files::default(),
-        }
-    }
-
     #[must_use]
     pub fn snapshot(&self) -> Self {
         Self {

docs/configuration.md

@@ -515,16 +515,16 @@ Ruff: An extremely fast Python linter and code formatter.
 Usage: ruff [OPTIONS] <COMMAND>
 
 Commands:
-  check       Run Ruff on the given files or directories (default)
-  rule        Explain a rule (or all rules)
-  config      List or describe the available configuration options
-  linter      List all supported upstream linters
-  clean       Clear any caches in the current directory and any subdirectories
-  format      Run the Ruff formatter on the given files or directories
-  server      Run the language server
-  import-map  Generate a map of Python file dependencies
-  version     Display Ruff's version
-  help        Print this message or the help of the given subcommand(s)
+  check    Run Ruff on the given files or directories (default)
+  rule     Explain a rule (or all rules)
+  config   List or describe the available configuration options
+  linter   List all supported upstream linters
+  clean    Clear any caches in the current directory and any subdirectories
+  format   Run the Ruff formatter on the given files or directories
+  server   Run the language server
+  graph    Analyze the import graph of the given files or directories
+  version  Display Ruff's version
+  help     Print this message or the help of the given subcommand(s)
 
 Options:
   -h, --help     Print help