@magic-marker/prosemirror-suggest-changes 0.3.3-wrap-unwrap.16 → 0.3.3-wrap-unwrap.18

package/dist/__tests__/playwrightPage.d.ts

@@ -1,3 +1,4 @@
+import { type Node } from "prosemirror-model";
 import { type Locator, type Page } from "@playwright/test";
 export declare class EditorPage {
     readonly page: Page;
@@ -16,9 +17,10 @@ export declare class EditorPage {
     }>;
     getDOMTextContentOfChildAtIndex(index: number): Promise<string>;
     getDocJSON(): Promise<object>;
+    getCurrentDoc(): Promise<Node>;
     getCurrentAndExpectedDoc(expectedDocJSON: object): Promise<{
-        currentDoc: import("prosemirror-model").Node;
-        expectedDoc: import("prosemirror-model").Node;
+        currentDoc: Node;
+        expectedDoc: Node;
     }>;
     revertAll(): Promise<void>;
     applyAll(): Promise<void>;

package/dist/ensureSelectionPlugin.js

@@ -147,8 +147,8 @@ function isPosValid($pos) {
     const insertionBefore = insertion.isInSet($pos.nodeBefore?.marks ?? []);
     const insertionAfter = insertion.isInSet($pos.nodeAfter?.marks ?? []);
     const ZWSP_REGEXP = new RegExp(ZWSP, "g");
-    const isZWSPBefore = $pos.nodeBefore && $pos.nodeBefore.textContent.replace(ZWSP_REGEXP, "") === "";
-    const isZWSPAfter = $pos.nodeAfter && $pos.nodeAfter.textContent.replace(ZWSP_REGEXP, "") === "";
+    const isZWSPBefore = $pos.nodeBefore && $pos.nodeBefore.isText && $pos.nodeBefore.textContent.replace(ZWSP_REGEXP, "") === "";
+    const isZWSPAfter = $pos.nodeAfter && $pos.nodeAfter.isText && $pos.nodeAfter.textContent.replace(ZWSP_REGEXP, "") === "";
     if (insertionBefore && insertionAfter && isZWSPBefore && isZWSPAfter) {
         trace("isPosValid", $pos.pos, "pos invalid", "reason: between two ZWSP insertions", {
             $pos

package/dist/features/wrapUnwrap/__tests__/buildMaterializedPaths.test.d.ts

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

package/dist/features/wrapUnwrap/buildMaterializedPaths.js

@@ -38,7 +38,7 @@ export function buildMaterializedPaths(doc) {
     });
     // now add the rest of the nodes
     doc.descendants((node, _pos, parent, childIndex)=>{
-        if (node.isText) return false;
+        if (node.isInline) return false;
         const nodeId = getNodeId(node);
         if (nodeId == null) return true;
         // this is to avoid processing direct doc children twice

package/dist/features/wrapUnwrap/structureChangesPlugin.js

@@ -240,15 +240,20 @@ function chainHasStructuralContext(chain, structuralContextPaths) {
     ].reverse().filter((parent)=>parent.nodeType !== DOC_NODE_ID).map((parent)=>parent.nodeType);
     return structuralContextPaths.some((path)=>containsContiguousPath(topDownChain, path));
 }
-// does a chain like: __doc__->nodeTypeA->nodeTypeB->nodeTypeC->nodeTypeD
-// contain a structural context path (a "sub chain") like nodeTypeB->nodeTypeC ?
+// does a chain like: nodeTypeA->nodeTypeB->nodeTypeC
+// end with a structural context path like nodeTypeB->nodeTypeC ?
 function containsContiguousPath(chainNodeTypes, structuralContextPath) {
     if (structuralContextPath.length > chainNodeTypes.length) return false;
-    for(let start = 0; start <= chainNodeTypes.length - structuralContextPath.length; start++){
-        const matches = structuralContextPath.every((nodeType, index)=>chainNodeTypes[start + index] === nodeType);
-        if (matches) return true;
+    let structuralPathPointer = structuralContextPath.length - 1;
+    let chainPointer = chainNodeTypes.length - 1;
+    while(structuralPathPointer >= 0){
+        if (structuralContextPath[structuralPathPointer] !== chainNodeTypes[chainPointer]) {
+            return false;
+        }
+        structuralPathPointer--;
+        chainPointer--;
     }
-    return false;
+    return true;
 }
 // detect block split - try to look at the node above, concatenate two text contents,
 // and see if it combines into a single node in the old document

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

@@ -37,4 +37,9 @@ export type MaterializedPaths = Map<string, {
 }>;
 export declare function guardDocParent(parent: Parent | undefined): parent is DocParent;
 export declare function guardStructureMarkAttrs(attrs: Attrs): attrs is StructureMarkAttrs;
+export interface StructureMark {
+    type: "structure";
+    attrs: StructureMarkAttrs;
+}
+export declare function isStructureMark(mark: unknown): mark is StructureMark;
 export {};

package/dist/features/wrapUnwrap/types.js

@@ -9,3 +9,9 @@ export function guardStructureMarkAttrs(attrs) {
     if (!("op" in data)) return false;
     return true;
 }
+export function isStructureMark(mark) {
+    if (mark === null || typeof mark !== "object") return false;
+    if (!("type" in mark) || mark.type !== "structure") return false;
+    if (!("attrs" in mark)) return false;
+    return guardStructureMarkAttrs(mark.attrs);
+}

package/dist/testing/e2eTestSchema.d.ts

@@ -1,2 +1,2 @@
 import { Schema } from "prosemirror-model";
-export declare function createSchema(deletionMarksVisibility?: "hidden" | "visible"): Schema<"blockquote" | "text" | "doc" | "paragraph" | "horizontal_rule" | "heading" | "code_block" | "image" | "hard_break" | "orderedList" | "bulletList" | "listItem", "insertion" | "deletion" | "modification" | "structure" | "code" | "em" | "link" | "strong">;
+export declare function createSchema(deletionMarksVisibility?: "hidden" | "visible"): Schema<"blockquote" | "text" | "doc" | "paragraph" | "horizontal_rule" | "heading" | "code_block" | "image" | "hard_break" | "orderedList" | "bulletList" | "listItem" | "hardBreak", "insertion" | "deletion" | "modification" | "structure" | "code" | "em" | "link" | "strong">;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magic-marker/prosemirror-suggest-changes",
-  "version": "0.3.3-wrap-unwrap.16",
+  "version": "0.3.3-wrap-unwrap.18",
   "license": "MIT",
   "type": "module",
   "module": "dist/index.js",