Merge pull request #45 from doolse/compiler/0.12

Changes for 0.12.0

Author: garyb

.travis.yml

@@ -1,7 +1,7 @@
 language: node_js
 dist: trusty
 sudo: required
-node_js: 6
+node_js: stable
 install:
   - npm install -g bower
   - npm install

bower.json

@@ -17,18 +17,17 @@
     "package.json"
   ],
   "dependencies": {
-    "purescript-arrays": "^4.3.0",
-    "purescript-generics-rep": "^5.2.0",
-    "purescript-globals": "^3.0.0",
-    "purescript-integers": "^3.0.0",
-    "purescript-maps": "^3.0.0",
-    "purescript-parsing": "^4.3.1",
-    "purescript-profunctor-lenses": "^3.7.0",
-    "purescript-unfoldable": "^3.0.0",
-    "purescript-these": "^3.0.0"
+    "purescript-arrays": "^5.0.0",
+    "purescript-generics-rep": "^6.0.0",
+    "purescript-globals": "^4.0.0",
+    "purescript-integers": "^4.0.0",
+    "purescript-parsing": "^5.0.0",
+    "purescript-profunctor-lenses": "^4.0.0",
+    "purescript-unfoldable": "^4.0.0",
+    "purescript-these": "^4.0.0"
   },
   "devDependencies": {
-    "purescript-quickcheck": "^4.4.0",
-    "purescript-spec": "^2.0.0"
+    "purescript-quickcheck": "^5.0.0",
+    "purescript-spec": "^3.0.0"
   }
 }

package.json

@@ -8,7 +8,7 @@
   "devDependencies": {
     "eslint": "^4.4.1",
     "pulp": "^11.0.2",
-    "purescript": "^0.11.6",
+    "purescript": "^0.12.0",
     "purescript-psa": "^0.5.1",
     "rimraf": "^2.6.1"
   }

src/URI/Common.purs

@@ -22,10 +22,12 @@ import Data.Either (Either(..), either)
 import Data.Generic.Rep (class Generic)
 import Data.Generic.Rep.Show (genericShow)
 import Data.Newtype (class Newtype, un)
-import Data.String as String
+import Data.String (joinWith) as String
+import Data.String.CodeUnits (singleton) as String
 import Data.String.NonEmpty (NonEmptyString)
-import Data.String.NonEmpty as NES
-import Global (decodeURIComponent, encodeURIComponent)
+import Data.String.NonEmpty.CodeUnits (singleton) as NES
+import Data.String.NonEmpty (unsafeFromString, toString) as NES
+import Global.Unsafe (unsafeDecodeURIComponent, unsafeEncodeURIComponent)
 import Partial.Unsafe (unsafePartial)
 import Text.Parsing.Parser (ParseError(..), ParseState(..), Parser, ParserT(..), runParser)
 import Text.Parsing.Parser.String (anyChar, char, eof, oneOf, satisfy)
@@ -87,14 +89,14 @@ pctEncoded = do
 -- | Accepts a parser that is used to determine whether a character is allowed
 -- | to appear un-encoded in the URI component and the string to encode.
 printEncoded ∷ Parser String Char → String → String
-printEncoded p s = either (const s) id (runParser s parse)
+printEncoded p s = either (const s) identity (runParser s parse)
   where
     parse ∷ Parser String String
     parse = (String.joinWith "" <$> Array.many (simpleChar <|> encodedChar)) <* eof
     simpleChar ∷ Parser String String
     simpleChar = String.singleton <$> p
     encodedChar ∷ Parser String String
