Update for PureScript 0.11

garyb · garyb · commit 2e5b605db6ac · 2017-03-26T03:57:20.000+01:00
diff --git a/.eslintrc.json b/.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"]
+  }
+}
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,6 @@
 /.*
 !/.gitignore
-!/.jscsrc
-!/.jshintrc
+!/.eslintrc.json
 !/.travis.yml
 /bower_components/
 /node_modules/
diff --git a/.jscsrc b/.jscsrc
diff --git a/.jshintrc b/.jshintrc
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
 language: node_js
 dist: trusty
 sudo: required
-node_js: 6
+node_js: stable
 env:
   - PATH=$HOME/purescript:$PATH
 install:
diff --git a/bower.json b/bower.json
@@ -16,18 +16,18 @@
     "package.json"
   ],
   "dependencies": {
-    "purescript-foldable-traversable": "^2.0.0",
-    "purescript-nonempty": "^3.0.0",
-    "purescript-partial": "^1.1.0",
-    "purescript-st": "^2.0.0",
-    "purescript-tailrec": "^2.0.0",
-    "purescript-tuples": "^3.0.0",
-    "purescript-unfoldable": "^2.0.0",
-    "purescript-unsafe-coerce": "^2.0.0"
+    "purescript-foldable-traversable": "^3.0.0",
+    "purescript-nonempty": "^4.0.0",
+    "purescript-partial": "^1.2.0",
+    "purescript-st": "^3.0.0",
+    "purescript-tailrec": "^3.0.0",
+    "purescript-tuples": "^4.0.0",
+    "purescript-unfoldable": "^3.0.0",
+    "purescript-unsafe-coerce": "^3.0.0"
   },
   "devDependencies": {
-    "purescript-assert": "^2.0.0",
-    "purescript-console": "^2.0.0",
-    "purescript-const": "^2.0.0"
+    "purescript-assert": "^3.0.0",
+    "purescript-console": "^3.0.0",
+    "purescript-const": "^3.0.0"
   }
 }
diff --git a/package.json b/package.json
@@ -2,14 +2,13 @@
   "private": true,
   "scripts": {
     "clean": "rimraf output && rimraf .pulp-cache",
-    "build": "jshint src && jscs src && pulp build --censor-lib --strict",
+    "build": "eslint src && pulp build -- --censor-lib --strict",
     "test": "pulp test"
   },
   "devDependencies": {
-    "jscs": "^2.8.0",
-    "jshint": "^2.9.1",
-    "pulp": "^9.0.1",
-    "purescript-psa": "^0.3.9",
-    "rimraf": "^2.5.0"
+    "eslint": "^3.17.1",
+    "pulp": "^10.0.4",
+    "purescript-psa": "^0.5.0-rc.1",
+    "rimraf": "^2.6.1"
   }
 }
