@dxos/react-ui-editor 0.3.11-main.5a4849d → 0.3.11-main.5cbcf4e

package/src/hooks/automerge/semaphore.ts

@@ -1,78 +0,0 @@
-//
-// Copyright 2023 DXOS.org
-//
-
-// TODO(burdon): Additional copyright?
-
-import { type EditorView } from '@codemirror/view';
-
-import { next as automerge } from '@dxos/automerge/automerge';
-
-import { type IDocHandle } from './handle';
-import { type Field, isReconcileTx, getPath, reconcileAnnotationType, updateHeads, getLastHeads } from './plugin';
-import { updateAutomerge } from './update-automerge';
-import { updateCodeMirror } from './update-codemirror';
-
-type Doc<T> = automerge.Doc<T>;
-type Heads = automerge.Heads;
-
-type ChangeFn = (atHeads: Heads, change: (doc: Doc<unknown>) => void) => Heads | undefined;
-
-/**
- * TODO(burdon): Comment.
- */
-export class PatchSemaphore {
-  _field!: Field;
-  _inReconcile = false;
-  _queue: Array<ChangeFn> = [];
-
-  constructor(field?: Field) {
-    if (field !== undefined) {
-      this._field = field;
-    }
-  }
-
-  reconcile = (handle: IDocHandle, view: EditorView) => {
-    if (this._inReconcile) {
-      return;
-    }
-    this._inReconcile = true;
-
-    const path = getPath(view.state, this._field);
-    const oldHeads = getLastHeads(view.state, this._field);
-    let selection = view.state.selection;
-
-    const transactions = view.state.field(this._field).unreconciledTransactions.filter((tx) => !isReconcileTx(tx));
-
-    // First undo all the unreconciled transactions.
-    const toInvert = transactions.slice().reverse();
-    for (const tx of toInvert) {
-      const inverted = tx.changes.invert(tx.startState.doc);
-      selection = selection.map(inverted);
-      view.dispatch({
-        changes: inverted,
-        annotations: reconcileAnnotationType.of(true),
-      });
-    }
-
-    // Apply the unreconciled transactions to the document.
-    let newHeads = updateAutomerge(this._field, handle, transactions, view.state);
-
-    // NOTE: null and undefined each come from automerge and repo respectively.
-    if (newHeads === null || newHeads === undefined) {
-      // TODO: @alexjg this is the call that's resetting the editor state on click
-      newHeads = automerge.getHeads(handle.docSync()!);
-    }
-
-    // Now get the diff between the updated state of the document and the heads and apply that to the codemirror doc.
-    const diff = automerge.equals(oldHeads, newHeads) ? [] : automerge.diff(handle.docSync()!, oldHeads, newHeads);
-    updateCodeMirror(view, selection, path, diff);
-
-    view.dispatch({
-      effects: updateHeads(newHeads),
-      annotations: reconcileAnnotationType.of({}),
-    });
-
-    this._inReconcile = false;
-  };
-}

package/src/hooks/automerge/update-automerge.ts

@@ -1,44 +0,0 @@
-//
-// Copyright 2023 DXOS.org
-//
-
-// TODO(burdon): Additional copyright?
-
-import { type EditorState, type Text, type Transaction } from '@codemirror/state';
-
-import { next as am, type Heads } from '@dxos/automerge/automerge';
-
-import { type IDocHandle } from './handle';
-import { type Field } from './plugin';
-
-export const updateAutomerge = (
-  field: Field,
-  handle: IDocHandle,
-  transactions: Transaction[],
-  state: EditorState,
-): Heads | undefined => {
-  const { lastHeads, path } = state.field(field);
-
-  // We don't want to call `automerge.updateAt` if there are no changes.
-  // Otherwise, later on `automerge.diff` will return empty patches that result in a no-op but still mess up the selection.
-  let hasChanges = false;
-  for (const tr of transactions) {
-    tr.changes.iterChanges(() => {
-      hasChanges = true;
-    });
-  }
-
-  if (!hasChanges) {
-    return undefined;
-  }
-
-  const newHeads = handle.changeAt(lastHeads, (doc: am.Doc<unknown>) => {
-    for (const tr of transactions) {
-      tr.changes.iterChanges((fromA: number, toA: number, _fromB: number, _toB: number, inserted: Text) => {
-        am.splice(doc, path, fromA, toA - fromA, inserted.toString());
-      });
-    }
-  });
-
-  return newHeads ?? undefined;
-};

package/src/hooks/yjs/index.ts

@@ -1,6 +0,0 @@
-//
-// Copyright 2023 DXOS.org
-//
-
-export * from './cursors';
-export * from './space-provider';

