@stll/folio-core 0.53.0 → 0.54.1

package/dist/prosemirror/commands/tableMergeFoldDecisions.js

@@ -0,0 +1,79 @@
+import { isCellMergeContinuation, isCellMergeStart, isTableCellMergeRevisionContinuation } from "../../docx/tableParser.js";
+import { tableCellHasMeaningfulContent } from "../../docx/verticalMergeProjection.js";
+import { expectTableCellAttrs } from "../attrs/index.js";
+import { standaloneTableCellFromProseMirror } from "../conversion/fromProseDoc.js";
+import { panic } from "better-result";
+import { TableMap } from "prosemirror-tables";
+//#region src/prosemirror/commands/tableMergeFoldDecisions.ts
+/** Resolve raw merge states without converting unrelated table revisions. */
+const tableMergeFoldDecisions = ({ table, mode, revisionSet }) => {
+	const decisions = /* @__PURE__ */ new Map();
+	const origins = /* @__PURE__ */ new Set();
+	const invalid = /* @__PURE__ */ new Set();
+	const map = TableMap.get(table);
+	const visited = /* @__PURE__ */ new Set();
+	for (const [index, position] of map.map.entries()) {
+		if (visited.has(position)) continue;
+		visited.add(position);
+		const cell = table.nodeAt(position);
+		if (cell?.attrs["cellMarker"]?.kind !== "merge") continue;
+		const marker = expectTableCellAttrs(cell).cellMarker;
+		if (marker?.kind !== "merge" || revisionSet !== null && !revisionSet.has(marker.info.revisionId)) continue;
+		const continues = isTableCellMergeRevisionContinuation(mode === "accept" ? marker.verticalMerge : marker.verticalMergeOriginal);
+		decisions.set(position, continues && (mode === "reject" || !tableCellHasMeaningfulContent(standaloneTableCellFromProseMirror(cell))));
+		if (!continues) continue;
+		if (Math.floor(index / map.width) === 0) {
+			invalid.add(position);
+			continue;
+		}
+		const abovePosition = map.map[index - map.width];
+		if (abovePosition === void 0) return panic("Merge resolution lost its origin");
+		const above = table.nodeAt(abovePosition);
+		if (!above) return panic("Merge resolution lost its origin");
+		const rectangle = map.findCell(position);
+		const aboveRectangle = map.findCell(abovePosition);
+		if (rectangle.left !== aboveRectangle.left || rectangle.right !== aboveRectangle.right || rectangle.top !== aboveRectangle.bottom) {
+			invalid.add(position);
+			continue;
+		}
+		const aboveMarker = expectTableCellAttrs(above).cellMarker;
+		const aboveContinues = aboveMarker?.kind === "merge" && (revisionSet === null || revisionSet.has(aboveMarker.info.revisionId)) && isTableCellMergeRevisionContinuation(mode === "accept" ? aboveMarker.verticalMerge : aboveMarker.verticalMergeOriginal);
+		const aboveModel = standaloneTableCellFromProseMirror(above);
+		if (mode === "accept" && (aboveContinues && decisions.get(abovePosition) === false || isCellMergeContinuation(aboveModel) && tableCellHasMeaningfulContent(aboveModel))) decisions.set(position, false);
+		if (aboveContinues || isCellMergeContinuation(aboveModel) || isCellMergeStart(aboveModel)) continue;
+		origins.add(abovePosition);
+	}
+	return {
+		folds: decisions,
+		origins,
+		invalid
+	};
+};
+/** Persist an implicit merge origin even when reader rules retain its continuation. */
+const resolvedTableMergeOriginAttrs = (cell) => ({
+	...cell.attrs,
+	_originalFormatting: {
+		...expectTableCellAttrs(cell)._originalFormatting,
+		vMerge: "restart"
+	},
+	_preserveVMergeRestart: true
+});
+/** A retained continuation must save the merge state the reviewer resolved. */
+const resolvedVisibleTableCellMergeAttrs = ({ cell, mode, origin }) => {
+	const attrs = expectTableCellAttrs(cell);
+	const marker = attrs.cellMarker;
+	if (marker?.kind !== "merge") return panic("Cell has no merge revision");
+	const continuation = mode === "accept" ? marker.verticalMerge : marker.verticalMergeOriginal;
+	const formatting = { ...attrs._originalFormatting };
+	if (origin) formatting.vMerge = "restart";
+	else if (isTableCellMergeRevisionContinuation(continuation)) formatting.vMerge = "continue";
+	else delete formatting.vMerge;
+	return {
+		...cell.attrs,
+		cellMarker: null,
+		_originalFormatting: formatting,
+		_preserveVMergeRestart: origin
+	};
+};
+//#endregion
+export { resolvedTableMergeOriginAttrs, resolvedVisibleTableCellMergeAttrs, tableMergeFoldDecisions };

