Skip to content
This repository was archived by the owner on Sep 17, 2023. It is now read-only.

feat: add subcommand to lint depenendency versions for consistent values #152

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
95 changes: 95 additions & 0 deletions src/lint.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
use std::collections::HashMap;
use std::error::Error;

use crate::opts;

use crate::configuration_file::ConfigurationFile;
use crate::monorepo_manifest::MonorepoManifest;

pub fn handle_subcommand(opts: opts::Lint) -> Result<(), Box<dyn Error>> {
match opts.subcommand {
opts::ClapLintSubCommand::DependencyVersion(args) => lint_dependency_version(&args),
}
}

fn most_common_dependency_version(
package_manifests_by_dependency_version: &HashMap<String, Vec<String>>,
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ocornoc if I wanted to semantically type String to something narrower like PackageManifestPath or DependencyVersion, what would that look like?

) -> Option<String> {
package_manifests_by_dependency_version
.iter()
// Map each dependecy version to its number of occurrences
.map(|(dependency_version, package_manifests)| {
(dependency_version, package_manifests.len())
})
// Take the max by value
.max_by(|a, b| a.1.cmp(&b.1))
.map(|(k, _v)| k.to_owned())
}

fn lint_dependency_version(opts: &opts::DependencyVersion) -> Result<(), Box<dyn Error>> {
let opts::DependencyVersion { root, dependencies } = opts;

let lerna_manifest = MonorepoManifest::from_directory(&root)?;
let package_manifest_by_package_name = lerna_manifest.package_manifests_by_package_name()?;

let mut is_exit_success = true;

for dependency in dependencies {
let package_manifests_by_dependency_version: HashMap<String, Vec<String>> =
package_manifest_by_package_name
.values()
.filter_map(|package_manifest| {
package_manifest
.get_dependency_version(&dependency)
.map(|dependency_version| (package_manifest, dependency_version))
})
.fold(
HashMap::new(),
|mut accumulator, (package_manifest, dependency_version)| {
let packages_using_this_dependency_version =
accumulator.entry(dependency_version).or_default();
packages_using_this_dependency_version.push(
package_manifest
.path()
.into_os_string()
.into_string()
.expect("Path not UTF-8 encoded"),
);
accumulator
},
);

if package_manifests_by_dependency_version.keys().len() <= 1 {
return Ok(());
}

let expected_version_number =
most_common_dependency_version(&package_manifests_by_dependency_version)
.expect("Expected dependency to be used in at least one package");

println!("Linting versions of dependency \"{}\"", &dependency);

package_manifests_by_dependency_version
.into_iter()
// filter out the packages using the expected dependency version
.filter(|(dependency_version, _package_manifests)| {
!dependency_version.eq(&expected_version_number)
})
.for_each(|(dependency_version, package_manifests)| {
package_manifests.into_iter().for_each(|package_manifest| {
println!(
"\tIn {}, expected version {} but found version {}",
&package_manifest, &expected_version_number, dependency_version
);
});
});

is_exit_success = false;
}

if is_exit_success {
return Ok(());
} else {
return Err("Found unexpected dependency versions".into());
}
}
2 changes: 2 additions & 0 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
mod configuration_file;
mod io;
mod link;
mod lint;
mod make_depend;
mod monorepo_manifest;
mod opts;
Expand All @@ -23,5 +24,6 @@ fn main() -> Result<(), Box<dyn Error>> {
opts::ClapSubCommand::Pin(args) => pin::pin_version_numbers_in_internal_packages(args),
opts::ClapSubCommand::MakeDepend(args) => make_depend::make_dependency_makefile(args),
opts::ClapSubCommand::Query(args) => query::handle_subcommand(args),
opts::ClapSubCommand::Lint(args) => lint::handle_subcommand(args),
}
}
33 changes: 28 additions & 5 deletions src/opts.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ pub enum ClapSubCommand {
MakeDepend(MakeDepend),
#[clap(about = "Query properties of the current monorepo state")]
Query(Query),
#[clap(about = "Lint internal packages for consistent use of external dependency versions")]
Lint(Lint),
}

