@kerebron/extension-odt 0.5.3 → 0.5.4

package/esm/postprocess/fixListsLevels.js

@@ -0,0 +1,62 @@
+import { Fragment } from 'prosemirror-model';
+const ANY_LIST = ['ordered_list', 'bullet_list'];
+// Related tests:
+// test ./example-document.md
+export const fixListsLevels = (state, dispatch) => {
+    const doc = 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 = [];
+    let curList = [];
+    let fakeLevelGenerated = 0;
+    function walk(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;
+};
+//# sourceMappingURL=fixListsLevels.js.map

package/esm/postprocess/fixListsLevels.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"fixListsLevels.js","sourceRoot":"","sources":["../../src/postprocess/fixListsLevels.ts"],"names":[],"mappings":"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"}

package/esm/postprocess/mergeCodeBlocks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mergeCodeBlocks.d.ts","sourceRoot":"","sources":["../../src/postprocess/mergeCodeBlocks.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAO5C,eAAO,MAAM,eAAe,EAAE,OA0F7B,CAAC"}
+{"version":3,"file":"mergeCodeBlocks.d.ts","sourceRoot":"","sources":["../../src/postprocess/mergeCodeBlocks.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAO5C,eAAO,MAAM,eAAe,EAAE,OA0G7B,CAAC"}

package/esm/postprocess/mergeCodeBlocks.js

@@ -31,14 +31,14 @@ export const mergeCodeBlocks = (state, dispatch) => {
             if (!next) {
                 break;
             }
-            const currentPos = nextPos;
             nextPos += next.nodeSize;
             if (next.type === paraBlockType && next.childCount === 0) {
                 codeTexts.push('\n');
                 codeSize += next.nodeSize;
                 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');
                 codeSize += next.nodeSize;
@@ -49,9 +49,20 @@ export const mergeCodeBlocks = (state, dispatch) => {
         if (codeTexts.length > 1) {
             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/esm/postprocess/mergeCodeBlocks.js.map

@@ -1 +1 @@
-{"version":3,"file":"mergeCodeBlocks.js","sourceRoot":"","sources":["../../src/postprocess/mergeCodeBlocks.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"mergeCodeBlocks.js","sourceRoot":"","sources":["../../src/postprocess/mergeCodeBlocks.ts"],"names":[],"mappings":"AAEA,MAAM,eAAe,GAAG,GAAG,CAAC,CAAC,QAAQ;AACrC,MAAM,aAAa,GAAG,GAAG,CAAC;AAE1B,iBAAiB;AACjB,wBAAwB;AACxB,MAAM,CAAC,MAAM,eAAe,GAAY,CAAC,KAAK,EAAE,QAAQ,EAAW,EAAE;IACnE,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;IAC5B,IAAI,EAAE,GAAG,KAAK,CAAC,EAAE,CAAC;IAElB,MAAM,aAAa,GAAG,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC;IAC9C,MAAM,aAAa,GAAG,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC;IAE7C,MAAM,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC;IACzB,IAAI,MAAM,GAAG,CAAC,CAAC;IACf,KAAK,IAAI,MAAM,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,EAAE,CAAC;QAC1D,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACnC,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,SAAS;QACX,CAAC;QAED,IAAI,IAAI,CAAC,IAAI,KAAK,aAAa,EAAE,CAAC;YAChC,MAAM,IAAI,IAAI,CAAC,QAAQ,CAAC;YACxB,SAAS;QACX,CAAC;QAED,IAAI,SAAS,GAAG,EAAE,CAAC;QACnB,IAAI,QAAQ,GAAG,CAAC,CAAC;QACjB,CAAC;YACC,QAAQ,IAAI,IAAI,CAAC,QAAQ,CAAC;YAC1B,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,WAAW,CAAC,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YACjE,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC;QAC3D,CAAC;QAED,IAAI,OAAO,GAAG,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC;QACrC,OAAO,IAAI,EAAE,CAAC;YACZ,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YACvC,IAAI,CAAC,IAAI,EAAE,CAAC;gBACV,MAAM;YACR,CAAC;YAED,OAAO,IAAI,IAAI,CAAC,QAAQ,CAAC;YAEzB,IAAI,IAAI,CAAC,IAAI,KAAK,aAAa,IAAI,IAAI,CAAC,UAAU,KAAK,CAAC,EAAE,CAAC;gBACzD,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACrB,QAAQ,IAAI,IAAI,CAAC,QAAQ,CAAC;gBAC1B,SAAS;YACX,CAAC;YAED,IACE,IAAI,CAAC,IAAI,KAAK,aAAa,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI,CAAC,KAAK,CAAC,IAAI;gBAClE,IAAI,CAAC,KAAK,CAAC,IAAI,KAAK,QAAQ,EAC5B,CAAC;gBACD,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,WAAW,CAAC,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;gBACjE,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC;gBAEzD,QAAQ,IAAI,IAAI,CAAC,QAAQ,CAAC;gBAC1B,SAAS;YACX,CAAC;YAED,MAAM;QACR,CAAC;QAED,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACzB,MAAM,QAAQ,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YACxC,MAAM,MAAM,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,GAAG,QAAQ,CAAC,CAAC;YAEjD,IAAI,QAAQ,GAAG,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;YAE1D,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACnC,IAAI,UAAU,GAAG,CAAC,CAAC;YACnB,KAAK,UAAU,GAAG,CAAC,EAAE,UAAU,GAAG,KAAK,CAAC,MAAM,EAAE,UAAU,EAAE,EAAE,CAAC;gBAC7D,IAAI,KAAK,CAAC,UAAU,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC;oBAC7B,MAAM;gBACR,CAAC;YACH,CAAC;YACD,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC;YAE5B,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAE5B,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YACvC,MAAM,SAAS,GAAG,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,aAAa,CAAC;gBACtD,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI;aACtB,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;YAEf,IAAI,SAAS,EAAE,CAAC;gBACd,EAAE,GAAG,EAAE,CAAC,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;YACxD,CAAC;QACH,CAAC;QAED,MAAM,IAAI,QAAQ,CAAC;IACrB,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE;QAClC,IACE,IAAI,CAAC,IAAI,KAAK,aAAa;YAC3B,CAAC,eAAe,EAAE,aAAa,CAAC,CAAC,QAAQ,CACvC,IAAI,CAAC,WAAW,CAAC,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CACvC,EACD,CAAC;YACD,EAAE,GAAG,EAAE,CAAC,WAAW,CACjB,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EACnB,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,CACpC,CAAC;QACJ,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,IAAI,QAAQ,EAAE,CAAC;QACb,QAAQ,CAAC,EAAE,CAAC,CAAC;IACf,CAAC;IAED,OAAO,EAAE,CAAC,UAAU,CAAC;AACvB,CAAC,CAAC"}

package/esm/postprocess/postProcess.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"postProcess.d.ts","sourceRoot":"","sources":["../../src/postprocess/postProcess.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAQ5C,MAAM,WAAW,iBAAiB;IAChC,GAAG,EAAE,IAAI,CAAC;IACV,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;CACtC;AAED,wBAAgB,6BAA6B,CAC3C,EAAE,GAAG,EAAE,QAAQ,EAAE,EAAE,iBAAiB,GACnC,KAAK,CAAC,OAAO,CAAC,CAQhB"}
+{"version":3,"file":"postProcess.d.ts","sourceRoot":"","sources":["../../src/postprocess/postProcess.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAS5C,MAAM,WAAW,iBAAiB;IAChC,GAAG,EAAE,IAAI,CAAC;IACV,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;CACtC;AAED,wBAAgB,6BAA6B,CAC3C,EAAE,GAAG,EAAE,QAAQ,EAAE,EAAE,iBAAiB,GACnC,KAAK,CAAC,OAAO,CAAC,CAShB"}

package/esm/postprocess/postProcess.js

@@ -1,12 +1,13 @@
 import { convertCodeParagraphsToCodeBlocks } from './convertCodeParagraphsToCodeBlocks.js';
-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 function getDefaultsPostProcessFilters({ doc, filesMap }) {
     return [
-        removeUnusedBookmarks,
+        // removeUnusedBookmarks,
         convertCodeParagraphsToCodeBlocks,
+        fixListsLevels,
         fixContinuedLists,
         convertMathMl,
         mergeCodeBlocks,

package/esm/postprocess/postProcess.js.map

@@ -1 +1 @@
-{"version":3,"file":"postProcess.js","sourceRoot":"","sources":["../../src/postprocess/postProcess.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,iCAAiC,EAAE,MAAM,wCAAwC,CAAC;AAC3F,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAOvD,MAAM,UAAU,6BAA6B,CAC3C,EAAE,GAAG,EAAE,QAAQ,EAAqB;IAEpC,OAAO;QACL,qBAAqB;QACrB,iCAAiC;QACjC,iBAAiB;QACjB,aAAa;QACb,eAAe;KAChB,CAAC;AACJ,CAAC"}
+{"version":3,"file":"postProcess.js","sourceRoot":"","sources":["../../src/postprocess/postProcess.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,iCAAiC,EAAE,MAAM,wCAAwC,CAAC;AAE3F,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAOrD,MAAM,UAAU,6BAA6B,CAC3C,EAAE,GAAG,EAAE,QAAQ,EAAqB;IAEpC,OAAO;QACL,yBAAyB;QACzB,iCAAiC;QACjC,cAAc;QACd,iBAAiB;QACjB,aAAa;QACb,eAAe;KAChB,CAAC;AACJ,CAAC"}

package/esm/postprocess/removeUnusedBookmarks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"removeUnusedBookmarks.d.ts","sourceRoot":"","sources":["../../src/postprocess/removeUnusedBookmarks.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAEjD,eAAO,MAAM,qBAAqB,EAAE,OA6CnC,CAAC"}
+{"version":3,"file":"removeUnusedBookmarks.d.ts","sourceRoot":"","sources":["../../src/postprocess/removeUnusedBookmarks.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAEjD,eAAO,MAAM,qBAAqB,EAAE,OA4CnC,CAAC"}

package/esm/postprocess/removeUnusedBookmarks.js

@@ -5,7 +5,6 @@ export const removeUnusedBookmarks = (state, dispatch) => {
     const bookmarkMarkType = schema.marks.bookmark;
     function walk(node, pos = 0, depth = 0) {
         if (node.type === bookmarkNodeType) {
-            console.log('del');
             tr = tr.delete(tr.mapping.map(pos - 1), tr.mapping.map(pos + node.nodeSize - 1));
             return;
         }

package/esm/postprocess/removeUnusedBookmarks.js.map

@@ -1 +1 @@
-{"version":3,"file":"removeUnusedBookmarks.js","sourceRoot":"","sources":["../../src/postprocess/removeUnusedBookmarks.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,MAAM,qBAAqB,GAAY,CAAC,KAAK,EAAE,QAAQ,EAAW,EAAE;IACzE,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;IAC5B,IAAI,EAAE,GAAG,KAAK,CAAC,EAAE,CAAC;IAElB,MAAM,gBAAgB,GAAG,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC;IACpD,MAAM,gBAAgB,GAAG,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC;IAE/C,SAAS,IAAI,CACX,IAAU,EACV,GAAG,GAAG,CAAC,EACP,KAAK,GAAG,CAAC;QAET,IAAI,IAAI,CAAC,IAAI,KAAK,gBAAgB,EAAE,CAAC;YACnC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YACnB,EAAE,GAAG,EAAE,CAAC,MAAM,CACZ,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,CAAC,EACvB,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,GAAG,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC,CACxC,CAAC;YACF,OAAO;QACT,CAAC;QAED,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAC1C,IAAI,CAAC,IAAI,KAAK,gBAAgB,CAC/B,CAAC;QACF,IAAI,QAAQ,CAAC,MAAM,KAAK,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;YAC1C,EAAE,GAAG,EAAE,CAAC,aAAa,CACnB,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EACnB,IAAI,EACJ,IAAI,EACJ,QAAQ,CACT,CAAC;QACJ,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE;YACpC,IAAI,CAAC,KAAK,EAAE,GAAG,GAAG,MAAM,GAAG,CAAC,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC;QAC3C,CAAC,CAAC,CAAC;IACL,CAAC;IAED,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAEhB,IAAI,QAAQ,EAAE,CAAC;QACb,QAAQ,CAAC,EAAE,CAAC,CAAC;IACf,CAAC;IAED,OAAO,EAAE,CAAC,UAAU,CAAC;AACvB,CAAC,CAAC"}
+{"version":3,"file":"removeUnusedBookmarks.js","sourceRoot":"","sources":["../../src/postprocess/removeUnusedBookmarks.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,MAAM,qBAAqB,GAAY,CAAC,KAAK,EAAE,QAAQ,EAAW,EAAE;IACzE,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;IAC5B,IAAI,EAAE,GAAG,KAAK,CAAC,EAAE,CAAC;IAElB,MAAM,gBAAgB,GAAG,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC;IACpD,MAAM,gBAAgB,GAAG,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC;IAE/C,SAAS,IAAI,CACX,IAAU,EACV,GAAG,GAAG,CAAC,EACP,KAAK,GAAG,CAAC;QAET,IAAI,IAAI,CAAC,IAAI,KAAK,gBAAgB,EAAE,CAAC;YACnC,EAAE,GAAG,EAAE,CAAC,MAAM,CACZ,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,CAAC,EACvB,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,GAAG,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC,CACxC,CAAC;YACF,OAAO;QACT,CAAC;QAED,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAC1C,IAAI,CAAC,IAAI,KAAK,gBAAgB,CAC/B,CAAC;QACF,IAAI,QAAQ,CAAC,MAAM,KAAK,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;YAC1C,EAAE,GAAG,EAAE,CAAC,aAAa,CACnB,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EACnB,IAAI,EACJ,IAAI,EACJ,QAAQ,CACT,CAAC;QACJ,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE;YACpC,IAAI,CAAC,KAAK,EAAE,GAAG,GAAG,MAAM,GAAG,CAAC,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC;QAC3C,CAAC,CAAC,CAAC;IACL,CAAC;IAED,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAEhB,IAAI,QAAQ,EAAE,CAAC;QACb,QAAQ,CAAC,EAAE,CAAC,CAAC;IACf,CAAC;IAED,OAAO,EAAE,CAAC,UAAU,CAAC;AACvB,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kerebron/extension-odt",
-  "version": "0.5.3",
+  "version": "0.5.4",
   "license": "MIT",
   "module": "./esm/ExtensionOdt.js",
   "exports": {
@@ -14,8 +14,8 @@
     "src"
   ],
   "dependencies": {
-    "@kerebron/editor": "0.5.3",
-    "@kerebron/odt-wasm": "0.5.3",
+    "@kerebron/editor": "0.5.4",
+    "@kerebron/odt-wasm": "0.5.4",
     "prosemirror-model": "1.25.3",
     "prosemirror-state": "1.4.3"
   },

package/src/ExtensionOdt.ts

@@ -6,12 +6,6 @@ import {
   Extension,
   type UrlRewriter,
 } from '@kerebron/editor';
-import {
-  init_debug,
-  parse_content,
-  parse_styles,
-  unzip,
-} from '@kerebron/odt-wasm';
 
 import { OdtParser, OdtParserConfig } from './OdtParser.js';
 import { getDefaultsPostProcessFilters } from './postprocess/postProcess.js';
@@ -24,7 +18,7 @@ export interface OdtConfig extends OdtParserConfig {
   postProcessCommands?: Command[];
 }
 
-init_debug();
+let odtWasm: Record<string, any> | undefined = undefined;
 
 export class ExtensionOdt extends Extension {
   name = 'odt';
@@ -43,7 +37,14 @@ export class ExtensionOdt extends Extension {
         throw new Error('Not implemented');
       },
       toDoc: async (buffer: Uint8Array): Promise<Node> => {
-        const { doc, filesMap } = odtConverter.odtToJson(buffer);
+        if (!odtWasm) {
+          odtWasm = this.config.debug
+            ? await import('@kerebron/odt-wasm/debug')
+            : await import('@kerebron/odt-wasm');
+          odtWasm = await odtWasm.init();
+        }
+
+        const { doc, filesMap } = odtConverter.odtToJson(buffer, odtWasm);
 
         const filterCommands = getDefaultsPostProcessFilters({
           doc,
@@ -81,15 +82,15 @@ export class ExtensionOdt extends Extension {
 
         return state.doc;
       },
-      odtToJson: (buffer: Uint8Array) => {
-        const files = unzip(buffer);
+      odtToJson: (buffer: Uint8Array, odtWasm: any) => {
+        const files = odtWasm.unzip(buffer);
         const filesMap: Record<string, Uint8Array> = {};
         for (const k of files.keys()) {
           filesMap[k] = Uint8Array.from(files.get(k));
         }
 
-        const stylesTree = parse_styles(files.get('styles.xml'));
-        const contentTree = parse_content(files.get('content.xml'));
+        const stylesTree = odtWasm.parse_styles(files.get('styles.xml'));
+        const contentTree = odtWasm.parse_content(files.get('content.xml'));
 
         if (this.config.debug) {
           const event = new CustomEvent('odt:parsed', {

package/src/OdtParser.ts

@@ -15,14 +15,53 @@ export interface OdtElement {
 
 export type NodeHandler = (ctx: OdtStashContext, value: any) => void;
 
+export interface ListLLevelLabelAlignment {
+  '@margin-left'?: string;
+}
+
+export interface ListLevelProperties {
+  'list-level-label-alignment': ListLLevelLabelAlignment;
+}
+
+export interface ListLevelStyleBullet {
+  '@level': number;
+  'list-level-properties': ListLevelProperties;
+}
+
+export interface ListLevelStyleNumber {
+  '@level': number;
+  '@start-value'?: number;
+  '@num-format': string;
+  'list-level-properties': ListLevelProperties;
+}
+
 export interface ListStyle {
-  '@name': string;
+  '@name'?: string;
+  'list-level-style-bullet': ListLevelStyleBullet[];
+  'list-level-style-number': ListLevelStyleNumber[];
+}
+
+export interface TextProperty {
+  '@font-name'?: string;
+  '@font-weight'?: string;
+  '@font-style'?: string;
+  '@font-size'?: string;
+  '@text-underline-style'?: string;
+  '@color'?: string;
+}
+
+export interface ParagraphProperty {
+  '@break-before'?: string;
+  '@break-after'?: string;
+  '@margin-left'?: string;
 }
 
 export interface Style {
-  '@name': string;
+  '@name'?: string;
   '@parent-style-name'?: string;
   styles: string[];
+  'text-properties'?: TextProperty;
+  'paragraph-properties'?: TextProperty;
 }
 
 export interface StylesTree {
@@ -36,6 +75,28 @@ export interface AutomaticStyles {
   'style': Array<Style>;
 }
 
+export function resolveListStyle(
+  stylesTree: StylesTree,
+  automaticStyles: AutomaticStyles,
+  name: string,
+): ListStyle {
+  let style: ListStyle | undefined;
+
+  style = stylesTree.styles['list-style'].find((item) =>
+    item['@name'] === name
+  );
+
+  if (!style) {
+    style = {
+      '@name': name,
+      'list-level-style-number': [],
+      'list-level-style-bullet': [],
+    };
+  }
+
+  return style;
+}
+
 export function resolveStyle(
   stylesTree: StylesTree,
   automaticStyles: AutomaticStyles,
@@ -43,11 +104,6 @@ export function resolveStyle(
 ): Style {
   let style: Style | undefined;
 
-  if (!style) {
-    style = stylesTree.styles['list-style'].find((item) =>
-      item['@name'] === name
-    );
-  }
   if (!style) {
     style = stylesTree.styles['style'].find((item) => item['@name'] === name);
   }
@@ -72,7 +128,7 @@ export function resolveStyle(
     );
     if (parentStyle) {
       const styles = [...style['styles'], ...parentStyle['styles']];
-      for (const key in style) {
+      for (const key of Object.keys(style) as (keyof Style)[]) {
         if (typeof style[key] === 'undefined') {
           delete style[key];
         }
@@ -268,7 +324,9 @@ export class OdtStashContext {
         this.automaticStyles,
         element['@style-name'],
       )
-      : {};
+      : {
+        styles: [],
+      };
 
     return style;
   }
@@ -295,24 +353,14 @@ export class OdtParser {
       ...getBasicNodesHandlers(),
       ...getListNodesHandlers(),
       ...getTableNodesHandlers(),
-
-      'change-start': () => {
-        // custom(state) {
-        //   state.textMarks.add({
-        //     markName: 'change',
-        //     markAttributes: {},
-        //   });
-        // },
-      },
-      'change-end': () => {
-        // custom(state) {
-        //   state.textMarks.forEach((x) =>
-        //     x.markName === 'change' ? state.textMarks.delete(x) : x
-        //   );
-        // },
-      },
       'g': () => { // Test is: embedded-diagram-example.odt
         // DrawG draw:g
+        const node = ctx.createText(
+          'INSTEAD OF EMBEDDED DIAGRAM ABOVE USE EMBEDDED DIAGRAM FROM DRIVE AND PUT LINK TO IT IN THE DESCRIPTION. See: https://github.com/mieweb/wikiGDrive/issues/353',
+        );
+        if (node) {
+          ctx.current.content.push(node);
+        }
       },
       'frame': (ctx: OdtStashContext, odtElement: any) => {
         if (odtElement.object && odtElement.object['@href']) {
@@ -329,7 +377,7 @@ export class OdtParser {
           }
         }
         if (odtElement.image && odtElement.image['@href']) { // TODO links rewrite
-          const alt = odtElement.description?.value || '';
+          const alt = odtElement.desc?.['$value'] || '';
           const src = odtElement.image['@href'];
           ctx.openNode();
           ctx.closeNode('image', {

package/src/node_handlers/basic_node_handlers.ts

@@ -1,5 +1,22 @@
+import { NESTING_CLOSING, NESTING_OPENING } from '@kerebron/editor';
 import { iterateChildren, NodeHandler, OdtStashContext } from '../OdtParser.js';
 
+export function inchesToMm(value: string): number {
+  if (!value) {
+    return 0;
+  }
+  if (value.endsWith('pt')) {
+    return parseFloat(value.substring(0, value.length - 2)) * 0.3528;
+  }
+  if (value.endsWith('in')) {
+    return parseFloat(value.substring(0, value.length - 2)) * 25.4;
+  }
+  if (value.endsWith('em')) {
+    return parseFloat(value.substring(0, value.length - 2)) / 0.125 * 25.4;
+  }
+  return 0;
+}
+
 export function getInlineNodesHandlers(): Record<string, NodeHandler> {
   return {
     '$text': (ctx: OdtStashContext, value: any) => {
@@ -23,10 +40,10 @@ export function getInlineNodesHandlers(): Record<string, NodeHandler> {
       }
     },
     'rect': (ctx: OdtStashContext, odtElement: any) => {
-      // if (odtElement['@rel-width'] === '100%') {
-      //   ctx.openNode();
-      //   ctx.closeNode('hr');
-      // }
+      if (odtElement['@rel-width'] === '100%') {
+        ctx.openNode();
+        ctx.closeNode('hr');
+      }
     },
     'line-break': (ctx: OdtStashContext, odtElement: any) => {
       ctx.openNode();
@@ -57,6 +74,20 @@ export function getInlineNodesHandlers(): Record<string, NodeHandler> {
       //     : x
       // );
     },
+    'change-start': (ctx: OdtStashContext, element: any) => {
+      ctx.openNode();
+      ctx.closeNode('comment', {
+        id: element['@change-id'],
+        nesting: NESTING_OPENING,
+      });
+    },
+    'change-end': (ctx: OdtStashContext, element: any) => {
+      ctx.openNode();
+      ctx.closeNode('comment', {
+        id: element['@change-id'],
+        nesting: NESTING_CLOSING,
+      });
+    },
   };
 }
 
@@ -101,13 +132,56 @@ export function getBasicNodesHandlers(): Record<string, NodeHandler> {
     },
 
     'table-of-content': (ctx: OdtStashContext, value: any) => {
-      ctx.openNode();
+      const levels: number[] = [];
+
+      let prevMarginLeft = -1;
       for (const pElem of value['index-body']['p']) {
+        const style = ctx.getElementStyle(pElem) as any;
+        let marginLeft = 0;
+        if ('paragraph-properties' in style) {
+          marginLeft = inchesToMm(
+            style['paragraph-properties']['@margin-left'],
+          );
+        }
+
+        if (prevMarginLeft < marginLeft) {
+          if (levels.length > 0) {
+            ctx.openNode(); // list_item
+          }
+          ctx.openNode(); // bullet_list
+          levels.push(marginLeft);
+        } else {
+          for (let i = levels.length - 1; i >= 0; i--) {
+            if (levels[i] > marginLeft) {
+              ctx.closeNode('bullet_list', { odtMarginLeft: marginLeft });
+              if (i > 0) {
+                ctx.closeNode('list_item');
+              }
+              levels.pop();
+            } else {
+              break;
+            }
+          }
+        }
         ctx.openNode();
         ctx.handle('p', pElem);
         ctx.closeNode('list_item');
+
+        prevMarginLeft = marginLeft;
+      }
+
+      for (let i = levels.length - 1; i >= 0; i--) {
+        const marginLeft = levels.pop();
+        if (i > 0) {
+          ctx.closeNode('bullet_list', { odtMarginLeft: marginLeft });
+          ctx.closeNode('list_item');
+        } else {
+          ctx.closeNode('bullet_list', {
+            odtMarginLeft: marginLeft,
+            toc: true,
+          });
+        }
       }
-      ctx.closeNode('bullet_list');
     },
 
     'span': (ctx: OdtStashContext, value: any) => {

package/src/node_handlers/list_node_handlers.ts

@@ -1,9 +1,11 @@
 import {
   iterateChildren,
+  ListStyle,
   NodeHandler,
   OdtStashContext,
-  resolveStyle,
+  resolveListStyle,
 } from '../OdtParser.js';
+import { inchesToMm } from './basic_node_handlers.js';
 
 // https://docs.oasis-open.org/office/OpenDocument/v1.4/OpenDocument-v1.4-part3-schema.html#a_19_880_22__text_list_
 // The text:style-name attribute specifies the name of a list style that is applied to a list.
@@ -14,33 +16,55 @@ import {
 // To determine which formatting properties are applied to a list, the list level and list style name are taken into account.
 function processListStyle(ctx: OdtStashContext, level: number) {
   const listTracker = ctx.listTracker;
-  const attrs: Record<string, string> = {};
+  const attrs: Record<string, string | number> = {};
+
+  let style: ListStyle = resolveListStyle(
+    ctx.stylesTree,
+    ctx.automaticStyles,
+    '',
+  );
 
-  let style = {};
   for (let i = listTracker.listStack.length - 1; i >= 0; i--) {
     const list = listTracker.listStack[i];
-    if (!style['@style-name']) {
-      style = (list.styleName)
-        ? resolveStyle(
-          ctx.stylesTree,
-          ctx.automaticStyles,
-          list.styleName,
-        )
-        : {};
+    if (!style['@name']) {
+      style = resolveListStyle(
+        ctx.stylesTree,
+        ctx.automaticStyles,
+        list.styleName,
+      );
     }
   }
 
   let nodeTypeName = 'bullet_list';
   if (style) {
     const numLevelStyle = style['list-level-style-number'].find(
-      (levelStyle) => parseInt(levelStyle['@level']) === level,
+      (levelStyle) => parseInt(String(levelStyle['@level'])) === level,
     );
     if (numLevelStyle) {
       attrs['type'] = numLevelStyle['@num-format'] || '1';
       if (numLevelStyle['@start-value']) {
-        attrs['start'] = numLevelStyle['@start-value'];
+        attrs['start'] = String(numLevelStyle['@start-value']);
       }
       nodeTypeName = 'ordered_list';
+      const marginLeft =
+        numLevelStyle['list-level-properties']['list-level-label-alignment'][
+          '@margin-left'
+        ];
+      if (marginLeft) {
+        attrs['odtMarginLeft'] = inchesToMm(marginLeft);
+      }
+    }
+    const bulletLevelStyle = style['list-level-style-bullet'].find(
+      (levelStyle) => parseInt(String(levelStyle['@level'])) === level,
+    );
+    if (bulletLevelStyle) {
+      const marginLeft =
+        bulletLevelStyle['list-level-properties']['list-level-label-alignment'][
+          '@margin-left'
+        ];
+      if (marginLeft) {
+        attrs['odtMarginLeft'] = inchesToMm(marginLeft);
+      }
     }
   }
 
@@ -53,9 +77,9 @@ function processListStyle(ctx: OdtStashContext, level: number) {
 // https://docs.oasis-open.org/office/OpenDocument/v1.4/OpenDocument-v1.4-part3-schema.html#element-text_list
 export function getListNodesHandlers(): Record<string, NodeHandler> {
   return {
-    'list': (ctx: OdtStashContext, odtElement: any) => {
+    'list': (ctx: OdtStashContext, odtElement) => {
       const listTracker = ctx.listTracker;
-      listTracker.pushList(odtElement['@id'], odtElement['@style-name']);
+      listTracker.pushList(odtElement['@xml:id'], odtElement['@style-name']);
 
       const { nodeTypeName, attrs } = processListStyle(
         ctx,
@@ -64,8 +88,8 @@ export function getListNodesHandlers(): Record<string, NodeHandler> {
 
       ctx.current.meta['list_type'] = nodeTypeName;
 
-      if (odtElement['@id']) {
-        attrs['id'] = odtElement['@id'];
+      if (odtElement['@xml:id']) {
+        attrs['id'] = odtElement['@xml:id'];
       }
       if (odtElement['@continue-list']) {
         attrs['continue'] = odtElement['@continue-list'];
@@ -76,7 +100,7 @@ export function getListNodesHandlers(): Record<string, NodeHandler> {
 
       ctx.openNode();
 
-      const children = odtElement['list-item'].map((item) => ({
+      const children = odtElement['list-item'].map((item: any) => ({
         'list-item': item,
       }));