splitting into modules wip

Author: dnolen

project.clj

@@ -1,46 +1,40 @@
-(defproject mori "0.3.2"
+(defproject mori "0.5.0-SNAPSHOT"
   :description "Persistent Data Structures for JavaScript"
 
   :dependencies [[org.clojure/clojure "1.6.0"]
-                 [org.clojure/clojurescript "0.0-2665"]]
+                 [org.clojure/clojurescript "0.0-3169"]]
 
-  :plugins [[lein-cljsbuild "1.0.4"]
-            [cider/cider-nrepl "0.8.1"]]
+  :plugins [[lein-cljsbuild "1.0.5"]]
 
-  :clean-targets ["out-mori-dev/"
-                  "out-mori-adv/"
-                  "out-bonsai-adv/"
-                  "mori.js" "mori.bare.js"
-                  "bonsai.js" "bonsai.bare.js"]
+  :clean-targets ["dev" "release" "target"]
 
   :cljsbuild
   {:builds
     [;; mori
-     {:source-paths ["src/mori"],
+     {:source-paths ["src"],
       :id "dev",
       :compiler
-      {:output-to "mori.dev.js",
-       :output-dir "out-mori-dev"
-       :optimizations :simple
+      {:output-to      "dev/mori.dev.js",
+       :output-dir     "dev/"
+       :optimizations  :simple
        :cache-analysis true
        :output-wrapper false
-       :pretty-print true}}
+       :pretty-print   true}}
 
-     {:source-paths ["src/mori"],
-      :id "release",
+     {:source-paths ["src"],
+      :id "release"
       :compiler
-      {:output-to "mori.bare.js",
-       :output-dir "out-mori-adv"
-       :optimizations :advanced
+      {:optimizations  :advanced
+       :output-dir     "release"
        :output-wrapper false
-       :pretty-print false}}
-
-     ;; bonsai
-     {:source-paths ["src/bonsai"],
-      :id "bonsai-release",
-      :compiler
-      {:output-to "bonsai.bare.js",
-       :output-dir "out-bonsai-adv"
-       :optimizations :advanced
-       :output-wrapper false
-       :pretty-print false}}]})
+       :pretty-print   false
+       :modules
+       {:cljs-base {:output-to "release/build/mori.base.js"}
+        :mori      {:entries #{mori}
+                    :output-to "release/build/mori.core.js"}
+        :mutable   {:entries #{mori.mutable}
+                    :depends-on #{:mori}
+                    :output-to "release/build/mori.mutable.js"}
+        :extra     {:entries #{mori.extra}
+                    :depends-on #{:mori}
+                    :output-to "release/build/mori.extra.js"}}}}]})

src/extra/mori/chain.cljs renamed to resources/chain.cljs

@@ -0,0 +1,40 @@
+(ns mori
+  (: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]))
+
+(mori-export count cljs.core/count)
+(mori-export empty cljs.core/empty)
+(mori-export conj cljs.core/conj)
+(mori-export find cljs.core/find)
+(mori-export nth cljs.core/nth)
+(mori-export assoc cljs.core/assoc)
+(mori-export dissoc cljs.core/dissoc)
+(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)
+(mori-export compare cljs.core/compare)
+

src/bonsai/core.cljs

