Merge in 'and' optimization from master branch

Fixes #3

Signed-off-by: Sean Corfield <[email protected]>

Author: seancorfield

CHANGELOG.md

@@ -1,5 +1,8 @@
 ## CHANGES
 
+* v0.13.next in progress
+  * address [clj-commons/slingshot#3](https://github.com/clj-commons/slingshot/issues/3) by merging `and` optimizations from original PR [#55](https://github.com/scgilardi/slingshot/pull/55) by [jbouwman](https://github.com/jbouwman).
+
 * v0.13.0 -- 2025-09-20
   - add clj-kondo config export
   - move to clj-commons; rename nses to `clj-commons.*`

src/clj_commons/slingshot/support.clj

@@ -140,8 +140,10 @@
              [(key-values []
                 (and (vector? selector)
                      (if (even? (count selector))
-                       `(and ~@(for [[key val] (partition 2 selector)]
-                                 `(= (get ~'% ~key) ~val)))
+                       (if (= 2 (count selector))
+                         `(= (get ~'% ~(first selector)) ~(second selector))
+                         `(and ~@(for [[key val] (partition 2 selector)]
+                                   `(= (get ~'% ~key) ~val))))
                        (throw-arg "key-values selector: %s does not match: %s"
                                   (pr-str selector) "[key val & kvs]"))))
               (selector-form []