prosemirror-transform 0.16.0 → 0.20.0

package/dist/index.js

@@ -1,15 +1,15 @@
 ;var assign;
-((assign = require("./transform"), exports.Transform = assign.Transform, exports.TransformError = assign.TransformError))
+((assign = require("./transform"), exports.Transform = assign.Transform, exports.TransformError = assign.TransformError, assign))
 ;var assign$1;
-((assign$1 = require("./step"), exports.Step = assign$1.Step, exports.StepResult = assign$1.StepResult))
+((assign$1 = require("./step"), exports.Step = assign$1.Step, exports.StepResult = assign$1.StepResult, assign$1))
 ;var assign$2;
-((assign$2 = require("./structure"), exports.joinPoint = assign$2.joinPoint, exports.canJoin = assign$2.canJoin, exports.canSplit = assign$2.canSplit, exports.insertPoint = assign$2.insertPoint, exports.liftTarget = assign$2.liftTarget, exports.findWrapping = assign$2.findWrapping))
+((assign$2 = require("./structure"), exports.joinPoint = assign$2.joinPoint, exports.canJoin = assign$2.canJoin, exports.canSplit = assign$2.canSplit, exports.insertPoint = assign$2.insertPoint, exports.liftTarget = assign$2.liftTarget, exports.findWrapping = assign$2.findWrapping, assign$2))
 ;var assign$3;
-((assign$3 = require("./map"), exports.StepMap = assign$3.StepMap, exports.MapResult = assign$3.MapResult, exports.Mapping = assign$3.Mapping))
+((assign$3 = require("./map"), exports.StepMap = assign$3.StepMap, exports.MapResult = assign$3.MapResult, exports.Mapping = assign$3.Mapping, assign$3))
 ;var assign$4;
-((assign$4 = require("./mark_step"), exports.AddMarkStep = assign$4.AddMarkStep, exports.RemoveMarkStep = assign$4.RemoveMarkStep))
+((assign$4 = require("./mark_step"), exports.AddMarkStep = assign$4.AddMarkStep, exports.RemoveMarkStep = assign$4.RemoveMarkStep, assign$4))
 ;var assign$5;
-((assign$5 = require("./replace_step"), exports.ReplaceStep = assign$5.ReplaceStep, exports.ReplaceAroundStep = assign$5.ReplaceAroundStep))
+((assign$5 = require("./replace_step"), exports.ReplaceStep = assign$5.ReplaceStep, exports.ReplaceAroundStep = assign$5.ReplaceAroundStep, assign$5))
 require("./mark")
 ;var assign$6;
-((assign$6 = require("./replace"), exports.replaceStep = assign$6.replaceStep))
+((assign$6 = require("./replace"), exports.replaceStep = assign$6.replaceStep, assign$6))

package/dist/map.js

@@ -165,7 +165,7 @@ var Mapping = function Mapping(maps, mirror, from, to) {
 };
 
 // :: (?number, ?number) → Mapping