diff --git a/src/Data/Array.js b/src/Data/Array.js
@@ -8,8 +8,10 @@ exports.range = function (start) {
   return function (end) {
     var step = start > end ? -1 : 1;
     var result = [];
-    for (var i = start, n = 0; i !== end; i += step) {
+    var i = start, n = 0;
+    while (i !== end) {
       result[n++] = i;
+      i += step;
     }
     result[n] = i;
     return result;
@@ -44,9 +46,10 @@ exports.fromFoldableImpl = (function () {
   function listToArray(list) {
     var result = [];
     var count = 0;
-    while (list !== emptyList) {
-      result[count++] = list.head;
-      list = list.tail;
+    var xs = list;
+    while (xs !== emptyList) {
+      result[count++] = xs.head;
+      xs = xs.tail;
     }
     return result;
   }
diff --git a/src/Data/Array.purs b/src/Data/Array.purs
@@ -164,15 +164,15 @@ infix 8 range as ..
 -- |
 -- | The `Lazy` constraint is used to generate the result lazily, to ensure
 -- | termination.
-some :: forall f a. (Alternative f, Lazy (f (Array a))) => f a -> f (Array a)
+some :: forall f a. Alternative f => Lazy (f (Array a)) => f a -> f (Array a)
 some v = (:) <$> v <*> defer (\_ -> many v)
 
 -- | Attempt a computation multiple times, returning as many successful results
 -- | as possible (possibly zero).
 -- |
 -- | The `Lazy` constraint is used to generate the result lazily, to ensure
 -- | termination.
-many :: forall f a. (Alternative f, Lazy (f (Array a))) => f a -> f (Array a)
+many :: forall f a. Alternative f => Lazy (f (Array a)) => f a -> f (Array a)
 many v = some v <|> pure []
 
 --------------------------------------------------------------------------------
diff --git a/src/Data/Array/ST.purs b/src/Data/Array/ST.purs
@@ -31,7 +31,7 @@ import Unsafe.Coerce (unsafeCoerce)
 -- |
 -- | The runtime representation of a value of type `STArray h a` is the same as that of `Array a`,
 -- | except that mutation is allowed.
-foreign import data STArray :: * -> * -> *
+foreign import data STArray :: Type -> Type -> Type
 
 -- | An element and its index.
 type Assoc a = { value :: a, index :: Int }
diff --git a/test/Test/Data/Array/ST.purs b/test/Test/Data/Array/ST.purs
@@ -33,25 +33,25 @@ testArrayST = do
 
   assert $ run (do
     arr <- emptySTArray
-    pushSTArray arr 1
-    pushSTArray arr 2
+    void $ pushSTArray arr 1
+    void $ pushSTArray arr 2
     pure arr) == [1, 2]
 
   assert $ run (do
     arr <- thaw [1, 2, 3]
-    pushSTArray arr 4
+    void $ pushSTArray arr 4
     pure arr) == [1, 2, 3, 4]
 
   log "pushAllSTArray should append multiple values to the end of the array"
 
   assert $ run (do
     arr <- emptySTArray
-    pushAllSTArray arr [1, 2]
+    void $ pushAllSTArray arr [1, 2]
     pure arr) == [1, 2]
 
   assert $ run (do
     arr <- thaw [1, 2, 3]
-    pushAllSTArray arr [4, 5, 6]
+    void $ pushAllSTArray arr [4, 5, 6]
     pure arr) == [1, 2, 3, 4, 5, 6]
 
   log "peekSTArray should return Nothing when peeking a value outside the array bounds"
@@ -106,21 +106,21 @@ testArrayST = do
 
   assert $ run (do
     arr <- thaw [1]
-    pokeSTArray arr 0 10
+    void $ pokeSTArray arr 0 10
     pure arr) == [10]
 
   log "pokeSTArray should do nothing when attempting to modify a value outside the array bounds"
 
   assert $ run (do
     arr <- thaw [1]
-    pokeSTArray arr 1 2
+    void $ pokeSTArray arr 1 2
     pure arr) == [1]
 
   log "spliceSTArray should be able to delete multiple items at a specified index"
 
   assert $ run (do
     arr <- thaw [1, 2, 3, 4, 5]
-    spliceSTArray arr 1 3 []
+    void $ spliceSTArray arr 1 3 []
     pure arr) == [1, 5]
 
   log "spliceSTArray should return the items removed"
@@ -133,14 +133,14 @@ testArrayST = do
 
   assert $ run (do
     arr <- thaw [1, 2, 3, 4, 5]
-    spliceSTArray arr 1 0 [0, 100]
+    void $ spliceSTArray arr 1 0 [0, 100]
     pure arr) == [1, 0, 100, 2, 3, 4, 5]
 
   log "spliceSTArray should be able to delete and insert at the same time"
 
   assert $ run (do
     arr <- thaw [1, 2, 3, 4, 5]
-    spliceSTArray arr 1 2 [0, 100]
+    void $ spliceSTArray arr 1 2 [0, 100]
     pure arr) == [1, 0, 100, 4, 5]
 
   log "toAssocArray should return all items in the array with the correct indices and values"
diff --git a/test/Test/Main.purs b/test/Test/Main.purs
@@ -1,6 +1,6 @@
 module Test.Main where
 
-import Prelude (bind, Unit)
+import Prelude
 
 import Control.Monad.Eff (Eff)
 import Control.Monad.Eff.Console (CONSOLE)
