Update to v0.15.0 (#27)

* Migrated FFI to ES modules via 'lebab'

* Replaced 'export var' with 'export const'

* Removed '"use strict";' in FFI files

* Update to CI to use 'unstable' purescript

* Update pulp to 16.0.0-0 and psa to 0.8.2

* Update Bower dependencies to master

* Update .eslintrc.json to ES6

* Fix FFI

* Fix compiler warnings

* Added changelog entry

* Just export toArrayWithkey

Author: JordanMartinez

.eslintrc.json

@@ -1,11 +1,9 @@
 {
   "parserOptions": {
-    "ecmaVersion": 5
+    "ecmaVersion": 6,
+    "sourceType": "module"
   },
   "extends": "eslint:recommended",
-  "env": {
-    "commonjs": true
-  },
   "rules": {
     "strict": [2, "global"],
     "block-scoped-var": 2,

.github/workflows/ci.yml

@@ -13,6 +13,8 @@ jobs:
       - uses: actions/checkout@v2
 
       - uses: purescript-contrib/setup-purescript@main
+        with:
+          purescript: "unstable"
 
       - uses: actions/setup-node@v1
         with:

CHANGELOG.md

@@ -5,6 +5,7 @@ Notable changes to this project are documented in this file. The format is based
 ## [Unreleased]
 
 Breaking changes:
+- Migrate FFI to ES modules (#27 by @JordanMartinez)
 
 New features:
 

bower.json

@@ -20,22 +20,22 @@
     "package.json"
   ],
   "dependencies": {
-    "purescript-arrays": "^6.0.0",
-    "purescript-foldable-traversable": "^5.0.0",
-    "purescript-functions": "^5.0.0",
-    "purescript-gen": "^3.0.0",
-    "purescript-lists": "^6.0.0",
-    "purescript-maybe": "^5.0.0",
-    "purescript-prelude": "^5.0.0",
-    "purescript-st": "^5.0.0",
-    "purescript-tailrec": "^5.0.0",
-    "purescript-tuples": "^6.0.0",
-    "purescript-typelevel-prelude": "^6.0.0",
-    "purescript-unfoldable": "^5.0.0"
+    "purescript-arrays": "master",
+    "purescript-foldable-traversable": "master",
+    "purescript-functions": "master",
+    "purescript-gen": "master",
+    "purescript-lists": "master",
+    "purescript-maybe": "master",
+    "purescript-prelude": "master",
+    "purescript-st": "master",
+    "purescript-tailrec": "master",
+    "purescript-tuples": "master",
+    "purescript-typelevel-prelude": "master",
+    "purescript-unfoldable": "master"
   },
   "devDependencies": {
-    "purescript-assert": "^5.0.0",
-    "purescript-minibench": "^3.0.0",
-    "purescript-quickcheck": "^7.0.0"
+    "purescript-assert": "master",
+    "purescript-minibench": "master",
+    "purescript-quickcheck": "master"
   }
 }

package.json

@@ -4,15 +4,14 @@
     "clean": "rimraf output && rimraf .pulp-cache",
     "build": "eslint src && pulp build -- --censor-lib --strict",
     "test": "pulp test",
-
     "bench:build": "purs compile 'bench/**/*.purs' 'src/**/*.purs' 'bower_components/*/src/**/*.purs'",
     "bench:run": "node -e 'require(\"./output/Bench.Main/index.js\").main()'",
     "bench": "npm run bench:build && npm run bench:run"
   },
   "devDependencies": {
     "eslint": "^7.15.0",
-    "pulp": "^15.0.0",
-    "purescript-psa": "^0.8.0",
+    "pulp": "16.0.0-0",
+    "purescript-psa": "^0.8.2",
     "rimraf": "^3.0.2"
   }
 }

src/Foreign/Object.js

