js.documents 14.2.0 → 14.3.1

package/dist/diagnostics-C2-C2uUI.d.cts

@@ -0,0 +1,17 @@
+//#region src/edit/docx/diagnostics.d.ts
+type DocxWriteDiagnosticSeverity = "info" | "warning";
+declare const DocxWriteDiagnosticCodes: {
+  readonly TABLE_HEADER_COLUMN_DROPPED: "docx-write/table-header-column-dropped";
+};
+type DocxWriteDiagnosticCode = (typeof DocxWriteDiagnosticCodes)[keyof typeof DocxWriteDiagnosticCodes];
+interface DocxWriteDiagnostic {
+  readonly code: DocxWriteDiagnosticCode;
+  readonly severity: DocxWriteDiagnosticSeverity;
+  readonly message: string;
+}
+type DocxWriteDiagnosticSink = (diagnostic: DocxWriteDiagnostic, context: {
+  readonly sourcePath?: string;
+}) => void;
+declare const NOOP_DOCX_WRITE_DIAGNOSTIC_SINK: DocxWriteDiagnosticSink;
+//#endregion
+export { DocxWriteDiagnosticSink as a, DocxWriteDiagnosticSeverity as i, DocxWriteDiagnosticCode as n, NOOP_DOCX_WRITE_DIAGNOSTIC_SINK as o, DocxWriteDiagnosticCodes as r, DocxWriteDiagnostic as t };

package/dist/diagnostics-C2-C2uUI.d.ts

@@ -0,0 +1,17 @@
+//#region src/edit/docx/diagnostics.d.ts
+type DocxWriteDiagnosticSeverity = "info" | "warning";
+declare const DocxWriteDiagnosticCodes: {
+  readonly TABLE_HEADER_COLUMN_DROPPED: "docx-write/table-header-column-dropped";
+};
+type DocxWriteDiagnosticCode = (typeof DocxWriteDiagnosticCodes)[keyof typeof DocxWriteDiagnosticCodes];
+interface DocxWriteDiagnostic {
+  readonly code: DocxWriteDiagnosticCode;
+  readonly severity: DocxWriteDiagnosticSeverity;
+  readonly message: string;
+}
+type DocxWriteDiagnosticSink = (diagnostic: DocxWriteDiagnostic, context: {
+  readonly sourcePath?: string;
+}) => void;
+declare const NOOP_DOCX_WRITE_DIAGNOSTIC_SINK: DocxWriteDiagnosticSink;
+//#endregion
+export { DocxWriteDiagnosticSink as a, DocxWriteDiagnosticSeverity as i, DocxWriteDiagnosticCode as n, NOOP_DOCX_WRITE_DIAGNOSTIC_SINK as o, DocxWriteDiagnosticCodes as r, DocxWriteDiagnostic as t };

package/dist/edit/docx/content.cjs

@@ -10,6 +10,7 @@ const require_edit_table_grid = require("../table-grid.cjs");
 const require_edit_docx_editor = require("./editor.cjs");
 const require_model_embedded_drawing = require("../../model/embedded-drawing.cjs");
 const require_model_formula = require("../../model/formula.cjs");
+const require_edit_docx_diagnostics = require("./diagnostics.cjs");
 const require_edit_docx_numbering = require("./numbering.cjs");
 let ooxml_js = require("ooxml.js");
 let document_schema_js = require("document-schema.js");
