[#38] Refactor :nth to ::navigate interpreter

Co-authored-by: @ghrpp <[email protected]> Co-authored-by: @rublag_hs <[email protected]> Co-authored-by: @kenichsberg <[email protected]> Co-authored-by: @IvannikovG <[email protected]>
zen-lang · Jan 20, 2023 · 5aef6ea · 5aef6ea
1 parent e6a6032
commit 5aef6ea
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 18 deletions.
diff --git a/src/zen/schema.clj b/src/zen/schema.clj
@@ -168,6 +168,7 @@
 (defmethod compile-key :minItems [_ _ _] {:when #(or (sequential? %) (set? %))})
 (defmethod compile-key :maxItems [_ _ _] {:when #(or (sequential? %) (set? %))})
 
+(defmethod compile-key :nth          [_ _ _] {:when sequential?})
 (defmethod compile-key :schema-index [_ _ _] {:when sequential?})
 
 (defmethod compile-key :subset-of   [_ _ _] {:when set?})
@@ -328,3 +329,21 @@
                  (v data opts)
                  (validation.utils/merge-vtx vtx)))))
        vtx))))
+
+
+(register-compile-key-interpreter!
+ [:nth ::navigate]
+ (fn [_ ztx cfg]
+   (let [schemas (doall
+                  (map (fn [[index v]] [index (get-cached ztx v false)])
+                       cfg))]
+     (fn [vtx data opts]
+       (reduce (fn [vtx* [index v]]
+                 (if-let [nth-el (and (< index (count data))
+                                      (nth data index))]
+                   (-> (validation.utils/node-vtx vtx* [:nth index] [index])
+                       (v nth-el opts)
+                       (validation.utils/merge-vtx vtx*))
+                   vtx*))
+               vtx
+               schemas)))))
diff --git a/src/zen/v2_validation.clj b/src/zen/v2_validation.clj
@@ -450,24 +450,6 @@ Probably safe to remove if no one relies on them"
                 vtx
                 ks)))))
 
-(defmethod compile-key :nth
-  [_ ztx cfg]
-  (let [schemas (doall
-                 (map (fn [[index v]] [index (get-cached ztx v false)])
-                      cfg))]
-    {:when sequential?
-     :rule
-     (fn [vtx data opts]
-       (reduce (fn [vtx* [index v]]
-                 (if-let [nth-el (and (< index (count data))
-                                      (nth data index))]
-                   (-> (node-vtx vtx* [:nth index] [index])
-                       (v nth-el opts)
-                       (merge-vtx vtx*))
-                   vtx*))
-               vtx
-               schemas))}))
-
 (defmethod compile-key :keyname-schemas
   [_ ztx {:keys [tags]}]
   {:when map?