More reliably find specs for unqualified keys in keys spec

project.clj

@@ -33,13 +33,13 @@
                                   [orchestra "2020.09.18-1"]
                                   [org.clojure/core.specs.alpha "0.2.44"]
                                   [vvvvalvalval/scope-capture "0.3.2"]
-                                  [org.clojure/test.check "0.10.0"]
+                                  [org.clojure/test.check "1.1.0"]
                                   [metosin/spec-tools "0.8.2"]
                                   [ring/ring-core "1.6.3"] ; required to make ring-spec work, may cause issues with figwheel?
                                   [ring/ring-spec "0.0.4"] ; to test specs
                                   [org.onyxplatform/onyx-spec "0.13.0.0"] ; to test specs
                                   [com.gfredericks/test.chuck "0.2.10"]
-                                  [cider/cider-nrepl "0.22.4"]
+                                  [cider/cider-nrepl "0.24.0"]
                                   ]
                    :injections [(require 'sc.api)]
                    :plugins [
@@ -83,7 +83,7 @@
              :kaocha [:test-common
                       {:dependencies [[lambdaisland/kaocha "0.0-565"]
                                       [lambdaisland/kaocha-cloverage "0.0-41"]]}]
-             :test-common {:dependencies [[org.clojure/test.check "0.10.0-alpha3"]
+             :test-common {:dependencies [[org.clojure/test.check "1.1.0"]
                                           [pjstadig/humane-test-output "0.9.0"]
                                           [com.gfredericks/test.chuck "0.2.10"]
                                           [orchestra "2020.09.18-1"]

src/expound/alpha.cljc

@@ -136,7 +136,7 @@
 
 (defn ^:private named? [x]
   #?(:clj (instance? clojure.lang.Named x)
-     :cljs (implements? cljs.core.INamed x)))
+     :cljs (implements? INamed x)))
 
 (defn ^:private pr-pred* [pred]
   (cond

src/expound/printer.cljc

@@ -23,7 +23,7 @@
   (s/or
    :kw qualified-keyword?
    :conj :expound.spec/spec-conjunction))
-(s/def :expound.spec/key-spec
+(s/def :expound.spec/keys-spec
   (s/cat :keys #{'clojure.spec.alpha/keys
                  'cljs.spec.alpha/keys}
          :clauses (s/*
@@ -37,7 +37,6 @@
                                         :compound (s/cat
                                                    :op #{`or `and}
                                                    :clauses (s/+ :expound.spec/contains-key-pred))))
-
 (declare format)
 
 (defn ^:private str-width [lines]
@@ -126,7 +125,6 @@
 
 ;;;; private
 
-
 (defn keywords [form]
   (->> form
        (tree-seq coll? seq)
@@ -137,20 +135,20 @@
 
 (defn specs-from-form [via]
   (let [form (some-> via last s/form)
-        conformed (s/conform :expound.spec/key-spec form)]
-    ;; The containing spec might not be
-    ;; a simple 'keys' call, in which case we give up
-    (if (and form
-             (not= ::s/invalid conformed))
-      (->> (:clauses conformed)
-           (map :specs)
+        keys-specs (->> (tree-seq coll? seq form)
+                        (filter #(s/valid? :expound.spec/keys-spec  %)))]
+    (if (empty? keys-specs)
+      #{}
+      (->> keys-specs
+           (map #(s/conform :expound.spec/keys-spec %))
+           (mapcat :clauses)
+           (mapcat :specs)
            (tree-seq coll? seq)
            (filter
             (fn [x]
               (and (vector? x) (= :kw (first x)))))
            (map second)
-           set)
-      #{})))
+           set))))
 
 (defn key->spec [keys problems]
   (doseq [p problems]

test/expound/alpha_test.cljc

@@ -2389,7 +2389,7 @@ Detected 2 errors\n"
 (s/def :conformers-test/string-AB
   (s/and
    ;; conform as sequence (seq function)
-   (s/conformer seq)
+   (s/conformer #(if (seqable? %) (seq %) %))
    ;; re-use previous sequence spec
    :conformers-test/string-AB-seq))
 
@@ -2866,9 +2866,9 @@ returned an invalid value
 
 should contain key: :my-int
 
-| key     | spec                                              |
-|=========+===================================================|
-| :my-int | <can't find spec for unqualified spec identifier> |
+| key     | spec     |
+|=========+==========|
+| :my-int | pos-int? |
 
 -------------------------
 Detected 1 error
@@ -4304,3 +4304,47 @@ Detected 1 error
            (expound/expound-str
             (clojure.spec.alpha/coll-of (fn [x] (< x 9)))
             (range 10))))))
+
+;; https://github.com/bhb/expound/issues/215
+(s/def :keys-within-operators.user/name string?)
+(s/def :keys-within-operators.user/age pos-int?)
+
+(deftest keys-within-operators
+
+  (is (= "-- Spec failed --------------------
+
+  {}
+
+should contain keys: :age, :keys-within-operators.user/name
+
+| key                              | spec     |
+|==================================+==========|
+| :age                             | pos-int? |
+|----------------------------------+----------|
+| :keys-within-operators.user/name | string?  |
+
+-------------------------
+Detected 1 error\n"
+         (expound/expound-str (s/and (s/keys :req [:keys-within-operators.user/name]
+                                             :req-un [:keys-within-operators.user/age])
+                                     #(contains? % :foo)) {} {:print-specs? false})))
+
+  (is (= "-- Spec failed --------------------
+
+  {}
+
+should contain keys: :age, :foo, :keys-within-operators.user/name
+
+| key                              | spec                                              |
+|==================================+===================================================|
+| :age                             | pos-int?                                          |
+|----------------------------------+---------------------------------------------------|
+| :foo                             | <can't find spec for unqualified spec identifier> |
+|----------------------------------+---------------------------------------------------|
+| :keys-within-operators.user/name | string?                                           |
+
+-------------------------
+Detected 1 error\n"
+         (expound/expound-str (s/or :k1 (s/keys :req [:keys-within-operators.user/name]
+                                                :req-un [:keys-within-operators.user/age])
+                                    :k2  #(contains? % :foo)) {} {:print-specs? false}))))