Merge pull request #14 from garyb/updates

Updates

Author: garyb

.eslintrc.json

@@ -0,0 +1,28 @@
+{
+  "parserOptions": {
+    "ecmaVersion": 5
+  },
+  "extends": "eslint:recommended",
+  "env": {
+    "commonjs": true
+  },
+  "rules": {
+    "strict": [2, "global"],
+    "block-scoped-var": 2,
+    "consistent-return": 2,
+    "eqeqeq": [2, "smart"],
+    "guard-for-in": 2,
+    "no-caller": 2,
+    "no-extend-native": 2,
+    "no-loop-func": 2,
+    "no-new": 2,
+    "no-param-reassign": 2,
+    "no-return-assign": 2,
+    "no-unused-expressions": 2,
+    "no-use-before-define": 2,
+    "radix": [2, "always"],
+    "indent": [2, 2],
+    "quotes": [2, "double"],
+    "semi": [2, "always"]
+  }
+}

.gitignore

@@ -1,5 +1,6 @@
 /.*
 !/.gitignore
+!/.eslintrc.json
 !/.travis.yml
 /bower_components/
 /node_modules/

.travis.yml

@@ -1,16 +1,17 @@
-language: node_js
-sudo: required
-node_js: 6
-install:
-  - npm install
-  - npm install -g bower
-  - bower install --production
-script:
-  - npm run -s build
-  - bower install
-  - npm -s test
-after_success:
-- >-
-  test $TRAVIS_TAG &&
-  echo $GITHUB_AUTH_TOKEN | pulp login &&
-  echo y | pulp publish --no-push
+language: node_js
+dist: trusty
+sudo: required
+node_js: 6
+install:
+  - npm install -g bower
+  - npm install
+script:
+  - bower install --production
+  - npm run -s build
+  - bower install
+  - npm -s test
+after_success:
+- >-
+  test $TRAVIS_TAG &&
+  echo $GITHUB_TOKEN | pulp login &&
+  echo y | pulp publish --no-push

bower.json

@@ -17,11 +17,14 @@
     "package.json"
   ],
   "dependencies": {
-    "purescript-globals": "^1.0.0",
-    "purescript-integers": "^1.0.0",
-    "purescript-maps": "^1.1.0",
-    "purescript-pathy": "^2.0.0",
-    "purescript-string-parsers": "^1.0.1",
-    "purescript-unfoldable": "^1.0.0"
+    "purescript-globals": "^2.0.0",
+    "purescript-integers": "^2.0.0",
+    "purescript-maps": "^2.0.0",
+    "purescript-pathy": "^3.0.0",
+    "purescript-string-parsers": "^2.0.0",
+    "purescript-unfoldable": "^2.0.0"
+  },
+  "devDependencies": {
+    "purescript-test-unit": "10.0.1"
   }
 }

package.json

@@ -1,13 +1,15 @@
-{
-  "private": true,
-  "scripts": {
-    "clean": "rimraf output && rimraf .pulp-cache",
-    "build": "pulp build",
-    "test": "pulp test"
-  },
-  "devDependencies": {
-    "pulp": "^9.0.1",
-    "rimraf": "^2.5.2",
-    "purescript": "0.9.1"
-  }
-}
+{
+  "private": true,
+  "scripts": {
+    "clean": "rimraf output && rimraf .pulp-cache",
+    "build": "eslint src && pulp build --censor-lib --strict",
+    "test": "pulp test"
+  },
+  "devDependencies": {
+    "eslint": "^3.8.1",
+    "pulp": "^9.0.1",
+    "purescript": "^0.10.1",
+    "purescript-psa": "^0.3.9",
+    "rimraf": "^2.5.4"
+  }
+}

src/Data/URI/Common.purs

@@ -9,11 +9,12 @@ import Data.Either (Either(..), fromRight)
 import Data.List (List)
 import Data.Maybe (Maybe(..))
 import Data.String as S
-import Data.String.Regex as Rx
+import Data.String.Regex (Regex, regex)
+import Data.String.Regex.Flags as RXF
 import Data.Unfoldable (replicateA)
 import Partial.Unsafe (unsafePartial)
 
-import Text.Parsing.StringParser (ParseError(ParseError), Parser(Parser), unParser)
+import Text.Parsing.StringParser (ParseError(..), Parser(..), unParser)
 import Text.Parsing.StringParser.String (string)
 
 joinWith ∷ String → List String → String
@@ -24,7 +25,7 @@ rep n p = S.joinWith "" <$> replicateA n p
 
 rxPat ∷ String → Parser String
 rxPat rx =
