From 4b0e8f6f1b079e175827543c424a2c2352fd2385 Mon Sep 17 00:00:00 2001 From: Cyril Sobierajewicz Date: Mon, 28 Dec 2020 14:11:34 +0100 Subject: [PATCH 1/3] Import Data.Generic.Rep from prelude --- bower.json | 14 +++++++------- spago.dhall | 2 +- test/Main.purs | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/bower.json b/bower.json index aad8011..52f6a92 100644 --- a/bower.json +++ b/bower.json @@ -16,14 +16,14 @@ }, "license": "MIT", "dependencies": { - "purescript-argonaut-core": "^5.0.0", - "purescript-argonaut-codecs": "^7.0.0", - "purescript-generics-rep": "^6.0.0", - "purescript-record": "^2.0.0" + "purescript-argonaut-core": "main", + "purescript-argonaut-codecs": "main", + "purescript-prelude": "master", + "purescript-record": "master" }, "devDependencies": { - "purescript-assert": "^4.1.0", - "purescript-console": "^4.4.0", - "purescript-exceptions": "^4.0.0" + "purescript-assert": "master", + "purescript-console": "master", + "purescript-exceptions": "master" } } diff --git a/spago.dhall b/spago.dhall index 438f8b7..43e56e1 100644 --- a/spago.dhall +++ b/spago.dhall @@ -6,7 +6,7 @@ , "console" , "effect" , "exceptions" - , "generics-rep" + , "prelude" , "psci-support" , "record" ] diff --git a/test/Main.purs b/test/Main.purs index a44dd67..a836c50 100644 --- a/test/Main.purs +++ b/test/Main.purs @@ -13,7 +13,7 @@ import Data.Argonaut.Parser (jsonParser) import Data.Argonaut.Types.Generic.Rep (Encoding, defaultEncoding) import Data.Either (Either(..), either) import Data.Generic.Rep (class Generic) -import Data.Generic.Rep.Show (genericShow) +import Data.Show.Generic (genericShow) import Data.String (toLower, toUpper) import Effect (Effect) import Effect.Console (log) From aa5d6f57d175d9e0934b7457c5cd16a60d75b27f Mon Sep 17 00:00:00 2001 From: Cyril Sobierajewicz Date: Mon, 28 Dec 2020 17:48:05 +0100 Subject: [PATCH 2/3] Drop the Rep suffix for consistency with other generic modules --- CHANGELOG.md | 1 + src/Data/Argonaut/Decode/{Generic/Rep.purs => Generic.purs} | 4 ++-- src/Data/Argonaut/Encode/{Generic/Rep.purs => Generic.purs} | 4 ++-- src/Data/Argonaut/Types/{Generic/Rep.purs => Generic.purs} | 3 +-- test/Main.purs | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) rename src/Data/Argonaut/Decode/{Generic/Rep.purs => Generic.purs} (98%) rename src/Data/Argonaut/Encode/{Generic/Rep.purs => Generic.purs} (97%) rename src/Data/Argonaut/Types/{Generic/Rep.purs => Generic.purs} (92%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4c04ae8..8723284 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ Notable changes to this project are documented in this file. The format is based Breaking changes (😱!!!): - Removed vestigial `EncodeRepFields` class and its remaining instance for `Data.Generic.Rep.Product`. +- Renamed `Data.Argonaut.Decode.Generic.Rep` to `Data.Argonaut.Decode.Generic`, `Data.Argonaut.Encode.Generic.Rep` to `Data.Argonaut.Encode.Generic` and `Data.Argonaut.Types.Generic.Rep` to `Data.Argonaut.Types.Generic`. New features: diff --git a/src/Data/Argonaut/Decode/Generic/Rep.purs b/src/Data/Argonaut/Decode/Generic.purs similarity index 98% rename from src/Data/Argonaut/Decode/Generic/Rep.purs rename to src/Data/Argonaut/Decode/Generic.purs index ceacd73..6a1f8ba 100644 --- a/src/Data/Argonaut/Decode/Generic/Rep.purs +++ b/src/Data/Argonaut/Decode/Generic.purs @@ -1,4 +1,4 @@ -module Data.Argonaut.Decode.Generic.Rep ( +module Data.Argonaut.Decode.Generic ( class DecodeRep, class DecodeRepArgs, class DecodeLiteral, @@ -17,7 +17,7 @@ import Prelude import Control.Alt ((<|>)) import Data.Argonaut.Core (Json, fromString, toArray, toObject, toString, fromArray) import Data.Argonaut.Decode (class DecodeJson, decodeJson, JsonDecodeError(..)) -import Data.Argonaut.Types.Generic.Rep (Encoding, defaultEncoding) +import Data.Argonaut.Types.Generic (Encoding, defaultEncoding) import Data.Array (uncons) import Data.Bifunctor (lmap) import Data.Either (Either(..), note) diff --git a/src/Data/Argonaut/Encode/Generic/Rep.purs b/src/Data/Argonaut/Encode/Generic.purs similarity index 97% rename from src/Data/Argonaut/Encode/Generic/Rep.purs rename to src/Data/Argonaut/Encode/Generic.purs index b917a22..283bcd1 100644 --- a/src/Data/Argonaut/Encode/Generic/Rep.purs +++ b/src/Data/Argonaut/Encode/Generic.purs @@ -1,4 +1,4 @@ -module Data.Argonaut.Encode.Generic.Rep ( +module Data.Argonaut.Encode.Generic ( class EncodeRep, class EncodeRepArgs, class EncodeLiteral, @@ -13,10 +13,10 @@ module Data.Argonaut.Encode.Generic.Rep ( ) where import Prelude -import Data.Argonaut.Types.Generic.Rep (Encoding, defaultEncoding) import Data.Argonaut.Core (Json, fromArray, fromObject, fromString) import Data.Argonaut.Encode.Class (class EncodeJson, encodeJson) +import Data.Argonaut.Types.Generic (Encoding, defaultEncoding) import Data.Generic.Rep as Rep import Data.Symbol (class IsSymbol, reflectSymbol) import Foreign.Object as FO diff --git a/src/Data/Argonaut/Types/Generic/Rep.purs b/src/Data/Argonaut/Types/Generic.purs similarity index 92% rename from src/Data/Argonaut/Types/Generic/Rep.purs rename to src/Data/Argonaut/Types/Generic.purs index 9157a84..a92d770 100644 --- a/src/Data/Argonaut/Types/Generic/Rep.purs +++ b/src/Data/Argonaut/Types/Generic.purs @@ -1,4 +1,4 @@ -module Data.Argonaut.Types.Generic.Rep ( +module Data.Argonaut.Types.Generic ( Encoding(..), defaultEncoding ) where @@ -19,4 +19,3 @@ defaultEncoding = , valuesKey: "values" , unwrapSingleArguments: false } - diff --git a/test/Main.purs b/test/Main.purs index a836c50..3e22358 100644 --- a/test/Main.purs +++ b/test/Main.purs @@ -6,11 +6,11 @@ import Prelude import Data.Argonaut.Core (Json, stringify) import Data.Argonaut.Decode.Class (class DecodeJson, decodeJson) -import Data.Argonaut.Decode.Generic.Rep (class DecodeLiteral, decodeLiteralSumWithTransform, genericDecodeJson, genericDecodeJsonWith) +import Data.Argonaut.Decode.Generic (class DecodeLiteral, decodeLiteralSumWithTransform, genericDecodeJson, genericDecodeJsonWith) import Data.Argonaut.Encode.Class (class EncodeJson, encodeJson) -import Data.Argonaut.Encode.Generic.Rep (class EncodeLiteral, encodeLiteralSumWithTransform, genericEncodeJson, genericEncodeJsonWith) +import Data.Argonaut.Encode.Generic (class EncodeLiteral, encodeLiteralSumWithTransform, genericEncodeJson, genericEncodeJsonWith) import Data.Argonaut.Parser (jsonParser) -import Data.Argonaut.Types.Generic.Rep (Encoding, defaultEncoding) +import Data.Argonaut.Types.Generic (Encoding, defaultEncoding) import Data.Either (Either(..), either) import Data.Generic.Rep (class Generic) import Data.Show.Generic (genericShow) From f5eef1af451b2ab5f60ab39a83b664dd9899eebf Mon Sep 17 00:00:00 2001 From: Cyril Sobierajewicz Date: Mon, 28 Dec 2020 18:10:07 +0100 Subject: [PATCH 3/3] Update the compiler version used on CI to 0.14.0-rc5 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d91f17d..9b78ffa 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: - name: Set up a PureScript toolchain uses: purescript-contrib/setup-purescript@main with: - purescript: "0.14.0-rc3" + purescript: "0.14.0-rc5" - name: Cache PureScript dependencies uses: actions/cache@v2