@stll/folio-core 0.22.2 → 0.23.0

package/dist/ai-edits/apply.d.ts

@@ -17,7 +17,7 @@ type FolioAIEditView = {
 type ApplyFolioAIEditOperationsOptions = {
   view: FolioAIEditView;
   snapshot: FolioAIEditSnapshot;
-  operations: FolioAIEditOperation[];
+  operations: readonly FolioAIEditOperation[];
   mode?: FolioAIEditApplyMode;
   author?: string;
   /** Optional author initials (w:initials) stamped alongside the author. */

package/dist/controller/layoutPipeline.js

@@ -58,6 +58,29 @@ function bodyBlocksClearSectionHeaderFooter(blocks, { authoredMargins, sectionHe
 	});
 	return changed ? nextBlocks : blocks;
 }
+const arePageMarginsEqual = (left, right) => left.top === right.top && left.right === right.right && left.bottom === right.bottom && left.left === right.left && left.header === right.header && left.footer === right.footer;
+const mirrorPageMarginsIfNeeded = (authoredMargins, pageNumber, mirrorMargins) => mirrorMargins && pageNumber % 2 === 0 ? {
+	...authoredMargins,
+	left: authoredMargins.right,
+	right: authoredMargins.left
+} : authoredMargins;
+function attachAuthoredMarginsToLayoutPages(layout, options) {
+	let changed = false;
+	const pages = layout.pages.map((page) => {
+		const sectionProperties = options.sectionPropertiesForMargins[page.sectionIndex ?? 0];
+		const authoredMargins = mirrorPageMarginsIfNeeded(sectionProperties ? getMargins(sectionProperties) : options.authoredMargins, page.number, options.mirrorMargins);
+		if (page.authoredMargins && arePageMarginsEqual(page.authoredMargins, authoredMargins)) return page;
+		changed = true;
+		return {
+			...page,
+			authoredMargins
+		};
+	});
+	return changed ? {
+		...layout,
+		pages
+	} : layout;
+}
 function runLayoutPipeline(deps, state, options = {}) {
 	const { contentWidth, columns, pageSize, margins, pageGap, showMarginGuides, marginGuideColor, syncCoordinator, headerContent, footerContent, firstPageHeaderContent, firstPageFooterContent, headerContentRId, footerContentRId, firstPageHeaderContentRId, firstPageFooterContentRId, sectionHeaderFooterRefs, theme: _theme, sectionProperties, document, defaultTabStop, mirrorMargins, styles, layout, hfPMs, painter, pagesContainer, session, renderHfFromContentOrPm, renderHeaderFooterContentByRId, documentFontsAreLoaded, buildFootnoteRenderItems, describeInvalidHighlightMarks, emptyTemplatePreviewEntries: EMPTY_TEMPLATE_PREVIEW_ENTRIES } = deps;
 	let outcome = {};
@@ -341,6 +364,11 @@ function runLayoutPipeline(deps, state, options = {}) {
 		};
 		let stabilizedFieldValues;
 		stabilizeFieldWidths();
+		newLayout = attachAuthoredMarginsToLayoutPages(newLayout, {
+			authoredMargins: margins,
+			mirrorMargins,
+			sectionPropertiesForMargins
+		});
 		const rebuildHeaderFooterForLayout = () => {
 			const seqValues = buildSeqValues(newBlocks);
 			const bookmarkTextInputs = stabilizedFieldValues === void 0 ? { seqValues } : {

package/dist/document-operations.d.ts

@@ -56,10 +56,10 @@ declare class InvalidFolioDocumentOperationBatchError extends InvalidFolioDocume
 declare const assertSupportedFolioDocumentOperationVersion: (value: unknown) => typeof FOLIO_DOCUMENT_OPERATION_CONTRACT_VERSION;
 type FolioDocumentOperationBatch = {
   readonly version: typeof FOLIO_DOCUMENT_OPERATION_CONTRACT_VERSION;
-  operations: FolioDocumentOperation[];
-  mode?: FolioDocumentOperationMode;
-  atomic?: boolean;
-  dryRun?: boolean;
+  readonly operations: readonly FolioDocumentOperation[];
+  readonly mode?: FolioDocumentOperationMode;
+  readonly atomic?: boolean;
+  readonly dryRun?: boolean;
 };
 declare const parseFolioDocumentOperationBatch: (value: unknown) => FolioDocumentOperationBatch;
 type FolioDocumentOperationStatus = "committed" | "previewed" | "rejected";

package/dist/document-operations.js

@@ -34,6 +34,7 @@ const FOLIO_DOCUMENT_OPERATION_STORIES = Object.freeze([
 ]);
 const FOLIO_DOCUMENT_OPERATION_PRECONDITIONS = Object.freeze(["blockTextHash"]);
 const FOLIO_DOCUMENT_OPERATION_BATCH_MODES = Object.freeze(["best-effort", "atomic"]);
+const parsedFolioDocumentOperationBatches = /* @__PURE__ */ new WeakSet();
 const DIRECT_AND_TRACKED_MODES = Object.freeze(["direct", "tracked-changes"]);
 const DIRECT_TRACKED_AND_SUGGESTED_MODES = FOLIO_DOCUMENT_OPERATION_MODES;
 const DIRECT_AND_SUGGESTED_MODES = Object.freeze(["direct", "suggested"]);
@@ -83,6 +84,17 @@ const assertSupportedFolioDocumentOperationVersion = (value) => {
 	});
 };
 const isPlainObject = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
+const isParsedFolioDocumentOperationBatch = (value) => typeof value === "object" && value !== null && parsedFolioDocumentOperationBatches.has(value);
+const freezeParsedValue = (value) => {
+	if (Array.isArray(value)) {
+		for (const entry of value) freezeParsedValue(entry);
+		Object.freeze(value);
+		return;
+	}
+	if (!isPlainObject(value)) return;
+	for (const entry of Object.values(value)) freezeParsedValue(entry);
+	Object.freeze(value);
+};
 const invalidBatch = (path, reason) => {
 	throw new InvalidFolioDocumentOperationBatchError({
 		message: `Invalid document operation batch at ${path}: ${reason}.`,
@@ -508,6 +520,7 @@ const parseDocumentOperation = (value, index) => {
 	return invalidBatch(`${path}.type`, `unsupported operation type "${type}"`);
 };
 const parseFolioDocumentOperationBatch = (value) => {
+	if (isParsedFolioDocumentOperationBatch(value)) return value;
 	if (!isPlainObject(value)) return invalidBatch("$", "expected an object");
 	assertAllowedKeys(value, "$", [
 		"version",
@@ -529,13 +542,16 @@ const parseFolioDocumentOperationBatch = (value) => {
 		if (operationIds.has(operation.id)) return invalidBatch(`$.operations[${index}].id`, "expected a unique operation id");
 		operationIds.add(operation.id);
 	}
-	return {
+	const parsedBatch = {
 		version,
 		operations: parsedOperations,
 		...mode !== void 0 && { mode },
 		...atomic !== void 0 && { atomic },
 		...dryRun !== void 0 && { dryRun }
 	};
+	freezeParsedValue(parsedBatch);
+	parsedFolioDocumentOperationBatches.add(parsedBatch);
+	return parsedBatch;
 };
 const recoveryByReason = {
 	missingBlock: "refreshDocument",

package/dist/docx/imageParser.js

@@ -4,7 +4,7 @@ import { sanitizeExternalUrl } from "../utils/urlSecurity.js";
 import { WRAP_ELEMENT_NAMES, parsePositionH, parsePositionV, parseWrapElement } from "./drawingUtils.js";
 import { resolveTarget } from "./relsParser.js";
 import { isTextBoxDrawing } from "./textBoxParser.js";
-import { findByFullName, findChild, getAttribute, getChildElements, parseNumericAttribute } from "./xmlParser.js";
+import { findByFullName, findChild, getAttribute, getChildElements, parseNumericAttribute, parseOnOffValue } from "./xmlParser.js";
 //#region src/docx/imageParser.ts
 /**
 * Convert rotation value (1/60000 of a degree) to degrees
@@ -74,7 +74,7 @@ function parseDocProps(docPr) {
 	const name = getAttribute(docPr, null, "name");
 	const descr = getAttribute(docPr, null, "descr");
 	const title = getAttribute(docPr, null, "title");
-	const decorative = getAttribute(docPr, null, "decorative") === "1";
+	const decorative = parseOnOffValue(getAttribute(docPr, null, "decorative")) === true;
 	const hlinkClickEl = findChild(docPr, "a", "hlinkClick");
 	const hlinkRId = hlinkClickEl ? getAttribute(hlinkClickEl, "r", "id") : null;
 	return {
@@ -92,8 +92,8 @@ function parseDocProps(docPr) {
 function parseTransform(xfrm) {
 	if (!xfrm) return;
 	const rot = getAttribute(xfrm, null, "rot");
-	const flipH = getAttribute(xfrm, null, "flipH") === "1";
-	const flipV = getAttribute(xfrm, null, "flipV") === "1";
+	const flipH = parseOnOffValue(getAttribute(xfrm, null, "flipH")) === true;
+	const flipV = parseOnOffValue(getAttribute(xfrm, null, "flipV")) === true;
 	const rotation = rotToDegrees(rot);
 	if (rotation === void 0 && !flipH && !flipV) return;
 	const transform = {};
@@ -155,10 +155,7 @@ function parseImageCrop(blipFill) {
 * spec-defined default.
 */
 function parseOnOffAttr(element, name) {
-	const raw = getAttribute(element, null, name);
-	if (raw === null) return;
-	if (raw === "1" || raw === "true" || raw === "on") return true;
-	if (raw === "0" || raw === "false" || raw === "off") return false;
+	return parseOnOffValue(getAttribute(element, null, name));
 }
 /**
 * Parse `<a:alphaModFix amt="..."/>` inside the `a:blip` element. The
@@ -358,7 +355,7 @@ function parseAnchor(anchorEl, rels, media) {
 	const size = parseExtent(findByFullName(anchorEl, "wp:extent"));
 	const padding = parseEffectExtent(findByFullName(anchorEl, "wp:effectExtent"));
 	const props = parseDocProps(findByFullName(anchorEl, "wp:docPr"));
-	const behindDoc = getAttribute(anchorEl, null, "behindDoc") === "1";
+	const behindDoc = parseOnOffValue(getAttribute(anchorEl, null, "behindDoc")) === true;
 	const layoutInCell = parseOnOffAttr(anchorEl, "layoutInCell");
 	const allowOverlap = parseOnOffAttr(anchorEl, "allowOverlap");
 	const anchorDistT = parseNumericAttribute(anchorEl, null, "distT");

package/dist/docx/rezip.d.ts

@@ -145,7 +145,7 @@ declare function updateCoreProperties(corePropsXml: string, { updateModifiedDate
  * @param buffer - Buffer to validate
  * @returns Promise resolving to validation result
  */
-declare function validateDocx(buffer: ArrayBuffer): Promise<{
+declare const validateDocx: (buffer: ArrayBuffer) => Promise<{
   valid: boolean;
   errors: string[];
   warnings: string[];

package/dist/docx/rezip.js

@@ -21,6 +21,7 @@ import { isPreservableDocxEntry } from "./unzip.js";
 import { WORDPROCESSINGML_NAMESPACE_URIS, findChild, getChildElements, getLocalName, getNamespaceUri, matchesName, parseXml } from "./xmlParser.js";
 import { assertXmlResourceLimits } from "./xmlResourceLimits.js";
 import { panic } from "better-result";
+import { validateDocxPackage } from "@stll/docx-core";
 import JSZip from "jszip";
 //#region src/docx/rezip.ts
 /**
@@ -1223,38 +1224,18 @@ function getContentTypeForExtension(extension, mimeType) {
 * @param buffer - Buffer to validate
 * @returns Promise resolving to validation result
 */
-async function validateDocx(buffer) {
-	const errors = [];
-	const warnings = [];
-	try {
-		const zip = await JSZip.loadAsync(buffer);
-		for (const file of ["[Content_Types].xml", "word/document.xml"]) if (!zip.file(file)) errors.push(`Missing required file: ${file}`);
-		for (const file of [
-			"_rels/.rels",
-			"word/_rels/document.xml.rels",
-			"word/styles.xml"
-		]) if (!zip.file(file)) warnings.push(`Missing recommended file: ${file}`);
-		const docFile = zip.file("word/document.xml");
-		if (docFile) {
-			const docXml = await docFile.async("text");
-			if (!docXml.includes("<?xml")) warnings.push("document.xml missing XML declaration");
-			if (!docXml.includes("<w:document")) errors.push("document.xml missing w:document element");
-			if (!docXml.includes("<w:body>")) errors.push("document.xml missing w:body element");
-		}
-		const ctFile = zip.file("[Content_Types].xml");
-		if (ctFile) {
-			const ctXml = await ctFile.async("text");
-			if (!ctXml.includes("word/document.xml") && !ctXml.includes("application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml")) warnings.push("Content_Types.xml may be missing document.xml type declaration");
-		}
-	} catch (error) {
-		errors.push(`Failed to read as ZIP: ${error instanceof Error ? error.message : "Unknown error"}`);
-	}
-	return {
-		valid: errors.length === 0,
-		errors,
-		warnings
+const validateDocx = async (buffer) => {
+	const result = await validateDocxPackage(buffer);
+	return result.valid ? {
+		valid: true,
+		errors: [],
+		warnings: []
+	} : {
+		valid: false,
+		errors: [result.error],
+		warnings: []
 	};
-}
+};
 /**
 * Check if buffer looks like a DOCX file (quick check)
 *

package/dist/docx/server/inspectDocxPackage.js

@@ -1,6 +1,6 @@
 import { getAttributeAnyPrefix, getLocalName, parseXmlDocument } from "../xmlParser.js";
 import { DocxArchiveError, loadDocxArchive } from "./boundedArchive.js";
-import { TaggedError } from "better-result";
+import { Result, TaggedError } from "better-result";
 import { createHash } from "node:crypto";
 //#region src/docx/server/inspectDocxPackage.ts
 const FOLIO_DOCX_PACKAGE_INSPECTION_VERSION = 1;
@@ -32,16 +32,17 @@ const decodeXml = (bytes, part) => {
 	let encoding = "utf-8";
 	if (bytes.length >= 2 && (bytes[0] === 255 && bytes[1] === 254 || bytes[0] === 60 && bytes[1] === 0)) encoding = "utf-16le";
 	else if (bytes.length >= 2 && (bytes[0] === 254 && bytes[1] === 255 || bytes[0] === 0 && bytes[1] === 60)) encoding = "utf-16be";
-	try {
-		return new TextDecoder(encoding, { fatal: true }).decode(bytes);
-	} catch (cause) {
-		throw new FolioDocxPackageInspectionError({
+	const decoded = Result.try({
+		try: () => new TextDecoder(encoding, { fatal: true }).decode(bytes),
+		catch: (cause) => new FolioDocxPackageInspectionError({
 			message: `Failed to decode XML package part "${part}"`,
 			code: "xml-decode-failed",
 			part,
 			cause
-		});
-	}
+		})
+	});
+	if (decoded.isOk()) return decoded.value;
+	throw decoded.error;
 };
 const parseContentTypes = (xml) => {
 	const declarations = {

package/dist/docx/styleParser.js

@@ -2,7 +2,7 @@ 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";
+import { findChild, findChildren, getAttribute, getLocalName, parseBooleanElement, parseNumberingLevelAttribute, parseNumericAttribute, parseOnOffValue, parseTableMeasurementValue, parseXmlDocument } from "./xmlParser.js";
 //#region src/docx/styleParser.ts
 /**
 * Parse text formatting properties (w:rPr)
@@ -224,9 +224,9 @@ function parseBorderSpec(border) {
 	const space = parseNumericAttribute(border, "w", "space");
 	if (space !== void 0) spec.space = space;
 	const shadowAttr = getAttribute(border, "w", "shadow");
-	if (shadowAttr) spec.shadow = shadowAttr === "1" || shadowAttr === "true";
+	if (shadowAttr) spec.shadow = parseOnOffValue(shadowAttr) ?? false;
 	const frame = getAttribute(border, "w", "frame");
-	if (frame) spec.frame = frame === "1" || frame === "true";
+	if (frame) spec.frame = parseOnOffValue(frame) ?? false;
 	return spec;
 }
 /**
@@ -278,9 +278,9 @@ function parseParagraphProperties(pPr, theme) {
 		const lineRule = narrowEnum(getAttribute(spacing, "w", "lineRule"), LineSpacingRuleSchema);
 		if (lineRule) formatting.lineSpacingRule = lineRule;
 		const beforeAuto = getAttribute(spacing, "w", "beforeAutospacing");
-		if (beforeAuto) formatting.beforeAutospacing = beforeAuto === "1" || beforeAuto === "true";
+		if (beforeAuto) formatting.beforeAutospacing = parseOnOffValue(beforeAuto) ?? false;
 		const afterAuto = getAttribute(spacing, "w", "afterAutospacing");
-		if (afterAuto) formatting.afterAutospacing = afterAuto === "1" || afterAuto === "true";
+		if (afterAuto) formatting.afterAutospacing = parseOnOffValue(afterAuto) ?? false;
 	}
 	const ind = findChild(pPr, "w", "ind");
 	if (ind) {
@@ -452,17 +452,17 @@ function parseTableLook(tblLook) {
 		}
 	}
 	const firstColumn = getAttribute(tblLook, "w", "firstColumn");
-	if (firstColumn) look.firstColumn = firstColumn === "1";
+	if (firstColumn) look.firstColumn = parseOnOffValue(firstColumn) ?? false;
 	const firstRow = getAttribute(tblLook, "w", "firstRow");
-	if (firstRow) look.firstRow = firstRow === "1";
+	if (firstRow) look.firstRow = parseOnOffValue(firstRow) ?? false;
 	const lastColumn = getAttribute(tblLook, "w", "lastColumn");
-	if (lastColumn) look.lastColumn = lastColumn === "1";
+	if (lastColumn) look.lastColumn = parseOnOffValue(lastColumn) ?? false;
 	const lastRow = getAttribute(tblLook, "w", "lastRow");
-	if (lastRow) look.lastRow = lastRow === "1";
+	if (lastRow) look.lastRow = parseOnOffValue(lastRow) ?? false;
 	const noHBand = getAttribute(tblLook, "w", "noHBand");
-	if (noHBand) look.noHBand = noHBand === "1";
+	if (noHBand) look.noHBand = parseOnOffValue(noHBand) ?? false;
 	const noVBand = getAttribute(tblLook, "w", "noVBand");
-	if (noVBand) look.noVBand = noVBand === "1";
+	if (noVBand) look.noVBand = parseOnOffValue(noVBand) ?? false;
 	return Object.keys(look).length > 0 ? look : void 0;
 }
 /**
@@ -669,7 +669,7 @@ function parseStyle(styleEl, theme) {
 		type: narrowEnum(rawType, StyleTypeSchema) ?? "paragraph"
 	};
 	const defaultAttr = getAttribute(styleEl, "w", "default");
-	if (defaultAttr) style.default = defaultAttr === "1" || defaultAttr === "true";
+	if (defaultAttr) style.default = parseOnOffValue(defaultAttr) ?? false;
 	const children = collectStyleChildren(styleEl);
 	const nameEl = children.name;
 	if (nameEl) {
@@ -871,10 +871,10 @@ function parseStyleDefinitionsFromDocument(doc, theme, resolvedStyles) {
 		const latentStylesEl = findChild(doc, "w", "latentStyles");
 		if (latentStylesEl) {
 			const latentStyles = {
-				defLockedState: getAttribute(latentStylesEl, "w", "defLockedState") === "1",
-				defSemiHidden: getAttribute(latentStylesEl, "w", "defSemiHidden") === "1",
-				defUnhideWhenUsed: getAttribute(latentStylesEl, "w", "defUnhideWhenUsed") === "1",
-				defQFormat: getAttribute(latentStylesEl, "w", "defQFormat") === "1"
+				defLockedState: parseOnOffValue(getAttribute(latentStylesEl, "w", "defLockedState")) ?? false,
+				defSemiHidden: parseOnOffValue(getAttribute(latentStylesEl, "w", "defSemiHidden")) ?? false,
+				defUnhideWhenUsed: parseOnOffValue(getAttribute(latentStylesEl, "w", "defUnhideWhenUsed")) ?? false,
+				defQFormat: parseOnOffValue(getAttribute(latentStylesEl, "w", "defQFormat")) ?? false
 			};
 			const defUIPriority = parseNumericAttribute(latentStylesEl, "w", "defUIPriority");
 			if (defUIPriority !== void 0) latentStyles.defUIPriority = defUIPriority;

package/dist/docx/xmlParser.d.ts

@@ -272,13 +272,17 @@ declare function parseNumberingLevelAttribute(element: XmlElement | null | undef
  * (`5000`); normalize those to the ECMA-376 unit the layout engine expects.
  */
 declare function parseTableMeasurementValue(element: XmlElement | null | undefined, widthType: string): number | undefined;
+/**
+ * Parse an OOXML `ST_OnOff` lexical value.
+ */
+declare function parseOnOffValue(value: string | null | undefined): boolean | undefined;
 /**
  * Parse a boolean value from an attribute or element presence
  *
  * OOXML boolean conventions:
  * - Element presence with no val attribute = true
- * - w:val="true" or w:val="1" = true
- * - w:val="false" or w:val="0" = false
+ * - w:val="true", w:val="1", or w:val="on" = true
+ * - w:val="false", w:val="0", or w:val="off" = false
  *
  * @param element - Element to check
  * @param namespace - Namespace for val attribute
@@ -334,4 +338,4 @@ declare function mergeXmlnsDeclarations(inherited: Record<string, string>, eleme
  */
 declare function cloneWithXmlnsDeclarations(element: XmlElement, xmlnsDecls: Record<string, string>): XmlElement;
 //#endregion
-export { NAMESPACES, WORDPROCESSINGML_NAMESPACE_URIS, XmlElement, XmlNamespaceScope, cloneWithXmlnsDeclarations, collectXmlnsDeclarations, elementToXml, findAllDeep, findByFullName, findChild, findChildByLocalName, findChildByNamespaceUri, findChildren, findChildrenByLocalName, findDeep, getAttribute, getAttributeAny, getAttributeAnyPrefix, getAttributeByNamespaceUri, getAttributes, getChildElements, getLocalName, getNamespacePrefix, getNamespaceUri, getTextContent, hasChild, hasFlag, matchesName, mergeXmlnsDeclarations, parseBooleanElement, parseColorElement, parseNumberingLevelAttribute, parseNumericAttribute, parseTableMeasurementValue, parseXml, parseXmlDocument };
+export { NAMESPACES, WORDPROCESSINGML_NAMESPACE_URIS, XmlElement, XmlNamespaceScope, cloneWithXmlnsDeclarations, collectXmlnsDeclarations, elementToXml, findAllDeep, findByFullName, findChild, findChildByLocalName, findChildByNamespaceUri, findChildren, findChildrenByLocalName, findDeep, getAttribute, getAttributeAny, getAttributeAnyPrefix, getAttributeByNamespaceUri, getAttributes, getChildElements, getLocalName, getNamespacePrefix, getNamespaceUri, getTextContent, hasChild, hasFlag, matchesName, mergeXmlnsDeclarations, parseBooleanElement, parseColorElement, parseNumberingLevelAttribute, parseNumericAttribute, parseOnOffValue, parseTableMeasurementValue, parseXml, parseXmlDocument };

package/dist/docx/xmlParser.js

@@ -438,8 +438,7 @@ function getTextContent(element) {
 function hasFlag(element, namespace, name) {
 	const value = getAttribute(element, namespace, name);
 	if (value === null) return false;
-	if (value === "0" || value === "false" || value === "off") return false;
-	return true;
+	return parseOnOffValue(value) ?? true;
 }
 /**
 * Check if a child element exists (used for boolean flags in OOXML)
@@ -515,12 +514,27 @@ function parseTableMeasurementValue(element, widthType) {
 	return Number.isNaN(num) ? void 0 : num;
 }
 /**
+* Parse an OOXML `ST_OnOff` lexical value.
+*/
+function parseOnOffValue(value) {
+	if (value === null || value === void 0) return;
+	switch (value) {
+		case "1":
+		case "true":
+		case "on": return true;
+		case "0":
+		case "false":
+		case "off": return false;
+		default: return;
+	}
+}
+/**
 * Parse a boolean value from an attribute or element presence
 *
 * OOXML boolean conventions:
 * - Element presence with no val attribute = true
-* - w:val="true" or w:val="1" = true
-* - w:val="false" or w:val="0" = false
+* - w:val="true", w:val="1", or w:val="on" = true
+* - w:val="false", w:val="0", or w:val="off" = false
 *
 * @param element - Element to check
 * @param namespace - Namespace for val attribute
@@ -541,8 +555,7 @@ function parseBooleanElement(element, namespace = "w") {
 		}
 	}
 	if (val === null) return true;
-	if (val === "0" || val === "false" || val === "off") return false;
-	return true;
+	return parseOnOffValue(val) ?? true;
 }
 /**
 * Deep find - search recursively for an element
@@ -699,4 +712,4 @@ function cloneWithXmlnsDeclarations(element, xmlnsDecls) {
 	return element;
 }
 //#endregion
-export { NAMESPACES, WORDPROCESSINGML_NAMESPACE_URIS, cloneWithXmlnsDeclarations, collectXmlnsDeclarations, elementToXml, findAllDeep, findByFullName, findChild, findChildByLocalName, findChildByNamespaceUri, findChildren, findChildrenByLocalName, findDeep, getAttribute, getAttributeAny, getAttributeAnyPrefix, getAttributeByNamespaceUri, getAttributes, getChildElements, getLocalName, getNamespacePrefix, getNamespaceUri, getTextContent, hasChild, hasFlag, matchesName, mergeXmlnsDeclarations, parseBooleanElement, parseColorElement, parseNumberingLevelAttribute, parseNumericAttribute, parseTableMeasurementValue, parseXml, parseXmlDocument };
+export { NAMESPACES, WORDPROCESSINGML_NAMESPACE_URIS, cloneWithXmlnsDeclarations, collectXmlnsDeclarations, elementToXml, findAllDeep, findByFullName, findChild, findChildByLocalName, findChildByNamespaceUri, findChildren, findChildrenByLocalName, findDeep, getAttribute, getAttributeAny, getAttributeAnyPrefix, getAttributeByNamespaceUri, getAttributes, getChildElements, getLocalName, getNamespacePrefix, getNamespaceUri, getTextContent, hasChild, hasFlag, matchesName, mergeXmlnsDeclarations, parseBooleanElement, parseColorElement, parseNumberingLevelAttribute, parseNumericAttribute, parseOnOffValue, parseTableMeasurementValue, parseXml, parseXmlDocument };

package/dist/layout-bridge/convert/toFlowBlocks.js

@@ -9,7 +9,6 @@ import { autospacingMatchesBase } from "../../prosemirror/autospacingBase.js";
 import { runShadingAttrsToShading } from "../../prosemirror/conversion/runShadingMark.js";
 import { directionIsRtl } from "../../prosemirror/paragraphDirection.js";
 import { assertValidProseMirrorDocument } from "../../prosemirror/validation.js";
-import { NUMBER_FORMAT_VALUES } from "../../types/documentEnumValues.js";
 import { resolveColor, resolveHighlightToCss } from "../../utils/colorResolver.js";
 import { resolveThemeFont } from "../../utils/fontResolver.js";
 import { resolveShadingFill } from "../../utils/formatToStyle.js";
@@ -364,7 +363,7 @@ const resolveWesternThemeFont = (fontFamily, theme) => {
 	return (themeRef ? resolveThemeFont(themeRef, theme?.fontScheme) : null) ?? fontFamily.ascii ?? fontFamily.hAnsi ?? void 0;
 };
 const resolveComplexScriptThemeFont = (fontFamily, theme) => {
-	return (fontFamily.cstheme ? resolveThemeFont(fontFamily.cstheme, theme?.fontScheme) : null) ?? fontFamily.cs ?? void 0;
+	return (fontFamily.csTheme ? resolveThemeFont(fontFamily.csTheme, theme?.fontScheme) : null) ?? fontFamily.cs ?? void 0;
 };
 const resolveEastAsiaThemeFont = (fontFamily, theme) => {
 	return (fontFamily.eastAsiaTheme ? resolveThemeFont(fontFamily.eastAsiaTheme, theme?.fontScheme) : null) ?? fontFamily.eastAsia ?? void 0;
@@ -650,78 +649,54 @@ function toListMarkerRevision(kind, info) {
 }
 function isAddedNumberingChange(change) {
 	const previousFormatting = change.previousFormatting;
-	return previousFormatting != null && Object.hasOwn(previousFormatting, "numPr") && previousFormatting["numPr"] == null;
+	return previousFormatting != null && Object.hasOwn(previousFormatting, "numPr") && previousFormatting.numPr == null;
 }
 function isRemovedNumberingChange(change) {
 	const previousFormatting = change.previousFormatting;
-	return previousFormatting != null && Object.hasOwn(previousFormatting, "numPr") && isListNumPr(previousFormatting["numPr"]);
+	return previousFormatting != null && Object.hasOwn(previousFormatting, "numPr") && isListNumPr(previousFormatting.numPr);
 }
 function isChangedNumberingChange(currentNumPr, change) {
 	const previousFormatting = change.previousFormatting;
-	return previousFormatting != null && Object.hasOwn(previousFormatting, "numPr") && isListNumPr(previousFormatting["numPr"]) && !areListNumPrEqual(previousFormatting["numPr"], currentNumPr);
+	return previousFormatting != null && Object.hasOwn(previousFormatting, "numPr") && isListNumPr(previousFormatting.numPr) && !areListNumPrEqual(previousFormatting.numPr, currentNumPr);
 }
 function areListNumPrEqual(left, right) {
 	return left.numId === right.numId && left.ilvl === right.ilvl;
 }
-function isRecord(value) {
-	return typeof value === "object" && value !== null;
-}
 function isListNumPr(value) {
-	if (!isRecord(value)) return false;
-	const numId = value["numId"];
-	const ilvl = value["ilvl"];
-	return (numId === void 0 || typeof numId === "number") && (ilvl === void 0 || typeof ilvl === "number");
-}
-function isNumberFormat(value) {
-	return NUMBER_FORMAT_VALUES.some((format) => format === value);
-}
-function readNumberFormats(value) {
-	if (!Array.isArray(value)) return;
-	const formats = [];
-	for (const item of value) {
-		if (!isNumberFormat(item)) return;
-		formats.push(item);
-	}
-	return formats;
-}
-function readListMarkerSuffix(value) {
-	if (value === "tab" || value === "space" || value === "nothing") return value;
-}
-function readListMarkerAlignment(value) {
-	if (value === "left" || value === "center" || value === "right") return value;
+	return value !== void 0 && value !== null;
 }
 function toPreviousListAttrs(previousFormatting) {
 	const attrs = {};
-	const numPr = previousFormatting["numPr"];
+	const numPr = previousFormatting.numPr;
 	if (isListNumPr(numPr)) attrs.numPr = numPr;
-	const listIsBullet = previousFormatting["listIsBullet"];
-	if (typeof listIsBullet === "boolean") attrs.listIsBullet = listIsBullet;
-	const listIsLegal = previousFormatting["listIsLegal"];
-	if (typeof listIsLegal === "boolean") attrs.listIsLegal = listIsLegal;
-	const listMarker = previousFormatting["listMarker"];
-	if (typeof listMarker === "string") attrs.listMarker = listMarker;
-	const listNumFmt = previousFormatting["listNumFmt"];
-	if (isNumberFormat(listNumFmt)) attrs.listNumFmt = listNumFmt;
-	const listLevelNumFmts = readNumberFormats(previousFormatting["listLevelNumFmts"]);
-	if (listLevelNumFmts) attrs.listLevelNumFmts = listLevelNumFmts;
-	const listLevelStarts = previousFormatting["listLevelStarts"];
-	if (Array.isArray(listLevelStarts) && listLevelStarts.every((value) => typeof value === "number")) attrs.listLevelStarts = listLevelStarts;
-	const listAbstractNumId = previousFormatting["listAbstractNumId"];
-	if (typeof listAbstractNumId === "number") attrs.listAbstractNumId = listAbstractNumId;
-	const listStartOverride = previousFormatting["listStartOverride"];
-	if (typeof listStartOverride === "number") attrs.listStartOverride = listStartOverride;
-	const listMarkerHidden = previousFormatting["listMarkerHidden"];
-	if (typeof listMarkerHidden === "boolean") attrs.listMarkerHidden = listMarkerHidden;
-	const listMarkerFontFamily = previousFormatting["listMarkerFontFamily"];
-	if (typeof listMarkerFontFamily === "string") attrs.listMarkerFontFamily = listMarkerFontFamily;
-	const listMarkerFontSize = previousFormatting["listMarkerFontSize"];
-	if (typeof listMarkerFontSize === "number") attrs.listMarkerFontSize = listMarkerFontSize;
-	const listMarkerBold = previousFormatting["listMarkerBold"];
-	if (typeof listMarkerBold === "boolean") attrs.listMarkerBold = listMarkerBold;
-	const listMarkerAlignment = readListMarkerAlignment(previousFormatting["listMarkerAlignment"]);
-	if (listMarkerAlignment) attrs.listMarkerAlignment = listMarkerAlignment;
-	const listMarkerSuffix = readListMarkerSuffix(previousFormatting["listMarkerSuffix"]);
-	if (listMarkerSuffix) attrs.listMarkerSuffix = listMarkerSuffix;
+	const listIsBullet = previousFormatting.listIsBullet;
+	if (listIsBullet !== void 0) attrs.listIsBullet = listIsBullet;
+	const listIsLegal = previousFormatting.listIsLegal;
+	if (listIsLegal !== void 0) attrs.listIsLegal = listIsLegal;
+	const listMarker = previousFormatting.listMarker;
+	if (listMarker !== void 0) attrs.listMarker = listMarker;
+	const listNumFmt = previousFormatting.listNumFmt;
+	if (listNumFmt !== void 0) attrs.listNumFmt = listNumFmt;
+	const listLevelNumFmts = previousFormatting.listLevelNumFmts;
+	if (listLevelNumFmts !== void 0) attrs.listLevelNumFmts = listLevelNumFmts;
+	const listLevelStarts = previousFormatting.listLevelStarts;
+	if (listLevelStarts !== void 0) attrs.listLevelStarts = listLevelStarts;
+	const listAbstractNumId = previousFormatting.listAbstractNumId;
+	if (listAbstractNumId !== void 0) attrs.listAbstractNumId = listAbstractNumId;
+	const listStartOverride = previousFormatting.listStartOverride;
+	if (listStartOverride !== void 0) attrs.listStartOverride = listStartOverride;
+	const listMarkerHidden = previousFormatting.listMarkerHidden;
+	if (listMarkerHidden !== void 0) attrs.listMarkerHidden = listMarkerHidden;
+	const listMarkerFontFamily = previousFormatting.listMarkerFontFamily;
+	if (listMarkerFontFamily !== void 0) attrs.listMarkerFontFamily = listMarkerFontFamily;
+	const listMarkerFontSize = previousFormatting.listMarkerFontSize;
+	if (listMarkerFontSize !== void 0) attrs.listMarkerFontSize = listMarkerFontSize;
+	const listMarkerBold = previousFormatting.listMarkerBold;
+	if (listMarkerBold !== void 0) attrs.listMarkerBold = listMarkerBold;
+	const listMarkerAlignment = previousFormatting.listMarkerAlignment;
+	if (listMarkerAlignment !== void 0) attrs.listMarkerAlignment = listMarkerAlignment;
+	const listMarkerSuffix = previousFormatting.listMarkerSuffix;
+	if (listMarkerSuffix !== void 0) attrs.listMarkerSuffix = listMarkerSuffix;
 	return attrs;
 }
 function resolveDeletedListMarker(previousListAttrs, listCounters, listAbstractCounters, listSeenNumIds) {
@@ -848,8 +823,7 @@ function convertParagraphAttrs(pmAttrs, theme, listCounters, listAbstractCounter
 	if (pmAttrs.runInWithNext) attrs.runInWithNext = true;
 	if (directionIsRtl(pmAttrs.direction)) attrs.bidi = true;
 	if (pmAttrs.styleId) attrs.styleId = pmAttrs.styleId;
-	const pPrChange = pmAttrs._propertyChanges;
-	const propertyChanges = Array.isArray(pPrChange) ? pPrChange : [];
+	const propertyChanges = pmAttrs._propertyChanges ?? [];
 	let changedNumberingChange;
 	if (pmAttrs.numPr) {
 		const numPr = {};

package/dist/layout-engine/measure/measureHelpers.d.ts

@@ -3,6 +3,7 @@ import { FontStyle } from "./measureTypes.js";
 //#region src/layout-engine/measure/measureHelpers.d.ts
 declare const DEFAULT_FONT_SIZE = 11;
 declare const DEFAULT_FONT_FAMILY = "Calibri";
+declare const DOCX_SCRIPT_FONT_SCALE = 0.75;
 /**
  * Build a measurement `FontStyle` from a run's formatting. Single source of
  * truth for run → FontStyle so every measurement path (layout line-breaking,
@@ -87,4 +88,4 @@ declare function halfPtToPx(halfPt: number): number;
  */
 declare function pxToHalfPt(px: number): number;
 //#endregion
-export { DEFAULT_FONT_FAMILY, DEFAULT_FONT_SIZE, buildFontString, buildRunFontStyle, clearFontResolvedCache, findCharacterAtX, getResolvedData, getXForCharacter, halfPtToPx, ptToPx, pxToHalfPt, pxToPt, pxToTwips, twipsToPx };
+export { DEFAULT_FONT_FAMILY, DEFAULT_FONT_SIZE, DOCX_SCRIPT_FONT_SCALE, buildFontString, buildRunFontStyle, clearFontResolvedCache, findCharacterAtX, getResolvedData, getXForCharacter, halfPtToPx, ptToPx, pxToHalfPt, pxToPt, pxToTwips, twipsToPx };

package/dist/layout-engine/measure/measureHelpers.js

@@ -9,12 +9,14 @@ import { FONT_KERNING_MODE, getRunFontKerningMode } from "./textMeasurementPolic
 * char-offset geometry. The layout engine imports these directly so it never
 * transitively pulls the canvas measurement backend; the canvas implementation
 * (`measureContainer.ts`) consumes them too.
+* Script sizing: eigenpal/docx-editor@585413d0 (Apache-2.0), modified for Folio.
 */
 const TWIPS_PER_INCH = 1440;
 const PX_PER_INCH = 96;
 const TWIPS_PER_PX = TWIPS_PER_INCH / PX_PER_INCH;
 const DEFAULT_FONT_SIZE = 11;
 const DEFAULT_FONT_FAMILY = "Calibri";
+const DOCX_SCRIPT_FONT_SCALE = .75;
 /**
 * Build a measurement `FontStyle` from a run's formatting. Single source of
 * truth for run → FontStyle so every measurement path (layout line-breaking,
@@ -24,7 +26,8 @@ const DEFAULT_FONT_FAMILY = "Calibri";
 * and size fallbacks for runs that declare neither.
 */
 function buildRunFontStyle(run, fallbackFontFamily, fallbackFontSize) {
-	const fontSize = run.fontSize ?? fallbackFontSize;
+	const baseFontSize = run.fontSize ?? fallbackFontSize;
+	const fontSize = run.superscript || run.subscript ? baseFontSize * DOCX_SCRIPT_FONT_SCALE : baseFontSize;
 	return {
 		fontFamily: run.fontFamily ?? fallbackFontFamily,
 		...run.eastAsiaFontFamily !== void 0 ? { eastAsiaFontFamily: run.eastAsiaFontFamily } : {},
@@ -168,4 +171,4 @@ function pxToHalfPt(px) {
 	return pxToPt(px) * 2;
 }
 //#endregion
-export { DEFAULT_FONT_FAMILY, DEFAULT_FONT_SIZE, buildFontString, buildRunFontStyle, clearFontResolvedCache, findCharacterAtX, getResolvedData, getXForCharacter, halfPtToPx, ptToPx, pxToHalfPt, pxToPt, pxToTwips, twipsToPx };
+export { DEFAULT_FONT_FAMILY, DEFAULT_FONT_SIZE, DOCX_SCRIPT_FONT_SCALE, buildFontString, buildRunFontStyle, clearFontResolvedCache, findCharacterAtX, getResolvedData, getXForCharacter, halfPtToPx, ptToPx, pxToHalfPt, pxToPt, pxToTwips, twipsToPx };

package/dist/layout-engine/types.d.ts

@@ -1063,6 +1063,12 @@ type Page = {
   fragments: Fragment[];
   /** Page margins. */
   margins: PageMargins;
+  /**
+   * Authored section margins before header/footer clearance expands the body
+   * content box insets. Page-margin-relative anchors use these page-setup
+   * landmarks instead of furniture-expanded content insets.
+   */
+  authoredMargins?: PageMargins;
   /** Page size (width, height). */
   size: {
     w: number;