Update for PureScript 0.13

Author: garyb

bower.json

@@ -21,7 +21,6 @@
     "purescript-generics-rep": "^6.0.0",
     "purescript-variant": "^6.0.0",
     "purescript-ordered-collections": "^1.0.0",
-    "purescript-typelevel-prelude": "^4.0.0",
     "purescript-type-equality": "^3.0.0"
   },
   "devDependencies": {

package.json

@@ -6,9 +6,9 @@
     "test": "pulp test"
   },
   "devDependencies": {
-    "pulp": "^12.0.0",
-    "purescript": "^0.12.0",
-    "purescript-psa": "^0.6.0",
+    "pulp": "^13.0.0",
+    "purescript": "^0.13.0",
+    "purescript-psa": "^0.7.3",
     "rimraf": "^2.6.2"
   }
 }

src/Data/Codec/Argonaut/Record.purs

@@ -6,33 +6,34 @@ module Data.Codec.Argonaut.Record
 
 import Data.Codec.Argonaut as CA
 import Data.Symbol (class IsSymbol, SProxy(..))
-import Prim.Row as Row
+import Prim.Row as R
+import Prim.RowList as RL
 import Record as Rec
+import Type.Data.RowList (RLProxy(..))
 import Type.Equality as TE
-import Type.Row as R
 import Unsafe.Coerce (unsafeCoerce)
 
-class RowListCodec (rl ∷ R.RowList) (ri ∷ # Type) (ro ∷ # Type) | rl → ri ro where
-  rowListCodec ∷ R.RLProxy rl → Record ri → CA.JPropCodec (Record ro)
+class RowListCodec (rl ∷ RL.RowList) (ri ∷ # Type) (ro ∷ # Type) | rl → ri ro where
+  rowListCodec ∷ RLProxy rl → Record ri → CA.JPropCodec (Record ro)
 
-instance rowListCodecNil ∷ RowListCodec R.Nil () () where
+instance rowListCodecNil ∷ RowListCodec RL.Nil () () where
   rowListCodec _ _ = CA.record
 
 instance rowListCodecCons ∷
   ( RowListCodec rs ri' ro'
-  , Row.Cons sym (CA.JsonCodec a) ri' ri
-  , Row.Cons sym a ro' ro
+  , R.Cons sym (CA.JsonCodec a) ri' ri
+  , R.Cons sym a ro' ro
   , IsSymbol sym
   , TE.TypeEquals co (CA.JsonCodec a)
-  ) ⇒ RowListCodec (R.Cons sym co rs) ri ro where
+  ) ⇒ RowListCodec (RL.Cons sym co rs) ri ro where
   rowListCodec _ codecs =
     CA.recordProp (SProxy ∷ SProxy sym) codec tail
     where
     codec ∷ CA.JsonCodec a
     codec = TE.from (Rec.get (SProxy ∷ SProxy sym) codecs)
 
     tail ∷ CA.JPropCodec (Record ro')
-    tail = rowListCodec (R.RLProxy ∷ R.RLProxy rs) ((unsafeCoerce ∷ Record ri → Record ri') codecs)
+    tail = rowListCodec (RLProxy ∷ RLProxy rs) ((unsafeCoerce ∷ Record ri → Record ri') codecs)
 
 -- | Constructs a record codec from a record of codecs.
 -- |
@@ -47,8 +48,8 @@ instance rowListCodecCons ∷
 
 record
   ∷ ∀ ri ro rl
-  . R.RowToList ri rl
+  . RL.RowToList ri rl
   ⇒ RowListCodec rl ri ro
   ⇒ Record ri
   → CA.JPropCodec (Record ro)
-record = rowListCodec (R.RLProxy ∷ R.RLProxy rl)
+record = rowListCodec (RLProxy ∷ RLProxy rl)

src/Data/Codec/Argonaut/Variant.purs

@@ -15,10 +15,11 @@ import Data.Tuple (Tuple(..))
 import Data.Variant (SProxy, Variant, case_, inj, on)
 import Foreign.Object as FO
 import Foreign.Object.ST as FOST
-import Prim.Row as Row
+import Prim.Row as R
+import Prim.RowList as RL
 import Record as Rec
+import Type.Data.RowList (RLProxy(..))
 import Type.Equality as TE
-import Type.Row as R
 import Unsafe.Coerce (unsafeCoerce)
 
 -- | Allows building codecs for variants in combination with variantCase.
@@ -49,7 +50,7 @@ variant = GCodec (ReaderT (Left <<< UnexpectedValue)) (Star case_)
 variantCase
   ∷ ∀ l a r r'
   . IsSymbol l
-  ⇒ Row.Cons l a r r'
+  ⇒ R.Cons l a r r'
   ⇒ SProxy l
   → Either a (JsonCodec a)
   → JsonCodec (Variant r)
@@ -84,32 +85,32 @@ variantCase proxy eacodec (GCodec dec enc) = GCodec dec' enc'
   coerceR ∷ Variant r → Variant r'
   coerceR = unsafeCoerce
 
-class VariantCodec (rl ∷ R.RowList) (ri ∷ # Type) (ro ∷ # Type) | rl → ri ro where
-  variantCodec ∷ R.RLProxy rl → Record ri → JsonCodec (Variant ro)
+class VariantCodec (rl ∷ RL.RowList) (ri ∷ # Type) (ro ∷ # Type) | rl → ri ro where
+  variantCodec ∷ RLProxy rl → Record ri → JsonCodec (Variant ro)
 
-instance variantCodecNil ∷ VariantCodec R.Nil () () where
+instance variantCodecNil ∷ VariantCodec RL.Nil () () where
   variantCodec _ _ = variant
 
 instance variantCodecCons ∷
   ( VariantCodec rs ri' ro'
-  , Row.Cons sym (Either a (JsonCodec a)) ri' ri
-  , Row.Cons sym a ro' ro
+  , R.Cons sym (Either a (JsonCodec a)) ri' ri
+  , R.Cons sym a ro' ro
   , IsSymbol sym
   , TE.TypeEquals co (Either a (JsonCodec a))
-  ) ⇒ VariantCodec (R.Cons sym co rs) ri ro where
+  ) ⇒ VariantCodec (RL.Cons sym co rs) ri ro where
   variantCodec _ codecs =
     variantCase (SProxy ∷ SProxy sym) codec tail
     where
     codec ∷ Either a (JsonCodec a)
     codec = TE.from (Rec.get (SProxy ∷ SProxy sym) codecs)
 
     tail ∷ JsonCodec (Variant ro')
-    tail = variantCodec (R.RLProxy ∷ R.RLProxy rs) ((unsafeCoerce ∷ Record ri → Record ri') codecs)
+    tail = variantCodec (RLProxy ∷ RLProxy rs) ((unsafeCoerce ∷ Record ri → Record ri') codecs)
 
 variantMatch
   ∷ ∀ rl ri ro
-  . R.RowToList ri rl
+  . RL.RowToList ri rl
   ⇒ VariantCodec rl ri ro
   ⇒ Record ri
   → JsonCodec (Variant ro)
-variantMatch = variantCodec (R.RLProxy ∷ R.RLProxy rl)
+variantMatch = variantCodec (RLProxy ∷ RLProxy rl)