V1.2.0 beta02 (#4)

* rxdart master * 1.2.0-beta02
hoc081098 · Dec 7, 2020 · 0ae7814 · 0ae7814
1 parent b231a61
commit 0ae7814
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 21 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/lib/src/distinct_value_connectable_stream.dart b/lib/src/distinct_value_connectable_stream.dart
@@ -1,7 +1,7 @@
 import 'dart:async';
 
-import 'package:rxdart/streams.dart'
-    show ConnectableStream, ConnectableStreamSubscription;
+import 'package:rxdart/rxdart.dart'
+    show ConnectableStream, ConnectableStreamSubscription, ErrorAndStackTrace;
 
 import 'distinct_value_stream.dart';
 import 'value_subject.dart';
@@ -103,7 +103,7 @@ class DistinctValueConnectableStream<T> extends ConnectableStream<T>
   T get value => _subject.value;
 
   @override
-  Object get error => _subject.error;
+  ErrorAndStackTrace get errorAndStackTrace => _subject.errorAndStackTrace;
 
   @override
   bool get hasError => _subject.hasError;

diff --git a/lib/src/value_subject.dart b/lib/src/value_subject.dart
@@ -1,21 +1,21 @@
 import 'dart:async';
 
-import 'package:rxdart/streams.dart' show ValueStream, ErrorAndStacktrace;
-import 'package:rxdart/subjects.dart' show Subject, PublishSubject;
+import 'package:rxdart/rxdart.dart'
+    show ValueStream, ErrorAndStackTrace, Subject, PublishSubject;
 
 enum _Event { data, error }
 
 class _DataOrError<T> {
   _Event event;
   T value;
-  ErrorAndStacktrace errorAndStacktrace;
+  ErrorAndStackTrace error;
 
   _DataOrError.data(this.value)
       : event = _Event.data,
-        errorAndStacktrace = null;
+        error = null;
 
-  void onError(ErrorAndStacktrace errorAndStacktrace) {
-    this.errorAndStacktrace = errorAndStacktrace;
+  void onError(ErrorAndStackTrace error) {
+    this.error = error;
     event = _Event.error;
   }
 
@@ -85,7 +85,7 @@ class ValueSubject<T> extends Subject<T> implements ValueStream<T> {
 
   @override
   void onAddError(Object error, [StackTrace stackTrace]) =>
-      _dataOrError.onError(ErrorAndStacktrace(error, stackTrace));
+      _dataOrError.onError(ErrorAndStackTrace(error, stackTrace));
 
   @override
   bool get hasValue => _dataOrError.event == _Event.data;
@@ -94,7 +94,7 @@ class ValueSubject<T> extends Subject<T> implements ValueStream<T> {
   T get value => _dataOrError.value;
 
   @override
-  Object get error => _dataOrError.errorAndStacktrace?.error;
+  ErrorAndStackTrace get errorAndStackTrace => _dataOrError.error;
 
   @override
   bool get hasError => _dataOrError.event == _Event.error;

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,13 +1,13 @@
 name: distinct_value_connectable_stream
 description: Distinct value connectable stream for RxDart, useful for BLoC pattern
-version: 1.2.0-beta01
+version: 1.2.0-beta02
 homepage: https://github.com/hoc081098/distinct_value_connectable_stream
 
 environment:
   sdk: '>=2.9.0 <3.0.0'
 
 dependencies:
-  rxdart: '>=0.25.0-beta3 <0.26.0'
+  rxdart: ^0.25.0
   meta: ^1.1.8
 
 dev_dependencies:

diff --git a/test/value_subject_test.dart b/test/value_subject_test.dart
@@ -281,7 +281,7 @@ void main() {
       void test(int expectedValue) {
         expect(subject.value, expectedValue);
         expect(subject.hasValue, isTrue);
-        expect(subject.error, isNull);
+        expect(subject.errorAndStackTrace?.error, isNull);
         expect(subject.hasError, isFalse);
       }
 
@@ -299,7 +299,7 @@ void main() {
       void test(int expectedError) {
         expect(subject.value, 0);
         expect(subject.hasValue, isFalse);
-        expect(subject.error, expectedError);
+        expect(subject.errorAndStackTrace?.error, expectedError);
         expect(subject.hasError, isTrue);
       }