Merge pull request #3 from Flutter-Dart-Open-Source/1.1.0 [skip ci]

1.1.0

Author: hoc081098

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.1.0 - May 9, 2021
+
+-   Update `rxdart` to `0.27.0`.
+
 ## 1.0.0 - Apr 02, 2021
 
 -   Stable release for null safety.

example/pubspec.lock

@@ -73,7 +73,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "1.0.0"
+    version: "1.1.0"
   matcher:
     dependency: transitive
     description:
@@ -108,7 +108,7 @@ packages:
       name: rxdart
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.26.0"
+    version: "0.27.0"
   sky_engine:
     dependency: transitive
     description: flutter

lib/src/value_listenable_to_value_stream.dart

@@ -1,7 +1,7 @@
 import 'dart:async' show Stream, StreamSubscription;
 
 import 'package:flutter/foundation.dart' show ValueListenable;
-import 'package:rxdart/rxdart.dart' show ValueStream, ValueWrapper;
+import 'package:rxdart/rxdart.dart' show ValueStream, ValueStreamError;
 
 import 'common.dart';
 import 'streamx.dart';
@@ -61,8 +61,23 @@ class ValueListenableStream<T> extends Stream<T> implements ValueStream<T> {
   bool get isBroadcast => false;
 
   @override
-  Null get errorAndStackTrace => null;
+  Never get error => throw ValueStreamError.hasNoError();
 
   @override
-  ValueWrapper<T> get valueWrapper => ValueWrapper(_valueListenable.value);
+  Null get errorOrNull => null;
+
+  @override
+  bool get hasError => false;
+
+  @override
+  Null get stackTrace => null;
+
+  @override
+  bool get hasValue => true;
+
+  @override
+  T get value => _valueListenable.value;
+
+  @override
+  T get valueOrNull => _valueListenable.value;
 }

pubspec.lock

@@ -94,7 +94,7 @@ packages:
       name: rxdart
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.26.0"
+    version: "0.27.0"
   sky_engine:
     dependency: transitive
     description: flutter

pubspec.yaml

@@ -1,6 +1,6 @@
 name: listenable_stream
 description: Convert Listenable (eg. ChangeNotifier), ValueListenable(eg. ValueNotifier) to Stream / ValueStream.
-version: 1.0.0
+version: 1.1.0
 author: Petrus Nguyen Thai Hoc <hoc081098@gmail.com>
 homepage: https://github.com/Flutter-Dart-Open-Source/listenable_stream.git
 repository: https://github.com/Flutter-Dart-Open-Source/listenable_stream.git
@@ -11,7 +11,7 @@ environment:
   flutter: '>=1.17.0'
 
 dependencies:
-  rxdart: ^0.26.0
+  rxdart: ^0.27.0
   flutter:
     sdk: flutter
 

test/listenable_stream_test.dart

@@ -3,7 +3,6 @@ import 'dart:async';
 import 'package:flutter/foundation.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:listenable_stream/listenable_stream.dart';
-import 'package:rxdart/rxdart.dart';
 
 // ignore_for_file: invalid_use_of_protected_member
 
@@ -105,6 +104,8 @@ void main() {
       final stream = valueNotifier.toValueStream();
 
       expect(stream.value, 0);
+      expect(stream.valueOrNull, 0);
+      expect(stream.hasValue, isTrue);
       expect(
         stream,
         emitsInOrder([1, 2, 3]),
@@ -120,7 +121,9 @@ void main() {
       final valueNotifier = ValueNotifier(0);
       final stream = valueNotifier.toValueStream(replayValue: true);
 
-      expect(stream.requireValue, 0);
+      expect(stream.value, 0);
+      expect(stream.valueOrNull, 0);
+      expect(stream.hasValue, isTrue);
       expect(
         stream,
         emitsInOrder([0, 1, 2, 3]),
@@ -299,15 +302,23 @@ void main() {
     });
 
     test('Has no error', () {
+      final notReplay = () => ValueNotifier(0).toValueStream();
       expect(
-        () => ValueNotifier(0).toValueStream().requireError,
+        () => notReplay().error,
         throwsA(anything),
       );
+      expect(notReplay().errorOrNull, isNull);
+      expect(notReplay().stackTrace, isNull);
+      expect(notReplay().hasError, isFalse);
 
+      final replay = () => ValueNotifier(0).toValueStream(replayValue: true);
       expect(
-        () => ValueNotifier(0).toValueStream(replayValue: true).requireError,
+        () => replay().error,
         throwsA(anything),
       );
+      expect(replay().errorOrNull, isNull);
+      expect(replay().stackTrace, isNull);
+      expect(replay().hasError, isFalse);
     });
   });
 }