luciano/reitit
1
0
Fork 0
mirror of https://github.com/metosin/reitit.git synced 2025-12-17 16:31:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

FIx cljs, welcome reitit.exception!

Browse source
This commit is contained in:
Tommi Reiman 2019-02-09 16:23:35 +02:00
parent 8abca179d0
commit d68e1b81fb
3 changed files with 23 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
modules/reitit-core/src/reitit/exception.cljc Normal file
View file

@ -0,0 +1,7 @@
(ns reitit.exception)
(defn fail!
([message]
(throw (ex-info message {:type ::exeption})))
([message data]
(throw (ex-info message (assoc data :type ::exeption)))))

23
modules/reitit-core/src/reitit/trie.cljc
View file

@ -1,6 +1,7 @@
(ns reitit.trie (ns reitit.trie
(:refer-clojure :exclude [compile]) (:refer-clojure :exclude [compile])
(:require [clojure.string :as str]) (:require [clojure.string :as str]
[reitit.exception :as ex])
#?(:clj (:import [reitit Trie Trie$Match Trie$Matcher] #?(:clj (:import [reitit Trie Trie$Match Trie$Matcher]
(java.net URLDecoder)))) (java.net URLDecoder))))
@ -49,7 +50,7 @@
(if (= to (count s)) (if (= to (count s))
(concat ss (-static from to)) (concat ss (-static from to))
(case (get s to) (case (get s to)
\{ (let [to' (or (str/index-of s "}" to) (throw (ex-info (str "Unbalanced brackets: " (pr-str s)) {})))] \{ (let [to' (or (str/index-of s "}" to) (ex/fail! (str "Unclosed brackets: " (pr-str s))))]
(if (= \* (get s (inc to))) (if (= \* (get s (inc to)))
(recur (concat ss (-static from to) (-catch-all (inc to) to')) (inc to') (inc to')) (recur (concat ss (-static from to) (-catch-all (inc to) to')) (inc to') (inc to'))
(recur (concat ss (-static from to) (-wild to to')) (inc to') (inc to')))) (recur (concat ss (-static from to) (-wild to to')) (inc to') (inc to'))))
@ -131,7 +132,7 @@
(instance? Wild path) (instance? Wild path)
(let [next (first ps)] (let [next (first ps)]
(if (or (instance? Wild next) (instance? CatchAll next)) (if (or (instance? Wild next) (instance? CatchAll next))
(throw (ex-info (str "Two following wilds: " path ", " next) {})) (ex/fail! (str "Two following wilds: " path ", " next))
(update-in node [:wilds path] (fn [n] (-insert (or n (-node {})) ps data))))) (update-in node [:wilds path] (fn [n] (-insert (or n (-node {})) ps data)))))
(instance? CatchAll path) (instance? CatchAll path)
@ -169,11 +170,12 @@
#?(:cljs #?(:cljs
(defn decode [path start end percent?] (defn decode [path start end percent?]
(if percent? (js/decodeURIComponent (subs path start end)) path))) (let [param (subs path start end)]
(if percent? (js/decodeURIComponent param) param))))
(defn data-matcher [data] (defn data-matcher [data]
#?(:clj (Trie/dataMatcher data) #?(:clj (Trie/dataMatcher data)
:cljs (let [match (->Match data nil)] :cljs (let [match (->Match data {})]
(reify Matcher (reify Matcher
(match [_ i max _] (match [_ i max _]
(if (= i max) (if (= i max)
@ -264,10 +266,8 @@
(for [[p c] wilds] (for [[p c] wilds]
(let [p (:value p) (let [p (:value p)
ends (ends c)] ends (ends c)]
(if (seq (rest ends)) (if (next ends)
(throw (ex/fail! (str "Trie compliation error: wild " p " has two terminators: " ends))
(ex-info
(str "Trie compliation error: wild " p " has two terminators: " ends) {}))
(wild-matcher p (ffirst ends) (compile c)))))) (wild-matcher p (ffirst ends) (compile c))))))
(into (for [[p c] catch-all] (catch-all-matcher (:value p) (:data c)))))] (into (for [[p c] catch-all] (catch-all-matcher (:value p) (:data c)))))]
(cond (cond
@ -283,10 +283,7 @@
#?(:clj (if-let [match ^Trie$Match (Trie/lookup ^Trie$Matcher matcher ^String path)] #?(:clj (if-let [match ^Trie$Match (Trie/lookup ^Trie$Matcher matcher ^String path)]
(->Match (.data match) (.params match))) (->Match (.data match) (.params match)))
:cljs (if-let [match (match matcher 0 (count path) path)] :cljs (if-let [match (match matcher 0 (count path) path)]
(let [params (if-let [path-params (:path-params match)] (->Match (:data match) (:path-params match)))))
(persistent! path-params)
{})]
(assoc match :path-params params)))))
;; ;;
;; spike ;; spike

10
test/cljc/reitit/core_test.cljc
View file

@ -101,7 +101,8 @@
["/{a/jabba}/{a.b/dabba}/{a.b.c/doo}/{a.b.c.d/daa}/{*foo/bar}" ::wild] ["/{a/jabba}/{a.b/dabba}/{a.b.c/doo}/{a.b.c.d/daa}/{*foo/bar}" ::wild]
["/files/file-{name}.html" ::html] ["/files/file-{name}.html" ::html]
["/files/file-{name}.json" ::json] ["/files/file-{name}.json" ::json]
["/{eskon}/{saum}/pium\u2215paum" ::loru]] ["/{eskon}/{saum}/pium\u2215paum" ::loru]
["/extra-end}s-are/ok" ::bracket]]
{:router r}) {:router r})
by-path #(-> router (r/match-by-path %) ((juxt (comp :name :data) :path-params)))] by-path #(-> router (r/match-by-path %) ((juxt (comp :name :data) :path-params)))]
(is (= [::abba {:abba "abba"}] (by-path "/abba"))) (is (= [::abba {:abba "abba"}] (by-path "/abba")))
@ -119,13 +120,14 @@
(by-path "/olipa/kerran/avaruus/vaan/ei/toista/kertaa"))) (by-path "/olipa/kerran/avaruus/vaan/ei/toista/kertaa")))
(is (= [::html {:name "10"}] (by-path "/files/file-10.html"))) (is (= [::html {:name "10"}] (by-path "/files/file-10.html")))
(is (= [::loru {:eskon "viitan", :saum "aa"}] (by-path "/viitan/aa/pium\u2215paum"))) (is (= [::loru {:eskon "viitan", :saum "aa"}] (by-path "/viitan/aa/pium\u2215paum")))
(is (= [nil nil] (by-path "/ei/osu/pium/paum"))))) (is (= [nil nil] (by-path "/ei/osu/pium/paum")))
(is (= [::bracket {}] (by-path "/extra-end}s-are/ok")))))
(testing "invalid syntax fails fast" (testing "invalid syntax fails fast"
(testing "unbalanced brackets" (testing "unclosed brackets"
(is (thrown-with-msg? (is (thrown-with-msg?
ExceptionInfo ExceptionInfo
#"^Unbalanced brackets" #"^Unclosed brackets"
(r/router ["/kikka/{kukka"])))) (r/router ["/kikka/{kukka"]))))
(testing "multiple terminators" (testing "multiple terminators"
(is (thrown-with-msg? (is (thrown-with-msg?