@stll/folio-core 0.22.3 → 0.23.1

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

@@ -18,7 +18,7 @@ import "../layout-engine/types.js";
 import { renderPages } from "../layout-painter/renderPage.js";
 import { tryBuildIncrementalMeasures } from "../paged-layout/incrementalMeasure.js";
 import { computePerBlockMeasureInputs } from "../paged-layout/sectionBlockWidths.js";
-import { getMargins, getPageSize, twipsToPixels } from "../paged-layout/sectionGeometry.js";
+import { getMargins, getPageNumbering, getPageSize, twipsToPixels } from "../paged-layout/sectionGeometry.js";
 import { templatePreviewValuesKey } from "../prosemirror/plugins/templatePreviewValues.js";
 import { getDocumentWatermark } from "../watermark/index.js";
 //#region src/controller/layoutPipeline.ts
@@ -195,7 +195,8 @@ function runLayoutPipeline(deps, state, options = {}) {
 		phaseStartedAt = performance.now();
 		const bodyLayoutConfig = {
 			pageSize,
-			margins: initialBodyMargins
+			margins: initialBodyMargins,
+			pageNumbering: getPageNumbering(sectionProperties)
 		};
 		if (columns !== void 0) bodyLayoutConfig.columns = columns;
 		const finalSectionProperties = document?.package.document.sections?.at(-1)?.properties;
@@ -213,7 +214,8 @@ function runLayoutPipeline(deps, state, options = {}) {
 				authoredMargins: getMargins(finalSectionProperties),
 				preparedHeader: finalHeaderForLayout,
 				preparedFooter: finalFooterForLayout
-			})
+			}),
+			pageNumbering: getPageNumbering(finalSectionProperties)
 		} : bodyLayoutConfig;
 		const finalColumns = getColumns(finalSectionProperties);
 		if (finalColumns !== void 0) finalLayoutConfig.columns = finalColumns;
@@ -258,6 +260,7 @@ function runLayoutPipeline(deps, state, options = {}) {
 			const nextLayoutOpts = {
 				pageSize,
 				margins: initialBodyMargins,
+				pageNumbering: bodyLayoutConfig.pageNumbering,
 				pageGap,
 				mirrorMargins
 			};
@@ -273,6 +276,7 @@ function runLayoutPipeline(deps, state, options = {}) {
 					count: 1,
 					gap: 0
 				};
+				nextLayoutOpts.finalPageNumbering = finalLayoutConfig.pageNumbering;
 			}
 			if (columns !== void 0) nextLayoutOpts.columns = columns;
 			if (bodyBreakType !== void 0) nextLayoutOpts.bodyBreakType = bodyBreakType;

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/blockContentParser.js

@@ -1,58 +1,13 @@
 import { parseBookmarkEnd, parseBookmarkStart } from "./bookmarkParser.js";
 import { appendBookmarkMarkerToLastParagraphInBlocks, prependBookmarkMarkersToFirstParagraphInBlocks } from "./bookmarkPlacement.js";
 import { convertBulletToUnicode } from "./bulletMarkers.js";
-import { padDecimal } from "./numberingParser.js";
+import { formatOoxmlCounter } from "./ooxmlCounterFormatter.js";
 import { parseParagraph } from "./paragraphParser.js";
 import { enrichParagraphTextBoxes } from "./paragraphTextBoxEnrichment.js";
 import { parseSdtProperties } from "./sdtProperties.js";
 import { parseTable } from "./tableParser.js";
 import { elementToXml, findChild, getChildElements, getLocalName, mergeXmlnsDeclarations } from "./xmlParser.js";
 //#region src/docx/blockContentParser.ts
