tweaks, reintroduce the reader

Author: dnolen

project.clj

@@ -28,13 +28,11 @@
        :output-dir     "release"
        :output-wrapper false
        :pretty-print   false
+       :verbose        true
        :modules
-       {:cljs-base {:output-to "release/build/mori.base.js"}
-        :mori      {:entries #{mori}
-                    :output-to "release/build/mori.core.js"}
+       {:cljs-base {:entries #{cljs.core mori}
+                    :output-to "release/build/mori.base.js"}
         :mutable   {:entries #{mori.mutable}
-                    :depends-on #{:mori}
                     :output-to "release/build/mori.mutable.js"}
-        :extra     {:entries #{mori.extra}
-                    :depends-on #{:mori}
+        :extra     {:entries #{cljs.reader clojure.set mori.extra}
                     :output-to "release/build/mori.extra.js"}}}}]})

src/mori.cljs

@@ -2,10 +2,10 @@
   (:require-macros
    [mori.macros :refer [mori-export]])
   (:refer-clojure :exclude
-   [count empty conj find nth assoc dissoc disj pop peek hash get
-    empty? reverse into merge subvec keys select-keys vals
-    equiv range sort sort-by into-array
-    list vector array-map hash-map set compare]))
+   [count empty conj find nth assoc dissoc disj pop peek get
+    empty? reverse into merge subvec keys vals
+    equiv sort sort-by
+    vector array-map hash-map set compare]))
 
 (mori-export count cljs.core/count)
 (mori-export empty cljs.core/empty)
@@ -17,22 +17,17 @@
 (mori-export disj cljs.core/disj)
 (mori-export pop cljs.core/pop)
 (mori-export peek cljs.core/peek)
-(mori-export hash cljs.core/hash)
 (mori-export get cljs.core/get)
 (mori-export isEmpty cljs.core/empty?)
 (mori-export reverse cljs.core/reverse)
 (mori-export into cljs.core/into)
 (mori-export merge cljs.core/merge)
 (mori-export subvec cljs.core/subvec)
 (mori-export keys cljs.core/keys)
-(mori-export selectKeys cljs.core/select-keys)
 (mori-export vals cljs.core/vals)
 (mori-export equiv cljs.core/==)
-(mori-export range cljs.core/range)
 (mori-export sort cljs.core/sort)
 (mori-export sortBy cljs.core/sort-by)
-(mori-export intoArray cljs.core/into-array)
-(mori-export list cljs.core/list)
 (mori-export vector cljs.core/vector)
 (mori-export hashMap cljs.core/array-map)
 (mori-export set cljs.core/set)

src/mori/extra.cljs

@@ -16,11 +16,17 @@
     sorted-set-by sorted-map sorted-map-by
     sum inc dec even? odd? subseq
     meta with-meta vary-meta
-    apply])
+    apply hash select-keys into-array list range])
   (:require-macros
    [mori.macros :refer [mori-export make-inspectable]])
-  (:require [clojure.set :as set]))
-
+  (:require [clojure.set :as set]
+            [cljs.reader :as reader]))
+
+(mori-export range cljs.core/range)
+(mori-export list cljs.core/list)
+(mori-export intoArray cljs.core/into-array)
+(mori-export selectKeys cljs.core/select-keys)
+(mori-export hash cljs.core/hash)
 (mori-export apply cljs.core/apply)
 (mori-export distinct cljs.core/distinct)
 (mori-export first cljs.core/first)
@@ -192,6 +198,8 @@
 (mori-export alterMeta cljs.core/alter-meta!)
 (mori-export resetMeta cljs.core/reset-meta!)
 
+(mori-export parse reader/read-string)
+
 ;; =============================================================================
 ;; Node.js Inspection support