Update for PureScript 0.11

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,7 +1,6 @@
 /.*
 !/.gitignore
-!/.jscsrc
-!/.jshintrc
+!/.eslintrc.json
 !/.travis.yml
 /bower_components/
 /node_modules/

.jscsrc

@@ -1,7 +1,7 @@
 language: node_js
 dist: trusty
 sudo: required
-node_js: 6
+node_js: stable
 env:
   - PATH=$HOME/purescript:$PATH
 install:

.jshintrc

@@ -21,12 +21,12 @@
     "package.json"
   ],
   "dependencies": {
-    "purescript-arrays": "^3.0.0",
-    "purescript-functions": "^2.0.0",
-    "purescript-lists": "^3.0.0",
-    "purescript-st": "^2.0.0"
+    "purescript-arrays": "^4.0.0",
+    "purescript-functions": "^3.0.0",
+    "purescript-lists": "^4.0.0",
+    "purescript-st": "^3.0.0"
   },
   "devDependencies": {
-    "purescript-quickcheck": "^3.0.0"
+    "purescript-quickcheck": "^4.0.0"
   }
 }

.travis.yml

@@ -2,14 +2,13 @@
   "private": true,
   "scripts": {
     "clean": "rimraf output && rimraf .pulp-cache",
-    "build": "jshint src && jscs src && psa \"src/**/*.purs\" \"bower_components/purescript-*/src/**/*.purs\" --censor-lib --strict",
-    "test": "psc \"src/**/*.purs\" \"bower_components/purescript-*/src/**/*.purs\" \"test/**/*.purs\" && psc-bundle \"output/**/*.js\" --module Test.Main --main Test.Main | node"
+    "build": "eslint src && pulp build -- --censor-lib --strict",
+    "test": "pulp test"
   },
   "devDependencies": {
-    "jscs": "^2.8.0",
-    "jshint": "^2.9.1",
-    "pulp": "^8.2.0",
-    "purescript-psa": "^0.3.8",
-    "rimraf": "^2.5.0"
+    "eslint": "^3.17.1",
+    "pulp": "^10.0.4",
+    "purescript-psa": "^0.5.0-rc.1",
+    "rimraf": "^2.6.1"
   }
 }

bower.json

@@ -18,7 +18,6 @@ module Data.Map
   , findMax
   , fromFoldable
   , fromFoldableWith
-  , toList
   , toUnfoldable
   , toAscUnfoldable
   , delete
@@ -98,7 +97,7 @@ instance traversableMap :: Traversable (Map k) where
   sequence = traverse id
 
 -- | Render a `Map` as a `String`
-showTree :: forall k v. (Show k, Show v) => Map k v -> String
+showTree :: forall k v. Show k => Show v => Map k v -> String
 showTree Leaf = "Leaf"
 showTree (Two left k v right) =
   "Two (" <> showTree left <>
@@ -164,7 +163,7 @@ lookup = unsafePartial \k tree ->
 
 
 -- | Lookup a value for the specified key, or the greatest one less than it
-lookupLE :: forall k v. (Ord k) => k -> Map k v -> Maybe { key :: k, value :: v }
+lookupLE :: forall k v. Ord k => k -> Map k v -> Maybe { key :: k, value :: v }
 lookupLE _ Leaf = Nothing
 lookupLE k (Two left k1 v1 right) = case compare k k1 of
   EQ -> Just { key: k1, value: v1 }
@@ -176,7 +175,7 @@ lookupLE k (Three left k1 v1 mid k2 v2 right) = case compare k k2 of
   LT -> lookupLE k $ Two left k1 v1 mid
 
 -- | Lookup a value for the greatest key less than the specified key
-lookupLT :: forall k v. (Ord k) => k -> Map k v -> Maybe { key :: k, value :: v }
+lookupLT :: forall k v. Ord k => k -> Map k v -> Maybe { key :: k, value :: v }
 lookupLT _ Leaf = Nothing
 lookupLT k (Two left k1 v1 right) = case compare k k1 of
   EQ -> findMax left