-// Create a remapping that maps only through a part of this one.
+// Create a mapping that maps only through a part of this one.
 Mapping.prototype.slice = function slice (from, to) {
     if ( from === void 0 ) from = 0;
     if ( to === void 0 ) to = this.maps.length;
@@ -190,7 +190,7 @@ Mapping.prototype.setMirror = function setMirror (n, m) {
 };
 
 // :: (StepMap, ?number)
-// Add a step map to the end of this remapping. If `mirrors` is
+// Add a step map to the end of this mapping. If `mirrors` is
 // given, it should be the index of the step map that is the mirror
 // image of this one.
 Mapping.prototype.appendMap = function appendMap (map, mirrors) {
@@ -210,8 +210,27 @@ Mapping.prototype.appendMapping = function appendMapping (mapping) {
   }
 };
 
+// :: (Mapping)
+// Append the inverse of the given mapping to this one.
+Mapping.prototype.appendMappingInverted = function appendMappingInverted (mapping) {
+    var this$1 = this;
+
+  for (var i = mapping.maps.length - 1, totalSize = this.maps.length + mapping.maps.length; i >= 0; i--) {
+    var mirr = mapping.getMirror(i)
+    this$1.appendMap(mapping.maps[i].invert(), mirr != null && mirr > i ? totalSize - mirr - 1 : null)
+  }
+};
+
+// () → Mapping
+// Create an inverted version of this mapping.
+Mapping.prototype.invert = function invert () {
+  var inverse = new Mapping
+  inverse.appendMappingInverted(this)
+  return inverse
+};
+
 // :: (number, ?number) → number
-// Map a position through this remapping.
+// Map a position through this mapping.
 Mapping.prototype.map = function map (pos, assoc) {
     var this$1 = this;
 
@@ -222,7 +241,7 @@ Mapping.prototype.map = function map (pos, assoc) {
 };
 
 // :: (number, ?number) → MapResult
-// Map a position through this remapping, returning a mapping
+// Map a position through this mapping, returning a mapping
 // result.
 Mapping.prototype.mapResult = function mapResult (pos, assoc) { return this._map(pos, assoc, false) };
 

package/dist/mark_step.js

@@ -59,6 +59,10 @@ var AddMarkStep = (function (Step) {
                              Math.max(this.to, other.to), this.mark) }
   };
 
+  AddMarkStep.prototype.offset = function offset (n) {
+    return new AddMarkStep(this.from + n, this.to + n, this.mark)
+  };
+
   AddMarkStep.fromJSON = function fromJSON (schema, json) {
     return new AddMarkStep(json.from, json.to, schema.markFromJSON(json.mark))
   };
@@ -110,6 +114,10 @@ var RemoveMarkStep = (function (Step) {
                                 Math.max(this.to, other.to), this.mark) }
   };
 
+  RemoveMarkStep.prototype.offset = function offset (n) {
+    return new RemoveMarkStep(this.from + n, this.to + n, this.mark)
+  };
+
   RemoveMarkStep.fromJSON = function fromJSON (schema, json) {
     return new RemoveMarkStep(json.from, json.to, schema.markFromJSON(json.mark))
   };

package/dist/replace.js

