ooxml.js 4.3.0 → 4.4.0

package/dist/{read-CDX1WbiF.d.cts → read-LTgVJIPU.d.cts}

@@ -3,15 +3,39 @@ import { z } from "zod";
 import { ContentBlock } from "document-schema.js";
 //#region src/typed/docx/read.d.ts
 declare const CommentSchema: z.ZodObject<{
+  id: z.ZodOptional<z.ZodString>;
   author: z.ZodOptional<z.ZodString>;
   text: z.ZodString;
 }, z.core.$strip>;
 type Comment = z.infer<typeof CommentSchema>;
 declare const FootnoteSchema: z.ZodObject<{
+  id: z.ZodOptional<z.ZodString>;
   type: z.ZodOptional<z.ZodString>;
   text: z.ZodString;
 }, z.core.$strip>;
 type Footnote = z.infer<typeof FootnoteSchema>;
+declare const HeaderFooterPartSchema: z.ZodObject<{
+  path: z.ZodString;
+  kind: z.ZodEnum<{
+    header: "header";
+    footer: "footer";
+  }>;
+  blocks: z.ZodArray<z.ZodCustom<ContentBlock, ContentBlock>>;
+}, z.core.$strip>;
+type HeaderFooterPart = z.infer<typeof HeaderFooterPartSchema>;
+declare const SectionHeaderFooterReferencesSchema: z.ZodObject<{
+  header: z.ZodOptional<z.ZodRecord<z.ZodEnum<{
+    default: "default";
+    first: "first";
+    even: "even";
+  }> & z.core.$partial, z.ZodString>>;
+  footer: z.ZodOptional<z.ZodRecord<z.ZodEnum<{
+    default: "default";
+    first: "first";
+    even: "even";
+  }> & z.core.$partial, z.ZodString>>;
+}, z.core.$strip>;
+type SectionHeaderFooterReferences = z.infer<typeof SectionHeaderFooterReferencesSchema>;
 declare const DocxDocumentSchema: z.ZodObject<{
   metadata: z.ZodObject<{
     title: z.ZodOptional<z.ZodString>;
@@ -34,6 +58,12 @@ declare const DocxDocumentSchema: z.ZodObject<{
       leftPt: z.ZodNumber;
     }, z.core.$strip>;
     blocks: z.ZodArray<z.ZodCustom<ContentBlock, ContentBlock>>;
+    breakType: z.ZodOptional<z.ZodEnum<{
+      nextPage: "nextPage";
+      continuous: "continuous";
+      evenPage: "evenPage";
+      oddPage: "oddPage";
+    }>>;
     source: z.ZodOptional<z.ZodObject<{
       format: z.ZodEnum<{
         docx: "docx";
@@ -53,15 +83,42 @@ declare const DocxDocumentSchema: z.ZodObject<{
     }, z.core.$strict>>;
   }, z.core.$strip>>;
   comments: z.ZodArray<z.ZodObject<{
+    id: z.ZodOptional<z.ZodString>;
     author: z.ZodOptional<z.ZodString>;
     text: z.ZodString;
   }, z.core.$strip>>;
   footnotes: z.ZodArray<z.ZodObject<{
+    id: z.ZodOptional<z.ZodString>;
+    type: z.ZodOptional<z.ZodString>;
+    text: z.ZodString;
+  }, z.core.$strip>>;
+  endnotes: z.ZodArray<z.ZodObject<{
+    id: z.ZodOptional<z.ZodString>;
     type: z.ZodOptional<z.ZodString>;
     text: z.ZodString;
   }, z.core.$strip>>;
   headers: z.ZodArray<z.ZodString>;
   footers: z.ZodArray<z.ZodString>;
+  headerFooterParts: z.ZodArray<z.ZodObject<{
+    path: z.ZodString;
+    kind: z.ZodEnum<{
+      header: "header";
+      footer: "footer";
+    }>;
+    blocks: z.ZodArray<z.ZodCustom<ContentBlock, ContentBlock>>;
+  }, z.core.$strip>>;
+  sectionHeaderFooters: z.ZodArray<z.ZodObject<{
+    header: z.ZodOptional<z.ZodRecord<z.ZodEnum<{
+      default: "default";
+      first: "first";
+      even: "even";
+    }> & z.core.$partial, z.ZodString>>;
+    footer: z.ZodOptional<z.ZodRecord<z.ZodEnum<{
+      default: "default";
+      first: "first";
+      even: "even";
+    }> & z.core.$partial, z.ZodString>>;
+  }, z.core.$strip>>;
   numbering: z.ZodRecord<z.ZodString, z.ZodObject<{
     levels: z.ZodRecord<z.ZodString, z.ZodObject<{
       format: z.ZodString;
@@ -74,4 +131,4 @@ declare const DocxDocumentSchema: z.ZodObject<{
 type DocxDocument = z.infer<typeof DocxDocumentSchema>;
 declare function readDocxContent(pkg: Package): DocxDocument;
 //#endregion
-export { Footnote as a, DocxDocumentSchema as i, CommentSchema as n, FootnoteSchema as o, DocxDocument as r, readDocxContent as s, Comment as t };
+export { Footnote as a, HeaderFooterPartSchema as c, readDocxContent as d, DocxDocumentSchema as i, SectionHeaderFooterReferences as l, CommentSchema as n, FootnoteSchema as o, DocxDocument as r, HeaderFooterPart as s, Comment as t, SectionHeaderFooterReferencesSchema as u };

package/dist/typed/document-package.cjs

@@ -1,8 +1,9 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_read = require("../read-Di5UfiSh.cjs");
+const require_read = require("../read-D-L3dItC.cjs");
 const require_typed_xlsx_content = require("./xlsx/content.cjs");
 const require_typed_xlsx_build = require("./xlsx/build.cjs");
 const require_typed_docx_write = require("./docx/write.cjs");
+const require_typed_xlsx_definitions = require("./xlsx/definitions.cjs");
 let document_schema_js = require("document-schema.js");
 //#region src/typed/document-package.ts
 function readDocx(pkg) {
@@ -27,7 +28,12 @@ function readPptx(pkg) {
 	});
 }
 function readXlsx(pkg) {
-	return (0, document_schema_js.assemblePackage)(require_typed_xlsx_content.readXlsxContent(pkg));
+	const definitions = require_typed_xlsx_definitions.readWorkbookDefinitions(pkg);
+	const tree = (0, document_schema_js.assemblePackage)(require_typed_xlsx_content.readXlsxContent(pkg));
+	return definitions === void 0 ? tree : {
+		...tree,
+		definitions
+	};
 }
 function buildXlsxPackage(document) {
 	const content = (0, document_schema_js.flattenPackage)(document);

package/dist/typed/document-package.js

@@ -1,7 +1,8 @@
-import { c as readPptxContent, i as readDocxContent } from "../read-BQoFiqsb.js";
+import { o as readDocxContent, u as readPptxContent } from "../read-DGknK1YY.js";
 import { readXlsxContent } from "./xlsx/content.js";
 import { buildXlsxPackageFromContent } from "./xlsx/build.js";
 import { buildDocxPackageFromContent } from "./docx/write.js";
+import { readWorkbookDefinitions } from "./xlsx/definitions.js";
 import { assemblePackage, flattenPackage } from "document-schema.js";
 //#region src/typed/document-package.ts
 function readDocx(pkg) {
@@ -26,7 +27,12 @@ function readPptx(pkg) {
 	});
 }
 function readXlsx(pkg) {
-	return assemblePackage(readXlsxContent(pkg));
+	const definitions = readWorkbookDefinitions(pkg);
+	const tree = assemblePackage(readXlsxContent(pkg));
+	return definitions === void 0 ? tree : {
+		...tree,
+		definitions
+	};
 }
 function buildXlsxPackage(document) {
 	const content = flattenPackage(document);

package/dist/typed/docx/constructs.cjs

@@ -93,11 +93,12 @@ function isBlockScopedHalf(half, index) {
 	const trailing = index.lastContentIndex === -1 || position > index.lastContentIndex;
 	return leading || trailing;
 }
-function runBookmarkExtents(halves, index) {
+function runRangeMarkerExtents(halves, index) {
 	const byId = /* @__PURE__ */ new Map();
 	for (const half of halves) {
-		const existing = byId.get(half.id);
-		if (existing === void 0) byId.set(half.id, [half]);
+		const key = `${half.family}:${half.id}`;
+		const existing = byId.get(key);
+		if (existing === void 0) byId.set(key, [half]);
 		else existing.push(half);
 	}
 	const extents = [];
@@ -107,10 +108,15 @@ function runBookmarkExtents(halves, index) {
 		const open = starts[0];
 		const close = ends[0];
 		if (starts.length !== 1 || ends.length !== 1 || open === void 0 || close === void 0) continue;
-		if (open.name === void 0 || close.runPosition < open.runPosition) continue;
+		const descriptor = open.family === "comment" ? {
+			kind: "anchor",
+			anchorType: "comment",
+			name: open.id
+		} : open.name === void 0 ? void 0 : bookmarkAnchorDescriptor(open.name);
+		if (descriptor === void 0 || close.runPosition < open.runPosition) continue;
 		if (isBlockScopedHalf(open, index) && isBlockScopedHalf(close, index)) continue;
 		extents.push({
-			descriptor: bookmarkAnchorDescriptor(open.name),
+			descriptor,
 			startRun: open.runPosition,
 			endRun: close.runPosition
 		});
@@ -250,6 +256,48 @@ function fieldCharType(run) {
 	const fldChar = require_typed_util.childrenWithTag(run, "w:fldChar")[0];
 	return fldChar === void 0 ? void 0 : require_typed_util.attr(fldChar, "w:fldCharType");
 }
+const FORM_CONTROL_TYPE_BY_TAG = /* @__PURE__ */ new Map([
+	["w:checkBox", "checkbox"],
+	["w:ddList", "dropDown"],
+	["w:textInput", "plainText"]
+]);
+function readOnOff(element) {
+	if (element === void 0) return;
+	const val = require_typed_util.attr(element, "w:val");
+	return val === void 0 || val !== "0" && val !== "false" && val !== "off";
+}
+function readFormControlDescriptor(beginRun) {
+	const ffData = require_typed_util.childrenWithTag(beginRun, "w:ffData")[0];
+	if (ffData === void 0) return;
+	const descriptor = {
+		kind: "contentControl",
+		controlType: "richText",
+		source: {
+			format: "docx",
+			xml: require_xml_build.buildXml([ffData])
+		}
+	};
+	const name = require_typed_util.childrenWithTag(ffData, "w:name")[0];
+	const nameVal = name === void 0 ? void 0 : require_typed_util.attr(name, "w:val");
+	if (nameVal !== void 0) descriptor.tag = require_typed_util.decodeEntities(nameVal);
+	for (const child of ffData.children) {
+		if (child.type !== "element") continue;
+		const controlType = FORM_CONTROL_TYPE_BY_TAG.get(child.tag);
+		if (controlType === void 0) continue;
+		descriptor.controlType = controlType;
+		if (child.tag === "w:checkBox") descriptor.checked = readOnOff(require_typed_util.childrenWithTag(child, "w:checked")[0]) ?? readOnOff(require_typed_util.childrenWithTag(child, "w:default")[0]) ?? false;
+		else if (child.tag === "w:ddList") {
+			const options = [];
+			for (const item of require_typed_util.childrenWithTag(child, "w:listItem")) {
+				const value = require_typed_util.attr(item, "w:displayText") ?? require_typed_util.attr(item, "w:val");
+				if (value !== void 0) options.push(require_typed_util.decodeEntities(value));
+			}
+			if (options.length > 0) descriptor.options = options;
+		}
+		break;
+	}
+	return descriptor;
+}
 //#endregion
 exports.PROVENANCE_CHANGE_BY_TAG = PROVENANCE_CHANGE_BY_TAG;
 exports.TABLE_OF_CONTENTS_GALLERY = TABLE_OF_CONTENTS_GALLERY;
@@ -260,6 +308,7 @@ exports.indexParagraphContent = indexParagraphContent;
 exports.insertConstructMarkers = insertConstructMarkers;
 exports.isDeletedChange = isDeletedChange;
 exports.readContentControlDescriptor = readContentControlDescriptor;
+exports.readFormControlDescriptor = readFormControlDescriptor;
 exports.readProvenanceDescriptor = readProvenanceDescriptor;
-exports.runBookmarkExtents = runBookmarkExtents;
 exports.runInstructionText = runInstructionText;
+exports.runRangeMarkerExtents = runRangeMarkerExtents;

package/dist/typed/docx/constructs.d.cts

@@ -15,14 +15,16 @@ interface ConstructExtent {
   readonly descriptor: ConstructDescriptor;
 }
 declare function insertConstructMarkers(blocks: readonly ContentBlock[], extents: readonly ConstructExtent[]): ContentBlock[];
-interface ParagraphBookmarkHalf {
+type RangeMarkerFamily = 'bookmark' | 'comment';
+interface ParagraphRangeMarkerHalf {
   readonly element: XmlElement;
+  readonly family: RangeMarkerFamily;
   readonly id: string;
   readonly name: string | undefined;
   readonly kind: 'start' | 'end';
   readonly runPosition: number;
 }
-declare function runBookmarkExtents(halves: readonly ParagraphBookmarkHalf[], index: ParagraphContentIndex): RunConstructExtent[];
+declare function runRangeMarkerExtents(halves: readonly ParagraphRangeMarkerHalf[], index: ParagraphContentIndex): RunConstructExtent[];
 declare const TABLE_OF_CONTENTS_GALLERY = "Table of Contents";
 declare function readContentControlDescriptor(sdt: XmlElement): ContentControlDescriptor;
 declare const PROVENANCE_CHANGE_BY_TAG: ReadonlyMap<string, ProvenanceChange>;
@@ -31,5 +33,6 @@ declare function readProvenanceDescriptor(element: XmlElement, change: Provenanc
 declare function bookmarkAnchorDescriptor(name: string): AnchorDescriptor;
 declare function runInstructionText(run: XmlElement): string;
 declare function fieldCharType(run: XmlElement): string | undefined;
+declare function readFormControlDescriptor(beginRun: XmlElement): ContentControlDescriptor | undefined;
 //#endregion
-export { ConstructExtent, PROVENANCE_CHANGE_BY_TAG, ParagraphBookmarkHalf, ParagraphContentIndex, TABLE_OF_CONTENTS_GALLERY, bookmarkAnchorDescriptor, contentBearingChildren, fieldCharType, indexParagraphContent, insertConstructMarkers, isDeletedChange, readContentControlDescriptor, readProvenanceDescriptor, runBookmarkExtents, runInstructionText };
+export { ConstructExtent, PROVENANCE_CHANGE_BY_TAG, ParagraphContentIndex, ParagraphRangeMarkerHalf, RangeMarkerFamily, TABLE_OF_CONTENTS_GALLERY, bookmarkAnchorDescriptor, contentBearingChildren, fieldCharType, indexParagraphContent, insertConstructMarkers, isDeletedChange, readContentControlDescriptor, readFormControlDescriptor, readProvenanceDescriptor, runInstructionText, runRangeMarkerExtents };

package/dist/typed/docx/constructs.d.ts

@@ -15,14 +15,16 @@ interface ConstructExtent {
   readonly descriptor: ConstructDescriptor;
 }
 declare function insertConstructMarkers(blocks: readonly ContentBlock[], extents: readonly ConstructExtent[]): ContentBlock[];
-interface ParagraphBookmarkHalf {
+type RangeMarkerFamily = 'bookmark' | 'comment';
+interface ParagraphRangeMarkerHalf {
   readonly element: XmlElement;
+  readonly family: RangeMarkerFamily;
   readonly id: string;
   readonly name: string | undefined;
   readonly kind: 'start' | 'end';
   readonly runPosition: number;
 }
-declare function runBookmarkExtents(halves: readonly ParagraphBookmarkHalf[], index: ParagraphContentIndex): RunConstructExtent[];
+declare function runRangeMarkerExtents(halves: readonly ParagraphRangeMarkerHalf[], index: ParagraphContentIndex): RunConstructExtent[];
 declare const TABLE_OF_CONTENTS_GALLERY = "Table of Contents";
 declare function readContentControlDescriptor(sdt: XmlElement): ContentControlDescriptor;
 declare const PROVENANCE_CHANGE_BY_TAG: ReadonlyMap<string, ProvenanceChange>;
@@ -31,5 +33,6 @@ declare function readProvenanceDescriptor(element: XmlElement, change: Provenanc
 declare function bookmarkAnchorDescriptor(name: string): AnchorDescriptor;
 declare function runInstructionText(run: XmlElement): string;
 declare function fieldCharType(run: XmlElement): string | undefined;
+declare function readFormControlDescriptor(beginRun: XmlElement): ContentControlDescriptor | undefined;
 //#endregion
-export { ConstructExtent, PROVENANCE_CHANGE_BY_TAG, ParagraphBookmarkHalf, ParagraphContentIndex, TABLE_OF_CONTENTS_GALLERY, bookmarkAnchorDescriptor, contentBearingChildren, fieldCharType, indexParagraphContent, insertConstructMarkers, isDeletedChange, readContentControlDescriptor, readProvenanceDescriptor, runBookmarkExtents, runInstructionText };
+export { ConstructExtent, PROVENANCE_CHANGE_BY_TAG, ParagraphContentIndex, ParagraphRangeMarkerHalf, RangeMarkerFamily, TABLE_OF_CONTENTS_GALLERY, bookmarkAnchorDescriptor, contentBearingChildren, fieldCharType, indexParagraphContent, insertConstructMarkers, isDeletedChange, readContentControlDescriptor, readFormControlDescriptor, readProvenanceDescriptor, runInstructionText, runRangeMarkerExtents };

package/dist/typed/docx/constructs.js

@@ -92,11 +92,12 @@ function isBlockScopedHalf(half, index) {
 	const trailing = index.lastContentIndex === -1 || position > index.lastContentIndex;
 	return leading || trailing;
 }
-function runBookmarkExtents(halves, index) {
+function runRangeMarkerExtents(halves, index) {
 	const byId = /* @__PURE__ */ new Map();
 	for (const half of halves) {
-		const existing = byId.get(half.id);
-		if (existing === void 0) byId.set(half.id, [half]);
+		const key = `${half.family}:${half.id}`;
+		const existing = byId.get(key);
+		if (existing === void 0) byId.set(key, [half]);
 		else existing.push(half);
 	}
 	const extents = [];
@@ -106,10 +107,15 @@ function runBookmarkExtents(halves, index) {
 		const open = starts[0];
 		const close = ends[0];
 		if (starts.length !== 1 || ends.length !== 1 || open === void 0 || close === void 0) continue;
-		if (open.name === void 0 || close.runPosition < open.runPosition) continue;
+		const descriptor = open.family === "comment" ? {
+			kind: "anchor",
+			anchorType: "comment",
+			name: open.id
+		} : open.name === void 0 ? void 0 : bookmarkAnchorDescriptor(open.name);
+		if (descriptor === void 0 || close.runPosition < open.runPosition) continue;
 		if (isBlockScopedHalf(open, index) && isBlockScopedHalf(close, index)) continue;
 		extents.push({
-			descriptor: bookmarkAnchorDescriptor(open.name),
+			descriptor,
 			startRun: open.runPosition,
 			endRun: close.runPosition
 		});
@@ -249,5 +255,47 @@ function fieldCharType(run) {
 	const fldChar = childrenWithTag(run, "w:fldChar")[0];
 	return fldChar === void 0 ? void 0 : attr(fldChar, "w:fldCharType");
 }
+const FORM_CONTROL_TYPE_BY_TAG = /* @__PURE__ */ new Map([
+	["w:checkBox", "checkbox"],
+	["w:ddList", "dropDown"],
+	["w:textInput", "plainText"]
+]);
+function readOnOff(element) {
+	if (element === void 0) return;
+	const val = attr(element, "w:val");
+	return val === void 0 || val !== "0" && val !== "false" && val !== "off";
+}
+function readFormControlDescriptor(beginRun) {
+	const ffData = childrenWithTag(beginRun, "w:ffData")[0];
+	if (ffData === void 0) return;
+	const descriptor = {
+		kind: "contentControl",
+		controlType: "richText",
+		source: {
+			format: "docx",
+			xml: buildXml([ffData])
+		}
+	};
+	const name = childrenWithTag(ffData, "w:name")[0];
+	const nameVal = name === void 0 ? void 0 : attr(name, "w:val");
+	if (nameVal !== void 0) descriptor.tag = decodeEntities(nameVal);
+	for (const child of ffData.children) {
+		if (child.type !== "element") continue;
+		const controlType = FORM_CONTROL_TYPE_BY_TAG.get(child.tag);
+		if (controlType === void 0) continue;
+		descriptor.controlType = controlType;
+		if (child.tag === "w:checkBox") descriptor.checked = readOnOff(childrenWithTag(child, "w:checked")[0]) ?? readOnOff(childrenWithTag(child, "w:default")[0]) ?? false;
+		else if (child.tag === "w:ddList") {
+			const options = [];
+			for (const item of childrenWithTag(child, "w:listItem")) {
+				const value = attr(item, "w:displayText") ?? attr(item, "w:val");
+				if (value !== void 0) options.push(decodeEntities(value));
+			}
+			if (options.length > 0) descriptor.options = options;
+		}
+		break;
+	}
+	return descriptor;
+}
 //#endregion
-export { PROVENANCE_CHANGE_BY_TAG, TABLE_OF_CONTENTS_GALLERY, bookmarkAnchorDescriptor, contentBearingChildren, fieldCharType, indexParagraphContent, insertConstructMarkers, isDeletedChange, readContentControlDescriptor, readProvenanceDescriptor, runBookmarkExtents, runInstructionText };
+export { PROVENANCE_CHANGE_BY_TAG, TABLE_OF_CONTENTS_GALLERY, bookmarkAnchorDescriptor, contentBearingChildren, fieldCharType, indexParagraphContent, insertConstructMarkers, isDeletedChange, readContentControlDescriptor, readFormControlDescriptor, readProvenanceDescriptor, runInstructionText, runRangeMarkerExtents };

package/dist/typed/docx/read.cjs

@@ -1,6 +1,8 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_read = require("../../read-Di5UfiSh.cjs");
+const require_read = require("../../read-D-L3dItC.cjs");
 exports.CommentSchema = require_read.CommentSchema;
 exports.DocxDocumentSchema = require_read.DocxDocumentSchema;
 exports.FootnoteSchema = require_read.FootnoteSchema;
+exports.HeaderFooterPartSchema = require_read.HeaderFooterPartSchema;
+exports.SectionHeaderFooterReferencesSchema = require_read.SectionHeaderFooterReferencesSchema;
 exports.readDocxContent = require_read.readDocxContent;

package/dist/typed/docx/read.d.cts

@@ -1,2 +1,2 @@
-import { a as Footnote, i as DocxDocumentSchema, n as CommentSchema, o as FootnoteSchema, r as DocxDocument, s as readDocxContent, t as Comment } from "../../read-CDX1WbiF.cjs";
-export { Comment, CommentSchema, DocxDocument, DocxDocumentSchema, Footnote, FootnoteSchema, readDocxContent };
+import { a as Footnote, c as HeaderFooterPartSchema, d as readDocxContent, i as DocxDocumentSchema, l as SectionHeaderFooterReferences, n as CommentSchema, o as FootnoteSchema, r as DocxDocument, s as HeaderFooterPart, t as Comment, u as SectionHeaderFooterReferencesSchema } from "../../read-LTgVJIPU.cjs";
+export { Comment, CommentSchema, DocxDocument, DocxDocumentSchema, Footnote, FootnoteSchema, HeaderFooterPart, HeaderFooterPartSchema, SectionHeaderFooterReferences, SectionHeaderFooterReferencesSchema, readDocxContent };

package/dist/typed/docx/read.d.ts

@@ -1,2 +1,2 @@
-import { a as Footnote, i as DocxDocumentSchema, n as CommentSchema, o as FootnoteSchema, r as DocxDocument, s as readDocxContent, t as Comment } from "../../read-CxMli3Om.js";
-export { Comment, CommentSchema, DocxDocument, DocxDocumentSchema, Footnote, FootnoteSchema, readDocxContent };
+import { a as Footnote, c as HeaderFooterPartSchema, d as readDocxContent, i as DocxDocumentSchema, l as SectionHeaderFooterReferences, n as CommentSchema, o as FootnoteSchema, r as DocxDocument, s as HeaderFooterPart, t as Comment, u as SectionHeaderFooterReferencesSchema } from "../../read-D30xHgEp.js";
+export { Comment, CommentSchema, DocxDocument, DocxDocumentSchema, Footnote, FootnoteSchema, HeaderFooterPart, HeaderFooterPartSchema, SectionHeaderFooterReferences, SectionHeaderFooterReferencesSchema, readDocxContent };

package/dist/typed/docx/read.js

@@ -1,2 +1,2 @@
-import { i as readDocxContent, n as DocxDocumentSchema, r as FootnoteSchema, t as CommentSchema } from "../../read-BQoFiqsb.js";
-export { CommentSchema, DocxDocumentSchema, FootnoteSchema, readDocxContent };
+import { a as SectionHeaderFooterReferencesSchema, i as HeaderFooterPartSchema, n as DocxDocumentSchema, o as readDocxContent, r as FootnoteSchema, t as CommentSchema } from "../../read-DGknK1YY.js";
+export { CommentSchema, DocxDocumentSchema, FootnoteSchema, HeaderFooterPartSchema, SectionHeaderFooterReferencesSchema, readDocxContent };

package/dist/typed/docx/write.cjs

@@ -188,7 +188,15 @@ function interleaveRunConstructExtents(runElements, paragraph, state) {
 	const fault = (0, document_schema_js.findRunConstructFault)(paragraph);
 	if (fault !== void 0) throw new Error(`buildDocxPackageFromContent: run-level construct extent at index ${String(fault.index)} of a paragraph does not name real runs (${fault.kind})`);
 	const bookmarks = paragraph.constructs.filter((extent) => extent.descriptor.kind === "anchor" && extent.descriptor.anchorType === "bookmark");
-	if (bookmarks.length === 0) return [...runElements];
+	const fields = paragraph.constructs.filter((extent) => extent.descriptor.kind === "field");
+	const links = [];
+	for (const extent of paragraph.constructs) if (extent.descriptor.kind === "link" && extent.descriptor.target.kind === "internal") links.push({
+		descriptor: extent.descriptor,
+		startRun: extent.startRun,
+		endRun: extent.endRun,
+		anchor: extent.descriptor.target.anchor
+	});
+	if (bookmarks.length === 0 && fields.length === 0) return wrapInternalLinks([...runElements], new RunPositions(runElements), links);
 	const closingAt = /* @__PURE__ */ new Map();
 	const openingAt = /* @__PURE__ */ new Map();
 	const pointAt = /* @__PURE__ */ new Map();
@@ -212,7 +220,22 @@ function interleaveRunConstructExtents(runElements, paragraph, state) {
 			push(closingAt, bookmark.endRun, close);
 		}
 	}
+	for (const field of fields) {
+		const opening = [
+			fieldCharRun("begin"),
+			require_xml_fragment.el("w:r", {}, [require_xml_fragment.el("w:instrText", { "xml:space": "preserve" }, [require_xml_fragment.txt(require_xml_entities.encodeXmlText(field.descriptor.instruction))])]),
+			fieldCharRun("separate")
+		];
+		if (field.startRun === field.endRun) {
+			for (const run of opening) push(pointAt, field.startRun, run);
+			push(pointAt, field.startRun, fieldCharRun("end"));
+		} else {
+			for (const run of opening) push(openingAt, field.startRun, run);
+			push(closingAt, field.endRun, fieldCharRun("end"));
+		}
+	}
 	const out = [];
+	const positions = new RunPositions(runElements);
 	for (let position = 0; position <= runElements.length; position++) {
 		for (const close of closingAt.get(position) ?? []) out.push(close);
 		for (const open of openingAt.get(position) ?? []) out.push(open);
@@ -220,6 +243,46 @@ function interleaveRunConstructExtents(runElements, paragraph, state) {
 		const run = runElements[position];
 		if (run !== void 0) out.push(run);
 	}
+	return wrapInternalLinks(out, positions, links);
+}
+var RunPositions = class {
+	indexOfElement = /* @__PURE__ */ new Map();
+	constructor(runElements) {
+		runElements.forEach((element, index) => {
+			this.indexOfElement.set(element, index);
+		});
+	}
+	positionOf(element) {
+		return this.indexOfElement.get(element);
+	}
+};
+function wrapInternalLinks(elements, positions, links) {
+	if (links.length === 0) return elements;
+	let out = elements;
+	const wrapped = [];
+	for (const link of [...links].sort((a, b) => a.startRun - b.startRun || b.endRun - a.endRun)) {
+		let first = -1;
+		let last = -1;
+		out.forEach((element, index) => {
+			const position = positions.positionOf(element);
+			if (position === link.startRun) first = index;
+			if (position === link.endRun - 1) last = index;
+		});
+		if (first === -1 || last === -1 || last < first) continue;
+		const slice = out.slice(first, last + 1);
+		const overlapsWrapped = wrapped.some((range) => first <= range.last && range.first <= last);
+		const carriesHyperlink = slice.some((element) => element.tag === "w:hyperlink");
+		if (overlapsWrapped || carriesHyperlink) continue;
+		wrapped.push({
+			first,
+			last
+		});
+		out = [
+			...out.slice(0, first),
+			require_xml_fragment.el("w:hyperlink", { "w:anchor": require_xml_entities.encodeXmlText(link.anchor) }, slice),
+			...out.slice(last + 1)
+		];
+	}
 	return out;
 }
 function trailingEmptyRunElements(paragraph, element) {
@@ -636,15 +699,20 @@ function buildBlockFlow(blocks, state, deleted) {
 	return buildFlowItems(parseFlow(blocks), state, deleted, void 0);
 }
 function buildSectionProperties(section) {
-	return require_xml_fragment.el("w:sectPr", {}, [require_xml_fragment.el("w:pgSz", {
-		"w:w": String(require_typed_shared_units.ptToTwips(section.pageSize.widthPt)),
-		"w:h": String(require_typed_shared_units.ptToTwips(section.pageSize.heightPt))
-	}), require_xml_fragment.el("w:pgMar", {
-		"w:top": String(require_typed_shared_units.ptToTwips(section.margins.topPt)),
-		"w:right": String(require_typed_shared_units.ptToTwips(section.margins.rightPt)),
-		"w:bottom": String(require_typed_shared_units.ptToTwips(section.margins.bottomPt)),
-		"w:left": String(require_typed_shared_units.ptToTwips(section.margins.leftPt))
-	})]);
+	const type = section.breakType === void 0 ? [] : [require_xml_fragment.el("w:type", { "w:val": section.breakType })];
+	return require_xml_fragment.el("w:sectPr", {}, [
+		...type,
+		require_xml_fragment.el("w:pgSz", {
+			"w:w": String(require_typed_shared_units.ptToTwips(section.pageSize.widthPt)),
+			"w:h": String(require_typed_shared_units.ptToTwips(section.pageSize.heightPt))
+		}),
+		require_xml_fragment.el("w:pgMar", {
+			"w:top": String(require_typed_shared_units.ptToTwips(section.margins.topPt)),
+			"w:right": String(require_typed_shared_units.ptToTwips(section.margins.rightPt)),
+			"w:bottom": String(require_typed_shared_units.ptToTwips(section.margins.bottomPt)),
+			"w:left": String(require_typed_shared_units.ptToTwips(section.margins.leftPt))
+		})
+	]);
 }
 function attachSectionBreak(nodes, section) {
 	const target = findParagraph(nodes, true);

package/dist/typed/docx/write.js

@@ -187,7 +187,15 @@ function interleaveRunConstructExtents(runElements, paragraph, state) {
 	const fault = findRunConstructFault(paragraph);
 	if (fault !== void 0) throw new Error(`buildDocxPackageFromContent: run-level construct extent at index ${String(fault.index)} of a paragraph does not name real runs (${fault.kind})`);
 	const bookmarks = paragraph.constructs.filter((extent) => extent.descriptor.kind === "anchor" && extent.descriptor.anchorType === "bookmark");
-	if (bookmarks.length === 0) return [...runElements];
+	const fields = paragraph.constructs.filter((extent) => extent.descriptor.kind === "field");
+	const links = [];
+	for (const extent of paragraph.constructs) if (extent.descriptor.kind === "link" && extent.descriptor.target.kind === "internal") links.push({
+		descriptor: extent.descriptor,
+		startRun: extent.startRun,
+		endRun: extent.endRun,
+		anchor: extent.descriptor.target.anchor
+	});
+	if (bookmarks.length === 0 && fields.length === 0) return wrapInternalLinks([...runElements], new RunPositions(runElements), links);
 	const closingAt = /* @__PURE__ */ new Map();
 	const openingAt = /* @__PURE__ */ new Map();
 	const pointAt = /* @__PURE__ */ new Map();
@@ -211,7 +219,22 @@ function interleaveRunConstructExtents(runElements, paragraph, state) {
 			push(closingAt, bookmark.endRun, close);
 		}
 	}
+	for (const field of fields) {
+		const opening = [
+			fieldCharRun("begin"),
+			el("w:r", {}, [el("w:instrText", { "xml:space": "preserve" }, [txt(encodeXmlText(field.descriptor.instruction))])]),
+			fieldCharRun("separate")
+		];
+		if (field.startRun === field.endRun) {
+			for (const run of opening) push(pointAt, field.startRun, run);
+			push(pointAt, field.startRun, fieldCharRun("end"));
+		} else {
+			for (const run of opening) push(openingAt, field.startRun, run);
+			push(closingAt, field.endRun, fieldCharRun("end"));
+		}
+	}
 	const out = [];
+	const positions = new RunPositions(runElements);
 	for (let position = 0; position <= runElements.length; position++) {
 		for (const close of closingAt.get(position) ?? []) out.push(close);
 		for (const open of openingAt.get(position) ?? []) out.push(open);
@@ -219,6 +242,46 @@ function interleaveRunConstructExtents(runElements, paragraph, state) {
 		const run = runElements[position];
 		if (run !== void 0) out.push(run);
 	}
+	return wrapInternalLinks(out, positions, links);
+}
+var RunPositions = class {
+	indexOfElement = /* @__PURE__ */ new Map();
+	constructor(runElements) {
+		runElements.forEach((element, index) => {
+			this.indexOfElement.set(element, index);
+		});
+	}
+	positionOf(element) {
+		return this.indexOfElement.get(element);
+	}
+};
+function wrapInternalLinks(elements, positions, links) {
+	if (links.length === 0) return elements;
+	let out = elements;
+	const wrapped = [];
+	for (const link of [...links].sort((a, b) => a.startRun - b.startRun || b.endRun - a.endRun)) {
+		let first = -1;
+		let last = -1;
+		out.forEach((element, index) => {
+			const position = positions.positionOf(element);
+			if (position === link.startRun) first = index;
+			if (position === link.endRun - 1) last = index;
+		});
+		if (first === -1 || last === -1 || last < first) continue;
+		const slice = out.slice(first, last + 1);
+		const overlapsWrapped = wrapped.some((range) => first <= range.last && range.first <= last);
+		const carriesHyperlink = slice.some((element) => element.tag === "w:hyperlink");
+		if (overlapsWrapped || carriesHyperlink) continue;
+		wrapped.push({
+			first,
+			last
+		});
+		out = [
+			...out.slice(0, first),
+			el("w:hyperlink", { "w:anchor": encodeXmlText(link.anchor) }, slice),
+			...out.slice(last + 1)
+		];
+	}
 	return out;
 }
 function trailingEmptyRunElements(paragraph, element) {
@@ -635,15 +698,20 @@ function buildBlockFlow(blocks, state, deleted) {
 	return buildFlowItems(parseFlow(blocks), state, deleted, void 0);
 }
 function buildSectionProperties(section) {
-	return el("w:sectPr", {}, [el("w:pgSz", {
-		"w:w": String(ptToTwips(section.pageSize.widthPt)),
-		"w:h": String(ptToTwips(section.pageSize.heightPt))
-	}), el("w:pgMar", {
-		"w:top": String(ptToTwips(section.margins.topPt)),
-		"w:right": String(ptToTwips(section.margins.rightPt)),
-		"w:bottom": String(ptToTwips(section.margins.bottomPt)),
-		"w:left": String(ptToTwips(section.margins.leftPt))
-	})]);
+	const type = section.breakType === void 0 ? [] : [el("w:type", { "w:val": section.breakType })];
+	return el("w:sectPr", {}, [
+		...type,
+		el("w:pgSz", {
+			"w:w": String(ptToTwips(section.pageSize.widthPt)),
+			"w:h": String(ptToTwips(section.pageSize.heightPt))
+		}),
+		el("w:pgMar", {
+			"w:top": String(ptToTwips(section.margins.topPt)),
+			"w:right": String(ptToTwips(section.margins.rightPt)),
+			"w:bottom": String(ptToTwips(section.margins.bottomPt)),
+			"w:left": String(ptToTwips(section.margins.leftPt))
+		})
+	]);
 }
 function attachSectionBreak(nodes, section) {
 	const target = findParagraph(nodes, true);

package/dist/typed/embedded.cjs

@@ -1,4 +1,4 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_read = require("../read-Di5UfiSh.cjs");
+const require_read = require("../read-D-L3dItC.cjs");
 exports.readEmbeddedOoxmlPayload = require_read.readEmbeddedOoxmlPayload;
 exports.readEmbeddedPayloadPart = require_read.readEmbeddedPayloadPart;