From f27c2fc2aaac9d3c34ab4d2170c5d0b761e3abc2 Mon Sep 17 00:00:00 2001
From: Tommi Reiman <tommi@iki.fi>
Date: Mon, 9 Jan 2023 16:58:51 +0200
Subject: [PATCH] clean

---
 modules/reitit-core/src/reitit/impl.cljc        | 7 +++++--
 modules/reitit-core/src/reitit/interceptor.cljc | 5 ++---
 modules/reitit-core/src/reitit/middleware.cljc  | 5 ++---
 modules/reitit-http/src/reitit/http.cljc        | 8 ++++----
 modules/reitit-ring/src/reitit/ring.cljc        | 5 ++---
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/modules/reitit-core/src/reitit/impl.cljc b/modules/reitit-core/src/reitit/impl.cljc
index 9b3780f5..8c6d1cbb 100644
--- a/modules/reitit-core/src/reitit/impl.cljc
+++ b/modules/reitit-core/src/reitit/impl.cljc
@@ -60,11 +60,14 @@
 (defn map-data [f routes]
   (mapv (fn [[p ds]] [p (f p ds)]) routes))
 
-(defn merge-data [{:keys [meta-merge]} p x]
+(defn meta-merge [left right opts]
+  ((or (:meta-merge opts) mm/meta-merge) left right))
+
+(defn merge-data [opts p x]
   (reduce
    (fn [acc [k v]]
      (try
-       ((or meta-merge mm/meta-merge) acc {k v})
+       (meta-merge acc {k v} opts)
        (catch #?(:clj Exception, :cljs js/Error) e
          (ex/fail! ::merge-data {:path p, :left acc, :right {k v}, :exception e}))))
    {} x))
diff --git a/modules/reitit-core/src/reitit/interceptor.cljc b/modules/reitit-core/src/reitit/interceptor.cljc
index 7f3dc593..c01c1668 100644
--- a/modules/reitit-core/src/reitit/interceptor.cljc
+++ b/modules/reitit-core/src/reitit/interceptor.cljc
@@ -1,6 +1,5 @@
 (ns reitit.interceptor
   (:require [clojure.pprint :as pprint]
-            [meta-merge.core :as mm]
             [reitit.core :as r]
             [reitit.exception :as exception]
             [reitit.impl :as impl]))
@@ -155,8 +154,8 @@
                      :handler get-user}]])"
   ([data]
    (router data nil))
-  ([data {:keys [meta-merge] :as opts}]
-   (let [opts ((or meta-merge mm/meta-merge) {:compile compile-result} opts)]
+  ([data opts]
+   (let [opts (impl/meta-merge {:compile compile-result} opts opts)]
      (r/router data opts))))
 
 (defn interceptor-handler [router]
diff --git a/modules/reitit-core/src/reitit/middleware.cljc b/modules/reitit-core/src/reitit/middleware.cljc
index 3329d84a..4481b459 100644
--- a/modules/reitit-core/src/reitit/middleware.cljc
+++ b/modules/reitit-core/src/reitit/middleware.cljc
@@ -1,6 +1,5 @@
 (ns reitit.middleware
   (:require [clojure.pprint :as pprint]
-            [meta-merge.core :as mm]
             [reitit.core :as r]
             [reitit.exception :as exception]
             [reitit.impl :as impl]))
@@ -138,8 +137,8 @@
                      :handler get-user}]])"
   ([data]
    (router data nil))
-  ([data {:keys [meta-merge] :as opts}]
-   (let [opts ((or meta-merge mm/meta-merge) {:compile compile-result} opts)]
+  ([data opts]
+   (let [opts (impl/meta-merge {:compile compile-result} opts opts)]
      (r/router data opts))))
 
 (defn middleware-handler [router]
diff --git a/modules/reitit-http/src/reitit/http.cljc b/modules/reitit-http/src/reitit/http.cljc
index 51c8b896..4533ebe1 100644
--- a/modules/reitit-http/src/reitit/http.cljc
+++ b/modules/reitit-http/src/reitit/http.cljc
@@ -1,7 +1,7 @@
 (ns reitit.http
-  (:require [meta-merge.core :as mm]
-            [reitit.core :as r]
+  (:require [reitit.core :as r]
             [reitit.exception :as ex]
+            [reitit.impl :as impl]
             [reitit.interceptor :as interceptor]
             [reitit.ring :as ring]))
 
@@ -14,7 +14,7 @@
              (update acc method expand opts)
              acc)) data ring/http-methods)])
 
-(defn compile-result [[path data] {:keys [::default-options-endpoint expand meta-merge] :as opts}]
+(defn compile-result [[path data] {:keys [::default-options-endpoint expand] :as opts}]
   (let [[top childs] (ring/group-keys data)
         childs (cond-> childs
                  (and (not (:options childs)) (not (:handler top)) default-options-endpoint)
@@ -38,7 +38,7 @@
       (->methods true top)
       (reduce-kv
        (fn [acc method data]
-         (let [data ((or meta-merge mm/meta-merge) top data)]
+         (let [data (impl/meta-merge top data opts)]
            (assoc acc method (->endpoint path data method method))))
        (->methods (:handler top) data)
        childs))))
diff --git a/modules/reitit-ring/src/reitit/ring.cljc b/modules/reitit-ring/src/reitit/ring.cljc
index 7dd2093d..22e62808 100644
--- a/modules/reitit-ring/src/reitit/ring.cljc
+++ b/modules/reitit-ring/src/reitit/ring.cljc
@@ -1,6 +1,5 @@
 (ns reitit.ring
   (:require [clojure.string :as str]
-            [meta-merge.core :as mm]
             #?@(:clj [[ring.util.mime-type :as mime-type]
              [ring.util.response :as response]])
             [reitit.core :as r]
@@ -29,7 +28,7 @@
              (update acc method expand opts)
              acc)) data http-methods)])
 
-(defn compile-result [[path data] {:keys [::default-options-endpoint expand meta-merge] :as opts}]
+(defn compile-result [[path data] {:keys [::default-options-endpoint expand] :as opts}]
   (let [[top childs] (group-keys data)
         childs (cond-> childs
                  (and (not (:options childs)) (not (:handler top)) default-options-endpoint)
@@ -50,7 +49,7 @@
       (->methods true top)
       (reduce-kv
        (fn [acc method data]
-         (let [data ((or meta-merge mm/meta-merge) top data)]
+         (let [data (impl/meta-merge top data opts)]
            (assoc acc method (->endpoint path data method method))))
        (->methods (:handler top) data)
        childs))))