-const toRoman = (numParam) => {
-	let num = numParam;
-	const romanNumerals = [
-		[1e3, "M"],
-		[900, "CM"],
-		[500, "D"],
-		[400, "CD"],
-		[100, "C"],
-		[90, "XC"],
-		[50, "L"],
-		[40, "XL"],
-		[10, "X"],
-		[9, "IX"],
-		[5, "V"],
-		[4, "IV"],
-		[1, "I"]
-	];
-	let result = "";
-	for (const [value, symbol] of romanNumerals) while (num >= value) {
-		result += symbol;
-		num -= value;
-	}
-	return result;
-};
-const toRepeatedLetter = (value, baseCodePoint) => {
-	if (value <= 0) return "0";
-	const zeroBased = value - 1;
-	return String.fromCodePoint(baseCodePoint + zeroBased % 26).repeat(Math.floor(zeroBased / 26) + 1);
-};
-const formatNumber = (value, numFmt) => {
-	switch (numFmt) {
-		case "decimal": return String(value);
-		case "decimalZero": return padDecimal(value, 2);
-		case "decimalZero3": return padDecimal(value, 3);
-		case "decimalZero4": return padDecimal(value, 4);
-		case "decimalZero5": return padDecimal(value, 5);
-		case "lowerLetter": return toRepeatedLetter(value, 97);
-		case "upperLetter": return toRepeatedLetter(value, 65);
-		case "lowerRoman": return toRoman(value).toLowerCase();
-		case "upperRoman": return toRoman(value);
-		case "bullet": return "•";
-		case "none": return "";
-		default: return String(value);
-	}
-};
 const computeListMarker = (paragraph, { numbering, listCounters, abstractCounters, restartedNumIds, previousList, siblingNumIdsByAbstractNumId }) => {
 	const listRendering = paragraph.listRendering;
 	if (!listRendering || !numbering) {
@@ -137,7 +92,7 @@ const computeListMarker = (paragraph, { numbering, listCounters, abstractCounter
 		if (computedMarker.includes(placeholder)) {
 			const value = counters[lvl] ?? 0;
 			const levelInfo = numbering.getLevel(numId, lvl);
-			const formatted = formatNumber(value, useLegalNumbering ? "decimal" : levelInfo?.numFmt || "decimal");
+			const formatted = formatOoxmlCounter(value, useLegalNumbering ? "decimal" : levelInfo?.numFmt || "decimal");
 			computedMarker = computedMarker.replaceAll(placeholder, formatted);
 		}
 	}

package/dist/docx/fieldParser.d.ts

@@ -188,7 +188,7 @@ declare function isTocField(field: document_d_exports.Field): boolean;
  * @param instruction - Parsed instruction for format switches
  * @returns Formatted page number string
  */
-declare function computePageNumber(pageNumber: number, instruction?: ParsedFieldInstruction): string;
+declare function computePageNumber(pageNumber: number, instruction?: ParsedFieldInstruction, sectionFormat?: string): string;
 /**
  * Format a date according to a format string
  *

package/dist/docx/fieldParser.js

@@ -345,16 +345,24 @@ function isTocField(field) {
 * @param instruction - Parsed instruction for format switches
 * @returns Formatted page number string
 */
-function computePageNumber(pageNumber, instruction) {
-	if (!instruction) return String(pageNumber);
-	const format = getFormatSwitch(instruction);
-	if (!format) return String(pageNumber);
+function computePageNumber(pageNumber, instruction, sectionFormat) {
+	const format = instruction ? getFormatSwitch(instruction) : void 0;
+	if (!format || format.toUpperCase() === "MERGEFORMAT") return formatSectionPageNumber(pageNumber, sectionFormat);
 	switch (format.toUpperCase()) {
 		case "ROMAN": return toRoman(pageNumber);
 		case "ALPHABETIC": return toLetter(pageNumber);
 		default: return String(pageNumber);
 	}
 }
+function formatSectionPageNumber(pageNumber, format) {
+	switch (format) {
+		case "upperRoman": return toRoman(pageNumber);
+		case "lowerRoman": return toRoman(pageNumber).toLowerCase();
+		case "upperLetter": return toLetter(pageNumber);
+		case "lowerLetter": return toLetter(pageNumber).toLowerCase();
+		default: return String(pageNumber);
+	}
+}
 /**
 * Convert number to uppercase Roman numerals
 */

package/dist/docx/numberingParser.d.ts

@@ -1,4 +1,5 @@
 import { document_d_exports } from "../types/document.js";
+import { formatOoxmlCounter, padDecimal } from "./ooxmlCounterFormatter.js";
 //#region src/docx/numberingParser.d.ts
 /**
  * Map of rId to numbering definitions
@@ -46,16 +47,6 @@ declare function computeListRendering(numPr: {
 }, numbering: NumberingMap): (document_d_exports.ListRendering & {
   levelStarts: number[];
 }) | null;
-/**
- * Format a number according to the specified format
- *
- * @param num - The number to format
- * @param format - The number format
- * @returns Formatted string
- */
-declare function formatNumber(num: number, format: document_d_exports.NumberFormat): string;
-/** Zero-pad a counter to `width` digits ("decimalZero" family, §17.18.59). */
-declare function padDecimal(num: number, width: number): string;
 /**
  * Compare two `numPr` references by value — `numId` plus `ilvl` (a missing
  * `ilvl` is level 0). Used for the style-sourced-numbering provenance check;
@@ -89,4 +80,4 @@ declare function getBulletCharacter(level: document_d_exports.ListLevel): string
  */
 declare function isBulletLevel(level: document_d_exports.ListLevel): boolean;
 //#endregion
-export { NumberingMap, computeListRendering, createNumberingMap, formatNumber, getBulletCharacter, getCachedNumberingMap, isBulletLevel, numPrEqual, padDecimal, parseNumbering, renderListMarker };
+export { NumberingMap, computeListRendering, createNumberingMap, formatOoxmlCounter as formatNumber, getBulletCharacter, getCachedNumberingMap, isBulletLevel, numPrEqual, padDecimal, parseNumbering, renderListMarker };

package/dist/docx/numberingParser.js

@@ -1,3 +1,4 @@
+import { formatOoxmlCounter, padDecimal } from "./ooxmlCounterFormatter.js";
 import { FontHintSchema, LevelSuffixSchema, ThemeColorSlotSchema, narrowEnum } from "./parserEnums.js";
 import { findChild, findChildren, getAttribute, parseBooleanElement, parseNumericAttribute, parseXmlDocument } from "./xmlParser.js";
 //#region src/docx/numberingParser.ts
@@ -614,37 +615,6 @@ function computeListRendering(numPr, numbering) {
 	return rendering;
 }
 /**
-* Format a number according to the specified format
-*
-* @param num - The number to format
-* @param format - The number format
-* @returns Formatted string
-*/
-function formatNumber(num, format) {
-	switch (format) {
-		case "decimal": return num.toString();
-		case "decimalZero": return padDecimal(num, 2);
-		case "decimalZero3": return padDecimal(num, 3);
-		case "decimalZero4": return padDecimal(num, 4);
-		case "decimalZero5": return padDecimal(num, 5);
-		case "upperRoman": return toRoman(num).toUpperCase();
-		case "lowerRoman": return toRoman(num).toLowerCase();
-		case "upperLetter": return toLetter(num).toUpperCase();
-		case "lowerLetter": return toLetter(num).toLowerCase();
-		case "ordinal": return toOrdinal(num);
-		case "bullet": return "•";
-		case "none": return "";
-		case "decimalEnclosedParen": return `(${num})`;
-		case "numberInDash": return `-${num}-`;
-		default: return num.toString();
-	}
-}
-/** Zero-pad a counter to `width` digits ("decimalZero" family, §17.18.59). */
-function padDecimal(num, width) {
-	if (num < 0) return num.toString();
-	return num.toString().padStart(width, "0");
-}
-/**
 * Compare two `numPr` references by value — `numId` plus `ilvl` (a missing
 * `ilvl` is level 0). Used for the style-sourced-numbering provenance check;
 * avoids JSON.stringify equality, which is sensitive to key order.
@@ -654,52 +624,6 @@ function numPrEqual(a, b) {
 	return a.numId === b.numId && (a.ilvl ?? 0) === (b.ilvl ?? 0);
 }
 /**
-* Convert number to Roman numerals
-*/
-function toRoman(num) {
-	if (num <= 0 || num > 3999) return num.toString();
-	const romanNumerals = [
-		[1e3, "m"],
-		[900, "cm"],
-		[500, "d"],
-		[400, "cd"],
-		[100, "c"],
-		[90, "xc"],
-		[50, "l"],
-		[40, "xl"],
-		[10, "x"],
-		[9, "ix"],
-		[5, "v"],
-		[4, "iv"],
-		[1, "i"]
-	];
-	let result = "";
-	let remaining = num;
-	for (const [value, numeral] of romanNumerals) while (remaining >= value) {
-		result += numeral;
-		remaining -= value;
-	}
-	return result;
-}
-function toLetter(num) {
-	if (num <= 0) return "";
-	const zeroBased = num - 1;
-	return String.fromCodePoint(97 + zeroBased % 26).repeat(Math.floor(zeroBased / 26) + 1);
-}
-/**
-* Convert number to ordinal (1st, 2nd, 3rd, ...)
-*/
-function toOrdinal(num) {
-	const suffix = [
-		"th",
-		"st",
-		"nd",
-		"rd"
-	];
-	const v = num % 100;
-	return num + (suffix[(v - 20) % 10] ?? suffix[v] ?? suffix[0] ?? "th");
-}
-/**
 * Render list marker text by replacing placeholders with formatted numbers
 *
 * @param lvlText - The level text pattern (e.g., "%1.", "%1.%2")
@@ -713,7 +637,7 @@ function renderListMarker(lvlText, counters, formats) {
 		const placeholder = `%${i}`;
 		if (result.includes(placeholder)) {
 			const counterIndex = i - 1;
-			const formatted = formatNumber(counters[counterIndex] ?? 1, formats[counterIndex] ?? "decimal");
+			const formatted = formatOoxmlCounter(counters[counterIndex] ?? 1, formats[counterIndex] ?? "decimal");
 			result = result.replaceAll(placeholder, formatted);
 		}
 	}
@@ -742,4 +666,4 @@ function isBulletLevel(level) {
 	return level.numFmt === "bullet" || level.numFmt === "none";
 }
 //#endregion
-export { computeListRendering, createNumberingMap, formatNumber, getBulletCharacter, getCachedNumberingMap, isBulletLevel, numPrEqual, padDecimal, parseNumbering, renderListMarker };
+export { computeListRendering, createNumberingMap, formatOoxmlCounter as formatNumber, getBulletCharacter, getCachedNumberingMap, isBulletLevel, numPrEqual, padDecimal, parseNumbering, renderListMarker };

package/dist/docx/ooxmlCounterFormatter.d.ts

@@ -0,0 +1,8 @@
+import { document_d_exports } from "../types/document.js";
+//#region src/docx/ooxmlCounterFormatter.d.ts
+/** Zero-pad a counter to `width` digits (the `decimalZero` family). */
+declare const padDecimal: (value: number, width: number) => string;
+/** Format one OOXML numbering counter using Microsoft Word display semantics. */
+declare const formatOoxmlCounter: (value: number, format: document_d_exports.NumberFormat | undefined) => string;
+//#endregion
+export { formatOoxmlCounter, padDecimal };

package/dist/docx/ooxmlCounterFormatter.js

@@ -0,0 +1,134 @@
+//#region src/docx/ooxmlCounterFormatter.ts
+const ROMAN_PAIRS = [
+	[1e3, "M"],
+	[900, "CM"],
+	[500, "D"],
+	[400, "CD"],
+	[100, "C"],
+	[90, "XC"],
+	[50, "L"],
+	[40, "XL"],
+	[10, "X"],
+	[9, "IX"],
+	[5, "V"],
+	[4, "IV"],
+	[1, "I"]
+];
+const LATIN_LOWER_SEQUENCE = [..."abcdefghijklmnopqrstuvwxyz"];
+const ARABIC_ALPHA_SEQUENCE = [..."أبتثجحخدذرزسشصضطظعغفقكلمنهوي"];
+const ARABIC_ABJAD_SEQUENCE = [..."أبجدهوزحطيكلمنسعفصقرشتثخذضظغ"];
+const ZERO_WIDTH_NON_JOINER = "‌";
+const MAX_REPEATED_COUNTER_LENGTH = 1024;
+const toRoman = (value) => {
+	if (value <= 0 || value > 3999) return String(value);
+	let remaining = value;
+	let result = "";
+	for (const [number, numeral] of ROMAN_PAIRS) while (remaining >= number) {
+		result += numeral;
+		remaining -= number;
+	}
+	return result;
+};
+const toRepeatedSequence = (value, sequence) => {
+	if (!Number.isSafeInteger(value) || value <= 0) return "";
+	const zeroBased = value - 1;
+	const character = sequence.at(zeroBased % sequence.length);
+	const repetitions = Math.floor(zeroBased / sequence.length) + 1;
+	if (repetitions > MAX_REPEATED_COUNTER_LENGTH) return;
+	return character?.repeat(repetitions) ?? "";
+};
+const toOrdinal = (value) => {
+	const suffixes = [
+		"th",
+		"st",
+		"nd",
+		"rd"
+	];
+	const remainder = value % 100;
+	return `${value}${suffixes[(remainder - 20) % 10] ?? suffixes[remainder] ?? "th"}`;
+};
+/** Zero-pad a counter to `width` digits (the `decimalZero` family). */
+const padDecimal = (value, width) => {
+	if (value < 0) return String(value);
+	return String(value).padStart(width, "0");
+};
+/** Format one OOXML numbering counter using Microsoft Word display semantics. */
+const formatOoxmlCounter = (value, format) => {
+	if (!Number.isFinite(value)) return "";
+	switch (format ?? "decimal") {
+		case "decimal":
+		case "cardinalText":
+		case "ordinalText":
+		case "hex":
+		case "chicago":
+		case "ideographDigital":
+		case "japaneseCounting":
+		case "aiueo":
+		case "iroha":
+		case "decimalFullWidth":
+		case "decimalHalfWidth":
+		case "japaneseLegal":
+		case "japaneseDigitalTenThousand":
+		case "decimalEnclosedCircle":
+		case "decimalFullWidth2":
+		case "aiueoFullWidth":
+		case "irohaFullWidth":
+		case "ganada":
+		case "chosung":
+		case "decimalEnclosedFullstop":
+		case "decimalEnclosedCircleChinese":
+		case "ideographEnclosedCircle":
+		case "ideographTraditional":
+		case "ideographZodiac":
+		case "ideographZodiacTraditional":
+		case "taiwaneseCounting":
+		case "ideographLegalTraditional":
+		case "taiwaneseCountingThousand":
+		case "taiwaneseDigital":
+		case "chineseCounting":
+		case "chineseLegalSimplified":
+		case "chineseCountingThousand":
+		case "koreanDigital":
+		case "koreanCounting":
+		case "koreanLegal":
+		case "koreanDigital2":
+		case "vietnameseCounting":
+		case "russianLower":
+		case "russianUpper":
+		case "hebrew1":
+		case "hebrew2":
+		case "hindiVowels":
+		case "hindiConsonants":
+		case "hindiNumbers":
+		case "hindiCounting":
+		case "thaiLetters":
+		case "thaiNumbers":
+		case "thaiCounting": return String(value);
+		case "decimalZero": return padDecimal(value, 2);
+		case "decimalZero3": return padDecimal(value, 3);
+		case "decimalZero4": return padDecimal(value, 4);
+		case "decimalZero5": return padDecimal(value, 5);
+		case "upperRoman": return toRoman(value);
+		case "lowerRoman": return toRoman(value).toLowerCase();
+		case "upperLetter": return (toRepeatedSequence(value, LATIN_LOWER_SEQUENCE) ?? String(value)).toUpperCase();
+		case "lowerLetter": return toRepeatedSequence(value, LATIN_LOWER_SEQUENCE) ?? String(value);
+		case "ordinal": return toOrdinal(value);
+		case "bullet": return "•";
+		case "none": return "";
+		case "decimalEnclosedParen": return `(${value})`;
+		case "numberInDash": return `-${value}-`;
+		case "arabicAlpha": {
+			const counter = toRepeatedSequence(value, ARABIC_ALPHA_SEQUENCE);
+			if (counter === void 0) return String(value);
+			return counter ? `${counter}${ZERO_WIDTH_NON_JOINER}` : "";
+		}
+		case "arabicAbjad": {
+			const counter = toRepeatedSequence(value, ARABIC_ABJAD_SEQUENCE);
+			if (counter === void 0) return String(value);
+			return counter ? `${ZERO_WIDTH_NON_JOINER}${counter}` : "";
+		}
+		default: return String(value);
+	}
+};
+//#endregion
+export { formatOoxmlCounter, padDecimal };

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/serializer/tableSerializer.js

@@ -134,7 +134,7 @@ function serializeTableFormatting(formatting, propertyChanges) {
 		if (formatting.styleId) parts.push(`<w:tblStyle w:val="${escapeXml(formatting.styleId)}"/>`);
 		const floatingXml = serializeFloatingTableProperties(formatting.floating);
 		if (floatingXml) parts.push(floatingXml);
-		if (formatting.bidi) parts.push("<w:bidiVisual/>");
+		if (formatting.bidi !== void 0) parts.push(formatting.bidi ? "<w:bidiVisual/>" : "<w:bidiVisual w:val=\"0\"/>");
 		const widthXml = serializeMeasurement(formatting.width, "tblW");
 		if (widthXml) parts.push(widthXml);
 		if (formatting.justification) parts.push(`<w:jc w:val="${formatting.justification}"/>`);

package/dist/docx/tableParser.js

@@ -284,7 +284,8 @@ function parseTableProperties(tblPrElement) {
 	}
 	const floating = parseFloatingTableProperties(findChild(tblPrElement, "w", "tblpPr"));
 	if (floating) formatting.floating = floating;
-	if (parseBooleanElement(findChild(tblPrElement, "w", "bidiVisual"))) formatting.bidi = true;
+	const bidiVisual = findChild(tblPrElement, "w", "bidiVisual");
+	if (bidiVisual) formatting.bidi = parseBooleanElement(bidiVisual);
 	if (Object.keys(formatting).length === 0) return;
 	return formatting;
 }

package/dist/fields/bookmarkPages.js

@@ -13,7 +13,7 @@ function buildBookmarkPageMap(pages, blocks) {
 	if (anchors.length === 0) return pageByBookmark;
 	for (const page of pages) for (const fragment of page.fragments) for (const anchor of anchors) {
 		if (!fragmentContainsAnchor(fragment, anchor)) continue;
-		assignBookmarkPage(pageByBookmark, anchor.names, page.number);
+		assignBookmarkPage(pageByBookmark, anchor.names, page.logicalNumber);
 	}
 	return pageByBookmark;
 }

package/dist/fields/evaluateField.js

@@ -38,7 +38,7 @@ function evaluateField(parsed, ctx, options = {}) {
 	const fallback = options.fallback ?? "";
 	if (options.locked) return fallback;
 	switch (parsed.type) {
-		case "PAGE": return computePageNumber(ctx.pageNumber, parsed);
+		case "PAGE": return computePageNumber(ctx.pageNumber, parsed, ctx.pageNumberFormat);
 		case "NUMPAGES": return computePageNumber(ctx.totalPages, parsed);
 		case "SECTIONPAGES": return ctx.sectionPages === void 0 ? fallback : computePageNumber(ctx.sectionPages, parsed);
 		case "TIME": {

package/dist/fields/fieldContext.d.ts

@@ -9,6 +9,8 @@
 type FieldContext = {
   /** 1-indexed page the field is on (PAGE). */
   pageNumber: number;
+  /** OOXML section-level format used when PAGE has no explicit format switch. */
+  pageNumberFormat?: string;
   /** Total pages in the document (NUMPAGES). */
   totalPages: number;
   /** Pages in the field's current section (SECTIONPAGES); omit until the

package/dist/fields/resolveFieldValues.js

@@ -22,6 +22,7 @@ function resolveFieldValues(blocks, pages, shared) {
 		const sectionPages = location ? shared.sectionPageCounts.get(location.sectionIndex) : void 0;
 		const context = {
 			pageNumber: location?.page ?? 1,
+			...location?.pageFormat === void 0 ? {} : { pageNumberFormat: location.pageFormat },
 			totalPages: shared.totalPages,
 			bookmarkPages: shared.bookmarkPages,
 			bookmarkText: shared.bookmarkText,
@@ -131,7 +132,8 @@ function fieldValuesEqual(a, b) {
 function buildBlockPageMap(pages) {
 	const map = /* @__PURE__ */ new Map();
 	for (const page of pages) for (const fragment of page.fragments) if (!map.has(fragment.blockId)) map.set(fragment.blockId, {
-		page: page.number,
+		page: page.logicalNumber,
+		...page.logicalNumberFormat === void 0 ? {} : { pageFormat: page.logicalNumberFormat },
 		sectionIndex: page.sectionIndex ?? 0
 	});
 	return map;
@@ -143,7 +145,8 @@ function buildTableRowPageMap(pages) {
 		for (let rowIndex = fragment.fromRow; rowIndex < fragment.toRow; rowIndex++) {
 			const key = tableRowKey(fragment.blockId, rowIndex);
 			if (!map.has(key)) map.set(key, {
-				page: page.number,
+				page: page.logicalNumber,
+				...page.logicalNumberFormat === void 0 ? {} : { pageFormat: page.logicalNumberFormat },
 				sectionIndex: page.sectionIndex ?? 0
 			});
 		}