@@ -57,7 +58,6 @@ function buildDocxPackage(content, options) {
 	const remap = /* @__PURE__ */ new Map();
 	if (numIdLevels.size > 0) {
 		const entries = [];
-		let abstractNumId = 0;
 		let numId = 1;
 		for (const [sourceNumId, levels] of numIdLevels) {
 			const remapped = String(numId);
@@ -65,22 +65,22 @@ function buildDocxPackage(content, options) {
 			entries.push({
 				sourceNumId,
 				remappedNumId: remapped,
-				abstractNumId: String(abstractNumId),
-				levels: [...levels].sort((a, b) => a - b)
+				levels
 			});
-			abstractNumId += 1;
 			numId += 1;
 		}
-		const numberingRoot = require_edit_docx_numbering.buildNumberingRoot(entries);
-		pkg.parts[require_edit_docx_numbering.NUMBERING_PART_PATH] = {
-			kind: "xml",
-			nodes: [require_edit_docx_numbering.declaration(), numberingRoot]
-		};
-		require_opc_content_types.ensureContentTypeOverride(pkg, require_edit_docx_numbering.NUMBERING_PART_PATH, require_edit_docx_numbering.NUMBERING_CONTENT_TYPE);
-		require_opc_rels.addRelationship(pkg, "word/document.xml", {
-			type: require_edit_docx_numbering.NUMBERING_REL_TYPE,
-			target: "numbering.xml"
-		});
+		const numberingRoot = (0, ooxml_js.buildNumberingElement)(require_edit_docx_numbering.buildNumberingDefinitions(entries));
+		if (numberingRoot !== void 0) {
+			pkg.parts[require_edit_docx_numbering.NUMBERING_PART_PATH] = {
+				kind: "xml",
+				nodes: [require_edit_docx_numbering.declaration(), numberingRoot]
+			};
+			require_opc_content_types.ensureContentTypeOverride(pkg, require_edit_docx_numbering.NUMBERING_PART_PATH, require_edit_docx_numbering.NUMBERING_CONTENT_TYPE);
+			require_opc_rels.addRelationship(pkg, "word/document.xml", {
+				type: require_edit_docx_numbering.NUMBERING_REL_TYPE,
+				target: "numbering.xml"
+			});
+		}
 	}
 	const editor = new require_edit_docx_editor.DocxEditor(pkg);
 	const markers = new ConstructMarkerState();
@@ -100,10 +100,10 @@ function collectListNumIds(blocks, out) {
 	for (const block of blocks) if (block.kind === "paragraph" && block.list !== void 0) {
 		let levels = out.get(block.list.numId);
 		if (levels === void 0) {
-			levels = /* @__PURE__ */ new Set();
+			levels = /* @__PURE__ */ new Map();
 			out.set(block.list.numId, levels);
 		}
-		levels.add(block.list.level);
+		if (!levels.has(block.list.level)) levels.set(block.list.level, block.list.format);
 	} else if (block.kind === "table") for (const row of block.rows) for (const cell of row.cells) collectListNumIds(cell.blocks, out);
 }
 function remapListNumIds(blocks, numIdMap) {
@@ -114,8 +114,8 @@ function remapListNumIds(blocks, numIdMap) {
 			return remapped === void 0 ? block : {
 				...block,
 				list: {
-					numId: remapped,
-					level: block.list.level
+					...block.list,
+					numId: remapped
 				}
 			};
 		}
@@ -208,8 +208,18 @@ function docxRowCells(positions, positionsByRow) {
 		return [];
 	});
 }
-function appendTable(body, block) {
+function reportDroppedHeaderColumns(block, onDiagnostic) {
+	block.columns.forEach((column, columnIndex) => {
+		if (column.isHeader === true) onDiagnostic({
+			code: require_edit_docx_diagnostics.DocxWriteDiagnosticCodes.TABLE_HEADER_COLUMN_DROPPED,
+			severity: "warning",
+			message: `buildDocxPackage: table column ${String(columnIndex)} is a header column, and that is dropped; w:tblGrid has no header-column marker, so the column is written exactly as any other`
+		}, { sourcePath: block.sourcePath });
+	});
+}
+function appendTable(body, block, options) {
 	require_edit_table_grid.assertTableObeysGridRule(block, "buildDocxPackage");
+	reportDroppedHeaderColumns(block, options?.onDiagnostic ?? require_edit_docx_diagnostics.NOOP_DOCX_WRITE_DIAGNOSTIC_SINK);
 	if (block.rows.length === 0) throw new Error("buildDocxPackage: table has no rows, and a table with no rows cannot be written in every word-processing format (ODF requires at least one table:table-row)");
 	const table = body.appendTable({
 		rows: 0,
@@ -250,7 +260,7 @@ function appendBlock(body, block, options, markers) {
 			altText: block.altText
 		});
 	} else if (block.kind === "pageBreak") body.appendPageBreak();
-	else if (block.kind === "table") appendTable(body, block);
+	else if (block.kind === "table") appendTable(body, block, options);
 	else if (block.kind === "embeddedObject") appendEmbeddedObject(body, block, options);
 	else if (block.kind === "constructStart") markers.openConstruct(body, block);
 	else markers.closeConstruct(body);

package/dist/edit/docx/content.d.cts

@@ -1,5 +1,6 @@
 import { t as ClockPort } from "../../clock-C7SUuYN0.cjs";
 import { t as OmmlDiagnostic } from "../../shared-c0Lp3_iY.cjs";
+import { a as DocxWriteDiagnosticSink } from "../../diagnostics-C2-C2uUI.cjs";
 import { ContentDocument } from "document-schema.js";
 import { Package } from "ooxml.js";
 //#region src/edit/docx/content.d.ts
@@ -8,6 +9,7 @@ interface BuildDocxPackageOptions {
     readonly sourcePath?: string;
   }) => void;
   readonly clock?: ClockPort;
+  readonly onDiagnostic?: DocxWriteDiagnosticSink;
 }
 declare function buildDocxPackage(content: ContentDocument, options?: BuildDocxPackageOptions): Package;
 //#endregion

package/dist/edit/docx/content.d.ts

@@ -1,5 +1,6 @@
 import { t as ClockPort } from "../../clock-C7SUuYN0.js";
 import { t as OmmlDiagnostic } from "../../shared-DHu5jDJf.js";
+import { a as DocxWriteDiagnosticSink } from "../../diagnostics-C2-C2uUI.js";
 import { Package } from "ooxml.js";
 import { ContentDocument } from "document-schema.js";
 //#region src/edit/docx/content.d.ts
@@ -8,6 +9,7 @@ interface BuildDocxPackageOptions {
     readonly sourcePath?: string;
   }) => void;
   readonly clock?: ClockPort;
+  readonly onDiagnostic?: DocxWriteDiagnosticSink;
 }
 declare function buildDocxPackage(content: ContentDocument, options?: BuildDocxPackageOptions): Package;
 //#endregion

package/dist/edit/docx/content.js

@@ -9,8 +9,9 @@ import { assertTableObeysGridRule } from "../table-grid.js";
 import { DocxEditor } from "./editor.js";
 import { FLOW_CONTAINER_ORIGIN, drawingOfBlock, embeddedDrawingVectors } from "../../model/embedded-drawing.js";
 import { formulaOfBlock, formulaPlaceholderText } from "../../model/formula.js";
