CLJS-2843: s/explain of evaluated predicate yields :s/unknown

port CLJ-2068, currently won't work under advanced due to munging

Author: dnolen

src/main/cljs/cljs/spec/alpha.cljs

@@ -120,6 +120,14 @@
         (when (ident? spec-or-k)
           (throw (js/Error. (str "Unable to resolve spec: " spec-or-k))))))
 
+(defn fn-sym [f-n]
+  (when-not (str/blank? f-n)
+    (let [xs (map demunge (str/split f-n "$"))]
+      (when (c/and (<= 2 (count xs))
+                   (every? #(not (str/blank? %)) xs))
+        (let [[xs y] ((juxt butlast last) xs)]
+          (symbol (str (str/join "." xs) "/" y)))))))
+
 (defprotocol Specize
   (specize* [_] [_ form]))
 
@@ -132,9 +140,20 @@
   (specize* ([s] (specize* (reg-resolve! s)))
             ([s _] (specize* (reg-resolve! s))))
 
+  PersistentHashSet
+  (specize* ([s] (spec-impl s s nil nil))
+            ([s form] (spec-impl form s nil nil)))
+
+  PersistentTreeSet
+  (specize* ([s] (spec-impl s s nil nil))
+            ([s form] (spec-impl form s nil nil)))
+
   default
   (specize*
-    ([o] (spec-impl ::unknown o nil nil))
+    ([o]
+     (if-let [f-n (c/and (fn? o) (fn-sym (.-name o)))]
+       (spec-impl f-n o nil nil)
+       (spec-impl ::unknown o nil nil)))
     ([o form] (spec-impl form o nil nil))))
 
 (defn- specize

src/test/cljs/cljs/spec_test.cljs

@@ -136,6 +136,19 @@
         lrange (s/int-in 7 42)
         drange (s/double-in :infinite? false :NaN? false :min 3.1 :max 3.2)
         irange (s/inst-in #inst "1939" #inst "1946")]
+
+    (when-not js/COMPILED
+      ;; CLJS-2483: these won't work with both :advanced and :none optimization settings
+      (are [spec x conformed ed]
+        (let [co (s/conform spec x)
+              e  (::s/problems (s/explain-data spec x))]
+          (when (not= conformed co) (println "conform fail\n\texpect=" conformed "\n\tactual=" co))
+          (when (not (every? true? (map submap? ed e)))
+            (println "explain failures\n\texpect=" ed "\n\tactual failures=" e "\n\tsubmap?=" (map submap? ed e)))
+          (and (= conformed co) (every? true? (map submap? ed e))))
+        keyword? nil ::s/invalid [{:pred `keyword? :val nil}]
+        keyword? "abc" ::s/invalid [{:pred `keyword? :val "abc"}]))
+
     (are [spec x conformed ed]
       (let [co (s/conform spec x)
             e  (::s/problems (s/explain-data spec x))]
@@ -160,8 +173,6 @@
       ;; drange Double/NaN ::s/invalid {[] {:pred '(not (isNaN %)), :val Double/NaN}}
 
       keyword? :k :k nil
-      keyword? nil ::s/invalid [{:pred ::s/unknown :val nil}]
-      keyword? "abc" ::s/invalid [{:pred ::s/unknown :val "abc"}]
 
       a 6 6 nil
       a 3 ::s/invalid '[{:pred (cljs.core/fn [%] (cljs.core/> % 5)), :val 3}]
@@ -420,6 +431,16 @@
 
 (s/def ::cljs-2940-foo (s/cat :bar (s/nilable ::cljs-2940-foo)))
 
+(deftest describing-evaled-specs
+  (let [sp #{1 2}]
+    (is (= (s/describe sp) (s/form sp) sp)))
+  ;; won't work under advanced
+  (when-not js/COMPILED
+    (is (= (s/describe odd?) 'odd?))
+    (is (= (s/form odd?) 'cljs.core/odd?)))
+  (is (= (s/describe #(odd? %)) ::s/unknown))
+  (is (= (s/form #(odd? %)) ::s/unknown)))
+
 (comment
 
   (run-tests)