impl const

zen-lang · Nov 12, 2020 · 0c6d0a4 · 0c6d0a4
1 parent 87f87a9
commit 0c6d0a4
Show file tree

Hide file tree

Showing 5 changed files with 96 additions and 26 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,4 @@
 language: clojure
 script: make test
 jdk:
-  - oraclejdk11
+  - oraclejdk9
diff --git a/README.md b/README.md
@@ -183,8 +183,23 @@ List of built-in types:
   * zen/vector
   * zen/set
   * zen/map
-* zen/union-map
-* zen/union
+* zen/case
+
+### zen/case
+
+`zen/case` is alternative to union type,
+it is more advanced and may be applied to different maps
+
+```edn
+
+{:zen/tags #{'zen/schema}
+ :type 'zen/vector
+ :every {:type 'zen/case
+         :case [{:when {:type 'zen/string}}
+                {:when {:type 'zen/map}
+                 :then {:type 'zen/map :require #{:name} :keys {:name {:type 'zen/string}}}}]}}
+
+```
 
 ### zen/symbol
 

diff --git a/pkg/zen.edn b/pkg/zen.edn
@@ -121,9 +121,15 @@
            :type map
            :schema-key {:key :type}
            :keys {:type {:type symbol}
-                  :confirms {:type set :every {:type symbol}}
-                  :enum {:type vector :every {:type map
-                                              :keys {:value {:type any}}}}}
+                  :confirms {:type set
+                             :zen/desc "set of schemas to confirm"
+                             :every {:type symbol}}
+                  :const {:type map
+                          :zen/desc "Check constant"
+                          :keys {:value {:type any}}} ;; TODO: apply top level schema to value
+                  :enum {:type vector
+                         :zen/desc "Check value is in enum"
+                         :every {:type map :keys {:value {:type any}}}}}
            :require [:type]}
 
  resource {:zen/tags #{schema}

diff --git a/src/zen/validation.clj b/src/zen/validation.clj
@@ -34,17 +34,13 @@
     (when (contains? (get-in @ctx [:tags 'zen/property]) sym)
       (get-symbol ctx sym))))
 
+;; TODO:
+;; * validate keys
+;; * minItems/maxItems
 (defmethod validate-type 'zen/map
-  [_ ctx acc {cfs :confirms ks :keys vls :values reqs :require eks :exclusive-keys} data]
+  [_ ctx acc {ks :keys vls :values reqs :require eks :exclusive-keys} data]
   (if (map? data)
-    (let [acc (->> cfs
-                   (reduce (fn [acc sym]
-                             (if-let [sch (get-symbol ctx sym)]
-                               (-> (validate-schema ctx (update-acc ctx acc {:schema [sym]}) sch data)
-                                   (restore-acc acc))
-                               (add-error ctx acc {:message (format "Could not resolve schema '%s" sym) :type "schema"})))
-                           acc))
-          acc (->> data
+    (let [acc (->> data
                    (reduce (fn [acc [k v]]
                              (if-let [sch (get ks k)]
                                (let [acc' (validate-schema ctx (update-acc ctx acc {:path [k] :schema [k]}) sch v)
@@ -212,20 +208,29 @@
     acc
     (add-error ctx acc {:message (format "Expected type of 'regex, got '%s" (pretty-type data)) :type "primitive-type"})))
 
-(defn validate-schema [ctx acc {tp :type {sk :key} :schema-key  ks :keys cfs :confirms :as schema} data]
+(defn validate-schema [ctx acc {tp :type {sk :key} :schema-key const :const enum :enum  cfs :confirms :as schema} data]
   (try
-    (let [acc (if-let [sch-nm (and sk (get data sk))]
+    (let [acc (if const
+                (if (= (:value const) data)
+                  acc
+                  (add-error ctx acc {:message (format "Expected '%s', got '%s'" (:value const) data) :type "schema"}))
+                acc)
+          acc (->> cfs
+                   (reduce (fn [acc sym]
+                             (if-let [sch (get-symbol ctx sym)]
+                               (-> (validate-schema ctx (update-acc ctx acc {:schema [sym]}) sch data)
+                                   (restore-acc acc))
+                               (add-error ctx acc {:message (format "Could not resolve schema '%s" sym) :type "schema"})))
+                           acc))
+          acc (if-let [sch-nm (and sk (get data sk))]
                 (if-let [sch (and sch-nm (get-symbol ctx sch-nm))]
                   (-> (validate-schema ctx (update-acc ctx acc {:schema [:schema-key sch-nm]}) sch data)
                       (restore-acc acc))
                   (add-error ctx acc {:message (format "Could not find schema %s" sch-nm) :type "schema"}))
                 acc)]
-      (cond
-        tp (validate-type tp ctx acc schema data)
-
-        (or ks cfs) (validate-type 'zen/map ctx acc schema data)
-
-        :else (add-error ctx acc {:message (format "I don't know how to eval %s" (pr-str schema)) :type "schema"})))
+      (if tp
+        (validate-type tp ctx acc schema data)
+        (add-error ctx acc {:message (format "I don't know how to eval %s" (pr-str schema)) :type "schema"})))
     (catch Exception e
       (add-error ctx acc {:message (.getMessage e)
                           :type "schema"}))))

diff --git a/test/zen/validation_test.clj b/test/zen/validation_test.clj
@@ -26,8 +26,8 @@
          'maps-case {:zen/tags #{'zen/schema}
                       :type 'zen/case
                       :case [{:when {:type 'zen/map
-                                      :require #{:person}
-                                      :keys {:person {:type 'zen/boolean}}}
+                                     :require #{:person}
+                                     :keys {:person {:type 'zen/boolean}}}
                                :then {:type 'zen/map
                                       :require #{:name}
                                       :keys {:name {:type 'zen/string}}}}
@@ -38,6 +38,14 @@
                                       :require #{:title}
                                       :keys {:title {:type 'zen/string}}}}]}
 
+         'const {:zen/tags #{'zen/schema}
+                 :type 'zen/string
+                 :const {:value "fixed"}}
+
+         'const-map {:zen/tags #{'zen/schema}
+                     :type 'zen/map
+                     :keys {:fixed {:type 'zen/string}}
+                     :const {:value {:fixed "fixed"}}}
 
          'Address {:zen/tags #{'zen/schema}
                    :type 'zen/map
@@ -171,6 +179,10 @@
   (vmatch #{'myapp/User} {:name "niquola" :identifiers [1 {:ups "ups"}]}
           {:errors
            [{:message "Expected type of 'map, got 1",
+             :type "type",
+             :path [:identifiers 0],
+             :schema ['myapp/User :identifiers :every 'myapp/Identifier]}
+            {:message "Expected type of 'map, got 1",
              :type "type",
              :path [:identifiers 0],
              :schema ['myapp/User :identifiers :every]}
@@ -346,5 +358,37 @@
              :path [],
              :schema ['myapp/maps-case :case]}]})
 
-  )
+  (vmatch #{'myapp/const} "ups"
+          {:errors
+           [{:message "Expected 'fixed', got 'ups'",
+             :type "schema",
+             :path [],
+             :schema ['myapp/const]}]})
+
+  (vmatch #{'myapp/const} "fixed"
+          {:errors empty?})
+
+  (vmatch #{'myapp/const} 1
+          {:errors
+           [{:message "Expected 'fixed', got '1'",
+             :schema ['myapp/const]}
+            {:message "Expected type of 'string, got 'long",
+             :schema ['myapp/const]}]})
+
+  (vmatch #{'myapp/const-map} {:fixed "fixed"}
+          {:errors empty?})
+
+  (vmatch #{'myapp/const-map} {:fixed "ups"}
+          {:errors
+           [{:message "Expected '{:fixed \"fixed\"}', got '{:fixed \"ups\"}'",
+             :type "schema",
+             :path [],
+             :schema ['myapp/const-map]}]})
+
+  (vmatch #{'zen/schema}
+          {:zen/tags #{'zen/schema}
+           :type 'zen/string
+           :const {:value 1}}
+          {:errors [{}]})
 
+)