@kerebron/extension-odt 0.5.3 → 0.5.4

package/src/postprocess/convertCodeParagraphsToCodeBlocks.ts

@@ -19,6 +19,15 @@ export const convertCodeParagraphsToCodeBlocks: Command = (
       let codeSize = 0;
       for (let childNo = 0; childNo < node.childCount; childNo++) {
         const child = node.child(childNo);
+        const monospaced = child.marks.some((mark) =>
+          mark.type === markCodeType
+        );
+
+        if (child.type.name === 'node_bookmark') {
+          codeText += '\n';
+          codeSize += child.nodeSize;
+          continue;
+        }
 
         if (child.type.name === 'br') {
           codeText += '\n';
@@ -26,7 +35,7 @@ export const convertCodeParagraphsToCodeBlocks: Command = (
           continue;
         }
 
-        if (child.marks.some((mark) => mark.type === markCodeType)) {
+        if (monospaced) {
           codeText += child.text || child.textBetween(0, child.content.size);
           codeSize += child.nodeSize;
           continue;
@@ -39,18 +48,22 @@ export const convertCodeParagraphsToCodeBlocks: Command = (
         const startPos = tr.mapping.map(pos);
         const endPos = tr.mapping.map(pos + 1 + codeSize);
 
-        const textNode = schema.text(codeText);
-        const codeBlock = schema.nodes.code_block.createAndFill(null, [
-          textNode,
-        ]);
+        if (codeText) {
+          const textNode = schema.text(codeText);
+          const codeBlock = schema.nodes.code_block.createAndFill(null, [
+            textNode,
+          ]);
 
-        if (codeBlock) {
-          tr = tr.replaceRangeWith(startPos, endPos, codeBlock);
+          if (codeBlock) {
+            tr.replaceRangeWith(startPos, endPos, codeBlock);
+          }
+        } else {
+          tr.replace(startPos, endPos);
         }
       }
 
       if (codeSize > 0 && codeSize + 2 === node.nodeSize) {
-        // tr = tr.deleteRange(tr.mapping.map(pos), tr.mapping.map(pos))
+        // tr.deleteRange(tr.mapping.map(pos), tr.mapping.map(pos))
       }
     }
   });

package/src/postprocess/convertMathMl.ts

@@ -51,5 +51,5 @@ export const convertMathMl: Command = (state, dispatch): boolean => {
     dispatch(tr);
   }
 
-  return true;
+  return tr.docChanged;
 };

package/src/postprocess/fixListsLevels.ts

@@ -0,0 +1,93 @@
+import { Fragment, Node } from 'prosemirror-model';
+import { Command } from 'prosemirror-state';
+
+const ANY_LIST = ['ordered_list', 'bullet_list'];
+
+type LevelMargins = Array<number>;
+
+// Related tests:
+// test ./example-document.md
+export const fixListsLevels: Command = (state, dispatch): boolean => {
+  const doc: Node = state.doc;
+  const schema = state.schema;
+  const bulletListType = schema.nodes.bullet_list;
+  const listItemType = schema.nodes.list_item;
+  const paragraphType = schema.nodes.paragraph;
+
+  const tr = state.tr;
+
+  let level = 0;
+
+  let prevList: LevelMargins = [];
+  let curList: LevelMargins = [];
+  let fakeLevelGenerated = 0;
+
+  function walk(
+    node: Node,
+    pos = 0,
+    depth = 0,
+  ) {
+    if (!ANY_LIST.includes(node.type.name)) {
+      node.forEach((child, offset) => {
+        walk(child, pos + offset + 1, depth + 1);
+      });
+    } else {
+      const marginLeft = node.attrs['odtMarginLeft'] || 0;
+      if (level === 0) {
+        curList = [];
+        fakeLevelGenerated = 0;
+        if (prevList.length >= level) {
+          for (let i = 0; i < prevList.length; i++) {
+            if (
+              fakeLevelGenerated < prevList.length &&
+              marginLeft > prevList[fakeLevelGenerated]
+            ) {
+              curList[level + fakeLevelGenerated] =
+                prevList[fakeLevelGenerated];
+              fakeLevelGenerated++;
+            }
+          }
+        }
+      }
+
+      curList[level + fakeLevelGenerated] = marginLeft;
+
+      level++;
+
+      node.forEach((child, offset) => {
+        walk(child, pos + offset + 1, depth + 1);
+      });
+
+      level--;
+
+      if (level === 0 && !node.attrs.toc) {
+        prevList = curList;
+        for (let i = 0; i < fakeLevelGenerated; i++) {
+          const wrapper = bulletListType.create(
+            { type: 'none' },
+            listItemType.create(
+              null,
+              Fragment.from([
+                paragraphType.create(),
+                node,
+              ]),
+            ),
+          );
+          tr.replaceWith(
+            tr.mapping.map(pos),
+            tr.mapping.map(pos + node.nodeSize),
+            wrapper,
+          );
+        }
+      }
+    }
+  }
+
+  walk(doc);
+
+  if (dispatch) {
+    dispatch(tr);
+  }
+
+  return tr.docChanged;
+};

package/src/postprocess/mergeCodeBlocks.ts

@@ -40,7 +40,6 @@ export const mergeCodeBlocks: Command = (state, dispatch): boolean => {
         break;
       }
 
-      const currentPos = nextPos;
       nextPos += next.nodeSize;
 
       if (next.type === paraBlockType && next.childCount === 0) {
@@ -49,7 +48,10 @@ export const mergeCodeBlocks: Command = (state, dispatch): boolean => {
         continue;
       }
 
-      if (next.type === codeBlockType && node.attrs.lang === next.attrs.lang) {
+      if (
+        next.type === codeBlockType && node.attrs.lang === next.attrs.lang &&
+        node.attrs.lang !== 'mathml'
+      ) {
         const text = next.text || next.textBetween(0, next.content.size);
         codeTexts.push(text.endsWith('\n') ? text : text + '\n');
 
@@ -64,9 +66,23 @@ export const mergeCodeBlocks: Command = (state, dispatch): boolean => {
       const startPos = tr.mapping.map(offset);
       const endPos = tr.mapping.map(offset + codeSize);
 
-      const codeText = codeTexts.join('').replace(/\n+$/gm, '\n');
+      let codeText = codeTexts.join('').replace(/\n+$/gm, '\n');
+
+      const lines = codeText.split('\n');
+      let emptyCount = 0;
+      for (emptyCount = 0; emptyCount < lines.length; emptyCount++) {
+        if (lines[emptyCount].trim()) {
+          break;
+        }
+      }
+      lines.splice(0, emptyCount);
+
+      codeText = lines.join('\n');
+
       const textNode = schema.text(codeText);
-      const codeBlock = schema.nodes.code_block.createAndFill(null, [textNode]);
+      const codeBlock = schema.nodes.code_block.createAndFill({
+        lang: node.attrs.lang,
+      }, [textNode]);
 
       if (codeBlock) {
         tr = tr.replaceRangeWith(startPos, endPos, codeBlock);

package/src/postprocess/postProcess.ts

@@ -6,6 +6,7 @@ import { removeUnusedBookmarks } from './removeUnusedBookmarks.js';
 import { fixContinuedLists } from './fixContinuedLists.js';
 import { convertMathMl } from './convertMathMl.js';
 import { mergeCodeBlocks } from './mergeCodeBlocks.js';
+import { fixListsLevels } from './fixListsLevels.js';
 
 export interface PostProcessConfig {
   doc: Node;
@@ -16,8 +17,9 @@ export function getDefaultsPostProcessFilters(
   { doc, filesMap }: PostProcessConfig,
 ): Array<Command> {
   return [
-    removeUnusedBookmarks,
+    // removeUnusedBookmarks,
     convertCodeParagraphsToCodeBlocks,
+    fixListsLevels,
     fixContinuedLists,
     convertMathMl,
     mergeCodeBlocks,

package/src/postprocess/removeUnusedBookmarks.ts

@@ -14,7 +14,6 @@ export const removeUnusedBookmarks: Command = (state, dispatch): boolean => {
     depth = 0,
   ) {
     if (node.type === bookmarkNodeType) {
-      console.log('del');
       tr = tr.delete(
         tr.mapping.map(pos - 1),
         tr.mapping.map(pos + node.nodeSize - 1),