Merge branch 'cljs-2767'

Author: dnolen

src/main/clojure/cljs/analyzer.cljc

@@ -1038,7 +1038,9 @@
          (when (contains? locals (-> sym name symbol))
            (warning :js-shadowed-by-local env {:name sym}))
          (let [pre (->> (string/split (name sym) #"\.") (map symbol) vec)]
-           (when-not (has-extern? pre)
+           (when (and (not (has-extern? pre))
+                      ;; ignore exists? usage
+                      (not (-> sym meta ::no-resolve)))
              (swap! env/*compiler* update-in
                (into [::namespaces (-> env :ns :name) :externs] pre) merge {}))
            (merge
@@ -2928,7 +2930,8 @@
                             (vary-meta (normalize-js-tag target-tag)
                               update-in [:prefix] (fnil conj '[Object]) prop))
                        nil)]
-    (when (not (string/starts-with? (str prop) "cljs$"))
+    (when (and (not= 'constructor prop)
+               (not (string/starts-with? (str prop) "cljs$")))
       ;; Adding to Object
       (when (= 'Object (first (-> tag meta :prefix)))
         (warning :infer-warning env

src/main/clojure/cljs/core.cljc

@@ -1819,7 +1819,7 @@
                                                (.. ~other ~(to-property field))))
                                          base-fields)
                                   (= (.-__extmap ~this)
-                                     (.-__extmap ~other)))))
+                                     (.-__extmap ~(with-meta other {:tag tagname}))))))
                         'IMeta
                         `(~'-meta [this#] ~'__meta)
                         'IWithMeta

src/test/clojure/cljs/analyzer_tests.clj

@@ -1076,3 +1076,23 @@
                :warnings ws
                :warn false})]
     (is (= (unsplit-lines ["Object.Component;"]) res))))
+
+(deftest test-cljs-2767-deftype-defrecord
+  (let [ws  (atom [])
+        res (infer-test-helper
+              {:forms '[(ns cjls-2767.core)
+                        (defrecord Foo [])]
+               :externs ["src/test/externs/test.js"]
+               :warnings ws
+               :with-core? true})]
+    (is (empty? @ws))
+    (is (not (string/includes? res "cljs.core"))))
+  (let [ws  (atom [])
+        res (infer-test-helper
+              {:forms '[(ns cjls-2767.core)
+                        (deftype Foo [])]
+               :externs ["src/test/externs/test.js"]
+               :warnings ws
+               :with-core? true})]
+    (is (empty? @ws))
+    (is (not (string/includes? res "cljs.core")))))