@godcreator/word-report 0.5.0 → 0.6.0

package/dist/cli.mjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
-import { n as reportExport, r as checkReports } from "./export-B01-yaAq.mjs";
-import { o as reportEntryIn, s as reportEntryOf } from "./report-files-Dfr71bRv.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-C1RVv6E-.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-B01-yaAq.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-C1RVv6E-.mjs";
-import { l as reportsDirName, t as JSON_ENTRY_NAME } from "./report-files-Dfr71bRv.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-C1RVv6E-.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;
@@ -315,30 +316,59 @@ function collectElement(context, element, marks, out) {
 			return;
 		default:
 			if (name !== null && BLOCK_COMPONENTS.has(name)) failAt(context, element, `<${name}> 要单独成段，前后空一行，不写在一段文字中间`);
-			failAt(context, element, `认不出组件 <${name ?? ""}>：行内只能用 WordRef、WordCite、WordPlainMath、sub、sup、strong、em、br`);
+			failAt(context, element, unknownComponentMessage(name ?? "", "行内只能用 WordRef、WordCite、WordPlainMath 与 HTML 标签 sub、sup、strong、em、br"));
 	}
 }
-const PLAIN_MATH_MARKS = [
+/** 认不出的元素：大写开头、不以 Word 开头的单独说明——报告的组件名都以 Word 开头，小写的只认几个 HTML 标签 */
+function unknownComponentMessage(name, allowed) {
+	if (/^[A-Z]/.test(name) && !name.startsWith("Word")) return `报告里的组件都以 Word 开头，<${name}> 不认：${allowed}`;
+	return `认不出组件 <${name}>：${allowed}`;
+}
+/** <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 = [];
@@ -593,7 +623,7 @@ function componentOf(context, element, place) {
 		case "tr":
 		case "th":
 		case "td": return failAt(context, element, `<${element.name}> 只能写在 <WordTable> 里：不编号的简单表格直接写 GFM 表格`);
-		default: return failAt(context, element, `认不出组件 <${element.name ?? ""}>：块级只能用 Figure、Figures、Table、Abstract、Bibliography`);
+		default: return failAt(context, element, unknownComponentMessage(element.name ?? "", "块级只能用 WordFigure、WordFigures、WordTable、WordAbstract、WordBibliography"));
 	}
 }
 function captionOf(context, element, what) {

package/dist/node.mjs

@@ -1,3 +1,3 @@
-import { i as readReport, n as reportExport, r as checkReports, t as reportEntry } from "./export-B01-yaAq.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-Dfr71bRv.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-Dfr71bRv.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-C1RVv6E-.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-C1RVv6E-.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-Dfr71bRv.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/package.json

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