Merge pull request #11 from rikuson/skip-codeblock

Skip codeblock

src/__tests__/utils.test.ts

@@ -1,4 +1,4 @@
-import { createLink, createTitle, extractHeadingsFromMd } from "../utils";
+import { createLink, createTitle, extractHeadingsFromMd, removeCodeBlockFromMd } from "../utils";
 
 describe("createLink", () => {
   it("removes # and connects each word with '-'.", () => {
@@ -61,3 +61,39 @@ describe("extractHeadingsFromMd", () => {
     ]);
   });
 });
+
+describe("removeCodeBlockFromMd", () => {
+  const markdownText = `
+# Heading1
+  This is the first paragraph.
+## Heading2
+  This is the second paragraph.
+\`\`\`
+### This is typical codeblock
+\`\`\`
+Text between codeblock
+\`\`\`\`
+\`\`\`
+### Escaped codeblock
+\`\`\`
+\`\`\`\`
+Text between codeblock
+~~~
+\`\`\`
+### Escaped codeblock
+\`\`\`
+~~~
+  `;
+
+  it("It removes codeblock from the given markdownText.", () => {
+    expect(removeCodeBlockFromMd(markdownText)).toEqual(`
+# Heading1
+  This is the first paragraph.
+## Heading2
+  This is the second paragraph.
+Text between codeblock
+Text between codeblock
+  `
+    );
+  });
+});

src/index.tsx

@@ -1,6 +1,6 @@
 import * as React from "react";
 import styles from "./styles.module.css";
-import { extractHeadingsFromMd } from "./utils";
+import { extractHeadingsFromMd, removeCodeBlockFromMd } from "./utils";
 import Heading, { newHeading } from "./Heading";
 
 interface Props {
@@ -59,7 +59,7 @@ const Toc = ({
 
   // Mutate headings
   const matchedHeadings: RegExpMatchArray | null = extractHeadingsFromMd(
-    markdownText,
+    removeCodeBlockFromMd(markdownText),
     headingLevels[0],
     headingLevels[1]
   );

src/utils.ts

@@ -35,4 +35,11 @@ const extractHeadingsFromMd = (
   return markdownText.match(headingRegex);
 };
 
-export { createLink, createTitle, extractHeadingsFromMd };
+const removeCodeBlockFromMd = (
+  markdownText: string
+): string => {
+  const codeBlockRegex = new RegExp('((````.+?````)|(```.+?```)|(~~~.+?~~~))\n', 'gms');
+  return markdownText.replace(codeBlockRegex, '');
+};
+
+export { createLink, createTitle, extractHeadingsFromMd, removeCodeBlockFromMd };