@stll/folio-core 0.35.1 → 0.37.0

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

@@ -1,8 +1,29 @@
 import { document_d_exports } from "../../types/document.js";
 import { ParagraphPropertyChangeAttrs } from "../schema/nodes.js";
+import { Node } from "prosemirror-model";
 //#region src/prosemirror/commands/propertyChangeScope.d.ts
+/** Editor-only suggestions are rebased away before save; every other entry emits `w:pPrChange`. */
+declare const hasSerializableParagraphPropertyChange: (changes: readonly ParagraphPropertyChangeAttrs[] | null | undefined) => boolean;
 type AttrPatch = Record<string, unknown>;
 type ParagraphPropertySnapshot = NonNullable<ParagraphPropertyChangeAttrs["previousFormatting"]>;
+type ParagraphPropertyChangeRemoval = {
+  type: "unchanged";
+} | {
+  type: "keep-live";
+  remaining: ParagraphPropertyChangeAttrs[];
+} | {
+  type: "restore-previous";
+  remaining: ParagraphPropertyChangeAttrs[];
+  previousFormatting: ParagraphPropertyChangeAttrs["previousFormatting"];
+};
+/**
+ * Remove selected entries from an oldest-to-newest paragraph-property chain.
+ * A retained entry immediately after a removed run inherits that run's
+ * earliest previous snapshot. Only a removed trailing run restores the live
+ * paragraph properties. This makes repeated scoped rejection independent of
+ * the order in which revisions are resolved.
+ */
+declare const removeParagraphPropertyChanges: (changes: readonly ParagraphPropertyChangeAttrs[], shouldRemove: (change: ParagraphPropertyChangeAttrs) => boolean) => ParagraphPropertyChangeRemoval;
 /**
  * Paragraph attrs governed by a `w:pPrChange` — the attrs
  * `paragraphFormattingToAttrs` (conversion/toProseDoc.ts) can produce from a
@@ -19,9 +40,12 @@ type ParagraphPropertySnapshot = NonNullable<ParagraphPropertyChangeAttrs["previ
  *   `runInWithNext` (`w:specVanish` lives in that rPr)
  * - load-time style/numbering bookkeeping the command layer cannot recompute
  *   without a style resolver: `numPrFromStyle`, the `list*` rendering attrs,
- *   `spacingFromDocDefaults`, `spacingFromImplicitDefaultStyle`
+ *   `alignmentFromStyle`, `spacingFromDocDefaults`, and resolved style-spacing
+ *   provenance in `spacingFromImplicitDefaultStyle`
  */
 declare const PPR_CHANGE_SCOPED_ATTR_KEYS: readonly ["styleId", "numPr", "alignment", "spaceBefore", "spaceAfter", "lineSpacing", "lineSpacingRule", "lineSpacingExplicit", "snapToGrid", "spacingExplicit", "indentLeft", "indentRight", "indentFirstLine", "hangingIndent", "borders", "shading", "tabs", "pageBreakBefore", "keepNext", "keepLines", "widowControl", "contextualSpacing", "outlineLevel", "direction", "_autospacingBase"];
+/** The in-scope paragraph properties as they stand, for a `w:pPrChange` record. */
+declare const paragraphPropertiesSnapshot: (node: Node) => ParagraphPropertySnapshot;
 /**
  * Build the attr patch that rejecting one pPrChange applies to a paragraph:
  * every in-scope key set to the stored previous value, or reset to `null`
@@ -29,7 +53,7 @@ declare const PPR_CHANGE_SCOPED_ATTR_KEYS: readonly ["styleId", "numPr", "alignm
  * the scoped set (editor-created list suggestions snapshot list-rendering
  * bookkeeping attrs) merge through 1:1 so their pre-change values restore too.
  */