#[derive(Parser)]
Expand Down Expand Up @@ -59,7 +61,6 @@ pub struct MakeDepend {

#[derive(Parser)]
pub struct Query {
/// internal-dependencies
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pretty sure this doesn't appear anywhere in the docstring

#[clap(subcommand)]
pub subcommand: ClapQuerySubCommand,
}
Expand All @@ -72,6 +73,12 @@ pub enum ClapQuerySubCommand {
InternalDependencies(InternalDependencies),
}

#[derive(ArgEnum, Clone)]
pub enum InternalDependenciesFormat {
Name,
Path,
}

#[derive(Parser)]
pub struct InternalDependencies {
/// Path to monorepo root
Expand All @@ -82,8 +89,24 @@ pub struct InternalDependencies {
pub format: InternalDependenciesFormat,
}

#[derive(ArgEnum, Clone)]
pub enum InternalDependenciesFormat {
Name,
Path,
#[derive(Parser)]
pub struct Lint {
#[clap(subcommand)]
pub subcommand: ClapLintSubCommand,
}

#[derive(Parser)]
pub enum ClapLintSubCommand {
#[clap(about = "Lint the used versions of an external dependency for consistency")]
DependencyVersion(DependencyVersion),
}

#[derive(Parser)]
pub struct DependencyVersion {
/// Path to monorepo root
#[clap(short, long, default_value = ".")]
pub root: PathBuf,
/// External dependency to lint for consistency of version used
#[clap(short, long = "dependency")]
pub dependencies: Vec<String>,
}
42 changes: 39 additions & 3 deletions src/package_manifest.rs
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,39 @@ impl AsRef<PackageManifest> for PackageManifest {
}

impl PackageManifest {
// Get the dependency
pub fn get_dependency_version<S>(&self, dependency: S) -> Option<String>
where
S: AsRef<str>,
{
static DEPENDENCY_GROUPS: &[&str] = &[
"dependencies",
"devDependencies",
"optionalDependencies",
"peerDependencies",
];

DEPENDENCY_GROUPS
.iter()
// only iterate over the objects corresponding to each dependency group
.filter_map(|dependency_group| {
self.contents
.extra_fields
.get(dependency_group)?
.as_object()
})
// get the target dependency version, if exists
.filter_map(|dependency_group_value| {
dependency_group_value
.get(dependency.as_ref())
// DISCUSS(Grayson): neither clone nor cloned work here, only to_owned
// How do I resolve this with https://github.com/typescript-tools/rust-implementation/pull/141#discussion_r845294514 ?
.and_then(|version_value| version_value.as_str().map(|a| a.to_owned()))
})
.take(1)
.next()
}
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got a q for @ocornoc

Does clone not work here because we need to change types, and clone can only preserve type?


pub fn internal_dependencies_iter<'a, T>(
&'a self,
package_manifests_by_package_name: &'a HashMap<String, &'a T>,
Expand All @@ -106,7 +139,10 @@ impl PackageManifest {
.iter()
// only iterate over the objects corresponding to each dependency group
.filter_map(|dependency_group| {
self.contents.extra_fields.get(dependency_group)?.as_object()
self.contents
.extra_fields
.get(dependency_group)?
.as_object()
})
// get all dependency names from all groups
.flat_map(|dependency_group_value| dependency_group_value.keys())
Expand All @@ -132,8 +168,8 @@ impl PackageManifest {
while let Some(current_manifest) = to_visit_package_manifests.pop_front() {
seen_package_names.insert(&current_manifest.contents.name);

for dependency in current_manifest
.internal_dependencies_iter(package_manifest_by_package_name)
for dependency in
current_manifest.internal_dependencies_iter(package_manifest_by_package_name)
{
internal_dependencies.insert(dependency.contents.name.to_owned());
if !seen_package_names.contains(&dependency.contents.name) {
Expand Down