Merge pull request #85 from jolt-lang/honeysql-enablement

core: defprotocol accepts docstring + keyword options (honeysql)

docs/libraries.md

@@ -12,5 +12,7 @@ Libraries confirmed to load and pass their conformance checks on Jolt
   on the [ring-app example](https://github.com/jolt-lang/examples/tree/main/ring-app)'s
   spork/http adapter
 * [ring-codec](https://github.com/ring-clojure/ring-codec)
+* [honeysql](https://github.com/seancorfield/honeysql) — full formatter + helpers
+  (select/insert/update/delete/joins/:inline), loaded unmodified from git
 * [clojure.jdbc](https://github.com/yogthos/clojure.jdbc) — as [jolt-lang/db](https://github.com/jolt-lang/db)'s
   `jdbc.core`, reimplemented over janet sqlite3/pq drivers (SQLite + PostgreSQL)

jolt-core/clojure/core/30-macros.clj

@@ -295,7 +295,15 @@
 ;; instead of evaluating its fields. methods is a {kw {:name str}} map (only :name
 ;; is consulted). Each method is a thin dispatch fn over protocol-dispatch.
 (defmacro defprotocol [pname & sigs]
-  (let [methods (reduce (fn [m sig]
+  ;; Clojure's defprotocol takes an optional docstring and leading keyword
+  ;; options (:extend-via-metadata true, honeysql uses it) before the method
+  ;; signatures — drop them (metadata extension is a JVM dispatch detail).
+  (let [sigs (loop [s sigs]
+               (cond
+                 (string? (first s))  (recur (rest s))
+                 (keyword? (first s)) (recur (rest (rest s)))
+                 :else s))
+        methods (reduce (fn [m sig]
                           (assoc m (keyword (name (first sig))) {:name (name (first sig))}))
                         {} sigs)]
     `(do

test/spec/protocols-spec.janet

@@ -48,3 +48,11 @@
    "(do (deftype P [n]) (.-n (P. 5)))"]
   ["dot ctor + method"    "5"
    "(do (defprotocol G (val-of [_])) (deftype P [n] G (val-of [_] n)) (val-of (P. 5)))"])
+
+# defprotocol accepts Clojure's optional docstring + leading keyword options
+# before the signatures (honeysql: :extend-via-metadata true).
+(defspec "protocols / defprotocol options"
+  ["docstring + option + method" ":hi"
+   "(do (defprotocol Pdoc \"docs\" :extend-via-metadata true (greet [x])) (extend-protocol Pdoc String (greet [s] :hi)) (greet \"x\"))"]
+  ["option only" "3"
+   "(do (defprotocol Popt :extend-via-metadata true (plus2 [x])) (extend-protocol Popt Long (plus2 [n] (+ n 2))) (plus2 1))"])