@magic-marker/prosemirror-suggest-changes 0.3.2 → 0.3.3-wrap-unwrap.0

package/dist/commands.d.ts

@@ -51,7 +51,9 @@ export declare function revertSuggestionsInRange(from?: number, to?: number): Co
  * The deletion mark will be removed, and their contents left in the doc.
  * Modifications tracked in modification marks will be reverted.
  */
-export declare function revertSuggestion(suggestionId: SuggestionId, from?: number, to?: number): Command;
+export declare function revertSuggestion(suggestionId: SuggestionId, from?: number, to?: number, opts?: {
+    structure: boolean;
+}): Command;
 /**
  * Command that updates the selection to cover an existing change.
  */

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 { applyStructureSuggestion, isStructureSuggestion, revertAllStructureSuggestions, revertStructureSuggestion } from "./features/wrapUnwrap/revertStructureSuggestion.js";
 /**
  * Given a node and a transform, add a set of steps to the
  * transform that applies all marks of type markTypeToApply
@@ -193,6 +194,9 @@ export function applySuggestionsToRange(doc, from, to) {
  * contents left in the doc.
  */ export function applySuggestion(suggestionId, from, to) {
     return (state, dispatch)=>{
+        if (isStructureSuggestion(suggestionId, state.tr)) {
+            return applyStructureSuggestion(suggestionId)(state, dispatch);
+        }
         const { deletion, insertion } = getSuggestionMarks(state.schema);
         const tr = state.tr;
         applySuggestionsToTransform(state.doc, tr, insertion, deletion, suggestionId, from, to);
@@ -214,7 +218,9 @@ export function applySuggestionsToRange(doc, from, to) {
  */ export function revertSuggestions(state, dispatch) {
     const { deletion, insertion } = getSuggestionMarks(state.schema);
     const tr = state.tr;
-    applySuggestionsToTransform(state.doc, tr, deletion, insertion);
+    const doc = state.doc;
+    revertAllStructureSuggestions(doc, tr);
+    applySuggestionsToTransform(doc, tr, deletion, insertion);
     applyModificationsToTransform(tr.doc, tr, -1);
     tr.setMeta(suggestChangesKey, {
         skip: true
@@ -247,8 +253,14 @@ export function applySuggestionsToRange(doc, from, to) {
  * This means that all content within the insertion mark will be deleted.
  * The deletion mark will be removed, and their contents left in the doc.
  * Modifications tracked in modification marks will be reverted.
- */ export function revertSuggestion(suggestionId, from, to) {
+ */ export function revertSuggestion(suggestionId, from, to, opts) {
     return (state, dispatch)=>{
+        if (opts?.structure === true) {
+            return revertStructureSuggestion(suggestionId)(state, dispatch);
+        }
+        if (opts?.structure !== false && isStructureSuggestion(suggestionId, state.tr)) {
+            return revertStructureSuggestion(suggestionId)(state, dispatch);
+        }
         const { deletion, insertion } = getSuggestionMarks(state.schema);
         const tr = state.tr;
         applySuggestionsToTransform(state.doc, tr, deletion, insertion, suggestionId, from, to);

package/dist/contentBetween.d.ts

@@ -0,0 +1,2 @@
+import { type Node } from "prosemirror-model";
+export declare function contentBetween(doc: Node, from: number, to: number): boolean;

package/dist/contentBetween.js

@@ -0,0 +1,33 @@
+/*
+    This function is used by ProseMirror to verify structure steps
+    https://github.com/ProseMirror/prosemirror-transform/blob/1.11.0/src/replace_step.ts#L163
+    https://github.com/ProseMirror/prosemirror-transform/blob/1.11.0/src/replace_step.ts#L110
+
+    If step is a structure step (structure: true), 
+    it means the range it covers does not contain any content 
+    except for closing and opening tokens (see https://prosemirror.net/docs/ref/#transform.ReplaceStep)
+    
+    ProseMirror throws an error if this function returns true for a structure step
+    https://github.com/ProseMirror/prosemirror-transform/blob/1.11.0/src/replace_step.ts#L30
+    
+    We can use this function to do the opposite - 
+    if some step has structure: false, 
+    but this function return false,
+    then we can treat the step as a structure step
+ */ export function contentBetween(doc, from, to) {
+    // eslint-disable-next-line prefer-const
+    let $from = doc.resolve(from), dist = to - from, depth = $from.depth;
+    while(dist > 0 && depth > 0 && $from.indexAfter(depth) == $from.node(depth).childCount){
+        depth--;
+        dist--;
+    }
+    if (dist > 0) {
+        let next = $from.node(depth).maybeChild($from.indexAfter(depth));
+        while(dist > 0){
+            if (!next || next.isLeaf) return true;
+            next = next.firstChild;
+            dist--;
+        }
+    }
+    return false;
+}

package/dist/features/wrapUnwrap/__tests__/blockquoteUnwrapAllNodes.data.d.ts

@@ -0,0 +1,38 @@
+export declare const initialDoc: import("prosemirror-model").Node & {
+    tag: {
+        [tag: string]: number;
+    };
+};
+export declare const finalDoc: import("prosemirror-model").Node & {
+    tag: {
+        [tag: string]: number;
+    };
+};
+export declare const finalDocWithMarks: import("prosemirror-model").Node & {
+    tag: {
+        [tag: string]: number;
+    };
+};
+export declare const steps: {
+    stepType: string;
+    from: number;
+    to: number;
+    gapFrom: number;
+    gapTo: number;
+    insert: number;
+    structure: boolean;
+}[];
+export declare const inverseSteps: {
+    stepType: string;
+    from: number;
+    to: number;
+    gapFrom: number;
+    gapTo: number;
+    insert: number;
+    slice: {
+        content: {
+            type: string;
+        }[];
+    };
+    structure: boolean;
+}[];

package/dist/features/wrapUnwrap/__tests__/blockquoteUnwrapAllNodes.playwright.test.d.ts

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

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

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

package/dist/features/wrapUnwrap/__tests__/blockquoteUnwrapOneNode.data.d.ts

@@ -0,0 +1,45 @@
+export declare const initialDoc: import("prosemirror-model").Node & {
+    tag: {
+        [tag: string]: number;
+    };
+};
+export declare const finalDoc: import("prosemirror-model").Node & {
+    tag: {
+        [tag: string]: number;
+    };
+};
+export declare const finalDocWithMarks: import("prosemirror-model").Node & {
+    tag: {
+        [tag: string]: number;
+    };
+};
+export declare const steps: {
+    stepType: string;
+    from: number;
+    to: number;
+    gapFrom: number;
+    gapTo: number;
+    insert: number;
+    slice: {
+        content: {
+            type: string;
+        }[];
+        openStart: number;
+    };
+    structure: boolean;
+}[];
+export declare const inverseSteps: {
+    stepType: string;
+    from: number;
+    to: number;
+    gapFrom: number;
+    gapTo: number;
+    insert: number;
+    slice: {
+        content: {
+            type: string;
+        }[];
+        openStart: number;
+    };
+    structure: boolean;
+}[];

package/dist/features/wrapUnwrap/__tests__/blockquoteUnwrapOneNode.playwright.test.d.ts

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

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

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

package/dist/features/wrapUnwrap/__tests__/blockquoteUnwrapSingleNode.data.d.ts

@@ -0,0 +1,38 @@
+export declare const initialDoc: import("prosemirror-model").Node & {
+    tag: {
+        [tag: string]: number;
+    };
+};
+export declare const finalDoc: import("prosemirror-model").Node & {
+    tag: {
+        [tag: string]: number;
+    };
+};
+export declare const finalDocWithMarks: import("prosemirror-model").Node & {
+    tag: {
+        [tag: string]: number;
+    };
+};
+export declare const steps: {
+    stepType: string;
+    from: number;
+    to: number;
+    gapFrom: number;
+    gapTo: number;
+    insert: number;
+    structure: boolean;
+}[];
+export declare const inverseSteps: {
+    stepType: string;
+    from: number;
+    to: number;
+    gapFrom: number;
+    gapTo: number;
+    insert: number;
+    slice: {
+        content: {
+            type: string;
+        }[];
+    };
+    structure: boolean;
+}[];

package/dist/features/wrapUnwrap/__tests__/blockquoteUnwrapSingleNode.playwright.test.d.ts

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

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

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

package/dist/features/wrapUnwrap/__tests__/blockquoteWrapAllNodes.data.d.ts

@@ -0,0 +1,38 @@
+export declare const initialDoc: import("prosemirror-model").Node & {
+    tag: {
+        [tag: string]: number;
+    };
+};
+export declare const finalDoc: import("prosemirror-model").Node & {
+    tag: {
+        [tag: string]: number;
+    };
+};
+export declare const finalDocWithMarks: import("prosemirror-model").Node & {
+    tag: {
+        [tag: string]: number;
+    };
+};
+export declare const steps: {
+    stepType: string;
+    from: number;
+    to: number;
+    gapFrom: number;
+    gapTo: number;
+    insert: number;
+    slice: {
+        content: {
+            type: string;
+        }[];
+    };
+    structure: boolean;
+}[];
+export declare const inverseSteps: {
+    stepType: string;
+    from: number;
+    to: number;
+    gapFrom: number;
+    gapTo: number;
+    insert: number;
+    structure: boolean;
+}[];

package/dist/features/wrapUnwrap/__tests__/blockquoteWrapAllNodes.playwright.test.d.ts

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

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

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

package/dist/features/wrapUnwrap/__tests__/blockquoteWrapSingleNode.data.d.ts

@@ -0,0 +1,38 @@
+export declare const initialDoc: import("prosemirror-model").Node & {
+    tag: {
+        [tag: string]: number;
+    };
+};
+export declare const finalDoc: import("prosemirror-model").Node & {
+    tag: {
+        [tag: string]: number;
+    };
+};
+export declare const finalDocWithMarks: import("prosemirror-model").Node & {
+    tag: {
+        [tag: string]: number;
+    };
+};
+export declare const steps: {
+    stepType: string;
+    from: number;
+    to: number;
+    gapFrom: number;
+    gapTo: number;
+    insert: number;
+    slice: {
+        content: {
+            type: string;
+        }[];
+    };
+    structure: boolean;
+}[];
+export declare const inverseSteps: {
+    stepType: string;
+    from: number;
+    to: number;
+    gapFrom: number;
+    gapTo: number;
+    insert: number;
+    structure: boolean;
+}[];

package/dist/features/wrapUnwrap/__tests__/blockquoteWrapSingleNode.playwright.test.d.ts

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

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

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

package/dist/features/wrapUnwrap/__tests__/listItemLiftLast.data.d.ts

@@ -0,0 +1,54 @@
+export declare const initialDoc: import("prosemirror-model").Node & {
+    tag: {
+        [tag: string]: number;
+    };
+};
+export declare const finalDoc: import("prosemirror-model").Node & {
+    tag: {
+        [tag: string]: number;
+    };
+};
+export declare const finalDocWithMarks: import("prosemirror-model").Node & {
+    tag: {
+        [tag: string]: number;
+    };
+};
+export declare const steps: {
+    stepType: string;
+    from: number;
+    to: number;
+    gapFrom: number;
+    gapTo: number;
+    insert: number;
+    slice: {
+        content: {
+            type: string;
+            attrs: {
+                order: number;
+            };
+        }[];
+        openStart: number;
+    };
+    structure: boolean;
+}[];
+export declare const inverseSteps: {
+    stepType: string;
+    from: number;
+    to: number;
+    gapFrom: number;
+    gapTo: number;
+    insert: number;
+    slice: {
+        content: {
+            type: string;
+            attrs: {
+                order: number;
+            };
+            content: {
+                type: string;
+            }[];
+        }[];
+        openStart: number;
+    };
+    structure: boolean;
+}[];

package/dist/features/wrapUnwrap/__tests__/listItemLiftLast.playwright.test.d.ts

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

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

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

package/dist/features/wrapUnwrap/__tests__/listItemLiftMiddle.data.d.ts

@@ -0,0 +1,48 @@
+export declare const initialDoc: import("prosemirror-model").Node & {
+    tag: {
+        [tag: string]: number;
+    };
+};
+export declare const finalDoc: import("prosemirror-model").Node & {
+    tag: {
+        [tag: string]: number;
+    };
+};
+export declare const finalDocWithMarks: import("prosemirror-model").Node & {
+    tag: {
+        [tag: string]: number;
+    };
+};
+export declare const steps: {
+    stepType: string;
+    from: number;
+    to: number;
+    gapFrom: number;
+    gapTo: number;
+    insert: number;
+    slice: {
+        content: {
+            type: string;
+            attrs: {
+                order: number;
+            };
+        }[];
+        openStart: number;
+        openEnd: number;
+    };
+    structure: boolean;
+}[];
+export declare const inverseSteps: {
+    stepType: string;
+    from: number;
+    to: number;
+    gapFrom: number;
+    gapTo: number;
+    insert: number;
+    slice: {
+        content: {
+            type: string;
+        }[];
+    };
+    structure: boolean;
+}[];

package/dist/features/wrapUnwrap/__tests__/listItemLiftMiddle.playwright.test.d.ts

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

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

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

package/dist/features/wrapUnwrap/__tests__/listItemLiftMultipleToTheTop.data.d.ts

@@ -0,0 +1,74 @@
+export declare const initialDoc: import("prosemirror-model").Node & {
+    tag: {
+        [tag: string]: number;
+    };
+};
+export declare const finalDoc: import("prosemirror-model").Node & {
+    tag: {
+        [tag: string]: number;
+    };
+};
+export declare const finalDocWithMarks: import("prosemirror-model").Node & {
+    tag: {
+        [tag: string]: number;
+    };
+};
+export declare const steps: ({
+    stepType: string;
+    from: number;
+    to: number;
+    gapFrom?: never;
+    gapTo?: never;
+    insert?: never;
+    slice?: never;
+    structure?: never;
+} | {
+    stepType: string;
+    from: number;
+    to: number;
+    gapFrom: number;
+    gapTo: number;
+    insert: number;
+    slice: {
+        content: {
+            type: string;
+            attrs: {
+                order: number;
+            };
+        }[];
+        openStart: number;
+        openEnd: number;
+    };
+    structure: boolean;
+})[];
+export declare const inverseSteps: ({
+    stepType: string;
+    from: number;
+    to: number;
+    slice: {
+        content: {
+            type: string;
+        }[];
+        openStart: number;
+        openEnd: number;
+    };
+    gapFrom?: never;
+    gapTo?: never;
+    insert?: never;
+    structure?: never;
+} | {
+    stepType: string;
+    from: number;
+    to: number;
+    gapFrom: number;
+    gapTo: number;
+    insert: number;
+    slice: {
+        content: {
+            type: string;
+        }[];
+        openStart?: never;
+        openEnd?: never;
+    };
+    structure: boolean;
+})[];

package/dist/features/wrapUnwrap/__tests__/listItemLiftMultipleToTheTop.playwright.test.d.ts

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

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

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

package/dist/features/wrapUnwrap/__tests__/listItemLiftNestedOnce.data.d.ts

@@ -0,0 +1,71 @@
+export declare const initialDoc: import("prosemirror-model").Node & {
+    tag: {
+        [tag: string]: number;
+    };
+};
+export declare const finalDoc: import("prosemirror-model").Node & {
+    tag: {
+        [tag: string]: number;
+    };
+};
+export declare const finalDocWithMarks: import("prosemirror-model").Node & {
+    tag: {
+        [tag: string]: number;
+    };
+};
+export declare const steps: {
+    stepType: string;
+    from: number;
+    to: number;
+    gapFrom: number;
+    gapTo: number;
+    insert: number;
+    slice: {
+        content: {
+            type: string;
+            content: {
+                type: string;
+                attrs: {
+                    order: number;
+                };
+            }[];
+        }[];
+        openStart: number;
+    };
+    structure: boolean;
+}[];
+export declare const inverseSteps: ({
+    stepType: string;
+    from: number;
+    to: number;
+    gapFrom: number;
+    gapTo: number;
+    insert: number;
+    slice: {
+        content: {
+            type: string;
+        }[];
+        openStart: number;
+    };
+    structure: boolean;
+} | {
+    stepType: string;
+    from: number;
+    to: number;
+    gapFrom: number;
+    gapTo: number;
+    insert: number;
+    slice: {
+        content: {
+            type: string;
+            content: {
+                type: string;
+                attrs: {
+                    order: number;
+                };
+            }[];
+        }[];
+        openStart: number;
+    };
+    structure: boolean;
+})[];

package/dist/features/wrapUnwrap/__tests__/listItemLiftNestedOnce.playwright.test.d.ts

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

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

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

package/dist/features/wrapUnwrap/__tests__/listItemLiftTop.data.d.ts

@@ -0,0 +1,54 @@
+export declare const initialDoc: import("prosemirror-model").Node & {
+    tag: {
+        [tag: string]: number;
+    };
+};
+export declare const finalDoc: import("prosemirror-model").Node & {
+    tag: {
+        [tag: string]: number;
+    };
+};
+export declare const finalDocWithMarks: import("prosemirror-model").Node & {
+    tag: {
+        [tag: string]: number;
+    };
+};
+export declare const steps: {
+    stepType: string;
+    from: number;
+    to: number;
+    gapFrom: number;
+    gapTo: number;
+    insert: number;
+    slice: {
+        content: {
+            type: string;
+            attrs: {
+                order: number;
+            };
+        }[];
+        openEnd: number;
+    };
+    structure: boolean;
+}[];
+export declare const inverseSteps: {
+    stepType: string;
+    from: number;
+    to: number;
+    gapFrom: number;
+    gapTo: number;
+    insert: number;
+    slice: {
+        content: {
+            type: string;
+            attrs: {
+                order: number;
+            };
+            content: {
+                type: string;
+            }[];
+        }[];
+        openEnd: number;
+    };
+    structure: boolean;
+}[];

package/dist/features/wrapUnwrap/__tests__/listItemLiftTop.playwright.test.d.ts

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

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

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