danog/dart-sass
1
0
Fork 0
mirror of https://github.com/danog/dart-sass.git synced 2024-11-30 04:39:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Debounce watch events on all platforms (#354)

Browse Source 
This doesn't flake as often on Dart as it does on Node, but it does
flake.
This commit is contained in:
Natalie Weizenbaum 2018-06-14 16:12:16 -07:00 committed by GitHub
parent c0a3f9d3fb
commit e0c6268efd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lib/src/executable/watch.dart
View File

@ -6,6 +6,7 @@ import 'dart:async';
import 'dart:collection';
import 'package:stack_trace/stack_trace.dart';
import 'package:stream_transform/stream_transform.dart';
import 'package:watcher/watcher.dart';
import '../exception.dart';
@ -104,7 +105,7 @@ class _Watcher {
/// Returns a future that will only complete if an unexpected error occurs.
Future watch(MultiDirWatcher watcher) async {
loop:
await for (var event in watcher.events) {
await for (var event in _debounceEvents(watcher.events)) {
var extension = p.extension(event.path);
if (extension != '.sass' && extension != '.scss') continue;
var url = p.toUri(p.canonicalize(event.path));
@ -148,6 +149,31 @@ class _Watcher {
}
}
/// Combine [WatchEvent]s that happen in quick succession.
///
/// Otherwise, if a file is erased and then rewritten, we can end up reading
/// the intermediate erased version.
Stream<WatchEvent> _debounceEvents(Stream<WatchEvent> events) {
return events
.transform(debounceBuffer(new Duration(milliseconds: 25)))
.expand((buffer) {
var typeForPath = new PathMap<ChangeType>();
for (var event in buffer) {
var oldType = typeForPath[event.path];
if (oldType == null) {
typeForPath[event.path] = event.type;
} else if (event.type == ChangeType.REMOVE) {
typeForPath[event.path] = ChangeType.REMOVE;
} else if (oldType != ChangeType.ADD) {
typeForPath[event.path] = ChangeType.MODIFY;
}
}
return typeForPath.keys
.map((path) => new WatchEvent(typeForPath[path], path));
});
}
/// Recompiles [nodes] and everything that transitively imports them, if
/// necessary.
Future _recompileDownstream(Iterable<StylesheetNode> nodes) async {

24
lib/src/io/node.dart
View File

@ -8,7 +8,6 @@ import 'dart:convert';
import 'package:dart2_constant/convert.dart' as convert;
import 'package:js/js.dart';
import 'package:source_span/source_span.dart';
import 'package:stream_transform/stream_transform.dart';
import 'package:watcher/watcher.dart';
import '../exception.dart';
@ -266,28 +265,7 @@ Future<Stream<WatchEvent>> watchDir(String path) {
var completer = new Completer<Stream<WatchEvent>>();
watcher.on('ready', allowInterop(() {
controller = new StreamController<WatchEvent>();
// Buffer events that happen in quick succession because otherwise, if a
// file is erased and then rewritten, we can end up reading the intermediate
// erased version.
completer.complete(controller.stream
.transform(debounceBuffer(new Duration(milliseconds: 25)))
.expand((buffer) {
var typeForPath = new PathMap<ChangeType>();
for (var event in buffer) {
var oldType = typeForPath[event.path];
if (oldType == null) {
typeForPath[event.path] = event.type;
} else if (event.type == ChangeType.REMOVE) {
typeForPath[event.path] = ChangeType.REMOVE;
} else if (oldType != ChangeType.ADD) {
typeForPath[event.path] = ChangeType.MODIFY;
}
}
return typeForPath.keys
.map((path) => new WatchEvent(typeForPath[path], path));
}));
completer.complete(controller.stream);
}));
return completer.future;