fix(common) Add logic to handle more multilines and nested blockquote content

Signed-off-by: Jerome Simeon <[email protected]>

Author: jeromesimeon

packages/markdown-common/src/CommonMarkTransformer.js

@@ -102,6 +102,7 @@ class CommonMarkTransformer {
         parameters.result = '';
         parameters.first = true;
         parameters.indent = 0;
+        parameters.blockIndent = 0;
         const visitor = new ToMarkdownStringVisitor(this.options);
         input.accept(visitor, parameters);
         return parameters.result.trim();
@@ -120,6 +121,7 @@ class CommonMarkTransformer {
         parameters.result = '';
         parameters.first = true;
         parameters.indent = 0;
+        parameters.blockIndent = 0;
         const visitor = new ToMarkdownStringVisitor(this.options);
         const result = ToMarkdownStringVisitor.visitChildren(visitor,input,parameters);
         // console.log('RESULT!' + result.trim());

packages/markdown-common/src/ToMarkdownStringVisitor.js

@@ -44,10 +44,11 @@ class ToMarkdownStringVisitor {
     static visitChildren(visitor, thing, parameters) {
         if(!parameters) {
             parameters = {};
-            parameters.result = '';
-            parameters.first = false;
             parameters.indent = 0;
+            parameters.first = false;
+            parameters.blockIndent = 0;
         }
+        parameters.result = '';
 
         if(thing.nodes) {
             thing.nodes.forEach(node => {
@@ -63,11 +64,12 @@ class ToMarkdownStringVisitor {
      * @param {*} parametersOut - the current parameters
      * @return {*} the new parameters with first set to true
      */
-    static mkParametersIn(parametersOut) {
+    static mkParametersInBlock(parametersOut) {
         let parameters = {};
         parameters.result = '';
-        parameters.first = true;
+        parameters.first = false;
         parameters.indent = parametersOut.indent; // Same indentation
+        parameters.blockIndent = parametersOut.blockIndent+1;
         return parameters;
     }
 
@@ -81,6 +83,7 @@ class ToMarkdownStringVisitor {
         parameters.result = '';
         parameters.first = true;
         parameters.indent = parametersOut.indent+1; // Increases indentation
+        parameters.blockIndent = parametersOut.blockIndent;
         return parameters;
     }
 
@@ -93,6 +96,15 @@ class ToMarkdownStringVisitor {
         return new Array(parameters.indent*3+1).join(' ');
     }
 
+    /**
+     * Create blockQuote indendation
+     * @param {*} parameters - the current parameters
+     * @return {string} prefix for blockquote indentation
+     */
+    static mkIndentBlock(parameters) {
+        return '> '.repeat(parameters.blockIndent);
+    }
+
     /**
      * Create Setext heading
      * @param {number} level - the heading level
@@ -121,8 +133,10 @@ class ToMarkdownStringVisitor {
      * @param {*} level - number of new lines
      */
     static newBlock(parameters,level) {
-        const newlines = parameters.first ? '' : Array(level).fill('\n').join('');
+        const fixLevel = parameters.blockIndent === 0 ? level : 1;
+        const newlines = parameters.first ? '' : Array(fixLevel).fill('\n').join('');
         parameters.result += newlines;
+        parameters.result += ToMarkdownStringVisitor.mkIndentBlock(parameters);
     }
 
     /**
@@ -159,9 +173,8 @@ class ToMarkdownStringVisitor {
             parameters.result += `**${ToMarkdownStringVisitor.visitChildren(this, thing)}**`;
             break;
         case 'BlockQuote': {
-            const parametersIn = ToMarkdownStringVisitor.mkParametersIn(parameters);
-            ToMarkdownStringVisitor.newBlock(parameters,2);
-            parameters.result += `> ${ToMarkdownStringVisitor.visitChildren(this, thing, parametersIn)}`;
+            const parametersIn = ToMarkdownStringVisitor.mkParametersInBlock(parameters);
+            parameters.result += `${ToMarkdownStringVisitor.visitChildren(this, thing, parametersIn)}`;
         }
             break;
         case 'Heading': {
@@ -182,7 +195,7 @@ class ToMarkdownStringVisitor {
             parameters.result += '\\\n';
             break;
         case 'Softbreak':
-            parameters.result += '\n';
+            parameters.result += '\n' + ToMarkdownStringVisitor.mkIndentBlock(parameters);
             break;
         case 'Link':
             parameters.result += `[${ToMarkdownStringVisitor.visitChildren(this, thing)}](${thing.destination} "${thing.title ? thing.title : ''}")`;
@@ -192,7 +205,7 @@ class ToMarkdownStringVisitor {
             break;
         case 'Paragraph':
             ToMarkdownStringVisitor.newBlock(parameters,2);
-            parameters.result += `${ToMarkdownStringVisitor.visitChildren(this, thing)}`;
+            parameters.result += `${ToMarkdownStringVisitor.visitChildren(this, thing, parameters)}`;
             break;
         case 'HtmlBlock':
             ToMarkdownStringVisitor.newBlock(parameters,2);

packages/markdown-docx/src/DocxTransformer.test.js

@@ -48,7 +48,7 @@ describe.only('import docx', () => {
     getDocxFiles().forEach(([file, docx], i) => {
         it(`converts ${file} to ciceromark`, async () => {
             const json = await docxTransformer.toCiceroMark(docx, 'json');
-            console.log(JSON.stringify(json, null, 4));
+            //console.log(JSON.stringify(json, null, 4));
             expect(json).toMatchSnapshot(); // (1)
         });
     });

packages/markdown-pdf/src/PdfTransformer.test.js

@@ -48,7 +48,7 @@ describe.only('pdf import', () => {
     getPdfFiles().forEach(([file, pdfContent], i) => {
         it(`converts ${file} to cicero mark`, async () => {
             const ciceroMarkDom = await pdfTransformer.toCiceroMark(pdfContent, 'json');
-            console.log(JSON.stringify(ciceroMarkDom, null, 4));
+            //console.log(JSON.stringify(ciceroMarkDom, null, 4));
             expect(ciceroMarkDom).toMatchSnapshot(); // (1)
         });
     });