prosemirror-changeset 2.3.0 → 2.3.1

package/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 2.3.1 (2025-05-28)
+
+### Bug fixes
+
+Improve diffing to not treat closing tokens of different node types as the same token.
+
 ## 2.3.0 (2025-05-05)
 
 ### New features

package/dist/index.cjs

@@ -12,6 +12,12 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+function typeID(type) {
+  var cache = type.schema.cached.changeSetIDs || (type.schema.cached.changeSetIDs = Object.create(null));
+  var id = cache[type.name];
+  if (id == null) cache[type.name] = id = Object.keys(type.schema.nodes).indexOf(type.name) + 1;
+  return id;
+}
 var DefaultEncoder = {
   encodeCharacter: function encodeCharacter(_char) {
     return _char;
@@ -19,8 +25,8 @@ var DefaultEncoder = {
   encodeNodeStart: function encodeNodeStart(node) {
     return node.type.name;
   },
-  encodeNodeEnd: function encodeNodeEnd() {
-    return -1;
+  encodeNodeEnd: function encodeNodeEnd(node) {
+    return -typeID(node.type);
   },
   compareTokens: function compareTokens(a, b) {
     return a === b;

package/dist/index.js

@@ -1,12 +1,20 @@
+function typeID(type) {
+    let cache = type.schema.cached.changeSetIDs || (type.schema.cached.changeSetIDs = Object.create(null));
+    let id = cache[type.name];
+    if (id == null)
+        cache[type.name] = id = Object.keys(type.schema.nodes).indexOf(type.name) + 1;
+    return id;
+}
+// The default token encoder, which encodes node open tokens are
+// encoded as strings holding the node name, characters as their
+// character code, and node close tokens as negative numbers.
 const DefaultEncoder = {
     encodeCharacter: char => char,
     encodeNodeStart: node => node.type.name,
-    encodeNodeEnd: () => -1,
+    encodeNodeEnd: node => -typeID(node.type),
     compareTokens: (a, b) => a === b
 };
-// Convert the given range of a fragment to tokens, where node open
-// tokens are encoded as strings holding the node name, characters as
-// their character code, and node close tokens as -1.
+// Convert the given range of a fragment to tokens.
 function tokens(frag, encoder, start, end, target) {
     for (let i = 0, off = 0; i < frag.childCount; i++) {
         let child = frag.child(i), endOff = off + child.nodeSize;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prosemirror-changeset",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "description": "Distills a series of editing steps into deleted and added ranges",
   "type": "module",
   "main": "dist/index.cjs",

package/src/diff.ts

@@ -1,4 +1,4 @@
-import {Fragment, Node, Mark} from "prosemirror-model"
+import {Fragment, Node, NodeType, Mark} from "prosemirror-model"
 import {Change} from "./change"
 
 /// A token encoder can be passed when creating a `ChangeSet` in order
@@ -23,16 +23,24 @@ export interface TokenEncoder<T> {
   compareTokens(a: T, b: T): boolean
 }
 
+function typeID(type: NodeType) {
+  let cache: Record<string, number> = type.schema.cached.changeSetIDs || (type.schema.cached.changeSetIDs = Object.create(null))
+  let id = cache[type.name]
+  if (id == null) cache[type.name] = id = Object.keys(type.schema.nodes).indexOf(type.name) + 1
+  return id
+}
+
+// The default token encoder, which encodes node open tokens are
+// encoded as strings holding the node name, characters as their
+// character code, and node close tokens as negative numbers.
 export const DefaultEncoder: TokenEncoder<number | string> = {
   encodeCharacter: char => char,
   encodeNodeStart: node => node.type.name,
-  encodeNodeEnd: () => -1,
+  encodeNodeEnd: node => -typeID(node.type),
   compareTokens: (a, b) => a === b
 }
 
-// Convert the given range of a fragment to tokens, where node open
-// tokens are encoded as strings holding the node name, characters as
-// their character code, and node close tokens as -1.
+// Convert the given range of a fragment to tokens.
 function tokens<T>(frag: Fragment, encoder: TokenEncoder<T>, start: number, end: number, target: T[]) {
   for (let i = 0, off = 0; i < frag.childCount; i++) {
     let child = frag.child(i), endOff = off + child.nodeSize

package/test/test-diff.ts

@@ -63,4 +63,7 @@ describe("computeDiff", () => {
 
   it("can handle ambiguous diffs", () =>
      test(doc(p("abcbcd")), doc(p("abcd")), [4, 6, 4, 4]))
+
+  it("sees the difference between different closing tokens", () =>
+     test(doc(p("a")), doc(h1("oo")), [0, 3, 0, 4]))
 })