@marimo-team/islands 0.25.3-dev206 → 0.25.3-dev207

package/src/core/codemirror/rtc/loro/sync.ts

@@ -1,169 +0,0 @@
-/* Copyright 2026 Marimo. All rights reserved. */
-
-// Vendored from https://github.com/loro-dev/loro-codemirror/blob/main/src/index.ts
-// and adapted to support:
-// - custom `getTextFromDoc`
-// - filter diffs by path
-
-import type { Extension } from "@codemirror/state";
-import { Annotation, type ChangeSpec } from "@codemirror/state";
-import type { EditorView, PluginValue, ViewUpdate } from "@codemirror/view";
-import { ViewPlugin } from "@codemirror/view";
-import type {
-  LoroDoc,
-  LoroEventBatch,
-  LoroText,
-  Subscription,
-} from "loro-crdt";
-
-/**
- * It is used to sync the document with the remote users.
- *
- * @param doc - LoroDoc instance
- * @returns Extension
- */
-export const loroSyncPlugin = (
-  doc: LoroDoc,
-  docPath: string[],
-  getTextFromDoc: (doc: LoroDoc) => LoroText,
-): Extension => {
-  return ViewPlugin.define(
-    (view) => new LoroSyncPluginValue(view, doc, docPath, getTextFromDoc),
-  );
-};
-
-/**
- * Annotation to identify loro sync changes (syncing from remote to local)
- */
-export const loroSyncAnnotation = Annotation.define();
-
-export class LoroSyncPluginValue implements PluginValue {
-  public sub?: Subscription;
-  private isInitDispatch = false;
-  private view: EditorView;
-  private doc: LoroDoc;
-  private docPath: string[];
-  private getTextFromDoc: (doc: LoroDoc) => LoroText;
-
-  public constructor(
-    view: EditorView,
-    doc: LoroDoc,
-    docPath: string[],
-    getTextFromDoc: (doc: LoroDoc) => LoroText,
-  ) {
-    this.view = view;
-    this.doc = doc;
-    this.docPath = docPath;
-    this.getTextFromDoc = getTextFromDoc;
-    this.sub = doc.subscribe(this.onRemoteUpdate);
-    Promise.resolve().then(() => {
-      this.isInitDispatch = true;
-      const currentText = this.view.state.doc.toString();
-      const text = this.getTextFromDoc(this.doc);
-
-      if (currentText === text.toString()) {
-        return;
-      }
-      view.dispatch({
-        changes: [
-          {
-            from: 0,
-            to: this.view.state.doc.length,
-            insert: text.toString(),
-          },
-        ],
-        annotations: [loroSyncAnnotation.of(this)],
-      });
-    });
-  }
-
-  public onRemoteUpdate = (e: LoroEventBatch) => {
-    if (e.by === "local") {
-      return;
-    }
-    if (e.by === "checkout") {
-      // TODO: better handle checkout
-      this.view.dispatch({
-        changes: [
-          {
-            from: 0,
-            to: this.view.state.doc.length,
-            insert: this.getTextFromDoc(this.doc).toString(),
-          },
-        ],
-        annotations: [loroSyncAnnotation.of(this)],
-      });
-      return;
-    }
-    if (e.by === "import") {
-      const changes: ChangeSpec[] = [];
-      let pos = 0;
-      for (const { diff, path } of e.events) {
-        if (path.join("/") !== this.docPath.join("/")) {
-          continue;
-        }
-        if (diff.type !== "text") {
-          continue;
-        }
-        const textDiff = diff.diff;
-        for (const delta of textDiff) {
-          if (delta.insert) {
-            changes.push({
-              from: pos,
-              to: pos,
-              insert: delta.insert,
-            });
-          } else if (delta.delete) {
-            changes.push({
-              from: pos,
-              to: pos + delta.delete,
-            });
-            pos += delta.delete;
-          } else if (delta.retain != null) {
-            pos += delta.retain;
-          }
-        }
-        if (changes.length > 0) {
-          this.view.dispatch({
-            changes,
-            annotations: [loroSyncAnnotation.of(this)],
-          });
-        }
-      }
-    }
-  };
-
-  public update(update: ViewUpdate): void {
-    if (this.isInitDispatch) {
-      this.isInitDispatch = false;
-      return;
-    }
-
-    if (
-      !update.docChanged ||
-      (update.transactions.length > 0 &&
-        (update.transactions[0].annotation(loroSyncAnnotation) === this ||
-          update.transactions[0].annotation(loroSyncAnnotation) === "undo"))
-    ) {
-      return;
-    }
-    let adj = 0;
-    // oxlint-disable-next-line marimo/prefer-object-params -- CodeMirror supplies positional change ranges and inserted text.
-    update.changes.iterChanges((fromA, toA, fromB, toB, insert) => {
-      const insertText = insert.sliceString(0, insert.length, "\n");
-      if (fromA !== toA) {
-        this.getTextFromDoc(this.doc).delete(fromA + adj, toA - fromA);
-      }
-      if (insertText.length > 0) {
-        this.getTextFromDoc(this.doc).insert(fromA + adj, insertText);
-      }
-      adj += insertText.length - (toA - fromA);
-    });
-    this.doc.commit();
-  }
-
-  public destroy(): void {
-    this.sub?.();
-    this.sub = undefined;
-  }
-}

package/src/core/rtc/state.ts

@@ -1,34 +0,0 @@
-/* Copyright 2026 Marimo. All rights reserved. */
-import { atomWithStorage } from "jotai/utils";
-import { SCRATCH_CELL_ID, type CellId } from "@/core/cells/ids";
-import { once } from "@/utils/once";
-import { jotaiJsonStorage } from "@/utils/storage/jotai";
-import { getFeatureFlag } from "../config/feature-flag";
-
-/**
- * The username for the current user when using real-time collaboration.
- * This is stored in localStorage.
- */
-export const usernameAtom = atomWithStorage<string>(
-  "marimo:rtc:username",
-  "",
-  jotaiJsonStorage,
-);
-
-/**
- * Whether RTC is enabled.
- *
- * This is cached on page-load because this UI can get into
- * weird states, so we require a page reload to take effect.
- */
-export const isRtcEnabled = once(() => {
-  return getFeatureFlag("rtc_v2");
-});
-
-/**
- * Whether this cell type can participate in real-time collaboration.
- * Scratchpad cells are local-only.
- */
-export function canUseRtc(cellId: CellId): boolean {
-  return cellId !== SCRATCH_CELL_ID;
-}