Changed the behavior of :cat in the describe function.

Author: green-coder

src/minimallist/core.cljc

@@ -134,12 +134,6 @@
     :let (-valid? (into context (:bindings model)) (:body model) data)
     :ref (-valid? context (get context (:key model)) data)))
 
-(defn- with-default-keys [entries]
-  (into []
-        (map-indexed (fn [index entry]
-                       (assoc entry :key (:key entry index))))
-        entries))
-
 (declare -describe)
 
 (defn- sequence-descriptions
@@ -148,22 +142,34 @@
   (if (and (#{:alt :cat :repeat :let :ref} (:type model))
            (:inlined model true))
     (case (:type model)
-      :alt (mapcat (fn [entry]
+      :alt (mapcat (fn [index entry]
                      (->> (sequence-descriptions context (:model entry) seq-data)
                           (map (fn [seq-description]
                                  {:rest-seq (:rest-seq seq-description)
-                                  :desc [(:key entry) (:desc seq-description)]}))))
-                   (with-default-keys (:entries model)))
-      :cat (reduce (fn [seq-descriptions entry]
-                     (mapcat (fn [acc]
-                               (->> (sequence-descriptions context (:model entry) (:rest-seq acc))
-                                    (map (fn [seq-description]
-                                           {:rest-seq (:rest-seq seq-description)
-                                            :desc (assoc (:desc acc) (:key entry) (:desc seq-description))}))))
-                             seq-descriptions))
-                   [{:rest-seq seq-data
-                     :desc {}}]
-                   (with-default-keys (:entries model)))
+                                  :desc [(:key entry index) (:desc seq-description)]}))))
+                   (range)
+                   (:entries model))
+      :cat (if (every? #(not (contains? % :key)) (:entries model))
+             (reduce (fn [seq-descriptions entry]
+                       (mapcat (fn [acc]
+                                 (->> (sequence-descriptions context (:model entry) (:rest-seq acc))
+                                      (map (fn [seq-description]
+                                             {:rest-seq (:rest-seq seq-description)
+                                              :desc (conj (:desc acc) (:desc seq-description))}))))
+                               seq-descriptions))
+                     [{:rest-seq seq-data
+                       :desc []}]
+                     (:entries model))
+             (reduce-kv (fn [seq-descriptions index entry]
+                          (mapcat (fn [acc]
+                                    (->> (sequence-descriptions context (:model entry) (:rest-seq acc))
+                                         (map (fn [seq-description]
+                                                {:rest-seq (:rest-seq seq-description)
+                                                 :desc (assoc (:desc acc) (:key entry index) (:desc seq-description))}))))
+                                  seq-descriptions))
+                     [{:rest-seq seq-data
+                       :desc {}}]
+                     (:entries model)))
       :repeat (->> (iterate (fn [seq-descriptions]
                               (mapcat (fn [acc]
                                         (->> (sequence-descriptions context (:elements-model model) (:rest-seq acc))

test/minimallist/core_test.cljc

@@ -338,7 +338,7 @@
                    (h/alt [:number (h/fn int?)]
                           [:sequence (h/cat (h/fn string?))])
                    [1 [:number 1]
-                    ["1"] [:sequence {0 "1"}]
+                    ["1"] [:sequence ["1"]]
                     [1] :invalid
                     "1" :invalid]
 
@@ -349,15 +349,9 @@
                                  [:option3 (h/cat (h/fn string?)
                                                   (h/fn keyword?))])
                           (h/fn int?))
-                   [[1 "2" 3] {0 1
-                               1 [:option1 "2"]
-                               2 3}
-                    [1 :2 3] {0 1
-                              1 [:option2 :2]
-                              2 3}
-                    [1 "a" :b 3] {0 1
-                                  1 [:option3 {0 "a", 1 :b}]
-                                  2 3}
+                   [[1 "2" 3] [1 [:option1 "2"] 3]
+                    [1 :2 3] [1 [:option2 :2] 3]
+                    [1 "a" :b 3] [1 [:option3 ["a" :b]] 3]
                     [1 ["a" :b] 3] :invalid]
 
                    ;; alt - inside a cat, but with :inline false on its cat entry
@@ -367,30 +361,24 @@
                                  [:option3 (h/not-inlined (h/cat (h/fn string?)
                                                                  (h/fn keyword?)))])
                           (h/fn int?))
-                   [[1 "2" 3] {0 1
-                               1 [:option1 "2"]
-                               2 3}
-                    [1 :2 3] {0 1
-                              1 [:option2 :2]
-                              2 3}
+                   [[1 "2" 3] [1 [:option1 "2"] 3]
+                    [1 :2 3] [1 [:option2 :2] 3]
                     [1 "a" :b 3] :invalid
-                    [1 ["a" :b] 3] {0 1
-                                    1 [:option3 {0 "a", 1 :b}]
-                                    2 3}]
+                    [1 ["a" :b] 3] [1 [:option3 ["a" :b]] 3]]
 
                    ;; cat of cat, the inner cat is implicitly inlined
                    (h/cat (h/fn int?)
                           (h/cat (h/fn int?)))
-                   [[1 2] {0 1, 1 {0 2}}
+                   [[1 2] [1 [2]]
                     [1] :invalid
                     [1 [2]] :invalid
                     [1 2 3] :invalid]
 
                    ;; cat of cat, the inner cat is explicitly not inlined
                    (h/cat (h/fn int?)
                           (h/not-inlined (h/cat (h/fn int?))))
-                   [[1 [2]] {0 1, 1 {0 2}}
-                    [1 '(2)] {0 1, 1 {0 2}}
+                   [[1 [2]] [1 [2]]
+                    [1 '(2)] [1 [2]]
                     [1] :invalid
                     [1 2] :invalid
                     [1 [2] 3] :invalid]
@@ -436,8 +424,8 @@
                    ;; repeat - of a cat
                    (h/repeat 1 2 (h/cat (h/fn int?)
                                         (h/fn string?)))
-                   [[1 "a"] [{0 1, 1 "a"}]
-                    [1 "a" 2 "b"] [{0 1, 1 "a"} {0 2, 1 "b"}]
+                   [[1 "a"] [[1 "a"]]
+                    [1 "a" 2 "b"] [[1 "a"] [2 "b"]]
                     [] :invalid
                     [1] :invalid
                     [1 2] :invalid
@@ -446,9 +434,9 @@
                    ;; repeat - of a cat with :inlined false
                    (h/repeat 1 2 (h/not-inlined (h/cat (h/fn int?)
                                                        (h/fn string?))))
-                   [[[1 "a"]] [{0 1, 1 "a"}]
-                    [[1 "a"] [2 "b"]] [{0 1, 1 "a"} {0 2, 1 "b"}]
-                    ['(1 "a") [2 "b"]] [{0 1, 1 "a"} {0 2, 1 "b"}]
+                   [[[1 "a"]] [[1 "a"]]
+                    [[1 "a"] [2 "b"]] [[1 "a"] [2 "b"]]
+                    ['(1 "a") [2 "b"]] [[1 "a"] [2 "b"]]
                     [] :invalid
                     [1] :invalid
                     [1 2] :invalid