Fixed :fn with-condition in the describe function. Added tests.

Author: green-coder

CHANGELOG.md

@@ -7,6 +7,9 @@ Versions prior to v0.1.0 are considered experimental, their API may change.
 
 ## [Unreleased]
 
+### Fixed
+- :fn with-condition in the `describe` function.
+  Updated the minimap model to reflect that with-condition is valid for the :fn nodes.
 
 ## [0.0.6] - 2020-08-09
 ## [0.0.5] - 2020-08-09

src/minimallist/core.cljc

@@ -197,7 +197,9 @@
 (defn- -describe
   [context model data]
   (case (:type model)
-    :fn {:valid? ((:fn model) data)
+    :fn {:valid? (and ((:fn model) data)
+                      (implies (contains? model :condition-model)
+                               (:valid? (-describe context (:condition-model model) data))))
          :desc data}
     :enum {:valid? (contains? (:values model) data)
            :desc data}

src/minimallist/minimap.cljc

@@ -5,8 +5,9 @@
 ;; A model of the model format accepted by Minimallist's functions.
 ;; Use it to validate your models when you have problems which you don't understand, just in case.
 (def minimap-model
-  (h/let ['model (h/alt [:fn (h/map [:type (h/val :fn)]
-                                    [:fn (h/fn fn?)])]
+  (h/let ['model (h/alt [:fn (-> (h/map [:type (h/val :fn)]
+                                        [:fn (h/fn fn?)])
+                                 (h/with-optional-entries [:condition-model (h/ref 'model)]))]
                         [:enum (h/map [:type (h/val :enum)]
                                       [:values (h/set-of (h/fn any?))])]
                         [:and-or (h/map [:type (h/enum #{:and :or})]

test/minimallist/core_test.cljc

@@ -40,6 +40,16 @@
                    [1]
                    [2]
 
+                   (-> (h/fn int?)
+                       (h/with-condition (h/fn odd?)))
+                   [1]
+                   [2]
+
+                   (-> (h/fn symbol?)
+                       (h/with-condition (h/fn (complement #{'if 'val}))))
+                   ['a]
+                   ['if]
+
                    ;; enum
                    (h/enum #{1 "2" :3})
                    [1 "2" :3]
@@ -252,6 +262,16 @@
                    [1 1
                     2 :invalid]
 
+                   (-> (h/fn int?)
+                       (h/with-condition (h/fn odd?)))
+                   [1 1
+                    2 :invalid]
+
+                   (-> (h/fn symbol?)
+                       (h/with-condition (h/fn (complement #{'if 'val}))))
+                   ['a 'a
+                    'if :invalid]
+
                    ;; enum
                    (h/enum #{1 "2" false nil})
                    [1 1