bump to latest yjs and fix tests

Author: dmonad

demo/codemirror.js

@@ -111,11 +111,8 @@ providerYdoc.awareness.setLocalStateField('user', {
 let currentView = null
 const initEditorBinding = () => {
   const withSuggestions = elemToggleShowSuggestions.checked
-  /**
-   * @type {Y.Text<never>}
-   */
-  const ytext = /** @type {any} */ ((withSuggestions ? suggestionDoc : ydoc).getText('quill'))
-  const docContent = ytext.getContent(attributionManager).children.map(s.match().if(delta.TextOp, op => op.insert).else(() => '').done()).join('')
+  const ytext = (withSuggestions ? suggestionDoc : ydoc).get('quill')
+  const docContent = ytext.toDelta(attributionManager).children.map(s.match().if(delta.TextOp, op => op.insert).else(() => '').done()).join('')
   const state = EditorState.create({
     doc: docContent,
     extensions: [

package-lock.json

@@ -53,10 +53,10 @@
     "@codemirror/state": "^6.5.2",
     "@codemirror/view": "^6.38.6",
     "@y/protocols": "^1.0.6-3",
-    "@y/y": "^14.0.0-16"
+    "@y/y": "^14.0.0-21"
   },
   "dependencies": {
-    "lib0": "^0.2.115"
+    "lib0": "^1.0.0-0"
   },
   "devDependencies": {
     "@codemirror/lang-javascript": "^6.2.4",
@@ -75,6 +75,6 @@
     "rollup": "^4.53.3",
     "standard": "^17.1.2",
     "typescript": "^5.9.3",
-    "@y/y": "^14.0.0-16"
+    "@y/y": "^14.0.0-21"
   }
 }

package.json

@@ -10,7 +10,7 @@ import { yUndoManager, yUndoManagerFacet, YUndoManagerConfig, undo, redo, yUndoM
 export { YRange, yRemoteSelections, yRemoteSelectionsTheme, ySync, ySyncFacet, YSyncConfig, ySyncAnnotation, yUndoManagerKeymap }
 
 /**
- * @param {Y.Text<never>} ytext
+ * @param {Y.Type<{text: true}>} ytext
  * @param {any} awareness
  * @param {Object} [opts]
  * @param {Y.UndoManager | false} [opts.undoManager] Set undoManager to false to disable the undo-redo plugin

src/index.js

@@ -10,7 +10,7 @@ export const yAttributionDecorations = cmState.StateField.define({
   create (state) {
     const conf = state.facet(ySyncFacet)
     const ytext = conf.ytext
-    const delta = ytext.getContent(conf.am, { retainInserts: true, retainDeletes: true })
+    const delta = ytext.toDelta(conf.am, { retainInserts: true, retainDeletes: true })
     const { decorations } = ydeltaToCmChanges(delta, false)
     return cmView.Decoration.set(decorations)
   },
@@ -78,13 +78,13 @@ const createAttributionDecoration = (type, username) => {
 
 export class YSyncConfig {
   /**
-   * @param {Y.Text<never>} ytext
+   * @param {Y.Type<{ text: true }>} ytext
    * @param {import('@y/protocols/awareness').Awareness} awareness
    * @param {Y.AbstractAttributionManager} am
    */
   constructor (ytext, awareness, am) {
     /**
-     * @type {Y.Text<never>}
+     * @type {Y.Type<{ text: true }>}
      */
     this.ytext = ytext
     this.awareness = awareness
@@ -235,12 +235,12 @@ class YSyncPluginValue {
     this._ytext = this.conf.ytext
     this._observer = this._ytext.observe((event, tr) => {
       /**
-       * @type {delta.DeltaAny?}
+       * @type {delta.Delta<{text: true}>?}
        */
       let delta = null
       if (tr.origin === this.conf && this.conf.am !== Y.noAttributionsManager) {
         const changes = Y.mergeIdSets([tr.insertSet, tr.deleteSet])
-        delta = this._ytext.getContent(this.conf.am, { itemsToRender: changes, retainInserts: true })
+        delta = this._ytext.toDelta(this.conf.am, { itemsToRender: changes, retainInserts: true })
       } else if (tr.origin !== this.conf) {
         delta = event.getDelta(this.conf.am)
       }
@@ -252,7 +252,7 @@ class YSyncPluginValue {
       }
     })
     this._onAttrChange = this.conf.am.on('change', (changes) => {
-      const delta = this._ytext.getContent(this.conf.am, { itemsToRender: changes, retainInserts: true, retainDeletes: true })
+      const delta = this._ytext.toDelta(this.conf.am, { itemsToRender: changes, retainInserts: true, retainDeletes: true })
       if (!delta.isEmpty()) {
         const { changes, decorations } = ydeltaToCmChanges(delta, false)
         if (changes.length > 0 && decorations.length > 0) {
@@ -276,7 +276,7 @@ class YSyncPluginValue {
        * This variable adjusts the fromA position to the current position in the Y.Text type.
        */
       let adj = 0
-      const d = delta.text()
+      const d = delta.create(delta.$delta({ text: true }))
       update.changes.iterChanges((fromA, toA, fromB, toB, insert) => {
         const insertText = insert.sliceString(0, insert.length, '\n')
         if (fromA !== toA) {
@@ -290,7 +290,7 @@ class YSyncPluginValue {
       ytext.applyDelta(d, this.conf.am)
       const attributedDeletes = tr.meta.get('attributedDeletes')
       if (attributedDeletes != null) {
-        const updateFix = this._ytext.getContent(this.conf.am, { itemsToRender: attributedDeletes })
+        const updateFix = this._ytext.toDelta(this.conf.am, { itemsToRender: attributedDeletes })
         const { changes, decorations } = ydeltaToCmChanges(updateFix, false)
         const dispatch = () => this.view.dispatch({ changes, annotations: [ySyncAnnotation.of(this.conf), yAttributionAnnotation.of(decorations)] })
         setTimeout(dispatch, 0)

src/y-sync.js

@@ -23,6 +23,7 @@ document.getSelection = () => ({ })
 global.requestAnimationFrame = f => setTimeout(f, 0)
 window.Element.prototype.scrollTo = () => {}
 global.scrollTo = () => {}
+window.requestAnimationFrame = setTimeout
 
 document.createRange = () => ({
   setStart () {},

test/test.node.cjs

@@ -10,15 +10,15 @@ import { applyRandomTests } from '@y/y/testHelper'
 import { yCollab } from '@y/codemirror'
 
 /**
- * @param {any} ydoc
+ * @param {Y.Doc} ydoc
  * @return {EditorView}
  */
 const createNewCodemirror = ydoc => {
   const state = EditorState.create({
-    doc: ydoc.getText().toString(),
+    doc: ydoc.get().toString(),
     extensions: [
       basicSetup,
-      yCollab(ydoc.getText(), null, { undoManager: false })
+      yCollab(ydoc.get(), null, { undoManager: false })
     ]
   })
   return new EditorView({ state })