@stll/folio-core 0.58.5 → 0.59.0

package/dist/docx/numberingParser.js

@@ -1,6 +1,6 @@
 import { DERIVED_PART_ROOT_ATTRIBUTES, attributeRemainder } from "./attributeRemainder.js";
 import { CAPTURE, dispatchChildrenWithContext, sequencePositions } from "./containerChildren.js";
-import { isNumberingReference } from "./numberingReference.js";
+import { isNumberingReference as isNumberingReference$1 } from "./numberingReference.js";
 import { formatOoxmlCounter, padDecimal } from "./ooxmlCounterFormatter.js";
 import { parseParagraphProperties } from "./paragraphProperties.js";
 import { LevelSuffixSchema, NumberFormatSchema, ParagraphAlignmentSchema, narrowEnum } from "./parserEnums.js";
@@ -459,7 +459,7 @@ function createNumberingMap(definitions) {
 */
 function computeListRendering(numPr, numbering) {
 	const { numId, ilvl = 0 } = numPr;
-	if (!isNumberingReference(numId)) return null;
+	if (!isNumberingReference$1(numId)) return null;
 	const level = numbering.getLevel(numId, ilvl);
 	if (!level) return null;
 	const levelNumFmts = [];

package/dist/docx/numberingReferenceNormalization.js

@@ -1,4 +1,4 @@
-import { NO_PARAGRAPH_NUMBERING as NO_PARAGRAPH_NUMBERING$1, paragraphNumberingReferenceId as paragraphNumberingReferenceId$1 } from "./numberingReference.js";
+import { NO_PARAGRAPH_NUMBERING as NO_PARAGRAPH_NUMBERING$1, paragraphNumberingReferenceId } from "./numberingReference.js";
 import { visitDocxParagraphs } from "./paragraphTraversal.js";
 import { PARSE_WARNING_CODES } from "@stll/docx-core/model";
 //#region src/docx/numberingReferenceNormalization.ts
@@ -40,7 +40,7 @@ const normalizeNumberingReferences = ({ documentBody, numbering, headers, footer
 		endnotes
 	}, (paragraph) => {
 		const formatting = paragraph.formatting;
-		const numId = paragraphNumberingReferenceId$1(formatting?.numPr);
+		const numId = paragraphNumberingReferenceId(formatting?.numPr);
 		if (!formatting || numId === void 0 || resolvesNumbering(numId, numbering)) return;
 		formatting.numPr = NO_PARAGRAPH_NUMBERING$1;
 		delete formatting.numPrFromStyle;
@@ -53,7 +53,7 @@ const normalizeStyleNumberingReferences = ({ styles, numbering }) => {
 	const unnumberedStyleIds = [];
 	for (const style of styles) {
 		const pPr = style.pPr;
-		const numId = paragraphNumberingReferenceId$1(pPr?.numPr);
+		const numId = paragraphNumberingReferenceId(pPr?.numPr);
 		if (!pPr || numId === void 0 || resolvesNumbering(numId, numbering)) continue;
 		pPr.numPr = NO_PARAGRAPH_NUMBERING$1;
 		unnumberedStyleIds.push(style.styleId);

package/dist/docx/paragraphParser.js

@@ -12,7 +12,7 @@ import { inlineWrapperOf } from "./inlineWrapperParser.js";
 import { preserveLinkedSdt } from "./linkedSdtPreservation.js";
 import { parseMarkupRangeMarker, parseMoveBookmarkMarker } from "./markupRangeMarker.js";
 import { counterFormatOf, markerAlignmentForLevel, markerFormattingFromLevel, numberingLevelHasMarkerSlot } from "./numberingParser.js";
-import { mergeParagraphNumbering as mergeParagraphNumbering$1, paragraphNumberingReferenceId as paragraphNumberingReferenceId$1, resolveParagraphNumbering as resolveParagraphNumbering$1 } from "./numberingReference.js";
+import { mergeParagraphNumbering as mergeParagraphNumbering$1, paragraphNumberingReferenceId, resolveParagraphNumbering as resolveParagraphNumbering$1 } from "./numberingReference.js";
 import { paraIdAttribute, textIdAttribute } from "./paraIdAttribute.js";
 import { paraIdInRange } from "./paraIdRangeNormalization.js";
 import { EMPTY_MARK_PROPERTIES_ATTRIBUTE, restoreEmptyMarkProperties } from "./paragraphMarkPropertyPresence.js";
@@ -1253,7 +1253,6 @@ function parseParagraph(node, styles, theme, numbering, rels = null, media = nul
 	let effectiveNumPr = directNumPr;
 	if (paragraphFormatting && numPrFromStyle) {
 		effectiveNumPr = mergeParagraphNumbering$1(styleNumPr, directNumPr);
-		if (effectiveNumPr !== void 0) paragraphFormatting.numPr = effectiveNumPr;
 		paragraphFormatting.numPrFromStyle = styleNumPr;
 	}
 	const resolvedNumbering = resolveParagraphNumbering$1(effectiveNumPr);
@@ -1444,7 +1443,7 @@ function isEmptyParagraph(paragraph) {
 * @returns true if paragraph has numbering properties
 */
 function isListItem(paragraph) {
-	return paragraphNumberingReferenceId$1(paragraph.formatting?.numPr) !== void 0;
+	return paragraphNumberingReferenceId(mergeParagraphNumbering$1(paragraph.formatting?.numPrFromStyle, paragraph.formatting?.numPr)) !== void 0;
 }
 /**
 * Get the list level of a paragraph (0-8)
@@ -1453,7 +1452,7 @@ function isListItem(paragraph) {
 * @returns List level or undefined if not a list item
 */
 function getListLevel(paragraph) {
-	const resolved = resolveParagraphNumbering$1(paragraph.formatting?.numPr);
+	const resolved = resolveParagraphNumbering$1(mergeParagraphNumbering$1(paragraph.formatting?.numPrFromStyle, paragraph.formatting?.numPr));
 	return resolved.kind === "reference" ? resolved.ilvl : void 0;
 }
 /**

package/dist/docx/rezip.js

@@ -16,7 +16,7 @@ import { assertValidFolioDocumentModel } from "./modelValidation.js";
 import { isNewDataUrlDrawing } from "./newImage.js";
 import { missingNoteReferenceStyles, noteReferenceNeeds } from "./noteReferenceStyles.js";
 import { parseNumbering } from "./numberingParser.js";
-import { paragraphNumberingReferenceId as paragraphNumberingReferenceId$1 } from "./numberingReference.js";
+import { paragraphNumberingReferenceId } from "./numberingReference.js";
 import { isUnsafePackagePath, reconcilePackageReferences, removeUnsafeEntries } from "./packageParts.js";
 import { normalizeParaIdRangeInXmlParts } from "./paraIdRangeNormalization.js";
 import { cloneDocumentWithParagraphPropertySources, cloneParagraphWithPropertySource, copyDocumentParagraphPropertySourceContract } from "./paragraphPropertySource.js";
@@ -2462,7 +2462,7 @@ const overrideXml = (partName, contentType) => `<Override PartName="${partName}"
 const assertStyleNumberingReferences = (doc) => {
 	const referenced = /* @__PURE__ */ new Set();
 	for (const style of doc.package.styles?.styles ?? []) {
-		const numId = paragraphNumberingReferenceId$1(style.pPr?.numPr);
+		const numId = paragraphNumberingReferenceId(style.pPr?.numPr);
 		if (numId !== void 0) referenced.add(numId);
 	}
 	if (referenced.size === 0) return;

package/dist/docx/server/materializeYjsDocx.js

@@ -1,6 +1,6 @@
 import { fromProseDoc } from "../../prosemirror/conversion/fromProseDoc.js";
 import { schema } from "../../prosemirror/schema/index.js";
-import { FolioYjsNoteReferenceSchemaError, applyAttrSchemaMigrations, readYjsAttrSchemaVersion, readYjsParagraphSourceContract, withParagraphSourceContract } from "../../prosemirror/yjsDocumentMetadata.js";
+import { FolioYjsNoteReferenceSchemaError, FolioYjsNumberingSourceSchemaError, applyAttrSchemaMigrations, readYjsAttrSchemaVersion, readYjsParagraphSourceContract, withParagraphSourceContract } from "../../prosemirror/yjsDocumentMetadata.js";
 import { ParagraphPropertySourceValidationError } from "../paragraphPropertySource.js";
 import { parseDocx } from "../parser.js";
 import { repackDocx } from "../rezip.js";
@@ -57,7 +57,7 @@ const readProseMirrorDocument = (yjsUpdate) => {
 		},
 		catch: (cause) => {
 			if (cause instanceof FolioYjsDocxMaterializationError) return cause;
-			if (cause instanceof FolioYjsNoteReferenceSchemaError) return new FolioYjsDocxMaterializationError({
+			if (cause instanceof FolioYjsNoteReferenceSchemaError || cause instanceof FolioYjsNumberingSourceSchemaError) return new FolioYjsDocxMaterializationError({
 				code: "stale_attr_schema",
 				message: cause.message,
 				cause

package/dist/docx/server/migrateYjsAttrSchema.js

@@ -1,4 +1,4 @@
-import { FolioYjsNoteReferenceSchemaError, applyAttrSchemaMigrations, readYjsAttrSchemaVersion } from "../../prosemirror/yjsDocumentMetadata.js";
+import { FolioYjsNoteReferenceSchemaError, FolioYjsNumberingSourceSchemaError, applyAttrSchemaMigrations, readYjsAttrSchemaVersion } from "../../prosemirror/yjsDocumentMetadata.js";
 import { FOLIO_YJS_PROSEMIRROR_FRAGMENT_NAME } from "./materializeYjsDocx.js";
 import { Result, TaggedError } from "better-result";
 import * as Y from "yjs";
@@ -77,19 +77,19 @@ const migrateFolioYjsSnapshot = (update) => {
 		catch: (cause) => new FolioYjsSnapshotMigrationError({
 			cause,
 			code: "unsupported_version",
-			message: cause instanceof FolioYjsNoteReferenceSchemaError ? cause.message : "Cannot migrate the collaboration attribute schema."
+			message: cause instanceof FolioYjsNoteReferenceSchemaError || cause instanceof FolioYjsNumberingSourceSchemaError ? cause.message : "Cannot migrate the collaboration attribute schema."
 		})
 	});
 	if (migratedAttrs.isErr()) {
 		ydoc.destroy();
 		return Result.err(migratedAttrs.error);
 	}
-	if (fromVersion === 12) {
+	if (fromVersion === 13) {
 		ydoc.destroy();
 		return Result.ok({
 			fromVersion,
 			paragraphsRewritten: 0,
-			toVersion: 12,
+			toVersion: 13,
 			update
 		});
 	}
@@ -99,7 +99,7 @@ const migrateFolioYjsSnapshot = (update) => {
 	return Result.ok({
 		fromVersion,
 		paragraphsRewritten,
-		toVersion: 12,
+		toVersion: 13,
 		update: migrated
 	});
 };

package/dist/generated/text_shaper.js

@@ -81,7 +81,7 @@ export function shapeRun(font, face_index, text, right_to_left, script, language
 function __wbg_get_imports() {
     const import0 = {
         __proto__: null,
-        __wbg___wbindgen_string_get_b0ca35b86a603356: function(arg0, arg1) {
+        __wbg___wbindgen_string_get_0380ccaa2f57f0d9: function(arg0, arg1) {
             const obj = getObject(arg1);
             const ret = typeof(obj) === 'string' ? obj : undefined;
             var ptr1 = isLikeNone(ret) ? 0 : passStringToWasm0(ret, wasm.__wbindgen_export, wasm.__wbindgen_export2);
@@ -89,10 +89,10 @@ function __wbg_get_imports() {
             getDataViewMemory0().setInt32(arg0 + 4 * 1, len1, true);
             getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true);
         },
-        __wbg___wbindgen_throw_344f42d3211c4765: function(arg0, arg1) {
+        __wbg___wbindgen_throw_41e9ee4f547fc59a: function(arg0, arg1) {
             throw new Error(getStringFromWasm0(arg0, arg1));
         },
-        __wbindgen_cast_0000000000000001: function(arg0, arg1) {
+        __wbindgen_generic_0000000000000001: function(arg0, arg1) {
             // Cast intrinsic for `Ref(String) -> Externref`.
             const ret = getStringFromWasm0(arg0, arg1);
             return addHeapObject(ret);
@@ -268,11 +268,15 @@ function __wbg_finalize_init(instance, module) {
 
 async function __wbg_load(module, imports) {
     if (typeof Response === 'function' && module instanceof Response) {
+        if (!module.ok) {
+            throw new Error(`failed to fetch Wasm: ${module.status} ${module.statusText} fetching '${module.url}'`);
+        }
+
         if (typeof WebAssembly.instantiateStreaming === 'function') {
             try {
                 return await WebAssembly.instantiateStreaming(module, imports);
             } catch (e) {
-                const validResponse = module.ok && expectedResponseType(module.type);
+                const validResponse = expectedResponseType(module.type);
 
                 if (validResponse && module.headers.get('Content-Type') !== 'application/wasm') {
                     console.warn("`WebAssembly.instantiateStreaming` failed because your server does not serve Wasm with `application/wasm` MIME type. Falling back to `WebAssembly.instantiate` which is slower. Original error:\n", e);

package/dist/index.d.ts

@@ -1,8 +1,8 @@
 import { document_d_exports } from "./types/document.js";
-import { FolioContentBlock, FolioContentContainerPathEntry, FolioContentFormatRange, FolioContentIdStability, FolioContentInlineBooleanProperty, FolioContentInlineComparisonResult, FolioContentInlineFormatting, FolioContentInlineFormattingPatch, FolioContentLineSpacingRule, FolioContentParagraphAlignment, FolioContentParagraphKind, FolioContentParagraphSpacing, FolioContentRun, FolioContentSnapshot, FolioContentTableLocation } from "./compare/content-types.js";
-import { FolioAIBlock, FolioAIBlockAnchor, FolioAIBlockKind, FolioAIBlockPreviewRun, FolioAIBlockStructuralBoundary, FolioAIBlockTableLocation, FolioAIComment, FolioAIEditAppliedOperation, FolioAIEditApplyMode, FolioAIEditApplyResult, FolioAIEditNormalization, FolioAIEditNormalizationCode, FolioAIEditOperation, FolioAIEditPrecondition, FolioAIEditReviewMeta, FolioAIEditSeverity, FolioAIEditSkipReason, FolioAIEditSkippedOperation, FolioAIEditSnapshot, FolioAIInlineBooleanProperty, FolioAIInlineFormatting, FolioAIInlineFormattingPatch, FolioAIParagraphSpacing, FolioAISignatureParty } from "./ai-edits/types.js";
+import { FolioContentBlock, FolioContentContainerPathEntry, FolioContentFormatRange, FolioContentIdStability, FolioContentInlineBooleanProperty, FolioContentInlineComparisonResult, FolioContentInlineFormatting, FolioContentInlineFormattingPatch, FolioContentLineSpacingRule, FolioContentParagraphAlignment, FolioContentParagraphKind, FolioContentParagraphSpacing, FolioContentRun, FolioContentSnapshot, FolioContentStatedNumbering, FolioContentTableLocation } from "./compare/content-types.js";
+import { FolioAIBlock, FolioAIBlockAnchor, FolioAIBlockKind, FolioAIBlockPreviewRun, FolioAIBlockStructuralBoundary, FolioAIBlockTableLocation, FolioAIComment, FolioAIDiagnosticBlock, FolioAIEditAppliedOperation, FolioAIEditApplyMode, FolioAIEditApplyResult, FolioAIEditNormalization, FolioAIEditNormalizationCode, FolioAIEditOperation, FolioAIEditPrecondition, FolioAIEditReviewMeta, FolioAIEditSeverity, FolioAIEditSkipReason, FolioAIEditSkippedOperation, FolioAIEditSnapshot, FolioAIInlineBooleanProperty, FolioAIInlineFormatting, FolioAIInlineFormattingPatch, FolioAIParagraphBlock, FolioAIParagraphSpacing, FolioAISignatureParty } from "./ai-edits/types.js";
 import { WORD_DIFF_GRANULARITIES, WordDiffGranularity, WordDiffNormalization, WordDiffOptions, WordDiffSegment, diffWordSegments } from "./ai-edits/word-diff.js";
-import { FolioAIEditApplyOutcome, FolioRevisionStamp, FolioWordDiffOptions, applyFolioAIEditOperations } from "./ai-edits/apply.js";
+import { FolioAIEditApplyOutcome, FolioRevisionStamp, FolioUndefinedReferencePolicy, FolioWordDiffOptions, applyFolioAIEditOperations } from "./ai-edits/apply.js";
 import { ApplyFolioDocumentOperationsOptions, FOLIO_DOCUMENT_OPERATION_BATCH_MODES, FOLIO_DOCUMENT_OPERATION_CONTRACT_VERSION, FOLIO_DOCUMENT_OPERATION_MODES, FOLIO_DOCUMENT_OPERATION_MODES_BY_TYPE, FOLIO_DOCUMENT_OPERATION_PRECONDITIONS, FOLIO_DOCUMENT_OPERATION_STORIES, FOLIO_DOCUMENT_OPERATION_TYPES, FOLIO_LINE_SPACING_RULE_VALUES, FOLIO_PARAGRAPH_ALIGNMENT_VALUES, FolioDocumentOperation, FolioDocumentOperationAffectedTarget, FolioDocumentOperationBatch, FolioDocumentOperationCapabilities, FolioDocumentOperationIssue, FolioDocumentOperationMode, FolioDocumentOperationPrecondition, FolioDocumentOperationReceipt, FolioDocumentOperationRecovery, FolioDocumentOperationResult, FolioDocumentOperationResultBase, FolioDocumentOperationStatus, FolioDocumentOperationStory, FolioDocumentOperationType, FolioDocumentOperationUndoFailureReason, FolioDocumentOperationUndoHandle, FolioDocumentOperationUndoResult, InvalidFolioDocumentOperationBatchError, UnsupportedFolioDocumentOperationVersionError, applyFolioDocumentOperations, assertSupportedFolioDocumentOperationVersion, getFolioDocumentOperationCapabilities, getFolioDocumentOperationIssues, getFolioDocumentOperationReceipts, isFolioDocumentOperationModeSupported, isSupportedFolioDocumentOperationVersion, parseFolioDocumentOperationBatch } from "./document-operations.js";
 import { createFolioAIEditSnapshot, hashFolioAIBlockText, isFolioAIContentBlock, normalizeFolioAIBlockText } from "./ai-edits/snapshot.js";
 import { DeriveBlockIdInput, FolioBlockId, currentFolioBlockId, deriveBlockId, getFolioParaIdFromBlockId, isFolioBlockId, isSequentialFolioBlockId } from "./types/block-id.js";
@@ -43,4 +43,4 @@ import { FOLIO_YJS_ATTR_SCHEMA_VERSION, FolioYjsAttrSchemaVersion, FolioYjsAttrS
 import { DOCX_CONFORMANCE_CLASSES } from "@stll/docx-core/model";
 type Document = document_d_exports.Document;
 type DocxConformanceClass = document_d_exports.DocxConformanceClass;
-export { type AIBarStatus, type AIChatMode, type AICitation, type AICitationRange, type AICitationSource, type AIGenerateInput, type AISuggestion, type AISuggestionApplyMode, type AISuggestionPreset, type AISuggestionSeverity, type AISuggestionStatus, type AcceptAutocompleteResult, type AnonymizationMatch, type AnonymizationTerm, type ApplyFolioDocumentOperationsOptions, type ApplyResult, type AutocompleteSuggestionPluginOptions, type AutocompleteSuggestionState, type AutocompleteSuggestionStatus, type AutocompleteTriggerCheck, type AutocompleteTriggerOptions, type AutocompleteTriggerSkipReason, type BlockRect, COMPARE_REVISION_FORMATS, COMPARE_UNSUPPORTED_REASONS, COMPARE_VERIFICATION_CAUSES, COMPARE_VERIFICATION_INVARIANTS, type CompareChange, type CompareChangeLocation, type CompareCompatibility, type CompareContentOptions, CompareDocxApplyError, type CompareDocxError, CompareDocxFinalParagraphMarkError, CompareDocxOperationLimitError, type CompareDocxOptions, CompareDocxParseError, CompareDocxRoundTripError, CompareDocxSerializeError, type CompareFolioRequirement, type CompareResult, type CompareRevisionFormat, type CompareUnsupportedPart, type CompareUnsupportedReason, type CompareVerification, type CompareVerificationCause, type CompareVerificationFailure, type CompareVerificationInvariant, type CreateEmptyDocumentOptions, DEFAULT_AI_SUGGESTION_PRESETS, DEFAULT_AUTOCOMPLETE_DEAD_ZONE_NODES, DEFAULT_OUTLINE_DEPTH, DOCUMENT_PRESET_VERSION, DOCUMENT_STYLE_SET_VERSION, DOCX_CONFORMANCE_CLASSES, DRAWING_SAFETY_CLASSES, type DeriveBlockIdInput, type DirectiveKind, type DirectiveRange, type Document, type DocumentPreset, type DocumentPropertiesOptions, type DocumentStyleCatalog, type DocumentStyleCatalogEntry, type DocumentStyleSet, type DocxCompatibility, type DocxCompatibilityContext, type DocxCompatibilityIssue, type DocxCompatibilityLocation, type DocxCompatibilityPart, type DocxConformanceClass, type DocxDrawingClassification, type DrawingSafetyClass, type EmbeddedFont, type EmbeddedFontParts, type ExtractDocumentStyleSetOptions, FOLIO_CONTENT_COMPARISON_LIMITS, FOLIO_DOCUMENT_OPERATION_BATCH_MODES, FOLIO_DOCUMENT_OPERATION_CONTRACT_VERSION, FOLIO_DOCUMENT_OPERATION_MODES, FOLIO_DOCUMENT_OPERATION_MODES_BY_TYPE, FOLIO_DOCUMENT_OPERATION_PRECONDITIONS, FOLIO_DOCUMENT_OPERATION_STORIES, FOLIO_DOCUMENT_OPERATION_TYPES, FOLIO_LINE_SPACING_RULE_VALUES, FOLIO_PARAGRAPH_ALIGNMENT_VALUES, FOLIO_YJS_ATTR_SCHEMA_VERSION, type FinalParagraphMarkRevision, type FolioAIBlock, type FolioAIBlockAnchor, type FolioAIBlockKind, type FolioAIBlockPreviewRun, type FolioAIBlockStructuralBoundary, type FolioAIBlockTableLocation, type FolioAIComment, type FolioAIEditAppliedOperation, type FolioAIEditApplyMode, type FolioAIEditApplyOutcome, type FolioAIEditApplyResult, type FolioAIEditNormalization, type FolioAIEditNormalizationCode, type FolioAIEditOperation, type FolioAIEditPrecondition, type FolioAIEditReviewMeta, type FolioAIEditSeverity, type FolioAIEditSkipReason, type FolioAIEditSkippedOperation, type FolioAIEditSnapshot, type FolioAIInlineBooleanProperty, type FolioAIInlineFormatting, type FolioAIInlineFormattingPatch, type FolioAIParagraphSpacing, type FolioAISignatureParty, type FolioBlockId, type FolioContentBlock, type FolioContentBlockProperty, type FolioContentComparison, type FolioContentComparisonError, type FolioContentComparisonEvent, type FolioContentComparisonLimit, FolioContentComparisonLimitError, type FolioContentContainerPathEntry, type FolioContentFormatRange, type FolioContentFormattingChange, type FolioContentIdStability, type FolioContentInlineBooleanProperty, type FolioContentInlineComparisonResult, type FolioContentInlineFormatting, type FolioContentInlineFormattingPatch, FolioContentInlinePresentationProjectionError, type FolioContentLineSpacingRule, type FolioContentParagraphAlignment, type FolioContentParagraphFormattingPatch, type FolioContentParagraphKind, type FolioContentParagraphSpacing, type FolioContentRun, type FolioContentSnapshot, type FolioContentStructuralChange, type FolioContentTableLocation, type FolioContentTextSegment, type FolioDocumentOperation, type FolioDocumentOperationAffectedTarget, type FolioDocumentOperationBatch, type FolioDocumentOperationCapabilities, type FolioDocumentOperationIssue, type FolioDocumentOperationMode, type FolioDocumentOperationPrecondition, type FolioDocumentOperationReceipt, type FolioDocumentOperationRecovery, type FolioDocumentOperationResult, type FolioDocumentOperationResultBase, type FolioDocumentOperationStatus, type FolioDocumentOperationStory, type FolioDocumentOperationType, type FolioDocumentOperationUndoFailureReason, type FolioDocumentOperationUndoHandle, type FolioDocumentOperationUndoResult, type FolioDocxCompatibilityHost, type FolioDocxCompatibilityProfile, type FolioRevisionStamp, type FolioWordDiffOptions, type FolioYjsAttrSchemaVersion, FolioYjsAttrSchemaVersionError, type ImageMeta, type ImageRef, type InspectDocxCompatibilityOptions, InvalidCompareDocxOptionsError, InvalidFolioContentComparisonError, InvalidFolioDocumentOperationBatchError, MAX_COMPARE_OPERATIONS, type MarkdownOptions, type MarkdownResult, type OutlineDepth, type PositionalText, type ResolvedAnchor, STELLA_STYLE_SET_NAME, type TemplatePreviewHiddenRange, type TemplatePreviewSpan, type TemplatePreviewValue, type TemplatePreviewValues, type TemplateSlashMenuKeyAction, type TemplateSlashMenuState, UnsupportedFolioDocumentOperationVersionError, WORD_DIFF_GRANULARITIES, type WordDiffGranularity, type WordDiffNormalization, type WordDiffOptions, type WordDiffSegment, acceptAutocompleteSuggestion, acceptAutocompleteWord, anonymizationDecorationsKey, appendAutocompleteToken, applyFolioAIEditOperations, applyFolioDocumentOperations, applySuggestions, assertSupportedFolioDocumentOperationVersion, autocompleteSuggestionKey, autocompleteSuggestionPlugin, buildEmbeddedFontFamilyMap, buildPositionalText, clearAutocompleteSuggestion, clearTemplateSlashMenu, compareContent, compareDocx, consumeTemplateSlashQuery, createAICitationDecorationsPlugin, createDocx, createEmptyDocument, createFolioAIEditSnapshot, createStellaStyleDocumentPreset, createStellaStyleSet, currentFolioBlockId, deriveBlockId, diffWordSegments, extractDocumentStyleSet, extractDocumentStyleSetFromDocx, extractEmbeddedFonts, filterHeadingsByDepth, finishAutocompleteSuggestion, fromMarkdown, getAnonymizationMatches, getAutocompleteSuggestion, getEmbeddedFontFaces, getFolioCaretViewportRect, getFolioDocumentOperationCapabilities, getFolioDocumentOperationIssues, getFolioDocumentOperationReceipts, getFolioParaIdFromBlockId, getFolioSelectionViewportRect, getGoogleFontsEnabled, getTemplateDirectives, getTemplateSlashMenu, hashFolioAIBlockText, inspectDocumentStyles, inspectDocumentStylesFromDocx, inspectDocxCompatibility, isFolioAIContentBlock, isFolioBlockId, isFolioDocumentOperationModeSupported, isSequentialFolioBlockId, isSuggestionStale, isSupportedFolioDocumentOperationVersion, mergeDocumentContent, normalizeFolioAIBlockText, parseFolioDocumentOperationBatch, resetTemplateSlashQuery, resolveSuggestionAnchor, scanDirectives, scopeEmbeddedFontFamily, scrollFolioPositionIntoView, setAICitationsMeta, setAISuggestionsMeta, setActiveCitationMeta, setAnonymizationTermsMeta, setEmbeddedFontFamilyMap, setFocusedSuggestionMeta, setGoogleFontsEnabled, setTemplatePreviewValues, shouldTriggerAutocomplete, startAutocompleteSuggestion, templateSlashMenuKey, toMarkdown, toMarkdownResult };
+export { type AIBarStatus, type AIChatMode, type AICitation, type AICitationRange, type AICitationSource, type AIGenerateInput, type AISuggestion, type AISuggestionApplyMode, type AISuggestionPreset, type AISuggestionSeverity, type AISuggestionStatus, type AcceptAutocompleteResult, type AnonymizationMatch, type AnonymizationTerm, type ApplyFolioDocumentOperationsOptions, type ApplyResult, type AutocompleteSuggestionPluginOptions, type AutocompleteSuggestionState, type AutocompleteSuggestionStatus, type AutocompleteTriggerCheck, type AutocompleteTriggerOptions, type AutocompleteTriggerSkipReason, type BlockRect, COMPARE_REVISION_FORMATS, COMPARE_UNSUPPORTED_REASONS, COMPARE_VERIFICATION_CAUSES, COMPARE_VERIFICATION_INVARIANTS, type CompareChange, type CompareChangeLocation, type CompareCompatibility, type CompareContentOptions, CompareDocxApplyError, type CompareDocxError, CompareDocxFinalParagraphMarkError, CompareDocxOperationLimitError, type CompareDocxOptions, CompareDocxParseError, CompareDocxRoundTripError, CompareDocxSerializeError, type CompareFolioRequirement, type CompareResult, type CompareRevisionFormat, type CompareUnsupportedPart, type CompareUnsupportedReason, type CompareVerification, type CompareVerificationCause, type CompareVerificationFailure, type CompareVerificationInvariant, type CreateEmptyDocumentOptions, DEFAULT_AI_SUGGESTION_PRESETS, DEFAULT_AUTOCOMPLETE_DEAD_ZONE_NODES, DEFAULT_OUTLINE_DEPTH, DOCUMENT_PRESET_VERSION, DOCUMENT_STYLE_SET_VERSION, DOCX_CONFORMANCE_CLASSES, DRAWING_SAFETY_CLASSES, type DeriveBlockIdInput, type DirectiveKind, type DirectiveRange, type Document, type DocumentPreset, type DocumentPropertiesOptions, type DocumentStyleCatalog, type DocumentStyleCatalogEntry, type DocumentStyleSet, type DocxCompatibility, type DocxCompatibilityContext, type DocxCompatibilityIssue, type DocxCompatibilityLocation, type DocxCompatibilityPart, type DocxConformanceClass, type DocxDrawingClassification, type DrawingSafetyClass, type EmbeddedFont, type EmbeddedFontParts, type ExtractDocumentStyleSetOptions, FOLIO_CONTENT_COMPARISON_LIMITS, FOLIO_DOCUMENT_OPERATION_BATCH_MODES, FOLIO_DOCUMENT_OPERATION_CONTRACT_VERSION, FOLIO_DOCUMENT_OPERATION_MODES, FOLIO_DOCUMENT_OPERATION_MODES_BY_TYPE, FOLIO_DOCUMENT_OPERATION_PRECONDITIONS, FOLIO_DOCUMENT_OPERATION_STORIES, FOLIO_DOCUMENT_OPERATION_TYPES, FOLIO_LINE_SPACING_RULE_VALUES, FOLIO_PARAGRAPH_ALIGNMENT_VALUES, FOLIO_YJS_ATTR_SCHEMA_VERSION, type FinalParagraphMarkRevision, type FolioAIBlock, type FolioAIBlockAnchor, type FolioAIBlockKind, type FolioAIBlockPreviewRun, type FolioAIBlockStructuralBoundary, type FolioAIBlockTableLocation, type FolioAIComment, type FolioAIDiagnosticBlock, type FolioAIEditAppliedOperation, type FolioAIEditApplyMode, type FolioAIEditApplyOutcome, type FolioAIEditApplyResult, type FolioAIEditNormalization, type FolioAIEditNormalizationCode, type FolioAIEditOperation, type FolioAIEditPrecondition, type FolioAIEditReviewMeta, type FolioAIEditSeverity, type FolioAIEditSkipReason, type FolioAIEditSkippedOperation, type FolioAIEditSnapshot, type FolioAIInlineBooleanProperty, type FolioAIInlineFormatting, type FolioAIInlineFormattingPatch, type FolioAIParagraphBlock, type FolioAIParagraphSpacing, type FolioAISignatureParty, type FolioBlockId, type FolioContentBlock, type FolioContentBlockProperty, type FolioContentComparison, type FolioContentComparisonError, type FolioContentComparisonEvent, type FolioContentComparisonLimit, FolioContentComparisonLimitError, type FolioContentContainerPathEntry, type FolioContentFormatRange, type FolioContentFormattingChange, type FolioContentIdStability, type FolioContentInlineBooleanProperty, type FolioContentInlineComparisonResult, type FolioContentInlineFormatting, type FolioContentInlineFormattingPatch, FolioContentInlinePresentationProjectionError, type FolioContentLineSpacingRule, type FolioContentParagraphAlignment, type FolioContentParagraphFormattingPatch, type FolioContentParagraphKind, type FolioContentParagraphSpacing, type FolioContentRun, type FolioContentSnapshot, type FolioContentStatedNumbering, type FolioContentStructuralChange, type FolioContentTableLocation, type FolioContentTextSegment, type FolioDocumentOperation, type FolioDocumentOperationAffectedTarget, type FolioDocumentOperationBatch, type FolioDocumentOperationCapabilities, type FolioDocumentOperationIssue, type FolioDocumentOperationMode, type FolioDocumentOperationPrecondition, type FolioDocumentOperationReceipt, type FolioDocumentOperationRecovery, type FolioDocumentOperationResult, type FolioDocumentOperationResultBase, type FolioDocumentOperationStatus, type FolioDocumentOperationStory, type FolioDocumentOperationType, type FolioDocumentOperationUndoFailureReason, type FolioDocumentOperationUndoHandle, type FolioDocumentOperationUndoResult, type FolioDocxCompatibilityHost, type FolioDocxCompatibilityProfile, type FolioRevisionStamp, type FolioUndefinedReferencePolicy, type FolioWordDiffOptions, type FolioYjsAttrSchemaVersion, FolioYjsAttrSchemaVersionError, type ImageMeta, type ImageRef, type InspectDocxCompatibilityOptions, InvalidCompareDocxOptionsError, InvalidFolioContentComparisonError, InvalidFolioDocumentOperationBatchError, MAX_COMPARE_OPERATIONS, type MarkdownOptions, type MarkdownResult, type OutlineDepth, type PositionalText, type ResolvedAnchor, STELLA_STYLE_SET_NAME, type TemplatePreviewHiddenRange, type TemplatePreviewSpan, type TemplatePreviewValue, type TemplatePreviewValues, type TemplateSlashMenuKeyAction, type TemplateSlashMenuState, UnsupportedFolioDocumentOperationVersionError, WORD_DIFF_GRANULARITIES, type WordDiffGranularity, type WordDiffNormalization, type WordDiffOptions, type WordDiffSegment, acceptAutocompleteSuggestion, acceptAutocompleteWord, anonymizationDecorationsKey, appendAutocompleteToken, applyFolioAIEditOperations, applyFolioDocumentOperations, applySuggestions, assertSupportedFolioDocumentOperationVersion, autocompleteSuggestionKey, autocompleteSuggestionPlugin, buildEmbeddedFontFamilyMap, buildPositionalText, clearAutocompleteSuggestion, clearTemplateSlashMenu, compareContent, compareDocx, consumeTemplateSlashQuery, createAICitationDecorationsPlugin, createDocx, createEmptyDocument, createFolioAIEditSnapshot, createStellaStyleDocumentPreset, createStellaStyleSet, currentFolioBlockId, deriveBlockId, diffWordSegments, extractDocumentStyleSet, extractDocumentStyleSetFromDocx, extractEmbeddedFonts, filterHeadingsByDepth, finishAutocompleteSuggestion, fromMarkdown, getAnonymizationMatches, getAutocompleteSuggestion, getEmbeddedFontFaces, getFolioCaretViewportRect, getFolioDocumentOperationCapabilities, getFolioDocumentOperationIssues, getFolioDocumentOperationReceipts, getFolioParaIdFromBlockId, getFolioSelectionViewportRect, getGoogleFontsEnabled, getTemplateDirectives, getTemplateSlashMenu, hashFolioAIBlockText, inspectDocumentStyles, inspectDocumentStylesFromDocx, inspectDocxCompatibility, isFolioAIContentBlock, isFolioBlockId, isFolioDocumentOperationModeSupported, isSequentialFolioBlockId, isSuggestionStale, isSupportedFolioDocumentOperationVersion, mergeDocumentContent, normalizeFolioAIBlockText, parseFolioDocumentOperationBatch, resetTemplateSlashQuery, resolveSuggestionAnchor, scanDirectives, scopeEmbeddedFontFamily, scrollFolioPositionIntoView, setAICitationsMeta, setAISuggestionsMeta, setActiveCitationMeta, setAnonymizationTermsMeta, setEmbeddedFontFamilyMap, setFocusedSuggestionMeta, setGoogleFontsEnabled, setTemplatePreviewValues, shouldTriggerAutocomplete, startAutocompleteSuggestion, templateSlashMenuKey, toMarkdown, toMarkdownResult };

package/dist/internal/paragraphFormattingSerialization.d.ts

@@ -3,14 +3,7 @@ import { ParagraphNumberingOverride } from "@stll/docx-core/model";
 //#region src/internal/paragraphFormattingSerialization.d.ts
 type ClassifiedParagraphFormattingField = "alignment" | "bidi" | "kinsoku" | "overflowPunctuation" | "spaceBefore" | "spaceAfter" | "lineSpacing" | "lineSpacingRule" | "snapToGrid" | "beforeAutospacing" | "afterAutospacing" | "spacingExplicit" | "spacingPreservedAttributes" | "indentLeft" | "indentRight" | "indentFirstLine" | "hangingIndent" | "indentPreservedAttributes" | "borders" | "shading" | "tabs" | "keepNext" | "keepLines" | "widowControl" | "pageBreakBefore" | "contextualSpacing" | "numPr" | "numPrFromStyle" | "numberingChangeXml" | "numberingInsertionXml" | "outlineLevel" | "styleId" | "frame" | "suppressLineNumbers" | "suppressAutoHyphens" | "runProperties" | "runInWithNext" | "preserved";
 type ExhaustiveParagraphFormatting = document_d_exports.ExhaustiveFields<document_d_exports.ParagraphFormatting, ClassifiedParagraphFormattingField>;
-/**
- * Whether resolved numbering still belongs to the paragraph's style tier.
- *
- * Effective equality, not stated: the resolved field carries the level the
- * cascade supplied even where the style stated none, and a paragraph whose
- * numbering came wholly from its style must still not emit a direct
- * `<w:numPr>`.
- */
+/** Only an absent paragraph override leaves numbering wholly to its style. */
 declare const isStyleSourcedParagraphNumbering: (numPr: ParagraphNumberingOverride | null | undefined, numPrFromStyle: ParagraphNumberingOverride | null | undefined) => boolean;
 /** Exact fallback-emission instructions for the modeled part of `w:pPr`. */
 type ModeledParagraphFormattingEmission = Readonly<{

package/dist/internal/paragraphFormattingSerialization.js

@@ -6,18 +6,11 @@ import { TRANSITIONAL_NAME_BY_STRICT_NAME } from "../docx/strictNames.gen.js";
 import { createCapturedXmlSanitizer } from "../docx/verbatimCapture.js";
 import { NAMESPACES, OOXML_NAMESPACE_SCOPE } from "../docx/xmlParser.js";
 import { escapeXmlAttribute, serializeOnOffElement } from "@stll/docx-core";
-import { mergeParagraphNumbering, outlineLevelStatedValue, paragraphNumberingLevel, paragraphNumberingSlots, sameEffectiveParagraphNumbering } from "@stll/docx-core/model";
+import { outlineLevelStatedValue, paragraphNumberingSlots } from "@stll/docx-core/model";
 import { serializeSequenceChildren } from "@stll/docx-core/schema";
 //#region src/internal/paragraphFormattingSerialization.ts
-/**
-* Whether resolved numbering still belongs to the paragraph's style tier.
-*
-* Effective equality, not stated: the resolved field carries the level the
-* cascade supplied even where the style stated none, and a paragraph whose
-* numbering came wholly from its style must still not emit a direct
-* `<w:numPr>`.
-*/
-const isStyleSourcedParagraphNumbering = (numPr, numPrFromStyle) => numPr != null && numPrFromStyle != null && sameEffectiveParagraphNumbering(numPr, numPrFromStyle);
+/** Only an absent paragraph override leaves numbering wholly to its style. */
+const isStyleSourcedParagraphNumbering = (numPr, numPrFromStyle) => numPr == null && numPrFromStyle != null;
 const serializeParagraphBorders = (borders) => {
 	if (!borders) return "";
 	const { top, left, bottom, right, between, bar } = borders;
@@ -150,7 +143,7 @@ const paragraphMarkPropertiesInner = (runProperties, runInWithNext) => {
 */
 const modelParagraphFormattingEmission = (input) => {
 	if (!input) return {};
-	const { alignment, bidi, kinsoku, overflowPunctuation, spaceBefore, spaceAfter, lineSpacing, lineSpacingRule, snapToGrid, beforeAutospacing, afterAutospacing, spacingExplicit, spacingPreservedAttributes, indentLeft, indentRight, indentFirstLine, hangingIndent, indentPreservedAttributes, borders, shading, tabs, keepNext, keepLines, widowControl, pageBreakBefore, contextualSpacing, numPr, numPrFromStyle, numberingChangeXml, numberingInsertionXml, outlineLevel, styleId, frame, suppressLineNumbers, suppressAutoHyphens, runProperties, runInWithNext, preserved } = input;
+	const { alignment, bidi, kinsoku, overflowPunctuation, spaceBefore, spaceAfter, lineSpacing, lineSpacingRule, snapToGrid, beforeAutospacing, afterAutospacing, spacingExplicit, spacingPreservedAttributes, indentLeft, indentRight, indentFirstLine, hangingIndent, indentPreservedAttributes, borders, shading, tabs, keepNext, keepLines, widowControl, pageBreakBefore, contextualSpacing, numPr, numberingChangeXml, numberingInsertionXml, outlineLevel, styleId, frame, suppressLineNumbers, suppressAutoHyphens, runProperties, runInWithNext, preserved } = input;
 	modelSpacingProvenance(spacingExplicit);
 	const propertiesXml = serializeSequenceChildren({
 		container: "paragraph-properties",
@@ -162,15 +155,8 @@ const modelParagraphFormattingEmission = (input) => {
 			["pageBreakBefore", serializeOnOffElement(pageBreakBefore, "pageBreakBefore")],
 			["framePr", serializeFrameProperties(frame)],
 			["widowControl", serializeOnOffElement(widowControl, "widowControl")],
-			["numPr", isStyleSourcedParagraphNumbering(numPr, numPrFromStyle) ? serializeNumbering({
-				numPr: void 0,
-				numberingChangeXml,
-				numberingInsertionXml
-			}) : serializeNumbering({
-				numPr: numPr?.kind === "reference" && numPrFromStyle?.kind === "reference" && numPr.numId === numPrFromStyle.numId ? {
-					kind: "levelOnly",
-					ilvl: paragraphNumberingLevel(mergeParagraphNumbering(numPrFromStyle, numPr)) ?? 0
-				} : numPr,
+			["numPr", serializeNumbering({
+				numPr,
 				numberingChangeXml,
 				numberingInsertionXml
 			})],

package/dist/layout-bridge/convert/flowConversionShared.d.ts

@@ -1,8 +1,8 @@
 import { document_d_exports } from "../../types/document.js";
 import { RunStyleResolver } from "../../prosemirror/runStyleFormatting.js";
+import { ListCounterStreams } from "../../prosemirror/listMarker.js";
 import { ParagraphAttrs, ParagraphBlock, TableBlock } from "../../layout-engine/types.js";
 import { FontAlternates } from "../../fonts/fontAlternates.js";
-import { ListCounterStreams } from "../../prosemirror/listMarker.js";
 import { Node } from "prosemirror-model";
 //#region src/layout-bridge/convert/flowConversionShared.d.ts
 /**

package/dist/layout-bridge/convert/listMarkers.d.ts

@@ -2,7 +2,6 @@ import { document_d_exports } from "../../types/document.js";
 import { ParagraphAttrs, ParagraphPropertyChangeAttrs } from "../../prosemirror/schema/nodes.js";
 import { ParagraphAttrs as ParagraphAttrs$1 } from "../../layout-engine/types.js";
 import { FontAlternates } from "../../fonts/fontAlternates.js";
-import { ListCounterState } from "../../prosemirror/listMarker.js";
 //#region src/layout-bridge/convert/listMarkers.d.ts
 declare function applyMarkerAllCaps(marker: string | null, allCaps: boolean | undefined): string | null;
 /**
@@ -23,6 +22,6 @@ declare function isChangedNumberingChange(currentNumPr: NonNullable<ParagraphAtt
 };
 declare function applyDeletedListMarkerAttrs(attrs: ParagraphAttrs$1, change: ListPropertyChange & {
   previousFormatting: ListPropertyFormatting;
-}, listCounterState: ListCounterState | undefined, theme: document_d_exports.Theme | null | undefined, fontAlternates: FontAlternates | undefined, paragraphMarkFormatting: () => document_d_exports.TextFormatting | undefined): void;
+}, theme: document_d_exports.Theme | null | undefined, fontAlternates: FontAlternates | undefined, paragraphMarkFormatting: () => document_d_exports.TextFormatting | undefined): void;
 //#endregion
 export { ListPropertyChange, ListPropertyFormatting, applyDeletedListMarkerAttrs, applyMarkerAllCaps, isAddedNumberingChange, isChangedNumberingChange, isRemovedNumberingChange, toListMarkerRevision };

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

@@ -1,6 +1,5 @@
 import { bulletMarkerFontName, convertBulletToUnicode } from "../../docx/bulletMarkers.js";
 import { isListNumPr } from "../../layout-engine/types.js";
-import { advanceListMarker } from "../../prosemirror/listMarker.js";
 import { listMarkerFormattingFor } from "./textFormattingConversion.js";
 import { sameStatedParagraphNumbering } from "@stll/docx-core/model";
 //#region src/layout-bridge/convert/listMarkers.ts
@@ -12,9 +11,6 @@ function applyMarkerAllCaps(marker, allCaps) {
 	if (marker === null || !allCaps) return marker;
 	return marker.toLocaleUpperCase();
 }
-function computeListMarker(pmAttrs, state) {
-	return advanceListMarker(pmAttrs, state);
-}
 function toListMarkerRevision(kind, info) {
 	const revision = { kind };
 	if (typeof info?.author === "string") revision.author = info.author;
@@ -72,18 +68,14 @@ function toPreviousListAttrs(previousFormatting) {
 	if (listMarkerSecondSlotOffsetTwips !== void 0) attrs.listMarkerSecondSlotOffsetTwips = listMarkerSecondSlotOffsetTwips;
 	return attrs;
 }
-function resolveDeletedListMarker(previousListAttrs, listCounterState) {
-	if (listCounterState && previousListAttrs.numPr) {
-		const marker = computeListMarker(previousListAttrs, listCounterState);
-		if (marker) return marker;
-	}
+function resolveDeletedListMarker(previousListAttrs) {
 	if (previousListAttrs.listMarker) return previousListAttrs.listIsBullet ? convertBulletToUnicode(previousListAttrs.listMarker, bulletMarkerFontName(previousListAttrs.listMarkerFormatting)) : previousListAttrs.listMarker;
 	if (previousListAttrs.listIsBullet) return "•";
 	return null;
 }
-function applyDeletedListMarkerAttrs(attrs, change, listCounterState, theme, fontAlternates, paragraphMarkFormatting) {
+function applyDeletedListMarkerAttrs(attrs, change, theme, fontAlternates, paragraphMarkFormatting) {
 	const previousListAttrs = toPreviousListAttrs(change.previousFormatting);
-	const marker = resolveDeletedListMarker(previousListAttrs, listCounterState);
+	const marker = resolveDeletedListMarker(previousListAttrs);
 	if (!marker) return;
 	attrs.listMarker = marker;
 	attrs.listMarkerRevision = toListMarkerRevision("del", change.info);

package/dist/layout-bridge/convert/paragraphAttrs.d.ts

@@ -1,8 +1,8 @@
 import { document_d_exports } from "../../types/document.js";
 import { ParagraphAttrs } from "../../prosemirror/schema/nodes.js";
+import { ListCounterStreams } from "../../prosemirror/listMarker.js";
 import { ParagraphAttrs as ParagraphAttrs$1 } from "../../layout-engine/types.js";
 import { FontAlternates } from "../../fonts/fontAlternates.js";
-import { ListCounterStreams } from "../../prosemirror/listMarker.js";
 //#region src/layout-bridge/convert/paragraphAttrs.d.ts
 type ConvertParagraphAttrsOptions = {
   theme: document_d_exports.Theme | null | undefined;

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

@@ -2,6 +2,7 @@ import { bulletMarkerFontName, convertBulletToUnicode } from "../../docx/bulletM
 import { getFontAlternate } from "../../fonts/fontAlternates.js";
 import { autospacingMatchesBase } from "../../prosemirror/autospacingBase.js";
 import { advanceVisibleListMarker } from "../../prosemirror/listMarker.js";
+import { effectiveParagraphNumberingReference, paragraphNumberingSourcesFromBoundary } from "../../prosemirror/numberingAttr.js";
 import { directionIsRtl, directionToBidi } from "../../prosemirror/paragraphDirection.js";
 import { mergeParagraphTabStops } from "../../utils/paragraphFormattingMerge.js";
 import { AUTO_PARAGRAPH_SPACING_PX } from "../../utils/units.js";
@@ -9,7 +10,6 @@ import { convertBorderSpecToLayout } from "./flowBorders.js";
 import { twipsToPixels } from "./flowConversionShared.js";
 import { applyDeletedListMarkerAttrs, applyMarkerAllCaps, isAddedNumberingChange, isChangedNumberingChange, isRemovedNumberingChange, toListMarkerRevision } from "./listMarkers.js";
 import { listMarkerFormattingFor, resolveWesternThemeFont } from "./textFormattingConversion.js";
-import { paragraphNumberingLevel, paragraphNumberingReferenceId } from "@stll/docx-core/model";
 //#region src/layout-bridge/convert/paragraphAttrs.ts
 /**
 * Converts ProseMirror paragraph attributes to layout ParagraphAttrs:
@@ -88,8 +88,12 @@ function convertParagraphAttrs(pmAttrs, { theme, fontAlternates, listCounterStre
 	let indentLeft = typeof pmAttrs.indentLeft === "number" ? pmAttrs.indentLeft : void 0;
 	let indentFirstLine = typeof pmAttrs.indentFirstLine === "number" ? pmAttrs.indentFirstLine : void 0;
 	let hangingIndent = pmAttrs.hangingIndent;
-	if (paragraphNumberingReferenceId(pmAttrs.numPr) !== void 0 && indentLeft === void 0 && indentFirstLine === void 0) {
-		indentLeft = ((paragraphNumberingLevel(pmAttrs.numPr) ?? 0) + 1) * 720;
+	const numbering = effectiveParagraphNumberingReference(paragraphNumberingSourcesFromBoundary({
+		numPr: pmAttrs.numPr,
+		numPrFromStyle: pmAttrs.numPrFromStyle
+	}));
+	if (numbering !== void 0 && indentLeft === void 0 && indentFirstLine === void 0) {
+		indentLeft = ((numbering.ilvl ?? 0) + 1) * 720;
 		if (indentFirstLine === void 0) {
 			indentFirstLine = -360;
 			hangingIndent = true;
@@ -177,7 +181,7 @@ function convertParagraphAttrs(pmAttrs, { theme, fontAlternates, listCounterStre
 	if (!pmAttrs.numPr) {
 		const numberingRemovedChange = propertyChanges.find(isRemovedNumberingChange);
 		if (numberingRemovedChange) {
-			applyDeletedListMarkerAttrs(attrs, numberingRemovedChange, void 0, theme, fontAlternates, paragraphMarkFormatting);
+			applyDeletedListMarkerAttrs(attrs, numberingRemovedChange, theme, fontAlternates, paragraphMarkFormatting);
 			if (resolvedMarker !== null) {
 				attrs.listMarker = resolvedMarker;
 				attrs.listMarkerRevision = toListMarkerRevision("del", numberingRemovedChange.info);

package/dist/layout-bridge/convert/toFlowBlocks.d.ts

@@ -1,5 +1,6 @@
+import { resolveListTemplate } from "../../docx/listTemplate.js";
+import { formatCounter } from "../../prosemirror/listMarker.js";
 import { FlowBlock } from "../../layout-engine/types.js";
-import { formatCounter, resolveListTemplate } from "../../prosemirror/listMarker.js";
 import { ToFlowBlocksOptions, resetBlockIdCounter } from "./flowConversionShared.js";
 import { collectNoteRefs } from "./noteReferences.js";
 import { convertBorderSpecToLayout } from "./flowBorders.js";

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

@@ -1,8 +1,9 @@
 import { resolveDocumentGridLinePitch } from "../../docx/documentGrid.js";
+import { resolveListTemplate } from "../../docx/listTemplate.js";
 import { buildPageBreakRunDescendantIndex } from "../../internal/pageBreakRunDescendantIndex.js";
 import { getPageNumbering } from "../../paged-layout/sectionGeometry.js";
 import { expectBlockSdtAttrs, expectHardBreakAttrs, expectParagraphAttrs, expectTextBoxAttrs } from "../../prosemirror/attrs/index.js";
-import { cloneListCounterState, formatCounter, resolveListTemplate } from "../../prosemirror/listMarker.js";
+import { cloneListCounterState, formatCounter } from "../../prosemirror/listMarker.js";
 import { resolveNumberedRefFields } from "../../prosemirror/numberedRefFields.js";
 import { expectTextBoxAnchorAttrs } from "../../prosemirror/textBoxAnchorAttrs.js";
 import { assertValidProseMirrorDocument } from "../../prosemirror/validation.js";

package/dist/markdown/renderParagraph.js

@@ -40,7 +40,33 @@ function renderParagraphBlock(ctx, pkg, para) {
 	let list = para.listRendering;
 	if (numPr?.kind === "none" || pkg?.numbering !== void 0 && numPr === void 0) list = void 0;
 	else if (pkg?.numbering !== void 0 && numPr?.kind === "reference") list = resolveCachedListRendering(para.listRendering, resolveListRenderingDefinition(numPr, getCachedNumberingMap(pkg.numbering))) ?? void 0;
-	const label = ctx.nextListLabel(list ? listLabelAttrsFromRendering(list, numPrFromStyle) : UNNUMBERED);
+	const counterAttrs = listLabelAttrsFromRendering(list, {
+		numPr: para.formatting?.numPr,
+		numPrFromStyle
+	});
+	if (para.pPrMark) counterAttrs.pPrMark = para.pPrMark;
+	let originalList;
+	if (para.propertyChanges) counterAttrs._propertyChanges = para.propertyChanges.map(({ previousFormatting, ...change }) => {
+		if (!previousFormatting) return change;
+		const previousInherited = ctx.paragraphNumbering(previousFormatting.styleId) ?? previousFormatting.numPrFromStyle;
+		const previousNumbering = mergeParagraphNumbering(previousInherited, previousFormatting.numPr);
+		const previousRendering = pkg?.numbering !== void 0 && previousNumbering?.kind === "reference" ? resolveListRenderingDefinition(previousNumbering, getCachedNumberingMap(pkg.numbering)).rendering ?? void 0 : void 0;
+		originalList ??= previousRendering;
+		const previousAttrs = listLabelAttrsFromRendering(previousRendering, {
+			numPr: previousFormatting.numPr,
+			numPrFromStyle: previousInherited
+		});
+		return {
+			...change,
+			previousFormatting: {
+				...previousFormatting,
+				...previousAttrs,
+				...previousAttrs.numPr === void 0 ? { numPr: null } : { numPr: previousAttrs.numPr },
+				...previousAttrs.numPrFromStyle === void 0 ? { numPrFromStyle: null } : { numPrFromStyle: previousAttrs.numPrFromStyle }
+			}
+		};
+	});
+	const label = ctx.nextListLabel(counterAttrs);
 	const inline = renderParagraphInline(ctx, pkg, para.content, para.paraId);
 	const styleId = para.formatting?.styleId;
 	const headingLevel = markdownHeadingLevel(ctx, para);
@@ -57,7 +83,8 @@ function renderParagraphBlock(ctx, pkg, para) {
 			type: "paragraph"
 		};
 	}
-	if (list && label !== void 0) return renderListItem(ctx, list, label, inline);
+	const visibleList = list ?? originalList;
+	if (visibleList && label !== void 0) return renderListItem(ctx, visibleList, label, inline);
 	ctx.listIndentWidths = [];
 	if (isQuoteStyle(styleId, ctx.builtInStyles)) return {
 		markdown: inline.split("\n").map((line) => `> ${line}`).join("\n"),
@@ -75,7 +102,6 @@ function markdownHeadingLevel(ctx, para) {
 		styleId: para.formatting?.styleId
 	}, ctx.builtInStyles);
 }
-const UNNUMBERED = Object.freeze({});
 /**
 * A plain paragraph whose visible text begins with markdown block syntax (e.g.
 * `# Not a heading`, `- value`, `1. value`, `> quote`) would be reclassified as

package/dist/prosemirror/commands/comments.js

@@ -1,5 +1,5 @@
 import { sameStatedParagraphNumbering as sameStatedParagraphNumbering$1 } from "../../docx/numberingReference.js";
-import { getProseParagraphPropertySourceToken, markParagraphPropertySourceTransfers } from "../../docx/paragraphPropertySource.js";
+import { markParagraphPropertySourceTransfers } from "../../docx/paragraphPropertySource.js";
 import { RevisionResolutionStep } from "../../internal/revisionResolutionStep.js";
 import { finalRevisionParagraphRanges } from "../../internal/revisionResolutionTracking.js";
 import { deleteTextBoxesAnchoredAt, droppedTextBoxAnchorIds, moveTextBoxesPastNextParagraph } from "../anchoredTextBoxes.js";
@@ -16,19 +16,18 @@ import { joinAtParagraphMark } from "../paragraphMarkJoin.js";
 import { getDocumentNumbering } from "../plugins/documentNumbering.js";
 import { getDocumentStyleResolver } from "../plugins/documentStyleState.js";
 import { resolvedPreservedXmlAttrs } from "../preservedXmlReview.js";
-import { rebaseParagraphRuns, setParagraphAttrsWithRebasedRunFormatting } from "../rebaseParagraphRunFormatting.js";
+import { setParagraphAttrsWithRebasedRunFormatting } from "../rebaseParagraphRunFormatting.js";
 import { rejoinRunsAt } from "../rejoinRunCarriers.js";
 import { getFolioNodeRevisionCarriers, nodePropertyRevisionSites } from "../revisionCarriers.js";
 import { RUN_FORMATTING_MARK_NAMES } from "../runFormattingMarkNames.js";
 import { reconstructRejectedRunFormattingMarks, restoreHistoricalRunFormatting } from "../runPropertyChangeResolution.js";
-import { paragraphRunStyleContext, paragraphRunStyleContextAt } from "../runStyleFormatting.js";
+import { paragraphRunStyleContextAt } from "../runStyleFormatting.js";
 import { getTableCellMergeChange } from "../tableCellMergeRevision.js";
 import { isTableCellRetainedInReviewView } from "../tableCellRevisionVisibility.js";
 import { markRowEmptiedInBatch, reconcileTableGridAfterColumnRemoval, removeRowsWithoutCellsAfterBatch, removeTableRow } from "../tableGridMutation.js";
 import { runInCellPending, runParagraphIntoTable } from "../tableRunIn.js";
 import { retainedTrackedRevisionMark, trackedRevisionPathOf } from "../trackedRevisionPath.js";
 import { holdsNoContent } from "../zeroWidthAnchors.js";
-import { inlineBookmarksForParagraphJoin } from "./paragraphBookmarkJoin.js";
 import { hasSerializableParagraphPropertyChange, paragraphPropertiesSnapshot } from "./propertyChangeScope.js";
 import { resolveNodePropertyChangeAttrs } from "./resolveNodePropertyChangeAttrs.js";
 import { resolveParagraphChangeAttrs } from "./resolveParagraphProperties.js";
@@ -338,8 +337,7 @@ function resolveChange(from, to, mode, revisionIds) {
 					continue;
 				}
 				if (moveTextBoxesPastNextParagraph(tr, mappedPos)) markStructuralChange(tr);
-				const joinPos = mappedPos + paragraph.nodeSize;
-				let nextPos = joinPos;
+				let nextPos = mappedPos + paragraph.nodeSize;
 				const boundaries = [];
 				while (nextPos < tr.doc.content.size) {
 					const boundary = tr.doc.nodeAt(nextPos);
@@ -375,32 +373,7 @@ function resolveChange(from, to, mode, revisionIds) {
 					continue;
 				}
 				try {
-					if (boundaries.length > 0) {
-						const leftToken = getProseParagraphPropertySourceToken(paragraph);
-						const rightToken = getProseParagraphPropertySourceToken(nextNode);
-						const inlineBookmarks = inlineBookmarksForParagraphJoin({
-							first: paragraph,
-							boundaries,
-							second: nextNode
-						});
-						if (!inlineBookmarks) continue;
-						tr.replaceWith(joinPos - 1, nextPos + 1, inlineBookmarks);
-						tr.setNodeMarkup(mappedPos, void 0, nextNode.attrs);
-						markParagraphPropertySourceTransfers(tr, [{
-							displacedToken: typeof leftToken === "string" ? leftToken : null,
-							selectedToken: typeof rightToken === "string" ? rightToken : null
-						}]);
-						if (styleResolver && paragraph.content.size > 0) rebaseParagraphRuns({
-							previousContext: paragraphRunStyleContext(paragraph, styleResolver),
-							paragraphPosition: mappedPos,
-							range: {
-								from: 0,
-								to: paragraph.content.size
-							},
-							styleResolver,
-							tr
-						});
-					} else joinAtParagraphMark({
+					joinAtParagraphMark({
 						tr,
 						paragraphPos: mappedPos,
 						paragraph,

package/dist/prosemirror/commands/paragraphBookmarkJoin.d.ts

@@ -9,5 +9,11 @@ type InlineBookmarksForParagraphJoinOptions = {
 declare const inlineBookmarksOf: (boundaries: readonly Node[]) => Node[] | null;
 /** Inline boundaries that can replace the paragraph break without replacing either paragraph's content. */
 declare const inlineBookmarksForParagraphJoin: ({ first, boundaries, second }: InlineBookmarksForParagraphJoinOptions) => Node[] | null;
+/** Paragraph siblings separated only by typed bookmark boundaries. */
+declare const paragraphJoinAfter: (doc: Node, position: number) => {
+  next: Node;
+  nextPosition: number;
+  inlineBookmarks: Node[];
+} | null;
 //#endregion
-export { inlineBookmarksForParagraphJoin, inlineBookmarksOf };
+export { inlineBookmarksForParagraphJoin, inlineBookmarksOf, paragraphJoinAfter };