@stll/folio-core 0.41.0 → 0.43.0

package/dist/prosemirror/styles/resolvedStyleAttrs.js

@@ -1,4 +1,5 @@
 import { computeListRendering, numberingLevelHasMarkerSlot } from "../../docx/numberingParser.js";
+import { isNumberingReference } from "../../docx/numberingReference.js";
 import { tableOfContentsStyleLevel } from "../../utils/tableOfContentsStyle.js";
 import { setAutospacingBaseValue } from "../autospacingBase.js";
 import { CLEARED_LIST_RENDERING_ATTRS } from "../listMarker.js";
@@ -74,7 +75,7 @@ function autospacingBaseFromResolvedParagraphFormatting(ppr) {
 */
 function listAttrsFromResolvedStyle(resolved, numbering) {
 	const numPr = resolved.paragraphFormatting?.numPr;
-	if (!numPr || numPr.numId === void 0 || numPr.numId === 0) return null;
+	if (!numPr || !isNumberingReference(numPr.numId)) return null;
 	const attrs = listAttrsFromNumbering({
 		numId: numPr.numId,
 		ilvl: numPr.ilvl ?? 0

package/dist/prosemirror/styles/styleResolver.js

@@ -1,3 +1,4 @@
+import { BUILT_IN_DEFAULT_PARAGRAPH_FORMATTING, resolveDefaultParagraphStyle } from "../../docx/defaultParagraphStyle.js";
 import { mergeParagraphFormatting } from "../../utils/paragraphFormattingMerge.js";
 import { cascadeStyleTextFormatting } from "./styleToggleCascade.js";
 //#region src/prosemirror/styles/styleResolver.ts
@@ -19,11 +20,7 @@ const BUILTIN_NORMAL_STYLE = {
 	type: "paragraph",
 	name: "Normal",
 	default: true,
-	pPr: {
-		spaceAfter: 160,
-		lineSpacing: 259,
-		lineSpacingRule: "auto"
-	}
+	pPr: BUILT_IN_DEFAULT_PARAGRAPH_FORMATTING
 };
 /**
 * StyleResolver provides efficient access to resolved style properties
@@ -213,8 +210,8 @@ var StyleResolver = class {
 		return this.stylesById.has(styleId);
 	}
 	findDefaultStyle(type) {
+		if (type === "paragraph") return resolveDefaultParagraphStyle(this.stylesById.values()) ?? (this.docDefaults ? void 0 : BUILTIN_NORMAL_STYLE);
 		for (const style of this.stylesById.values()) if (style.type === type && style.default) return style;
-		if (type === "paragraph") return this.stylesById.get("Normal") ?? (this.docDefaults ? void 0 : BUILTIN_NORMAL_STYLE);
 	}
 };
 /**

package/dist/prosemirror/utils/visualLineNavigation.d.ts

@@ -1,9 +1,29 @@
 import { EditorView } from "prosemirror-view";
 //#region src/prosemirror/utils/visualLineNavigation.d.ts
+/**
+ * Where the previous vertical step left the caret: the column later steps keep
+ * (`stickyX`), the visual line it settled on, and the caret position both
+ * describe. The line index is not redundant with the position — a soft-wrap
+ * boundary position belongs to two visual lines (the end of the wrapped line
+ * and the start of the next), so the painted DOM alone cannot say which one the
+ * caret sits on.
+ *
+ * @internal
+ */
+type VisualLineStep = {
+  stickyX: number;
+  lineIndex: number;
+  pmPos: number;
+};
 /** @internal */
 type VisualLineState = {
-  stickyX: number | null;
-  lastVisualLineIndex: number;
+  /**
+   * Only describes the caret while it is still at `step.pmPos`. Any other move
+   * (a click, a find result, an agent edit, typing) leaves the caret elsewhere,
+   * and the next vertical step re-resolves both column and line from the DOM
+   * instead of continuing from a line the caret has left.
+   */
+  step: VisualLineStep | null;
 };
 /** @internal */
 declare function createVisualLineState(): VisualLineState;

package/dist/prosemirror/utils/visualLineNavigation.js

@@ -1,7 +1,8 @@
+import { findCollapsedLineEdgeCaretTarget } from "../../layout-bridge/dom/clickToPositionDom.js";
 import { findBodyEmptyRuns, findBodyPmSpans } from "../../layout-bridge/dom/findBodyPmSpans.js";
 import { createTextStreamRange, descendantTextNodes, totalTextLength } from "../../layout-bridge/dom/textStreamDom.js";
 import { findVerticalScrollParent } from "../../utils/findVerticalScrollParent.js";
-import { TextSelection } from "prosemirror-state";
+import { Selection, TextSelection } from "prosemirror-state";
 //#region src/prosemirror/utils/visualLineNavigation.ts
 /**
 * Visual line navigation helpers — implements Word/Google-Docs-style
@@ -17,12 +18,10 @@ import { TextSelection } from "prosemirror-state";
 * @internal
 */
 const CONTENT_LINE_SELECTOR = ".layout-page-content .layout-line";
+const PM_SPAN_SELECTOR = "span[data-pm-start][data-pm-end]";
 /** @internal */
 function createVisualLineState() {
-	return {
-		stickyX: null,
-		lastVisualLineIndex: -1
-	};
+	return { step: null };
 }
 function scrollIntoViewIfNeeded(el) {
 	const container = findVerticalScrollParent(el);
@@ -35,7 +34,10 @@ function scrollIntoViewIfNeeded(el) {
 }
 /** @internal */
 function getCaretClientX(container, pmPos) {
-	for (const spanEl of findBodyPmSpans(container)) {
+	const spans = findBodyPmSpans(container);
+	const collapsedTarget = findCollapsedLineEdgeCaretTarget(spans, pmPos);
+	if (collapsedTarget) return collapsedTarget.geometry.left;
+	for (const spanEl of spans) {
 		const pmStart = Number(spanEl.dataset["pmStart"]);
 		const pmEnd = Number(spanEl.dataset["pmEnd"]);
 		if (spanEl.classList.contains("layout-run-tab")) {
@@ -58,21 +60,24 @@ function getCaretClientX(container, pmPos) {
 	}
 	return null;
 }
+/**
+* Whether one painted line carries `pmPos`. Span endpoints are inclusive, so a
+* soft-wrap boundary answers true for both the line it ends and the line it
+* starts.
+*/
+const lineCarriesPosition = (lineEl, pmPos) => {
+	for (const span of Array.from(lineEl.querySelectorAll(PM_SPAN_SELECTOR))) {
+		const start = Number(span.dataset["pmStart"]);
+		const end = Number(span.dataset["pmEnd"]);
+		if (pmPos >= start && pmPos <= end) return true;
+	}
+	return false;
+};
 /** @internal */
 function findLineElementAtPosition(container, pmPos) {
 	const allLines = container.querySelectorAll(CONTENT_LINE_SELECTOR);
-	for (const line of Array.from(allLines)) {
-		const lineEl = line;
-		const spans = lineEl.querySelectorAll("span[data-pm-start][data-pm-end]");
-		for (const span of Array.from(spans)) {
-			const s = span;
-			const start = Number(s.dataset["pmStart"]);
-			const end = Number(s.dataset["pmEnd"]);
-			if (pmPos >= start && pmPos <= end) return lineEl;
-		}
-	}
-	for (const line of Array.from(allLines)) {
-		const lineEl = line;
+	for (const lineEl of Array.from(allLines)) if (lineCarriesPosition(lineEl, pmPos)) return lineEl;
+	for (const lineEl of Array.from(allLines)) {
 		const paragraph = lineEl.closest(".layout-paragraph");
 		if (!paragraph) continue;
 		const pStart = Number(paragraph.dataset["pmStart"]);
@@ -145,6 +150,36 @@ function findPositionOnLineAtClientX(lineEl, clientX) {
 	return clientX < closestSpan.getBoundingClientRect().left ? Number(closestSpan.dataset["pmStart"]) : Number(closestSpan.dataset["pmEnd"]);
 }
 /**
+* The step the next vertical move continues from: the remembered one while the
+* caret is still where that move left it, the caret's own painted geometry
+* otherwise.
+*/
+const resolveVisualLineStep = ({ state, container, allLines, pmPos }) => {
+	const remembered = state.step;
+	if (remembered?.pmPos === pmPos) {
+		const rememberedLine = allLines[remembered.lineIndex];
+		if (rememberedLine && lineCarriesPosition(rememberedLine, pmPos)) return remembered;
+	}
+	const currentLine = findLineElementAtPosition(container, pmPos);
+	if (!currentLine) return null;
+	const lineIndex = allLines.indexOf(currentLine);
+	if (lineIndex === -1) return null;
+	const stickyX = getCaretClientX(container, pmPos);
+	return stickyX === null ? null : {
+		stickyX,
+		lineIndex,
+		pmPos
+	};
+};
+const createVerticalSelection = ({ doc, anchor, head, extend }) => {
+	try {
+		return extend ? TextSelection.create(doc, anchor, head) : TextSelection.create(doc, head);
+	} catch {
+		const $head = doc.resolve(head);
+		return extend ? TextSelection.between(doc.resolve(anchor), $head) : Selection.near($head);
+	}
+};
+/**
 * Handle PM ArrowUp / ArrowDown with visual-line awareness + sticky
 * X. Returns true if the event was handled and PM should not run
 * its default behaviour. Mutates `state` so consecutive presses
@@ -153,59 +188,41 @@ function findPositionOnLineAtClientX(lineEl, clientX) {
 * @internal
 */
 function handleVisualLineKeyDown(state, view, event, container) {
-	if (event.key !== "ArrowUp" && event.key !== "ArrowDown") {
-		if ([
-			"ArrowLeft",
-			"ArrowRight",
-			"Home",
-			"End"
-		].includes(event.key) || event.key.length === 1 && !event.ctrlKey && !event.metaKey) {
-			state.stickyX = null;
-			state.lastVisualLineIndex = -1;
-		}
-		return false;
-	}
-	if (event.ctrlKey || event.metaKey) {
-		state.stickyX = null;
-		state.lastVisualLineIndex = -1;
-		return false;
-	}
+	if (event.key !== "ArrowUp" && event.key !== "ArrowDown") return false;
+	if (event.ctrlKey || event.metaKey) return false;
 	if (!container) return false;
 	const allLines = Array.from(container.querySelectorAll(CONTENT_LINE_SELECTOR));
 	if (allLines.length === 0) return false;
-	const { from, anchor } = view.state.selection;
-	if (state.stickyX === null) {
-		const clientX = getCaretClientX(container, from);
-		if (clientX === null) return false;
-		state.stickyX = clientX;
-	}
-	let currentIndex;
-	if (state.lastVisualLineIndex >= 0 && state.lastVisualLineIndex < allLines.length) currentIndex = state.lastVisualLineIndex;
-	else {
-		const currentLine = findLineElementAtPosition(container, from);
-		if (!currentLine) return false;
-		currentIndex = allLines.indexOf(currentLine);
-		if (currentIndex === -1) return false;
-	}
-	const targetIndex = event.key === "ArrowUp" ? currentIndex - 1 : currentIndex + 1;
-	if (targetIndex < 0 || targetIndex >= allLines.length) {
-		state.lastVisualLineIndex = -1;
+	const { head, anchor } = view.state.selection;
+	const step = resolveVisualLineStep({
+		state,
+		container,
+		allLines,
+		pmPos: head
+	});
+	if (!step) return false;
+	const targetIndex = event.key === "ArrowUp" ? step.lineIndex - 1 : step.lineIndex + 1;
+	const targetLine = allLines[targetIndex];
+	if (!targetLine) {
+		state.step = null;
 		return false;
 	}
-	const targetLine = allLines[targetIndex];
-	const newPos = findPositionOnLineAtClientX(targetLine, state.stickyX);
+	const newPos = findPositionOnLineAtClientX(targetLine, step.stickyX);
 	if (newPos === null) return false;
-	state.lastVisualLineIndex = targetIndex;
 	const { state: pmState, dispatch } = view;
 	const clampedPos = Math.max(0, Math.min(newPos, pmState.doc.content.size));
-	try {
-		const sel = event.shiftKey ? TextSelection.create(pmState.doc, anchor, clampedPos) : TextSelection.create(pmState.doc, clampedPos);
-		dispatch(pmState.tr.setSelection(sel));
-	} catch {
-		const $newPos = pmState.doc.resolve(clampedPos);
-		const sel = event.shiftKey ? TextSelection.between(pmState.doc.resolve(anchor), $newPos) : TextSelection.near($newPos);
-		dispatch(pmState.tr.setSelection(sel));
-	}
+	const selection = createVerticalSelection({
+		doc: pmState.doc,
+		anchor,
+		head: clampedPos,
+		extend: event.shiftKey
+	});
+	dispatch(pmState.tr.setSelection(selection));
+	state.step = {
+		stickyX: step.stickyX,
+		lineIndex: targetIndex,
+		pmPos: selection.head
+	};
 	scrollIntoViewIfNeeded(targetLine);
 	return true;
 }

package/dist/server.d.ts

@@ -10,7 +10,7 @@ import { DOCUMENT_PRESET_VERSION, DOCUMENT_STYLE_SET_VERSION, DocumentPreset, Do
 import { CreateEmptyDocumentOptions, createEmptyDocument } from "./utils/createDocument.js";
 import { DocumentStyleCatalog, DocumentStyleCatalogEntry, ExtractDocumentStyleSetOptions, extractDocumentStyleSet, extractDocumentStyleSetFromDocx, inspectDocumentStyles, inspectDocumentStylesFromDocx } from "./style-sets/extract.js";
 import { STELLA_STYLE_SET_NAME, createStellaStyleDocumentPreset, createStellaStyleSet } from "./style-sets/stellaStyle.js";
-import { createDocx } from "./docx/rezip.js";
+import { DocumentPropertiesOptions, createDocx } from "./docx/rezip.js";
 import { EnsureParaIdsError, EnsureParaIdsOptions, EnsureParaIdsResult, ensureParaIds } from "./docx/ensureParaIds.js";
 import { FOLIO_DOCUMENT_METADATA_PROPERTIES, FOLIO_DOCUMENT_PRIVACY_TRANSFORMS, FolioDocumentMetadataProperty, FolioDocumentPrivacyArchiveError, FolioDocumentPrivacyOptions, FolioDocumentPrivacyReport, FolioDocumentPrivacyTransform, InvalidFolioDocumentPrivacyOptionsError, RewriteDocxMetadataPrivacyResult, isFolioDocumentPrivacyTransform, rewriteDocxMetadataPrivacy } from "./docx/metadataPrivacy.js";
 import { ParseOptions, parseDocx } from "./docx/parser.js";
@@ -28,4 +28,4 @@ import { FOLIO_DOCX_PACKAGE_INSPECTION_DEFAULTS, FOLIO_DOCX_PACKAGE_INSPECTION_E
 import { FOLIO_YJS_DOCX_MATERIALIZATION_ERROR_CODES, FOLIO_YJS_PROSEMIRROR_FRAGMENT_NAME, FOLIO_YJS_UPDATE_MAX_BYTES, FolioYjsDocxMaterializationError, FolioYjsDocxMaterializationErrorCode, MaterializeYjsDocxOptions, materializeYjsDocx } from "./docx/server/materializeYjsDocx.js";
 import { GenerateRedlineDocxOptions, GenerateRedlineDocxResult, GenerateRedlineUnprocessedStory, InvalidGenerateRedlineDocxOptionsError, generateRedlineDocx } from "./redline.js";
 import { FOLIO_VERSION_COMPARISON_PRIVACY_TRANSFORMS, FOLIO_VERSION_COMPARISON_SCOPES, FolioBlockDiff, FolioBlockProperty, FolioCompareDocxVersionsOptions, FolioDocumentMetadataValue, FolioFormatProperty, FolioMetadataDiff, FolioStoryDiff, FolioVersionBlockHandle, FolioVersionChangeProperty, FolioVersionComparisonPrivacyTransform, FolioVersionComparisonScope, FolioVersionDiff, FolioVersionDiffPrivacyOptions, FolioVersionDiffPrivacyReport, FolioVersionDiffSegment, FolioVersionDiffSummaryCounts, InvalidFolioVersionComparisonOptionsError, applyFolioVersionDiffPrivacy, compareDocxVersions, isFolioVersionComparisonPrivacyTransform, isFolioVersionComparisonScope } from "./version-comparison.js";
-export { type ApplyDocxXmlPatchProposalArgs, type ApplyFolioAIEditsToBufferOptions, type ApplyFolioAIEditsToBufferResult, BILINGUAL_TABLE_LAYOUTS, type BilingualBorders, type BilingualParagraphRef, type BilingualRow, type BilingualRowKind, type BilingualTableLayout, type BilingualTableParagraphRef, type CreateBilingualDocumentOptions, type CreateBilingualDocumentResult, type CreateBilingualDocxOptions, type CreateBilingualDocxResult, type CreateCommentReplyInput, type CreateEmptyDocumentOptions, DOCUMENT_PRESET_VERSION, DOCUMENT_STYLE_SET_VERSION, type DeriveBlockIdInput, type DocumentPreset, type DocumentStyleCatalog, type DocumentStyleCatalogEntry, type DocumentStyleSet, DocxArchiveError, type DocxArchiveOptions, type DocxParagraphSource, type DocxTableRowKind, type DocxTableRowPosition, EnsureParaIdsError, type EnsureParaIdsOptions, type EnsureParaIdsResult, type EvaluateDocxXmlPatchProposalArgs, type ExtractDocumentStyleSetOptions, type ExtractedDocxParagraph, type ExtractedDocxTableCell, type ExtractedDocxTableCellParagraph, type ExtractedDocxText, FOLIO_DOCUMENT_METADATA_PROPERTIES, FOLIO_DOCUMENT_OPERATION_BATCH_MODES, FOLIO_DOCUMENT_OPERATION_BATCH_PRECONDITIONS, FOLIO_DOCUMENT_OPERATION_CONTRACT_VERSION, FOLIO_DOCUMENT_OPERATION_KEYS_BY_TYPE, FOLIO_DOCUMENT_OPERATION_MODES, FOLIO_DOCUMENT_OPERATION_MODES_BY_TYPE, FOLIO_DOCUMENT_OPERATION_PRECONDITIONS, FOLIO_DOCUMENT_OPERATION_STORIES, FOLIO_DOCUMENT_OPERATION_TYPES, FOLIO_DOCUMENT_PRIVACY_TRANSFORMS, FOLIO_DOCX_CONFORMANCE_CHECKS, FOLIO_DOCX_CONFORMANCE_ISSUE_CODES, FOLIO_DOCX_CONFORMANCE_PROFILE, FOLIO_DOCX_CONFORMANCE_REPORT_VERSION, FOLIO_DOCX_PACKAGE_INSPECTION_DEFAULTS, FOLIO_DOCX_PACKAGE_INSPECTION_ERROR_CODES, FOLIO_DOCX_PACKAGE_INSPECTION_VERSION, FOLIO_DOCX_XML_PATCH_APPLICATION_PROFILE, FOLIO_DOCX_XML_PATCH_APPLICATION_VERSION, FOLIO_DOCX_XML_PATCH_PROPOSAL_DEFAULTS, FOLIO_DOCX_XML_PATCH_PROPOSAL_ISSUE_CODES, FOLIO_DOCX_XML_PATCH_PROPOSAL_PROFILE, FOLIO_DOCX_XML_PATCH_PROPOSAL_VERSION, FOLIO_LINE_SPACING_RULE_VALUES, FOLIO_PAGE_BREAK_CLEAR_VALUES, FOLIO_PARAGRAPH_ALIGNMENT_VALUES, FOLIO_RESOLVED_REVIEWED_VIEWS, FOLIO_REVIEWED_VIEWS, FOLIO_VERSION_COMPARISON_PRIVACY_TRANSFORMS, FOLIO_VERSION_COMPARISON_SCOPES, FOLIO_YJS_DOCX_MATERIALIZATION_ERROR_CODES, FOLIO_YJS_PROSEMIRROR_FRAGMENT_NAME, FOLIO_YJS_UPDATE_MAX_BYTES, type FolioAIBlock, type FolioAIBlockAnchor, type FolioAIBlockKind, type FolioAIBlockPreviewRun, type FolioAIBlockStructuralBoundary, type FolioAIComment, type FolioAIEditApplyMode, type FolioAIEditApplyResult, type FolioAIEditNormalization, type FolioAIEditNormalizationCode, type FolioAIEditOperation, type FolioAIEditPrecondition, type FolioAIEditSnapshot, type FolioAIInlineBooleanProperty, type FolioAIInlineFormatting, type FolioAIInlineFormattingPatch, type FolioAIParagraphSpacing, type FolioAITextRangeHandle, type FolioApplyDocumentOperationsOptions, type FolioApplyDocumentOperationsToStoryOptions, type FolioApplyOperationsOptions, type FolioBlockDiff, type FolioBlockId, type FolioBlockProperty, type FolioCompareDocxVersionsOptions, type FolioContentParagraphKind, type FolioDocumentMetadataProperty, type FolioDocumentMetadataValue, type FolioDocumentNavigationTarget, type FolioDocumentOperation, type FolioDocumentOperationAffectedTarget, type FolioDocumentOperationBatch, type FolioDocumentOperationBatchPrecondition, type FolioDocumentOperationCapabilities, type FolioDocumentOperationIssue, type FolioDocumentOperationMode, type FolioDocumentOperationPrecondition, type FolioDocumentOperationQueuedOperation, type FolioDocumentOperationReceipt, type FolioDocumentOperationRecovery, type FolioDocumentOperationResult, type FolioDocumentOperationResultBase, type FolioDocumentOperationStatus, type FolioDocumentOperationStory, type FolioDocumentOperationType, type FolioDocumentOperationUndoFailureReason, type FolioDocumentOperationUndoHandle, type FolioDocumentOperationUndoResult, type FolioDocumentOutline, type FolioDocumentOutlineEntry, FolioDocumentPrivacyArchiveError, type FolioDocumentPrivacyOptions, type FolioDocumentPrivacyReport, type FolioDocumentPrivacyTransform, type FolioDocumentSection, type FolioDocumentSectionHandle, type FolioDocumentSectionReadResult, type FolioDocumentStory, type FolioDocumentStoryHandle, FolioDocumentStoryNotFoundError, type FolioDocxConformanceCheck, type FolioDocxConformanceCheckId, type FolioDocxConformanceCheckStatus, type FolioDocxConformanceIssue, type FolioDocxConformanceIssueCode, type FolioDocxConformanceReport, type FolioDocxConformanceStatus, type FolioDocxInspectedXmlPart, type FolioDocxPackageInspection, FolioDocxPackageInspectionError, type FolioDocxPackageInspectionErrorCode, type FolioDocxPackageInspectionLimits, type FolioDocxPackagePart, type FolioDocxPackagePartKind, type FolioDocxPreparedXmlReplacement, FolioDocxReviewer, type FolioDocxReviewerOptions, type FolioDocxXmlPatchApplication, FolioDocxXmlPatchApplicationError, type FolioDocxXmlPatchApplicationReceipt, type FolioDocxXmlPatchProposal, type FolioDocxXmlPatchProposalEvaluation, type FolioDocxXmlPatchProposalIssue, type FolioDocxXmlPatchProposalIssueCode, type FolioDocxXmlPatchProposalLimits, type FolioDocxXmlReplacement, type FolioEditableDocumentStoryHandle, type FolioFormatProperty, type FolioMetadataDiff, type FolioReadReviewedStoryOptions, type FolioResolveReviewedStoryOptions, type FolioResolvedReviewedView, type FolioReviewChange, type FolioReviewChangeFilter, type FolioReviewChangeKind, type FolioReviewComment, type FolioReviewCommentFilter, type FolioReviewCommentReply, type FolioReviewReplyInput, type FolioReviewedStory, type FolioReviewedView, type FolioStoryDiff, type FolioVersionBlockHandle, type FolioVersionChangeProperty, type FolioVersionComparisonPrivacyTransform, type FolioVersionComparisonScope, type FolioVersionDiff, type FolioVersionDiffPrivacyOptions, type FolioVersionDiffPrivacyReport, type FolioVersionDiffSegment, type FolioVersionDiffSummaryCounts, FolioYjsDocxMaterializationError, type FolioYjsDocxMaterializationErrorCode, type GenerateRedlineDocxOptions, type GenerateRedlineDocxResult, type GenerateRedlineUnprocessedStory, HEADING_LEVELS, type HeadingLevel, type InspectDocxPackageOptions, InvalidBilingualDocumentOptionsError, InvalidFolioDocumentOperationBatchError, InvalidFolioDocumentPrivacyOptionsError, InvalidFolioDocxXmlPatchProposalError, InvalidFolioDocxXmlPatchProposalOptionsError, InvalidFolioReportBuilderOptionsError, InvalidFolioVersionComparisonOptionsError, InvalidGenerateRedlineDocxOptionsError, type MaterializeYjsDocxOptions, type ParseOptions, type RewriteDocxMetadataPrivacyResult, STELLA_STYLE_SET_NAME, type TableCellSpec, UnsupportedFolioDocumentOperationVersionError, UnsupportedFolioDocxXmlPatchApplicationProfileError, UnsupportedFolioReviewedViewError, type ValidateDocxConformanceOptions, applyDocxXmlPatchProposal, applyFolioAIEditsToBuffer, applyFolioVersionDiffPrivacy, assertSupportedFolioDocumentOperationVersion, bookmark, compareDocxVersions, createBilingualDocument, createBilingualDocx, createDocx, createEmptyDocument, createFolioAITextRangeHandle, createStellaStyleDocumentPreset, createStellaStyleSet, createTableOfContentsField, deriveBlockId, docxToMarkdown, endnote, ensureParaIds, evaluateDocxXmlPatchProposal, extractDocumentStyleSet, extractDocumentStyleSetFromDocx, extractDocxText, generateRedlineDocx, getFolioDocumentOperationCapabilities, getFolioDocumentOperationIssues, getFolioDocumentOperationReceipts, getFolioDocumentOutline, getFolioParaIdFromBlockId, hashFolioAIBlockText, heading, hyperlink, inspectDocumentStyles, inspectDocumentStylesFromDocx, inspectDocxPackage, isFolioAIContentBlock, isFolioBlockId, isFolioDocumentOperationModeSupported, isFolioDocumentPrivacyTransform, isFolioResolvedReviewedView, isFolioReviewedView, isFolioVersionComparisonPrivacyTransform, isFolioVersionComparisonScope, isSequentialFolioBlockId, isSupportedFolioDocumentOperationVersion, materializeYjsDocx, normalizeFolioAIBlockText, pageBreak, paragraph, parseDocx, parseFolioDocumentOperationBatch, parseFolioDocxXmlPatchProposal, readBilingualDocument, readBilingualDocx, readFolioDocumentSection, replyToComment, rewriteDocxMetadataPrivacy, run, table, validateDocxConformance };
+export { type ApplyDocxXmlPatchProposalArgs, type ApplyFolioAIEditsToBufferOptions, type ApplyFolioAIEditsToBufferResult, BILINGUAL_TABLE_LAYOUTS, type BilingualBorders, type BilingualParagraphRef, type BilingualRow, type BilingualRowKind, type BilingualTableLayout, type BilingualTableParagraphRef, type CreateBilingualDocumentOptions, type CreateBilingualDocumentResult, type CreateBilingualDocxOptions, type CreateBilingualDocxResult, type CreateCommentReplyInput, type CreateEmptyDocumentOptions, DOCUMENT_PRESET_VERSION, DOCUMENT_STYLE_SET_VERSION, type DeriveBlockIdInput, type DocumentPreset, type DocumentPropertiesOptions, type DocumentStyleCatalog, type DocumentStyleCatalogEntry, type DocumentStyleSet, DocxArchiveError, type DocxArchiveOptions, type DocxParagraphSource, type DocxTableRowKind, type DocxTableRowPosition, EnsureParaIdsError, type EnsureParaIdsOptions, type EnsureParaIdsResult, type EvaluateDocxXmlPatchProposalArgs, type ExtractDocumentStyleSetOptions, type ExtractedDocxParagraph, type ExtractedDocxTableCell, type ExtractedDocxTableCellParagraph, type ExtractedDocxText, FOLIO_DOCUMENT_METADATA_PROPERTIES, FOLIO_DOCUMENT_OPERATION_BATCH_MODES, FOLIO_DOCUMENT_OPERATION_BATCH_PRECONDITIONS, FOLIO_DOCUMENT_OPERATION_CONTRACT_VERSION, FOLIO_DOCUMENT_OPERATION_KEYS_BY_TYPE, FOLIO_DOCUMENT_OPERATION_MODES, FOLIO_DOCUMENT_OPERATION_MODES_BY_TYPE, FOLIO_DOCUMENT_OPERATION_PRECONDITIONS, FOLIO_DOCUMENT_OPERATION_STORIES, FOLIO_DOCUMENT_OPERATION_TYPES, FOLIO_DOCUMENT_PRIVACY_TRANSFORMS, FOLIO_DOCX_CONFORMANCE_CHECKS, FOLIO_DOCX_CONFORMANCE_ISSUE_CODES, FOLIO_DOCX_CONFORMANCE_PROFILE, FOLIO_DOCX_CONFORMANCE_REPORT_VERSION, FOLIO_DOCX_PACKAGE_INSPECTION_DEFAULTS, FOLIO_DOCX_PACKAGE_INSPECTION_ERROR_CODES, FOLIO_DOCX_PACKAGE_INSPECTION_VERSION, FOLIO_DOCX_XML_PATCH_APPLICATION_PROFILE, FOLIO_DOCX_XML_PATCH_APPLICATION_VERSION, FOLIO_DOCX_XML_PATCH_PROPOSAL_DEFAULTS, FOLIO_DOCX_XML_PATCH_PROPOSAL_ISSUE_CODES, FOLIO_DOCX_XML_PATCH_PROPOSAL_PROFILE, FOLIO_DOCX_XML_PATCH_PROPOSAL_VERSION, FOLIO_LINE_SPACING_RULE_VALUES, FOLIO_PAGE_BREAK_CLEAR_VALUES, FOLIO_PARAGRAPH_ALIGNMENT_VALUES, FOLIO_RESOLVED_REVIEWED_VIEWS, FOLIO_REVIEWED_VIEWS, FOLIO_VERSION_COMPARISON_PRIVACY_TRANSFORMS, FOLIO_VERSION_COMPARISON_SCOPES, FOLIO_YJS_DOCX_MATERIALIZATION_ERROR_CODES, FOLIO_YJS_PROSEMIRROR_FRAGMENT_NAME, FOLIO_YJS_UPDATE_MAX_BYTES, type FolioAIBlock, type FolioAIBlockAnchor, type FolioAIBlockKind, type FolioAIBlockPreviewRun, type FolioAIBlockStructuralBoundary, type FolioAIComment, type FolioAIEditApplyMode, type FolioAIEditApplyResult, type FolioAIEditNormalization, type FolioAIEditNormalizationCode, type FolioAIEditOperation, type FolioAIEditPrecondition, type FolioAIEditSnapshot, type FolioAIInlineBooleanProperty, type FolioAIInlineFormatting, type FolioAIInlineFormattingPatch, type FolioAIParagraphSpacing, type FolioAITextRangeHandle, type FolioApplyDocumentOperationsOptions, type FolioApplyDocumentOperationsToStoryOptions, type FolioApplyOperationsOptions, type FolioBlockDiff, type FolioBlockId, type FolioBlockProperty, type FolioCompareDocxVersionsOptions, type FolioContentParagraphKind, type FolioDocumentMetadataProperty, type FolioDocumentMetadataValue, type FolioDocumentNavigationTarget, type FolioDocumentOperation, type FolioDocumentOperationAffectedTarget, type FolioDocumentOperationBatch, type FolioDocumentOperationBatchPrecondition, type FolioDocumentOperationCapabilities, type FolioDocumentOperationIssue, type FolioDocumentOperationMode, type FolioDocumentOperationPrecondition, type FolioDocumentOperationQueuedOperation, type FolioDocumentOperationReceipt, type FolioDocumentOperationRecovery, type FolioDocumentOperationResult, type FolioDocumentOperationResultBase, type FolioDocumentOperationStatus, type FolioDocumentOperationStory, type FolioDocumentOperationType, type FolioDocumentOperationUndoFailureReason, type FolioDocumentOperationUndoHandle, type FolioDocumentOperationUndoResult, type FolioDocumentOutline, type FolioDocumentOutlineEntry, FolioDocumentPrivacyArchiveError, type FolioDocumentPrivacyOptions, type FolioDocumentPrivacyReport, type FolioDocumentPrivacyTransform, type FolioDocumentSection, type FolioDocumentSectionHandle, type FolioDocumentSectionReadResult, type FolioDocumentStory, type FolioDocumentStoryHandle, FolioDocumentStoryNotFoundError, type FolioDocxConformanceCheck, type FolioDocxConformanceCheckId, type FolioDocxConformanceCheckStatus, type FolioDocxConformanceIssue, type FolioDocxConformanceIssueCode, type FolioDocxConformanceReport, type FolioDocxConformanceStatus, type FolioDocxInspectedXmlPart, type FolioDocxPackageInspection, FolioDocxPackageInspectionError, type FolioDocxPackageInspectionErrorCode, type FolioDocxPackageInspectionLimits, type FolioDocxPackagePart, type FolioDocxPackagePartKind, type FolioDocxPreparedXmlReplacement, FolioDocxReviewer, type FolioDocxReviewerOptions, type FolioDocxXmlPatchApplication, FolioDocxXmlPatchApplicationError, type FolioDocxXmlPatchApplicationReceipt, type FolioDocxXmlPatchProposal, type FolioDocxXmlPatchProposalEvaluation, type FolioDocxXmlPatchProposalIssue, type FolioDocxXmlPatchProposalIssueCode, type FolioDocxXmlPatchProposalLimits, type FolioDocxXmlReplacement, type FolioEditableDocumentStoryHandle, type FolioFormatProperty, type FolioMetadataDiff, type FolioReadReviewedStoryOptions, type FolioResolveReviewedStoryOptions, type FolioResolvedReviewedView, type FolioReviewChange, type FolioReviewChangeFilter, type FolioReviewChangeKind, type FolioReviewComment, type FolioReviewCommentFilter, type FolioReviewCommentReply, type FolioReviewReplyInput, type FolioReviewedStory, type FolioReviewedView, type FolioStoryDiff, type FolioVersionBlockHandle, type FolioVersionChangeProperty, type FolioVersionComparisonPrivacyTransform, type FolioVersionComparisonScope, type FolioVersionDiff, type FolioVersionDiffPrivacyOptions, type FolioVersionDiffPrivacyReport, type FolioVersionDiffSegment, type FolioVersionDiffSummaryCounts, FolioYjsDocxMaterializationError, type FolioYjsDocxMaterializationErrorCode, type GenerateRedlineDocxOptions, type GenerateRedlineDocxResult, type GenerateRedlineUnprocessedStory, HEADING_LEVELS, type HeadingLevel, type InspectDocxPackageOptions, InvalidBilingualDocumentOptionsError, InvalidFolioDocumentOperationBatchError, InvalidFolioDocumentPrivacyOptionsError, InvalidFolioDocxXmlPatchProposalError, InvalidFolioDocxXmlPatchProposalOptionsError, InvalidFolioReportBuilderOptionsError, InvalidFolioVersionComparisonOptionsError, InvalidGenerateRedlineDocxOptionsError, type MaterializeYjsDocxOptions, type ParseOptions, type RewriteDocxMetadataPrivacyResult, STELLA_STYLE_SET_NAME, type TableCellSpec, UnsupportedFolioDocumentOperationVersionError, UnsupportedFolioDocxXmlPatchApplicationProfileError, UnsupportedFolioReviewedViewError, type ValidateDocxConformanceOptions, applyDocxXmlPatchProposal, applyFolioAIEditsToBuffer, applyFolioVersionDiffPrivacy, assertSupportedFolioDocumentOperationVersion, bookmark, compareDocxVersions, createBilingualDocument, createBilingualDocx, createDocx, createEmptyDocument, createFolioAITextRangeHandle, createStellaStyleDocumentPreset, createStellaStyleSet, createTableOfContentsField, deriveBlockId, docxToMarkdown, endnote, ensureParaIds, evaluateDocxXmlPatchProposal, extractDocumentStyleSet, extractDocumentStyleSetFromDocx, extractDocxText, generateRedlineDocx, getFolioDocumentOperationCapabilities, getFolioDocumentOperationIssues, getFolioDocumentOperationReceipts, getFolioDocumentOutline, getFolioParaIdFromBlockId, hashFolioAIBlockText, heading, hyperlink, inspectDocumentStyles, inspectDocumentStylesFromDocx, inspectDocxPackage, isFolioAIContentBlock, isFolioBlockId, isFolioDocumentOperationModeSupported, isFolioDocumentPrivacyTransform, isFolioResolvedReviewedView, isFolioReviewedView, isFolioVersionComparisonPrivacyTransform, isFolioVersionComparisonScope, isSequentialFolioBlockId, isSupportedFolioDocumentOperationVersion, materializeYjsDocx, normalizeFolioAIBlockText, pageBreak, paragraph, parseDocx, parseFolioDocumentOperationBatch, parseFolioDocxXmlPatchProposal, readBilingualDocument, readBilingualDocx, readFolioDocumentSection, replyToComment, rewriteDocxMetadataPrivacy, run, table, validateDocxConformance };

package/dist/style-engine/styleEngine.d.ts

@@ -34,7 +34,7 @@ type StyleEngine = {
   hasStyle: (styleId: string) => boolean;
   /** Return the document-wide defaults (`w:docDefaults`). */
   getDocDefaults: () => document_d_exports.DocDefaults | undefined;
-  /** The style flagged `w:default="1"` for paragraphs, else "Normal". */
+  /** The paragraph default per ECMA-376 17.7.4.17, else the built-in Normal. */
   getDefaultParagraphStyle: () => document_d_exports.Style | undefined;
   /** The style flagged `w:default="1"` for character styles. */
   getDefaultCharacterStyle: () => document_d_exports.Style | undefined;

package/dist/style-sets/extract.js

@@ -1,10 +1,14 @@
+import { BUILT_IN_DEFAULT_PARAGRAPH_FORMATTING, BUILT_IN_DEFAULT_PARAGRAPH_STYLE_ID, BUILT_IN_DEFAULT_PARAGRAPH_STYLE_NAME, resolveDefaultParagraphStyle } from "../docx/defaultParagraphStyle.js";
+import { getCachedNumberingMap } from "../docx/numberingParser.js";
+import { isNumberingReference } from "../docx/numberingReference.js";
+import { normalizeStyleNumberingReferences } from "../docx/numberingReferenceNormalization.js";
 import { parseDocx } from "../docx/parser.js";
 import "./types.js";
 import { panic } from "better-result";
 //#region src/style-sets/extract.ts
 const inspectDocumentStyles = (document) => {
 	const styles = document.package.styles?.styles ?? [];
-	const defaultParagraphStyleId = styles.find((style) => style.type === "paragraph" && style.default)?.styleId;
+	const defaultParagraphStyleId = resolveDefaultParagraphStyle(styles)?.styleId;
 	return {
 		...defaultParagraphStyleId ? { defaultParagraphStyleId } : {},
 		styles: styles.map(toCatalogEntry)
@@ -24,15 +28,21 @@ const inspectDocumentStylesFromDocx = async (input) => inspectDocumentStyles(awa
 * are retained. No source content or package relationship can enter the result.
 */
 const extractDocumentStyleSet = (document, options) => {
+	if (options.styleIds?.length === 0) return panic("Cannot extract an empty style set");
 	const definitions = document.package.styles;
-	if (!definitions || definitions.styles.length === 0) return panic("Cannot extract a style set from a document without styles");
-	const stylesById = new Map(definitions.styles.map((style) => [style.styleId, style]));
+	const sourceStyles = definitions?.styles ?? [];
+	const stylesById = new Map(sourceStyles.map((style) => [style.styleId, style]));
 	const selectedStyleIds = options.styleIds === void 0 ? new Set(stylesById.keys()) : collectStyleDependencyClosure(stylesById, options.styleIds);
-	const styles = definitions.styles.filter((style) => selectedStyleIds.has(style.styleId));
-	if (styles.length === 0) return panic("Cannot extract an empty style set");
-	const defaultParagraphStyle = styles.find((style) => style.type === "paragraph" && style.default);
-	const initialParagraphStyleId = options.initialParagraphStyleId ?? defaultParagraphStyle?.styleId ?? "Normal";
-	if (!styles.find((style) => style.styleId === initialParagraphStyleId && style.type === "paragraph")) return panic(`Initial paragraph style "${initialParagraphStyleId}" is not present in the extracted set`);
+	const styles = structuredClone(sourceStyles.filter((style) => selectedStyleIds.has(style.styleId)));
+	normalizeStyleNumberingReferences({
+		styles,
+		numbering: document.package.numbering ? getCachedNumberingMap(document.package.numbering) : void 0
+	});
+	const initialParagraphStyleId = ensureInitialParagraphStyle({
+		styles,
+		requested: options.initialParagraphStyleId,
+		hasDocDefaults: definitions?.docDefaults !== void 0
+	});
 	const numbering = extractReferencedNumbering(styles, document);
 	const fontTable = sanitizeFontTable(document.package.fontTable);
 	return structuredClone({
@@ -40,8 +50,8 @@ const extractDocumentStyleSet = (document, options) => {
 		name: options.name,
 		initialParagraphStyleId,
 		styles: {
-			...definitions.docDefaults ? { docDefaults: definitions.docDefaults } : {},
-			...definitions.latentStyles ? { latentStyles: definitions.latentStyles } : {},
+			...definitions?.docDefaults ? { docDefaults: definitions.docDefaults } : {},
+			...definitions?.latentStyles ? { latentStyles: definitions.latentStyles } : {},
 			styles
 		},
 		...numbering ? { numbering } : {},
@@ -59,6 +69,42 @@ const extractDocumentStyleSetFromDocx = async (input, options) => {
 	});
 	return extractDocumentStyleSet(document, options);
 };
+const ensureInitialParagraphStyle = ({ styles, requested, hasDocDefaults }) => {
+	if (requested !== void 0) {
+		if (!styles.find((style) => style.styleId === requested && style.type === "paragraph")) return panic(`Initial paragraph style "${requested}" is not present in the extracted set`);
+		return requested;
+	}
+	const resolved = resolveDefaultParagraphStyle(styles);
+	if (resolved) return resolved.styleId;
+	const minted = mintDefaultParagraphStyle({
+		takenStyleIds: new Set(styles.map((style) => style.styleId)),
+		hasDocDefaults
+	});
+	styles.push(minted);
+	return minted.styleId;
+};
+/**
+* The default paragraph style a set needs when its source declared none.
+*
+* The id only has to be free, because the set is what defines it. The
+* formatting has to be the built-in template's whenever the source had no
+* `w:docDefaults`, because that is what the source itself rendered as: a
+* consumer applies its built-in Normal only where no default paragraph style
+* exists, and this minted style is one. Where the source did declare
+* `w:docDefaults`, the set carries them and they remain authoritative, so the
+* minted style states nothing.
+*/
+const mintDefaultParagraphStyle = ({ takenStyleIds, hasDocDefaults }) => {
+	let styleId = BUILT_IN_DEFAULT_PARAGRAPH_STYLE_ID;
+	for (let suffix = 1; takenStyleIds.has(styleId); suffix += 1) styleId = `${BUILT_IN_DEFAULT_PARAGRAPH_STYLE_ID}${suffix}`;
+	return {
+		styleId,
+		type: "paragraph",
+		name: BUILT_IN_DEFAULT_PARAGRAPH_STYLE_NAME,
+		default: true,
+		...hasDocDefaults ? {} : { pPr: { ...BUILT_IN_DEFAULT_PARAGRAPH_FORMATTING } }
+	};
+};
 const collectStyleDependencyClosure = (stylesById, requestedStyleIds) => {
 	const selected = /* @__PURE__ */ new Set();
 	const pending = [...requestedStyleIds];
@@ -82,7 +128,7 @@ const extractReferencedNumbering = (styles, document) => {
 	const referencedNumIds = /* @__PURE__ */ new Set();
 	for (const style of styles) {
 		const numId = style.pPr?.numPr?.numId;
-		if (numId !== void 0) referencedNumIds.add(numId);
+		if (isNumberingReference(numId)) referencedNumIds.add(numId);
 	}
 	if (referencedNumIds.size === 0) return;
 	const nums = source.nums.filter((numbering) => referencedNumIds.has(numbering.numId));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stll/folio-core",
-  "version": "0.41.0",
+  "version": "0.43.0",
   "description": "Headless, framework-neutral core of folio: the OOXML (.docx) parser, document model, ProseMirror integration, and page-layout engine. No React.",
   "keywords": [
     "document-model",
@@ -134,6 +134,7 @@
     "prosemirror-dropcursor": "^1.8.2",
     "prosemirror-gapcursor": "^1.4.1",
     "prosemirror-history": "^1.5.0",
+    "prosemirror-inputrules": "^1.5.0",
     "prosemirror-keymap": "^1.2.3",
     "prosemirror-model": "^1.25.9",
     "prosemirror-state": "^1.4.4",