highmark-markdown 0.0.334 → 0.0.336

package/src/utilities/childNodes.js

@@ -4,14 +4,12 @@ import { arrayUtilities } from "necessary";
 
 import PlainTextMarkdownNode from "../node/markdown/plainText";
 
-import { contentFromMarkdownNodes } from "./content";
-import { CARRIAGE_RETURN, EMPTY_STRING } from "../constants";
+import { EMPTY_STRING } from "../constants";
+import { contentFromNodes } from "./content";
 
-const { push, clear } = arrayUtilities;
-
-export function htmlFromChildNodes(childNodes, context, leftTrimmed) {
-  let html;
+const { first, last, push, clear } = arrayUtilities;
 
+export function htmlFromChildNodes(childNodes, context) {
   const htmls = [],
         plainTextMarkdownNodes = [];
 
@@ -28,10 +26,10 @@ export function htmlFromChildNodes(childNodes, context, leftTrimmed) {
 
         plainTextMarkdownNodes.push(plainTextMarkdownNode);
       } else {
-        const plainText = plainTextFromPlainTextMarkdownNodes(plainTextMarkdownNodes, context, leftTrimmed);
+        const content = contentFromPlainTextMarkdownNodes(plainTextMarkdownNodes, childNodes, context);
 
-        if (plainText !== null) {
-          const html = plainText; ///
+        if (content !== null) {
+          const html = content; ///
 
           htmls.push(html);
         }
@@ -44,26 +42,22 @@ export function htmlFromChildNodes(childNodes, context, leftTrimmed) {
         }
       }
     }
-
-    leftTrimmed = false;
   });
 
-  const plainText = plainTextFromPlainTextMarkdownNodes(plainTextMarkdownNodes, context, leftTrimmed);
+  const content = contentFromPlainTextMarkdownNodes(plainTextMarkdownNodes, childNodes, context);
 
-  if (plainText !== null) {
-    const html = plainText; ///
+  if (content !== null) {
+    const html = content; ///
 
     htmls.push(html);
   }
 
-  html = htmls.join(EMPTY_STRING);
+  const html = htmls.join(EMPTY_STRING);
 
   return html;
 }
 
-export function plainTextFromChildNodes(childNodes, context, leftTrimmed) {
-  let plainText;
-
+export function plainTextFromChildNodes(childNodes, context) {
   const plainTexts = [],
         plainTextMarkdownNodes = [];
 
@@ -80,37 +74,38 @@ export function plainTextFromChildNodes(childNodes, context, leftTrimmed) {
 
         plainTextMarkdownNodes.push(plainTextMarkdownNode);
       } else {
-        plainText = plainTextFromPlainTextMarkdownNodes(plainTextMarkdownNodes, context, leftTrimmed);
+        const content = contentFromPlainTextMarkdownNodes(plainTextMarkdownNodes, childNodes, context);
+
+        if (content !== null) {
+          const plainText = content;  ///
 
-        if (plainText !== null) {
           plainTexts.push(plainText);
         }
 
-        const childNodes = markdownNode.getChildNodes();
-
-        plainText = plainTextFromChildNodes(childNodes, context, leftTrimmed);
+        const childNodes = markdownNode.getChildNodes(),
+              plainText = plainTextFromChildNodes(childNodes, context);
 
         if (plainText !== EMPTY_STRING) {
           plainTexts.push(plainText);
         }
       }
     }
-
-    leftTrimmed = false;
   });
 
-  plainText = plainTextFromPlainTextMarkdownNodes(plainTextMarkdownNodes, context, leftTrimmed);
+  const content = contentFromPlainTextMarkdownNodes(plainTextMarkdownNodes, childNodes, context);
+
+  if (content !== null) {
+    const plainText = content;  ///
 
-  if (plainText !== null) {
     plainTexts.push(plainText);
   }
 
-  plainText = plainTexts.join(EMPTY_STRING);
+  const plainText = plainTexts.join(EMPTY_STRING);
 
   return plainText;
 }
 
