fix multi-path + val collection and minor problem in if-path

src/clj/com/rpl/specter.cljx

@@ -672,18 +672,25 @@
   "A path that branches on multiple paths. For updates,
    applies updates to the paths in order."
   [& paths]
-  (variable-pathed-nav [compiled-paths paths]
+  (let [paths-comp (mapv i/comp-paths* (vec paths))
-    (select* [this structure next-fn]
+        all-needed (mapv i/num-needed-params paths-comp)
-      (doseqres NONE [c compiled-paths]
+        idx-deltas (vec (cons 0 (reductions + all-needed)))
-        (i/compiled-traverse* c next-fn structure)
+        extracted (mapv i/extract-rich-tfns paths-comp)
-        ))
+        sel-info (mapv vector (mapv first extracted) idx-deltas)
-    (transform* [this structure next-fn]
+        tran-info (mapv vector (mapv second extracted) idx-deltas)]
-      (reduce
+    (richnav (reduce + 0 all-needed)
-        (fn [structure path]
+      (select* [params params-idx vals structure next-fn]
-          (compiled-transform path next-fn structure))
+        (doseqres NONE [[s delta] sel-info]
-        structure
+          (s params (+ params-idx delta) vals structure next-fn)
-        compiled-paths
+          ))
-        ))))
+      (transform* [params params-idx vals structure next-fn]
+        (reduce
+          (fn [structure [t delta]]
+            (t params (+ params-idx delta) vals structure next-fn)
+            )
+          structure
+          tran-info
+          )))))
 
 (defpathedfn stay-then-continue
   "Navigates to the current element and then navigates via the provided path.

src/clj/com/rpl/specter/impl.cljx

@@ -1095,7 +1095,7 @@
         tran (if test?
                then-t
                else-t)
-        idx (if test? params-idx then-params)]
+        idx (if test? params-idx (+ params-idx then-params))]
     (tran params
           idx
           vals
@@ -1507,3 +1507,8 @@
     [(:selector tfns) (:transformer tfns)]
     ))
 
+(defn mk-jump-next-fn [next-fn init-idx total-params]
+  (let [jumped (+ init-idx total-params)]
+    (fn [params params-idx vals structure]
+      (next-fn params jumped vals structure)
+      )))

src/clj/com/rpl/specter/macros.clj

@@ -130,15 +130,25 @@
    the next params index, the collected vals, and finally the next structure.
    This is the lowest level way of making navigators."
   [num-params impl1 impl2]
-  (let [[select-impl transform-impl] (determine-params-impls impl1 impl2)]
+  (let [[[s-params & s-body] [t-params & t-body]] (determine-params-impls impl1 impl2)
-    `(let [tfns# (i/->TransformFunctions
+        s-next-fn-sym (last s-params)
+        s-pidx-sym (second s-params)
+        t-next-fn-sym (last t-params)
+        t-pidx-sym (second t-params)
+        ]
+    `(let [num-params# ~num-params
+           tfns# (i/->TransformFunctions
                    i/RichPathExecutor
-                   (fn ~@select-impl)
+                   (fn ~s-params 
-                   (fn ~@transform-impl)
+                     (let [~s-next-fn-sym (i/mk-jump-next-fn ~s-next-fn-sym ~s-pidx-sym num-params#)]
+                       ~@s-body))
+                   (fn ~t-params
+                     (let [~t-next-fn-sym (i/mk-jump-next-fn ~t-next-fn-sym ~t-pidx-sym num-params#)]
+                       ~@t-body))
                    )]
-      (if (zero? ~num-params)
+      (if (zero? num-params#)
         (i/no-params-compiled-path tfns#)
-        (i/->ParamsNeededPath tfns# ~num-params)
+        (i/->ParamsNeededPath tfns# num-params#)
         ))))
 
 (defmacro paramsfn [params [structure-sym] & impl]

test/com/rpl/specter/core_test.cljx

@@ -373,11 +373,11 @@
   (is (empty? (select (s/if-path odd? (s/view inc)) 2)))
   (is (= [6 2 10 6 14]
          (transform [(s/putval 2)
-                  s/ALL
+                     s/ALL
-                  (s/if-path odd? [(s/view inc) (s/view inc)] (s/view dec))]
+                    (s/if-path odd? [(s/view inc) (s/view inc)] (s/view dec))]
-                  *
+                    *
-                  [1 2 3 4 5]
+                    [1 2 3 4 5]
-                     )))
+                    )))
   (is (= 2
          (transform [(s/putval 2)
                   (s/if-path odd? (s/view inc))]