-
-
Notifications
You must be signed in to change notification settings - Fork 56
feat: migration dependency visualization using GraphViz/Mermaid #643
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
ElijahAhianyo
wants to merge
8
commits into
master
Choose a base branch
from
elijah/migration-graph
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
3caaa36
Add migration graph subcommand to generate a graph for visualization
ElijahAhianyo c48c306
tests and more tests
ElijahAhianyo 2322b11
add non exhaustive
ElijahAhianyo 2004afe
miri fix
ElijahAhianyo 57d3489
address PR comments
ElijahAhianyo dec50de
docs improve
ElijahAhianyo de0639b
fix UI tests
ElijahAhianyo 5d252f4
style import kitchen sink
ElijahAhianyo File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,7 +8,7 @@ use async_trait::async_trait; | |
| pub use clap; | ||
| use clap::{Arg, ArgAction, ArgMatches, Command, value_parser}; | ||
| #[cfg(feature = "db")] | ||
| use cot::db::migrations::{MigrationEngine, SyncDynMigration}; | ||
| use cot::db::migrations::{GraphExporter, GraphFormat, MigrationEngine, SyncDynMigration}; | ||
| use cot::project::BootstrappedProject; | ||
| use derive_more::Debug; | ||
|
|
||
|
|
@@ -21,6 +21,7 @@ const LISTEN_PARAM: &str = "listen"; | |
| const COLLECT_STATIC_DIR_PARAM: &str = "dir"; | ||
| const MIGRATION_GROUP_SUBCOMMAND: &str = "migration"; | ||
| const MIGRATION_ROLLBACK_SUBCOMMAND: &str = "rollback"; | ||
| const MIGRATION_GRAPH_SUBCOMMAND: &str = "graph"; | ||
|
|
||
| /// A central point for configuring the default Command Line Interface (CLI) for | ||
| /// Cot-powered projects. | ||
|
|
@@ -101,6 +102,7 @@ impl Cli { | |
| let mut migration_group = | ||
| CliTaskGroup::new(MIGRATION_GROUP_SUBCOMMAND).about("Database migration commands"); | ||
| migration_group.add_task(MigrationRollback); | ||
| migration_group.add_task(MigrationGraph); | ||
|
|
||
| cli.add_task(migration_group); | ||
| } | ||
|
|
@@ -655,6 +657,75 @@ impl CliTask for MigrationRollback { | |
| } | ||
| } | ||
|
|
||
| #[cfg(feature = "db")] | ||
| struct MigrationGraph; | ||
|
|
||
| #[cfg(feature = "db")] | ||
| #[async_trait(?Send)] | ||
| impl CliTask for MigrationGraph { | ||
| fn subcommand(&self) -> Command { | ||
| Command::new(MIGRATION_GRAPH_SUBCOMMAND) | ||
| .about("Export the migration dependency graph for visualization") | ||
| .arg( | ||
| Arg::new("format") | ||
| .long("format") | ||
| .value_name("FORMAT") | ||
| .value_parser(["dot", "mermaid"]) | ||
| .default_value("dot") | ||
| .help("Output format: dot (Graphviz) or mermaid"), | ||
| ) | ||
| .arg( | ||
| Arg::new("output") | ||
| .short('o') | ||
| .long("output") | ||
| .value_name("FILE") | ||
| .value_parser(value_parser!(PathBuf)) | ||
| .required(false) | ||
| .help("Write to a file instead of stdout"), | ||
| ) | ||
| } | ||
|
|
||
| async fn execute( | ||
| &mut self, | ||
| matches: &ArgMatches, | ||
| bootstrapper: Bootstrapper<WithConfig>, | ||
| ) -> Result<()> { | ||
| let format = match matches.get_one::<String>("format").map(String::as_str) { | ||
| Some("mermaid") => GraphFormat::Mermaid, | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Can we move |
||
| _ => GraphFormat::Dot, | ||
| }; | ||
|
|
||
| let bootstrapper = bootstrapper | ||
| .with_apps() | ||
| .with_database() | ||
| .await? | ||
| .boot() | ||
| .await?; | ||
|
|
||
| let BootstrappedProject { | ||
| context, | ||
| handler: _, | ||
| error_handler: _, | ||
| } = bootstrapper.finish(); | ||
|
|
||
| let mut migrations: Vec<Box<SyncDynMigration>> = Vec::new(); | ||
| for app in context.apps() { | ||
| migrations.extend(app.migrations()); | ||
| } | ||
|
|
||
| let engine = MigrationEngine::new(migrations)?; | ||
| let exporter = GraphExporter::new(engine.migrations()); | ||
| let rendered = exporter.export(format)?; | ||
|
|
||
| match matches.get_one::<PathBuf>("output") { | ||
| Some(path) => std::fs::write(path, rendered)?, | ||
| None => println!("{rendered}"), | ||
| } | ||
|
|
||
| Ok(()) | ||
| } | ||
| } | ||
|
|
||
| /// A macro to generate a [`CliMetadata`] struct from the Cargo manifest. | ||
| #[macro_export] | ||
| macro_rules! metadata { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Would it make sense to also include
long_helpthat would point to GraphViz and Mermaid links?also, nit: I think it's Mermaid, not mermaid.