Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add support for namespaced keys, update algor for matching, remove se…
…cretary - Router now supports namespaced keys in the URLs. Namespace separator (`/`) is serialized as `$` in the URL. - Removed Secretary dependency and inlined the code for URL encode/decode - Route matching algorithm is now changed to work better with default values. - Route matching algorithm will now try exact matches first when matching URL with the route pattern
- Loading branch information
Showing
4 changed files
with
312 additions
and
113 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,128 @@ | ||
| (ns router.util | ||
| (:require [clojure.string :as str])) | ||
|
|
||
| ;; this is taken from the Secretary project and slightly modified | ||
| ;; https://github.com/clj-commons/secretary/blob/master/src/secretary/core.cljs | ||
|
|
||
| (def encode js/encodeURIComponent) | ||
|
|
||
| (defmulti | ||
| ^{:private true | ||
| :doc "Given a key and a value return and encoded key-value pair."} | ||
| encode-pair | ||
| (fn [[k v]] | ||
| (cond | ||
| (or (sequential? v) (set? v)) | ||
| ::sequential | ||
| (or (map? v) (satisfies? IRecord v)) | ||
| ::map))) | ||
|
|
||
| (defn- key-index | ||
| ([k] (str (name k) "[]")) | ||
| ([k index] | ||
| (str (name k) "[" index "]"))) | ||
|
|
||
| (defmethod encode-pair ::sequential [[k v]] | ||
| (let [encoded (map-indexed | ||
| (fn [i x] | ||
| (let [pair (if (coll? x) | ||
| [(key-index k i) x] | ||
| [(key-index k) x])] | ||
| (encode-pair pair))) | ||
| v)] | ||
| (str/join \& encoded))) | ||
|
|
||
| (defmethod encode-pair ::map [[k v]] | ||
| (let [encoded (map | ||
| (fn [[ik iv]] | ||
| (encode-pair [(key-index k (name ik)) iv])) | ||
| v)] | ||
| (str/join \& encoded))) | ||
|
|
||
| (defmethod encode-pair :default [[k v]] | ||
| (str (name k) \= (encode (str v)))) | ||
|
|
||
| (defn encode-query-params | ||
| "Convert a map of query parameters into url encoded str." | ||
| [query-params] | ||
| (str/join \& (map encode-pair query-params))) | ||
|
|
||
| (defn encode-uri | ||
| "Like js/encodeURIComponent excepts ignore slashes." | ||
| [uri] | ||
| (->> (str/split uri #"/") | ||
| (map encode) | ||
| (str/join "/"))) | ||
|
|
||
| ;;---------------------------------------------------------------------- | ||
| ;; Parameter decoding | ||
|
|
||
| (def decode js/decodeURIComponent) | ||
|
|
||
| (defn- parse-path | ||
| "Parse a value from a serialized query-str key index. If the | ||
| index value is empty 0 is returned, if it's a digit it returns the | ||
| js/parseInt value, otherwise it returns the extracted index." | ||
| [path] | ||
| (let [index-re #"\[([^\]]*)\]*" ;; Capture the index value. | ||
| parts (re-seq index-re path)] | ||
| (map | ||
| (fn [[_ part]] | ||
| (cond | ||
| (empty? part) 0 | ||
| (re-matches #"\d+" part) (js/parseInt part) | ||
| :else part)) | ||
| parts))) | ||
|
|
||
| (defn- key-parse | ||
| "Return a key path for a serialized query-str entry. | ||
| Ex. | ||
| (key-parse \"foo[][a][][b]\") | ||
| ;; => (\"foo\" 0 \"a\" 0 \"b\") | ||
| " | ||
| [k] | ||
| (let [re #"([^\[\]]+)((?:\[[^\]]*\])*)?" | ||
| [_ key path] (re-matches re k) | ||
| parsed-path (when path (parse-path path))] | ||
| (cons key parsed-path))) | ||
|
|
||
| (defn- assoc-in-query-params | ||
| "Like assoc-in but numbers in path create vectors instead of maps. | ||
| Ex. | ||
| (assoc-in-query-params {} [\"foo\" 0] 1) | ||
| ;; => {\"foo\" [1]} | ||
| (assoc-in-query-params {} [\"foo\" 0 \"a\"] 1) | ||
| ;; => {\"foo\" [{\"a\" 1}]} | ||
| " | ||
| [m path v] | ||
| (let [heads (fn [xs] | ||
| (map-indexed | ||
| (fn [i _] | ||
| (take (inc i) xs)) | ||
| xs)) | ||
| hs (heads path) | ||
| m (reduce | ||
| (fn [m h] | ||
| (if (and (or (number? (last h))) | ||
| (not (vector? (get-in m (butlast h))))) | ||
| (assoc-in m (butlast h) []) | ||
| m)) | ||
| m | ||
| hs)] | ||
| (if (zero? (last path)) | ||
| (update-in m (butlast path) conj v) | ||
| (assoc-in m path v)))) | ||
|
|
||
| (defn decode-query-params | ||
| "Extract a map of query parameters from a query str." | ||
| [query-str] | ||
| (let [parts (str/split query-str #"&") | ||
| params (reduce | ||
| (fn [m part] | ||
| ;; We only want two parts since the part on the right hand side | ||
| ;; could potentially contain an =. | ||
| (let [[k v] (str/split part #"=" 2)] | ||
| (assoc-in-query-params m (key-parse (decode k)) (decode v)))) | ||
| {} | ||
| parts)] | ||
| params)) |
Oops, something went wrong.