prosemirror-transform 1.11.0 → 1.12.1

package/CHANGELOG.md

@@ -1,3 +1,19 @@
+## 1.12.1 (2026-09-02)
+
+### Bug fixes
+
+Fix an issue where replace step fitting could create an invalid slice, and then crash or loop forever.
+
+## 1.12.0 (2026-03-30)
+
+### Bug fixes
+
+Handle deletions that go from the beginning of one textblock to the beginning of another specially, deleting the selected textblocks entirely.
+
+### New features
+
+`ReplaceStep.MAP_BIAS` can now be adjusted to change the way insertion steps are mapped over other insertions at the same place. The default behavior remains the same for the sake of backwards compatibility.
+
 ## 1.11.0 (2026-01-21)
 
 ### New features

package/CONTRIBUTING.md

@@ -12,7 +12,7 @@ Community discussion, questions, and informal bug reporting is done on the
 ## Submitting bug reports
 
 Report bugs on the
-[GitHub issue tracker](http://github.com/prosemirror/prosemirror/issues).
+[issue tracker](https://code.haverbeke.berlin/prosemirror/prosemirror/issues).
 Before reporting a bug, please read these pointers.
 
 - The issue tracker is for *bugs*, not requests for help. Questions
@@ -34,25 +34,28 @@ Before reporting a bug, please read these pointers.
 
 ## Contributing code
 
+Code generated by a language model is not welcome in this project.
+Please don't waste my time with it.
+
 If you want to make a change that involves a significant overhaul of
 the code or introduces a user-visible new feature, create an
-[RFC](https://github.com/ProseMirror/rfcs/) first with your proposal.
+[issue](https://code.haverbeke.berlin/prosemirror/prosemirror/issues/)
+first with your proposal.
 
-- Make sure you have a [GitHub Account](https://github.com/signup/free)
+- Make sure you have a [Codeberg](https://codeberg.org/user/sign_up)
+  or [GitHub](https://github.com/signup/free) account.
+  
+- Use that to create a [code.haverbeke.berlin
+  account](https://code.haverbeke.berlin/user/login).
 
-- Fork the relevant repository
-  ([how to fork a repo](https://help.github.com/articles/fork-a-repo))
+- Fork the relevant repository.
 
 - Create a local checkout of the code. You can use the
-  [main repository](https://github.com/prosemirror/prosemirror) to
+  [main repository](https://code.haverbeke.berlin/prosemirror/prosemirror) to
   easily check out all core modules.
 
 - Make your changes, and commit them
 
-- Follow the code style of the rest of the project (see below). Run
-  `npm run lint` (in the main repository checkout) to make sure that
-  the linter is happy.
-
 - If your changes are easy to test or likely to regress, add tests in
   the relevant `test/` directory. Either put them in an existing
   `test-*.js` file, if they fit there, or add a new file.
@@ -60,13 +63,13 @@ the code or introduces a user-visible new feature, create an
 - Make sure all tests pass. Run `npm run test` to verify tests pass
   (you will need Node.js v6+).
 
-- Submit a pull request ([how to create a pull request](https://help.github.com/articles/fork-a-repo)).
-  Don't put more than one feature/fix in a single pull request.
+- Submit a pull request. Don't put more than one feature/fix in a
+  single pull request.
 
 By contributing code to ProseMirror you
 
  - Agree to license the contributed code under the project's [MIT
-   license](https://github.com/ProseMirror/prosemirror/blob/master/LICENSE).
+   license](https://code.haverbeke.berlin/prosemirror/prosemirror/blob/main/LICENSE).
 
  - Confirm that you have the right to contribute and license the code
    in question. (Either you hold all rights on the code, or the rights
@@ -86,19 +89,16 @@ By contributing code to ProseMirror you
 - Follow the surrounding code when it comes to spacing, brace
   placement, etc.
 
-- Brace-less single-statement bodies are encouraged (whenever they
-  don't impact readability).
+- Brace-less single-statement bodies are encouraged whenever they
+  don't impact readability.
 
-- [getdocs](https://github.com/marijnh/getdocs)-style doc comments
+- [getdocs-ts](https://code.haverbeke.berlin/marijn/getdocs-ts)-style doc comments
   above items that are part of the public API.
 
 - When documenting non-public items, you can put the type after a
   single colon, so that getdocs doesn't pick it up and add it to the
   API reference.
 
-- The linter (`npm run lint`) complains about unused variables and
-  functions. Prefix their names with an underscore to muffle it.
-
 - ProseMirror does *not* follow JSHint or JSLint prescribed style.
   Patches that try to 'fix' code to pass one of these linters will not
   be accepted.

package/README.md

@@ -1,6 +1,6 @@
 # prosemirror-transform
 
-[ [**WEBSITE**](https://prosemirror.net) | [**ISSUES**](https://github.com/prosemirror/prosemirror/issues) | [**FORUM**](https://discuss.prosemirror.net) | [**CHANGELOG**](https://github.com/ProseMirror/prosemirror-transform/blob/master/CHANGELOG.md) ]
+[ [**WEBSITE**](https://prosemirror.net) | [**ISSUES**](https://code.haverbeke.berlin/prosemirror/prosemirror/issues) | [**FORUM**](https://discuss.prosemirror.net) | [**CHANGELOG**](https://code.haverbeke.berlin/prosemirror/prosemirror-transform/src/branch/main/CHANGELOG.md) ]
 
 This is a [core module](https://prosemirror.net/docs/ref/#transform) of [ProseMirror](https://prosemirror.net).
 ProseMirror is a well-behaved rich semantic content editor based on
@@ -17,10 +17,10 @@ number of [examples](https://prosemirror.net/examples/) and the
 [documentation](https://prosemirror.net/docs/).
 
 This code is released under an
-[MIT license](https://github.com/prosemirror/prosemirror/tree/master/LICENSE).
+[MIT license](https://code.haverbeke.berlin/prosemirror/prosemirror/src/branch/main/LICENSE).
 There's a [forum](http://discuss.prosemirror.net) for general
 discussion and support requests, and the
-[Github bug tracker](https://github.com/prosemirror/prosemirror/issues)
+[bug tracker](https://code.haverbeke.berlin/prosemirror/prosemirror/issues)
 is the place to report issues.
 
 We aim to be an inclusive, welcoming community. To make that explicit,

package/dist/index.cjs

@@ -610,8 +610,8 @@ var ReplaceStep = function (_Step5) {
   }, {
     key: "map",
     value: function map(mapping) {
-      var from = mapping.mapResult(this.from, 1),
-        to = mapping.mapResult(this.to, -1);
+      var to = mapping.mapResult(this.to, -1);
+      var from = this.from == this.to && ReplaceStep.MAP_BIAS < 0 ? to : mapping.mapResult(this.from, 1);
       if (from.deletedAcross && to.deletedAcross) return null;
       return new ReplaceStep(from.pos, Math.max(from.pos, to.pos), this.slice, this.structure);
     }
@@ -650,6 +650,7 @@ var ReplaceStep = function (_Step5) {
   }]);
   return ReplaceStep;
 }(Step);
+ReplaceStep.MAP_BIAS = 1;
 Step.jsonID("replace", ReplaceStep);
 var ReplaceAroundStep = function (_Step6) {
   _inherits(ReplaceAroundStep, _Step6);
@@ -1253,9 +1254,9 @@ var Fitter = function () {
         content = _this$unplaced.content,
         openStart = _this$unplaced.openStart,
         openEnd = _this$unplaced.openEnd;
-      var inner = contentAt(content, openStart);
-      if (!inner.childCount || inner.firstChild.isLeaf) return false;
-      this.unplaced = new prosemirrorModel.Slice(content, openStart + 1, Math.max(openEnd, inner.size + openStart >= content.size - openEnd ? openStart + 1 : 0));
+      if (maxOpen(content, -1) <= openStart) return false;
+      if (this.unplaced.size > 1 && maxOpen(content, 1) > openEnd) openEnd++;
+      this.unplaced = new prosemirrorModel.Slice(content, openStart + 1, openEnd);
       return true;
     }
   }, {
@@ -1431,6 +1432,13 @@ function invalidMarks(type, fragment, start) {
 function definesContent(type) {
   return type.spec.defining || type.spec.definingForContent;
 }
+function maxOpen(frag, side) {
+  for (var count = 0;; count++) {
+    var ch = side < 0 ? frag.firstChild : frag.lastChild;
+    if (!ch || ch.isAtom) return count;
+    frag = ch.content;
+  }
+}
 function _replaceRange(tr, from, to, slice) {
   if (!slice.size) return tr.deleteRange(from, to);
   var $from = tr.doc.resolve(from),
@@ -1507,6 +1515,18 @@ function _replaceRangeWith(tr, from, to, node) {
 function _deleteRange(tr, from, to) {
   var $from = tr.doc.resolve(from),
     $to = tr.doc.resolve(to);
+  if ($from.parent.isTextblock && $to.parent.isTextblock && $from.start() != $to.start() && $from.parentOffset == 0 && $to.parentOffset == 0) {
+    var shared = $from.sharedDepth(to),
+      isolated = false;
+    for (var d = $from.depth; d > shared; d--) if ($from.node(d).type.spec.isolating) isolated = true;
+    for (var _d4 = $to.depth; _d4 > shared; _d4--) if ($to.node(_d4).type.spec.isolating) isolated = true;
+    if (!isolated) {
+      for (var _d5 = $from.depth; _d5 > 0 && from == $from.start(_d5); _d5--) from = $from.before(_d5);
+      for (var _d6 = $to.depth; _d6 > 0 && to == $to.start(_d6); _d6--) to = $to.before(_d6);
+      $from = tr.doc.resolve(from);
+      $to = tr.doc.resolve(to);
+    }
+  }
   var covered = coveredDepths($from, $to);
   for (var i = 0; i < covered.length; i++) {
     var depth = covered[i],
@@ -1514,8 +1534,8 @@ function _deleteRange(tr, from, to) {
     if (last && depth == 0 || $from.node(depth).type.contentMatch.validEnd) return tr["delete"]($from.start(depth), $to.end(depth));
     if (depth > 0 && (last || $from.node(depth - 1).canReplace($from.index(depth - 1), $to.indexAfter(depth - 1)))) return tr["delete"]($from.before(depth), $to.after(depth));
   }
-  for (var d = 1; d <= $from.depth && d <= $to.depth; d++) {
-    if (from - $from.start(d) == $from.depth - d && to > $from.end(d) && $to.end(d) - to != $to.depth - d && $from.start(d - 1) == $to.start(d - 1) && $from.node(d - 1).canReplace($from.index(d - 1), $to.index(d - 1))) return tr["delete"]($from.before(d), to);
+  for (var _d7 = 1; _d7 <= $from.depth && _d7 <= $to.depth; _d7++) {
+    if (from - $from.start(_d7) == $from.depth - _d7 && to > $from.end(_d7) && $to.end(_d7) - to != $to.depth - _d7 && $from.start(_d7 - 1) == $to.start(_d7 - 1) && $from.node(_d7 - 1).canReplace($from.index(_d7 - 1), $to.index(_d7 - 1))) return tr["delete"]($from.before(_d7), to);
   }
   tr["delete"](from, to);
 }

package/dist/index.d.cts

@@ -704,6 +704,15 @@ declare class ReplaceStep extends Step {
     map(mapping: Mappable): ReplaceStep | null;
     merge(other: Step): ReplaceStep | null;
     toJSON(): any;
+    /**
+    By default, for backwards compatibility, an inserting step
+    mapped over an insertion at that same position fill move after
+    the inserted content. In a collaborative editing situation, that
+    can make redone insertions appear in unexpected places. You can
+    set this to -1 to make such mapping keep the step before the
+    insertion instead.
+    */
+    static MAP_BIAS: -1 | 1;
 }
 /**
 Replace a part of the document with a slice of content, but

package/dist/index.d.ts

@@ -704,6 +704,15 @@ declare class ReplaceStep extends Step {
     map(mapping: Mappable): ReplaceStep | null;
     merge(other: Step): ReplaceStep | null;
     toJSON(): any;
+    /**
+    By default, for backwards compatibility, an inserting step
+    mapped over an insertion at that same position fill move after
+    the inserted content. In a collaborative editing situation, that
+    can make redone insertions appear in unexpected places. You can
+    set this to -1 to make such mapping keep the step before the
+    insertion instead.
+    */
+    static MAP_BIAS: -1 | 1;
 }
 /**
 Replace a part of the document with a slice of content, but

package/dist/index.js

@@ -711,7 +711,8 @@ class ReplaceStep extends Step {
         return new ReplaceStep(this.from, this.from + this.slice.size, doc.slice(this.from, this.to));
     }
     map(mapping) {
-        let from = mapping.mapResult(this.from, 1), to = mapping.mapResult(this.to, -1);
+        let to = mapping.mapResult(this.to, -1);
+        let from = this.from == this.to && ReplaceStep.MAP_BIAS < 0 ? to : mapping.mapResult(this.from, 1);
         if (from.deletedAcross && to.deletedAcross)
             return null;
         return new ReplaceStep(from.pos, Math.max(from.pos, to.pos), this.slice, this.structure);
@@ -750,6 +751,15 @@ class ReplaceStep extends Step {
         return new ReplaceStep(json.from, json.to, Slice.fromJSON(schema, json.slice), !!json.structure);
     }
 }
+/**
+By default, for backwards compatibility, an inserting step
+mapped over an insertion at that same position fill move after
+the inserted content. In a collaborative editing situation, that
+can make redone insertions appear in unexpected places. You can
+set this to -1 to make such mapping keep the step before the
+insertion instead.
+*/
+ReplaceStep.MAP_BIAS = 1;
 Step.jsonID("replace", ReplaceStep);
 /**
 Replace a part of the document with a slice of content, but
@@ -1464,10 +1474,11 @@ class Fitter {
     }
     openMore() {
         let { content, openStart, openEnd } = this.unplaced;
-        let inner = contentAt(content, openStart);
-        if (!inner.childCount || inner.firstChild.isLeaf)
+        if (maxOpen(content, -1) <= openStart)
             return false;
-        this.unplaced = new Slice(content, openStart + 1, Math.max(openEnd, inner.size + openStart >= content.size - openEnd ? openStart + 1 : 0));
+        if (this.unplaced.size > 1 && maxOpen(content, 1) > openEnd)
+            openEnd++;
+        this.unplaced = new Slice(content, openStart + 1, openEnd);
         return true;
     }
     dropNode() {
@@ -1637,6 +1648,14 @@ function invalidMarks(type, fragment, start) {
 function definesContent(type) {
     return type.spec.defining || type.spec.definingForContent;
 }
+function maxOpen(frag, side) {
+    for (let count = 0;; count++) {
+        let ch = side < 0 ? frag.firstChild : frag.lastChild;
+        if (!ch || ch.isAtom)
+            return count;
+        frag = ch.content;
+    }
+}
 function replaceRange(tr, from, to, slice) {
     if (!slice.size)
         return tr.deleteRange(from, to);
@@ -1736,6 +1755,26 @@ function replaceRangeWith(tr, from, to, node) {
 }
 function deleteRange(tr, from, to) {
     let $from = tr.doc.resolve(from), $to = tr.doc.resolve(to);
+    // When the deleted range spans from the start of one textblock to
+    // the start of another one, move out of the start of both blocks.
+    if ($from.parent.isTextblock && $to.parent.isTextblock && $from.start() != $to.start() &&
+        $from.parentOffset == 0 && $to.parentOffset == 0) {
+        let shared = $from.sharedDepth(to), isolated = false;
+        for (let d = $from.depth; d > shared; d--)
+            if ($from.node(d).type.spec.isolating)
+                isolated = true;
+        for (let d = $to.depth; d > shared; d--)
+            if ($to.node(d).type.spec.isolating)
+                isolated = true;
+        if (!isolated) {
+            for (let d = $from.depth; d > 0 && from == $from.start(d); d--)
+                from = $from.before(d);
+            for (let d = $to.depth; d > 0 && to == $to.start(d); d--)
+                to = $to.before(d);
+            $from = tr.doc.resolve(from);
+            $to = tr.doc.resolve(to);
+        }
+    }
     let covered = coveredDepths($from, $to);
     for (let i = 0; i < covered.length; i++) {
         let depth = covered[i], last = i == covered.length - 1;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prosemirror-transform",
-  "version": "1.11.0",
+  "version": "1.12.1",
   "description": "ProseMirror document transformations",
   "type": "module",
   "main": "dist/index.cjs",
@@ -21,7 +21,7 @@
   ],
   "repository": {
     "type": "git",
-    "url": "git://github.com/prosemirror/prosemirror-transform.git"
+    "url": "git+https://code.haverbeke.berlin/prosemirror/prosemirror-transform.git"
   },
   "dependencies": {
     "prosemirror-model": "^1.21.0"

package/src/replace.ts

@@ -155,10 +155,9 @@ class Fitter {
 
   openMore() {
     let {content, openStart, openEnd} = this.unplaced
-    let inner = contentAt(content, openStart)
-    if (!inner.childCount || inner.firstChild!.isLeaf) return false
-    this.unplaced = new Slice(content, openStart + 1,
-                              Math.max(openEnd, inner.size + openStart >= content.size - openEnd ? openStart + 1 : 0))
+    if (maxOpen(content, -1) <= openStart) return false
+    if (this.unplaced.size > 1 && maxOpen(content, 1) > openEnd) openEnd++
+    this.unplaced = new Slice(content, openStart + 1, openEnd)
     return true
   }
 
@@ -331,6 +330,14 @@ function definesContent(type: NodeType) {
   return type.spec.defining || type.spec.definingForContent
 }
 
+function maxOpen(frag: Fragment, side: -1 | 1) {
+  for (let count = 0;; count++) {
+    let ch = side < 0 ? frag.firstChild : frag.lastChild
+    if (!ch || ch.isAtom) return count
+    frag = ch.content
+  }
+}
+
 export function replaceRange(tr: Transform, from: number, to: number, slice: Slice) {
   if (!slice.size) return tr.deleteRange(from, to)
 
@@ -425,6 +432,22 @@ export function replaceRangeWith(tr: Transform, from: number, to: number, node:
 
 export function deleteRange(tr: Transform, from: number, to: number) {
   let $from = tr.doc.resolve(from), $to = tr.doc.resolve(to)
+
+  // When the deleted range spans from the start of one textblock to
+  // the start of another one, move out of the start of both blocks.
+  if ($from.parent.isTextblock && $to.parent.isTextblock && $from.start() != $to.start() &&
+      $from.parentOffset == 0 && $to.parentOffset == 0) {
+    let shared = $from.sharedDepth(to), isolated = false
+    for (let d = $from.depth; d > shared; d--) if ($from.node(d).type.spec.isolating) isolated = true
+    for (let d = $to.depth; d > shared; d--) if ($to.node(d).type.spec.isolating) isolated = true
+    if (!isolated) {
+      for (let d = $from.depth; d > 0 && from == $from.start(d); d--) from = $from.before(d)
+      for (let d = $to.depth; d > 0 && to == $to.start(d); d--) to = $to.before(d)
+      $from = tr.doc.resolve(from)
+      $to = tr.doc.resolve(to)
+    }
+  }
+
   let covered = coveredDepths($from, $to)
   for (let i = 0; i < covered.length; i++) {
     let depth = covered[i], last = i == covered.length - 1

package/src/replace_step.ts

@@ -40,7 +40,8 @@ export class ReplaceStep extends Step {
   }
 
   map(mapping: Mappable) {
-    let from = mapping.mapResult(this.from, 1), to = mapping.mapResult(this.to, -1)
+    let to = mapping.mapResult(this.to, -1)
+    let from = this.from == this.to && ReplaceStep.MAP_BIAS < 0 ? to : mapping.mapResult(this.from, 1)
     if (from.deletedAcross && to.deletedAcross) return null
     return new ReplaceStep(from.pos, Math.max(from.pos, to.pos), this.slice, this.structure)
   }
@@ -74,6 +75,14 @@ export class ReplaceStep extends Step {
       throw new RangeError("Invalid input for ReplaceStep.fromJSON")
     return new ReplaceStep(json.from, json.to, Slice.fromJSON(schema, json.slice), !!json.structure)
   }
+
+  /// By default, for backwards compatibility, an inserting step
+  /// mapped over an insertion at that same position fill move after
+  /// the inserted content. In a collaborative editing situation, that
+  /// can make redone insertions appear in unexpected places. You can
+  /// set this to -1 to make such mapping keep the step before the
+  /// insertion instead.
+  static MAP_BIAS: -1 | 1 = 1
 }
 
 Step.jsonID("replace", ReplaceStep)