Remove unnecessary ConstructableFileSystemEvent classes (dart-lang/wa…

…tcher#143)

pkgs/watcher/.github/workflows/test-package.yml

@@ -46,7 +46,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        sdk: [2.19.0, dev]
+        sdk: [3.0.0, dev]
     steps:
       - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
       - uses: dart-lang/setup-dart@d6a63dab3335f427404425de0fbfed4686d93c4f

pkgs/watcher/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.1.0-dev
+
+- Require Dart SDK >= 3.0.0
+- Remove usage of redundant ConstructableFileSystemEvent classes.
+- 
 ## 1.0.3-dev
 
 - Require Dart SDK >= 2.19

pkgs/watcher/lib/src/directory_watcher/mac_os.dart

@@ -7,7 +7,6 @@ import 'dart:io';
 
 import 'package:path/path.dart' as p;
 
-import '../constructable_file_system_event.dart';
 import '../directory_watcher.dart';
 import '../path_set.dart';
 import '../resubscribable.dart';
@@ -285,12 +284,11 @@ class _MacOSDirectoryWatcher
         // [_eventsBasedOnFileSystem] will handle this correctly by producing a
         // DELETE event followed by a CREATE event if the directory exists.
         if (isDir) return null;
-        return ConstructableFileSystemCreateEvent(batch.first.path, false);
+        return FileSystemCreateEvent(batch.first.path, false);
       case FileSystemEvent.delete:
-        return ConstructableFileSystemDeleteEvent(batch.first.path, isDir);
+        return FileSystemDeleteEvent(batch.first.path, isDir);
       case FileSystemEvent.modify:
-        return ConstructableFileSystemModifyEvent(
-            batch.first.path, isDir, false);
+        return FileSystemModifyEvent(batch.first.path, isDir, false);
       default:
         throw StateError('unreachable');
     }
@@ -312,26 +310,26 @@ class _MacOSDirectoryWatcher
     var events = <FileSystemEvent>[];
     if (fileExisted) {
       if (fileExists) {
-        events.add(ConstructableFileSystemModifyEvent(path, false, false));
+        events.add(FileSystemModifyEvent(path, false, false));
       } else {
-        events.add(ConstructableFileSystemDeleteEvent(path, false));
+        events.add(FileSystemDeleteEvent(path, false));
       }
     } else if (dirExisted) {
       if (dirExists) {
         // If we got contradictory events for a directory that used to exist and
         // still exists, we need to rescan the whole thing in case it was
         // replaced with a different directory.
-        events.add(ConstructableFileSystemDeleteEvent(path, true));
-        events.add(ConstructableFileSystemCreateEvent(path, true));
+        events.add(FileSystemDeleteEvent(path, true));
+        events.add(FileSystemCreateEvent(path, true));
       } else {
-        events.add(ConstructableFileSystemDeleteEvent(path, true));
+        events.add(FileSystemDeleteEvent(path, true));
       }
     }
 
     if (!fileExisted && fileExists) {
-      events.add(ConstructableFileSystemCreateEvent(path, false));
+      events.add(FileSystemCreateEvent(path, false));
     } else if (!dirExisted && dirExists) {
-      events.add(ConstructableFileSystemCreateEvent(path, true));
+      events.add(FileSystemCreateEvent(path, true));
     }
 
     return events;

pkgs/watcher/lib/src/directory_watcher/windows.dart

@@ -9,7 +9,6 @@ import 'dart:io';
 
 import 'package:path/path.dart' as p;
 
-import '../constructable_file_system_event.dart';
 import '../directory_watcher.dart';
 import '../path_set.dart';
 import '../resubscribable.dart';
@@ -306,12 +305,11 @@ class _WindowsDirectoryWatcher
 
     switch (type) {
       case FileSystemEvent.create:
-        return ConstructableFileSystemCreateEvent(batch.first.path, isDir);
+        return FileSystemCreateEvent(batch.first.path, isDir);
       case FileSystemEvent.delete:
-        return ConstructableFileSystemDeleteEvent(batch.first.path, isDir);
+        return FileSystemDeleteEvent(batch.first.path, isDir);
       case FileSystemEvent.modify:
-        return ConstructableFileSystemModifyEvent(
-            batch.first.path, isDir, false);
+        return FileSystemModifyEvent(batch.first.path, isDir, false);
       case FileSystemEvent.move:
         return null;
       default:
@@ -342,26 +340,26 @@ class _WindowsDirectoryWatcher
     var events = <FileSystemEvent>[];
     if (fileExisted) {
       if (fileExists) {
-        events.add(ConstructableFileSystemModifyEvent(path, false, false));
+        events.add(FileSystemModifyEvent(path, false, false));
       } else {
-        events.add(ConstructableFileSystemDeleteEvent(path, false));
+        events.add(FileSystemDeleteEvent(path, false));
       }
     } else if (dirExisted) {
       if (dirExists) {
         // If we got contradictory events for a directory that used to exist and
         // still exists, we need to rescan the whole thing in case it was
         // replaced with a different directory.
-        events.add(ConstructableFileSystemDeleteEvent(path, true));
-        events.add(ConstructableFileSystemCreateEvent(path, true));
+        events.add(FileSystemDeleteEvent(path, true));
+        events.add(FileSystemCreateEvent(path, true));
       } else {
-        events.add(ConstructableFileSystemDeleteEvent(path, true));
+        events.add(FileSystemDeleteEvent(path, true));
       }
     }
 
     if (!fileExisted && fileExists) {
-      events.add(ConstructableFileSystemCreateEvent(path, false));
+      events.add(FileSystemCreateEvent(path, false));
     } else if (!dirExisted && dirExists) {
-      events.add(ConstructableFileSystemCreateEvent(path, true));
+      events.add(FileSystemCreateEvent(path, true));
     }
 
     return events;

pkgs/watcher/pubspec.yaml

@@ -1,12 +1,12 @@
 name: watcher
-version: 1.0.3-dev
+version: 1.1.0-dev
 description: >-
   A file system watcher. It monitors changes to contents of directories and
   sends notifications when files have been added, removed, or modified.
 repository: https://github.com/dart-lang/watcher
 
 environment:
-  sdk: '>=2.19.0 <3.0.0'
+  sdk: ^3.0.0
 
 dependencies:
   async: ^2.5.0