-import { NUMBERING_CONTENT_TYPE, NUMBERING_PART_PATH, NUMBERING_REL_TYPE, buildNumberingRoot, declaration } from "./numbering.js";
-import { base64ToBytes } from "ooxml.js";
+import { DocxWriteDiagnosticCodes, NOOP_DOCX_WRITE_DIAGNOSTIC_SINK } from "./diagnostics.js";
+import { NUMBERING_CONTENT_TYPE, NUMBERING_PART_PATH, NUMBERING_REL_TYPE, buildNumberingDefinitions, declaration } from "./numbering.js";
+import { base64ToBytes, buildNumberingElement } from "ooxml.js";
 import { resolveCellFillColor, tableCellColumnSpan, tableCellRowSpan, tableGridColumnCount, walkTableGrid } from "document-schema.js";
 //#region src/edit/docx/content.ts
 var ConstructMarkerState = class {
@@ -56,7 +57,6 @@ function buildDocxPackage(content, options) {
 	const remap = /* @__PURE__ */ new Map();
 	if (numIdLevels.size > 0) {
 		const entries = [];
-		let abstractNumId = 0;
 		let numId = 1;
 		for (const [sourceNumId, levels] of numIdLevels) {
 			const remapped = String(numId);
@@ -64,22 +64,22 @@ function buildDocxPackage(content, options) {
 			entries.push({
 				sourceNumId,
 				remappedNumId: remapped,
-				abstractNumId: String(abstractNumId),
-				levels: [...levels].sort((a, b) => a - b)
+				levels
 			});
-			abstractNumId += 1;
 			numId += 1;
 		}
-		const numberingRoot = buildNumberingRoot(entries);
-		pkg.parts[NUMBERING_PART_PATH] = {
-			kind: "xml",
-			nodes: [declaration(), numberingRoot]
-		};
-		ensureContentTypeOverride(pkg, NUMBERING_PART_PATH, NUMBERING_CONTENT_TYPE);
-		addRelationship(pkg, "word/document.xml", {
-			type: NUMBERING_REL_TYPE,
-			target: "numbering.xml"
-		});
+		const numberingRoot = buildNumberingElement(buildNumberingDefinitions(entries));
+		if (numberingRoot !== void 0) {
+			pkg.parts[NUMBERING_PART_PATH] = {
+				kind: "xml",
+				nodes: [declaration(), numberingRoot]
+			};
+			ensureContentTypeOverride(pkg, NUMBERING_PART_PATH, NUMBERING_CONTENT_TYPE);
+			addRelationship(pkg, "word/document.xml", {
+				type: NUMBERING_REL_TYPE,
+				target: "numbering.xml"
+			});
+		}
 	}
 	const editor = new DocxEditor(pkg);
 	const markers = new ConstructMarkerState();
@@ -99,10 +99,10 @@ function collectListNumIds(blocks, out) {
 	for (const block of blocks) if (block.kind === "paragraph" && block.list !== void 0) {
 		let levels = out.get(block.list.numId);
 		if (levels === void 0) {
-			levels = /* @__PURE__ */ new Set();
+			levels = /* @__PURE__ */ new Map();
 			out.set(block.list.numId, levels);
 		}
-		levels.add(block.list.level);
+		if (!levels.has(block.list.level)) levels.set(block.list.level, block.list.format);
 	} else if (block.kind === "table") for (const row of block.rows) for (const cell of row.cells) collectListNumIds(cell.blocks, out);
 }
 function remapListNumIds(blocks, numIdMap) {
@@ -113,8 +113,8 @@ function remapListNumIds(blocks, numIdMap) {
 			return remapped === void 0 ? block : {
 				...block,
 				list: {
-					numId: remapped,
-					level: block.list.level
+					...block.list,
+					numId: remapped
 				}
 			};
 		}
@@ -207,8 +207,18 @@ function docxRowCells(positions, positionsByRow) {
 		return [];
 	});
 }
-function appendTable(body, block) {
+function reportDroppedHeaderColumns(block, onDiagnostic) {
+	block.columns.forEach((column, columnIndex) => {
+		if (column.isHeader === true) onDiagnostic({
+			code: DocxWriteDiagnosticCodes.TABLE_HEADER_COLUMN_DROPPED,
+			severity: "warning",
+			message: `buildDocxPackage: table column ${String(columnIndex)} is a header column, and that is dropped; w:tblGrid has no header-column marker, so the column is written exactly as any other`
+		}, { sourcePath: block.sourcePath });
+	});
+}
+function appendTable(body, block, options) {
 	assertTableObeysGridRule(block, "buildDocxPackage");
+	reportDroppedHeaderColumns(block, options?.onDiagnostic ?? NOOP_DOCX_WRITE_DIAGNOSTIC_SINK);
 	if (block.rows.length === 0) throw new Error("buildDocxPackage: table has no rows, and a table with no rows cannot be written in every word-processing format (ODF requires at least one table:table-row)");
 	const table = body.appendTable({
 		rows: 0,
@@ -249,7 +259,7 @@ function appendBlock(body, block, options, markers) {
 			altText: block.altText
 		});
 	} else if (block.kind === "pageBreak") body.appendPageBreak();
-	else if (block.kind === "table") appendTable(body, block);
+	else if (block.kind === "table") appendTable(body, block, options);
 	else if (block.kind === "embeddedObject") appendEmbeddedObject(body, block, options);
 	else if (block.kind === "constructStart") markers.openConstruct(body, block);
 	else markers.closeConstruct(body);

package/dist/edit/docx/diagnostics.cjs

@@ -0,0 +1,7 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+//#region src/edit/docx/diagnostics.ts
+const DocxWriteDiagnosticCodes = { TABLE_HEADER_COLUMN_DROPPED: "docx-write/table-header-column-dropped" };
+const NOOP_DOCX_WRITE_DIAGNOSTIC_SINK = () => {};
+//#endregion
+exports.DocxWriteDiagnosticCodes = DocxWriteDiagnosticCodes;
+exports.NOOP_DOCX_WRITE_DIAGNOSTIC_SINK = NOOP_DOCX_WRITE_DIAGNOSTIC_SINK;

package/dist/edit/docx/diagnostics.d.cts

@@ -0,0 +1,2 @@
+import { a as DocxWriteDiagnosticSink, i as DocxWriteDiagnosticSeverity, n as DocxWriteDiagnosticCode, o as NOOP_DOCX_WRITE_DIAGNOSTIC_SINK, r as DocxWriteDiagnosticCodes, t as DocxWriteDiagnostic } from "../../diagnostics-C2-C2uUI.cjs";
+export { DocxWriteDiagnostic, DocxWriteDiagnosticCode, DocxWriteDiagnosticCodes, DocxWriteDiagnosticSeverity, DocxWriteDiagnosticSink, NOOP_DOCX_WRITE_DIAGNOSTIC_SINK };

package/dist/edit/docx/diagnostics.d.ts

@@ -0,0 +1,2 @@
+import { a as DocxWriteDiagnosticSink, i as DocxWriteDiagnosticSeverity, n as DocxWriteDiagnosticCode, o as NOOP_DOCX_WRITE_DIAGNOSTIC_SINK, r as DocxWriteDiagnosticCodes, t as DocxWriteDiagnostic } from "../../diagnostics-C2-C2uUI.js";
+export { DocxWriteDiagnostic, DocxWriteDiagnosticCode, DocxWriteDiagnosticCodes, DocxWriteDiagnosticSeverity, DocxWriteDiagnosticSink, NOOP_DOCX_WRITE_DIAGNOSTIC_SINK };

package/dist/edit/docx/diagnostics.js

@@ -0,0 +1,5 @@
+//#region src/edit/docx/diagnostics.ts
+const DocxWriteDiagnosticCodes = { TABLE_HEADER_COLUMN_DROPPED: "docx-write/table-header-column-dropped" };
+const NOOP_DOCX_WRITE_DIAGNOSTIC_SINK = () => {};
+//#endregion
+export { DocxWriteDiagnosticCodes, NOOP_DOCX_WRITE_DIAGNOSTIC_SINK };

package/dist/edit/docx/numbering.cjs

@@ -1,5 +1,4 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_xml_fragment = require("../../xml/fragment.cjs");
 //#region src/edit/docx/numbering.ts
 const NUMBERING_CONTENT_TYPE = "application/vnd.openxmlformats-officedocument.wordprocessingml.numbering+xml";
 const NUMBERING_REL_TYPE = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/numbering";
@@ -23,23 +22,25 @@ function declaration() {
 		]
 	};
 }
-function buildNumberingRoot(entries) {
-	const W = "http://schemas.openxmlformats.org/wordprocessingml/2006/main";
-	const abstractNums = entries.map((entry) => require_xml_fragment.el("w:abstractNum", { "w:abstractNumId": entry.abstractNumId }, entry.levels.map((level) => require_xml_fragment.el("w:lvl", {
-		"w:ilvl": String(level),
-		"w:tentative": "1"
-	}, [
-		require_xml_fragment.el("w:start", { "w:val": "1" }),
-		require_xml_fragment.el("w:numFmt", { "w:val": "bullet" }),
-		require_xml_fragment.el("w:lvlText", { "w:val": "•" }),
-		require_xml_fragment.el("w:lvlJc", { "w:val": "left" })
-	]))));
-	const nums = entries.map((entry) => require_xml_fragment.el("w:num", { "w:numId": entry.remappedNumId }, [require_xml_fragment.el("w:abstractNumId", { "w:val": entry.abstractNumId })]));
-	return require_xml_fragment.el("w:numbering", { "xmlns:w": W }, [...abstractNums, ...nums]);
+function lvlText(format, level) {
+	return format === void 0 || format === "bullet" ? "•" : `%${level + 1}.`;
+}
+function buildNumberingDefinitions(entries) {
+	const definitions = {};
+	for (const entry of entries) {
+		const levels = {};
+		for (const [level, format] of entry.levels) levels[String(level)] = {
+			format: format ?? "bullet",
+			text: lvlText(format, level),
+			startAt: 1
+		};
+		definitions[entry.remappedNumId] = { levels };
+	}
+	return definitions;
 }
 //#endregion
 exports.NUMBERING_CONTENT_TYPE = NUMBERING_CONTENT_TYPE;
 exports.NUMBERING_PART_PATH = NUMBERING_PART_PATH;
 exports.NUMBERING_REL_TYPE = NUMBERING_REL_TYPE;
-exports.buildNumberingRoot = buildNumberingRoot;
+exports.buildNumberingDefinitions = buildNumberingDefinitions;
 exports.declaration = declaration;

package/dist/edit/docx/numbering.d.cts

@@ -1,4 +1,5 @@
-import { XmlElement, XmlNode } from "ooxml.js";
+import { ContentListMembership } from "document-schema.js";
+import { NumberingDefinitions, XmlNode } from "ooxml.js";
 //#region src/edit/docx/numbering.d.ts
 declare const NUMBERING_CONTENT_TYPE = "application/vnd.openxmlformats-officedocument.wordprocessingml.numbering+xml";
 declare const NUMBERING_REL_TYPE = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/numbering";
@@ -7,9 +8,8 @@ declare function declaration(): XmlNode;
 interface NumberingEntry {
   readonly sourceNumId: string | undefined;
   readonly remappedNumId: string;
-  readonly abstractNumId: string;
-  readonly levels: readonly number[];
+  readonly levels: ReadonlyMap<number, ContentListMembership["format"]>;
 }
-declare function buildNumberingRoot(entries: readonly NumberingEntry[]): XmlElement;
+declare function buildNumberingDefinitions(entries: readonly NumberingEntry[]): NumberingDefinitions;
 //#endregion
-export { NUMBERING_CONTENT_TYPE, NUMBERING_PART_PATH, NUMBERING_REL_TYPE, NumberingEntry, buildNumberingRoot, declaration };
+export { NUMBERING_CONTENT_TYPE, NUMBERING_PART_PATH, NUMBERING_REL_TYPE, NumberingEntry, buildNumberingDefinitions, declaration };

package/dist/edit/docx/numbering.d.ts

@@ -1,4 +1,5 @@
-import { XmlElement, XmlNode } from "ooxml.js";
+import { NumberingDefinitions, XmlNode } from "ooxml.js";
+import { ContentListMembership } from "document-schema.js";
 //#region src/edit/docx/numbering.d.ts
 declare const NUMBERING_CONTENT_TYPE = "application/vnd.openxmlformats-officedocument.wordprocessingml.numbering+xml";
 declare const NUMBERING_REL_TYPE = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/numbering";
@@ -7,9 +8,8 @@ declare function declaration(): XmlNode;
 interface NumberingEntry {
   readonly sourceNumId: string | undefined;
   readonly remappedNumId: string;
-  readonly abstractNumId: string;
-  readonly levels: readonly number[];
+  readonly levels: ReadonlyMap<number, ContentListMembership["format"]>;
 }
-declare function buildNumberingRoot(entries: readonly NumberingEntry[]): XmlElement;
+declare function buildNumberingDefinitions(entries: readonly NumberingEntry[]): NumberingDefinitions;
 //#endregion
-export { NUMBERING_CONTENT_TYPE, NUMBERING_PART_PATH, NUMBERING_REL_TYPE, NumberingEntry, buildNumberingRoot, declaration };
+export { NUMBERING_CONTENT_TYPE, NUMBERING_PART_PATH, NUMBERING_REL_TYPE, NumberingEntry, buildNumberingDefinitions, declaration };

package/dist/edit/docx/numbering.js

@@ -1,4 +1,3 @@
-import { el } from "../../xml/fragment.js";
 //#region src/edit/docx/numbering.ts
 const NUMBERING_CONTENT_TYPE = "application/vnd.openxmlformats-officedocument.wordprocessingml.numbering+xml";
 const NUMBERING_REL_TYPE = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/numbering";
@@ -22,19 +21,21 @@ function declaration() {
 		]
 	};
 }
-function buildNumberingRoot(entries) {
-	const W = "http://schemas.openxmlformats.org/wordprocessingml/2006/main";
-	const abstractNums = entries.map((entry) => el("w:abstractNum", { "w:abstractNumId": entry.abstractNumId }, entry.levels.map((level) => el("w:lvl", {
-		"w:ilvl": String(level),
-		"w:tentative": "1"
-	}, [
-		el("w:start", { "w:val": "1" }),
-		el("w:numFmt", { "w:val": "bullet" }),
-		el("w:lvlText", { "w:val": "•" }),
-		el("w:lvlJc", { "w:val": "left" })
-	]))));
-	const nums = entries.map((entry) => el("w:num", { "w:numId": entry.remappedNumId }, [el("w:abstractNumId", { "w:val": entry.abstractNumId })]));
-	return el("w:numbering", { "xmlns:w": W }, [...abstractNums, ...nums]);
+function lvlText(format, level) {
+	return format === void 0 || format === "bullet" ? "•" : `%${level + 1}.`;
+}
+function buildNumberingDefinitions(entries) {
+	const definitions = {};
+	for (const entry of entries) {
+		const levels = {};
+		for (const [level, format] of entry.levels) levels[String(level)] = {
+			format: format ?? "bullet",
+			text: lvlText(format, level),
+			startAt: 1
+		};
+		definitions[entry.remappedNumId] = { levels };
+	}
+	return definitions;
 }
 //#endregion
-export { NUMBERING_CONTENT_TYPE, NUMBERING_PART_PATH, NUMBERING_REL_TYPE, buildNumberingRoot, declaration };
+export { NUMBERING_CONTENT_TYPE, NUMBERING_PART_PATH, NUMBERING_REL_TYPE, buildNumberingDefinitions, declaration };

package/dist/edit/pptx/content.cjs

@@ -64,7 +64,8 @@ function appendShape(slide, shape, options) {
 			table: {
 				rows: onlyBlock.rows.length,
 				columns: (0, document_schema_js.tableGridColumnCount)(onlyBlock),
-				columnWidthsPt: onlyBlock.columns.map((c) => c.widthPt)
+				columnWidthsPt: onlyBlock.columns.map((c) => c.widthPt),
+				rowHeightsPt: onlyBlock.rows.map((r) => r.heightPt)
 			}
 		}), onlyBlock, options?.onDiagnostic ?? require_edit_pptx_diagnostics.NOOP_PPTX_WRITE_DIAGNOSTIC_SINK, (url) => slide.registerHyperlink(url));
 		return;

