Merge pull request #22 from garyb/query-monoid

Make `Query` a `Monoid`

Author: garyb

bower.json

@@ -22,7 +22,8 @@
     "purescript-maps": "^3.0.0",
     "purescript-pathy": "^4.0.0",
     "purescript-string-parsers": "^3.0.0",
-    "purescript-unfoldable": "^3.0.0"
+    "purescript-unfoldable": "^3.0.0",
+    "purescript-generics": "^4.0.0"
   },
   "devDependencies": {
     "purescript-test-unit": "11.0.0",

package.json

@@ -2,13 +2,13 @@
   "private": true,
   "scripts": {
     "clean": "rimraf output && rimraf .pulp-cache",
-    "build": "eslint src && pulp build --censor-lib --strict",
+    "build": "eslint src && pulp build -- --censor-lib --strict",
     "test": "pulp test"
   },
   "devDependencies": {
-    "eslint": "^3.19.0",
-    "pulp": "^11.0.0",
-    "purescript": "^0.11.3",
+    "eslint": "^4.4.1",
+    "pulp": "^11.0.2",
+    "purescript": "^0.11.6",
     "purescript-psa": "^0.5.1",
     "rimraf": "^2.6.1"
   }

src/Data/URI/Types.purs

@@ -6,6 +6,7 @@ import Data.Either (Either)
 import Data.Generic (class Generic)
 import Data.List (List)
 import Data.Maybe (Maybe)
+import Data.Monoid (class Monoid)
 import Data.Newtype (class Newtype)
 import Data.Path.Pathy (Path, File, Dir, Abs, Rel, Sandboxed, Unsandboxed)
 import Data.Tuple (Tuple)
@@ -115,6 +116,8 @@ instance showHost ∷ Show Host where
 derive instance newtypeQuery ∷ Newtype Query _
 derive newtype instance eqQuery ∷ Eq Query
 derive newtype instance ordQuery ∷ Ord Query
+derive newtype instance semigroupQuery ∷ Semigroup Query
+derive newtype instance monoidQuery ∷ Monoid Query
 
 instance showQuery ∷ Show Query where
   show (Query m) = "(Query " <> show m <> ")"