|
26 | 26 | (filter |
27 | 27 | (fn [source] |
28 | 28 | (when (some #(.startsWith ^String % matcher) |
29 | | - (map (comp str munge) (:provides source))) |
| 29 | + (map (comp str comp/munge) (:provides source))) |
30 | 30 | source))) |
31 | 31 | sources)] |
32 | 32 | (when-not (empty? matches) |
|
36 | 36 | (let [matcher |
37 | 37 | (into #{} |
38 | 38 | [(name entry) (name (comp/munge entry))])] |
39 | | - (when (some matcher (map (comp str munge) (:provides source))) |
| 39 | + (when (some matcher (map (comp str comp/munge) (:provides source))) |
40 | 40 | source))) |
41 | 41 | sources)] |
42 | 42 | #{input})))) |
|
51 | 51 | (fn [ret module-name module] |
52 | 52 | (assoc ret module-name |
53 | 53 | (update module :entries |
54 | | - (fn [es] (into #{} (map (comp str munge)) es))))) |
| 54 | + (fn [es] (into #{} (map (comp str comp/munge)) es))))) |
55 | 55 | {} modules)) |
56 | 56 |
|
57 | 57 | (defn add-cljs-base |
|
104 | 104 | (map |
105 | 105 | (fn [provide] |
106 | 106 | (vector |
107 | | - (-> provide munge str) |
| 107 | + (-> provide comp/munge str) |
108 | 108 | (-> input |
109 | | - (update :provides #(into [] (map (comp str munge)) %)) |
110 | | - (update :requires #(into [] (map (comp str munge)) %)))))) |
| 109 | + (update :provides #(into [] (map (comp str comp/munge)) %)) |
| 110 | + (update :requires #(into [] (map (comp str comp/munge)) %)))))) |
111 | 111 | provides)) |
112 | 112 | {} inputs)) |
113 | 113 |
|
|
121 | 121 | (defn deps-for-entry |
122 | 122 | "Return all dependencies for an entry using a compiler inputs index." |
123 | 123 | [entry indexed-inputs] |
124 | | - (map #(-> % munge str) (deps-for entry indexed-inputs :requires))) |
| 124 | + (map #(-> % comp/munge str) (deps-for entry indexed-inputs :requires))) |
125 | 125 |
|
126 | 126 | (defn deps-for-module |
127 | 127 | "Return all dependencies of a module using compiler :modules." |
|
199 | 199 | (into {} (map assign1) d->ms) |
200 | 200 | (into {} (map assign1) e->ms)) |
201 | 201 | orphans (zipmap |
202 | | - (map (comp str munge first :provides) |
| 202 | + (map (comp str comp/munge first :provides) |
203 | 203 | (-> (reduce-kv (fn [m k _] (dissoc m k)) index assigned) |
204 | 204 | vals set)) |
205 | 205 | (repeat :cljs-base))] |
|
213 | 213 | (reduce |
214 | 214 | (fn [[ret n] {:keys [provides]}] |
215 | 215 | [(merge ret |
216 | | - (zipmap (map (comp str munge) provides) (repeat n))) |
| 216 | + (zipmap (map (comp str comp/munge) provides) (repeat n))) |
217 | 217 | (inc n)]) |
218 | 218 | [{} 0] inputs)) |
219 | 219 | modules' (-> modules normalize add-cljs-base add-cljs-base-dep) |
|
348 | 348 | "Given an entry find the module it belongs to." |
349 | 349 | [entry modules] |
350 | 350 | (let [modules' (normalize modules) |
351 | | - entry' (str (munge entry))] |
| 351 | + entry' (str (comp/munge entry))] |
352 | 352 | (->> modules' |
353 | 353 | (some |
354 | 354 | (fn [[module-name {:keys [entries]} :as me]] |
|
0 commit comments