@sullux/markdown-html 1.0.1 → 2.0.0

package/lib/html-to-markdown/block-builder.js

@@ -60,17 +60,19 @@ const processBlockNode = (node, style, blocks, currentInline, traverse, toAst) =
 
   if (tagName === 'ul' || tagName === 'ol') {
     flushInline()
-    const items = []
+    const children = []
     for (const child of node.children) {
       if (child.tagName === 'li') {
         const itemInline = []
         for (const liChild of child.children) traverse(liChild, style, itemInline)
-        if (itemInline.length > 0) items.push(itemInline)
+        if (itemInline.length > 0) {
+          children.push({ type: 'listItem', children: [{ type: 'paragraph', children: itemInline }] })
+        }
       } else {
         traverse(child, style, currentInline)
       }
     }
-    if (items.length > 0) blocks.push({ type: tagName === 'ul' ? 'bulletList' : 'orderedList', items })
+    if (children.length > 0) blocks.push({ type: tagName === 'ul' ? 'bulletList' : 'orderedList', tight: true, children })
     return true
   }
 

package/lib/markdown-to-html/index.js

@@ -3,7 +3,7 @@ const { renderBlock } = require('./render-block')
 
 const markdownToHtml = (markdown, options = {}) => {
   if (!markdown) return ''
-  const ast = parse(markdown)
+  const ast = typeof markdown === 'string' ? parse(markdown) : markdown
   const ctx = { ...options, usedSlugs: new Set() }
   return ast.blocks.map((block) => renderBlock(block, ctx)).join('')
 }

package/lib/markdown-to-html/render-block.js

@@ -2,6 +2,7 @@ const { escapeHtml } = require('./escape')
 const { slugify } = require('./slugify')
 const { renderInline } = require('./render-inline')
 const { highlightCode } = require('./highlight')
+const { renderList } = require('./render-list')
 
 const renderBlock = (node, options = {}) => {
   if (!node) return ''
@@ -35,13 +36,9 @@ const renderBlock = (node, options = {}) => {
       const innerHtml = node.children ? node.children.map((child) => renderBlock(child, options)).join('') : ''
       return `<div class="callout callout-${style}">\n<div class="callout-title">${title}</div>\n${innerHtml}</div>\n`
     }
-    case 'bulletList': {
-      const itemsHtml = node.items ? node.items.map((item) => `<li>${renderInline(item, options)}</li>\n`).join('') : ''
-      return `<ul>\n${itemsHtml}</ul>\n`
-    }
+    case 'bulletList':
     case 'orderedList': {
-      const itemsHtml = node.items ? node.items.map((item) => `<li>${renderInline(item, options)}</li>\n`).join('') : ''
-      return `<ol>\n${itemsHtml}</ol>\n`
+      return renderList(node, options, renderBlock)
     }
     case 'table': {
       const alignments = node.alignments || []

package/lib/markdown-to-html/render-list.js

@@ -0,0 +1,39 @@
+const { renderInline } = require('./render-inline')
+
+const renderListItem = (item, options, tight, renderBlock) => {
+  const checkHtml = item.checked !== undefined
+    ? `<input type="checkbox"${item.checked ? ' checked' : ''} disabled /> `
+    : ''
+  const taskClass = item.checked !== undefined ? ' class="task-list-item"' : ''
+
+  if (Array.isArray(item)) {
+    return `<li${taskClass}>${checkHtml}${renderInline(item, options)}</li>\n`
+  }
+
+  const children = item.children || []
+  const childrenHtml = children
+    .map((child, idx) => {
+      if (child.type === 'paragraph' && tight && idx === 0) {
+        return renderInline(child.children, options)
+      }
+      return renderBlock(child, options)
+    })
+    .join('')
+
+  return `<li${taskClass}>${checkHtml}${childrenHtml}</li>\n`
+}
+
+const renderList = (node, options, renderBlock) => {
+  const tight = node.tight !== false
+  const isOrdered = node.type === 'orderedList'
+  const listItems = node.children || node.items || []
+  const itemsHtml = listItems.map((item) => renderListItem(item, options, tight, renderBlock)).join('')
+
+  if (isOrdered) {
+    const startAttr = node.start && node.start !== 1 ? ` start="${node.start}"` : ''
+    return `<ol${startAttr}>\n${itemsHtml}</ol>\n`
+  }
+  return `<ul>\n${itemsHtml}</ul>\n`
+}
+
+module.exports = { renderList }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sullux/markdown-html",
-  "version": "1.0.1",
+  "version": "2.0.0",
   "description": "A high-performance, bidirectional Markdown <-> HTML compiler supporting GFM, GitBook hints, syntax highlighting, and custom image dimensions.",
   "main": "./index.js",
   "author": "Charles Sullivan <charles@sullux.com>",
@@ -31,6 +31,6 @@
     "registry": "https://registry.npmjs.org/"
   },
   "dependencies": {
-    "@sullux/markdown-compiler": "^1.0.0"
+    "@sullux/markdown-compiler": "^2.0.0"
   }
 }