diff --git a/bower.json b/bower.json index 7889069..0c47a59 100644 --- a/bower.json +++ b/bower.json @@ -46,6 +46,7 @@ "purescript-strings": "^4.0.0", "purescript-tuples": "^5.1.0", "purescript-type-equality": "^3.0.0", - "purescript-unsafe-coerce": "^4.0.0" + "purescript-unsafe-coerce": "^4.0.0", + "purescript-globals": "^4.1.0" } } diff --git a/psc-package.json b/psc-package.json index c7bd103..63c518d 100644 --- a/psc-package.json +++ b/psc-package.json @@ -1,6 +1,6 @@ { "name": "purescript-httpure", - "set": "psc-0.12.2", + "set": "psc-0.13.2-20190815", "source": "https://github.com/purescript/package-sets.git", "depends": [ "aff", @@ -13,6 +13,7 @@ "exceptions", "foldable-traversable", "foreign", + "globals", "lists", "maybe", "newtype", diff --git a/src/HTTPure/Utils.js b/src/HTTPure/Utils.js deleted file mode 100644 index cf4769d..0000000 --- a/src/HTTPure/Utils.js +++ /dev/null @@ -1,11 +0,0 @@ -"use strict"; - -exports.encodeURIComponent = encodeURIComponent - -exports.decodeURIComponentImpl = function(s) { - try { - return decodeURIComponent(s); - } catch(error) { - return null; - } -}; diff --git a/src/HTTPure/Utils.purs b/src/HTTPure/Utils.purs index 5485d7e..02c3e7d 100644 --- a/src/HTTPure/Utils.purs +++ b/src/HTTPure/Utils.purs @@ -1,6 +1,6 @@ module HTTPure.Utils - ( encodeURIComponent - , decodeURIComponent + ( module Global + , encodeURIComponent , replacePlus , urlDecode ) where @@ -8,16 +8,13 @@ module HTTPure.Utils import Prelude import Data.Maybe as Maybe -import Data.Nullable as Nullable import Data.String as String +import Global (decodeURIComponent) as Global +import Global.Unsafe (unsafeEncodeURIComponent) -foreign import encodeURIComponent :: String -> String - -foreign import decodeURIComponentImpl :: String -> Nullable.Nullable String - -decodeURIComponent :: String -> Maybe.Maybe String -decodeURIComponent = Nullable.toMaybe <<< decodeURIComponentImpl +encodeURIComponent :: String -> String +encodeURIComponent = unsafeEncodeURIComponent replacePlus :: String -> String @@ -27,4 +24,4 @@ replacePlus = urlDecode :: String -> String urlDecode s = - Maybe.fromMaybe s $ decodeURIComponent s + Maybe.fromMaybe s $ Global.decodeURIComponent s