Skip to content
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.

Sign up for GitHub

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

Remove blacklistPatterns #3594

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

Remove blacklistPatterns #3594

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
36a44fc
Remove blacklistPatterns
natebosch Sep 1, 2023
9454718
Unused import
natebosch Oct 6, 2023
210a8f3
Reformat
natebosch Oct 6, 2023
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
3 changes: 1 addition & 2 deletions build_daemon/example/example.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,7 @@ void main(List<String> args) async {
..outputLocation = OutputLocation((b) => b
..output = 'web_output'
..useSymlinks = false
..hoist = true).toBuilder()
..blackListPatterns.replace([RegExp(r'.*_test\.dart$')])));
..hoist = true).toBuilder()));
print('Registered example web target...');
} else {
client.registerBuildTarget(DefaultBuildTarget((b) => b
Expand Down
5 changes: 0 additions & 5 deletions build_daemon/lib/data/build_target.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,6 @@ abstract class DefaultBuildTarget

DefaultBuildTarget._();

/// A set of file path patterns to match changes against.
///
/// If a change matches a pattern this target will not be built.
BuiltSet<RegExp> get blackListPatterns;

OutputLocation? get outputLocation;

/// A set of globs patterns for files to build.
Expand Down
30 changes: 1 addition & 29 deletions build_daemon/lib/data/build_target.g.dart
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions build_daemon/lib/data/serializers.g.dart
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 1 addition & 6 deletions build_daemon/lib/src/managers/build_target_manager.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,8 @@ import 'package:web_socket_channel/web_socket_channel.dart';

import '../../data/build_target.dart';

bool _isBlacklistedPath(String filePath, Set<RegExp> blackListedPatterns) =>
blackListedPatterns.any((pattern) => filePath.contains(pattern));

bool _shouldBuild(BuildTarget target, Iterable<WatchEvent> changes) =>
target is DefaultBuildTarget &&
changes.any((change) =>
!_isBlacklistedPath(change.path, target.blackListPatterns.toSet()));
target is DefaultBuildTarget;

/// Manages the set of build targets, and corresponding listeners, tracked by
/// the Dart Build Daemon.
Expand Down
44 changes: 3 additions & 41 deletions build_daemon/test/managers/build_target_manager_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import 'package:build_daemon/data/build_target.dart';
import 'package:build_daemon/src/managers/build_target_manager.dart';
import 'package:mockito/mockito.dart';
import 'package:test/test.dart';
import 'package:watcher/watcher.dart';
import 'package:web_socket_channel/web_socket_channel.dart';

void main() {
Expand Down Expand Up @@ -78,53 +77,16 @@ void main() {
expect(manager.targets.isEmpty, isTrue);
});

test(
'a build target will be reused if the target and the blackListPattern '
'is the same', () {
var manager = BuildTargetManager();
var channelA = DummyChannel();
var channelB = DummyChannel();
var targetA = DefaultBuildTarget((b) => b
..target = 'foo'
..blackListPatterns.replace([RegExp('bar')]));
var targetB = DefaultBuildTarget((b) => b
..target = 'foo'
..blackListPatterns.replace([RegExp('bar')]));
manager
..addBuildTarget(targetA, channelA)
..addBuildTarget(targetB, channelB);
expect(manager.targets.length, 1);
});

test('different blackListPatterns result in different build targets', () {
test('a build target will be reused if the target is the same', () {
var manager = BuildTargetManager();
var channelA = DummyChannel();
var channelB = DummyChannel();
var targetA = DefaultBuildTarget((b) => b..target = 'foo');
var targetB = DefaultBuildTarget((b) => b
..target = 'foo'
..blackListPatterns.replace([RegExp('bar')]));
var targetB = DefaultBuildTarget((b) => b..target = 'foo');
manager
..addBuildTarget(targetA, channelA)
..addBuildTarget(targetB, channelB);
expect(manager.targets.length, 2);
});

test(
'correctly uses the blackListPattern to filter build targets for changes',
() {
var manager = BuildTargetManager();
var channel = DummyChannel();
var target = DefaultBuildTarget((b) => b
..target = 'foo'
..blackListPatterns.replace([RegExp(r'.*_test\.dart$')]));
manager.addBuildTarget(target, channel);
var targets = manager.targetsForChanges(
[WatchEvent(ChangeType.ADD, 'foo/bar/blah/some_file.dart')]);
expect(targets.map((target) => target.target), contains('foo'));
targets = manager.targetsForChanges(
[WatchEvent(ChangeType.ADD, 'foo/bar/blah/some_test.dart')]);
expect(targets.isEmpty, isTrue);
expect(manager.targets.length, 1);
});
}

Expand Down