@godcreator/word-report 0.3.1 → 0.4.1

package/dist/node.d.mts

@@ -1,5 +1,5 @@
 import { n as AssemblyOptions, r as AssemblyResult } from "./types-Bcl48xQN.mjs";
-import { a as ReportCheckDiagnostic, i as reportExport, n as ReportExportResult, o as ReportCheckResult, r as reportEntry, s as checkReports, t as ReportExportOptions } from "./export-DC764Umz.mjs";
+import { a as ConvertReportResult, c as ReportCheckResult, i as reportExport, l as checkReports, n as ReportExportResult, o as convertReportToMdx, r as reportEntry, s as ReportCheckDiagnostic, t as ReportExportOptions } from "./export-Da4yhrZa.mjs";
 //#region src/node/read-report.d.ts
 interface SnapshotEntry {
   path: string;
@@ -18,18 +18,24 @@ declare function readReport(entryAbsolute: string, options?: AssemblyOptions & {
 }): Promise<ReadReportResult>;
 //#endregion
 //#region src/node/report-files.d.ts
-/** 站点里的报告：站点根下 reports/<报告 id>/content.json，章节与图片在同一个报告目录里 */
+/** 站点里的报告：站点根下 reports/<报告 id>/，入口是 content.json（JSON 报告）或 index.mdx（MDX 报告），两种只能有一种 */
 declare const reportsDirName = "reports";
+declare const JSON_ENTRY_NAME = "content.json";
 /** 报告 id 就是报告目录名，出现在网址里：小写字母、数字与 -，以字母或数字开头 */
 declare const REPORT_ID_PATTERN: RegExp;
-/** 报告的入口，相对站点目录 */
+/** JSON 报告的入口，相对站点目录；报告是哪种格式要看磁盘，用 reportEntryIn */
 declare function reportEntryOf(reportId: string): string;
-/** 站点里的报告 id：reports/ 下有 content.json 的目录，按名字排；目录名不合 REPORT_ID_PATTERN 的直接报错，不悄悄跳过 */
+declare const isMdxEntry: (entry: string) => boolean;
+/** 一份报告的入口，相对站点目录：reports/<id>/content.json 或 reports/<id>/index.mdx */
+declare function reportEntryIn(siteDir: string, reportId: string): Promise<string>;
+/** 站点里的报告 id：reports/ 下有入口文件的目录，按名字排；目录名不合 REPORT_ID_PATTERN 的直接报错，不悄悄跳过 */
 declare function reportIdsOf(siteDir: string): Promise<string[]>;
 /**
  * 读一份报告组装要的全部 JSON 文件（入口与它 include 到的章节），键是相对站点目录的路径，交给 assembleDocument。
  * 不读图片、不解码：网页显示用；检查与导出用 readReport，它还核对图片与快照
  */
 declare function readReportFiles(siteDir: string, entry: string): Promise<Record<string, string>>;
+/** 读一份 MDX 报告的全部原文：入口、chapters 列的各章、存在时的 references.mdx，键是相对站点目录的路径，交给 assembleMdxReport */
+declare function readMdxReportFiles(siteDir: string, entry: string): Promise<Record<string, string>>;
 //#endregion
-export { REPORT_ID_PATTERN, type ReadReportResult, type ReportCheckDiagnostic, type ReportCheckResult, type ReportExportOptions, type ReportExportResult, type SnapshotEntry, checkReports, readReport, readReportFiles, reportEntry, reportEntryOf, reportExport, reportIdsOf, reportsDirName };
+export { type ConvertReportResult, JSON_ENTRY_NAME, REPORT_ID_PATTERN, type ReadReportResult, type ReportCheckDiagnostic, type ReportCheckResult, type ReportExportOptions, type ReportExportResult, type SnapshotEntry, checkReports, convertReportToMdx, isMdxEntry, readMdxReportFiles, readReport, readReportFiles, reportEntry, reportEntryIn, reportEntryOf, reportExport, reportIdsOf, reportsDirName };

package/dist/node.mjs

@@ -1,3 +1,3 @@
-import { i as readReport, n as reportExport, r as checkReports, t as reportEntry } from "./export-TbclsIsE.mjs";
-import { a as reportsDirName, i as reportIdsOf, n as readReportFiles, r as reportEntryOf, t as REPORT_ID_PATTERN } from "./report-files-DM9Ea6yK.mjs";
-export { REPORT_ID_PATTERN, checkReports, readReport, readReportFiles, reportEntry, reportEntryOf, reportExport, reportIdsOf, reportsDirName };
+import { a as readReport, i as checkReports, n as reportEntry, r as reportExport, t as convertReportToMdx } from "./convert-o7bPWP9A.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-BsIvifZe.mjs";
+export { JSON_ENTRY_NAME, REPORT_ID_PATTERN, checkReports, convertReportToMdx, isMdxEntry, readMdxReportFiles, readReport, readReportFiles, reportEntry, reportEntryIn, reportEntryOf, reportExport, reportIdsOf, reportsDirName };

package/dist/report-files-BsIvifZe.mjs

@@ -0,0 +1,103 @@
+import { i as validateDocument, n as safeRelativePath, o as parseReportJson, s as ReportContentError } from "./assemble-BpllQNVY.mjs";
+import { r as MDX_ENTRY_NAME, s as mdxReportInputsOf } from "./mdx-4Rs1N1nv.mjs";
+import { readFile, readdir, realpath, stat } from "node:fs/promises";
+import path from "node:path";
+//#region src/node/report-files.ts
+/** 站点里的报告：站点根下 reports/<报告 id>/，入口是 content.json（JSON 报告）或 index.mdx（MDX 报告），两种只能有一种 */
+const reportsDirName = "reports";
+const JSON_ENTRY_NAME = "content.json";
+/** 报告 id 就是报告目录名，出现在网址里：小写字母、数字与 -，以字母或数字开头 */
+const REPORT_ID_PATTERN = /^[a-z0-9][a-z0-9-]{0,63}$/;
+/** JSON 报告的入口，相对站点目录；报告是哪种格式要看磁盘，用 reportEntryIn */
+function reportEntryOf(reportId) {
+	if (!REPORT_ID_PATTERN.test(reportId)) throw new ReportContentError(`报告 id 只能是小写字母、数字与 -，以字母或数字开头：${JSON.stringify(reportId)}`);
+	return `${reportsDirName}/${reportId}/${JSON_ENTRY_NAME}`;
+}
+const isMdxEntry = (entry) => entry === "index.mdx" || entry.endsWith(`/index.mdx`);
+async function isFile(file) {
+	return stat(file).then((info) => info.isFile(), (error) => {
+		if (error.code === "ENOENT") return false;
+		throw error;
+	});
+}
+/** 报告目录里有哪种入口：两种都有直接报错，都没有回 undefined */
+async function entryNameIn(reportDir, reportId) {
+	const [hasJson, hasMdx] = await Promise.all([isFile(path.join(reportDir, JSON_ENTRY_NAME)), isFile(path.join(reportDir, MDX_ENTRY_NAME))]);
+	if (hasJson && hasMdx) throw new ReportContentError(`报告目录里 ${JSON_ENTRY_NAME} 和 ${MDX_ENTRY_NAME} 只能留一个`, `${reportsDirName}/${reportId}`);
+	return hasJson ? JSON_ENTRY_NAME : hasMdx ? MDX_ENTRY_NAME : void 0;
+}
+/** 一份报告的入口，相对站点目录：reports/<id>/content.json 或 reports/<id>/index.mdx */
+async function reportEntryIn(siteDir, reportId) {
+	const jsonEntry = reportEntryOf(reportId);
+	const name = await entryNameIn(path.join(siteDir, path.dirname(jsonEntry)), reportId);
+	if (name === void 0) throw new ReportContentError(`站点里没有报告 ${reportId}：reports/${reportId}/ 下既没有 ${JSON_ENTRY_NAME} 也没有 ${MDX_ENTRY_NAME}`, siteDir);
+	return `${reportsDirName}/${reportId}/${name}`;
+}
+/** 站点里的报告 id：reports/ 下有入口文件的目录，按名字排；目录名不合 REPORT_ID_PATTERN 的直接报错，不悄悄跳过 */
+async function reportIdsOf(siteDir) {
+	const reportsDir = path.join(siteDir, reportsDirName);
+	let entries;
+	try {
+		entries = await readdir(reportsDir, { withFileTypes: true });
+	} catch (error) {
+		if (error.code === "ENOENT") return [];
+		throw error;
+	}
+	const ids = [];
+	for (const entry of entries) {
+		if (!entry.isDirectory()) continue;
+		if (await entryNameIn(path.join(reportsDir, entry.name), entry.name) === void 0) continue;
+		reportEntryOf(entry.name);
+		ids.push(entry.name);
+	}
+	return ids.sort();
+}
+/** 读站点目录里的一个文件（相对路径），挡住经符号链接跑出站点目录的 */
+async function readInsideSite(root, relative) {
+	let real;
+	try {
+		real = await realpath(path.join(root, relative));
+	} catch {
+		throw new ReportContentError("Missing or unreadable file", relative);
+	}
+	const inside = path.relative(root, real);
+	if (inside === ".." || inside.startsWith(".." + path.sep) || path.isAbsolute(inside)) throw new ReportContentError("File escapes report root", relative);
+	return readFile(real, "utf8");
+}
+/**
+* 读一份报告组装要的全部 JSON 文件（入口与它 include 到的章节），键是相对站点目录的路径，交给 assembleDocument。
+* 不读图片、不解码：网页显示用；检查与导出用 readReport，它还核对图片与快照
+*/
+async function readReportFiles(siteDir, entry) {
+	const root = await realpath(siteDir);
+	const files = {};
+	const load = async (relative) => {
+		if (Object.hasOwn(files, relative)) return;
+		const text = await readInsideSite(root, relative);
+		files[relative] = text;
+		const document = parseReportJson(text, relative);
+		validateDocument(document, relative);
+		for (const [index, block] of document.blocks.entries()) {
+			if (block.type !== "include") continue;
+			try {
+				safeRelativePath(block.src);
+			} catch (error) {
+				throw new ReportContentError(error.message, relative, `/blocks/${index}/src`);
+			}
+			await load(path.posix.join(path.posix.dirname(relative), block.src));
+		}
+	};
+	await load(entry);
+	return files;
+}
+/** 读一份 MDX 报告的全部原文：入口、chapters 列的各章、存在时的 references.mdx，键是相对站点目录的路径，交给 assembleMdxReport */
+async function readMdxReportFiles(siteDir, entry) {
+	const root = await realpath(siteDir);
+	const files = { [entry]: await readInsideSite(root, entry) };
+	const { chapters, references } = mdxReportInputsOf(files[entry], entry);
+	for (const chapter of chapters) files[chapter] = await readInsideSite(root, chapter);
+	if (await isFile(path.join(root, references))) files[references] = await readInsideSite(root, references);
+	return files;
+}
+//#endregion
+export { readReportFiles as a, reportIdsOf as c, readMdxReportFiles as i, reportsDirName as l, REPORT_ID_PATTERN as n, reportEntryIn as o, isMdxEntry as r, reportEntryOf as s, JSON_ENTRY_NAME as t };

package/dist/site-server.mjs

@@ -1,5 +1,6 @@
-import { t as assembleDocument } from "./assemble-3cx8L2vo.mjs";
-import { i as reportIdsOf, n as readReportFiles, r as reportEntryOf, t as REPORT_ID_PATTERN } from "./report-files-DM9Ea6yK.mjs";
+import { t as assembleDocument } from "./assemble-BpllQNVY.mjs";
+import { a as assembleMdxReport, r as MDX_ENTRY_NAME, s as mdxReportInputsOf } from "./mdx-4Rs1N1nv.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-BsIvifZe.mjs";
 import { n as reportHrefOf } from "./page-data-DLPoVgXy.mjs";
 import { readFile, realpath, stat } from "node:fs/promises";
 import path from "node:path";
@@ -8,7 +9,7 @@ import { Readable } from "node:stream";
 //#region src/site/loaders.server.ts
 /**
 * `@godcreator/word-report/site/server`：报告列表、报告页与报告里图片的 loader。报告从站点 reports/ 现读，
-* 报告页与图片在 JSON 原文没变时沿用上一次的组装结果。
+* 原文没变时沿用上一次的组装结果。
 */
 /** 组装结果里有 Object.create(null) 的对象：换成普通对象再交给 React Router 序列化 */
 const plainOf = (result) => JSON.parse(JSON.stringify(result));
@@ -18,75 +19,94 @@ const plainOf = (result) => JSON.parse(JSON.stringify(result));
 */
 const latestAssemblies = /* @__PURE__ */ new Map();
 async function assembleFromDisk(siteDir, reportId) {
-	const entry = reportEntryOf(reportId);
+	const entry = await reportEntryIn(siteDir, reportId);
+	const reportDir = path.posix.dirname(entry);
+	if (isMdxEntry(entry)) {
+		const files = await readMdxReportFiles(siteDir, entry);
+		const { chapters, references } = mdxReportInputsOf(files[entry], entry);
+		return {
+			files,
+			absentFiles: [`${reportDir}/${JSON_ENTRY_NAME}`, ...Object.hasOwn(files, references) ? [] : [references]],
+			result: assembleMdxReport({
+				reportId,
+				entry,
+				files
+			}, { mode: "complete" }),
+			chapterCount: chapters.length
+		};
+	}
 	const files = await readReportFiles(siteDir, entry);
+	const entryDocument = JSON.parse(files[entry]);
+	const result = assembleDocument(entry, files, { mode: "complete" });
 	return {
 		files,
-		result: assembleDocument(entry, files, { mode: "complete" })
+		absentFiles: [`${reportDir}/${MDX_ENTRY_NAME}`],
+		result,
+		chapterCount: entryDocument.blocks.filter((block) => block.type === "include").length
 	};
 }
-/** 上次组装读过的每个 JSON 文件原文都没变；文件没了也算变了，交给重新组装去报错 */
-async function sameFilesOnDisk(siteDir, files) {
+/** 上次组装读过的每个文件原文都没变、当时不存在的文件仍不存在；读过的文件没了也算变了，交给重新组装去报错 */
+async function unchangedOnDisk(siteDir, assembly) {
 	const root = await realpath(siteDir);
-	return (await Promise.all(Object.entries(files).map(async ([relative, text]) => {
+	const textOrMissing = async (relative) => {
 		try {
-			return await readFile(path.join(root, relative), "utf8") === text;
+			return await readFile(path.join(root, relative), "utf8");
 		} catch (error) {
-			if (error.code === "ENOENT") return false;
+			if (error.code === "ENOENT") return null;
 			throw error;
 		}
-	}))).every(Boolean);
+	};
+	const [sameTexts, stillAbsent] = await Promise.all([Promise.all(Object.entries(assembly.files).map(async ([relative, text]) => await textOrMissing(relative) === text)), Promise.all(assembly.absentFiles.map(async (relative) => await textOrMissing(relative) === null))]);
+	return [...sameTexts, ...stillAbsent].every(Boolean);
 }
-/** 报告的整份组装结果：JSON 原文和上次一样就用上次的，同时到的请求共用同一次组装；结果只读，要改先复制 */
-async function assembledReport(siteDir, reportId) {
+/** 报告的整份组装：原文和上次一样就用上次的，同时到的请求共用同一次组装；结果只读，要改先复制 */
+async function latestAssembly(siteDir, reportId) {
 	const key = `${path.resolve(siteDir)}\0${reportId}`;
 	const latest = latestAssemblies.get(key);
 	if (latest !== void 0) {
 		const assembly = await latest;
-		if (await sameFilesOnDisk(siteDir, assembly.files)) return assembly.result;
+		if (await unchangedOnDisk(siteDir, assembly)) return assembly;
 	}
 	const newer = latestAssemblies.get(key);
-	if (newer !== void 0 && newer !== latest) return (await newer).result;
+	if (newer !== void 0 && newer !== latest) return newer;
 	const fresh = assembleFromDisk(siteDir, reportId);
 	latestAssemblies.set(key, fresh);
 	try {
-		return (await fresh).result;
+		return await fresh;
 	} catch (error) {
 		if (latestAssemblies.get(key) === fresh) latestAssemblies.delete(key);
 		throw error;
 	}
 }
+async function assembledReport(siteDir, reportId) {
+	return (await latestAssembly(siteDir, reportId)).result;
+}
 /** 地址里的报告 id：形状不对或站点里没有这份报告都是 404 */
 async function reportIdOf(params, siteDir) {
 	const reportId = params["report"] ?? "";
 	if (!REPORT_ID_PATTERN.test(reportId) || !(await reportIdsOf(siteDir)).includes(reportId)) throw new Response(`站点里没有报告 ${reportId}`, { status: 404 });
 	return reportId;
 }
-function summaryOf(reportId, files, result, problem) {
-	const metadata = result?.document.metadata ?? {};
-	const entryDocument = files === null ? null : JSON.parse(files[reportEntryOf(reportId)]);
+function summaryOf(reportId, read, problem) {
+	const metadata = read?.result.document.metadata ?? {};
 	return {
 		id: reportId,
 		title: metadata.title ?? reportId,
 		revision: metadata.revision ?? null,
 		date: metadata.date ?? null,
 		authors: metadata.authors ?? [],
-		chapterCount: entryDocument?.blocks.filter((block) => block.type === "include").length ?? 0,
-		warningCount: result?.warnings.length ?? 0,
+		chapterCount: read?.chapterCount ?? 0,
+		warningCount: read?.result.warnings.length ?? 0,
 		problem
 	};
 }
 /** 报告列表：站点 reports/ 下的每份报告各一行；读不对的报告也列出来，带上原话 */
 async function reportListLoader(_args, site) {
 	const reports = [];
-	for (const reportId of await reportIdsOf(site.siteDir)) {
-		let files = null;
-		try {
-			files = await readReportFiles(site.siteDir, reportEntryOf(reportId));
-			reports.push(summaryOf(reportId, files, assembleDocument(reportEntryOf(reportId), files, { mode: "complete" }), null));
-		} catch (error) {
-			reports.push(summaryOf(reportId, null, null, error instanceof Error ? error.message : String(error)));
-		}
+	for (const reportId of await reportIdsOf(site.siteDir)) try {
+		reports.push(summaryOf(reportId, await latestAssembly(site.siteDir, reportId), null));
+	} catch (error) {
+		reports.push(summaryOf(reportId, null, error instanceof Error ? error.message : String(error)));
 	}
 	return {
 		siteName: site.siteName,

package/dist/site.mjs

@@ -1,4 +1,4 @@
-import { t as assembleDocument } from "./assemble-3cx8L2vo.mjs";
+import { t as assembleDocument } from "./assemble-BpllQNVY.mjs";
 import { n as reportHrefOf, t as reportAssetHrefOf } from "./page-data-DLPoVgXy.mjs";
 import { Link, useLoaderData } from "react-router";
 import { DocsBody, DocsPage, DocsTitle } from "@fumadocs/base-ui/layouts/docs/page";

package/engine/src/docreport/compose.py

@@ -61,10 +61,19 @@ class Composer:
         if kind not in ('Table', 'Figure'):
             raise ValueError(f'Unknown caption kind: {kind}')
         name = {'Table': '表', 'Figure': '图'}[kind]
-        number = self.field_token('SEQ ' + kind + r' \* ARABIC', bookmark)
+        number = self.chapter_number(r'STYLEREF 1 \s', 'SEQ ' + kind + r' \* ARABIC \s 1', bookmark)
         return self.paragraph(f'{name} {number}  {text}',
                               'Table Caption' if kind == 'Table' else -35)
 
+    def chapter_number(self, chapter_code, sequence_code, bookmark):
+        """Return「章号-序号」 placeholders; ``bookmark`` spans both fields so REF shows the whole number."""
+        chapter = self.field_token(chapter_code)
+        number = self.field_token(sequence_code)
+        index = len(self._pending_numbers)
+        begin, end = f'@NUMSTART{index}@', f'@NUMEND{index}@'
+        self._pending_numbers.append((begin, end, bookmark))
+        return f'{begin}{chapter}-{number}{end}'
+
     def list(self, items, ordered=False):
         doc = self.doc
         list_start = doc.Content.End - 1
@@ -100,12 +109,8 @@ class Composer:
                                       boldSymbol=bold_symbol))
         if inline:
             return self.paragraph(before + token + after)
-        chapter = self.field_token(r'STYLEREF 1 \s')
-        number = self.field_token(r'SEQ Equation \* ARABIC \s 1')
-        index = len(self._pending_numbers)
-        begin, end = f'@NUMSTART{index}@', f'@NUMEND{index}@'
-        self._pending_numbers.append((begin, end, bookmark))
-        return self.paragraph(f'\t{token}\t({begin}{chapter}-{number}{end})', 'Equation')
+        number = self.chapter_number(r'STYLEREF 1 \s', r'SEQ Equation \* ARABIC \s 1', bookmark)
+        return self.paragraph(f'\t{token}\t({number})', 'Equation')
 
     def footnote(self, token, text):
         rng = self.doc.Content.Duplicate
@@ -313,12 +318,26 @@ class ContentComposer(Composer):
                     setattr(run.Font, {'strong': 'Bold', 'em': 'Italic', 'sup': 'Superscript', 'sub': 'Subscript'}[mark], True)
         return rng
 
+    def chapter_sequence(self, kind, bookmark):
+        """「章号-序号」 for an equation, figure or table in the current top-level chapter."""
+        if self.chapter_is_appendix:
+            # The SEQ "\s 1" restart only fires on built-in Heading 1
+            # paragraphs; the template's Appendix Heading is Normal-based,
+            # so appendix sequences never restart there. Giving each
+            # appendix its own SEQ identifier keeps a natural 1, 2, 3 …
+            # count that renumbers on insert or delete like main chapters,
+            # without touching heading styles or their linked lists.
+            letter = chr(ord('A') + self.appendix_count - 1)
+            return self.chapter_number(r'STYLEREF "Appendix Heading" \s',
+                                       'SEQ ' + kind + 'Appendix' + letter + r' \* ARABIC', bookmark)
+        return self.chapter_number(r'STYLEREF 1 \s', 'SEQ ' + kind + r' \* ARABIC \s 1', bookmark)
+
     def numbered_caption(self, node, kind):
         from .content import bookmark
         numbered = node.get('numbered', True)
         prefix = ''
         if numbered:
-            prefix = {'Figure': '图 ', 'Table': '表 '}[kind] + self.field_token('SEQ ' + kind + r' \* ARABIC', bookmark(node['id'], '_n')) + '  '
+            prefix = {'Figure': '图 ', 'Table': '表 '}[kind] + self.chapter_sequence(kind, bookmark(node['id'], '_n')) + '  '
         rng = self.rich_paragraph(node['caption'], 'Table Caption' if kind == 'Table' else -35, prefix=prefix)
         title = self.part(rng, utf16_length(prefix), rng.End - rng.Start - utf16_length(prefix) - 1)
         self.mark(node['id'], title, '_t')
@@ -416,24 +435,9 @@ class ContentComposer(Composer):
         token = self.math_token(node, False)
         suffix = ''
         if node['numbered']:
-            chapter = self.field_token(r'STYLEREF 1 \s' if self.chapter_style == 'Heading 1' else r'STYLEREF "Appendix Heading" \s')
-            if self.chapter_is_appendix:
-                # The SEQ "\s 1" restart only fires on built-in Heading 1
-                # paragraphs; the template's Appendix Heading is Normal-based,
-                # so appendix sequences never restart there. Giving each
-                # appendix its own SEQ identifier keeps a natural 1, 2, 3 …
-                # count that renumbers on insert or delete like main chapters,
-                # without touching heading styles or their linked lists.
-                letter = chr(ord('A') + self.appendix_count - 1)
-                number = self.field_token(r'SEQ EquationAppendix' + letter + r' \* ARABIC')
-            else:
-                number = self.field_token(r'SEQ Equation \* ARABIC \s 1')
-            self.chapter_first_equation = False
-            i = len(self._pending_numbers)
-            begin, end = f'@NUMSTART{i}@', f'@NUMEND{i}@'
             from .content import bookmark
-            self._pending_numbers.append((begin, end, bookmark(node['id'], '_n')))
-            suffix = f'\t({begin}{chapter}-{number}{end})'
+            self.chapter_first_equation = False
+            suffix = '\t(' + self.chapter_sequence('Equation', bookmark(node['id'], '_n')) + ')'
         rng = self.paragraph('\t' + token + suffix, 'Equation')
         rng.ParagraphFormat.TabStops.ClearAll()
         rng.ParagraphFormat.TabStops.Add(self.width / 2, 1, 0)

package/engine/src/docreport/content.py

@@ -166,7 +166,10 @@ def validate_content(content, directory):
                 blocks(item["children"], depth + 1, scope, mode, tables)
             elif kind == "equation" and item["numbered"]:
                 require(chapter is not None, f"{item['id']}: numbered equation outside a chapter")
+            elif kind == "figure":
+                require(chapter is not None, f"{item['id']}: numbered figure outside a chapter")
             elif kind == "table":
+                require(chapter is not None or not item["numbered"], f"{item['id']}: numbered table outside a chapter")
                 require(tables < 6, f"{item['id']}: Word renderer supports at most six table levels")
                 for row in item["rows"]:
                     for cell in row["cells"]:

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@godcreator/word-report",
-  "version": "0.3.1",
+  "version": "0.4.1",
   "author": {
     "name": "godcreator"
   },
   "type": "module",
-  "description": "报告：JSON 报告文档的格式、校验与分章组装（.）；读报告目录、检查、导出 Word 的命令行 report-docx（./node）；报告页与报告列表（./site），两页与图片的 loader（./site/server）；engine/ 是驱动本机 Word 的 Python 导出引擎与 .dotx 模板；template/ 是建站器复制进站点 app/features/word-report/ 的接线文件（两条页面路由、图片路由、侧栏入口、样式）。",
+  "description": "报告：JSON 报告文档的格式、校验与分章组装，MDX 写法编译成它（.）；读报告目录、检查、导出 Word、JSON 报告转 MDX 的命令行 report-docx（./node）；报告页与报告列表（./site），两页与图片的 loader（./site/server）；engine/ 是驱动本机 Word 的 Python 导出引擎与 .dotx 模板；template/ 是建站器复制进站点 app/features/word-report/ 的接线文件（两条页面路由、图片路由、侧栏入口、样式）。",
   "license": "MIT",
   "exports": {
     ".": {
@@ -43,7 +43,14 @@
   ],
   "dependencies": {
     "@godcreator/comments": "^0.1.3",
-    "sharp": "^0.35.5"
+    "remark-frontmatter": "^5.0.0",
+    "remark-gfm": "^4.0.1",
+    "remark-math": "^6.0.0",
+    "remark-mdx": "^3.1.0",
+    "remark-parse": "^11.0.0",
+    "sharp": "^0.35.5",
+    "unified": "^11.0.5",
+    "yaml": "^2.9.1"
   },
   "peerDependencies": {
     "@fumadocs/base-ui": "^16.17.1",

package/dist/report-files-DM9Ea6yK.mjs

@@ -1,72 +0,0 @@
-import { a as parseReportJson, n as safeRelativePath, o as ReportContentError, r as validateDocument } from "./assemble-3cx8L2vo.mjs";
-import { readFile, readdir, realpath, stat } from "node:fs/promises";
-import path from "node:path";
-//#region src/node/report-files.ts
-/** 站点里的报告：站点根下 reports/<报告 id>/content.json，章节与图片在同一个报告目录里 */
-const reportsDirName = "reports";
-/** 报告 id 就是报告目录名，出现在网址里：小写字母、数字与 -，以字母或数字开头 */
-const REPORT_ID_PATTERN = /^[a-z0-9][a-z0-9-]{0,63}$/;
-/** 报告的入口，相对站点目录 */
-function reportEntryOf(reportId) {
-	if (!REPORT_ID_PATTERN.test(reportId)) throw new ReportContentError(`报告 id 只能是小写字母、数字与 -，以字母或数字开头：${JSON.stringify(reportId)}`);
-	return `${reportsDirName}/${reportId}/content.json`;
-}
-/** 站点里的报告 id：reports/ 下有 content.json 的目录，按名字排；目录名不合 REPORT_ID_PATTERN 的直接报错，不悄悄跳过 */
-async function reportIdsOf(siteDir) {
-	const reportsDir = path.join(siteDir, reportsDirName);
-	let entries;
-	try {
-		entries = await readdir(reportsDir, { withFileTypes: true });
-	} catch (error) {
-		if (error.code === "ENOENT") return [];
-		throw error;
-	}
-	const ids = [];
-	for (const entry of entries) {
-		if (!entry.isDirectory()) continue;
-		if (!await stat(path.join(reportsDir, entry.name, "content.json")).then((info) => info.isFile(), (error) => {
-			if (error.code === "ENOENT") return false;
-			throw error;
-		})) continue;
-		reportEntryOf(entry.name);
-		ids.push(entry.name);
-	}
-	return ids.sort();
-}
-/**
-* 读一份报告组装要的全部 JSON 文件（入口与它 include 到的章节），键是相对站点目录的路径，交给 assembleDocument。
-* 不读图片、不解码：网页显示用；检查与导出用 readReport，它还核对图片与快照
-*/
-async function readReportFiles(siteDir, entry) {
-	const root = await realpath(siteDir);
-	const files = {};
-	const load = async (relative) => {
-		if (Object.hasOwn(files, relative)) return;
-		const absolute = path.join(root, relative);
-		let real;
-		try {
-			real = await realpath(absolute);
-		} catch {
-			throw new ReportContentError("Missing or unreadable file", relative);
-		}
-		const inside = path.relative(root, real);
-		if (inside === ".." || inside.startsWith(".." + path.sep) || path.isAbsolute(inside)) throw new ReportContentError("File escapes report root", relative);
-		const text = await readFile(real, "utf8");
-		files[relative] = text;
-		const document = parseReportJson(text, relative);
-		validateDocument(document, relative);
-		for (const [index, block] of document.blocks.entries()) {
-			if (block.type !== "include") continue;
-			try {
-				safeRelativePath(block.src);
-			} catch (error) {
-				throw new ReportContentError(error.message, relative, `/blocks/${index}/src`);
-			}
-			await load(path.posix.join(path.posix.dirname(relative), block.src));
-		}
-	};
-	await load(entry);
-	return files;
-}
-//#endregion
-export { reportsDirName as a, reportIdsOf as i, readReportFiles as n, reportEntryOf as r, REPORT_ID_PATTERN as t };