Merge pull request #57 from JordanMartinez/updateTov0.14.1

Update to v0.14.1 PS
This commit is contained in:
paluh 2021-11-08 17:21:03 +01:00 committed by GitHub
commit da14129b18
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 135 additions and 176 deletions

View File

@ -14,31 +14,46 @@
"output"
],
"dependencies": {
"purescript-aff": "^v5.1.1",
"purescript-argonaut": "^v6.0.0",
"purescript-arrays": "^v5.3.0",
"purescript-assert": "^v4.1.0",
"purescript-bifunctors": "^v4.0.0",
"purescript-aff": "^v6.0.0",
"purescript-argonaut": "^v8.0.0",
"purescript-arrays": "^v6.0.1",
"purescript-assert": "^v5.0.0",
"purescript-bifunctors": "^v5.0.0",
"purescript-bytestrings": "^v8.0.0",
"purescript-console": "^v4.2.0",
"purescript-datetime": "^v4.1.1",
"purescript-decimals": "^v5.0.0",
"purescript-effect": "^v2.0.1",
"purescript-either": "^v4.1.1",
"purescript-exceptions": "^v4.0.0",
"purescript-foldable-traversable": "^v4.1.1",
"purescript-foreign": "^v5.0.0",
"purescript-foreign-generic": "^v10.0.0",
"purescript-foreign-object": "^v2.0.3",
"purescript-js-date": "^v6.0.0",
"purescript-lists": "^v5.4.1",
"purescript-maybe": "^v4.0.1",
"purescript-newtype": "^v3.0.0",
"purescript-nullable": "^v4.1.1",
"purescript-prelude": "^v4.1.1",
"purescript-psci-support": "^v4.0.0",
"purescript-test-unit": "^v15.0.0",
"purescript-transformers": "^v4.2.0",
"purescript-tuples": "^v5.1.0"
"purescript-datetime": "^v5.0.2",
"purescript-decimals": "^v6.0.0",
"purescript-dotenv": "^v2.0.0",
"purescript-effect": "^v3.0.0",
"purescript-either": "^v5.0.0",
"purescript-enums": "^v5.0.0",
"purescript-exceptions": "^v5.0.0",
"purescript-foldable-traversable": "^v5.0.1",
"purescript-foreign": "^v6.0.1",
"purescript-foreign-generic": "^v11.0.0",
"purescript-foreign-object": "^v3.0.0",
"purescript-identity": "^v5.0.0",
"purescript-integers": "^v5.0.0",
"purescript-js-date": "^v7.0.0",
"purescript-lists": "^v6.0.1",
"purescript-math": "^v3.0.0",
"purescript-maybe": "^v5.0.0",
"purescript-newtype": "^v4.0.0",
"purescript-node-process": "^v8.2.0",
"purescript-nullable": "^v5.0.0",
"purescript-ordered-collections": "^v2.0.1",
"purescript-partial": "^v3.0.0",
"purescript-polyform": "updateTov0.14.1",
"purescript-polyform-batteries-core": "updateTov0.14.1",
"purescript-polyform-batteries-env": "updateTov0.14.1",
"purescript-prelude": "^v5.0.0",
"purescript-string-parsers": "^v6.0.0",
"purescript-transformers": "^v5.1.0",
"purescript-tuples": "^v6.0.1",
"purescript-typelevel-prelude": "^v6.0.0",
"purescript-validation": "^v5.0.0"
},
"devDependencies": {
"purescript-psci-support": "^v5.0.0",
"purescript-test-unit": "^v16.0.0"
}
}

View File

