Update Expectations v2 port

Closes #10
Closes #11

.clj-kondo/config.edn

@@ -1,3 +1,4 @@
 {:config-paths ["../resources/clj-kondo.exports/io.github.noahtheduke/lazytest"]
+ :cljc {:features [:clj]}
  :linters {:clojure-lsp/unused-public-var {:level :off}
            :unused-binding {:exclude-patterns ["^this"]}}}

.clj-kondo/imports/io.github.noahtheduke/lazytest/config.edn

@@ -8,7 +8,14 @@
            lazytest.experimental.interfaces.clojure-test/are clojure.test/are
            ;; xunit interface
            lazytest.experimental.interfaces.xunit/defsuite clojure.core/def
+           ;; Expectations v2
+           lazytest.extensions.expectations/from-each clojure.core/for
+           lazytest.extensions.expectations/=? clojure.core/=
            }
+ :hooks {:analyze-call {;; Expectations v2
+                        lazytest.extensions.expectations/more-> hooks.lazytest.expectations/more->
+                        lazytest.extensions.expectations/more-of hooks.lazytest.expectations/more-of
+                        }}
  :linters {:clojure-lsp/unused-public-var
            {:exclude-when-defined-by #{lazytest.core/defdescribe
                                        lazytest.experimental.interfaces.xunit/defsuite

.clj-kondo/imports/io.github.noahtheduke/lazytest/hooks/lazytest/expectations.clj_kondo

@@ -0,0 +1,31 @@
+;; Copied from https://github.com/clojure-expectations/clojure-test/blob/b90ed5b24924238b3b16b0bbaaee4c3b05a1268a
+
+(ns hooks.lazytest.expectations
+  (:require [clj-kondo.hooks-api :as api]))
+
+(defn more-> [{:keys [node]}]
+  (let [tail (rest (:children node))
+        rewritten
+        (api/list-node
+         (list*
+          (api/token-node 'cond->)
+          (api/token-node 'nil)
+          tail))]
+    {:node rewritten}))
+
+(defn more-of [{:keys [node]}]
+  (let [bindings (fnext (:children node))
+        pairs (partition 2 (nnext (:children node)))
+        rewritten
+        (api/list-node
+         (list*
+          (api/token-node 'fn)
+          (api/vector-node (vector bindings))
+          (map (fn [[e a]]
+                 (api/list-node
+                  (list
+                   (api/token-node 'lazytest.core/expect)
+                   e
+                   a)))
+               pairs)))]
+    {:node rewritten}))

.projections.json

@@ -1,12 +1,24 @@
 {
-  "doc/*.md": {"type": "doc"},
-  "README.md": {"type": "doc"},
-  "src/clojure/*.clj": {
-      "type": "source",
-      "alternate": "test/clojure/{}_test.clj"
-  },
-  "test/clojure/*_test.clj": {
-      "type": "test",
-      "alternate": "src/clojure/{}.clj"
-  }
+    "doc/*.md": {
+        "type": "doc"
+    },
+    "README.md": {
+        "type": "doc"
+    },
+    "src/clojure/*.clj": {
+        "type": "source",
+        "alternate": "test/clojure/{}_test.clj"
+    },
+    "src/clojure/*.cljc": {
+        "type": "source",
+        "alternate": "test/clojure/{}_test.cljc"
+    },
+    "test/clojure/*_test.clj": {
+        "type": "test",
+        "alternate": "src/clojure/{}.clj"
+    },
+    "test/clojure/*_test.cljc": {
+        "type": "test",
+        "alternate": "src/clojure/{}.cljc"
+    }
 }

CHANGELOG.md

@@ -5,6 +5,7 @@
 ### Fixed
 
 - `around` context macro is now called once for all children. (See [#12](https://github.com/NoahTheDuke/lazytest/issues/12).)
+- Update Expectations v2 port to allow for easier updating in the future and support all non-test definition functions/macros. (See [#10](https://github.com/NoahTheDuke/lazytest/issues/10) and [#11](https://github.com/NoahTheDuke/lazytest/issues/11).)
 
 ### Misc
 

resources/clj-kondo.exports/io.github.noahtheduke/lazytest/config.edn

@@ -8,7 +8,14 @@
            lazytest.experimental.interfaces.clojure-test/are clojure.test/are
            ;; xunit interface
            lazytest.experimental.interfaces.xunit/defsuite clojure.core/def
+           ;; Expectations v2
+           lazytest.extensions.expectations/from-each clojure.core/for
+           lazytest.extensions.expectations/=? clojure.core/=
            }
+ :hooks {:analyze-call {;; Expectations v2
+                        lazytest.extensions.expectations/more-> hooks.lazytest.expectations/more->
+                        lazytest.extensions.expectations/more-of hooks.lazytest.expectations/more-of
+                        }}
  :linters {:clojure-lsp/unused-public-var
            {:exclude-when-defined-by #{lazytest.core/defdescribe
                                        lazytest.experimental.interfaces.xunit/defsuite

resources/clj-kondo.exports/io.github.noahtheduke/lazytest/hooks/lazytest/expectations.clj_kondo

@@ -0,0 +1,31 @@
+;; Copied from https://github.com/clojure-expectations/clojure-test/blob/b90ed5b24924238b3b16b0bbaaee4c3b05a1268a
+
+(ns hooks.lazytest.expectations
+  (:require [clj-kondo.hooks-api :as api]))
+
+(defn more-> [{:keys [node]}]
+  (let [tail (rest (:children node))
+        rewritten
+        (api/list-node
+         (list*
+          (api/token-node 'cond->)
+          (api/token-node 'nil)
+          tail))]
+    {:node rewritten}))
+
+(defn more-of [{:keys [node]}]
+  (let [bindings (fnext (:children node))
+        pairs (partition 2 (nnext (:children node)))
+        rewritten
+        (api/list-node
+         (list*
+          (api/token-node 'fn)
+          (api/vector-node (vector bindings))
+          (map (fn [[e a]]
+                 (api/list-node
+                  (list
+                   (api/token-node 'lazytest.core/expect)
+                   e
+                   a)))
+               pairs)))]
+    {:node rewritten}))