Merge pull request #7 from purescript/compiler/0.12

Update for PureScript 0.12

Author: garyb

.gitignore

@@ -5,3 +5,4 @@
 /bower_components/
 /node_modules/
 /output/
+package-lock.json

LICENSE

@@ -1,20 +1,26 @@
-The MIT License (MIT)
+Copyright 2018 PureScript
 
-Copyright (c) 2015 PureScript
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
+1. Redistributions of source code must retain the above copyright notice, this
+list of conditions and the following disclaimer.
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+2. Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+3. Neither the name of the copyright holder nor the names of its contributors
+may be used to endorse or promote products derived from this software without
+specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

bower.json

@@ -1,8 +1,7 @@
 {
   "name": "purescript-assert",
   "homepage": "https://github.com/purescript/purescript-assert",
-  "description": "Basic assertions library for low level testing",
-  "license": "MIT",
+  "license": "BSD-3-Clause",
   "repository": {
     "type": "git",
     "url": "git://github.com/purescript/purescript-assert.git"
@@ -17,7 +16,8 @@
     "package.json"
   ],
   "dependencies": {
-    "purescript-eff": "^3.0.0",
-    "purescript-console": "^3.0.0"
+    "purescript-effect": "^2.0.0",
+    "purescript-console": "^4.0.0",
+    "purescript-prelude": "^4.0.0"
   }
 }

package.json

@@ -5,9 +5,9 @@
     "build": "eslint src && pulp build -- --censor-lib --strict"
   },
   "devDependencies": {
-    "eslint": "^3.17.1",
-    "pulp": "^10.0.4",
-    "purescript-psa": "^0.5.0-rc.1",
-    "rimraf": "^2.6.1"
+    "eslint": "^4.19.1",
+    "pulp": "^12.2.0",
+    "purescript-psa": "^0.6.0",
+    "rimraf": "^2.6.2"
   }
 }

src/Test/Assert.purs

@@ -1,6 +1,5 @@
 module Test.Assert
-  ( ASSERT
-  , assert
+  ( assert
   , assert'
   , assertEqual
   , assertFalse
@@ -11,33 +10,29 @@ module Test.Assert
 
 import Prelude
 
-import Control.Monad.Eff (Eff, kind Effect)
-import Control.Monad.Eff.Console (CONSOLE, error)
-
--- | Assertion effect type.
-foreign import data ASSERT :: Effect
+import Effect (Effect)
+import Effect.Console (error)
 
 -- | Throws a runtime exception with message "Assertion failed" when the boolean
 -- | value is false.
-assert :: forall e. Boolean -> Eff (assert :: ASSERT | e) Unit
+assert :: Boolean -> Effect Unit
 assert = assert' "Assertion failed"
 
 -- | Throws a runtime exception with the specified message when the boolean
 -- | value is false.
 foreign import assert'
-  :: forall e
-   . String
+  :: String
   -> Boolean
-  -> Eff (assert :: ASSERT | e) Unit
+  -> Effect Unit
 
 -- | Throws a runtime exception with message "Assertion failed: An error should
 -- | have been thrown", unless the argument throws an exception when evaluated.
 -- |
 -- | This function is specifically for testing unsafe pure code; for example,
 -- | to make sure that an exception is thrown if a precondition is not
--- | satisfied. Functions which use `Eff (err :: EXCEPTION | eff) a` can be
+-- | satisfied. Functions which use `Effect a` can be
 -- | tested with `catchException` instead.
-assertThrows :: forall e a. (Unit -> a) -> Eff (assert :: ASSERT | e) Unit
+assertThrows :: forall a. (Unit -> a) -> Effect Unit
 assertThrows =
   assertThrows' "Assertion failed: An error should have been thrown"
 
@@ -46,30 +41,30 @@ assertThrows =
 -- |
 -- | This function is specifically for testing unsafe pure code; for example,
 -- | to make sure that an exception is thrown if a precondition is not
--- | satisfied. Functions which use `Eff (err :: EXCEPTION | eff) a` can be
+-- | satisfied. Functions which use `Effect a` can be
 -- | tested with `catchException` instead.
 assertThrows'
-  :: forall e a
+  :: forall a
    . String
   -> (Unit -> a)
-  -> Eff (assert :: ASSERT | e) Unit
+  -> Effect Unit
 assertThrows' msg fn = assert' msg =<< checkThrows fn
 
 foreign import checkThrows
-  :: forall e a
+  :: forall a
    . (Unit -> a)
-  -> Eff (assert :: ASSERT | e) Boolean
+  -> Effect Boolean
 
 -- | Compares the `expected` and `actual` values for equality and
 -- | throws a runtime exception when the values are not equal.
 -- |
 -- | The message indicates the expected value and the actual value.
 assertEqual
-  :: forall a e
+  :: forall a
    . Eq a
   => Show a
   => { actual :: a, expected :: a }
-  -> Eff (assert :: ASSERT, console :: CONSOLE | e) Unit
+  -> Effect Unit
 assertEqual {actual, expected} = do
   unless result $ error message
   assert' message result
@@ -82,17 +77,15 @@ assertEqual {actual, expected} = do
 -- | The message indicates the expected value (`true`)
 -- | and the actual value (`false`).
 assertTrue
-  :: forall e
-   . Boolean
-  -> Eff (assert :: ASSERT, console :: CONSOLE | e) Unit
+  :: Boolean
+  -> Effect Unit
 assertTrue actual = assertEqual { actual, expected: true }
 
 -- | Throws a runtime exception when the value is `true`.
 -- |
 -- | The message indicates the expected value (`false`)
 -- | and the actual value (`true`).
 assertFalse
-  :: forall e
-   . Boolean
-  -> Eff (assert :: ASSERT, console :: CONSOLE | e) Unit
+  :: Boolean
+  -> Effect Unit
 assertFalse actual = assertEqual { actual, expected: false }