package/dist/edit/pptx/content.js

@@ -63,7 +63,8 @@ function appendShape(slide, shape, options) {
 			table: {
 				rows: onlyBlock.rows.length,
 				columns: tableGridColumnCount(onlyBlock),
-				columnWidthsPt: onlyBlock.columns.map((c) => c.widthPt)
+				columnWidthsPt: onlyBlock.columns.map((c) => c.widthPt),
+				rowHeightsPt: onlyBlock.rows.map((r) => r.heightPt)
 			}
 		}), onlyBlock, options?.onDiagnostic ?? NOOP_PPTX_WRITE_DIAGNOSTIC_SINK, (url) => slide.registerHyperlink(url));
 		return;

package/dist/edit/pptx/slide.d.cts

@@ -1,6 +1,6 @@
 import { t as ImageInit } from "../../image-C3L2cCLQ.cjs";
 import { r as PptxShape } from "../../shape-C2ef6uwC.cjs";
-import { r as PptxTableInit, t as PptxTable } from "../../table-ukpjK2hS.cjs";
+import { r as PptxTableInit, t as PptxTable } from "../../table-CxLN4l90.cjs";
 import { Box, ContentVector } from "document-schema.js";
 import { Package, XmlElement, XmlNode } from "ooxml.js";
 //#region src/edit/pptx/slide.d.ts

