decodeURI and encodeURI -> add

CHANGELOG.md

@@ -29,6 +29,7 @@ Other improvements:
 Breaking changes:
 
 New features:
+- Added `encodeURI`, `decodeURI` functions (#4 by @srghma)
 
 Bugfixes:
 

packages.dhall

@@ -1,4 +1,5 @@
 let upstream =
-      https://raw.githubusercontent.com/purescript/package-sets/prepare-0.15/src/packages.dhall
+      https://github.com/purescript/package-sets/releases/download/psc-0.15.4-20220808/packages.dhall
+        sha256:60eee64b04ca0013fae3e02a69fc3b176105c6baa2f31865c67cd5f881a412fd
 
 in  upstream

src/JSURI.js

@@ -1,39 +1,61 @@
-// A helper which transforms the result ofencodeURIComponent to be compliant
-// with RFC3896, as described in the MDN documentation here:
+// A helper which transforms the result of encodeURIComponent to be compliant
+// with RFC3986, as described in the MDN documentation here:
 //
 // https://web.archive.org/web/20201206001047/https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/encodeURIComponent
-function toRFC3896(input) {
+function encodeURIComponent_to_RFC3986(input) {
   return input.replace(/[!'()*]/g, function (c) {
     return "%" + c.charCodeAt(0).toString(16);
   });
 }
 
-export const _encodeURIComponent = function encode(fail, succeed, input) {
+// A helper which transforms the result of encodeURI to be compliant
+// with RFC3986, as described in the MDN documentation here:
+//
+// https://web.archive.org/web/20210117175449/https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/encodeURI#encoding_for_ipv6
+function encodeURI_to_RFC3986(input) {
+  return input.replace(/%5B/g, "[").replace(/%5D/g, "]");
+}
+
+export function _encodeURIComponent(fail, succeed, input) {
   try {
-    return succeed(toRFC3896(encodeURIComponent(input)));
+    return succeed(encodeURIComponent_to_RFC3986(encodeURIComponent(input)));
   } catch (err) {
     return fail(err);
   }
-};
+}
 
-export const _encodeFormURLComponent = function encode(fail, succeed, input) {
+export function _encodeFormURLComponent(fail, succeed, input) {
   try {
-    return succeed(toRFC3896(encodeURIComponent(input)).replace(/%20/g, "+"));
+    return succeed(encodeURIComponent_to_RFC3986(encodeURIComponent(input)).replace(/%20/g, "+"));
   } catch (err) {
     return fail(err);
   }
-};
+}
 
-function _decodeURIComponent(fail, succeed, input) {
+export function _decodeURIComponent(fail, succeed, input) {
   try {
     return succeed(decodeURIComponent(input));
   } catch (err) {
     return fail(err);
   }
 }
 
-export {_decodeURIComponent};
-
-export const _decodeFormURLComponent = function encode(fail, succeed, input) {
+export function _decodeFormURLComponent(fail, succeed, input) {
   return _decodeURIComponent(fail, succeed, input.replace(/\+/g, " "));
-};
+}
+
+export function _encodeURI(fail, succeed, input) {
+  try {
+    return succeed(encodeURI_to_RFC3986(encodeURI(input)));
+  } catch (err) {
+    return fail(err);
+  }
+}
+
+export function _decodeURI(fail, succeed, input) {
+  try {
+    return succeed(decodeURI(input));
+  } catch (err) {
+    return fail(err);
+  }
+}

src/JSURI.purs

@@ -1,8 +1,10 @@
 module JSURI
   ( encodeURIComponent
   , encodeFormURLComponent
+  , encodeURI
   , decodeURIComponent
   , decodeFormURLComponent
+  , decodeURI
   ) where
 
 import Prelude
@@ -87,3 +89,13 @@ foreign import _decodeFormURLComponent :: Fn3 (String -> Maybe String) (String -
 -- | ```
 decodeFormURLComponent :: String -> Maybe String
 decodeFormURLComponent = runFn3 _decodeFormURLComponent (const Nothing) Just
+
+foreign import _encodeURI :: Fn3 (String -> Maybe String) (String -> Maybe String) String (Maybe String)
+
+encodeURI :: String -> Maybe String
+encodeURI = runFn3 _encodeURI (const Nothing) Just
+
+foreign import _decodeURI :: Fn3 (String -> Maybe String) (String -> Maybe String) String (Maybe String)
+
+decodeURI :: String -> Maybe String
+decodeURI = runFn3 _decodeURI (const Nothing) Just