-    encodedChar = encodeURIComponent <<< String.singleton <$> anyChar
+    encodedChar = unsafeEncodeURIComponent <<< String.singleton <$> anyChar
 
 -- | A version of [`printEncoded`](#v:printEncoded) that operates on non-empty
 -- | strings.
@@ -106,4 +108,4 @@ printEncoded' p =
 -- | that operates on non-empty strings.
 decodeURIComponent' ∷ NonEmptyString → NonEmptyString
 decodeURIComponent' =
-  unsafePartial NES.unsafeFromString <<< decodeURIComponent <<< NES.toString
+  unsafePartial NES.unsafeFromString <<< unsafeDecodeURIComponent <<< NES.toString

src/URI/Extra/MultiHostPortPair.purs

@@ -12,7 +12,8 @@ import Data.Array.NonEmpty as NEA
 import Data.Either (Either)
 import Data.Maybe (Maybe(..))
 import Data.String as String
-import Data.String.NonEmpty as NES
+import Data.String.NonEmpty.CodeUnits (singleton) as NES
+import Data.String.NonEmpty (join1With) as NES
 import Data.These (These(..))
 import Text.Parsing.Parser (Parser, fail)
 import Text.Parsing.Parser.Combinators (optionMaybe, sepBy, try)

src/URI/Extra/QueryPairs.purs

@@ -25,12 +25,12 @@ import Data.Either (Either)
 import Data.Generic.Rep (class Generic)
 import Data.Generic.Rep.Show (genericShow)
 import Data.Maybe (Maybe(..))
-import Data.Monoid (class Monoid)
 import Data.String as String
-import Data.String.NonEmpty as NES
+import Data.String.NonEmpty.CodeUnits (singleton) as NES
+import Data.String.NonEmpty (joinWith) as NES
 import Data.Traversable (traverse)
 import Data.Tuple (Tuple(..))
-import Global (decodeURIComponent)
+import Global.Unsafe (unsafeDecodeURIComponent)
 import Text.Parsing.Parser (ParseError(..), Parser, runParser)
 import Text.Parsing.Parser.Combinators (optionMaybe, sepBy)
 import Text.Parsing.Parser.String (char, oneOf)
@@ -136,7 +136,7 @@ keyFromString = Key <<< printEncoded keyPartChar
 -- | keyToString (unsafeKeyFromString "foo%23bar") = "foo#bar"
 -- | ```
 keyToString ∷ Key → String
-keyToString (Key s) = decodeURIComponent s
+keyToString (Key s) = unsafeDecodeURIComponent s
 
 -- | Constructs a key value from a string directly - no percent-encoding
 -- | will be applied. This is useful when using a custom encoding scheme for
@@ -188,7 +188,7 @@ valueFromString =
 -- | valueToString (unsafeValueFromString "foo%23bar") = "foo#bar"
 -- | ```
 valueToString ∷ Value → String
-valueToString (Value s) = decodeURIComponent s
+valueToString (Value s) = unsafeDecodeURIComponent s
 
 -- | Constructs a value from a string directly - no percent-encoding
 -- | will be applied. This is useful when using a custom encoding scheme for

src/URI/Extra/UserPassInfo.purs

@@ -13,7 +13,7 @@ import Data.Maybe (Maybe(..))
 import Data.Newtype (class Newtype)
 import Data.String as String
 import Data.String.NonEmpty (NonEmptyString)
-import Data.String.NonEmpty as NES
+import Data.String.NonEmpty.CodeUnits (singleton, splitAt, indexOf, drop) as NES
 import Text.Parsing.Parser (Parser)
 import URI.Common (URIPartParseError(..), decodeURIComponent', subDelims, unreserved, printEncoded')
 import URI.UserInfo (UserInfo)
@@ -50,7 +50,7 @@ parse ui =
   let
     s = UserInfo.unsafeToString ui
   in
-    case flip NES.splitAt s =<< NES.indexOf (String.Pattern ":") s of
+    case flip NES.splitAt s <$> NES.indexOf (String.Pattern ":") s of
       Just { before: Nothing } →
         Left (URIPartParseError "Expected a username before a password segment")
       Just { before: Just before, after: Just after } →

src/URI/Fragment.purs

@@ -13,9 +13,9 @@ import Prelude
 
 import Control.Alt ((<|>))
 import Data.Array as Array
-import Data.Monoid (class Monoid)
-import Data.String.NonEmpty as NES
-import Global (decodeURIComponent)
+import Data.String.NonEmpty.CodeUnits (singleton) as NES
+import Data.String.NonEmpty (joinWith) as NES
+import Global.Unsafe (unsafeDecodeURIComponent)
 import Text.Parsing.Parser (Parser)
 import Text.Parsing.Parser.String (char)
 import URI.Common (subDelims, unreserved, pctEncoded, printEncoded)
@@ -52,7 +52,7 @@ fromString = Fragment <<< printEncoded fragmentChar
 -- | toString (unsafeFromString "foo%23bar") = "foo#bar"
 -- | ```
 toString ∷ Fragment → String
-toString (Fragment s) = decodeURIComponent s
+toString (Fragment s) = unsafeDecodeURIComponent s
 
 -- | Constructs a fragment value from a string directly - no percent-encoding
 -- | will be applied. This is useful when using a custom encoding scheme for

src/URI/Host/Gen.purs

@@ -6,7 +6,7 @@ import Control.Monad.Gen as Gen
 import Control.Monad.Rec.Class (class MonadRec)
 import Data.Char.Gen as GenChar
 import Data.String.Gen as GenString
-import Data.String.NonEmpty as NES
+import Data.String.NonEmpty.CodeUnits as NES
 import URI.Host (Host(..), IPv4Address, RegName)
 import URI.Host.IPv4Address as IPv4Address
 import URI.Host.RegName as RegName

src/URI/Host/IPv4Address.purs

@@ -12,7 +12,7 @@ import Control.Alt ((<|>))
 import Data.Either (Either(..))
 import Data.Int as Int
 import Data.Maybe (Maybe(..))
-import Data.String as String
+import Data.String.CodeUnits as String
 import Partial.Unsafe (unsafeCrashWith)
 import Text.Parsing.Parser (Parser)
 import Text.Parsing.Parser.Combinators (try)