-export function domElementsFromChildNodes(childNodes, context, leftTrimmed) {
+export function domElementsFromChildNodes(childNodes, context) {
   const domElements = [],
         plainTextMarkdownNodes = [];
 
@@ -127,11 +122,10 @@ export function domElementsFromChildNodes(childNodes, context, leftTrimmed) {
 
         plainTextMarkdownNodes.push(plainTextMarkdownNode);
       } else {
-        const plainText = plainTextFromPlainTextMarkdownNodes(plainTextMarkdownNodes, context, leftTrimmed);
+        const content = contentFromPlainTextMarkdownNodes(plainTextMarkdownNodes, childNodes, context);
 
-        if (plainText !== null) {
-          const content = plainText,  ///
-                textNode = document.createTextNode(content),
+        if (content !== null) {
+          const textNode = document.createTextNode(content),
                 domElement = textNode;  ///
 
           domElements.push(domElement);
@@ -144,25 +138,12 @@ export function domElementsFromChildNodes(childNodes, context, leftTrimmed) {
         push(domElements, markdownNodeDOMElements);
       }
     }
-
-    leftTrimmed = false;
   });
 
-  const plainText = plainTextFromPlainTextMarkdownNodes(plainTextMarkdownNodes, context, leftTrimmed);
+  const content = contentFromPlainTextMarkdownNodes(plainTextMarkdownNodes, childNodes, context);
 
-  if (plainText !== null) {
-    const content = plainText,  ///
-          textNode = document.createTextNode(content),
-          domElement = textNode;  ///
-
-    domElements.push(domElement);
-  }
-
-  const domElementsLength = domElements.length;
-
-  if (domElementsLength === 0) {
-    const content = CARRIAGE_RETURN,  ///
-          textNode = document.createTextNode(content),
+  if (content !== null) {
+    const textNode = document.createTextNode(content),
           domElement = textNode;  ///
 
     domElements.push(domElement);
@@ -171,20 +152,27 @@ export function domElementsFromChildNodes(childNodes, context, leftTrimmed) {
   return domElements;
 }
 
-function plainTextFromPlainTextMarkdownNodes(plainTextMarkdownNodes, context, leftTrimmed) {
-  let plainText = null;
+function contentFromPlainTextMarkdownNodes(plainTextMarkdownNodes, childNodes, context) {
+  let content = null;
 
   const plainTextMarkdownNodesLength = plainTextMarkdownNodes.length;
 
   if (plainTextMarkdownNodesLength > 0) {
-    const markdownNodes = plainTextMarkdownNodes,  ///
-          rightTrimmed = false,
-          content = contentFromMarkdownNodes(markdownNodes, context, leftTrimmed, rightTrimmed);
-
-    plainText = content; ///
+    const nodes = plainTextMarkdownNodes, ///
+          lastNode = last(nodes),
+          firstNode = first(nodes),
+          lastNodeIndex = childNodes.indexOf(lastNode),
+          firstNodeIndex = childNodes.indexOf(firstNode),
+          childNodesLength = childNodes.length,
+          lastChildNodeIndex = childNodesLength - 1,
+          firstChildNodeIndex = 0,
+          augmentLeft = (firstNodeIndex !== firstChildNodeIndex),
+          augmentRight = (lastNodeIndex !== lastChildNodeIndex);  ///
+
+    content = contentFromNodes(nodes, augmentLeft, augmentRight, context);
 
     clear(plainTextMarkdownNodes);
   }
 
-  return plainText;
+  return content;
 }

package/src/utilities/content.js

@@ -7,25 +7,46 @@ import { ESCAPED_TOKEN_TYPE } from "../tokenTypes";
 
 const { first, last } = arrayUtilities;
 
-export function contentFromMarkdownNodes(markdownNodes, context, leftTrimmed, rightTrimmed) {
+export function contentFromNode(node, context) {
   let content = EMPTY_STRING;
 
   let { tokens } = context;
 
-  const markdownNodesLength = markdownNodes.length,
-        firstMarkdownNode = first(markdownNodes),
-        lastMarkdownNode = (markdownNodesLength === 1) ?
-                               firstMarkdownNode : ///
-                                 last(markdownNodes),
-        firstSignificantToken = firstMarkdownNode.getFirstSignificantToken(),
-        lastSignificantToken = lastMarkdownNode.getLastSignificantToken(),
-        firstSignificantTokenIndex = tokens.indexOf(firstSignificantToken),
-        lastSignificantTokenIndex = tokens.indexOf(lastSignificantToken);
+  const lastSignificantToken = node.getLastSignificantToken(),
+        firstSignificantToken = node.getFirstSignificantToken(),
+        lastSignificantTokenIndex = tokens.indexOf(lastSignificantToken),
+        firstSignificantTokenIndex = tokens.indexOf(firstSignificantToken);
+
+  const start = firstSignificantTokenIndex,  ///
+        end = lastSignificantTokenIndex + 1;
+
+  tokens = tokens.slice(start, end);
+
+  tokens.forEach((token) => {
+    const tokenContent = tokenContentFromToken(token);
+
+    content += tokenContent;
+  });
+
+  return content;
+}
+
+export function contentFromNodes(nodes, augmentLeft, augmentRight, context) {
+  let content = EMPTY_STRING;
+
+  let { tokens } = context;
+
+  const lastNode = last(nodes),
+        firstNode = first(nodes),
+        lastSignificantToken = lastNode.getLastSignificantToken(),
+        firstSignificantToken = firstNode.getFirstSignificantToken(),
+        lastSignificantTokenIndex = tokens.indexOf(lastSignificantToken),
+        firstSignificantTokenIndex = tokens.indexOf(firstSignificantToken);
 
   let firstTokenIndex = firstSignificantTokenIndex,  ///
       lastTokenIndex = lastSignificantTokenIndex; ///
 
-  if (!leftTrimmed) {
+  if (augmentLeft) {
     const previousTokenIndex = firstTokenIndex - 1;
 
     if (previousTokenIndex > -1) {
@@ -38,7 +59,7 @@ export function contentFromMarkdownNodes(markdownNodes, context, leftTrimmed, ri
     }
   }
 
-  if (!rightTrimmed) {
+  if (augmentRight) {
     const tokensLength = tokens.length,
           nextTokenIndex = lastTokenIndex + 1;
 
@@ -68,6 +89,8 @@ export function contentFromMarkdownNodes(markdownNodes, context, leftTrimmed, ri
 }
 
 export function contentFromNodeAndTokens(node, tokens, offset = 0) {
+  let content = EMPTY_STRING;
+
   const firstSignificantToken = node.getFirstSignificantToken(),
         lastSignificantToken = node.getLastSignificantToken(),
         firstToken = firstSignificantToken, ///
@@ -75,8 +98,6 @@ export function contentFromNodeAndTokens(node, tokens, offset = 0) {
         firstTokenIndex = tokens.indexOf(firstToken) + offset,  ///
         lastTokenIndex = tokens.indexOf(lastToken);
 
-  let content = EMPTY_STRING;
-
   for (let index = firstTokenIndex; index <= lastTokenIndex; index++) {
     const token = tokens[index],
           tokenContent = token.getContent();