@stll/folio-core 0.52.0 → 0.53.0

package/dist/prosemirror/extensions/features/ParaIdAllocatorExtension.d.ts

@@ -1,6 +1,6 @@
 import { Extension } from "../types.js";
-import { EditorState, PluginKey, Transaction } from "prosemirror-state";
 import { Node } from "prosemirror-model";
+import { EditorState, PluginKey, Transaction } from "prosemirror-state";
 //#region src/prosemirror/extensions/features/ParaIdAllocatorExtension.d.ts
 type ParagraphPropertySourceSeed = {
   contract: string | null;
@@ -20,6 +20,23 @@ declare const paraIdAllocatorKey: PluginKey<ParagraphPropertySourceSeed>;
 declare const deterministicParaIdSeedKey: PluginKey<string>;
 /** Ask the allocator to mint reproducible ids for the paragraphs `tr` creates. */
 declare const requestDeterministicParaIds: (tr: Transaction, seed: string) => Transaction;
+type ParagraphPropertySourceKeeper = {
+  status: "ambiguous";
+} | {
+  pos: number;
+  status: "deleted" | "mapped";
+};
+type MappedParagraphKeepers = {
+  paraIds: Map<string, number>;
+  sourceTokens: Map<string, ParagraphPropertySourceKeeper>;
+};
+/**
+ * Where each id's and each seeded source token's owner went: the first
+ * occurrence that survives the batch keeps an id.
+ *
+ * @internal Exported for the per-step equivalence test.
+ */
+declare const mapParagraphKeepers: (oldDoc: Node, transactions: readonly Transaction[], sourceSeed: ParagraphPropertySourceSeed) => MappedParagraphKeepers;
 /**
  * Allocate initial paragraph IDs before constructing editor state.
  *
@@ -31,4 +48,4 @@ declare const ensureParaIdsInDoc: (doc: Node) => Node;
 declare const ensureParaIdsInState: (state: EditorState) => EditorState;
 declare const ParaIdAllocatorExtension: (options?: Partial<{}> | undefined) => Extension;
 //#endregion
-export { ParaIdAllocatorExtension, deterministicParaIdSeedKey, ensureParaIdsInDoc, ensureParaIdsInState, paraIdAllocatorKey, requestDeterministicParaIds };
+export { ParaIdAllocatorExtension, deterministicParaIdSeedKey, ensureParaIdsInDoc, ensureParaIdsInState, mapParagraphKeepers, paraIdAllocatorKey, requestDeterministicParaIds };

package/dist/prosemirror/extensions/features/ParaIdAllocatorExtension.js

@@ -1,5 +1,6 @@
 import { PROSE_PARAGRAPH_SOURCE_TOKEN_ATTR, getExplicitParagraphPropertySourceTransfers, getProseDocumentParagraphPropertySourceContract, getProseParagraphPropertySourceToken, paragraphPropertySourceTokenMatchesContract, recreateProseNodeWithParagraphPropertySource, setProseParagraphMarkupWithPropertySource, transferProseParagraphPropertySource } from "../../../docx/paragraphPropertySource.js";
 import { deterministicHexId, generateHexId } from "../../../utils/hexId.js";
+import { sweepPositions } from "../../positionSweep.js";
 import { createExtension } from "../create.js";
 import { ignoreTrackedChanges } from "./ParagraphChangeTrackerExtension.js";
 import { panic } from "better-result";
@@ -92,33 +93,45 @@ const collectParagraphPropertySourceSeed = (doc) => {
 		tokens: new Set([...counts].filter(([, count]) => count === 1).map(([token]) => token))
 	};
 };
+/**
+* Where each id's and each seeded source token's owner went: the first
+* occurrence that survives the batch keeps an id.
+*
+* @internal Exported for the per-step equivalence test.
+*/
 const mapParagraphKeepers = (oldDoc, transactions, sourceSeed) => {
-	const paraIds = /* @__PURE__ */ new Map();
-	const sourceTokens = /* @__PURE__ */ new Map();
+	const paragraphs = [];
 	oldDoc.descendants((node, pos) => {
 		if (node.type.name !== "paragraph") return true;
 		const id = node.attrs["paraId"];
 		const token = getProseParagraphPropertySourceToken(node);
-		const mapsParaId = isUsableParaId(id) && !paraIds.has(id);
-		const mapsSourceToken = typeof token === "string" && sourceSeed.tokens.has(token);
-		if (!mapsParaId && !mapsSourceToken) return false;
-		let mapped = pos;
-		let mappedInterior = pos + 1;
-		let deleted = false;
-		for (const transaction of transactions) {
-			const ownerResult = transaction.mapping.mapResult(mapped);
-			const interiorResult = transaction.mapping.mapResult(mappedInterior, -1);
-			deleted ||= interiorResult.deletedAcross;
-			mapped = ownerResult.pos;
-			mappedInterior = interiorResult.pos;
-		}
-		if (mapsParaId && !deleted) paraIds.set(id, mapped);
-		if (mapsSourceToken) sourceTokens.set(token, sourceTokens.has(token) ? { status: "ambiguous" } : {
-			pos: mapped,
-			status: deleted ? "deleted" : "mapped"
+		if (isUsableParaId(id) || typeof token === "string" && sourceSeed.tokens.has(token)) paragraphs.push({
+			pos,
+			id,
+			token
 		});
 		return false;
 	});
+	const swept = sweepPositions(transactions.map((transaction) => transaction.mapping), paragraphs.flatMap(({ pos }) => [{
+		pos,
+		assoc: 1,
+		from: 0
+	}, {
+		pos: pos + 1,
+		assoc: -1,
+		from: 0
+	}]));
+	const paraIds = /* @__PURE__ */ new Map();
+	const sourceTokens = /* @__PURE__ */ new Map();
+	for (const [index, { id, token }] of paragraphs.entries()) {
+		const mapped = swept[2 * index].pos;
+		const deleted = swept[2 * index + 1].deletedAcross;
+		if (isUsableParaId(id) && !paraIds.has(id) && !deleted) paraIds.set(id, mapped);
+		if (typeof token === "string" && sourceSeed.tokens.has(token)) sourceTokens.set(token, sourceTokens.has(token) ? { status: "ambiguous" } : {
+			pos: mapped,
+			status: deleted ? "deleted" : "mapped"
+		});
+	}
 	return {
 		paraIds,
 		sourceTokens
@@ -334,4 +347,4 @@ const ParaIdAllocatorExtension = createExtension({
 	}
 });
 //#endregion
-export { ParaIdAllocatorExtension, deterministicParaIdSeedKey, ensureParaIdsInDoc, ensureParaIdsInState, paraIdAllocatorKey, requestDeterministicParaIds };
+export { ParaIdAllocatorExtension, deterministicParaIdSeedKey, ensureParaIdsInDoc, ensureParaIdsInState, mapParagraphKeepers, paraIdAllocatorKey, requestDeterministicParaIds };

package/dist/prosemirror/extensions/features/ParagraphChangeTrackerExtension.d.ts

@@ -1,7 +1,8 @@
+import { document_d_exports } from "../../../types/document.js";
 import { Extension } from "../types.js";
 import { RemovedSectionReference, TrackedSectionEndpointRemoval } from "../../../internal/sectionEndpointResolution.js";
-import { EditorState, PluginKey, Transaction } from "prosemirror-state";
 import { Node } from "prosemirror-model";
+import { EditorState, PluginKey, Transaction } from "prosemirror-state";
 //#region src/prosemirror/extensions/features/ParagraphChangeTrackerExtension.d.ts
 declare const paragraphChangeTrackerKey: PluginKey<InternalParagraphChangeTrackerState>;
 type ParagraphChangeTrackerState = {
@@ -26,6 +27,8 @@ type InternalParagraphChangeTrackerState = ParagraphChangeTrackerState & {
   /** Editing an already unidentified source paragraph cannot become selective. */
   hasUntrackedSourceChanges: boolean;
   blockStructureFingerprint: string;
+  /** The section records themselves, by identity. */
+  sectionRecords: ReadonlySet<document_d_exports.SectionProperties>;
 };
 /**
  * Get the change tracker state from an EditorState
@@ -45,6 +48,24 @@ declare function hasStructuralChanges(state: EditorState): boolean;
 declare function hasUntrackedChanges(state: EditorState): boolean;
 /** Exact section-count transition authorized by tracked paragraph-mark resolution. */
 declare function getTrackedSectionEndpointRemoval(state: EditorState): TrackedSectionEndpointRemoval | null;
+type RepackWithEditorSectionRemovalsOptions<T> = {
+  /** The editor state the document was built from. */
+  state: EditorState;
+  /** The exact document object `repack` hands to `repackDocx`. */
+  document: document_d_exports.Document;
+  repack: () => Promise<T>;
+};
+/**
+ * Run an editor save's full repack with the section removals the editor's own
+ * edits made.
+ *
+ * A save refuses a package with fewer sections than its source unless it is
+ * told which removals were meant: deleting the paragraph that ends a section,
+ * or accepting its tracked deletion, removes that section on purpose. The
+ * tracker records exactly those removals; without them the repack throws and
+ * the edit cannot be saved.
+ */
+declare const repackWithEditorSectionRemovals: <T>({ state, document, repack }: RepackWithEditorSectionRemovalsOptions<T>) => Promise<T>;
 type MarkTrackedSectionEndpointRemovalOptions = {
   sourceDoc: Node;
   removedEndpointCount: number;
@@ -52,6 +73,13 @@ type MarkTrackedSectionEndpointRemovalOptions = {
 };
 /** Record only a complete, internally consistent endpoint-removal transition. */
 declare function markTrackedSectionEndpointRemoval(tr: Transaction, { sourceDoc, removedEndpointCount, removedReferences }: MarkTrackedSectionEndpointRemovalOptions): Transaction;
+/**
+ * Record that `tr` removed section breaks on purpose: a command whose job is
+ * to remove the break (not to delete its paragraph mark, which the tracker
+ * reads for itself). Only a plain removal is recorded; a transaction that also
+ * adds or replaces a record is left as it is.
+ */
+declare function markSectionBreakRemoval(tr: Transaction, sourceDoc: Node): Transaction;
 /**
  * Create a transaction that clears the change tracker
  */
@@ -64,9 +92,10 @@ type MarkChangedParagraphRangesOptions = {
     to: number;
   }[];
   mappingFrom: number;
+  replacesStepMapAt?: number;
 };
 /** Record mark-only paragraph changes whose replacement step has a granular map. */
 declare function markChangedParagraphRanges(tr: Transaction, batch: MarkChangedParagraphRangesOptions): Transaction;
 declare const ParagraphChangeTrackerExtension: (options?: Partial<{}> | undefined) => Extension;
 //#endregion
-export { ParagraphChangeTrackerExtension, ParagraphChangeTrackerState, clearTrackedChanges, getChangeTrackerState, getChangedParagraphIds, getTrackedSectionEndpointRemoval, hasStructuralChanges, hasUntrackedChanges, ignoreTrackedChanges, markChangedParagraphRanges, markStructuralChange, markTrackedSectionEndpointRemoval, paragraphChangeTrackerKey };
+export { ParagraphChangeTrackerExtension, ParagraphChangeTrackerState, clearTrackedChanges, getChangeTrackerState, getChangedParagraphIds, getTrackedSectionEndpointRemoval, hasStructuralChanges, hasUntrackedChanges, ignoreTrackedChanges, markChangedParagraphRanges, markSectionBreakRemoval, markStructuralChange, markTrackedSectionEndpointRemoval, paragraphChangeTrackerKey, repackWithEditorSectionRemovals };