@godcreator/word-report 0.5.1 → 0.6.1

package/dist/cli.mjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
-import { n as reportExport, r as checkReports } from "./export-CGvF3Wz-.mjs";
-import { o as reportEntryIn, s as reportEntryOf } from "./report-files-DyPBOCgh.mjs";
+import { n as reportExport, r as checkReports } from "./export-BrDdJ_E-.mjs";
+import { o as reportEntryIn, s as reportEntryOf } from "./report-files-CpZA-0-K.mjs";
 import path from "node:path";
 import { realpathSync } from "node:fs";
 import { fileURLToPath } from "node:url";

package/dist/core.mjs

@@ -1,3 +1,3 @@
 import { i as validateDocument, n as safeRelativePath, o as parseReportJson, s as ReportContentError, t as assembleDocument } from "./assemble-BEt9_xsB.mjs";
-import { a as mdxReportInputsOf, i as compileMdxReport, n as MDX_REFERENCES_NAME, o as GENERATED_ID_PREFIX, r as assembleMdxReport, t as MDX_ENTRY_NAME } from "./mdx-B1V34o8x.mjs";
+import { a as mdxReportInputsOf, i as compileMdxReport, n as MDX_REFERENCES_NAME, o as GENERATED_ID_PREFIX, r as assembleMdxReport, t as MDX_ENTRY_NAME } from "./mdx-DUOW1JEE.mjs";
 export { GENERATED_ID_PREFIX, MDX_ENTRY_NAME, MDX_REFERENCES_NAME, ReportContentError, assembleDocument, assembleMdxReport, compileMdxReport, mdxReportInputsOf, parseReportJson, safeRelativePath, validateDocument };

package/dist/{export-CGvF3Wz-.mjs → export-BrDdJ_E-.mjs}

@@ -1,6 +1,6 @@
 import { a as walk, i as validateDocument, n as safeRelativePath, o as parseReportJson, s as ReportContentError, t as assembleDocument } from "./assemble-BEt9_xsB.mjs";
-import { a as mdxReportInputsOf, r as assembleMdxReport, t as MDX_ENTRY_NAME } from "./mdx-B1V34o8x.mjs";
-import { l as reportsDirName, t as JSON_ENTRY_NAME } from "./report-files-DyPBOCgh.mjs";
+import { a as mdxReportInputsOf, r as assembleMdxReport, t as MDX_ENTRY_NAME } from "./mdx-DUOW1JEE.mjs";
+import { l as reportsDirName, t as JSON_ENTRY_NAME } from "./report-files-CpZA-0-K.mjs";
 import { access, mkdir, open, readFile, readdir, realpath, rename, stat, unlink, writeFile } from "node:fs/promises";
 import path from "node:path";
 import { createHash, randomUUID } from "node:crypto";

package/dist/{mdx-B1V34o8x.mjs → mdx-DUOW1JEE.mjs}

