Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/main/clojure/cljs/analyzer.cljc
Original file line number Diff line number Diff line change
Expand Up @@ -1220,11 +1220,13 @@
:node {:name (symbol (str current-ns)
(munge-node-lib (resolve-ns-alias env ns)))
:op :js-var
:ns current-ns}
:ns current-ns
:tag 'js}
:global {:name (symbol (str current-ns)
(munge-global-export (resolve-ns-alias env ns)))
:op :js-var
:ns current-ns})))
:ns current-ns
:tag 'js})))

(defn resolve-import
"goog.modules are deterministically assigned to a property of the namespace,
Expand Down
26 changes: 24 additions & 2 deletions src/test/clojure/cljs/externs_infer_tests.clj
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
(is (= 'js/Foo (ana/js-tag '[baz] :ret-tag externs)))))

(defn infer-test-helper
[{:keys [forms externs warnings warn js-dependency-index with-core? opts]}]
[{:keys [forms externs warnings warn js-dependency-index node-module-index with-core? opts]}]
(let [test-cenv (atom
(cond->
(if with-core?
Expand All @@ -60,7 +60,8 @@
{::ana/externs
(externs/externs-map
(closure/load-externs {:externs (or externs [])}))})
js-dependency-index (assoc :js-dependency-index js-dependency-index)))
js-dependency-index (assoc :js-dependency-index js-dependency-index)
node-module-index (assoc :node-module-index node-module-index)))
wrap (if with-core?
#(comp/with-core-cljs nil %)
#(do (%)))]
Expand Down Expand Up @@ -453,6 +454,27 @@
"Object.someProperty;"])
res)))))

(deftest test-cljs-3381
(testing "invokeable js namespaces not hinted properly"
(let [ws (atom [])
res (infer-test-helper
{:node-module-index #{"markdown-it"}
:forms '[(ns foo.core
(:require [markdown-it]))
(defonce mdi
(doto (new markdown-it
(js-obj
"linkify" true
"typographer" true))
(.renderInline mdi "hi")))]
:warnings ws
:warn true
:with-core? false
:target :nodejs})]
(is (= (unsplit-lines
["Object.renderInline;"])
res)))))

(comment
(binding [ana/*cljs-ns* ana/*cljs-ns*]
(ana/no-warn
Expand Down