Merge pull request mrin9#58 from andyrooger/53-better-md-support

Offload markdown parsing to marked and html-to-pdfmake

Author: mrin9

package.json

@@ -28,6 +28,7 @@
   "main": "./src/rapipdf.js",
   "module": "./src/rapipdf.js",
   "dependencies": {
+    "html-to-pdfmake": "^2.0.2",
     "marked": "^0.8.2",
     "pdfmake": "^0.1.65",
     "swagger-client": "^3.10.0",
@@ -46,7 +47,6 @@
     "clean-webpack-plugin": "^3.0.0",
     "compression-webpack-plugin": "^3.1.0",
     "css-loader": "^3.4.2",
-    "trim-right": "^1.0.1",
     "eslint": "^6.8.0",
     "eslint-config-airbnb": "^18.1.0",
     "eslint-import-resolver-webpack": "^0.12.1",
@@ -57,6 +57,7 @@
     "html-webpack-plugin": "^4.0.2",
     "inspectpack": "^4.4.0",
     "style-loader": "^1.1.3",
+    "trim-right": "^1.0.1",
     "webpack": "^4.42.1",
     "webpack-bundle-analyzer": "^3.6.1",
     "webpack-cli": "^3.3.11",

src/markdown.js

@@ -1,13 +1,18 @@
 import marked from 'marked';
+import htmlToPdfmake from 'html-to-pdfmake';
 import { rowLinesTableLayout } from '@/table-layouts';
-import { getMarkDownDef } from '@/markdown';
 import {
   getTypeInfo,
   schemaInObjectNotation,
   objectToTree,
   objectToTableTree,
 } from '@/object-tree-gen';
 
+function markdownToPdfmake(markdown) {
+  const html = marked(markdown);
+  return htmlToPdfmake(html);
+}
+
 // Info Def
 export function getInfoDef(spec, bookTitle, localize) {
   let content;
@@ -46,9 +51,8 @@ export function getInfoDef(spec, bookTitle, localize) {
 
     let specInfDescrMarkDef;
     if (spec.info.description) {
-      const tokens = marked.lexer(spec.info.description);
       specInfDescrMarkDef = {
-        stack: getMarkDownDef(tokens),
+        stack: markdownToPdfmake(spec.info.description),
         style: ['topMargin3'],
       };
     } else {
@@ -337,20 +341,17 @@ export function getApiDef(spec, filterPath, schemaStyle, localize, includeExampl
       });
       operationContent.push({ text: '', style: ['topMarginRegular'] });
 
-      let pathSummaryMarkDef; let pathDescrMarkDef; let
-        tokens;
+      let pathSummaryMarkDef; let pathDescrMarkDef;
       if (path.summary) {
-        tokens = marked.lexer(path.summary);
         pathSummaryMarkDef = {
-          stack: getMarkDownDef(tokens),
+          stack: markdownToPdfmake(path.summary),
           style: ['primary', 'b'],
         };
         operationContent.push(pathSummaryMarkDef);
       }
       if (path.description && path.description.trim() !== path.summary.trim()) {
-        tokens = marked.lexer(path.description);
         pathDescrMarkDef = {
-          stack: getMarkDownDef(tokens),
+          stack: markdownToPdfmake(path.description),
         };
         operationContent.push(pathDescrMarkDef);
       }
@@ -418,12 +419,10 @@ export function getApiDef(spec, filterPath, schemaStyle, localize, includeExampl
 
     if (pathSeq > 0) {
       tagSeq += 1;
-      let tagDescrMarkDef; let
-        tokens;
+      let tagDescrMarkDef;
       if (tag.description) {
-        tokens = marked.lexer(tag.description);
         tagDescrMarkDef = {
-          stack: getMarkDownDef(tokens),
+          stack: markdownToPdfmake(tag.description),
           style: ['topMarginRegular'],
         };
       } else {

src/pdf-parts-gen.js

@@ -4368,6 +4368,11 @@ html-minifier-terser@^5.0.1:
     relateurl "^0.2.7"
     terser "^4.6.3"
 
+html-to-pdfmake@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/html-to-pdfmake/-/html-to-pdfmake-2.0.2.tgz#2ad2062904278e4679081617d216d72a00d06244"
+  integrity sha512-fZi5xTSgVY76CnnaWUtnBeoaEcDXFbD+p/cSuf9Z1PcwIXzqUHXNPcFfRDN47rex6jhcsRJM0RaUp0JDIg0Y3g==
+
 html-webpack-plugin@^4.0.2:
   version "4.0.4"
   resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-4.0.4.tgz#90cdfb168094e93e047174d9baca098ec5540636"