Merge remote-tracking branch 'origin/HEAD' into changelog_cleanup

dart-lang · Nov 22, 2023 · b747047 · b747047
2 parents 84dafa6 + 4cb5811
commit b747047
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,8 @@
 ## 0.4.1-wip
 
 - Add an example.
+- `helpers.dart`:
+  - Added event extensions for `WebSocket`
 
 ## 0.4.0
 

diff --git a/analysis_options.yaml b/analysis_options.yaml
@@ -18,8 +18,6 @@ linter:
   - avoid_bool_literals_in_conditional_expressions
   - avoid_private_typedef_functions
   - avoid_redundant_argument_values
-  - avoid_returning_null
-  - avoid_returning_null_for_future
   - avoid_returning_this
   - avoid_unused_constructor_parameters
   - cancel_subscriptions

diff --git a/lib/src/helpers/events/events.dart b/lib/src/helpers/events/events.dart
@@ -289,3 +289,13 @@ extension WindowCustomEvents on Window {
   Stream<TransitionEvent> get onTransitionEnd =>
       CustomEventProviders.transitionEndEvent.forTarget(this);
 }
+
+extension WebSocketEvents on WebSocket {
+  Stream<Event> get onOpen => EventStreamProviders.openEvent.forTarget(this);
+  Stream<MessageEvent> get onMessage =>
+      EventStreamProviders.messageEvent.forTarget(this);
+  Stream<CloseEvent> get onClose =>
+      EventStreamProviders.closeEvent.forTarget(this);
+  Stream<Event> get onError =>
+      EventStreamProviders.errorEventSourceEvent.forTarget(this);
+}
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -6,7 +6,7 @@ version: 0.4.1-wip
 repository: https://github.com/dart-lang/web
 
 environment:
-  sdk: ">=3.2.0-194.0.dev <4.0.0"
+  sdk: ^3.2.0
 
 dev_dependencies:
   analyzer: ^6.2.0