@ -8,7 +8,7 @@
"devDependencies": {
"github-release-notes": "^0.17.1",
"paluh-litps": "^0.1.4",
"pulp": "^13.0.0"
"pulp": "^15.0.0"
},
"scripts": {
"pretest": "paluh-litps compile --file README.md; mv README.purs test/README.purs",

View File

@ -1,146 +1,75 @@
{-
Welcome to your new Dhall package-set!
Below are instructions for how to edit this file for most use
cases, so that you don't need to know Dhall to use it.
## Warning: Don't Move This Top-Level Comment!
Due to how `dhall format` currently works, this comment's
instructions cannot appear near corresponding sections below
because `dhall format` will delete the comment. However,
it will not delete a top-level comment like this one.
## Use Cases
Most will want to do one or both of these options:
1. Override/Patch a package's dependency
2. Add a package not already in the default package set
This file will continue to work whether you use one or both options.
Instructions for each option are explained below.
### Overriding/Patching a package
Purpose:
- Change a package's dependency to a newer/older release than the
default package set's release
- Use your own modified version of some dependency that may
include new API, changed API, removed API by
using your custom git repo of the library rather than
the package set's repo
Syntax:
Replace the overrides' "{=}" (an empty record) with the following idea
The "//" or "⫽" means "merge these two records and
when they have the same value, use the one on the right:"
-------------------------------
let override =
{ packageName =
upstream.packageName // { updateEntity1 = "new value", updateEntity2 = "new value" }
, packageName =
upstream.packageName // { version = "v4.0.0" }
, packageName =
upstream.packageName // { repo = "https://www.example.com/path/to/new/repo.git" }
}
-------------------------------
Example:
-------------------------------
let overrides =
{ halogen =
upstream.halogen // { version = "master" }
, halogen-vdom =
upstream.halogen-vdom // { version = "v4.0.0" }
}
-------------------------------
### Additions
Purpose:
- Add packages that aren't already included in the default package set
Syntax:
Replace the additions' "{=}" (an empty record) with the following idea:
-------------------------------
let additions =
{ "package-name" =
mkPackage
[ "dependency1"
, "dependency2"
]
"https://example.com/path/to/git/repo.git"
"tag ('v4.0.0') or branch ('master')"
, "package-name" =
mkPackage
[ "dependency1"
, "dependency2"
]
"https://example.com/path/to/git/repo.git"
"tag ('v4.0.0') or branch ('master')"
, etc.
}
-------------------------------
Example:
-------------------------------
let additions =
{ benchotron =
mkPackage
[ "arrays"
, "exists"
, "profunctor"
, "strings"
, "quickcheck"
, "lcg"
, "transformers"
, "foldable-traversable"
, "exceptions"
, "node-fs"
, "node-buffer"
, "node-readline"
, "datetime"
, "now"
]
"https://github.com/hdgarrood/purescript-benchotron.git"
"v7.0.0"
}
-------------------------------
-}
let mkPackage =
https://raw.githubusercontent.com/purescript/package-sets/psc-0.13.2-20190725/src/mkPackage.dhall sha256:0b197efa1d397ace6eb46b243ff2d73a3da5638d8d0ac8473e8e4a8fc528cf57
let upstream =
https://raw.githubusercontent.com/purescript/package-sets/psc-0.13.2-20190725/src/packages.dhall sha256:60cc03d2c3a99a0e5eeebb16a22aac219fa76fe6a1686e8c2bd7a11872527ea3
https://github.com/purescript/package-sets/releases/download/psc-0.14.1-20210506/packages.dhall sha256:d199e142515f9cc15838d8e6d724a98cd0ca776ceb426b7b36e841311643e3ef
let overrides = {=}
let polyform = mkPackage
[ "debug", "foreign", "foreign-object", "generics-rep", "invariant", "newtype"
, "ordered-collections", "parsing", "psci-support", "profunctor", "quickcheck-laws"
, "run", "test-unit", "transformers", "validation", "variant"
in upstream
with polyform =
{ dependencies =
[ "arrays"
, "bifunctors"
, "control"
, "effect"
, "either"
, "enums"
, "functors"
, "identity"
, "invariant"
, "lists"
, "maybe"
, "newtype"
, "parallel"
, "partial"
, "prelude"
, "profunctor"
, "psci-support"
, "quickcheck"
, "quickcheck-laws"
, "record"
, "transformers"
, "tuples"
, "typelevel-prelude"
, "unsafe-coerce"
, "validation"
, "variant"
]
"https://github.com/purescript-polyform/polyform.git"
"master"
let polyform-batteries = mkPackage
[ "affjax", "argonaut", "debug", "decimals", "filterable"
, "numbers", "polyform", "prelude", "record-extra"
, "test-unit"
]
"https://github.com/purescript-polyform/batteries.git"
"master"
let polyform-batteries-env = mkPackage
[ "polyform-batteries" ]
"https://github.com/purescript-polyform/batteries-env.git"
"master"
let additions =
{ polyform = polyform
, polyform-batteries = polyform-batteries
, polyform-batteries-env = polyform-batteries-env
, repo = "https://github.com/jordanmartinez/purescript-polyform.git"
, version = "updateTov0.14.1"
}
with polyform-batteries-core =
{ dependencies =
[ "arrays"
, "decimals"
, "effect"
, "enums"
, "integers"
, "lazy"
, "maybe"
, "numbers"
, "partial"
, "polyform"
, "prelude"
, "psci-support"
, "quickcheck"
, "strings"
, "test-unit"
, "typelevel-prelude"
, "validation"
, "variant"
]
, repo = "https://github.com/jordanmartinez/purescript-polyform-validators.git"
, version = "updateTov0.14.1"
}
with polyform-batteries-env =
{ dependencies =
[ "arrays"
, "identity"
, "maybe"
, "ordered-collections"
, "polyform"
, "polyform-batteries-core"
, "prelude"
, "psci-support"
, "typelevel-prelude"
]
, repo = "https://github.com/jordanmartinez/batteries-env.git"
, version = "updateTov0.14.1"
}
in upstream // overrides // additions

View File

@ -11,31 +11,40 @@ You can edit this file as you like.
, "assert"
, "bifunctors"
, "bytestrings"
, "console"
, "datetime"
, "decimals"
, "dotenv"
, "effect"
, "either"
, "enums"
, "exceptions"
, "foldable-traversable"
, "foreign"
, "foreign-generic"
, "foreign-object"
, "identity"
, "integers"
, "js-date"
, "lists"
, "math"
, "maybe"
, "newtype"
, "node-fs"
, "node-process"
, "nullable"
, "ordered-collections"
, "partial"
, "polyform"
, "polyform-batteries-core"
, "polyform-batteries-env"
, "prelude"
, "psci-support"
, "string-parsers"
, "strings"
, "test-unit"
, "transformers"
, "tuples"
, "typelevel-prelude"
, "validation"
]
, packages = ./packages.dhall
, repository = "https://github.com/rightfold/purescript-postgresql-client.git"

View File

@ -23,7 +23,7 @@ import Data.Array (head)
import Data.Bifunctor (lmap)
import Data.Either (Either(..), either, hush)
import Data.Generic.Rep (class Generic)
import Data.Generic.Rep.Show (genericShow)
import Data.Show.Generic (genericShow)
import Data.Maybe (Maybe(..), maybe)
import Data.Newtype (class Newtype)
import Data.Nullable (Nullable, toMaybe, toNullable)

View File

@ -5,7 +5,7 @@ module Data.PostgreSQL.RowList where
--
-- infixl 10 type RowList.Cons as :
--
-- type Apply (f :: RowList -> RowList) (a ∷ RowList) = f a
-- type Apply (f :: RowList Type -> RowList Type) (a ∷ RowList Type) = f a
--
-- infixr 0 type Apply as $
--

View File

@ -10,7 +10,7 @@ import Control.Monad.Error.Class (throwError)
import Control.Monad.Except (ExceptT, except, runExcept, runExceptT)
import Data.Argonaut (Json)
import Data.Argonaut (stringify) as Argonaut
import Data.Array (foldl)
import Data.Foldable (foldl)
import Data.Array as Array
import Data.Bifunctor (lmap)
import Data.ByteString (ByteString)

5
test/Main.js Normal file
View File

@ -0,0 +1,5 @@
"use strict";
exports.unsafeStringify = function (x) {
return JSON.stringify(x);
}

View File

@ -31,7 +31,6 @@ import Effect.Class (liftEffect)
import Effect.Exception (message)
import Foreign.Object (Object)
import Foreign.Object (fromFoldable) as Object
import Global.Unsafe (unsafeStringify)
import Math ((%))
import Partial.Unsafe (unsafePartial)
import Test.Assert (assert)
@ -389,3 +388,5 @@ validUriToPoolConfigs = { uri: "postgres://urllgqrivcyako:c52275a95b7f177e2850c4
notValidConnUri :: PGConnectionURI
notValidConnUri = "postgres://urllgqrivcyakoc52275a95b7f177e2850c49de9bfa8bedc457ce860ccca664cb15db973554969@ec2-79-124-25-231.eu-west-1.compute.amazonaws.com:5432/e7cecg4nirunpo"
foreign import unsafeStringify :: forall a. a -> String