highmark-markdown 0.0.58 → 0.0.60

package/lib/utilities/content.js

@@ -13,22 +13,25 @@ var _constants = require("../constants");
 var _tokenTypes = require("../tokenTypes");
 var first = _necessary.arrayUtilities.first, last = _necessary.arrayUtilities.last;
 function contentFromMarkdownNodes(markdownNodes, context) {
+    var trimmed = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : false;
     var content = _constants.EMPTY_STRING;
     var tokens = context.tokens;
     var 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);
     var firstTokenIndex = firstSignificantTokenIndex, lastTokenIndex = lastSignificantTokenIndex; ///
-    var previousTokenIndex = firstTokenIndex - 1, nextTokenIndex = lastTokenIndex + 1;
-    if (previousTokenIndex > -1) {
-        var previousToken = tokens[previousTokenIndex], previousTokenSignificant = previousToken.isSignificant();
-        if (!previousTokenSignificant) {
-            firstTokenIndex--;
+    if (!trimmed) {
+        var previousTokenIndex = firstTokenIndex - 1, nextTokenIndex = lastTokenIndex + 1;
+        if (previousTokenIndex > -1) {
+            var previousToken = tokens[previousTokenIndex], previousTokenSignificant = previousToken.isSignificant();
+            if (!previousTokenSignificant) {
+                firstTokenIndex--;
+            }
         }
-    }
-    var tokensLength = tokens.length;
-    if (nextTokenIndex < tokensLength) {
-        var nextToken = tokens[nextTokenIndex], nextTokenSignificant = nextToken.isSignificant();
-        if (!nextTokenSignificant) {
-            lastTokenIndex++;
+        var tokensLength = tokens.length;
+        if (nextTokenIndex < tokensLength) {
+            var nextToken = tokens[nextTokenIndex], nextTokenSignificant = nextToken.isSignificant();
+            if (!nextTokenSignificant) {
+                lastTokenIndex++;
+            }
         }
     }
     var start = firstTokenIndex, end = lastTokenIndex + 1;
@@ -49,4 +52,4 @@ function tokenContentFromToken(token) {
     return tokenContent;
 }
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsaXRpZXMvY29udGVudC5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IHsgYXJyYXlVdGlsaXRpZXMgfSBmcm9tIFwibmVjZXNzYXJ5XCI7XG5cbmltcG9ydCB7IEVNUFRZX1NUUklORyB9IGZyb20gXCIuLi9jb25zdGFudHNcIjtcbmltcG9ydCB7IEVTQ0FQRURfVE9LRU5fVFlQRSB9IGZyb20gXCIuLi90b2tlblR5cGVzXCI7XG5cbmNvbnN0IHsgZmlyc3QsIGxhc3QgfSA9IGFycmF5VXRpbGl0aWVzO1xuXG5leHBvcnQgZnVuY3Rpb24gY29udGVudEZyb21NYXJrZG93bk5vZGVzKG1hcmtkb3duTm9kZXMsIGNvbnRleHQpIHtcbiAgbGV0IGNvbnRlbnQgPSBFTVBUWV9TVFJJTkc7XG5cbiAgbGV0IHsgdG9rZW5zIH0gPSBjb250ZXh0O1xuXG4gIGNvbnN0IG1hcmtkb3duTm9kZXNMZW5ndGggPSBtYXJrZG93bk5vZGVzLmxlbmd0aCxcbiAgICAgICAgZmlyc3RNYXJrZG93bk5vZGUgPSBmaXJzdChtYXJrZG93bk5vZGVzKSxcbiAgICAgICAgbGFzdE1hcmtkb3duTm9kZSA9IChtYXJrZG93bk5vZGVzTGVuZ3RoID09PSAxKSA/XG4gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZmlyc3RNYXJrZG93bk5vZGUgOiAvLy9cbiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGxhc3QobWFya2Rvd25Ob2RlcyksXG4gICAgICAgIGZpcnN0U2lnbmlmaWNhbnRUb2tlbiA9IGZpcnN0TWFya2Rvd25Ob2RlLmdldEZpcnN0U2lnbmlmaWNhbnRUb2tlbigpLFxuICAgICAgICBsYXN0U2lnbmlmaWNhbnRUb2tlbiA9IGxhc3RNYXJrZG93bk5vZGUuZ2V0TGFzdFNpZ25pZmljYW50VG9rZW4oKSxcbiAgICAgICAgZmlyc3RTaWduaWZpY2FudFRva2VuSW5kZXggPSB0b2tlbnMuaW5kZXhPZihmaXJzdFNpZ25pZmljYW50VG9rZW4pLFxuICAgICAgICBsYXN0U2lnbmlmaWNhbnRUb2tlbkluZGV4ID0gdG9rZW5zLmluZGV4T2YobGFzdFNpZ25pZmljYW50VG9rZW4pO1xuXG4gIGxldCBmaXJzdFRva2VuSW5kZXggPSBmaXJzdFNpZ25pZmljYW50VG9rZW5JbmRleCwgIC8vL1xuICAgICAgbGFzdFRva2VuSW5kZXggPSBsYXN0U2lnbmlmaWNhbnRUb2tlbkluZGV4OyAvLy9cblxuICBjb25zdCBwcmV2aW91c1Rva2VuSW5kZXggPSBmaXJzdFRva2VuSW5kZXggLSAxLFxuICAgICAgICBuZXh0VG9rZW5JbmRleCA9IGxhc3RUb2tlbkluZGV4ICsgMTtcblxuICBpZiAocHJldmlvdXNUb2tlbkluZGV4ID4gLTEpIHtcbiAgICBjb25zdCBwcmV2aW91c1Rva2VuID0gdG9rZW5zW3ByZXZpb3VzVG9rZW5JbmRleF0sXG4gICAgICAgICAgcHJldmlvdXNUb2tlblNpZ25pZmljYW50ID0gcHJldmlvdXNUb2tlbi5pc1NpZ25pZmljYW50KCk7XG5cbiAgICBpZiAoIXByZXZpb3VzVG9rZW5TaWduaWZpY2FudCkge1xuICAgICAgZmlyc3RUb2tlbkluZGV4LS07XG4gICAgfVxuICB9XG5cbiAgY29uc3QgdG9rZW5zTGVuZ3RoID0gdG9rZW5zLmxlbmd0aDtcblxuICBpZiAobmV4dFRva2VuSW5kZXggPCB0b2tlbnNMZW5ndGgpIHtcbiAgICBjb25zdCBuZXh0VG9rZW4gPSB0b2tlbnNbbmV4dFRva2VuSW5kZXhdLFxuICAgICAgICAgIG5leHRUb2tlblNpZ25pZmljYW50ID0gbmV4dFRva2VuLmlzU2lnbmlmaWNhbnQoKTtcblxuICAgIGlmICghbmV4dFRva2VuU2lnbmlmaWNhbnQpIHtcbiAgICAgIGxhc3RUb2tlbkluZGV4Kys7XG4gICAgfVxuICB9XG5cbiAgY29uc3Qgc3RhcnQgPSBmaXJzdFRva2VuSW5kZXgsICAvLy9cbiAgICAgICAgZW5kID0gbGFzdFRva2VuSW5kZXggKyAxO1xuXG4gIHRva2VucyA9IHRva2Vucy5zbGljZShzdGFydCwgZW5kKTtcblxuICB0b2tlbnMuZm9yRWFjaCgodG9rZW4pID0+IHtcbiAgICBjb25zdCB0b2tlbkNvbnRlbnQgPSB0b2tlbkNvbnRlbnRGcm9tVG9rZW4odG9rZW4pO1xuXG4gICAgY29udGVudCArPSB0b2tlbkNvbnRlbnQ7XG4gIH0pO1xuXG4gIHJldHVybiBjb250ZW50O1xufVxuXG5mdW5jdGlvbiB0b2tlbkNvbnRlbnRGcm9tVG9rZW4odG9rZW4pIHtcbiAgbGV0IHRva2VuQ29udGVudCA9IHRva2VuLmdldENvbnRlbnQoKTtcblxuICBjb25zdCB0eXBlID0gdG9rZW4uZ2V0VHlwZSgpO1xuXG4gIGlmICh0eXBlID09PSBFU0NBUEVEX1RPS0VOX1RZUEUpIHtcbiAgICBjb25zdCBzdGFydCA9IDE7XG5cbiAgICB0b2tlbkNvbnRlbnQgPSB0b2tlbkNvbnRlbnQuc3Vic3RyaW5nKHN0YXJ0KTtcbiAgfVxuXG4gIHJldHVybiB0b2tlbkNvbnRlbnQ7XG59XG4iXSwibmFtZXMiOlsiY29udGVudEZyb21NYXJrZG93bk5vZGVzIiwiZmlyc3QiLCJhcnJheVV0aWxpdGllcyIsImxhc3QiLCJtYXJrZG93bk5vZGVzIiwiY29udGV4dCIsImNvbnRlbnQiLCJFTVBUWV9TVFJJTkciLCJ0b2tlbnMiLCJtYXJrZG93bk5vZGVzTGVuZ3RoIiwibGVuZ3RoIiwiZmlyc3RNYXJrZG93bk5vZGUiLCJsYXN0TWFya2Rvd25Ob2RlIiwiZmlyc3RTaWduaWZpY2FudFRva2VuIiwiZ2V0Rmlyc3RTaWduaWZpY2FudFRva2VuIiwibGFzdFNpZ25pZmljYW50VG9rZW4iLCJnZXRMYXN0U2lnbmlmaWNhbnRUb2tlbiIsImZpcnN0U2lnbmlmaWNhbnRUb2tlbkluZGV4IiwiaW5kZXhPZiIsImxhc3RTaWduaWZpY2FudFRva2VuSW5kZXgiLCJmaXJzdFRva2VuSW5kZXgiLCJsYXN0VG9rZW5JbmRleCIsInByZXZpb3VzVG9rZW5JbmRleCIsIm5leHRUb2tlbkluZGV4IiwicHJldmlvdXNUb2tlbiIsInByZXZpb3VzVG9rZW5TaWduaWZpY2FudCIsImlzU2lnbmlmaWNhbnQiLCJ0b2tlbnNMZW5ndGgiLCJuZXh0VG9rZW4iLCJuZXh0VG9rZW5TaWduaWZpY2FudCIsInN0YXJ0IiwiZW5kIiwic2xpY2UiLCJmb3JFYWNoIiwidG9rZW4iLCJ0b2tlbkNvbnRlbnQiLCJ0b2tlbkNvbnRlbnRGcm9tVG9rZW4iLCJnZXRDb250ZW50IiwidHlwZSIsImdldFR5cGUiLCJFU0NBUEVEX1RPS0VOX1RZUEUiLCJzdWJzdHJpbmciXSwicmFuZ2VNYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OzsiLCJtYXBwaW5ncyI6IkFBQUE7Ozs7K0JBU2dCQTs7O2VBQUFBOzs7eUJBUGU7eUJBRUY7MEJBQ007QUFFbkMsSUFBUUMsUUFBZ0JDLHlCQUFjLENBQTlCRCxPQUFPRSxPQUFTRCx5QkFBYyxDQUF2QkM7QUFFUixTQUFTSCx5QkFBeUJJLGFBQWEsRUFBRUMsT0FBTztJQUM3RCxJQUFJQyxVQUFVQyx1QkFBWTtJQUUxQixJQUFJLEFBQUVDLFNBQVdILFFBQVhHO0lBRU4sSUFBTUMsc0JBQXNCTCxjQUFjTSxNQUFNLEVBQzFDQyxvQkFBb0JWLE1BQU1HLGdCQUMxQlEsbUJBQW1CLEFBQUNILHdCQUF3QixJQUNyQkUsb0JBQ0VSLEtBQUtDLGdCQUM5QlMsd0JBQXdCRixrQkFBa0JHLHdCQUF3QixJQUNsRUMsdUJBQXVCSCxpQkFBaUJJLHVCQUF1QixJQUMvREMsNkJBQTZCVCxPQUFPVSxPQUFPLENBQUNMLHdCQUM1Q00sNEJBQTRCWCxPQUFPVSxPQUFPLENBQUNIO0lBRWpELElBQUlLLGtCQUFrQkgsNEJBQ2xCSSxpQkFBaUJGLDJCQUEyQixHQUFHO0lBRW5ELElBQU1HLHFCQUFxQkYsa0JBQWtCLEdBQ3ZDRyxpQkFBaUJGLGlCQUFpQjtJQUV4QyxJQUFJQyxxQkFBcUIsQ0FBQyxHQUFHO1FBQzNCLElBQU1FLGdCQUFnQmhCLE1BQU0sQ0FBQ2MsbUJBQW1CLEVBQzFDRywyQkFBMkJELGNBQWNFLGFBQWE7UUFFNUQsSUFBSSxDQUFDRCwwQkFBMEI7WUFDN0JMO1FBQ0Y7SUFDRjtJQUVBLElBQU1PLGVBQWVuQixPQUFPRSxNQUFNO0lBRWxDLElBQUlhLGlCQUFpQkksY0FBYztRQUNqQyxJQUFNQyxZQUFZcEIsTUFBTSxDQUFDZSxlQUFlLEVBQ2xDTSx1QkFBdUJELFVBQVVGLGFBQWE7UUFFcEQsSUFBSSxDQUFDRyxzQkFBc0I7WUFDekJSO1FBQ0Y7SUFDRjtJQUVBLElBQU1TLFFBQVFWLGlCQUNSVyxNQUFNVixpQkFBaUI7SUFFN0JiLFNBQVNBLE9BQU93QixLQUFLLENBQUNGLE9BQU9DO0lBRTdCdkIsT0FBT3lCLE9BQU8sQ0FBQyxTQUFDQztRQUNkLElBQU1DLGVBQWVDLHNCQUFzQkY7UUFFM0M1QixXQUFXNkI7SUFDYjtJQUVBLE9BQU83QjtBQUNUO0FBRUEsU0FBUzhCLHNCQUFzQkYsS0FBSztJQUNsQyxJQUFJQyxlQUFlRCxNQUFNRyxVQUFVO0lBRW5DLElBQU1DLE9BQU9KLE1BQU1LLE9BQU87SUFFMUIsSUFBSUQsU0FBU0UsOEJBQWtCLEVBQUU7UUFDL0IsSUFBTVYsUUFBUTtRQUVkSyxlQUFlQSxhQUFhTSxTQUFTLENBQUNYO0lBQ3hDO0lBRUEsT0FBT0s7QUFDVCJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsaXRpZXMvY29udGVudC5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IHsgYXJyYXlVdGlsaXRpZXMgfSBmcm9tIFwibmVjZXNzYXJ5XCI7XG5cbmltcG9ydCB7IEVNUFRZX1NUUklORyB9IGZyb20gXCIuLi9jb25zdGFudHNcIjtcbmltcG9ydCB7IEVTQ0FQRURfVE9LRU5fVFlQRSB9IGZyb20gXCIuLi90b2tlblR5cGVzXCI7XG5cbmNvbnN0IHsgZmlyc3QsIGxhc3QgfSA9IGFycmF5VXRpbGl0aWVzO1xuXG5leHBvcnQgZnVuY3Rpb24gY29udGVudEZyb21NYXJrZG93bk5vZGVzKG1hcmtkb3duTm9kZXMsIGNvbnRleHQsIHRyaW1tZWQgPSBmYWxzZSkge1xuICBsZXQgY29udGVudCA9IEVNUFRZX1NUUklORztcblxuICBsZXQgeyB0b2tlbnMgfSA9IGNvbnRleHQ7XG5cbiAgY29uc3QgbWFya2Rvd25Ob2Rlc0xlbmd0aCA9IG1hcmtkb3duTm9kZXMubGVuZ3RoLFxuICAgICAgICBmaXJzdE1hcmtkb3duTm9kZSA9IGZpcnN0KG1hcmtkb3duTm9kZXMpLFxuICAgICAgICBsYXN0TWFya2Rvd25Ob2RlID0gKG1hcmtkb3duTm9kZXNMZW5ndGggPT09IDEpID9cbiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBmaXJzdE1hcmtkb3duTm9kZSA6IC8vL1xuICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbGFzdChtYXJrZG93bk5vZGVzKSxcbiAgICAgICAgZmlyc3RTaWduaWZpY2FudFRva2VuID0gZmlyc3RNYXJrZG93bk5vZGUuZ2V0Rmlyc3RTaWduaWZpY2FudFRva2VuKCksXG4gICAgICAgIGxhc3RTaWduaWZpY2FudFRva2VuID0gbGFzdE1hcmtkb3duTm9kZS5nZXRMYXN0U2lnbmlmaWNhbnRUb2tlbigpLFxuICAgICAgICBmaXJzdFNpZ25pZmljYW50VG9rZW5JbmRleCA9IHRva2Vucy5pbmRleE9mKGZpcnN0U2lnbmlmaWNhbnRUb2tlbiksXG4gICAgICAgIGxhc3RTaWduaWZpY2FudFRva2VuSW5kZXggPSB0b2tlbnMuaW5kZXhPZihsYXN0U2lnbmlmaWNhbnRUb2tlbik7XG5cbiAgbGV0IGZpcnN0VG9rZW5JbmRleCA9IGZpcnN0U2lnbmlmaWNhbnRUb2tlbkluZGV4LCAgLy8vXG4gICAgICBsYXN0VG9rZW5JbmRleCA9IGxhc3RTaWduaWZpY2FudFRva2VuSW5kZXg7IC8vL1xuXG4gIGlmICghdHJpbW1lZCkge1xuICAgIGNvbnN0IHByZXZpb3VzVG9rZW5JbmRleCA9IGZpcnN0VG9rZW5JbmRleCAtIDEsXG4gICAgICAgICAgbmV4dFRva2VuSW5kZXggPSBsYXN0VG9rZW5JbmRleCArIDE7XG5cbiAgICBpZiAocHJldmlvdXNUb2tlbkluZGV4ID4gLTEpIHtcbiAgICAgIGNvbnN0IHByZXZpb3VzVG9rZW4gPSB0b2tlbnNbcHJldmlvdXNUb2tlbkluZGV4XSxcbiAgICAgICAgICAgIHByZXZpb3VzVG9rZW5TaWduaWZpY2FudCA9IHByZXZpb3VzVG9rZW4uaXNTaWduaWZpY2FudCgpO1xuXG4gICAgICBpZiAoIXByZXZpb3VzVG9rZW5TaWduaWZpY2FudCkge1xuICAgICAgICBmaXJzdFRva2VuSW5kZXgtLTtcbiAgICAgIH1cbiAgICB9XG5cbiAgICBjb25zdCB0b2tlbnNMZW5ndGggPSB0b2tlbnMubGVuZ3RoO1xuXG4gICAgaWYgKG5leHRUb2tlbkluZGV4IDwgdG9rZW5zTGVuZ3RoKSB7XG4gICAgICBjb25zdCBuZXh0VG9rZW4gPSB0b2tlbnNbbmV4dFRva2VuSW5kZXhdLFxuICAgICAgICAgICAgbmV4dFRva2VuU2lnbmlmaWNhbnQgPSBuZXh0VG9rZW4uaXNTaWduaWZpY2FudCgpO1xuXG4gICAgICBpZiAoIW5leHRUb2tlblNpZ25pZmljYW50KSB7XG4gICAgICAgIGxhc3RUb2tlbkluZGV4Kys7XG4gICAgICB9XG4gICAgfVxuICB9XG5cbiAgY29uc3Qgc3RhcnQgPSBmaXJzdFRva2VuSW5kZXgsICAvLy9cbiAgICAgICAgZW5kID0gbGFzdFRva2VuSW5kZXggKyAxO1xuXG4gIHRva2VucyA9IHRva2Vucy5zbGljZShzdGFydCwgZW5kKTtcblxuICB0b2tlbnMuZm9yRWFjaCgodG9rZW4pID0+IHtcbiAgICBjb25zdCB0b2tlbkNvbnRlbnQgPSB0b2tlbkNvbnRlbnRGcm9tVG9rZW4odG9rZW4pO1xuXG4gICAgY29udGVudCArPSB0b2tlbkNvbnRlbnQ7XG4gIH0pO1xuXG4gIHJldHVybiBjb250ZW50O1xufVxuXG5mdW5jdGlvbiB0b2tlbkNvbnRlbnRGcm9tVG9rZW4odG9rZW4pIHtcbiAgbGV0IHRva2VuQ29udGVudCA9IHRva2VuLmdldENvbnRlbnQoKTtcblxuICBjb25zdCB0eXBlID0gdG9rZW4uZ2V0VHlwZSgpO1xuXG4gIGlmICh0eXBlID09PSBFU0NBUEVEX1RPS0VOX1RZUEUpIHtcbiAgICBjb25zdCBzdGFydCA9IDE7XG5cbiAgICB0b2tlbkNvbnRlbnQgPSB0b2tlbkNvbnRlbnQuc3Vic3RyaW5nKHN0YXJ0KTtcbiAgfVxuXG4gIHJldHVybiB0b2tlbkNvbnRlbnQ7XG59XG4iXSwibmFtZXMiOlsiY29udGVudEZyb21NYXJrZG93bk5vZGVzIiwiZmlyc3QiLCJhcnJheVV0aWxpdGllcyIsImxhc3QiLCJtYXJrZG93bk5vZGVzIiwiY29udGV4dCIsInRyaW1tZWQiLCJjb250ZW50IiwiRU1QVFlfU1RSSU5HIiwidG9rZW5zIiwibWFya2Rvd25Ob2Rlc0xlbmd0aCIsImxlbmd0aCIsImZpcnN0TWFya2Rvd25Ob2RlIiwibGFzdE1hcmtkb3duTm9kZSIsImZpcnN0U2lnbmlmaWNhbnRUb2tlbiIsImdldEZpcnN0U2lnbmlmaWNhbnRUb2tlbiIsImxhc3RTaWduaWZpY2FudFRva2VuIiwiZ2V0TGFzdFNpZ25pZmljYW50VG9rZW4iLCJmaXJzdFNpZ25pZmljYW50VG9rZW5JbmRleCIsImluZGV4T2YiLCJsYXN0U2lnbmlmaWNhbnRUb2tlbkluZGV4IiwiZmlyc3RUb2tlbkluZGV4IiwibGFzdFRva2VuSW5kZXgiLCJwcmV2aW91c1Rva2VuSW5kZXgiLCJuZXh0VG9rZW5JbmRleCIsInByZXZpb3VzVG9rZW4iLCJwcmV2aW91c1Rva2VuU2lnbmlmaWNhbnQiLCJpc1NpZ25pZmljYW50IiwidG9rZW5zTGVuZ3RoIiwibmV4dFRva2VuIiwibmV4dFRva2VuU2lnbmlmaWNhbnQiLCJzdGFydCIsImVuZCIsInNsaWNlIiwiZm9yRWFjaCIsInRva2VuIiwidG9rZW5Db250ZW50IiwidG9rZW5Db250ZW50RnJvbVRva2VuIiwiZ2V0Q29udGVudCIsInR5cGUiLCJnZXRUeXBlIiwiRVNDQVBFRF9UT0tFTl9UWVBFIiwic3Vic3RyaW5nIl0sInJhbmdlTWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7IiwibWFwcGluZ3MiOiJBQUFBOzs7OytCQVNnQkE7OztlQUFBQTs7O3lCQVBlO3lCQUVGOzBCQUNNO0FBRW5DLElBQVFDLFFBQWdCQyx5QkFBYyxDQUE5QkQsT0FBT0UsT0FBU0QseUJBQWMsQ0FBdkJDO0FBRVIsU0FBU0gseUJBQXlCSSxhQUFhLEVBQUVDLE9BQU87UUFBRUMsVUFBQUEsaUVBQVU7SUFDekUsSUFBSUMsVUFBVUMsdUJBQVk7SUFFMUIsSUFBSSxBQUFFQyxTQUFXSixRQUFYSTtJQUVOLElBQU1DLHNCQUFzQk4sY0FBY08sTUFBTSxFQUMxQ0Msb0JBQW9CWCxNQUFNRyxnQkFDMUJTLG1CQUFtQixBQUFDSCx3QkFBd0IsSUFDckJFLG9CQUNFVCxLQUFLQyxnQkFDOUJVLHdCQUF3QkYsa0JBQWtCRyx3QkFBd0IsSUFDbEVDLHVCQUF1QkgsaUJBQWlCSSx1QkFBdUIsSUFDL0RDLDZCQUE2QlQsT0FBT1UsT0FBTyxDQUFDTCx3QkFDNUNNLDRCQUE0QlgsT0FBT1UsT0FBTyxDQUFDSDtJQUVqRCxJQUFJSyxrQkFBa0JILDRCQUNsQkksaUJBQWlCRiwyQkFBMkIsR0FBRztJQUVuRCxJQUFJLENBQUNkLFNBQVM7UUFDWixJQUFNaUIscUJBQXFCRixrQkFBa0IsR0FDdkNHLGlCQUFpQkYsaUJBQWlCO1FBRXhDLElBQUlDLHFCQUFxQixDQUFDLEdBQUc7WUFDM0IsSUFBTUUsZ0JBQWdCaEIsTUFBTSxDQUFDYyxtQkFBbUIsRUFDMUNHLDJCQUEyQkQsY0FBY0UsYUFBYTtZQUU1RCxJQUFJLENBQUNELDBCQUEwQjtnQkFDN0JMO1lBQ0Y7UUFDRjtRQUVBLElBQU1PLGVBQWVuQixPQUFPRSxNQUFNO1FBRWxDLElBQUlhLGlCQUFpQkksY0FBYztZQUNqQyxJQUFNQyxZQUFZcEIsTUFBTSxDQUFDZSxlQUFlLEVBQ2xDTSx1QkFBdUJELFVBQVVGLGFBQWE7WUFFcEQsSUFBSSxDQUFDRyxzQkFBc0I7Z0JBQ3pCUjtZQUNGO1FBQ0Y7SUFDRjtJQUVBLElBQU1TLFFBQVFWLGlCQUNSVyxNQUFNVixpQkFBaUI7SUFFN0JiLFNBQVNBLE9BQU93QixLQUFLLENBQUNGLE9BQU9DO0lBRTdCdkIsT0FBT3lCLE9BQU8sQ0FBQyxTQUFDQztRQUNkLElBQU1DLGVBQWVDLHNCQUFzQkY7UUFFM0M1QixXQUFXNkI7SUFDYjtJQUVBLE9BQU83QjtBQUNUO0FBRUEsU0FBUzhCLHNCQUFzQkYsS0FBSztJQUNsQyxJQUFJQyxlQUFlRCxNQUFNRyxVQUFVO0lBRW5DLElBQU1DLE9BQU9KLE1BQU1LLE9BQU87SUFFMUIsSUFBSUQsU0FBU0UsOEJBQWtCLEVBQUU7UUFDL0IsSUFBTVYsUUFBUTtRQUVkSyxlQUFlQSxhQUFhTSxTQUFTLENBQUNYO0lBQ3hDO0lBRUEsT0FBT0s7QUFDVCJ9

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "highmark-markdown",
   "author": "James Smith",
-  "version": "0.0.58",
+  "version": "0.0.60",
   "license": "MIT, Anti-996",
   "homepage": "https://github.com/djalbat/highmark-markdown",
   "description": "Highmark's Markdown.",

package/src/example/view.js

@@ -110,7 +110,11 @@ class View extends Element {
   }
 
   static initialMarkdown = `
-- james.smith@djalbat.com
+  
+1. Regular expressions[^regular-expressions].
+
+[^regular-expressions]: A footnote about regular expressions.
+
 `;
 
   static tagName = "div";

package/src/markdown/entries.js

@@ -47,7 +47,7 @@ const entries = [
     "number": "^[1-9][0-9]*"
   },
   {
-    "path": "^\\/(?:[A-Za-z\\-]+\\/)*(?:[A-Za-z\\-]+(?:\\.[A-Za-z\\-]+)?)?"
+    "path": "^\\/(?:[A-Za-z_\\-]+\\/)*(?:[A-Za-z_\\-]+(?:\\.[A-Za-z_\\-]+)?)?"
   },
   {
     "domain": "^[a-z]+(?:-[a-z]+)*(?:\\.[a-z]+(?:-[a-z]+)*)+"

package/src/markdown/lexer.js

@@ -2,7 +2,6 @@
 
 import { CommonLexer } from "occam-lexers";
 import { WhitespaceToken,
-         RegularExpressionToken,
          EndOfLineSignificantToken,
          CStyleSingleLineCommentToken,
          SinglyQuotedStringLiteralToken,
@@ -25,7 +24,7 @@ export default class MarkdownLexer extends CommonLexer {
 
   static SingleLineCommentToken = CStyleSingleLineCommentToken; ///
 
-  static RegularExpressionToken = RegularExpressionToken;
+  static RegularExpressionToken = null;
 
   static EndOfMultiLineCommentToken = CStyleEndOfMultiLineCommentToken; ///
 

package/src/mixins/content.js

@@ -3,11 +3,12 @@
 import { contentFromMarkdownNodes } from "../utilities/content";
 
 function content(context) {
-  const markdownNode = this, ///
+  const trimmed = true,
+        markdownNode = this, ///
         markdownNodes = [
           markdownNode
         ],
-        content = contentFromMarkdownNodes(markdownNodes, context);
+        content = contentFromMarkdownNodes(markdownNodes, context, trimmed);
 
   return content;
 }

package/src/node/markdown/address.js

@@ -3,7 +3,7 @@
 import MarkdownNode from "../../node/markdown";
 import contentMixins from "../../mixins/content";
 
-export default class AddressMarkdownNode extends MarkdownNode {
+class AddressMarkdownNode extends MarkdownNode {
   asHTML(indent, context) {
     const content = this.content(context),
           html = content; ///
@@ -24,3 +24,5 @@ export default class AddressMarkdownNode extends MarkdownNode {
 }
 
 Object.assign(AddressMarkdownNode.prototype, contentMixins);
+
+export default AddressMarkdownNode;

package/src/node/markdown/blockListing.js

@@ -7,15 +7,6 @@ import MarkdownNode from "../../node/markdown";
 const { first, second } = arrayUtilities;
 
 export default class BlockListingMarkdownNode extends MarkdownNode {
-  content(context) {
-    const childNodes = this.getChildNodes(),
-          secondChildNode = second(childNodes),
-          blockTextMarkdownNode = secondChildNode,  ///
-          content = blockTextMarkdownNode.content(context);
-
-    return content;
-  }
-
   className(context) {
     let className = super.className(context);
 

package/src/node/markdown/blockText.js

@@ -1,20 +1,21 @@
 "use strict";
 
-import contentMixins from "../../mixins/content";
-
 import MarkdownNode from "../markdown";
+import contentMixins from "../../mixins/content";
 
 class BlockTextMarkdownNode extends MarkdownNode {
   asHTML(indent, context) {
-    const content = this.content(context),
+    const trimmed = false,
+          content = this.content(context, trimmed),
           html = content; ///
 
     return html;
   }
 
   createDOMElement(context) {
-    const content = this.content(context),
-          domElement = document.createTextNode(content);
+    const trimmed = false,
+          content = this.content(context),
+          domElement = document.createTextNode(content, trimmed);
 
     this.setDOMElement(domElement);
 

package/src/node/markdown/division.js

@@ -5,7 +5,6 @@ import FootnotesListMarkdownNode from "../../node/markdown/footnotesList";
 
 import { EMPTY_STRING } from "../../constants";
 import { renumberLinkMarkdownNodes, renumberLinkMarkdownNodesHTML } from "../../utilities/link";
-import ruleNameToHTMLMap from "../../ruleNameToHTMLMap";
 
 export default class DivisionMarkdownNode extends MarkdownNode {
   className(context) {

package/src/node/markdown/emphasisedText.js

@@ -1,8 +1,7 @@
 "use strict";
 
-import contentMixins from "../../mixins/content";
-
 import MarkdownNode from "../markdown";
+import contentMixins from "../../mixins/content";
 
 class EmphasisedTextMarkdownNode extends MarkdownNode {
   static fromRuleNameChildNodesAndOpacity(ruleName, childNodes, opacity) { return MarkdownNode.fromRuleNameChildNodesAndOpacity(EmphasisedTextMarkdownNode, ruleName, childNodes, opacity); }

package/src/node/markdown/endOfLine.js

@@ -1,8 +1,9 @@
 "use strict";
 
 import MarkdownNode from "../../node/markdown";
+import contentMixins from "../../mixins/content";
 
-export default class EndOfLineMarkdownNode extends MarkdownNode {
+class EndOfLineMarkdownNode extends MarkdownNode {
   asHTML(indent, context) {
     const content = this.content(context),
           html = content; ///
@@ -19,13 +20,9 @@ export default class EndOfLineMarkdownNode extends MarkdownNode {
     return domElement;
   }
 
-  content(context) {
-    const firstSignificantToken = this.getFirstSignificantToken(),
-          endOfLineToken = firstSignificantToken, ///
-          content = endOfLineToken.getContent();
-
-    return content;
-  }
-
   static fromRuleNameChildNodesAndOpacity(ruleName, childNodes, opacity) { return MarkdownNode.fromRuleNameChildNodesAndOpacity(EndOfLineMarkdownNode, ruleName, childNodes, opacity); }
 }
+
+Object.assign(EndOfLineMarkdownNode.prototype, contentMixins);
+
+export default EndOfLineMarkdownNode;

package/src/node/markdown/error.js

@@ -1,12 +1,9 @@
 "use strict";
 
-import { arrayUtilities } from "necessary";
-
 import MarkdownNode from "../../node/markdown";
+import contentMixins from "../../mixins/content";
 
-const { first } = arrayUtilities;
-
-export default class ErrorMarkdownNode extends MarkdownNode {
+class ErrorMarkdownNode extends MarkdownNode {
   childNodesAsHTML(indent, context) {
     const content = this.content(context),
           childNodesHTML = content;  ///
@@ -16,22 +13,14 @@ export default class ErrorMarkdownNode extends MarkdownNode {
 
   createChildNodeDOMElements(context) {
     const content = this.content(context),
-          domElement = this.getDOMElement(),
-          parentDOMElement = domElement,  ///
-          siblingDOMElement = null,
           childNodeDOMElement = document.createTextNode(content);
 
-    parentDOMElement.insertBefore(childNodeDOMElement, siblingDOMElement);
+    this.insertDOMElement(childNodeDOMElement);
   }
 
-  content(context) {
-    const childNodes = this.getChildNodes(),
-          firstChildNode = first(childNodes),
-          terminalNode = firstChildNode,  ///
-          content = terminalNode.getContent();
+  static fromRuleNameChildNodesAndOpacity(ruleName, childNodes, opacity) { return MarkdownNode.fromRuleNameChildNodesAndOpacity(ErrorMarkdownNode, ruleName, childNodes, opacity); }
+}
 
-    return content;
-  }
+Object.assign(ErrorMarkdownNode.prototype, contentMixins);
 
-  static fromRuleNameChildNodesAndOpacity(ruleName, childNodes, opacity) { return MarkdownNode.fromRuleNameChildNodesAndOpacity(ErrorMarkdownNode, ruleName, childNodes, opacity); }
-}
+export default ErrorMarkdownNode;

package/src/node/markdown/hyperlink.js

@@ -9,11 +9,39 @@ import { HREF_ATTRIBUTE_NAME } from "../../attributeNames";
 const { first, second, secondLast } = arrayUtilities;
 
 export default class HyperlinkMarkdownNode extends MarkdownNode {
+  attributeName(context) {
+    const attributeName = HREF_ATTRIBUTE_NAME;
+
+    return attributeName;
+  }
+
+  attributeValue(context) {
+    const childNodes = this.getChildNodes(),
+          childNodesLength = childNodes.length;
+
+    let urlMarkdownNode;
+
+    if (childNodesLength === 1) {
+      const firstChildNode = first(childNodes);
+
+      urlMarkdownNode = firstChildNode;  ///
+    } else {
+      const secondLastChildNode = secondLast(childNodes);
+
+      urlMarkdownNode = secondLastChildNode;  ///
+    }
+
+    const urlMarkdownNodeContent = urlMarkdownNode.content(context),
+          attributeValue = urlMarkdownNodeContent;  ///
+
+    return attributeValue;
+  }
+
   childNodesAsHTML(indent, context) {
     let childNodesHTML;
 
     const childNodes = this.getChildNodes(),
-      childNodesLength = childNodes.length;
+          childNodesLength = childNodes.length;
 
     if (childNodesLength === 1) {
       const firstChildNode = first(childNodes),
@@ -34,7 +62,7 @@ export default class HyperlinkMarkdownNode extends MarkdownNode {
 
   createChildNodeDOMElements(context) {
     const childNodes = this.getChildNodes(),
-      childNodesLength = childNodes.length;
+          childNodesLength = childNodes.length;
 
     if (childNodesLength === 1) {
       const firstChildNode = first(childNodes),
@@ -51,33 +79,5 @@ export default class HyperlinkMarkdownNode extends MarkdownNode {
     }
   }
 
-  attributeName(context) {
-    const attributeName = HREF_ATTRIBUTE_NAME;
-
-    return attributeName;
-  }
-
-  attributeValue(context) {
-    const childNodes = this.getChildNodes(),
-          childNodesLength = childNodes.length;
-
-    let urlMarkdownNode;
-
-    if (childNodesLength === 1) {
-      const firstChildNode = first(childNodes);
-
-      urlMarkdownNode = firstChildNode;  ///
-    } else {
-      const secondLastChildNode = secondLast(childNodes);
-
-      urlMarkdownNode = secondLastChildNode;  ///
-    }
-
-    const urlMarkdownNodeContent = urlMarkdownNode.content(context),
-          attributeValue = urlMarkdownNodeContent;  ///
-
-    return attributeValue;
-  }
-
   static fromRuleNameChildNodesAndOpacity(ruleName, childNodes, opacity) { return MarkdownNode.fromRuleNameChildNodesAndOpacity(HyperlinkMarkdownNode, ruleName, childNodes, opacity); }
 }

package/src/node/markdown/image.js

@@ -9,32 +9,6 @@ import { SRC_ATTRIBUTE_NAME } from "../../attributeNames";
 const { second, secondLast } = arrayUtilities;
 
 export default class ImageMarkdownNode extends MarkdownNode {
-  childNodesAsHTML(indent, context) {
-    const content = this.content(context),
-          childNodesHTML = content; ///
-
-    return childNodesHTML;
-  }
-
-  createChildNodeDOMElements(context) {
-    const content = this.content(context),
-          domElement = this.getDOMElement(),
-          parentDOMElement = domElement,  ///
-          siblingDOMElement = null,
-          childNodeDOMElement = document.createTextNode(content);
-
-    parentDOMElement.insertBefore(childNodeDOMElement, siblingDOMElement);
-  }
-
-  content(context) {
-    const childNodes = this.getChildNodes(),
-          secondChildNode = second(childNodes),
-          inlineTextMarkdownNode = secondChildNode,  ///
-          content = inlineTextMarkdownNode.content(context);
-
-    return content;
-  }
-
   attributeName(context) {
     const attributeName = SRC_ATTRIBUTE_NAME;
 
@@ -49,12 +23,32 @@ export default class ImageMarkdownNode extends MarkdownNode {
           pathTerminalNodeContent = pathTerminalNode.getContent(),
           path = pathTerminalNodeContent, ///
           imageURL = (pathToURL === null) ?
-                      path : ///
-                        pathToURL(path),
+                       path : ///
+                         pathToURL(path),
           attributeValue = imageURL; ///
 
     return attributeValue;
   }
 
+  childNodesAsHTML(indent, context) {
+    const childNodes = this.getChildNodes(),
+          secondChildNode = second(childNodes),
+          inlineTextMarkdownNode = secondChildNode,  ///
+          content = inlineTextMarkdownNode.content(context),
+          childNodesHTML = content; ///
+
+    return childNodesHTML;
+  }
+
+  createChildNodeDOMElements(context) {
+    const childNodes = this.getChildNodes(),
+          secondChildNode = second(childNodes),
+          inlineTextMarkdownNode = secondChildNode,  ///
+          content = inlineTextMarkdownNode.content(context),
+          childNodeDOMElement = document.createTextNode(content);
+
+    this.insertDOMElement(childNodeDOMElement);
+  }
+
   static fromRuleNameChildNodesAndOpacity(ruleName, childNodes, opacity) { return MarkdownNode.fromRuleNameChildNodesAndOpacity(ImageMarkdownNode, ruleName, childNodes, opacity); }
 }

package/src/node/markdown/inlineText.js

@@ -1,8 +1,7 @@
 "use strict";
 
-import contentMixins from "../../mixins/content";
-
 import MarkdownNode from "../markdown";
+import contentMixins from "../../mixins/content";
 
 class InlineTextMarkdownNode extends MarkdownNode {
   asHTML(indent, context) {

package/src/node/markdown/line.js

@@ -14,14 +14,11 @@ export default class LineMarkdownNode extends MarkdownNode {
 
   createChildNodeDOMElements(context) {
     const childNodes = this.getChildNodes(),
-          domElement = this.getDOMElement(),
           domElements = domElementsFromChildNodes(childNodes, context),
-          parentDOMElement = domElement,  ///
-          siblingDOMElement = null,
           childNodeDOMElements = domElements; ///
 
     childNodeDOMElements.forEach((childNodeDOMElement) => {
-      parentDOMElement.insertBefore(childNodeDOMElement, siblingDOMElement);
+      this.insertDOMElement(childNodeDOMElement);
     });
   }
 

package/src/node/markdown/mailToLink.js

@@ -9,6 +9,34 @@ import { HREF_ATTRIBUTE_NAME } from "../../attributeNames";
 const { first, second, secondLast } = arrayUtilities;
 
 export default class MailToLinkMarkdownNode extends MarkdownNode {
+  attributeName(context) {
+    const attributeName = HREF_ATTRIBUTE_NAME;
+
+    return attributeName;
+  }
+
+  attributeValue(context) {
+    const childNodes = this.getChildNodes(),
+          childNodesLength = childNodes.length;
+
+    let addressMarkdownNode;
+
+    if (childNodesLength === 1) {
+      const firstChildNode = first(childNodes);
+
+      addressMarkdownNode = firstChildNode;  ///
+    } else {
+      const secondLastChildNode = secondLast(childNodes);
+
+      addressMarkdownNode = secondLastChildNode;  ///
+    }
+
+    const addressMarkdownNodeContent = addressMarkdownNode.content(context),
+          attributeValue = `mailto:${addressMarkdownNodeContent}`;
+
+    return attributeValue;
+  }
+
   childNodesAsHTML(indent, context) {
     let childNodesHTML;
 
@@ -51,33 +79,5 @@ export default class MailToLinkMarkdownNode extends MarkdownNode {
     }
   }
 
-  attributeName(context) {
-    const attributeName = HREF_ATTRIBUTE_NAME;
-
-    return attributeName;
-  }
-
-  attributeValue(context) {
-    const childNodes = this.getChildNodes(),
-          childNodesLength = childNodes.length;
-
-    let addressMarkdownNode;
-
-    if (childNodesLength === 1) {
-      const firstChildNode = first(childNodes);
-
-      addressMarkdownNode = firstChildNode;  ///
-    } else {
-      const secondLastChildNode = secondLast(childNodes);
-
-      addressMarkdownNode = secondLastChildNode;  ///
-    }
-
-    const addressMarkdownNodeContent = addressMarkdownNode.content(context),
-          attributeValue = `mailto:${addressMarkdownNodeContent}`;
-
-    return attributeValue;
-  }
-
   static fromRuleNameChildNodesAndOpacity(ruleName, childNodes, opacity) { return MarkdownNode.fromRuleNameChildNodesAndOpacity(MailToLinkMarkdownNode, ruleName, childNodes, opacity); }
 }

package/src/node/markdown/strongText.js

@@ -1,8 +1,7 @@
 "use strict";
 
-import contentMixins from "../../mixins/content";
-
 import MarkdownNode from "../markdown";
+import contentMixins from "../../mixins/content";
 
 class StrongTextMarkdownNode extends MarkdownNode {
   static fromRuleNameChildNodesAndOpacity(ruleName, childNodes, opacity) { return MarkdownNode.fromRuleNameChildNodesAndOpacity(StrongTextMarkdownNode, ruleName, childNodes, opacity); }

package/src/node/markdown/stronglyEmphasisedText.js

@@ -1,8 +1,7 @@
 "use strict";
 
-import contentMixins from "../../mixins/content";
-
 import MarkdownNode from "../markdown";
+import contentMixins from "../../mixins/content";
 import ruleNameToHTMLMap from "../../ruleNameToHTMLMap";
 
 import { STRONG_TEXT_RULE_NAME } from "../../ruleNames";

package/src/node/markdown/tableCell.js

@@ -1,69 +1,24 @@
 "use strict";
 
-import { arrayUtilities } from "necessary";
-
 import MarkdownNode from "../../node/markdown";
-import TextMarkdownNode from "./text";
 
-import { PERIOD } from "../../constants";
 import { htmlFromChildNodes, domElementsFromChildNodes } from "../../utilities/childNodes";
 
-const { first } = arrayUtilities;
-
 export default class TableCellMarkdownNode extends MarkdownNode {
-  isEmpty(context) {
-    let empty = false;
-
-    const childNodes = this.getChildNodes(),
-          childNodesLength = childNodes.length;
-
-    if (childNodesLength === 2) {
-      const firstChildNode = first(childNodes),
-            firstChildNodeTextMarkdownNode = (firstChildNode instanceof TextMarkdownNode);
-
-      if (firstChildNodeTextMarkdownNode) {
-        const textMarkdownNode = firstChildNode,  ///
-              content = textMarkdownNode.content(context);
-
-        if (content === PERIOD) {
-          empty = true;
-        }
-      }
-    }
-
-    return empty;
-  }
-
   childNodesAsHTML(indent, context) {
-    let childNodesHTML = null;
-
-    const empty = this.isEmpty(context);
-
-    if (!empty) {
-      const childNodes = this.getChildNodes(),
-            html = htmlFromChildNodes(childNodes, context);
-
-      childNodesHTML = html;  ///
-    }
+    const childNodes = this.getChildNodes(),
+          childNodesHTML = htmlFromChildNodes(childNodes, context);
 
     return childNodesHTML;
   }
 
-  createChildNodeDOMElements(domElement, context) {
-    const empty = this.isEmpty(context);
-
-    if (empty) {
-      return;
-    }
-
+  createChildNodeDOMElements(context) {
     const childNodes = this.getChildNodes(),
           domElements = domElementsFromChildNodes(childNodes, context),
-          parentDOMElement = domElement,  ///
-          childDOMElements = domElements,  ///
-          siblingDOMElement = null;
+          childNodeDOMElements = domElements; ///
 
-    childDOMElements.forEach((childDOMElement) => {
-      parentDOMElement.insertBefore(childDOMElement, siblingDOMElement);
+    childNodeDOMElements.forEach((childNodeDOMElement) => {
+      this.insertDOMElement(childNodeDOMElement);
     });
   }
 

package/src/node/markdown/text.js

@@ -1,20 +1,7 @@
 "use strict";
 
-import { arrayUtilities } from "necessary";
-
 import MarkdownNode from "../../node/markdown";
 
-const { first } = arrayUtilities;
-
 export default class TextMarkdownNode extends MarkdownNode {
-  content(context) {
-    const childNodes = this.getChildNodes(),
-          firstChildNode = first(childNodes),
-          terminalNode = firstChildNode,  ///
-          content = terminalNode.getContent();
-
-    return content;
-  }
-
   static fromRuleNameChildNodesAndOpacity(ruleName, childNodes, opacity) { return MarkdownNode.fromRuleNameChildNodesAndOpacity(TextMarkdownNode, ruleName, childNodes, opacity); }
 }