docrev 0.10.2 → 0.11.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/lib/anchor-match.d.ts +3 -1
- package/dist/lib/anchor-match.d.ts.map +1 -1
- package/dist/lib/anchor-match.js +5 -7
- package/dist/lib/anchor-match.js.map +1 -1
- package/dist/lib/annotations.d.ts +0 -6
- package/dist/lib/annotations.d.ts.map +1 -1
- package/dist/lib/annotations.js +26 -8
- package/dist/lib/annotations.js.map +1 -1
- package/dist/lib/build.d.ts.map +1 -1
- package/dist/lib/build.js +9 -6
- package/dist/lib/build.js.map +1 -1
- package/dist/lib/commands/build.d.ts.map +1 -1
- package/dist/lib/commands/build.js +5 -0
- package/dist/lib/commands/build.js.map +1 -1
- package/dist/lib/commands/doi.d.ts.map +1 -1
- package/dist/lib/commands/doi.js +14 -2
- package/dist/lib/commands/doi.js.map +1 -1
- package/dist/lib/commands/sync.d.ts.map +1 -1
- package/dist/lib/commands/sync.js +24 -11
- package/dist/lib/commands/sync.js.map +1 -1
- package/dist/lib/comment-realign.d.ts +12 -21
- package/dist/lib/comment-realign.d.ts.map +1 -1
- package/dist/lib/comment-realign.js +40 -348
- package/dist/lib/comment-realign.js.map +1 -1
- package/dist/lib/dependencies.d.ts +10 -0
- package/dist/lib/dependencies.d.ts.map +1 -1
- package/dist/lib/dependencies.js +41 -9
- package/dist/lib/dependencies.js.map +1 -1
- package/dist/lib/doi.d.ts.map +1 -1
- package/dist/lib/doi.js +68 -80
- package/dist/lib/doi.js.map +1 -1
- package/dist/lib/errors.d.ts.map +1 -1
- package/dist/lib/errors.js +3 -1
- package/dist/lib/errors.js.map +1 -1
- package/dist/lib/import.d.ts +7 -4
- package/dist/lib/import.d.ts.map +1 -1
- package/dist/lib/import.js +58 -62
- package/dist/lib/import.js.map +1 -1
- package/dist/lib/ooxml.d.ts +207 -0
- package/dist/lib/ooxml.d.ts.map +1 -0
- package/dist/lib/ooxml.js +634 -0
- package/dist/lib/ooxml.js.map +1 -0
- package/dist/lib/rate-limiter.d.ts +8 -0
- package/dist/lib/rate-limiter.d.ts.map +1 -1
- package/dist/lib/rate-limiter.js +41 -4
- package/dist/lib/rate-limiter.js.map +1 -1
- package/dist/lib/types.d.ts +9 -1
- package/dist/lib/types.d.ts.map +1 -1
- package/dist/lib/word-extraction.d.ts.map +1 -1
- package/dist/lib/word-extraction.js +48 -307
- package/dist/lib/word-extraction.js.map +1 -1
- package/dist/lib/word.d.ts.map +1 -1
- package/dist/lib/word.js +80 -175
- package/dist/lib/word.js.map +1 -1
- package/dist/lib/wordcomments.d.ts.map +1 -1
- package/dist/lib/wordcomments.js +53 -92
- package/dist/lib/wordcomments.js.map +1 -1
- package/docs-src/build.py +113 -113
- package/docs-src/extra.css +208 -208
- package/docs-src/md-to-html.lua +6 -6
- package/docs-src/template.html +116 -116
- package/lib/anchor-match.ts +6 -7
- package/lib/annotations.ts +28 -8
- package/lib/build.ts +10 -6
- package/lib/commands/build.ts +5 -0
- package/lib/commands/doi.ts +17 -1
- package/lib/commands/sync.ts +26 -13
- package/lib/comment-realign.ts +46 -464
- package/lib/dependencies.ts +43 -9
- package/lib/doi.ts +76 -94
- package/lib/errors.ts +5 -1
- package/lib/import.ts +65 -70
- package/lib/ooxml.ts +768 -0
- package/lib/rate-limiter.ts +37 -4
- package/lib/types.ts +9 -1
- package/lib/word-extraction.ts +49 -330
- package/lib/word.ts +86 -203
- package/lib/wordcomments.ts +53 -104
- package/mkdocs.yml +64 -64
- package/package.json +1 -1
- package/issues.md +0 -180
- package/site/assets/extra.css +0 -208
- package/site/commands.html +0 -926
- package/site/configuration.html +0 -469
- package/site/index.html +0 -288
- package/site/troubleshooting.html +0 -461
- package/site/workflow.html +0 -518
|
@@ -1,365 +1,57 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* Realign comments from a reference DOCX
|
|
3
|
-
*
|
|
2
|
+
* Realign comments from a reference DOCX onto markdown.
|
|
3
|
+
*
|
|
4
|
+
* This is the same job as `rev sync`: read the comments and their anchors from
|
|
5
|
+
* a docx, then place them into the current markdown. It therefore reuses the
|
|
6
|
+
* one extraction + placement engine rather than carrying a second docx parser
|
|
7
|
+
* and a proportional position-mapper.
|
|
4
8
|
*/
|
|
5
9
|
import * as fs from 'fs';
|
|
6
|
-
import
|
|
7
|
-
import {
|
|
8
|
-
/**
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
export async function extractParagraphsWithComments(docxPath) {
|
|
12
|
-
const zip = new AdmZip(docxPath);
|
|
13
|
-
const doc = zip.readAsText('word/document.xml');
|
|
14
|
-
const commentsXml = zip.readAsText('word/comments.xml');
|
|
15
|
-
// Parse comments to get authors and texts
|
|
16
|
-
const parsed = await parseStringPromise(commentsXml, { explicitArray: false });
|
|
17
|
-
const commentNodes = parsed['w:comments']?.['w:comment'];
|
|
18
|
-
if (!commentNodes)
|
|
19
|
-
return [];
|
|
20
|
-
const nodes = Array.isArray(commentNodes) ? commentNodes : [commentNodes];
|
|
21
|
-
const commentData = {};
|
|
22
|
-
for (const c of nodes) {
|
|
23
|
-
const id = c.$?.['w:id'] ?? '';
|
|
24
|
-
const author = c.$?.['w:author'] ?? 'Unknown';
|
|
25
|
-
let text = '';
|
|
26
|
-
const extractT = (n) => {
|
|
27
|
-
if (!n)
|
|
28
|
-
return;
|
|
29
|
-
if (n['w:t']) {
|
|
30
|
-
const t = n['w:t'];
|
|
31
|
-
text += typeof t === 'string' ? t : (t._ || t);
|
|
32
|
-
}
|
|
33
|
-
if (n['w:r']) {
|
|
34
|
-
(Array.isArray(n['w:r']) ? n['w:r'] : [n['w:r']]).forEach(extractT);
|
|
35
|
-
}
|
|
36
|
-
if (n['w:p']) {
|
|
37
|
-
(Array.isArray(n['w:p']) ? n['w:p'] : [n['w:p']]).forEach(extractT);
|
|
38
|
-
}
|
|
39
|
-
};
|
|
40
|
-
extractT(c);
|
|
41
|
-
commentData[id] = { author, text: text.trim() };
|
|
42
|
-
}
|
|
43
|
-
// Extract paragraphs with comments
|
|
44
|
-
const paragraphs = [];
|
|
45
|
-
const paraPattern = /<w:p\b[^>]*>([\s\S]*?)<\/w:p>/g;
|
|
46
|
-
let match;
|
|
47
|
-
while ((match = paraPattern.exec(doc)) !== null) {
|
|
48
|
-
const paraContent = match[1];
|
|
49
|
-
const hasComments = /commentRangeStart/.test(paraContent);
|
|
50
|
-
// Build paragraph text and track comment positions
|
|
51
|
-
let text = '';
|
|
52
|
-
const comments = [];
|
|
53
|
-
const tokenPattern = /<w:t[^>]*>([^<]*)<\/w:t>|<w:commentRangeStart[^>]*w:id="(\d+)"[^>]*\/?>/g;
|
|
54
|
-
let tokenMatch;
|
|
55
|
-
while ((tokenMatch = tokenPattern.exec(paraContent)) !== null) {
|
|
56
|
-
if (tokenMatch[1] !== undefined) {
|
|
57
|
-
text += tokenMatch[1];
|
|
58
|
-
}
|
|
59
|
-
else if (tokenMatch[2] !== undefined) {
|
|
60
|
-
const cid = tokenMatch[2];
|
|
61
|
-
const data = commentData[cid];
|
|
62
|
-
if (data) {
|
|
63
|
-
comments.push({
|
|
64
|
-
id: cid,
|
|
65
|
-
position: text.length,
|
|
66
|
-
author: data.author,
|
|
67
|
-
text: data.text,
|
|
68
|
-
});
|
|
69
|
-
}
|
|
70
|
-
}
|
|
71
|
-
}
|
|
72
|
-
if (text.trim() || hasComments) {
|
|
73
|
-
paragraphs.push({ text: text.trim(), comments });
|
|
74
|
-
}
|
|
75
|
-
}
|
|
76
|
-
return paragraphs;
|
|
77
|
-
}
|
|
78
|
-
/**
|
|
79
|
-
* Find best matching paragraph in markdown for a reference paragraph
|
|
80
|
-
*/
|
|
81
|
-
function findMatchingParagraph(refText, mdParagraphs) {
|
|
82
|
-
// Normalize for comparison
|
|
83
|
-
const normalize = (s) => s.toLowerCase().replace(/\s+/g, ' ').trim();
|
|
84
|
-
const refNorm = normalize(refText);
|
|
85
|
-
if (refNorm.length < 20)
|
|
86
|
-
return null;
|
|
87
|
-
let bestMatch = null;
|
|
88
|
-
let bestScore = 0;
|
|
89
|
-
for (let i = 0; i < mdParagraphs.length; i++) {
|
|
90
|
-
const mdNorm = normalize(mdParagraphs[i].text);
|
|
91
|
-
// Calculate word overlap
|
|
92
|
-
const refWords = new Set(refNorm.split(' ').filter((w) => w.length > 3));
|
|
93
|
-
const mdWords = mdNorm.split(' ').filter((w) => w.length > 3);
|
|
94
|
-
const overlap = mdWords.filter((w) => refWords.has(w)).length;
|
|
95
|
-
const score = overlap / Math.max(refWords.size, 1);
|
|
96
|
-
// Also check for substring containment (for section headers)
|
|
97
|
-
const containsStart = mdNorm.includes(refNorm.slice(0, 50));
|
|
98
|
-
if (score > bestScore || (containsStart && score > 0.3)) {
|
|
99
|
-
bestScore = Math.max(score, containsStart ? 0.8 : score);
|
|
100
|
-
bestMatch = { index: i, score: bestScore, paragraph: mdParagraphs[i] };
|
|
101
|
-
}
|
|
102
|
-
}
|
|
103
|
-
return bestScore > 0.4 ? bestMatch : null;
|
|
104
|
-
}
|
|
105
|
-
/**
|
|
106
|
-
* Extract paragraphs from markdown (split by blank lines)
|
|
107
|
-
*/
|
|
108
|
-
function parseMdParagraphs(markdown) {
|
|
109
|
-
const paragraphs = [];
|
|
110
|
-
const parts = markdown.split(/\n\n+/);
|
|
111
|
-
let pos = 0;
|
|
112
|
-
for (const part of parts) {
|
|
113
|
-
const trimmed = part.trim();
|
|
114
|
-
if (trimmed) {
|
|
115
|
-
const partStart = markdown.indexOf(part, pos);
|
|
116
|
-
if (partStart !== -1) {
|
|
117
|
-
paragraphs.push({
|
|
118
|
-
text: trimmed,
|
|
119
|
-
start: partStart,
|
|
120
|
-
end: partStart + part.length,
|
|
121
|
-
});
|
|
122
|
-
pos = partStart + part.length;
|
|
123
|
-
}
|
|
124
|
-
}
|
|
125
|
-
}
|
|
126
|
-
return paragraphs;
|
|
127
|
-
}
|
|
128
|
-
/**
|
|
129
|
-
* Normalize text for matching (remove citations, extra whitespace)
|
|
130
|
-
*/
|
|
131
|
-
function normalizeForMatching(text) {
|
|
132
|
-
return text
|
|
133
|
-
// Remove Word citation placeholders
|
|
134
|
-
.replace(/\(\s*\$+\s*\)/g, '')
|
|
135
|
-
.replace(/\$+/g, '')
|
|
136
|
-
// Remove markdown citations
|
|
137
|
-
.replace(/\[@[^\]]+\]/g, '')
|
|
138
|
-
.replace(/@[A-Z][a-z]+\d{4}/g, '')
|
|
139
|
-
// Remove rendered citations like "(Author et al. 2021)"
|
|
140
|
-
.replace(/\([A-Z][a-z]+(?:\s+et\s+al\.?)?\s+\d{4}[a-z]?(?:[;,]\s*[A-Z][a-z]+(?:\s+et\s+al\.?)?\s+\d{4}[a-z]?)*\)/g, '')
|
|
141
|
-
// Remove figure references like "Fig. 1" or "(Fig. 1)"
|
|
142
|
-
.replace(/\(?Fig\.?\s*\d+[a-z]?\)?/gi, '')
|
|
143
|
-
// Normalize whitespace
|
|
144
|
-
.replace(/\s+/g, ' ')
|
|
145
|
-
.trim()
|
|
146
|
-
.toLowerCase();
|
|
147
|
-
}
|
|
148
|
-
/**
|
|
149
|
-
* Find the word at or near a position in text
|
|
150
|
-
*/
|
|
151
|
-
function getWordAtPosition(text, pos) {
|
|
152
|
-
const before = text.slice(Math.max(0, pos - 30), pos);
|
|
153
|
-
const after = text.slice(pos, pos + 30);
|
|
154
|
-
// Get the last complete word before position
|
|
155
|
-
const beforeWords = before.split(/\s+/).filter(w => w.length > 2);
|
|
156
|
-
const afterWords = after.split(/\s+/).filter(w => w.length > 2);
|
|
157
|
-
return {
|
|
158
|
-
before: beforeWords.slice(-3),
|
|
159
|
-
after: afterWords.slice(0, 3)
|
|
160
|
-
};
|
|
10
|
+
import { extractWordComments, extractCommentAnchors } from './word-extraction.js';
|
|
11
|
+
import { insertCommentsIntoMarkdown } from './import.js';
|
|
12
|
+
/** Existing CriticMarkup comments, removed before the reference set is placed. */
|
|
13
|
+
function stripExistingComments(markdown) {
|
|
14
|
+
return markdown.replace(/\s*\{>>[\s\S]+?<<\}/g, '');
|
|
161
15
|
}
|
|
162
16
|
/**
|
|
163
|
-
*
|
|
164
|
-
*
|
|
17
|
+
* Realign the reference docx's comments onto an in-memory markdown string.
|
|
18
|
+
* Existing comments are cleared first so re-running is idempotent.
|
|
165
19
|
*/
|
|
166
|
-
function
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
const matches = [...normalizedMd.matchAll(regex)];
|
|
183
|
-
if (matches.length === 1) {
|
|
184
|
-
// Unique match - use this position
|
|
185
|
-
const matchEnd = matches[0].index + matches[0][0].length;
|
|
186
|
-
// Map back to original markdown position
|
|
187
|
-
const ratio = matchEnd / Math.max(normalizedMd.length, 1);
|
|
188
|
-
return Math.round(ratio * mdText.length);
|
|
189
|
-
}
|
|
190
|
-
else if (matches.length > 1) {
|
|
191
|
-
// Multiple matches - use context after to disambiguate
|
|
192
|
-
const afterWords = refWords.after;
|
|
193
|
-
if (afterWords.length > 0) {
|
|
194
|
-
const afterPattern = afterWords[0].toLowerCase().replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
|
|
195
|
-
for (const match of matches) {
|
|
196
|
-
const matchEnd = match.index + match[0].length;
|
|
197
|
-
const afterContext = normalizedMd.slice(matchEnd, matchEnd + 50);
|
|
198
|
-
if (afterContext.includes(afterPattern)) {
|
|
199
|
-
const ratio = matchEnd / Math.max(normalizedMd.length, 1);
|
|
200
|
-
return Math.round(ratio * mdText.length);
|
|
201
|
-
}
|
|
202
|
-
}
|
|
203
|
-
}
|
|
204
|
-
// Fall back to first match
|
|
205
|
-
const matchEnd = matches[0].index + matches[0][0].length;
|
|
206
|
-
const ratio = matchEnd / Math.max(normalizedMd.length, 1);
|
|
207
|
-
return Math.round(ratio * mdText.length);
|
|
208
|
-
}
|
|
20
|
+
export async function realignMarkdown(docxPath, markdown, options = {}) {
|
|
21
|
+
try {
|
|
22
|
+
let comments = await extractWordComments(docxPath);
|
|
23
|
+
const { anchors } = await extractCommentAnchors(docxPath);
|
|
24
|
+
if (options.author) {
|
|
25
|
+
const keep = new Set([options.author, options.replyAuthor].filter(Boolean));
|
|
26
|
+
comments = comments.filter((c) => keep.has(c.author));
|
|
27
|
+
}
|
|
28
|
+
const stripped = stripExistingComments(markdown);
|
|
29
|
+
const stats = { placed: 0, lowConfidence: 0, deduped: 0, unmatched: 0 };
|
|
30
|
+
const result = insertCommentsIntoMarkdown(stripped, comments, anchors, {
|
|
31
|
+
quiet: true,
|
|
32
|
+
wrapAnchor: false,
|
|
33
|
+
outStats: stats,
|
|
34
|
+
});
|
|
35
|
+
return { success: true, markdown: result, insertions: stats.placed + stats.lowConfidence };
|
|
209
36
|
}
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
return Math.round(ratio * mdText.length);
|
|
213
|
-
}
|
|
214
|
-
/**
|
|
215
|
-
* Extract reply comments that follow a parent comment
|
|
216
|
-
* Returns map of parent comment text -> array of reply texts
|
|
217
|
-
*/
|
|
218
|
-
function extractReplies(markdown, parentAuthor, replyAuthor) {
|
|
219
|
-
const replies = new Map();
|
|
220
|
-
const pattern = new RegExp(`\\{>>${parentAuthor}:\\s*([^<]+)<<\\}((?:\\s*\\{>>${replyAuthor}:[^<]+<<\\})*)`, 'g');
|
|
221
|
-
let match;
|
|
222
|
-
while ((match = pattern.exec(markdown)) !== null) {
|
|
223
|
-
const parentText = match[1].trim();
|
|
224
|
-
const replyBlock = match[2];
|
|
225
|
-
if (replyBlock) {
|
|
226
|
-
const replyPattern = new RegExp(`\\{>>${replyAuthor}:\\s*([^<]+)<<\\}`, 'g');
|
|
227
|
-
const replyTexts = [];
|
|
228
|
-
let replyMatch;
|
|
229
|
-
while ((replyMatch = replyPattern.exec(replyBlock)) !== null) {
|
|
230
|
-
replyTexts.push(replyMatch[1].trim());
|
|
231
|
-
}
|
|
232
|
-
if (replyTexts.length > 0) {
|
|
233
|
-
replies.set(parentText.slice(0, 50), replyTexts); // Use first 50 chars as key
|
|
234
|
-
}
|
|
235
|
-
}
|
|
37
|
+
catch (err) {
|
|
38
|
+
return { success: false, markdown, insertions: 0, error: err.message };
|
|
236
39
|
}
|
|
237
|
-
return replies;
|
|
238
40
|
}
|
|
239
41
|
/**
|
|
240
|
-
* Realign comments
|
|
42
|
+
* Realign the reference docx's comments onto a markdown file in place.
|
|
241
43
|
*/
|
|
242
44
|
export async function realignComments(docxPath, markdownPath, options = {}) {
|
|
243
|
-
const { dryRun = false, author
|
|
244
|
-
|
|
245
|
-
const
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
console.log(`Found ${replies.size} ${author} comments with ${replyAuthor} replies`);
|
|
249
|
-
// Extract reference paragraphs with comments
|
|
250
|
-
const refParagraphs = await extractParagraphsWithComments(docxPath);
|
|
251
|
-
const refWithComments = refParagraphs.filter((p) => p.comments.length > 0 && p.comments.some((c) => c.author === author));
|
|
252
|
-
console.log(`Found ${refWithComments.length} paragraphs with ${author} comments in reference`);
|
|
253
|
-
// Strip ALL comments (both authors) from markdown to start fresh
|
|
254
|
-
let markdown = originalMarkdown;
|
|
255
|
-
markdown = markdown.replace(/\s*\{>>[\s\S]+?<<\}/g, '');
|
|
256
|
-
console.log(`Stripped all comments from markdown`);
|
|
257
|
-
// Parse markdown paragraphs
|
|
258
|
-
const mdParagraphs = parseMdParagraphs(markdown);
|
|
259
|
-
// Track insertions (position, text) - will insert from end to start
|
|
260
|
-
const insertions = [];
|
|
261
|
-
let matched = 0;
|
|
262
|
-
let unmatched = 0;
|
|
263
|
-
for (const refPara of refWithComments) {
|
|
264
|
-
const match = findMatchingParagraph(refPara.text, mdParagraphs);
|
|
265
|
-
if (!match) {
|
|
266
|
-
console.log(` No match for: "${refPara.text.slice(0, 60)}..."`);
|
|
267
|
-
unmatched++;
|
|
268
|
-
continue;
|
|
269
|
-
}
|
|
270
|
-
matched++;
|
|
271
|
-
const mdPara = match.paragraph;
|
|
272
|
-
// Get author's comments in this paragraph
|
|
273
|
-
const authorComments = refPara.comments.filter((c) => c.author === author);
|
|
274
|
-
for (const comment of authorComments) {
|
|
275
|
-
// Find corresponding position in markdown paragraph
|
|
276
|
-
const mdPos = findMdPosition(refPara.text, comment.position, mdPara?.text ?? '');
|
|
277
|
-
const absolutePos = (mdPara?.start ?? 0) + mdPos;
|
|
278
|
-
// Build comment mark with any replies
|
|
279
|
-
let commentMark = ` {>>${comment.author}: ${comment.text}<<}`;
|
|
280
|
-
// Check for replies
|
|
281
|
-
const replyKey = comment.text.trim().slice(0, 50);
|
|
282
|
-
const replyTexts = replies.get(replyKey);
|
|
283
|
-
if (replyTexts) {
|
|
284
|
-
for (const replyText of replyTexts) {
|
|
285
|
-
commentMark += ` {>>${replyAuthor}: ${replyText}<<}`;
|
|
286
|
-
}
|
|
287
|
-
}
|
|
288
|
-
insertions.push({
|
|
289
|
-
position: absolutePos,
|
|
290
|
-
text: commentMark,
|
|
291
|
-
commentText: comment.text.slice(0, 30),
|
|
292
|
-
hasReplies: !!replyTexts,
|
|
293
|
-
debug: `"${(mdPara?.text ?? '').slice(Math.max(0, mdPos - 20), mdPos)}|HERE|${(mdPara?.text ?? '').slice(mdPos, mdPos + 20)}"`,
|
|
294
|
-
});
|
|
295
|
-
}
|
|
45
|
+
const { dryRun = false, author, replyAuthor } = options;
|
|
46
|
+
const original = fs.readFileSync(markdownPath, 'utf-8');
|
|
47
|
+
const realigned = await realignMarkdown(docxPath, original, { author, replyAuthor });
|
|
48
|
+
if (!realigned.success) {
|
|
49
|
+
return { success: false, insertions: 0, error: realigned.error };
|
|
296
50
|
}
|
|
297
|
-
console.log(`Matched ${matched} paragraphs, ${unmatched} unmatched`);
|
|
298
|
-
console.log(`Inserting ${insertions.length} comments (${insertions.filter((i) => i.hasReplies).length} with replies)`);
|
|
299
51
|
if (dryRun) {
|
|
300
|
-
|
|
301
|
-
for (const ins of insertions.slice(0, 10)) {
|
|
302
|
-
console.log(` At ${ins.position}: ${ins.debug}`);
|
|
303
|
-
console.log(` Comment: "${ins.commentText}..."${ins.hasReplies ? ' (+ replies)' : ''}`);
|
|
304
|
-
}
|
|
305
|
-
return { success: true, dryRun: true, insertions: insertions.length };
|
|
306
|
-
}
|
|
307
|
-
// Sort by position descending and insert
|
|
308
|
-
insertions.sort((a, b) => b.position - a.position);
|
|
309
|
-
for (const ins of insertions) {
|
|
310
|
-
markdown = markdown.slice(0, ins.position) + ins.text + markdown.slice(ins.position);
|
|
311
|
-
}
|
|
312
|
-
// Write result
|
|
313
|
-
fs.writeFileSync(markdownPath, markdown);
|
|
314
|
-
return { success: true, insertions: insertions.length, matched, unmatched };
|
|
315
|
-
}
|
|
316
|
-
/**
|
|
317
|
-
* Realign comments in markdown string (in-memory, doesn't write to file)
|
|
318
|
-
*/
|
|
319
|
-
export async function realignMarkdown(docxPath, markdown, options = {}) {
|
|
320
|
-
const { author = 'Guy Colling', replyAuthor = 'Gilles Colling' } = options;
|
|
321
|
-
try {
|
|
322
|
-
// Extract reply relationships from original markdown
|
|
323
|
-
const replies = extractReplies(markdown, author, replyAuthor);
|
|
324
|
-
// Extract reference paragraphs with comments
|
|
325
|
-
const refParagraphs = await extractParagraphsWithComments(docxPath);
|
|
326
|
-
const refWithComments = refParagraphs.filter((p) => p.comments.length > 0 && p.comments.some((c) => c.author === author));
|
|
327
|
-
// Strip ALL comments from markdown
|
|
328
|
-
let result = markdown.replace(/\s*\{>>[\s\S]+?<<\}/g, '');
|
|
329
|
-
// Parse markdown paragraphs
|
|
330
|
-
const mdParagraphs = parseMdParagraphs(result);
|
|
331
|
-
// Track insertions
|
|
332
|
-
const insertions = [];
|
|
333
|
-
for (const refPara of refWithComments) {
|
|
334
|
-
const match = findMatchingParagraph(refPara.text, mdParagraphs);
|
|
335
|
-
if (!match)
|
|
336
|
-
continue;
|
|
337
|
-
const mdPara = match.paragraph;
|
|
338
|
-
const authorComments = refPara.comments.filter((c) => c.author === author);
|
|
339
|
-
for (const comment of authorComments) {
|
|
340
|
-
const mdPos = findMdPosition(refPara.text, comment.position, mdPara?.text ?? '');
|
|
341
|
-
const absolutePos = (mdPara?.start ?? 0) + mdPos;
|
|
342
|
-
let commentMark = ` {>>${comment.author}: ${comment.text}<<}`;
|
|
343
|
-
// Check for replies
|
|
344
|
-
const replyKey = comment.text.trim().slice(0, 50);
|
|
345
|
-
const replyTexts = replies.get(replyKey);
|
|
346
|
-
if (replyTexts) {
|
|
347
|
-
for (const replyText of replyTexts) {
|
|
348
|
-
commentMark += ` {>>${replyAuthor}: ${replyText}<<}`;
|
|
349
|
-
}
|
|
350
|
-
}
|
|
351
|
-
insertions.push({ position: absolutePos, text: commentMark });
|
|
352
|
-
}
|
|
353
|
-
}
|
|
354
|
-
// Sort by position descending and insert
|
|
355
|
-
insertions.sort((a, b) => b.position - a.position);
|
|
356
|
-
for (const ins of insertions) {
|
|
357
|
-
result = result.slice(0, ins.position) + ins.text + result.slice(ins.position);
|
|
358
|
-
}
|
|
359
|
-
return { success: true, markdown: result, insertions: insertions.length };
|
|
360
|
-
}
|
|
361
|
-
catch (err) {
|
|
362
|
-
return { success: false, markdown, insertions: 0, error: err.message };
|
|
52
|
+
return { success: true, dryRun: true, insertions: realigned.insertions };
|
|
363
53
|
}
|
|
54
|
+
fs.writeFileSync(markdownPath, realigned.markdown);
|
|
55
|
+
return { success: true, insertions: realigned.insertions };
|
|
364
56
|
}
|
|
365
57
|
//# sourceMappingURL=comment-realign.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"comment-realign.js","sourceRoot":"","sources":["../../lib/comment-realign.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"comment-realign.js","sourceRoot":"","sources":["../../lib/comment-realign.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,6 +9,16 @@ export declare function hasPandocCrossref(): boolean;
|
|
|
9
9
|
* Check if pandoc is available
|
|
10
10
|
*/
|
|
11
11
|
export declare function hasPandoc(): boolean;
|
|
12
|
+
/**
|
|
13
|
+
* Parsed pandoc version (e.g. "3.9"), or null when pandoc is unavailable.
|
|
14
|
+
*/
|
|
15
|
+
export declare function getPandocVersion(): string | null;
|
|
16
|
+
/**
|
|
17
|
+
* Whether pandoc bundles citeproc and accepts `--citeproc`. That flag and the
|
|
18
|
+
* built-in citeproc arrived in pandoc 2.11; earlier versions need the separate
|
|
19
|
+
* pandoc-citeproc filter.
|
|
20
|
+
*/
|
|
21
|
+
export declare function pandocSupportsCiteproc(): boolean;
|
|
12
22
|
/**
|
|
13
23
|
* Check if LaTeX is available (for PDF generation)
|
|
14
24
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dependencies.d.ts","sourceRoot":"","sources":["../../lib/dependencies.ts"],"names":[],"mappings":"AAAA;;GAEG;
|
|
1
|
+
{"version":3,"file":"dependencies.d.ts","sourceRoot":"","sources":["../../lib/dependencies.ts"],"names":[],"mappings":"AAAA;;GAEG;AAqBH;;GAEG;AACH,wBAAgB,iBAAiB,IAAI,OAAO,CAE3C;AAED;;GAEG;AACH,wBAAgB,SAAS,IAAI,OAAO,CAEnC;AAED;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,MAAM,GAAG,IAAI,CAKhD;AAED;;;;GAIG;AACH,wBAAgB,sBAAsB,IAAI,OAAO,CAOhD;AAED;;GAEG;AACH,wBAAgB,QAAQ,IAAI,OAAO,CAElC;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAwBjE;AAED,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,OAAO,CAAC;IAChB,KAAK,EAAE,OAAO,CAAC;IACf,QAAQ,EAAE,OAAO,CAAC;IAClB,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB;AAED;;GAEG;AACH,wBAAgB,iBAAiB,IAAI,gBAAgB,CAwBpD"}
|
package/dist/lib/dependencies.js
CHANGED
|
@@ -1,36 +1,64 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Dependency checking utilities for pandoc, LaTeX, and related tools
|
|
3
3
|
*/
|
|
4
|
-
import {
|
|
4
|
+
import { execFileSync } from 'child_process';
|
|
5
5
|
/**
|
|
6
|
-
*
|
|
6
|
+
* Run `<file> --version` without a shell and return its stdout, or null when
|
|
7
|
+
* the binary is absent (ENOENT) or exits non-zero (present but broken). Using
|
|
8
|
+
* execFileSync avoids shell quoting and treats both failure modes uniformly.
|
|
7
9
|
*/
|
|
8
|
-
function
|
|
10
|
+
function runVersion(file, args = ['--version']) {
|
|
9
11
|
try {
|
|
10
|
-
|
|
11
|
-
return true;
|
|
12
|
+
return execFileSync(file, args, { stdio: ['ignore', 'pipe', 'ignore'], encoding: 'utf-8' });
|
|
12
13
|
}
|
|
13
14
|
catch {
|
|
14
|
-
return
|
|
15
|
+
return null;
|
|
15
16
|
}
|
|
16
17
|
}
|
|
18
|
+
function commandExists(file, args = ['--version']) {
|
|
19
|
+
return runVersion(file, args) !== null;
|
|
20
|
+
}
|
|
17
21
|
/**
|
|
18
22
|
* Check if pandoc-crossref is available
|
|
19
23
|
*/
|
|
20
24
|
export function hasPandocCrossref() {
|
|
21
|
-
return commandExists('pandoc-crossref
|
|
25
|
+
return commandExists('pandoc-crossref');
|
|
22
26
|
}
|
|
23
27
|
/**
|
|
24
28
|
* Check if pandoc is available
|
|
25
29
|
*/
|
|
26
30
|
export function hasPandoc() {
|
|
27
|
-
return commandExists('pandoc
|
|
31
|
+
return commandExists('pandoc');
|
|
32
|
+
}
|
|
33
|
+
/**
|
|
34
|
+
* Parsed pandoc version (e.g. "3.9"), or null when pandoc is unavailable.
|
|
35
|
+
*/
|
|
36
|
+
export function getPandocVersion() {
|
|
37
|
+
const out = runVersion('pandoc');
|
|
38
|
+
if (!out)
|
|
39
|
+
return null;
|
|
40
|
+
const m = out.match(/pandoc(?:\.exe)?\s+(\d+\.\d+(?:\.\d+)?)/i);
|
|
41
|
+
return m ? m[1] : null;
|
|
42
|
+
}
|
|
43
|
+
/**
|
|
44
|
+
* Whether pandoc bundles citeproc and accepts `--citeproc`. That flag and the
|
|
45
|
+
* built-in citeproc arrived in pandoc 2.11; earlier versions need the separate
|
|
46
|
+
* pandoc-citeproc filter.
|
|
47
|
+
*/
|
|
48
|
+
export function pandocSupportsCiteproc() {
|
|
49
|
+
const v = getPandocVersion();
|
|
50
|
+
if (!v)
|
|
51
|
+
return false;
|
|
52
|
+
const parts = v.split('.').map((n) => parseInt(n, 10));
|
|
53
|
+
const major = parts[0] ?? 0;
|
|
54
|
+
const minor = parts[1] ?? 0;
|
|
55
|
+
return major > 2 || (major === 2 && minor >= 11);
|
|
28
56
|
}
|
|
29
57
|
/**
|
|
30
58
|
* Check if LaTeX is available (for PDF generation)
|
|
31
59
|
*/
|
|
32
60
|
export function hasLatex() {
|
|
33
|
-
return commandExists('pdflatex
|
|
61
|
+
return commandExists('pdflatex') || commandExists('xelatex');
|
|
34
62
|
}
|
|
35
63
|
/**
|
|
36
64
|
* Get installation instructions for missing dependencies
|
|
@@ -72,6 +100,10 @@ export function checkDependencies() {
|
|
|
72
100
|
if (!status.pandoc) {
|
|
73
101
|
status.messages.push(`Pandoc not found. Install with: ${getInstallInstructions('pandoc')}`);
|
|
74
102
|
}
|
|
103
|
+
else if (!pandocSupportsCiteproc()) {
|
|
104
|
+
const version = getPandocVersion();
|
|
105
|
+
status.messages.push(`Pandoc ${version ?? '(unknown version)'} is older than 2.11; citation processing (--citeproc) needs 2.11+. Upgrade with: ${getInstallInstructions('pandoc')}`);
|
|
106
|
+
}
|
|
75
107
|
if (!status.latex) {
|
|
76
108
|
status.messages.push(`LaTeX not found (required for PDF). Install with: ${getInstallInstructions('latex')}`);
|
|
77
109
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dependencies.js","sourceRoot":"","sources":["../../lib/dependencies.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"dependencies.js","sourceRoot":"","sources":["../../lib/dependencies.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/doi.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"doi.d.ts","sourceRoot":"","sources":["../../lib/doi.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,iBAAiB,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"doi.d.ts","sourceRoot":"","sources":["../../lib/doi.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,iBAAiB,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAoC/G;;GAEG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,QAAQ,EAAE,CAiG3D;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAKrD;AAED,UAAU,eAAe;IACvB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED;;;GAGG;AACH,wBAAsB,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,GAAE,eAAoB,GAAG,OAAO,CAAC,cAAc,GAAG;IAAE,MAAM,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC,CAsDzH;AAiCD;;GAEG;AACH,wBAAsB,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAkCzE;AAED,UAAU,mBAAmB;IAC3B,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED;;GAEG;AACH,wBAAsB,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,GAAE,mBAAwB,GAAG,OAAO,CAAC,cAAc,CAAC,CAwE9G;AAgHD;;GAEG;AACH,wBAAsB,SAAS,CAC7B,KAAK,EAAE,MAAM,EACb,MAAM,GAAE,MAAW,EACnB,IAAI,GAAE,MAAM,GAAG,IAAW,EAC1B,OAAO,GAAE,MAAW,GACnB,OAAO,CAAC,eAAe,CAAC,CA6R1B;AAED,UAAU,wBAAwB;IAChC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CACvD;AAED,UAAU,sBAAsB;IAC9B,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,eAAe,CAAC;CACzB;AAED;;GAEG;AACH,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,MAAM,EACf,OAAO,GAAE,wBAA6B,GACrC,OAAO,CAAC,sBAAsB,EAAE,CAAC,CAsDnC;AAED,UAAU,cAAc;IACtB,OAAO,EAAE,OAAO,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;GAEG;AACH,wBAAgB,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,cAAc,CAmBxE"}
|