[CM2] Parse markdown content of models

Copy-paste the parse function from _baseEntry to category and collection. Maybe a base model class with this parse functionality?

Author: scriptype

src/compiler/contentModel2/helpers.js

@@ -1,3 +1,5 @@
+const marked = require('marked')
+
 const templateExtensions = [
   '.hbs',
   '.handlebars',
@@ -25,9 +27,30 @@ const parseTags = (tags = []) => {
     tags
 }
 
+const Markdown = {
+  parse(text) {
+    return Markdown.unescapeHandlebarsExpressions(
+      marked.parse(
+        text.replace(/^[\u200B\u200C\u200D\u200E\u200F\uFEFF]/, '')
+      )
+    )
+  },
+
+  unescapeHandlebarsExpressions(html) {
+    // partial greater sign
+    html = html.replace(/{{>/g, '{{>')
+    // helpers
+    html = html.replace(/{{(.+)(?:"|')(.+)(?:"|')(.*)}}/g, '{{\$1"\$2"\$3}}')
+    // partials
+    html = html.replace(/{{>(.+)(?:"|')(.+)(?:"|').*}}/g, '{{>\$1"\$2"\$3}}')
+    return html
+  },
+}
+
 module.exports = {
   templateExtensions,
   isTemplateFile,
   removeExtension,
-  parseTags
+  parseTags,
+  Markdown
 }

src/compiler/contentModel2/models/_baseEntry.js

@@ -1,17 +1,20 @@
 const _ = require('lodash')
 const frontMatter = require('front-matter')
 const slug = require('slug')
-const { templateExtensions, removeExtension } = require('../helpers')
+const { templateExtensions, removeExtension, Markdown } = require('../helpers')
 
 const models = {
   attachment: require('./attachment')
 }
 
 const isIndexFile = (node, nameOptions) => {
+  if (node.children) {
+    return false
+  }
   const names = nameOptions.join('|')
   const extensions = templateExtensions.join('|')
   const namePattern = new RegExp(`^(${names})(${extensions})$`, 'i')
-  return !node.children && node.name.match(namePattern)
+  return node.name.match(namePattern)
 }
 
 function parseFolderedEntry(node, indexFileNameOptions) {
@@ -33,6 +36,13 @@ function parseFolderedEntry(node, indexFileNameOptions) {
   }
 }
 
+function parseContent(node, content) {
+  if (node.extension.match(/(html|htm|hbs|handlebars)/i)) {
+    return content
+  }
+  return Markdown.parse(content)
+}
+
 function _baseEntry(node, indexFileNameOptions) {
   const folderedEntry = node.children ?
     parseFolderedEntry(node, indexFileNameOptions) :
@@ -43,13 +53,16 @@ function _baseEntry(node, indexFileNameOptions) {
     folderedEntry?.name || entryFile.name
   )
   const attachments = folderedEntry?.attachments || []
+  const contentRaw = body || ''
+  const content = parseContent(entryFile, contentRaw)
 
   return {
     ..._.omit(node, 'children'),
     ...attributes,
     title: attributes.title || entryName,
     slug: attributes.slug || slug(entryName),
-    content: body || '',
+    contentRaw,
+    content,
     attachments
   }
 }

src/compiler/contentModel2/models/collection/category.js

@@ -2,12 +2,19 @@ const { join } = require('path')
 const frontMatter = require('front-matter')
 const makeSlug = require('slug')
 const Settings = require('../../../../settings')
-const { isTemplateFile } = require('../../helpers')
+const { isTemplateFile, Markdown } = require('../../helpers')
 const models = {
   post: require('./post'),
   attachment: require('../attachment')
 }
 
+function parseContent(node, content) {
+  if (node.extension.match(/(html|htm|hbs|handlebars)/i)) {
+    return content
+  }
+  return Markdown.parse(content)
+}
+
 function category(node, context) {
   const settings = Settings.getSettings()
 
@@ -26,6 +33,7 @@ function category(node, context) {
       context,
       childContentType: context.collection.childContentType,
       content: '',
+      contentRaw: '',
       title: settings.defaultCategoryName,
       slug,
       permalink,
@@ -102,11 +110,17 @@ function category(node, context) {
 
   tree.posts.sort((a, b) => b.date - a.date)
 
+  const contentRaw = indexProps.content || ''
+  const content = indexFile ?
+    parseContent(indexFile, contentRaw) :
+    ''
+
   return {
     ...categoryContext,
     ...tree,
     context: context,
-    content: indexProps.content || '',
+    contentRaw,
+    content,
     outputPath
   }
 }

src/compiler/contentModel2/models/collection/index.js

@@ -3,13 +3,20 @@ const _ = require('lodash')
 const frontMatter = require('front-matter')
 const makeSlug = require('slug')
 const Settings = require('../../../../settings')
-const { isTemplateFile } = require('../../helpers')
+const { isTemplateFile, Markdown } = require('../../helpers')
 const models = {
   attachment: require('../attachment'),
   category: require('./category'),
   post: require('./post')
 }
 
+function parseContent(node, content) {
+  if (node.extension.match(/(html|htm|hbs|handlebars)/i)) {
+    return content
+  }
+  return Markdown.parse(content)
+}
+
 function collection(node) {
   const settings = Settings.getSettings()
 
@@ -108,10 +115,16 @@ function collection(node) {
     attachLinks(post, i, posts)
   })
 
+  const contentRaw = indexProps.content || ''
+  const content = indexFile ?
+    parseContent(indexFile, contentRaw) :
+    ''
+
   return {
     ...context,
     ...tree,
-    content: indexProps.content || '',
+    contentRaw,
+    content,
     outputPath
   }
 }