Merge pull request #82 from justinwoo/ivantomac-master

"purescript 0.14"

Author: justinwoo

bower.json

@@ -12,19 +12,17 @@
     "output"
   ],
   "dependencies": {
-    "purescript-prelude": "^4.1.1",
-    "purescript-typelevel-prelude": "^5.0.0",
-    "purescript-record": "^2.0.1",
-    "purescript-variant": "^6.0.1",
-    "purescript-nullable": "^4.1.1",
-    "purescript-foreign-object": "^2.0.3",
-    "purescript-globals": "^4.0.0",
-    "purescript-foreign": "^5.0.0",
-    "purescript-exceptions": "^4.0.0",
-    "purescript-arrays": "^5.3.0"
+    "purescript-prelude": "^5.0.0",
+    "purescript-typelevel-prelude": "^6.0.0",
+    "purescript-record": "^3.0.0",
+    "purescript-variant": "^7.0.1",
+    "purescript-nullable": "^5.0.0",
+    "purescript-foreign-object": "^3.0.0",
+    "purescript-foreign": "^6.0.0",
+    "purescript-exceptions": "^5.0.0",
+    "purescript-arrays": "^6.0.0"
   },
   "devDependencies": {
-    "purescript-assert": "^4.1.0",
-    "purescript-generics-rep": "^6.1.1"
+    "purescript-assert": "^5.0.0"
   }
 }

ci.nix

@@ -1,28 +1,26 @@
 let
   nixpkgs = builtins.fetchTarball {
-    # Commit to release-20.03 on 23 June 2020
     url = "https://github.com/nixos/nixpkgs/archive/39da4240609ee0d8ea533f142ae4c7e25df95980.tar.gz";
     sha256 = "10mp5rjnkl0s6pigbnkdf6pjwm074nf4aq7mwhfwxmz5gs5dpi71";
   };
 in
 
 { pkgs ? import nixpkgs {} }:
 
-let
-  # Latest commit to the master branch as of 25 June 2020
-  ezPscSrc = pkgs.fetchFromGitHub {
-    owner = "justinwoo";
-    repo = "easy-purescript-nix";
-    rev = "2432d492b1f0cc3aa7bf8b4bdb2c7ee0219e1f4e";
-    sha256 = "0gdg7b4yvs9rg2z6xv705miq5c9vbhimq21nfmhk9j48b3m3xkhf";
-  };
-  ezPsc = import ezPscSrc { inherit pkgs; };
-in
+  let
+    ezPscSrc = pkgs.fetchFromGitHub {
+      owner = "justinwoo";
+      repo = "easy-purescript-nix";
+      rev = "e8a1ffafafcdf2e81adba419693eb35f3ee422f8";
+      sha256 = "0bk32wckk82f1j5i5gva63f3b3jl8swc941c33bqc3pfg5cgkyyf";
+    };
+    ezPsc = import ezPscSrc { inherit pkgs; };
+  in
 
-pkgs.mkShell {
-  buildInputs = [
-    ezPsc.purs
-    pkgs.nodePackages_10_x.bower
-    pkgs.nodePackages_10_x.pulp
-  ];
-}
+    pkgs.mkShell {
+      buildInputs = [
+        ezPsc.purs-0_14_0
+        pkgs.nodePackages_10_x.bower
+        pkgs.nodePackages_10_x.pulp
+      ];
+    }

src/Simple/JSON.js

@@ -1,3 +1,5 @@
 exports._parseJSON = JSON.parse;
 
 exports._undefined = undefined;
+
+exports._unsafeStringify = JSON.stringify;

src/Simple/JSON.purs

@@ -10,6 +10,7 @@ module Simple.JSON
 , read_
 , parseJSON
 , undefined
+, unsafeStringify
 
 , class ReadForeign
 , readImpl
