update ps 0.15.0

Author: justinwoo

.github/workflows/ci.yml

@@ -0,0 +1,14 @@
+name: ci
+
+# Run the workflow on any pushes or PRs.
+on: [push, pull_request]
+
+jobs:
+  tests:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: cachix/install-nix-action@v12
+        with:
+          nix_path: nixpkgs=channel:nixos-unstable
+      - run: ./test.bash

bower.json

@@ -12,12 +12,12 @@
     "output"
   ],
   "dependencies": {
-    "purescript-aff": "^6.0.0",
-    "purescript-foreign": "^6.0.1"
+    "purescript-aff": "^7.0.0",
+    "purescript-foreign": "^7.0.0"
   },
   "devDependencies": {
-    "purescript-test-unit": "^16.0.0",
-    "purescript-node-fs-aff": "^7.0.0",
-    "purescript-simple-json": "^8.0.0"
+    "purescript-test-unit": "^17.0.0",
+    "purescript-node-fs-aff": "^9.0.0",
+    "purescript-simple-json": "^9.0.0"
   }
 }

package.json

@@ -20,6 +20,6 @@
   },
   "homepage": "https://github.com/justinwoo/purescript-node-sqlite3#readme",
   "dependencies": {
-    "sqlite3": "^4.0.0"
+    "sqlite3": "^5.0.8"
   }
 }

shell.nix

@@ -0,0 +1,22 @@
+{ pkgs ? import <nixpkgs> { } }:
+let
+  easy-ps = import
+    (pkgs.fetchFromGitHub {
+      owner = "justinwoo";
+      repo = "easy-purescript-nix";
+      rev = "0ad5775c1e80cdd952527db2da969982e39ff592";
+      sha256 = "0x53ads5v8zqsk4r1mfpzf5913byifdpv5shnvxpgw634ifyj1kg";
+    })
+    {
+      inherit pkgs;
+    };
+in
+pkgs.mkShell {
+  buildInputs = [
+    easy-ps.purs
+    easy-ps.psc-package
+    pkgs.nodejs
+    pkgs.nodePackages.pulp
+    pkgs.nodePackages.bower
+  ];
+}

src/SQLite3/Internal.js

@@ -1,24 +1,24 @@
-var sqlite3 = require("sqlite3");
+import sqlite3 from "sqlite3";
 
-exports._newDB = function(filename, cb) {
+export function _newDB(filename, cb) {
   cb(new sqlite3.Database(filename))();
-};
+}
 
-exports._closeDB = function(db, eb, cb) {
-  db.close(function(err) {
+export function _closeDB(db, eb, cb) {
+  db.close(function (err) {
     if (err) {
       eb(err);
     } else {
       cb();
     }
   });
-};
+}
 
-exports._queryDB = function(db, query, params, eb, cb) {
+export function _queryDB(db, query, params, eb, cb) {
   db.all.apply(
     db,
     [query].concat(
-      params.concat(function(err, rows) {
+      params.concat(function (err, rows) {
         if (err) {
           eb(err);
         } else {
@@ -27,14 +27,14 @@ exports._queryDB = function(db, query, params, eb, cb) {
       })
     )
   );
-};
+}
 
-exports._queryObjectDB = function(db, query, params, eb, cb) {
-  db.all(query, params, function(err, rows) {
+export function _queryObjectDB(db, query, params, eb, cb) {
+  db.all(query, params, function (err, rows) {
     if (err) {
       eb(err);
     } else {
       cb(rows);
     }
   });
-};
+}

test.bash

@@ -0,0 +1,10 @@
+#! /usr/bin/env nix-shell
+#! nix-shell shell.nix -i bash
+
+set -e
+
+bower install
+
+pulp build --include test
+
+node ./test/index.mjs

test/Main.purs

@@ -7,22 +7,23 @@ import Data.Foldable (for_)
 import Effect (Effect)
 import Effect.Aff (launchAff_)
 import Effect.Class (liftEffect)
-import Node.FS.Aff (exists, unlink)
+import Node.FS.Aff (unlink)
+import Node.FS.Sync (exists)
 import SQLite3 (closeDB, newDB, queryDB, queryObjectDB)
 import Simple.JSON (read)
 import Test.Unit (failure, suite, test)
 import Test.Unit.Assert (assert, equal)
 import Test.Unit.Main (runTest)
 
-type Row =
+type TableRow =
   { name :: String
   , detail :: String
   }
 
 main :: Effect Unit
 main = launchAff_ do
   let testPath = "./test.sqlite3"
-  (flip when) (unlink testPath) =<< exists testPath
+  (flip when) (unlink testPath) =<< liftEffect (exists testPath)
   db <- newDB testPath
   _ <- queryDB db
     """
@@ -36,7 +37,7 @@ CREATE TABLE IF NOT EXISTS mytable
     suite "SQLite3" do
 
       test ("db connection worked and created " <> testPath) do
-        assert "exists testPath" =<< exists testPath
+        assert "exists testPath" =<< liftEffect (exists testPath)
 
       test "we can insert rows and retrieve them" do
         _ <- queryDB db
@@ -51,7 +52,7 @@ INSERT INTO mytable
 SELECT name, detail FROM mytable
           """ []
         case results of
-          Right (as :: Array Row) ->
+          Right (as :: Array TableRow) ->
             for_ as \a -> do
               equal a.name "aa"
               equal a.detail "bbbb"
@@ -61,7 +62,7 @@ SELECT name, detail FROM mytable
       test "we can use queryObjectDB to retrieve records" do
         results <- read <$> queryObjectDB db "SELECT name, detail FROM mytable WHERE name = $asdf" { "$asdf": "aa" }
         case results of
-          Right (as :: Array Row) ->
+          Right (as :: Array TableRow) ->
             for_ as \a -> do
               equal a.name "aa"
               equal a.detail "bbbb"

test/index.mjs

@@ -0,0 +1,3 @@
+import { main } from "../output/Test.Main/index.js";
+
+main();