[#38] Refactor zen.schema/compile-schema loop

Co-authored-by: @islambegkatibov <79331750+islambegk@users.noreply.github.com>
zen-lang · Jan 20, 2023 · d5d4ec3 · d5d4ec3
1 parent 865d98d
commit d5d4ec3
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/src/zen/schema.clj b/src/zen/schema.clj
@@ -81,14 +81,15 @@
 
         compiled-schema-fn
         (fn compiled-schema-fn [vtx data opts]
-          (loop [rs rulesets
-                 vtx* (navigate-props (assoc vtx :type (:type schema)) data props opts)]
-            (if (empty? rs)
-              vtx*
-              (let [{when-fn :when rule-fn :rule} (first rs)]
-                (if (or (nil? when-fn) (when-fn data))
-                  (recur (rest rs) (rule-fn vtx* data opts))
-                  (recur (rest rs) vtx*))))))]
+          (let [vtx* (assoc vtx :type (:type schema))
+                vtx* (navigate-props vtx* data props opts)]
+            (loop [rs rulesets, vtx* vtx*]
+              (if (empty? rs)
+                vtx*
+                (let [{when-fn :when rule-fn :rule} (first rs)]
+                  (if (or (nil? when-fn) (when-fn data))
+                    (recur (rest rs) (rule-fn vtx* data opts))
+                    (recur (rest rs) vtx*)))))))]
 
     (wrap-with-post-hooks
       compiled-schema-fn