depend on 0.0-3178, export everything into mori ns, cleanup

Author: dnolen

project.clj

@@ -2,7 +2,7 @@
   :description "Persistent Data Structures for JavaScript"
 
   :dependencies [[org.clojure/clojure "1.6.0"]
-                 [org.clojure/clojurescript "0.0-3169"]]
+                 [org.clojure/clojurescript "0.0-3178"]]
 
   :plugins [[lein-cljsbuild "1.0.5"]]
 

src/mori/extra.cljs

@@ -62,7 +62,7 @@
 
 (defn ^:export flatten [x]
   (cljs.core/filter #(not (sequential-or-array? %))
-    (cljs.core/rest (tree-seq sequential-or-array? seq x))))
+    (cljs.core/rest (tree-seq sequential-or-array? cljs.core/seq x))))
 
 ; The real lazy-seq is a macro, but it just expands its body into a function
 (defn ^:export lazySeq [f]
@@ -153,19 +153,19 @@
 (mori-export comp cljs.core/comp)
 
 (defn ^:export pipeline [& args]
-  (reduce #(%2 %1) args))
+  (cljs.core/reduce #(%2 %1) args))
 
 (defn ^:export curry [fun & args]
   (fn [arg]
-    (cljs.core/apply fun (cons arg args))))
+    (cljs.core/apply fun (cljs.core/cons arg args))))
 
 (defn ^:export juxt [& fns]
   (fn [& args]
-    (into-array (map #(cljs.core/apply % args) fns))))
+    (cljs.core/into-array (cljs.core/map #(cljs.core/apply % args) fns))))
 
 (defn ^:export knit [& fns]
   (fn [args]
-    (into-array (map #(% %2) fns args))))
+    (cljs.core/into-array (cljs.core/map #(% %2) fns args))))
 
 ;; Useful fns
 

src/mori/macros.clj

@@ -18,17 +18,21 @@
 (defmacro mori-export [exportf coref]
   (let [{:keys [ns name methods]} (ana-api/resolve &env coref)]
     `(do
-       (def ~(vary-meta exportf assoc :export true) ~coref)
+       (js/goog.exportSymbol ~(str "mori." (core/name exportf)) ~coref) ~(list 'js* ";")
        ~@(when-not (= 1 (count methods))
            (map
              (fn [{:keys [variadic max-fixed-arity]}]
                (if variadic
-                 `(js/goog.exportSymbol
-                    ~(str ana/*cljs-ns* "." (core/name exportf) ".fn")
-                    ~(symbol (str ns) (str (core/name name) ".cljs$core$IFn$_invoke$variadic")))
-                 `(js/goog.exportSymbol
-                    ~(str ana/*cljs-ns* "." (core/name exportf) ".f" max-fixed-arity)
-                    ~(symbol (str ns) (str (core/name name) ".cljs$core$IFn$_invoke$arity$" max-fixed-arity)))))
+                 `(do
+                    (js/goog.exportSymbol
+                      ~(str "mori." (core/name exportf) ".fn")
+                      ~(symbol (str ns) (str (core/name name) ".cljs$core$IFn$_invoke$variadic")))
+                    ~(list 'js* ";"))
+                 `(do
+                    (js/goog.exportSymbol
+                     ~(str "mori." (core/name exportf) ".f" max-fixed-arity)
+                     ~(symbol (str ns) (str (core/name name) ".cljs$core$IFn$_invoke$arity$" max-fixed-arity)))
+                    ~(list 'js* ";"))))
              methods)))))
 
 (comment