Merge pull request #1 from garyb/paulyoung-paulyoung/0.12

Improve constraints, bump -functors for `Compose` fix, remove StrongCheck/generated stuff

Author: paulyoung

README.md

@@ -34,10 +34,6 @@ import Text.Markdown.SlamDown.Pretty
 Module documentation is [published on
 Pursuit](http://pursuit.purescript.org/packages/purescript-markdown).
 
-### Tests
-
-The tests use [purescript-strongcheck](http://github.com/purescript-contrib/purescript-strongcheck) to verify that an arbitrary `SlamDown` document can be rendered as a `String` and then parsed to a `SlamDown` equal to the original.
-
 ## Features
 
 In general, SlamDown is a subset of [CommonMark](http://spec.commonmark.org/), supporting the following features:

bower.json

@@ -24,16 +24,18 @@
   "dependencies": {
     "purescript-const": "^4.0.0",
     "purescript-datetime": "^4.0.0",
-    "purescript-functors": "^3.0.0",
+    "purescript-functors": "^3.0.1",
     "purescript-lists": "^5.0.0",
     "purescript-ordered-collections": "^1.0.0",
     "purescript-parsing": "^5.0.1",
     "purescript-partial": "^2.0.0",
     "purescript-precise": "^3.0.1",
     "purescript-prelude": "^4.0.1",
     "purescript-strings": "^4.0.0",
-    "purescript-strongcheck": "^4.1.1",
     "purescript-unicode": "^4.0.1",
     "purescript-validation": "^4.0.0"
+  },
+  "devDependencies": {
+    "purescript-assert": "^4.0.0"
   }
 }

src/Text/Markdown/SlamDown/Syntax.purs

@@ -9,33 +9,28 @@ module Text.Markdown.SlamDown.Syntax
 
 import Prelude
 
+import Data.Eq (class Eq1)
 import Data.List as L
-import Test.StrongCheck.Arbitrary as SCA
-import Test.StrongCheck.Gen as Gen
-
+import Data.Ord (class Ord1)
 import Text.Markdown.SlamDown.Syntax.Block (Block(..), CodeBlockType(..), ListType(..)) as SDB
 import Text.Markdown.SlamDown.Syntax.FormField (class Value, Expr(..), FormField, FormFieldP(..), TextBox(..), TimePrecision(..), getLiteral, getUnevaluated, renderValue, stringValue, transFormField, transTextBox, traverseFormField, traverseTextBox) as SDF
 import Text.Markdown.SlamDown.Syntax.Inline (Inline(..), LinkTarget(..)) as SDI
 
 -- | `SlamDownP` is the type of SlamDown abstract syntax trees which take values in `a`.
-data SlamDownP a = SlamDown (L.List (SDB.Block a))
+newtype SlamDownP a = SlamDown (L.List (SDB.Block a))
 
 type SlamDown = SlamDownP String
 
-instance functorSlamDownP ∷ Functor SlamDownP where
-  map f (SlamDown bs) = SlamDown (map f <$> bs)
+derive instance functorSlamDownP ∷ Functor SlamDownP
 
 instance showSlamDownP ∷ (Show a) ⇒ Show (SlamDownP a) where
   show (SlamDown bs) = "(SlamDown " <> show bs <> ")"
 
-derive instance eqSlamDownP ∷ (Eq a, Ord a) ⇒ Eq (SlamDownP a)
-derive instance ordSlamDownP ∷ (Eq a, Ord a) ⇒ Ord (SlamDownP a)
-
-instance semigroupSlamDownP ∷ Semigroup (SlamDownP a) where
-  append (SlamDown bs1) (SlamDown bs2) = SlamDown (bs1 <> bs2)
+derive newtype instance eqSlamDownP ∷ Eq a ⇒ Eq (SlamDownP a)
+derive instance eq1SlamDownP ∷ Eq1 SlamDownP
 
-instance monoidSlamDownP ∷ Monoid (SlamDownP a) where
-  mempty = SlamDown mempty
+derive newtype instance ordSlamDownP ∷ Ord a ⇒ Ord (SlamDownP a)
+derive instance ord1SlamDownP ∷ Ord1 SlamDownP
 
-instance arbitrarySlamDownP ∷ (SCA.Arbitrary a, Eq a) ⇒ SCA.Arbitrary (SlamDownP a) where
-  arbitrary = SlamDown <<< L.fromFoldable <$> Gen.arrayOf SCA.arbitrary
+derive newtype instance semigroupSlamDownP ∷ Semigroup (SlamDownP a)
+derive newtype instance monoidSlamDownP ∷ Monoid (SlamDownP a)

src/Text/Markdown/SlamDown/Syntax/Block.purs

@@ -6,11 +6,9 @@ module Text.Markdown.SlamDown.Syntax.Block
 
 import Prelude
 
+import Data.Eq (class Eq1)
 import Data.List as L
-
-import Test.StrongCheck.Arbitrary as SCA
-import Test.StrongCheck.Gen as Gen
-
+import Data.Ord (class Ord1)
 import Text.Markdown.SlamDown.Syntax.Inline (Inline)
 
 data Block a
@@ -22,18 +20,9 @@ data Block a
   | LinkReference String String
   | Rule
 
-instance functorBlock ∷ Functor Block where
-  map f x =
-    case x of
-      Paragraph is → Paragraph (map f <$> is)
-      Header n is → Header n (map f <$> is)
-      Blockquote bs → Blockquote (map f <$> bs)
-      Lst ty bss → Lst ty (map (map f) <$> bss)
-      CodeBlock ty ss → CodeBlock ty ss
-      LinkReference l uri → LinkReference l uri
-      Rule → Rule
+derive instance functorBlock ∷ Functor Block
 
-instance showBlock ∷ (Show a) ⇒ Show (Block a) where
+instance showBlock ∷ Show a ⇒ Show (Block a) where
   show (Paragraph is) = "(Paragraph " <> show is <> ")"
   show (Header n is) = "(Header " <> show n <> " " <> show is <> ")"
   show (Blockquote bs) = "(Blockquote " <> show bs <> ")"
@@ -42,24 +31,10 @@ instance showBlock ∷ (Show a) ⇒ Show (Block a) where
   show (LinkReference l uri) = "(LinkReference " <> show l <> " " <> show uri <> ")"
   show Rule = "Rule"
 
-derive instance eqBlock ∷ (Eq a, Ord a) ⇒ Eq (Block a)
-derive instance ordBlock ∷ (Ord a) ⇒ Ord (Block a)
-
--- | Nota bene: this does not generate any recursive structure
-instance arbitraryBlock ∷ (SCA.Arbitrary a, Eq a) ⇒ SCA.Arbitrary (Block a) where
-  arbitrary = do
-    k ← Gen.chooseInt 0 6
-    case k of
-      0 → Paragraph <$> listOf SCA.arbitrary
-      1 → Header <$> SCA.arbitrary <*> listOf SCA.arbitrary
-      2 → pure $ Blockquote L.Nil
-      3 → Lst <$> SCA.arbitrary <*> listOf (pure L.Nil)
-      4 → CodeBlock <$> SCA.arbitrary <*> listOf SCA.arbitrary
-      5 → LinkReference <$> SCA.arbitrary <*> SCA.arbitrary
-      _ → pure Rule
-
-listOf ∷ ∀ f a. (Monad f) ⇒ Gen.GenT f a → Gen.GenT f (L.List a)
-listOf = map L.fromFoldable <<< Gen.arrayOf
+derive instance eqBlock ∷ Eq a ⇒ Eq (Block a)
+derive instance eq1Block ∷ Eq1 Block
+derive instance ordBlock ∷ Ord a ⇒ Ord (Block a)
+derive instance ord1Block ∷ Ord1 Block
 
 data ListType
   = Bullet String
@@ -72,11 +47,6 @@ instance showListType ∷ Show ListType where
 derive instance eqListType ∷ Eq ListType
 derive instance ordListType ∷ Ord ListType
 
-instance arbitraryListType ∷ SCA.Arbitrary ListType where
-  arbitrary = do
-    b ← SCA.arbitrary
-    if b then Bullet <$> SCA.arbitrary else Ordered <$> SCA.arbitrary
-
 data CodeBlockType
   = Indented
   | Fenced Boolean String
@@ -87,8 +57,3 @@ instance showCodeBlockType ∷ Show CodeBlockType where
 
 derive instance eqCodeBlockType ∷ Eq CodeBlockType
 derive instance ordCodeBlockType ∷ Ord CodeBlockType
-
-instance arbitraryCodeBlockType ∷ SCA.Arbitrary CodeBlockType where
-  arbitrary = do
-    b ← SCA.arbitrary
-    if b then pure Indented else Fenced <$> SCA.arbitrary <*> SCA.arbitrary