Skip to content

Commit 528b249

Browse files
authored
Import Data.Generic.Rep from prelude (#33)
* Import Data.Generic.Rep from prelude * Drop the Rep suffix for consistency with other generic modules * Update the compiler version used on CI to 0.14.0-rc5
1 parent 15d0913 commit 528b249

File tree

8 files changed

+19
-19
lines changed

8 files changed

+19
-19
lines changed

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Set up a PureScript toolchain
1717
uses: purescript-contrib/setup-purescript@main
1818
with:
19-
purescript: "0.14.0-rc3"
19+
purescript: "0.14.0-rc5"
2020

2121
- name: Cache PureScript dependencies
2222
uses: actions/cache@v2

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Notable changes to this project are documented in this file. The format is based
77
Breaking changes (😱!!!):
88

99
- Removed vestigial `EncodeRepFields` class and its remaining instance for `Data.Generic.Rep.Product`.
10+
- 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`.
1011

1112
New features:
1213

bower.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616
},
1717
"license": "MIT",
1818
"dependencies": {
19-
"purescript-argonaut-core": "^5.0.0",
20-
"purescript-argonaut-codecs": "^7.0.0",
21-
"purescript-generics-rep": "^6.0.0",
22-
"purescript-record": "^2.0.0"
19+
"purescript-argonaut-core": "main",
20+
"purescript-argonaut-codecs": "main",
21+
"purescript-prelude": "master",
22+
"purescript-record": "master"
2323
},
2424
"devDependencies": {
25-
"purescript-assert": "^4.1.0",
26-
"purescript-console": "^4.4.0",
27-
"purescript-exceptions": "^4.0.0"
25+
"purescript-assert": "master",
26+
"purescript-console": "master",
27+
"purescript-exceptions": "master"
2828
}
2929
}

spago.dhall

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
, "console"
77
, "effect"
88
, "exceptions"
9-
, "generics-rep"
9+
, "prelude"
1010
, "psci-support"
1111
, "record"
1212
]

src/Data/Argonaut/Decode/Generic/Rep.purs renamed to src/Data/Argonaut/Decode/Generic.purs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module Data.Argonaut.Decode.Generic.Rep (
1+
module Data.Argonaut.Decode.Generic (
22
class DecodeRep,
33
class DecodeRepArgs,
44
class DecodeLiteral,
@@ -17,7 +17,7 @@ import Prelude
1717
import Control.Alt ((<|>))
1818
import Data.Argonaut.Core (Json, fromString, toArray, toObject, toString, fromArray)
1919
import Data.Argonaut.Decode (class DecodeJson, decodeJson, JsonDecodeError(..))
20-
import Data.Argonaut.Types.Generic.Rep (Encoding, defaultEncoding)
20+
import Data.Argonaut.Types.Generic (Encoding, defaultEncoding)
2121
import Data.Array (uncons)
2222
import Data.Bifunctor (lmap)
2323
import Data.Either (Either(..), note)

src/Data/Argonaut/Encode/Generic/Rep.purs renamed to src/Data/Argonaut/Encode/Generic.purs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module Data.Argonaut.Encode.Generic.Rep (
1+
module Data.Argonaut.Encode.Generic (
22
class EncodeRep,
33
class EncodeRepArgs,
44
class EncodeLiteral,
@@ -13,10 +13,10 @@ module Data.Argonaut.Encode.Generic.Rep (
1313
) where
1414

1515
import Prelude
16-
import Data.Argonaut.Types.Generic.Rep (Encoding, defaultEncoding)
1716

1817
import Data.Argonaut.Core (Json, fromArray, fromObject, fromString)
1918
import Data.Argonaut.Encode.Class (class EncodeJson, encodeJson)
19+
import Data.Argonaut.Types.Generic (Encoding, defaultEncoding)
2020
import Data.Generic.Rep as Rep
2121
import Data.Symbol (class IsSymbol, reflectSymbol)
2222
import Foreign.Object as FO

src/Data/Argonaut/Types/Generic/Rep.purs renamed to src/Data/Argonaut/Types/Generic.purs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module Data.Argonaut.Types.Generic.Rep (
1+
module Data.Argonaut.Types.Generic (
22
Encoding(..),
33
defaultEncoding
44
) where
@@ -19,4 +19,3 @@ defaultEncoding =
1919
, valuesKey: "values"
2020
, unwrapSingleArguments: false
2121
}
22-

test/Main.purs

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ import Prelude
66

77
import Data.Argonaut.Core (Json, stringify)
88
import Data.Argonaut.Decode.Class (class DecodeJson, decodeJson)
9-
import Data.Argonaut.Decode.Generic.Rep (class DecodeLiteral, decodeLiteralSumWithTransform, genericDecodeJson, genericDecodeJsonWith)
9+
import Data.Argonaut.Decode.Generic (class DecodeLiteral, decodeLiteralSumWithTransform, genericDecodeJson, genericDecodeJsonWith)
1010
import Data.Argonaut.Encode.Class (class EncodeJson, encodeJson)
11-
import Data.Argonaut.Encode.Generic.Rep (class EncodeLiteral, encodeLiteralSumWithTransform, genericEncodeJson, genericEncodeJsonWith)
11+
import Data.Argonaut.Encode.Generic (class EncodeLiteral, encodeLiteralSumWithTransform, genericEncodeJson, genericEncodeJsonWith)
1212
import Data.Argonaut.Parser (jsonParser)
13-
import Data.Argonaut.Types.Generic.Rep (Encoding, defaultEncoding)
13+
import Data.Argonaut.Types.Generic (Encoding, defaultEncoding)
1414
import Data.Either (Either(..), either)
1515
import Data.Generic.Rep (class Generic)
16-
import Data.Generic.Rep.Show (genericShow)
16+
import Data.Show.Generic (genericShow)
1717
import Data.String (toLower, toUpper)
1818
import Effect (Effect)
1919
import Effect.Console (log)

0 commit comments

Comments
 (0)