Feat: Markdown adapter

packages/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@junyiacademy/perseus-core",
-  "version": "1.0.44",
+  "version": "1.0.46",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "license": "MIT",

packages/perseus/src/perseus-markdown.tsx

@@ -396,10 +396,10 @@ export default {
     traverseContent: traverseContent,
     parse: parse,
     parseInline: inlineParser,
-    reactFor: SimpleMarkdown.reactFor,
-    ruleOutput: SimpleMarkdown.ruleOutput(rules, "react") as any,
+    sanitizeUrl: SimpleMarkdown.sanitizeUrl,
+    reactFor: SimpleMarkdown.reactFor, // deprecated
+    ruleOutput: SimpleMarkdown.ruleOutput(rules, "react") as any, // deprecated
     basicOutput: SimpleMarkdown.reactFor(
         SimpleMarkdown.ruleOutput(rules, "react"),
-    ) as any,
-    sanitizeUrl: SimpleMarkdown.sanitizeUrl,
+    ) as any, // deprecated
 };

packages/simple-markdown/src/index.ts

@@ -18,6 +18,7 @@
  * Many of the regexes and original logic has been adapted from
  * the wonderful [marked.js](https://github.com/chjj/marked)
  */
+import {adaptLegacyMarkdown} from "./legacyMarkdownAdapter";
 import type {Capture, MatchFunction, State} from "./troublesome-types";
 import type * as React from "react";
 
@@ -450,17 +451,20 @@ var parserFor = function (
         source: string,
         state?: State | null,
     ): Array<SingleASTNode> {
+        var legacyAdaptedStr = adaptLegacyMarkdown(source);
         latestState = populateInitialState(state, defaultState);
-        if (!latestState.inline && !latestState.disableAutoBlockNewlines) {
-            source = source + "\n\n";
-        }
+        var str =
+            !latestState.inline && !latestState.disableAutoBlockNewlines
+                ? legacyAdaptedStr + "\n\n"
+                : legacyAdaptedStr;
+
         // We store the previous capture so that match functions can
         // use some limited amount of lookbehind. Lists use this to
         // ensure they don't match arbitrary '- ' or '* ' in inline
         // text (see the list rule for more information). This stores
         // the full regex capture object, if there is one.
         latestState.prevCapture = null;
-        return nestedParse(preprocess(source), latestState);
+        return nestedParse(preprocess(str), latestState);
     };
 
     return outerParse;

packages/simple-markdown/src/legacyMarkdownAdapter.ts

@@ -0,0 +1,19 @@
+export const adaptLegacyMarkdown = (str: string) => {
+    // heading 前只有一個 \n 時，將 \n 改為 \n\n
+    const addedNewLineAboveHeadingStr = str.replace(
+        /(?<=[^\n]\n *)(#{1,6}.*)/g,
+        "\n$1",
+    );
+    // heading 後只有一個 \n 時，將 \n 改為 \n\n
+    const addedNewLineUnderHeadingStr = addedNewLineAboveHeadingStr.replace(
+        /(?<=\n *|^)(#{1,6}[^\n]*)(?=\n[^\n])/g,
+        "$1\n",
+    );
+    // hr 後只有一個 \n 時，將 \n 改為 \n\n
+    const addedNewLineUnderHrStr = addedNewLineUnderHeadingStr.replace(
+        /(?<=\n *)([-*_]{3,})(?=\n[^\n])/g,
+        "$1\n",
+    );
+
+    return addedNewLineUnderHrStr;
+};