highmark-markdown 1.1.113 → 1.1.115

package/src/example/view.js

@@ -22,13 +22,16 @@ import MarkdownStyleContainerDiv from "./view/div/container/markdownStyle";
 
 import { importer } from "./importer";
 import { WEB_TARGET } from "../targets";
+import { PREVIEW_CSS_SELECTORS_STRING } from "./constants";
 
 const { tokensFromMarkdown,
         markdownNodeFromTokens,
         tokensFromMarkdownStyle,
         markdownStyleNodeFromTokens,
         topmostHTMLNodeFromMarkdownNode,
-        topmostCSSNodeFromMarkdownStyleNode } = grammarUtilities;
+        htmlFromMarkdownOptionsAndImporter,
+        topmostCSSNodeFromMarkdownStyleNode,
+        cssFromMarkdownStyleAndCSSSelectorsString } = grammarUtilities;
 
 class View extends Element {
   pageUpdateCustomHandler = (event, element, index) => {
@@ -98,20 +101,6 @@ class View extends Element {
     this.setTopmostMarkdownStyleNode(topmostMarkdownStyleNode);
 
     this.updateMarkdownStyleParseTreeTextarea(parseTree);
-
-    const markdownStyleElement = this.getMarkdownStyleElement(),
-          topmostCSSNode = topmostCSSNodeFromMarkdownStyleNode(markdownStyleNode),
-          target = WEB_TARGET,
-          context = {
-            target,
-            tokens
-          };
-
-    topmostCSSNode.resolve(context);
-
-    const css = topmostCSSNode.asCSS(context);
-
-    markdownStyleElement.setCSS(css);
   }
 
   updateMarkdown() {
@@ -176,7 +165,6 @@ class View extends Element {
           tokens = markdownTokens;  ///
 
     context = {
-      indexOptions,
       tokens
     };
 
@@ -191,15 +179,13 @@ class View extends Element {
     const divisionHTMLNOdeParseTree = divisionHTMLNOde.asParseTree(),
           htmlParseTree = divisionHTMLNOdeParseTree,  ///
           multiplicity = topmostHTMLNode.getMultiplicity(),
-          length = multiplicity;
+          length = multiplicity;  ///
 
     context = {
       tokens,
       pathToURL
     };
 
-    this.updateXMP(divisionHTMLNOde, context);
-
     this.updatePreviewDiv(divisionHTMLNOde, context);
 
     this.updatePlainTextTextarea(divisionHTMLNOde, context);
@@ -207,6 +193,12 @@ class View extends Element {
     this.updateHTMLParseTreeTextarea(htmlParseTree);
 
     this.updatePageButtonsDiv(length, index);
+
+    const markdown = this.getMarkdown(),
+          options = indexOptions, ///
+          html = htmlFromMarkdownOptionsAndImporter(markdown, options, importer);
+
+    this.updateXMP(html, context);
   }
 
   updateCSS() {
@@ -224,11 +216,17 @@ class View extends Element {
     topmostCSSNode.resolve(context);
 
     const topmostCSSNodeParseTree = topmostCSSNode.asParseTree(tokens),
-          cssParseTree = topmostCSSNodeParseTree, ///
-          css = topmostCSSNode.asCSS(context);
+          cssParseTree = topmostCSSNodeParseTree; ///
 
     this.updateCSSParseTreeTextarea(cssParseTree);
 
+    const markdownStyleElement = this.getMarkdownStyleElement(),
+          cssSelectorsString = PREVIEW_CSS_SELECTORS_STRING,
+          markdownStyle = this.getMarkdownStyle(),
+          css = cssFromMarkdownStyleAndCSSSelectorsString(markdownStyle, cssSelectorsString);
+
+    markdownStyleElement.setCSS(css);
+
     this.setCSS(css);
   }
 

package/src/utilities/grammar.js

@@ -101,6 +101,34 @@ export function topmostHTMLNodeFromMarkdownNode(markdownNode, ClassFromOuterNode
   return topmostHTMLNode;
 }
 
+export function htmlFromMarkdownOptionsAndImporter(markdown, options, importer) {
+  let html = null;
+
+  const tokens = tokensFromMarkdown(markdown),
+        markdownNode = markdownNodeFromTokens(tokens);
+
+  if (markdownNode !== null) {
+    const topmostMarkdownNode = markdownNode, ///
+          context = {
+            tokens,
+            importer,
+            ...options
+          };
+
+    topmostMarkdownNode.resolve(context);
+
+    const topmostHTMLNode = topmostHTMLNodeFromMarkdownNode(markdownNode);
+
+    topmostHTMLNode.resolve(context);
+
+    const divisionHTMLNOde = topmostHTMLNode.getDivisionHTMLNode();
+
+    html = divisionHTMLNOde.asHTML(context);
+  }
+
+  return html;
+}
+
 export function topmostCSSNodeFromMarkdownStyleNode(markdownStyleNode, ClassFromOuterNode = CSSClassFromMarkdownStyleNode) {
   const node = markdownStyleNode,  ///
         queries = markdownStyleQueries, ///
@@ -132,7 +160,7 @@ export function cssFromMarkdownStyleAndCSSSelectorsString(markdownStyle, cssSele
   }
 
   css = `${cssSelectorsString} {
-  ${css}
+${css}
 }`;
 
   return css;
@@ -146,6 +174,7 @@ export default {
   markdownStyleNodeFromTokens,
   CSSClassFromMarkdownStyleNode,
   topmostHTMLNodeFromMarkdownNode,
+  htmlFromMarkdownOptionsAndImporter,
   topmostCSSNodeFromMarkdownStyleNode,
   cssFromMarkdownStyleAndCSSSelectorsString
 };

package/src/utilities/index.js

@@ -34,8 +34,7 @@ export function indexMapFromIndexDirectiveHTMLNodeAndDivisionHTMLNodes(indexDire
 function createIndexMap(indexDirectiveHTMLNode, divisionHTMLNodes, context) {
   const indexMap = {};
 
-  const { indexOptions } = context,
-        { phrases } = indexOptions,
+  const { phrases } = context,
         indexMatches = phrases.map((phrase) => {
           const indexMatch = IndexMatch.fromPhrase(phrase);
 
@@ -115,8 +114,7 @@ function compressPageNumbers(indexMap) {
 }
 
 function removeIgnoredWords(indexMap, context) {
-  const { indexOptions } = context,
-        { ignoredWords } = indexOptions;
+  const { ignoredWords } = context;
 
   ignoredWords.forEach((ignoredWord) => {
     delete indexMap[ignoredWord];
@@ -124,14 +122,12 @@ function removeIgnoredWords(indexMap, context) {
 }
 
 function adjustProperNouns(indexMap, context) {
-  const { indexOptions } = context,
-        { properNouns } = indexOptions;
+  const { properNouns } = context,
+        lowerCaseProperNouns = properNouns.map((properNoun) => {
+          const lowerCaseProperNoun = properNoun.toLowerCase();
 
-  const lowerCaseProperNouns = properNouns.map((properNoun) => {
-    const lowerCaseProperNoun = properNoun.toLowerCase();
-
-    return lowerCaseProperNoun;
-  });
+          return lowerCaseProperNoun;
+        });
 
   mapKeys(indexMap, (wordOrPhrase) => {
     const index = lowerCaseProperNouns.findIndex((lowerCaseProperName) => {
@@ -163,14 +159,12 @@ function preparePlainText(plainText) {
 }
 
 function adjustAcronyms(indexMap, context) {
-  const { indexOptions } = context,
-        { acronyms } = indexOptions;
+  const { acronyms } = context,
+        lowerCaseAcronyms = acronyms.map((acronym) => {
+          const lowerCaseAcronym = acronym.toLowerCase();
 
-  const lowerCaseAcronyms = acronyms.map((acronym) => {
-    const lowerCaseAcronym = acronym.toLowerCase();
-
-    return lowerCaseAcronym;
-  });
+          return lowerCaseAcronym;
+        });
 
   mapKeys(indexMap, (wordOrPhrase) => {
     const index = lowerCaseAcronyms.findIndex((lowerCaseProperName) => {
@@ -190,8 +184,7 @@ function adjustAcronyms(indexMap, context) {
 }
 
 function adjustMixedPlurals(indexMap, context) {
-  const { indexOptions } = context,
-        { plurals } = indexOptions,
+  const { plurals } = context,
         mixedPlurals = reducePlurals(plurals, isMixed),
         pluralPlurals = mapPlurals(mixedPlurals, mixedToPlural),
         singularPlurals = mapPlurals(mixedPlurals, mixedToSingular);
@@ -236,8 +229,7 @@ function adjustMixedPlurals(indexMap, context) {
 }
 
 function adjustPluralPlurals(indexMap, context) {
-  const { indexOptions } = context,
-        { plurals } = indexOptions,
+  const { plurals } = context,
         pluralPlurals = reducePlurals(plurals, isPlural),
         singularPlurals = mapPlurals(pluralPlurals, pluralToSingular);
 
@@ -263,8 +255,7 @@ function adjustPluralPlurals(indexMap, context) {
 }
 
 function adjustSingularPlurals(indexMap, context) {
-  const { indexOptions } = context,
-        { plurals } = indexOptions,
+  const { plurals } = context,
         singularPlurals = reducePlurals(plurals, isSingular),
         pluralPlurals = mapPlurals(singularPlurals, singularToPlural);