Wrap lists + remove nested divs

source/Clean.js

@@ -167,6 +167,13 @@ var stylesRewriters = {
     INS: replaceWithTag( 'U' ),
     STRIKE: replaceWithTag( 'S' ),
     P: replaceWithTag('DIV'),
+    DIV: function ( node, parent ) {
+      if (node.querySelectorAll('div').length) {
+        return removeNested('div', node)
+      }
+
+      return node
+    },
     FONT: function ( node, parent ) {
         var face = node.face,
             size = node.size,
@@ -318,7 +325,14 @@ var cleanTree = function cleanTree ( node, preserveWS ) {
                 l += childLength - 1;
                 node.replaceChild( empty( child ), child );
                 continue;
+            } else if (nodeName === 'LI' && !hasAncestor(child, ['UL', 'OL'])) {
+              const ulNode = createElement(doc, 'UL')
+              child.parentNode.insertBefore(ulNode, child)
+              const slurpedNodes = slurpNodes(ulNode, 'LI')
+              l -= slurpedNodes.length
+              continue;
             }
+
             if ( childLength ) {
                 cleanTree( child, preserveWS || ( nodeName === 'PRE' ) );
             }

source/Node.js

@@ -441,6 +441,43 @@ function fixContainer ( container, root ) {
     return container;
 }
 
+function hasAncestor(node, parents=[]) {
+  if (!node.parentNode) {
+    return false
+  }
+
+  if (parents.includes(node.parentNode.tagName)) {
+    return true
+  }
+
+  return hasAncestor(node.parentNode, parents)
+}
+
+function slurpNodes(node, tagToSlurp, slurpedNodes) {
+  slurpedNodes = slurpedNodes || []
+
+  const next = node.nextSibling
+
+  if (next && next.tagName === 'LI') {
+    const detachedLi = detach(next)
+    node.appendChild(detachedLi)
+    return slurpNodes(node, tagToSlurp, slurpedNodes.concat([detachedLi]))
+  }
+
+  return slurpedNodes
+}
+
+function removeNested(tag, node) {
+  const nesteds = node.querySelectorAll(tag)
+
+  _.each(nesteds, function (nested) {
+    nested.outerHTML = nested.innerHTML
+  })
+
+  return node
+}
+
+
 function split ( node, offset, stopNode, root ) {
     var nodeType = node.nodeType,
         parent, clone, next;