feat: Make it work for madlib 0.21.1

Author: aboeglin

.gitignore

@@ -3,3 +3,5 @@ build
 madlib_modules
 node_modules
 .module_cache
+src/Example.mad
+.DS_Store

madlib.json

@@ -1,7 +1,7 @@
 {
   "name": "MadMarkdownParser",
-  "version": "0.0.3",
-  "madlibVersion": "0.12.0",
+  "version": "0.0.4",
+  "madlibVersion": "0.21.1",
   "main": "src/Main.mad",
   "importAliases": {
     ".": "src"

src/Example.mad

@@ -54,7 +54,7 @@ here are the items:
 // P.runParser(P.many(P.anyChar), mdBig)
 // P.runParser(P.many(P.choice([P.anyChar])), mdBig)
 
-
-parseMarkdown(mdFixture) |> IO.log
-
-
+main = () => {
+  parseMarkdown(mdFixture) |> IO.log
+  parseMarkdown(mdFixture) |> IO.cLog
+}

src/Main.mad

@@ -1,4 +1,4 @@
-import { dropWhile, filter } from "List"
+import { dropWhile, mapMaybe } from "List"
 import { always, equals, identity } from "Function"
 import { Just, Nothing } from "Maybe"
 import type { Either } from "Either"
@@ -42,14 +42,15 @@ between = (start, mid, end) => pipe(
   apL($, end)
 )(start)
 
-contentCharacter :: P.Parser Char
-contentCharacter = P.choice([
-  P.letter,
-  P.digit,
-  P.char('!'),
-  P.char('?'),
-  P.char(' ')
-])
+
+// contentCharacter :: P.Parser Char
+// contentCharacter = P.choice([
+//   P.letter,
+//   P.digit,
+//   P.char('!'),
+//   P.char('?'),
+//   P.char(' ')
+// ])
 
 // https://stackoverflow.com/questions/1547899/which-characters-make-a-url-invalid
 linkCharacter :: P.Parser Char
@@ -89,13 +90,21 @@ bold = pipe(
   apL($, P.string("**"))
 )(P.string("**"))
 
+
 italic :: P.Parser ContentPart
-italic = pipe(
-  mapL((a, b) => Italic(String.pushChar(a, b))),
-  ap($, P.notChar(' ')),
-  ap($, pipe(P.many, map(String.fromList))(P.notOneOf(['*', '\n']))),
-  apL($, P.char('*'))
-)(P.char('*'))
+italic = do {
+  _ <- P.char('*')
+  firstChar <- P.notChar(' ')
+  nextChars <- P.many(P.notOneOf(['*', '\n']))
+  _ <- P.char('*')
+
+  return pipe(
+    String.fromList,
+    String.pushChar(firstChar),
+    Italic,
+    of
+  )([firstChar, ...nextChars])
+}
 
 inlineCode :: P.Parser ContentPart
 inlineCode = pipe(
@@ -273,16 +282,7 @@ markdownParser :: P.Parser Markdown
 markdownParser = pipe(
   P.choice,
   P.many,
-  map(pipe(
-    filter(where {
-      Just(x) =>
-        true
-
-      Nothing =>
-        false
-    }),
-    map(where { Just(x) => x })
-  ))
+  map(mapMaybe((x) => x)),
 )([map(always(Nothing), P.spaces), map(Just, block)])
 
 

version.lock

@@ -1,15 +1,25 @@
 {
-  "api": {
+  "buildHash": "ab8cca75a596bb1bcc10877846ce3dd2",
+  "jsApi": {
+    "apiInstances": [],
     "apiAliases": {
-      "Content": "(List ContentPart)",
-      "Markdown": "(List Block)"
+      "Markdown": "(List Block)",
+      "Content": "(List ContentPart)"
     },
-    "apiInstances": [],
     "apiInterfaces": {},
     "apiNames": {
       "parseMarkdown": "String -> Either String (List Block)"
     },
     "apiTypes": {
+      "ContentPart": [
+        "Text String",
+        "Bold String",
+        "Italic String",
+        "InlineCode String",
+        "Link String String",
+        "Image String String",
+        "LineReturn"
+      ],
       "Block": [
         "H1 Content",
         "H2 Content",
@@ -21,7 +31,20 @@
         "Blockquote Content",
         "Code String String",
         "UnorderedList (List Content)"
-      ],
+      ]
+    }
+  },
+  "llvmApi": {
+    "apiInstances": [],
+    "apiAliases": {
+      "Markdown": "(List Block)",
+      "Content": "(List ContentPart)"
+    },
+    "apiInterfaces": {},
+    "apiNames": {
+      "parseMarkdown": "String -> Either String (List Block)"
+    },
+    "apiTypes": {
       "ContentPart": [
         "Text String",
         "Bold String",
@@ -30,9 +53,20 @@
         "Link String String",
         "Image String String",
         "LineReturn"
+      ],
+      "Block": [
+        "H1 Content",
+        "H2 Content",
+        "H3 Content",
+        "H4 Content",
+        "H5 Content",
+        "H6 Content",
+        "Paragraph Content",
+        "Blockquote Content",
+        "Code String String",
+        "UnorderedList (List Content)"
       ]
     }
   },
-  "buildHash": "e1f3048c1f97de9540efb556aa817949",
-  "versionHash": "7f76975313afde67f0b4efca59761e8a"
+  "versionHash": "7417b617700b295682ee25ac611b0db6"
 }