Update to PureScript v0.15.0 (#15)

* 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 Bower dependencies to master or main

* Update pulp to 16.0.0-0

* Update psa to 0.8.2

* Update .eslintrc.json to ES6

* Added changelog entry

* Update CI to use node 14

* Fix unused name warning

* Try to fix node test

* Fix Test.Main import

* Revert import order back to original

* Use async import before running tests

`global` isn't assigned until all modules are imprted
By wrapping it in an async/await block,
we defer importing Test.Main
until after XPathResult hsa been defined

Author: JordanMartinez

.eslintrc.json

@@ -1,10 +1,10 @@
 {
   "parserOptions": {
-    "ecmaVersion": 5
+    "ecmaVersion": 6,
+    "sourceType": "module"
   },
   "extends": "eslint:recommended",
   "env": {
-    "commonjs": true,
     "browser": true
   },
   "rules": {

.github/workflows/ci.yml

@@ -13,10 +13,12 @@ jobs:
       - uses: actions/checkout@v2
 
       - uses: purescript-contrib/setup-purescript@main
+        with:
+          purescript: "unstable"
 
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v2
         with:
-          node-version: "10"
+          node-version: "14"
 
       - name: Install dependencies
         run: |

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 (#15 by @JordanMartinez)
 
 New features:
 

bower.json

@@ -15,13 +15,13 @@
     "package.json"
   ],
   "dependencies": {
-    "purescript-web-dom": "^5.0.0"
+    "purescript-web-dom": "master"
   },
   "devDependencies": {
-    "purescript-aff": "^6.0.0",
-    "purescript-assert": "^5.0.0",
-    "purescript-console": "^5.0.0",
-    "purescript-foreign": "^6.0.0",
-    "purescript-web-dom-parser": "^7.0.0"
+    "purescript-aff": "main",
+    "purescript-assert": "master",
+    "purescript-console": "master",
+    "purescript-foreign": "master",
+    "purescript-web-dom-parser": "master"
   }
 }

package.json

@@ -4,15 +4,15 @@
   "scripts": {
     "clean": "rimraf output && rimraf .pulp-cache",
     "build": "eslint src && pulp build -- --censor-lib --strict",
-    "test": "eslint src && pulp build -I \"test\" -- --censor-lib && node test/node.js",
+    "test": "eslint src && pulp build -I \"test\" -- --censor-lib && node test/node.mjs",
     "testbrowser": "./scripts/testbrowser"
   },
   "devDependencies": {
     "eslint": "^7.15.0",
     "jsdom": "^16.4.0",
     "parcel-bundler": "^1.12.4",
-    "pulp": "^15.0.0",
-    "purescript-psa": "^0.8.0",
+    "pulp": "16.0.0-0",
+    "purescript-psa": "^0.8.2",
     "rimraf": "^3.0.2"
   }
 }

src/Web/DOM/XPath.js

@@ -1,6 +1,4 @@
-"use strict";
-
-exports.evaluateInternal = function (xpathExpression) {
+export function evaluateInternal(xpathExpression) {
   return function (contextNode) {
     return function (namespaceResolver) {
       return function (resultType) {
@@ -20,83 +18,82 @@ exports.evaluateInternal = function (xpathExpression) {
       };
     };
   };
-};
-
+}
 
 //       --- XPathResult functions ---
 
-exports.resultType = function (xpathResult) {
+export function resultType(xpathResult) {
   return xpathResult.resultType;
-};
+}
 
-exports.numberValue = function (xpathResult) {
+export function numberValue(xpathResult) {
   return function () { // Effect thunk
     return xpathResult.numberValue;
   };
-};
+}
 
-exports.stringValue = function (xpathResult) {
+export function stringValue(xpathResult) {
   return function () { // Effect thunk
     return xpathResult.stringValue;
   };
-};
+}
 
-exports.booleanValue = function (xpathResult) {
+export function booleanValue(xpathResult) {
   return function () { // Effect thunk
     return xpathResult.booleanValue;
   };
-};
+}
 
-exports.singleNodeValueInternal = function (xpathResult) {
+export function singleNodeValueInternal(xpathResult) {
   return function () { // Effect thunk
     return xpathResult.singleNodeValue;
   };
-};
+}
 
-exports.invalidIteratorState = function (xpathResult) {
+export function invalidIteratorState(xpathResult) {
   return xpathResult.invalidIteratorState;
-};
+}
 
-exports.snapshotLengthInternal = function (xpathResult) {
+export function snapshotLengthInternal(xpathResult) {
   return function () { // Effect thunk
     return xpathResult.snapshotLength;
   };
-};
+}
 
-exports.iterateNextInternal = function (xpathResult) {
+export function iterateNextInternal(xpathResult) {
   return function () { // Effect thunk
     return xpathResult.iterateNext();
   };
-};
+}
 
-exports.snapshotItemInternal = function (xpathResult) {
+export function snapshotItemInternal(xpathResult) {
   return function (index) {
     return function () { // Effect thunk
       return xpathResult.snapshotItem(index);
     };
   };
-};
+}
 
 //       --- namespace resolver functions ---
 
-exports.customNSResolver = function (customRes) {
+export function customNSResolver(customRes) {
   var nsResolver = {
     lookupNamespaceURI : customRes
   };
   return nsResolver;
-};
+}
 
-exports.createNSResolver = function (nodeResolver) {
+export function createNSResolver(nodeResolver) {
   return function (doc) {
     return doc.createNSResolver(nodeResolver);
   };
-};
+}
 
-exports.lookupNamespaceURIInternal = function (nsResolver) {
+export function lookupNamespaceURIInternal(nsResolver) {
   return function (prefix) {
     return nsResolver.lookupNamespaceURI(prefix);
   };
-};
+}
 
 // exports._makeEmptyDoc = function () {  // Effect thunk
 //     var doc = (new DOMParser()).parseFromString('<dummy/>', 'application/xml');

src/Web/DOM/XPath/ResultType.js

@@ -1,13 +1,11 @@
-"use strict";
-
-exports.any_type = XPathResult.ANY_TYPE;
-exports.number_type = XPathResult.NUMBER_TYPE;
-exports.string_type = XPathResult.STRING_TYPE;
-exports.boolean_type = XPathResult.BOOLEAN_TYPE;
-exports.unordered_node_iterator_type = XPathResult.UNORDERED_NODE_ITERATOR_TYPE;
-exports.ordered_node_iterator_type  = XPathResult.ORDERED_NODE_ITERATOR_TYPE;
-exports.unordered_node_snapshot_type = XPathResult.UNORDERED_NODE_SNAPSHOT_TYPE;
-exports.ordered_node_snapshot_type = XPathResult.ORDERED_NODE_SNAPSHOT_TYPE;
-exports.any_unordered_node_type = XPathResult.ANY_UNORDERED_NODE_TYPE;
-exports.first_ordered_node_type = XPathResult.FIRST_ORDERED_NODE_TYPE;
+export const any_type = XPathResult.ANY_TYPE;
+export const number_type = XPathResult.NUMBER_TYPE;
+export const string_type = XPathResult.STRING_TYPE;
+export const boolean_type = XPathResult.BOOLEAN_TYPE;
+export const unordered_node_iterator_type = XPathResult.UNORDERED_NODE_ITERATOR_TYPE;
+export const ordered_node_iterator_type = XPathResult.ORDERED_NODE_ITERATOR_TYPE;
+export const unordered_node_snapshot_type = XPathResult.UNORDERED_NODE_SNAPSHOT_TYPE;
+export const ordered_node_snapshot_type = XPathResult.ORDERED_NODE_SNAPSHOT_TYPE;
+export const any_unordered_node_type = XPathResult.ANY_UNORDERED_NODE_TYPE;
+export const first_ordered_node_type = XPathResult.FIRST_ORDERED_NODE_TYPE;
 

test/Main.purs

@@ -169,7 +169,7 @@ main { browser } = launchAff_ $ flip runReaderT "" do
     test "NS resolver construction" do
       domParser <- liftEffect $ makeDOMParser
 
-      customRes <- pure $ XP.customNSResolver (\x -> "http://foo.com")
+      customRes <- pure $ XP.customNSResolver (\_ -> "http://foo.com")
 
       assertFalse "custom NS resolver shouldn't be undefined"
         (isUndefined $ unsafeToForeign customRes)

test/node.js

@@ -0,0 +1,9 @@
+import {JSDOM} from "jsdom";
+const { XPathResult, DOMParser } = new JSDOM().window;
+
+Object.assign(global, { XPathResult, DOMParser });
+
+(async () => {
+  const { main } = await import("../output/Test.Main/index.js");
+  main({ browser: false })();
+})();