package/src/hooks/yjs/space-provider.ts

@@ -1,126 +0,0 @@
-//
-// Copyright 2023 DXOS.org
-//
-
-import * as decoding from 'lib0/decoding';
-import * as encoding from 'lib0/encoding';
-import { Observable } from 'lib0/observable';
-import * as awarenessProtocol from 'y-protocols/awareness';
-import { type Doc } from 'yjs';
-
-import { log } from '@dxos/log';
-import { type Space } from '@dxos/react-client/echo';
-import { type GossipMessage } from '@dxos/react-client/mesh';
-
-type Awareness = awarenessProtocol.Awareness;
-
-// Based on https://github.com/yjs/y-webrtc/blob/88baab2/src/y-webrtc.js.
-
-const messageAwareness = 1;
-const messageQueryAwareness = 3;
-
-/**
- * Yjs awareness provider on top of a DXOS space.
- */
-export class SpaceAwarenessProvider extends Observable<any> {
-  private readonly _space: Space;
-  private readonly _awareness: Awareness;
-  private readonly _clientId: number;
-  private readonly _channel: string;
-
-  constructor({ space, doc, channel, awareness }: { space: Space; doc: Doc; channel: string; awareness?: Awareness }) {
-    super();
-    this._space = space;
-    this._awareness = awareness ?? new awarenessProtocol.Awareness(doc);
-    this._channel = channel;
-    this._clientId = doc.clientID;
-
-    this._awareness.on('update', this._handleAwarenessUpdate.bind(this));
-    this._space.listen(this._channel, this._handleSpaceMessage.bind(this));
-
-    if (typeof window !== 'undefined') {
-      window.addEventListener('beforeunload', this._handleBeforeUnload.bind(this));
-    } else if (typeof process !== 'undefined') {
-      process.on('exit', this._handleBeforeUnload.bind(this));
-    }
-
-    // Post queryAwareness.
-    const encoderAwarenessQuery = encoding.createEncoder();
-    encoding.writeVarUint(encoderAwarenessQuery, messageQueryAwareness);
-    void this._space.postMessage(this._channel, encoding.toUint8Array(encoderAwarenessQuery));
-
-    // Post local awareness state.
-    const encoderAwarenessState = encoding.createEncoder();
-    encoding.writeVarUint(encoderAwarenessState, messageAwareness);
-    encoding.writeVarUint8Array(
-      encoderAwarenessState,
-      awarenessProtocol.encodeAwarenessUpdate(this.awareness, [this._clientId]),
-    );
-    void this._space.postMessage(this._channel, encoding.toUint8Array(encoderAwarenessState));
-  }
-
-  get awareness(): Awareness {
-    return this._awareness;
-  }
-
-  private _handleAwarenessUpdate({ added, updated, removed }: any, origin: any) {
-    log('awareness update', { added, updated, removed, origin });
-    const changedClients = added.concat(updated).concat(removed);
-    const encoderAwareness = encoding.createEncoder();
-    encoding.writeVarUint(encoderAwareness, messageAwareness);
-    encoding.writeVarUint8Array(
-      encoderAwareness,
-      awarenessProtocol.encodeAwarenessUpdate(this._awareness, changedClients),
-    );
-    void this._space.postMessage(this._channel, encoding.toUint8Array(encoderAwareness));
-  }
-
-  private _handleSpaceMessage({ payload }: GossipMessage) {
-    log('space message', payload);
-    const data = new Uint8Array(Array.from(Object.values(payload)));
-    const encoder = this._readMessage(data);
-    if (encoder) {
-      void this._space.postMessage(this._channel, encoding.toUint8Array(encoder));
-    }
-  }
-
-  private _readMessage(message: Uint8Array) {
-    const decoder = decoding.createDecoder(message);
-    const encoder = encoding.createEncoder();
-    const messageType = decoding.readVarUint(decoder);
-
-    let sendReply = false;
-    switch (messageType) {
-      case messageAwareness: {
-        awarenessProtocol.applyAwarenessUpdate(this._awareness, decoding.readVarUint8Array(decoder), this);
-        break;
-      }
-
-      case messageQueryAwareness: {
-        encoding.writeVarUint(encoder, messageAwareness);
-        encoding.writeVarUint8Array(
-          encoder,
-          awarenessProtocol.encodeAwarenessUpdate(this._awareness, Array.from(this._awareness.getStates().keys())),
-        );
-        sendReply = true;
-        break;
-      }
-
-      default: {
-        console.error('Invalid message:', messageType);
-        return encoder;
-      }
-    }
-
-    if (!sendReply) {
-      // Nothing has been written, no answer created.
-      return null;
-    }
-
-    return encoder;
-  }
-
-  private _handleBeforeUnload() {
-    awarenessProtocol.removeAwarenessStates(this._awareness, [this._clientId], 'window unload');
-  }
-}

