@usejunior/docx-core 0.9.1 → 0.10.0
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/dist/.tsbuildinfo +1 -1
- package/dist/atomizer.d.ts +15 -1
- package/dist/atomizer.d.ts.map +1 -1
- package/dist/atomizer.js +37 -1
- package/dist/atomizer.js.map +1 -1
- package/dist/baselines/atomizer/documentReconstructor.d.ts.map +1 -1
- package/dist/baselines/atomizer/documentReconstructor.js +218 -90
- package/dist/baselines/atomizer/documentReconstructor.js.map +1 -1
- package/dist/baselines/atomizer/formattingFidelity.d.ts +99 -0
- package/dist/baselines/atomizer/formattingFidelity.d.ts.map +1 -0
- package/dist/baselines/atomizer/formattingFidelity.js +449 -0
- package/dist/baselines/atomizer/formattingFidelity.js.map +1 -0
- package/dist/baselines/atomizer/inPlaceModifier-bookmarks.d.ts +37 -0
- package/dist/baselines/atomizer/inPlaceModifier-bookmarks.d.ts.map +1 -0
- package/dist/baselines/atomizer/inPlaceModifier-bookmarks.js +189 -0
- package/dist/baselines/atomizer/inPlaceModifier-bookmarks.js.map +1 -0
- package/dist/baselines/atomizer/inPlaceModifier-containers.d.ts +74 -0
- package/dist/baselines/atomizer/inPlaceModifier-containers.d.ts.map +1 -0
- package/dist/baselines/atomizer/inPlaceModifier-containers.js +171 -0
- package/dist/baselines/atomizer/inPlaceModifier-containers.js.map +1 -0
- package/dist/baselines/atomizer/inPlaceModifier-deletion.d.ts +88 -0
- package/dist/baselines/atomizer/inPlaceModifier-deletion.d.ts.map +1 -0
- package/dist/baselines/atomizer/inPlaceModifier-deletion.js +326 -0
- package/dist/baselines/atomizer/inPlaceModifier-deletion.js.map +1 -0
- package/dist/baselines/atomizer/inPlaceModifier-postprocess.d.ts +85 -0
- package/dist/baselines/atomizer/inPlaceModifier-postprocess.d.ts.map +1 -0
- package/dist/baselines/atomizer/inPlaceModifier-postprocess.js +402 -0
- package/dist/baselines/atomizer/inPlaceModifier-postprocess.js.map +1 -0
- package/dist/baselines/atomizer/inPlaceModifier-presplit.d.ts +39 -0
- package/dist/baselines/atomizer/inPlaceModifier-presplit.d.ts.map +1 -0
- package/dist/baselines/atomizer/inPlaceModifier-presplit.js +265 -0
- package/dist/baselines/atomizer/inPlaceModifier-presplit.js.map +1 -0
- package/dist/baselines/atomizer/inPlaceModifier-shared.d.ts +62 -0
- package/dist/baselines/atomizer/inPlaceModifier-shared.d.ts.map +1 -0
- package/dist/baselines/atomizer/inPlaceModifier-shared.js +139 -0
- package/dist/baselines/atomizer/inPlaceModifier-shared.js.map +1 -0
- package/dist/baselines/atomizer/inPlaceModifier-wrappers.d.ts +189 -0
- package/dist/baselines/atomizer/inPlaceModifier-wrappers.d.ts.map +1 -0
- package/dist/baselines/atomizer/inPlaceModifier-wrappers.js +427 -0
- package/dist/baselines/atomizer/inPlaceModifier-wrappers.js.map +1 -0
- package/dist/baselines/atomizer/inPlaceModifier.d.ts +6 -290
- package/dist/baselines/atomizer/inPlaceModifier.d.ts.map +1 -1
- package/dist/baselines/atomizer/inPlaceModifier.js +23 -1828
- package/dist/baselines/atomizer/inPlaceModifier.js.map +1 -1
- package/dist/baselines/atomizer/pipeline.d.ts +76 -1
- package/dist/baselines/atomizer/pipeline.d.ts.map +1 -1
- package/dist/baselines/atomizer/pipeline.js +204 -27
- package/dist/baselines/atomizer/pipeline.js.map +1 -1
- package/dist/baselines/atomizer/trackChangesAcceptorAst.d.ts.map +1 -1
- package/dist/baselines/atomizer/trackChangesAcceptorAst.js +56 -160
- package/dist/baselines/atomizer/trackChangesAcceptorAst.js.map +1 -1
- package/dist/compare-types.d.ts +151 -0
- package/dist/compare-types.d.ts.map +1 -0
- package/dist/compare-types.js +2 -0
- package/dist/compare-types.js.map +1 -0
- package/dist/core-types.d.ts +5 -1
- package/dist/core-types.d.ts.map +1 -1
- package/dist/core-types.js +5 -1
- package/dist/core-types.js.map +1 -1
- package/dist/footnotes.d.ts +8 -3
- package/dist/footnotes.d.ts.map +1 -1
- package/dist/footnotes.js +8 -3
- package/dist/footnotes.js.map +1 -1
- package/dist/index.d.ts +6 -150
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +6 -0
- package/dist/index.js.map +1 -1
- package/dist/integration/libreoffice-oracle.d.ts +41 -0
- package/dist/integration/libreoffice-oracle.d.ts.map +1 -0
- package/dist/integration/libreoffice-oracle.js +282 -0
- package/dist/integration/libreoffice-oracle.js.map +1 -0
- package/dist/primitives/accept_changes.d.ts +2 -2
- package/dist/primitives/accept_changes.d.ts.map +1 -1
- package/dist/primitives/accept_changes.js +24 -79
- package/dist/primitives/accept_changes.js.map +1 -1
- package/dist/primitives/comments.d.ts +12 -3
- package/dist/primitives/comments.d.ts.map +1 -1
- package/dist/primitives/comments.js +374 -97
- package/dist/primitives/comments.js.map +1 -1
- package/dist/primitives/content_fingerprint.d.ts +29 -0
- package/dist/primitives/content_fingerprint.d.ts.map +1 -0
- package/dist/primitives/content_fingerprint.js +63 -0
- package/dist/primitives/content_fingerprint.js.map +1 -0
- package/dist/primitives/document.d.ts +56 -15
- package/dist/primitives/document.d.ts.map +1 -1
- package/dist/primitives/document.js +303 -32
- package/dist/primitives/document.js.map +1 -1
- package/dist/primitives/document_view-comments.d.ts +18 -0
- package/dist/primitives/document_view-comments.d.ts.map +1 -0
- package/dist/primitives/document_view-comments.js +159 -0
- package/dist/primitives/document_view-comments.js.map +1 -0
- package/dist/primitives/document_view-headings.d.ts +45 -0
- package/dist/primitives/document_view-headings.d.ts.map +1 -0
- package/dist/primitives/document_view-headings.js +247 -0
- package/dist/primitives/document_view-headings.js.map +1 -0
- package/dist/primitives/document_view-styles.d.ts +11 -0
- package/dist/primitives/document_view-styles.d.ts.map +1 -0
- package/dist/primitives/document_view-styles.js +104 -0
- package/dist/primitives/document_view-styles.js.map +1 -0
- package/dist/primitives/document_view-toon.d.ts +37 -0
- package/dist/primitives/document_view-toon.d.ts.map +1 -0
- package/dist/primitives/document_view-toon.js +199 -0
- package/dist/primitives/document_view-toon.js.map +1 -0
- package/dist/primitives/document_view-types.d.ts +137 -0
- package/dist/primitives/document_view-types.d.ts.map +1 -0
- package/dist/primitives/document_view-types.js +2 -0
- package/dist/primitives/document_view-types.js.map +1 -0
- package/dist/primitives/document_view.d.ts +8 -106
- package/dist/primitives/document_view.d.ts.map +1 -1
- package/dist/primitives/document_view.js +134 -301
- package/dist/primitives/document_view.js.map +1 -1
- package/dist/primitives/dom-helpers.d.ts +9 -0
- package/dist/primitives/dom-helpers.d.ts.map +1 -1
- package/dist/primitives/dom-helpers.js +10 -1
- package/dist/primitives/dom-helpers.js.map +1 -1
- package/dist/primitives/footnotes.d.ts +4 -3
- package/dist/primitives/footnotes.d.ts.map +1 -1
- package/dist/primitives/footnotes.js +232 -44
- package/dist/primitives/footnotes.js.map +1 -1
- package/dist/primitives/formatting_tags.d.ts +6 -0
- package/dist/primitives/formatting_tags.d.ts.map +1 -1
- package/dist/primitives/formatting_tags.js +6 -1
- package/dist/primitives/formatting_tags.js.map +1 -1
- package/dist/primitives/index.d.ts +6 -0
- package/dist/primitives/index.d.ts.map +1 -1
- package/dist/primitives/index.js +5 -0
- package/dist/primitives/index.js.map +1 -1
- package/dist/primitives/layout.d.ts +4 -3
- package/dist/primitives/layout.d.ts.map +1 -1
- package/dist/primitives/layout.js +32 -3
- package/dist/primitives/layout.js.map +1 -1
- package/dist/primitives/merge_runs.d.ts +21 -3
- package/dist/primitives/merge_runs.d.ts.map +1 -1
- package/dist/primitives/merge_runs.js +32 -10
- package/dist/primitives/merge_runs.js.map +1 -1
- package/dist/primitives/namespaces.d.ts +6 -0
- package/dist/primitives/namespaces.d.ts.map +1 -1
- package/dist/primitives/namespaces.js +9 -0
- package/dist/primitives/namespaces.js.map +1 -1
- package/dist/primitives/reject_changes.d.ts +2 -2
- package/dist/primitives/reject_changes.d.ts.map +1 -1
- package/dist/primitives/reject_changes.js +24 -81
- package/dist/primitives/reject_changes.js.map +1 -1
- package/dist/primitives/semantic_tags.d.ts +7 -0
- package/dist/primitives/semantic_tags.d.ts.map +1 -1
- package/dist/primitives/semantic_tags.js +21 -3
- package/dist/primitives/semantic_tags.js.map +1 -1
- package/dist/primitives/serialize_html.d.ts +36 -0
- package/dist/primitives/serialize_html.d.ts.map +1 -0
- package/dist/primitives/serialize_html.js +393 -0
- package/dist/primitives/serialize_html.js.map +1 -0
- package/dist/primitives/serialize_markdown.d.ts +16 -0
- package/dist/primitives/serialize_markdown.d.ts.map +1 -0
- package/dist/primitives/serialize_markdown.js +300 -0
- package/dist/primitives/serialize_markdown.js.map +1 -0
- package/dist/primitives/serialize_plaintext.d.ts +15 -0
- package/dist/primitives/serialize_plaintext.d.ts.map +1 -0
- package/dist/primitives/serialize_plaintext.js +154 -0
- package/dist/primitives/serialize_plaintext.js.map +1 -0
- package/dist/primitives/styles.js +22 -22
- package/dist/primitives/styles.js.map +1 -1
- package/dist/primitives/tables.d.ts.map +1 -1
- package/dist/primitives/tables.js +13 -3
- package/dist/primitives/tables.js.map +1 -1
- package/dist/primitives/text.d.ts +2 -1
- package/dist/primitives/text.d.ts.map +1 -1
- package/dist/primitives/text.js +116 -12
- package/dist/primitives/text.js.map +1 -1
- package/dist/primitives/track-changes-emitter.d.ts +139 -0
- package/dist/primitives/track-changes-emitter.d.ts.map +1 -0
- package/dist/primitives/track-changes-emitter.js +241 -0
- package/dist/primitives/track-changes-emitter.js.map +1 -0
- package/dist/primitives/xml-helpers.d.ts +29 -0
- package/dist/primitives/xml-helpers.d.ts.map +1 -0
- package/dist/primitives/xml-helpers.js +35 -0
- package/dist/primitives/xml-helpers.js.map +1 -0
- package/dist/shared/ooxml/namespaces.d.ts +4 -1
- package/dist/shared/ooxml/namespaces.d.ts.map +1 -1
- package/dist/shared/ooxml/namespaces.js +4 -1
- package/dist/shared/ooxml/namespaces.js.map +1 -1
- package/package.json +7 -6
|
@@ -0,0 +1,282 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* LibreOffice accept/reject oracle — a committed, reproducible reference voter.
|
|
3
|
+
*
|
|
4
|
+
* Drives LibreOffice headless as a track-changes accept/reject implementation so the
|
|
5
|
+
* production engine's paragraph-collapse behavior (the G3/G4/G5 differential cases) can be
|
|
6
|
+
* validated against a real word processor, not just Lean↔TS self-consistency. LibreOffice is
|
|
7
|
+
* the native engine for the .uno:AcceptAllTrackedChanges / .uno:RejectAllTrackedChanges
|
|
8
|
+
* dispatches, so its paragraph-structure output is authoritative ground truth for the
|
|
9
|
+
* mark-based rule (an untracked paragraph mark is kept on accept/reject; a PPR-INS/PPR-DEL mark
|
|
10
|
+
* is dropped).
|
|
11
|
+
*
|
|
12
|
+
* Mechanism (macOS-portable; also works on Linux): pyuno from a terminal is blocked on macOS by
|
|
13
|
+
* Launch Constraints, so this injects a Basic macro into a throwaway user profile and invokes it
|
|
14
|
+
* with a bare `macro:///` URL. The order matters — a fresh profile regenerates the Standard Basic
|
|
15
|
+
* library on first launch, clobbering any hand-placed Module1.xba — so we (1) init the profile via
|
|
16
|
+
* a throwaway convert, (2) THEN overwrite Module1.xba, (3) THEN run the macro. See
|
|
17
|
+
* reference_libreoffice_macos_oracle.
|
|
18
|
+
*
|
|
19
|
+
* This module is gated by callers: when `resolveSoffice()` returns null the oracle is skipped.
|
|
20
|
+
* CI does not install LibreOffice, so the oracle voter is a local developer check.
|
|
21
|
+
*/
|
|
22
|
+
import { execFile } from 'node:child_process';
|
|
23
|
+
import { existsSync, mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
|
|
24
|
+
import os from 'node:os';
|
|
25
|
+
import path from 'node:path';
|
|
26
|
+
import { pathToFileURL } from 'node:url';
|
|
27
|
+
import { promisify } from 'node:util';
|
|
28
|
+
import { createZipBuffer, readZipText } from '../primitives/zip.js';
|
|
29
|
+
import { parseXml } from '../primitives/xml.js';
|
|
30
|
+
const execFileAsync = promisify(execFile);
|
|
31
|
+
const W_NS = 'http://schemas.openxmlformats.org/wordprocessingml/2006/main';
|
|
32
|
+
const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
|
|
33
|
+
/** Run soffice, capturing stdout/stderr; never throws (the macro terminates the desktop, so a
|
|
34
|
+
* nonzero exit is expected). */
|
|
35
|
+
async function runSoffice(soffice, args, timeout) {
|
|
36
|
+
try {
|
|
37
|
+
const r = await execFileAsync(soffice, args, { timeout, killSignal: 'SIGKILL', maxBuffer: 8 * 1024 * 1024 });
|
|
38
|
+
return { stdout: String(r.stdout ?? ''), stderr: String(r.stderr ?? '') };
|
|
39
|
+
}
|
|
40
|
+
catch (err) {
|
|
41
|
+
const e = err;
|
|
42
|
+
return { stdout: String(e.stdout ?? ''), stderr: String(e.stderr ?? e.message ?? '') };
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
/**
|
|
46
|
+
* LibreOffice's single-instance model forwards a new `soffice` invocation to an existing instance
|
|
47
|
+
* that shares the same UserInstallation — so the init-convert process MUST be fully gone before the
|
|
48
|
+
* macro launch, or the `macro:///` command is delivered to the dying init instance (which has no
|
|
49
|
+
* Module1 yet) and never runs. The instance lock is `<profile>/.lock`. LibreOffice often leaves a
|
|
50
|
+
* STALE lock after `--convert-to` exits, so we wait a short bounded window for it to self-clear and
|
|
51
|
+
* then remove it unconditionally; the macro launch's own retry backstops a slow init exit.
|
|
52
|
+
*/
|
|
53
|
+
async function settleProfile(profile, timeoutMs = 1_500) {
|
|
54
|
+
const lock = path.join(profile, '.lock');
|
|
55
|
+
const deadline = Date.now() + timeoutMs;
|
|
56
|
+
while (existsSync(lock) && Date.now() < deadline)
|
|
57
|
+
await sleep(150);
|
|
58
|
+
if (existsSync(lock)) {
|
|
59
|
+
try {
|
|
60
|
+
rmSync(lock, { force: true });
|
|
61
|
+
}
|
|
62
|
+
catch { /* best effort — fresh launch will relock */ }
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
/** Resolve a LibreOffice binary, or null if none is available (callers skip the oracle). */
|
|
66
|
+
export function resolveSoffice() {
|
|
67
|
+
const candidates = [
|
|
68
|
+
process.env.SAFE_DOCX_SOFFICE_BIN,
|
|
69
|
+
process.env.ODF_SOFFICE_BIN,
|
|
70
|
+
'/opt/homebrew/bin/soffice',
|
|
71
|
+
'/usr/bin/soffice',
|
|
72
|
+
'/usr/local/bin/soffice',
|
|
73
|
+
'/Applications/LibreOffice.app/Contents/MacOS/soffice',
|
|
74
|
+
].filter(Boolean);
|
|
75
|
+
return candidates.find((c) => existsSync(c)) ?? null;
|
|
76
|
+
}
|
|
77
|
+
const CONTENT_TYPES = `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
|
78
|
+
<Types xmlns="http://schemas.openxmlformats.org/package/2006/content-types">
|
|
79
|
+
<Default Extension="rels" ContentType="application/vnd.openxmlformats-package.relationships+xml"/>
|
|
80
|
+
<Default Extension="xml" ContentType="application/xml"/>
|
|
81
|
+
<Override PartName="/word/document.xml" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml"/>
|
|
82
|
+
</Types>`;
|
|
83
|
+
const RELS = `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
|
84
|
+
<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">
|
|
85
|
+
<Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument" Target="word/document.xml"/>
|
|
86
|
+
</Relationships>`;
|
|
87
|
+
const DOC_RELS = `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
|
88
|
+
<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships"/>`;
|
|
89
|
+
/** Pack a bare `word/document.xml` string into a minimal valid .docx package. */
|
|
90
|
+
export async function packMinimalDocx(documentXml) {
|
|
91
|
+
return createZipBuffer({
|
|
92
|
+
'[Content_Types].xml': CONTENT_TYPES,
|
|
93
|
+
'_rels/.rels': RELS,
|
|
94
|
+
'word/_rels/document.xml.rels': DOC_RELS,
|
|
95
|
+
'word/document.xml': documentXml,
|
|
96
|
+
});
|
|
97
|
+
}
|
|
98
|
+
/** Read `word/document.xml` back out of a .docx package. */
|
|
99
|
+
export async function extractDocumentXml(docx) {
|
|
100
|
+
const xml = await readZipText(docx, 'word/document.xml');
|
|
101
|
+
if (xml == null)
|
|
102
|
+
throw new Error('word/document.xml not found in oracle output');
|
|
103
|
+
return xml;
|
|
104
|
+
}
|
|
105
|
+
const SCRIPT_XLC = `<?xml version="1.0" encoding="UTF-8"?>
|
|
106
|
+
<!DOCTYPE library:libraries PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "libraries.dtd">
|
|
107
|
+
<library:libraries xmlns:library="http://openoffice.org/2000/library" xmlns:xlink="http://www.w3.org/1999/xlink">
|
|
108
|
+
<library:library library:name="Standard" xlink:href="$(USER)/basic/Standard/script.xlb/" xlink:type="simple" library:link="false"/>
|
|
109
|
+
</library:libraries>`;
|
|
110
|
+
const SCRIPT_XLB = `<?xml version="1.0" encoding="UTF-8"?>
|
|
111
|
+
<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
|
|
112
|
+
<library:library xmlns:library="http://openoffice.org/2000/library" library:name="Standard" library:readonly="false" library:passwordprotected="false">
|
|
113
|
+
<library:element library:name="Module1"/>
|
|
114
|
+
</library:library>`;
|
|
115
|
+
const REGMOD = `<?xml version="1.0" encoding="UTF-8"?>
|
|
116
|
+
<oor:items xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
|
|
117
|
+
<item oor:path="/org.openoffice.Office.Common/Security/Scripting"><prop oor:name="MacroSecurityLevel" oor:op="fuse"><value>0</value></prop></item>
|
|
118
|
+
<item oor:path="/org.openoffice.Office.Common/Misc"><prop oor:name="FirstRun" oor:op="fuse"><value>false</value></prop></item>
|
|
119
|
+
</oor:items>`;
|
|
120
|
+
/** The Basic macro: load each doc Hidden, dispatch accept/reject-all (or, for `identity`,
|
|
121
|
+
* dispatch nothing at all), save with the job's filter. */
|
|
122
|
+
function module1Xba(jobsPath, markerPath) {
|
|
123
|
+
return `<?xml version="1.0" encoding="UTF-8"?>
|
|
124
|
+
<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
|
|
125
|
+
<script:module xmlns:script="http://openoffice.org/2000/script" script:name="Module1" script:language="StarBasic">
|
|
126
|
+
Sub RunOracle
|
|
127
|
+
Dim iFile As Integer, sLine As String, parts() As String, m As Integer
|
|
128
|
+
m = FreeFile : Open "${markerPath}" For Output As #m : Print #m, "started" : Close #m
|
|
129
|
+
iFile = FreeFile
|
|
130
|
+
Open "${jobsPath}" For Input As #iFile
|
|
131
|
+
Do While Not EOF(iFile)
|
|
132
|
+
Line Input #iFile, sLine
|
|
133
|
+
If Len(Trim(sLine)) > 0 Then
|
|
134
|
+
parts = Split(sLine, "|")
|
|
135
|
+
ProcessOne(parts(0), ConvertToURL(parts(1)), ConvertToURL(parts(2)), parts(3))
|
|
136
|
+
End If
|
|
137
|
+
Loop
|
|
138
|
+
Close #iFile
|
|
139
|
+
StarDesktop.terminate()
|
|
140
|
+
End Sub
|
|
141
|
+
|
|
142
|
+
Sub ProcessOne(op As String, inUrl As String, outUrl As String, filterName As String)
|
|
143
|
+
Dim oDoc As Object, oFrame As Object, oDisp As Object
|
|
144
|
+
Dim loadArgs(0) As New com.sun.star.beans.PropertyValue
|
|
145
|
+
loadArgs(0).Name = "Hidden" : loadArgs(0).Value = True
|
|
146
|
+
oDoc = StarDesktop.loadComponentFromURL(inUrl, "_blank", 0, loadArgs())
|
|
147
|
+
oFrame = oDoc.getCurrentController().getFrame()
|
|
148
|
+
oDisp = createUnoService("com.sun.star.frame.DispatchHelper")
|
|
149
|
+
Dim noArgs()
|
|
150
|
+
If op = "accept" Then
|
|
151
|
+
oDisp.executeDispatch(oFrame, ".uno:AcceptAllTrackedChanges", "", 0, noArgs())
|
|
152
|
+
ElseIf op = "reject" Then
|
|
153
|
+
oDisp.executeDispatch(oFrame, ".uno:RejectAllTrackedChanges", "", 0, noArgs())
|
|
154
|
+
End If
|
|
155
|
+
' op = "identity": no dispatch — a plain load->save, exposing LibreOffice's own DOCX
|
|
156
|
+
' import/export of UNRESOLVED tracked changes (the oracle trust-boundary check).
|
|
157
|
+
Dim saveArgs(0) As New com.sun.star.beans.PropertyValue
|
|
158
|
+
saveArgs(0).Name = "FilterName" : saveArgs(0).Value = filterName
|
|
159
|
+
oDoc.storeToURL(outUrl, saveArgs())
|
|
160
|
+
oDoc.close(False)
|
|
161
|
+
End Sub
|
|
162
|
+
</script:module>`;
|
|
163
|
+
}
|
|
164
|
+
function isOdtJob(job) {
|
|
165
|
+
return 'odt' in job;
|
|
166
|
+
}
|
|
167
|
+
/**
|
|
168
|
+
* Run LibreOffice over a batch of jobs in ONE headless launch and return each job's resulting
|
|
169
|
+
* main XML part — `word/document.xml` for DOCX jobs, `content.xml` for ODT jobs. Throws if the
|
|
170
|
+
* binary is missing or the macro did not run.
|
|
171
|
+
*/
|
|
172
|
+
export async function runLibreOfficeOracle(jobs, soffice = resolveSoffice()) {
|
|
173
|
+
if (!soffice)
|
|
174
|
+
throw new Error('runLibreOfficeOracle: no soffice binary (call resolveSoffice() and skip)');
|
|
175
|
+
if (jobs.length === 0)
|
|
176
|
+
return [];
|
|
177
|
+
const work = mkdtempSync(path.join(os.tmpdir(), 'lo-oracle-'));
|
|
178
|
+
const profile = path.join(work, 'profile');
|
|
179
|
+
const userDir = path.join(profile, 'user');
|
|
180
|
+
const basicDir = path.join(userDir, 'basic', 'Standard');
|
|
181
|
+
const inDir = path.join(work, 'in');
|
|
182
|
+
const outDir = path.join(work, 'out');
|
|
183
|
+
const marker = path.join(work, 'macro_ran.txt');
|
|
184
|
+
const jobsPath = path.join(work, 'jobs.txt');
|
|
185
|
+
const profileUrl = pathToFileURL(profile).href;
|
|
186
|
+
let keepWork = false;
|
|
187
|
+
try {
|
|
188
|
+
for (const d of [userDir, basicDir, inDir, outDir])
|
|
189
|
+
mkdirSync(d, { recursive: true });
|
|
190
|
+
// Write each job's input package and build the jobs file (op|inPath|outPath|filter).
|
|
191
|
+
const outPaths = [];
|
|
192
|
+
const jobLines = [];
|
|
193
|
+
for (let i = 0; i < jobs.length; i++) {
|
|
194
|
+
const job = jobs[i];
|
|
195
|
+
const ext = isOdtJob(job) ? 'odt' : 'docx';
|
|
196
|
+
const filter = isOdtJob(job) ? 'writer8' : 'MS Word 2007 XML';
|
|
197
|
+
const inPath = path.join(inDir, `job${i}.${ext}`);
|
|
198
|
+
const outPath = path.join(outDir, `job${i}.${ext}`);
|
|
199
|
+
writeFileSync(inPath, isOdtJob(job) ? new Uint8Array(job.odt) : new Uint8Array(await packMinimalDocx(job.documentXml)));
|
|
200
|
+
outPaths.push(outPath);
|
|
201
|
+
jobLines.push(`${job.op}|${inPath}|${outPath}|${filter}`);
|
|
202
|
+
}
|
|
203
|
+
writeFileSync(jobsPath, jobLines.join('\n') + '\n');
|
|
204
|
+
// Macro security level 0 so the Standard-library macro runs headless.
|
|
205
|
+
writeFileSync(path.join(userDir, 'registrymodifications.xcu'), REGMOD);
|
|
206
|
+
const baseArgs = ['--headless', '--norestore', '--nologo', `-env:UserInstallation=${profileUrl}`];
|
|
207
|
+
const diag = [];
|
|
208
|
+
// (1) INIT the profile: a throwaway convert makes soffice populate user/basic/Standard
|
|
209
|
+
// (which would otherwise clobber a pre-placed Module1.xba on first real launch).
|
|
210
|
+
const init = await runSoffice(soffice, [...baseArgs, '--convert-to', 'txt', '--outdir', path.join(work, 'init'), path.join(inDir, 'job0.docx')], 20_000);
|
|
211
|
+
diag.push(`[init] ${(init.stderr || init.stdout || '(no output)').trim()}`);
|
|
212
|
+
// (2) Overwrite the Basic library with our macro.
|
|
213
|
+
mkdirSync(basicDir, { recursive: true });
|
|
214
|
+
writeFileSync(path.join(userDir, 'basic', 'script.xlc'), SCRIPT_XLC);
|
|
215
|
+
writeFileSync(path.join(basicDir, 'script.xlb'), SCRIPT_XLB);
|
|
216
|
+
writeFileSync(path.join(basicDir, 'Module1.xba'), module1Xba(jobsPath, marker));
|
|
217
|
+
// (3) Run the macro via a bare macro:/// URL — but only once the init instance has fully
|
|
218
|
+
// released the profile, so LibreOffice's single-instance model can't forward our macro command
|
|
219
|
+
// to the dying init process. Retry once: the first macro launch can still race a slow init exit.
|
|
220
|
+
for (let attempt = 1; attempt <= 2 && !existsSync(marker); attempt++) {
|
|
221
|
+
await settleProfile(profile);
|
|
222
|
+
const run = await runSoffice(soffice, [...baseArgs, 'macro:///Standard.Module1.RunOracle'], 45_000);
|
|
223
|
+
diag.push(`[macro attempt ${attempt}] ${(run.stderr || run.stdout || '(no output)').trim()}`);
|
|
224
|
+
if (!existsSync(marker))
|
|
225
|
+
await sleep(400);
|
|
226
|
+
}
|
|
227
|
+
if (!existsSync(marker)) {
|
|
228
|
+
keepWork = Boolean(process.env.SAFE_DOCX_ORACLE_DEBUG);
|
|
229
|
+
throw new Error('LibreOffice oracle macro did not run (no marker file) after 2 attempts.\nsoffice output:\n' +
|
|
230
|
+
diag.join('\n') +
|
|
231
|
+
(keepWork ? `\n(profile kept for debugging at ${work})` : ' (set SAFE_DOCX_ORACLE_DEBUG=1 to keep the profile)'));
|
|
232
|
+
}
|
|
233
|
+
return Promise.all(outPaths.map(async (p, i) => {
|
|
234
|
+
if (!existsSync(p))
|
|
235
|
+
throw new Error(`LibreOffice oracle produced no output for ${path.basename(p)}`);
|
|
236
|
+
if (isOdtJob(jobs[i])) {
|
|
237
|
+
const contentXml = await readZipText(readFileSync(p), 'content.xml');
|
|
238
|
+
if (contentXml == null)
|
|
239
|
+
throw new Error(`content.xml not found in oracle output ${path.basename(p)}`);
|
|
240
|
+
return contentXml;
|
|
241
|
+
}
|
|
242
|
+
return extractDocumentXml(readFileSync(p));
|
|
243
|
+
}));
|
|
244
|
+
}
|
|
245
|
+
finally {
|
|
246
|
+
if (!keepWork)
|
|
247
|
+
rmSync(work, { recursive: true, force: true });
|
|
248
|
+
}
|
|
249
|
+
}
|
|
250
|
+
/**
|
|
251
|
+
* Structural projection of a `word/document.xml`: one entry per top-level body paragraph,
|
|
252
|
+
* recording whether it carries visible text (a non-whitespace `w:t` descendant). This captures
|
|
253
|
+
* the paragraph-collapse claim the oracle is authoritative for — how many paragraphs survive and
|
|
254
|
+
* which collapsed to empty — without depending on revision-markup or formatting details (which
|
|
255
|
+
* LibreOffice rewrites). `[]`-length is the paragraph count.
|
|
256
|
+
*/
|
|
257
|
+
export function paragraphShape(documentXml) {
|
|
258
|
+
const doc = parseXml(documentXml);
|
|
259
|
+
const body = doc.getElementsByTagNameNS(W_NS, 'body').item(0) ?? doc.documentElement;
|
|
260
|
+
if (!body)
|
|
261
|
+
return [];
|
|
262
|
+
const shape = [];
|
|
263
|
+
for (let i = 0; i < body.childNodes.length; i++) {
|
|
264
|
+
const node = body.childNodes[i];
|
|
265
|
+
if (node.nodeType !== 1)
|
|
266
|
+
continue;
|
|
267
|
+
const el = node;
|
|
268
|
+
if (el.namespaceURI !== W_NS || el.localName !== 'p')
|
|
269
|
+
continue; // skip w:sectPr etc.
|
|
270
|
+
const texts = el.getElementsByTagNameNS(W_NS, 't');
|
|
271
|
+
let hasText = false;
|
|
272
|
+
for (let j = 0; j < texts.length; j++) {
|
|
273
|
+
if ((texts.item(j).textContent ?? '').trim().length > 0) {
|
|
274
|
+
hasText = true;
|
|
275
|
+
break;
|
|
276
|
+
}
|
|
277
|
+
}
|
|
278
|
+
shape.push(hasText);
|
|
279
|
+
}
|
|
280
|
+
return shape;
|
|
281
|
+
}
|
|
282
|
+
//# sourceMappingURL=libreoffice-oracle.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"libreoffice-oracle.js","sourceRoot":"","sources":["../../src/integration/libreoffice-oracle.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,8 +20,8 @@ export type AcceptChangesResult = {
|
|
|
20
20
|
propertyChangesResolved: number;
|
|
21
21
|
};
|
|
22
22
|
/**
|
|
23
|
-
* Accept all tracked changes in the document body, producing a
|
|
24
|
-
* document with no revision markup.
|
|
23
|
+
* Accept all tracked changes in the document body or story root, producing a
|
|
24
|
+
* clean document with no revision markup.
|
|
25
25
|
*
|
|
26
26
|
* Mutates the Document in place (same convention as simplifyRedlines
|
|
27
27
|
* and mergeRuns).
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"accept_changes.d.ts","sourceRoot":"","sources":["../../src/primitives/accept_changes.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAMH,MAAM,MAAM,mBAAmB,GAAG;IAChC,kBAAkB,EAAE,MAAM,CAAC;IAC3B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,aAAa,EAAE,MAAM,CAAC;IACtB,uBAAuB,EAAE,MAAM,CAAC;CACjC,CAAC;
|
|
1
|
+
{"version":3,"file":"accept_changes.d.ts","sourceRoot":"","sources":["../../src/primitives/accept_changes.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAMH,MAAM,MAAM,mBAAmB,GAAG;IAChC,kBAAkB,EAAE,MAAM,CAAC;IAC3B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,aAAa,EAAE,MAAM,CAAC;IACtB,uBAAuB,EAAE,MAAM,CAAC;CACjC,CAAC;AAoFF;;;;;;GAMG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,QAAQ,GAAG,mBAAmB,CA4FhE"}
|
|
@@ -21,9 +21,6 @@ function isW(node, localName) {
|
|
|
21
21
|
node.namespaceURI === W_NS &&
|
|
22
22
|
node.localName === localName);
|
|
23
23
|
}
|
|
24
|
-
function isWElement(node) {
|
|
25
|
-
return node.nodeType === 1 && node.namespaceURI === W_NS;
|
|
26
|
-
}
|
|
27
24
|
function getDepth(node) {
|
|
28
25
|
let depth = 0;
|
|
29
26
|
let cur = node.parentNode;
|
|
@@ -87,60 +84,6 @@ function paragraphHasParaMarker(p, markerLocalName) {
|
|
|
87
84
|
}
|
|
88
85
|
return false;
|
|
89
86
|
}
|
|
90
|
-
/**
|
|
91
|
-
* Check if a node (or its descendants) contains any w:r elements.
|
|
92
|
-
*/
|
|
93
|
-
function containsRun(node) {
|
|
94
|
-
if (isW(node, 'r'))
|
|
95
|
-
return true;
|
|
96
|
-
for (let i = 0; i < node.childNodes.length; i++) {
|
|
97
|
-
if (containsRun(node.childNodes[i]))
|
|
98
|
-
return true;
|
|
99
|
-
}
|
|
100
|
-
return false;
|
|
101
|
-
}
|
|
102
|
-
// Tags that are "removed" content — should not count as live content
|
|
103
|
-
const REMOVED_LOCALS = new Set(['del', 'moveFrom']);
|
|
104
|
-
// Tags that are "kept" content — their presence means the paragraph has live content
|
|
105
|
-
const KEPT_LOCALS = new Set(['ins', 'moveTo']);
|
|
106
|
-
// Range marker tags to ignore when scanning paragraph children
|
|
107
|
-
const RANGE_MARKER_LOCALS = new Set([
|
|
108
|
-
'moveFromRangeStart', 'moveFromRangeEnd',
|
|
109
|
-
'moveToRangeStart', 'moveToRangeEnd',
|
|
110
|
-
]);
|
|
111
|
-
/**
|
|
112
|
-
* Determine if a paragraph's only content lives inside w:del or w:moveFrom
|
|
113
|
-
* (no w:r outside those wrappers, and no w:ins/w:moveTo siblings).
|
|
114
|
-
*/
|
|
115
|
-
function paragraphHasOnlyRemovedContent(p) {
|
|
116
|
-
for (let i = 0; i < p.childNodes.length; i++) {
|
|
117
|
-
const child = p.childNodes[i];
|
|
118
|
-
if (child.nodeType !== 1)
|
|
119
|
-
continue;
|
|
120
|
-
const el = child;
|
|
121
|
-
if (el.namespaceURI !== W_NS)
|
|
122
|
-
continue;
|
|
123
|
-
const local = el.localName;
|
|
124
|
-
// If the paragraph has kept content wrappers, it stays
|
|
125
|
-
if (KEPT_LOCALS.has(local))
|
|
126
|
-
return false;
|
|
127
|
-
// Skip pPr, range markers, and removed wrappers — they don't contribute live content
|
|
128
|
-
if (local === 'pPr' || RANGE_MARKER_LOCALS.has(local) || REMOVED_LOCALS.has(local))
|
|
129
|
-
continue;
|
|
130
|
-
// A bare w:r or any other element that contains runs means live content
|
|
131
|
-
if (local === 'r' || containsRun(el))
|
|
132
|
-
return false;
|
|
133
|
-
}
|
|
134
|
-
// We passed all children without finding live content — but there must be
|
|
135
|
-
// at least one removed wrapper for this to be a "removed content" paragraph
|
|
136
|
-
for (let i = 0; i < p.childNodes.length; i++) {
|
|
137
|
-
const child = p.childNodes[i];
|
|
138
|
-
if (child.nodeType === 1 && isWElement(child) && REMOVED_LOCALS.has(child.localName)) {
|
|
139
|
-
return true;
|
|
140
|
-
}
|
|
141
|
-
}
|
|
142
|
-
return false;
|
|
143
|
-
}
|
|
144
87
|
// Property change element local names (all 6 types)
|
|
145
88
|
const PR_CHANGE_LOCALS = [
|
|
146
89
|
'rPrChange', 'pPrChange', 'sectPrChange',
|
|
@@ -148,49 +91,51 @@ const PR_CHANGE_LOCALS = [
|
|
|
148
91
|
];
|
|
149
92
|
// ── Public API ──────────────────────────────────────────────────────
|
|
150
93
|
/**
|
|
151
|
-
* Accept all tracked changes in the document body, producing a
|
|
152
|
-
* document with no revision markup.
|
|
94
|
+
* Accept all tracked changes in the document body or story root, producing a
|
|
95
|
+
* clean document with no revision markup.
|
|
153
96
|
*
|
|
154
97
|
* Mutates the Document in place (same convention as simplifyRedlines
|
|
155
98
|
* and mergeRuns).
|
|
156
99
|
*/
|
|
157
100
|
export function acceptChanges(doc) {
|
|
158
|
-
const
|
|
159
|
-
if (!
|
|
101
|
+
const root = doc.getElementsByTagNameNS(W_NS, 'body').item(0) ?? doc.documentElement;
|
|
102
|
+
if (!root) {
|
|
160
103
|
return { insertionsAccepted: 0, deletionsAccepted: 0, movesResolved: 0, propertyChangesResolved: 0 };
|
|
161
104
|
}
|
|
162
105
|
// Phase A — Identify paragraphs to remove
|
|
163
106
|
const paragraphsToRemove = new Set();
|
|
164
|
-
const allParagraphs = collectByLocalName(
|
|
107
|
+
const allParagraphs = collectByLocalName(root, 'p');
|
|
165
108
|
for (const p of allParagraphs) {
|
|
166
|
-
//
|
|
109
|
+
// Remove a paragraph iff its paragraph MARK is a tracked deletion
|
|
110
|
+
// (w:p > w:pPr > w:rPr > w:del) — the paragraph break itself was deleted.
|
|
111
|
+
// We deliberately do NOT drop a paragraph based on content ("all runs inside
|
|
112
|
+
// w:del/w:moveFrom"): a run-level deletion under an untracked mark means text was
|
|
113
|
+
// deleted from a pre-existing paragraph, which Word/LibreOffice keep (empty) on
|
|
114
|
+
// accept. safe-docx's deleted paragraphs always carry the mark now, so the
|
|
115
|
+
// mark-based rule suffices and is Word-faithful. (Mirrors acceptAllChanges and the
|
|
116
|
+
// reject-side rule.)
|
|
167
117
|
if (paragraphHasParaMarker(p, 'del')) {
|
|
168
118
|
paragraphsToRemove.add(p);
|
|
169
|
-
continue;
|
|
170
|
-
}
|
|
171
|
-
// Paragraphs whose only content is inside w:del or w:moveFrom
|
|
172
|
-
if (paragraphHasOnlyRemovedContent(p)) {
|
|
173
|
-
paragraphsToRemove.add(p);
|
|
174
119
|
}
|
|
175
120
|
}
|
|
176
121
|
// Phase B — Remove deletions and move sources
|
|
177
|
-
const deletionsAccepted = removeAllByLocalName(
|
|
178
|
-
const moveFromRemoved = removeAllByLocalName(
|
|
179
|
-
removeAllByLocalName(
|
|
180
|
-
removeAllByLocalName(
|
|
181
|
-
removeAllByLocalName(
|
|
182
|
-
removeAllByLocalName(
|
|
122
|
+
const deletionsAccepted = removeAllByLocalName(root, 'del');
|
|
123
|
+
const moveFromRemoved = removeAllByLocalName(root, 'moveFrom');
|
|
124
|
+
removeAllByLocalName(root, 'moveFromRangeStart');
|
|
125
|
+
removeAllByLocalName(root, 'moveFromRangeEnd');
|
|
126
|
+
removeAllByLocalName(root, 'moveToRangeStart');
|
|
127
|
+
removeAllByLocalName(root, 'moveToRangeEnd');
|
|
183
128
|
// Phase C — Unwrap insertions and move destinations (depth-sorted)
|
|
184
|
-
const insertionsAccepted = unwrapAllByLocalName(
|
|
185
|
-
const moveToUnwrapped = unwrapAllByLocalName(
|
|
129
|
+
const insertionsAccepted = unwrapAllByLocalName(root, 'ins');
|
|
130
|
+
const moveToUnwrapped = unwrapAllByLocalName(root, 'moveTo');
|
|
186
131
|
// Phase D — Remove property change records
|
|
187
132
|
let propertyChangesResolved = 0;
|
|
188
133
|
for (const localName of PR_CHANGE_LOCALS) {
|
|
189
|
-
propertyChangesResolved += removeAllByLocalName(
|
|
134
|
+
propertyChangesResolved += removeAllByLocalName(root, localName);
|
|
190
135
|
}
|
|
191
136
|
// Phase E — Cleanup
|
|
192
137
|
// Strip paragraph-level revision markers from w:pPr/w:rPr
|
|
193
|
-
for (const p of collectByLocalName(
|
|
138
|
+
for (const p of collectByLocalName(root, 'p')) {
|
|
194
139
|
for (let i = 0; i < p.childNodes.length; i++) {
|
|
195
140
|
const child = p.childNodes[i];
|
|
196
141
|
if (!isW(child, 'pPr'))
|
|
@@ -220,7 +165,7 @@ export function acceptChanges(doc) {
|
|
|
220
165
|
}
|
|
221
166
|
}
|
|
222
167
|
// Strip w:rsidDel attributes on remaining elements
|
|
223
|
-
const allElements =
|
|
168
|
+
const allElements = root.getElementsByTagNameNS(W_NS, '*');
|
|
224
169
|
for (let i = 0; i < allElements.length; i++) {
|
|
225
170
|
const el = allElements[i];
|
|
226
171
|
if (el.hasAttributeNS(W_NS, 'rsidDel')) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"accept_changes.js","sourceRoot":"","sources":["../../src/primitives/accept_changes.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAExC,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;AASxB,uEAAuE;AAEvE,SAAS,GAAG,CAAC,IAAU,EAAE,SAAiB;IACxC,OAAO,CACL,IAAI,CAAC,QAAQ,KAAK,CAAC;QAClB,IAAgB,CAAC,YAAY,KAAK,IAAI;QACtC,IAAgB,CAAC,SAAS,KAAK,SAAS,CAC1C,CAAC;AACJ,CAAC;AAED,SAAS,
|
|
1
|
+
{"version":3,"file":"accept_changes.js","sourceRoot":"","sources":["../../src/primitives/accept_changes.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,7 @@
|
|
|
5
5
|
* and supports threaded replies via commentsExtended.xml.
|
|
6
6
|
*/
|
|
7
7
|
import { DocxZip } from './zip.js';
|
|
8
|
+
import { type RevisionContext } from './track-changes-emitter.js';
|
|
8
9
|
export type BootstrapResult = {
|
|
9
10
|
partsCreated: string[];
|
|
10
11
|
};
|
|
@@ -33,7 +34,7 @@ export type AddCommentResult = {
|
|
|
33
34
|
* - Adds comment entry to comments.xml
|
|
34
35
|
* - Adds author to people.xml if not present
|
|
35
36
|
*/
|
|
36
|
-
export declare function addComment(documentXml: Document, zip: DocxZip, params: AddCommentParams): Promise<AddCommentResult>;
|
|
37
|
+
export declare function addComment(documentXml: Document, zip: DocxZip, params: AddCommentParams, ctx?: RevisionContext): Promise<AddCommentResult>;
|
|
37
38
|
export type AddCommentReplyParams = {
|
|
38
39
|
parentCommentId: number;
|
|
39
40
|
author: string;
|
|
@@ -49,8 +50,11 @@ export type AddCommentReplyResult = {
|
|
|
49
50
|
*
|
|
50
51
|
* Replies don't have range markers in the document body.
|
|
51
52
|
* Thread linkage is stored in commentsExtended.xml via paraIdParent.
|
|
53
|
+
* `ctx` is accepted for API consistency with other comment mutations, but this
|
|
54
|
+
* primitive only updates comment side parts for replies, so no body revision
|
|
55
|
+
* markup is emitted here.
|
|
52
56
|
*/
|
|
53
|
-
export declare function addCommentReply(_documentXml: Document, zip: DocxZip, params: AddCommentReplyParams): Promise<AddCommentReplyResult>;
|
|
57
|
+
export declare function addCommentReply(_documentXml: Document, zip: DocxZip, params: AddCommentReplyParams, _ctx?: RevisionContext): Promise<AddCommentReplyResult>;
|
|
54
58
|
export type Comment = {
|
|
55
59
|
id: number;
|
|
56
60
|
author: string;
|
|
@@ -59,6 +63,11 @@ export type Comment = {
|
|
|
59
63
|
text: string;
|
|
60
64
|
paragraphId: string | null;
|
|
61
65
|
anchoredParagraphId: string | null;
|
|
66
|
+
endParagraphId?: string | null;
|
|
67
|
+
startRunIndex?: number;
|
|
68
|
+
startCharOffset?: number;
|
|
69
|
+
endRunIndex?: number;
|
|
70
|
+
endCharOffset?: number;
|
|
62
71
|
replies: Comment[];
|
|
63
72
|
};
|
|
64
73
|
/**
|
|
@@ -84,5 +93,5 @@ export declare function getComment(zip: DocxZip, documentXml: Document, commentI
|
|
|
84
93
|
*/
|
|
85
94
|
export declare function deleteComment(documentXml: Document, zip: DocxZip, params: {
|
|
86
95
|
commentId: number;
|
|
87
|
-
}): Promise<void>;
|
|
96
|
+
}, ctx?: RevisionContext): Promise<void>;
|
|
88
97
|
//# sourceMappingURL=comments.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"comments.d.ts","sourceRoot":"","sources":["../../src/primitives/comments.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"comments.d.ts","sourceRoot":"","sources":["../../src/primitives/comments.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAKnC,OAAO,EAGL,KAAK,eAAe,EACrB,MAAM,4BAA4B,CAAC;AAgDpC,MAAM,MAAM,eAAe,GAAG;IAC5B,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB,CAAC;AAEF;;;GAGG;AACH,wBAAsB,qBAAqB,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,eAAe,CAAC,CA0BlF;AA2FD,MAAM,MAAM,gBAAgB,GAAG;IAC7B,WAAW,EAAE,OAAO,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF;;;;;;;;GAQG;AACH,wBAAsB,UAAU,CAC9B,WAAW,EAAE,QAAQ,EACrB,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,gBAAgB,EACxB,GAAG,CAAC,EAAE,eAAe,GACpB,OAAO,CAAC,gBAAgB,CAAC,CAuC3B;AAID,MAAM,MAAM,qBAAqB,GAAG;IAClC,eAAe,EAAE,MAAM,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF;;;;;;;;GAQG;AACH,wBAAsB,eAAe,CACnC,YAAY,EAAE,QAAQ,EACtB,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,qBAAqB,EAC7B,IAAI,CAAC,EAAE,eAAe,GACrB,OAAO,CAAC,qBAAqB,CAAC,CAmChC;AA8UD,MAAM,MAAM,OAAO,GAAG;IACpB,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,mBAAmB,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,OAAO,EAAE,CAAC;CACpB,CAAC;AAyCF;;;;;;GAMG;AACH,wBAAsB,WAAW,CAAC,GAAG,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAmGzF;AAwLD;;GAEG;AACH,wBAAsB,UAAU,CAAC,GAAG,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,CAGhH;AAaD;;;;;;;;GAQG;AACH,wBAAsB,aAAa,CACjC,WAAW,EAAE,QAAQ,EACrB,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,EAC7B,GAAG,CAAC,EAAE,eAAe,GACpB,OAAO,CAAC,IAAI,CAAC,CAoGf"}
|