@stll/folio-core 0.15.1 → 0.15.3

package/dist/docx/runParser.js

@@ -1,12 +1,12 @@
-import { EmphasisMarkSchema, FontHintSchema, FontThemeSchema, HighlightColorSchema, ShadingPatternSchema, TextEffectSchema, ThemeColorSlotSchema, UnderlineStyleSchema, narrowEnum } from "./parserEnums.js";
-import { cloneWithXmlnsDeclarations, elementToXml, findAllDeep, findChild, findChildren, getAttribute, getChildElements, getLocalName, getTextContent, mergeXmlnsDeclarations, parseBooleanElement, parseNumericAttribute } from "./xmlParser.js";
-import { isTextBoxDrawing } from "./textBoxParser.js";
-import { parseImage } from "./imageParser.js";
 import { parseGroupDrawing } from "./groupDrawingParser.js";
+import { parseImage } from "./imageParser.js";
+import { EmphasisMarkSchema, FontHintSchema, FontThemeSchema, HighlightColorSchema, PositionalTabAlignmentSchema, PositionalTabLeaderSchema, PositionalTabRelativeToSchema, ShadingPatternSchema, TextEffectSchema, ThemeColorSlotSchema, UnderlineStyleSchema, narrowEnum } from "./parserEnums.js";
 import { parseShapeFromDrawing, shouldPreserveRawShapeDrawing } from "./shapeParser.js";
-import { parseVmlImageContent } from "./vmlImageParser.js";
-import { resolveThemeFontRef } from "./themeParser.js";
+import { isTextBoxDrawing } from "./textBoxParser.js";
 import { requiresXmlSpacePreserve } from "./textWhitespace.js";
+import { resolveThemeFontRef } from "./themeParser.js";
+import { parseVmlImageContent } from "./vmlImageParser.js";
+import { cloneWithXmlnsDeclarations, elementToXml, findAllDeep, findChild, findChildren, getAttribute, getChildElements, getLocalName, getTextContent, mergeXmlnsDeclarations, parseBooleanElement, parseNumericAttribute } from "./xmlParser.js";
 import { normalizeRevisionId } from "@stll/docx-core/model";
 //#region src/docx/runParser.ts
 /**
@@ -386,6 +386,19 @@ function parseTextContent(element) {
 function parseTabContent() {
 	return { type: "tab" };
 }
+function parsePositionalTabContent(element) {
+	const positional = {};
+	const relativeTo = narrowEnum(getAttribute(element, "w", "relativeTo"), PositionalTabRelativeToSchema);
+	const alignment = narrowEnum(getAttribute(element, "w", "alignment"), PositionalTabAlignmentSchema);
+	const leader = narrowEnum(getAttribute(element, "w", "leader"), PositionalTabLeaderSchema);
+	if (relativeTo !== void 0) positional.relativeTo = relativeTo;
+	if (alignment !== void 0) positional.alignment = alignment;
+	if (leader !== void 0) positional.leader = leader;
+	return {
+		type: "tab",
+		positional
+	};
+}
 /**
 * Parse break element (w:br)
 */
