Skip to content

Commit c7f03a2

Browse files
authored
Merge pull request #1 from garyb/data
Move namespace to Data.Codec
2 parents 0eeb2f2 + 29f7434 commit c7f03a2

File tree

10 files changed

+27
-27
lines changed

10 files changed

+27
-27
lines changed

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
],
1818
"dependencies": {
1919
"purescript-argonaut-core": "^3.1.0",
20-
"purescript-codec": "^1.0.0",
20+
"purescript-codec": "^2.0.0",
2121
"purescript-generics-rep": "^5.1.0"
2222
},
2323
"devDependencies": {

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
},
88
"devDependencies": {
99
"pulp": "^11.0.0",
10-
"purescript": "^0.11.3",
10+
"purescript": "^0.11.5",
1111
"purescript-psa": "^0.5.1",
1212
"rimraf": "^2.6.1"
1313
}

src/Control/Codec/Argonaut.purs renamed to src/Data/Codec/Argonaut.purs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module Control.Monad.Codec.Argonaut
1+
module Data.Codec.Argonaut
22
( JsonCodec
33
, JsonDecodeError(..)
44
, printJsonDecodeError
@@ -23,23 +23,23 @@ module Control.Monad.Codec.Argonaut
2323

2424
import Prelude
2525

26-
import Control.Monad.Codec (BasicCodec, Codec, GCodec(..), basicCodec, bihoistGCodec, decode, encode)
27-
import Control.Monad.Codec (decode, encode, (~), (<~<)) as Exports
2826
import Control.Monad.Reader (ReaderT(..), runReaderT)
2927
import Control.Monad.Writer (writer, mapWriter)
3028
import Data.Argonaut.Core as J
3129
import Data.Array as A
3230
import Data.Bifunctor as BF
31+
import Data.Codec (BasicCodec, Codec, GCodec(..), basicCodec, bihoistGCodec, decode, encode)
32+
import Data.Codec (decode, encode, (~), (<~<)) as Exports
3333
import Data.Either (Either(..))
3434
import Data.Generic.Rep (class Generic)
3535
import Data.Generic.Rep.Show (genericShow)
3636
import Data.Int as I
3737
import Data.List as L
3838
import Data.Maybe (Maybe(..), maybe)
39+
import Data.Profunctor.Star (Star(..))
3940
import Data.String as S
4041
import Data.StrMap as SM
4142
import Data.Traversable (traverse)
42-
import Data.Profunctor.Star (Star(..))
4343
import Data.Tuple (Tuple(..))
4444

4545
-- | Codec type for `Json` values.

src/Control/Codec/Argonaut/Common.purs renamed to src/Data/Codec/Argonaut/Common.purs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
module Control.Monad.Codec.Argonaut.Common
2-
( module Control.Monad.Codec.Argonaut.Common
3-
, module Control.Monad.Codec.Argonaut
1+
module Data.Codec.Argonaut.Common
2+
( module Data.Codec.Argonaut.Common
3+
, module Data.Codec.Argonaut
44
) where
55

66
import Prelude hiding (map)
77

8-
import Control.Monad.Codec (basicCodec)
9-
import Control.Monad.Codec.Argonaut (JIndexedCodec, JPropCodec, JsonCodec, JsonDecodeError(..), array, boolean, char, decode, encode, index, indexedArray, int, jarray, jobject, json, null, number, object, printJsonDecodeError, prop, string, (<~<), (~))
10-
import Control.Monad.Codec.Argonaut.Sum (Tag(..), taggedSum)
118
import Data.Argonaut.Core as J
129
import Data.Array as A
1310
import Data.Bifunctor as BF
11+
import Data.Codec (basicCodec)
12+
import Data.Codec.Argonaut (JIndexedCodec, JPropCodec, JsonCodec, JsonDecodeError(..), array, boolean, char, decode, encode, index, indexedArray, int, jarray, jobject, json, null, number, object, printJsonDecodeError, prop, string, (<~<), (~))
13+
import Data.Codec.Argonaut.Sum (Tag(..), taggedSum)
1414
import Data.Either (Either(..))
1515
import Data.List as L
1616
import Data.Map as M

src/Control/Codec/Argonaut/Compat.purs renamed to src/Data/Codec/Argonaut/Compat.purs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
-- | Codecs that are compatible with `purescript-argonaut-codecs`.
2-
module Control.Monad.Codec.Argonaut.Compat
3-
( module Control.Monad.Codec.Argonaut.Compat
4-
, module Control.Monad.Codec.Argonaut
2+
module Data.Codec.Argonaut.Compat
3+
( module Data.Codec.Argonaut.Compat
4+
, module Data.Codec.Argonaut
55
, module Common
66
) where
77

88
import Prelude
99

10-
import Control.Monad.Codec (basicCodec, mapCodec)
11-
import Control.Monad.Codec.Argonaut (JIndexedCodec, JPropCodec, JsonCodec, JsonDecodeError(..), array, boolean, char, decode, encode, index, indexedArray, int, jarray, jobject, json, null, number, object, printJsonDecodeError, prop, string, (<~<), (~))
12-
import Control.Monad.Codec.Argonaut.Common (either, list, map, tuple) as Common
1310
import Data.Argonaut.Core as J
1411
import Data.Bifunctor as BF
12+
import Data.Codec (basicCodec, mapCodec)
13+
import Data.Codec.Argonaut (JIndexedCodec, JPropCodec, JsonCodec, JsonDecodeError(..), array, boolean, char, decode, encode, index, indexedArray, int, jarray, jobject, json, null, number, object, printJsonDecodeError, prop, string, (<~<), (~))
14+
import Data.Codec.Argonaut.Common (either, list, map, tuple) as Common
1515
import Data.Either (Either)
1616
import Data.Functor as F
1717
import Data.Maybe (Maybe(..))

src/Control/Codec/Argonaut/Sum.purs renamed to src/Data/Codec/Argonaut/Sum.purs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
module Control.Monad.Codec.Argonaut.Sum
1+
module Data.Codec.Argonaut.Sum
22
( Tag(..)
33
, taggedSum
44
) where
55

66
import Prelude
77

8-
import Control.Monad.Codec (GCodec(..), decode, encode)
9-
import Control.Monad.Codec.Argonaut (JsonCodec, JsonDecodeError, jobject, json, prop, string)
108
import Control.Monad.Reader (ReaderT(..))
119
import Control.Monad.Writer (Writer, writer)
1210
import Data.Argonaut.Core as J
11+
import Data.Codec (GCodec(..), decode, encode)
12+
import Data.Codec.Argonaut (JsonCodec, JsonDecodeError, jobject, json, prop, string)
1313
import Data.Either as E
14+
import Data.Newtype (class Newtype)
15+
import Data.Profunctor.Star (Star(..))
1416
import Data.StrMap as SM
1517
import Data.StrMap.ST as SMST
16-
import Data.Profunctor.Star (Star(..))
1718
import Data.Tuple (Tuple(..))
18-
import Data.Newtype (class Newtype)
1919

2020
-- | A tag value for a case in a sum type.
2121
newtype Tag = Tag String

test/Test/Common.purs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ module Test.Common where
22

33
import Prelude
44

5-
import Control.Monad.Codec.Argonaut.Common as JA
65
import Control.Monad.Eff.Console (log)
76
import Control.Monad.Gen as Gen
87
import Control.Monad.Gen.Common as GenC
8+
import Data.Codec.Argonaut.Common as JA
99
import Data.Map.Gen (genMap)
1010
import Data.String.Gen (genAsciiString)
1111
import Data.StrMap.Gen (genStrMap)

test/Test/Compat.purs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ module Test.Compat where
22

33
import Prelude
44

5-
import Control.Monad.Codec.Argonaut.Compat as JA
65
import Control.Monad.Eff.Console (log)
76
import Control.Monad.Gen.Common as GenC
87
import Data.Argonaut.Decode (class DecodeJson, decodeJson)
98
import Data.Argonaut.Encode (class EncodeJson, encodeJson)
9+
import Data.Codec.Argonaut.Compat as JA
1010
import Data.Either (Either(..))
1111
import Data.String.Gen (genAsciiString)
1212
import Data.StrMap.Gen (genStrMap)

test/Test/Prim.purs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ module Test.Prim where
22

33
import Prelude
44

5-
import Control.Monad.Codec.Argonaut.Common as JA
65
import Control.Monad.Eff.Console (log)
76
import Control.Monad.Gen as Gen
87
import Data.Argonaut.Core as J
98
import Data.Argonaut.Gen (genJson)
109
import Data.Char.Gen (genAsciiChar)
10+
import Data.Codec.Argonaut.Common as JA
1111
import Data.String.Gen (genAsciiString)
1212
import Data.StrMap.Gen (genStrMap)
1313
import Test.QuickCheck (QC, Result, quickCheck)

test/Test/Util.purs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ module Test.Util where
22

33
import Prelude
44

5-
import Control.Monad.Codec.Argonaut.Common as JA
65
import Control.Monad.Gen as Gen
6+
import Data.Codec.Argonaut.Common as JA
77
import Data.Either (Either(..))
88
import Test.QuickCheck (Result, (===))
99
import Test.QuickCheck.Gen (Gen)

0 commit comments

Comments
 (0)