CLJS-3170: Checked-arrays triggers on inferred Array type

if we see Array return type, convert to array. add test.

CLJS-3189: Incorrect inference for goog.object/get

if we have a generic type, set return type to 'any. add test

Author: swannodette

src/main/clojure/cljs/externs.clj

@@ -48,6 +48,17 @@
           (recur (conj ret (conj (last ret) opt)) (drop 1 opts))
           (seq ret))))))
 
+(defn generic? [t]
+  (let [s (name t)]
+    (boolean (re-matches #"[A-Z]" s))))
+
+(defn gtype->cljs-type [t]
+  (when t
+    (cond
+      (generic? t) 'any
+      (= t 'Array) 'array
+      :else t)))
+
 (defn get-var-info [^Node node]
   (when node
     (let [info (.getJSDocInfo node)]
@@ -67,7 +78,8 @@
                       arglists (params->method-params arglist)]
                   {:tag             'Function
                    :js-fn-var       true
-                   :ret-tag         (or (some-> (.getReturnType info) get-tag)
+                   :ret-tag         (or (some-> (.getReturnType info)
+                                          get-tag gtype->cljs-type)
                                         'clj-nil)
                    :variadic?       (boolean (some '#{var_args} arglist))
                    :max-fixed-arity (count (take-while #(not= 'var_args %) arglist))

src/test/clojure/cljs/externs_parsing_test.clj

@@ -29,6 +29,11 @@
   (let [ns (externs/analyze-goog-file "goog/date/date.js" 'goog.date.month)]
     (is (= 12 (-> ns :defs count)))))
 
+(deftest cljs-3170&3189
+  (let [ns (externs/analyze-goog-file "goog/object/object.js")]
+    (is (= 'any (get-in ns [:defs 'get :ret-tag])))
+    (is (= 'array (get-in ns [:defs 'getKeys :ret-tag])))))
+
 (comment
 
   (test/run-tests)