@@ -516,6 +529,9 @@ function parseRunContents(runElement, rels, media, rootXmlns = {}) {
 		case "tab":
 			contents.push(parseTabContent());
 			break;
+		case "ptab":
+			contents.push(parsePositionalTabContent(child));
+			break;
 		case "br":
 			contents.push(parseBreakContent(child));
 			break;

package/dist/docx/sectionParser.js

@@ -1,7 +1,7 @@
-import { BorderStyleSchema, ThemeColorSlotSchema, narrowEnum } from "./parserEnums.js";
-import { findChild, findChildren, getAttribute, getChildElements, getLocalName, parseBooleanElement, parseNumericAttribute } from "./xmlParser.js";
 import { parseFooterReference, parseHeaderReference } from "./headerFooterRefParser.js";
 import { parseEndnoteProperties, parseFootnoteProperties } from "./notePropertiesParser.js";
+import { BorderStyleSchema, ThemeColorSlotSchema, narrowEnum } from "./parserEnums.js";
+import { findChild, findChildren, getAttribute, getChildElements, getLocalName, parseBooleanElement, parseNumericAttribute } from "./xmlParser.js";
 import { normalizeRevisionId } from "@stll/docx-core/model";
 //#region src/docx/sectionParser.ts
 /**

package/dist/docx/selectiveSave.js

@@ -1,18 +1,18 @@
-import { parseNumbering } from "./numberingParser.js";
-import { RELATIONSHIP_TYPES } from "./relsParser.js";
 import { parseCommentsExtended } from "./commentParser.js";
-import { validateFolioDocumentModel } from "./modelValidation.js";
-import { isPreservableDocxEntry } from "./unzip.js";
-import { hasUnsynthesizedReplyRanges } from "./commentReplyMarkers.js";
 import { withoutOrphanCommentRanges } from "./commentRangeIntegrity.js";
+import { hasUnsynthesizedReplyRanges } from "./commentReplyMarkers.js";
+import { validateFolioDocumentModel } from "./modelValidation.js";
 import { isNewDataUrlDrawing } from "./newImage.js";
+import { parseNumbering } from "./numberingParser.js";
+import { RELATIONSHIP_TYPES } from "./relsParser.js";
+import { COMMENTS_CONTENT_TYPE, COMMENTS_EXTENDED_PART_LOWER, addCommentsExtendedOverride, addCommentsExtendedRelationship, applyUpdatesToZip, collectHeaderFooterUpdates, findMaxRId, hasModelDrivenPictureWatermark, hasUnmaterializedHeaderFooter, updateCoreProperties } from "./rezip.js";
+import "./selectiveSaveFlags.js";
 import { buildPatchedDocumentXml, buildPatchedNoteXml, buildPatchedNumberingXml, collectChangedNumberingDefs, collectParaIds } from "./selectiveXmlPatch.js";
 import { ensureThreadedCommentParaIds, serializeComments, serializeCommentsExtended } from "./serializer/commentSerializer.js";
 import { serializeDocument } from "./serializer/documentSerializer.js";
 import { serializeEndnotes, serializeFootnotes } from "./serializer/noteSerializer.js";
 import { serializeNumberingXml } from "./serializer/numberingSerializer.js";
-import { COMMENTS_CONTENT_TYPE, COMMENTS_EXTENDED_PART_LOWER, addCommentsExtendedOverride, addCommentsExtendedRelationship, applyUpdatesToZip, collectHeaderFooterUpdates, findMaxRId, hasModelDrivenPictureWatermark, hasUnmaterializedHeaderFooter, updateCoreProperties } from "./rezip.js";
-import "./selectiveSaveFlags.js";
+import { isPreservableDocxEntry } from "./unzip.js";
 //#region src/docx/selectiveSave.ts
 /**
 * Check if document content has new images (data: URL without rId) or

package/dist/docx/serializer/commentSerializer.js

@@ -1,33 +1,38 @@
 import { deterministicHexId } from "../../utils/hexId.js";
-import { escapeXml } from "./xmlUtils.js";
 import { serializeParagraph } from "./paragraphSerializer.js";
+import { serializeTextFormatting } from "./runSerializer.js";
+import { escapeXml } from "./xmlUtils.js";
 //#region src/docx/serializer/commentSerializer.ts
 /**
 * Comment Serializer
 *
 * Serializes Comment[] to OOXML comments.xml format.
 */
-const ANNOTATION_REFERENCE_XML = "<w:r><w:rPr><w:rStyle w:val=\"CommentReference\"/></w:rPr><w:annotationRef/></w:r>";
+const DEFAULT_ANNOTATION_REFERENCE_PROPERTIES = "<w:rPr><w:rStyle w:val=\"CommentReference\"/></w:rPr>";
 const PARAGRAPH_PROPERTIES_END = "</w:pPr>";
+const serializeAnnotationReference = (formatting) => {
+	return `<w:r>${formatting ? serializeTextFormatting(formatting) : DEFAULT_ANNOTATION_REFERENCE_PROPERTIES}<w:annotationRef/></w:r>`;
+};
 /** Serialize a paragraph, prepending an annotationRef run (required by Word in first paragraph of a comment) */
-function serializeParagraphWithAnnotationRef(paragraph) {
+function serializeParagraphWithAnnotationRef(paragraph, formatting) {
 	const xml = serializeParagraph(paragraph);
+	const annotationReference = serializeAnnotationReference(formatting);
 	const propertiesEnd = xml.indexOf(PARAGRAPH_PROPERTIES_END);
 	if (propertiesEnd !== -1) {
 		const contentStart = propertiesEnd + 8;
-		return `${xml.slice(0, contentStart)}${ANNOTATION_REFERENCE_XML}${xml.slice(contentStart)}`;
+		return `${xml.slice(0, contentStart)}${annotationReference}${xml.slice(contentStart)}`;
 	}
-	return xml.replace(/^<w:p(?=[\s>])[^>]*>/u, (openingTag) => `${openingTag}${ANNOTATION_REFERENCE_XML}`);
+	return xml.replace(/^<w:p(?=[\s>])[^>]*>/u, (openingTag) => `${openingTag}${annotationReference}`);
 }
 function serializeComment(comment) {
 	const attrs = [`w:id="${comment.id}"`, `w:author="${escapeXml(comment.author)}"`];
-	if (comment.initials) attrs.push(`w:initials="${escapeXml(comment.initials)}"`);
+	if (comment.initials !== void 0) attrs.push(`w:initials="${escapeXml(comment.initials)}"`);
 	if (comment.date) attrs.push(`w:date="${escapeXml(comment.date)}"`);
 	let xml = `<w:comment ${attrs.join(" ")}>`;
 	if (comment.content.length > 0) {
-		xml += serializeParagraphWithAnnotationRef(comment.content[0]);
+		xml += serializeParagraphWithAnnotationRef(comment.content[0], comment.annotationReferenceFormatting);
 		for (let i = 1; i < comment.content.length; i++) xml += serializeParagraph(comment.content[i]);
-	} else xml += "<w:p><w:r><w:rPr><w:rStyle w:val=\"CommentReference\"/></w:rPr><w:annotationRef/></w:r></w:p>";
+	} else xml += `<w:p>${serializeAnnotationReference(comment.annotationReferenceFormatting)}</w:p>`;
 	xml += "</w:comment>";
 	return xml;
 }

package/dist/docx/serializer/documentSerializer.js

@@ -1,13 +1,14 @@
-import { serializeTable } from "./tableSerializer.js";
+import { serializeBlockSdt } from "./blockSdtSerializer.js";
+import { serializeParagraph } from "./paragraphSerializer.js";
 import { resetAutoIdCounter } from "./runSerializer.js";
 import { serializeSectionProperties } from "./sectionPropertiesSerializer.js";
-import { serializeParagraph } from "./paragraphSerializer.js";
-import { serializeBlockSdt } from "./blockSdtSerializer.js";
+import { serializeTable } from "./tableSerializer.js";
 //#region src/docx/serializer/documentSerializer.ts
 /**
 * Standard OOXML namespaces for document.xml
 */
 const NAMESPACES = {
+	a: "http://schemas.openxmlformats.org/drawingml/2006/main",
 	wpc: "http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas",
 	cx: "http://schemas.microsoft.com/office/drawing/2014/chartex",
 	cx1: "http://schemas.microsoft.com/office/drawing/2015/9/8/chartex",
@@ -23,6 +24,7 @@ const NAMESPACES = {
 	am3d: "http://schemas.microsoft.com/office/drawing/2017/model3d",
 	o: "urn:schemas-microsoft-com:office:office",
 	oel: "http://schemas.microsoft.com/office/2019/extlst",
+	pic: "http://schemas.openxmlformats.org/drawingml/2006/picture",
 	r: "http://schemas.openxmlformats.org/officeDocument/2006/relationships",
 	m: "http://schemas.openxmlformats.org/officeDocument/2006/math",
 	v: "urn:schemas-microsoft-com:vml",
@@ -47,9 +49,11 @@ const NAMESPACES = {
 */
 function buildNamespaceDeclarations() {
 	const declared = {
+		a: NAMESPACES.a,
 		wpc: NAMESPACES.wpc,
 		mc: NAMESPACES.mc,
 		o: NAMESPACES.o,
+		pic: NAMESPACES.pic,
 		r: NAMESPACES.r,
 		m: NAMESPACES.m,
 		v: NAMESPACES.v,

package/dist/docx/serializer/headerFooterSerializer.js

@@ -1,8 +1,8 @@
 import { canReplayHeaderFooterVerbatim, getHeaderFooterVerbatimXml } from "../headerFooterVerbatim.js";
-import { escapeXml } from "./xmlUtils.js";
-import { serializeTable } from "./tableSerializer.js";
-import { serializeParagraph } from "./paragraphSerializer.js";
 import { serializeBlockSdt } from "./blockSdtSerializer.js";
+import { serializeParagraph } from "./paragraphSerializer.js";
+import { serializeTable } from "./tableSerializer.js";
+import { escapeXml } from "./xmlUtils.js";
 //#region src/docx/serializer/headerFooterSerializer.ts
 const NAMESPACES = {
 	wpc: "http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas",

package/dist/docx/serializer/noteSerializer.js

@@ -1,6 +1,6 @@
-import { serializeTable } from "./tableSerializer.js";
-import { serializeParagraph } from "./paragraphSerializer.js";
 import { serializeBlockSdt } from "./blockSdtSerializer.js";
+import { serializeParagraph } from "./paragraphSerializer.js";
+import { serializeTable } from "./tableSerializer.js";
 //#region src/docx/serializer/noteSerializer.ts
 const NAMESPACES = {
 	wpc: "http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas",

package/dist/docx/serializer/numberingSerializer.js

@@ -1,5 +1,5 @@
-import { escapeXml, intAttr } from "./xmlUtils.js";
 import { serializeTextFormatting } from "./runSerializer.js";
+import { escapeXml, intAttr } from "./xmlUtils.js";
 //#region src/docx/serializer/numberingSerializer.ts
 const W_NS = "http://schemas.openxmlformats.org/wordprocessingml/2006/main";
 /**

package/dist/docx/serializer/paragraphSerializer.js

@@ -1,10 +1,10 @@
-import { numPrEqual } from "../numberingParser.js";
 import { isValidHexColor } from "../../utils/colorResolver.js";
+import { numPrEqual } from "../numberingParser.js";
 import { reconcileRawSdtPr } from "../sdtPropertiesPatch.js";
-import { escapeXml, intAttr, isSingleWellFormedElement } from "./xmlUtils.js";
 import { serializeBorder } from "./borderSerializer.js";
 import { serializeRun, serializeTextFormatting } from "./runSerializer.js";
 import { serializeSectionProperties } from "./sectionPropertiesSerializer.js";
+import { escapeXml, intAttr, isSingleWellFormedElement } from "./xmlUtils.js";
 import { normalizeRevisionId } from "@stll/docx-core/model";
 //#region src/docx/serializer/paragraphSerializer.ts
 /**

package/dist/docx/serializer/runSerializer.js

@@ -1,10 +1,10 @@
 import { HIGHLIGHT_COLOR_VALUES } from "../../types/documentEnumValues.js";
-import { THEME_COLOR_TO_DRAWING_SCHEME } from "../drawingUtils.js";
 import { isValidHexColor } from "../../utils/colorResolver.js";
+import { THEME_COLOR_TO_DRAWING_SCHEME } from "../drawingUtils.js";
 import { requiresXmlSpacePreserve } from "../textWhitespace.js";
-import { escapeXml, intAttr } from "./xmlUtils.js";
-import { serializeTable } from "./tableSerializer.js";
 import { serializeParagraph } from "./paragraphSerializer.js";
+import { serializeTable } from "./tableSerializer.js";
+import { escapeXml, intAttr } from "./xmlUtils.js";
 import { panic } from "better-result";
 import { normalizeRevisionId } from "@stll/docx-core/model";
 //#region src/docx/serializer/runSerializer.ts
@@ -38,7 +38,7 @@ function getUniqueId(id) {
 	return String(nextAutoId++);
 }
 /** Valid OOXML highlight color names (ECMA-376 §17.18.40) */
-const VALID_HIGHLIGHT_COLORS = new Set(HIGHLIGHT_COLOR_VALUES.filter((color) => color !== "none"));
+const VALID_HIGHLIGHT_COLORS = new Set(HIGHLIGHT_COLOR_VALUES);
 /**
 * Serialize a color element (w:color)
 */
@@ -132,7 +132,7 @@ function serializeTextFormatting(formatting) {
 	if (formatting.position !== void 0) parts.push(`<w:position w:val="${intAttr(formatting.position)}"/>`);
 	if (formatting.fontSize !== void 0) parts.push(`<w:sz w:val="${intAttr(formatting.fontSize)}"/>`);
 	if (formatting.fontSizeCs !== void 0) parts.push(`<w:szCs w:val="${intAttr(formatting.fontSizeCs)}"/>`);
-	if (formatting.highlight && formatting.highlight !== "none") {
+	if (formatting.highlight) {
 		if (VALID_HIGHLIGHT_COLORS.has(formatting.highlight)) parts.push(`<w:highlight w:val="${formatting.highlight}"/>`);
 		else if (!formatting.shading) {
 			const hex = formatting.highlight.replace(/^#/u, "");
@@ -150,13 +150,14 @@ function serializeTextFormatting(formatting) {
 		parts.push(`<w:u ${uAttrs.join(" ")}/>`);
 	}
 	if (formatting.effect && formatting.effect !== "none") parts.push(`<w:effect w:val="${formatting.effect}"/>`);
-	if (formatting.emphasisMark && formatting.emphasisMark !== "none") parts.push(`<w:em w:val="${formatting.emphasisMark}"/>`);
+	if (formatting.emphasisMark) parts.push(`<w:em w:val="${formatting.emphasisMark}"/>`);
 	const shadingXml = serializeShading(formatting.shading);
 	if (shadingXml) parts.push(shadingXml);
 	if (formatting.vertAlign) parts.push(`<w:vertAlign w:val="${formatting.vertAlign}"/>`);
 	if (formatting.rtl === true) parts.push("<w:rtl/>");
 	else if (formatting.rtl === false) parts.push("<w:rtl w:val=\"0\"/>");
-	if (formatting.cs) parts.push("<w:cs/>");
+	if (formatting.cs === true) parts.push("<w:cs/>");
+	else if (formatting.cs === false) parts.push("<w:cs w:val=\"0\"/>");
 	if (parts.length === 0) return "";
 	return `<w:rPr>${parts.join("")}</w:rPr>`;
 }
@@ -191,8 +192,13 @@ function serializeTextContent(content) {
 /**
 * Serialize tab content (w:tab)
 */
-function serializeTabContent(_content) {
-	return "<w:tab/>";
+function serializeTabContent(content) {
+	if (!content.positional) return "<w:tab/>";
+	return `<w:ptab${[
+		content.positional.relativeTo ? ` w:relativeTo="${escapeXml(content.positional.relativeTo)}"` : "",
+		content.positional.alignment ? ` w:alignment="${escapeXml(content.positional.alignment)}"` : "",
+		content.positional.leader ? ` w:leader="${escapeXml(content.positional.leader)}"` : ""
+	].join("")}/>`;
 }
 /**
 * Serialize break content (w:br)
@@ -201,10 +207,8 @@ function serializeBreakContent(content) {
 	const attrs = [];
 	if (content.breakType === "page") attrs.push("w:type=\"page\"");
 	else if (content.breakType === "column") attrs.push("w:type=\"column\"");
-	else if (content.breakType === "textWrapping") {
-		attrs.push("w:type=\"textWrapping\"");
-		if (content.clear && content.clear !== "none") attrs.push(`w:clear="${content.clear}"`);
-	}
+	else if (content.breakType === "textWrapping") attrs.push("w:type=\"textWrapping\"");
+	if (content.clear !== void 0) attrs.push(`w:clear="${content.clear}"`);
 	if (attrs.length === 0) return "<w:br/>";
 	return `<w:br ${attrs.join(" ")}/>`;
 }
@@ -264,6 +268,7 @@ function serializeDrawingColor(color) {
 /** Serialize shape fill to DrawingML */
 function serializeFill(fill) {
 	if (!fill) return "";
+	if (fill.rawXml) return fill.rawXml;
 	if (fill.type === "none") return "<a:noFill/>";
 	if (fill.type === "solid" && fill.color) return `<a:solidFill>${serializeDrawingColor(fill.color)}</a:solidFill>`;
 	if (fill.type === "gradient" && fill.gradient) {
@@ -286,6 +291,7 @@ function serializeLineCap(cap) {
 }
 function serializeOutline(outline) {
 	if (!outline) return "";
+	if (outline.rawXml) return outline.rawXml;
 	const attrs = [];
 	if (typeof outline.width === "number") attrs.push(`w="${outline.width}"`);
 	if (outline.cap) attrs.push(`cap="${serializeLineCap(outline.cap)}"`);

package/dist/docx/serializer/sectionPropertiesSerializer.js

@@ -1,6 +1,6 @@
 import { getUnserializedSectionPropertyChildNames } from "../sectionParser.js";
-import { escapeXml, intAttr } from "./xmlUtils.js";
 import { serializeBorder } from "./borderSerializer.js";
+import { escapeXml, intAttr } from "./xmlUtils.js";
 import { normalizeRevisionId } from "@stll/docx-core/model";
 //#region src/docx/serializer/sectionPropertiesSerializer.ts
 const serializeHeaderReference = (ref) => `<w:headerReference w:type="${ref.type}" r:id="${ref.rId}"/>`;
@@ -51,7 +51,7 @@ function serializePaperSource(props) {
 	return attrs.length > 0 ? `<w:paperSrc ${attrs.join(" ")}/>` : "";
 }
 function serializeColumns(props) {
-	if (props.columnCount === void 0 && !props.columns?.length && props.columnSpace === void 0) return "";
+	if (props.columnCount === void 0 && !props.columns?.length && props.columnSpace === void 0 && props.equalWidth === void 0) return "";
 	const attrs = [];
 	if (props.columnCount !== void 0 && props.columnCount >= 1) attrs.push(`w:num="${intAttr(props.columnCount)}"`);
 	if (props.columnSpace !== void 0) attrs.push(`w:space="${intAttr(props.columnSpace)}"`);
@@ -169,7 +169,8 @@ function serializeSectionProperties(props) {
 	]) if (xml) parts.push(xml);
 	if (props.verticalAlign) parts.push(`<w:vAlign w:val="${props.verticalAlign}"/>`);
 	if (props.textDirection) parts.push(`<w:textDirection w:val="${props.textDirection}"/>`);
-	if (props.titlePg) parts.push("<w:titlePg/>");
+	const titlePgXml = serializeOnOffElement(props.titlePg, "titlePg");
+	if (titlePgXml) parts.push(titlePgXml);
 	const bidiXml = serializeOnOffElement(props.bidi, "bidi");
 	if (bidiXml) parts.push(bidiXml);
 	for (const xml of [

package/dist/docx/serializer/stylesSerializer.js

@@ -1,7 +1,7 @@
-import { escapeXml } from "./xmlUtils.js";
-import { serializeTableCellFormatting, serializeTableFormatting, serializeTableRowFormatting } from "./tableSerializer.js";
-import { serializeTextFormatting } from "./runSerializer.js";
 import { serializeParagraphFormatting } from "./paragraphSerializer.js";
+import { serializeTextFormatting } from "./runSerializer.js";
+import { serializeTableCellFormatting, serializeTableFormatting, serializeTableRowFormatting } from "./tableSerializer.js";
+import { escapeXml } from "./xmlUtils.js";
 //#region src/docx/serializer/stylesSerializer.ts
 const W_NS = "http://schemas.openxmlformats.org/wordprocessingml/2006/main";
 const serializeStylesXml = (definitions) => {

package/dist/docx/serializer/tableSerializer.js

@@ -1,6 +1,6 @@
 import { isValidHexColor } from "../../utils/colorResolver.js";
-import { escapeXml, intAttr } from "./xmlUtils.js";
 import { serializeBorder } from "./borderSerializer.js";
+import { escapeXml, intAttr } from "./xmlUtils.js";
 import { normalizeRevisionId } from "@stll/docx-core/model";
 //#region src/docx/serializer/tableSerializer.ts
 function normalizeTrackedChangeInfo(info) {

package/dist/docx/server/docxToMarkdown.js

@@ -1,5 +1,5 @@
-import { parseDocx } from "../parser.js";
 import { toMarkdown } from "../../markdown/index.js";
+import { parseDocx } from "../parser.js";
 //#region src/docx/server/docxToMarkdown.ts
 /**
 * Convert a DOCX file to markdown in a single server-safe call.

package/dist/docx/server/evaluateDocxXmlPatchProposal.js

@@ -1,5 +1,5 @@
-import { DocxArchiveError } from "./boundedArchive.js";
 import { getDocxXmlSafetyIssue } from "../xmlSafety.js";
+import { DocxArchiveError } from "./boundedArchive.js";
 import { FolioDocxPackageInspectionError, inspectDocxPackage } from "./inspectDocxPackage.js";
 import { TaggedError, panic } from "better-result";
 import { createHash } from "node:crypto";

package/dist/docx/server/extractDocxText.js

@@ -1,5 +1,5 @@
-import { findAllDeep, findChild, findDeep, getAttribute, getAttributeAnyPrefix, getLocalName, getTextContent, parseXml } from "../xmlParser.js";
 import { RELATIONSHIP_TYPES, parseRelationships } from "../relsParser.js";
+import { findAllDeep, findChild, findDeep, getAttribute, getAttributeAnyPrefix, getLocalName, getTextContent, parseXml } from "../xmlParser.js";
 import { loadDocxArchive } from "./boundedArchive.js";
 //#region src/docx/server/extractDocxText.ts
 const DOCUMENT_RELS_PATH = "word/_rels/document.xml.rels";

package/dist/docx/server/validateDocxConformance.js

@@ -1,10 +1,10 @@
-import { findChildByLocalName, getAttributeAnyPrefix, getLocalName, getNamespacePrefix, parseXmlDocument } from "../xmlParser.js";
 import { detectDocxConformanceClass } from "../conformance.js";
-import { DocxModelValidationError, validateFolioDocumentModel } from "../modelValidation.js";
 import { DOCX_CONTAINER_TYPES, detectDocxContainerType } from "../encryption/containerFormat.js";
+import { DocxModelValidationError, validateFolioDocumentModel } from "../modelValidation.js";
 import { DocxParseError, parseDocx } from "../parser.js";
-import { DocxArchiveError, loadDocxArchive } from "./boundedArchive.js";
+import { findChildByLocalName, getAttributeAnyPrefix, getLocalName, getNamespacePrefix, parseXmlDocument } from "../xmlParser.js";
 import { getDocxXmlSafetyIssue } from "../xmlSafety.js";
+import { DocxArchiveError, loadDocxArchive } from "./boundedArchive.js";
 import { DOCX_CONFORMANCE_CLASSES } from "@stll/docx-core/model";
 //#region src/docx/server/validateDocxConformance.ts
 const FOLIO_DOCX_CONFORMANCE_REPORT_VERSION = 1;

package/dist/docx/shapeParser.js

@@ -1,6 +1,6 @@
-import { ShapeOutlineStyleSchema, ShapeTypeSchema, narrowEnum } from "./parserEnums.js";
-import { findAllDeep, findChildByLocalName, findChildrenByLocalName, getAttribute, parseNumericAttribute } from "./xmlParser.js";
-import { parseAnchorPosition, parseAnchorWrap, parseColorElement, parseFill } from "./drawingUtils.js";
+import { parseAnchorPosition, parseAnchorWrap, parseFill, parseOutline } from "./drawingUtils.js";
+import { ShapeTypeSchema, narrowEnum } from "./parserEnums.js";
+import { findAllDeep, findChildByLocalName, getAttribute, parseNumericAttribute } from "./xmlParser.js";
 //#region src/docx/shapeParser.ts
 /** Convert OOXML rotation (1/60000ths of a degree) to degrees. */
 function rotToDegrees(rot) {
@@ -13,115 +13,7 @@ function rotToDegrees(rot) {
 * Falls through to `drawingUtils.parseFill` for solid / none cases.
 */
 function parseShapeFill(spPr) {
-	const base = parseFill(spPr);
-	if (base?.type !== "gradient" || !spPr) return base;
-	const gradFill = findChildByLocalName(spPr, "gradFill");
-	if (!gradFill) return base;
-	return parseGradientFill(gradFill);
-}
-function parseGradientFill(gradFill) {
-	let gradientType = "linear";
-	let angle;
-	const lin = findChildByLocalName(gradFill, "lin");
-	if (lin) {
-		gradientType = "linear";
-		const ang = getAttribute(lin, null, "ang");
-		if (ang) {
-			const parsed = Number.parseInt(ang, 10);
-			angle = Number.isNaN(parsed) ? void 0 : parsed / 6e4;
-		}
-	}
-	const path = findChildByLocalName(gradFill, "path");
-	if (path) {
-		const pathType = getAttribute(path, null, "path");
-		if (pathType === "circle") gradientType = "radial";
-		else if (pathType === "rect") gradientType = "rectangular";
-		else gradientType = "path";
-	}
-	const stops = [];
-	const gsLst = findChildByLocalName(gradFill, "gsLst");
-	if (gsLst) for (const gs of findChildrenByLocalName(gsLst, "gs")) {
-		const pos = getAttribute(gs, null, "pos");
-		const position = pos ? Number.parseInt(pos, 10) : 0;
-		const color = parseColorElement(gs);
-		if (color) stops.push({
-			position: Number.isNaN(position) ? 0 : position,
-			color
-		});
-	}
-	return {
-		type: "gradient",
-		gradient: {
-			type: gradientType,
-			...angle !== void 0 ? { angle } : {},
-			stops
-		}
-	};
-}
-const LINE_END_TYPES = /* @__PURE__ */ new Set([
-	"none",
-	"triangle",
-	"stealth",
-	"diamond",
-	"oval",
-	"arrow"
-]);
-function narrowLineEndType(value) {
-	if (value === null || value === void 0) return "none";
-	for (const allowed of LINE_END_TYPES) if (allowed === value) return allowed;
-	return "none";
-}
-function narrowLineEndSize(value) {
-	if (value === "sm" || value === "med" || value === "lg") return value;
-}
-function parseLineEnd(element) {
-	const type = narrowLineEndType(getAttribute(element, null, "type"));
-	const width = narrowLineEndSize(getAttribute(element, null, "w"));
-	const length = narrowLineEndSize(getAttribute(element, null, "len"));
-	return {
-		type,
-		...width !== void 0 ? { width } : {},
-		...length !== void 0 ? { length } : {}
-	};
-}
-/**
-* Parse a shape outline with cap, join, and arrow end fidelity. Returns
-* `undefined` when the spPr has no `<a:ln>`, an explicit `<a:noFill/>`,
-* or no usable attributes.
-*/
-function parseShapeOutline(spPr) {
-	const ln = findChildByLocalName(spPr, "ln");
-	if (!ln) return;
-	if (findChildByLocalName(ln, "noFill")) return;
-	const outline = {};
-	const w = getAttribute(ln, null, "w");
-	if (w) {
-		const parsed = Number.parseInt(w, 10);
-		if (!Number.isNaN(parsed)) outline.width = parsed;
-	}
-	const cap = getAttribute(ln, null, "cap");
-	if (cap === "flat") outline.cap = "flat";
-	else if (cap === "rnd") outline.cap = "round";
-	else if (cap === "sq") outline.cap = "square";
-	if (findChildByLocalName(ln, "bevel")) outline.join = "bevel";
-	else if (findChildByLocalName(ln, "round")) outline.join = "round";
-	else if (findChildByLocalName(ln, "miter")) outline.join = "miter";
-	const solidFill = findChildByLocalName(ln, "solidFill");
-	if (solidFill) {
-		const color = parseColorElement(solidFill);
-		if (color) outline.color = color;
-	}
-	const prstDash = findChildByLocalName(ln, "prstDash");
-	if (prstDash) {
-		const narrowed = narrowEnum(getAttribute(prstDash, null, "val"), ShapeOutlineStyleSchema);
-		if (narrowed !== void 0) outline.style = narrowed;
-	}
-	const headEnd = findChildByLocalName(ln, "headEnd");
-	if (headEnd) outline.headEnd = parseLineEnd(headEnd);
-	const tailEnd = findChildByLocalName(ln, "tailEnd");
-	if (tailEnd) outline.tailEnd = parseLineEnd(tailEnd);
-	if (outline.width === void 0 && outline.color === void 0 && outline.cap === void 0 && outline.join === void 0 && outline.style === void 0 && outline.headEnd === void 0 && outline.tailEnd === void 0) return;
-	return outline;
+	return parseFill(spPr);
 }
 function parseTransform(xfrm) {
 	if (!xfrm) return { size: {
@@ -194,7 +86,7 @@ function parseShape(node) {
 	const shapeType = parseShapeType(spPr);
 	const { size, transform } = parseTransform(findChildByLocalName(spPr, "xfrm"));
 	const fill = parseShapeFill(spPr);
-	const outline = parseShapeOutline(spPr);
+	const outline = parseOutline(spPr);
 	const id = cNvPr ? getAttribute(cNvPr, null, "id") ?? void 0 : void 0;
 	const name = cNvPr ? getAttribute(cNvPr, null, "name") ?? void 0 : void 0;
 	const shape = {

package/dist/docx/styleParser.js

@@ -1,8 +1,8 @@
-import { BorderStyleSchema, ConditionalStyleTypeSchema, EmphasisMarkSchema, FontHintSchema, FontThemeSchema, HighlightColorSchema, LineSpacingRuleSchema, ParagraphAlignmentSchema, ShadingPatternSchema, StyleTypeSchema, TabLeaderSchema, TabStopAlignmentSchema, TableCellTextDirectionSchema, TableRowHeightRuleSchema, TableWidthTypeSchema, TextEffectSchema, ThemeColorSlotSchema, UnderlineStyleSchema, narrowEnum } from "./parserEnums.js";
-import { findChild, findChildren, getAttribute, getLocalName, parseBooleanElement, parseNumberingLevelAttribute, parseNumericAttribute, parseTableMeasurementValue, parseXmlDocument } from "./xmlParser.js";
-import { mergeTextFormatting } from "../utils/textFormattingMerge.js";
 import { mergeParagraphFormatting } from "../utils/paragraphFormattingMerge.js";
+import { mergeTextFormatting } from "../utils/textFormattingMerge.js";
+import { BorderStyleSchema, ConditionalStyleTypeSchema, EmphasisMarkSchema, FontHintSchema, FontThemeSchema, HighlightColorSchema, LineSpacingRuleSchema, ParagraphAlignmentSchema, ShadingPatternSchema, StyleTypeSchema, TabLeaderSchema, TabStopAlignmentSchema, TableCellTextDirectionSchema, TableRowHeightRuleSchema, TableWidthTypeSchema, TextEffectSchema, ThemeColorSlotSchema, UnderlineStyleSchema, narrowEnum } from "./parserEnums.js";
 import { resolveThemeFontRef } from "./themeParser.js";
+import { findChild, findChildren, getAttribute, getLocalName, parseBooleanElement, parseNumberingLevelAttribute, parseNumericAttribute, parseTableMeasurementValue, parseXmlDocument } from "./xmlParser.js";
 //#region src/docx/styleParser.ts
 /**
 * Parse text formatting properties (w:rPr)

package/dist/docx/tableParser.js

@@ -1,9 +1,9 @@
-import { BorderStyleSchema, FloatingTableXSpecSchema, FloatingTableYSpecSchema, ShadingPatternSchema, TableCellTextDirectionSchema, ThemeColorSlotSchema, narrowEnum } from "./parserEnums.js";
-import { findChild, findChildByLocalName, findChildren, getAttribute, getChildElements, getLocalName, mergeXmlnsDeclarations, parseBooleanElement, parseNumericAttribute, parseTableMeasurementValue } from "./xmlParser.js";
 import { parseBookmarkEnd, parseBookmarkStart } from "./bookmarkParser.js";
-import { parseParagraph } from "./paragraphParser.js";
 import { appendBookmarkMarkerToLastParagraphInBlocks, appendBookmarkMarkerToLastParagraphInCells, prependBookmarkMarkersToFirstParagraphInBlocks, prependBookmarkMarkersToFirstParagraphInCell } from "./bookmarkPlacement.js";
+import { parseParagraph } from "./paragraphParser.js";
 import { enrichParagraphTextBoxes } from "./paragraphTextBoxEnrichment.js";
+import { BorderStyleSchema, FloatingTableXSpecSchema, FloatingTableYSpecSchema, ShadingPatternSchema, TableCellTextDirectionSchema, ThemeColorSlotSchema, narrowEnum } from "./parserEnums.js";
+import { findChild, findChildByLocalName, findChildren, getAttribute, getChildElements, getLocalName, mergeXmlnsDeclarations, parseBooleanElement, parseNumericAttribute, parseTableMeasurementValue } from "./xmlParser.js";
 import { normalizeRevisionId } from "@stll/docx-core/model";
 //#region src/docx/tableParser.ts
 /**
@@ -394,12 +394,14 @@ function parseTableRowProperties(trPrElement) {
 	const heightElement = findChild(trPrElement, "w", "trHeight");
 	if (heightElement) {
 		const heightVal = parseNumericAttribute(heightElement, "w", "val");
-		if (heightVal !== void 0 && heightVal > 0) formatting.height = {
-			value: heightVal,
-			type: "dxa"
-		};
-		const hRule = getAttribute(heightElement, "w", "hRule");
-		if (hRule === "auto" || hRule === "atLeast" || hRule === "exact") formatting.heightRule = hRule;
+		if (heightVal !== void 0 && heightVal > 0) {
+			formatting.height = {
+				value: heightVal,
+				type: "dxa"
+			};
+			const hRule = getAttribute(heightElement, "w", "hRule");
+			if (hRule === "auto" || hRule === "atLeast" || hRule === "exact") formatting.heightRule = hRule;
+		}
 	}
 	if (parseBooleanElement(findChild(trPrElement, "w", "tblHeader"))) formatting.header = true;
 	if (parseBooleanElement(findChild(trPrElement, "w", "cantSplit"))) formatting.cantSplit = true;

package/dist/docx/textBoxParser.js

@@ -1,6 +1,6 @@
-import { findByFullName, findChildByLocalName, findChildrenByLocalName, getAttribute, getChildElements, parseNumericAttribute } from "./xmlParser.js";
 import { emuToPixels } from "../utils/units.js";
 import { parseAnchorPosition, parseAnchorWrap, parseFill, parseOutline, resolveColorValueToHex } from "./drawingUtils.js";
+import { findByFullName, findChildByLocalName, findChildrenByLocalName, getAttribute, getChildElements, parseNumericAttribute } from "./xmlParser.js";
 //#region src/docx/textBoxParser.ts
 /** Default text box margins in EMUs (0.1 inch) */
 const DEFAULT_MARGIN_EMU = 91440;
@@ -133,7 +133,7 @@ function parseTextBox(drawingEl) {
 		if (position) textBox.position = position;
 		const wrap = parseAnchorWrap(container);
 		if (wrap) textBox.wrap = wrap;
-	}
+	} else textBox.wrap = { type: "inline" };
 	return textBox;
 }
 /**

package/dist/docx/vmlImageParser.js

@@ -1,8 +1,8 @@
-import { cloneWithXmlnsDeclarations, elementToXml, findAllDeep, findChild, findDeep, getAttribute, getChildElements, getLocalName } from "./xmlParser.js";
-import { pixelsToEmu } from "../utils/units.js";
 import { sanitizeImageSrc } from "../utils/sanitizeImageSrc.js";
+import { pixelsToEmu } from "../utils/units.js";
 import { resolveImageData } from "./imageParser.js";
 import { isWatermarkShape } from "./watermarkParser.js";
+import { cloneWithXmlnsDeclarations, elementToXml, findAllDeep, findChild, findDeep, getAttribute, getChildElements, getLocalName } from "./xmlParser.js";
 //#region src/docx/vmlImageParser.ts
 const MAX_VML_PREVIEW_SHAPES = 256;
 const MAX_VML_PREVIEW_DIMENSION_PX = 2e4;

package/dist/fonts/embeddedFonts.js

@@ -1,8 +1,8 @@
 import { parseRelationships, resolveRelativePath } from "../docx/relsParser.js";
-import { generateHexId } from "../utils/hexId.js";
 import { unzipDocx } from "../docx/unzip.js";
-import { deobfuscateFont, isValidFontKey } from "./fontDeobfuscation.js";
+import { generateHexId } from "../utils/hexId.js";
 import { parseEmbeddedFontTable } from "./embeddedFontTable.js";
+import { deobfuscateFont, isValidFontKey } from "./fontDeobfuscation.js";
 //#region src/fonts/embeddedFonts.ts
 /**
 * Embedded-font extraction.