@@ -1,6 +1,4 @@
-"use strict";
-
-exports._copyST = function (m) {
+export function _copyST(m) {
   return function () {
     var r = {};
     for (var k in m) {
@@ -10,35 +8,35 @@ exports._copyST = function (m) {
     }
     return r;
   };
-};
+}
 
-exports.empty = {};
+export const empty = {};
 
-exports.runST = function (f) {
+export function runST(f) {
   return f();
-};
+}
 
-exports._fmapObject = function (m0, f) {
+export function _fmapObject(m0, f) {
   var m = {};
   for (var k in m0) {
     if (hasOwnProperty.call(m0, k)) {
       m[k] = f(m0[k]);
     }
   }
   return m;
-};
+}
 
-exports._mapWithKey = function (m0, f) {
+export function _mapWithKey(m0, f) {
   var m = {};
   for (var k in m0) {
     if (hasOwnProperty.call(m0, k)) {
       m[k] = f(k)(m0[k]);
     }
   }
   return m;
-};
+}
 
-exports._foldM = function (bind) {
+export function _foldM(bind) {
   return function (f) {
     return function (mz) {
       return function (m) {
@@ -57,9 +55,9 @@ exports._foldM = function (bind) {
       };
     };
   };
-};
+}
 
-exports._foldSCObject = function (m, z, f, fromMaybe) {
+export function _foldSCObject(m, z, f, fromMaybe) {
   var acc = z;
   for (var k in m) {
     if (hasOwnProperty.call(m, k)) {
@@ -70,38 +68,38 @@ exports._foldSCObject = function (m, z, f, fromMaybe) {
     }
   }
   return acc;
-};
+}
 
-exports.all = function (f) {
+export function all(f) {
   return function (m) {
     for (var k in m) {
       if (hasOwnProperty.call(m, k) && !f(k)(m[k])) return false;
     }
     return true;
   };
-};
+}
 
-exports.size = function (m) {
+export function size(m) {
   var s = 0;
   for (var k in m) {
     if (hasOwnProperty.call(m, k)) {
       ++s;
     }
   }
   return s;
-};
+}
 
-exports._lookup = function (no, yes, k, m) {
+export function _lookup(no, yes, k, m) {
   return k in m ? yes(m[k]) : no;
-};
+}
 
-exports._lookupST = function (no, yes, k, m) {
+export function _lookupST(no, yes, k, m) {
   return function () {
     return k in m ? yes(m[k]) : no;
   };
-};
+}
 
-function toArrayWithKey(f) {
+export function toArrayWithKey(f) {
   return function (m) {
     var r = [];
     for (var k in m) {
@@ -113,8 +111,6 @@ function toArrayWithKey(f) {
   };
 }
 
-exports.toArrayWithKey = toArrayWithKey;
-
-exports.keys = Object.keys || toArrayWithKey(function (k) {
+export const keys = Object.keys || toArrayWithKey(function (k) {
   return function () { return k; };
 });

src/Foreign/Object/ST.js

@@ -1,10 +1,9 @@
-"use strict";
-
-exports["new"] = function () {
+const newImpl = function () {
   return {};
 };
+export { newImpl as new };
 
-exports.peekImpl = function (just) {
+export function peekImpl(just) {
   return function (nothing) {
     return function (k) {
       return function (m) {
@@ -14,9 +13,9 @@ exports.peekImpl = function (just) {
       };
     };
   };
-};
+}
 
-exports.poke = function (k) {
+export function poke(k) {
   return function (v) {
     return function (m) {
       return function () {
@@ -25,13 +24,14 @@ exports.poke = function (k) {
       };
     };
   };
-};
+}
 
-exports["delete"] = function (k) {
+const deleteImpl = function (k) {
   return function (m) {
     return function () {
       delete m[k];
       return m;
     };
   };
 };
+export { deleteImpl as delete };

src/Foreign/Object/ST/Unsafe.js

@@ -1,7 +1,5 @@
-"use strict";
-
-exports.unsafeFreeze = function (m) {
+export function unsafeFreeze(m) {
   return function () {
     return m;
   };
-};
+}

src/Foreign/Object/Unsafe.js

@@ -1,7 +1,5 @@
-"use strict";
-
-exports.unsafeIndex = function (m) {
+export function unsafeIndex(m) {
   return function (k) {
     return m[k];
   };
-};
+}

test/Test/Foreign/Object.purs

@@ -175,7 +175,7 @@ objectTests = do
 
   log "fromFoldableWith (<>) = fromFoldable . collapse with (<>) . group on fst"
   quickCheck $ \arr ->
-    let combine (Tuple s a) (Tuple t b) = (Tuple s $ b <> a)
+    let combine (Tuple s a) (Tuple _ b) = (Tuple s $ b <> a)
         foldl1 g = unsafePartial \(L.Cons x xs) -> foldl g x xs
         f = O.fromFoldable <<< map (foldl1 combine <<< NEL.toList) <<<
             L.groupBy ((==) `on` fst) <<< L.sortBy (compare `on` fst) in
@@ -230,7 +230,7 @@ objectTests = do
 
   log "foldMapWithIndex f ~ traverseWithIndex (\\k v -> tell (f k v))"
   quickCheck \(TestObject m :: TestObject Int) ->
-    let f k v = "(" <> "k" <> "," <> show v <> ")"
+    let f _ v = "(" <> "k" <> "," <> show v <> ")"
         resultA = foldMapWithIndex f m
         resultB = snd (runWriter (traverseWithIndex (\k v -> tell (f k v)) m))
     in resultA === resultB