package/src/hooks/yjs/yjs.stories.tsx

@@ -1,56 +0,0 @@
-//
-// Copyright 2023 DXOS.org
-//
-
-import '@dxosTheme';
-
-import React, { useState } from 'react';
-
-import { PublicKey } from '@dxos/react-client';
-import { TextKind } from '@dxos/react-client/echo';
-import { ClientRepeater, textGenerator, useDataGenerator } from '@dxos/react-client/testing';
-import { useId, Input } from '@dxos/react-ui';
-import { withTheme } from '@dxos/storybook-utils';
-
-import { MarkdownEditor } from '../../components';
-import { Replicator, useYjsModel } from '../../testing';
-
-export default {
-  title: 'react-ui-editor/YJS',
-  component: MarkdownEditor,
-  decorators: [withTheme],
-};
-
-const replicator = new Replicator(TextKind.PLAIN);
-
-const Story = () => {
-  const [generate, setGenerate] = useState(false);
-  const generateId = useId('generate');
-
-  const [id] = useState(PublicKey.random().toHex());
-  const model = useYjsModel({ id, replicator });
-
-  useDataGenerator({
-    generator: generate ? textGenerator : undefined,
-    options: { text: typeof model?.content !== 'string' ? (model?.content as any) : undefined },
-  });
-
-  return (
-    <main className='flex flex-col flex-1 p-4 gap-4'>
-      <div id={generateId} className='flex gap-2'>
-        <Input.Root>
-          <Input.Checkbox checked={generate} onCheckedChange={(checked) => setGenerate(!!checked)} />
-          <Input.Label>Start</Input.Label>
-        </Input.Root>
-      </div>
-      <div className='border'>
-        <MarkdownEditor model={model} />
-      </div>
-    </main>
-  );
-};
-
-export const Default = {
-  // TODO(wittjosiah): Decorator for doing this without clients being initialized?
-  render: () => <ClientRepeater count={2} Component={Story} />,
-};

package/src/hooks/yjs/yjs.test.ts

@@ -1,59 +0,0 @@
-//
-// Copyright 2024 DXOS.org
-//
-
-import { effect } from '@preact/signals-react';
-import { expect } from 'chai';
-import * as Y from 'yjs';
-
-import { Trigger } from '@dxos/async';
-import { Expando, setGlobalAutomergePreference, TextObject } from '@dxos/echo-schema';
-import { registerSignalFactory } from '@dxos/echo-signals';
-import { describe, test } from '@dxos/test';
-import { type YText } from '@dxos/text-model';
-
-describe('YJS', () => {
-  // https://docs.yjs.dev/api/shared-types/y.text
-  // https://github.com/yjs/yjs?tab=readme-ov-file#relative-positions
-  test('absolute position', () => {
-    const obj = new TextObject('hello world');
-    const index = obj.text.indexOf('world');
-    const relPos = Y.encodeRelativePosition(Y.createRelativePositionFromTypeIndex(obj.content as YText, index));
-
-    {
-      const cursor = Y.createAbsolutePositionFromRelativePosition(Y.decodeRelativePosition(relPos), obj.doc!);
-      expect(cursor!.index).to.equal(index);
-      expect(obj.text.substring(cursor!.index)).to.equal('world');
-    }
-
-    (obj.content as YText).insert(index, 'cruel ');
-    expect(obj.text).to.equal('hello cruel world');
-
-    {
-      const cursor = Y.createAbsolutePositionFromRelativePosition(Y.decodeRelativePosition(relPos), obj.doc!);
-      expect(cursor!.index).not.to.equal(index);
-      expect(obj.text.substring(cursor!.index)).to.equal('world');
-    }
-  });
-
-  // TODO(burdon): Test deleting end character.
-
-  test.skip('effect', async () => {
-    setGlobalAutomergePreference(true);
-    registerSignalFactory();
-    const obj = new Expando({ comments: [] });
-
-    const trigger = new Trigger();
-    const unsubscribe = effect(() => {
-      // TODO(burdon): BUG: doesn't work with YJS.
-      console.log(obj.comments);
-      if (obj.comments.length > 0) {
-        trigger.wake();
-      }
-    });
-
-    obj.comments.push({ message: 'hello' });
-    await trigger.wait();
-    unsubscribe();
-  });
-});

package/src/testing/index.ts

