TNS-55: Added jar/dir and file metadata to ns declaration synbol name in find-ns-decls and test.

Author: fogus

src/main/clojure/clojure/tools/namespace/find.clj

@@ -19,6 +19,8 @@
                     InputStreamReader)
            (java.util.jar JarFile JarEntry)))
 
+(set! *warn-on-reflection* true)
+
 (def ^{:added "0.3.0"}
   clj
   "Platform definition of file extensions and reader options for
@@ -77,14 +79,20 @@
 (defn find-ns-decls-in-dir
   "Searches dir recursively for (ns ...) declarations in Clojure
   source files; returns the unevaluated ns declarations.
+  The symbol name in the returned ns declaration will contain metadata
+  for the corresponding directory and located file within at keys
+  :dir and :file.
 
   Optional second argument platform is either clj (default) or cljs,
   both defined in clojure.tools.namespace.find."
   {:added "0.2.0"}
   ([dir] (find-ns-decls-in-dir dir nil))
   ([dir platform]
    (keep #(ignore-reader-exception
-           (file/read-file-ns-decl % (:read-opts platform)))
+           (let [[_ nom & more] (file/read-file-ns-decl % (:read-opts platform))]
+             (list* 'ns (with-meta nom
+                          {:dir (.getName ^java.io.File dir) :file (.getName ^java.io.File %)})
+                    more)))
          (find-sources-in-dir dir platform))))
 
 (defn find-namespaces-in-dir
@@ -131,6 +139,9 @@
   "Attempts to read a (ns ...) declaration from the named entry in the
   JAR file, and returns the unevaluated form. Returns nil if read
   fails due to invalid syntax or if a ns declaration cannot be found.
+  The symbol name in the returned ns declaration will contain metadata
+  for the corresponding jar filename and located file within at keys
+  :jar and :file.
 
   Optional third argument platform is either clj (default) or cljs,
   both defined in clojure.tools.namespace.find."
@@ -142,7 +153,10 @@
                       (io/reader
                        (.getInputStream jarfile (.getEntry jarfile entry-name))))]
        (ignore-reader-exception
-        (parse/read-ns-decl rdr read-opts))))))
+        (let [[_ nom & more] (parse/read-ns-decl rdr read-opts)]
+          (list* 'ns (with-meta nom
+                       {:jar (.getName ^java.io.File jarfile) :file entry-name})
+                 more)))))))
 
 (defn find-ns-decls-in-jarfile
   "Searches the JAR file for source files containing (ns ...)

src/test/clojure/clojure/tools/namespace/find_test.clj

@@ -27,3 +27,13 @@
     (is (help/same-files?
          [main-cljs one-cljc two-cljs]
          (find/find-sources-in-dir dir find/cljs)))))
+
+(deftest t-find-ns-decl-meta
+  (let [dir (help/create-temp-dir "t-find-clj-and-cljc-files")
+        main-clj (help/create-source dir 'example.main :clj '[example.one])
+        one-cljc (help/create-source dir 'example.one :cljc '[example.two])
+        two-clj (help/create-source dir 'example.two :clj)
+        two-cljs (help/create-source dir 'example.two :cljs)]
+    (is (every? #{(.getName ^java.io.File dir)}
+         (map #(-> % second meta :dir)
+              (find/find-ns-decls [dir]))))))