diff --git a/bower.json b/bower.json index 37eb943..d7d240a 100644 --- a/bower.json +++ b/bower.json @@ -14,11 +14,11 @@ "package.json" ], "dependencies": { - "purescript-prelude": "^1.0.1", - "purescript-globals": "^1.0.0", - "purescript-generics": "^1.0.0", - "purescript-maybe": "^1.0.0", - "purescript-strings": "^1.0.0", - "purescript-tuples": "^1.0.0" + "purescript-prelude": "^2.0.0", + "purescript-globals": "^2.0.0", + "purescript-generics": "^3.0.0", + "purescript-maybe": "^2.0.0", + "purescript-strings": "^2.0.0", + "purescript-tuples": "^3.0.0" } } diff --git a/package.json b/package.json index 8212e00..1a81173 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "devDependencies": { "pulp": "^9.0.0", "purescript-psa": "^0.3.9", - "purescript": "^0.9.1", + "purescript": "^0.10.1", "rimraf": "^2.5.0" } } diff --git a/src/Data/FormURLEncoded.purs b/src/Data/FormURLEncoded.purs index 0965f42..2421576 100644 --- a/src/Data/FormURLEncoded.purs +++ b/src/Data/FormURLEncoded.purs @@ -1,17 +1,19 @@ module Data.FormURLEncoded - ( FormURLEncoded() + ( FormURLEncoded(FormURLEncoded) , fromArray , toArray , encode ) where -import Prelude (class Show, class Ord, class Eq, map, (<<<), (<>), compare, eq) -import Data.String (joinWith) as String +import Data.Newtype (class Newtype) +import Data.Generic (class Generic) import Data.Maybe (Maybe(..)) +import Data.Monoid (class Monoid) +import Data.Semigroup (class Semigroup) +import Data.String (joinWith) as String import Data.Tuple (Tuple(..)) -import Data.Generic (class Generic, gShow) - import Global (encodeURIComponent) +import Prelude (class Show, class Ord, class Eq, map, (<<<), (<>)) -- | `FormURLEncoded` is an ordered list of key-value pairs with possible duplicates. newtype FormURLEncoded @@ -27,15 +29,12 @@ toArray :: FormURLEncoded -> Array (Tuple String (Maybe String)) toArray (FormURLEncoded a) = a derive instance genericFormUrlEncoded :: Generic FormURLEncoded - -instance eqFormUrlEncoded :: Eq FormURLEncoded where - eq (FormURLEncoded a) (FormURLEncoded b) = eq a b - -instance ordFormUrlEncoded :: Ord FormURLEncoded where - compare (FormURLEncoded a) (FormURLEncoded b) = compare a b - -instance showFormUrlEncoded :: Show FormURLEncoded where - show = gShow +derive instance newtypeFormUrlEncoded :: Newtype FormURLEncoded _ +derive newtype instance eqFormUrlEncoded :: Eq FormURLEncoded +derive newtype instance ordFormUrlEncoded :: Ord FormURLEncoded +derive newtype instance showFormUrlEncoded :: Show FormURLEncoded +derive newtype instance semigroupFormUrlEncoded :: Semigroup FormURLEncoded +derive newtype instance monoidFormUrlEncoded :: Monoid FormURLEncoded -- | Encode `FormURLEncoded` as `application/x-www-form-urlencoded`. encode :: FormURLEncoded -> String