Fix: Improve error handling

sandypockets · Dec 16, 2023 · 66fcf5d · 66fcf5d
1 parent 618aed5
commit 66fcf5d
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 38 deletions.
diff --git a/dist/index.cjs b/dist/index.cjs
diff --git a/dist/index.esm.js b/dist/index.esm.js
diff --git a/examples/nuxt-tailwind/helpers/getAllPosts.js b/examples/nuxt-tailwind/helpers/getAllPosts.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "epic-remark",
-  "version": "0.1.10",
+  "version": "0.1.11",
   "description": "Epic Remark is an all-in-one markdown to HTML processor built on top of remark",
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.js",

diff --git a/src/processMarkdown.js b/src/processMarkdown.js
@@ -24,19 +24,22 @@ export default async function processMarkdown(markdownContent, options = {}) {
   };
 
   const wrapConfig = { ...defaultWrapConfig, ...(options.wrapConfig || {}) };
-  let frontMatterData = null;
+  let frontMatterData = {};
   let tableOfContents = null;
   let readingTime = null;
 
   const processor = remark()
-    .use(frontmatter, ['yaml'])
-    .use(() => tree => {
-      frontMatterData = extractFrontMatter(tree);
-    })
-    .use(html)
-    .use(gfm)
-    .use(remarkRehype, { allowDangerousHtml: true })
-    .use(wrapElements, wrapConfig);
+  .use(frontmatter, ['yaml'])
+  .use(() => tree => {
+    const yamlNode = tree.children.find(node => node.type === 'yaml');
+    if (yamlNode) {
+      frontMatterData = yaml.parse(yamlNode.value);
+    }
+  })
+  .use(html)
+  .use(gfm)
+  .use(remarkRehype, { allowDangerousHtml: true })
+  .use(wrapElements, wrapConfig);
 
   if (options.addHeadingIds) {
     processor.use(addHeadingIds);
@@ -47,10 +50,10 @@ export default async function processMarkdown(markdownContent, options = {}) {
       const tocNode = addTableOfContents(tree, options.insertTocDirectly);
       if (tocNode) {
         tableOfContents = await remark()
-          .use(() => () => tocNode)
-          .use(rehypeStringify)
-          .process('')
-          .then(file => file.toString());
+        .use(() => () => tocNode)
+        .use(rehypeStringify)
+        .process('')
+        .then(file => file.toString());
       }
     });
   }
@@ -63,7 +66,7 @@ export default async function processMarkdown(markdownContent, options = {}) {
     processor.use(embed).use(rehypeRaw);
   }
 
-  let processedContent = await processor.use(rehypeStringify).process(markdownContent);
+  const processedContent = await processor.use(rehypeStringify).process(markdownContent);
   const wrappedContentHtml = wrapWithDiv(processedContent.toString(), 'markdown');
 
   return {
@@ -73,8 +76,3 @@ export default async function processMarkdown(markdownContent, options = {}) {
     readingTime: readingTime,
   };
 }
-
-function extractFrontMatter(tree) {
-  const frontMatterNode = tree.children.find(node => node.type === 'yaml');
-  return frontMatterNode ? yaml.parse(frontMatterNode.value) : {};
-}