fork cljss to fix race condition

- theres no need for an atom to track state if we just pass the class
through in a functional implementation

Author: lwhorton

project.clj

@@ -1,7 +1,16 @@
-(defproject org.roman01la/cljss "1.6.3"
+(defproject com.verypossible/cljss "1.6.4"
   :description "Clojure Style Sheets"
 
-  :url "https://github.com/roman01la/cljss"
+  :repositories [
+                 ["releases" {:url "https://clojars.org"
+                              :sign-releases false
+                              :username :env/clojars_username
+                              :password :env/clojars_password}]
+                 ["snapshots" {:url "https://clojars.org"
+                               :sign-releases false}]
+                 ]
+
+  :url "https://github.com/verypossible/cljss"
 
   :license {:name "Eclipse Public License"
             :url  "http://www.eclipse.org/legal/epl-v10.html"}

src/cljss/builder.clj

@@ -8,12 +8,11 @@
        (map? value)))
 
 (defn build-styles [cls styles]
-  (c/reset-env! {:cls cls})
   (let [pseudo  (filterv utils/pseudo? styles)
         nested  (->> styles
                      (filterv (comp not utils/pseudo?))
                      (filterv utils/nested?))
-        [mstatic mvals] (some-> styles :cljss.core/media build-media)
+        [mstatic mvals] (some-> styles :cljss.core/media ((partial build-media cls)))
         styles  (dissoc styles :cljss.core/media)
         styles  (filterv #(and (not (utils/pseudo? %)) (not (utils/nested? %))) styles)
         [static vals] (c/collect-styles cls styles)

src/cljss/collect.clj

@@ -1,12 +1,6 @@
 (ns cljss.collect
   (:require [cljss.utils :refer [build-css]]))
 
-(def env* (atom {:id  0
-                 :cls nil}))
-
-(defn reset-env! [v]
-  (reset! env* (merge {:id 0 :cls nil} v)))
-
 (defn dynamic? [[_ value]]
   (not (or (string? value)
            (number? value))))
@@ -15,16 +9,14 @@
   [rule (str "--var-" cls "-" idx)])
 
 (defn collect-styles [cls styles]
-  (let [id      (:cls @env*)
-        dynamic (filterv dynamic? styles)
+  (let [dynamic (filterv dynamic? styles)
         static  (filterv (comp not dynamic?) styles)
-        vars
+        [vars _]
                 (reduce
-                  (fn [vars ds]
-                    (let [ret (conj vars (varid id (:id @env*) ds))]
-                      (swap! env* update :id inc)
-                      ret))
-                  []
+                  (fn [[vars idx] ds]
+                    (let [ret (conj vars (varid cls idx ds))]
+                      [ret (inc idx)]))
+                  [[] 0]
                   dynamic)
         vals    (mapv (fn [[_ var] [_ exp]] [var exp]) vars dynamic)
         static  (->> vars

src/cljss/media.clj

@@ -234,44 +234,43 @@
          (clojure.string/join " ")
          (str "@media "))))
 
-(defn compile-media-dispatch [styles]
+(defn compile-media-dispatch [styles _]
   (cond
     (contains? styles :media) :media
     (contains? styles :styles) :styles))
 
 (defmulti compile-media #'compile-media-dispatch)
 
-(defmethod compile-media :media [{media :media}]
+(defmethod compile-media :media [{media :media} cls]
   (->> (seq media)
        (reduce
          (fn [[sstyles svalues] [query styles]]
-           (let [[static values] (compile-media {:styles styles})
+           (let [[static values] (compile-media {:styles styles} cls)
                  query (-compile-media-query query)]
              [(str sstyles query static) (concat svalues values)]))
          ["" []])))
 
-(defmethod compile-media :styles [{styles :styles}]
+(defmethod compile-media :styles [{styles :styles} cls]
   (let [pseudo (filterv utils/pseudo? styles)
         pstyles (->> pseudo
                      (reduce
                        (fn [coll [rule styles]]
-                         (conj coll (c/collect-styles (str (:cls @c/env*) (subs (name rule) 1)) styles)))
+                         (conj coll (c/collect-styles (str cls (subs (name rule) 1)) styles)))
                        []))
         styles (filterv (comp not utils/pseudo?) styles)
-        [static values] (c/collect-styles (:cls @c/env*) styles)
+        [static values] (c/collect-styles cls styles)
         values (->> pstyles
                     (mapcat second)
                     (into values))]
     [(str "{" (apply str static (map first pstyles)) "}")
      values]))
 
-(defn build-media [styles]
-  (compile-media {:media styles}))
+(defn build-media [cls styles]
+  (compile-media {:media styles} cls))
 
 (comment
-  (c/reset-env! {:cls "class"})
-
   (build-media
+    "class"
     {[[:only :screen :and [:min-width "300px"]]
       [:print :and [:color]]]
      {:font-size 'p