Set version to 2021.06.03-0.

Author: niwinz

CHANGES.md

@@ -1,5 +1,11 @@
 # Changelog #
 
+## Version 2021.06-03-0 ##
+
+- Add `merge-scan` operator.
+- Minor improvements on `concat` and `zip` constructors.
+
+
 ## Version 2021.06.02-0 ##
 
 - Update bundled rxjs to 7.1.0

assets/rxjs/externs.js

@@ -166,6 +166,7 @@ rxjsOperators.concatAll = function() {};
 rxjsOperators.concatMap = function() {};
 rxjsOperators.concatMapTo = function() {};
 rxjsOperators.scan = function() {};
+rxjsOperators.mergeScan = function() {};
 rxjsOperators.merge = function() {};
 rxjsOperators.mergeAll = function() {};
 rxjsOperators.mergeMap = function() {};

deps.edn

@@ -2,7 +2,7 @@
  :aliases
  {:dev
   {:extra-deps
-   {org.clojure/clojurescript {:mvn/version "1.10.866"}
+   {org.clojure/clojurescript {:mvn/version "1.10.844"}
     org.clojure/clojure {:mvn/version "1.10.3"}
     com.bhauman/rebel-readline-cljs {:mvn/version "RELEASE"}
     com.bhauman/rebel-readline {:mvn/version "RELEASE"}

pom.xml

@@ -4,7 +4,7 @@
   <groupId>funcool</groupId>
   <artifactId>beicon</artifactId>
   <packaging>jar</packaging>
-  <version>2021.06.02-0</version>
+  <version>2021.06.03-0</version>
   <name>beicon</name>
   <description>Reactive Streams for Clojure(Script)</description>
   <url>https://github.com/funcool/beicon</url>

src/beicon/core.cljs

@@ -323,26 +323,23 @@
   "Merges the specified observable sequences or Promises (cljs) into one
   observable sequence."
   [& items]
-  (let [[selector items] (if (ifn? (c/first items))
-                           [(c/first items) (rest items)]
-                           [vector items])
-        items (if (vector? items) items (vec items))]
-    (apply (.-zip rx) (conj items selector))))
+  (let [zip-fn (unchecked-get rx "zip")]
+    (apply zip-fn items)))
 
 (defn concat
   "Concatenates all of the specified observable
   sequences, as long as the previous observable
   sequence terminated successfully."
   [& more]
-  (let [more (cljs.core/filter identity more)]
-    (apply (.-concat rx) more)))
+  (let [concat-fn (unchecked-get rx "concat")]
+    (apply concat-fn (c/filter some? more))))
 
 (defn merge
   "Merges all the observable sequences and Promises
   into a single observable sequence."
   [& more]
-  (let [more (cljs.core/filter identity more)]
-    (apply (.-merge rx) more)))
+  (let [merge-fn (unchecked-get rx "merge")]
+    (apply merge-fn (c/filter some? more))))
 
 (defn merge-all
   "Merges an observable sequence of observable sequences into an
@@ -465,6 +462,15 @@
   ([f ob] (pipe ob (.scan ^js rxop #(f %1 %2))))
   ([f seed ob] (pipe ob (.scan ^js rxop #(f %1 %2) seed))))
 
+(defn merge-scan
+  "Applies an accumulator function over the source Observable where
+  the accumulator function itself returns an Observable, then each
+  intermediate Observable returned is merged into the output
+  Observable."
+  [f seed ob]
+  (let [merge-scan-fn (unchecked-get rxop "mergeScan")]
+    (pipe ob (merge-scan-fn #(f %1 %2) seed))))
+
 (defn with-latest
   "Merges the specified observable sequences into one observable
   sequence by using the selector function only when the source

test/beicon/tests/test_core.cljs

@@ -169,7 +169,8 @@
     (let [s1 (s/from [1 2])
           s2 (s/from [4 5])
           s3 (s/from [7 8])
-          cs (s/zip s1 s2 s3)]
+          cs (->> (s/zip s1 s2 s3)
+                  (s/map vec))]
       (drain! cs #(t/is (= % [[1 4 7] [2 5 8]])))
       (s/on-end cs done))))
 
@@ -237,6 +238,22 @@
                      (done))))))
 
 
+(t/deftest observable-scan
+  (t/async done
+    (let [s (->> (s/from [4 5 6])
+                 (s/scan conj [1]))]
+      (drain! s #(do (t/is (= % [[1 4] [1 4 5] [1 4 5 6]]))
+                     (done))))))
+
+
+(t/deftest observable-merge-scan
+  (t/async done
+    (let [s (->> (s/from [4 5 6])
+                 (s/merge-scan (fn [acc i] (s/of (conj acc i))) [1]))]
+      (drain! s #(do (t/is (= % [[1 4] [1 4 5] [1 4 5 6]]))
+                     (done))))))
+
+
 (t/deftest observable-filter-with-ifn
   (t/async done
     (let [s (s/from [1 2 3 4 5])