@@ -188,7 +187,7 @@ lookupLT k (Three left k1 v1 mid k2 v2 right) = case compare k k2 of
   LT -> lookupLT k $ Two left k1 v1 mid
 
 -- | Lookup a value for the specified key, or the least one greater than it
-lookupGE :: forall k v. (Ord k) => k -> Map k v -> Maybe { key :: k, value :: v }
+lookupGE :: forall k v. Ord k => k -> Map k v -> Maybe { key :: k, value :: v }
 lookupGE _ Leaf = Nothing
 lookupGE k (Two left k1 v1 right) = case compare k k1 of
   EQ -> Just { key: k1, value: v1 }
@@ -200,7 +199,7 @@ lookupGE k (Three left k1 v1 mid k2 v2 right) = case compare k k1 of
   GT -> lookupGE k $ Two mid k2 v2 right
 
 -- | Lookup a value for the least key greater than the specified key
-lookupGT :: forall k v. (Ord k) => k -> Map k v -> Maybe { key :: k, value :: v }
+lookupGT :: forall k v. Ord k => k -> Map k v -> Maybe { key :: k, value :: v }
 lookupGT _ Leaf = Nothing
 lookupGT k (Two left k1 v1 right) = case compare k k1 of
   EQ -> findMin right
@@ -371,21 +370,16 @@ update f k m = alter (maybe Nothing f) k m
 
 -- | Convert any foldable collection of key/value pairs to a map.
 -- | On key collision, later values take precedence over earlier ones.
-fromFoldable :: forall f k v. (Ord k, Foldable f) => f (Tuple k v) -> Map k v
+fromFoldable :: forall f k v. Ord k => Foldable f => f (Tuple k v) -> Map k v
 fromFoldable = foldl (\m (Tuple k v) -> insert k v m) empty
 
 -- | Convert any foldable collection of key/value pairs to a map.
 -- | On key collision, the values are configurably combined.
