@kerebron/extension-odt 0.5.2 → 0.5.3
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.
- package/README.md +2 -2
- package/esm/ExtensionOdt.d.ts.map +1 -1
- package/esm/ExtensionOdt.js +16 -70
- package/esm/ExtensionOdt.js.map +1 -1
- package/esm/OdtParser.d.ts +5 -5
- package/esm/OdtParser.d.ts.map +1 -1
- package/esm/OdtParser.js +20 -13
- package/esm/OdtParser.js.map +1 -1
- package/esm/lists.d.ts +9 -9
- package/esm/lists.d.ts.map +1 -1
- package/esm/lists.js +21 -7
- package/esm/lists.js.map +1 -1
- package/esm/node_handlers/basic_node_handlers.d.ts.map +1 -1
- package/esm/node_handlers/basic_node_handlers.js +1 -3
- package/esm/node_handlers/basic_node_handlers.js.map +1 -1
- package/esm/node_handlers/list_node_handlers.d.ts.map +1 -1
- package/esm/node_handlers/list_node_handlers.js +50 -64
- package/esm/node_handlers/list_node_handlers.js.map +1 -1
- package/esm/postprocess/convertCodeParagraphsToCodeBlocks.d.ts.map +1 -1
- package/esm/postprocess/convertCodeParagraphsToCodeBlocks.js +30 -67
- package/esm/postprocess/convertCodeParagraphsToCodeBlocks.js.map +1 -1
- package/esm/postprocess/convertMathMl.d.ts.map +1 -1
- package/esm/postprocess/convertMathMl.js.map +1 -1
- package/esm/postprocess/fixContinuedLists.d.ts.map +1 -1
- package/esm/postprocess/fixContinuedLists.js +80 -67
- package/esm/postprocess/fixContinuedLists.js.map +1 -1
- package/esm/postprocess/mergeCodeBlocks.d.ts +3 -0
- package/esm/postprocess/mergeCodeBlocks.d.ts.map +1 -0
- package/esm/postprocess/mergeCodeBlocks.js +72 -0
- package/esm/postprocess/mergeCodeBlocks.js.map +1 -0
- package/esm/postprocess/postProcess.d.ts.map +1 -1
- package/esm/postprocess/postProcess.js +3 -1
- package/esm/postprocess/postProcess.js.map +1 -1
- package/esm/postprocess/removeUnusedBookmarks.d.ts +1 -1
- package/esm/postprocess/removeUnusedBookmarks.d.ts.map +1 -1
- package/esm/postprocess/removeUnusedBookmarks.js +17 -19
- package/esm/postprocess/removeUnusedBookmarks.js.map +1 -1
- package/esm/postprocess/urlRewrite.d.ts +4 -0
- package/esm/postprocess/urlRewrite.d.ts.map +1 -0
- package/esm/postprocess/urlRewrite.js +60 -0
- package/esm/postprocess/urlRewrite.js.map +1 -0
- package/package.json +3 -3
- package/src/ExtensionOdt.ts +17 -102
- package/src/OdtParser.ts +15 -8
- package/src/lists.ts +24 -10
- package/src/node_handlers/basic_node_handlers.ts +2 -4
- package/src/node_handlers/list_node_handlers.ts +64 -87
- package/src/postprocess/convertCodeParagraphsToCodeBlocks.ts +33 -88
- package/src/postprocess/convertMathMl.ts +0 -1
- package/src/postprocess/fixContinuedLists.ts +95 -78
- package/src/postprocess/mergeCodeBlocks.ts +98 -0
- package/src/postprocess/postProcess.ts +3 -1
- package/src/postprocess/removeUnusedBookmarks.ts +34 -21
- package/src/postprocess/urlRewrite.ts +95 -0
|
@@ -1,82 +1,45 @@
|
|
|
1
|
-
function onlyHasCodeMarkedText(paragraph, codeMarkType) {
|
|
2
|
-
if (paragraph.content.size === 0) {
|
|
3
|
-
return paragraph.marks.some((mark) => mark.type.name === codeMarkType.name);
|
|
4
|
-
}
|
|
5
|
-
let allAreCodeMarked = true;
|
|
6
|
-
paragraph.content.forEach((child) => {
|
|
7
|
-
if (!child.isText ||
|
|
8
|
-
!child.marks.some((mark) => mark.type.name === codeMarkType.name)) {
|
|
9
|
-
allAreCodeMarked = false;
|
|
10
|
-
}
|
|
11
|
-
});
|
|
12
|
-
return allAreCodeMarked;
|
|
13
|
-
}
|
|
14
1
|
export const convertCodeParagraphsToCodeBlocks = (state, dispatch) => {
|
|
15
2
|
const doc = state.doc;
|
|
16
3
|
const schema = state.schema;
|
|
17
4
|
let tr = state.tr;
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
if (paragraphsToMerge === null) {
|
|
21
|
-
return;
|
|
22
|
-
}
|
|
23
|
-
const textNode = schema.text(paragraphsToMerge.innerText);
|
|
24
|
-
const codeBlock = schema.nodes.code_block.createAndFill(null, [textNode]);
|
|
25
|
-
const startPos = tr.mapping.map(paragraphsToMerge.startPos);
|
|
26
|
-
const endPos = tr.mapping.map(paragraphsToMerge.endPos);
|
|
27
|
-
if (codeBlock) {
|
|
28
|
-
tr.replaceRangeWith(startPos, endPos, codeBlock);
|
|
29
|
-
}
|
|
30
|
-
paragraphsToMerge = null;
|
|
31
|
-
}
|
|
32
|
-
function nodesToText(fragment) {
|
|
33
|
-
if (fragment.content.length === 0) {
|
|
34
|
-
return '';
|
|
35
|
-
}
|
|
36
|
-
let retVal = '';
|
|
37
|
-
fragment.content.forEach((node) => {
|
|
38
|
-
if (node.isText) {
|
|
39
|
-
retVal += node.text;
|
|
40
|
-
}
|
|
41
|
-
else {
|
|
42
|
-
retVal = '@TODO: node.type ' + node.type;
|
|
43
|
-
}
|
|
44
|
-
});
|
|
45
|
-
return retVal;
|
|
46
|
-
}
|
|
47
|
-
doc.forEach((node, pos) => {
|
|
5
|
+
const markCodeType = schema.marks.code;
|
|
6
|
+
doc.descendants((node, pos) => {
|
|
48
7
|
if (node.type.name === 'paragraph') {
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
};
|
|
8
|
+
let codeText = '';
|
|
9
|
+
let codeSize = 0;
|
|
10
|
+
for (let childNo = 0; childNo < node.childCount; childNo++) {
|
|
11
|
+
const child = node.child(childNo);
|
|
12
|
+
if (child.type.name === 'br') {
|
|
13
|
+
codeText += '\n';
|
|
14
|
+
codeSize += child.nodeSize;
|
|
15
|
+
continue;
|
|
58
16
|
}
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
innerText: paragraphsToMerge.innerText + '\n' +
|
|
64
|
-
nodesToText(node.content),
|
|
65
|
-
};
|
|
17
|
+
if (child.marks.some((mark) => mark.type === markCodeType)) {
|
|
18
|
+
codeText += child.text || child.textBetween(0, child.content.size);
|
|
19
|
+
codeSize += child.nodeSize;
|
|
20
|
+
continue;
|
|
66
21
|
}
|
|
67
|
-
|
|
22
|
+
break;
|
|
23
|
+
}
|
|
24
|
+
if (codeSize > 0) {
|
|
25
|
+
const startPos = tr.mapping.map(pos);
|
|
26
|
+
const endPos = tr.mapping.map(pos + 1 + codeSize);
|
|
27
|
+
const textNode = schema.text(codeText);
|
|
28
|
+
const codeBlock = schema.nodes.code_block.createAndFill(null, [
|
|
29
|
+
textNode,
|
|
30
|
+
]);
|
|
31
|
+
if (codeBlock) {
|
|
32
|
+
tr = tr.replaceRangeWith(startPos, endPos, codeBlock);
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
if (codeSize > 0 && codeSize + 2 === node.nodeSize) {
|
|
36
|
+
// tr = tr.deleteRange(tr.mapping.map(pos), tr.mapping.map(pos))
|
|
68
37
|
}
|
|
69
|
-
}
|
|
70
|
-
if (paragraphsToMerge !== null) {
|
|
71
|
-
flushCodeBlock();
|
|
72
38
|
}
|
|
73
39
|
});
|
|
74
|
-
if (paragraphsToMerge !== null) {
|
|
75
|
-
flushCodeBlock();
|
|
76
|
-
}
|
|
77
40
|
if (dispatch) {
|
|
78
41
|
dispatch(tr);
|
|
79
42
|
}
|
|
80
|
-
return tr.
|
|
43
|
+
return tr.docChanged;
|
|
81
44
|
};
|
|
82
45
|
//# sourceMappingURL=convertCodeParagraphsToCodeBlocks.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"convertCodeParagraphsToCodeBlocks.js","sourceRoot":"","sources":["../../src/postprocess/convertCodeParagraphsToCodeBlocks.ts"],"names":[],"mappings":"AAKA,
|
|
1
|
+
{"version":3,"file":"convertCodeParagraphsToCodeBlocks.js","sourceRoot":"","sources":["../../src/postprocess/convertCodeParagraphsToCodeBlocks.ts"],"names":[],"mappings":"AAKA,MAAM,CAAC,MAAM,iCAAiC,GAAY,CACxD,KAAK,EACL,QAAQ,EACC,EAAE;IACX,MAAM,GAAG,GAAS,KAAK,CAAC,GAAG,CAAC;IAC5B,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;IAC5B,IAAI,EAAE,GAAgB,KAAK,CAAC,EAAE,CAAC;IAE/B,MAAM,YAAY,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC;IAEvC,GAAG,CAAC,WAAW,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE;QAC5B,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;YACnC,IAAI,QAAQ,GAAG,EAAE,CAAC;YAClB,IAAI,QAAQ,GAAG,CAAC,CAAC;YACjB,KAAK,IAAI,OAAO,GAAG,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,OAAO,EAAE,EAAE,CAAC;gBAC3D,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;gBAElC,IAAI,KAAK,CAAC,IAAI,CAAC,IAAI,KAAK,IAAI,EAAE,CAAC;oBAC7B,QAAQ,IAAI,IAAI,CAAC;oBACjB,QAAQ,IAAI,KAAK,CAAC,QAAQ,CAAC;oBAC3B,SAAS;gBACX,CAAC;gBAED,IAAI,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,YAAY,CAAC,EAAE,CAAC;oBAC3D,QAAQ,IAAI,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,WAAW,CAAC,CAAC,EAAE,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;oBACnE,QAAQ,IAAI,KAAK,CAAC,QAAQ,CAAC;oBAC3B,SAAS;gBACX,CAAC;gBAED,MAAM;YACR,CAAC;YAED,IAAI,QAAQ,GAAG,CAAC,EAAE,CAAC;gBACjB,MAAM,QAAQ,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;gBACrC,MAAM,MAAM,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,QAAQ,CAAC,CAAC;gBAElD,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBACvC,MAAM,SAAS,GAAG,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,aAAa,CAAC,IAAI,EAAE;oBAC5D,QAAQ;iBACT,CAAC,CAAC;gBAEH,IAAI,SAAS,EAAE,CAAC;oBACd,EAAE,GAAG,EAAE,CAAC,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;gBACxD,CAAC;YACH,CAAC;YAED,IAAI,QAAQ,GAAG,CAAC,IAAI,QAAQ,GAAG,CAAC,KAAK,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACnD,gEAAgE;YAClE,CAAC;QACH,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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"convertMathMl.d.ts","sourceRoot":"","sources":["../../src/postprocess/convertMathMl.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"convertMathMl.d.ts","sourceRoot":"","sources":["../../src/postprocess/convertMathMl.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAI5C,eAAO,MAAM,aAAa,EAAE,OAiD3B,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"convertMathMl.js","sourceRoot":"","sources":["../../src/postprocess/convertMathMl.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"convertMathMl.js","sourceRoot":"","sources":["../../src/postprocess/convertMathMl.ts"],"names":[],"mappings":"AAGA,iBAAiB;AACjB,6BAA6B;AAC7B,MAAM,CAAC,MAAM,aAAa,GAAY,CAAC,KAAK,EAAE,QAAQ,EAAW,EAAE;IACjE,MAAM,GAAG,GAAS,KAAK,CAAC,GAAG,CAAC;IAC5B,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;IAC5B,MAAM,QAAQ,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC;IACnC,MAAM,aAAa,GAAG,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC;IAE9C,IAAI,CAAC,QAAQ,IAAI,CAAC,aAAa,EAAE,CAAC;QAChC,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAI,QAAQ,GAAG,KAAK,CAAC;IAErB,MAAM,EAAE,GAAG,KAAK,CAAC,EAAE,CAAC;IAEpB,GAAG,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE;QACxC,IAAI,UAAU,CAAC,UAAU,KAAK,CAAC,EAAE,CAAC;YAChC,OAAO;QACT,CAAC;QAED,MAAM,SAAS,GAAG,MAAM,CAAC;QAEzB,MAAM,IAAI,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAEjC,IAAI,IAAI,CAAC,IAAI,KAAK,QAAQ;YAAE,OAAO;QACnC,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO;QAE5C,MAAM,SAAS,GAAG,aAAa,CAAC,MAAM,CACpC;YACE,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI;SACtB,EACD,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAChC,CAAC;QAEF,EAAE,CAAC,WAAW,CACZ,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,EACzB,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,GAAG,UAAU,CAAC,QAAQ,CAAC,EAC/C,SAAS,CACV,CAAC;QAEF,QAAQ,GAAG,IAAI,CAAC;IAClB,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,QAAQ;QAAE,OAAO,KAAK,CAAC;IAE5B,IAAI,QAAQ,EAAE,CAAC;QACb,QAAQ,CAAC,EAAE,CAAC,CAAC;IACf,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fixContinuedLists.d.ts","sourceRoot":"","sources":["../../src/postprocess/fixContinuedLists.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"fixContinuedLists.d.ts","sourceRoot":"","sources":["../../src/postprocess/fixContinuedLists.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAM5C,eAAO,MAAM,iBAAiB,EAAE,OA0H/B,CAAC"}
|
|
@@ -1,78 +1,91 @@
|
|
|
1
|
-
import {
|
|
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
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
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
|
-
|
|
65
|
-
|
|
66
|
-
|
|
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
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
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":"
|
|
1
|
+
{"version":3,"file":"fixContinuedLists.js","sourceRoot":"","sources":["../../src/postprocess/fixContinuedLists.ts"],"names":[],"mappings":"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"}
|
|
@@ -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,OA0F7B,CAAC"}
|
|
@@ -0,0 +1,72 @@
|
|
|
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
|
+
const currentPos = nextPos;
|
|
35
|
+
nextPos += next.nodeSize;
|
|
36
|
+
if (next.type === paraBlockType && next.childCount === 0) {
|
|
37
|
+
codeTexts.push('\n');
|
|
38
|
+
codeSize += next.nodeSize;
|
|
39
|
+
continue;
|
|
40
|
+
}
|
|
41
|
+
if (next.type === codeBlockType && node.attrs.lang === next.attrs.lang) {
|
|
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
|
+
const codeText = codeTexts.join('').replace(/\n+$/gm, '\n');
|
|
53
|
+
const textNode = schema.text(codeText);
|
|
54
|
+
const codeBlock = schema.nodes.code_block.createAndFill(null, [textNode]);
|
|
55
|
+
if (codeBlock) {
|
|
56
|
+
tr = tr.replaceRangeWith(startPos, endPos, codeBlock);
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
offset += codeSize;
|
|
60
|
+
}
|
|
61
|
+
state.doc.descendants((node, pos) => {
|
|
62
|
+
if (node.type === paraBlockType &&
|
|
63
|
+
[CODEBLOCK_START, CODEBLOCK_END].includes(node.textBetween(0, node.content.size))) {
|
|
64
|
+
tr = tr.deleteRange(tr.mapping.map(pos), tr.mapping.map(pos + node.nodeSize));
|
|
65
|
+
}
|
|
66
|
+
});
|
|
67
|
+
if (dispatch) {
|
|
68
|
+
dispatch(tr);
|
|
69
|
+
}
|
|
70
|
+
return tr.docChanged;
|
|
71
|
+
};
|
|
72
|
+
//# 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;
|
|
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"}
|
|
@@ -2,12 +2,14 @@ import { convertCodeParagraphsToCodeBlocks } from './convertCodeParagraphsToCode
|
|
|
2
2
|
import { removeUnusedBookmarks } from './removeUnusedBookmarks.js';
|
|
3
3
|
import { fixContinuedLists } from './fixContinuedLists.js';
|
|
4
4
|
import { convertMathMl } from './convertMathMl.js';
|
|
5
|
+
import { mergeCodeBlocks } from './mergeCodeBlocks.js';
|
|
5
6
|
export function getDefaultsPostProcessFilters({ doc, filesMap }) {
|
|
6
7
|
return [
|
|
7
|
-
convertCodeParagraphsToCodeBlocks,
|
|
8
8
|
removeUnusedBookmarks,
|
|
9
|
+
convertCodeParagraphsToCodeBlocks,
|
|
9
10
|
fixContinuedLists,
|
|
10
11
|
convertMathMl,
|
|
12
|
+
mergeCodeBlocks,
|
|
11
13
|
];
|
|
12
14
|
}
|
|
13
15
|
//# 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;
|
|
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"}
|
|
@@ -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;
|
|
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"}
|
|
@@ -1,28 +1,26 @@
|
|
|
1
1
|
export const removeUnusedBookmarks = (state, dispatch) => {
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
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
|
+
console.log('del');
|
|
9
|
+
tr = tr.delete(tr.mapping.map(pos - 1), tr.mapping.map(pos + node.nodeSize - 1));
|
|
10
|
+
return;
|
|
11
|
+
}
|
|
12
|
+
const newMarks = node.marks.filter((mark) => mark.type !== bookmarkMarkType);
|
|
11
13
|
if (newMarks.length !== node.marks.length) {
|
|
12
|
-
|
|
14
|
+
tr = tr.setNodeMarkup(tr.mapping.map(pos), null, null, newMarks);
|
|
13
15
|
}
|
|
14
|
-
|
|
15
|
-
|
|
16
|
+
node.forEach((child, offset, index) => {
|
|
17
|
+
walk(child, pos + offset + 1, depth + 1);
|
|
18
|
+
});
|
|
16
19
|
}
|
|
17
|
-
|
|
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
|
-
// }
|
|
20
|
+
walk(state.doc);
|
|
23
21
|
if (dispatch) {
|
|
24
22
|
dispatch(tr);
|
|
25
23
|
}
|
|
26
|
-
return tr.
|
|
24
|
+
return tr.docChanged;
|
|
27
25
|
};
|
|
28
26
|
//# 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,
|
|
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"}
|
|
@@ -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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"}
|