-  unsafePartial $ fromRight $ anyMatch <$> Rx.regex rx (Rx.noFlags { ignoreCase = true })
+  unsafePartial $ fromRight $ anyMatch <$> regex rx RXF.ignoreCase
 
 wrapParser ∷ ∀ a. Parser a → Parser String → Parser a
 wrapParser outer inner = Parser \ps → do
@@ -49,18 +50,18 @@ parsePCTEncoded = rxPat "%[0-9a-f]{2}"
 parseSubDelims ∷ Parser String
 parseSubDelims = rxPat "[!$&'()*+;=]"
 
-anyMatch ∷ Rx.Regex → Parser String
+anyMatch ∷ Regex → Parser String
 anyMatch rx = Parser \{ str: str, pos: i } → case match1From rx i str of
   Just m → pure { result : m, suffix: { str: str, pos: i + (S.length m) }}
   Nothing → Left { error: (ParseError $ "Expected " <> show rx), pos: i }
 
-match1From ∷ Rx.Regex → Int → String → Maybe String
+match1From ∷ Regex → Int → String → Maybe String
 match1From = match1FromImpl Just Nothing
 
 foreign import match1FromImpl
   ∷ (∀ a. a → Maybe a)
   → (∀ a. Maybe a)
-  → Rx.Regex
+  → Regex
   → Int
   → String
   → (Maybe String)

src/Data/URI/Path.purs

@@ -94,4 +94,4 @@ printPath = either printPath' printPath'
 printPath' ∷ ∀ a' b s'. Path a' b s' → String
 printPath' path =
   let printed = unsafePrintPath path
-  in fromMaybe printed $ Str.stripPrefix "./" printed
+  in fromMaybe printed $ Str.stripPrefix (Str.Pattern "./") printed

src/Data/URI/Query.purs

@@ -11,8 +11,8 @@ import Control.Alt ((<|>))
 import Data.Either (fromRight)
 import Data.List (List(..))
 import Data.Maybe (Maybe(..))
-import Data.String.Regex as Rgx
-import Data.StrMap (StrMap, fromList, toList)
+import Data.String.Regex as RX
+import Data.String.Regex.Flags as RXF
 import Data.Tuple (Tuple(..))
 import Data.URI.Common (joinWith, rxPat, parsePChar, wrapParser)
 import Data.URI.Types (Query(..))
@@ -29,18 +29,18 @@ parseQuery ∷ Parser Query
 parseQuery = Query <$> (wrapParser parseParts $
   try (joinWith "" <$> many (parsePChar <|> string "/" <|> string "?")))
 
-parseParts ∷ Parser (StrMap (Maybe String))
-parseParts = fromList <$> sepBy parsePart (string ";" <|> string "&")
+parseParts ∷ Parser (List (Tuple String (Maybe String)))
+parseParts = sepBy parsePart (string ";" <|> string "&")
 
 parsePart ∷ Parser (Tuple String (Maybe String))
 parsePart = do
-  key ← rxPat "[^=]+"
+  key ← rxPat "[^=;&]+"
   value ← optionMaybe $ string "=" *> rxPat "[^;&]*"
   pure $ Tuple (prettyDecodeURI key) (prettyDecodeURI <$> value)
 
 printQuery ∷ Query → String
 printQuery (Query m) =
-  case toList m of
+  case m of
     Nil → ""
     items → "?" <> joinWith "&" (printPart <$> items)
   where
@@ -49,13 +49,13 @@ printQuery (Query m) =
   printPart (Tuple k (Just v)) = prettyEncodeURI k <> "=" <> prettyEncodeURI v
 
 prettyEncodeURI ∷ String → String
-prettyEncodeURI = Rgx.replace rgxSpace "+" <<< encodeURIComponent
+prettyEncodeURI = RX.replace rgxSpace "+" <<< encodeURIComponent
 
 prettyDecodeURI ∷ String → String
-prettyDecodeURI = decodeURIComponent <<< Rgx.replace rgxPlus " "
+prettyDecodeURI = decodeURIComponent <<< RX.replace rgxPlus " "
 
-rgxSpace ∷ Rgx.Regex
-rgxSpace = unsafePartial $ fromRight $ Rgx.regex "%20" (Rgx.noFlags { global = true })
+rgxSpace ∷ RX.Regex
+rgxSpace = unsafePartial $ fromRight $ RX.regex "%20" RXF.global
 
-rgxPlus ∷ Rgx.Regex
-rgxPlus = unsafePartial $ fromRight $ Rgx.regex "\\+" (Rgx.noFlags { global = true })
+rgxPlus ∷ RX.Regex
+rgxPlus = unsafePartial $ fromRight $ RX.regex "\\+" RXF.global

