@stll/folio-core 0.47.2 → 0.47.4

package/dist/ai-edits/headless.js

@@ -164,16 +164,49 @@ const FOLIO_RESOLVED_STORY_SERIALIZATION_MISMATCHES = Object.freeze({
 	blockProjection: "block-projection"
 });
 var FolioResolvedStorySerializationError = class extends TaggedError("FolioResolvedStorySerializationError") {};
+/** Blocks whose id folio minted, because the package names no id for them. */
+const mintedBlockOrdinals = (snapshot) => {
+	const ordinals = /* @__PURE__ */ new Set();
+	for (const [ordinal, block] of snapshot.blocks.entries()) if (block.idStability === "positional") ordinals.add(ordinal);
+	return ordinals;
+};
 /**
-* `idStability` records how an id entered the current snapshot. A synthesized
-* paraId is positional until save writes it into the package, then becomes an
-* authored stable id when reopened. Compare the persisted block projection
-* without changing that live snapshot identity contract.
+* What a block looks like once the story has been through the package.
+*
+* `idStability` is the snapshot's own fact rather than the package's, so it
+* goes. `minted` names the blocks whose id folio invented for a paragraph the
+* package gives no `w14:paraId`, and each of those stands down to its position.
+* A minted id is derived from the paragraph's text and ordinal, so resolving
+* its text can make an id-less paragraph derive a different id when reopened.
+* The two save paths also disagree about whether it reaches the file at all:
+* the selective patch keeps the author's id-less convention (see
+* `withoutMintedIds`) while a full repack writes the model's ids. Which path
+* ran is not what this check is about, so neither the id nor the choice between
+* them may decide it. An authored id is compared exactly as it is, and a block
+* that moved still fails.
 */
