Skip to content

Commit 89cd5ec

Browse files
committed
CLJS-2076: modules should support wildcard namespaces
1 parent 4b68cf2 commit 89cd5ec

1 file changed

Lines changed: 18 additions & 8 deletions

File tree

src/main/clojure/cljs/closure.clj

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1087,14 +1087,24 @@
10871087
)
10881088

10891089
(defn find-entries [sources entry]
1090-
#{(some
1091-
(fn [source]
1092-
(let [matcher
1093-
(into #{}
1094-
[(name entry) (name (comp/munge entry))])]
1095-
(when (some matcher (:provides source))
1096-
source)))
1097-
sources)})
1090+
(let [m (name (comp/munge entry))
1091+
xs (string/split m #"\.")]
1092+
(if (= "_STAR_" (last xs))
1093+
(let [matcher (str (string/join "." (butlast xs)) ".")]
1094+
(into #{}
1095+
(filter
1096+
(fn [source]
1097+
(when (some #(.startsWith ^String % matcher) (:provides source))
1098+
source)))
1099+
sources))
1100+
#{(some
1101+
(fn [source]
1102+
(let [matcher
1103+
(into #{}
1104+
[(name entry) (name (comp/munge entry))])]
1105+
(when (some matcher (:provides source))
1106+
source)))
1107+
sources)})))
10981108

10991109
(defn build-modules
11001110
"Given a list of IJavaScript sources in dependency order and compiler options

0 commit comments

Comments
 (0)