From 47a8a5d67b0ca5fb7ada0fe9fc6e6bd6c65b42ed Mon Sep 17 00:00:00 2001 From: sigma-andex Date: Fri, 18 Feb 2022 21:04:41 +0000 Subject: [PATCH 01/11] Add support for es modules --- src/Node/Net.js | 11 ++--- src/Node/Net/Server.js | 28 +++++------ src/Node/Net/Socket.js | 104 ++++++++++++++++++++--------------------- 3 files changed, 70 insertions(+), 73 deletions(-) diff --git a/src/Node/Net.js b/src/Node/Net.js index 56d964d..61b1919 100644 --- a/src/Node/Net.js +++ b/src/Node/Net.js @@ -1,9 +1,6 @@ "use strict"; -var net = require("net"); - -exports.isIP = net.isIP; - -exports.isIPv4 = net.isIPv4; - -exports.isIPv6 = net.isIPv6; +import net from "net"; +export var isIP = net.isIP; +export var isIPv4 = net.isIPv4; +export var isIPv6 = net.isIPv6; diff --git a/src/Node/Net/Server.js b/src/Node/Net/Server.js index 8357db1..449b9fb 100644 --- a/src/Node/Net/Server.js +++ b/src/Node/Net/Server.js @@ -1,29 +1,29 @@ "use strict"; -var net = require("net"); +import net from "net"; -exports.addressImpl = function (server) { +export function addressImpl(server) { return server.address(); -}; +} -exports.closeImpl = function (server, callback) { +export function closeImpl(server, callback) { server.close(callback); -}; +} -exports.createServerImpl = net.createServer; +export var createServerImpl = net.createServer; -exports.getConnectionsImpl = function (server, callback) { +export function getConnectionsImpl(server, callback) { server.getConnections(callback); -}; +} -exports.listenImpl = function (server, options, callback) { +export function listenImpl(server, options, callback) { server.listen(options, callback); -}; +} -exports.listeningImpl = function (socket) { +export function listeningImpl(socket) { return socket.listening; -}; +} -exports.onImpl = function (event, server, callback) { +export function onImpl(event, server, callback) { server.on(event, callback); -}; +} diff --git a/src/Node/Net/Socket.js b/src/Node/Net/Socket.js index 6f16f29..d4b7707 100644 --- a/src/Node/Net/Socket.js +++ b/src/Node/Net/Socket.js @@ -1,54 +1,54 @@ "use strict"; -var net = require("net"); +import net from "net"; -exports.bufferSizeImpl = function (socket) { +export function bufferSizeImpl(socket) { return socket.bufferSize; -}; +} -exports.bytesReadImpl = function (socket) { +export function bytesReadImpl(socket) { return socket.bytesRead; -}; +} -exports.bytesWrittenImpl = function (socket) { +export function bytesWrittenImpl(socket) { return socket.bytesWritten; -}; +} -exports.connectImpl = function (socket, options, callback) { +export function connectImpl(socket, options, callback) { socket.connect(options, callback); -}; +} -exports.connectingImpl = function (socket) { +export function connectingImpl(socket) { return socket.connecting; -}; +} -exports.createConnectionImpl = net.createConnection; +export var createConnectionImpl = net.createConnection; -exports.destroyImpl = function (socket, err) { +export function destroyImpl(socket, err) { socket.destroy(err); -}; +} -exports.destroyedImpl = function (socket) { +export function destroyedImpl(socket) { return socket.destroyed; -}; +} -exports.endImpl = function (socket, buffer, callback) { +export function endImpl(socket, buffer, callback) { socket.end(buffer, null, callback); -}; +} -exports.endStringImpl = function (socket, str, encoding, callback) { +export function endStringImpl(socket, str, encoding, callback) { socket.end(str, encoding, callback); -}; +} -exports.localAddressImpl = function (socket) { +export function localAddressImpl(socket) { return socket.localAddress; -}; +} -exports.localPortImpl = function (socket) { +export function localPortImpl(socket) { return socket.localPort; -}; +} -exports.onDataImpl = function (socket, callbackBuffer, callbackString) { +export function onDataImpl(socket, callbackBuffer, callbackString) { socket.on("data", function (data) { if (typeof data === "string") { callbackString(data); @@ -56,56 +56,56 @@ exports.onDataImpl = function (socket, callbackBuffer, callbackString) { callbackBuffer(data); } }); -}; +} -exports.onImpl = function (event, socket, callback) { +export function onImpl(event, socket, callback) { socket.on(event, callback); -}; +} -exports.pauseImpl = function (socket) { +export function pauseImpl(socket) { socket.pause(); -}; +} -exports.pendingImpl = function (socket) { +export function pendingImpl(socket) { return socket.pending; -}; +} -exports.remoteAddressImpl = function (socket) { +export function remoteAddressImpl(socket) { return socket.remoteAddress; -}; +} -exports.remoteFamilyImpl = function (socket) { +export function remoteFamilyImpl(socket) { return socket.remoteFamily; -}; +} -exports.remotePortImpl = function (socket) { +export function remotePortImpl(socket) { return socket.remotePort; -}; +} -exports.resumeImpl = function (socket) { +export function resumeImpl(socket) { socket.resume(); -}; +} -exports.setEncodingImpl = function (socket, encoding) { +export function setEncodingImpl(socket, encoding) { socket.setEncoding(encoding); -}; +} -exports.setKeepAliveImpl = function (socket, enable, initialDelay) { +export function setKeepAliveImpl(socket, enable, initialDelay) { socket.setKeepAlive(enable, initialDelay); -}; +} -exports.setNoDelayImpl = function (socket, noDelay) { +export function setNoDelayImpl(socket, noDelay) { socket.setNoDelay(noDelay); -}; +} -exports.setTimeoutImpl = function (socket, timeout, callback) { +export function setTimeoutImpl(socket, timeout, callback) { socket.setTimeout(timeout, callback); -}; +} -exports.writeImpl = function (socket, buffer, callback) { +export function writeImpl(socket, buffer, callback) { return socket.write(buffer, null, callback); -}; +} -exports.writeStringImpl = function (socket, str, encoding, callback) { +export function writeStringImpl(socket, str, encoding, callback) { return socket.write(str, encoding, callback); -}; +} From 74a3cefd1f16901c4714e33157c3bf4093d2f1ef Mon Sep 17 00:00:00 2001 From: sigma-andex Date: Wed, 23 Mar 2022 13:07:31 +0000 Subject: [PATCH 02/11] Replaced 'export var' with 'export const' --- src/Node/Net.js | 6 +++--- src/Node/Net/Server.js | 2 +- src/Node/Net/Socket.js | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Node/Net.js b/src/Node/Net.js index 61b1919..1b3d522 100644 --- a/src/Node/Net.js +++ b/src/Node/Net.js @@ -1,6 +1,6 @@ "use strict"; import net from "net"; -export var isIP = net.isIP; -export var isIPv4 = net.isIPv4; -export var isIPv6 = net.isIPv6; +export const isIP = net.isIP; +export const isIPv4 = net.isIPv4; +export const isIPv6 = net.isIPv6; diff --git a/src/Node/Net/Server.js b/src/Node/Net/Server.js index 449b9fb..32388e9 100644 --- a/src/Node/Net/Server.js +++ b/src/Node/Net/Server.js @@ -10,7 +10,7 @@ export function closeImpl(server, callback) { server.close(callback); } -export var createServerImpl = net.createServer; +export const createServerImpl = net.createServer; export function getConnectionsImpl(server, callback) { server.getConnections(callback); diff --git a/src/Node/Net/Socket.js b/src/Node/Net/Socket.js index d4b7707..1d33e1e 100644 --- a/src/Node/Net/Socket.js +++ b/src/Node/Net/Socket.js @@ -22,7 +22,7 @@ export function connectingImpl(socket) { return socket.connecting; } -export var createConnectionImpl = net.createConnection; +export const createConnectionImpl = net.createConnection; export function destroyImpl(socket, err) { socket.destroy(err); From e619c02c4a40454a04f701ec56d1375bfc895d06 Mon Sep 17 00:00:00 2001 From: sigma-andex Date: Wed, 23 Mar 2022 13:07:32 +0000 Subject: [PATCH 03/11] Removed '"use strict";' in FFI files --- src/Node/Net.js | 2 -- src/Node/Net/Server.js | 2 -- src/Node/Net/Socket.js | 2 -- 3 files changed, 6 deletions(-) diff --git a/src/Node/Net.js b/src/Node/Net.js index 1b3d522..867534b 100644 --- a/src/Node/Net.js +++ b/src/Node/Net.js @@ -1,5 +1,3 @@ -"use strict"; - import net from "net"; export const isIP = net.isIP; export const isIPv4 = net.isIPv4; diff --git a/src/Node/Net/Server.js b/src/Node/Net/Server.js index 32388e9..69e6f7e 100644 --- a/src/Node/Net/Server.js +++ b/src/Node/Net/Server.js @@ -1,5 +1,3 @@ -"use strict"; - import net from "net"; export function addressImpl(server) { diff --git a/src/Node/Net/Socket.js b/src/Node/Net/Socket.js index 1d33e1e..a35fa7c 100644 --- a/src/Node/Net/Socket.js +++ b/src/Node/Net/Socket.js @@ -1,5 +1,3 @@ -"use strict"; - import net from "net"; export function bufferSizeImpl(socket) { From 655a7298b3c9c203fbbafefeba8907aa3064aae9 Mon Sep 17 00:00:00 2001 From: sigma-andex Date: Wed, 23 Mar 2022 13:07:32 +0000 Subject: [PATCH 04/11] Update to CI to use 'unstable' purescript --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 063845e..f5a96fe 100644 --- a/.github/workflows/ci.yml +++ b/.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: From a6806a1514b0d12a067b093b96a343ae6837a78c Mon Sep 17 00:00:00 2001 From: sigma-andex Date: Wed, 23 Mar 2022 13:07:32 +0000 Subject: [PATCH 05/11] Update Bower dependencies to master or main --- bower.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/bower.json b/bower.json index b05283d..7c7cf4b 100644 --- a/bower.json +++ b/bower.json @@ -12,19 +12,19 @@ "output" ], "dependencies": { - "purescript-effect": "^3.0.0", - "purescript-either": "^5.0.0", - "purescript-exceptions": "^5.0.0", - "purescript-foreign": "^6.0.0", - "purescript-maybe": "^5.0.0", + "purescript-effect": "master", + "purescript-either": "master", + "purescript-exceptions": "master", + "purescript-foreign": "master", + "purescript-maybe": "master", "purescript-node-buffer": "^7.0.0", "purescript-node-fs": "^6.0.0", - "purescript-nullable": "^5.0.0", - "purescript-options": "^6.0.0", - "purescript-prelude": "^5.0.0", - "purescript-transformers": "^5.0.0" + "purescript-nullable": "main", + "purescript-options": "main", + "purescript-prelude": "master", + "purescript-transformers": "master" }, "devDependencies": { - "purescript-console": "^5.0.0" + "purescript-console": "master" } } From e34fc4edde372237fa1928bf3f5d256a846143d1 Mon Sep 17 00:00:00 2001 From: sigma-andex Date: Wed, 23 Mar 2022 13:07:32 +0000 Subject: [PATCH 06/11] Update pulp to 16.0.0-0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 63f9f51..784caa5 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ }, "devDependencies": { "eslint": "^7.15.0", - "pulp": "^15.0.0", + "pulp": "16.0.0-0", "purescript-psa": "^0.8.0", "rimraf": "^3.0.2" } From 185ab61502dfe5c75325a86673041a0957ac3671 Mon Sep 17 00:00:00 2001 From: sigma-andex Date: Wed, 23 Mar 2022 13:07:32 +0000 Subject: [PATCH 07/11] Update psa to 0.8.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 784caa5..c08ce8f 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "devDependencies": { "eslint": "^7.15.0", "pulp": "16.0.0-0", - "purescript-psa": "^0.8.0", + "purescript-psa": "^0.8.2", "rimraf": "^3.0.2" } } From b98eebc6efda80ec966b1a3b29d6f45931ec368e Mon Sep 17 00:00:00 2001 From: sigma-andex Date: Wed, 23 Mar 2022 13:20:20 +0000 Subject: [PATCH 08/11] Update Bower dependencies to master or main --- bower.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bower.json b/bower.json index 7c7cf4b..5ef22bb 100644 --- a/bower.json +++ b/bower.json @@ -17,8 +17,8 @@ "purescript-exceptions": "master", "purescript-foreign": "master", "purescript-maybe": "master", - "purescript-node-buffer": "^7.0.0", - "purescript-node-fs": "^6.0.0", + "purescript-node-buffer": "master", + "purescript-node-fs": "master", "purescript-nullable": "main", "purescript-options": "main", "purescript-prelude": "master", From efc9b1d5e0746bb076aaf9db48e905d6791f7cb0 Mon Sep 17 00:00:00 2001 From: sigma-andex Date: Wed, 23 Mar 2022 13:21:28 +0000 Subject: [PATCH 09/11] Update eslintrc --- .eslintrc.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.eslintrc.json b/.eslintrc.json index 84cef4f..7b219e5 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -1,10 +1,11 @@ { "parserOptions": { - "ecmaVersion": 5 + "ecmaVersion": 6, + "sourceType": "module" }, "extends": "eslint:recommended", "env": { - "commonjs": true + "node": true }, "rules": { "strict": [2, "global"], From 662014a7fb5ee971eec2db6c8c130b8bb6125bb0 Mon Sep 17 00:00:00 2001 From: sigma-andex Date: Wed, 23 Mar 2022 13:21:51 +0000 Subject: [PATCH 10/11] Update ci.yml to v2 --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f5a96fe..06ed895 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,9 +16,9 @@ jobs: with: purescript: "unstable" - - uses: actions/setup-node@v1 + - uses: actions/setup-node@v2 with: - node-version: "10" + node-version: "14" - name: Install dependencies run: | From c041d1d900c458d1e337051025c0f18671e1ab7f Mon Sep 17 00:00:00 2001 From: sigma-andex Date: Wed, 23 Mar 2022 13:23:23 +0000 Subject: [PATCH 11/11] Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 59608a7..6f7a526 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ Notable changes to this project are documented in this file. The format is based ## [Unreleased] Breaking changes: +- Update project and deps to PureScript v0.15.0 (#11 by @JordanMartinez, @thomashoneyman, @sigma-andex) New features: