@kerebron/extension-odt 0.5.2 → 0.5.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (61) hide show
  1. package/README.md +2 -2
  2. package/esm/ExtensionOdt.d.ts.map +1 -1
  3. package/esm/ExtensionOdt.js +28 -77
  4. package/esm/ExtensionOdt.js.map +1 -1
  5. package/esm/OdtParser.d.ts +41 -7
  6. package/esm/OdtParser.d.ts.map +1 -1
  7. package/esm/OdtParser.js +26 -19
  8. package/esm/OdtParser.js.map +1 -1
  9. package/esm/lists.d.ts +9 -9
  10. package/esm/lists.d.ts.map +1 -1
  11. package/esm/lists.js +21 -7
  12. package/esm/lists.js.map +1 -1
  13. package/esm/node_handlers/basic_node_handlers.d.ts +1 -0
  14. package/esm/node_handlers/basic_node_handlers.d.ts.map +1 -1
  15. package/esm/node_handlers/basic_node_handlers.js +77 -9
  16. package/esm/node_handlers/basic_node_handlers.js.map +1 -1
  17. package/esm/node_handlers/list_node_handlers.d.ts.map +1 -1
  18. package/esm/node_handlers/list_node_handlers.js +61 -65
  19. package/esm/node_handlers/list_node_handlers.js.map +1 -1
  20. package/esm/postprocess/convertCodeParagraphsToCodeBlocks.d.ts.map +1 -1
  21. package/esm/postprocess/convertCodeParagraphsToCodeBlocks.js +40 -66
  22. package/esm/postprocess/convertCodeParagraphsToCodeBlocks.js.map +1 -1
  23. package/esm/postprocess/convertMathMl.d.ts.map +1 -1
  24. package/esm/postprocess/convertMathMl.js +1 -1
  25. package/esm/postprocess/convertMathMl.js.map +1 -1
  26. package/esm/postprocess/fixContinuedLists.d.ts.map +1 -1
  27. package/esm/postprocess/fixContinuedLists.js +80 -67
  28. package/esm/postprocess/fixContinuedLists.js.map +1 -1
  29. package/esm/postprocess/fixListsLevels.d.ts +3 -0
  30. package/esm/postprocess/fixListsLevels.d.ts.map +1 -0
  31. package/esm/postprocess/fixListsLevels.js +62 -0
  32. package/esm/postprocess/fixListsLevels.js.map +1 -0
  33. package/esm/postprocess/mergeCodeBlocks.d.ts +3 -0
  34. package/esm/postprocess/mergeCodeBlocks.d.ts.map +1 -0
  35. package/esm/postprocess/mergeCodeBlocks.js +83 -0
  36. package/esm/postprocess/mergeCodeBlocks.js.map +1 -0
  37. package/esm/postprocess/postProcess.d.ts.map +1 -1
  38. package/esm/postprocess/postProcess.js +5 -2
  39. package/esm/postprocess/postProcess.js.map +1 -1
  40. package/esm/postprocess/removeUnusedBookmarks.d.ts +1 -1
  41. package/esm/postprocess/removeUnusedBookmarks.d.ts.map +1 -1
  42. package/esm/postprocess/removeUnusedBookmarks.js +16 -19
  43. package/esm/postprocess/removeUnusedBookmarks.js.map +1 -1
  44. package/esm/postprocess/urlRewrite.d.ts +4 -0
  45. package/esm/postprocess/urlRewrite.d.ts.map +1 -0
  46. package/esm/postprocess/urlRewrite.js +60 -0
  47. package/esm/postprocess/urlRewrite.js.map +1 -0
  48. package/package.json +3 -3
  49. package/src/ExtensionOdt.ts +30 -114
  50. package/src/OdtParser.ts +86 -31
  51. package/src/lists.ts +24 -10
  52. package/src/node_handlers/basic_node_handlers.ts +82 -10
  53. package/src/node_handlers/list_node_handlers.ts +91 -90
  54. package/src/postprocess/convertCodeParagraphsToCodeBlocks.ts +44 -86
  55. package/src/postprocess/convertMathMl.ts +1 -2
  56. package/src/postprocess/fixContinuedLists.ts +95 -78
  57. package/src/postprocess/fixListsLevels.ts +93 -0
  58. package/src/postprocess/mergeCodeBlocks.ts +114 -0
  59. package/src/postprocess/postProcess.ts +5 -1
  60. package/src/postprocess/removeUnusedBookmarks.ts +33 -21
  61. package/src/postprocess/urlRewrite.ts +95 -0