@@ -31,11 +31,12 @@ Transform.prototype.replaceRange = function(from, to, slice) {
 
   if (!slice.size) { return this.deleteRange(from, to) }
 
-  var $from = this.doc.resolve(from)
-  if (fitsTrivially($from, this.doc.resolve(to), slice))
+  var $from = this.doc.resolve(from), $to = this.doc.resolve(to)
+  if (fitsTrivially($from, $to, slice))
     { return this.step(new ReplaceStep(from, to, slice)) }
 
   var canExpand = coveredDepths($from, this.doc.resolve(to)), preferredExpand = 0
+  if (canExpand[canExpand.length - 1] == 0) { canExpand.pop() }
   canExpand.unshift($from.depth + 1)
   for (var d = $from.depth; d > 0; d--) {
     if ($from.node(d).type.spec.defining) { break }
@@ -67,7 +68,7 @@ Transform.prototype.replaceRange = function(from, to, slice) {
       var expandDepth = canExpand[(i$1 + preferredExpand) % canExpand.length]
       var parent = $from.node(expandDepth - 1), index = $from.index(expandDepth - 1)
       if (parent.canReplaceWith(index, index, insert.type, insert.attrs, insert.marks))
-        { return this$1.replace($from.before(expandDepth), expandDepth > $from.depth ? to : $from.after(expandDepth),
+        { return this$1.replace($from.before(expandDepth), expandDepth > $from.depth ? to : $to.after(expandDepth),
                             new Slice(closeFragment(slice.content, 0, slice.openLeft, openDepth),
                                       openDepth, slice.openRight)) }
     }
@@ -103,28 +104,22 @@ Transform.prototype.replaceRangeWith = function(from, to, node) {
 }
 
 // :: (number, number) → Transform
-// Delete the given range, and any fully covered parent nodes that are
-// not allowed to be empty.
+// Delete the given range, expanding it to cover fully covered
+// parent nodes until a valid replace is found.
 Transform.prototype.deleteRange = function(from, to) {
-  var $from = this.doc.resolve(from)
-  var covered = coveredDepths($from, this.doc.resolve(to)), grown = false
-  // Find the innermost covered node that allows its whole content to
-  // be deleted
+  var $from = this.doc.resolve(from), $to = this.doc.resolve(to)
+  var covered = coveredDepths($from, $to)
   for (var i = 0; i < covered.length; i++) {
-    if ($from.node(covered[i]).contentMatchAt(0).validEnd()) {
-      from = $from.start(covered[i])
-      to = $from.end(covered[i])
-      grown = true
+    var depth = covered[i], last = i == covered.length - 1
+    if ((last && depth == 0) || $from.node(depth).contentMatchAt(0).validEnd()) {
+      from = $from.start(depth)
+      to = $to.end(depth)
       break
     }
-  }
-  // If no such node was found and the outermose covered node can be
-  // deleted entirely, do that
-  if (!grown && covered.length) {
-    var depth = covered[covered.length - 1]
-    if ($from.node(depth - 1).canReplace($from.index(depth - 1), $from.indexAfter(depth - 1))) {
+    if (depth > 0 && (last || $from.node(depth - 1).canReplace($from.index(depth - 1), $to.indexAfter(depth - 1)))) {
       from = $from.before(depth)
-      to = $from.after(depth)
+      to = $to.after(depth)
+      break
     }
   }
   return this.delete(from, to)
@@ -132,13 +127,14 @@ Transform.prototype.deleteRange = function(from, to) {
 
 // : (ResolvedPos, ResolvedPos) → [number]
 // Returns an array of all depths for which $from - $to spans the
-// whole content of the node at that depth.
+// whole content of the nodes at that depth.
 function coveredDepths($from, $to) {
-  var result = []
-  for (var i = 0; i < $from.depth; i++) {
-    var depth = $from.depth - i
-    if ($from.pos - i > $from.start(depth)) { break }
-    if ($to.depth >= depth && $to.pos + ($to.depth - depth) == $from.end(depth)) { result.push(depth) }
+  var result = [], minDepth = Math.min($from.depth, $to.depth)
+  for (var d = minDepth; d >= 0; d--) {
+    var start = $from.start(d)
+    if (start < $from.pos - ($from.depth - d) ||
+        $to.end(d) > $to.pos + ($to.depth - d)) { break }
+    if (start == $to.start(d)) { result.push(d) }
   }
   return result
 }
@@ -388,7 +384,7 @@ function placeSlice($from, slice) {
     if (dSlice >= 0) {
       if (dSlice > 0) { // Inside slice
         ;var assign;
-        ((assign = nodeLeft(slice.content, dSlice), curType = assign.type, curAttrs = assign.attrs, curFragment = assign.content))
+        ((assign = nodeLeft(slice.content, dSlice), curType = assign.type, curAttrs = assign.attrs, curFragment = assign.content, assign))
       } else if (dSlice == 0) { // Top of slice
         curFragment = slice.content
       }
@@ -408,6 +404,9 @@ function placeSlice($from, slice) {
     // This will go through the positions in $from, down from dFrom,
     // to find a fit
     var found = findPlacement(curFragment, $from, dFrom, placed)
+    if (found && unneccesaryFallthrough($from, dFrom, found.depth, slice, dSlice))
+      { found = null }
+
     if (found) {
       // If there was a fit, store it, and consider this content placed
       if (found.fragment.size > 0) { placed[found.depth] = {
@@ -433,7 +432,7 @@ function placeSlice($from, slice) {
         // Store the result for subsequent iterations.
         parents = [{type: top.type, attrs: top.attrs}].concat(wrap)
         ;var assign$1;
-        ((assign$1 = last, curType = assign$1.type, curAttrs = assign$1.attrs))
+        ((assign$1 = last, curType = assign$1.type, curAttrs = assign$1.attrs, assign$1))
       }
       if (curFragment.size) {
         curFragment = curType.contentExpr.start(curAttrs).fillBefore(curFragment, true).append(curFragment)
@@ -482,3 +481,13 @@ function matchStrippingMarks(match, fragment) {
   }
   return Fragment.from(newNodes)
 }
+
+function unneccesaryFallthrough($from, dFrom, dFound, slice, dSlice) {
+  if (dSlice < 1) { return false }
+  for (; dFrom > dFound; dFrom--) {
+    var here = $from.node(dFrom).contentMatchAt($from.indexAfter(dFrom))
+    for (var d = dSlice - 1; d >= 0; d--)
+      { if (here.matchNode(nodeLeft(slice.content, d))) { return true } }
+  }
+  return false
+}

package/dist/replace_step.js

@@ -64,6 +64,10 @@ var ReplaceStep = (function (Step) {
     return json
   };
 
+  ReplaceStep.prototype.offset = function offset (n) {
+    return new ReplaceStep(this.from + n, this.to + n, this.slice, this.structure)
+  };
+
   ReplaceStep.fromJSON = function fromJSON (schema, json) {
     return new ReplaceStep(json.from, json.to, Slice.fromJSON(schema, json.slice), !!json.structure)
   };
@@ -133,6 +137,11 @@ var ReplaceAroundStep = (function (Step) {
     return true
   };
 
+  ReplaceAroundStep.prototype.offset = function offset (n) {
+    return new ReplaceAroundStep(this.from + n, this.to + n, this.gapFrom + n, this.gapTo + n,
+                                 this.slice, this.insert, this.structure)
+  };
+
   ReplaceAroundStep.fromJSON = function fromJSON (schema, json) {
     return new ReplaceAroundStep(json.from, json.to, json.gapFrom, json.gapTo,
                                  Slice.fromJSON(schema, json.slice), json.insert, !!json.structure)

package/dist/step.js

@@ -43,6 +43,13 @@ Step.prototype.map = function map (_mapping) { return mustOverride() };
 // steps can't be merged.
 Step.prototype.merge = function merge (_other) { return null };
 
+// :: (n: number) → Step
+// Returns a copy of this step in which all positions have `n` added
+// to them. The main use for this is to take a step in one document,
+// and make it apply to a sub-document, or a larger document that
+// the original document is a part of.
+Step.prototype.offset = function offset (_n) { return mustOverride() };
+
 // :: () → Object
 // Create a JSON-serializeable representation of this step. By
 // default, it'll create an object with the step's [JSON

package/dist/structure.js

@@ -145,20 +145,21 @@ Transform.prototype.setBlockType = function(from, to, type, attrs) {
   return this
 }
 
-// :: (number, ?NodeType, ?Object) → Transform
+// :: (number, ?NodeType, ?Object, ?[Mark]) → Transform
 // Change the type and attributes of the node after `pos`.
-Transform.prototype.setNodeType = function(pos, type, attrs) {
+Transform.prototype.setNodeType = function(pos, type, attrs, marks) {
   var node = this.doc.nodeAt(pos)
   if (!node) { throw new RangeError("No node at given position") }
   if (!type) { type = node.type }
+  var newNode = type.create(attrs, null, marks || node.marks)
   if (node.isLeaf)
-    { return this.replaceWith(pos, pos + node.nodeSize, type.create(attrs, null, node.marks)) }
+    { return this.replaceWith(pos, pos + node.nodeSize, newNode) }
 
   if (!type.validContent(node.content, attrs))
     { throw new RangeError("Invalid content for node type " + type.name) }
 
   return this.step(new ReplaceAroundStep(pos, pos + node.nodeSize, pos + 1, pos + node.nodeSize - 1,
-                                         new Slice(Fragment.from(type.create(attrs)), 0, 0), 1, true))
+                                         new Slice(Fragment.from(newNode), 0, 0), 1, true))
 }
 
 // :: (Node, number, ?[?{type: NodeType, attrs: ?Object}]) → bool

package/dist/transform.js

@@ -2,13 +2,16 @@ var ref = require("./map");
 var Mapping = ref.Mapping;
 
 var TransformError = (function (Error) {
-  function TransformError () {
-    Error.apply(this, arguments);
-  }if ( Error ) TransformError.__proto__ = Error;
+  function TransformError(message) { Error.call(this, message) }
+
+  if ( Error ) TransformError.__proto__ = Error;
   TransformError.prototype = Object.create( Error && Error.prototype );
   TransformError.prototype.constructor = TransformError;
 
-  
+  var prototypeAccessors = { name: {} };
+  prototypeAccessors.name.get = function () { return "TransformError" };
+
+  Object.defineProperties( TransformError.prototype, prototypeAccessors );
 
   return TransformError;
 }(Error));
@@ -35,10 +38,10 @@ var Transform = function Transform(doc) {
   this.mapping = new Mapping
 };
 
-var prototypeAccessors = { before: {} };
+var prototypeAccessors$1 = { before: {},docChanged: {} };
 
 // :: Node The document at the start of the transformation.
-prototypeAccessors.before.get = function () { return this.docs.length ? this.docs[0] : this.doc };
+prototypeAccessors$1.before.get = function () { return this.docs.length ? this.docs[0] : this.doc };
 
 // :: (step: Step) → Transform
 // Apply a new step in this transformation, saving the result.
@@ -54,14 +57,22 @@ Transform.prototype.step = function step (object) {
 // fails. Returns the step result.
 Transform.prototype.maybeStep = function maybeStep (step) {
   var result = step.apply(this.doc)
-  if (!result.failed) {
-    this.docs.push(this.doc)
-    this.steps.push(step)
-    this.mapping.appendMap(step.getMap())
-    this.doc = result.doc
-  }
+  if (!result.failed) { this.addStep(step, result.doc) }
   return result
 };
 
-Object.defineProperties( Transform.prototype, prototypeAccessors );
+// :: bool
+// True when this transaction changes the document.
+prototypeAccessors$1.docChanged.get = function () {
+  return this.steps.length > 0
+};
+
+Transform.prototype.addStep = function addStep (step, doc) {
+  this.docs.push(this.doc)
+  this.steps.push(step)
+  this.mapping.appendMap(step.getMap())
+  this.doc = doc
+};
+
+Object.defineProperties( Transform.prototype, prototypeAccessors$1 );
 exports.Transform = Transform

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prosemirror-transform",
-  "version": "0.16.0",
+  "version": "0.20.0",
   "description": "ProseMirror document transformations",
   "main": "dist/index.js",
   "license": "MIT",
@@ -16,13 +16,14 @@
     "url": "git://github.com/prosemirror/prosemirror-transform.git"
   },
   "dependencies": {
-    "prosemirror-model": "^0.16.0"
+    "prosemirror-model": "^0.20.0"
   },
   "devDependencies": {
     "buble": "^0.15.1",
     "mocha": "^3.0.2",
     "ist": "^1.0.0",
-    "rimraf": "^2.5.4"
+    "rimraf": "^2.5.4",
+    "prosemirror-test-builder": "^0.20.0"
   },
   "scripts": {
     "test": "mocha test/test-*.js",

package/src/README.md

@@ -1,5 +1,5 @@
 This module defines a way to transform documents. You can read more
-about transformations in [this guide](guide/transform.html).
+about transformations in [this guide](/docs/guides/transform/).
 
 ### Steps
 

package/src/map.js

@@ -147,7 +147,7 @@ StepMap.empty = new StepMap([])
 // class implements [`Mappable`](#transform.Mappable).
 class Mapping {
   // :: (?[StepMap])
-  // Create a new remapping with the given position maps.
+  // Create a new mapping with the given position maps.
   constructor(maps, mirror, from, to) {
     // :: [StepMap]
     // The step maps in this mapping.
@@ -163,7 +163,7 @@ class Mapping {
   }
 
   // :: (?number, ?number) → Mapping
-  // Create a remapping that maps only through a part of this one.
+  // Create a mapping that maps only through a part of this one.
   slice(from = 0, to = this.maps.length) {
     return new Mapping(this.maps, this.mirror, from, to)
   }
@@ -183,7 +183,7 @@ class Mapping {
   }
 
   // :: (StepMap, ?number)
-  // Add a step map to the end of this remapping. If `mirrors` is
+  // Add a step map to the end of this mapping. If `mirrors` is
   // given, it should be the index of the step map that is the mirror
   // image of this one.
   appendMap(map, mirrors) {
@@ -201,8 +201,25 @@ class Mapping {
     }
   }
 
+  // :: (Mapping)
+  // Append the inverse of the given mapping to this one.
+  appendMappingInverted(mapping) {
+    for (let i = mapping.maps.length - 1, totalSize = this.maps.length + mapping.maps.length; i >= 0; i--) {
+      let mirr = mapping.getMirror(i)
+      this.appendMap(mapping.maps[i].invert(), mirr != null && mirr > i ? totalSize - mirr - 1 : null)
+    }
+  }
+
+  // () → Mapping
+  // Create an inverted version of this mapping.
+  invert() {
+    let inverse = new Mapping
+    inverse.appendMappingInverted(this)
+    return inverse
+  }
+
   // :: (number, ?number) → number
-  // Map a position through this remapping.
+  // Map a position through this mapping.
   map(pos, assoc) {
     if (this.mirror) return this._map(pos, assoc, true)
     for (let i = this.from; i < this.to; i++)
@@ -211,7 +228,7 @@ class Mapping {
   }
 
   // :: (number, ?number) → MapResult
-  // Map a position through this remapping, returning a mapping
+  // Map a position through this mapping, returning a mapping
   // result.
   mapResult(pos, assoc) { return this._map(pos, assoc, false) }
 

package/src/mark_step.js

@@ -50,6 +50,10 @@ class AddMarkStep extends Step {
                              Math.max(this.to, other.to), this.mark)
   }
 
+  offset(n) {
+    return new AddMarkStep(this.from + n, this.to + n, this.mark)
+  }
+
   static fromJSON(schema, json) {
     return new AddMarkStep(json.from, json.to, schema.markFromJSON(json.mark))
   }
@@ -94,6 +98,10 @@ class RemoveMarkStep extends Step {
                                 Math.max(this.to, other.to), this.mark)
   }
 
+  offset(n) {
+    return new RemoveMarkStep(this.from + n, this.to + n, this.mark)
+  }
+
   static fromJSON(schema, json) {
     return new RemoveMarkStep(json.from, json.to, schema.markFromJSON(json.mark))
   }

package/src/replace.js

@@ -23,11 +23,12 @@ const {insertPoint} = require("./structure")
 Transform.prototype.replaceRange = function(from, to, slice) {
   if (!slice.size) return this.deleteRange(from, to)
 
-  let $from = this.doc.resolve(from)
-  if (fitsTrivially($from, this.doc.resolve(to), slice))
+  let $from = this.doc.resolve(from), $to = this.doc.resolve(to)
+  if (fitsTrivially($from, $to, slice))
     return this.step(new ReplaceStep(from, to, slice))
 
   let canExpand = coveredDepths($from, this.doc.resolve(to)), preferredExpand = 0
+  if (canExpand[canExpand.length - 1] == 0) canExpand.pop()
   canExpand.unshift($from.depth + 1)
   for (let d = $from.depth; d > 0; d--) {
     if ($from.node(d).type.spec.defining) break
@@ -59,7 +60,7 @@ Transform.prototype.replaceRange = function(from, to, slice) {
       let expandDepth = canExpand[(i + preferredExpand) % canExpand.length]
       let parent = $from.node(expandDepth - 1), index = $from.index(expandDepth - 1)
       if (parent.canReplaceWith(index, index, insert.type, insert.attrs, insert.marks))
-        return this.replace($from.before(expandDepth), expandDepth > $from.depth ? to : $from.after(expandDepth),
+        return this.replace($from.before(expandDepth), expandDepth > $from.depth ? to : $to.after(expandDepth),
                             new Slice(closeFragment(slice.content, 0, slice.openLeft, openDepth),
                                       openDepth, slice.openRight))
     }
@@ -95,28 +96,22 @@ Transform.prototype.replaceRangeWith = function(from, to, node) {
 }
 
 // :: (number, number) → Transform
-// Delete the given range, and any fully covered parent nodes that are
-// not allowed to be empty.
+// Delete the given range, expanding it to cover fully covered
+// parent nodes until a valid replace is found.
 Transform.prototype.deleteRange = function(from, to) {
-  let $from = this.doc.resolve(from)
-  let covered = coveredDepths($from, this.doc.resolve(to)), grown = false
-  // Find the innermost covered node that allows its whole content to
-  // be deleted
+  let $from = this.doc.resolve(from), $to = this.doc.resolve(to)
+  let covered = coveredDepths($from, $to)
   for (let i = 0; i < covered.length; i++) {
-    if ($from.node(covered[i]).contentMatchAt(0).validEnd()) {
-      from = $from.start(covered[i])
-      to = $from.end(covered[i])
-      grown = true
+    let depth = covered[i], last = i == covered.length - 1
+    if ((last && depth == 0) || $from.node(depth).contentMatchAt(0).validEnd()) {
+      from = $from.start(depth)
+      to = $to.end(depth)
       break
     }
-  }
-  // If no such node was found and the outermose covered node can be
-  // deleted entirely, do that
-  if (!grown && covered.length) {
-    let depth = covered[covered.length - 1]
-    if ($from.node(depth - 1).canReplace($from.index(depth - 1), $from.indexAfter(depth - 1))) {
+    if (depth > 0 && (last || $from.node(depth - 1).canReplace($from.index(depth - 1), $to.indexAfter(depth - 1)))) {
       from = $from.before(depth)
-      to = $from.after(depth)
+      to = $to.after(depth)
+      break
     }
   }
   return this.delete(from, to)
@@ -124,13 +119,14 @@ Transform.prototype.deleteRange = function(from, to) {
 
 // : (ResolvedPos, ResolvedPos) → [number]
 // Returns an array of all depths for which $from - $to spans the
-// whole content of the node at that depth.
+// whole content of the nodes at that depth.
 function coveredDepths($from, $to) {
-  let result = []
-  for (let i = 0; i < $from.depth; i++) {
-    let depth = $from.depth - i
-    if ($from.pos - i > $from.start(depth)) break
-    if ($to.depth >= depth && $to.pos + ($to.depth - depth) == $from.end(depth)) result.push(depth)
+  let result = [], minDepth = Math.min($from.depth, $to.depth)
+  for (let d = minDepth; d >= 0; d--) {
+    let start = $from.start(d)
+    if (start < $from.pos - ($from.depth - d) ||
+        $to.end(d) > $to.pos + ($to.depth - d)) break
+    if (start == $to.start(d)) result.push(d)
   }
   return result
 }
@@ -391,6 +387,9 @@ function placeSlice($from, slice) {
     // This will go through the positions in $from, down from dFrom,
     // to find a fit
     let found = findPlacement(curFragment, $from, dFrom, placed)
+    if (found && unneccesaryFallthrough($from, dFrom, found.depth, slice, dSlice))
+      found = null
+
     if (found) {
       // If there was a fit, store it, and consider this content placed
       if (found.fragment.size > 0) placed[found.depth] = {
@@ -464,3 +463,13 @@ function matchStrippingMarks(match, fragment) {
   }
   return Fragment.from(newNodes)
 }
+
+function unneccesaryFallthrough($from, dFrom, dFound, slice, dSlice) {
+  if (dSlice < 1) return false
+  for (; dFrom > dFound; dFrom--) {
+    let here = $from.node(dFrom).contentMatchAt($from.indexAfter(dFrom))
+    for (let d = dSlice - 1; d >= 0; d--)
+      if (here.matchNode(nodeLeft(slice.content, d))) return true
+  }
+  return false
+}

package/src/replace_step.js

@@ -5,7 +5,7 @@ const {StepMap} = require("./map")
 
 // ::- Replace a part of the document with a slice of new content.
 class ReplaceStep extends Step {
-  // :: (number, number, Slice, bool)
+  // :: (number, number, Slice, ?bool)
   // The given `slice` should fit the 'gap' between `from` and
   // `to`—the depths must line up, and the surrounding nodes must be
   // able to be joined with the open sides of the slice. When
@@ -64,6 +64,10 @@ class ReplaceStep extends Step {
     return json
   }
 
+  offset(n) {
+    return new ReplaceStep(this.from + n, this.to + n, this.slice, this.structure)
+  }
+
   static fromJSON(schema, json) {
     return new ReplaceStep(json.from, json.to, Slice.fromJSON(schema, json.slice), !!json.structure)
   }
@@ -76,7 +80,7 @@ Step.jsonID("replace", ReplaceStep)
 // preserve a range of the replaced content by moving it into the
 // slice.
 class ReplaceAroundStep extends Step {
-  // :: (number, number, number, number, Slice, number, bool)
+  // :: (number, number, number, number, Slice, number, ?bool)
   // Create a replace-wrap step with the given range and gap. `insert`
   // should be the point in the slice into which the gap should be
   // moved. `structure` has the same meaning as it has in the
@@ -132,6 +136,11 @@ class ReplaceAroundStep extends Step {
     return true
   }
 
+  offset(n) {
+    return new ReplaceAroundStep(this.from + n, this.to + n, this.gapFrom + n, this.gapTo + n,
+                                 this.slice, this.insert, this.structure)
+  }
+
   static fromJSON(schema, json) {
     return new ReplaceAroundStep(json.from, json.to, json.gapFrom, json.gapTo,
                                  Slice.fromJSON(schema, json.slice), json.insert, !!json.structure)

package/src/step.js

@@ -45,6 +45,13 @@ class Step {
   // steps can't be merged.
   merge(_other) { return null }
 
+  // :: (n: number) → Step
+  // Returns a copy of this step in which all positions have `n` added
+  // to them. The main use for this is to take a step in one document,
+  // and make it apply to a sub-document, or a larger document that
+  // the original document is a part of.
+  offset(_n) { return mustOverride() }
+
   // :: () → Object
   // Create a JSON-serializeable representation of this step. By
   // default, it'll create an object with the step's [JSON

package/src/structure.js

@@ -129,20 +129,21 @@ Transform.prototype.setBlockType = function(from, to = from, type, attrs) {
   return this
 }
 
-// :: (number, ?NodeType, ?Object) → Transform
+// :: (number, ?NodeType, ?Object, ?[Mark]) → Transform
 // Change the type and attributes of the node after `pos`.
-Transform.prototype.setNodeType = function(pos, type, attrs) {
+Transform.prototype.setNodeType = function(pos, type, attrs, marks) {
   let node = this.doc.nodeAt(pos)
   if (!node) throw new RangeError("No node at given position")
   if (!type) type = node.type
+  let newNode = type.create(attrs, null, marks || node.marks)
   if (node.isLeaf)
-    return this.replaceWith(pos, pos + node.nodeSize, type.create(attrs, null, node.marks))
+    return this.replaceWith(pos, pos + node.nodeSize, newNode)
 
   if (!type.validContent(node.content, attrs))
     throw new RangeError("Invalid content for node type " + type.name)
 
   return this.step(new ReplaceAroundStep(pos, pos + node.nodeSize, pos + 1, pos + node.nodeSize - 1,
-                                         new Slice(Fragment.from(type.create(attrs)), 0, 0), 1, true))
+                                         new Slice(Fragment.from(newNode), 0, 0), 1, true))
 }
 
 // :: (Node, number, ?[?{type: NodeType, attrs: ?Object}]) → bool

package/src/transform.js

@@ -1,6 +1,9 @@
 const {Mapping} = require("./map")
 
-class TransformError extends Error {}
+class TransformError extends Error {
+  constructor(message) { super(message) }
+  get name() { return "TransformError" }
+}
 exports.TransformError = TransformError
 
 // ::- Abstraction to build up and track such an array of
@@ -44,13 +47,21 @@ class Transform {
   // fails. Returns the step result.
   maybeStep(step) {
     let result = step.apply(this.doc)
-    if (!result.failed) {
-      this.docs.push(this.doc)
-      this.steps.push(step)
-      this.mapping.appendMap(step.getMap())
-      this.doc = result.doc
-    }
+    if (!result.failed) this.addStep(step, result.doc)
     return result
   }
+
+  // :: bool
+  // True when this transaction changes the document.
+  get docChanged() {
+    return this.steps.length > 0
+  }
+
+  addStep(step, doc) {
+    this.docs.push(this.doc)
+    this.steps.push(step)
+    this.mapping.appendMap(step.getMap())
+    this.doc = doc
+  }
 }
 exports.Transform = Transform