Merge pull request #13 from mismathh/issue-9

Add initial support for Markdown

README.md

@@ -1,6 +1,6 @@
 # til-to-html
 
-This tool converts [TIL](https://simonwillison.net/2022/Nov/6/what-to-blog-about/) posts written in [Markdown](https://www.markdownguide.org/) into static HTML pages.
+This tool converts [TIL](https://simonwillison.net/2022/Nov/6/what-to-blog-about/) posts written in [Markdown](https://www.markdownguide.org/) (.txt, .md) into static HTML pages.
 
 ## Setup
 

examples/dir/markdown1.md

@@ -0,0 +1,20 @@
+This is a Heading 2 markdown test file 1
+
+
+First Heading 2 ## Testing out 
+--
+A TIL—Today I Learned—is the most liberating form of content I know of.
+
+Did you just learn how to do something? Write about that.
+
+Call it a TIL—that way you’re not promising anyone a revelation or an in-depth tutorial. You’re saying “I just figured this out: here are my notes, you may find them useful too”.
+
+I also like the humility of this kind of content. Part of the reason I publish them is to emphasize that even with 25 years of professional experience you should still celebrate learning even the most basic of things.
+
+Second Heading 2
+  -----------------------------------------
+I learned the “interact” command in pdb the other day! [Here’s my TIL](https://til.simonwillison.net/python/pdb-interact).
+
+I started publishing TILs [in April 2020](https://simonwillison.net/2020/Apr/20/self-rewriting-readme/). I’m up to 346 now, and most of them took less than 10 minutes to write. It’s such a great format for quick and satisfying online writing.
+
+My collection lives at https://til.simonwillison.net/—which publishes content from my [simonw/til](https://github.com/simonw/til) GitHub repository.

examples/markdown.md

@@ -0,0 +1,16 @@
+markdown-to-html test
+
+
+A tool to convert [TIL](https://simonwillison.net/2022/Nov/6/what-to-blog-about/) posts written in [Markdown](https://www.markdownguide.org/) into **static HTML pages**.
+
+## Usage for Flags - Heading 2
+Run **til-to-html -h** for additional help.
+
+Run **til-to-html -v** for version information.
+
+  ##       Usage for Paths - Heading 2
+Run **til-to-html ./examples/til.txt** to generate a single webpage.
+
+Run **til-to-html ./examples/dir** to generate multiple webpages from a folder.
+
+Refer to the [til-to-html repository](https://github.com/paulkim26/til-to-html) for additional information.

src/parse-markdown/index.ts

@@ -9,6 +9,14 @@ export default function parseMarkdown(md: string, fname: string) {
   const hasTitle =
     paragraphs[0].length > 0 && paragraphs[1] === "" && paragraphs[2] === "";
 
+  // Check for alternative Heading Two syntax
+  for (let i = 0; i < (paragraphs.length - 1); i++) {
+    if (paragraphs[i + 1].match(/^( {0,3}-+\s*)$/) !== null) {
+      paragraphs[i] = `${paragraphs[i]}\n${paragraphs[i + 1]}`;
+      paragraphs[i + 1] = "";
+    }
+  }
+
   // Clear empty paragraphs
   paragraphs = paragraphs.filter((paragraph) => paragraph !== "");
 
@@ -22,7 +30,11 @@ export default function parseMarkdown(md: string, fname: string) {
       lineHtml += `<h1>${parsedParagraph}</h1>`;
       title = parsedParagraph; // Set <title> tag
     } else {
-      lineHtml += `<p>${parsedParagraph}</p>`;
+      if (parsedParagraph.startsWith("<h2>") && parsedParagraph.endsWith("</h2>")) {
+        lineHtml += parsedParagraph;
+      } else {
+        lineHtml += `<p>${parsedParagraph}</p>`;
+      }
     }
 
     bodyHtml += `${lineHtml}\n`;

src/parse-markdown/parseBlock.ts

@@ -1,11 +1,13 @@
 import parseLink from "@/parse-markdown/parseLink";
 import parseBold from "@/parse-markdown/parseBold";
 import parseItalics from "@/parse-markdown/parseItalics";
+import parseHeadingTwo from "./parseHeadingTwo";
 
 // Parse text within paragraph tag
 export default function parseBlock(text: string) {
   let html = text;
 
+  html = parseHeadingTwo(html);
   html = parseLink(html);
   html = parseBold(html);
   html = parseItalics(html);

src/parse-markdown/parseHeadingTwo.ts

@@ -0,0 +1,17 @@
+export default function parseHeadingTwo(text: string) {
+  let html = text;
+
+  const headingTwoPattern = /^( {0,3}##\s+.*)/;
+  html = html.replace(headingTwoPattern, (match, headingTwoText) => {
+    const headingTwo = headingTwoText.split(/##/).slice(1).join("##").trim();
+    return `<h2>${headingTwo}</h2>`;
+  });
+
+  const headingTwoPattern2 = /^(.*\n {0,3}-+\s*)/;
+  html = html.replace(headingTwoPattern2, (match, headingTwoText) => {
+    const headingTwo = headingTwoText.split(/\n/)[0].trim();
+    return `<h2>${headingTwo}</h2>`;
+  });
+
+  return html;
+}

src/parseArguments.ts

@@ -46,14 +46,14 @@ export default async function parseArguments(args: string[]) {
 
   if (foundTarget) {
     const filesToProcess = [];
-    const isFolder = !target.endsWith(".txt");
+    const isFolder = !(target.endsWith(".txt") || target.endsWith(".md"));
 
     console.log(`Reading files...`);
 
     if (isFolder) {
       // Parse folder of text files
       const dir = target;
-      let files = readdirSync(dir).filter((file) => file.endsWith(".txt"));
+      let files = readdirSync(dir).filter((file) => file.endsWith(".txt") || file.endsWith(".md"));
       files = files.map((file) => `${dir}/${file}`);
 
       files.forEach((file) => filesToProcess.push(file));