@@ -49,14 +50,13 @@ import Foreign (F, Foreign, ForeignError(..), MultipleErrors, fail, isNull, isUn
 import Foreign.Index (readProp)
 import Foreign.Object (Object)
 import Foreign.Object as Object
-import Global.Unsafe (unsafeStringify)
 import Partial.Unsafe (unsafeCrashWith)
 import Prim.Row as Row
-import Prim.RowList (class RowToList, Cons, Nil, kind RowList)
+import Prim.RowList (class RowToList, Cons, Nil, RowList)
 import Record (get)
 import Record.Builder (Builder)
 import Record.Builder as Builder
-import Type.Prelude (RLProxy(..))
+import Type.Prelude (Proxy(..))
 
 -- | An alias for the Either result of decoding
 type E a = Either MultipleErrors a
@@ -84,12 +84,19 @@ readJSON_ ::  forall a
   -> Maybe a
 readJSON_ = hush <<< readJSON
 
+-- | Uses the global JSON object to turn anything into a string. Careful! Trying
+-- | to serialize functions returns undefined
+foreign import _unsafeStringify :: forall a. a -> String
+
+unsafeStringify :: forall a. a -> String
+unsafeStringify = _unsafeStringify
+
 -- | Write a JSON string from a type `a`.
 writeJSON :: forall a
   .  WriteForeign a
   => a
   -> String
-writeJSON = unsafeStringify <<< writeImpl
+writeJSON = _unsafeStringify <<< writeImpl
 
 write :: forall a
   .  WriteForeign a
@@ -199,12 +206,12 @@ instance readRecord ::
   ) => ReadForeign (Record fields) where
   readImpl o = flip Builder.build {} <$> getFields fieldListP o
     where
-      fieldListP = RLProxy :: RLProxy fieldList
+      fieldListP = Proxy :: Proxy fieldList
 
 -- | A class for reading foreign values from properties
