Refactor and improve how fields are displayed

doclet/src/clojure/play_clj_doclet/core.clj

@@ -5,27 +5,43 @@
             [marginalia.core :as marg]
             [play-clj-doclet.html :as html])
   (:import [com.sun.javadoc ClassDoc ConstructorDoc Doc ExecutableMemberDoc
-            Parameter RootDoc]))
+            FieldDoc Parameter RootDoc]))
 
 (def targets (-> "targets.edn" io/resource slurp edn/read-string))
 
+(defn camel->keyword
+  [s]
+  (->> (string/split (string/replace s "_" "-") #"(?<=[a-z])(?=[A-Z])")
+       (map string/lower-case)
+       (string/join "-")
+       keyword))
+
 (defn parse-param
   [^Parameter p]
-  [(.typeName p) (.name p)])
+  [(.typeName p) (-> (.name p) camel->keyword name)])
+
+(defn parse-doc-name
+  [^Doc d]
+  (cond
+    (isa? (type d) ConstructorDoc)
+    nil
+    (isa? (type d) ClassDoc)
+    (subs (.name d) (+ 1 (.lastIndexOf (.name d) ".")))
+    :else
+    (.name d)))
 
 (defn parse-doc
   [^Doc d]
-  [(some-> (cond
+  (merge {}
-             (isa? (type d) ConstructorDoc)
+         (when-let [n (some-> (parse-doc-name d) camel->keyword)]
-             nil
+           {:name n})
-             (isa? (type d) ClassDoc)
+         (when (> (count (.commentText d)) 0)
-             (subs (.name d) (+ 1 (.lastIndexOf (.name d) ".")))
+           {:text (.commentText d)})
-             :else
+         (cond
-             (.name d))
+           (isa? (type d) ExecutableMemberDoc)
-           html/camel->keyword)
+           {:args (->> d .parameters (map parse-param) vec)}
-   (.commentText d)
+           (isa? (type d) FieldDoc)
-   (when (isa? (type d) ExecutableMemberDoc)
+           {:args [[(-> d .type .typeName) "val"]]})))
-     (->> d .parameters (map parse-param) vec))])
 
 (defn parse-class-entry
   [^ClassDoc c type]

doclet/src/clojure/play_clj_doclet/html.clj

@@ -2,35 +2,28 @@
   (:require [clojure.string :as string]
             [hiccup.core :refer :all]))
 
-(defn camel->keyword
-  [s]
-  (->> (string/split (string/replace s "_" "-") #"(?<=[a-z])(?=[A-Z])")
-       (map string/lower-case)
-       (string/join "-")
-       keyword))
-
 (defn param
   [[type-name param-name]]
   (html [:span {}
          [:span {:class "type-name"} "^" type-name]
          " "
-         (-> param-name camel->keyword name)]))
+         param-name]))
 
 (defn item
-  [[name text params]]
+  [{:keys [name text args]}]
   [:div
    [:p
     [:b (str name)]
     " "
-    (string/join ", " (map param params))]
+    (string/join ", " (map param args))]
-   (when (> (count text) 0)
+   (when text [:i text])])
-     [:i text])])
 
 (defn create-from-file
   [parsed-file]
   (for [group (:groups parsed-file)]
     [:div
      [:h1 {} (:name group)]
+     (:docstring group)
      (for [[name items] (:java group)]
        [:div
         (when (not= (:name group) name)