Read fragment string without decoding

Users can use Malli decoding to control decoding per schema.
metosin · Feb 16, 2023 · c2ac4bc · c2ac4bc
1 parent 83c31e3
commit c2ac4bc
Show file tree

Hide file tree

Showing 4 changed files with 3,749 additions and 57 deletions.
diff --git a/modules/reitit-core/src/reitit/coercion.cljc b/modules/reitit-core/src/reitit/coercion.cljc
@@ -40,7 +40,7 @@
    :form (->ParameterCoercion :form-params :string true true)
    :header (->ParameterCoercion :headers :string true true)
    :path (->ParameterCoercion :path-params :string true true)
-   :fragment (->ParameterCoercion :fragment-params :string true true)})
+   :fragment (->ParameterCoercion :fragment :string true true)})
 
 (defn ^:no-doc request-coercion-failed! [result coercion value in request serialize-failed-result]
   (throw

diff --git a/modules/reitit-frontend/src/reitit/frontend.cljs b/modules/reitit-frontend/src/reitit/frontend.cljs
@@ -1,6 +1,5 @@
 (ns reitit.frontend
   (:require [clojure.set :as set]
-            [clojure.string :as str]
             [reitit.coercion :as coercion]
             [reitit.core :as r])
   (:import goog.Uri
@@ -21,19 +20,6 @@
          (map (juxt keyword #(query-param q %)))
          (into {}))))
 
-(defn fragment-params
-  "Given goog.Uri, read fragment parameters into Clojure map."
-  [^Uri uri]
-  (let [fp (.getFragment uri)]
-    (if-not (seq fp)
-      {}
-      (into {}
-            (comp
-              (map #(str/split % #"="))
-              (map (fn [[k v]]
-                     [(keyword k) v])))
-            (str/split fp #"&")))))
-
 (defn match-by-path
   "Given routing tree and current path, return match with possibly
   coerced parameters. Return nil if no match found.
@@ -51,14 +37,17 @@
                    coercion/coerce!)]
      (if-let [match (r/match-by-path router (.getPath uri))]
        (let [q (query-params uri)
-             fp (fragment-params uri)
-             match (assoc match :query-params q :fragment-params fp)
+             fragment (when (.hasFragment uri)
+                        (.getFragment uri))
+             match (assoc match
+                          :query-params q
+                          :fragment fragment)
              ;; Return uncoerced values if coercion is not enabled - so
              ;; that tha parameters are always accessible from same property.
              parameters (or (coerce! match)
                             {:path (:path-params match)
                              :query q
-                             :fragment fp})]
+                             :fragment fragment})]
          (assoc match :parameters parameters))))))
 
 (defn match-by-name