Merge pull request #17 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) 2014 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

@@ -2,7 +2,7 @@
   "name": "purescript-globals",
   "homepage": "https://github.com/purescript/purescript-globals",
   "description": "Typed definitions for standard Javascript globals",
-  "license": "MIT",
+  "license": "BSD-3-Clause",
   "repository": {
     "type": "git",
     "url": "git://github.com/purescript/purescript-globals.git"
@@ -17,7 +17,7 @@
     "package.json"
   ],
   "devDependencies": {
-    "purescript-assert": "^3.0.0",
-    "purescript-console": "^3.0.0"
+    "purescript-assert": "^4.0.0",
+    "purescript-console": "^4.0.0"
   }
 }

package.json

@@ -3,12 +3,12 @@
   "scripts": {
     "clean": "rimraf output && rimraf .pulp-cache",
     "build": "eslint src && pulp build -- --censor-lib --strict",
-    "test": "pulp test"
+    "test": "pulp test --check-main-type Effect.Effect"
   },
   "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/Global.js

@@ -1,8 +1,6 @@
 /* globals exports */
 "use strict";
 
-// module Global
-
 exports.nan = NaN;
 
 exports.isNaN = isNaN;
@@ -18,8 +16,3 @@ exports.readInt = function (radix) {
 };
 
 exports.readFloat = parseFloat;
-
-exports.decodeURI = decodeURI;
-exports.encodeURI = encodeURI;
-exports.decodeURIComponent = decodeURIComponent;
-exports.encodeURIComponent = encodeURIComponent;

src/Global.purs

@@ -19,15 +19,3 @@ foreign import readInt :: Int -> String -> Number
 
 -- | Parse a floating point value from a `String`
 foreign import readFloat :: String -> Number
-
--- | uri decoding
-foreign import decodeURI :: String -> String
-
--- | uri encoding
-foreign import encodeURI :: String -> String
-
--- | uri component decoding
-foreign import decodeURIComponent :: String -> String
-
--- | uri component encoding
-foreign import encodeURIComponent :: String -> String

src/Global/Unsafe.js

@@ -1,8 +1,6 @@
 /* globals exports, JSON */
 "use strict";
 
-// module Global.Unsafe
-
 exports.unsafeStringify = function (x) {
   return JSON.stringify(x);
 };
@@ -25,3 +23,7 @@ exports.unsafeToPrecision  = function (digits) {
   };
 };
 
+exports.unsafeDecodeURI = decodeURI;
+exports.unsafeEncodeURI = encodeURI;
+exports.unsafeDecodeURIComponent = decodeURIComponent;
+exports.unsafeEncodeURIComponent = encodeURIComponent;

src/Global/Unsafe.purs

@@ -4,19 +4,38 @@ module Global.Unsafe where
 -- | to serialize functions returns undefined
 foreign import unsafeStringify :: forall a. a -> String
 
--- | Formats Number as a String with limited number of digits after the dot
+-- | Formats Number as a String with limited number of digits after the dot.
+-- |
 -- | May throw RangeError if the number of digits is not within the allowed range
 -- | (standard precision range is 0 to 20, but implementations may change it)
 foreign import unsafeToFixed :: Int -> Number -> String
 
 -- | Formats Number as String in exponential notation limiting number of digits
--- | after the decimal dot. 
+-- | after the decimal dot.
+-- |
 -- | May throw RangeError if the number of digits is not within the allowed range
 -- | (standard precision range is 0 to 20, but implementations may change it)
 foreign import unsafeToExponential :: Int -> Number -> String
 
--- | Formats Number as String in fixed-point or exponential notation rounded 
+-- | Formats Number as String in fixed-point or exponential notation rounded
 -- | to specified number of significant digits.
+-- |
 -- | May throw RangeError if the number of digits is not within the allowed range
 -- | (standard precision range is 0 to 100, but implementations may change it)
 foreign import unsafeToPrecision :: Int -> Number -> String
+
+-- | URI decoding. May throw a `URIError` if given a value with undecodeable
+-- | escape sequences.
+foreign import unsafeDecodeURI :: String -> String
+
+-- | URI encoding. May throw a `URIError` if given a value with unencodeable
+-- | characters.
+foreign import unsafeEncodeURI :: String -> String
+
+-- | URI component decoding. May throw a `URIError` if given a value with
+-- | undecodeable escape sequences.
+foreign import unsafeDecodeURIComponent :: String -> String
+
+-- | URI component encoding. May throw a `URIError` if given a value with
+-- | unencodeable characters.
+foreign import unsafeEncodeURIComponent :: String -> String

test/Test/Main.purs

@@ -2,15 +2,15 @@ module Test.Main where
 
 import Prelude
 
-import Control.Monad.Eff (Eff)
-import Control.Monad.Eff.Console (CONSOLE, log)
+import Effect (Effect)
+import Effect.Console (log)
 
 import Global (readFloat, readInt, isFinite, infinity, nan, isNaN)
 import Global.Unsafe (unsafeToPrecision, unsafeToExponential, unsafeToFixed)
 
-import Test.Assert (ASSERT, assert)
+import Test.Assert (assert)
 
-main :: Eff (console :: CONSOLE, assert :: ASSERT) Unit
+main :: Effect Unit
 main = do
   let num = 12345.6789