Add code blocks support

Resolves: #412

src/odt/postprocess/convertCodeBlockParagraphs.ts

@@ -0,0 +1,57 @@
+import {MarkdownNode, MarkdownNodes} from '../MarkdownNodes.ts';
+import {walkRecursiveSync} from '../markdownNodesUtils.ts';
+
+const CODEBLOCK_START = '';
+const CODEBLOCK_END = '';
+
+function isCodeBlockPara(chunk: MarkdownNode, type: string) {
+  if (chunk.isTag === true && ['P'].includes(chunk.tag)) {
+    if (chunk.children.length !== 1) {
+      return false;
+    }
+
+    const firstChunk = chunk.children[0];
+
+    if ('text' in firstChunk) {
+      const txt = firstChunk.text;
+      return (txt === type);
+    }
+
+  }
+  return false;
+}
+
+export function convertCodeBlockParagraphs(markdownChunks: MarkdownNodes) {
+  walkRecursiveSync(markdownChunks.body, async (node, ctx: { nodeIdx: number }) => {
+    if (isCodeBlockPara(node, CODEBLOCK_START)) {
+      for (let nodeIdx2 = ctx.nodeIdx + 1; nodeIdx2 < node.parent.children.length; nodeIdx2++) {
+        const node2 = node.parent.children[nodeIdx2];
+        if (isCodeBlockPara(node2, CODEBLOCK_END)) {
+          console.log('hhh', ctx.nodeIdx, nodeIdx2);
+          const inner = node.parent.children.splice(ctx.nodeIdx + 1, nodeIdx2 - (ctx.nodeIdx + 1));
+
+          const toInsert = inner.map((part, idx) => {
+            if (!part.isTag) {
+              const pre = markdownChunks.createNode('PRE');
+              pre.children.splice(0, 0, ...inner);
+              pre.payload.lang = (idx < inner.length - 1) ? 'codeblock' : 'codeblockend';
+              return pre;
+            }
+            if (part.isTag && part.tag === 'P') {
+              part.tag = 'PRE';
+              part.payload.lang = (idx < inner.length - 1) ? 'codeblock' : 'codeblockend';
+              return part;
+            }
+            return part;
+          });
+
+          const emptyLine = markdownChunks.createNode('EMPTY_LINE/');
+          emptyLine.comment = 'addEmptyLines.ts: after codeblock';
+          toInsert.push(emptyLine);
+          node.parent.children.splice(ctx.nodeIdx, 2, ...toInsert);
+          break;
+        }
+      }
+    }
+  });
+}

src/odt/postprocess/mergeParagraphs.ts

@@ -18,6 +18,10 @@ export function mergeParagraphs(markdownChunks: MarkdownNodes) {
       if (chunk.tag === 'PRE' && chunk.payload?.lang === 'math') {
         return;
       }
+      if (chunk.tag === 'PRE' && chunk.payload?.lang === 'codeblockend') {
+        chunk.payload.lang = '';
+        return;
+      }
 
       const nextChunk = chunk.parent.children[ctx.nodeIdx + 1];
       if (nextChunk?.isTag && nextChunk.tag === chunk.tag) {

src/odt/postprocess/postProcess.ts

@@ -27,6 +27,7 @@ import {convertMathMl} from './convertMathMl.ts';
 import {unwrapEmptyPre} from './unwrapEmptyPre.ts';
 import {convertGoogleUrls} from './convertGoogleUrls.ts';
 import {fixIdLinks} from './fixIdLinks.ts';
+import {convertCodeBlockParagraphs} from './convertCodeBlockParagraphs.ts';
 
 export async function postProcess(chunks: MarkdownNodes, rewriteRules: RewriteRule[]) {
   convertToc(chunks);
@@ -35,6 +36,7 @@ export async function postProcess(chunks: MarkdownNodes, rewriteRules: RewriteRu
   fixSpacesInsideInlineFormatting(chunks);
   await fixBoldItalic(chunks);
   hideSuggestedChanges(chunks);
+  convertCodeBlockParagraphs(chunks);
   convertMathMl(chunks);
 
   trimParagraphs(chunks);

test/odt_md/MarkDownTransform.test.ts

@@ -130,6 +130,12 @@ describe('MarkDownTransformTest', () => {
     assert.ok(compareTexts(testMarkdown, markdown, false));
   });
 
+  it('test ./code-blocks.md', async () => {
+    const testMarkdown = fs.readFileSync(__dirname + '/code-blocks.md').toString();
+    const markdown = await transformOdt('code-blocks');
+    assert.ok(compareTexts(testMarkdown, markdown, false));
+  });
+
 });
 
 async function transformOdt(id: string) {

test/odt_md/code-blocks.md

@@ -0,0 +1,30 @@
+**This** is a line
+
+**This** is line two
+
+* This is a bulleted test
+* Second line
+
+```
+void hi() {
+}
+
+hi();
+```
+
+```
+function hi2() {
+}
+
+hi2();
+```
+
+This is a cool new wikiGDrive! With a change.
+
+![](100000000000080100000600B855EF66465B18B1.jpg)
+
+![](1000000000000801000006008E6541DADAF62125.jpg)
+
+![](10000000000009C400000753DA4A57339A651C1F.jpg)
+
+![](10000000000009C40000075322E66BBDAA567D45.jpg)