-declare function paragraphRejectAttrPatch(previousFormatting: ParagraphPropertySnapshot | null | undefined): AttrPatch;
+declare function paragraphRejectAttrPatch(previousFormatting: ParagraphPropertySnapshot | null | undefined, inheritedFormatting?: document_d_exports.ParagraphFormatting): AttrPatch;
 /**
  * Rebuild the paragraph's `_originalFormatting` (the serializer's pPr source)
  * after a reject: the stored old pPr wholesale within CT_PPrBase scope, with
@@ -66,4 +90,4 @@ declare function tableRowRejectAttrPatch(previousFormatting: document_d_exports.
  */
 declare function tableCellRejectAttrPatch(previousFormatting: document_d_exports.TableCellFormatting | undefined, liveOriginalFormatting: document_d_exports.TableCellFormatting | null | undefined): AttrPatch;
 //#endregion
-export { PPR_CHANGE_SCOPED_ATTR_KEYS, paragraphRejectAttrPatch, paragraphRejectOriginalFormatting, sectionRejectProperties, tableCellRejectAttrPatch, tableRejectAttrPatch, tableRowRejectAttrPatch };
+export { PPR_CHANGE_SCOPED_ATTR_KEYS, ParagraphPropertyChangeRemoval, hasSerializableParagraphPropertyChange, paragraphPropertiesSnapshot, paragraphRejectAttrPatch, paragraphRejectOriginalFormatting, removeParagraphPropertyChanges, sectionRejectProperties, tableCellRejectAttrPatch, tableRejectAttrPatch, tableRowRejectAttrPatch };

package/dist/prosemirror/commands/propertyChangeScope.js

@@ -1,6 +1,53 @@
-import { setAutospacingBaseValue } from "../autospacingBase.js";
+import { expectParagraphAttrs } from "../attrs/index.js";
+import { directParagraphAlignment } from "../paragraphAlignment.js";
 import { directionFromBidi } from "../paragraphDirection.js";
+import { directParagraphSpacing, paragraphSpacingAttrPatch, paragraphSpacingFromFormatting } from "../paragraphSpacing.js";
 //#region src/prosemirror/commands/propertyChangeScope.ts