@@ -1,78 +1,91 @@
1
- import { Fragment, Slice } from 'prosemirror-model';
1
+ import { ListNumbering } from '../lists.js';
2
2
  const ANY_LIST = ['ordered_list', 'bullet_list'];
3
- function getListEndingMaxDepth(list) {
4
- if (!list) {
5
- return 0;
6
- }
7
- if (ANY_LIST.indexOf(list.type.name) === -1) {
8
- return 0;
9
- }
10
- if (list.lastChild?.type.name === 'list_item') {
11
- return 1 + getListEndingMaxDepth(list.lastChild?.lastChild);
12
- }
13
- return 0;
14
- }
15
- function convertToStitchingLevels(list, array = []) {
16
- if (ANY_LIST.indexOf(list.type.name) === -1) {
17
- throw new Error(`Incorrect list type: ${list.type.name}`);
18
- }
19
- if (!list?.firstChild) {
20
- return array;
21
- }
22
- const firstChildParagraph = list.firstChild.firstChild;
23
- if (firstChildParagraph?.content.size === 0) {
24
- if (list?.firstChild.children.length < 2) {
25
- array.push(new Slice(Fragment.from([]), 0, 0));
26
- // array.push(list.slice(list.firstChild.nodeSize, list.firstChild.nodeSize)) // empty slice
27
- return array;
28
- }
29
- const subList = list?.firstChild.child(1);
30
- array.push(list.slice(list.firstChild.nodeSize, list.content.size));
31
- if (ANY_LIST.indexOf(subList?.type.name) > -1) {
32
- convertToStitchingLevels(subList, array);
33
- }
34
- }
35
- else {
36
- array.push(list.slice(0, list.content.size));
37
- }
38
- return array;
39
- }
40
3
  export const fixContinuedLists = (state, dispatch) => {
41
4
  const doc = state.doc;
42
5
  let tr = state.tr;
43
- let previousList = null;
44
- // console.debug(nodeToTreeString(doc));
45
- doc.forEach((child, childPos) => {
46
- if (child.type.name === 'ordered_list') {
47
- const start = childPos;
48
- const end = start + child.nodeSize;
49
- if (previousList) {
50
- const stitchingLevels = convertToStitchingLevels(child);
51
- if (stitchingLevels.length <= previousList.stitchingDepth) {
52
- const betweenStart = previousList.end;
53
- const betweenNodes = doc.slice(betweenStart, start);
54
- tr = tr.delete(tr.mapping.map(betweenStart), tr.mapping.map(end));
55
- let posToInsert = tr.mapping.map(previousList.end);
56
- for (const level of stitchingLevels) {
57
- posToInsert -= 1; // Before /OL token
58
- tr = tr.replace(posToInsert, posToInsert, level);
59
- posToInsert -= 1; // Before /LI token
60
- }
61
- if (betweenNodes.size > 0) {
62
- tr = tr.replace(posToInsert, posToInsert, betweenNodes);
6
+ const listNumberings = new Map();
7
+ let topListId = '';
8
+ function processContinuation(node) {
9
+ let listNumbering = null;
10
+ if (topListId && listNumberings.has(topListId)) {
11
+ listNumbering = listNumberings.get(topListId);
12
+ }
13
+ const cont = node.attrs['continue'];
14
+ if (cont) {
15
+ listNumbering = listNumberings.get(cont);
16
+ }
17
+ if (!listNumbering) {
18
+ listNumbering = new ListNumbering(topListId);
19
+ }
20
+ listNumberings.set(topListId, listNumbering);
21
+ return { listNumbering };
22
+ }
23
+ let possibleContinue = true;
24
+ let level = 0;
25
+ function walk(node, pos = 0, depth = 0) {
26
+ if ('list_item' === node.type.name) {
27
+ const listNumbering = listNumberings.get('_current');
28
+ const firstChild = node.content.firstChild;
29
+ if (firstChild && listNumbering) {
30
+ if (firstChild.type.name === 'paragraph' &&
31
+ firstChild.content.childCount > 0) {
32
+ if (listNumbering.forceStart[level]) {
33
+ delete listNumbering.forceStart[level];
34
+ tr = tr.setNodeMarkup(tr.mapping.map(pos - 1), node.type, {
35
+ ...node.attrs,
36
+ value: listNumbering.levels[level],
37
+ });
63
38
  }
64
- previousList.stitchingDepth = getListEndingMaxDepth(child);
65
- previousList.end = end;
66
- return;
39
+ listNumbering.levels[level]++;
40
+ }
41
+ else {
42
+ tr = tr.setNodeMarkup(tr.mapping.map(pos - 1), node.type, {
43
+ ...node.attrs,
44
+ type: 'none',
45
+ });
46
+ listNumbering.forceStart[level] = true;
47
+ }
48
+ }
49
+ }
50
+ if (!ANY_LIST.includes(node.type.name)) {
51
+ node.forEach((child, offset) => {
52
+ walk(child, pos + offset + 1, depth + 1);
53
+ });
54
+ }
55
+ else {
56
+ level++;
57
+ if (level === 1) {
58
+ topListId = node.attrs.id;
59
+ possibleContinue = true;
60
+ }
61
+ const { listNumbering } = processContinuation(node);
62
+ listNumberings.set('_current', listNumbering);
63
+ if (!possibleContinue) {
64
+ listNumbering.levels[level] = 1;
65
+ }
66
+ if (node.attrs.start) {
67
+ listNumbering.levels[level] = node.attrs.start;
68
+ }
69
+ if ('ordered_list' === node.type.name) {
70
+ if (1 < listNumbering.levels[level]) {
71
+ tr = tr.setNodeMarkup(tr.mapping.map(pos - 1), node.type, {
72
+ ...node.attrs,
73
+ start: listNumbering.levels[level],
74
+ continue: undefined,
75
+ });
67
76
  }
68
77
  }
69
- previousList = {
70
- stitchingDepth: getListEndingMaxDepth(child),
71
- start,
72
- end,
73
- };
78
+ node.forEach((child, offset) => {
79
+ walk(child, pos + offset + 1, depth + 1);
80
+ });
81
+ if (level === 1) {
82
+ listNumberings.set('_last', listNumbering);
83
+ }
84
+ level--;
85
+ possibleContinue = false;
74
86
  }
75
- });
87
+ }
88
+ walk(doc);
76
89
  if (dispatch) {
77
90
  dispatch(tr);
78
91
  }
@@ -1 +1 @@
1
- {"version":3,"file":"fixContinuedLists.js","sourceRoot":"","sources":["../../src/postprocess/fixContinuedLists.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"fixContinuedLists.js","sourceRoot":"","sources":["../../src/postprocess/fixContinuedLists.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,MAAM,QAAQ,GAAG,CAAC,cAAc,EAAE,aAAa,CAAC,CAAC;AAEjD,MAAM,CAAC,MAAM,iBAAiB,GAAY,CAAC,KAAK,EAAE,QAAQ,EAAW,EAAE;IACrE,MAAM,GAAG,GAAS,KAAK,CAAC,GAAG,CAAC;IAC5B,IAAI,EAAE,GAAG,KAAK,CAAC,EAAE,CAAC;IAElB,MAAM,cAAc,GAA+B,IAAI,GAAG,EAGvD,CAAC;IAEJ,IAAI,SAAS,GAAG,EAAE,CAAC;IAEnB,SAAS,mBAAmB,CAAC,IAAU;QACrC,IAAI,aAAa,GAAG,IAAI,CAAC;QAEzB,IAAI,SAAS,IAAI,cAAc,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;YAC/C,aAAa,GAAG,cAAc,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAChD,CAAC;QAED,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QACpC,IAAI,IAAI,EAAE,CAAC;YACT,aAAa,GAAG,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC3C,CAAC;QAED,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,aAAa,GAAG,IAAI,aAAa,CAAC,SAAS,CAAC,CAAC;QAC/C,CAAC;QAED,cAAc,CAAC,GAAG,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;QAE7C,OAAO,EAAE,aAAa,EAAE,CAAC;IAC3B,CAAC;IAED,IAAI,gBAAgB,GAAG,IAAI,CAAC;IAC5B,IAAI,KAAK,GAAG,CAAC,CAAC;IAEd,SAAS,IAAI,CACX,IAAU,EACV,GAAG,GAAG,CAAC,EACP,KAAK,GAAG,CAAC;QAET,IAAI,WAAW,KAAK,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;YACnC,MAAM,aAAa,GAAG,cAAc,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;YACrD,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC;YAC3C,IAAI,UAAU,IAAI,aAAa,EAAE,CAAC;gBAChC,IACE,UAAU,CAAC,IAAI,CAAC,IAAI,KAAK,WAAW;oBACpC,UAAU,CAAC,OAAO,CAAC,UAAU,GAAG,CAAC,EACjC,CAAC;oBACD,IAAI,aAAa,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;wBACpC,OAAO,aAAa,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;wBAEvC,EAAE,GAAG,EAAE,CAAC,aAAa,CAAC,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,IAAI,EAAE;4BACxD,GAAG,IAAI,CAAC,KAAK;4BACb,KAAK,EAAE,aAAa,CAAC,MAAM,CAAC,KAAK,CAAC;yBACnC,CAAC,CAAC;oBACL,CAAC;oBAED,aAAa,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;gBAChC,CAAC;qBAAM,CAAC;oBACN,EAAE,GAAG,EAAE,CAAC,aAAa,CAAC,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,IAAI,EAAE;wBACxD,GAAG,IAAI,CAAC,KAAK;wBACb,IAAI,EAAE,MAAM;qBACb,CAAC,CAAC;oBACH,aAAa,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC;gBACzC,CAAC;YACH,CAAC;QACH,CAAC;QAED,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YACvC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;gBAC7B,IAAI,CAAC,KAAK,EAAE,GAAG,GAAG,MAAM,GAAG,CAAC,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC;YAC3C,CAAC,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,KAAK,EAAE,CAAC;YAER,IAAI,KAAK,KAAK,CAAC,EAAE,CAAC;gBAChB,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC1B,gBAAgB,GAAG,IAAI,CAAC;YAC1B,CAAC;YAED,MAAM,EAAE,aAAa,EAAE,GAAG,mBAAmB,CAAC,IAAI,CAAC,CAAC;YAEpD,cAAc,CAAC,GAAG,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC;YAE9C,IAAI,CAAC,gBAAgB,EAAE,CAAC;gBACtB,aAAa,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAClC,CAAC;YAED,IAAI,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;gBACrB,aAAa,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC;YACjD,CAAC;YAED,IAAI,cAAc,KAAK,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;gBACtC,IAAI,CAAC,GAAG,aAAa,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;oBACpC,EAAE,GAAG,EAAE,CAAC,aAAa,CAAC,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,IAAI,EAAE;wBACxD,GAAG,IAAI,CAAC,KAAK;wBACb,KAAK,EAAE,aAAa,CAAC,MAAM,CAAC,KAAK,CAAC;wBAClC,QAAQ,EAAE,SAAS;qBACpB,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;YAED,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;gBAC7B,IAAI,CAAC,KAAK,EAAE,GAAG,GAAG,MAAM,GAAG,CAAC,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC;YAC3C,CAAC,CAAC,CAAC;YAEH,IAAI,KAAK,KAAK,CAAC,EAAE,CAAC;gBAChB,cAAc,CAAC,GAAG,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;YAC7C,CAAC;YAED,KAAK,EAAE,CAAC;YACR,gBAAgB,GAAG,KAAK,CAAC;QAC3B,CAAC;IACH,CAAC;IAED,IAAI,CAAC,GAAG,CAAC,CAAC;IAEV,IAAI,QAAQ,EAAE,CAAC;QACb,QAAQ,CAAC,EAAE,CAAC,CAAC;IACf,CAAC;IAED,OAAO,EAAE,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC;AAC7B,CAAC,CAAC"}
@@ -0,0 +1,3 @@
1
+ import { Command } from 'prosemirror-state';
2
+ export declare const fixListsLevels: Command;
3
+ //# sourceMappingURL=fixListsLevels.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"fixListsLevels.d.ts","sourceRoot":"","sources":["../../src/postprocess/fixListsLevels.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAQ5C,eAAO,MAAM,cAAc,EAAE,OAmF5B,CAAC"}
@@ -0,0 +1,62 @@
1
+ import { Fragment } from 'prosemirror-model';
2
+ const ANY_LIST = ['ordered_list', 'bullet_list'];
3
+ // Related tests:
4
+ // test ./example-document.md
5
+ export const fixListsLevels = (state, dispatch) => {
6
+ const doc = state.doc;
7
+ const schema = state.schema;
8
+ const bulletListType = schema.nodes.bullet_list;
9
+ const listItemType = schema.nodes.list_item;
10
+ const paragraphType = schema.nodes.paragraph;
11
+ const tr = state.tr;
12
+ let level = 0;
13
+ let prevList = [];
14
+ let curList = [];
15
+ let fakeLevelGenerated = 0;
16
+ function walk(node, pos = 0, depth = 0) {
17
+ if (!ANY_LIST.includes(node.type.name)) {
18
+ node.forEach((child, offset) => {
19
+ walk(child, pos + offset + 1, depth + 1);
20
+ });
21
+ }
22
+ else {
23
+ const marginLeft = node.attrs['odtMarginLeft'] || 0;
24
+ if (level === 0) {
25
+ curList = [];
26
+ fakeLevelGenerated = 0;
27
+ if (prevList.length >= level) {
28
+ for (let i = 0; i < prevList.length; i++) {
29
+ if (fakeLevelGenerated < prevList.length &&
30
+ marginLeft > prevList[fakeLevelGenerated]) {
31
+ curList[level + fakeLevelGenerated] =
32
+ prevList[fakeLevelGenerated];
33
+ fakeLevelGenerated++;
34
+ }
35
+ }
36
+ }
37
+ }
38
+ curList[level + fakeLevelGenerated] = marginLeft;
39
+ level++;
40
+ node.forEach((child, offset) => {
41
+ walk(child, pos + offset + 1, depth + 1);
42
+ });
43
+ level--;
44
+ if (level === 0 && !node.attrs.toc) {
45
+ prevList = curList;
46
+ for (let i = 0; i < fakeLevelGenerated; i++) {
47
+ const wrapper = bulletListType.create({ type: 'none' }, listItemType.create(null, Fragment.from([
48
+ paragraphType.create(),
49
+ node,
50
+ ])));
51
+ tr.replaceWith(tr.mapping.map(pos), tr.mapping.map(pos + node.nodeSize), wrapper);
52
+ }
53
+ }
54
+ }
55
+ }
56
+ walk(doc);
57
+ if (dispatch) {
58
+ dispatch(tr);
59
+ }
60
+ return tr.docChanged;
61
+ };
62
+ //# sourceMappingURL=fixListsLevels.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"fixListsLevels.js","sourceRoot":"","sources":["../../src/postprocess/fixListsLevels.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,3 @@
1
+ import { Command } from 'prosemirror-state';
2
+ export declare const mergeCodeBlocks: Command;
3
+ //# sourceMappingURL=mergeCodeBlocks.d.ts.map
@@ -0,0 +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,OA0G7B,CAAC"}
@@ -0,0 +1,83 @@
1
+ const CODEBLOCK_START = ''; // gdocs
2
+ const CODEBLOCK_END = '';
3
+ // Related tests:
4
+ // test ./code-blocks.md
5
+ export const mergeCodeBlocks = (state, dispatch) => {
6
+ const schema = state.schema;
7
+ let tr = state.tr;
8
+ const codeBlockType = schema.nodes.code_block;
9
+ const paraBlockType = schema.nodes.paragraph;
10
+ const parent = state.doc;
11
+ let offset = 0;
12
+ for (let nodeNo = 0; nodeNo < parent.childCount; nodeNo++) {
13
+ const node = parent.nodeAt(offset);
14
+ if (!node) {
15
+ continue;
16
+ }
17
+ if (node.type !== codeBlockType) {
18
+ offset += node.nodeSize;
19
+ continue;
20
+ }
21
+ let codeTexts = [];
22
+ let codeSize = 0;
23
+ {
24
+ codeSize += node.nodeSize;
25
+ const text = node.text || node.textBetween(0, node.content.size);
26
+ codeTexts.push(text.endsWith('\n') ? text : text + '\n');
27
+ }
28
+ let nextPos = offset + node.nodeSize;
29
+ while (true) {
30
+ const next = state.doc.nodeAt(nextPos);
31
+ if (!next) {
32
+ break;
33
+ }
34
+ nextPos += next.nodeSize;
35
+ if (next.type === paraBlockType && next.childCount === 0) {
36
+ codeTexts.push('\n');
37
+ codeSize += next.nodeSize;
38
+ continue;
39
+ }
40
+ if (next.type === codeBlockType && node.attrs.lang === next.attrs.lang &&
41
+ node.attrs.lang !== 'mathml') {
42
+ const text = next.text || next.textBetween(0, next.content.size);
43
+ codeTexts.push(text.endsWith('\n') ? text : text + '\n');
44
+ codeSize += next.nodeSize;
45
+ continue;
46
+ }
47
+ break;
48
+ }
49
+ if (codeTexts.length > 1) {
50
+ const startPos = tr.mapping.map(offset);
51
+ const endPos = tr.mapping.map(offset + codeSize);
52
+ let codeText = codeTexts.join('').replace(/\n+$/gm, '\n');
53
+ const lines = codeText.split('\n');
54
+ let emptyCount = 0;
55
+ for (emptyCount = 0; emptyCount < lines.length; emptyCount++) {
56
+ if (lines[emptyCount].trim()) {
57
+ break;
58
+ }
59
+ }
60
+ lines.splice(0, emptyCount);
61
+ codeText = lines.join('\n');
62
+ const textNode = schema.text(codeText);
63
+ const codeBlock = schema.nodes.code_block.createAndFill({
64
+ lang: node.attrs.lang,
65
+ }, [textNode]);
66
+ if (codeBlock) {
67
+ tr = tr.replaceRangeWith(startPos, endPos, codeBlock);
68
+ }
69
+ }
70
+ offset += codeSize;
71
+ }
72
+ state.doc.descendants((node, pos) => {
73
+ if (node.type === paraBlockType &&
74
+ [CODEBLOCK_START, CODEBLOCK_END].includes(node.textBetween(0, node.content.size))) {
75
+ tr = tr.deleteRange(tr.mapping.map(pos), tr.mapping.map(pos + node.nodeSize));
76
+ }
77
+ });
78
+ if (dispatch) {
79
+ dispatch(tr);
80
+ }
81
+ return tr.docChanged;
82
+ };
83
+ //# sourceMappingURL=mergeCodeBlocks.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"mergeCodeBlocks.js","sourceRoot":"","sources":["../../src/postprocess/mergeCodeBlocks.ts"],"names":[],"mappings":"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"}
@@ -1 +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;AAO5C,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,CAOhB"}
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;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"}
@@ -1,13 +1,16 @@
1
1
  import { convertCodeParagraphsToCodeBlocks } from './convertCodeParagraphsToCodeBlocks.js';
2
- import { removeUnusedBookmarks } from './removeUnusedBookmarks.js';
3
2
  import { fixContinuedLists } from './fixContinuedLists.js';
4
3
  import { convertMathMl } from './convertMathMl.js';
4
+ import { mergeCodeBlocks } from './mergeCodeBlocks.js';
5
+ import { fixListsLevels } from './fixListsLevels.js';
5
6
  export function getDefaultsPostProcessFilters({ doc, filesMap }) {
6
7
  return [
8
+ // removeUnusedBookmarks,
7
9
  convertCodeParagraphsToCodeBlocks,
8
- removeUnusedBookmarks,
10
+ fixListsLevels,
9
11
  fixContinuedLists,
10
12
  convertMathMl,
13
+ mergeCodeBlocks,
11
14
  ];
12
15
  }
13
16
  //# sourceMappingURL=postProcess.js.map
@@ -1 +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;AAOnD,MAAM,UAAU,6BAA6B,CAC3C,EAAE,GAAG,EAAE,QAAQ,EAAqB;IAEpC,OAAO;QACL,iCAAiC;QACjC,qBAAqB;QACrB,iBAAiB;QACjB,aAAa;KACd,CAAC;AACJ,CAAC"}
1
+ {"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"}
@@ -1,3 +1,3 @@
1
- import { Command } from 'prosemirror-state';
1
+ import type { Command } from 'prosemirror-state';
2
2
  export declare const removeUnusedBookmarks: Command;
3
3
  //# sourceMappingURL=removeUnusedBookmarks.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"removeUnusedBookmarks.d.ts","sourceRoot":"","sources":["../../src/postprocess/removeUnusedBookmarks.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAE5C,eAAO,MAAM,qBAAqB,EAAE,OAgCnC,CAAC"}
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,OA4CnC,CAAC"}
@@ -1,28 +1,25 @@
1
1
  export const removeUnusedBookmarks = (state, dispatch) => {
2
- return false;
3
- function condition(mark) {
4
- console.log('rrrr', mark.type.name);
5
- return mark.type.name === 'bookmark';
6
- }
7
- if (node.marks) {
8
- // For text nodes, filter out the marks that match the condition
9
- const newMarks = node.marks.filter((mark) => !condition(mark));
10
- // If marks were removed, return a new text node with the remaining marks
2
+ const schema = state.schema;
3
+ let tr = state.tr;
4
+ const bookmarkNodeType = schema.nodes.node_bookmark;
5
+ const bookmarkMarkType = schema.marks.bookmark;
6
+ function walk(node, pos = 0, depth = 0) {
7
+ if (node.type === bookmarkNodeType) {
8
+ tr = tr.delete(tr.mapping.map(pos - 1), tr.mapping.map(pos + node.nodeSize - 1));
9
+ return;
10
+ }
11
+ const newMarks = node.marks.filter((mark) => mark.type !== bookmarkMarkType);
11
12
  if (newMarks.length !== node.marks.length) {
12
- return node.mark(newMarks);
13
+ tr = tr.setNodeMarkup(tr.mapping.map(pos), null, null, newMarks);
13
14
  }
14
- // Otherwise, return the original text node
15
- return node;
15
+ node.forEach((child, offset, index) => {
16
+ walk(child, pos + offset + 1, depth + 1);
17
+ });
16
18
  }
17
- // if (Array.isArray(node.content)) {
18
- // const content: Node[] = node.content.content.map(childNode => removeUnusedBookmarks(childNode));
19
- // return node.copy(content);
20
- // } else {
21
- // console.log('node.content', node.content);
22
- // }
19
+ walk(state.doc);
23
20
  if (dispatch) {
24
21
  dispatch(tr);
25
22
  }
26
- return tr.steps.length > 0;
23
+ return tr.docChanged;
27
24
  };
28
25
  //# sourceMappingURL=removeUnusedBookmarks.js.map
@@ -1 +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,OAAO,KAAK,CAAC;IACb,SAAS,SAAS,CAAC,IAAI;QACrB,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpC,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,UAAU,CAAC;IACvC,CAAC;IAED,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;QACf,gEAAgE;QAChE,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;QAE/D,yEAAyE;QACzE,IAAI,QAAQ,CAAC,MAAM,KAAK,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;YAC1C,OAAO,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC7B,CAAC;QAED,2CAA2C;QAC3C,OAAO,IAAI,CAAC;IACd,CAAC;IAED,qCAAqC;IACrC,qGAAqG;IACrG,6BAA6B;IAC7B,WAAW;IACX,6CAA6C;IAC7C,IAAI;IAEJ,IAAI,QAAQ,EAAE,CAAC;QACb,QAAQ,CAAC,EAAE,CAAC,CAAC;IACf,CAAC;IAED,OAAO,EAAE,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC;AAC7B,CAAC,CAAC"}
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,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"}
@@ -0,0 +1,4 @@
1
+ import { EditorState, Transaction } from 'prosemirror-state';
2
+ import { UrlRewriter } from '@kerebron/editor';
3
+ export declare function urlRewrite(urlFromRewriter: UrlRewriter, filesMap: Record<string, Uint8Array>, state: EditorState, dispatch: (tr: Transaction) => void): Promise<boolean>;
4
+ //# sourceMappingURL=urlRewrite.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"urlRewrite.d.ts","sourceRoot":"","sources":["../../src/postprocess/urlRewrite.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAE7D,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,wBAAsB,UAAU,CAC9B,eAAe,EAAE,WAAW,EAC5B,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,EACpC,KAAK,EAAE,WAAW,EAClB,QAAQ,EAAE,CAAC,EAAE,EAAE,WAAW,KAAK,IAAI,GAClC,OAAO,CAAC,OAAO,CAAC,CAoFlB"}
@@ -0,0 +1,60 @@
1
+ export async function urlRewrite(urlFromRewriter, filesMap, state, dispatch) {
2
+ const imageNodes = [];
3
+ state.doc.descendants((node, pos) => {
4
+ if (node.type.name === 'image') {
5
+ imageNodes.push({ node, pos });
6
+ }
7
+ });
8
+ const linkNodes = [];
9
+ state.doc.descendants((node, pos) => {
10
+ if (node.marks.find((mark) => mark.type.name === 'link')) {
11
+ linkNodes.push({ node, pos });
12
+ }
13
+ });
14
+ const tr = state.tr;
15
+ for (const { node, pos } of linkNodes) {
16
+ const linkMark = node.marks.find((mark) => mark.type.name === 'link');
17
+ if (!linkMark) {
18
+ continue;
19
+ }
20
+ let href = linkMark.attrs.href || '';
21
+ href = await urlFromRewriter(href, {
22
+ type: 'A',
23
+ dest: 'kerebron',
24
+ });
25
+ if (href !== linkMark.attrs.href) {
26
+ const newMarks = node.marks.map((mark) => {
27
+ if (mark.type.name === 'link') {
28
+ const markType = state.schema.marks['link'];
29
+ return markType.create({ ...mark.attrs, href });
30
+ }
31
+ return mark;
32
+ });
33
+ const nodeType = state.schema.nodes[node.type.name];
34
+ let replaceNode;
35
+ if (nodeType.isText) {
36
+ replaceNode = state.schema.text(node.text || '', newMarks);
37
+ }
38
+ else {
39
+ replaceNode = nodeType.create(node.attrs, node.content, newMarks);
40
+ }
41
+ tr.replaceWith(tr.mapping.map(pos), tr.mapping.map(pos + node.nodeSize), replaceNode);
42
+ }
43
+ }
44
+ for (const { node, pos } of imageNodes) {
45
+ let src = node.attrs.src || '';
46
+ src = await urlFromRewriter(src, {
47
+ type: 'IMG',
48
+ dest: 'kerebron',
49
+ filesMap,
50
+ });
51
+ if (src !== node.attrs.src) {
52
+ const nodeType = state.schema.nodes[node.type.name];
53
+ const replaceNode = nodeType.create({ ...node.attrs, src }, node.content, node.marks);
54
+ tr.replaceWith(tr.mapping.map(pos), tr.mapping.map(pos + node.nodeSize), replaceNode);
55
+ }
56
+ }
57
+ dispatch(tr);
58
+ return tr.docChanged;
59
+ }
60
+ //# sourceMappingURL=urlRewrite.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"urlRewrite.js","sourceRoot":"","sources":["../../src/postprocess/urlRewrite.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kerebron/extension-odt",
3
- "version": "0.5.2",
3
+ "version": "0.5.4",
4
4
  "license": "MIT",
5
5
  "module": "./esm/ExtensionOdt.js",
6
6
  "exports": {
@@ -14,8 +14,8 @@
14
14
  "src"
15
15
  ],
16
16
  "dependencies": {
17
- "@kerebron/editor": "0.5.2",
18
- "@kerebron/odt-wasm": "0.5.2",
17
+ "@kerebron/editor": "0.5.4",
18
+ "@kerebron/odt-wasm": "0.5.4",
19
19
  "prosemirror-model": "1.25.3",
20
20
  "prosemirror-state": "1.4.3"
21
21
  },