Skip to content
Merged
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
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "star-setup"
version = "0.6.0"
version = "0.6.1"
edition = "2021"
repository = "https://github.com/star-setup/core"
description = "Lightweight CLI to clone, configure, and wire single or multi-repo ecosystems"
Expand Down
11 changes: 9 additions & 2 deletions src/commands/mono/mode.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
use crate::{
build::{
build_project, detect_mono_build_system, generate_dev_scripts, generate_mono_config,
generate_watch_scripts, open_scripts, BuildSystem::{self, Npm},
generate_watch_scripts, open_scripts,
BuildSystem::{self, Npm},
},
commands::{
build_repo_list,
Expand Down Expand Up @@ -166,7 +167,13 @@ fn generate_npm_scripts(
open_scripts("watch", mono_repo_path, &mut ctx.io, ctx.flags)?;
}
if !args.build.no_dev
&& generate_dev_scripts(mono_repo_path, repos_path, test_repos, &mut ctx.io, ctx.flags)?
&& generate_dev_scripts(
mono_repo_path,
repos_path,
test_repos,
&mut ctx.io,
ctx.flags,
)?
&& args.build.dev
{
open_scripts("dev", mono_repo_path, &mut ctx.io, ctx.flags)?;
Expand Down
9 changes: 7 additions & 2 deletions src/commands/mono/resolve.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
use crate::{config::Config, profile::Profile, resolve::ResolvedArgs};
use crate::{config::Config, profile::Profile, repository::repo_dir_name, resolve::ResolvedArgs};
use std::collections::HashSet;

/// Normalizes a repository input to `username/repo` format.
/// # Errors
Expand Down Expand Up @@ -54,11 +55,15 @@ pub fn resolve_test_repos_for_mono(
}
}

/// Resolves the dependency repositories for mono-repo mode from a profile or explicit list.
/// Resolves the dependency repositories for mono-repo mode from a profile or explicit list, deduplicating deps shared across test repos.
#[must_use]
pub fn resolve_dep_repos_for_mono(args: &ResolvedArgs, profile: Option<&Profile>) -> Vec<String> {
let mut seen = HashSet::new();
profile
.map(|p| p.deps.values().flatten().cloned().collect())
.or_else(|| args.mono.repos.clone())
.unwrap_or_default()
.into_iter()
.filter(|r| seen.insert(repo_dir_name(r)))
.collect()
}
25 changes: 25 additions & 0 deletions tests/commands/mono/resolve.rs
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,31 @@ fn test_resolve_test_repos_for_mono_from_profile() {
);
}

#[test]
fn test_resolve_dep_repos_for_mono_dedups_shared_deps() {
let profile = Profile {
test_repos: BTreeMap::from([
("game1".to_string(), "user/game1".to_string()),
("game2".to_string(), "user/game2".to_string()),
]),
deps: BTreeMap::from([
(
"game1".to_string(),
vec!["user/engine".to_string(), "user/audio".to_string()],
),
(
"game2".to_string(),
vec!["user/engine".to_string(), "user/ui".to_string()],
),
]),
};
let args = default_resolved();
assert_eq!(
resolve_dep_repos_for_mono(&args, Some(&profile)),
vec!["user/engine", "user/audio", "user/ui"]
);
}

#[test]
fn test_resolve_repos_for_mono_with_explicit_repos() {
let mut args = default_resolved();
Expand Down
Loading