+/** Editor-only suggestions are rebased away before save; every other entry emits `w:pPrChange`. */
+const hasSerializableParagraphPropertyChange = (changes) => changes?.some(({ info }) => info.provenance !== "suggested") === true;
+/**
+* Remove selected entries from an oldest-to-newest paragraph-property chain.
+* A retained entry immediately after a removed run inherits that run's
+* earliest previous snapshot. Only a removed trailing run restores the live
+* paragraph properties. This makes repeated scoped rejection independent of
+* the order in which revisions are resolved.
+*/
+const removeParagraphPropertyChanges = (changes, shouldRemove) => {
+	const remaining = [];
+	let removedPrevious;
+	let removedAny = false;
+	let removingRun = false;
+	for (const change of changes) {
+		if (shouldRemove(change)) {
+			if (!removingRun) {
+				removedPrevious = change.previousFormatting;
+				removingRun = true;
+			}
+			removedAny = true;
+			continue;
+		}
+		if (!removingRun) {
+			remaining.push(change);
+			continue;
+		}
+		const rebased = { ...change };
+		if (removedPrevious === void 0) Reflect.deleteProperty(rebased, "previousFormatting");
+		else rebased.previousFormatting = removedPrevious;
+		remaining.push(rebased);
+		removedPrevious = void 0;
+		removingRun = false;
+	}
+	if (!removedAny) return { type: "unchanged" };
+	if (!removingRun) return {
+		type: "keep-live",
+		remaining
+	};
+	return {
+		type: "restore-previous",
+		remaining,
+		previousFormatting: removedPrevious
+	};
+};
 /**
 * Paragraph attrs governed by a `w:pPrChange` — the attrs
 * `paragraphFormattingToAttrs` (conversion/toProseDoc.ts) can produce from a
@@ -17,7 +64,8 @@ import { directionFromBidi } from "../paragraphDirection.js";
 *   `runInWithNext` (`w:specVanish` lives in that rPr)
 * - load-time style/numbering bookkeeping the command layer cannot recompute
 *   without a style resolver: `numPrFromStyle`, the `list*` rendering attrs,
-*   `spacingFromDocDefaults`, `spacingFromImplicitDefaultStyle`
+*   `alignmentFromStyle`, `spacingFromDocDefaults`, and resolved style-spacing
+*   provenance in `spacingFromImplicitDefaultStyle`
 */
 const PPR_CHANGE_SCOPED_ATTR_KEYS = [
 	"styleId",
@@ -47,6 +95,31 @@ const PPR_CHANGE_SCOPED_ATTR_KEYS = [
 	"_autospacingBase"
 ];
 const PPR_CHANGE_SCOPED_ATTR_KEY_SET = new Set(PPR_CHANGE_SCOPED_ATTR_KEYS);
+/** Effective/bookkeeping attrs whose tracked snapshot must use direct provenance instead. */
+const PPR_SPACING_ATTR_KEYS = /* @__PURE__ */ new Set([
+	"spaceBefore",
+	"spaceAfter",
+	"lineSpacing",
+	"lineSpacingRule",
+	"lineSpacingExplicit",
+	"spacingExplicit",
+	"_autospacingBase"
+]);
+/** The in-scope paragraph properties as they stand, for a `w:pPrChange` record. */
+const paragraphPropertiesSnapshot = (node) => {
+	const attrs = expectParagraphAttrs(node);
+	const snapshot = {};
+	for (const key of PPR_CHANGE_SCOPED_ATTR_KEYS) {
+		if (key === "alignment" || PPR_SPACING_ATTR_KEYS.has(key)) continue;
+		const value = attrs[key];
+		if (key === "hangingIndent" && value === false && attrs._originalFormatting?.hangingIndent === void 0) continue;
+		if (value !== null && value !== void 0) snapshot[key] = value;
+	}
+	const directAlignment = directParagraphAlignment(attrs);
+	if (directAlignment !== void 0) snapshot["alignment"] = directAlignment;
+	Object.assign(snapshot, directParagraphSpacing(attrs));
+	return snapshot;
+};
 /**
 * Parser-shaped `ParagraphFormatting` keys that must NOT merge through to
 * attrs verbatim: they either normalize to a differently named attr
@@ -108,12 +181,19 @@ const PPR_CHANGE_SCOPED_FORMATTING_KEYS = [
 * the scoped set (editor-created list suggestions snapshot list-rendering
 * bookkeeping attrs) merge through 1:1 so their pre-change values restore too.
 */
-function paragraphRejectAttrPatch(previousFormatting) {
+function paragraphRejectAttrPatch(previousFormatting, inheritedFormatting) {
 	const prev = previousFormatting ?? {};
 	const patch = {};
 	for (const key of PPR_CHANGE_SCOPED_ATTR_KEYS) patch[key] = Object.hasOwn(prev, key) ? prev[key] ?? null : null;
+	if (!Object.hasOwn(prev, "alignment")) patch["alignment"] = inheritedFormatting?.alignment ?? null;
+	patch["alignmentFromStyle"] = inheritedFormatting?.alignment;
+	const directSpacing = paragraphSpacingFromFormatting(prev);
+	const inheritedSpacing = paragraphSpacingFromFormatting(inheritedFormatting);
+	Object.assign(patch, paragraphSpacingAttrPatch({
+		direct: directSpacing,
+		inherited: inheritedSpacing
+	}));
 	if (!Object.hasOwn(prev, "direction")) patch["direction"] = directionFromBidi(prev.bidi);
-	if (!Object.hasOwn(prev, "_autospacingBase")) patch["_autospacingBase"] = autospacingBaseFromFormatting(prev);
 	for (const [key, value] of Object.entries(prev)) {
 		if (PPR_CHANGE_SCOPED_ATTR_KEY_SET.has(key) || PPR_PARSER_ONLY_KEYS.has(key)) continue;
 		patch[key] = value ?? null;
@@ -140,15 +220,6 @@ function paragraphRejectOriginalFormatting(previousFormatting, liveOriginal) {
 	if (Object.keys(result).length === 0) return null;
 	return result;
 }
-function autospacingBaseFromFormatting(prev) {
-	const before = prev.beforeAutospacing === true;
-	const after = prev.afterAutospacing === true;
-	if (!before && !after) return null;
-	const base = {};
-	if (before) setAutospacingBaseValue(base, "before", prev.spaceBefore);
-	if (after) setAutospacingBaseValue(base, "after", prev.spaceAfter);
-	return base;
-}
 /**
 * Rejected section properties: the stored old sectPr wholesale, preserving
 * the live header/footer references — `EG_HdrFtrReferences` is not part of
@@ -241,4 +312,4 @@ function isRecord(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 //#endregion
-export { PPR_CHANGE_SCOPED_ATTR_KEYS, paragraphRejectAttrPatch, paragraphRejectOriginalFormatting, sectionRejectProperties, tableCellRejectAttrPatch, tableRejectAttrPatch, tableRowRejectAttrPatch };
+export { PPR_CHANGE_SCOPED_ATTR_KEYS, hasSerializableParagraphPropertyChange, paragraphPropertiesSnapshot, paragraphRejectAttrPatch, paragraphRejectOriginalFormatting, removeParagraphPropertyChanges, sectionRejectProperties, tableCellRejectAttrPatch, tableRejectAttrPatch, tableRowRejectAttrPatch };

package/dist/prosemirror/conversion/fromProseDoc.d.ts

@@ -1,16 +1,19 @@
 import { document_d_exports } from "../../types/document.js";
 import { TableAttrs, TableCellAttrs, TableRowAttrs } from "../schema/nodes.js";
+import { RunStyleResolver } from "../runStyleFormatting.js";
 import { Mark, Node } from "prosemirror-model";
 //#region src/prosemirror/conversion/fromProseDoc.d.ts
-/**
- * Convert a ProseMirror document to our Document type
- */
+/** Convert a ProseMirror document to the document model. */
 declare function fromProseDoc(pmDoc: Node, baseDocument?: document_d_exports.Document): document_d_exports.Document;
 /**
  * Convert ProseMirror marks to TextFormatting
  */
 type MarksToTextFormattingOptions = {
-  inheritedFormatting: document_d_exports.TextFormatting | undefined;
+  baseParagraphFormatting?: document_d_exports.TextFormatting | undefined;
+  inheritedFormatting?: document_d_exports.TextFormatting | undefined;
+  paragraphMarkFormatting?: document_d_exports.TextFormatting | undefined;
+  paragraphMarkPrecedesStyle?: boolean | undefined;
+  styleResolver?: RunStyleResolver | null | undefined;
 };
 declare function marksToTextFormatting(marks: readonly Mark[], options?: MarksToTextFormattingOptions): document_d_exports.TextFormatting;
 declare function tableAttrsToFormatting(attrs: TableAttrs): document_d_exports.TableFormatting | undefined;
@@ -32,6 +35,6 @@ declare function updateDocumentContent(originalDocument: document_d_exports.Docu
  * Used for converting edited header/footer PM content back to the document
  * model.
  */
-declare function proseDocToBlocks(pmDoc: Node): document_d_exports.BlockContent[];
+declare function proseDocToBlocks(pmDoc: Node, baseContent?: document_d_exports.BlockContent[], styles?: NonNullable<document_d_exports.Document["package"]>["styles"]): document_d_exports.BlockContent[];
 //#endregion
 export { fromProseDoc, marksToTextFormatting, proseDocToBlocks, standaloneTableCellFromProseMirror, tableAttrsToFormatting, tableCellAttrsToFormatting, tableRowAttrsToFormatting, updateDocumentContent };