Updates for PS 0.15 and related workflow improvements (#5)

Author: nsaunders

.github/workflows/build.yml

@@ -0,0 +1,71 @@
+name: CI
+
+on:
+  push:
+    branches: [master]
+    paths:
+      - 'examples/**/*.purs'
+      - 'examples/**/*.js'
+      - 'src/**/*.purs'
+      - 'src/**/*.js'
+      - 'test/**/*.purs'
+      - 'test/**/*.js'
+      - '*.json'
+      - '*.dhall'
+      - '.github/workflows/ci.yml'
+  pull_request:
+    branches: [master]
+    paths:
+      - 'examples/**/*.purs'
+      - 'examples/**/*.js'
+      - 'src/**/*.purs'
+      - 'src/**/*.js'
+      - 'test/**/*.purs'
+      - 'test/**/*.js'
+      - '*.json'
+      - '*.dhall'
+      - '.github/workflows/ci.yml'
+
+jobs:
+  build:
+    name: Build
+ 
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Set up a PureScript toolchain
+        uses: purescript-contrib/setup-purescript@main
+        with:
+          purescript: "unstable"
+          purs-tidy: "latest"
+
+      - name: Cache PureScript dependencies
+        uses: actions/cache@v2
+        with:
+          key: ${{ runner.os }}-spago-${{ hashFiles('**/*.dhall') }}
+          path: |
+            .spago
+            output
+
+      - name: Install PureScript dependencies
+        run: spago install
+
+      - name: Build source
+        run: spago build --no-install --purs-args '--censor-lib --strict'
+
+      - name: Build examples
+        run: spago -x example.dhall build
+
+      - name: Run tests
+        run: spago -x test.dhall test
+
+      - name: Check formatting
+        run: purs-tidy check examples src test
+
+      - name: Verify Bower & Pulp
+        run: |
+          npm install bower [email protected]
+          npx bower install
+          npx pulp build -- --censor-lib --strict

.github/workflows/ci.yml

@@ -0,0 +1,34 @@
+name: Traffic
+
+on:
+  push:
+    branches: [master]
+    paths:
+      - '.github/workflows/traffic.yml'
+  schedule: 
+    - cron: "15 23 * * 0"
+
+jobs:
+  update:
+    name: Update
+
+    runs-on: ubuntu-latest
+
+    env:
+      TRAFFIC_PATH: .github/traffic.json
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: nsaunders/traffic-lite@v1
+        with:
+          path: ${{ env.TRAFFIC_PATH }}
+          repo: ${{ github.repository }}
+          token: ${{ secrets.GH_ACCESS_TOKEN }}
+
+      - uses: EndBug/add-and-commit@v9
+        with:
+          add: ${{ env.TRAFFIC_PATH }}
+          author_name: GitHub Actions
+          author_email: 41898282+github-actions[bot]@users.noreply.github.com
+          message: Log repository traffic.

.github/workflows/traffic.yml

@@ -0,0 +1,10 @@
+{
+  "importSort": "ide",
+  "importWrap": "auto",
+  "indent": 2,
+  "operatorsFile": null,
+  "ribbon": 1,
+  "typeArrowPlacement": "first",
+  "unicode": "never",
+  "width": 80
+}

.tidyrc.json

@@ -0,0 +1,28 @@
+{
+    "name": "purescript-typedenv",
+    "license": [
+        "MIT"
+    ],
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/nsaunders/purescript-typedenv"
+    },
+    "ignore": [
+        "**/.*",
+        "node_modules",
+        "bower_components",
+        "output"
+    ],
+    "dependencies": {
+        "purescript-either": "^v6.1.0",
+        "purescript-foreign-object": "^v4.0.0",
+        "purescript-integers": "^v6.0.0",
+        "purescript-maybe": "^v6.0.0",
+        "purescript-numbers": "^v9.0.0",
+        "purescript-prelude": "^v6.0.0",
+        "purescript-record": "^v4.0.0",
+        "purescript-strings": "^v6.0.0",
+        "purescript-type-equality": "^v4.0.1",
+        "purescript-typelevel-prelude": "^v7.0.0"
+    }
+}