@@ -1,6 +0,0 @@
-//
-// Copyright 2023 DXOS.org
-//
-
-export * from './proto';
-export * from './replicator';

package/src/testing/proto/gen/schema.ts

@@ -1,49 +0,0 @@
-/**
- * @generated @dxos/echo-typegen src/testing/proto/schema.proto
- **/
-
-import * as dxos_echo_schema from "@dxos/echo-schema";
-
-export const types = new dxos_echo_schema.TypeCollection();
-
-export type EditorDocumentProps = {
-  content: dxos_echo_schema.Text;
-};
-
-export class EditorDocument extends dxos_echo_schema.TypedObject<EditorDocumentProps> {
-  declare static readonly schema: dxos_echo_schema.Schema;
-
-  static filter(
-    filter?:
-      | Partial<EditorDocumentProps>
-      | dxos_echo_schema.OperatorFilter<EditorDocument>
-  ): dxos_echo_schema.Filter<EditorDocument> {
-    return dxos_echo_schema.Filter.typename(
-      "dxos.testing.editor.EditorDocument",
-      filter
-    );
-  }
-
-  constructor(
-    initValues?: Partial<EditorDocumentProps>,
-    opts?: dxos_echo_schema.TypedObjectOptions
-  ) {
-    super({ ...initValues }, { schema: EditorDocument.schema, ...opts });
-  }
-  declare content: dxos_echo_schema.Text;
-}
-
-types.registerPrototype(EditorDocument, {
-  typename: "dxos.testing.editor.EditorDocument",
-  props: [
-    {
-      id: "content",
-      type: 5,
-      repeated: false,
-      refName: "dxos.schema.Text",
-      refModelType: "dxos.org/model/text",
-    },
-  ],
-});
-
-types.link();

package/src/testing/proto/index.ts

@@ -1,5 +0,0 @@
-//
-// Copyright 2023 DXOS.org
-//
-
-export * from './gen/schema';

package/src/testing/proto/schema.proto

@@ -1,15 +0,0 @@
-//
-// Copyright 2022 DXOS.org
-//
-
-syntax = "proto3";
-
-import "dxos/schema.proto";
-
-package dxos.testing.editor;
-
-message EditorDocument {
-  option (object) = true;
-
-  dxos.schema.Text content = 1;
-}

package/src/testing/replicator.ts