package/dist/edit/pptx/slide.d.ts

@@ -1,6 +1,6 @@
 import { t as ImageInit } from "../../image-CAeD6ZbR.js";
 import { r as PptxShape } from "../../shape-DwZouh8R.js";
-import { r as PptxTableInit, t as PptxTable } from "../../table-BuNLtwgL.js";
+import { r as PptxTableInit, t as PptxTable } from "../../table-B1uKqI0r.js";
 import { Package, XmlElement, XmlNode } from "ooxml.js";
 import { Box, ContentVector } from "document-schema.js";
 //#region src/edit/pptx/slide.d.ts

package/dist/edit/pptx/table.cjs

@@ -15,6 +15,17 @@ const PPTX_TABLE_CELL_VERTICAL_ALIGN_ANCHOR = {
 	center: "ctr",
 	bottom: "b"
 };
+const PPTX_BORDER_STYLE_TO_DASH_VAL = {
+	solid: "solid",
+	dashed: "dash",
+	dotted: "sysDot"
+};
+const DASH_VAL_TO_PPTX_BORDER_STYLE = /* @__PURE__ */ new Map([
+	["solid", "solid"],
+	["dash", "dashed"],
+	["sysDot", "dotted"]
+]);
+const PPTX_BORDER_CMPD_DOUBLE = "dbl";
 const ANCHOR_TABLE_CELL_VERTICAL_ALIGN = /* @__PURE__ */ new Map([
 	["t", "top"],
 	["ctr", "center"],
@@ -115,7 +126,12 @@ var PptxTableCell = class {
 		]) {
 			const border = value[key];
 			if (border === void 0) continue;
-			tcPr.children.push(require_xml_fragment.el(tag, { w: String(require_model_units.ptToEmu(border.widthPt)) }, [require_xml_fragment.el("a:solidFill", {}, [require_xml_fragment.el("a:srgbClr", { val: require_edit_drawingml_vector.drawingMlColorHex(border.color) })])]));
+			const lineChildren = [require_xml_fragment.el("a:solidFill", {}, [require_xml_fragment.el("a:srgbClr", { val: require_edit_drawingml_vector.drawingMlColorHex(border.color) })])];
+			const dashVal = border.style === void 0 ? void 0 : PPTX_BORDER_STYLE_TO_DASH_VAL[border.style];
+			if (dashVal !== void 0) lineChildren.push(require_xml_fragment.el("a:prstDash", { val: dashVal }));
+			const lineAttrs = { w: String(require_model_units.ptToEmu(border.widthPt)) };
+			if (border.style === "double") lineAttrs.cmpd = PPTX_BORDER_CMPD_DOUBLE;
+			tcPr.children.push(require_xml_fragment.el(tag, lineAttrs, lineChildren));
 		}
 	}
 	get verticalAlign() {
@@ -143,11 +159,20 @@ var PptxTableCell = class {
 		const srgbClr = solidFill === void 0 ? void 0 : require_xml_edit.directChildElement(solidFill, "a:srgbClr");
 		const hex = srgbClr === void 0 ? void 0 : (0, ooxml_js.attr)(srgbClr, "val");
 		if (hex === void 0) return;
+		const style = this.readBorderStyle(lnElement);
 		return {
 			color: (0, document_schema_js.rgbHexToColor)(hex),
-			widthPt
+			widthPt,
+			...style === void 0 ? {} : { style }
 		};
 	}
+	readBorderStyle(lnElement) {
+		if ((0, ooxml_js.attr)(lnElement, "cmpd") === PPTX_BORDER_CMPD_DOUBLE) return "double";
+		const prstDash = require_xml_edit.directChildElement(lnElement, "a:prstDash");
+		const dashVal = prstDash === void 0 ? void 0 : (0, ooxml_js.attr)(prstDash, "val");
+		if (dashVal === void 0) return;
+		return DASH_VAL_TO_PPTX_BORDER_STYLE.get(dashVal) ?? "solid";
+	}
 	setParagraphs(paragraphs) {
 		const txBody = require_xml_edit.directChildElement(this.node, "a:txBody");
 		if (txBody === void 0) return;
@@ -204,7 +229,8 @@ function buildDrawingTable(init) {
 	for (let r = 0; r < init.rows; r++) {
 		const cells = [];
 		for (let c = 0; c < init.columns; c++) cells.push(buildTableCellElement());
-		rows.push(require_xml_fragment.el("a:tr", { h: String(require_model_units.ptToEmu(DEFAULT_ROW_HEIGHT_PT)) }, cells));
+		const heightPt = init.rowHeightsPt?.[r] ?? DEFAULT_ROW_HEIGHT_PT;
+		rows.push(require_xml_fragment.el("a:tr", { h: String(require_model_units.ptToEmu(heightPt)) }, cells));
 	}
 	return require_xml_fragment.el("a:tbl", {}, [
 		require_xml_fragment.el("a:tblPr"),

package/dist/edit/pptx/table.d.cts

@@ -1,2 +1,2 @@
-import { a as buildDrawingTable, i as PptxTableRow, n as PptxTableCell, o as buildTableGraphicFrame, r as PptxTableInit, s as findGraphicFrameTable, t as PptxTable } from "../../table-ukpjK2hS.cjs";
+import { a as buildDrawingTable, i as PptxTableRow, n as PptxTableCell, o as buildTableGraphicFrame, r as PptxTableInit, s as findGraphicFrameTable, t as PptxTable } from "../../table-CxLN4l90.cjs";
 export { PptxTable, PptxTableCell, PptxTableInit, PptxTableRow, buildDrawingTable, buildTableGraphicFrame, findGraphicFrameTable };

package/dist/edit/pptx/table.d.ts

@@ -1,2 +1,2 @@
-import { a as buildDrawingTable, i as PptxTableRow, n as PptxTableCell, o as buildTableGraphicFrame, r as PptxTableInit, s as findGraphicFrameTable, t as PptxTable } from "../../table-BuNLtwgL.js";
+import { a as buildDrawingTable, i as PptxTableRow, n as PptxTableCell, o as buildTableGraphicFrame, r as PptxTableInit, s as findGraphicFrameTable, t as PptxTable } from "../../table-B1uKqI0r.js";
 export { PptxTable, PptxTableCell, PptxTableInit, PptxTableRow, buildDrawingTable, buildTableGraphicFrame, findGraphicFrameTable };

package/dist/edit/pptx/table.js

@@ -14,6 +14,17 @@ const PPTX_TABLE_CELL_VERTICAL_ALIGN_ANCHOR = {
 	center: "ctr",
 	bottom: "b"
 };
+const PPTX_BORDER_STYLE_TO_DASH_VAL = {
+	solid: "solid",
+	dashed: "dash",
+	dotted: "sysDot"
+};
+const DASH_VAL_TO_PPTX_BORDER_STYLE = /* @__PURE__ */ new Map([
+	["solid", "solid"],
+	["dash", "dashed"],
+	["sysDot", "dotted"]
+]);
+const PPTX_BORDER_CMPD_DOUBLE = "dbl";
 const ANCHOR_TABLE_CELL_VERTICAL_ALIGN = /* @__PURE__ */ new Map([
 	["t", "top"],
 	["ctr", "center"],
@@ -114,7 +125,12 @@ var PptxTableCell = class {
 		]) {
 			const border = value[key];
 			if (border === void 0) continue;
-			tcPr.children.push(el(tag, { w: String(ptToEmu(border.widthPt)) }, [el("a:solidFill", {}, [el("a:srgbClr", { val: drawingMlColorHex(border.color) })])]));
+			const lineChildren = [el("a:solidFill", {}, [el("a:srgbClr", { val: drawingMlColorHex(border.color) })])];
+			const dashVal = border.style === void 0 ? void 0 : PPTX_BORDER_STYLE_TO_DASH_VAL[border.style];
+			if (dashVal !== void 0) lineChildren.push(el("a:prstDash", { val: dashVal }));
+			const lineAttrs = { w: String(ptToEmu(border.widthPt)) };
+			if (border.style === "double") lineAttrs.cmpd = PPTX_BORDER_CMPD_DOUBLE;
+			tcPr.children.push(el(tag, lineAttrs, lineChildren));
 		}
 	}
 	get verticalAlign() {
@@ -142,11 +158,20 @@ var PptxTableCell = class {
 		const srgbClr = solidFill === void 0 ? void 0 : directChildElement(solidFill, "a:srgbClr");
 		const hex = srgbClr === void 0 ? void 0 : attr(srgbClr, "val");
 		if (hex === void 0) return;
+		const style = this.readBorderStyle(lnElement);
 		return {
 			color: rgbHexToColor(hex),
-			widthPt
+			widthPt,
+			...style === void 0 ? {} : { style }
 		};
 	}
+	readBorderStyle(lnElement) {
+		if (attr(lnElement, "cmpd") === PPTX_BORDER_CMPD_DOUBLE) return "double";
+		const prstDash = directChildElement(lnElement, "a:prstDash");
+		const dashVal = prstDash === void 0 ? void 0 : attr(prstDash, "val");
+		if (dashVal === void 0) return;
+		return DASH_VAL_TO_PPTX_BORDER_STYLE.get(dashVal) ?? "solid";
+	}
 	setParagraphs(paragraphs) {
 		const txBody = directChildElement(this.node, "a:txBody");
 		if (txBody === void 0) return;
@@ -203,7 +228,8 @@ function buildDrawingTable(init) {
 	for (let r = 0; r < init.rows; r++) {
 		const cells = [];
 		for (let c = 0; c < init.columns; c++) cells.push(buildTableCellElement());
-		rows.push(el("a:tr", { h: String(ptToEmu(DEFAULT_ROW_HEIGHT_PT)) }, cells));
+		const heightPt = init.rowHeightsPt?.[r] ?? DEFAULT_ROW_HEIGHT_PT;
+		rows.push(el("a:tr", { h: String(ptToEmu(heightPt)) }, cells));
 	}
 	return el("a:tbl", {}, [
 		el("a:tblPr"),

package/dist/index.d.cts

@@ -66,7 +66,7 @@ import { PptShape, PptSlide } from "./edit/ppt/slide.cjs";
 import { CreatePptOptions, PptEditor, createPpt, openPpt } from "./edit/ppt/editor.cjs";
 import { BuildPptxPackageOptions, buildPptxPackage, embeddedPresentationSerialiser } from "./edit/pptx/content.cjs";
 import { n as DrawingRunInit, r as PptxShape, t as DrawingParagraphInit } from "./shape-C2ef6uwC.cjs";
-import { i as PptxTableRow, n as PptxTableCell, r as PptxTableInit, t as PptxTable } from "./table-ukpjK2hS.cjs";
+import { i as PptxTableRow, n as PptxTableCell, r as PptxTableInit, t as PptxTable } from "./table-CxLN4l90.cjs";
 import { PptxSlide, SlideImageInit as SlideImageInit$1, SlideTableInit as SlideTableInit$1, TextBoxInit as TextBoxInit$2 } from "./edit/pptx/slide.cjs";
 import { CreatePptxOptions, PptxEditor, createPptx, openPptx } from "./edit/pptx/editor.cjs";
 import { CreateEmptyPptxPackageOptions } from "./edit/pptx/scaffold.cjs";

package/dist/index.d.ts

@@ -66,7 +66,7 @@ import { PptShape, PptSlide } from "./edit/ppt/slide.js";
 import { CreatePptOptions, PptEditor, createPpt, openPpt } from "./edit/ppt/editor.js";
 import { BuildPptxPackageOptions, buildPptxPackage, embeddedPresentationSerialiser } from "./edit/pptx/content.js";
 import { n as DrawingRunInit, r as PptxShape, t as DrawingParagraphInit } from "./shape-DwZouh8R.js";
-import { i as PptxTableRow, n as PptxTableCell, r as PptxTableInit, t as PptxTable } from "./table-BuNLtwgL.js";
+import { i as PptxTableRow, n as PptxTableCell, r as PptxTableInit, t as PptxTable } from "./table-B1uKqI0r.js";
 import { PptxSlide, SlideImageInit as SlideImageInit$1, SlideTableInit as SlideTableInit$1, TextBoxInit as TextBoxInit$2 } from "./edit/pptx/slide.js";
 import { CreatePptxOptions, PptxEditor, createPptx, openPptx } from "./edit/pptx/editor.js";
 import { CreateEmptyPptxPackageOptions } from "./edit/pptx/scaffold.js";

package/dist/{table-BuNLtwgL.d.ts → table-B1uKqI0r.d.ts}

@@ -6,6 +6,7 @@ interface PptxTableInit {
   readonly rows: number;
   readonly columns: number;
   readonly columnWidthsPt?: readonly number[];
+  readonly rowHeightsPt?: readonly (number | undefined)[];
 }
 declare class PptxTableCell {
   private readonly node;
@@ -25,6 +26,7 @@ declare class PptxTableCell {
   get verticalAlign(): ContentTableCell["verticalAlign"];
   set verticalAlign(value: ContentTableCell["verticalAlign"]);
   private readBorder;
+  private readBorderStyle;
   setParagraphs(paragraphs: readonly DrawingParagraphInit[]): void;
 }
 declare class PptxTableRow {

package/dist/{table-ukpjK2hS.d.cts → table-CxLN4l90.d.cts}

@@ -6,6 +6,7 @@ interface PptxTableInit {
   readonly rows: number;
   readonly columns: number;
   readonly columnWidthsPt?: readonly number[];
+  readonly rowHeightsPt?: readonly (number | undefined)[];
 }
 declare class PptxTableCell {
   private readonly node;
@@ -25,6 +26,7 @@ declare class PptxTableCell {
   get verticalAlign(): ContentTableCell["verticalAlign"];
   set verticalAlign(value: ContentTableCell["verticalAlign"]);
   private readBorder;
+  private readBorderStyle;
   setParagraphs(paragraphs: readonly DrawingParagraphInit[]): void;
 }
 declare class PptxTableRow {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "js.documents",
-  "version": "14.2.0",
+  "version": "14.3.1",
   "description": "Bidirectional docx/pptx <-> PDF conversion and a read+write editable OOXML document model, built on ooxml.js and Zod 4 codecs.",
   "type": "module",
   "repository": {
@@ -79,13 +79,13 @@
   "dependencies": {
     "archive-codec": "1.11.12",
     "byte-codec": "1.8.1",
-    "doc-codec": "6.0.3",
+    "doc-codec": "6.1.0",
     "document-schema.js": "7.15.0",
     "epub-codec": "5.1.0",
     "fflate": "0.8.3",
     "markdown-codec": "11.1.0",
     "odf.js": "11.1.0",
-    "ooxml.js": "12.0.2",
+    "ooxml.js": "12.2.0",
     "pdf-codec": "5.2.6",
     "ppt-codec": "2.2.0",
     "rtf-codec": "8.1.0",