.tool-versions

@@ -0,0 +1,13 @@
+let conf = ./spago.dhall
+
+in conf // {
+  sources = conf.sources # [ "examples/**/*.purs" ],
+  dependencies = conf.dependencies # 
+    [ "console"
+    , "effect"
+    , "foldable-traversable"
+    , "lists"
+    , "node-process"
+    , "transformers"
+    ]
+}

bower.json

@@ -1,20 +1,21 @@
 module Example.App where
 
 import Prelude
+
 import Control.Monad.Reader (ReaderT, asks, runReaderT)
 import Control.Monad.Reader.Class (class MonadAsk)
 import Data.Either (Either(..))
 import Effect (Effect)
 import Effect.Class (class MonadEffect, liftEffect)
 import Effect.Console (log)
 import Node.Process (getEnv)
-import Type.Data.Row (RProxy(..))
 import Type.Equality (class TypeEquals, from)
+import Type.Proxy (Proxy(..))
 import TypedEnv (Resolved, Variable, envErrorMessage)
 import TypedEnv (fromEnv) as TypedEnv
 
 type Config f =
-  ( alertEmail   :: f "ALERT_EMAIL" String
+  ( alertEmail :: f "ALERT_EMAIL" String
   , alertSubject :: f "ALERT_SUBJECT" String
   )
 
@@ -37,7 +38,7 @@ instance monadAskAppM :: TypeEquals e ResolvedConfig => MonadAsk e AppM where
 
 main :: Effect Unit
 main = do
-  eitherConfig <- TypedEnv.fromEnv (RProxy :: RProxy (Config Variable)) <$> getEnv
+  eitherConfig <- TypedEnv.fromEnv (Proxy :: Proxy (Config Variable)) <$> getEnv
   case eitherConfig of
     Left error ->
       log $ "ERROR: " <> envErrorMessage error
@@ -48,4 +49,7 @@ sendAlert :: AppM Unit
 sendAlert = do
   email <- asks _.alertEmail
   subject <- asks _.alertSubject
-  liftEffect $ log ("Sending alert with subject \"" <> subject <> "\" to \"" <> email <> "\"...done.")
+  liftEffect $ log
+    ( "Sending alert with subject \"" <> subject <> "\" to \"" <> email <>
+        "\"...done."
+    )

example.dhall

@@ -1,23 +1,24 @@
 module Example.Basic where
 
 import Prelude
+
 import Data.Either (Either(..))
 import Data.List.Lazy (replicateM)
 import Effect (Effect)
 import Effect.Console (log)
 import Node.Process (getEnv)
-import Type.Data.Row (RProxy(..))
+import Type.Proxy (Proxy(..))
 import TypedEnv (type (<:), envErrorMessage)
 import TypedEnv (fromEnv) as TypedEnv
 
 type Environment =
   ( greeting :: String <: "GREETING"
-  , count    :: Int    <: "COUNT"
+  , count :: Int <: "COUNT"
   )
 
 main :: Effect Unit
 main = do
-  env <- TypedEnv.fromEnv (RProxy :: RProxy Environment) <$> getEnv
+  env <- TypedEnv.fromEnv (Proxy :: Proxy Environment) <$> getEnv
   case env of
     Left error ->
       log $ "ERROR: " <> envErrorMessage error

example/App.purs renamed to examples/App.purs

@@ -1,14 +1,15 @@
 module Example.CustomType where
 
 import Prelude
+
 import Data.Either (Either(..))
 import Data.Foldable (find)
 import Data.Int (fromString) as Int
 import Effect (Effect)
 import Effect.Console (log)
 import Node.Process (getEnv)
-import Type.Data.Row (RProxy(..))
-import TypedEnv (type (<:), class ParseValue, envErrorMessage)
+import Type.Proxy (Proxy(..))
+import TypedEnv (class ParseValue, type (<:), envErrorMessage)
 import TypedEnv (fromEnv) as TypedEnv
 
 newtype Port = Port Int
@@ -21,12 +22,12 @@ instance parseValuePort :: ParseValue Port where
 
 type Settings =
   ( host :: String <: "HOST"
-  , port :: Port   <: "PORT"
+  , port :: Port <: "PORT"
   )
 
 main :: Effect Unit
 main = do
-  env <- TypedEnv.fromEnv (RProxy :: RProxy Settings) <$> getEnv
+  env <- TypedEnv.fromEnv (Proxy :: Proxy Settings) <$> getEnv
   case env of
     Left error ->
       log $ "ERROR: " <> envErrorMessage error

example/Basic.purs renamed to examples/Basic.purs

@@ -1,20 +1,21 @@
 module Example.Optional where
 
 import Prelude
+
 import Data.Either (Either(..))
 import Data.Maybe (Maybe, fromMaybe)
 import Effect (Effect)
 import Effect.Console (log)
 import Node.Process (getEnv)
-import Type.Data.Row (RProxy(..))
+import Type.Proxy (Proxy(..))
 import TypedEnv (type (<:), envErrorMessage)
 import TypedEnv (fromEnv) as TypedEnv
 
-type Settings = ( username :: Maybe String <: "USERNAME" )
+type Settings = (username :: Maybe String <: "USERNAME")
 
 main :: Effect Unit
 main = do
-  env <- TypedEnv.fromEnv (RProxy :: RProxy Settings) <$> getEnv
+  env <- TypedEnv.fromEnv (Proxy :: Proxy Settings) <$> getEnv
   case env of
     Left error ->
       log $ "ERROR: " <> envErrorMessage error

example/CustomType.purs renamed to examples/CustomType.purs

@@ -1,25 +1,26 @@
 module Example.Reader where
 
 import Prelude
+
 import Control.Monad.Reader (Reader, asks, runReader)
 import Data.Either (Either(..))
 import Data.List.Lazy (replicateM)
 import Data.Maybe (Maybe, fromMaybe)
 import Effect (Effect)
 import Effect.Console (log)
 import Node.Process (getEnv)
-import Type.Data.Row (RProxy(..))
+import Type.Proxy (Proxy(..))
 import TypedEnv (type (<:), envErrorMessage)
 import TypedEnv (fromEnv) as TypedEnv
 
 type Config =
   ( username :: Maybe String <: "USERNAME"
-  , repeat   :: Maybe Int    <: "REPEAT"
+  , repeat :: Maybe Int <: "REPEAT"
   )
 
 main :: Effect Unit
 main = do
-  env <- TypedEnv.fromEnv (RProxy :: RProxy Config) <$> getEnv
+  env <- TypedEnv.fromEnv (Proxy :: Proxy Config) <$> getEnv
   case env of
     Left error ->
       log $ "ERROR: " <> envErrorMessage error
@@ -28,4 +29,6 @@ main = do
       pure unit
 
 greeting :: forall r. Reader { username :: Maybe String | r } String
-greeting = asks _.username >>= \username -> pure $ "Hello, " <> fromMaybe "Sailor" username <> "!"
+greeting = asks _.username >>= \username -> pure $ "Hello, "
+  <> fromMaybe "Sailor" username
+  <> "!"

example/Optional.purs renamed to examples/Optional.purs

@@ -2,7 +2,7 @@ let mkPackage =
       https://raw.githubusercontent.com/purescript/package-sets/psc-0.13.0-20190626/src/mkPackage.dhall sha256:0b197efa1d397ace6eb46b243ff2d73a3da5638d8d0ac8473e8e4a8fc528cf57
 
 let upstream =
-      https://github.com/purescript/package-sets/releases/download/psc-0.14.0-20210324/packages.dhall sha256:b4564d575da6aed1c042ca7936da97c8b7a29473b63f4515f09bb95fae8dddab
+      https://github.com/purescript/package-sets/releases/download/psc-0.15.2-20220706/packages.dhall sha256:7a24ebdbacb2bfa27b2fc6ce3da96f048093d64e54369965a2a7b5d9892b6031
 
 let overrides = {=}