@stll/folio-core 0.61.0 → 0.63.0

package/dist/docx/groupDrawingParser.js

@@ -16,6 +16,11 @@ const CROP_SCALE = 1e5;
 const MAX_PATH_COMMANDS = 1e4;
 const MAX_TEXT_CHARACTERS = 2e4;
 const MAX_SVG_CHARACTERS = 1e6;
+const NON_RENDERING_GROUP_CHILDREN = /* @__PURE__ */ new Set([
+	"cNvGrpSpPr",
+	"grpSpPr",
+	"extLst"
+]);
 const numericAttr = (element, name) => {
 	const direct = parseNumericAttribute(element, null, name);
 	if (direct !== void 0) return direct;
@@ -25,7 +30,8 @@ const numericAttr = (element, name) => {
 	return Number.isNaN(parsed) ? 0 : parsed;
 };
 const childTransform = (wsp) => {
-	const xfrm = findChildByLocalName(findChildByLocalName(wsp, "spPr"), "xfrm");
+	const spPr = findChildByLocalName(wsp, "spPr");
+	const xfrm = findChildByLocalName(spPr, "xfrm");
 	const off = findChildByLocalName(xfrm, "off");
 	const ext = findChildByLocalName(xfrm, "ext");
 	return {
@@ -41,7 +47,8 @@ const colorFrom = (parent, fallback) => {
 		if (value && HEX_COLOR.test(value)) return value.toUpperCase();
 	}
 	if (findChildByLocalName(parent, "noFill")) return "none";
-	const srgb = findChildByLocalName(findChildByLocalName(parent, "solidFill"), "srgbClr");
+	const solidFill = findChildByLocalName(parent, "solidFill");
+	const srgb = findChildByLocalName(solidFill, "srgbClr");
 	const referencedSrgb = findChildByLocalName(parent, "srgbClr");
 	const value = getAttribute(srgb ?? referencedSrgb, null, "val");
 	if (value && HEX_COLOR.test(value)) return value.toUpperCase();
@@ -88,7 +95,8 @@ const pathData = (path) => {
 */
 const withChildTransform = (element, piece) => {
 	if (!piece) return piece;
-	const transform = readTransform(findChildByLocalName(findChildByLocalName(element, "spPr"), "xfrm"));
+	const spPr = findChildByLocalName(element, "spPr");
+	const transform = readTransform(findChildByLocalName(spPr, "xfrm"));
 	return wrapTransformed(transform, piece);
 };
 const wrapTransformed = (transform, piece) => {
@@ -160,7 +168,8 @@ const renderPicture = (picture, index, rels, media) => {
 	if (width <= 0 || height <= 0) return "";
 	const blipFill = findChildByLocalName(picture, "blipFill");
 	const blip = findChildByLocalName(blipFill, "blip");
-	const { src } = resolveImageData(getAttribute(blip, "r", "embed") ?? getAttribute(blip, "r", "link") ?? void 0, rels, media);
+	const rId = getAttribute(blip, "r", "embed") ?? getAttribute(blip, "r", "link") ?? void 0;
+	const { src } = resolveImageData(rId, rels, media);
 	if (!src) return "";
 	const sourceRect = findChildByLocalName(blipFill, "srcRect");
 	const left = Math.max(0, numericAttr(sourceRect, "l")) / CROP_SCALE;
@@ -175,13 +184,14 @@ const renderPicture = (picture, index, rels, media) => {
 	const clipId = `group-picture-${index}`;
 	return `<defs><clipPath id="${clipId}"><rect x="${x}" y="${y}" width="${width}" height="${height}"/></clipPath></defs><g clip-path="url(#${clipId})">${image}</g>`;
 };
-const groupViewBox = (group, width, height) => {
-	const transform = readTransform(findChildByLocalName(findChildByLocalName(group, "grpSpPr"), "xfrm"));
+const effectiveRootTransform = (group, width, height) => {
+	const authored = readTransform(findChildByLocalName(findChildByLocalName(group, "grpSpPr"), "xfrm"));
 	return {
-		x: transform.childX,
-		y: transform.childY,
-		width: transform.childWidth > 0 ? transform.childWidth : width,
-		height: transform.childHeight > 0 ? transform.childHeight : height
+		...authored,
+		width: authored.width > 0 ? authored.width : width,
+		height: authored.height > 0 ? authored.height : height,
+		childWidth: authored.childWidth > 0 ? authored.childWidth : width,
+		childHeight: authored.childHeight > 0 ? authored.childHeight : height
 	};
 };
 /**
@@ -226,23 +236,26 @@ const createSvg = (group, width, height, rels, media, hostedTextBoxes) => {
 				if (nested === null) return null;
 				piece = nested ? wrapTransformed(transform, `<g transform="${nestedGroupTransform(transform)}">${nested}</g>`) : "";
 				total -= nested.length;
-			} else continue;
+			} else if (NON_RENDERING_GROUP_CHILDREN.has(localName)) continue;
+			else return null;
 			content += piece;
 			total += piece.length;
 			if (total > MAX_SVG_CHARACTERS) return null;
 		}
 		return content;
 	};
-	const viewBox = groupViewBox(group, width, height);
+	const root = effectiveRootTransform(group, width, height);
 	const content = render(group, {
-		x: width / viewBox.width,
-		y: height / viewBox.height
+		x: root.width / root.childWidth,
+		y: root.height / root.childHeight
 	}, 0);
 	if (content === null || !content && hostedTextBoxes.size === 0) return null;
-	return `<svg xmlns="http://www.w3.org/2000/svg" viewBox="${viewBox.x} ${viewBox.y} ${viewBox.width} ${viewBox.height}" width="${emuToPixels(width)}" height="${emuToPixels(height)}">${content}</svg>`;
+	const transformed = content ? wrapTransformed(root, `<g transform="${nestedGroupTransform(root)}">${content}</g>`) : "";
+	return `<svg xmlns="http://www.w3.org/2000/svg" data-folio-preview="wpGroup" viewBox="0 0 ${width} ${height}" width="${emuToPixels(width)}" height="${emuToPixels(height)}">${transformed}</svg>`;
 };
 const groupElement = (drawing) => {
-	return findChildByLocalName(findAllDeep(drawing, "a", "graphicData").at(0) ?? null, "wgp");
+	const graphicData = findAllDeep(drawing, "a", "graphicData").at(0);
+	return findChildByLocalName(graphicData ?? null, "wgp");
 };
 /**
 * Whether the layout can place the group's text boxes itself. A floating group
@@ -273,7 +286,9 @@ const parseGroupDrawing = (drawing, previews, rels, media) => {
 	if (!group) return null;
 	const image = parseImage(drawing, void 0, void 0);
 	if (!image || image.size.width <= 0 || image.size.height <= 0) return null;
-	const hosted = hostsTextBoxes(image) ? collectGroupTextBoxes(group, image.size.width, image.size.height) : [];
+	const rootTransform = effectiveRootTransform(group, image.size.width, image.size.height);
+	const rootTurnsChildren = rootTransform.rotation !== 0 || rootTransform.flipH || rootTransform.flipV;
+	const hosted = hostsTextBoxes(image) && !rootTurnsChildren ? collectGroupTextBoxes(group, image.size.width, image.size.height) : [];
 	const svg = createSvg(group, image.size.width, image.size.height, rels, media, new Set(hosted.map(({ wsp }) => wsp)));
 	if (!svg || svg.length > MAX_SVG_CHARACTERS) return null;
 	const { rId: _rId, src: _src, mimeType: _mimeType, filename: _filename, ...frame } = image;

package/dist/docx/headerFooterParser.d.ts

@@ -7,7 +7,7 @@ import { parseFooterReference, parseFooterReferences, parseHeaderReference, pars
 /**
  * Map of header/footer ID to HeaderFooter content
  */
-type HeaderFooterMap = {
+export type HeaderFooterMap = {
   /** Map of rId to HeaderFooter */
   byId: Map<string, document_d_exports.HeaderFooter>;
   /** Get header/footer by rId */
@@ -33,7 +33,7 @@ type HeaderFooterMap = {
  *   read on its own charges its previews to no package
  * @returns HeaderFooter object
  */
-declare function parseHeader(headerXml: string, hdrFtrType?: document_d_exports.HeaderFooterType, styles?: StyleMap | null, theme?: document_d_exports.Theme | null, numbering?: NumberingMap | null, rels?: document_d_exports.RelationshipMap | null, media?: Map<string, document_d_exports.MediaFile> | null, previews?: PreviewLedger): document_d_exports.HeaderFooter;
+export declare function parseHeader(headerXml: string, hdrFtrType?: document_d_exports.HeaderFooterType, styles?: StyleMap | null, theme?: document_d_exports.Theme | null, numbering?: NumberingMap | null, rels?: document_d_exports.RelationshipMap | null, media?: Map<string, document_d_exports.MediaFile> | null, previews?: PreviewLedger): document_d_exports.HeaderFooter;
 /**
  * Parse a footer XML file (word/footer*.xml)
  *
@@ -48,7 +48,7 @@ declare function parseHeader(headerXml: string, hdrFtrType?: document_d_exports.
  *   read on its own charges its previews to no package
  * @returns HeaderFooter object
  */
-declare function parseFooter(footerXml: string, hdrFtrType?: document_d_exports.HeaderFooterType, styles?: StyleMap | null, theme?: document_d_exports.Theme | null, numbering?: NumberingMap | null, rels?: document_d_exports.RelationshipMap | null, media?: Map<string, document_d_exports.MediaFile> | null, previews?: PreviewLedger): document_d_exports.HeaderFooter;
+export declare function parseFooter(footerXml: string, hdrFtrType?: document_d_exports.HeaderFooterType, styles?: StyleMap | null, theme?: document_d_exports.Theme | null, numbering?: NumberingMap | null, rels?: document_d_exports.RelationshipMap | null, media?: Map<string, document_d_exports.MediaFile> | null, previews?: PreviewLedger): document_d_exports.HeaderFooter;
 /**
  * Generic function to parse either header or footer
  *
@@ -62,11 +62,11 @@ declare function parseFooter(footerXml: string, hdrFtrType?: document_d_exports.
  * @param media - Media files
  * @returns HeaderFooter object
  */
-declare function parseHeaderFooter(xml: string, isHeader: boolean, hdrFtrType?: document_d_exports.HeaderFooterType, styles?: StyleMap | null, theme?: document_d_exports.Theme | null, numbering?: NumberingMap | null, rels?: document_d_exports.RelationshipMap | null, media?: Map<string, document_d_exports.MediaFile> | null): document_d_exports.HeaderFooter;
+export declare function parseHeaderFooter(xml: string, isHeader: boolean, hdrFtrType?: document_d_exports.HeaderFooterType, styles?: StyleMap | null, theme?: document_d_exports.Theme | null, numbering?: NumberingMap | null, rels?: document_d_exports.RelationshipMap | null, media?: Map<string, document_d_exports.MediaFile> | null): document_d_exports.HeaderFooter;
 /**
  * Create an empty HeaderFooterMap
  */
-declare function createEmptyHeaderFooterMap(): HeaderFooterMap;
+export declare function createEmptyHeaderFooterMap(): HeaderFooterMap;
 /**
  * Build a HeaderFooterMap from references and XML content
  *
@@ -80,15 +80,15 @@ declare function createEmptyHeaderFooterMap(): HeaderFooterMap;
  * @param media - Media files
  * @returns HeaderFooterMap with all parsed headers/footers
  */
-declare function buildHeaderFooterMap(references: (document_d_exports.HeaderReference | document_d_exports.FooterReference)[], xmlContents: Map<string, string>, isHeader: boolean, styles?: StyleMap | null, theme?: document_d_exports.Theme | null, numbering?: NumberingMap | null, rels?: document_d_exports.RelationshipMap | null, media?: Map<string, document_d_exports.MediaFile> | null): HeaderFooterMap;
+export declare function buildHeaderFooterMap(references: (document_d_exports.HeaderReference | document_d_exports.FooterReference)[], xmlContents: Map<string, string>, isHeader: boolean, styles?: StyleMap | null, theme?: document_d_exports.Theme | null, numbering?: NumberingMap | null, rels?: document_d_exports.RelationshipMap | null, media?: Map<string, document_d_exports.MediaFile> | null): HeaderFooterMap;
 /**
  * Check if header/footer is empty (no content)
  */
-declare function isEmptyHeaderFooter(hf: document_d_exports.HeaderFooter): boolean;
+export declare function isEmptyHeaderFooter(hf: document_d_exports.HeaderFooter): boolean;
 /**
  * Check if header/footer has page number field
  */
-declare function hasPageNumberField(hf: document_d_exports.HeaderFooter): boolean;
+export declare function hasPageNumberField(hf: document_d_exports.HeaderFooter): boolean;
 /**
  * Get the header for a given page considering type rules
  *
@@ -99,26 +99,26 @@ declare function hasPageNumberField(hf: document_d_exports.HeaderFooter): boolea
  * @param hasDifferentOddEven - Whether different odd/even pages is enabled
  * @returns The appropriate HeaderFooter or undefined
  */
-declare function getHeaderForPage(headers: Map<document_d_exports.HeaderFooterType, document_d_exports.HeaderFooter>, pageNumber: number, isFirstPage: boolean, hasDifferentFirstPage: boolean, hasDifferentOddEven: boolean): document_d_exports.HeaderFooter | undefined;
+export declare function getHeaderForPage(headers: Map<document_d_exports.HeaderFooterType, document_d_exports.HeaderFooter>, pageNumber: number, isFirstPage: boolean, hasDifferentFirstPage: boolean, hasDifferentOddEven: boolean): document_d_exports.HeaderFooter | undefined;
 /**
  * Get the footer for a given page considering type rules
  * (Same logic as getHeaderForPage)
  */
-declare function getFooterForPage(footers: Map<document_d_exports.HeaderFooterType, document_d_exports.HeaderFooter>, pageNumber: number, isFirstPage: boolean, hasDifferentFirstPage: boolean, hasDifferentOddEven: boolean): document_d_exports.HeaderFooter | undefined;
+export declare function getFooterForPage(footers: Map<document_d_exports.HeaderFooterType, document_d_exports.HeaderFooter>, pageNumber: number, isFirstPage: boolean, hasDifferentFirstPage: boolean, hasDifferentOddEven: boolean): document_d_exports.HeaderFooter | undefined;
 /**
  * Convert HeaderFooterMap to type-indexed Map
  *
  * @param map - HeaderFooterMap
  * @returns Map indexed by HeaderFooterType
  */
-declare function headerFooterMapToTypeMap(map: HeaderFooterMap): Map<document_d_exports.HeaderFooterType, document_d_exports.HeaderFooter>;
+export declare function headerFooterMapToTypeMap(map: HeaderFooterMap): Map<document_d_exports.HeaderFooterType, document_d_exports.HeaderFooter>;
 /**
  * Check if a HeaderFooter contains any images
  */
-declare function hasImages(hf: document_d_exports.HeaderFooter): boolean;
+export declare function hasImages(hf: document_d_exports.HeaderFooter): boolean;
 /**
  * Check if a HeaderFooter contains any tables
  */
-declare function hasTables(hf: document_d_exports.HeaderFooter): boolean;
+export declare function hasTables(hf: document_d_exports.HeaderFooter): boolean;
 //#endregion
-export { HeaderFooterMap, buildHeaderFooterMap, createEmptyHeaderFooterMap, getFooterForPage, getHeaderForPage, hasImages, hasPageNumberField, hasTables, headerFooterMapToTypeMap, isEmptyHeaderFooter, parseFooter, parseFooterReference, parseFooterReferences, parseHeader, parseHeaderFooter, parseHeaderReference, parseHeaderReferences };
+export { parseFooterReference, parseFooterReferences, parseHeaderReference, parseHeaderReferences };

package/dist/docx/headerFooterRefParser.d.ts

@@ -12,22 +12,21 @@ import { XmlElement } from "./xmlParser.js";
  * header/footer reference types has to read them through here, or a
  * normalisation at this boundary looks like a lost reference downstream.
  */
-declare function parseHeaderFooterType(typeAttr: string | null, context?: ParseContext): document_d_exports.HeaderFooterType;
+export declare function parseHeaderFooterType(typeAttr: string | null, context?: ParseContext): document_d_exports.HeaderFooterType;
 /**
  * Parse a header reference from sectPr (w:headerReference)
  */
-declare function parseHeaderReference(element: XmlElement, context?: ParseContext): document_d_exports.HeaderReference | null;
+export declare function parseHeaderReference(element: XmlElement, context?: ParseContext): document_d_exports.HeaderReference | null;
 /**
  * Parse a footer reference from sectPr (w:footerReference)
  */
-declare function parseFooterReference(element: XmlElement, context?: ParseContext): document_d_exports.FooterReference | null;
+export declare function parseFooterReference(element: XmlElement, context?: ParseContext): document_d_exports.FooterReference | null;
 /**
  * Parse all header references from a sectPr element
  */
-declare function parseHeaderReferences(sectPr: XmlElement): document_d_exports.HeaderReference[];
+export declare function parseHeaderReferences(sectPr: XmlElement): document_d_exports.HeaderReference[];
 /**
  * Parse all footer references from a sectPr element
  */
-declare function parseFooterReferences(sectPr: XmlElement): document_d_exports.FooterReference[];
-//#endregion
-export { parseFooterReference, parseFooterReferences, parseHeaderFooterType, parseHeaderReference, parseHeaderReferences };
+export declare function parseFooterReferences(sectPr: XmlElement): document_d_exports.FooterReference[];
+//#endregion

package/dist/docx/headerFooterReferenceNormalization.d.ts

@@ -1,8 +1,8 @@
 import { document_d_exports } from "../types/document.js";
 //#region src/docx/headerFooterReferenceNormalization.d.ts
 /** The codes this normalisation is reported under, owned here, not at the caller. */
-declare const DANGLING_HEADER_REFERENCE_WARNING: "dangling-header-reference";
-declare const DANGLING_FOOTER_REFERENCE_WARNING: "dangling-footer-reference";
+export declare const DANGLING_HEADER_REFERENCE_WARNING: "dangling-header-reference";
+export declare const DANGLING_FOOTER_REFERENCE_WARNING: "dangling-footer-reference";
 type NormalizeHeaderFooterReferencesInput = {
   documentBody: document_d_exports.DocumentBody;
   headers?: Map<string, document_d_exports.HeaderFooter>;
@@ -12,7 +12,7 @@ type NormalizeHeaderFooterReferencesResult = {
   removedDanglingHeaderReferences: number;
   removedDanglingFooterReferences: number;
 };
-declare const normalizeHeaderFooterReferences: ({ documentBody, headers, footers }: NormalizeHeaderFooterReferencesInput) => NormalizeHeaderFooterReferencesResult;
+export declare const normalizeHeaderFooterReferences: ({ documentBody, headers, footers }: NormalizeHeaderFooterReferencesInput) => NormalizeHeaderFooterReferencesResult;
 type AssignHeaderFooterRolesInput = {
   documentBody: document_d_exports.DocumentBody;
   headers?: Map<string, document_d_exports.HeaderFooter>;
@@ -31,6 +31,6 @@ type AssignHeaderFooterRolesInput = {
  * sections reference in different roles keeps the first, and a reader that
  * needs every role reads the section references themselves.
  */
-declare const assignHeaderFooterRoles: ({ documentBody, headers, footers }: AssignHeaderFooterRolesInput) => void;
+export declare const assignHeaderFooterRoles: ({ documentBody, headers, footers }: AssignHeaderFooterRolesInput) => void;
 //#endregion
-export { DANGLING_FOOTER_REFERENCE_WARNING, DANGLING_HEADER_REFERENCE_WARNING, assignHeaderFooterRoles, normalizeHeaderFooterReferences };
+export {};

package/dist/docx/headerFooterVerbatim.d.ts

@@ -8,27 +8,27 @@ type HeaderFooterSourceBaseline = {
   type: "captured";
   content: readonly document_d_exports.BlockContent[];
 };
-declare const captureHeaderFooterPackageBaselines: (document: document_d_exports.Document) => void;
+export declare const captureHeaderFooterPackageBaselines: (document: document_d_exports.Document) => void;
 /**
  * Transfer body, header and footer capture handles across a trusted
  * document graph clone. `structuredClone` drops symbol-keyed properties, so a
  * clone would otherwise read an edited part as uncaptured ("missing") rather
  * than as a mismatch against its source.
  */
-declare const copyHeaderFooterBaselineHandles: (target: document_d_exports.Document, source: document_d_exports.Document) => void;
+export declare const copyHeaderFooterBaselineHandles: (target: document_d_exports.Document, source: document_d_exports.Document) => void;
 /** Transfer the parsed package registry only across a trusted document graph clone. */
-declare const copyHeaderFooterPackageBaselines: (target: document_d_exports.Document, source: document_d_exports.Document) => void;
-declare const getHeaderFooterSourceBaseline: (hf: document_d_exports.HeaderFooter, originalBuffer?: ArrayBuffer) => HeaderFooterSourceBaseline;
-declare const canReplayHeaderFooterBlocks: (hf: document_d_exports.HeaderFooter, baselineContent: readonly document_d_exports.BlockContent[]) => boolean;
-declare const getHeaderFooterVerbatimXml: (hf: document_d_exports.HeaderFooter) => string | undefined;
-declare const canReplayHeaderFooterVerbatim: (hf: document_d_exports.HeaderFooter) => boolean;
-declare const assignHeaderFooterVerbatimXml: (hf: document_d_exports.HeaderFooter, xml: string) => void;
-declare const refreshHeaderFooterVerbatimFingerprint: (hf: document_d_exports.HeaderFooter) => void;
-declare const clearHeaderFooterVerbatimXml: (hf: document_d_exports.HeaderFooter) => void;
+export declare const copyHeaderFooterPackageBaselines: (target: document_d_exports.Document, source: document_d_exports.Document) => void;
+export declare const getHeaderFooterSourceBaseline: (hf: document_d_exports.HeaderFooter, originalBuffer?: ArrayBuffer) => HeaderFooterSourceBaseline;
+export declare const canReplayHeaderFooterBlocks: (hf: document_d_exports.HeaderFooter, baselineContent: readonly document_d_exports.BlockContent[]) => boolean;
+export declare const getHeaderFooterVerbatimXml: (hf: document_d_exports.HeaderFooter) => string | undefined;
+export declare const canReplayHeaderFooterVerbatim: (hf: document_d_exports.HeaderFooter) => boolean;
+export declare const assignHeaderFooterVerbatimXml: (hf: document_d_exports.HeaderFooter, xml: string) => void;
+export declare const refreshHeaderFooterVerbatimFingerprint: (hf: document_d_exports.HeaderFooter) => void;
+export declare const clearHeaderFooterVerbatimXml: (hf: document_d_exports.HeaderFooter) => void;
 /** Capture parsed resources on the same trusted handle, including an absent main part. */
-declare const captureDocumentSourceBaseline: (document: document_d_exports.Document, xml: string | undefined) => void;
+export declare const captureDocumentSourceBaseline: (document: document_d_exports.Document, xml: string | undefined) => void;
 /** Read the identity-stable, deeply frozen stylesheet without cloning or body comparison. */
-declare const getDocumentSourceStyles: (document: document_d_exports.Document, liveStyles?: document_d_exports.Document["package"]["styles"]) => {
+export declare const getDocumentSourceStyles: (document: document_d_exports.Document, liveStyles?: document_d_exports.Document["package"]["styles"]) => {
   readonly type: "missing";
   readonly baseline?: never;
 } | {
@@ -39,7 +39,7 @@ declare const getDocumentSourceStyles: (document: document_d_exports.Document, l
   readonly styles: Readonly<import("@stll/docx-core/model").StyleDefinitions> | undefined;
   readonly additions: import("@stll/docx-core").Style[];
 };
-declare const getDocumentSourceBaseline: (document: document_d_exports.Document) => {
+export declare const getDocumentSourceBaseline: (document: document_d_exports.Document) => {
   type: "missing";
 } | {
   type: "mismatch";
@@ -56,4 +56,4 @@ declare const getDocumentSourceBaseline: (document: document_d_exports.Document)
   }>;
 };
 //#endregion
-export { assignHeaderFooterVerbatimXml, canReplayHeaderFooterBlocks, canReplayHeaderFooterVerbatim, captureDocumentSourceBaseline, captureHeaderFooterPackageBaselines, clearHeaderFooterVerbatimXml, copyHeaderFooterBaselineHandles, copyHeaderFooterPackageBaselines, getDocumentSourceBaseline, getDocumentSourceStyles, getHeaderFooterSourceBaseline, getHeaderFooterVerbatimXml, refreshHeaderFooterVerbatimFingerprint };
+export {};

package/dist/docx/hyperlinkParser.d.ts

@@ -19,16 +19,16 @@ import { StyleMap } from "./styleParser.js";
  *   read on its own charges its previews to no package
  * @returns Parsed Hyperlink object
  */
-declare function parseHyperlink(node: XmlElement, rels: document_d_exports.RelationshipMap | null, styles?: StyleMap | null, theme?: document_d_exports.Theme | null, media?: Map<string, document_d_exports.MediaFile> | null, rootXmlns?: Record<string, string>, previews?: PreviewLedger): document_d_exports.Hyperlink;
+export declare function parseHyperlink(node: XmlElement, rels: document_d_exports.RelationshipMap | null, styles?: StyleMap | null, theme?: document_d_exports.Theme | null, media?: Map<string, document_d_exports.MediaFile> | null, rootXmlns?: Record<string, string>, previews?: PreviewLedger): document_d_exports.Hyperlink;
 /**
  * A `w:hyperlink`'s own attributes as a link with no children yet.
  *
  * The paragraph parser's revision-segmenting walk reads the children itself,
  * so it takes the shell rather than a link whose children it would discard.
  */
-declare function parseHyperlinkShell(node: XmlElement, rels: document_d_exports.RelationshipMap | null): document_d_exports.Hyperlink;
+export declare function parseHyperlinkShell(node: XmlElement, rels: document_d_exports.RelationshipMap | null): document_d_exports.Hyperlink;
 /** What {@link HYPERLINK_CHILD_HANDLERS} needs to read one child of a link. */
-type HyperlinkChildContext = {
+export type HyperlinkChildContext = {
   /** Where a parsed or captured child lands, in source order. */
   push: (child: document_d_exports.Hyperlink["children"][number]) => void;
   styles: StyleMap | null;
@@ -55,7 +55,7 @@ type HyperlinkChildContext = {
  * recognising is recognised by all of them rather than by whichever list
  * somebody remembered to update.
  */
-declare const HYPERLINK_CHILD_HANDLERS: {
+export declare const HYPERLINK_CHILD_HANDLERS: {
   readonly r: (child: XmlElement, { push, styles, theme, rels, media, previews, inScopeXmlns }: HyperlinkChildContext) => void;
   readonly bookmarkStart: (child: XmlElement, { push }: HyperlinkChildContext) => void;
   readonly bookmarkEnd: (child: XmlElement, { push }: HyperlinkChildContext) => void;
@@ -67,8 +67,8 @@ declare const HYPERLINK_CHILD_HANDLERS: {
   readonly ins: "capture";
   readonly moveFrom: "capture";
   readonly moveTo: "capture";
-  readonly commentRangeEnd: "capture";
-  readonly commentRangeStart: "capture";
+  readonly commentRangeEnd: ChildReader<HyperlinkChildContext>;
+  readonly commentRangeStart: ChildReader<HyperlinkChildContext>;
   readonly customXmlDelRangeEnd: "capture";
   readonly customXmlDelRangeStart: "capture";
   readonly customXmlInsRangeEnd: "capture";
@@ -79,10 +79,10 @@ declare const HYPERLINK_CHILD_HANDLERS: {
   readonly customXmlMoveToRangeStart: "capture";
   readonly fldSimple: (child: XmlElement, { push }: HyperlinkChildContext) => void;
   readonly hyperlink: (child: XmlElement, { push }: HyperlinkChildContext) => void;
-  readonly moveFromRangeEnd: "capture";
-  readonly moveFromRangeStart: "capture";
-  readonly moveToRangeEnd: "capture";
-  readonly moveToRangeStart: "capture";
+  readonly moveFromRangeEnd: ChildReader<HyperlinkChildContext>;
+  readonly moveFromRangeStart: ChildReader<HyperlinkChildContext>;
+  readonly moveToRangeEnd: ChildReader<HyperlinkChildContext>;
+  readonly moveToRangeStart: ChildReader<HyperlinkChildContext>;
   readonly permEnd: "capture";
   readonly permStart: "capture";
   readonly proofErr: "capture";
@@ -97,21 +97,21 @@ declare const HYPERLINK_CHILD_HANDLERS: {
  * @param hyperlink - Parsed Hyperlink object
  * @returns Display text string
  */
-declare function getHyperlinkText(hyperlink: document_d_exports.Hyperlink): string;
+export declare function getHyperlinkText(hyperlink: document_d_exports.Hyperlink): string;
 /**
  * Check if a hyperlink is an external link
  *
  * @param hyperlink - Parsed Hyperlink object
  * @returns true if this links to an external URL
  */
-declare function isExternalLink(hyperlink: document_d_exports.Hyperlink): boolean;
+export declare function isExternalLink(hyperlink: document_d_exports.Hyperlink): boolean;
 /**
  * Check if a hyperlink is an internal bookmark link
  *
  * @param hyperlink - Parsed Hyperlink object
  * @returns true if this links to an internal bookmark
  */
-declare function isInternalLink(hyperlink: document_d_exports.Hyperlink): boolean;
+export declare function isInternalLink(hyperlink: document_d_exports.Hyperlink): boolean;
 /**
  * Get the resolved URL of a hyperlink
  *
@@ -122,14 +122,14 @@ declare function isInternalLink(hyperlink: document_d_exports.Hyperlink): boolea
  * @param hyperlink - Parsed Hyperlink object
  * @returns Resolved URL or undefined
  */
-declare function getHyperlinkUrl(hyperlink: document_d_exports.Hyperlink): string | undefined;
+export declare function getHyperlinkUrl(hyperlink: document_d_exports.Hyperlink): string | undefined;
 /**
  * Check if a hyperlink has any content (runs)
  *
  * @param hyperlink - Parsed Hyperlink object
  * @returns true if hyperlink has child runs
  */
-declare function hasContent(hyperlink: document_d_exports.Hyperlink): boolean;
+export declare function hasContent(hyperlink: document_d_exports.Hyperlink): boolean;
 /**
  * Get all runs from a hyperlink, including those inside a transparent wrapper
  *
@@ -140,7 +140,7 @@ declare function hasContent(hyperlink: document_d_exports.Hyperlink): boolean;
  * @param hyperlink - Parsed Hyperlink object
  * @returns Array of Run objects
  */
-declare function getHyperlinkRuns(hyperlink: document_d_exports.Hyperlink): document_d_exports.Run[];
+export declare function getHyperlinkRuns(hyperlink: document_d_exports.Hyperlink): document_d_exports.Run[];
 /**
  * Resolve a hyperlink's rId to a URL using a relationship map
  *
@@ -151,7 +151,7 @@ declare function getHyperlinkRuns(hyperlink: document_d_exports.Hyperlink): docu
  * @param rels - Relationship map to resolve against
  * @returns The resolved URL or undefined
  */
-declare function resolveHyperlinkUrl(hyperlink: document_d_exports.Hyperlink, rels: document_d_exports.RelationshipMap): string | undefined;
+export declare function resolveHyperlinkUrl(hyperlink: document_d_exports.Hyperlink, rels: document_d_exports.RelationshipMap): string | undefined;
 /**
  * Create an internal hyperlink to a bookmark
  *
@@ -162,7 +162,7 @@ declare function resolveHyperlinkUrl(hyperlink: document_d_exports.Hyperlink, re
  * @param options - Optional properties (tooltip, etc.)
  * @returns New Hyperlink object
  */
-declare function createInternalHyperlink(anchor: string, children: document_d_exports.Run[], options?: {
+export declare function createInternalHyperlink(anchor: string, children: document_d_exports.Run[], options?: {
   tooltip?: string;
 }): document_d_exports.Hyperlink;
 /**
@@ -176,9 +176,8 @@ declare function createInternalHyperlink(anchor: string, children: document_d_ex
  * @param options - Optional properties (tooltip, target, etc.)
  * @returns New Hyperlink object
  */
-declare function createExternalHyperlink(url: string, children: document_d_exports.Run[], options?: {
+export declare function createExternalHyperlink(url: string, children: document_d_exports.Run[], options?: {
   tooltip?: string;
   target?: string;
 }): document_d_exports.Hyperlink;
-//#endregion
-export { HYPERLINK_CHILD_HANDLERS, HyperlinkChildContext, createExternalHyperlink, createInternalHyperlink, getHyperlinkRuns, getHyperlinkText, getHyperlinkUrl, hasContent, isExternalLink, isInternalLink, parseHyperlink, parseHyperlinkShell, resolveHyperlinkUrl };
+//#endregion

package/dist/docx/hyperlinkParser.js

@@ -2,12 +2,14 @@ import { sanitizeExternalUrl } from "../utils/urlSecurity.js";
 import { CAPTURE, dispatchChildrenWithContext, ownedElsewhere, withPreservedChildren } from "./containerChildren.js";
 import { inlineWrapperOf } from "./inlineWrapperParser.js";
 import { preserveLinkedSdt } from "./linkedSdtPreservation.js";
+import { parseCopyOriginMarker, parseMarkupRangeMarker, parseMoveBookmarkMarker } from "./markupRangeMarker.js";
 import { preserveInlineChild, preservedInlineCapture } from "./preservedRunContent.js";
 import { standalonePreviewLedger } from "./previewBudget.js";
 import { RELATIONSHIP_TYPES, resolveRelationshipIdOfType } from "./relsParser.js";
 import { parseRun } from "./runParser.js";
 import { runHoldsPayload } from "./runPayload.js";
-import { getAttribute, mergeXmlnsDeclarations, parseNumericAttribute, parseOnOffAttribute } from "./xmlParser.js";
+import { WORDPROCESSINGML_NAMESPACE_URIS, findChildren, getAttribute, getAttributeByNamespaceUri, mergeXmlnsDeclarations, parseNumericAttribute, parseOnOffAttribute } from "./xmlParser.js";
+import { isValidOoxmlNumericId } from "@stll/docx-core";
 //#region src/docx/hyperlinkParser.ts
 /**
 * Hyperlink Parser - Parse hyperlinks (w:hyperlink) with URL resolution
@@ -70,7 +72,7 @@ function parseHyperlink(node, rels, styles = null, theme = null, media = null, r
 	const hyperlink = parseHyperlinkShell(node, rels);
 	const inScopeXmlns = mergeXmlnsDeclarations(rootXmlns, node);
 	const children = [];
-	hyperlink.children = withPreservedChildren(children, dispatchChildrenWithContext({
+	const preserved = dispatchChildrenWithContext({
 		element: node,
 		container: "w:hyperlink",
 		capturePosition: () => children.length,
@@ -86,7 +88,8 @@ function parseHyperlink(node, rels, styles = null, theme = null, media = null, r
 			previews,
 			inScopeXmlns
 		}
-	}), preservedInlineCapture);
+	});
+	hyperlink.children = withPreservedChildren(children, preserved, preservedInlineCapture);
 	return hyperlink;
 }
 /**
@@ -127,6 +130,38 @@ function parseHyperlinkShell(node, rels) {
 const linkedInlineWrapper = (element) => (child, context) => {
 	context.push(parseLinkedInlineWrapper(element, child, context));
 };
+const linkedRangeMarker = (type) => (child, { push }) => {
+	const id = getAttributeByNamespaceUri(child, WORDPROCESSINGML_NAMESPACE_URIS, "id");
+	if (id === null || !isValidOoxmlNumericId(id)) {
+		push(preserveInlineChild(child));
+		return;
+	}
+	switch (type) {
+		case "moveFromRangeStart":
+		case "moveToRangeStart":
+			push({
+				type,
+				...parseMoveBookmarkMarker(child)
+			});
+			return;
+		case "commentRangeStart":
+		case "commentRangeEnd":
+			push({
+				type,
+				...parseMarkupRangeMarker(child)
+			});
+			return;
+		case "moveFromRangeEnd":
+		case "moveToRangeEnd":
+			push({
+				type,
+				...parseMarkupRangeMarker(child),
+				...parseCopyOriginMarker(child)
+			});
+			return;
+		default: return type;
+	}
+};
 /**
 * What a `w:hyperlink` does with every child its content model declares.
 *
@@ -148,6 +183,13 @@ const HYPERLINK_CHILD_HANDLERS = {
 	r: (child, { push, styles, theme, rels, media, previews, inScopeXmlns }) => {
 		const run = parseRun(child, styles, theme, rels, media, inScopeXmlns, previews);
 		if (runHoldsPayload(run)) push(run);
+		for (const commentReference of findChildren(child, "w", "commentReference")) {
+			const commentId = Number.parseInt(getAttributeByNamespaceUri(commentReference, WORDPROCESSINGML_NAMESPACE_URIS, "id") ?? "", 10);
+			if (Number.isFinite(commentId)) push({
+				type: "commentReference",
+				id: commentId
+			});
+		}
 	},
 	bookmarkStart: (child, { push }) => {
 		push(parseBookmarkStart(child));
@@ -163,8 +205,8 @@ const HYPERLINK_CHILD_HANDLERS = {
 	ins: CAPTURE,
 	moveFrom: CAPTURE,
 	moveTo: CAPTURE,
-	commentRangeEnd: CAPTURE,
-	commentRangeStart: CAPTURE,
+	commentRangeEnd: linkedRangeMarker("commentRangeEnd"),
+	commentRangeStart: linkedRangeMarker("commentRangeStart"),
 	customXmlDelRangeEnd: CAPTURE,
 	customXmlDelRangeStart: CAPTURE,
 	customXmlInsRangeEnd: CAPTURE,
@@ -179,10 +221,10 @@ const HYPERLINK_CHILD_HANDLERS = {
 	hyperlink: (child, { push }) => {
 		push(preserveInlineChild(child));
 	},
-	moveFromRangeEnd: CAPTURE,
-	moveFromRangeStart: CAPTURE,
-	moveToRangeEnd: CAPTURE,
-	moveToRangeStart: CAPTURE,
+	moveFromRangeEnd: linkedRangeMarker("moveFromRangeEnd"),
+	moveFromRangeStart: linkedRangeMarker("moveFromRangeStart"),
+	moveToRangeEnd: linkedRangeMarker("moveToRangeEnd"),
+	moveToRangeStart: linkedRangeMarker("moveToRangeStart"),
 	permEnd: CAPTURE,
 	permStart: CAPTURE,
 	proofErr: CAPTURE,
@@ -223,7 +265,7 @@ const LINKED_INLINE_WRAPPER_HANDLERS = {
 const parseLinkedInlineWrapper = (element, node, context) => {
 	const inScopeXmlns = mergeXmlnsDeclarations(context.inScopeXmlns, node);
 	const content = [];
-	return inlineWrapperOf(element, node, withPreservedChildren(content, dispatchChildrenWithContext({
+	const preserved = dispatchChildrenWithContext({
 		element: node,
 		container: "run-level-content",
 		capturePosition: () => content.length,
@@ -235,7 +277,8 @@ const parseLinkedInlineWrapper = (element, node, context) => {
 				content.push(child);
 			}
 		}
-	}), preservedInlineCapture));
+	});
+	return inlineWrapperOf(element, node, withPreservedChildren(content, preserved, preservedInlineCapture));
 };
 /**
 * Get the display text of a hyperlink