@kerebron/extension-odt 0.6.4 → 0.6.5
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/esm/node_handlers/basic_node_handlers.d.ts.map +1 -1
- package/esm/node_handlers/basic_node_handlers.js +2 -0
- package/esm/node_handlers/basic_node_handlers.js.map +1 -1
- package/esm/postprocess/convertCodeParagraphsToCodeBlocks.d.ts.map +1 -1
- package/esm/postprocess/convertCodeParagraphsToCodeBlocks.js +8 -3
- package/esm/postprocess/convertCodeParagraphsToCodeBlocks.js.map +1 -1
- package/esm/postprocess/mergeCodeBlocks.d.ts.map +1 -1
- package/esm/postprocess/mergeCodeBlocks.js +5 -6
- package/esm/postprocess/mergeCodeBlocks.js.map +1 -1
- package/package.json +3 -3
- package/src/node_handlers/basic_node_handlers.ts +2 -1
- package/src/postprocess/convertCodeParagraphsToCodeBlocks.ts +10 -3
- package/src/postprocess/mergeCodeBlocks.ts +13 -14
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"basic_node_handlers.d.ts","sourceRoot":"","sources":["../../src/node_handlers/basic_node_handlers.ts"],"names":[],"mappings":"AACA,OAAO,EAAmB,WAAW,EAAmB,MAAM,iBAAiB,CAAC;AAEhF,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAchD;AAED,wBAAgB,sBAAsB,IAAI,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,
|
|
1
|
+
{"version":3,"file":"basic_node_handlers.d.ts","sourceRoot":"","sources":["../../src/node_handlers/basic_node_handlers.ts"],"names":[],"mappings":"AACA,OAAO,EAAmB,WAAW,EAAmB,MAAM,iBAAiB,CAAC;AAEhF,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAchD;AAED,wBAAgB,sBAAsB,IAAI,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAyFpE;AAED,wBAAgB,qBAAqB,IAAI,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAqInE"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"basic_node_handlers.js","sourceRoot":"","sources":["../../src/node_handlers/basic_node_handlers.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"basic_node_handlers.js","sourceRoot":"","sources":["../../src/node_handlers/basic_node_handlers.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"convertCodeParagraphsToCodeBlocks.d.ts","sourceRoot":"","sources":["../../src/postprocess/convertCodeParagraphsToCodeBlocks.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AAEzD,eAAO,MAAM,iCAAiC,EAAE,
|
|
1
|
+
{"version":3,"file":"convertCodeParagraphsToCodeBlocks.d.ts","sourceRoot":"","sources":["../../src/postprocess/convertCodeParagraphsToCodeBlocks.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AAEzD,eAAO,MAAM,iCAAiC,EAAE,OA6E/C,CAAC"}
|
|
@@ -7,11 +7,13 @@ export const convertCodeParagraphsToCodeBlocks = (state, dispatch) => {
|
|
|
7
7
|
if (node.type.name === 'paragraph') {
|
|
8
8
|
let codeText = '';
|
|
9
9
|
let codeSize = 0;
|
|
10
|
+
const bookmarks = [];
|
|
10
11
|
for (let childNo = 0; childNo < node.childCount; childNo++) {
|
|
11
12
|
const child = node.child(childNo);
|
|
12
13
|
const monospaced = child.marks.some((mark) => mark.type === markCodeType);
|
|
14
|
+
const whitespaced = child.textContent.match(/^[ \t\u00A0]+$/);
|
|
13
15
|
if (child.type.name === 'node_bookmark') {
|
|
14
|
-
|
|
16
|
+
bookmarks.push(child);
|
|
15
17
|
codeSize += child.nodeSize;
|
|
16
18
|
continue;
|
|
17
19
|
}
|
|
@@ -20,7 +22,7 @@ export const convertCodeParagraphsToCodeBlocks = (state, dispatch) => {
|
|
|
20
22
|
codeSize += child.nodeSize;
|
|
21
23
|
continue;
|
|
22
24
|
}
|
|
23
|
-
if (monospaced) {
|
|
25
|
+
if (monospaced || whitespaced) {
|
|
24
26
|
codeText += child.text || child.textBetween(0, child.content.size);
|
|
25
27
|
codeSize += child.nodeSize;
|
|
26
28
|
continue;
|
|
@@ -30,7 +32,7 @@ export const convertCodeParagraphsToCodeBlocks = (state, dispatch) => {
|
|
|
30
32
|
if (codeSize > 0) {
|
|
31
33
|
const startPos = tr.mapping.map(pos);
|
|
32
34
|
const endPos = tr.mapping.map(pos + 1 + codeSize);
|
|
33
|
-
if (codeText) {
|
|
35
|
+
if (codeText.trim()) {
|
|
34
36
|
const textNode = schema.text(codeText);
|
|
35
37
|
const codeBlock = schema.nodes.code_block.createAndFill(null, [
|
|
36
38
|
textNode,
|
|
@@ -42,6 +44,9 @@ export const convertCodeParagraphsToCodeBlocks = (state, dispatch) => {
|
|
|
42
44
|
else {
|
|
43
45
|
tr.replace(startPos, endPos);
|
|
44
46
|
}
|
|
47
|
+
for (const bookmark of bookmarks) {
|
|
48
|
+
tr.insert(startPos, bookmark);
|
|
49
|
+
}
|
|
45
50
|
}
|
|
46
51
|
if (codeSize > 0 && codeSize + 2 === node.nodeSize) {
|
|
47
52
|
// tr.deleteRange(tr.mapping.map(pos), tr.mapping.map(pos))
|
|
@@ -1 +1 @@
|
|
|
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;
|
|
1
|
+
{"version":3,"file":"convertCodeParagraphsToCodeBlocks.js","sourceRoot":"","sources":["../../src/postprocess/convertCodeParagraphsToCodeBlocks.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +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,
|
|
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,OAyG7B,CAAC"}
|
|
@@ -7,6 +7,11 @@ export const mergeCodeBlocks = (state, dispatch) => {
|
|
|
7
7
|
let tr = state.tr;
|
|
8
8
|
const codeBlockType = schema.nodes.code_block;
|
|
9
9
|
const paraBlockType = schema.nodes.paragraph;
|
|
10
|
+
state.doc.descendants((node, pos) => {
|
|
11
|
+
if ([CODEBLOCK_START, CODEBLOCK_END].includes(node.textContent.trim())) {
|
|
12
|
+
tr = tr.deleteRange(tr.mapping.map(pos), tr.mapping.map(pos + node.nodeSize));
|
|
13
|
+
}
|
|
14
|
+
});
|
|
10
15
|
const parent = state.doc;
|
|
11
16
|
let offset = 0;
|
|
12
17
|
for (let nodeNo = 0; nodeNo < parent.childCount; nodeNo++) {
|
|
@@ -69,12 +74,6 @@ export const mergeCodeBlocks = (state, dispatch) => {
|
|
|
69
74
|
}
|
|
70
75
|
offset += codeSize;
|
|
71
76
|
}
|
|
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
77
|
if (dispatch) {
|
|
79
78
|
dispatch(tr);
|
|
80
79
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mergeCodeBlocks.js","sourceRoot":"","sources":["../../src/postprocess/mergeCodeBlocks.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"mergeCodeBlocks.js","sourceRoot":"","sources":["../../src/postprocess/mergeCodeBlocks.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.6.
|
|
3
|
+
"version": "0.6.5",
|
|
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.6.
|
|
18
|
-
"@kerebron/odt-wasm": "0.6.
|
|
17
|
+
"@kerebron/editor": "0.6.5",
|
|
18
|
+
"@kerebron/odt-wasm": "0.6.5",
|
|
19
19
|
"prosemirror-model": "1.25.3",
|
|
20
20
|
"prosemirror-state": "1.4.3"
|
|
21
21
|
},
|
|
@@ -66,8 +66,9 @@ export function getInlineNodesHandlers(): Record<string, NodeHandler> {
|
|
|
66
66
|
ctx.closeNode('br');
|
|
67
67
|
},
|
|
68
68
|
'soft-page-break': (ctx: OdtStashContext, odtElement: any) => {
|
|
69
|
+
ctx.openNode();
|
|
70
|
+
ctx.closeNode('softbreak');
|
|
69
71
|
},
|
|
70
|
-
|
|
71
72
|
'bookmark': (ctx: OdtStashContext, element: any) => { // bookmark for parent para
|
|
72
73
|
ctx.openNode();
|
|
73
74
|
ctx.closeNode('node_bookmark', {
|
|
@@ -17,14 +17,18 @@ export const convertCodeParagraphsToCodeBlocks: Command = (
|
|
|
17
17
|
if (node.type.name === 'paragraph') {
|
|
18
18
|
let codeText = '';
|
|
19
19
|
let codeSize = 0;
|
|
20
|
+
|
|
21
|
+
const bookmarks: Node[] = [];
|
|
22
|
+
|
|
20
23
|
for (let childNo = 0; childNo < node.childCount; childNo++) {
|
|
21
24
|
const child = node.child(childNo);
|
|
22
25
|
const monospaced = child.marks.some((mark) =>
|
|
23
26
|
mark.type === markCodeType
|
|
24
27
|
);
|
|
28
|
+
const whitespaced = child.textContent.match(/^[ \t\u00A0]+$/);
|
|
25
29
|
|
|
26
30
|
if (child.type.name === 'node_bookmark') {
|
|
27
|
-
|
|
31
|
+
bookmarks.push(child);
|
|
28
32
|
codeSize += child.nodeSize;
|
|
29
33
|
continue;
|
|
30
34
|
}
|
|
@@ -35,7 +39,7 @@ export const convertCodeParagraphsToCodeBlocks: Command = (
|
|
|
35
39
|
continue;
|
|
36
40
|
}
|
|
37
41
|
|
|
38
|
-
if (monospaced) {
|
|
42
|
+
if (monospaced || whitespaced) {
|
|
39
43
|
codeText += child.text || child.textBetween(0, child.content.size);
|
|
40
44
|
codeSize += child.nodeSize;
|
|
41
45
|
continue;
|
|
@@ -48,7 +52,7 @@ export const convertCodeParagraphsToCodeBlocks: Command = (
|
|
|
48
52
|
const startPos = tr.mapping.map(pos);
|
|
49
53
|
const endPos = tr.mapping.map(pos + 1 + codeSize);
|
|
50
54
|
|
|
51
|
-
if (codeText) {
|
|
55
|
+
if (codeText.trim()) {
|
|
52
56
|
const textNode = schema.text(codeText);
|
|
53
57
|
const codeBlock = schema.nodes.code_block.createAndFill(null, [
|
|
54
58
|
textNode,
|
|
@@ -60,6 +64,9 @@ export const convertCodeParagraphsToCodeBlocks: Command = (
|
|
|
60
64
|
} else {
|
|
61
65
|
tr.replace(startPos, endPos);
|
|
62
66
|
}
|
|
67
|
+
for (const bookmark of bookmarks) {
|
|
68
|
+
tr.insert(startPos, bookmark);
|
|
69
|
+
}
|
|
63
70
|
}
|
|
64
71
|
|
|
65
72
|
if (codeSize > 0 && codeSize + 2 === node.nodeSize) {
|
|
@@ -12,6 +12,19 @@ export const mergeCodeBlocks: Command = (state, dispatch): boolean => {
|
|
|
12
12
|
const codeBlockType = schema.nodes.code_block;
|
|
13
13
|
const paraBlockType = schema.nodes.paragraph;
|
|
14
14
|
|
|
15
|
+
state.doc.descendants((node, pos) => {
|
|
16
|
+
if (
|
|
17
|
+
[CODEBLOCK_START, CODEBLOCK_END].includes(
|
|
18
|
+
node.textContent.trim(),
|
|
19
|
+
)
|
|
20
|
+
) {
|
|
21
|
+
tr = tr.deleteRange(
|
|
22
|
+
tr.mapping.map(pos),
|
|
23
|
+
tr.mapping.map(pos + node.nodeSize),
|
|
24
|
+
);
|
|
25
|
+
}
|
|
26
|
+
});
|
|
27
|
+
|
|
15
28
|
const parent = state.doc;
|
|
16
29
|
let offset = 0;
|
|
17
30
|
for (let nodeNo = 0; nodeNo < parent.childCount; nodeNo++) {
|
|
@@ -92,20 +105,6 @@ export const mergeCodeBlocks: Command = (state, dispatch): boolean => {
|
|
|
92
105
|
offset += codeSize;
|
|
93
106
|
}
|
|
94
107
|
|
|
95
|
-
state.doc.descendants((node, pos) => {
|
|
96
|
-
if (
|
|
97
|
-
node.type === paraBlockType &&
|
|
98
|
-
[CODEBLOCK_START, CODEBLOCK_END].includes(
|
|
99
|
-
node.textBetween(0, node.content.size),
|
|
100
|
-
)
|
|
101
|
-
) {
|
|
102
|
-
tr = tr.deleteRange(
|
|
103
|
-
tr.mapping.map(pos),
|
|
104
|
-
tr.mapping.map(pos + node.nodeSize),
|
|
105
|
-
);
|
|
106
|
-
}
|
|
107
|
-
});
|
|
108
|
-
|
|
109
108
|
if (dispatch) {
|
|
110
109
|
dispatch(tr);
|
|
111
110
|
}
|