prosemirror-transform 1.3.3 → 1.4.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prosemirror-transform",
-  "version": "1.3.3",
+  "version": "1.4.1",
   "description": "ProseMirror document transformations",
   "main": "dist/index.js",
   "module": "dist/index.es.js",
@@ -20,7 +20,7 @@
     "prosemirror-model": "^1.0.0"
   },
   "devDependencies": {
-    "mocha": "^3.0.2",
+    "mocha": "^9.1.2",
     "ist": "^1.0.0",
     "prosemirror-test-builder": "^1.0.0",
     "rollup": "^2.26.3",

package/src/map.js

@@ -57,6 +57,7 @@ export class StepMap {
   // represented as an array of numbers, in which each group of three
   // represents a modified chunk as `[start, oldSize, newSize]`.
   constructor(ranges, inverted = false) {
+    if (!ranges.length && StepMap.empty) return StepMap.empty
     this.ranges = ranges
     this.inverted = inverted
   }
@@ -138,6 +139,8 @@ export class StepMap {
   }
 }
 
+// :: StepMap
+// A StepMap that contains no changed ranges.
 StepMap.empty = new StepMap([])
 
 // :: class extends Mappable

package/src/replace.js

@@ -335,6 +335,10 @@ function invalidMarks(type, fragment, start) {
   return false
 }
 
+function definesContent(type) {
+  return type.spec.defining || type.spec.definingForContent
+}
+
 // :: (number, number, Slice) → this
 // Replace a range of the document with a given slice, using `from`,
 // `to`, and the slice's [`openStart`](#model.Slice.openStart) property
@@ -342,9 +346,9 @@ function invalidMarks(type, fragment, start) {
 // grow the replaced area or close open nodes in the slice in order to
 // get a fit that is more in line with WYSIWYG expectations, by
 // dropping fully covered parent nodes of the replaced region when
-// they are marked [non-defining](#model.NodeSpec.defining), or
+// they are marked [non-defining as context](#model.NodeSpec.definingAsContext), or
 // including an open parent node from the slice that _is_ marked as
-// [defining](#model.NodeSpec.defining).
+// [defining its content](#model.NodeSpec.definingForContent).
 //
 // This is the method, for example, to handle paste. The similar
 // [`replace`](#transform.Transform.replace) method is a more
@@ -371,7 +375,7 @@ Transform.prototype.replaceRange = function(from, to, slice) {
   // cross a defining node.
   for (let d = $from.depth, pos = $from.pos - 1; d > 0; d--, pos--) {
     let spec = $from.node(d).type.spec
-    if (spec.defining || spec.isolating) break
+    if (spec.defining || spec.definingAsContext || spec.isolating) break
     if (targetDepths.indexOf(d) > -1) preferredTarget = d
     else if ($from.before(d) == pos) targetDepths.splice(1, 0, -d)
   }
@@ -386,14 +390,14 @@ Transform.prototype.replaceRange = function(from, to, slice) {
     if (i == slice.openStart) break
     content = node.content
   }
-  // Back up if the node directly above openStart, or the node above
-  // that separated only by a non-defining textblock node, is defining.
-  if (preferredDepth > 0 && leftNodes[preferredDepth - 1].type.spec.defining &&
-      $from.node(preferredTargetIndex).type != leftNodes[preferredDepth - 1].type)
-    preferredDepth -= 1
-  else if (preferredDepth >= 2 && leftNodes[preferredDepth - 1].isTextblock && leftNodes[preferredDepth - 2].type.spec.defining &&
-           $from.node(preferredTargetIndex).type != leftNodes[preferredDepth - 2].type)
-    preferredDepth -= 2
+
+  // Back up preferredDepth to cover defining textblocks directly
+  // above it, possibly skipping a non-defining textblock.
+  for (let d = preferredDepth - 1; d >= 0; d--) {
+    let type = leftNodes[d].type, def = definesContent(type)
+    if (def && $from.node(preferredTargetIndex).type != type) preferredDepth = d
+    else if (def || !type.isTextblock) break
+  }
 
   for (let j = slice.openStart; j >= 0; j--) {
     let openDepth = (j + preferredDepth + 1) % (slice.openStart + 1)

package/src/structure.js

@@ -103,8 +103,14 @@ function findWrappingInside(range, type) {
 // probably be computed with [`findWrapping`](#transform.findWrapping).
 Transform.prototype.wrap = function(range, wrappers) {
   let content = Fragment.empty
-  for (let i = wrappers.length - 1; i >= 0; i--)
+  for (let i = wrappers.length - 1; i >= 0; i--) {
+    if (content.size) {
+      let match = wrappers[i].type.contentMatch.matchFragment(content)
+      if (!match || !match.validEnd)
+        throw new RangeError("Wrapper type given to Transform.wrap does not form valid content of its parent wrapper")
+    }
     content = Fragment.from(wrappers[i].type.create(wrappers[i].attrs, content))
+  }
 
   let start = range.start, end = range.end
   return this.step(new ReplaceAroundStep(start, end, start, end, new Slice(content, 0, 0), wrappers.length, true))