Remove reader conditional block in query-builder

Add support for handling times in CLJS in parse-arg

Relates to apa512#65

Author: danielcompton

src/rethinkdb/query_builder.cljc

@@ -9,51 +9,50 @@
    ::args args
    ::optargs optargs})
 
-#?(:clj
-   (do
-     (declare parse-term)
-
-     (defn snake-case-keys [m]
-       (into {}
-         (for [[k v] m]
-           [(snake-case k) v])))
-
-     (defmulti parse-arg
-       (fn [arg]
-         (cond
-           (::term arg) :query
-           (or (sequential? arg) (seq? arg)) :sequential
-           (map? arg) :map
-           (= (type arg) #?(:clj org.joda.time.DateTime :cljs js/Date)) :time
-           (= (type arg) #?(:clj java.util.UUID :cljs UUID)) :uuid)))
-
-     (defmethod parse-arg :query [arg]
-       (parse-term arg))
-
-     (defmethod parse-arg :sequential [arg]
-       (parse-term (term :MAKE_ARRAY arg)))
-
-     (defmethod parse-arg :map [arg]
-       (zipmap (keys arg) (map parse-arg (vals arg))))
-
-     (defmethod parse-arg :time [arg]
-       (parse-term (term :EPOCH_TIME [(c/to-epoch arg)])))
-
-     (defmethod parse-arg :uuid [arg]
-       (str arg))
-
-     (defmethod parse-arg :default [arg]
-       arg)
-
-     (defn parse-term [{term ::term args ::args optargs ::optargs}]
-       (filter
-         identity
-         [(tt->int term)
-          (map parse-arg (seq args))
-          (if optargs (snake-case-keys optargs))]))
-
-     (defn parse-query
-       ([type]
-        [(qt->int type)])
-       ([type term]
-        [(qt->int type) (parse-term term)]))))
+(declare parse-term)
+
+(defn snake-case-keys [m]
+  (into {}
+    (for [[k v] m]
+      [(snake-case k) v])))
+
+(defmulti parse-arg
+  (fn [arg]
+    (cond
+      (::term arg) :query
+      (or (sequential? arg) (seq? arg)) :sequential
+      (map? arg) :map
+      (= (type arg) #?(:clj org.joda.time.DateTime :cljs js/Date)) :time
+      (= (type arg) #?(:clj java.util.UUID :cljs UUID)) :uuid)))
+
+(defmethod parse-arg :query [arg]
+  (parse-term arg))
+
+(defmethod parse-arg :sequential [arg]
+  (parse-term (term :MAKE_ARRAY arg)))
+
+(defmethod parse-arg :map [arg]
+  (zipmap (keys arg) (map parse-arg (vals arg))))
+
+(defmethod parse-arg :time [arg]
+  (parse-term (term :EPOCH_TIME [#?(:clj (c/to-epoch arg)
+                                    :cljs (.getTime arg))])))
+
+(defmethod parse-arg :uuid [arg]
+  (str arg))
+
+(defmethod parse-arg :default [arg]
+  arg)
+
+(defn parse-term [{term ::term args ::args optargs ::optargs}]
+  (filter
+    identity
+    [(tt->int term)
+     (map parse-arg (seq args))
+     (if optargs (snake-case-keys optargs))]))
+
+(defn parse-query
+  ([type]
+   [(qt->int type)])
+  ([type term]
+   [(qt->int type) (parse-term term)]))