-class ReadForeignFields (xs :: RowList) (from :: # Type) (to :: # Type)
+class ReadForeignFields (xs :: RowList Type) (from :: Row Type) (to :: Row Type)
   | xs -> from to where
-  getFields :: RLProxy xs
+  getFields :: Proxy xs
     -> Foreign
     -> F (Builder (Record from) (Record to))
 
@@ -222,7 +229,7 @@ instance readFieldsCons ::
         pure $ Builder.insert nameP value
       rest = getFields tailP obj
       nameP = SProxy :: SProxy name
-      tailP = RLProxy :: RLProxy tail
+      tailP = Proxy :: Proxy tail
       name = reflectSymbol nameP
       withExcept' = withExcept <<< map $ ErrorAtProperty name
 
@@ -246,11 +253,11 @@ instance readForeignVariant ::
   ( RowToList variants rl
   , ReadForeignVariant rl variants
   ) => ReadForeign (Variant variants) where
-  readImpl o = readVariantImpl (RLProxy :: RLProxy rl) o
+  readImpl o = readVariantImpl (Proxy :: Proxy rl) o
 
-class ReadForeignVariant (xs :: RowList) (row :: # Type)
+class ReadForeignVariant (xs :: RowList Type) (row :: Row Type)
   | xs -> row where
-  readVariantImpl :: RLProxy xs
+  readVariantImpl :: Proxy xs
     -> Foreign
     -> F (Variant row)
 
@@ -272,7 +279,7 @@ instance readVariantCons ::
         pure $ inj namep value
       else
         (fail <<< ForeignError $ "Did not match variant tag " <> name)
-    <|> readVariantImpl (RLProxy :: RLProxy tail) o
+    <|> readVariantImpl (Proxy :: Proxy tail) o
     where
       namep = SProxy :: SProxy name
       name = reflectSymbol namep
@@ -318,10 +325,10 @@ instance recordWriteForeign ::
   ) => WriteForeign (Record row) where
   writeImpl rec = unsafeToForeign $ Builder.build steps {}
     where
-      rlp = RLProxy :: RLProxy rl
+      rlp = Proxy :: Proxy rl
       steps = writeImplFields rlp rec
 
-class WriteForeignFields (rl :: RowList) row (from :: # Type) (to :: # Type)
+class WriteForeignFields (rl :: RowList Type) row (from :: Row Type) (to :: Row Type)
   | rl -> row from to where
   writeImplFields :: forall g. g rl -> Record row -> Builder (Record from) (Record to)
 
@@ -337,7 +344,7 @@ instance consWriteForeignFields ::
     where
       namep = SProxy :: SProxy name
       value = writeImpl $ get namep rec
-      tailp = RLProxy :: RLProxy tail
+      tailp = Proxy :: Proxy tail
       rest = writeImplFields tailp rec
       result = Builder.insert namep value <<< rest
 instance nilWriteForeignFields ::
@@ -348,9 +355,9 @@ instance writeForeignVariant ::
   ( RowToList row rl
   , WriteForeignVariant rl row
   ) => WriteForeign (Variant row) where
-  writeImpl variant = writeVariantImpl (RLProxy :: RLProxy rl) variant
+  writeImpl variant = writeVariantImpl (Proxy :: Proxy rl) variant
 
-class WriteForeignVariant (rl :: RowList) (row :: # Type)
+class WriteForeignVariant (rl :: RowList Type) (row :: Row Type)
   | rl -> row where
   writeVariantImpl :: forall g. g rl -> Variant row -> Foreign
 
@@ -370,7 +377,7 @@ instance consWriteForeignVariant ::
     on
       namep
       writeVariant
-      (writeVariantImpl (RLProxy :: RLProxy tail))
+      (writeVariantImpl (Proxy :: Proxy tail))
       variant
     where
     namep = SProxy :: SProxy name

test/EnumSumGeneric.purs

@@ -6,7 +6,7 @@ import Control.Alt ((<|>))
 import Control.Monad.Except (throwError)
 import Data.Either (Either, isRight)
 import Data.Generic.Rep (class Generic, Constructor(..), NoArguments(..), Sum(..), to)
-import Data.Generic.Rep.Show (genericShow)
+import Data.Show.Generic (genericShow)
 import Effect (Effect)
 import Foreign (Foreign)
 import Foreign as Foreign

test/Generic.purs

@@ -5,7 +5,7 @@ import Prelude
 import Control.Alt ((<|>))
 import Data.Either (Either, isRight)
 import Data.Generic.Rep as GR
-import Data.Generic.Rep.Show (genericShow)
+import Data.Show.Generic (genericShow)
 import Effect (Effect)
 import Foreign (Foreign)
 import Foreign as Foreign

test/Main.purs

@@ -4,7 +4,7 @@ import Prelude
 
 import Control.Monad.Except (runExcept)
 import Data.Bifunctor (lmap)
-import Data.Either (Either(..), either, fromLeft, isRight)
+import Data.Either (Either(..), either, isRight)
 import Data.List (List(..), (:))
 import Data.List.NonEmpty (NonEmptyList(..))
 import Data.Maybe (Maybe)
@@ -15,7 +15,6 @@ import Effect (Effect)
 import Effect.Exception (throw)
 import Foreign (Foreign, ForeignError(..), MultipleErrors)
 import Foreign.Object (Object)
-import Partial.Unsafe (unsafePartial)
 import Simple.JSON (class ReadForeign, class WriteForeign, parseJSON, readJSON, writeJSON)
 import Test.Assert (assertEqual)
 import Test.EnumSumGeneric as Test.EnumSumGeneric
@@ -98,8 +97,8 @@ main = do
 
   -- "fails with invalid JSON"
   let r1 = readJSON """{ "c": 1, "d": 2}"""
-  (unsafePartial $ fromLeft r1) `shouldEqual`
-    (NonEmptyList (NonEmpty (ErrorAtProperty "a" (TypeMismatch "Int" "Undefined")) ((ErrorAtProperty "b" (TypeMismatch "String" "Undefined")) : (ErrorAtProperty "c" (TypeMismatch "Boolean" "Number")) : (ErrorAtProperty "d" (TypeMismatch "array" "Number")) : Nil)))
+  r1 `shouldEqual`
+    (Left (NonEmptyList (NonEmpty (ErrorAtProperty "a" (TypeMismatch "Int" "Undefined")) ((ErrorAtProperty "b" (TypeMismatch "String" "Undefined")) : (ErrorAtProperty "c" (TypeMismatch "Boolean" "Number")) : (ErrorAtProperty "d" (TypeMismatch "array" "Number")) : Nil))))
   isRight (r1 :: E MyTest) `shouldEqual` false
 
   -- "works with missing Maybe fields by setting them to Nothing"
@@ -110,8 +109,8 @@ main = do
   let r3 = readJSON """
     { "a": "asdf" }
   """
-  (unsafePartial $ fromLeft r3) `shouldEqual`
-    (NonEmptyList (NonEmpty (ErrorAtProperty "b" (TypeMismatch "Nullable String" "Undefined")) Nil))
+  r3 `shouldEqual`
+    (Left (NonEmptyList (NonEmpty (ErrorAtProperty "b" (TypeMismatch "Nullable String" "Undefined")) Nil)))
   (isRight (r3 :: E MyTestNullable)) `shouldEqual` false
 
   -- roundtrips

test/Util.purs

@@ -3,7 +3,7 @@ module Test.Util where
 import Prelude
 
 import Prim.Row as Row
-import Prim.RowList (class RowToList, Cons, Nil, kind RowList)
+import Prim.RowList (class RowToList, Cons, Nil, RowList)
 import Record (get)
 import Type.Prelude (class IsSymbol, RLProxy(..), SProxy(..))
 
@@ -17,7 +17,7 @@ equal
   -> Boolean
 equal a b = equalFields (RLProxy :: RLProxy rs) a b
 
-class EqualFields (rs :: RowList) (row :: # Type) | rs -> row where
+class EqualFields (rs :: RowList Type) (row :: Row Type) | rs -> row where
   equalFields :: RLProxy rs -> Record row -> Record row -> Boolean
 
 instance equalFieldsCons