-fromFoldableWith :: forall f k v. (Ord k, Foldable f) => (v -> v -> v) -> f (Tuple k v) -> Map k v
+fromFoldableWith :: forall f k v. Ord k => Foldable f => (v -> v -> v) -> f (Tuple k v) -> Map k v
 fromFoldableWith f = foldl (\m (Tuple k v) -> alter (combine v) k m) empty where
   combine v (Just v') = Just $ f v v'
   combine v Nothing = Just v
 
--- | Convert a map to a list of key/value pairs.
--- | DEPRECATED: use toUnfoldable or toAscUnfoldable instead.
-toList :: forall k v. Map k v -> List (Tuple k v)
-toList = toAscUnfoldable
-
 -- | Convert a map to an unfoldable structure of key/value pairs
 toUnfoldable :: forall f k v. Unfoldable f => Map k v -> f (Tuple k v)
 toUnfoldable m = unfoldr go (m : Nil) where
@@ -427,7 +421,7 @@ values (Three left _ v1 mid _ v2 right) = values left <> pure v1 <> values mid <
 -- | Compute the union of two maps, using the specified function
 -- | to combine values for duplicate keys.
 unionWith :: forall k v. Ord k => (v -> v -> v) -> Map k v -> Map k v -> Map k v
-unionWith f m1 m2 = foldl go m2 (toList m1)
+unionWith f m1 m2 = foldl go m2 (toUnfoldable m1 :: List (Tuple k v))
   where
   go m (Tuple k v) = alter (Just <<< maybe v (f v)) k m
 
@@ -437,7 +431,7 @@ union :: forall k v. Ord k => Map k v -> Map k v -> Map k v
 union = unionWith const
 
 -- | Compute the union of a collection of maps
-unions :: forall k v f. (Ord k, Foldable f) => f (Map k v) -> Map k v
+unions :: forall k v f. Ord k => Foldable f => f (Map k v) -> Map k v
 unions = foldl union empty
 
 -- | Calculate the number of key/value pairs in a map

package.json

@@ -1,8 +1,5 @@
-/* global exports */
 "use strict";
 
-// module Data.StrMap
-
 exports._copyEff = function (m) {
   return function () {
     var r = {};
@@ -21,7 +18,6 @@ exports.runST = function (f) {
   return f;
 };
 
-// jshint maxparams: 2
 exports._fmapStrMap = function (m0, f) {
   var m = {};
   for (var k in m0) {
@@ -32,7 +28,6 @@ exports._fmapStrMap = function (m0, f) {
   return m;
 };
 
-// jshint maxparams: 2
 exports._mapWithKey = function (m0, f) {
   var m = {};
   for (var k in m0) {
@@ -43,7 +38,6 @@ exports._mapWithKey = function (m0, f) {
   return m;
 };
 
-// jshint maxparams: 1
 exports._foldM = function (bind) {
   return function (f) {
     return function (mz) {
@@ -65,20 +59,19 @@ exports._foldM = function (bind) {
   };
 };
 
-// jshint maxparams: 4
 exports._foldSCStrMap = function (m, z, f, fromMaybe) {
+  var acc = z;
   for (var k in m) {
     if (hasOwnProperty.call(m, k)) {
-      var maybeR = f(z)(k)(m[k]);
+      var maybeR = f(acc)(k)(m[k]);
       var r = fromMaybe(null)(maybeR);
-      if (r === null) return z;
-      else z = r;
+      if (r === null) return acc;
+      else acc = r;
     }
   }
-  return z;
+  return acc;
 };
 
-// jshint maxparams: 1
 exports.all = function (f) {
   return function (m) {
     for (var k in m) {
@@ -98,18 +91,15 @@ exports.size = function (m) {
   return s;
 };
 
-// jshint maxparams: 4
 exports._lookup = function (no, yes, k, m) {
   return k in m ? yes(m[k]) : no;
 };
 
-// jshint maxparams: 2
 exports._unsafeDeleteStrMap = function (m, k) {
   delete m[k];
   return m;
 };
 
-// jshint maxparams: 4
 exports._lookupST = function (no, yes, k, m) {
   return function () {
     return k in m ? yes(m[k]) : no;

src/Data/Map.purs

@@ -54,7 +54,7 @@ import Data.Tuple (Tuple(..), uncurry)
 import Data.Unfoldable (class Unfoldable)
 
 -- | `StrMap a` represents a map from `String`s to values of type `a`.
-foreign import data StrMap :: * -> *
+foreign import data StrMap :: Type -> Type
 
 foreign import _copyEff :: forall a b h r. a -> Eff (st :: ST.ST h | r) b
 
@@ -94,13 +94,13 @@ fold = _foldM ((#))
 
 -- | Fold the keys and values of a map, accumulating values using
 -- | some `Monoid`.
-foldMap :: forall a m. (Monoid m) => (String -> a -> m) -> StrMap a -> m
+foldMap :: forall a m. Monoid m => (String -> a -> m) -> StrMap a -> m
 foldMap f = fold (\acc k v -> acc <> f k v) mempty
 
 -- | Fold the keys and values of a map, accumulating values and effects in
 -- | some `Monad`.
-foldM :: forall a m z. (Monad m) => (z -> String -> a -> m z) -> z -> StrMap a -> m z
-foldM f z = _foldM (>>=) f (pure z)
+foldM :: forall a m z. Monad m => (z -> String -> a -> m z) -> z -> StrMap a -> m z
+foldM f z = _foldM bind f (pure z)
 
 instance foldableStrMap :: Foldable StrMap where
   foldl f = fold (\z _ -> f z)
@@ -136,7 +136,7 @@ instance showStrMap :: (Show a) => Show (StrMap a) where
 foreign import empty :: forall a. StrMap a
 
 -- | Test whether one map contains all of the keys and values contained in another map
-isSubmap :: forall a. (Eq a) => StrMap a -> StrMap a -> Boolean
+isSubmap :: forall a. Eq a => StrMap a -> StrMap a -> Boolean
 isSubmap m1 m2 = all f m1 where
   f k v = runFn4 _lookup false ((==) v) k m2