package/dist/prosemirror/containerFinalParagraph.d.ts

@@ -28,18 +28,24 @@ declare const finalParagraphsOf: (doc: Node, paragraphTypeName: string) => {
   position: number;
   node: Node;
 }[];
+type AddedBreakCarrierBeforeOptions = {
+  at: ResolvedPos;
+  paragraphTypeName: string;
+  canCrossTable?: (table: Node) => boolean;
+};
 /**
  * The paragraph an added break can rotate BACK onto from the one at `at`: the
  * paragraph the run of inserted ones was appended after.
  *
  * The walk crosses the inserted paragraphs — their own marks stay where they
  * are, and only which paragraph is left markless changes — and stops at the
- * first one whose mark is free. `null` when there is none: a table in between,
- * which no mark joins across; a paragraph whose mark says something else,
- * which the rotation must not overwrite; or a container whose every paragraph
- * is new.
+ * first one whose mark is free. A table blocks the walk unless the caller
+ * authorizes a wholly inserted table: rejecting it removes that barrier too.
+ * `null` when there is no carrier: a table the caller cannot cross, a
+ * paragraph whose mark the rotation must not overwrite, or a container whose
+ * every paragraph is new.
  */
-declare const addedBreakCarrierBefore: (at: ResolvedPos, paragraphTypeName: string) => {
+declare const addedBreakCarrierBefore: ({ at, paragraphTypeName, canCrossTable }: AddedBreakCarrierBeforeOptions) => {
   position: number;
   node: Node;
 } | null;

package/dist/prosemirror/containerFinalParagraph.js

@@ -66,18 +66,19 @@ const marksAnAddedBreak = (node) => {
 *
 * The walk crosses the inserted paragraphs — their own marks stay where they
 * are, and only which paragraph is left markless changes — and stops at the
-* first one whose mark is free. `null` when there is none: a table in between,
-* which no mark joins across; a paragraph whose mark says something else,
-* which the rotation must not overwrite; or a container whose every paragraph
-* is new.
+* first one whose mark is free. A table blocks the walk unless the caller
+* authorizes a wholly inserted table: rejecting it removes that barrier too.
+* `null` when there is no carrier: a table the caller cannot cross, a
+* paragraph whose mark the rotation must not overwrite, or a container whose
+* every paragraph is new.
 */
-const addedBreakCarrierBefore = (at, paragraphTypeName) => {
+const addedBreakCarrierBefore = ({ at, paragraphTypeName, canCrossTable }) => {
 	let position = at.pos;
 	for (let index = at.index() - 1; index >= 0; index--) {
 		const sibling = at.parent.child(index);
 		position -= sibling.nodeSize;
 		if (sibling.type.name !== paragraphTypeName) {
-			if (isAContainerChild(sibling, paragraphTypeName)) return null;
+			if (isAContainerChild(sibling, paragraphTypeName) && !canCrossTable?.(sibling)) return null;
 			continue;
 		}
 		if (sibling.attrs["pPrMark"] == null) return {

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

@@ -1,7 +1,7 @@
 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";
+import { marksToTextFormatting } from "../runFormattingFromMarks.js";
+import { Node } from "prosemirror-model";
 //#region src/prosemirror/conversion/fromProseDoc.d.ts
 /**
  * Whether a record the editor did not change may come back from the base
@@ -21,17 +21,6 @@ type FromProseDocOptions = {
 };
 /** Convert a ProseMirror document to the document model. */
 declare function fromProseDoc(pmDoc: Node, baseDocument?: document_d_exports.Document, { reuse }?: FromProseDocOptions): document_d_exports.Document;
-/**
- * Convert ProseMirror marks to TextFormatting
- */
-type MarksToTextFormattingOptions = {
-  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;
 /**
  * Convert ProseMirror table row attrs to TableRowFormatting