#23: cleanup up most of AOT cljs warnings.. [still have some]

.gitignore

@@ -7,6 +7,7 @@ pom.xml.asc
 dev/resources/public/js/*
 figwheel_server.log
 build.xml
+doo-index.html
 *.jar
 *.class
 /.lein-*

project.clj

@@ -10,7 +10,7 @@
   
   :profiles {:dev {:source-paths ["dev" "dev/clj"]
                    :dependencies [[org.clojure/clojure "1.7.0"]
-                                  [org.clojure/clojurescript "1.7.170"]
+                                  [org.clojure/clojurescript "1.7.170"]; :classifier "aot"]
                                   [datascript "0.13.3"]
                                   [hiccups "0.3.0"]
                                   [com.andrewmcveigh/cljs-time "0.3.14"]

src/mount/core.cljc

@@ -1,9 +1,8 @@
 (ns mount.core
   #?(:clj (:require [mount.tools.macro :refer [on-error throw-runtime] :as macro])
-     :cljs (:require [mount.tools.macro :as macro]
+     :cljs (:require [mount.tools.macro :as macro]))
-                     [mount.tools.cljs :as cljs]))
+  #?(:cljs (:require-macros [mount.core]
-  #?(:cljs (:require-macros [mount.tools.macro :refer [on-error throw-runtime]]
+                            [mount.tools.macro :refer [on-error throw-runtime]])))
-                            [mount.core :refer [defstate]])))
 
 (defonce ^:private -args (atom :no-args))                  ;; mostly for command line args and external files
 (defonce ^:private state-seq (atom 0))
@@ -36,8 +35,7 @@
 
 (defn- pounded? [f]
   (let [pound "(fn* [] "]          ;;TODO: think of a better (i.e. typed) way to distinguish #(f params) from (fn [params] (...)))
-    #?(:clj (.startsWith (str f) pound)
+    (.startsWith (str f) pound)))
-       :cljs (cljs/starts-with? (str f) pound))))
 
 (defn unpound [f]
   (if (pounded? f)
@@ -128,6 +126,7 @@
         (up name state (atom #{})))
       @inst)))
 
+#?(:clj
   (defmacro defstate [state & body]
     (let [[state params] (macro/name-with-attributes state body)
           {:keys [start stop suspend resume] :as lifecycle} (apply hash-map params)
@@ -146,7 +145,7 @@
            (def ~state (DerefableState. ~state-name))
            ((var update-meta!) [~state-name] (assoc ~s-meta :inst (atom (NotStartedState. ~state-name)) 
                                                             :var (var ~state)))
-         (var ~state)))))
+           (var ~state))))))
 
 (defn in-cljc-mode []
   (reset! mode :cljc))
@@ -182,7 +181,7 @@
 
 #?(:cljs
     (defn var-to-str [v]
-      (if (var? v)
+      (if (instance? cljs.core.Var v)
         (let [{:keys [ns name]} (meta v)]
           (with-ns ns name))
         v)))

src/mount/tools/cljs.cljs

@@ -1,9 +0,0 @@
-(ns mount.tools.cljs
-  (:require [cljs.analyzer :as ana]
-            [goog.string :as gstring]))
-
-(defn this-ns [] 
-  ana/*cljs-ns*)
-
-(defn starts-with? [s pre]
-  (gstring/startsWith s pre))

src/mount/tools/macro.cljc

@@ -1,16 +1,19 @@
-(ns mount.tools.macro)
+(ns mount.tools.macro
+  #?(:cljs (:require-macros [mount.tools.macro])))
 
+#?(:clj
   (defmacro on-error [msg f]
     `(try
        ~f
        (catch #?(:clj Throwable
                  :cljs :default) t#
          (throw #?(:clj (RuntimeException. ~msg t#)
-                 :cljs (js/Error (str ~msg (.-stack t#))))))))
+                   :cljs (js/Error (str ~msg (.-stack t#)))))))))
 
+#?(:clj
   (defmacro throw-runtime [msg]
     `(throw #?(:clj (RuntimeException. ~msg)
-             :cljs (js/Error (str ~msg)))))
+               :cljs (js/Error (str ~msg))))))
 
 ;; this is a one to one copy from https://github.com/clojure/tools.macro
 ;; to avoid a lib dependency for a single function