check option keys

package.json

@@ -11,7 +11,7 @@
   "author": "jiyinyiyong <jiyinyiyong@gmail.com>",
   "license": "MIT",
   "devDependencies": {
-    "shadow-cljs": "^2.8.90",
+    "shadow-cljs": "^2.8.91",
     "source-map-support": "^0.5.16",
     "ws": "^7.2.1"
   }

shadow-cljs.edn

@@ -5,7 +5,7 @@
   ;   "clojars" {:url "https://mirrors.ustc.edu.cn/clojars/"}
   ; }
   :dependencies [
-    [medley "1.2.0"]
+    [medley "1.3.0"]
   ]
   :builds {
     :app {

src/lilac/core.cljs

@@ -1,8 +1,7 @@
 
 (ns lilac.core
   (:require-macros [lilac.core])
-  (:require [lilac.util :refer [re?]]
-            [lilac.util :refer [preview-data]]
+  (:require [lilac.util :refer [re? preview-data check-keys]]
             [clojure.string :as string]
             [clojure.set :refer [difference]]))
 
@@ -42,7 +41,9 @@
 
 (defn any+
   ([] (any+ nil))
-  ([options] {:lilac-type :any, :options options, :some? (:some? options)}))
+  ([options]
+   (check-keys "checking any+" options [:some?])
+   {:lilac-type :any, :options options, :some? (:some? options)}))
 
 (defn boolean+ ([] (boolean+ nil)) ([options] {:lilac-type :boolean}))
 
@@ -513,6 +514,7 @@
 (defn list+
   ([item] (list+ item nil))
   ([item options]
+   (check-keys "checking list+" options [:allow-seq?])
    {:lilac-type :list, :item item, :options options, :allow-seq? (:allow-seq? options)}))
 
 (defn map+
@@ -529,6 +531,7 @@
 (defn number+
   ([] (number+ nil))
   ([options]
+   (check-keys "checking number+" options [:max :min])
    {:lilac-type :number, :max (:max options), :min (:min options), :options options}))
 
 (defn optional+
@@ -546,6 +549,7 @@
 (defn record+
   ([pairs] (record+ pairs nil))
   ([pairs options]
+   (check-keys "checking record+" options [:exact-keys? :check-keys? :all-optional?])
    {:lilac-type :record,
     :pairs pairs,
     :options options,
@@ -566,6 +570,7 @@
 (defn string+
   ([] (string+ nil))
   ([options]
+   (check-keys "checking string+" options [:nonblank?])
    {:lilac-type :string,
     :re (:re options),
     :nonblank? (:nonblank? options),
@@ -577,6 +582,7 @@
   ([items] (tuple+ items nil))
   ([items options]
    (assert (vector? items) "expects items of tuple+ in vector")
+   (check-keys "checking tuple+" options [:in-list? :check-size?])
    {:lilac-type :tuple,
     :items items,
     :options options,
@@ -586,4 +592,5 @@
 (defn vector+
   ([item] (vector+ item nil))
   ([item options]
+   (check-keys "checking vector+" options [:allow-seq?])
    {:lilac-type :vector, :item item, :options options, :allow-seq? (:allow-seq? options)}))

src/lilac/main.cljs

@@ -18,7 +18,7 @@
 (defn run-demo! []
   (let [result (validate-lilac router-data (lilac-router+))]
     (if (:ok? result) (println "Passed validation!") (println (:formatted-message result)))
-    (dev-check "1" (number+))))
+    (dev-check "1" (number+ {:x 1}))))
 
 (defn main! [] (println "Started.") (run-demo!))
 

src/lilac/router.cljs

@@ -38,7 +38,7 @@
    :put (lilac-method+),
    :delete (lilac-method+),
    :next (optional+ (vector+ (lilac-router-path+)))}
-  {:valid-keys? true}))
+  {:check-keys? true}))
 
 (deflilac
  lilac-router+

src/lilac/util.cljs

@@ -1,6 +1,12 @@
 
 (ns lilac.util )
 
+(defn check-keys [message data xs]
+  (let [valid-keys (set xs), real-keys (keys data)]
+    (doseq [k real-keys]
+      (when (not (contains? valid-keys k))
+        (js/console.warn message "unexpected key" (pr-str k) ", expect" (pr-str valid-keys))))))
+
 (defn preview-data [x]
   (cond
     (string? x) (pr-str x)