fix(aft): Include/exclude for aft version-bump

Author: Dillon Nys

packages/aft/lib/src/commands/version_bump_command.dart

@@ -29,6 +29,21 @@ class VersionBumpCommand extends AmplifyCommand
         help: 'Responds "yes" to all prompts',
         defaultsTo: false,
         negatable: false,
+      )
+      ..addFlag(
+        'force-breaking',
+        help: 'Forces a major version bump',
+        negatable: false,
+      )
+      ..addFlag(
+        'force-non-breaking',
+        help: 'Forces a minor version bump',
+        negatable: false,
+      )
+      ..addFlag(
+        'force-patch',
+        help: 'Forces a patch version bump',
+        negatable: false,
       );
   }
 
@@ -43,6 +58,16 @@ class VersionBumpCommand extends AmplifyCommand
 
   late final bool preview = argResults!['preview'] as bool;
 
+  late final VersionBumpType? forcedBumpType = () {
+    final forceBreaking = argResults!['force-breaking'] as bool;
+    if (forceBreaking) return VersionBumpType.breaking;
+    final forceNonBreaking = argResults!['force-non-breaking'] as bool;
+    if (forceNonBreaking) return VersionBumpType.nonBreaking;
+    final forcePatch = argResults!['force-patch'] as bool;
+    if (forcePatch) return VersionBumpType.patch;
+    return null;
+  }();
+
   GitChanges _changesForPackage(PackageInfo package) {
     final baseRef = this.baseRef ?? repo.latestBumpRef(package);
     if (baseRef == null) {
@@ -56,12 +81,14 @@ class VersionBumpCommand extends AmplifyCommand
 
   Future<List<PackageInfo>> _updateVersions() async {
     repo.bumpAllVersions(
+      commandPackages,
       changesForPackage: _changesForPackage,
+      forcedBumpType: forcedBumpType,
     );
     final changelogUpdates = repo.changelogUpdates;
 
     final bumpedPackages = <PackageInfo>[];
-    for (final package in commandPackages.values) {
+    for (final package in repo.publishablePackages()) {
       final edits = package.pubspecInfo.pubspecYamlEditor.edits;
       if (edits.isNotEmpty) {
         bumpedPackages.add(package);
@@ -121,7 +148,7 @@ class VersionBumpCommand extends AmplifyCommand
     logger.info('Version successfully bumped');
     // Stage changes
     final publishableBumpedPackages =
-        bumpedPackages.where((pkg) => pkg.isPublishable).toList();
+        commandPackages.values.where((pkg) => pkg.isPublishable).toList();
     final mergedChangelog = Changelog.empty().makeVersionEntry(
       commits: {
         for (final package in publishableBumpedPackages)

packages/aft/lib/src/repo.dart

@@ -221,14 +221,17 @@ class Repo {
   final Map<PackageInfo, ChangelogUpdate> changelogUpdates = {};
 
   /// Bumps the version for all packages in the repo.
-  void bumpAllVersions({
+  void bumpAllVersions(
+    Map<String, PackageInfo> packages, {
     required GitChanges Function(PackageInfo) changesForPackage,
+    VersionBumpType? forcedBumpType,
   }) {
-    final sortedPackages = List.of(publishablePackages());
+    final sortedPackages = List.of(publishablePackages(packages));
     sortPackagesTopologically(
       sortedPackages,
       (PackageInfo pkg) => pkg.pubspecInfo.pubspec,
     );
+    bool canBump(PackageInfo package) => packages.containsKey(package.name);
     for (final package in sortedPackages) {
       final changes = changesForPackage(package);
       final commits = (changes.commitsByPackage[package]?.toList() ?? const [])
@@ -237,12 +240,13 @@ class Repo {
         if (commit.type == CommitType.version) {
           continue;
         }
-        final bumpType = commit.bumpType;
+        final bumpType = forcedBumpType ?? commit.bumpType;
         if (bumpType != null) {
           bumpVersion(
             package,
             commit: commit,
             type: bumpType,
+            canBump: canBump,
             includeInChangelog: commit.includeInChangelog,
           );
         }
@@ -272,6 +276,7 @@ class Repo {
     PackageInfo package, {
     required CommitMessage commit,
     required VersionBumpType type,
+    required bool Function(PackageInfo) canBump,
     required bool includeInChangelog,
     bool? propagateToComponent,
   }) {
@@ -344,11 +349,12 @@ class Repo {
                   .contains(package.name),
         )) {
           logger.verbose('found dependent package ${dependent.name}');
-          if (dependent.isPublishable) {
+          if (dependent.isPublishable && canBump(dependent)) {
             bumpVersion(
               dependent,
               commit: commit,
               type: VersionBumpType.patch,
+              canBump: canBump,
               includeInChangelog: false,
             );
           }
@@ -364,14 +370,17 @@ class Repo {
             return MapEntry(allPackages[name]!, dependents);
           }),
           (componentPackage) {
-            if (componentPackage == package) return;
+            if (componentPackage == package || !canBump(componentPackage)) {
+              return;
+            }
             logger.verbose(
               'Bumping component package ${componentPackage.name}',
             );
             bumpVersion(
               componentPackage,
               commit: commit,
               type: type,
+              canBump: canBump,
               includeInChangelog: false,
               propagateToComponent: false,
             );

packages/aft/test/e2e_test.dart

@@ -469,6 +469,7 @@ environment:
 
         setUp(() async {
           repo.bumpAllVersions(
+            repo.allPackages,
             changesForPackage: (pkg) => changesForPackage(
               pkg.name,
               baseRef: baseRef,