Fix small things.

Author: green-coder

README.md

@@ -16,7 +16,7 @@ A minimalist data driven data model library, inspired by [Clojure Spec](https://
 
 (def hiccup-model
   (h/let ['hiccup (h/alt [:node (h/in-vector (h/cat [:name (h/fn keyword?)]
-                                                    [:props (h/? (h/map-of (h/fn keyword?) (h/fn any?)))]
+                                                    [:props (h/? (h/map-of (h/vector (h/fn keyword?) (h/fn any?))))]
                                                     [:children (h/* (h/not-inlined (h/ref 'hiccup)))]))]
                          [:primitive (h/alt [:nil (h/fn nil?)]
                                             [:boolean (h/fn boolean?)]
@@ -30,8 +30,8 @@ A minimalist data driven data model library, inspired by [Clojure Spec](https://
 
 (describe hiccup-model [:div {:class [:foo :bar]}
                         [:p "Hello, world of data"]])
-;=> [:node {:name :div,
-;           :props [{:class [:foo :bar]}],
+;=> [:node {:name :div
+;           :props [[[:class [:foo :bar]]]]
 ;           :children [[:node {:name :p
 ;                              :props []
 ;                              :children [[:primitive [:text "Hello, world of data"]]]}]]}]

deps.edn

@@ -17,6 +17,6 @@
 ;;     clj -Spom
 ;; - build the jar:
 ;;     clojure -A:depstar -m hf.depstar.jar minimallist.jar -v
+;; - add a tag "v0.0.x" to the latest commit and push to repo
 ;; - deploy:
 ;;     mvn deploy:deploy-file -Dfile=minimallist.jar -DpomFile=pom.xml -DrepositoryId=clojars -Durl=https://clojars.org/repo/
-;; - add a tag "v0.0.x" to the latest commit and push to repo

doc/model_builder.md

@@ -104,7 +104,7 @@ outside of a `:condition-model` field, you need to add your own generator to the
 (h/set-of (h/fn keyword?))
 
 ;; Map of id->name.
-(h/map-of (h/fn int?) (h/fn string?))
+(h/map-of (h/vector (h/fn int?) (h/fn string?)))
 
 ;; Sequence of numbers, either in a list or in a vector.
 (h/sequence-of (h/fn int?))

src/minimallist/minicup.cljc

@@ -87,7 +87,6 @@
                      [:map (h/in-vector (h/cat (h/val :map)
                                                (h/+ (entry-of (h/ref 'model)))))]
                      [:map-of (h/vector (h/val :map-of)
-                                        (h/ref 'model)
                                         (h/ref 'model))]
                      [:sequence-of (h/in-vector (h/cat (h/val :sequence-of)
                                                        (h/? (h/map [:count {:optional true} (h/ref 'model)]))

src/minimallist/minimap.cljc

@@ -61,8 +61,7 @@
                                                               [:condition-model (h/ref 'model)])
                                      (h/with-condition (h/fn #(<= (:min %) (:max %)))))]
                         [:let (h/map [:type (h/val :let)]
-                                     [:bindings (h/map-of (h/fn any?)
-                                                          (h/ref 'model))]
+                                     [:bindings (h/map-of (h/vector (h/fn any?) (h/ref 'model)))]
                                      [:body (h/ref 'model)])]
                         [:ref (h/map [:type (h/val :ref)]
                                      [:key (h/fn any?)])])]