@@ -298,12 +298,13 @@ function collectElement(context, element, marks, out) {
 			return;
 		}
 		case "WordPlainMath": {
-			const attributes = attributesOf(context, element, { tex: "required" });
-			const plainText = plainMathRunsOf(context, element);
+			const attributes = attributesOf(context, element, { word: "required" });
+			const latex = plainMathFormulaOf(context, element);
+			const plainText = plainMathRunsOf(context, element, attributes["word"]);
 			out.push(located(context, context.ids.request({
 				type: "math",
 				id: "",
-				latex: attributes["tex"],
+				latex,
 				plainText
 			}, "m"), element));
 			return;
@@ -323,27 +324,51 @@ function unknownComponentMessage(name, allowed) {
 	if (/^[A-Z]/.test(name) && !name.startsWith("Word")) return `报告里的组件都以 Word 开头，<${name}> 不认：${allowed}`;
 	return `认不出组件 <${name}>：${allowed}`;
 }
-const PLAIN_MATH_MARKS = [
+/** <WordPlainMath> 标签里的公式：只能是一个 $…$ */
+function plainMathFormulaOf(context, element) {
+	const children = element.children.filter((child) => !isCommentOnlyExpression(child));
+	const only = children.length === 1 ? children[0] : void 0;
+	if (only?.type !== "inlineMath") failAt(context, element, "<WordPlainMath word=\"…\"> 的标签里只写一个行内公式 $…$，别的都不放");
+	return only.value;
+}
+const PLAIN_MATH_MARK_ORDER = [
 	"em",
 	"sub",
 	"sup"
 ];
-/** <WordPlainMath> 里写给 Word 的文字：只收文字、斜体、下标、上标 */
-function plainMathRunsOf(context, element) {
-	const usage = "<WordPlainMath tex=\"…\"> 里写 Word 用的文字，只能用文字、*斜体*、<sub>、<sup>";
-	const inlines = inlinesOf(context, element.children);
-	if (!inlines.length) failAt(context, element, `${usage}，这里是空的`);
-	return inlines.map((inline) => {
-		if (inline.type !== "text") failAt(context, element, `${usage}，这里出现了 ${inline.type}`);
-		const marks = inline.marks ?? [];
-		const unsupported = marks.find((mark) => !PLAIN_MATH_MARKS.includes(mark));
-		if (unsupported !== void 0) failAt(context, element, `${usage}，这里出现了 ${unsupported}`);
-		if (marks.includes("sub") && marks.includes("sup")) failAt(context, element, "<WordPlainMath> 里同一段文字不能既是下标又是上标");
-		return marks.length ? {
-			text: inline.text,
-			marks
-		} : { text: inline.text };
-	});
+/** word 属性：Word 里写的文字，按正文的规则解析，只收文字、*斜体*、<sub>、<sup>；相邻同样式的文字合并 */
+function plainMathRunsOf(context, element, word) {
+	const usage = "<WordPlainMath> 的 word 属性写 Word 用的文字，只能用文字、*斜体*、<sub>、<sup>";
+	if (/[\r\n]/.test(word)) failAt(context, element, `${usage}，不能换行`);
+	let root;
+	try {
+		root = parseMdx(word, "");
+	} catch (error) {
+		return failAt(context, element, `<WordPlainMath> 的 word 属性解析不了（位置从属性开头算）：${error.message}`);
+	}
+	const blocks = root.children;
+	if (blocks.length !== 1 || blocks[0].type !== "paragraph") failAt(context, element, `${usage}，这里${blocks.length ? "不是一段文字" : "是空的"}`);
+	const runs = [];
+	const collect = (nodes, marks) => {
+		for (const node of nodes) if (node.type === "text") {
+			const sorted = PLAIN_MATH_MARK_ORDER.filter((mark) => marks.has(mark));
+			const previous = runs.at(-1);
+			if (previous && (previous.marks ?? []).join() === sorted.join()) previous.text += node.value;
+			else runs.push(sorted.length ? {
+				text: node.value,
+				marks: sorted
+			} : { text: node.value });
+		} else if (node.type === "emphasis") collect(node.children, /* @__PURE__ */ new Set([...marks, "em"]));
+		else if (node.type === "mdxJsxTextElement" && (node.name === "sub" || node.name === "sup")) {
+			if (node.attributes.length) failAt(context, element, `${usage}，<${node.name}> 不带属性`);
+			const script = node.name;
+			if (marks.has(script === "sub" ? "sup" : "sub")) failAt(context, element, "<WordPlainMath> 的 word 属性里同一段文字不能既是下标又是上标");
+			collect(node.children, /* @__PURE__ */ new Set([...marks, script]));
+		} else failAt(context, element, `${usage}，这里出现了 ${node.type === "mdxJsxTextElement" ? `<${node.name}>` : node.type}`);
+	};
+	collect(blocks[0].children, /* @__PURE__ */ new Set());
+	if (!runs.some((run) => run.text)) failAt(context, element, `${usage}，这里是空的`);
+	return runs.filter((run) => run.text);
 }
 function linkTextOf(context, link) {
 	const inlines = [];

package/dist/node.mjs

@@ -1,3 +1,3 @@
-import { i as readReport, n as reportExport, r as checkReports, t as reportEntry } from "./export-CGvF3Wz-.mjs";
-import { a as readReportFiles, c as reportIdsOf, i as readMdxReportFiles, l as reportsDirName, n as REPORT_ID_PATTERN, o as reportEntryIn, r as isMdxEntry, s as reportEntryOf, t as JSON_ENTRY_NAME } from "./report-files-DyPBOCgh.mjs";
+import { i as readReport, n as reportExport, r as checkReports, t as reportEntry } from "./export-BrDdJ_E-.mjs";
+import { a as readReportFiles, c as reportIdsOf, i as readMdxReportFiles, l as reportsDirName, n as REPORT_ID_PATTERN, o as reportEntryIn, r as isMdxEntry, s as reportEntryOf, t as JSON_ENTRY_NAME } from "./report-files-CpZA-0-K.mjs";
 export { JSON_ENTRY_NAME, REPORT_ID_PATTERN, checkReports, isMdxEntry, readMdxReportFiles, readReport, readReportFiles, reportEntry, reportEntryIn, reportEntryOf, reportExport, reportIdsOf, reportsDirName };

package/dist/{report-files-DyPBOCgh.mjs → report-files-CpZA-0-K.mjs}

@@ -1,5 +1,5 @@
 import { i as validateDocument, n as safeRelativePath, o as parseReportJson, s as ReportContentError } from "./assemble-BEt9_xsB.mjs";
-import { a as mdxReportInputsOf, t as MDX_ENTRY_NAME } from "./mdx-B1V34o8x.mjs";
+import { a as mdxReportInputsOf, t as MDX_ENTRY_NAME } from "./mdx-DUOW1JEE.mjs";
 import { readFile, readdir, realpath, stat } from "node:fs/promises";
 import path from "node:path";
 //#region src/node/report-files.ts

package/dist/site-server.mjs

@@ -1,6 +1,6 @@
 import { t as assembleDocument } from "./assemble-BEt9_xsB.mjs";
-import { a as mdxReportInputsOf, r as assembleMdxReport, t as MDX_ENTRY_NAME } from "./mdx-B1V34o8x.mjs";
-import { a as readReportFiles, c as reportIdsOf, i as readMdxReportFiles, n as REPORT_ID_PATTERN, o as reportEntryIn, r as isMdxEntry, t as JSON_ENTRY_NAME } from "./report-files-DyPBOCgh.mjs";
+import { a as mdxReportInputsOf, r as assembleMdxReport, t as MDX_ENTRY_NAME } from "./mdx-DUOW1JEE.mjs";
+import { a as readReportFiles, c as reportIdsOf, i as readMdxReportFiles, n as REPORT_ID_PATTERN, o as reportEntryIn, r as isMdxEntry, t as JSON_ENTRY_NAME } from "./report-files-CpZA-0-K.mjs";
 import { n as reportHrefOf } from "./page-data-DLPoVgXy.mjs";
 import { readFile, realpath, stat } from "node:fs/promises";
 import path from "node:path";

package/engine/src/docreport/compose.py

@@ -10,6 +10,8 @@ import re
 from docreport.plain_math import INLINE_MATH_STYLE
 from docreport.word import utf16_length, find_text, MarkerFinder
 
+BODY_MARKER = re.compile(r'@(?:FIELD|NUMSTART|NUMEND|LINK|NOTE)\d+@')
+
 
 def mm(value):
     """Convert millimetres to Word points."""
@@ -227,30 +229,74 @@ class ContentComposer(Composer):
         self.appendix_numbering = None
         self.appendix_count = 0
         self._inline_math_style = None
+        # Each COM call crosses into the Word process; style objects, the bookmark collection
+        # and the start of the paragraph just written are fetched once and reused.
+        self._style_objects = {}
+        self._bookmark_collection = doc.Bookmarks
+        self._last_range, self._last_start = None, None
+        self._token_positions = {}
+
+    def style_object(self, name):
+        style = self._style_objects.get(name)
+        if style is None:
+            style = self._style_objects[name] = self.doc.Styles.Item(name)
+        return style
+
+    def in_main_story(self):
+        """Body paragraphs and body table cells; a footnote container is another story."""
+        return self.container is None or self.cell
+
+    def range_at(self, start, end):
+        if self.in_main_story():
+            return self.doc.Range(start, end)
+        rng = self.container.Range.Duplicate
+        rng.SetRange(start, end)
+        return rng
 
-    def point(self):
-        rng = self.doc.Content.Duplicate if self.container is None else self.container.Range.Duplicate
+    def insertion_point(self):
+        if self.container is None:
+            position = self.doc.Content.End - 1
+            return self.doc.Range(position, position), position
+        rng = self.container.Range.Duplicate
         # Word exposes the cell's CR/BEL terminator as one Range position.
         position = rng.End - 1
         rng.SetRange(position, position)
-        return rng
+        return rng, position
+
+    def point(self):
+        return self.insertion_point()[0]
 
     def paragraph(self, text, style=None):
-        rng = self.point()
-        start = rng.Start
+        rng, start = self.insertion_point()
+        # InsertBefore expands the range over the inserted text and paragraph mark.
         rng.InsertBefore(text + '\r')
-        rng.SetRange(start, start + utf16_length(text) + 1)
-        rng.Style = self.doc.Styles.Item(self.style if style is None else style)
+        rng.Style = self.style_object(self.style if style is None else style)
+        self._last_range, self._last_start = rng, start
+        self.record_tokens(text, start)
         return rng
 
+    def record_tokens(self, text, start):
+        """Body positions of field, number, note and link markers, so finish() needs no Find.
+
+        Content is only appended after a recorded marker, so its position holds until
+        build() replaces markers; notes and links shift later positions, fields go back to front.
+        """
+        if not self.in_main_story():
+            return
+        for match in BODY_MARKER.finditer(text):
+            self._token_positions[match.group()] = start + utf16_length(text[:match.start()])
+
     def part(self, rng, offset, length):
+        if rng is self._last_range:
+            return self.range_at(self._last_start + offset, self._last_start + offset + length)
         result = rng.Duplicate
-        result.SetRange(rng.Start + offset, rng.Start + offset + length)
+        start = rng.Start
+        result.SetRange(start + offset, start + offset + length)
         return result
 
     def mark(self, identifier, rng, suffix=''):
         from .content import bookmark
-        self.doc.Bookmarks.Add(bookmark(identifier, suffix), rng)
+        self._bookmark_collection.Add(bookmark(identifier, suffix), rng)
 
     def math_token(self, node, inline):
         from .content import bookmark
@@ -315,21 +361,29 @@ class ContentComposer(Composer):
     def rich_paragraph(self, nodes, style=None, prefix='', suffix=''):
         text, spans = self.inline(nodes)
         rng = self.paragraph(prefix + text + suffix, style)
-        self.apply_marks(rng, utf16_length(prefix), spans)
+        self.apply_marks_at(self._last_start + utf16_length(prefix), spans)
         return rng
 
     def apply_marks(self, rng, offset, spans):
+        start = self._last_start if rng is self._last_range else rng.Start
+        self.apply_marks_at(start + offset, spans)
+
+    def apply_marks_at(self, base, spans):
         for start, length, marks in spans:
             if not marks:
                 continue
-            run = self.part(rng, offset + start, length)
+            run = self.range_at(base + start, base + start + length)
             for mark in marks:
                 if mark == 'code':
                     run.Font.Name = 'Consolas'
                 elif mark == 'math':
                     run.Style = self.inline_math_style()
+                elif mark == 'strong':
+                    run.Bold = True
+                elif mark == 'em':
+                    run.Italic = True
                 else:
-                    setattr(run.Font, {'strong': 'Bold', 'em': 'Italic', 'sup': 'Superscript', 'sub': 'Subscript'}[mark], True)
+                    setattr(run.Font, {'sup': 'Superscript', 'sub': 'Subscript'}[mark], True)
 
     def inline_math_style(self):
         """Character style of inline formulas written as text; created in the document, the DOTX stays unchanged."""
@@ -343,11 +397,13 @@ class ContentComposer(Composer):
         """Write a one-paragraph cell in one assignment; the general path inserts then trims a paragraph."""
         text, spans = self.inline(node['content'])
         rng = cell.Range
+        start = rng.Start
         rng.Text = text
-        rng = self.part(cell.Range, 0, utf16_length(text))
-        rng.Style = self.doc.Styles.Item(self.layout.get(node['id'], {}).get('style') or self.style)
-        self.apply_marks(rng, 0, spans)
-        self.mark(node['id'], rng, '_b')
+        self.record_tokens(text, start)
+        target = self.range_at(start, start + utf16_length(text))
+        target.Style = self.style_object(self.layout.get(node['id'], {}).get('style') or self.style)
+        self.apply_marks_at(start, spans)
+        self.mark(node['id'], target, '_b')
 
     def chapter_sequence(self, kind, bookmark):
         """「章号-序号」 for an equation, figure or table in the current top-level chapter."""
@@ -494,7 +550,7 @@ class ContentComposer(Composer):
         table.AllowAutoFit = False
         table.Borders.Enable = 1
         table.Rows.AllowBreakAcrossPages = 0
-        table.Range.Style = self.doc.Styles.Item('Table Text')
+        table.Range.Style = self.style_object('Table Text')
         table.TopPadding = table.BottomPadding = 3
         table.LeftPadding = table.RightPadding = 4
         layout = self.layout.get(node['id'], {})
@@ -512,14 +568,19 @@ class ContentComposer(Composer):
             table.Rows.Item(r).Shading.BackgroundPatternColor = 0xEFEFEF
         if layout.get('minRowHeightPt'):
             table.Rows.HeightRule, table.Rows.Height = 1, layout['minRowHeightPt']
-        cells = {(r, c): table.Cell(r + 1, c + 1).Range.Duplicate
-                 for r in range(len(node['rows'])) for c in range(len(node['columns']))}
-        for r, c, rs, cs, cell in reversed(placements):
-            if rs > 1 or cs > 1:
-                cells[r, c].Cells.Item(1).Merge(cells[r + rs - 1, c + cs - 1].Cells.Item(1))
+        if any(rs > 1 or cs > 1 for _, _, rs, cs, _ in placements):
+            # Merging renumbers cells; ranges taken before merging still find each placed cell.
+            cells = {(r, c): table.Cell(r + 1, c + 1).Range.Duplicate
+                     for r in range(len(node['rows'])) for c in range(len(node['columns']))}
+            for r, c, rs, cs, cell in reversed(placements):
+                if rs > 1 or cs > 1:
+                    cells[r, c].Cells.Item(1).Merge(cells[r + rs - 1, c + cs - 1].Cells.Item(1))
+            cell_at = lambda r, c: cells[r, c].Cells.Item(1)
+        else:
+            cell_at = lambda r, c: table.Cell(r + 1, c + 1)
         saved = self.container, self.cell, self.style, self.width
         for r, c, rs, cs, cell in placements:
-            self.container = cells[r, c].Cells.Item(1)
+            self.container = cell_at(r, c)
             self.cell = True
             self.style = 'Table Header' if r < node['headerRows'] else 'Table Text'
             self.width = sum(widths[c:c + cs]) - 8
@@ -608,6 +669,92 @@ class ContentComposer(Composer):
             else:
                 raise ValueError(f'Unsupported block: {kind}')
 
+    def replace_body_marker(self, token, replace):
+        """Replace a note or link marker; markers recorded after it move by the change in body length."""
+        position = self._token_positions.pop(token, None)
+        if position is None:
+            replace(find_text(self.doc, token))
+            return
+        before = self.doc.Content.End
+        replace(self.doc.Range(position, position + utf16_length(token)))
+        delta = self.doc.Content.End - before
+        if delta:
+            for marker, recorded in self._token_positions.items():
+                if recorded > position:
+                    self._token_positions[marker] = recorded + delta
+
+    def compose_note(self, target, identifier):
+        target.Text = ''
+        note = self.doc.Footnotes.Add(Range=target, Text='')
+        saved = self.container, self.cell, self.style, self.width
+        self.container, self.cell, self.style = note, False, -30
+        self.blocks(self.context['index'][identifier]['blocks'])
+        self.trim_container()
+        self.container, self.cell, self.style, self.width = saved
+
+    def add_link(self, target, text, url):
+        # Word can retain a nonempty anchor's placeholder even when
+        # TextToDisplay is supplied. Replace the range explicitly before
+        # adding the hyperlink so the saved document contains source text.
+        target.Text = text
+        self.doc.Hyperlinks.Add(target, url)
+
+    def add_field(self, token, rng, code, bookmark):
+        field = self.doc.Fields.Add(rng, -1, code, False)
+        font = field.Code.Font
+        font.Bold, font.Italic = 0, 0
+        if bookmark:
+            self._bookmark_collection.Add(bookmark, field.Result)
+
+    def finish(self):
+        """Body markers go back to front, so each replacement leaves earlier positions unchanged.
+
+        A collapsed or adjacent Word range does not follow a field inserted right before it,
+        so the end of a 「章号-序号」 bookmark is tracked from the change in body length.
+        Markers inside footnotes are not recorded and are found by searching.
+        """
+        if self._finished:
+            raise RuntimeError('Composer.finish() may only be called once.')
+        doc = self.doc
+        fields = {token: (code, bookmark) for token, code, bookmark in self._pending_fields}
+        openings = {begin: (end, bookmark) for begin, end, bookmark in self._pending_numbers}
+        closings = {end for _, end, _ in self._pending_numbers}
+        open_number = None
+        for position, token in sorted(((p, t) for t, p in self._token_positions.items()), reverse=True):
+            rng = doc.Range(position, position + utf16_length(token))
+            if token in fields:
+                if open_number is None:
+                    self.add_field(token, rng, *fields.pop(token))
+                    continue
+                before = doc.Content.End
+                self.add_field(token, rng, *fields.pop(token))
+                open_number[1] += doc.Content.End - before
+            elif token in closings:
+                if open_number is not None:
+                    raise RuntimeError(f'Number marker nested in another number: {token}')
+                rng.Delete()
+                open_number = [token, position]
+            elif token in openings:
+                end_token, bookmark = openings.pop(token)
+                if open_number is None or open_number[0] != end_token:
+                    raise RuntimeError(f'Number marker without its end: {token}')
+                rng.Delete()
+                self._bookmark_collection.Add(bookmark, doc.Range(position, open_number[1] - utf16_length(token)))
+                open_number = None
+            else:
+                raise RuntimeError(f'Body marker left unhandled: {token}')
+        if openings:
+            raise RuntimeError(f'Number markers outside the body: {sorted(openings)}')
+        finder = MarkerFinder(doc)
+        for token, code, bookmark in self._pending_fields:
+            if token in fields:
+                self.add_field(token, finder.find(token), *fields.pop(token))
+        for table in doc.Tables:
+            following = doc.Range(table.Range.End, table.Range.End).Paragraphs.First.Format
+            following.SpaceBefore = max(6, following.SpaceBefore)
+        self._finished = True
+        return self.pending_math
+
     def build(self):
         metadata = self.content['metadata']
         values = dict(reportTitle=metadata['title'], projectName='', author='、'.join(metadata.get('authors', [])),
@@ -623,21 +770,9 @@ class ContentComposer(Composer):
         self.doc.Bookmarks.Add('ReportBodyStart', self.doc.Range(start, start))
         self.blocks(self.content['blocks'])
         for token, identifier in self.note_tokens:
-            target = find_text(self.doc, token)
-            target.Text = ''
-            note = self.doc.Footnotes.Add(Range=target, Text='')
-            saved = self.container, self.cell, self.style, self.width
-            self.container, self.cell, self.style = note, False, -30
-            self.blocks(self.context['index'][identifier]['blocks'])
-            self.trim_container()
-            self.container, self.cell, self.style, self.width = saved
+            self.replace_body_marker(token, lambda target: self.compose_note(target, identifier))
         for token, text, url in self.links:
-            target = find_text(self.doc, token)
-            # Word can retain a nonempty anchor's placeholder even when
-            # TextToDisplay is supplied. Replace the range explicitly before
-            # adding the hyperlink so the saved document contains source text.
-            target.Text = text
-            self.doc.Hyperlinks.Add(target, url)
+            self.replace_body_marker(token, lambda target: self.add_link(target, text, url))
         pending = self.finish()
         for index, section in enumerate(self.doc.Sections, 1):
             if index > 1:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@godcreator/word-report",
-  "version": "0.5.1",
+  "version": "0.6.1",
   "author": {
     "name": "godcreator"
   },