@@ -1,189 +0,0 @@
-//
-// Copyright 2023 DXOS.org
-//
-
-// TODO(wittjosiah): Remove. Use DXOS protocols to reduce duplicate functionality weighing down apps.
-import * as decoding from 'lib0/decoding';
-import * as encoding from 'lib0/encoding';
-import { Observable } from 'lib0/observable';
-import { useMemo } from 'react';
-import * as awarenessProtocol from 'y-protocols/awareness';
-import * as syncProtocol from 'y-protocols/sync';
-import { Doc } from 'yjs';
-
-import { Event } from '@dxos/async';
-import { log } from '@dxos/log';
-import { TextKind } from '@dxos/protocols/proto/dxos/echo/model/text';
-
-import { cursorColor, type EditorModel } from '../hooks';
-
-type Awareness = awarenessProtocol.Awareness;
-
-const messageSync = 0;
-const messageAwareness = 1;
-const messageQueryAwareness = 3;
-
-/**
- * Yjs awareness provider in-memory.
- */
-export class AwarenessProvider extends Observable<any> {
-  private readonly _remoteUpdate: Event<Uint8Array>;
-  private readonly _awareness: Awareness;
-  private readonly _doc: Doc;
-
-  constructor({ update, doc, awareness }: { update: Event<Uint8Array>; doc: Doc; awareness?: Awareness }) {
-    super();
-    this._remoteUpdate = update;
-    this._doc = doc;
-    this._awareness = awareness ?? new awarenessProtocol.Awareness(doc);
-
-    this._doc.on('update', this._handleDocUpdate.bind(this));
-    this._awareness.on('update', this._handleAwarenessUpdate.bind(this));
-    this._remoteUpdate.on(this._handleRemoteUpdate.bind(this));
-
-    if (typeof window !== 'undefined') {
-      window.addEventListener('beforeunload', this._handleBeforeUnload.bind(this));
-    } else if (typeof process !== 'undefined') {
-      process.on('exit', this._handleBeforeUnload.bind(this));
-    }
-
-    // Post queryAwareness.
-    const encoderAwarenessQuery = encoding.createEncoder();
-    encoding.writeVarUint(encoderAwarenessQuery, messageQueryAwareness);
-    void this._remoteUpdate.emit(encoding.toUint8Array(encoderAwarenessQuery));
-
-    // Post local awareness state.
-    const encoderAwarenessState = encoding.createEncoder();
-    encoding.writeVarUint(encoderAwarenessState, messageAwareness);
-    encoding.writeVarUint8Array(
-      encoderAwarenessState,
-      awarenessProtocol.encodeAwarenessUpdate(this.awareness, [this._doc.clientID]),
-    );
-    void this._remoteUpdate.emit(encoding.toUint8Array(encoderAwarenessState));
-  }
-
-  get awareness(): Awareness {
-    return this._awareness;
-  }
-
-  private _handleDocUpdate(update: Uint8Array, origin: any) {
-    log('doc update', { update, origin });
-    const encoder = encoding.createEncoder();
-    encoding.writeVarUint(encoder, messageSync);
-    syncProtocol.writeUpdate(encoder, update);
-    this._remoteUpdate.emit(encoding.toUint8Array(encoder));
-  }
-
-  private _handleAwarenessUpdate({ added, updated, removed }: any, origin: any) {
-    log('awareness update', { added, updated, removed, origin });
-    const changedClients = added.concat(updated).concat(removed);
-    const encoderAwareness = encoding.createEncoder();
-    encoding.writeVarUint(encoderAwareness, messageAwareness);
-    encoding.writeVarUint8Array(
-      encoderAwareness,
-      awarenessProtocol.encodeAwarenessUpdate(this._awareness, changedClients),
-    );
-    this._remoteUpdate.emit(encoding.toUint8Array(encoderAwareness));
-  }
-
-  private _handleRemoteUpdate(payload: Uint8Array) {
-    log('remote update', { payload });
-    const data = new Uint8Array(Array.from(Object.values(payload)));
-    const encoder = this._readMessage(data);
-    if (encoder) {
-      this._remoteUpdate.emit(encoding.toUint8Array(encoder));
-    }
-  }
-
-  private _readMessage(message: Uint8Array) {
-    const decoder = decoding.createDecoder(message);
-    const encoder = encoding.createEncoder();
-    const messageType = decoding.readVarUint(decoder);
-
-    let sendReply = false;
-    switch (messageType) {
-      case messageSync: {
-        encoding.writeVarUint(encoder, messageSync);
-        syncProtocol.readSyncMessage(decoder, encoder, this._doc, this);
-        break;
-      }
-
-      case messageAwareness: {
-        awarenessProtocol.applyAwarenessUpdate(this._awareness, decoding.readVarUint8Array(decoder), this);
-        break;
-      }
-
-      case messageQueryAwareness: {
-        encoding.writeVarUint(encoder, messageAwareness);
-        encoding.writeVarUint8Array(
-          encoder,
-          awarenessProtocol.encodeAwarenessUpdate(this._awareness, Array.from(this._awareness.getStates().keys())),
-        );
-        sendReply = true;
-        break;
-      }
-
-      default: {
-        console.error('Invalid message:', messageType);
-        return encoder;
-      }
-    }
-
-    if (!sendReply) {
-      // Nothing has been written, no answer created.
-      return null;
-    }
-
-    return encoder;
-  }
-
-  private _handleBeforeUnload() {
-    awarenessProtocol.removeAwarenessStates(this._awareness, [this._doc.clientID], 'window unload');
-  }
-}
-
-/**
- * This mocks the replication across the swarm.
- */
-export class Replicator {
-  private readonly _update = new Event<Uint8Array>();
-  private _peers: EditorModel[] = [];
-
-  constructor(private readonly _kind: TextKind) {}
-
-  setPeers(peers: EditorModel[]) {
-    this._peers = peers;
-  }
-
-  createPeer = (id: string, doc: Doc = new Doc()): EditorModel => {
-    const provider = new AwarenessProvider({ update: this._update, doc });
-    provider.awareness.setLocalStateField('user', {
-      name: 'Anonymous ' + Math.floor(Math.random() * 100),
-      color: cursorColor.color,
-      colorLight: cursorColor.light,
-    });
-
-    const field = 'content';
-    const content = this._kind === TextKind.PLAIN ? doc.getText(field) : doc.getXmlFragment(field);
-    const model: EditorModel = {
-      id: doc.guid,
-      text: () => content.toString(),
-      content,
-      awareness: provider.awareness,
-      peer: { id },
-    };
-
-    this._peers.push(model);
-    return model;
-  };
-}
-
-export type UseYjsModelOptions = {
-  replicator: Replicator;
-  id: string;
-  doc?: Doc;
-};
-
-export const useYjsModel = ({ replicator, id, doc }: UseYjsModelOptions): EditorModel => {
-  return useMemo(() => replicator.createPeer(id, doc), [doc]);
-};