[file_selector_web] Migrated to null-safety

packages/file_selector/file_selector_web/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 1.0.0-nullsafety.0
+
+- Migrated to null-safety
+
 # 0.7.0+1
 
 - Add dummy `ios` dir, so flutter sdk can be lower than 1.20

packages/file_selector/file_selector_web/integration_test/dom_helper_test.dart

@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// @dart = 2.9
-
 import 'dart:html';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:integration_test/integration_test.dart';
@@ -13,18 +11,18 @@ import 'package:file_selector_platform_interface/file_selector_platform_interfac
 void main() {
   group('FileSelectorWeb', () {
     IntegrationTestWidgetsFlutterBinding.ensureInitialized();
-    DomHelper domHelper;
-    FileUploadInputElement input;
+    late DomHelper domHelper;
+    FileUploadInputElement? input;
 
-    FileList FileListItems(List<File> files) {
+    FileList? FileListItems(List<File> files) {
       final dataTransfer = DataTransfer();
-      files.forEach(dataTransfer.items.add);
-      return dataTransfer.files;
+      files.forEach(dataTransfer.items!.add);
+      return dataTransfer.files as FileList?;
     }
 
     void setFilesAndTriggerChange(List<File> files) {
-      input.files = FileListItems(files);
-      input.dispatchEvent(Event('change'));
+      input!.files = FileListItems(files);
+      input!.dispatchEvent(Event('change'));
     }
 
     setUp(() {
@@ -87,17 +85,17 @@ void main() {
         bool wasClicked = false;
 
         //ignore: unawaited_futures
-        input.onClick.first.then((_) => wasClicked = true);
+        input!.onClick.first.then((_) => wasClicked = true);
 
         final futureFile = domHelper.getFiles(
           accept: accept,
           multiple: multiple,
           input: input,
         );
 
-        expect(input.matchesWithAncestors('body'), true);
-        expect(input.accept, accept);
-        expect(input.multiple, multiple);
+        expect(input!.matchesWithAncestors('body'), true);
+        expect(input!.accept, accept);
+        expect(input!.multiple, multiple);
         expect(
           wasClicked,
           true,
@@ -109,7 +107,7 @@ void main() {
         await futureFile;
 
         // It should be already removed from the DOM after the file is resolved.
-        expect(input.parent, isNull);
+        expect(input!.parent, isNull);
       });
     });
   });

packages/file_selector/file_selector_web/integration_test/file_selector_web_test.dart

@@ -2,8 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// @dart = 2.9
-
+import 'dart:html';
 import 'dart:typed_data';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mockito/mockito.dart';
@@ -15,8 +14,8 @@ import 'package:file_selector_web/src/dom_helper.dart';
 void main() {
   group('FileSelectorWeb', () {
     IntegrationTestWidgetsFlutterBinding.ensureInitialized();
-    MockDomHelper mockDomHelper;
-    FileSelectorWeb plugin;
+    late MockDomHelper mockDomHelper;
+    late FileSelectorWeb plugin;
 
     setUp(() {
       mockDomHelper = MockDomHelper();
@@ -81,7 +80,17 @@ void main() {
   });
 }
 
-class MockDomHelper extends Mock implements DomHelper {}
+class MockDomHelper extends Mock implements DomHelper {
+  @override
+  Future<List<XFile>> getFiles({
+    String accept = '',
+    bool multiple = false,
+    FileUploadInputElement? input,
+  }) {
+    return super
+        .noSuchMethod(Invocation.method(#getFiles, [accept, multiple, input]));
+  }
+}
 
 XFile createXFile(String content, String name) {
   final data = Uint8List.fromList(content.codeUnits);

packages/file_selector/file_selector_web/lib/file_selector_web.dart

@@ -13,7 +13,7 @@ import 'package:file_selector_web/src/utils.dart';
 ///
 /// This class implements the `package:file_selector` functionality for the web.
 class FileSelectorWeb extends FileSelectorPlatform {
-  final _domHelper;
+  final DomHelper _domHelper;
 
   /// Registers this class as the default instance of [FileSelectorPlatform].
   static void registerWith(Registrar registrar) {
@@ -23,46 +23,46 @@ class FileSelectorWeb extends FileSelectorPlatform {
   /// Default constructor, initializes _domHelper that we can use
   /// to interact with the DOM.
   /// overrides parameter allows for testing to override functions
-  FileSelectorWeb({@visibleForTesting DomHelper domHelper})
+  FileSelectorWeb({@visibleForTesting DomHelper? domHelper})
       : _domHelper = domHelper ?? DomHelper();
 
   @override
   Future<XFile> openFile({
-    List<XTypeGroup> acceptedTypeGroups,
-    String initialDirectory,
-    String confirmButtonText,
+    List<XTypeGroup>? acceptedTypeGroups,
+    String? initialDirectory,
+    String? confirmButtonText,
   }) async {
     final files = await _openFiles(acceptedTypeGroups: acceptedTypeGroups);
     return files.first;
   }
 
   @override
   Future<List<XFile>> openFiles({
-    List<XTypeGroup> acceptedTypeGroups,
-    String initialDirectory,
-    String confirmButtonText,
+    List<XTypeGroup>? acceptedTypeGroups,
+    String? initialDirectory,
+    String? confirmButtonText,
   }) async {
     return _openFiles(acceptedTypeGroups: acceptedTypeGroups, multiple: true);
   }
 
   @override
-  Future<String> getSavePath({
-    List<XTypeGroup> acceptedTypeGroups,
-    String initialDirectory,
-    String suggestedName,
-    String confirmButtonText,
+  Future<String?> getSavePath({
+    List<XTypeGroup>? acceptedTypeGroups,
+    String? initialDirectory,
+    String? suggestedName,
+    String? confirmButtonText,
   }) async =>
       null;
 
   @override
-  Future<String> getDirectoryPath({
-    String initialDirectory,
-    String confirmButtonText,
+  Future<String?> getDirectoryPath({
+    String? initialDirectory,
+    String? confirmButtonText,
   }) async =>
       null;
 
   Future<List<XFile>> _openFiles({
-    List<XTypeGroup> acceptedTypeGroups,
+    List<XTypeGroup>? acceptedTypeGroups,
     bool multiple = false,
   }) async {
     final accept = acceptedTypesToString(acceptedTypeGroups);

packages/file_selector/file_selector_web/lib/src/dom_helper.dart

@@ -14,15 +14,15 @@ class DomHelper {
 
   /// Default constructor, initializes the container DOM element.
   DomHelper() {
-    final body = querySelector('body');
+    final body = querySelector('body')!;
     body.children.add(_container);
   }
 
   /// Sets the <input /> attributes and waits for a file to be selected.
   Future<List<XFile>> getFiles({
     String accept = '',
     bool multiple = false,
-    @visibleForTesting FileUploadInputElement input,
+    @visibleForTesting FileUploadInputElement? input,
   }) {
     final Completer<List<XFile>> _completer = Completer();
     input = input ?? FileUploadInputElement();
@@ -34,18 +34,18 @@ class DomHelper {
     );
 
     input.onChange.first.then((_) {
-      final List<XFile> files = input.files.map(_convertFileToXFile).toList();
+      final List<XFile> files = input!.files!.map(_convertFileToXFile).toList();
       input.remove();
       _completer.complete(files);
     });
 
     input.onError.first.then((event) {
-      final ErrorEvent error = event;
+      final ErrorEvent error = event as ErrorEvent;
       final platformException = PlatformException(
         code: error.type,
         message: error.message,
       );
-      input.remove();
+      input!.remove();
       _completer.completeError(platformException);
     });
 
@@ -58,6 +58,6 @@ class DomHelper {
         Url.createObjectUrl(file),
         name: file.name,
         length: file.size,
-        lastModified: DateTime.fromMillisecondsSinceEpoch(file.lastModified),
+        lastModified: DateTime.fromMillisecondsSinceEpoch(file.lastModified!),
       );
 }

packages/file_selector/file_selector_web/lib/src/utils.dart

@@ -5,19 +5,19 @@
 import 'package:file_selector_platform_interface/file_selector_platform_interface.dart';
 
 /// Convert list of XTypeGroups to a comma-separated string
-String acceptedTypesToString(List<XTypeGroup> acceptedTypes) {
+String acceptedTypesToString(List<XTypeGroup>? acceptedTypes) {
   if (acceptedTypes == null) return '';
   final List<String> allTypes = [];
   for (final group in acceptedTypes) {
     _assertTypeGroupIsValid(group);
     if (group.extensions != null) {
-      allTypes.addAll(group.extensions.map(_normalizeExtension));
+      allTypes.addAll(group.extensions!.map(_normalizeExtension));
     }
     if (group.mimeTypes != null) {
-      allTypes.addAll(group.mimeTypes);
+      allTypes.addAll(group.mimeTypes!);
     }
     if (group.webWildCards != null) {
-      allTypes.addAll(group.webWildCards);
+      allTypes.addAll(group.webWildCards!);
     }
   }
   return allTypes.join(',');
@@ -26,9 +26,9 @@ String acceptedTypesToString(List<XTypeGroup> acceptedTypes) {
 /// Make sure that at least one of its fields is populated.
 void _assertTypeGroupIsValid(XTypeGroup group) {
   assert(
-      !((group.extensions == null || group.extensions.isEmpty) &&
-          (group.mimeTypes == null || group.mimeTypes.isEmpty) &&
-          (group.webWildCards == null || group.webWildCards.isEmpty)),
+      !((group.extensions == null || group.extensions!.isEmpty) &&
+          (group.mimeTypes == null || group.mimeTypes!.isEmpty) &&
+          (group.webWildCards == null || group.webWildCards!.isEmpty)),
       'At least one of extensions / mimeTypes / webWildCards is required for web.');
 }
 

packages/file_selector/file_selector_web/pubspec.yaml

@@ -1,7 +1,7 @@
 name: file_selector_web
 description: Web platform implementation of file_selector
 homepage: https://github.com/flutter/plugins/tree/master/packages/file_selector/file_selector_web
-version: 0.7.0+1
+version: 1.0.0-nullsafety.0
 
 flutter:
   plugin:
@@ -11,22 +11,22 @@ flutter:
         fileName: file_selector_web.dart
 
 dependencies:
-  file_selector_platform_interface: ^1.0.2
-  platform_detect: ^1.4.0
+  file_selector_platform_interface: ^2.0.0-nullsafety.0
   flutter:
     sdk: flutter
   flutter_web_plugins:
     sdk: flutter
-  meta: ^1.1.7
+  meta: ^1.3.0-nullsafety.6
 
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  mockito: ^4.1.1
-  pedantic: ^1.8.0
+  mockito: ^5.0.0-nullsafety.5
+  pedantic: ^1.10.0
   integration_test:
-    path: ../../integration_test
+    sdk: flutter
+  build_runner: ^1.10.0
 
 environment:
-  sdk: ">=2.2.0 <3.0.0"
-  flutter: ">=1.10.0"
+  sdk: '>=2.12.0-0 <3.0.0'
+  flutter: ">=1.26.0-0"

packages/file_selector/file_selector_web/test/utils_test.dart

@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// @dart = 2.9
-
 import 'package:flutter_test/flutter_test.dart';
 import 'package:file_selector_web/src/utils.dart';
 import 'package:file_selector_platform_interface/file_selector_platform_interface.dart';