SD-1651 (second try) (#65)

* update build

* fix warning

* Support spaces in form field items

Author: jonsterling

package.json

@@ -1,6 +1,6 @@
 {
   "private": true,
   "devDependencies": {
-    "purescript": "^0.8.2"
+    "purescript": "^0.8.5"
   }
 }

src/Text/Markdown/SlamDown/Eval.purs

@@ -62,8 +62,8 @@ eval fs = everywhereM b i
       quoteTextBox = SD.transTextBox (runIdentity >>> SD.Literal >>> M.Just >>> Compose)
 
   f (SD.RadioButtons sel opts) = do
-    sel' <- evalExpr fs.value sel
-    opts' <- evalExpr fs.list opts
+    sel' ← evalExpr fs.value sel
+    opts' ← evalExpr fs.list opts
     pure $ SD.RadioButtons sel' (mergeSelection sel' opts')
 
   f (SD.CheckBoxes checkeds vals) = do
@@ -90,4 +90,3 @@ eval fs = everywhereM b i
   getValues ∷ ∀ e. SD.Expr (L.List e) → L.List e
   getValues (SD.Literal vs) = vs
   getValues _ = L.Nil
-

src/Text/Markdown/SlamDown/Parser/Inline.purs

@@ -177,7 +177,7 @@ inlines = L.many inline2 <* PS.eof
     f is = SD.Strong $ L.singleton $ SD.Emph is
 
   space ∷ P.Parser String (SD.Inline a)
-  space = (toSpace <<< (S.fromChar <$>)) <$> L.some (PS.satisfy PU.isWhitespace)
+  space = (toSpace <<< (S.fromChar <$> _)) <$> L.some (PS.satisfy PU.isWhitespace)
     where
     toSpace cs
       | "\n" `elem` cs =
@@ -305,7 +305,7 @@ inlines = L.many inline2 <* PS.eof
       where
         literalRadioButtons = do
           ls ← L.some $ PC.try do
-            let item = SD.stringValue <$> manyOf \c → not $ c `elem` ['(',')',' ','!','`']
+            let item = SD.stringValue <<< S.trim <$> manyOf \c → not $ c `elem` ['(',')','!','`']
             PU.skipSpaces
             b ← (PS.string "(x)" *> pure true) <|> (PS.string "()" *> pure false)
             PU.skipSpaces
@@ -317,10 +317,6 @@ inlines = L.many inline2 <* PS.eof
               _ → P.fail "Invalid number of selected radio buttons"
           pure $ SD.RadioButtons (SD.Literal sel) (SD.Literal (map snd ls))
 
-
-        hole ∷ ∀ b. b
-        hole = Unsafe.Coerce.unsafeCoerce "hole"
-
         evaluatedRadioButtons = do
           SD.RadioButtons
             <$> PU.parens unevaluated
@@ -331,7 +327,7 @@ inlines = L.many inline2 <* PS.eof
       where
         literalCheckBoxes = do
           ls ← L.some $ PC.try do
-            let item = SD.stringValue <$> manyOf \c → not $ c `elem` ['[',']',' ','!','`']
+            let item = SD.stringValue <<< S.trim <$> manyOf \c → not $ c `elem` ['[',']','!','`']
             PU.skipSpaces
             b ← (PS.string "[x]" *> pure true) <|> (PS.string "[]" *> pure false)
             PU.skipSpaces
@@ -346,7 +342,7 @@ inlines = L.many inline2 <* PS.eof
 
     dropDown ∷ P.Parser String (SD.FormField a)
     dropDown = do
-      let item = SD.stringValue <$> manyOf \c → not $ c `elem` ['{','}',',',' ','!','`','(',')']
+      let item = SD.stringValue <<< S.trim <$> manyOf \c → not $ c `elem` ['{','}',',','!','`','(',')']
       ls ← PU.braces $ expr id $ (PC.try (PU.skipSpaces *> item)) `PC.sepBy` (PU.skipSpaces *> PS.string ",")
       sel ← PC.optionMaybe $ PU.skipSpaces *> (PU.parens $ expr id $ item)
       return $ SD.DropDown sel ls
@@ -456,4 +452,3 @@ unevaluated = do
   PS.string "!"
   ticks ← someOf (\x → S.fromChar x == "`")
   SD.Unevaluated <<< S.fromCharArray <<< L.fromList <$> PC.manyTill PS.anyChar (PS.string ticks)
-

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

@@ -134,7 +134,7 @@ instance arbitraryFormField ∷ (SC.Arbitrary a, Eq a) ⇒ SC.Arbitrary (FormFie
         case xse of
           Literal xs → do
             x ← do
-              def ← SC.arbitrary
+              let def = Data.Maybe.Unsafe.fromJust (L.head xs)
               Literal <$> Gen.elements def xs
             pure $ RadioButtons x xse
           Unevaluated e → do
@@ -154,7 +154,7 @@ instance arbitraryFormField ∷ (SC.Arbitrary a, Eq a) ⇒ SC.Arbitrary (FormFie
         case xse of
           Literal xs → do
             mx ← genMaybe do
-              def ← SC.arbitrary
+              let def = Data.Maybe.Unsafe.fromJust (L.head xs)
               Literal <$> Gen.elements def xs
             pure $ DropDown mx xse
           Unevaluated e → do
@@ -169,7 +169,7 @@ instance arbitraryFormFieldIdentity ∷ (SC.Arbitrary a, Eq a) ⇒ SC.Arbitrary
       1 → do
         xs ← distinctListOf $ getArbIdentity <$> SC.arbitrary
         x ← do
-          def <- getArbIdentity <$> SC.arbitrary
+          let def = Data.Maybe.Unsafe.fromJust (L.head xs)
           Gen.elements def xs
         pure $ RadioButtons x $ TR.sequence xs
       2 → do
@@ -179,7 +179,7 @@ instance arbitraryFormFieldIdentity ∷ (SC.Arbitrary a, Eq a) ⇒ SC.Arbitrary
       _ → do
         xs ← distinctListOf $ getArbIdentity <$> SC.arbitrary
         mx ← genMaybe do
-          def <- getArbIdentity <$> SC.arbitrary
+          let def = Data.Maybe.Unsafe.fromJust (L.head xs)
           Gen.elements def xs
         pure $ DropDown mx $ TR.sequence xs
 

test/src/Test/Main.purs

@@ -17,6 +17,8 @@ import Data.Array as A
 import Data.Char as CH
 import Data.String as S
 
+import Data.Tuple (uncurry)
+
 import Text.Markdown.SlamDown.Syntax as SD
 import Text.Markdown.SlamDown.Eval as SDE
 import Text.Markdown.SlamDown.Parser as SDP
@@ -32,7 +34,28 @@ type TestEffects e =
   | e
   )
 
-testDocument ∷ ∀ e. SD.SlamDown → Eff (TestEffects e) Unit
+newtype NonEmptyString = NonEmptyString String
+derive instance eqNonEmptyString ∷ Eq NonEmptyString
+
+genChar ∷ Gen.Gen Char
+genChar = Gen.elements '-' $ L.toList $ S.toCharArray "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789@#$%^&*"
+
+instance arbitraryNonEmptyString ∷ SC.Arbitrary NonEmptyString where
+  arbitrary =
+    Gen.arrayOf1 genChar
+      <#> uncurry A.cons
+      >>> S.fromCharArray
+      >>> S.trim
+      >>> NonEmptyString
+
+instance showNonEmptyString ∷ Show NonEmptyString where
+  show (NonEmptyString str) = str
+
+instance valueNonEmptyString ∷ SD.Value NonEmptyString where
+  stringValue = NonEmptyString
+  renderValue (NonEmptyString str) = str
+
+testDocument ∷ ∀ e. SD.SlamDownP NonEmptyString → Eff (TestEffects e) Unit
 testDocument sd = do
 
   let printed = SDPR.prettyPrintMd sd
@@ -266,9 +289,9 @@ smallArrayOf g = do
   len ← Gen.chooseInt 1.0 2.0
   Gen.vectorOf len g
 
-newtype TestSlamDown = TestSlamDown SD.SlamDown
+newtype TestSlamDown = TestSlamDown (SD.SlamDownP NonEmptyString)
 
-runTestSlamDown ∷ TestSlamDown → SD.SlamDown
+runTestSlamDown ∷ TestSlamDown → SD.SlamDownP NonEmptyString
 runTestSlamDown (TestSlamDown sd) = sd
 
 instance arbSlamDown ∷ SC.Arbitrary TestSlamDown where