@magic-marker/prosemirror-suggest-changes 0.3.3-wrap-unwrap.31 → 0.3.3-wrap-unwrap.32

package/dist/__tests__/playwrightPage.d.ts

@@ -9,6 +9,8 @@ export declare class EditorPage {
     getParagraphText(index: number, childIndexes?: number[]): Promise<string>;
     getParagraphAt(index: number): Locator;
     getParagraphCount(): Promise<number>;
+    getListItems(): Locator;
+    getParagraphs(): Locator;
     getListItemCount(): Promise<number>;
     getProseMirrorMarkCount(name: string): Promise<number>;
     getProseMirrorMarksJSON(): Promise<unknown[]>;

package/dist/commands.js

@@ -5,6 +5,7 @@ import { suggestChangesKey } from "./plugin.js";
 import { getSuggestionMarks } from "./utils.js";
 import { ZWSP } from "./constants.js";
 import { maybeRevertJoinMark } from "./features/joinOnDelete/index.js";
+import { isJoinMark } from "./features/joinOnDelete/types.js";
 import { revertAllStructureSuggestions, revertStructureSuggestion } from "./features/wrapUnwrap/revert/index.js";
 import { applyAllStructureSuggestions, applyStructureSuggestion } from "./features/wrapUnwrap/apply/index.js";
 /**
@@ -65,7 +66,9 @@ import { applyAllStructureSuggestions, applyStructureSuggestion } from "./featur
             tr.removeMark(insertionFrom, insertionTo, markTypeToApply);
             const joinRevertResult = maybeRevertJoinMark(tr, insertionFrom, insertionTo, child, markTypeToApply);
             // reverting a join mark may produce new structure marks that were serialized in the join metadata
-            if (joinRevertResult) joinRevertResult.restoredStructureSuggestionIds.forEach((id)=>restoredStructureSuggestionIds.add(id));
+            if (joinRevertResult) {
+                joinRevertResult.restoredStructureSuggestionIds.forEach((id)=>restoredStructureSuggestionIds.add(id));
+            }
             if (!joinRevertResult && child.text === ZWSP) {
                 tr.delete(insertionFrom, insertionTo);
             }
@@ -78,6 +81,47 @@ import { applyAllStructureSuggestions, applyStructureSuggestion } from "./featur
         restoredStructureSuggestionIds
     };
 }
+/**
+ * Collect suggestion IDs of join marks in the node
+ *
+ * @param node
+ * @param deletion
+ * @returns an array of suggestion IDs
+ */ function findJoinSuggestionIds(node, deletion) {
+    const joinSuggestionIds = [];
+    node.descendants((child)=>{
+        const mark = deletion.isInSet(child.marks);
+        if (!mark || !isJoinMark(mark)) return true;
+        if (!child.isText || child.text !== ZWSP) return true;
+        joinSuggestionIds.push(mark.attrs.id);
+        return true;
+    });
+    return joinSuggestionIds.reverse();
+}
+/**
+ * Revert suggestions revealed by reverting a join mark
+ * Prioritize reverting revealed suggestions with the same id as the join mark
+ * (that means they are linked to the join mark and has to be reverted together as one)
+ * Revert other revealed suggestions as well so the user doesn't have to revert multiple times at the same place
+ *
+ * @param tr
+ * @param suggestionId
+ * @param restoredStructureSuggestionIds
+ */ function revertRestoredStructureSuggestions(tr, suggestionId, restoredStructureSuggestionIds) {
+    if (restoredStructureSuggestionIds.has(suggestionId)) {
+        const restoredStructureTransform = revertStructureSuggestion(tr.doc, suggestionId);
+        restoredStructureTransform.steps.forEach((step)=>{
+            tr.step(step);
+        });
+    }
+    restoredStructureSuggestionIds.forEach((restoredSuggestionId)=>{
+        if (restoredSuggestionId === suggestionId) return;
+        const restoredStructureTransform = revertStructureSuggestion(tr.doc, restoredSuggestionId);
+        restoredStructureTransform.steps.forEach((step)=>{
+            tr.step(step);
+        });
+    });
+}
 function revertModifications(node, pos, tr) {
     const { modification } = getSuggestionMarks(node.type.schema);
     const existingMods = node.marks.filter((mark)=>mark.type === modification);
@@ -291,7 +335,17 @@ export function applySuggestionsToRange(doc, from, to) {
     const { deletion, insertion } = getSuggestionMarks(state.schema);
     // create a structure transform that reverts all structure changes on the given document
     const structureTransform = revertAllStructureSuggestions(state.doc);
-    // then start a clear transform from the document where the structure changes are reverted
+    // revert all join marks first as well as any structure marks they contain serialized
+    const joinSuggestionIds = findJoinSuggestionIds(structureTransform.doc, deletion);
+    joinSuggestionIds.forEach((suggestionId)=>{
+        const suggestionsTransform = new Transform(structureTransform.doc);
+        const { restoredStructureSuggestionIds } = applySuggestionsToTransform(suggestionsTransform.doc, suggestionsTransform, deletion, insertion, suggestionId);
+        suggestionsTransform.steps.forEach((step)=>{
+            structureTransform.step(step);
+        });
+        revertRestoredStructureSuggestions(structureTransform, suggestionId, restoredStructureSuggestionIds);
+    });
+    // then start a clear transform from the document where the structure changes and join marks are reverted
     const suggestionsTransform = new Transform(structureTransform.doc);
     applySuggestionsToTransform(suggestionsTransform.doc, suggestionsTransform, deletion, insertion);
     applyModificationsToTransform(suggestionsTransform.doc, suggestionsTransform, -1);
@@ -370,12 +424,9 @@ export function applySuggestionsToRange(doc, from, to) {
         suggestionsTransform.steps.forEach((step)=>{
             structureTransform.step(step);
         });
-        restoredStructureSuggestionIds.forEach((suggestionId)=>{
-            const restoredStructureTransform = revertStructureSuggestion(structureTransform.doc, suggestionId);
-            restoredStructureTransform.steps.forEach((step)=>{
-                structureTransform.step(step);
-            });
-        });
+        // in case there are structure marks revealed after join mark revert,
+        // revert them as well
+        revertRestoredStructureSuggestions(structureTransform, suggestionId, restoredStructureSuggestionIds);
         // apply the structure transform to the transaction
         const transaction = state.tr;
         structureTransform.steps.forEach((step)=>{

package/dist/features/joinOnDelete/__tests__/listWithJoinsAndStructureMarks.playwright.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/features/joinOnDelete/types.d.ts

@@ -1,4 +1,5 @@
 import { type Mark, type Attrs, type Node } from "prosemirror-model";
+import { type SuggestionId } from "../../generateId.js";
 export interface SerializedJoinNode {
     type: string;
     attrs: object;
@@ -7,6 +8,7 @@ export interface SerializedJoinNode {
     }[];
 }
 export interface JoinMarkAttrs {
+    id: SuggestionId;
     type: "join";
     data: {
         leftNode?: SerializedJoinNode;

package/dist/features/joinOnDelete/types.js

@@ -5,6 +5,9 @@ export function isSerializedJoinNode(node) {
     return typeof data.type === "string" && typeof data.attrs === "object" && data.attrs !== null && Array.isArray(data.marks);
 }
 export function isJoinMarkAttrs(attrs) {
+    if (typeof attrs["id"] !== "string" && typeof attrs["id"] !== "number") {
+        return false;
+    }
     if (attrs["type"] !== "join") return false;
     if (attrs["data"] == null) return false;
     return true;

package/dist/features/startToStartTextblockDeletion/index.d.ts

@@ -0,0 +1,6 @@
+import { type Selection } from "prosemirror-state";
+import { type ReplaceStep, type Step } from "prosemirror-transform";
+export declare function adjustForStartToStartTextblockDeletion(selection: Selection, step: ReplaceStep, prevSteps: Step[]): {
+    from: number;
+    to: number;
+};

package/dist/features/startToStartTextblockDeletion/index.js

@@ -0,0 +1,54 @@
+import { TextSelection } from "prosemirror-state";
+export function adjustForStartToStartTextblockDeletion(selection, step, prevSteps) {
+    if (prevSteps.length > 0) return {
+        from: step.from,
+        to: step.to
+    };
+    if (!(selection instanceof TextSelection)) {
+        return {
+            from: step.from,
+            to: step.to
+        };
+    }
+    if (selection.empty || step.slice.size !== 0) {
+        return {
+            from: step.from,
+            to: step.to
+        };
+    }
+    const { $from, $to } = selection;
+    if (!$from.parent.isTextblock || !$to.parent.isTextblock) {
+        return {
+            from: step.from,
+            to: step.to
+        };
+    }
+    if ($from.parentOffset !== 0 || $to.parentOffset !== 0) {
+        return {
+            from: step.from,
+            to: step.to
+        };
+    }
+    if ($from.start() === $to.start()) return {
+        from: step.from,
+        to: step.to
+    };
+    if (step.from !== $from.before($from.depth)) {
+        return {
+            from: step.from,
+            to: step.to
+        };
+    }
+    if (step.to !== $to.before($to.depth)) {
+        return {
+            from: step.from,
+            to: step.to
+        };
+    }
+    // The step boundary is moved before the right textblock, but the selection
+    // boundary is the user-visible end of the deleted text range.
+    return {
+        from: step.from,
+        to: selection.to
+    };
+}

package/dist/features/transactionShaping/tipTapParagraphIntoListJoin/handleTipTapParagraphIntoListJoin.js

@@ -1,5 +1,6 @@
 import { EditorState, Selection } from "prosemirror-state";
 import { preserveTransactionData, transformToSuggestionTransaction } from "../../../transformToSuggestionTransaction.js";
+import { generateNextNumberId } from "../../../generateId.js";
 import { suggestStructureChanges } from "../../wrapUnwrap/structureChangesPlugin.js";
 import { detectSpecialTransactionShape } from "../detectSpecialTransactionShape.js";
 // handle the specific TipTap pattern when backspacing from a paragraph into a list above
@@ -14,6 +15,8 @@ export function handleTipTapParagraphIntoListJoin(args) {
     const docBefore = args.transaction.docs[0];
     if (!docBefore) return null;
     const trackedTransaction = args.state.tr;
+    const sharedSuggestionId = args.generateId ? args.generateId(args.state.schema, docBefore) : generateNextNumberId(args.state.schema, docBefore);
+    const generateSharedSuggestionId = ()=>sharedSuggestionId;
     try {
         trackedTransaction.step(shape.deleteStep);
         trackedTransaction.step(shape.insertStep);
@@ -26,7 +29,7 @@ export function handleTipTapParagraphIntoListJoin(args) {
     uniqueNodeIdsTransform.steps.forEach((step)=>{
         trackedTransaction.step(step);
     });
-    const structureChangesResult = suggestStructureChanges(docBefore, uniqueNodeIdsTransform.doc, args.structuralContextPaths, args.generateId);
+    const structureChangesResult = suggestStructureChanges(docBefore, uniqueNodeIdsTransform.doc, args.structuralContextPaths, generateSharedSuggestionId);
     if (!structureChangesResult.handled) {
         return null;
     }
@@ -43,7 +46,7 @@ export function handleTipTapParagraphIntoListJoin(args) {
     } catch  {
         return null;
     }
-    const trackedJoinTransaction = transformToSuggestionTransaction(joinTransaction, intermediateState, args.generateId);
+    const trackedJoinTransaction = transformToSuggestionTransaction(joinTransaction, intermediateState, generateSharedSuggestionId);
     trackedJoinTransaction.steps.forEach((step)=>{
         trackedTransaction.step(step);
     });

package/dist/replaceStep.js

@@ -4,6 +4,8 @@ import { rebasePos } from "./rebasePos.js";
 import { getSuggestionMarks } from "./utils.js";
 import { joinBlocks } from "./features/joinBlocks/index.js";
 import { collapseZWSPNodes, findJoinMark, joinNodesAndMarkJoinPoints, removeZWSPDeletions } from "./features/joinOnDelete/index.js";
+import { adjustForStartToStartTextblockDeletion } from "./features/startToStartTextblockDeletion/index.js";
+// import { rebaseStep } from "./rebaseStep.js";
 /**
  * Transform a replace step into its equivalent tracked steps.
  *
@@ -35,17 +37,18 @@ import { collapseZWSPNodes, findJoinMark, joinNodesAndMarkJoinPoints, removeZWSP
  * zero-width spaces will be removed.
  */ export function suggestReplaceStep(trackedTransaction, state, doc, step, prevSteps, suggestionId) {
     const { deletion, insertion } = getSuggestionMarks(state.schema);
+    const semanticStep = adjustForStartToStartTextblockDeletion(state.selection, step, prevSteps);
     // Check for insertion and deletion marks directly
     // adjacent to this step's boundaries. If they exist,
     // we'll use their ids, rather than producing a new one
-    const nodeBefore = doc.resolve(step.from).nodeBefore;
+    const nodeBefore = doc.resolve(semanticStep.from).nodeBefore;
     const markBefore = nodeBefore?.marks.find((mark)=>mark.type === deletion || mark.type === insertion) ?? null;
-    const nodeAfter = doc.resolve(step.to).nodeAfter;
+    const nodeAfter = doc.resolve(semanticStep.to).nodeAfter;
     const markAfter = nodeAfter?.marks.find((mark)=>mark.type === deletion || mark.type === insertion) ?? null;
     let markId = markBefore?.attrs["id"] ?? markAfter?.attrs["id"] ?? suggestionId;
     // Rebase this step's boundaries onto the newest doc
-    let stepFrom = rebasePos(step.from, prevSteps, trackedTransaction.steps);
-    let stepTo = rebasePos(step.to, prevSteps, trackedTransaction.steps);
+    let stepFrom = rebasePos(semanticStep.from, prevSteps, trackedTransaction.steps);
+    let stepTo = rebasePos(semanticStep.to, prevSteps, trackedTransaction.steps);
     if (state.selection.empty && stepFrom !== stepTo) {
         trackedTransaction.setSelection(TextSelection.near(trackedTransaction.doc.resolve(stepFrom)));
     }
@@ -58,8 +61,8 @@ import { collapseZWSPNodes, findJoinMark, joinNodesAndMarkJoinPoints, removeZWSP
     }
     // Update the step boundaries, since we may have just changed
     // the document
-    stepFrom = rebasePos(step.from, prevSteps, trackedTransaction.steps);
-    stepTo = rebasePos(step.to, prevSteps, trackedTransaction.steps);
+    stepFrom = rebasePos(semanticStep.from, prevSteps, trackedTransaction.steps);
+    stepTo = rebasePos(semanticStep.to, prevSteps, trackedTransaction.steps);
     // Re-resolve nodeAfter and markAfter if we did a block join
     // The original values are stale after joinBlocks modifies the document
     let nodeAfterResolved = nodeAfter;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magic-marker/prosemirror-suggest-changes",
-  "version": "0.3.3-wrap-unwrap.31",
+  "version": "0.3.3-wrap-unwrap.32",
   "license": "MIT",
   "type": "module",
   "module": "dist/index.js",
@@ -55,17 +55,17 @@
     "markdown-toc": "^1.2.0",
     "playwright": "^1.56.0",
     "prettier": "^3.5.3",
-    "prosemirror-commands": "^1.7.0",
-    "prosemirror-history": "^1.5.0",
-    "prosemirror-inputrules": "^1.4.0",
-    "prosemirror-keymap": "^1.2.2",
-    "prosemirror-model": "^1.24.1",
-    "prosemirror-schema-basic": "^1.2.3",
-    "prosemirror-schema-list": "^1.5.0",
-    "prosemirror-state": "^1.4.3",
-    "prosemirror-test-builder": "^1.1.1",
-    "prosemirror-transform": "^1.10.2",
-    "prosemirror-view": "^1.38.0",
+    "prosemirror-commands": "1.7.1",
+    "prosemirror-history": "1.5.0",
+    "prosemirror-inputrules": "1.5.1",
+    "prosemirror-keymap": "1.2.3",
+    "prosemirror-model": "1.25.4",
+    "prosemirror-schema-basic": "1.2.4",
+    "prosemirror-schema-list": "1.5.1",
+    "prosemirror-state": "1.4.4",
+    "prosemirror-test-builder": "1.1.1",
+    "prosemirror-transform": "1.12.0",
+    "prosemirror-view": "1.41.9",
     "remark-parse": "^11.0.0",
     "rimraf": "^6.0.1",
     "typescript": "^5.8.2",
@@ -79,5 +79,17 @@
     "prosemirror-state": "^1.0.0",
     "prosemirror-transform": "^1.0.0",
     "prosemirror-view": "^1.0.0"
+  },
+  "resolutions": {
+    "prosemirror-model": "1.25.4",
+    "prosemirror-state": "1.4.4",
+    "prosemirror-transform": "1.12.0",
+    "prosemirror-view": "1.41.9",
+    "prosemirror-keymap": "1.2.3",
+    "prosemirror-commands": "1.7.1",
+    "prosemirror-schema-basic": "1.2.4",
+    "prosemirror-schema-list": "1.5.1",
+    "prosemirror-history": "1.5.0",
+    "prosemirror-inputrules": "1.5.1"
   }
 }