prepare 0.0.2

Author: hoc081098

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.0.2 - Jan 12, 2021
+
+-   Internal refactor
+
 ## 0.0.1 - Dec 15, 2020
 
 -   Initial version.

README.md

@@ -7,6 +7,9 @@
 [![codecov](https://codecov.io/gh/Flutter-Dart-Open-Source/listenable_stream/branch/master/graph/badge.svg?token=6eORcR6Web)](https://codecov.io/gh/Flutter-Dart-Open-Source/listenable_stream)
 [![Flutter Tests](https://github.com/Flutter-Dart-Open-Source/listenable_stream/workflows/Flutter%20Tests/badge.svg)](https://github.com/Flutter-Dart-Open-Source/listenable_stream.git)
 
+- [x] `Listenable` ▶ `Stream<Listenable>`
+- [x] `ValueListenable<T>` ▶ `ValueStream<T>`
+
 ## Listenable.toStream()
 ```dart
 final ChangeNotifier changeNotifier = ChangeNotifier();

lib/src/common.dart

@@ -0,0 +1,44 @@
+import 'dart:async';
+
+import 'package:flutter/foundation.dart' show Listenable, VoidCallback;
+
+/// @private
+/// Convert this [Listenable] to a [Stream].
+Stream<R> toStreamWithTransform<T extends Listenable, R>(
+  T listenable,
+  R Function(T) transform,
+) {
+  StreamController<R> controller;
+  VoidCallback listener;
+
+  final onListenOrOnResume = () {
+    try {
+      listenable
+          .addListener(listener = () => controller.add(transform(listenable)));
+    } catch (_ /*Ignore*/) {
+      controller.close();
+    }
+  };
+
+  final createOnPauseOrOnCancel = ([bool closeOnError = false]) {
+    return () {
+      try {
+        listenable.removeListener(listener);
+        listener = null;
+      } catch (_ /*Ignore*/) {
+        if (identical(closeOnError, true)) {
+          controller.close();
+        }
+      }
+    };
+  };
+
+  controller = StreamController<R>(
+    onListen: onListenOrOnResume,
+    onPause: createOnPauseOrOnCancel(true),
+    onResume: onListenOrOnResume,
+    onCancel: createOnPauseOrOnCancel(),
+  );
+
+  return controller.stream;
+}

lib/src/listenable_to_stream.dart

@@ -1,28 +1,11 @@
 import 'dart:async';
 
-import 'package:flutter/foundation.dart' show Listenable, VoidCallback;
+import 'package:flutter/foundation.dart' show Listenable;
+
+import 'common.dart';
 
 /// Convert this [Listenable] to a [Stream].
 extension ListenableToStream<T extends Listenable> on T {
   /// Convert this [Listenable] to a [Stream].
-  Stream<T> toStream() {
-    StreamController<T> controller;
-    VoidCallback listener;
-
-    controller = StreamController<T>(
-      sync: true,
-      onListen: () {
-        listener = () => controller.add(this);
-        addListener(listener);
-      },
-      onCancel: () {
-        try {
-          removeListener(listener);
-          listener = null;
-        } catch (_ /*Ignore*/) {}
-      },
-    );
-
-    return controller.stream;
-  }
+  Stream<T> toStream() => toStreamWithTransform<T, T>(this, (t) => t);
 }

lib/src/value_listenable_to_value_stream.dart

@@ -3,9 +3,14 @@ import 'dart:async' show Stream, StreamSubscription;
 import 'package:flutter/foundation.dart' show ValueListenable;
 import 'package:rxdart/rxdart.dart' show ErrorAndStackTrace, ValueStream;
 
-import 'listenable_to_stream.dart';
+import 'common.dart';
 import 'streamx.dart';
 
+extension _ValueListenableToStreamExtension<T> on ValueListenable<T> {
+  Stream<T> toStream() =>
+      toStreamWithTransform<ValueListenable<T>, T>(this, (l) => l.value);
+}
+
 /// Convert this [ValueListenable] to a [ValueStream].
 /// The returned [ValueStream] is a Single-Subscription [Stream].
 ///
@@ -52,12 +57,11 @@ class ValueListenableStream<T> extends Stream<T> implements ValueStream<T> {
     void Function() onDone,
     bool cancelOnError,
   }) {
-    final getValue = ([void _]) => _valueListenable.value;
-
     if (_replayValue) {
-      _stream ??= _valueListenable.toStream().map(getValue).startWith(getValue);
+      _stream ??=
+          _valueListenable.toStream().startWith(() => _valueListenable.value);
     } else {
-      _stream ??= _valueListenable.toStream().map(getValue);
+      _stream ??= _valueListenable.toStream();
     }
 
     return _stream.listen(

pubspec.yaml

@@ -1,6 +1,6 @@
 name: listenable_stream
 description: Convert Listenable (eg. ChangeNotifier), ValueListenable(eg. ValueNotifier) to Stream / ValueStream.
-version: 0.0.1
+version: 0.0.2
 author: Petrus Nguyễn Thái Học <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