@@ -1,66 +1,48 @@
-(ns mori
+(ns mori.extra
   (:refer-clojure :exclude
-   [count distinct empty first second next rest seq conj cons find nth last assoc dissoc
-    get-in update-in assoc-in fnil disj pop peek hash get empty? reverse
+   [distinct first second next rest seq cons last
+    get-in update-in assoc-in fnil
     take drop take-nth partition partition-all partition-by iterate
-    into merge merge-with subvec
+    merge-with
     take-while drop-while group-by
     interpose interleave concat flatten
-    keys select-keys vals
     prim-seq lazy-seq keep keep-indexed
-    map mapcat map-indexed reduce reduce-kv filter remove some every? equiv
+    map mapcat map-indexed reduce reduce-kv filter remove some every?
     transduce eduction sequence dedupe completing
-    range repeat repeatedly sort sort-by
-    into-array
+    repeat repeatedly
     partial comp juxt
     identity constantly
-    list vector vec array-map hash-map zipmap set sorted-set keyword symbol
+    zipmap sorted-set keyword symbol
     sorted-set-by sorted-map sorted-map-by
-    sum inc dec even? odd? subseq compare
+    sum inc dec even? odd? subseq
     meta with-meta vary-meta
     apply])
-  (:use-macros [mori.macros :only [make-inspectable mori-export]])
+  (:require-macros
+   [mori.macros :refer [mori-export make-inspectable]])
   (:require [clojure.set :as set]))
 
 (mori-export apply cljs.core/apply)
-(mori-export count cljs.core/count)
 (mori-export distinct cljs.core/distinct)
-(mori-export empty cljs.core/empty)
 (mori-export first cljs.core/first)
 (mori-export second cljs.core/second)
 (mori-export next cljs.core/next)
 (mori-export rest cljs.core/rest)
 (mori-export seq cljs.core/seq)
-(mori-export conj cljs.core/conj)
 (mori-export cons cljs.core/cons)
-(mori-export find cljs.core/find)
-(mori-export nth cljs.core/nth)
 (mori-export last cljs.core/last)
-(mori-export assoc cljs.core/assoc)
-(mori-export dissoc cljs.core/dissoc)
 (mori-export getIn cljs.core/get-in)
 (mori-export updateIn cljs.core/update-in)
 (mori-export assocIn cljs.core/assoc-in)
 (mori-export fnil cljs.core/fnil)
-(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 hasKey cljs.core/contains?)
-(mori-export isEmpty cljs.core/empty?)
-(mori-export reverse cljs.core/reverse)
 (mori-export take cljs.core/take)
 (mori-export drop cljs.core/drop)
 (mori-export takeNth cljs.core/take-nth)
 (mori-export partition cljs.core/partition)
 (mori-export partitionAll cljs.core/partition-all)
 (mori-export partitionBy cljs.core/partition-by)
 (mori-export iterate cljs.core/iterate)
-(mori-export into cljs.core/into)
-(mori-export merge cljs.core/merge)
 (mori-export mergeWith cljs.core/merge-with)
-(mori-export subvec cljs.core/subvec)
 (mori-export takeWhile cljs.core/take-while)
 (mori-export dropWhile cljs.core/drop-while)
 (mori-export groupBy cljs.core/group-by)
@@ -80,9 +62,6 @@
 (defn ^:export lazySeq [f]
   (new cljs.core/LazySeq nil f nil nil))
 
-(mori-export keys cljs.core/keys)
-(mori-export selectKeys cljs.core/select-keys)
-(mori-export vals cljs.core/vals)
 (mori-export primSeq cljs.core/prim-seq)
 (mori-export map cljs.core/map)
 (mori-export mapIndexed cljs.core/map-indexed)
@@ -96,12 +75,8 @@
 (mori-export some cljs.core/some)
 (mori-export every cljs.core/every?)
 (mori-export equals cljs.core/=)
-(mori-export range cljs.core/range)
 (mori-export repeat cljs.core/repeat)
 (mori-export repeatedly cljs.core/repeatedly)
-(mori-export sort cljs.core/sort)
-(mori-export sortBy cljs.core/sort-by)
-(mori-export intoArray cljs.core/into-array)
 (mori-export subseq cljs.core/subseq)
 (mori-export dedupe cljs.core/dedupe)
 
@@ -114,12 +89,6 @@
 
 ;; constructors
 
-(mori-export list cljs.core/list)
-(mori-export vector cljs.core/vector)
-(mori-export vec cljs.core/vec)
-(mori-export hashMap cljs.core/array-map)
-
-(mori-export set cljs.core/set)
 (mori-export sortedSet cljs.core/sorted-set)
 (mori-export sortedSetBy cljs.core/sorted-set-by)
 (mori-export sortedMap cljs.core/sorted-map)
@@ -171,7 +140,6 @@
 (mori-export gte cljs.core/>=)
 (mori-export lt cljs.core/<)
 (mori-export lte cljs.core/<=)
-(mori-export compare cljs.core/compare)
 
 ;; HOFs
 
@@ -187,11 +155,11 @@
 
 (defn ^:export juxt [& fns]
   (fn [& args]
-    (intoArray (map #(cljs.core/apply % args) fns))))
+    (into-array (map #(cljs.core/apply % args) fns))))
 
 (defn ^:export knit [& fns]
   (fn [args]
-    (intoArray (map #(% %2) fns args))))
+    (into-array (map #(% %2) fns args))))
 
 ;; Useful fns