CLJS-3176: Unexpected number of args warning for some closure functions

need to pass the ns being loaded to analyze-goog-file

ignore definitions from other provided namespaces

add tests

Author: swannodette

src/main/clojure/cljs/analyzer.cljc

@@ -2591,7 +2591,7 @@
              (let [dep-name (name dep)]
                (when (string/starts-with? dep-name "goog.")
                  #?(:clj (let [js-lib (get-in compiler [:js-dependency-index dep-name])
-                               ns (externs/analyze-goog-file (:file js-lib))]
+                               ns (externs/analyze-goog-file (:file js-lib) (symbol dep-name))]
                            (swap! env/*compiler* update-in [::namespaces dep] merge ns)))))
              #?(:clj (if-some [src (locate-src dep)]
                        (analyze-file src opts)

src/main/clojure/cljs/externs.clj

@@ -192,24 +192,35 @@
            externs (index-externs (parse-externs externs-file))))
        defaults sources))))
 
-(defn parsed->defs [externs]
-  (reduce
-    (fn [m xs]
-      (let [sym (last xs)]
-        (cond-> m
-          (seq xs) (assoc sym (merge (meta sym) {:ns *goog-ns* :name sym})))))
-    {} externs))
+(defn ns-match? [ns-segs var-segs]
+  (and
+    (= (inc (count ns-segs)) (count var-segs))
+    (= ns-segs (take (count ns-segs) var-segs))))
 
-(defn analyze-goog-file [f]
-  (let [rsrc (io/resource f)
-        desc (js-deps/parse-js-ns (line-seq (io/reader rsrc)))
-        ns   (-> (:provides desc) first symbol)]
-    ;; TODO: figure out what to do about other provides
-    (binding [*goog-ns* ns]
-      {:name ns
-       :defs (parsed->defs
-               (parse-externs
-                 (SourceFile/fromInputStream f (io/input-stream rsrc))))})))
+(defn parsed->defs [externs]
+  (let [ns-segs (into [] (map symbol (string/split (str *goog-ns*) #"\.")))]
+    (reduce
+      (fn [m xs]
+        ;; ignore definitions from other provided namespaces not under consideration
+        (if (ns-match? ns-segs xs)
+          (let [sym (last xs)]
+            (cond-> m
+              (seq xs) (assoc sym (merge (meta sym) {:ns *goog-ns* :name sym}))))
+          m))
+      {} externs)))
+
+(defn analyze-goog-file
+  ([f]
+   (analyze-goog-file f nil))
+  ([f ns]
+   (let [rsrc (io/resource f)
+         desc (js-deps/parse-js-ns (line-seq (io/reader rsrc)))
+         ns   (or ns (-> (:provides desc) first symbol))]
+     (binding [*goog-ns* ns]
+       {:name ns
+        :defs (parsed->defs
+                (parse-externs
+                  (SourceFile/fromInputStream f (io/input-stream rsrc))))}))))
 
 (comment
   (require '[clojure.java.io :as io]
@@ -246,6 +257,15 @@
     (find 'numberAwareCompare_)
     first meta)
 
+  (-> (externs-map
+        [(closure/js-source-file "goog/date/date.js"
+           (io/input-stream (io/resource "goog/date/date.js")))]
+        {})
+    (get-in '[goog date month])
+    )
+
+  (pprint (analyze-goog-file "goog/date/date.js" 'goog.date.month))
+
   (externs-map)
 
   (-> (externs-map)

src/test/clojure/cljs/externs_parsing_test.clj

@@ -21,3 +21,18 @@
             (= (count (distinct xs))
                (count xs)))
           externs))))
+
+(deftest cljs-3176
+  (let [ns (externs/analyze-goog-file "goog/date/date.js")
+        v  (get-in ns [:defs 'getWeekNumber])]
+    (is (= 3 (-> v :method-params first count))))
+  (let [ns (externs/analyze-goog-file "goog/date/date.js" 'goog.date.month)]
+    (is (= 12 (-> ns :defs count)))))
+
+(comment
+
+  (test/run-tests)
+
+  (externs/analyze-goog-file "goog/date/date.js" 'goog.date.month)
+
+  )