fix attribution change event to contain explicit attributions

dmonad · dmonad · commit f30c784cb9b4 · 2026-04-15T01:24:15.000+02:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -71,7 +71,7 @@
   },
   "homepage": "https://docs.yjs.dev",
   "dependencies": {
-    "lib0": "^1.0.0-rc.7"
+    "lib0": "^1.0.0-rc.12"
   },
   "devDependencies": {
     "@types/node": "^22.14.1",
diff --git a/src/utils/ids.js b/src/utils/ids.js
@@ -378,9 +378,13 @@ export const iterateStructsByIdSetWithoutSplits = (store, ds, f) =>
     const ranges = idRanges.getIds()
     const structs = /** @type {Array<GC|Item>} */ (store.clients.get(clientid))
     if (structs != null) {
+      const lastStruct = structs[structs.length - 1]
+      const nextClock = lastStruct.id.clock + lastStruct.length
       for (let i = 0; i < ranges.length; i++) {
         const del = ranges[i]
-        iterateStructsWithoutSplits(structs, del.clock, del.len, f)
+        if (del.clock < nextClock) {
+          iterateStructsWithoutSplits(structs, del.clock, del.len, f)
+        }
       }
     }
   })
diff --git a/tests/attribution.tests.js b/tests/attribution.tests.js
@@ -195,3 +195,22 @@ export const testAttributionEvent = () => {
   ytype.delete(0, 1)
   t.assert(called)
 }
+
+export const testAttributionChange = () => {
+  const ydoc = new Y.Doc()
+  const ytype = ydoc.get()
+  ytype.applyDelta(delta.create().insert('hi').done())
+  const ydocClone = Y.cloneDoc(ydoc)
+  const am = Y.createAttributionManagerFromDiff(ydocClone, ydoc)
+  ytype.applyDelta(delta.create().retain(2).insert('!').done())
+  let calledHandler = false
+  am.on('change', changes => {
+    calledHandler = true
+    const changeUpdate = ytype.toDelta(am, { deep: true, itemsToRender: changes, retainInserts: true, retainDeletes: true })
+    const expectedUpdate = delta.create().retain(2).retain(1, null, {})
+    t.compare(changeUpdate, expectedUpdate)
+    console.log(changeUpdate.toJSON())
+  })
+  Y.applyUpdate(ydocClone, Y.encodeStateAsUpdate(ydoc))
+  t.assert(calledHandler)
+}