-const resolvedStoryBlockProjection = (block) => {
+const resolvedStoryBlockProjection = (block, ordinal, minted) => {
 	const persisted = { ...block };
 	delete persisted.idStability;
-	return persisted;
+	return minted.has(ordinal) ? {
+		...persisted,
+		id: `minted-${String(ordinal)}`
+	} : persisted;
+};
+/**
+* The two halves of the expectation, from one projection.
+*
+* The reading text carries each block's id, so it has to be built from the
+* same projected blocks the block comparison uses; formatting the raw snapshot
+* instead would put a minted id back into the text and fail the check the
+* block projection just passed.
+*/
+const resolvedStoryProjection = (snapshot, minted) => {
+	const blocks = snapshot.blocks.map((block, ordinal) => resolvedStoryBlockProjection(block, ordinal, minted));
+	return {
+		text: blocks.filter(isFolioAIContentBlock).map(formatBlockForLLM).join("\n"),
+		blocks
+	};
 };
 const numberingLevelsOf = (numbering) => {
 	if (!numbering) return [];
@@ -735,10 +768,11 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 		const resolvedState = resolveReviewedState(sourceState, view);
 		this.setEditableStoryState(story, resolvedState);
 		const snapshot = createStateSnapshot(resolvedState);
+		const minted = mintedBlockOrdinals(snapshot);
 		this.resolvedStoryExpectations.set(editableStoryKey(story), {
 			story,
-			text: formatStorySnapshotForLLM(snapshot, false),
-			blocks: snapshot.blocks.map(resolvedStoryBlockProjection)
+			minted,
+			...resolvedStoryProjection(snapshot, minted)
 		});
 		return snapshot;
 	}
@@ -1356,13 +1390,14 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 	async assertResolvedStoriesSerialized(buffer, expectations) {
 		if (expectations.length === 0) return;
 		const reopened = await FolioDocxReviewer.fromBuffer(buffer);
-		for (const { story, text, blocks } of expectations) {
+		for (const { story, text, blocks, minted } of expectations) {
 			const serialized = reopened.readReviewedStory({
 				story,
 				view: "current-markup"
 			});
-			const serializedText = serialized ? formatStorySnapshotForLLM(serialized.snapshot, false) : null;
-			const serializedBlocks = serialized ? serialized.snapshot.blocks.map(resolvedStoryBlockProjection) : null;
+			const persisted = serialized ? resolvedStoryProjection(serialized.snapshot, minted) : null;
+			const serializedText = persisted?.text ?? null;
+			const serializedBlocks = persisted?.blocks ?? null;
 			const mismatches = [];
 			if (!serialized) mismatches.push(FOLIO_RESOLVED_STORY_SERIALIZATION_MISMATCHES.storyMissing);
 			else {

package/dist/docx/paragraphProperties.js

@@ -128,8 +128,10 @@ function parseParagraphProperties(pPr, theme) {
 				if (stated !== void 0) formatting.numPr = stated;
 				const numberingChange = findChild(child, "w", "numberingChange");
 				if (numberingChange) formatting.numberingChangeXml = captureVerbatimXml(numberingChange);
+				const numberingInsertion = findChild(child, "w", "ins");
+				if (numberingInsertion) formatting.numberingInsertionXml = captureVerbatimXml(numberingInsertion);
 				const statedLevel = parseNumericAttribute(findChild(child, "w", "ilvl"), "w", "val");
-				return stated !== void 0 || numberingChange !== null || statedLevel === -1;
+				return stated !== void 0 || numberingChange !== null || numberingInsertion !== null || statedLevel === -1;
 			}),
 			suppressLineNumbers: toggle("suppressLineNumbers", "suppressLineNumbers"),
 			pBdr: once("pBdr", (child) => {

package/dist/docx/serializer/paragraphSerializer.js

@@ -29,10 +29,10 @@ const RESERVED_PARAGRAPH_PROPERTY_CHILDREN = /* @__PURE__ */ new Set(["pPrChange
 /**
 * Revision records a captured `w:pPr` may not carry into a replay.
 *
-* `w:numberingChange` is not among them: the model holds it
-* (`ParagraphFormatting.numberingChangeXml`) and the serializer writes it
-* back, so both paths keep it. Refusing the capture used to force a rebuild
-* that could not write it, which turned a replay gate into a lost revision.
+* The revision records inside `w:numPr` are not among them: the model holds
+* `w:numberingChange` and `w:ins`, and the serializer writes both back, so both
+* paths keep them. Refusing the capture used to force a rebuild that could not
+* write the records, which turned a replay gate into a lost revision.
 */
 const RESERVED_PARAGRAPH_CAPTURE_CHILDREN = /* @__PURE__ */ new Set([
 	...RESERVED_PARAGRAPH_PROPERTY_CHILDREN,

package/dist/internal/paragraphFormattingSerialization.d.ts

@@ -1,7 +1,7 @@
 import { document_d_exports } from "../types/document.js";
 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" | "outlineLevel" | "styleId" | "frame" | "suppressLineNumbers" | "suppressAutoHyphens" | "runProperties" | "runInWithNext" | "preserved";
+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.

package/dist/internal/paragraphFormattingSerialization.js

@@ -72,32 +72,30 @@ const serializeIndentation = (formatting) => {
 	const written = serializePreservedAttributes(attrs, formatting.indentPreservedAttributes);
 	return written.length === 0 ? "" : `<w:ind ${written.join(" ")}/>`;
 };
-/**
-* `w:numPr`, with the tracked record of the numbering it replaced.
-*
-* `w:numberingChange` is the revision a reviewer's numbering change left
-* behind. It is history: nothing in the model derives it, and a rebuilt
-* `w:numPr` that drops it discards the revision silently. It is written even
-* when the paragraph's own numbering reference is gone, because a change
-* record with nothing left to describe is still a record — the schema declares
-* it last in `CT_NumPr`, after `w:ilvl` and `w:numId`.
-*/
-const serializeNumbering = (numPr, numberingChangeXml) => {
+const serializeNumbering = ({ numPr, numberingChangeXml, numberingInsertionXml }) => {
 	const slots = numPr === void 0 ? {} : paragraphNumberingSlots(numPr);
 	const parts = [];
 	if (slots.ilvl !== void 0) parts.push(`<w:ilvl w:val="${intAttr(slots.ilvl)}"/>`);
 	if (slots.numId !== void 0) parts.push(`<w:numId w:val="${intAttr(slots.numId)}"/>`);
 	const change = replayableNumberingChangeXml(numberingChangeXml);
 	if (change !== null) parts.push(change);
+	const insertion = replayableNumberingInsertionXml(numberingInsertionXml);
+	if (insertion !== null) parts.push(insertion);
 	return parts.length === 0 ? "" : `<w:numPr>${parts.join("")}</w:numPr>`;
 };
 const NUMBERING_CHANGE_ROOT_NAME = /* @__PURE__ */ new Set(["numberingChange"]);
+const NUMBERING_INSERTION_ROOT_NAME = /* @__PURE__ */ new Set(["ins"]);
 const WORDPROCESSINGML_NAMESPACE = /* @__PURE__ */ new Set([NAMESPACES.w]);
 const replayableNumberingChangeXml = (numberingChangeXml) => sanitizeCapturedXmlElement(numberingChangeXml, {
 	allowedLocalNames: NUMBERING_CHANGE_ROOT_NAME,
 	allowedNamespaceUris: WORDPROCESSINGML_NAMESPACE,
 	inheritedNamespaceScope: OOXML_NAMESPACE_SCOPE
 });
+const replayableNumberingInsertionXml = (numberingInsertionXml) => sanitizeCapturedXmlElement(numberingInsertionXml, {
+	allowedLocalNames: NUMBERING_INSERTION_ROOT_NAME,
+	allowedNamespaceUris: WORDPROCESSINGML_NAMESPACE,
+	inheritedNamespaceScope: OOXML_NAMESPACE_SCOPE
+});
 const serializeFrameProperties = (frame) => {
 	if (!frame) return "";
 	const { dropCap, lines, width, height, hSpace, vSpace, hAnchor, vAnchor, x, y, xAlign, yAlign, wrap, preservedAttributes } = frame;
@@ -152,7 +150,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, 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, numPrFromStyle, numberingChangeXml, numberingInsertionXml, outlineLevel, styleId, frame, suppressLineNumbers, suppressAutoHyphens, runProperties, runInWithNext, preserved } = input;
 	modelSpacingProvenance(spacingExplicit);
 	const propertiesXml = serializeSequenceChildren({
 		container: "paragraph-properties",
@@ -164,7 +162,15 @@ const modelParagraphFormattingEmission = (input) => {
 			["pageBreakBefore", serializeOnOffElement(pageBreakBefore, "pageBreakBefore")],
 			["framePr", serializeFrameProperties(frame)],
 			["widowControl", serializeOnOffElement(widowControl, "widowControl")],
-			["numPr", isStyleSourcedParagraphNumbering(numPr, numPrFromStyle) ? serializeNumbering(void 0, numberingChangeXml) : serializeNumbering(numPr, numberingChangeXml)],
+			["numPr", isStyleSourcedParagraphNumbering(numPr, numPrFromStyle) ? serializeNumbering({
+				numPr: void 0,
+				numberingChangeXml,
+				numberingInsertionXml
+			}) : serializeNumbering({
+				numPr,
+				numberingChangeXml,
+				numberingInsertionXml
+			})],
 			["suppressLineNumbers", serializeOnOffElement(suppressLineNumbers, "suppressLineNumbers")],
 			["pBdr", serializeParagraphBorders(borders)],
 			["shd", serializeShading(shading)],

package/dist/prosemirror/attrs/index.js

@@ -2124,6 +2124,7 @@ const validateParagraphFormatting = (value, path, issues) => {
 	optionalOneOf(value, "lineSpacingRule", `${path}.lineSpacingRule`, issues, LINE_SPACING_RULE_VALUES);
 	optionalString(value, "styleId", `${path}.styleId`, issues);
 	optionalString(value, "numberingChangeXml", `${path}.numberingChangeXml`, issues);
+	optionalString(value, "numberingInsertionXml", `${path}.numberingInsertionXml`, issues);
 	optionalOneOf(value, "listNumFmt", `${path}.listNumFmt`, issues, COUNTER_FORMAT_VALUES);
 	optionalString(value, "listMarker", `${path}.listMarker`, issues);
 	optionalString(value, "listMarkerTemplate", `${path}.listMarkerTemplate`, issues);

package/dist/prosemirror/paragraphFormattingProvenance.d.ts

@@ -129,6 +129,9 @@ declare const PARAGRAPH_FORMATTING_WRITE_BACK: {
   readonly numberingChangeXml: {
     readonly kind: "original-only";
   };
+  readonly numberingInsertionXml: {
+    readonly kind: "original-only";
+  };
   readonly outlineLevel: {
     readonly kind: "style-resolved-attr";
     readonly attr: "outlineLevel";

package/dist/prosemirror/paragraphFormattingProvenance.js

@@ -78,6 +78,7 @@ const PARAGRAPH_FORMATTING_WRITE_BACK = {
 	numPr: { kind: "direct-provenance" },
 	numPrFromStyle: { kind: "derived" },
 	numberingChangeXml: { kind: "original-only" },
+	numberingInsertionXml: { kind: "original-only" },
 	outlineLevel: {
 		kind: "style-resolved-attr",
 		attr: "outlineLevel"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stll/folio-core",
-  "version": "0.47.2",
+  "version": "0.47.4",
   "description": "Headless, framework-neutral core of folio: the OOXML (.docx) parser, document model, ProseMirror integration, and page-layout engine. No React.",
   "keywords": [
     "document-model",
@@ -128,7 +128,7 @@
     "perf": "bun scripts/profile-editor.ts"
   },
   "dependencies": {
-    "@stll/docx-core": "^0.25.1",
+    "@stll/docx-core": "^0.25.2",
     "@stll/docx-utils": "^0.1.0",
     "@stll/template-conditions": ">=0.4.0 <1.0.0",
     "better-result": "3.0.1",