Update for PureScript 0.15

Author: garyb

.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,

bower.json

@@ -20,14 +20,14 @@
     "package.json"
   ],
   "dependencies": {
-    "purescript-prelude": "^5.0.1",
-    "purescript-functions": "^5.0.0",
-    "purescript-maybe": "^5.0.0",
-    "purescript-either": "^5.0.0",
-    "purescript-st": "^5.0.1",
-    "purescript-tuples": "^6.0.1",
-    "purescript-foldable-traversable": "^5.0.1",
-    "purescript-gen": "^3.0.0",
-    "purescript-strings": "^5.0.0"
+    "purescript-prelude": "^6.0.1",
+    "purescript-functions": "^6.0.0",
+    "purescript-maybe": "^6.0.0",
+    "purescript-either": "^6.1.0",
+    "purescript-st": "^6.2.0",
+    "purescript-tuples": "^7.0.0",
+    "purescript-foldable-traversable": "^6.0.0",
+    "purescript-gen": "^4.0.0",
+    "purescript-strings": "^6.0.1"
   }
 }

package.json

@@ -2,14 +2,13 @@
   "private": true,
   "scripts": {
     "clean": "rimraf output && rimraf .pulp-cache",
-    "build": "eslint src && purs-tidy check --config-require src/**/*.purs && pulp build -- --censor-lib --strict",
-    "test": "pulp test"
+    "build": "eslint src && purs-tidy check --config-require src/**/*.purs && pulp build -- --censor-lib --strict"
   },
   "devDependencies": {
-    "eslint": "^8.7.0",
-    "pulp": "^15.0.0",
+    "eslint": "^8.25.0",
+    "pulp": "^16.0.2",
     "purescript-psa": "^0.8.2",
-    "purs-tidy": "^0.6.4",
+    "purs-tidy": "^0.9.2",
     "rimraf": "^3.0.2"
   }
 }

src/Json/Internal.js

@@ -1,9 +1,8 @@
-"use strict";
+const toString = Object.prototype.toString;
+const hasOwnProperty = Object.prototype.hasOwnProperty;
+const coerce = (x) => x;
 
-var toString = Object.prototype.toString;
-var hasOwnProperty = Object.prototype.hasOwnProperty;
-
-exports._parse = function (left, right, s) {
+export const _parse = (left, right, s) => {
   try {
     return right(JSON.parse(s));
   }
@@ -12,57 +11,36 @@ exports._parse = function (left, right, s) {
   }
 };
 
-exports.print = function (j) {
-  return JSON.stringify(j);
-};
+export const print = (j) => JSON.stringify(j);
 
-exports.printIndented = function (j) {
-  return JSON.stringify(j, null, 2);
-};
+export const printIndented = (j) => JSON.stringify(j, null, 2);
 
-exports._case = function (isNull, isBool, isNum, isStr, isArr, isObj, j) {
+export const _case = (isNull, isBool, isNum, isStr, isArr, isObj, j) => {
   if (j == null) return isNull(null);
-  var ty = typeof j;
+  const ty = typeof j;
   if (ty === "boolean") return isBool(j);
   if (ty === "number") return isNum(j);
   if (ty === "string") return isStr(j);
   if (toString.call(j) === "[object Array]") return isArr(j);
   return isObj(j);
 };
 
-exports._null = null;
+export const _null = null;
 
-var coerce = function (x) {
-  return x;
-};
+export const fromBoolean = coerce;
 
-exports.fromBoolean = coerce;
+export const fromNumberWithDefault = (fallback) => (n) => isNaN(n) || !isFinite(n) ? fallback : n;
 
-exports.fromNumberWithDefault = function (x) {
-  return function (y) {
-    if (isNaN(y) || !isFinite(y)) return x;
-    return y;
-  };
-};
+export const fromInt = coerce;
 
-exports.fromInt = coerce;
+export const fromString = coerce;
 
-exports.fromString = coerce;
+export const fromArray = coerce;
 
-exports.fromArray = coerce;
+export const fromObject = coerce;
 
-exports.fromObject = coerce;
+export const _entries = (tuple, obj) =>
+  Object.entries(obj).map(([k, v]) => tuple(k)(v));
 
-exports._entries = function (tuple, obj) {
-  var result = [];
-  for (var k in obj) {
-    if (hasOwnProperty.call(obj, k)) {
-      result[k] = tuple(k, obj[k]);
-    }
-  }
-  return result;
-};
-
-exports._lookup = function (nothing, just, key, obj) {
-  return hasOwnProperty.call(obj, key) ? just(obj[key]) : nothing;
-};
+export const _lookup = (nothing, just, key, obj) =>
+  hasOwnProperty.call(obj, key) ? just(obj[key]) : nothing;

src/Json/Object/ST.js

@@ -1,33 +1,15 @@
-"use strict";
-
-var hasOwnProperty = {}.hasOwnProperty;
-
-exports.new = function () {
+export const _new = () => {
   return {};
 };
 
-exports._poke = function (k, v, obj) {
-  return function () {
-    obj[k] = v;
-  };
+export const _poke = (k, v, obj) => () => {
+  obj[k] = v;
 };
 
-var copy = function (obj) {
-  return function () {
-    var r = {};
-    for (var k in obj) {
-      if (hasOwnProperty.call(obj, k)) {
-        r[k] = obj[k];
-      }
-    }
-    return r;
-  };
-};
+const copy = (obj) => () => Object.assign({}, obj);
 
-exports.freeze = copy;
+export const freeze = copy;
 
-exports.thaw = copy;
+export const thaw = copy;
 
-exports.run = function (f) {
-  return f();
-};
+export const run = (f) => f();

src/Json/Object/ST.purs

@@ -15,7 +15,10 @@ import Json.Internal (Json, Object)
 
 foreign import data STObject :: Region -> Type
 
-foreign import new :: forall r. ST r (STObject r)
+new :: forall r. ST r (STObject r)
+new = _new
+
+foreign import _new :: forall r. ST r (STObject r)
 
 poke :: forall r. String -> Json -> STObject r -> ST r Unit
 poke key value obj = runFn3 _poke key value obj