src/Data/URI/Types.purs

@@ -1,12 +1,11 @@
 module Data.URI.Types where
 
 import Prelude
-
 import Data.Either (Either)
 import Data.Generic (class Generic)
+import Data.List (List)
 import Data.Maybe (Maybe)
 import Data.Path.Pathy (Path, File, Dir, Abs, Rel, Sandboxed, Unsandboxed)
-import Data.StrMap (StrMap)
 import Data.Tuple (Tuple)
 
 -- | A generic URI
@@ -57,60 +56,60 @@ data Host
 type Port = Int
 
 -- | The query component of a URI.
-newtype Query = Query (StrMap (Maybe String))
+newtype Query = Query (List (Tuple String (Maybe String)))
 
 -- | The hash fragment of a URI.
 type Fragment = String
 
 derive instance eqURI ∷ Eq URI
 
 instance showURI ∷ Show URI where
-  show (URI s h q f) = "URI (" <> show s <> ") (" <> show h <> ") (" <> show q <> ") (" <> show f <> ")"
+  show (URI s h q f) = "(URI " <> show s <> " " <> show h <> " " <> show q <> " " <> show f <> ")"
 
 derive instance eqAbsoluteURI ∷ Eq AbsoluteURI
 
 instance showAbsoluteURI ∷ Show AbsoluteURI where
-  show (AbsoluteURI s h q) = "AbsoluteURI (" <> show s <> ") (" <> show h <> ") (" <> show q <> ")"
+  show (AbsoluteURI s h q) = "(AbsoluteURI " <> show s <> " " <> show h <> " " <> show q <> ")"
 
 derive instance eqRelativeRef ∷ Eq RelativeRef
 
 instance showRelativeRef ∷ Show RelativeRef where
-  show (RelativeRef r q f) = "RelativeRef (" <> show r <> ") (" <> show q <> ") (" <> show f <> ")"
+  show (RelativeRef r q f) = "(RelativeRef " <> show r <> " " <> show q <> " " <> show f <> ")"
 
 derive instance eqURIScheme ∷ Eq URIScheme
 derive instance ordURIScheme ∷ Ord URIScheme
 derive instance genericURIScheme ∷ Generic URIScheme
 
 instance showURIScheme ∷ Show URIScheme where
-  show (URIScheme s) = "URIScheme " <> show s
+  show (URIScheme s) = "(URIScheme " <> show s <> ")"
 
 derive instance eqHierarchicalPart ∷ Eq HierarchicalPart
 
 instance showHierarchicalPart ∷ Show HierarchicalPart where
-  show (HierarchicalPart authority path) = "HierarchicalPart (" <> show authority <> ") (" <> show path <> ")"
+  show (HierarchicalPart authority path) = "(HierarchicalPart " <> show authority <> " " <> show path <> ")"
 
 derive instance eqRelativePart ∷ Eq RelativePart
 
 instance showRelativePart ∷ Show RelativePart where
-  show (RelativePart authority path) = "RelativePart (" <> show authority <> ") (" <> show path <> ")"
+  show (RelativePart authority path) = "(RelativePart " <> show authority <> " " <> show path <> ")"
 
 derive instance eqAuthority ∷ Eq Authority
 derive instance ordAuthority ∷ Ord Authority
 derive instance genericAuthority ∷ Generic Authority
 
 instance showAuthority ∷ Show Authority where
-  show (Authority userinfo hosts) = "Authority (" <> show userinfo <> ") " <> show hosts
+  show (Authority userinfo hosts) = "(Authority " <> show userinfo <> " " <> show hosts <> ")"
 
 derive instance eqHost ∷ Eq Host
 derive instance ordHost ∷ Ord Host
 derive instance genericQuery ∷ Generic Host
 
 instance showHost ∷ Show Host where
-  show (IPv6Address ip) = "IPv6Address " <> show ip
-  show (IPv4Address ip) = "IPv4Address " <> show ip
-  show (NameAddress name) = "NameAddress " <> show name
+  show (IPv6Address ip) = "(IPv6Address " <> show ip <> ")"
+  show (IPv4Address ip) = "(IPv4Address " <> show ip <> ")"
+  show (NameAddress name) = "(NameAddress " <> show name <> ")"
 
 derive instance eqQuery ∷ Eq Query
 
 instance showQuery ∷ Show Query where
-  show (Query m) = "Query (" <> show m <> ")"
+  show (Query m) = "(Query (" <> show m <> "))"