@dxos/react-ui-editor 0.4.2-main.330edbe → 0.4.2-main.571cfa2

package/src/extensions/automerge/automerge.ts

@@ -4,15 +4,14 @@
 // Ref: https://github.com/automerge/automerge-codemirror
 //
 
-import { invertedEffects } from '@codemirror/commands';
-import { StateField, type Extension, type StateEffect } from '@codemirror/state';
+import { StateField, type Extension } from '@codemirror/state';
 import { EditorView, ViewPlugin } from '@codemirror/view';
 
 import { next as A, type Prop } from '@dxos/automerge/automerge';
 
 import { cursorConverter } from './cursor';
 import { updateHeadsEffect, type IDocHandle, isReconcile, type State } from './defs';
-import { PatchSemaphore } from './semaphore';
+import { Syncer } from './sync';
 import { Cursor } from '../cursor';
 
 export type AutomergeOptions = {
@@ -55,7 +54,7 @@ export const automerge = ({ handle, path }: AutomergeOptions): Extension => {
     },
   });
 
-  const semaphore = new PatchSemaphore(handle, syncState);
+  const syncer = new Syncer(handle, syncState);
 
   return [
     Cursor.converter.of(cursorConverter(handle, path)),
@@ -73,7 +72,7 @@ export const automerge = ({ handle, path }: AutomergeOptions): Extension => {
         }
 
         _handleChange() {
-          semaphore.reconcile(this._view);
+          syncer.reconcile(this._view, false);
         }
       },
     ),
@@ -81,23 +80,8 @@ export const automerge = ({ handle, path }: AutomergeOptions): Extension => {
     // Reconcile local updates.
     EditorView.updateListener.of(({ view, changes }) => {
       if (!changes.empty) {
-        semaphore.reconcile(view);
+        syncer.reconcile(view, true);
       }
     }),
-
-    // TODO(burdon): Record undo transactions.
-    //  See https://github.com/yjs/y-codemirror.next/tree/main
-    // https://codemirror.net/examples/inverted-effect
-    invertedEffects.of((tr) => {
-      // Each change results it three transactions: insert, delete, insert.
-      const effects: StateEffect<any>[] = [];
-      if (!tr.changes.empty) {
-        tr.changes.iterChanges((fromA, toA, fromB, toB, inserted) => {
-          // effects.push(effectType.of({});
-        });
-      }
-
-      return effects;
-    }),
   ];
 };

package/src/extensions/automerge/{semaphore.ts → sync.ts}

@@ -12,11 +12,11 @@ import { next as A } from '@dxos/automerge/automerge';
 import {
   getLastHeads,
   getPath,
-  isReconcile,
-  reconcileAnnotation,
-  updateHeads,
   type IDocHandle,
   type State,
+  reconcileAnnotation,
+  updateHeads,
+  isReconcile,
 } from './defs';
 import { updateAutomerge } from './update-automerge';
 import { updateCodeMirror } from './update-codemirror';
@@ -24,8 +24,8 @@ import { updateCodeMirror } from './update-codemirror';
 /**
  * Implements three-way merge (on each mutation).
  */
-export class PatchSemaphore {
-  private _inReconcile = false;
+export class Syncer {
+  private _pending = false;
 
   // prettier-ignore
   constructor(
@@ -33,46 +33,44 @@ export class PatchSemaphore {
     private readonly _state: StateField<State>
   ) {}
 
-  reconcile(view: EditorView) {
-    if (!this._inReconcile) {
-      this._inReconcile = true;
-      this.doReconcile(view);
-      this._inReconcile = false;
+  reconcile(view: EditorView, editor: boolean) {
+    // TODO(burdon): Better way to do mutex?
+    if (this._pending) {
+      return;
     }
-  }
-
-  private doReconcile(view: EditorView) {
-    const path = getPath(view.state, this._state);
 
-    // Get the heads before the unreconciled transactions are applied.
-    const oldHeads = getLastHeads(view.state, this._state);
-    let selection = view.state.selection;
+    this._pending = true;
+    if (editor) {
+      this.onEditorChange(view);
+    } else {
+      this.onAutomergeChange(view);
+    }
+    this._pending = false;
+  }
 
-    // First undo all the unreconciled transactions.
+  onEditorChange(view: EditorView) {
+    // Apply the unreconciled transactions to the document.
     const transactions = view.state.field(this._state).unreconciledTransactions.filter((tx) => !isReconcile(tx));
-    const toInvert = transactions.slice().reverse();
-    for (const tr of toInvert) {
-      const inverted = tr.changes.invert(tr.startState.doc);
-      selection = selection.map(inverted);
+    const newHeads = updateAutomerge(this._state, this._handle, transactions, view.state);
+
+    if (newHeads) {
       view.dispatch({
-        changes: inverted,
-        annotations: reconcileAnnotation.of(true),
+        effects: updateHeads(newHeads),
+        annotations: reconcileAnnotation.of(false),
       });
     }
+  }
 
-    // Apply the unreconciled transactions to the document.
-    // NOTE: null and undefined each come from automerge and repo respectively.
-    let newHeads = updateAutomerge(this._state, this._handle, transactions, view.state);
-    if (newHeads === null || newHeads === undefined) {
-      // TODO(alexjg): this is the call that's resetting the editor state on click.
-      newHeads = A.getHeads(this._handle.docSync()!);
-    }
-
-    // Now get the diff between the updated state of the document and the heads and apply that to the codemirror doc.
+  onAutomergeChange(view: EditorView) {
+    // Get the diff between the updated state of the document and the heads and apply that to the codemirror doc.
+    const oldHeads = getLastHeads(view.state, this._state);
+    const newHeads = A.getHeads(this._handle.docSync()!);
     const diff = A.equals(oldHeads, newHeads) ? [] : A.diff(this._handle.docSync()!, oldHeads, newHeads);
+
+    const selection = view.state.selection;
+    const path = getPath(view.state, this._state);
     updateCodeMirror(view, selection, path, diff);
 
-    // Update automerge state.
     view.dispatch({
       effects: updateHeads(newHeads),
       annotations: reconcileAnnotation.of(false),

package/dist/types/src/extensions/automerge/semaphore.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"semaphore.d.ts","sourceRoot":"","sources":["../../../../../src/extensions/automerge/semaphore.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAInD,OAAO,EAML,KAAK,UAAU,EACf,KAAK,KAAK,EACX,MAAM,QAAQ,CAAC;AAIhB;;GAEG;AACH,qBAAa,cAAc;IAKvB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,MAAM;IALzB,OAAO,CAAC,YAAY,CAAS;gBAIV,OAAO,EAAE,UAAU,EACnB,MAAM,EAAE,UAAU,CAAC,KAAK,CAAC;IAG5C,SAAS,CAAC,IAAI,EAAE,UAAU;IAQ1B,OAAO,CAAC,WAAW;CAqCpB"}