fix broken pseudo/nested

- turns out the env* had a lot more hidden context
- fixed incorrect classnames being bandied about

Author: lwhorton

src/cljss/builder.clj

@@ -13,19 +13,22 @@
         nested (->> styles
                     (filterv (comp not utils/pseudo?))
                     (filterv utils/nested?))
-        [mstatic mvals rule-index] (some-> styles :cljss.core/media ((partial build-media cls rule-index)))
+        [mstatic mvals mrule-index] (some-> styles :cljss.core/media ((partial build-media cls rule-index)))
+        rule-index (or mrule-index rule-index)
         styles (dissoc styles :cljss.core/media)
         styles (filterv #(and (not (utils/pseudo? %)) (not (utils/nested? %))) styles)
 
         [static vals rule-index] (c/collect-styles cls styles rule-index)
         [pstyles rule-index] (c/collect-dynamic-styles
                                rule-index
                                pseudo
-                               (fn [rule] (str cls (subs (name rule) 1))))
+                               cls
+                               (fn [rule] (subs (name rule) 1)))
         [nstyles rule-index] (c/collect-dynamic-styles
                                rule-index
                                nested
-                               (fn [rule] (str cls " " rule)))
+                               cls
+                               (fn [rule] (str " " rule)))
 
         vals (->> pstyles
                   (mapcat second)

src/cljss/collect.clj

@@ -8,35 +8,33 @@
 (defn varid [cls idx [rule]]
   [rule (str "--var-" cls "-" idx)])
 
-(defn collect-styles [cls styles rule-index]
-  (let [dynamic (filterv dynamic? styles)
-        static  (filterv (comp not dynamic?) styles)
-        [vars rule-index] (reduce
-                            (fn [[vars idx] ds]
-                              (let [ret (conj vars (varid cls idx ds))]
-                                [ret (inc idx)]))
-                            [[] rule-index]
-                            dynamic)
-        _ (println "static" static)
-        _ (println "vars" vars)
-        _ (println "dynamic" dynamic)
-        vals    (mapv (fn [[_ var] [_ exp]] [var exp]) vars dynamic)
-        _ (println "vals" vals)
-        static  (->> vars
-                     (map (fn [[rule var]] [rule (str "var(" var ")")]))
-                     (concat static)
-                     (build-css cls))]
-    [static vals rule-index]))
+(defn collect-styles
+  ([cls styles rule-index] (collect-styles cls styles rule-index nil))
+  ([cls styles rule-index tail-class]
+   (let [dynamic (filterv dynamic? styles)
+         static  (filterv (comp not dynamic?) styles)
+         [vars rule-index] (reduce
+                             (fn [[vars idx] ds]
+                               (let [ret (conj vars (varid cls idx ds))]
+                                 [ret (inc idx)]))
+                             [[] rule-index]
+                             dynamic)
+         vals    (mapv (fn [[_ var] [_ exp]] [var exp]) vars dynamic)
+         static  (->> vars
+                      (map (fn [[rule var]] [rule (str "var(" var ")")]))
+                      (concat static)
+                      (build-css (str cls tail-class)))]
+     [static vals rule-index])))
 
-(defn collect-dynamic-styles [rule-index rules class-generator]
+(defn collect-dynamic-styles [rule-index rules cls tail-class-g]
   (loop
     [idx rule-index
      acc []
      coll rules]
     (if (not (seq coll))
       [acc idx]
       (let [[rule styles] (first coll)
-            [static vals nxt-idx] (collect-styles (class-generator rule) styles idx)]
+            [static vals nxt-idx] (collect-styles cls styles idx (tail-class-g rule))]
         (recur nxt-idx
                (conj acc [static vals])
                (rest coll))))))

src/cljss/media.clj

@@ -252,7 +252,7 @@
 
 (defmethod compile-media :styles [{styles :styles} cls rule-index]
   (let [pseudo (filterv utils/pseudo? styles)
-        [pstyles rule-index] (c/collect-dynamic-styles rule-index pseudo (fn [rule] (str cls (subs (name rule) 1))))
+        [pstyles rule-index] (c/collect-dynamic-styles rule-index pseudo cls (fn [rule] (subs (name rule) 1)))
 
         styles (filterv (comp not utils/pseudo?) styles)
         [static values rule-index] (c/collect-styles cls styles rule-index)